X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/timetracker.git/blobdiff_plain/dd30f46db3b91a8540b92f905930d8c38ea4c2b9..d8d15e03655dcacf8365baf6d2b36d80dad84890:/dbinstall.php

diff --git a/dbinstall.php b/dbinstall.php
old mode 100755
new mode 100644
index 49c9747e..1648a827
--- a/dbinstall.php
+++ b/dbinstall.php
@@ -31,7 +31,10 @@ require_once('WEB-INF/lib/common.lib.php');
 require_once('initialize.php');
 import('ttUserHelper');
 import('ttTaskHelper');
+import('ttUser');
 
+// setChange - executes an sql statement. TODO: rename this function to something better.
+// Better yet, redo the entire thing and make an installer.
 function setChange($sql) {
   print "<pre>".$sql."</pre>";
   $mdb2 = getConnection();
@@ -42,6 +45,7 @@ function setChange($sql) {
     print "successful update<br>\n";
 }
 
+
 if ($request->isGet()) {
   echo('<h2>Environment Checks</h2>');
 
@@ -61,7 +65,7 @@ if ($request->isGet()) {
     // 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) {
+    if (strcmp("<?php\n", $line) !== 0 && strcmp("<?php\r\n", $line) !== 0) {
       echo('<font color="red">Error: WEB-INF/config.php file does not start with PHP opening tag.</font><br>');
     }
     fclose($file);
@@ -152,6 +156,16 @@ if ($request->isGet()) {
   } else {
     echo('<font color="red">There are no tables in database. Execute step 1 - Create database structure.</font><br>');
   }
+
+  $sql = "select param_value from tt_site_config where param_name = 'version_db'";
+  $res = $conn->query($sql);
+  if (is_a($res, 'MDB2_Error')) {
+    echo('<font color="red">Error: database schema version query failed. '.$res->getMessage().'</font><br>');
+  } else {
+    $val = $res->fetchRow();
+    echo('Database version is: '.$val['param_value'].'.');
+  }
+
   $conn->disconnect();
 }
 
@@ -600,6 +614,67 @@ if ($_POST) {
     setChange("ALTER TABLE tt_invoices DROP end_date");
   }
 
+  // The update_clients function updates projects field in tt_clients table.
+  if ($_POST["update_clients"]) {
+    $mdb2 = getConnection();
+    $sql = "select id from tt_clients where status = 1 or status = 0";
+    $res = $mdb2->query($sql);
+    if (is_a($res, 'PEAR_Error')) {
+      die($res->getMessage());
+    }
+
+    $clients_updated = 0;
+    // Iterate through clients.
+    while ($val = $res->fetchRow()) {
+      $client_id = $val['id'];
+
+      // Get projects binds for client.
+      $sql = "select cpb.project_id from tt_client_project_binds cpb
+        left join tt_projects p on (p.id = cpb.project_id)
+        where cpb.client_id = $client_id order by p.name";
+
+      $result = $mdb2->query($sql);
+      if (is_a($result, 'PEAR_Error'))
+        die($result->getMessage());
+
+      $project_arr = array();
+      while ($value = $result->fetchRow()) {
+        $project_arr[] = $value['project_id'];	
+      }
+      $comma_separated = implode(',', $project_arr); // This is a comma-separated list of associated project ids.
+
+      // Update the projects field.
+      $sql = "update tt_clients set projects = ".$mdb2->quote($comma_separated)." where id = $client_id";
+      $affected = $mdb2->exec($sql);
+      if (is_a($affected, 'PEAR_Error'))
+        die($affected->getMessage());
+      $clients_updated += $affected;
+    }
+    print "Updated $clients_updated clients...<br>\n";
+  }
+
+  // The update_custom_fields function updates option_id field field in tt_custom_field_log table.
+  if ($_POST['update_custom_fields']) {
+    $mdb2 = getConnection();
+    $sql = "update tt_custom_field_log set option_id = value where field_id in (select id from tt_custom_fields where type = 2)";
+    $affected = $mdb2->exec($sql);
+    if (is_a($affected, 'PEAR_Error'))
+      die($affected->getMessage());
+
+    print "Updated $affected custom fields...<br>\n";
+  }
+
+  // The update_tracking_mode function sets the tracking_mode field in tt_teams table to 2 (== MODE_PROJECTS_AND_TASKS).
+  if ($_POST['update_tracking_mode']) {
+    $mdb2 = getConnection();
+    $sql = "update tt_teams set tracking_mode = 2 where tracking_mode = 0";
+    $affected = $mdb2->exec($sql);
+    if (is_a($affected, 'PEAR_Error'))
+      die($affected->getMessage());
+
+    print "Updated $affected teams...<br>\n";
+  }
+
   if ($_POST["convert1600to11400"]) {
     setChange("DROP TABLE IF EXISTS tt_invoice_headers");
     setChange("ALTER TABLE tt_fav_reports ADD COLUMN `client_id` int(11) default NULL");
@@ -647,66 +722,93 @@ if ($_POST) {
     setChange("ALTER TABLE `tt_cron` ADD `subject` varchar(100) default NULL AFTER `cc`");
     setChange("ALTER TABLE `tt_log` ADD `paid` tinyint(4) NULL default '0' AFTER `billable`");
   }
-  
-  // The update_clients function updates projects field in tt_clients table.
-  if ($_POST["update_clients"]) {
+
+  if ($_POST["convert11400to11744"]) {
+    setChange("ALTER TABLE `tt_teams` DROP `address`");
+    setChange("ALTER TABLE `tt_fav_reports` ADD `report_spec` text default NULL AFTER `user_id`");
+    setChange("ALTER TABLE `tt_fav_reports` ADD `paid_status` tinyint(4) default NULL AFTER `invoice`");
+    setChange("ALTER TABLE `tt_fav_reports` ADD `show_paid` tinyint(4) NOT NULL DEFAULT '0' AFTER `show_invoice`");
+    setChange("ALTER TABLE `tt_expense_items` ADD `paid` tinyint(4) NULL default '0' AFTER `invoice_id`");
+    setChange("ALTER TABLE `tt_monthly_quotas` MODIFY `quota` decimal(5,2) NOT NULL");
+    setChange("ALTER TABLE `tt_teams` MODIFY `workday_hours` decimal(5,2) DEFAULT '8.00'");
+    setChange("ALTER TABLE `tt_teams` ADD `config` text default NULL AFTER `custom_logo`");
+    setChange("ALTER TABLE `tt_monthly_quotas` ADD `minutes` int(11) DEFAULT NULL");
+    setChange("ALTER TABLE `tt_teams` ADD `workday_minutes` smallint(4) DEFAULT '480' AFTER `workday_hours`");
+    setChange("UPDATE `tt_teams` SET `workday_minutes` = 60 * `workday_hours`");
+    setChange("ALTER TABLE `tt_teams` DROP `workday_hours`");
+    setChange("UPDATE `tt_monthly_quotas` SET `minutes` = 60 * `quota`");
+    setChange("ALTER TABLE `tt_monthly_quotas` DROP `quota`");
+    setChange("ALTER TABLE `tt_teams` DROP `uncompleted_indicators`");
+    setChange("ALTER TABLE `tt_users` MODIFY `timestamp` timestamp default CURRENT_TIMESTAMP");
+    setChange("ALTER TABLE `tt_teams` MODIFY `timestamp` timestamp default CURRENT_TIMESTAMP");
+    setChange("ALTER TABLE `tt_log` MODIFY `timestamp` timestamp default CURRENT_TIMESTAMP");
+    setChange("ALTER TABLE `tt_tmp_refs` MODIFY `timestamp` timestamp default CURRENT_TIMESTAMP");
+    setChange("CREATE TABLE `tt_roles` (`id` int(11) NOT NULL auto_increment, `team_id` int(11) NOT NULL, `name` varchar(80) default NULL, `rank` int(11) default 0, `rights` text default NULL, `status` tinyint(4) default 1, PRIMARY KEY (`id`))");
+    setChange("create unique index role_idx on tt_roles(team_id, rank, status)");
+    setChange("ALTER TABLE `tt_roles` ADD `description` varchar(255) default NULL AFTER `name`");
+    setChange("ALTER TABLE `tt_users` ADD `role_id` int(11) default NULL AFTER `role`");
+    setChange("CREATE TABLE `tt_site_config` (`param_name` varchar(32) NOT NULL, `param_value` text default NULL, `created` datetime default NULL, `updated` datetime default NULL, PRIMARY KEY (`param_name`))");
+    setChange("INSERT INTO `tt_site_config` (`param_name`, `param_value`, `created`) VALUES ('version_db', '1.17.34', now())");
+    setChange("INSERT INTO `tt_roles` (`team_id`, `name`, `rank`, `rights`) VALUES (0, 'Site administrator', 1024, 'administer_site')");
+    setChange("INSERT INTO `tt_roles` (`team_id`, `name`, `rank`, `rights`) VALUES (0, 'Top manager', 512, 'data_entry,view_own_data,manage_own_settings,view_users,on_behalf_data_entry,view_data,override_punch_mode,swap_roles,approve_timesheets,manage_users,manage_projects,manage_tasks,manage_custom_fields,manage_clients,manage_invoices,manage_features,manage_basic_settings,manage_advanced_settings,manage_roles,export_data,manage_subgroups')");
+    setChange("UPDATE `tt_site_config` SET `param_value` = '1.17.35' where param_name = 'version_db'");
+    setChange("update `tt_users` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.17.35') set role_id = (select id from tt_roles where rank = 1024) where role = 1024");
+    setChange("update `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.17.35') set rights = 'data_entry,view_own_reports,view_own_charts,view_own_invoices,manage_own_settings,view_users,on_behalf_data_entry,view_reports,view_charts,override_punch_mode,swap_roles,approve_timesheets,manage_users,manage_projects,manage_tasks,manage_custom_fields,manage_clients,manage_invoices,manage_features,manage_basic_settings,manage_advanced_settings,manage_roles,export_data,manage_subgroups' where team_id = 0 and rank = 512");
+    setChange("update `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.17.35') set rights = replace(rights, 'view_own_data', 'view_own_reports,view_own_charts') where team_id > 0");
+    setChange("update `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.17.35') set rights = replace(rights, 'view_data', 'view_reports,view_charts') where team_id > 0");
+    setChange("update `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.17.35') set rights = replace(rights, 'view_own_charts,manage_own_settings', 'view_own_charts,view_own_invoices,manage_own_settings') where team_id > 0 and rank = 16");
+    setChange("UPDATE `tt_site_config` SET `param_value` = '1.17.40' where param_name = 'version_db'");
+    setChange("update `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.17.40') set rights = replace(rights, 'on_behalf_data_entry', 'track_time,track_expenses')");
+    setChange("update `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.17.40') set rights = replace(rights, 'data_entry', 'track_own_time,track_own_expenses')");
+    setChange("UPDATE `tt_site_config` SET `param_value` = '1.17.43' where param_name = 'version_db'");
+    setChange("update `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.17.43') set rights = replace(rights, 'override_punch_mode,swap_roles', 'override_punch_mode,override_date_lock,swap_roles')");
+    setChange("UPDATE `tt_site_config` SET `param_value` = '1.17.44' where param_name = 'version_db'");
+  }
+
+  // The update_role_id function assigns a role_id to users, who don't have it.
+  if ($_POST['update_role_id']) {
+    import('I18n');
+
     $mdb2 = getConnection();
-    $sql = "select id from tt_clients where status = 1 or status = 0";
+
+    $sql = "select u.id, u.status from tt_users u inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.17.44') where u.role_id is NULL and u.status is NOT NULL";
     $res = $mdb2->query($sql);
     if (is_a($res, 'PEAR_Error')) {
       die($res->getMessage());
     }
 
-    $clients_updated = 0;
-    // Iterate through clients.
+    $users_updated = 0;
+    // Iterate through users.
     while ($val = $res->fetchRow()) {
-      $client_id = $val['id'];
 
-      // Get projects binds for client.
-      $sql = "select cpb.project_id from tt_client_project_binds cpb
-        left join tt_projects p on (p.id = cpb.project_id)
-        where cpb.client_id = $client_id order by p.name";
+      $user_id = $val['id'];
 
-      $result = $mdb2->query($sql);
-      if (is_a($result, 'PEAR_Error'))
-        die($result->getMessage());
-
-      $project_arr = array();
-      while ($value = $result->fetchRow()) {
-        $project_arr[] = $value['project_id'];	
+      // Code only works on active users. Temporarily activate a user.
+      $deactivate = false;
+      if ($val['status'] == 0) {
+        $deactivate = true; // To deactivate later.
+        $sql = "update tt_users set status = 1 where id = $user_id";
+        $mdb2->exec($sql);
       }
-      $comma_separated = implode(',', $project_arr); // This is a comma-separated list of associated project ids.
 
-      // Update the projects field.
-      $sql = "update tt_clients set projects = ".$mdb2->quote($comma_separated)." where id = $client_id";
-      $affected = $mdb2->exec($sql);
-      if (is_a($affected, 'PEAR_Error'))
-        die($affected->getMessage());
-      $clients_updated += $affected;
-    }
-    print "Updated $clients_updated clients...<br>\n";
-  }
-
-  // The update_custom_fields function updates option_id field field in tt_custom_field_log table.
-  if ($_POST['update_custom_fields']) {
-    $mdb2 = getConnection();
-    $sql = "update tt_custom_field_log set option_id = value where field_id in (select id from tt_custom_fields where type = 2)";
-    $affected = $mdb2->exec($sql);
-    if (is_a($affected, 'PEAR_Error'))
-      die($affected->getMessage());
+      $user = new ttUser(null, $user_id);
+      $i18n = new I18n();
+      $i18n->load($val['lang']);
+      if ($user->login)
+        $user->migrateLegacyRole();
 
-    print "Updated $affected custom fields...<br>\n";
-  }
-
-  // The update_tracking_mode function sets the tracking_mode field in tt_teams table to 2 (== MODE_PROJECTS_AND_TASKS).
-  if ($_POST['update_tracking_mode']) {
-    $mdb2 = getConnection();
-    $sql = "update tt_teams set tracking_mode = 2 where tracking_mode = 0";
-    $affected = $mdb2->exec($sql);
-    if (is_a($affected, 'PEAR_Error'))
-      die($affected->getMessage());
+      if ($deactivate) {
+        // Deactivate temporarily activated user back.
+        $sql = "update tt_users set status = 0 where id = $user_id";
+        $mdb2->exec($sql);
+      }
 
-    print "Updated $affected teams...<br>\n";
+      unset($user);
+      unset($i18n);
+      $users_updated++;
+      // if ($users_updated >= 1000) break; // TODO: uncomment for large user sets to run multiple times.
+    }
+    print "Updated $users_updated users...<br>\n";
   }
 
   if ($_POST["cleanup"]) {
@@ -739,6 +841,7 @@ if ($_POST) {
     setChange("OPTIMIZE TABLE tt_tmp_refs");
     setChange("OPTIMIZE TABLE tt_user_project_binds");
     setChange("OPTIMIZE TABLE tt_users");
+    setChange("OPTIMIZE TABLE tt_roles");
   }
 
   print "done.<br>\n";
@@ -751,7 +854,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.14.0)</b>
+    <td width="80%"><b>Create database structure (v1.17.44)</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>
@@ -786,6 +889,10 @@ if ($_POST) {
     <td>Update database structure (v1.6 to v1.14)</td>
     <td><input type="submit" name="convert1600to11400" value="Update"><br></td>
   </tr>
+  <tr valign="top">
+    <td>Update database structure (v1.14 to v1.17.44)</td>
+    <td><input type="submit" name="convert11400to11744" value="Update"><br><input type="submit" name="update_role_id" value="Update role_id"></td>
+  </tr>
 </table>
 
 <h2>DB Maintenance</h2>