X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=dbinstall.php;h=46fc0fc7484a94c79e28ef873f59ecc6400537cb;hb=a07b6f8bccda226991ced6fe25f1c9c508e423e5;hp=32540fd685c2ddd5e5c52aba284056b6e0c68dd6;hpb=270ff8df9ea85d9deb349accedfaedc2f8734251;p=timetracker.git

diff --git a/dbinstall.php b/dbinstall.php
index 32540fd6..46fc0fc7 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 matk (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\n", $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')) {
@@ -614,8 +632,7 @@ if ($_POST) {
     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 `workday_hours` SMALLINT NULL DEFAULT '8' AFTER `lock_spec`");
-    setChange("UPDATE `tt_teams` SET `workday_hours` = 8");
-    setChange("ALTER TABLE tt_teams DROP daily_working_hours");
+    setChange("RENAME TABLE tt_monthly_quota TO tt_monthly_quotas");
   }
   
   // The update_clients function updates projects field in tt_clients table.
@@ -701,7 +718,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");