xoops-svn Mailing List for XOOPS Web Application System (Page 120)

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Revision: 10397
          http://sourceforge.net/p/xoops/svn/10397
Author:   trabis
Date:     2012-12-15 22:45:23 +0000 (Sat, 15 Dec 2012)
Log Message:
-----------
Making use of Xoops_Module_Abstract

Modified Paths:
--------------
    XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/publisher/blocks/latest_news.php
    XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/publisher/class/publisher.php
    XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/publisher/class/utils.php
    XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/publisher/include/common.php

Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/publisher/blocks/latest_news.php
===================================================================

--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/publisher/blocks/latest_news.php	2012-12-15 22:44:59 UTC (rev 10396)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/publisher/blocks/latest_news.php	2012-12-15 22:45:23 UTC (rev 10397)
@@ -123,7 +123,7 @@
             $item['image'] = $image;
         }
 
-        if ($publisher->userIsModuleAdmin()) {
+        if ($publisher->IsUserAdmin()) {
             $item['admin'] = "<a href='" . PUBLISHER_URL . "/submit.php?itemid=" . $itemObj->getVar('itemid'). "'><img src='" . PUBLISHER_URL . "/images/links/edit.gif'" . " title='" . _CO_PUBLISHER_EDIT . "' alt='" . _CO_PUBLISHER_EDIT . "' /></a>&nbsp;";
             $item['admin'] .= "<a href='" . PUBLISHER_URL . "/admin/item.php?op=del&amp;itemid=" . $itemObj->getVar('itemid'). "'><img src='" . PUBLISHER_URL . "/images/links/delete.png'" . " title='" . _CO_PUBLISHER_DELETE . "' alt='" . _CO_PUBLISHER_DELETE . "' /></a>";
         } else {

Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/publisher/class/publisher.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/publisher/class/publisher.php	2012-12-15 22:44:59 UTC (rev 10396)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/publisher/class/publisher.php	2012-12-15 22:45:23 UTC (rev 10397)
@@ -21,194 +21,21 @@
  */
 defined("XOOPS_ROOT_PATH") or die("XOOPS root path not defined");
 
-class Publisher
+class Publisher extends Xoops_Module_Abstract
 {
     /**
-     * @var string
-     */
-    private $_dirname = '';
-
-    /**
-     * @var null|XoopsModule
-     */
-    private $_module = null;
-
-    /**
-     * @var bool
-     */
-    private $_debug = false;
-
-    /**
-     * @var null|bool
-     */
-    private $_userIsModuleAdmin = null;
-
-    /**
-     * @var bool
-     */
-    private $_isCurrentModule = false;
-
-    protected function __construct()
-    {
-        $this->_dirname = basename(dirname(dirname(__FILE__)));
-        if (Xoops::getInstance()->moduleDirname = $this->_dirname) {
-            $this->_isCurrentModule = true;
-        }
-    }
-
-    /**
-     * @return Publisher
-     */
-    static function getInstance()
-    {
-        static $instance = false;
-        if (!$instance) {
-            $instance = new self();
-        }
-        return $instance;
-    }
-
-    /**
-     * @param bool $debug
-     */
-    public function setDebug($debug)
-    {
-        $this->_debug = (bool)$debug;
-    }
-
-    /**
-     * @return null|XoopsModule
-     */
-    public function getModule()
-    {
-        if ($this->_module == null) {
-            $this->_initModule();
-        }
-        return $this->_module;
-    }
-
-    /**
-     * @param string $name
+     * Init the module
      *
-     * @return mixed
+     * @return null|void
      */
-    public function getConfig($name)
+    public function init()
     {
-        $name = strtolower($name);
-        $result = Xoops::getInstance()->getModuleConfig($name, $this->_dirname);
-        $this->_addLog("Getting config '{$name}' : " . $result);
-        return $result;
+        $this->setDirname('publisher');
+        $this->setDebug(true);
+        $this->loadLanguage('modinfo');
     }
 
     /**
-     * @param string $name
-     *
-     * @return XoopsObjectHandler
-     */
-    public function getHandler($name)
-    {
-        $name = strtolower($name);
-        $this->_addLog("Getting handler '{$name}'");
-        return Xoops::getInstance()->getModuleHandler($name, $this->_dirname);
-    }
-
-    public function disableCache()
-    {
-        Xoops::getInstance()->appendConfig('module_cache', array($this->getModule()->getVar('mid') => 0), true);
-        $this->_addLog("Disabling module cache");
-    }
-
-    public function userIsModuleAdmin()
-    {
-        $xoops = Xoops::getInstance();
-
-        if ($this->_userIsModuleAdmin != null) {
-            return $this->_userIsModuleAdmin;
-        }
-
-        if (!$xoops->isUser()) {
-            $this->_userIsModuleAdmin = false;
-        } else {
-            $this->_userIsModuleAdmin = $xoops->user->isAdmin($this->getModule()->getVar('mid'));
-        }
-
-        return $this->_userIsModuleAdmin;
-    }
-
-    public function isCurrentModule()
-    {
-        return $this->_isCurrentModule;
-    }
-
-    /**
-     * @param string $url
-     *
-     * @return string
-     */
-    public function url($url = '')
-    {
-        return Xoops::getInstance()->url('modules/' . $this->_dirname . '/' . $url);
-    }
-
-    /**
-     * @param string $path
-     *
-     * @return string
-     */
-    public function path($path = '')
-    {
-        return Xoops::getInstance()->path('modules/' . $this->_dirname . '/' . $path);
-    }
-
-    /**
-     * @param string $language
-     *
-     * @return string
-     */
-    public function loadLanguage($language)
-    {
-        Xoops::getInstance()->loadLanguage($language, $this->_dirname);
-        $this->_addLog("Loading language '{$language}'");
-    }
-
-    /**
-     * @param XoopsObject       $obj
-     * @param string            $name
-     *
-     * @return bool|XoopsForm
-     */
-    public function getForm(XoopsObject $obj, $name)
-    {
-        $name = strtolower($name);
-        $this->_addLog("Loading form '{$name}'");
-        return Xoops::getInstance()->getModuleForm($obj, $name, $this->_dirname);
-    }
-
-    private function _initModule()
-    {
-        $xoops = Xoops::getInstance();
-        if ($xoops->isModule() && ($xoops->module->getVar('dirname') == $this->_dirname)) {
-            $this->_module = $xoops->module;
-        } else {
-            $this->_module = $xoops->getHandlerModule()->getByDirname($this->_dirname);
-        }
-        $this->_addLog('INIT MODULE');
-    }
-
-    /**
-     * @param string $log
-     */
-    private function _addLog($log)
-    {
-        if ($this->_debug) {
-            $xoops = Xoops::getInstance();
-            if ($xoops->isActiveModule('logger')) {
-                Logger::getInstance()->addExtra($this->getModule()->getVar('name'), $log);
-            }
-        }
-    }
-
-    /**
      * @return PublisherItemHandler
      */
     public function getItemHandler()

Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/publisher/class/utils.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/publisher/class/utils.php	2012-12-15 22:44:59 UTC (rev 10396)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/publisher/class/utils.php	2012-12-15 22:45:23 UTC (rev 10397)
@@ -362,7 +362,7 @@
 
     static function userIsAdmin()
     {
-        return Publisher::getInstance()->userIsModuleAdmin();
+        return Publisher::getInstance()->IsUserAdmin();
     }
 
     /**

Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/publisher/include/common.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/publisher/include/common.php	2012-12-15 22:44:59 UTC (rev 10396)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/publisher/include/common.php	2012-12-15 22:45:23 UTC (rev 10397)
@@ -28,7 +28,6 @@
 define("PUBLISHER_UPLOADS_PATH", XOOPS_ROOT_PATH . '/uploads/' . PUBLISHER_DIRNAME);
 
 $publisher = Publisher::getInstance();
-$publisher->setDebug(true);
 $publisher->loadLanguage('common');
 
 XoopsLoad::loadFile($publisher->path('include/constants.php'));





2012	Jan	Feb (214)	Mar (139)	Apr (198)	May (187)	Jun (151)	Jul (210)	Aug (169)	Sep (58)	Oct (53)	Nov (54)	Dec (301)
2013	Jan (348)	Feb (178)	Mar (219)	Apr (154)	May (117)	Jun (194)	Jul (61)	Aug (132)	Sep (121)	Oct (110)	Nov (11)	Dec (18)
2014	Jan (34)	Feb (50)	Mar (82)	Apr (98)	May (39)	Jun (111)	Jul (67)	Aug (36)	Sep (33)	Oct (26)	Nov (53)	Dec (44)
2015	Jan (29)	Feb (47)	Mar (25)	Apr (19)	May (23)	Jun (20)	Jul (49)	Aug (7)	Sep (10)	Oct (10)	Nov (4)	Dec (25)
2016	Jan (8)	Feb (7)	Mar (1)	Apr	May (3)	Jun	Jul (1)	Aug (2)	Sep	Oct	Nov (7)	Dec (5)
2017	Jan (4)	Feb	Mar	Apr	May (15)	Jun	Jul (18)	Aug (24)	Sep	Oct (14)	Nov	Dec
2018	Jan	Feb (22)	Mar	Apr (11)	May (1)	Jun (17)	Jul (2)	Aug (2)	Sep	Oct (6)	Nov (5)	Dec
2019	Jan	Feb	Mar	Apr (1)	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec (2)
2025	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug (2)	Sep	Oct	Nov	Dec

xoops-svn Mailing List for XOOPS Web Application System (Page 120)

The world's leading content management systems (CMS) written in PHP

xoops-svn — All SVN commits will be posted to this ML