X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/timetracker.git/blobdiff_plain/32e0397e34d3092eb2b89411ab97ee288f88038a..2a7ba96739989c4ae4c8554a37aef62b7066f1ea:/dbinstall.php

diff --git a/dbinstall.php b/dbinstall.php
index f87b2a4e..c9dcc185 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["convert11797to11824"]) {
+  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`");
@@ -1039,6 +1039,7 @@ if ($_POST) {
     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'");
+    setChange("update `tt_client_project_binds` cpb inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.26') inner join `tt_clients` c on c.id = cpb.client_id set cpb.group_id = c.group_id, cpb.org_id = c.org_id where cpb.org_id is null");
   }
 
   if ($_POST["cleanup"]) {
@@ -1086,7 +1087,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.24)</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>
@@ -1131,8 +1132,8 @@ if ($_POST) {
   </tr>
   </tr>
   <tr valign="top">
-    <td>Update database structure (v1.17.97 to v1.18.24)</td>
-    <td><input type="submit" name="convert11797to11824" 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>