- Fix PostGreSQL support in the Config Model

app/models/config/Config.php

@@ -14,8 +14,8 @@ class Config extends Model {
     public $xmppwhitelist;
     public $info;
     public $unregister;
-    public $user;
-    public $pass;
+    public $username;
+    public $password;
     public $sizelimit;
     
     public function __construct() {
@@ -43,9 +43,9 @@ class Config extends Model {
                 {"type":"text" },
             "unregister" : 
                 {"type":"int", "size":1 },
-            "user" : 
+            "username" : 
                 {"type":"string", "size":32, "mandatory":true },
-            "pass" : 
+            "password" : 
                 {"type":"string", "size":64, "mandatory":true  },
             "sizelimit" : 
                 {"type":"int", "size":16 }
@@ -64,8 +64,8 @@ class Config extends Model {
         $this->xmppwhitelist    = '';
         $this->info             = '';
         $this->unregister       = false;
-        $this->user             = 'admin';
-        $this->pass             = sha1('password');
+        $this->username         = 'admin';
+        $this->password         = sha1('password');
         $this->sizelimit        = 20240001;
     }
 }

app/models/config/ConfigDAO.php

@@ -17,8 +17,8 @@ class ConfigDAO extends SQL {
                 xmppwhitelist = :xmppwhitelist,
                 info          = :info,
                 unregister    = :unregister,
-                user          = :user,
-                pass          = :pass,
+                username      = :username,
+                password      = :password,
                 sizelimit     = :sizelimit';
         
         $this->prepare(
@@ -35,8 +35,8 @@ class ConfigDAO extends SQL {
                 'xmppwhitelist'=> $c->xmppwhitelist,
                 'info'         => $c->info,
                 'unregister'   => $c->unregister,
-                'user'         => $c->user,
-                'pass'         => $c->pass,
+                'username'     => $c->username,
+                'password'     => $c->password,
                 'sizelimit'    => $c->sizelimit
             )
         );
@@ -45,7 +45,17 @@ class ConfigDAO extends SQL {
         
         if(!$this->_effective) {
             $this->_sql = '
-                truncate table config;
+                truncate table config;';
+
+            $this->prepare(
+                'Config', 
+                array(
+                )
+            );
+            
+            $this->run('Config');
+            
+            $this->_sql = '
                 insert into config
                 (
                     environment,
@@ -59,8 +69,8 @@ class ConfigDAO extends SQL {
                     xmppwhitelist,
                     info,
                     unregister,
-                    user,
-                    pass,
+                    username,
+                    password,
                     sizelimit
                 )
                 values
@@ -76,8 +86,8 @@ class ConfigDAO extends SQL {
                     :xmppwhitelist,
                     :info,
                     :unregister,
-                    :user,
-                    :pass,
+                    :username,
+                    :password,
                     :sizelimit
                 )
                 ';
@@ -96,8 +106,8 @@ class ConfigDAO extends SQL {
                     'xmppwhitelist'=> $c->xmppwhitelist,
                     'info'         => $c->info,
                     'unregister'   => $c->unregister,
-                    'user'         => $c->user,
-                    'pass'         => $c->pass,
+                    'username'     => $c->username,
+                    'password'     => $c->password,
                     'sizelimit'    => $c->sizelimit
                 )
             );

app/widgets/AdminMain/AdminMain.php

@@ -25,12 +25,12 @@ class AdminMain extends WidgetBase
         $config = $cd->get();
 
         if(isset($form)) {
-            if($form['pass'] != '' && $form['repass'] != ''
-            && $form['pass'] == $form['repass']) {
+            if($form['password'] != '' && $form['repassword'] != ''
+            && $form['password'] == $form['repassword']) {
                 unset($form['repass']);
-                $form['pass'] = sha1($form['pass']);
+                $form['password'] = sha1($form['password']);
             } else {
-                $form['pass'] = $config->pass;
+                $form['password'] = $config->password;
             }
 
             foreach($form as $key => $value) {

app/widgets/AdminMain/adminmain.tpl

@@ -149,17 +149,17 @@
 
         <div class="element" >
             <label for="username">{$c->__('credentials.username')}</label>
-            <input type="text" id="user" name="user" value="{$conf->user}"/>
+            <input type="text" id="username" name="username" value="{$conf->user}"/>
         </div>
         <div class="clear"></div>
         
         <div class="element">
             <label for="pass">{$c->__('credentials.password')}</label>
-            <input type="password" id="pass" name="pass" value=""/>
+            <input type="password" id="password" name="pass" value=""/>
         </div>                            
         <div class="element">
-            <label for="repass">{$c->__('credentials.re_password')}</label>
-            <input type="password" id="repass" name="repass" value=""/>
+            <label for="repassword">{$c->__('credentials.re_password')}</label>
+            <input type="password" id="repassword" name="repassword" value=""/>
         </div>
     </fieldset>
 

bootstrap.php

@@ -249,7 +249,7 @@ class Bootstrap {
         $cd = new \Modl\ConfigDAO();
         $config = $cd->get();
 
-        define('LOG_LEVEL', (int)$config->loglevel);
+        define('LOG_LEVEL', 2);
     }
 
     private function loadModl() {