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

microweber · Feb 10, 2022 · b66537f · b66537f
2 parents 07e9249 + fb91619
commit b66537f
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 7 deletions.
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/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'])) {