- Allow & in SSL certificates (like in "MeineFirma GmbH & Co. KG").

Falko Timme

2013-10-29 2c0812a625552379b85fefa69dfe2092d3fee06e

 server/lib/classes/db_mysql.inc.php

@@ -61,7 +61,8 @@

    parent::__construct($this->dbHost, $this->dbUser, $this->dbPass,$this->dbName);
    $try = 0;
    while(!is_null($this->connect_error) && $try < 10) {
    //while(!is_null($this->connect_error) && $try < 10) {
   while(mysqli_connect_error() && $try < 10) {
      if($try > 8) sleep(5);
      elseif($try > 0) sleep(1);
      
@@ -71,7 +72,8 @@
      parent::__construct($this->dbHost, $this->dbUser, $this->dbPass,$this->dbName);
    }
    
    if(is_null($this->connect_error)) $this->isConnected = true;
    //if(is_null($this->connect_error)) $this->isConnected = true;
   if(!mysqli_connect_error()) $this->isConnected = true;
    
    $this->setCharacterEncoding();
  }
@@ -89,12 +91,21 @@
  public function updateError($location) {
    global $app;

   /*
    if(!is_null($this->connect_error)) {
      $this->errorNumber = $this->connect_errno;
      $this->errorMessage = $this->connect_error;
    } else {
      $this->errorNumber = $this->errno;
      $this->errorMessage = $this->error;
    }
   */
   if(mysqli_connect_error()) {
      $this->errorNumber = mysqli_connect_errno();
      $this->errorMessage = mysqli_connect_error();
    } else {
      $this->errorNumber = mysqli_errno($this);
      $this->errorMessage = mysqli_error($this);
    }

    $this->errorLocation = $location;
@@ -362,6 +373,15 @@

      return true;
    }
	
   //** Deletes a record and saves the changes into the datalog
    public function datalogError($errormsg) {
      global $app;
	  
     if(isset($app->modules->current_datalog_id) && $app->modules->current_datalog_id > 0) $this->query("UPDATE sys_datalog set error = '".$this->quote($errormsg)."' WHERE datalog_id = ".$app->modules->current_datalog_id);

      return true;
    }


    public function freeResult($query)