- Start using Composer

- Call Modl properly in the sourcecode using the Composer autoloader
- Comment the Movim Logger
- Add Monolog as a dependency

app/controllers/AdminloginController.php

@@ -11,7 +11,7 @@ class AdminloginController extends BaseController {
         $this->page->menuAddLink(t('Home'), 'main');
         $this->page->menuAddLink(t('Administration'), 'admin', true);
         
-        $conf = \system\Conf::getServerConf();
+        $conf = Conf::getServerConf();
         
         if($conf['user'] == $_POST['username'] 
         && $conf['pass'] == sha1($_POST['password'])) {

app/helpers/StringHelper.php

@@ -114,7 +114,7 @@ function prepareString($string) {
     );
    
     // We add some smileys...
-    $conf = new \system\Conf();
+    $conf = new Conf();
     $theme = $conf->getServerConfElement('theme');
     
     $path = BASE_URI . 'themes/' . $theme . '/img/smileys/';

app/models/cache/Cache.php

@@ -2,7 +2,7 @@
 
 namespace modl;
 
-class Cache extends ModlModel{
+class Cache extends Model{
     public $session;
     public $name;
     public $data;

app/models/cache/CacheDAO.php

@@ -2,7 +2,7 @@
 
 namespace modl;
 
-class CacheDAO extends ModlSQL {
+class CacheDAO extends SQL {
     function get($session, $key) {
         $this->_sql = '
             select * from cache

app/models/caps/Caps.php

@@ -2,7 +2,7 @@
 
 namespace modl;
 
-class Caps extends ModlModel {
+class Caps extends Model {
     public $node;
     public $category;
     public $type;

app/models/caps/CapsDAO.php

@@ -2,7 +2,7 @@
 
 namespace modl;
 
-class CapsDAO extends ModlSQL { 
+class CapsDAO extends SQL { 
     function get($node) {
         $this->_sql = '
             select * from caps

app/models/conference/Conference.php

@@ -2,7 +2,7 @@
 
 namespace modl;
 
-class Conference extends ModlModel {    
+class Conference extends Model {    
     public $jid;
     public $conference;
     public $name;

app/models/conference/ConferenceDAO.php

@@ -2,7 +2,7 @@
 
 namespace modl;
 
-class ConferenceDAO extends ModlSQL {
+class ConferenceDAO extends SQL {
     function set(Conference $c) {
         $this->_sql = '
             update conference

app/models/contact/Contact.php

@@ -2,7 +2,7 @@
 
 namespace modl;
 
-class Contact extends ModlModel {
+class Contact extends Model {
     protected $jid;
     
     protected $fn;
@@ -270,19 +270,21 @@ class Contact extends ModlModel {
         $this->adrcountry      = $vcard->adr->country;
         $this->adrpostalcode   = $vcard->adr->code;
 
-        foreach($vcard->impp->children() as $c) {
-            list($key, $value) = explode(':', (string)$c);
+        if(isset($vcard->impp)) {
+            foreach($vcard->impp->children() as $c) {
+                list($key, $value) = explode(':', (string)$c);
 
-            switch($key) {
-                case 'twitter' :
-                    $this->twitter = str_replace('@', '', $value);
-                    break;
-                case 'skype' :
-                    $this->skype = $value;
-                    break;
-                case 'ymsgr' :
-                    $this->yahoo = $value;
-                    break;
+                switch($key) {
+                    case 'twitter' :
+                        $this->twitter = str_replace('@', '', $value);
+                        break;
+                    case 'skype' :
+                        $this->skype = $value;
+                        break;
+                    case 'ymsgr' :
+                        $this->yahoo = $value;
+                        break;
+                }
             }
         }
 

app/models/contact/ContactDAO.php

@@ -2,7 +2,7 @@
 
 namespace modl;
 
-class ContactDAO extends ModlSQL {
+class ContactDAO extends SQL {
     function __construct() {
         parent::__construct();
     }

app/models/item/Item.php

@@ -2,7 +2,7 @@
 
 namespace modl;
 
-class Item extends ModlModel {
+class Item extends Model {
     public $server;
     public $jid;
     public $name;
@@ -49,7 +49,7 @@ class Item extends ModlModel {
     }
 }
 
-class Server extends ModlModel {
+class Server extends Model {
     public $server;
     public $number;
 }

app/models/item/ItemDAO.php

@@ -2,7 +2,7 @@
 
 namespace modl;
 
-class ItemDAO extends ModlSQL { 
+class ItemDAO extends SQL { 
     function set(Item $item) {
         $this->_sql = '
             update item

app/models/message/Message.php

@@ -2,7 +2,7 @@
 
 namespace modl;
 
-class Message extends ModlModel {
+class Message extends Model {
     public $session;
     public $jidto;
     public $jidfrom;

app/models/message/MessageDAO.php

@@ -2,7 +2,7 @@
 
 namespace modl;
 
-class MessageDAO extends ModlSQL {  
+class MessageDAO extends SQL {  
     function set(Message $message) {
         $this->_sql = '
             insert into message

app/models/postn/Postn.php

@@ -2,7 +2,7 @@
 
 namespace modl;
 
-class Postn extends ModlModel {
+class Postn extends Model {
     public $session;
 
     public $jid;       // Where the post is comming from (jid or server)

app/models/postn/PostnDAO.php

@@ -2,7 +2,7 @@
 
 namespace modl;
 
-class PostnDAO extends ModlSQL {  
+class PostnDAO extends SQL {  
     function set(Postn $post) {
         $this->_sql = '
             update postn

app/models/presence/Presence.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace modl;
+namespace Modl;
 
-class Presence extends ModlModel {
+class Presence extends Model {
     protected $id;
     
     protected $session;

app/models/presence/PresenceDAO.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace modl;
+namespace Modl;
 
-class PresenceDAO extends ModlSQL {
+class PresenceDAO extends SQL {
     function __construct() {
         parent::__construct();
     }

app/models/privacy/Privacy.php

@@ -2,7 +2,7 @@
 
 namespace modl;
 
-class Privacy extends ModlModel {    
+class Privacy extends Model {    
     public $pkey;
     public $value;
     protected $hash;

app/models/privacy/PrivacyDAO.php

@@ -2,7 +2,7 @@
 
 namespace modl;
 
-class PrivacyDAO extends ModlSQL {    
+class PrivacyDAO extends SQL {    
     function set(Privacy $p) {        
         $this->_sql = '
             update privacy

app/models/rosterlink/RosterLink.php

@@ -2,7 +2,7 @@
 
 namespace modl;
 
-class RosterLink extends ModlModel {    
+class RosterLink extends Model {    
     public $session;
     public $jid;
     

app/models/rosterlink/RosterLinkDAO.php

@@ -2,7 +2,7 @@
 
 namespace modl;
 
-class RosterLinkDAO extends ModlSQL {
+class RosterLinkDAO extends SQL {
     function set(RosterLink $r) { 
         $this->_sql = '
             insert into rosterlink

app/models/session/Session.php

@@ -2,7 +2,7 @@
 
 namespace modl;
 
-class Session extends ModlModel {    
+class Session extends Model {    
     public $name;
     public $value;
     public $session;

app/models/session/SessionDAO.php

@@ -2,7 +2,7 @@
 
 namespace modl;
 
-class SessionDAO extends ModlSQL {
+class SessionDAO extends SQL {
     function set($session, $container, $name, $value) {
         $timestamp = date(DATE_ISO8601);
 

app/models/sessionx/Sessionx.php

@@ -2,7 +2,7 @@
 
 namespace modl;
 
-class Sessionx extends ModlModel {
+class Sessionx extends Model {
     public $session;
     public $username;
     public $password;

app/models/sessionx/SessionxDAO.php

@@ -2,7 +2,7 @@
 
 namespace modl;
 
-class SessionxDAO extends ModlSQL {
+class SessionxDAO extends SQL {
     function init(Sessionx $s) {        
         $this->_sql = '
             update sessionx

app/models/subscription/Subscription.php

@@ -2,7 +2,7 @@
 
 namespace modl;
 
-class Subscription extends ModlModel {    
+class Subscription extends Model {    
     public $jid;
     public $server;
     public $node;

app/models/subscription/SubscriptionDAO.php

@@ -2,7 +2,7 @@
 
 namespace modl;
 
-class SubscriptionDAO extends ModlSQL {
+class SubscriptionDAO extends SQL {
     function set(Subscription $s) {
         $this->_sql = '
             update subscription

app/widgets/Admin/Admin.php

@@ -25,7 +25,7 @@ class Admin extends WidgetBase {
     function load()
     {
         $this->addjs('admin.js');
-        $this->_conf = \system\Conf::getServerConf();
+        $this->_conf = Conf::getServerConf();
     }
     
     private function isValid($what)

app/widgets/Login/Login.php

@@ -32,7 +32,7 @@ class Login extends WidgetBase {
     {
         $submit = $this->genCallAjax('ajaxLogin', "movim_parse_form('login')");
         $this->view->assign('submit', $submit);
-        $this->view->assign('conf',   \system\Conf::getServerConf($submit));
+        $this->view->assign('conf',   Conf::getServerConf($submit));
         $this->view->assign('submit_event', 
             'document.getElementById(\'submitb\').click();
             '.$submit.'
@@ -70,7 +70,7 @@ class Login extends WidgetBase {
             t('You can login with Facebook (chat only) using %syour.id@chat.facebook.com%s and your password',
                 '<a href="#" onclick="fillExample(\'your.id@chat.facebook.com \', \'\');">', '</a>'));
         
-        $conf = \system\Conf::getServerConf();
+        $conf = Conf::getServerConf();
         $whitelist = $conf['xmppWhiteList'];
         
         if(isset($whitelist) && $whitelist!=''){
@@ -207,7 +207,7 @@ class Login extends WidgetBase {
     function ajaxLogin($element)
     {
         // We get the Server Configuration
-        $serverconfig = \system\Conf::getServerConf();
+        $serverconfig = Conf::getServerConf();
         
         $warning = false;
 

app/widgets/System/System.php

@@ -27,7 +27,7 @@ class System extends WidgetBase {
             $this->view->assign('fail_safe',    '');
 
         // And we load some public values of the system configuration
-        $conf = \system\Conf::getServerConf();
+        $conf = Conf::getServerConf();
         $public_conf = array(
             'bosh_url' => $conf['boshUrl'],
             'timezone' => $conf['timezone']

bootstrap.php

@@ -6,6 +6,7 @@ if (!defined('DOCUMENT_ROOT')) die('Access denied');
  * @param string $className
  * @return boolean
  */
+/*
 function __autoload($className)
 {
     $className = ltrim($className, '\\');
@@ -24,13 +25,31 @@ function __autoload($className)
         return false;
     }
 }
+*/
+require 'vendor/autoload.php';
+//use Modl\Loader;
+//use Monolog\Logger;
+//use Monolog\Logger;
+//use Monolog\Handler\StreamHandler;
 
+//use Modl\Modl;
+
+//use Psr\Log\LoggerInterface;
+
+//$l = new Psr\Log\NullLogger;
+//$m = new Modl\Modl;
+// create a log channel
+//$log = new Logger('name');
+//$m = Modl::getInstance;
+//$m = new Modl\Loader;
+//print_r(get_declared_classes());
+//$m = new Modl;
 /**
  * Error Handler...
  */
 function systemErrorHandler ( $errno , $errstr , $errfile ,  $errline , $errcontext=null ) 
 {
-    \system\Logs\Logger::addLog( $errstr,$errno,'system',$errfile,$errline);
+    //\system\Logs\Logger::addLog( $errstr,$errno,'system',$errfile,$errline);
     return false;
 }
 
@@ -39,12 +58,16 @@ function systemErrorHandler ( $errno , $errstr , $errfile ,  $errline , $errcont
  */
 class Bootstrap {
     function boot() {
+        //define all needed constants
+        $this->setContants();
+
+        require_once(SYSTEM_PATH . "Conf.php");
+        
         mb_internal_encoding("UTF-8");
 
         //First thing to do, define error management (in case of error forward)
         $this->setLogs();
-        //define all needed constants
-        $this->setContants();
+        
         //Check if vital system need is OK
         $this->checkSystem();
 
@@ -217,7 +240,7 @@ class Bootstrap {
     
     private function setLogs() {
         try {
-            define('ENVIRONMENT',\system\Conf::getServerConfElement('environment'));
+            define('ENVIRONMENT', Conf::getServerConfElement('environment'));
         } catch (Exception $e) {
             define('ENVIRONMENT','development');//default environment is production
         }
@@ -247,33 +270,31 @@ class Bootstrap {
     
     private function setTimezone() {
         // We set the default timezone to the server timezone
-        $conf = \system\Conf::getServerConf();
+        $conf = Conf::getServerConf();
         if(isset($conf['timezone']))
             date_default_timezone_set($conf['timezone']);
     }
     
     private function loadModl() {
         // We load Movim Data Layer
-        require_once(LIB_PATH . 'Modl/loader.php');
-
-        $db = modl\Modl::getInstance();
+        $db = Modl\Modl::getInstance();
         $db->setModelsPath(APP_PATH.'models');
         
-        modl\loadModel('Presence');
-        modl\loadModel('Contact');
-        modl\loadModel('Privacy');
-        modl\loadModel('RosterLink');
-        modl\loadModel('Session');
-        modl\loadModel('Cache');
-        modl\loadModel('Postn');
-        modl\loadModel('Subscription');
-        modl\loadModel('Caps');
-        modl\loadModel('Item');
-        modl\loadModel('Message');
-        modl\loadModel('Sessionx');
-        modl\loadModel('Conference');
+        Modl\Utils::loadModel('Presence');
+        Modl\Utils::loadModel('Contact');
+        Modl\Utils::loadModel('Privacy');
+        Modl\Utils::loadModel('RosterLink');
+        Modl\Utils::loadModel('Session');
+        Modl\Utils::loadModel('Cache');
+        Modl\Utils::loadModel('Postn');
+        Modl\Utils::loadModel('Subscription');
+        Modl\Utils::loadModel('Caps');
+        Modl\Utils::loadModel('Item');
+        Modl\Utils::loadModel('Message');
+        Modl\Utils::loadModel('Sessionx');
+        Modl\Utils::loadModel('Conference');
         
-        $db->setConnectionArray(\System\Conf::getServerConf());
+        $db->setConnectionArray(Conf::getServerConf());
         $db->connect();
 
         return true;
@@ -339,15 +360,5 @@ class Bootstrap {
     private function startingSession() {
         $s = \Sessionx::start();
         $s->load();
-        //$s->load();
-        // Starting session.
-        //$sess = Session::start(APP_NAME);
-        //$session = $sess->get('session');
-        
-        //$this->user = new User;
-
-        /*$db = modl\Modl::getInstance();
-        $u = new User();
-        $db->setUser($u->getLogin());*/
     }
 }

composer.json

@@ -0,0 +1,6 @@
+{
+    "require": {
+        "monolog/monolog": "1.8.*",
+        "movim/modl": "dev-master"
+    }
+}

index.php

@@ -40,6 +40,17 @@
 define('DOCUMENT_ROOT', dirname(__FILE__));
 require_once(DOCUMENT_ROOT.'/bootstrap.php');
 
+use Monolog\Logger;
+use Monolog\Handler\StreamHandler;
+
+// create a log channel
+$log = new Logger('name');
+$log->pushHandler(new StreamHandler(DOCUMENT_ROOT.'/log/your.log', Logger::WARNING));
+
+// add records to the log
+$log->addWarning('Foo');
+$log->addError('Bar');
+
 try {
     if((isset($_GET['q']) && $_GET['q'] == 'admin') ||
        (isset($_GET['query']) && $_GET['query'] == 'admin')
@@ -87,4 +98,4 @@ try {
 } 
 
 //display only if not already done and if there is something to display
-\system\Logs\Logger::displayFooterDebug();
+//\system\Logs\Logger::displayFooterDebug();

system/Conf.php

@@ -1,5 +1,5 @@
 <?php
-namespace system;
+//namespace system;
 if (!defined('DOCUMENT_ROOT')) die('Access denied');
 
 class Conf

system/Event.php

@@ -6,7 +6,7 @@ class Event
 
     function __construct()
     {
-        $this->conf = new \system\Conf();
+        $this->conf = new Conf();
     }
 
     function runEvent($type, $event = false)

system/RPC.php

@@ -40,7 +40,7 @@ class RPC
 
             self::$funcalls[] = $funcall;
         } elseif(isset($args[0])) {
-            \system\Logs\Logger::log('RPC cleaning system : '.$funcname.', '.$args[0].' cleared');
+            //\system\Logs\Logger::log('RPC cleaning system : '.$funcname.', '.$args[0].' cleared');
         }
     }
 

system/Sessionx.php

@@ -93,7 +93,7 @@ class Sessionx {
     }
 
     public function init($user, $pass, $host, $domain) {
-        $serverconfig = \system\Conf::getServerConf();
+        $serverconfig = Conf::getServerConf();
         
         $this->_url         = $serverconfig['boshUrl'];
         $this->_port        = 5222;

system/User.php

@@ -41,7 +41,7 @@ class User {
             if($session->config)
                 $this->config = $session->config;
 
-            $this->sizelimit = (int)\system\Conf::getServerConfElement('sizeLimit');
+            $this->sizelimit = (int)Conf::getServerConfElement('sizeLimit');
 
             $this->userdir = DOCUMENT_ROOT.'/users/'.$this->username.'/';
             $this->useruri = BASE_URI.'users/'.$this->username.'/';

system/template/TplPageBuilder.php

@@ -34,7 +34,7 @@ class TplPageBuilder
     function __construct(&$user = NULL)
     {
         $this->user = $user;
-        $conf = new \system\Conf();
+        $conf = new Conf();
         $this->theme = $conf->getServerConfElement('theme');
      
     }
@@ -226,7 +226,7 @@ class TplPageBuilder
     
     function displayFooterDebug()
     {
-        \system\Logs\Logger::displayFooterDebug();
+        //\system\Logs\Logger::displayFooterDebug();
     }
 }