Merge pull request #330 in ZP/z-push from...

Merge pull request #330 in ZP/z-push from bugfix/ZP-1005-sqlstatemachine.php-runs-in-a-constant to develop

* commit 'ca77ba8b':
  ZP-1005 Check if database name is confirm the SQL naming standards.

src/backend/sqlstatemachine/sqlstatemachine.php

@@ -84,6 +84,10 @@ class SqlStateMachine implements IStateMachine {
             throw new FatalMisconfigurationException("SqlStateMachine(): missing configuration for the state sql. Check STATE_SQL_* values in the configuration.");
         }
 
+        if (!preg_match('/[0-9a-zA-Z$_]+/', STATE_SQL_DATABASE)) {
+            throw new FatalMisconfigurationException(sprintf("SqlStateMachine(): invalid database name '%s'. The name may contain ASCII 7bit letters, numbers and the '$' and '_' signs. Please change your configuration.", STATE_SQL_DATABASE));
+        }
+
         $this->options = array();
         if (trim(STATE_SQL_OPTIONS)) {
             $this->options = unserialize(STATE_SQL_OPTIONS);
@@ -492,8 +496,6 @@ class SqlStateMachine implements IStateMachine {
      * @return int
      */
     public function GetStateVersion() {
-        ZLog::Write(LOGLEVEL_DEBUG, "SqlStateMachine->GetStateVersion().");
-
         $sth = null;
         $record = null;
         $version = IStateMachine::STATEVERSION_01;
@@ -727,7 +729,6 @@ class SqlStateMachine implements IStateMachine {
      * @throws UnavailableException
      */
     protected function checkDbAndTables() {
-        ZLog::Write(LOGLEVEL_DEBUG, "SqlStateMachine->checkDbAndTables(): Checking if database and tables are available.");
         try {
             $sqlStmt = sprintf("SHOW TABLES FROM %s", STATE_SQL_DATABASE);
             $sth = $this->getDbh(false)->prepare($sqlStmt);
@@ -768,7 +769,7 @@ class SqlStateMachine implements IStateMachine {
             $sqlStmt = sprintf("CREATE DATABASE %s", STATE_SQL_DATABASE);
             $sth = $dbh->prepare($sqlStmt);
             $sth->execute();
-            ZLog::Write(LOGLEVEL_DEBUG, "SqlStateMachine->createDB(): Database created succesfully.");
+            ZLog::Write(LOGLEVEL_DEBUG, "SqlStateMachine->createDB(): Database created successfully.");
             $this->createTables();
             $this->clearConnection($dbh);
             return true;
@@ -796,7 +797,7 @@ class SqlStateMachine implements IStateMachine {
                 ));
             $sth = $this->getDbh()->prepare($sqlStmt);
             $sth->execute();
-            ZLog::Write(LOGLEVEL_DEBUG, "SqlStateMachine->createTables(): tables created succesfully.");
+            ZLog::Write(LOGLEVEL_DEBUG, "SqlStateMachine->createTables(): tables created successfully.");
             return true;
         }
         catch (PDOException $ex) {