X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/timetracker.git/blobdiff_plain/8d68ecdd7b1c45cb2a5cf592b8d504d7e4614911..fdaf50116c208e78b6c4de6e6fe263541163c4af:/dbinstall.php

diff --git a/dbinstall.php b/dbinstall.php
index 1c95fc28..0d25d1b7 100644
--- a/dbinstall.php
+++ b/dbinstall.php
@@ -771,7 +771,7 @@ if ($_POST) {
 
     $mdb2 = getConnection();
 
-    $sql = "select u.id, u.team_id, u.role, u.status, t.lang from tt_users u inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.17.44') left join tt_teams t on (u.team_id = t.id) where u.role_id is NULL and u.status is NOT NULL";
+    $sql = "select u.id, u.team_id, u.role, t.lang from tt_users u inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.17.44') left join tt_teams t on (u.team_id = t.id) 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());
 
@@ -805,6 +805,15 @@ if ($_POST) {
     print "Updated $users_updated users...<br>\n";
   }
 
+  if ($_POST["convert11744to11750"]) {
+    setChange("update `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.17.44') set rights = replace(rights, 'override_punch_mode,override_date_lock', 'override_punch_mode,override_own_punch_mode,override_date_lock')");
+    setChange("UPDATE `tt_site_config` SET param_value = '1.17.48' where param_name = 'version_db' and param_value = '1.17.44'");
+    setChange("update `tt_users` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.17.48') set role_id = (select id from tt_roles where team_id = 0 and rank = 512) where role = 324");
+    setChange("UPDATE `tt_site_config` SET param_value = '1.17.49' where param_name = 'version_db' and param_value = '1.17.48'");
+    setChange("ALTER TABLE `tt_users` drop role");
+    setChange("UPDATE `tt_site_config` SET param_value = '1.17.50' where param_name = 'version_db' and param_value = '1.17.49'");
+  }
+
   if ($_POST["cleanup"]) {
 
     $mdb2 = getConnection();
@@ -848,7 +857,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.17.44)</b>
+    <td width="80%"><b>Create database structure (v1.17.50)</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>
@@ -887,6 +896,10 @@ if ($_POST) {
     <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>
+    <tr valign="top">
+    <td>Update database structure (v1.17.44 to v1.17.50)</td>
+    <td><input type="submit" name="convert11744to11750" value="Update"></td>
+  </tr>
 </table>
 
 <h2>DB Maintenance</h2>