Merge branch 'master' of https://github.com/avidenic/timetracker into avidenic-master

Conflicts:
	.gitignore
	WEB-INF/templates/footer.tpl

diff --combined dbinstall.php
index 34f3a8b,1009f51..a511617
mode 100644,100755..100755
--- 1/dbinstall.php
--- 2/dbinstall.php
+++ b/dbinstall.php
@@@ -42,99 -42,6 +42,99 @@@ function setChange($sql) 
      print "successful update<br>\n";
  }
  
 +if (!$request->isPost()) {
 +  echo('<h2>Environment check</h2>');
 +
 +  // Check if WEB-INF/templates_c dir is writable.
 +  if (is_writable(APP_DIR.'/WEB-INF/templates_c/')) {
 +    echo('WEB-INF/templates_c/ directory is writable.<br>');
 +  } else {
 +    echo('<font color="red">Error: WEB-INF/templates_c/ directory is not writable.</font><br>');
 +  }
 +
 +  // Require the configuration file with application settings.
 +  if (file_exists(APP_DIR."/WEB-INF/config.php")) {
 +    echo('WEB-INF/config.php file exists.<br>');
 +  } else {
 +    echo('<font color="red">Error: WEB-INF/config.php file does not exist.</font><br>');
 +  }
 +
 +  // Check whether DSN is defined.
 +  if (defined('DSN')) {
 +    // echo('DSN is defined as '.DSN.'<br>');
 +    echo('DSN is defined.<br>');
 +  } else {
 +    echo('<font color="red">Error: DSN value is not defined. Check your config.php file.</font><br>');
 +  }
 +
 +  // Depending on DSN, require either mysqli or mysql extensions.
 +  if (strrpos(DSN, 'mysqli://', -strlen(DSN)) !== FALSE) {
 +    if (extension_loaded('mysqli')) {
 +      echo('mysqli PHP extension is loaded.<br>');
 +    } else {
 +      echo('<font color="red">Error: mysqli PHP extension is required but is not loaded.</font><br>');
 +    }
 +  }
 +  if (strrpos(DSN, 'mysql://', -strlen(DSN)) !== FALSE) {
 +    if (extension_loaded('mysql')) {
 +      echo('mysql PHP extension is loaded.<br>');
 +    } else {
 +      echo('<font color="red">Error: mysql PHP extension is required but is not loaded.</font><br>');
 +    }
 +  }
 +
 +  // Check mbstring extension.
 +  if (extension_loaded('mbstring')) {
 +    echo('mbstring PHP extension is loaded.<br>');
 +  } else {
 +    echo('<font color="red">Error: mbstring PHP extension is not loaded.</font><br>');
 +  }
 +
 +  // Check gd extension.
 +  if (extension_loaded('gd')) {
 +    echo('gd PHP extension is loaded.<br>');
 +  } else {
 +    echo('<font color="red">Error: gd PHP extension is not loaded. It is required for charts plugin.</font><br>');
 +  }
 +
 +  // Check ldap extension.
 +  if (AUTH_MODULE == 'ldap') {
 +    if (extension_loaded('ldap_')) {
 +      echo('ldap PHP extension is loaded.<br>');
 +    } else {
 +      echo('<font color="red">Error: ldap PHP extension is not loaded. It is required for LDAP authentication.</font><br>');
 +    }
 +  }
 +
 +  // Check database access.
 +  require_once('MDB2.php');
 +  $conn = MDB2::connect(DSN);
 +  if (!is_a($conn, 'MDB2_Error')) {
 +    echo('Connection to database successful.<br>');
 +  } else {
 +    die('<font color="red">Error: connection to database failed. '.$conn->getMessage().'</font><br>');
 +  }
 +
 +  $conn->setOption('debug', true);
 +  $conn->setFetchMode(MDB2_FETCHMODE_ASSOC);
 +
 +  $sql = "show tables";
 +  $res = $conn->query($sql);
 +  if (is_a($res, 'MDB2_Error')) {
 +    die('<font color="red">Error: show tables returned an error. '.$res->getMessage().'</font><br>');
 +  }
 +  $tblCnt = 0;
 +  while ($val = $res->fetchRow()) {
 +    $tblCnt++;
 +  }
 +  if ($tblCnt > 0) {
 +    echo("There are $tblCnt tables in database.<br>");
 +  } else {
 +    echo('<font color="red">There are no tables in database. Execute step 1 - Create database structure.</font><br>');
 +  }
 +  $conn->disconnect();
 +}
 +
  
  if ($_POST) {
    print "Processing...<br>\n";
@@@ -612,7 -519,14 +612,14 @@@
      setChange("ALTER TABLE tt_teams ADD COLUMN lock_spec varchar(255) default NULL");
      setChange("ALTER TABLE tt_teams DROP locktime");
    }
- 
+   
+   if ($_POST["convert1900to1930"]){
+     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");
+   }
+   
    // The update_clients function updates projects field in tt_clients table.
    if ($_POST["update_clients"]) {
      $mdb2 = getConnection();
@@@ -696,6 -610,7 +703,7 @@@
      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_project_task_binds");
      setChange("OPTIMIZE TABLE tt_projects");
      setChange("OPTIMIZE TABLE tt_tasks");
@@@ -715,7 -630,7 +723,7 @@@
  <h2>DB Install</h2>
  <table width="80%" border="1" cellpadding="10" cellspacing="0">
    <tr>
-     <td width="80%"><b>Create database structure (v1.9)</b>
+     <td width="80%"><b>Create database structure (v1.9.30)</b>
      <br>(applies only to new installations, do not execute when updating)</br></td><td><input type="submit" name="crstructure" value="Create"></td>
    </tr>
  </table>
@@@ -750,6 -665,10 +758,10 @@@
      <td>Update database structure (v1.6 to v1.9)</td>
      <td><input type="submit" name="convert1600to1900" value="Update"><br></td>
    </tr>
+   <tr valign="top">
+     <td>Update database structure (v1.9 to v1.9.30)</td>
+     <td><input type="submit" name="convert1900to1930" value="Update"><br></td>
+   </tr>
  </table>
  
  <h2>DB Maintenance</h2>