Merge remote-tracking branch 'ispc/master'

Marius Cramer

2014-04-30 8edabf647814a012307bbf68628e4656ecf89eff

 server/lib/classes/aps_installer.inc.php

@@ -371,6 +371,21 @@

      $tmp = $app->db->queryOneRecord("SELECT value FROM aps_instances_settings WHERE name = 'main_database_login' AND instance_id = '".$app->db->quote($task['instance_id'])."';");
      $newdb_login = $tmp['value'];
		
      /* Test if the new mysql connection is laready working to ensure that db servers in multiserver
         setups get enough time to create the database */
      if($this->handle_type == 'install') {
         for($n = 1; $n < 15; $n++) {
            $link = mysql_connect($newdb_host, $newdb_login, $newdb_pw);
            if (!$link) {
               unset($link);
               sleep(5);
            } else {
               unset($link);
               break;
            }
         }
      }

      $this->putenv[] = 'DB_'.$db_id.'_TYPE=mysql';
      $this->putenv[] = 'DB_'.$db_id.'_NAME='.$newdb_name;
@@ -740,6 +755,10 @@
      {
         $app->db->query('DELETE FROM aps_instances WHERE id = "'.$app->db->quote($task['instance_id']).'";');
         $app->db->query('DELETE FROM aps_instances_settings WHERE instance_id = "'.$app->db->quote($task['instance_id']).'";');
         if ($app->dbmaster != $app->db) {
            $app->dbmaster->query('DELETE FROM aps_instances WHERE id = "'.$app->db->quote($task['instance_id']).'";');
            $app->dbmaster->query('DELETE FROM aps_instances_settings WHERE instance_id = "'.$app->db->quote($task['instance_id']).'";');
         }
      }

      unset($sxe);