Expense Item description - Follow-up to pull request #22 (#23)

[timetracker.git] / dbinstall.php

diff --git a/dbinstall.php b/dbinstall.php
index 4a7bcd129bdb42a4c4f03293ce73e66109058e0e..9f579947aa8889214c9fbc21b6a28f3b14c32fed 100755 (executable)
--- a/dbinstall.php
+++ b/dbinstall.php
@@ -42,8 +42,8 @@ function setChange($sql) {
     print "successful update<br>\n";
 }
 
     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/')) {
 
   // 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>');
   // 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>');
   }
   } 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>');
   }
 
     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')) {
   // Depending on DSN, require either mysqli or mysql extensions.
   if (strrpos(DSN, 'mysqli://', -strlen(DSN)) !== FALSE) {
     if (extension_loaded('mysqli')) {


@@ -587,7 +605,18 @@ if ($_POST) {
     setChange("ALTER TABLE tt_fav_reports ADD COLUMN `show_client` tinyint(4) NOT NULL default '0'");
     setChange("ALTER TABLE tt_fav_reports ADD COLUMN `show_invoice` tinyint(4) NOT NULL default '0'");
     setChange("ALTER TABLE tt_fav_reports ADD COLUMN `group_by` varchar(20) default NULL");
     setChange("ALTER TABLE tt_fav_reports ADD COLUMN `show_client` tinyint(4) NOT NULL default '0'");
     setChange("ALTER TABLE tt_fav_reports ADD COLUMN `show_invoice` tinyint(4) NOT NULL default '0'");
     setChange("ALTER TABLE tt_fav_reports ADD COLUMN `group_by` varchar(20) default NULL");

-    setChange("CREATE TABLE `tt_expense_items` (`id` bigint NOT NULL auto_increment, `date` date NOT NULL, `user_id` int(11) NOT NULL, `client_id` int(11) default NULL, `project_id` int(11) default NULL, `name` varchar(255) NOT NULL, `cost` decimal(10,2) default '0.00', `invoice_id` int(11) default NULL, PRIMARY KEY  (`id`))");
+    
+    setChange("CREATE TABLE `tt_expense_items` (`id` bigint NOT NULL auto_increment, `date` date NOT NULL,
+    `user_id` int(11) NOT NULL, `client_id` int(11) default NULL, `project_id` int(11) default NULL, 
+    
+   /* Kimberly Keown suggested revision to increase character length of expenses.php and expense_edit.php $cl_item_name textarea.
+   Updated mysql.sql also.
+   Original: `name` varchar(255) NOT NULL, */
+    `name` text NOT NULL, 
+    
+    `cost` decimal(10,2) default '0.00', `invoice_id` int(11) default NULL, 
+    PRIMARY KEY  (`id`))");
+    

     setChange("create index date_idx on tt_expense_items(date)");
     setChange("create index user_idx on tt_expense_items(user_id)");
     setChange("create index client_idx on tt_expense_items(client_id)");
     setChange("create index date_idx on tt_expense_items(date)");
     setChange("create index user_idx on tt_expense_items(user_id)");
     setChange("create index client_idx on tt_expense_items(client_id)");


@@ -613,8 +642,8 @@ if ($_POST) {
     setChange("ALTER TABLE tt_teams DROP locktime");
     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 DROP locktime");
     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");

   }
   
   // The update_clients function updates projects field in tt_clients table.
   }
   
   // The update_clients function updates projects field in tt_clients table.


@@ -700,7 +729,7 @@ if ($_POST) {
     setChange("OPTIMIZE TABLE tt_fav_reports");
     setChange("OPTIMIZE TABLE tt_invoices");
     setChange("OPTIMIZE TABLE tt_log");
     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");
     setChange("OPTIMIZE TABLE tt_project_task_binds");
     setChange("OPTIMIZE TABLE tt_projects");
     setChange("OPTIMIZE TABLE tt_tasks");


@@ -767,4 +796,4 @@ if ($_POST) {
 </form>
 </div>
 </body>
 </form>
 </div>
 </body>

-</html>
\ No newline at end of file
+</html>