Mercurial > hg > fapweb

changeset 537:12726b4be750

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Make database connection settings better.
author Matti Hamalainen <ccr@tnsp.org>
date Fri, 13 Dec 2013 18:48:40 +0200
parents 380cd0151890
children b9ce451d8ec7
files msitegen.inc.php
diffstat 1 files changed, 14 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/msitegen.inc.php	Fri Dec 13 18:26:03 2013 +0200
+++ b/msitegen.inc.php	Fri Dec 13 18:48:40 2013 +0200
@@ -128,12 +128,15 @@
 }
 
 
-function stGetSetting($name)
+function stGetSetting($name, $default = NULL)
 {
   global $siteSettings;
   if (isset($siteSettings[$name]))
     return $siteSettings[$name];
   else
+  if ($default !== NULL)
+    return $default;
+  else
   {
     error_log("No config value for '".$name."'");
     die("No config value for '".$name."'.\n");
@@ -454,6 +457,16 @@
 function stConnectSQLDB()
 {
   global $db;
+  try {
+    $db = new PDO(stGetSetting("sqlDB"),
+      stGetSetting("sqlUsername", FALSE),
+      stGetSetting("sqlPassword", FALSE),
+      stGetSetting("sqlOptions", array()));
+  }
+  catch (PDOException $e) {
+    error_log("Could not connect to SQL database: ".$e->getMessage().".");
+    return FALSE;
+  }
   $db = stConnectSQLDBSpec(stGetSetting("sqlDB"));
   return ($db !== false);
 }