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

microweber · Feb 10, 2022 · ccacc52 · ccacc52
2 parents 8542169 + 0a7e5f1
commit ccacc52
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 16 deletions.
diff --git a/src/MicroweberPackages/App/functions/plupload.php b/src/MicroweberPackages/App/functions/plupload.php
@@ -149,7 +149,13 @@
                             $is_ext = strtolower($is_ext);
 
                             switch ($is_ext) {
-                                case 'php':
+                                case 'php': 
+                                case 'php12':
+                                case 'php11':
+                                case 'php10':
+                                case 'php9':
+                                case 'php8':
+                                case 'php7':
                                 case 'php5':
                                 case 'php4':
                                 case 'php3':

diff --git a/src/MicroweberPackages/Backup/Http/Controllers/Admin/BackupController.php b/src/MicroweberPackages/Backup/Http/Controllers/Admin/BackupController.php
@@ -148,7 +148,7 @@ public function upload(Request $request)
             );
         }
 
-        $src = str_replace('..',false,$src);
+        $src = str_replace('..','',$src);
 
         $checkFile = url2dir(trim($src));
         $checkFile = normalize_path($checkFile, false);

diff --git a/src/MicroweberPackages/Export/Http/Controllers/Admin/BackupController.php b/src/MicroweberPackages/Export/Http/Controllers/Admin/BackupController.php
@@ -154,7 +154,7 @@ public function upload(Request $request)
                 'error' => 'You have not provided src to the file.'
             );
         }
-
+        $src = str_replace('..','',$src);
         $checkFile = url2dir(trim($src));
 
         $backupLocation = backup_location();

diff --git a/src/MicroweberPackages/Import/Http/Controllers/Admin/BackupController.php b/src/MicroweberPackages/Import/Http/Controllers/Admin/BackupController.php
@@ -154,7 +154,7 @@ public function upload(Request $request)
                 'error' => 'You have not provided src to the file.'
             );
         }
-
+        $src = str_replace('..','',$src);
         $checkFile = url2dir(trim($src));
 
         $backupLocation = backup_location();

diff --git a/tests/Browser/AdminAddCategoryTest.php b/tests/Browser/AdminAddCategoryTest.php
@@ -36,6 +36,9 @@ public function testAddCategory()
                 $browser->validate();
             });
 
+            $browser->pause(1000);
+            $browser->waitForText('Category name');  
+
             $browser->type('#content-title-field', $categoryTitle);
 
             $browser->click('#category-dropdown-holder');

diff --git a/tests/Browser/CheckoutCartTest.php b/tests/Browser/CheckoutCartTest.php
@@ -29,8 +29,8 @@ public function testSubmit()
             $browser->pause(1000);
 
             $browser->radio('payment_gw', 'shop/payments/gateways/bank_transfer');
-            $browser->pause(3000);
 
+            $browser->pause(3000);
             $browser->script("$('html, body').animate({ scrollTop: $('.js-finish-your-order').first().offset().top - 60 }, 0);");
             $browser->pause(3000);
 
@@ -70,10 +70,6 @@ public function testSubmit()
     public function testCheckoutWithPaypal()
     {
 
-
-
-
-
         $siteUrl = $this->siteUrl;
 
         // enable paypal
@@ -108,14 +104,16 @@ public function testCheckoutWithPaypal()
 
             $this->_browserToCheckoutAndFillShippingInfo($browser, $uniqueId);
 
+            $browser->pause(4000);
+            $browser->script("$('html, body').animate({ scrollTop: $('.js-finish-your-order').first().offset().top - 60 }, 0);");
+            $browser->pause(3000);
+
 
             $browser->radio('payment_gw', 'shop/payments/gateways/paypal');
             $browser->pause(1000);
 
-
             try {
-
-                $browser->click('.js-checkout-continue')->waitForText('Please wait', 15);
+                $browser->click('.js-finish-your-order')->waitForText('Please wait', 15);
             } catch (\Facebook\WebDriver\Exception\WebDriverCurlException $e) {
 
                 $this->markTestSkipped('Paypal is not available');

diff --git a/userfiles/modules/slider/index.php b/userfiles/modules/slider/index.php
@@ -106,14 +106,14 @@
                 controls: <?php print $controls ? $controls : 'undefined'; ?>,
                 infiniteLoop: <?php print $loop ? $loop : 'undefined'; ?>,
                 adaptiveHeight: <?php print $adaptiveHeight ? $adaptiveHeight : 'undefined'; ?>,
-                auto: '<?php print $autoplay ? $autoplay : 'undefined'; ?>',
+                auto: <?php print $autoplay ? $autoplay : 'false'; ?>,
                 autoHover: '<?php print $pauseOnHover ? $pauseOnHover : 'undefined'; ?>',
                 pause: '<?php print $autoplaySpeed ? $autoplaySpeed : '3000'; ?>',
                 hideControlOnEnd:  <?php print $hideControlOnEnd ? $hideControlOnEnd : 'undefined'; ?>,
                 mode: '<?php print $mode ? $mode : 'undefined'; ?>',
-                prevText: '<?php print $prevText ? $prevText : 'undefined'; ?>',
-                nextText: '<?php print $nextText ? $nextText : 'undefined'; ?>',
-                touchEnabled: <?php print $touchEnabled ? $touchEnabled : 'undefined'; ?>,
+                prevText: '<?php print $prevText ? $prevText : ''; ?>',
+                nextText: '<?php print $nextText ? $nextText : ''; ?>',
+                touchEnabled: <?php print $touchEnabled ? $touchEnabled : 'true'; ?>,
                 captions: true,
                 onSliderLoad: function () {
                     mw.trigger("mw.bxslider.onSliderLoad");

diff --git a/userfiles/modules/slider/options.php b/userfiles/modules/slider/options.php
@@ -119,6 +119,7 @@
 }
 
 $autoplay = get_module_option('autoplay', $params['id']);
+
 if ($autoplay) {
     $autoplay = $autoplay;
 } elseif (isset($params['autoplay'])) {