u20220309

d2dsoft · d2dsoft · commit b4df87ca76cb · 2022-03-09T22:27:50.000+07:00
diff --git a/.htaccess b/.htaccess
@@ -1,4 +1,3 @@
-
 Options +FollowSymLinks -MultiViews
 
 RewriteEngine On
diff --git a/app/bootstrap.php b/app/bootstrap.php
@@ -11,7 +11,7 @@
  * DISCLAIMER
  * Do not edit or add to this file if you wish to upgrade this extension/plugin/module to newer version in the future.
  *
- * @author     D2dSoft Developers <develop@d2d-soft.com>
+ * @author     D2dSoft Developers <developer@d2d-soft.com>
  * @copyright  Copyright (c) 2021 D2dSoft (https://d2d-soft.com)
  * @license    https://d2d-soft.com/license/AFL.txt
  */
diff --git a/app/config/autoload.php b/app/config/autoload.php
@@ -11,7 +11,7 @@
  * DISCLAIMER
  * Do not edit or add to this file if you wish to upgrade this extension/plugin/module to newer version in the future.
  *
- * @author     D2dSoft Developers <develop@d2d-soft.com>
+ * @author     D2dSoft Developers <developer@d2d-soft.com>
  * @copyright  Copyright (c) 2021 D2dSoft (https://d2d-soft.com)
  * @license    https://d2d-soft.com/license/AFL.txt
  */
diff --git a/app/config/db.php b/app/config/db.php
@@ -11,13 +11,13 @@
  * DISCLAIMER
  * Do not edit or add to this file if you wish to upgrade this extension/plugin/module to newer version in the future.
  *
- * @author     D2dSoft Developers <develop@d2d-soft.com>
+ * @author     D2dSoft Developers <developer@d2d-soft.com>
  * @copyright  Copyright (c) 2021 D2dSoft (https://d2d-soft.com)
  * @license    https://d2d-soft.com/license/AFL.txt
  */
 
 return array(
-    'type' => 'sqlite',
-    'path' => _ROOT_DIR . '/pub/data/db.sqlite3',   
-    'debug' => false,
+    'type' => 'sqlite', 
+    'path' => _ROOT_DIR . '/pub/data/db.sqlite3',
+    'debug' => true,
 );
diff --git a/app/config/env.php b/app/config/env.php
@@ -11,11 +11,9 @@
  * DISCLAIMER
  * Do not edit or add to this file if you wish to upgrade this extension/plugin/module to newer version in the future.
  *
- * @author     D2dSoft Developers <develop@d2d-soft.com>
+ * @author     D2dSoft Developers <developer@d2d-soft.com>
  * @copyright  Copyright (c) 2021 D2dSoft (https://d2d-soft.com)
  * @license    https://d2d-soft.com/license/AFL.txt
  */
 
-return array(
-    'site' => 'https://d2d-soft.com/',
-);
+return array();
diff --git a/app/config/route.php b/app/config/route.php
@@ -11,7 +11,7 @@
  * DISCLAIMER
  * Do not edit or add to this file if you wish to upgrade this extension/plugin/module to newer version in the future.
  *
- * @author     D2dSoft Developers <develop@d2d-soft.com>
+ * @author     D2dSoft Developers <developer@d2d-soft.com>
  * @copyright  Copyright (c) 2021 D2dSoft (https://d2d-soft.com)
  * @license    https://d2d-soft.com/license/AFL.txt
  */
diff --git a/app/controllers/Abstract.php b/app/controllers/Abstract.php
@@ -11,7 +11,7 @@
  * DISCLAIMER
  * Do not edit or add to this file if you wish to upgrade this extension/plugin/module to newer version in the future.
  *
- * @author     D2dSoft Developers <develop@d2d-soft.com>
+ * @author     D2dSoft Developers <developer@d2d-soft.com>
  * @copyright  Copyright (c) 2021 D2dSoft (https://d2d-soft.com)
  * @license    https://d2d-soft.com/license/AFL.txt
  */
diff --git a/app/controllers/Import.php b/app/controllers/Import.php
@@ -11,7 +11,7 @@
  * DISCLAIMER
  * Do not edit or add to this file if you wish to upgrade this extension/plugin/module to newer version in the future.
  *
- * @author     D2dSoft Developers <develop@d2d-soft.com>
+ * @author     D2dSoft Developers <developer@d2d-soft.com>
  * @copyright  Copyright (c) 2021 D2dSoft (https://d2d-soft.com)
  * @license    https://d2d-soft.com/license/AFL.txt
  */
diff --git a/app/controllers/License.php b/app/controllers/License.php
@@ -11,7 +11,7 @@
  * DISCLAIMER
  * Do not edit or add to this file if you wish to upgrade this extension/plugin/module to newer version in the future.
  *
- * @author     D2dSoft Developers <develop@d2d-soft.com>
+ * @author     D2dSoft Developers <developer@d2d-soft.com>
  * @copyright  Copyright (c) 2021 D2dSoft (https://d2d-soft.com)
  * @license    https://d2d-soft.com/license/AFL.txt
  */
@@ -69,10 +69,7 @@ public function setupAction()
      */
     protected function _downloadAndExtraLibrary($license = '')
     {
-        global $bootstrap;
-        $envConfig = $bootstrap->getConfig('env');
-        $site = $bootstrap->getArrayValue($envConfig, 'site', '');
-        $url = $site . '/download_package.php';
+        $url = 'https://d2d-soft.com/download_package.php';
         $tmp_path = _ROOT_DIR . '/pub/media/resources.zip';
         $data = array(
             'license' => $license
diff --git a/app/controllers/Setting.php b/app/controllers/Setting.php
@@ -11,7 +11,7 @@
  * DISCLAIMER
  * Do not edit or add to this file if you wish to upgrade this extension/plugin/module to newer version in the future.
  *
- * @author     D2dSoft Developers <develop@d2d-soft.com>
+ * @author     D2dSoft Developers <developer@d2d-soft.com>
  * @copyright  Copyright (c) 2021 D2dSoft (https://d2d-soft.com)
  * @license    https://d2d-soft.com/license/AFL.txt
  */
diff --git a/app/layouts/default.tpl.php b/app/layouts/default.tpl.php
@@ -11,7 +11,7 @@
  * DISCLAIMER
  * Do not edit or add to this file if you wish to upgrade this extension/plugin/module to newer version in the future.
  *
- * @author     D2dSoft Developers <develop@d2d-soft.com>
+ * @author     D2dSoft Developers <developer@d2d-soft.com>
  * @copyright  Copyright (c) 2021 D2dSoft (https://d2d-soft.com)
  * @license    https://d2d-soft.com/license/AFL.txt
  */
@@ -39,6 +39,7 @@
     'jquery.validate.min.js',
     'jquery.extend.js',
     'jquery.migration.js',
+//    'script.js'
 );
 ?>
 <!doctype html>
diff --git a/app/views/content.tpl.php b/app/views/content.tpl.php
@@ -11,7 +11,7 @@
  * DISCLAIMER
  * Do not edit or add to this file if you wish to upgrade this extension/plugin/module to newer version in the future.
  *
- * @author     D2dSoft Developers <develop@d2d-soft.com>
+ * @author     D2dSoft Developers <developer@d2d-soft.com>
  * @copyright  Copyright (c) 2021 D2dSoft (https://d2d-soft.com)
  * @license    https://d2d-soft.com/license/AFL.txt
  */
diff --git a/app/views/import/index.tpl.php b/app/views/import/index.tpl.php
@@ -11,7 +11,7 @@
  * DISCLAIMER
  * Do not edit or add to this file if you wish to upgrade this extension/plugin/module to newer version in the future.
  *
- * @author     D2dSoft Developers <develop@d2d-soft.com>
+ * @author     D2dSoft Developers <developer@d2d-soft.com>
  * @copyright  Copyright (c) 2021 D2dSoft (https://d2d-soft.com)
  * @license    https://d2d-soft.com/license/AFL.txt
  */
diff --git a/app/views/license/index.tpl.php b/app/views/license/index.tpl.php
@@ -11,15 +11,12 @@
  * DISCLAIMER
  * Do not edit or add to this file if you wish to upgrade this extension/plugin/module to newer version in the future.
  *
- * @author     D2dSoft Developers <develop@d2d-soft.com>
+ * @author     D2dSoft Developers <developer@d2d-soft.com>
  * @copyright  Copyright (c) 2021 D2dSoft (https://d2d-soft.com)
  * @license    https://d2d-soft.com/license/AFL.txt
  */
 
-global $bootstrap;
-$envConfig = $bootstrap->getConfig('env');
-$site = $bootstrap->getArrayValue($envConfig, 'site', '');
-?>
+global $bootstrap; ?>
 <div id="migration-page">
 
     <div class="page-header">
@@ -55,7 +52,7 @@
 
                     <div class="form-group" style="margin-top: 10px;">
                         <p>Please fill your license in the form and click the "Install" button. The tool auto-downloads the newest library from D2dSoft's server and installs it. After that, you can run the migration.</p>
-                        <p>If you don't have the license, please go to the <a href="<?php echo $site ?>" target="_blank">D2dSoft website</a> to buy a license or try to run the free migration.</p>
+                        <p>If you don't have the license, please go to the <a href="https://d2d-soft.com/">D2dSoft website</a> to buy a license or try to run the free migration.</p>
                     </div>
                 </div>
                 <div class="box-action">
diff --git a/app/views/setting/index.tpl.php b/app/views/setting/index.tpl.php
@@ -11,7 +11,7 @@
  * DISCLAIMER
  * Do not edit or add to this file if you wish to upgrade this extension/plugin/module to newer version in the future.
  *
- * @author     D2dSoft Developers <develop@d2d-soft.com>
+ * @author     D2dSoft Developers <developer@d2d-soft.com>
  * @copyright  Copyright (c) 2021 D2dSoft (https://d2d-soft.com)
  * @license    https://d2d-soft.com/license/AFL.txt
  */
diff --git a/index.php b/index.php
@@ -11,14 +11,11 @@
  * DISCLAIMER
  * Do not edit or add to this file if you wish to upgrade this extension/plugin/module to newer version in the future.
  *
- * @author     D2dSoft Developers <develop@d2d-soft.com>
+ * @author     D2dSoft Developers <developer@d2d-soft.com>
  * @copyright  Copyright (c) 2021 D2dSoft (https://d2d-soft.com)
  * @license    https://d2d-soft.com/license/AFL.txt
  */
 
-error_reporting(0);
-ini_set('display_errors', 0);
-
 session_start();
 define('DS', DIRECTORY_SEPARATOR);
 define('_ROOT_DIR', dirname(__FILE__));
diff --git a/pub/js/jquery.extend.js b/pub/js/jquery.extend.js
@@ -28,7 +28,7 @@
     'use strict';
 
     $.validator.addMethod( "url_internal", function( value, element ) {
-        return this.optional( element ) || /^(https?|ftp):\/\/(((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:)*@)?(((\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5]))|((([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.)*(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.?)(:\d*)?)(\/((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)+(\/(([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)*)*)?)?(\?((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)|[\uE000-\uF8FF]|\/|\?)*)?(#((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)|\/|\?)*)?$/i.test( value );
+        return this.optional( element ) || /^(https?|ftp):\/\/(((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:)*@)?(((\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5]))|((([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.)*(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.?)(:\d*)?)(\/((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)+(\/(([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)*)*)?)?(\?((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)|[\uE000-\uF8FF]|\/|\?)*)?(#((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)|\/|\?)*)?(.*)?$/i.test( value );
     }, $.validator.messages.url );
 
 }));
diff --git a/pub/js/jquery.migration-server.js b/pub/js/jquery.migration-server.js
@@ -418,6 +418,9 @@
             }
 
             function scrollToErrorMessage(element){
+                if(element.length < 1){
+                    return false;
+                }
                 $(window).scrollTop( $('.message-valid', element).offset().top - $(window).height() + 50);
             }
 
diff --git a/pub/js/jquery.migration.js b/pub/js/jquery.migration.js
@@ -412,6 +412,9 @@
             }
 
             function scrollToErrorMessage(element){
+                if(element.length < 1){
+                    return false;
+                }
                 $(window).scrollTop( $('.message-valid', element).offset().top - $(window).height() + 50);
             }
 
@@ -531,12 +534,12 @@
                         if(result.next_type){
                             processBarAnimate(result.next_type, false);
                         }
-                        importEntity(result.next_type);
+                        delayImportEntity(result.next_type);
                     } else if(response.status == 'process'){
                         var result = response.data;
                         processBarResult(result.type, result.total, result.import, result.error, result.point);
                         processBarAnimate(result.type, false);
-                        importEntity(result.type);
+                        delayImportEntity(result.type);
                     } else {
                         processRetry(type);
                     }
@@ -546,6 +549,19 @@
                 });
             }
 
+            function delayImportEntity(type){
+                importEntity(type);
+                /*var time = parseFloat(settings.delay);
+                if(time > 0){
+                    var delay = time * 1000;
+                    setTimeout(function(){
+                        importEntity(type);
+                    }, delay);
+                } else {
+                    importEntity(type);
+                }*/
+            }
+
             function processBarResult(entity, total, imported, error, point)
             {
                 var id = '#import-wrap #' + entity + '-process';

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-`
`2`	`1`	`Options +FollowSymLinks -MultiViews`
`3`	`2`
`4`	`3`	`RewriteEngine On`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`	`* DISCLAIMER`
`12`	`12`	`* Do not edit or add to this file if you wish to upgrade this extension/plugin/module to newer version in the future.`
`13`	`13`	`*`
`14`		`- * @author D2dSoft Developers <develop@d2d-soft.com>`
	`14`	`+ * @author D2dSoft Developers <developer@d2d-soft.com>`
`15`	`15`	`* @copyright Copyright (c) 2021 D2dSoft (https://d2d-soft.com)`
`16`	`16`	`* @license https://d2d-soft.com/license/AFL.txt`
`17`	`17`	`*/`