X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=dbinstall.php;h=4d7feeb2589a38bdc88b28c918bcea063e0031e3;hb=a8a191541d6f05b08bd8331bdf409af5abfac896;hp=1648a8277f944eb631eaa33453b46df55ee5150f;hpb=d8d15e03655dcacf8365baf6d2b36d80dad84890;p=timetracker.git diff --git a/dbinstall.php b/dbinstall.php index 1648a827..4d7feeb2 100644 --- a/dbinstall.php +++ b/dbinstall.php @@ -31,7 +31,7 @@ require_once('WEB-INF/lib/common.lib.php'); require_once('initialize.php'); import('ttUserHelper'); import('ttTaskHelper'); -import('ttUser'); +import('ttRoleHelper'); // setChange - executes an sql statement. TODO: rename this function to something better. // Better yet, redo the entire thing and make an installer. @@ -771,46 +771,97 @@ if ($_POST) { $mdb2 = getConnection(); - $sql = "select u.id, u.status from tt_users u inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.17.44') 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()); - } + if (is_a($res, 'PEAR_Error')) die($res->getMessage()); $users_updated = 0; // Iterate through users. while ($val = $res->fetchRow()) { $user_id = $val['id']; + $team_id = $val['team_id']; + $lang = $val['lang']; + $legacy_role = $val['role']; + + $sql = "select count(*) as count from tt_roles where team_id = $team_id"; + $result = $mdb2->query($sql); + if (is_a($result, 'PEAR_Error')) die($result->getMessage()); + $row = $result->fetchRow(); + if ($row['count'] == 0) + ttRoleHelper::createPredefinedRoles($team_id, $lang); - // Code only works on active users. Temporarily activate a user. - $deactivate = false; - if ($val['status'] == 0) { - $deactivate = true; // To deactivate later. - $sql = "update tt_users set status = 1 where id = $user_id"; - $mdb2->exec($sql); - } - - $user = new ttUser(null, $user_id); - $i18n = new I18n(); - $i18n->load($val['lang']); - if ($user->login) - $user->migrateLegacyRole(); + // Obtain new role id based on legacy role. + $role_id = ttRoleHelper::getRoleByRank($legacy_role, $team_id); + if (!$role_id) continue; // Role not found, nothing to do. - if ($deactivate) { - // Deactivate temporarily activated user back. - $sql = "update tt_users set status = 0 where id = $user_id"; - $mdb2->exec($sql); - } + $sql = "update tt_users set role_id = $role_id where id = $user_id and team_id = $team_id"; + $affected = $mdb2->exec($sql); + if (is_a($affected, 'PEAR_Error')) die($affected->getMessage()); - unset($user); - unset($i18n); $users_updated++; // if ($users_updated >= 1000) break; // TODO: uncomment for large user sets to run multiple times. } print "Updated $users_updated users...
\n"; } + if ($_POST["convert11744to11767"]) { + 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'"); + setChange("update `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.17.50') set rights = replace(rights, 'override_date_lock,swap_roles', 'override_date_lock,override_own_date_lock,swap_roles')"); + setChange("UPDATE `tt_site_config` SET param_value = '1.17.51' where param_name = 'version_db' and param_value = '1.17.50'"); + setChange("ALTER TABLE `tt_users` ADD `created` datetime default NULL AFTER `email`"); + setChange("ALTER TABLE `tt_users` ADD `created_ip` varchar(45) default NULL AFTER `created`"); + setChange("ALTER TABLE `tt_users` ADD `created_by` int(11) default NULL AFTER `created_ip`"); + setChange("ALTER TABLE `tt_users` ADD `modified` datetime default NULL AFTER `created_by`"); + setChange("ALTER TABLE `tt_users` ADD `modified_ip` varchar(45) default NULL AFTER `modified`"); + setChange("ALTER TABLE `tt_users` ADD `modified_by` int(11) default NULL AFTER `modified_ip`"); + setChange("ALTER TABLE `tt_users` ADD `accessed` datetime default NULL AFTER `modified_by`"); + setChange("ALTER TABLE `tt_users` ADD `accessed_ip` varchar(45) default NULL AFTER `accessed`"); + setChange("UPDATE `tt_site_config` SET param_value = '1.17.52' where param_name = 'version_db' and param_value = '1.17.51'"); + setChange("ALTER TABLE `tt_site_config` CHANGE `updated` `modified` datetime default NULL"); + setChange("UPDATE `tt_site_config` SET param_value = '1.17.53', modified = now() where param_name = 'version_db' and param_value = '1.17.52'"); + setChange("ALTER TABLE `tt_log` ADD `created` datetime default NULL AFTER `paid`"); + setChange("ALTER TABLE `tt_log` ADD `created_ip` varchar(45) default NULL AFTER `created`"); + setChange("ALTER TABLE `tt_log` ADD `created_by` int(11) default NULL AFTER `created_ip`"); + setChange("ALTER TABLE `tt_log` ADD `modified` datetime default NULL AFTER `created_by`"); + setChange("ALTER TABLE `tt_log` ADD `modified_ip` varchar(45) default NULL AFTER `modified`"); + setChange("ALTER TABLE `tt_log` ADD `modified_by` int(11) default NULL AFTER `modified_ip`"); + setChange("UPDATE `tt_site_config` SET param_value = '1.17.56', modified = now() where param_name = 'version_db' and param_value = '1.17.53'"); + setChange("ALTER TABLE `tt_expense_items` ADD `created` datetime default NULL AFTER `paid`"); + setChange("ALTER TABLE `tt_expense_items` ADD `created_ip` varchar(45) default NULL AFTER `created`"); + setChange("ALTER TABLE `tt_expense_items` ADD `created_by` int(11) default NULL AFTER `created_ip`"); + setChange("ALTER TABLE `tt_expense_items` ADD `modified` datetime default NULL AFTER `created_by`"); + setChange("ALTER TABLE `tt_expense_items` ADD `modified_ip` varchar(45) default NULL AFTER `modified`"); + setChange("ALTER TABLE `tt_expense_items` ADD `modified_by` int(11) default NULL AFTER `modified_ip`"); + setChange("UPDATE `tt_site_config` SET param_value = '1.17.59', modified = now() where param_name = 'version_db' and param_value = '1.17.56'"); + setChange("ALTER TABLE `tt_fav_reports` ADD `show_ip` tinyint(4) NOT NULL DEFAULT '0' AFTER `show_paid`"); + setChange("UPDATE `tt_site_config` SET param_value = '1.17.61', modified = now() where param_name = 'version_db' and param_value = '1.17.59'"); + setChange("update `tt_log` l inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.17.61') set l.created = l.timestamp where l.created is null"); + setChange("ALTER TABLE `tt_log` drop `timestamp`"); + setChange("UPDATE `tt_site_config` SET param_value = '1.17.64', modified = now() where param_name = 'version_db' and param_value = '1.17.61'"); + setChange("ALTER TABLE `tt_teams` ADD `created` datetime default NULL AFTER `config`"); + setChange("ALTER TABLE `tt_teams` ADD `created_ip` varchar(45) default NULL AFTER `created`"); + setChange("ALTER TABLE `tt_teams` ADD `created_by` int(11) default NULL AFTER `created_ip`"); + setChange("ALTER TABLE `tt_teams` ADD `modified` datetime default NULL AFTER `created_by`"); + setChange("ALTER TABLE `tt_teams` ADD `modified_ip` varchar(45) default NULL AFTER `modified`"); + setChange("ALTER TABLE `tt_teams` ADD `modified_by` int(11) default NULL AFTER `modified_ip`"); + setChange("UPDATE `tt_site_config` SET param_value = '1.17.65', modified = now() where param_name = 'version_db' and param_value = '1.17.64'"); + setChange("update `tt_teams` t inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.17.65') set t.created = t.timestamp where t.created is null"); + setChange("update `tt_users` u inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.17.65') set u.created = u.timestamp where u.created is null"); + setChange("ALTER TABLE `tt_teams` drop `timestamp`"); + setChange("ALTER TABLE `tt_users` drop `timestamp`"); + setChange("UPDATE `tt_site_config` SET param_value = '1.17.66', modified = now() where param_name = 'version_db' and param_value = '1.17.65'"); + setChange("ALTER TABLE `tt_tmp_refs` ADD `created` datetime default NULL AFTER `timestamp`"); + setChange("ALTER TABLE `tt_tmp_refs` drop `timestamp`"); + setChange("delete from `tt_tmp_refs`"); + setChange("UPDATE `tt_site_config` SET param_value = '1.17.67', modified = now() where param_name = 'version_db' and param_value = '1.17.66'"); + } + if ($_POST["cleanup"]) { $mdb2 = getConnection(); @@ -854,7 +905,7 @@ if ($_POST) {

DB Install

-
Create database structure (v1.17.44) + Create database structure (v1.17.67)
(applies only to new installations, do not execute when updating)
@@ -893,6 +944,10 @@ if ($_POST) { Update database structure (v1.14 to v1.17.44)
+ + Update database structure (v1.17.44 to v1.17.67) + +

DB Maintenance