Installer and updater improved

shared folder is also renamed to vendor instead
Equotix · Mar 18, 2016 · 7cad117 · 7cad117
1 parent c34c9fd
commit 7cad117
Show file tree

Hide file tree

Showing 48 changed files with 411 additions and 258 deletions.
diff --git a/upload/admin/index.php b/upload/admin/index.php
@@ -1,7 +1,4 @@
 <?php
-// Version
-define('VERSION', '1.0.1');
-
 // Configuration
 if (file_exists('../config.php')) {
     require_once('../config.php');
@@ -63,6 +60,10 @@
 
 function error_handler($errno, $errstr, $errfile, $errline) {
     global $log, $config;
+
+	if (error_reporting() === 0) {
+		return false;
+	}
 
     switch ($errno) {
         case E_NOTICE:

diff --git a/upload/admin/view/template/billing/invoice_invoice.tpl b/upload/admin/view/template/billing/invoice_invoice.tpl
@@ -5,9 +5,9 @@
     <title><?php echo $title; ?></title>
     <base href="<?php echo $base; ?>" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <script type="text/javascript" src="<?php echo $application; ?>share/jquery-2.1.3.min.js"></script>
-    <script type="text/javascript" src="<?php echo $application; ?>share/bootstrap/js/bootstrap.min.js"></script>
-    <link rel="stylesheet" type="text/css" href="<?php echo $application; ?>share/bootstrap/css/bootstrap.min.css" />
+    <script type="text/javascript" src="<?php echo $application; ?>vendor/jquery/jquery-2.1.3.min.js"></script>
+    <script type="text/javascript" src="<?php echo $application; ?>vendor/bootstrap/js/bootstrap.min.js"></script>
+    <link rel="stylesheet" type="text/css" href="<?php echo $application; ?>vendor/bootstrap/css/bootstrap.min.css" />
     <link rel="stylesheet" type="text/css" href="view/stylesheet/stylesheet.css" />
   </head>
   <body>

diff --git a/upload/admin/view/template/common/header.tpl b/upload/admin/view/template/common/header.tpl
@@ -4,10 +4,10 @@
     <title><?php echo $title; ?></title>
     <base href="<?php echo $base; ?>" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <script type="text/javascript" src="<?php echo $application; ?>share/jquery-2.1.4.min.js"></script>
-    <script type="text/javascript" src="<?php echo $application; ?>share/bootstrap/js/bootstrap.min.js"></script>
-    <link rel="stylesheet" type="text/css" href="<?php echo $application; ?>share/bootstrap/css/bootstrap.min.css" />
-    <link rel="stylesheet" type="text/css" href="<?php echo $application; ?>share/font-awesome/css/font-awesome.min.css" />
+    <script type="text/javascript" src="<?php echo $application; ?>vendor/jquery/jquery-2.1.4.min.js"></script>
+    <script type="text/javascript" src="<?php echo $application; ?>vendor/bootstrap/js/bootstrap.min.js"></script>
+    <link rel="stylesheet" type="text/css" href="<?php echo $application; ?>vendor/bootstrap/css/bootstrap.min.css" />
+    <link rel="stylesheet" type="text/css" href="<?php echo $application; ?>vendor/font-awesome/css/font-awesome.min.css" />
     <link rel="stylesheet" type="text/css" href="view/stylesheet/stylesheet.css" />
     <?php foreach ($scripts as $script) { ?>
     <script type="text/javascript" src="<?php echo $script; ?>"></script>

diff --git a/upload/application/view/theme/default/template/account/invoice_invoice.tpl b/upload/application/view/theme/default/template/account/invoice_invoice.tpl
@@ -5,10 +5,10 @@
     <title><?php echo $title; ?></title>
     <base href="<?php echo $base; ?>" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <script type="text/javascript" src="share/jquery-2.1.3.min.js"></script>
-    <script type="text/javascript" src="share/bootstrap/js/bootstrap.min.js"></script>
-    <link rel="stylesheet" type="text/css" href="share/bootstrap/css/bootstrap.min.css" />
-    <link rel="stylesheet" type="text/css" href="share/font-awesome/css/font-awesome.min.css" />
+    <script type="text/javascript" src="vendor/jquery/jquery-2.1.3.min.js"></script>
+    <script type="text/javascript" src="vendor/bootstrap/js/bootstrap.min.js"></script>
+    <link rel="stylesheet" type="text/css" href="vendor/bootstrap/css/bootstrap.min.css" />
+    <link rel="stylesheet" type="text/css" href="vendor/font-awesome/css/font-awesome.min.css" />
     <link rel="stylesheet" type="text/css" href="application/view/stylesheet/stylesheet.css" />
   </head>
   <body>

diff --git a/upload/application/view/theme/default/template/common/header.tpl b/upload/application/view/theme/default/template/common/header.tpl
@@ -17,11 +17,11 @@
   <?php foreach ($links as $link) { ?>
   <link href="<?php echo $link['href']; ?>" rel="<?php echo $link['rel']; ?>" />
   <?php } ?>
-  <script type="text/javascript" src="share/jquery-2.1.4.min.js"></script>
-  <script type="text/javascript" src="share/bootstrap/js/bootstrap.min.js"></script>
+  <script type="text/javascript" src="vendor/jquery/jquery-2.1.4.min.js"></script>
+  <script type="text/javascript" src="vendor/bootstrap/js/bootstrap.min.js"></script>
   <script type="text/javascript" src="application/view/javascript/system.js"></script>
-  <link rel="stylesheet" type="text/css" href="share/bootstrap/css/bootstrap.min.css" />
-  <link rel="stylesheet" type="text/css" href="share/font-awesome/css/font-awesome.min.css" />
+  <link rel="stylesheet" type="text/css" href="vendor/bootstrap/css/bootstrap.min.css" />
+  <link rel="stylesheet" type="text/css" href="vendor/font-awesome/css/font-awesome.min.css" />
   <link rel="stylesheet" type="text/css" href="application/view/theme/default/stylesheet/stylesheet.css" />
   <?php foreach ($scripts as $script) { ?>
   <script type="text/javascript" src="<?php echo $script; ?>"></script>

diff --git a/upload/defined.php b/upload/defined.php
@@ -1,4 +1,7 @@
 <?php
+defined('_PATH') or die('Restricted!');
+
+define('VERSION', '1.1.0[a]');
 define('HTTP_SERVER', _URL);
 define('HTTP_APPLICATION', APP_URL);
 define('HTTPS_SERVER', _SURL);
@@ -8,9 +11,4 @@
 define('DIR_IMAGE', __DIR__ . '/image/');
 define('DIR_LANGUAGE', _PATH . '/language/');
 define('DIR_SYSTEM', __DIR__ . '/system/');
-
-if (_FRONT) {
-    define('DIR_TEMPLATE', _PATH . '/view/theme/');
-} else {
-    define('DIR_TEMPLATE', _PATH . '/view/template/');
-}
+define('DIR_TEMPLATE', _PATH . '/view/');
diff --git a/upload/index.php b/upload/index.php
@@ -1,7 +1,4 @@
 <?php
-// Version
-define('VERSION', '1.0.1');
-
 // Configuration
 if (file_exists('config.php')) {
     require_once('config.php');
@@ -66,6 +63,10 @@
 
 function error_handler($errno, $errstr, $errfile, $errline) {
     global $log, $config;
+
+	if (error_reporting() === 0) {
+		return false;
+	}
 
     switch ($errno) {
         case E_NOTICE:

diff --git a/upload/install/controller/install.php b/upload/install/controller/install.php
diff --git a/upload/install/controller/install/step_1.php b/upload/install/controller/install/step_1.php
@@ -0,0 +1,13 @@
+<?php
+class ControllerInstallStep1 extends Controller {
+    public function index() {
+        $this->data = $this->load->language('default');
+
+        $this->data['base'] = HTTP_SERVER;
+        $this->data['application'] = HTTP_APPLICATION;
+
+        $this->data['license'] = file_get_contents(DIR_APPLICATION . 'license.txt');
+
+        $this->response->setOutput($this->render('install/step_1'));
+    }
+}