X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=dbinstall.php;h=ac88bc4226493bbf8c75b0e11f9bd92adef0b3b8;hb=cb8e3de960b758147b34d8323054e7de70548619;hp=a511617bb37f275c8c7565a73d2cab70e953c9a8;hpb=0576ffe7b0fdedf1e38df47d15d2112fb03ec1c6;p=timetracker.git

diff --git a/dbinstall.php b/dbinstall.php
index a511617b..ac88bc42 100755
--- a/dbinstall.php
+++ b/dbinstall.php
@@ -42,8 +42,8 @@ function setChange($sql) {
     print "successful update<br>\n";
 }
 
-if (!$request->isPost()) {
-  echo('<h2>Environment check</h2>');
+if ($request->isGet()) {
+  echo('<h2>Environment Checks</h2>');
 
   // Check if WEB-INF/templates_c dir is writable.
   if (is_writable(APP_DIR.'/WEB-INF/templates_c/')) {
@@ -55,6 +55,16 @@ if (!$request->isPost()) {
   // Require the configuration file with application settings.
   if (file_exists(APP_DIR."/WEB-INF/config.php")) {
     echo('WEB-INF/config.php file exists.<br>');
+
+    // Config file must start with the PHP opening tag. We are checking this because
+    // a Unicode editor may insert a byte order mark (BOM) before it. This is not good as it will
+    // spit white space before output in some situations such as in PDF reports.
+    $file = fopen(APP_DIR.'/WEB-INF/config.php', 'r');
+    $line = fgets($file);
+    if (strcmp('<?php'.PHP_EOL, $line) !== 0) {
+      echo('<font color="red">Error: WEB-INF/config.php file does not start with PHP opening tag.</font><br>');
+    }
+    fclose($file);
   } else {
     echo('<font color="red">Error: WEB-INF/config.php file does not exist.</font><br>');
   }
@@ -67,6 +77,14 @@ if (!$request->isPost()) {
     echo('<font color="red">Error: DSN value is not defined. Check your config.php file.</font><br>');
   }
 
+  // Check if PHP version is good enough.
+  $required_version = '5.2.1'; // Something in TCPDF library does not work below this one.
+  if (version_compare(phpversion(), $required_version, '>=')) {
+    echo('PHP version: '.phpversion().', good enough.<br>');
+  } else {
+    echo('<font color="red">Error: PHP version is not high enough: '.phpversion().'. Required: '.$required_version.'.</font><br>');
+  }
+
   // Depending on DSN, require either mysqli or mysql extensions.
   if (strrpos(DSN, 'mysqli://', -strlen(DSN)) !== FALSE) {
     if (extension_loaded('mysqli')) {
@@ -154,7 +172,7 @@ if ($_POST) {
   }
 
   if ($_POST["convert5to7"]) {
-    setChange("alter table `activity_log` CHANGE al_comment al_comment BLOB");
+    setChange("alter table `activity_log` CHANGE al_comment al_comment text");
     setChange("CREATE TABLE `sysconfig` (`sysc_id` int(11) unsigned NOT NULL auto_increment,`sysc_name` varchar(32) NOT NULL default '',`sysc_value` varchar(70) default NULL, PRIMARY KEY  (`sysc_id`), UNIQUE KEY `sysc_id` (`sysc_id`), UNIQUE KEY `sysc_name` (`sysc_name`))");
     setChange("alter table `companies` add c_locktime int(4) default -1");
     setChange("alter table `activity_log` add al_billable tinyint(4) default 0");
@@ -529,7 +547,7 @@ if ($_POST) {
     setChange("ALTER TABLE tt_log CHANGE al_project_id project_id int(11) NOT NULL");
     setChange("ALTER TABLE tt_log MODIFY project_id int(11) default NULL");
     setChange("ALTER TABLE tt_log CHANGE al_activity_id task_id int(11) default NULL");
-    setChange("ALTER TABLE tt_log CHANGE al_comment comment blob");
+    setChange("ALTER TABLE tt_log CHANGE al_comment comment text");
     setChange("ALTER TABLE tt_log CHANGE al_billable billable tinyint(4) default '0'");
     setChange("drop index al_user_id_idx on tt_log");
     setChange("drop index al_project_id_idx on tt_log");
@@ -611,13 +629,13 @@ if ($_POST) {
     setChange("create unique index name_idx on tt_invoices(team_id, name, status)");
     setChange("ALTER TABLE tt_teams ADD COLUMN lock_spec varchar(255) default NULL");
     setChange("ALTER TABLE tt_teams DROP locktime");
-  }
-  
-  if ($_POST["convert1900to1930"]){
     setChange("CREATE TABLE `tt_monthly_quota` (`team_id` int(11) NOT NULL, `year` smallint(5) UNSIGNED NOT NULL, `month` tinyint(3) UNSIGNED NOT NULL, `quota` smallint(5) UNSIGNED NOT NULL, PRIMARY KEY (`year`,`month`,`team_id`))");
     setChange("ALTER TABLE `tt_monthly_quota` ADD CONSTRAINT `FK_TT_TEAM_CONSTRAING` FOREIGN KEY (`team_id`) REFERENCES `tt_teams` (`id`) ON DELETE CASCADE ON UPDATE CASCADE");
-    setChange("ALTER TABLE `tt_teams` ADD `daily_working_hours` SMALLINT NULL DEFAULT '8' AFTER `lock_spec`");
-    setChange("UPDATE `tt_teams` SET `daily_working_hours` = 8");
+    setChange("ALTER TABLE `tt_teams` ADD `workday_hours` SMALLINT NULL DEFAULT '8' AFTER `lock_spec`");
+    setChange("RENAME TABLE tt_monthly_quota TO tt_monthly_quotas");
+    setChange("ALTER TABLE tt_expense_items modify `name` text NOT NULL");
+    setChange("ALTER TABLE `tt_teams` ADD `uncompleted_indicators` SMALLINT(2) NOT NULL DEFAULT '0' AFTER `record_type`");
+    setChange("CREATE TABLE `tt_predefined_expenses` (`id` int(11) NOT NULL auto_increment, `team_id` int(11) NOT NULL, `name` varchar(255) NOT NULL, `cost` decimal(10,2) default '0.00', PRIMARY KEY  (`id`))");
   }
   
   // The update_clients function updates projects field in tt_clients table.
@@ -703,7 +721,7 @@ if ($_POST) {
     setChange("OPTIMIZE TABLE tt_fav_reports");
     setChange("OPTIMIZE TABLE tt_invoices");
     setChange("OPTIMIZE TABLE tt_log");
-    setChange("OPTIMIZE TABLE tt_monthly_quota");
+    setChange("OPTIMIZE TABLE tt_monthly_quotas");
     setChange("OPTIMIZE TABLE tt_project_task_binds");
     setChange("OPTIMIZE TABLE tt_projects");
     setChange("OPTIMIZE TABLE tt_tasks");
@@ -758,10 +776,6 @@ if ($_POST) {
     <td>Update database structure (v1.6 to v1.9)</td>
     <td><input type="submit" name="convert1600to1900" value="Update"><br></td>
   </tr>
-  <tr valign="top">
-    <td>Update database structure (v1.9 to v1.9.30)</td>
-    <td><input type="submit" name="convert1900to1930" value="Update"><br></td>
-  </tr>
 </table>
 
 <h2>DB Maintenance</h2>
@@ -774,4 +788,4 @@ if ($_POST) {
 </form>
 </div>
 </body>
-</html>
\ No newline at end of file
+</html>