Merge branch 'dev' of https://github.com/microweber/microweber into dev

microweber · Feb 25, 2022 · 8d0220d · 8d0220d
2 parents 13e7b44 + 15e519a
commit 8d0220d
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 1 deletion.
diff --git a/.github/workflows/templates.yml.backup → .github/workflows/templates.yml b/.github/workflows/templates.yml.backup → .github/workflows/templates.yml
diff --git a/src/MicroweberPackages/Cart/CartManager.php b/src/MicroweberPackages/Cart/CartManager.php
@@ -565,7 +565,21 @@ public function update_cart($data)
         }
 
         if ($data['for'] == 'content') {
+
             $cont = $this->app->content_manager->get_by_id($for_id);
+
+            if (isset($cont['is_active'])) {
+                if ($cont['is_active'] != 1) {
+                    $cont = false;
+                }
+            }
+
+            if (isset($cont['is_deleted'])) {
+                if ($cont['is_deleted'] > 0) {
+                    $cont = false;
+                }
+            }
+
             $cont_data = $this->app->content_manager->data($for_id);
             if ($cont == false) {
                 return array('error' => 'Invalid product?');

diff --git a/src/MicroweberPackages/Media/MediaManager.php b/src/MicroweberPackages/Media/MediaManager.php
@@ -4,6 +4,7 @@
 
 use Conner\Tagging\Model\Tagged;
 use \Intervention\Image\ImageManagerStatic as Image;
+use MicroweberPackages\Helper\HTMLClean;
 use MicroweberPackages\Media\Models\Media;
 use MicroweberPackages\Media\Models\MediaThumbnail;
 use MicroweberPackages\Utils\Media\Thumbnailer;
@@ -1184,6 +1185,10 @@ public function thumbnail_img($params)
 
     public function create_media_dir($params)
     {
+
+        $clean = new HTMLClean();
+        $_REQUEST = $clean->cleanArray($_REQUEST);
+
         must_have_access();
         $resp = array();
         // $target_path = media_base_path() . 'uploaded' . DS;
@@ -1198,7 +1203,7 @@ public function create_media_dir($params)
 
             $target_path = $fn_path;
         }
-        if (!isset($_REQUEST['name'])) {
+        if (!isset($_REQUEST['name']) || empty($_REQUEST['name'])) {
             $resp = array('error' => 'You must send new_folder parameter');
         } else {
             $fn_new_folder_path = $_REQUEST['name'];