X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=inline;f=dbinstall.php;h=f333bd3a00e937ff5e76b4168a9497f3d08c0ef9;hb=08bbf671649fd5419fe4d38fab621e053472e8ce;hp=c32695d5a51fb49cf4ba24393872ee3ff9178b8e;hpb=f74704271ae5d37aee3fdf941f3462c8b92ad0fd;p=timetracker.git
diff --git a/dbinstall.php b/dbinstall.php
index c32695d5..f333bd3a 100755
--- 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 ');
@@ -55,6 +58,16 @@ if ($request->isGet()) {
// Require the configuration file with application settings.
if (file_exists(APP_DIR."/WEB-INF/config.php")) {
echo('WEB-INF/config.php file exists. ');
+
+ // Config file must start with the PHP opening tag. We are checking this because
+ // a Unicode editor may insert a byte order mark (BOM) before it. This is not good as it will
+ // 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);
} else {
echo('Error: WEB-INF/config.php file does not exist. ');
}
@@ -67,6 +80,16 @@ if ($request->isGet()) {
echo('Error: DSN value is not defined. Check your config.php file. ');
}
+ // Check if PHP version is good enough.
+ // $required_version = '5.2.1'; // Something in TCPDF library does not work below this one.
+ $required_version = '5.4.0'; // Week view (week.php) requires 5.4 because of []-way of referencing arrays.
+ // This needs further investigation as we use [] elsewhere without obvious problems.
+ if (version_compare(phpversion(), $required_version, '>=')) {
+ echo('PHP version: '.phpversion().', good enough. ');
+ } else {
+ echo('Error: PHP version is not high enough: '.phpversion().'. Required: '.$required_version.'. ');
+ }
+
// Depending on DSN, require either mysqli or mysql extensions.
if (strrpos(DSN, 'mysqli://', -strlen(DSN)) !== FALSE) {
if (extension_loaded('mysqli')) {
@@ -132,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();
}
@@ -154,7 +187,7 @@ if ($_POST) {
}
if ($_POST["convert5to7"]) {
- setChange("alter table `activity_log` CHANGE al_comment al_comment BLOB");
+ setChange("alter table `activity_log` CHANGE al_comment al_comment text");
setChange("CREATE TABLE `sysconfig` (`sysc_id` int(11) unsigned NOT NULL auto_increment,`sysc_name` varchar(32) NOT NULL default '',`sysc_value` varchar(70) default NULL, PRIMARY KEY (`sysc_id`), UNIQUE KEY `sysc_id` (`sysc_id`), UNIQUE KEY `sysc_name` (`sysc_name`))");
setChange("alter table `companies` add c_locktime int(4) default -1");
setChange("alter table `activity_log` add al_billable tinyint(4) default 0");
@@ -529,7 +562,7 @@ if ($_POST) {
setChange("ALTER TABLE tt_log CHANGE al_project_id project_id int(11) NOT NULL");
setChange("ALTER TABLE tt_log MODIFY project_id int(11) default NULL");
setChange("ALTER TABLE tt_log CHANGE al_activity_id task_id int(11) default NULL");
- setChange("ALTER TABLE tt_log CHANGE al_comment comment blob");
+ setChange("ALTER TABLE tt_log CHANGE al_comment comment text");
setChange("ALTER TABLE tt_log CHANGE al_billable billable tinyint(4) default '0'");
setChange("drop index al_user_id_idx on tt_log");
setChange("drop index al_project_id_idx on tt_log");
@@ -580,43 +613,6 @@ if ($_POST) {
setChange("ALTER TABLE tt_invoices DROP end_date");
}
- if ($_POST["convert1600to1900"]) {
- setChange("DROP TABLE IF EXISTS tt_invoice_headers");
- setChange("ALTER TABLE tt_fav_reports ADD COLUMN `client_id` int(11) default NULL");
- setChange("ALTER TABLE tt_fav_reports ADD COLUMN `cf_1_option_id` int(11) default NULL");
- setChange("ALTER TABLE tt_fav_reports ADD COLUMN `show_client` tinyint(4) NOT NULL default '0'");
- setChange("ALTER TABLE tt_fav_reports ADD COLUMN `show_invoice` tinyint(4) NOT NULL default '0'");
- setChange("ALTER TABLE tt_fav_reports ADD COLUMN `group_by` varchar(20) default NULL");
- setChange("CREATE TABLE `tt_expense_items` (`id` bigint NOT NULL auto_increment, `date` date NOT NULL, `user_id` int(11) NOT NULL, `client_id` int(11) default NULL, `project_id` int(11) default NULL, `name` varchar(255) NOT NULL, `cost` decimal(10,2) default '0.00', `invoice_id` int(11) default NULL, PRIMARY KEY (`id`))");
- setChange("create index date_idx on tt_expense_items(date)");
- setChange("create index user_idx on tt_expense_items(user_id)");
- setChange("create index client_idx on tt_expense_items(client_id)");
- setChange("create index project_idx on tt_expense_items(project_id)");
- setChange("create index invoice_idx on tt_expense_items(invoice_id)");
- setChange("ALTER TABLE tt_fav_reports DROP sort_by");
- setChange("ALTER TABLE tt_fav_reports DROP show_empty_days");
- setChange("ALTER TABLE tt_invoices DROP discount");
- setChange("ALTER TABLE tt_users ADD COLUMN `client_id` int(11) default NULL");
- setChange("ALTER TABLE tt_teams ADD COLUMN `decimal_mark` char(1) NOT NULL default '.'");
- setChange("ALTER TABLE tt_fav_reports ADD COLUMN `invoice` tinyint(4) default NULL");
- setChange("CREATE TABLE `tt_cron` (`id` int(11) NOT NULL auto_increment, `cron_spec` varchar(255) NOT NULL, `last` int(11) default NULL, `next` int(11) default NULL, `report_id` int(11) default NULL, `email` varchar(100) default NULL, `status` tinyint(4) default '1', PRIMARY KEY (`id`))");
- setChange("ALTER TABLE tt_cron ADD COLUMN `team_id` int(11) NOT NULL");
- setChange("create index client_idx on tt_client_project_binds(client_id)");
- setChange("create index project_idx on tt_client_project_binds(project_id)");
- setChange("ALTER TABLE tt_log ADD COLUMN status tinyint(4) default '1'");
- setChange("ALTER TABLE tt_custom_field_log ADD COLUMN status tinyint(4) default '1'");
- setChange("ALTER TABLE tt_expense_items ADD COLUMN status tinyint(4) default '1'");
- setChange("ALTER TABLE tt_invoices ADD COLUMN status tinyint(4) default '1'");
- setChange("DROP INDEX name_idx on tt_invoices");
- setChange("create unique index name_idx on tt_invoices(team_id, name, status)");
- setChange("ALTER TABLE tt_teams ADD COLUMN lock_spec varchar(255) default NULL");
- setChange("ALTER TABLE tt_teams DROP locktime");
- setChange("CREATE TABLE `tt_monthly_quota` (`team_id` int(11) NOT NULL, `year` smallint(5) UNSIGNED NOT NULL, `month` tinyint(3) UNSIGNED NOT NULL, `quota` smallint(5) UNSIGNED NOT NULL, PRIMARY KEY (`year`,`month`,`team_id`))");
- setChange("ALTER TABLE `tt_monthly_quota` ADD CONSTRAINT `FK_TT_TEAM_CONSTRAING` FOREIGN KEY (`team_id`) REFERENCES `tt_teams` (`id`) ON DELETE CASCADE ON UPDATE CASCADE");
- setChange("ALTER TABLE `tt_teams` ADD `workday_hours` SMALLINT NULL DEFAULT '8' AFTER `lock_spec`");
- setChange("RENAME TABLE tt_monthly_quota TO tt_monthly_quotas");
- }
-
// The update_clients function updates projects field in tt_clients table.
if ($_POST["update_clients"]) {
$mdb2 = getConnection();
@@ -678,6 +674,86 @@ if ($_POST) {
print "Updated $affected teams... \n";
}
+ if ($_POST["convert1600to11400"]) {
+ setChange("DROP TABLE IF EXISTS tt_invoice_headers");
+ setChange("ALTER TABLE tt_fav_reports ADD COLUMN `client_id` int(11) default NULL");
+ setChange("ALTER TABLE tt_fav_reports ADD COLUMN `cf_1_option_id` int(11) default NULL");
+ setChange("ALTER TABLE tt_fav_reports ADD COLUMN `show_client` tinyint(4) NOT NULL default '0'");
+ setChange("ALTER TABLE tt_fav_reports ADD COLUMN `show_invoice` tinyint(4) NOT NULL default '0'");
+ setChange("ALTER TABLE tt_fav_reports ADD COLUMN `group_by` varchar(20) default NULL");
+ setChange("CREATE TABLE `tt_expense_items` (`id` bigint NOT NULL auto_increment, `date` date NOT NULL, `user_id` int(11) NOT NULL, `client_id` int(11) default NULL, `project_id` int(11) default NULL, `name` varchar(255) NOT NULL, `cost` decimal(10,2) default '0.00', `invoice_id` int(11) default NULL, PRIMARY KEY (`id`))");
+ setChange("create index date_idx on tt_expense_items(date)");
+ setChange("create index user_idx on tt_expense_items(user_id)");
+ setChange("create index client_idx on tt_expense_items(client_id)");
+ setChange("create index project_idx on tt_expense_items(project_id)");
+ setChange("create index invoice_idx on tt_expense_items(invoice_id)");
+ setChange("ALTER TABLE tt_fav_reports DROP sort_by");
+ setChange("ALTER TABLE tt_fav_reports DROP show_empty_days");
+ setChange("ALTER TABLE tt_invoices DROP discount");
+ setChange("ALTER TABLE tt_users ADD COLUMN `client_id` int(11) default NULL");
+ setChange("ALTER TABLE tt_teams ADD COLUMN `decimal_mark` char(1) NOT NULL default '.'");
+ setChange("ALTER TABLE tt_fav_reports ADD COLUMN `invoice` tinyint(4) default NULL");
+ setChange("CREATE TABLE `tt_cron` (`id` int(11) NOT NULL auto_increment, `cron_spec` varchar(255) NOT NULL, `last` int(11) default NULL, `next` int(11) default NULL, `report_id` int(11) default NULL, `email` varchar(100) default NULL, `status` tinyint(4) default '1', PRIMARY KEY (`id`))");
+ setChange("ALTER TABLE tt_cron ADD COLUMN `team_id` int(11) NOT NULL");
+ setChange("create index client_idx on tt_client_project_binds(client_id)");
+ setChange("create index project_idx on tt_client_project_binds(project_id)");
+ setChange("ALTER TABLE tt_log ADD COLUMN status tinyint(4) default '1'");
+ setChange("ALTER TABLE tt_custom_field_log ADD COLUMN status tinyint(4) default '1'");
+ setChange("ALTER TABLE tt_expense_items ADD COLUMN status tinyint(4) default '1'");
+ setChange("ALTER TABLE tt_invoices ADD COLUMN status tinyint(4) default '1'");
+ setChange("DROP INDEX name_idx on tt_invoices");
+ setChange("create unique index name_idx on tt_invoices(team_id, name, status)");
+ setChange("ALTER TABLE tt_teams ADD COLUMN lock_spec varchar(255) default NULL");
+ setChange("ALTER TABLE tt_teams DROP locktime");
+ setChange("CREATE TABLE `tt_monthly_quota` (`team_id` int(11) NOT NULL, `year` smallint(5) UNSIGNED NOT NULL, `month` tinyint(3) UNSIGNED NOT NULL, `quota` smallint(5) UNSIGNED NOT NULL, PRIMARY KEY (`year`,`month`,`team_id`))");
+ setChange("ALTER TABLE `tt_monthly_quota` ADD CONSTRAINT `FK_TT_TEAM_CONSTRAING` FOREIGN KEY (`team_id`) REFERENCES `tt_teams` (`id`) ON DELETE CASCADE ON UPDATE CASCADE");
+ setChange("ALTER TABLE `tt_teams` ADD `workday_hours` SMALLINT NULL DEFAULT '8' AFTER `lock_spec`");
+ setChange("RENAME TABLE tt_monthly_quota TO tt_monthly_quotas");
+ setChange("ALTER TABLE tt_expense_items modify `name` text NOT NULL");
+ setChange("ALTER TABLE `tt_teams` ADD `uncompleted_indicators` SMALLINT(2) NOT NULL DEFAULT '0' AFTER `record_type`");
+ setChange("CREATE TABLE `tt_predefined_expenses` (`id` int(11) NOT NULL auto_increment, `team_id` int(11) NOT NULL, `name` varchar(255) NOT NULL, `cost` decimal(10,2) default '0.00', PRIMARY KEY (`id`))");
+ setChange("ALTER TABLE `tt_teams` ADD `task_required` smallint(2) NOT NULL DEFAULT '0' AFTER `tracking_mode`");
+ setChange("ALTER TABLE `tt_teams` ADD `project_required` smallint(2) NOT NULL DEFAULT '0' AFTER `tracking_mode`");
+ setChange("ALTER TABLE `tt_cron` ADD `report_condition` varchar(255) default NULL AFTER `email`");
+ setChange("ALTER TABLE `tt_fav_reports` ADD `status` tinyint(4) default '1'");
+ setChange("ALTER TABLE `tt_teams` ADD `bcc_email` varchar(100) default NULL AFTER `uncompleted_indicators`");
+ setChange("ALTER TABLE `tt_cron` ADD `cc` varchar(100) default NULL AFTER `email`");
+ setChange("ALTER TABLE `tt_cron` ADD `subject` varchar(100) default NULL AFTER `cc`");
+ setChange("ALTER TABLE `tt_log` ADD `paid` tinyint(4) NULL default '0' AFTER `billable`");
+ }
+
+ if ($_POST["convert11400to11735"]) {
+ 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`");
+ setChange("ALTER TABLE `tt_fav_reports` ADD `show_paid` tinyint(4) NOT NULL DEFAULT '0' AFTER `show_invoice`");
+ setChange("ALTER TABLE `tt_expense_items` ADD `paid` tinyint(4) NULL default '0' AFTER `invoice_id`");
+ setChange("ALTER TABLE `tt_monthly_quotas` MODIFY `quota` decimal(5,2) NOT NULL");
+ setChange("ALTER TABLE `tt_teams` MODIFY `workday_hours` decimal(5,2) DEFAULT '8.00'");
+ setChange("ALTER TABLE `tt_teams` ADD `config` text default NULL AFTER `custom_logo`");
+ setChange("ALTER TABLE `tt_monthly_quotas` ADD `minutes` int(11) DEFAULT NULL");
+ setChange("ALTER TABLE `tt_teams` ADD `workday_minutes` smallint(4) DEFAULT '480' AFTER `workday_hours`");
+ setChange("UPDATE `tt_teams` SET `workday_minutes` = 60 * `workday_hours`");
+ 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");
+ }
+
if ($_POST["cleanup"]) {
$mdb2 = getConnection();
@@ -708,6 +784,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";
@@ -720,7 +797,7 @@ if ($_POST) {
DB Install
@@ -752,8 +829,12 @@ if ($_POST) {
- Update database structure (v1.6 to v1.9)
-
+ Update database structure (v1.6 to v1.14)
+
+
+
+ Update database structure (v1.14 to v1.17.35)
+
@@ -767,4 +848,4 @@ if ($_POST) {