X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=dbinstall.php;h=3db74cc54aab811ba2b6b5cd5526a28e44a42579;hb=ae00c14ac2999773e17a761542932cb95420430a;hp=48bfa743d8762204de0bf27c34177a691d56b0f7;hpb=c67091565ab5dcd136184e44cc87943039c24150;p=timetracker.git

diff --git a/dbinstall.php b/dbinstall.php
index 48bfa743..3db74cc5 100644
--- a/dbinstall.php
+++ b/dbinstall.php
@@ -32,6 +32,8 @@ require_once('initialize.php');
 import('ttUserHelper');
 import('ttTaskHelper');
 
+// 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();
@@ -43,9 +45,133 @@ function setChange($sql) {
 }
 
 
+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/')) {
+    echo('WEB-INF/templates_c/ directory is writable.<br>');
+  } else {
+    echo('<font color="red">Error: WEB-INF/templates_c/ directory is not writable.</font><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\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);
+  } else {
+    echo('<font color="red">Error: WEB-INF/config.php file does not exist.</font><br>');
+  }
+
+  // Check whether DSN is defined.
+  if (defined('DSN')) {
+    // echo('DSN is defined as '.DSN.'<br>');
+    echo('DSN is defined.<br>');
+  } else {
+    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.
+  $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 {
+    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')) {
+      echo('mysqli PHP extension is loaded.<br>');
+    } else {
+      echo('<font color="red">Error: mysqli PHP extension is required but is not loaded.</font><br>');
+    }
+  }
+  if (strrpos(DSN, 'mysql://', -strlen(DSN)) !== FALSE) {
+    if (extension_loaded('mysql')) {
+      echo('mysql PHP extension is loaded.<br>');
+    } else {
+      echo('<font color="red">Error: mysql PHP extension is required but is not loaded.</font><br>');
+    }
+  }
+
+  // Check mbstring extension.
+  if (extension_loaded('mbstring')) {
+    echo('mbstring PHP extension is loaded.<br>');
+  } else {
+    echo('<font color="red">Error: mbstring PHP extension is not loaded.</font><br>');
+  }
+
+  // Check gd extension.
+  if (extension_loaded('gd')) {
+    echo('gd PHP extension is loaded.<br>');
+  } else {
+    echo('<font color="red">Error: gd PHP extension is not loaded. It is required for charts plugin.</font><br>');
+  }
+
+  // Check ldap extension.
+  if (AUTH_MODULE == 'ldap') {
+    if (extension_loaded('ldap_')) {
+      echo('ldap PHP extension is loaded.<br>');
+    } else {
+      echo('<font color="red">Error: ldap PHP extension is not loaded. It is required for LDAP authentication.</font><br>');
+    }
+  }
+
+  // Check database access.
+  require_once('MDB2.php');
+  $conn = MDB2::connect(DSN);
+  if (!is_a($conn, 'MDB2_Error')) {
+    echo('Connection to database successful.<br>');
+  } else {
+    die('<font color="red">Error: connection to database failed. '.$conn->getMessage().'</font><br>');
+  }
+
+  $conn->setOption('debug', true);
+  $conn->setFetchMode(MDB2_FETCHMODE_ASSOC);
+
+  $sql = "show tables";
+  $res = $conn->query($sql);
+  if (is_a($res, 'MDB2_Error')) {
+    die('<font color="red">Error: show tables returned an error. '.$res->getMessage().'</font><br>');
+  }
+  $tblCnt = 0;
+  while ($val = $res->fetchRow()) {
+    $tblCnt++;
+  }
+  if ($tblCnt > 0) {
+    echo("There are $tblCnt tables in database.<br>");
+  } 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();
+}
+
+
 if ($_POST) {
   print "Processing...<br>\n";
-  
+
   if ($_POST["crstructure"]) {
     $sqlQuery = join("\n", file("mysql.sql"));
     $sqlQuery = str_replace("TYPE=MyISAM","",$sqlQuery);
@@ -59,9 +185,9 @@ 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");
@@ -99,40 +225,39 @@ if ($_POST) {
     }
     // Iterate through projects.
     while ($val = $res->fetchRow()) {
-    	$project_id = $val['p_id'];
-    	
-        // Get activity binds for project (old way).
-        // $sql = "select ab_id_a from activity_bind where ab_id_p = $project_id";
-        $sql = "select ab_id_a, a_id, a_name from activity_bind
-          inner join activities on (ab_id_a = a_id)
-          where ab_id_p = $project_id
-          order by a_name";
-        
-        $result = $mdb2->query($sql);
-        if (is_a($result, 'PEAR_Error')) {
-          die($result->getMessage());
-        }
-        $activity_arr = array();
-        while ($value = $result->fetchRow()) {
-          $activity_arr[] = $value['ab_id_a'];	
-        }
-        $a_comma_separated = implode(",", $activity_arr); // This is a comma-separated list of associated activity ids.
-             
-        // Re-bind the project to activities (new way).
-        $sql = "update projects set p_activities = ".$mdb2->quote($a_comma_separated)." where p_id = $project_id";
-        $affected = $mdb2->exec($sql);
-        if (is_a($affected, 'PEAR_Error')) {
-          die($affected->getMessage());
-        }
+      $project_id = $val['p_id'];
+
+      // Get activity binds for project (old way).
+      // $sql = "select ab_id_a from activity_bind where ab_id_p = $project_id";
+      $sql = "select ab_id_a, a_id, a_name from activity_bind
+        inner join activities on (ab_id_a = a_id)
+        where ab_id_p = $project_id order by a_name";
+
+      $result = $mdb2->query($sql);
+      if (is_a($result, 'PEAR_Error')) {
+        die($result->getMessage());
+      }
+      $activity_arr = array();
+      while ($value = $result->fetchRow()) {
+        $activity_arr[] = $value['ab_id_a'];
+      }
+      $a_comma_separated = implode(",", $activity_arr); // This is a comma-separated list of associated activity ids.
+
+      // Re-bind the project to activities (new way).
+      $sql = "update projects set p_activities = ".$mdb2->quote($a_comma_separated)." where p_id = $project_id";
+      $affected = $mdb2->exec($sql);
+      if (is_a($affected, 'PEAR_Error')) {
+        die($affected->getMessage());
+      }
     }
   }
-  
+
   if ($_POST["convert133to1340"]) {
     setChange("ALTER TABLE companies ADD COLUMN c_show_pie smallint(2) DEFAULT 1");
     setChange("ALTER TABLE companies ADD COLUMN c_pie_mode smallint(2) DEFAULT 1");
     setChange("ALTER TABLE companies ADD COLUMN c_lang varchar(20) default NULL");
   }
-  
+
   // The update_companies function sets up c_show_pie, c_pie_mode, and c_lang
   // fields in the companies table from the corresponding manager fields. 
   if ($_POST["update_companies"]) {
@@ -150,22 +275,22 @@ if ($_POST) {
       $show_pie = $val['u_show_pie'];
       $pie_mode = $val['u_pie_mode'];
       $lang = $val['u_lang'];
-      
+
       $sql = "update companies set
         c_show_pie = $show_pie, c_pie_mode = $pie_mode, c_lang = ".$mdb2->quote($lang).
         " where c_id = $company_id";
-      
+
       $result = $mdb2->query($sql);
       if (is_a($result, 'PEAR_Error')) {
         die($result->getMessage());
       }
     }
   }
-    
+
   if ($_POST["convert1340to1485"]) {
     setChange("ALTER TABLE users DROP u_show_pie");
     setChange("ALTER TABLE users DROP u_pie_mode");
-    setChange("ALTER TABLE users DROP u_lang");  
+    setChange("ALTER TABLE users DROP u_lang");
     setChange("ALTER TABLE `users` modify u_login varchar(100) NOT NULL");
     setChange("ALTER TABLE `users` modify u_active smallint(6) default '1'");
     setChange("drop index u_login_idx on users");
@@ -188,7 +313,7 @@ if ($_POST) {
     setChange("RENAME TABLE teams TO att_teams");
     setChange("ALTER TABLE att_teams CHANGE c_id id int(11) NOT NULL auto_increment");
     setChange("RENAME TABLE users TO att_users");
-    setChange("update att_users set u_company_id = 0 where u_company_id is NULL");    
+    setChange("update att_users set u_company_id = 0 where u_company_id is NULL");
     setChange("ALTER TABLE att_users CHANGE u_company_id team_id int(11) NOT NULL");
     setChange("RENAME TABLE att_teams TO tt_teams");
     setChange("RENAME TABLE att_users TO tt_users");
@@ -247,7 +372,7 @@ if ($_POST) {
     setChange("ALTER TABLE tt_users CHANGE u_id id int(11) NOT NULL auto_increment");
     setChange("ALTER TABLE tt_users CHANGE u_timestamp timestamp timestamp NOT NULL");
     setChange("ALTER TABLE tt_users CHANGE u_login login varchar(50) NOT NULL");
-    setChange("drop index u_login_idx on tt_users");  
+    setChange("drop index u_login_idx on tt_users");
     setChange("create unique index login_idx on tt_users(login, u_active)");
     setChange("ALTER TABLE tt_users CHANGE u_password password varchar(50) default NULL");
     setChange("ALTER TABLE tt_users CHANGE u_name name varchar(100) default NULL");
@@ -263,14 +388,14 @@ if ($_POST) {
     setChange("ALTER TABLE user_bind CHANGE ub_checked status tinyint(4) default '1'");
     setChange("ALTER TABLE activities ADD COLUMN team_id int(11) NOT NULL");
     setChange("ALTER TABLE clients ADD COLUMN team_id int(11) NOT NULL");
-    setChange("ALTER TABLE projects ADD COLUMN team_id int(11) NOT NULL");			
+    setChange("ALTER TABLE projects ADD COLUMN team_id int(11) NOT NULL");
   }
-  
+
   // The update_to_team_id function sets team_id field projects, activities, and clients tables.
   if ($_POST["update_to_team_id"]) {
     $mdb2 = getConnection();
-    
-    // Update projects.   
+
+    // Update projects.
     $sql = "select p_id, p_manager_id from projects where team_id = 0 limit 1000";
     $res = $mdb2->query($sql);
     if (is_a($res, 'PEAR_Error')) {
@@ -281,7 +406,7 @@ if ($_POST) {
     while ($val = $res->fetchRow()) {
       $project_id = $val['p_id'];
       $manager_id = $val['p_manager_id'];
-      
+
       $sql = "select team_id from tt_users where id = $manager_id";
       $res2 = $mdb2->query($sql);
       if (is_a($res2, 'PEAR_Error')) {
@@ -289,7 +414,7 @@ if ($_POST) {
       }
       $val2 = $res2->fetchRow();
       $team_id = $val2['team_id'];
-      
+
       if ($team_id) {
         $sql = "update projects set team_id = $team_id where p_id = $project_id";
         $affected = $mdb2->exec($sql);
@@ -300,8 +425,8 @@ if ($_POST) {
       }
     }
     print "Updated $projects_updated projects...<br>\n";
-    
-    // Update tasks.   
+
+    // Update tasks.
     $sql = "select a_id, a_manager_id from activities where team_id = 0 limit 1000";
     $res = $mdb2->query($sql);
     if (is_a($res, 'PEAR_Error')) {
@@ -312,7 +437,7 @@ if ($_POST) {
     while ($val = $res->fetchRow()) {
       $task_id = $val['a_id'];
       $manager_id = $val['a_manager_id'];
-      
+
       $sql = "select team_id from tt_users where id = $manager_id";
       $res2 = $mdb2->query($sql);
       if (is_a($res2, 'PEAR_Error')) {
@@ -320,19 +445,19 @@ if ($_POST) {
       }
       $val2 = $res2->fetchRow();
       $team_id = $val2['team_id'];
-      
+
       if ($team_id) {
         $sql = "update activities set team_id = $team_id where a_id = $task_id";
         $affected = $mdb2->exec($sql);
         if (is_a($affected, 'PEAR_Error')) {
           die($affected->getMessage());
         }
-        $tasks_updated += $affected;	
+        $tasks_updated += $affected;
       }
     }
     print "Updated $tasks_updated tasks...<br>\n";
-    
-    // Update clients.   
+
+    // Update clients.
     $sql = "select clnt_id, clnt_id_um from clients where team_id = 0 limit 1000";
     $res = $mdb2->query($sql);
     if (is_a($res, 'PEAR_Error')) {
@@ -343,7 +468,7 @@ if ($_POST) {
     while ($val = $res->fetchRow()) {
       $client_id = $val['clnt_id'];
       $manager_id = $val['clnt_id_um'];
-      
+
       $sql = "select team_id from tt_users where id = $manager_id";
       $res2 = $mdb2->query($sql);
       if (is_a($res2, 'PEAR_Error')) {
@@ -351,28 +476,28 @@ if ($_POST) {
       }
       $val2 = $res2->fetchRow();
       $team_id = $val2['team_id'];
-      
+
       if ($team_id) {
         $sql = "update clients set team_id = $team_id where clnt_id = $client_id";
         $affected = $mdb2->exec($sql);
         if (is_a($affected, 'PEAR_Error')) {
           die($affected->getMessage());
         }
-        $clients_updated += $affected;	
+        $clients_updated += $affected;
       }
     }
     print "Updated $clients_updated clients...<br>\n";
   }
-    
+
   if ($_POST["convert1485to1579"]) {
     setChange("ALTER TABLE tt_fav_reports MODIFY id int(11) NOT NULL auto_increment");
     setChange("RENAME TABLE clients TO tt_clients");
     setChange("ALTER TABLE tt_clients CHANGE clnt_id id int(11) NOT NULL AUTO_INCREMENT");
     setChange("ALTER TABLE tt_clients CHANGE clnt_status status tinyint(4) default '1'");
-    setChange("ALTER TABLE tt_clients DROP clnt_id_um");  	
+    setChange("ALTER TABLE tt_clients DROP clnt_id_um");
     setChange("ALTER TABLE tt_clients CHANGE clnt_name name varchar(80) NOT NULL");
     setChange("drop index clnt_name_idx on tt_clients");
-    setChange("drop index client_name_idx on tt_clients");   
+    setChange("drop index client_name_idx on tt_clients");
     setChange("create unique index client_name_idx on tt_clients(team_id, name, status)");
     setChange("ALTER TABLE tt_teams ADD COLUMN `timestamp` timestamp NOT NULL");
     setChange("ALTER TABLE tt_clients CHANGE clnt_addr_cust address varchar(255) default NULL");
@@ -437,7 +562,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");
@@ -459,7 +584,7 @@ if ($_POST) {
     setChange("ALTER TABLE tt_invoices drop client_name");
     setChange("ALTER TABLE tt_invoices drop client_addr");
     setChange("ALTER TABLE tt_invoices drop comment");
-    setChange("ALTER TABLE tt_invoices drop tax");    
+    setChange("ALTER TABLE tt_invoices drop tax");
     setChange("ALTER TABLE tt_invoices ADD COLUMN name varchar(80) NOT NULL");
     setChange("ALTER TABLE tt_invoices ADD COLUMN client_id int(11) NOT NULL");
     setChange("ALTER TABLE tt_invoices ADD COLUMN start_date date NOT NULL");
@@ -470,7 +595,7 @@ if ($_POST) {
     setChange("create index client_idx on tt_log(client_id)");
     setChange("create index invoice_idx on tt_log(invoice_id)");
   }
-  
+
   if ($_POST["convert1579to1600"]) {
     setChange("ALTER TABLE tt_invoices ADD COLUMN date date NOT NULL");
     setChange("ALTER TABLE tt_teams ADD COLUMN custom_logo tinyint(4) default '0'");
@@ -487,38 +612,7 @@ if ($_POST) {
     setChange("ALTER TABLE tt_invoices DROP start_date");
     setChange("ALTER TABLE tt_invoices DROP end_date");
   }
-  
-  if ($_POST["convert1600to1900"]) {
-    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, `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)");
-    setChange("create index project_idx on tt_expense_items(project_id)");
-    setChange("create index invoice_idx on tt_expense_items(invoice_id)");
-    setChange("ALTER TABLE tt_fav_reports DROP sort_by");
-    setChange("ALTER TABLE tt_fav_reports DROP show_empty_days");
-    setChange("ALTER TABLE tt_invoices DROP discount");
-    setChange("ALTER TABLE tt_users ADD COLUMN `client_id` int(11) default NULL");
-    setChange("ALTER TABLE tt_teams ADD COLUMN `decimal_mark` char(1) NOT NULL default '.'");
-    setChange("ALTER TABLE tt_fav_reports ADD COLUMN `invoice` tinyint(4) default NULL");
-    setChange("CREATE TABLE `tt_cron` (`id` int(11) NOT NULL auto_increment, `cron_spec` varchar(255) NOT NULL, `last` int(11) default NULL, `next` int(11) default NULL, `report_id` int(11) default NULL, `email` varchar(100) default NULL, `status` tinyint(4) default '1', PRIMARY KEY (`id`))");
-    setChange("ALTER TABLE tt_cron ADD COLUMN `team_id` int(11) NOT NULL");
-    setChange("create index client_idx on tt_client_project_binds(client_id)");
-    setChange("create index project_idx on tt_client_project_binds(project_id)");
-    setChange("ALTER TABLE tt_log ADD COLUMN status tinyint(4) default '1'");
-    setChange("ALTER TABLE tt_custom_field_log ADD COLUMN status tinyint(4) default '1'");
-    setChange("ALTER TABLE tt_expense_items ADD COLUMN status tinyint(4) default '1'");
-    setChange("ALTER TABLE tt_invoices ADD COLUMN status tinyint(4) default '1'");
-    setChange("DROP INDEX name_idx on tt_invoices");
-    setChange("create unique index name_idx on tt_invoices(team_id, name, status)");
-  } 	
-   
+
   // The update_clients function updates projects field in tt_clients table.
   if ($_POST["update_clients"]) {
     $mdb2 = getConnection();
@@ -527,37 +621,37 @@ if ($_POST) {
     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;	
+      $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();
@@ -565,7 +659,7 @@ if ($_POST) {
     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error'))
       die($affected->getMessage());
-    
+
     print "Updated $affected custom fields...<br>\n";
   }
 
@@ -576,19 +670,107 @@ if ($_POST) {
     $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");
+    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, `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)");
+    setChange("create index project_idx on tt_expense_items(project_id)");
+    setChange("create index invoice_idx on tt_expense_items(invoice_id)");
+    setChange("ALTER TABLE tt_fav_reports DROP sort_by");
+    setChange("ALTER TABLE tt_fav_reports DROP show_empty_days");
+    setChange("ALTER TABLE tt_invoices DROP discount");
+    setChange("ALTER TABLE tt_users ADD COLUMN `client_id` int(11) default NULL");
+    setChange("ALTER TABLE tt_teams ADD COLUMN `decimal_mark` char(1) NOT NULL default '.'");
+    setChange("ALTER TABLE tt_fav_reports ADD COLUMN `invoice` tinyint(4) default NULL");
+    setChange("CREATE TABLE `tt_cron` (`id` int(11) NOT NULL auto_increment, `cron_spec` varchar(255) NOT NULL, `last` int(11) default NULL, `next` int(11) default NULL, `report_id` int(11) default NULL, `email` varchar(100) default NULL, `status` tinyint(4) default '1', PRIMARY KEY (`id`))");
+    setChange("ALTER TABLE tt_cron ADD COLUMN `team_id` int(11) NOT NULL");
+    setChange("create index client_idx on tt_client_project_binds(client_id)");
+    setChange("create index project_idx on tt_client_project_binds(project_id)");
+    setChange("ALTER TABLE tt_log ADD COLUMN status tinyint(4) default '1'");
+    setChange("ALTER TABLE tt_custom_field_log ADD COLUMN status tinyint(4) default '1'");
+    setChange("ALTER TABLE tt_expense_items ADD COLUMN status tinyint(4) default '1'");
+    setChange("ALTER TABLE tt_invoices ADD COLUMN status tinyint(4) default '1'");
+    setChange("DROP INDEX name_idx on tt_invoices");
+    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");
+    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("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`");
+    setChange("ALTER TABLE `tt_log` ADD `paid` tinyint(4) NULL default '0' AFTER `billable`");
+  }
+
+  if ($_POST["convert11400to11743"]) {
+    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'");
+  }
+
   if ($_POST["cleanup"]) {
-     
+
     $mdb2 = getConnection();
     $inactive_teams = ttTeamHelper::getInactiveTeams();
-    
+
     $count = count($inactive_teams);
     print "$count inactive teams found...<br>\n";
     for ($i = 0; $i < $count; $i++) {
-      print "  deleting team ".$inactive_teams[$i]."<br>\n";    	
+      print "  deleting team ".$inactive_teams[$i]."<br>\n";
       $res = ttTeamHelper::delete($inactive_teams[$i]);
     }
 
@@ -596,21 +778,23 @@ if ($_POST) {
     setChange("OPTIMIZE TABLE tt_clients");
     setChange("OPTIMIZE TABLE tt_config");
     setChange("OPTIMIZE TABLE tt_custom_field_log");
-    setChange("OPTIMIZE TABLE tt_custom_field_options");   
+    setChange("OPTIMIZE TABLE tt_custom_field_options");
     setChange("OPTIMIZE TABLE tt_custom_fields"); 
     setChange("OPTIMIZE TABLE tt_expense_items");
     setChange("OPTIMIZE TABLE tt_fav_reports");
-    setChange("OPTIMIZE TABLE tt_invoices");    
+    setChange("OPTIMIZE TABLE tt_invoices");
     setChange("OPTIMIZE TABLE tt_log");
+    setChange("OPTIMIZE TABLE tt_monthly_quotas");
     setChange("OPTIMIZE TABLE tt_project_task_binds");
-    setChange("OPTIMIZE TABLE tt_projects");            
+    setChange("OPTIMIZE TABLE tt_projects");
     setChange("OPTIMIZE TABLE tt_tasks");
     setChange("OPTIMIZE TABLE tt_teams");
     setChange("OPTIMIZE TABLE tt_tmp_refs");
-    setChange("OPTIMIZE TABLE tt_user_project_binds");    
+    setChange("OPTIMIZE TABLE tt_user_project_binds");
     setChange("OPTIMIZE TABLE tt_users");
+    setChange("OPTIMIZE TABLE tt_roles");
   }
-  
+
   print "done.<br>\n";
 }
 ?>
@@ -621,7 +805,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)</b>
+    <td width="80%"><b>Create database structure (v1.17.43)</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>
@@ -653,8 +837,12 @@ 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.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.43)</td>
+    <td><input type="submit" name="convert11400to11743" value="Update"><br></td>
   </tr>
 </table>
 
@@ -668,4 +856,4 @@ if ($_POST) {
 </form>
 </div>
 </body>
-</html>
\ No newline at end of file
+</html>