X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/timetracker.git/blobdiff_plain/6ebd9b5c4aa66017858979cf00ac1db700f9d643..80481c14be5a7ac9e4d386ad7b3ec71d7628e03b:/dbinstall.php

diff --git a/dbinstall.php b/dbinstall.php
index d0ccbe33..67fac318 100644
--- a/dbinstall.php
+++ b/dbinstall.php
@@ -124,7 +124,7 @@ if ($request->isGet()) {
 
   // Check ldap extension.
   if (AUTH_MODULE == 'ldap') {
-    if (extension_loaded('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>');
@@ -957,7 +957,7 @@ if ($_POST) {
     print "Updated $tt_expense_items_updated tt_expense_items records...<br>\n";
   }
 
-  if ($_POST["convert11797to11822"]) {
+  if ($_POST["convert11797to11826"]) {
     setChange("ALTER TABLE `tt_fav_reports` CHANGE `group_by` `group_by1` varchar(20) default NULL");
     setChange("ALTER TABLE `tt_fav_reports` ADD `group_by2` varchar(20) default NULL AFTER `group_by1`");
     setChange("ALTER TABLE `tt_fav_reports` ADD `group_by3` varchar(20) default NULL AFTER `group_by2`");
@@ -1035,18 +1035,22 @@ if ($_POST) {
     setChange("UPDATE `tt_custom_fields` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.23') set org_id = group_id where org_id is null");
     setChange("update `tt_custom_field_options` cfo inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.23') inner join `tt_custom_fields` cf on cf.id = cfo.field_id set cfo.group_id = cf.group_id, cfo.org_id = cf.org_id where cfo.org_id is null");
     setChange("update `tt_custom_field_log` cfl inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.23') inner join `tt_custom_fields` cf on cf.id = cfl.field_id set cfl.group_id = cf.group_id, cfl.org_id = cf.org_id where cfl.org_id is null");
+    setChange("ALTER TABLE `tt_custom_field_options` ADD `status` tinyint(4) default '1' after `value`");
+    setChange("UPDATE `tt_site_config` SET param_value = '1.18.24', modified = now() where param_name = 'version_db' and param_value = '1.18.23'");
+    setChange("ALTER TABLE `tt_groups` ADD COLUMN `description` varchar(255) default NULL after `name`");
+    setChange("UPDATE `tt_site_config` SET param_value = '1.18.26', modified = now() where param_name = 'version_db' and param_value = '1.18.24'");
   }
 
   if ($_POST["cleanup"]) {
 
     $mdb2 = getConnection();
-    $inactive_groups = ttOrgHelper::getInactiveOrgs();
+    $inactive_orgs = ttOrgHelper::getInactiveOrgs();
 
-    $count = count($inactive_groups);
-    print "$count inactive groups found...<br>\n";
+    $count = count($inactive_orgs);
+    print "$count inactive organizations found...<br>\n";
     for ($i = 0; $i < $count; $i++) {
-      print "  deleting group ".$inactive_groups[$i]."<br>\n";
-      $res = ttTeamHelper::delete($inactive_groups[$i]); // TODO: rewrite this to delete subgroups, too.
+      print "  deleting organization ".$inactive_orgs[$i]."<br>\n";
+      $res = ttOrgHelper::deleteOrg($inactive_orgs[$i]);
     }
 
     setChange("OPTIMIZE TABLE tt_client_project_binds");
@@ -1082,7 +1086,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.18.22)</b>
+    <td width="80%"><b>Create database structure (v1.18.26)</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>
@@ -1127,8 +1131,8 @@ if ($_POST) {
   </tr>
   </tr>
   <tr valign="top">
-    <td>Update database structure (v1.17.97 to v1.18.22)</td>
-    <td><input type="submit" name="convert11797to11822" value="Update"></td>
+    <td>Update database structure (v1.17.97 to v1.18.26)</td>
+    <td><input type="submit" name="convert11797to11826" value="Update"></td>
   </tr>
 </table>