X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=dbinstall.php;h=3db74cc54aab811ba2b6b5cd5526a28e44a42579;hb=813f43a9406fb5adfb8c6e89cd97b06a11da58c9;hp=dd360115095abfbb357b532e9a6f9c664e5a750a;hpb=bf5ddc4f34213ffe75d6d601c16148a3fe506455;p=timetracker.git
diff --git a/dbinstall.php b/dbinstall.php
old mode 100755
new mode 100644
index dd360115..3db74cc5
--- a/dbinstall.php
+++ b/dbinstall.php
@@ -32,6 +32,8 @@ require_once('initialize.php');
import('ttUserHelper');
import('ttTaskHelper');
+// setChange - executes an sql statement. TODO: rename this function to something better.
+// Better yet, redo the entire thing and make an installer.
function setChange($sql) {
print "
".$sql." ";
$mdb2 = getConnection();
@@ -42,6 +44,7 @@ function setChange($sql) {
print "successful update \n";
}
+
if ($request->isGet()) {
echo('Environment Checks ');
@@ -61,7 +64,7 @@ if ($request->isGet()) {
// spit white space before output in some situations such as in PDF reports.
$file = fopen(APP_DIR.'/WEB-INF/config.php', 'r');
$line = fgets($file);
- if (strcmp('Error: WEB-INF/config.php file does not start with PHP opening tag. ');
}
fclose($file);
@@ -152,6 +155,16 @@ if ($request->isGet()) {
} else {
echo('There are no tables in database. Execute step 1 - Create database structure. ');
}
+
+ $sql = "select param_value from tt_site_config where param_name = 'version_db'";
+ $res = $conn->query($sql);
+ if (is_a($res, 'MDB2_Error')) {
+ echo('Error: database schema version query failed. '.$res->getMessage().' ');
+ } else {
+ $val = $res->fetchRow();
+ echo('Database version is: '.$val['param_value'].'.');
+ }
+
$conn->disconnect();
}
@@ -709,7 +722,7 @@ if ($_POST) {
setChange("ALTER TABLE `tt_log` ADD `paid` tinyint(4) NULL default '0' AFTER `billable`");
}
- if ($_POST["convert11400to11715"]) {
+ if ($_POST["convert11400to11743"]) {
setChange("ALTER TABLE `tt_teams` DROP `address`");
setChange("ALTER TABLE `tt_fav_reports` ADD `report_spec` text default NULL AFTER `user_id`");
setChange("ALTER TABLE `tt_fav_reports` ADD `paid_status` tinyint(4) default NULL AFTER `invoice`");
@@ -724,6 +737,29 @@ if ($_POST) {
setChange("ALTER TABLE `tt_teams` DROP `workday_hours`");
setChange("UPDATE `tt_monthly_quotas` SET `minutes` = 60 * `quota`");
setChange("ALTER TABLE `tt_monthly_quotas` DROP `quota`");
+ setChange("ALTER TABLE `tt_teams` DROP `uncompleted_indicators`");
+ setChange("ALTER TABLE `tt_users` MODIFY `timestamp` timestamp default CURRENT_TIMESTAMP");
+ setChange("ALTER TABLE `tt_teams` MODIFY `timestamp` timestamp default CURRENT_TIMESTAMP");
+ setChange("ALTER TABLE `tt_log` MODIFY `timestamp` timestamp default CURRENT_TIMESTAMP");
+ setChange("ALTER TABLE `tt_tmp_refs` MODIFY `timestamp` timestamp default CURRENT_TIMESTAMP");
+ setChange("CREATE TABLE `tt_roles` (`id` int(11) NOT NULL auto_increment, `team_id` int(11) NOT NULL, `name` varchar(80) default NULL, `rank` int(11) default 0, `rights` text default NULL, `status` tinyint(4) default 1, PRIMARY KEY (`id`))");
+ setChange("create unique index role_idx on tt_roles(team_id, rank, status)");
+ setChange("ALTER TABLE `tt_roles` ADD `description` varchar(255) default NULL AFTER `name`");
+ 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("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");
+ setChange("update `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.17.35') set rights = 'data_entry,view_own_reports,view_own_charts,view_own_invoices,manage_own_settings,view_users,on_behalf_data_entry,view_reports,view_charts,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' where team_id = 0 and rank = 512");
+ setChange("update `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.17.35') set rights = replace(rights, 'view_own_data', 'view_own_reports,view_own_charts') where team_id > 0");
+ setChange("update `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.17.35') set rights = replace(rights, 'view_data', 'view_reports,view_charts') where team_id > 0");
+ setChange("update `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.17.35') set rights = replace(rights, 'view_own_charts,manage_own_settings', 'view_own_charts,view_own_invoices,manage_own_settings') where team_id > 0 and rank = 16");
+ setChange("UPDATE `tt_site_config` SET `param_value` = '1.17.40' where param_name = 'version_db'");
+ setChange("update `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.17.40') set rights = replace(rights, 'on_behalf_data_entry', 'track_time,track_expenses')");
+ setChange("update `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.17.40') set rights = replace(rights, 'data_entry', 'track_own_time,track_own_expenses')");
+ setChange("UPDATE `tt_site_config` SET `param_value` = '1.17.43' where param_name = 'version_db'");
}
if ($_POST["cleanup"]) {
@@ -756,6 +792,7 @@ if ($_POST) {
setChange("OPTIMIZE TABLE tt_tmp_refs");
setChange("OPTIMIZE TABLE tt_user_project_binds");
setChange("OPTIMIZE TABLE tt_users");
+ setChange("OPTIMIZE TABLE tt_roles");
}
print "done. \n";
@@ -768,7 +805,7 @@ if ($_POST) {
DB Install
@@ -804,8 +841,8 @@ if ($_POST) {
- Update database structure (v1.14 to v1.17.15)
-
+ Update database structure (v1.14 to v1.17.43)
+