X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=dbinstall.php;h=2b0d896ca3fccf2f4e80a6113fca7af4e3bfb130;hb=19e183c61f684ff92f5b7c95f09a0a6ca7d7bffe;hp=9f579947aa8889214c9fbc21b6a28f3b14c32fed;hpb=55e76bcb802e12987d7afa9a79fcf37eaec0d746;p=timetracker.git

diff --git a/dbinstall.php b/dbinstall.php
index 9f579947..2b0d896c 100755
--- a/dbinstall.php
+++ b/dbinstall.php
@@ -78,7 +78,9 @@ if ($request->isGet()) {
   }
 
   // Check if PHP version is good enough.
-  $required_version = '5.2.1'; // Something in TCPDF library does not work below this one.
+  // $required_version = '5.2.1'; // Something in TCPDF library does not work below this one.
+  $required_version = '5.4.0';    // Week view (week.php) requires 5.4 because of []-way of referencing arrays.
+                                  // This needs further investigation as we use [] elsewhere without obvious problems.
   if (version_compare(phpversion(), $required_version, '>=')) {
     echo('PHP version: '.phpversion().', good enough.<br>');
   } else {
@@ -172,7 +174,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");
@@ -547,7 +549,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");
@@ -598,25 +600,14 @@ if ($_POST) {
     setChange("ALTER TABLE tt_invoices DROP end_date");
   }
 
-  if ($_POST["convert1600to1900"]) {
+  if ($_POST["convert1600to11300"]) {
     setChange("DROP TABLE IF EXISTS tt_invoice_headers");
     setChange("ALTER TABLE tt_fav_reports ADD COLUMN `client_id` int(11) default NULL");
     setChange("ALTER TABLE tt_fav_reports ADD COLUMN `cf_1_option_id` int(11) 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, 
-    
-   /* 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 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 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)");
@@ -644,6 +635,16 @@ if ($_POST) {
     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("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`))");
+    setChange("ALTER TABLE `tt_teams` ADD `task_required` smallint(2) NOT NULL DEFAULT '0' AFTER `tracking_mode`");
+    setChange("ALTER TABLE `tt_teams` ADD `project_required` smallint(2) NOT NULL DEFAULT '0' AFTER `tracking_mode`");
+    setChange("ALTER TABLE `tt_cron` ADD `report_condition` varchar(255) default NULL AFTER `email`");
+    setChange("ALTER TABLE `tt_fav_reports` ADD `status` tinyint(4) default '1'");
+    setChange("ALTER TABLE `tt_teams` ADD `bcc_email` varchar(100) default NULL AFTER `uncompleted_indicators`");
+    setChange("ALTER TABLE `tt_cron` ADD `cc` varchar(100) default NULL AFTER `email`");
+    setChange("ALTER TABLE `tt_cron` ADD `subject` varchar(100) default NULL AFTER `cc`");
   }
   
   // The update_clients function updates projects field in tt_clients table.
@@ -749,7 +750,7 @@ if ($_POST) {
 <h2>DB Install</h2>
 <table width="80%" border="1" cellpadding="10" cellspacing="0">
   <tr>
-    <td width="80%"><b>Create database structure (v1.9.30)</b>
+    <td width="80%"><b>Create database structure (v1.13.0)</b>
     <br>(applies only to new installations, do not execute when updating)</br></td><td><input type="submit" name="crstructure" value="Create"></td>
   </tr>
 </table>
@@ -781,8 +782,8 @@ if ($_POST) {
     <td><input type="submit" name="convert1579to1600" value="Update"><br><input type="submit" name="update_clients" value="Update clients"><br><input type="submit" name="update_custom_fields" value="Update custom fields"><br><input type="submit" name="update_tracking_mode" value="Update tracking mode"></td>
   </tr>
   <tr valign="top">
-    <td>Update database structure (v1.6 to v1.9)</td>
-    <td><input type="submit" name="convert1600to1900" value="Update"><br></td>
+    <td>Update database structure (v1.6 to v1.13)</td>
+    <td><input type="submit" name="convert1600to11300" value="Update"><br></td>
   </tr>
 </table>