fix breakage caused by empty SSL_CERT options

ZoneMinder · Aug 15, 2017 · f573158 · f573158
1 parent b6965a2
commit f573158
Showing 1 changed file with 12 additions and 6 deletions.
diff --git a/web/includes/database.php b/web/includes/database.php
@@ -42,12 +42,18 @@ function dbConnect() {
   }
 
   try {
-    $dbOptions = array(
-      PDO::MYSQL_ATTR_SSL_CA   => ZM_DB_SSL_CA_CERT,
-      PDO::MYSQL_ATTR_SSL_KEY  => ZM_DB_SSL_CLIENT_KEY,
-      PDO::MYSQL_ATTR_SSL_CERT => ZM_DB_SSL_CLIENT_CERT,
-    );
-    $dbConn = new PDO( ZM_DB_TYPE . $socket . ';dbname='.ZM_DB_NAME, ZM_DB_USER, ZM_DB_PASS, $dbOptions );
+    $dbOptions = null;
+    if ( defined( 'ZM_DB_SSL_CA_CERT' ) and ZM_DB_SSL_CA_CERT ) {
+      $dbOptions = array(
+        PDO::MYSQL_ATTR_SSL_CA   => ZM_DB_SSL_CA_CERT,
+        PDO::MYSQL_ATTR_SSL_KEY  => ZM_DB_SSL_CLIENT_KEY,
+        PDO::MYSQL_ATTR_SSL_CERT => ZM_DB_SSL_CLIENT_CERT,
+      );
+      $dbConn = new PDO( ZM_DB_TYPE . $socket . ';dbname='.ZM_DB_NAME, ZM_DB_USER, ZM_DB_PASS, $dbOptions );
+    } else {
+      $dbConn = new PDO( ZM_DB_TYPE . $socket . ';dbname='.ZM_DB_NAME, ZM_DB_USER, ZM_DB_PASS );
+    }
+
     $dbConn->setAttribute(PDO::ATTR_EMULATE_PREPARES, false);
     $dbConn->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
   } catch(PDOException $ex ) {