X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=dbinstall.php;h=f333bd3a00e937ff5e76b4168a9497f3d08c0ef9;hb=08bbf671649fd5419fe4d38fab621e053472e8ce;hp=4346345725bd1bd0761bc4229c59a522748615f9;hpb=3eff870011f63ebcd0cf13c3aa3696e2502ba791;p=timetracker.git

diff --git a/dbinstall.php b/dbinstall.php
index 43463457..f333bd3a 100755
--- a/dbinstall.php
+++ b/dbinstall.php
@@ -159,10 +159,10 @@ if ($request->isGet()) {
   $sql = "select param_value from tt_site_config where param_name = 'version_db'";
   $res = $conn->query($sql);
   if (is_a($res, 'MDB2_Error')) {
-    die('<font color="red">Error: database schema version query failed. '.$res->getMessage().'</font><br>');
+    echo('<font color="red">Error: database schema version query failed. '.$res->getMessage().'</font><br>');
   } else {
     $val = $res->fetchRow();
-    echo('Current database version is: '.$val['param_value'].'.');
+    echo('Database version is: '.$val['param_value'].'.');
   }
 
   $conn->disconnect();
@@ -748,10 +748,10 @@ if ($_POST) {
     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("DELETE from `tt_roles` WHERE team_id = 0");
     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");
   }
 
   if ($_POST["cleanup"]) {