webinterface.git

@@ -21,10 +21,13 @@ require_once('inc/debug.php');

 class DB extends PDO {

   function __construct() {

-    $dsn = "mysql:host=".config('db_host');

+    $dsn = "mysql:host=".config('db_host', true);

     if (config('db_port', true)) {

       $dsn .= ';port='.config('db_port', true);

     }

+    if (config('db_socket', true)) {

+      $dsn = "mysql:unix_socket=".config('db_socket', true);

+    }

     $username = config('db_user', true);

     $password = config('db_pass', true);

     parent::__construct($dsn, $username, $password);

@@ -17,7 +17,13 @@ Nevertheless, in case you use a significant part of this code, we ask (but not r

 global $config;

 $config = array();

-$config['db_host'] = ':/var/run/mysqld/mysqld-sys.sock';

+// either...

+$config['db_socket'] = '/var/run/mysqld/mysqld-sys.sock';

+// ... or

+$config['db_host'] = '10.8.0.1';

+$config['db_port'] = 3307;

+// (socket is preferred if both are defined)

+

 $config['db_user'] = 'username';

 $config['db_pass'] = 'password';

@@ -37,6 +43,6 @@ $config['session_name'] = 'CONFIG_SCHOKOKEKS_ORG';

 $config['theme'] = 'default';

 $config['jquery_ui_path'] = 'https://source.schokokeks.org/external/jquery/jquery-ui-1.10.0/';

-ini_set('error_reporting','On');

+ini_set('display_errors','On');

 ?>

@@ -17,7 +17,7 @@ Nevertheless, in case you use a significant part of this code, we ask (but not r

 require_once('class/database.php');

 require_once('inc/debug.php');

-function config($key)

+function config($key, $localonly = false)

 {

   global $config;

@@ -35,6 +35,10 @@ function config($key)

   if (array_key_exists($key, $config))

     return $config[$key];

+  if ($localonly) {

+    return NULL;

+  }  

+

   /* read configuration from database */

   $result = db_query( "SELECT `key`, value FROM misc.config" );