From fcfae54a3a23c2dbef26ebe38bfb82a472af27ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaussoin=20Timoth=C3=A9e?= Date: Wed, 26 Mar 2014 10:38:23 +0100 Subject: [PATCH] - 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 | 2 +- app/helpers/StringHelper.php | 2 +- app/models/cache/Cache.php | 2 +- app/models/cache/CacheDAO.php | 2 +- app/models/caps/Caps.php | 2 +- app/models/caps/CapsDAO.php | 2 +- app/models/conference/Conference.php | 2 +- app/models/conference/ConferenceDAO.php | 2 +- app/models/contact/Contact.php | 28 ++++---- app/models/contact/ContactDAO.php | 2 +- app/models/item/Item.php | 4 +- app/models/item/ItemDAO.php | 2 +- app/models/message/Message.php | 2 +- app/models/message/MessageDAO.php | 2 +- app/models/postn/Postn.php | 2 +- app/models/postn/PostnDAO.php | 2 +- app/models/presence/Presence.php | 4 +- app/models/presence/PresenceDAO.php | 4 +- app/models/privacy/Privacy.php | 2 +- app/models/privacy/PrivacyDAO.php | 2 +- app/models/rosterlink/RosterLink.php | 2 +- app/models/rosterlink/RosterLinkDAO.php | 2 +- app/models/session/Session.php | 2 +- app/models/session/SessionDAO.php | 2 +- app/models/sessionx/Sessionx.php | 2 +- app/models/sessionx/SessionxDAO.php | 2 +- app/models/subscription/Subscription.php | 2 +- app/models/subscription/SubscriptionDAO.php | 2 +- app/widgets/Admin/Admin.php | 2 +- app/widgets/Login/Login.php | 6 +- app/widgets/System/System.php | 2 +- bootstrap.php | 75 ++++++++++++--------- composer.json | 6 ++ index.php | 13 +++- system/Conf.php | 2 +- system/Event.php | 2 +- system/RPC.php | 2 +- system/Sessionx.php | 2 +- system/User.php | 2 +- system/template/TplPageBuilder.php | 4 +- 40 files changed, 118 insertions(+), 88 deletions(-) create mode 100644 composer.json diff --git a/app/controllers/AdminloginController.php b/app/controllers/AdminloginController.php index d41ce2485..a9fbfae02 100644 --- a/app/controllers/AdminloginController.php +++ b/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'])) { diff --git a/app/helpers/StringHelper.php b/app/helpers/StringHelper.php index d927e5401..25ea7564e 100644 --- a/app/helpers/StringHelper.php +++ b/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/'; diff --git a/app/models/cache/Cache.php b/app/models/cache/Cache.php index 75eeabe59..7beb45342 100644 --- a/app/models/cache/Cache.php +++ b/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; diff --git a/app/models/cache/CacheDAO.php b/app/models/cache/CacheDAO.php index 869686259..a1ca5ffc3 100644 --- a/app/models/cache/CacheDAO.php +++ b/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 diff --git a/app/models/caps/Caps.php b/app/models/caps/Caps.php index 38010d34b..b0065f35d 100644 --- a/app/models/caps/Caps.php +++ b/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; diff --git a/app/models/caps/CapsDAO.php b/app/models/caps/CapsDAO.php index 897b79af7..effa7a22e 100644 --- a/app/models/caps/CapsDAO.php +++ b/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 diff --git a/app/models/conference/Conference.php b/app/models/conference/Conference.php index f96e35b76..3f951533c 100644 --- a/app/models/conference/Conference.php +++ b/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; diff --git a/app/models/conference/ConferenceDAO.php b/app/models/conference/ConferenceDAO.php index 84dc50aaf..6ea033014 100644 --- a/app/models/conference/ConferenceDAO.php +++ b/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 diff --git a/app/models/contact/Contact.php b/app/models/contact/Contact.php index da55f414f..efed17862 100644 --- a/app/models/contact/Contact.php +++ b/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; + } } } diff --git a/app/models/contact/ContactDAO.php b/app/models/contact/ContactDAO.php index e752c6a51..1cc2ed4d6 100644 --- a/app/models/contact/ContactDAO.php +++ b/app/models/contact/ContactDAO.php @@ -2,7 +2,7 @@ namespace modl; -class ContactDAO extends ModlSQL { +class ContactDAO extends SQL { function __construct() { parent::__construct(); } diff --git a/app/models/item/Item.php b/app/models/item/Item.php index 55df52c15..0d3152467 100644 --- a/app/models/item/Item.php +++ b/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; } diff --git a/app/models/item/ItemDAO.php b/app/models/item/ItemDAO.php index ddce0a57a..2c512c1b8 100644 --- a/app/models/item/ItemDAO.php +++ b/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 diff --git a/app/models/message/Message.php b/app/models/message/Message.php index 1829efbfe..1cfb2efa1 100644 --- a/app/models/message/Message.php +++ b/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; diff --git a/app/models/message/MessageDAO.php b/app/models/message/MessageDAO.php index eae98d518..9f01aff41 100644 --- a/app/models/message/MessageDAO.php +++ b/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 diff --git a/app/models/postn/Postn.php b/app/models/postn/Postn.php index eba11a947..2614819d5 100644 --- a/app/models/postn/Postn.php +++ b/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) diff --git a/app/models/postn/PostnDAO.php b/app/models/postn/PostnDAO.php index 499ba0a7e..5bddf7297 100644 --- a/app/models/postn/PostnDAO.php +++ b/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 diff --git a/app/models/presence/Presence.php b/app/models/presence/Presence.php index 5f0920cd7..7dc7185bc 100644 --- a/app/models/presence/Presence.php +++ b/app/models/presence/Presence.php @@ -1,8 +1,8 @@ _sql = ' update privacy diff --git a/app/models/rosterlink/RosterLink.php b/app/models/rosterlink/RosterLink.php index 9dfccfbd1..2668c419c 100644 --- a/app/models/rosterlink/RosterLink.php +++ b/app/models/rosterlink/RosterLink.php @@ -2,7 +2,7 @@ namespace modl; -class RosterLink extends ModlModel { +class RosterLink extends Model { public $session; public $jid; diff --git a/app/models/rosterlink/RosterLinkDAO.php b/app/models/rosterlink/RosterLinkDAO.php index 3e8e9edc4..9b86438f6 100644 --- a/app/models/rosterlink/RosterLinkDAO.php +++ b/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 diff --git a/app/models/session/Session.php b/app/models/session/Session.php index 3158bb57d..62777df6b 100644 --- a/app/models/session/Session.php +++ b/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; diff --git a/app/models/session/SessionDAO.php b/app/models/session/SessionDAO.php index 04e8e4211..92f92fe2f 100644 --- a/app/models/session/SessionDAO.php +++ b/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); diff --git a/app/models/sessionx/Sessionx.php b/app/models/sessionx/Sessionx.php index a3821a9d0..83a0bb5a4 100644 --- a/app/models/sessionx/Sessionx.php +++ b/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; diff --git a/app/models/sessionx/SessionxDAO.php b/app/models/sessionx/SessionxDAO.php index 307bf107c..8624e48a5 100644 --- a/app/models/sessionx/SessionxDAO.php +++ b/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 diff --git a/app/models/subscription/Subscription.php b/app/models/subscription/Subscription.php index 8e7e40591..7da74917e 100644 --- a/app/models/subscription/Subscription.php +++ b/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; diff --git a/app/models/subscription/SubscriptionDAO.php b/app/models/subscription/SubscriptionDAO.php index fd212c49f..69b741ac2 100644 --- a/app/models/subscription/SubscriptionDAO.php +++ b/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 diff --git a/app/widgets/Admin/Admin.php b/app/widgets/Admin/Admin.php index e65c4dcb6..355b8e932 100644 --- a/app/widgets/Admin/Admin.php +++ b/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) diff --git a/app/widgets/Login/Login.php b/app/widgets/Login/Login.php index 59b00799c..0bf57a20f 100644 --- a/app/widgets/Login/Login.php +++ b/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', '', '')); - $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; diff --git a/app/widgets/System/System.php b/app/widgets/System/System.php index 81b5cb60e..d762412ae 100644 --- a/app/widgets/System/System.php +++ b/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'] diff --git a/bootstrap.php b/bootstrap.php index d7f4a9d00..25085048e 100644 --- a/bootstrap.php +++ b/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());*/ } } diff --git a/composer.json b/composer.json new file mode 100644 index 000000000..7af9732d6 --- /dev/null +++ b/composer.json @@ -0,0 +1,6 @@ +{ + "require": { + "monolog/monolog": "1.8.*", + "movim/modl": "dev-master" + } +} diff --git a/index.php b/index.php index 3b5f6cfc5..37e756e63 100644 --- a/index.php +++ b/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(); diff --git a/system/Conf.php b/system/Conf.php index 2fb4ce5a2..b97766d51 100644 --- a/system/Conf.php +++ b/system/Conf.php @@ -1,5 +1,5 @@ conf = new \system\Conf(); + $this->conf = new Conf(); } function runEvent($type, $event = false) diff --git a/system/RPC.php b/system/RPC.php index 1744ead1d..3d9f95bd6 100644 --- a/system/RPC.php +++ b/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'); } } diff --git a/system/Sessionx.php b/system/Sessionx.php index d01fa9000..f72616e83 100644 --- a/system/Sessionx.php +++ b/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; diff --git a/system/User.php b/system/User.php index 3d60abb76..4b46b1c9f 100644 --- a/system/User.php +++ b/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.'/'; diff --git a/system/template/TplPageBuilder.php b/system/template/TplPageBuilder.php index 4a8219207..6662b03fe 100644 --- a/system/template/TplPageBuilder.php +++ b/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(); } }