X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=dbinstall.php;h=cb5f1c630b237da33e3362bb856a2146c0879f80;hb=9e7fa54992c2053eaae351bf8d28160bfbedfd88;hp=4a7bcd129bdb42a4c4f03293ce73e66109058e0e;hpb=ba0b5f34efabfeded3112115086eaa9d00f2a345;p=timetracker.git
diff --git a/dbinstall.php b/dbinstall.php
index 4a7bcd12..cb5f1c63 100755
--- a/dbinstall.php
+++ b/dbinstall.php
@@ -42,8 +42,8 @@ function setChange($sql) {
print "successful update
\n";
}
-if (!$request->isPost()) {
- echo('
Environment check
');
+if ($request->isGet()) {
+ echo('Environment Checks
');
// Check if WEB-INF/templates_c dir is writable.
if (is_writable(APP_DIR.'/WEB-INF/templates_c/')) {
@@ -55,6 +55,16 @@ if (!$request->isPost()) {
// 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 +77,14 @@ if (!$request->isPost()) {
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.
+ 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')) {
@@ -154,7 +172,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 +547,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");
@@ -613,8 +631,18 @@ if ($_POST) {
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 `daily_working_hours` SMALLINT NULL DEFAULT '8' AFTER `lock_spec`");
- setChange("UPDATE `tt_teams` SET `daily_working_hours` = 8");
+ 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`");
}
// The update_clients function updates projects field in tt_clients table.
@@ -700,7 +728,7 @@ if ($_POST) {
setChange("OPTIMIZE TABLE tt_fav_reports");
setChange("OPTIMIZE TABLE tt_invoices");
setChange("OPTIMIZE TABLE tt_log");
- setChange("OPTIMIZE TABLE tt_monthly_quota");
+ setChange("OPTIMIZE TABLE tt_monthly_quotas");
setChange("OPTIMIZE TABLE tt_project_task_binds");
setChange("OPTIMIZE TABLE tt_projects");
setChange("OPTIMIZE TABLE tt_tasks");
@@ -767,4 +795,4 @@ if ($_POST) {