From: <tr...@us...> - 2011-10-27 00:17:07
|
Revision: 7984 http://xoops.svn.sourceforge.net/xoops/?rev=7984&view=rev Author: trabis Date: 2011-10-27 00:17:00 +0000 (Thu, 27 Oct 2011) Log Message: ----------- updating setActiveModules Modified Paths: -------------- XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoops.php XoopsCore/branches/2.6.x/2.6.0/htdocs/include/functions.php Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoops.php =================================================================== --- XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoops.php 2011-10-27 00:12:48 UTC (rev 7983) +++ XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoops.php 2011-10-27 00:17:00 UTC (rev 7984) @@ -567,7 +567,7 @@ } if (!$this->_activeModules = XoopsCache::read('system_modules_active')) { - $this->_activeModules = $this->_setActiveModules(); + $this->_activeModules = $this->setActiveModules(); } return $this->_activeModules; } @@ -580,7 +580,7 @@ * * @return array */ - private function _setActiveModules() + public function setActiveModules() { /* @var $module_handler XoopsModuleHandler */ $module_handler = xoops_gethandler('module'); Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/include/functions.php =================================================================== --- XoopsCore/branches/2.6.x/2.6.0/htdocs/include/functions.php 2011-10-27 00:12:48 UTC (rev 7983) +++ XoopsCore/branches/2.6.x/2.6.0/htdocs/include/functions.php 2011-10-27 00:17:00 UTC (rev 7984) @@ -26,7 +26,7 @@ function xoops_getHandler($name, $optional = false) { $xoops = Xoops::getInstance(); - $xoops->logger->addDeprecated(__FUNCTION__ . ' is deprecated. See how to replace in file ' . __FILE__ . ' line ' . __LINE__); + $xoops->logger->addDeprecated(__FUNCTION__ . ' is deprecated. See how to replace it in file ' . __FILE__ . ' line ' . __LINE__); return $xoops->getHandler($name, $optional); } @@ -39,7 +39,7 @@ function xoops_getModuleHandler($name = null, $module_dir = null, $optional = false) { $xoops = Xoops::getInstance(); - $xoops->logger->addDeprecated(__FUNCTION__ . ' is deprecated. See how to replace in file ' . __FILE__ . ' line ' . __LINE__); + $xoops->logger->addDeprecated(__FUNCTION__ . ' is deprecated. See how to replace it in file ' . __FILE__ . ' line ' . __LINE__); return $xoops->getModuleHandler($name, $module_dir, $optional); } @@ -55,7 +55,7 @@ function xoops_load($name, $type = 'core') { $xoops = Xoops::getInstance(); - $xoops->logger->addDeprecated(__FUNCTION__ . ' is deprecated. See how to replace in file ' . __FILE__ . ' line ' . __LINE__); + $xoops->logger->addDeprecated(__FUNCTION__ . ' is deprecated. See how to replace it in file ' . __FILE__ . ' line ' . __LINE__); return $xoops->load($name, $type); } @@ -74,7 +74,7 @@ function xoops_loadLanguage($name, $domain = '', $language = null) { $xoops = Xoops::getInstance(); - $xoops->logger->addDeprecated(__FUNCTION__ . ' is deprecated since XOOPS 2.6.0. See how to replace in file ' . __FILE__ . ' line ' . __LINE__); + $xoops->logger->addDeprecated(__FUNCTION__ . ' is deprecated since XOOPS 2.6.0. See how to replace it in file ' . __FILE__ . ' line ' . __LINE__); return $xoops->loadLanguage($name, $domain, $language); } @@ -89,7 +89,7 @@ function xoops_getActiveModules() { $xoops = Xoops::getInstance(); - $xoops->logger->addDeprecated(__FUNCTION__ . ' is deprecated since XOOPS 2.6.0. See how to replace in file ' . __FILE__ . ' line ' . __LINE__); + $xoops->logger->addDeprecated(__FUNCTION__ . ' is deprecated since XOOPS 2.6.0. See how to replace it in file ' . __FILE__ . ' line ' . __LINE__); return $xoops->getActiveModules(); } @@ -103,7 +103,9 @@ */ function xoops_setActiveModules() { - exit('xoops_setActiveModules is deprecated'); + $xoops = Xoops::getInstance(); + $xoops->logger->addDeprecated(__FUNCTION__ . ' is deprecated since XOOPS 2.6.0. See how to replace it in file ' . __FILE__ . ' line ' . __LINE__); + return $xoops->setActiveModules(); } /** @@ -118,7 +120,7 @@ function xoops_isActiveModule($dirname) { $xoops = Xoops::getInstance(); - $xoops->logger->addDeprecated(__FUNCTION__ . ' is deprecated since XOOPS 2.6.0. See how to replace in file ' . __FILE__ . ' line ' . __LINE__); + $xoops->logger->addDeprecated(__FUNCTION__ . ' is deprecated since XOOPS 2.6.0. See how to replace it in file ' . __FILE__ . ' line ' . __LINE__); return $xoops->isActiveModule($dirname); } @@ -129,7 +131,7 @@ function xoops_header($closehead = true) { $xoops = Xoops::getInstance(); - $xoops->logger->addDeprecated(__FUNCTION__ . ' is deprecated since XOOPS 2.6.0. See how to replace in file ' . __FILE__ . ' line ' . __LINE__); + $xoops->logger->addDeprecated(__FUNCTION__ . ' is deprecated since XOOPS 2.6.0. See how to replace it in file ' . __FILE__ . ' line ' . __LINE__); $xoops->simpleHeader($closehead); } @@ -139,7 +141,7 @@ function xoops_footer() { $xoops = Xoops::getInstance(); - $xoops->logger->addDeprecated(__FUNCTION__ . ' is deprecated since XOOPS 2.6.0. See how to replace in file ' . __FILE__ . ' line ' . __LINE__); + $xoops->logger->addDeprecated(__FUNCTION__ . ' is deprecated since XOOPS 2.6.0. See how to replace it in file ' . __FILE__ . ' line ' . __LINE__); $xoops->simpleFooter(); } @@ -151,7 +153,7 @@ function xoops_error($msg, $title = '') { $xoops = Xoops::getInstance(); - $xoops->logger->addDeprecated(__FUNCTION__ . ' is deprecated since XOOPS 2.6.0. See how to replace in file ' . __FILE__ . ' line ' . __LINE__); + $xoops->logger->addDeprecated(__FUNCTION__ . ' is deprecated since XOOPS 2.6.0. See how to replace it in file ' . __FILE__ . ' line ' . __LINE__); $xoops->error($msg, $title); } @@ -163,7 +165,7 @@ function xoops_result($msg, $title = '') { $xoops = Xoops::getInstance(); - $xoops->logger->addDeprecated(__FUNCTION__ . ' is deprecated since XOOPS 2.6.0. See how to replace in file ' . __FILE__ . ' line ' . __LINE__); + $xoops->logger->addDeprecated(__FUNCTION__ . ' is deprecated since XOOPS 2.6.0. See how to replace it in file ' . __FILE__ . ' line ' . __LINE__); $xoops->result($msg, $title); } @@ -178,7 +180,7 @@ function xoops_confirm($hiddens, $action, $msg, $submit = '', $addtoken = true) { $xoops = Xoops::getInstance(); - $xoops->logger->addDeprecated(__FUNCTION__ . ' is deprecated since XOOPS 2.6.0. See how to replace in file ' . __FILE__ . ' line ' . __LINE__); + $xoops->logger->addDeprecated(__FUNCTION__ . ' is deprecated since XOOPS 2.6.0. See how to replace it in file ' . __FILE__ . ' line ' . __LINE__); $xoops->error($hiddens, $action, $msg, $submit, $addtoken); } @@ -190,7 +192,7 @@ function xoops_getUserTimestamp($time, $timeoffset = '') { $xoops = Xoops::getInstance(); - $xoops->logger->addDeprecated(__FUNCTION__ . ' is deprecated since XOOPS 2.6.0. See how to replace in file ' . __FILE__ . ' line ' . __LINE__); + $xoops->logger->addDeprecated(__FUNCTION__ . ' is deprecated since XOOPS 2.6.0. See how to replace it in file ' . __FILE__ . ' line ' . __LINE__); return $xoops->getUserTimestamp($time, $timeoffset); } @@ -205,7 +207,7 @@ function formatTimestamp($time, $format = 'l', $timeoffset = '') { $xoops = Xoops::getInstance(); - $xoops->logger->addDeprecated(__FUNCTION__ . ' is deprecated since XOOPS 2.6.0. See how to replace in file ' . __FILE__ . ' line ' . __LINE__); + $xoops->logger->addDeprecated(__FUNCTION__ . ' is deprecated since XOOPS 2.6.0. See how to replace it in file ' . __FILE__ . ' line ' . __LINE__); return $xoops->formatTimestamp($time, $format, $timeoffset); } @@ -219,7 +221,7 @@ function userTimeToServerTime($timestamp, $userTZ = null) { $xoops = Xoops::getInstance(); - $xoops->logger->addDeprecated(__FUNCTION__ . ' is deprecated since XOOPS 2.6.0. See how to replace in file ' . __FILE__ . ' line ' . __LINE__); + $xoops->logger->addDeprecated(__FUNCTION__ . ' is deprecated since XOOPS 2.6.0. See how to replace it in file ' . __FILE__ . ' line ' . __LINE__); return $xoops->userTimeToServerTime($timestamp, $userTZ); } @@ -229,7 +231,7 @@ function xoops_makepass() { $xoops = Xoops::getInstance(); - $xoops->logger->addDeprecated(__FUNCTION__ . ' is deprecated since XOOPS 2.6.0. See how to replace in file ' . __FILE__ . ' line ' . __LINE__); + $xoops->logger->addDeprecated(__FUNCTION__ . ' is deprecated since XOOPS 2.6.0. See how to replace it in file ' . __FILE__ . ' line ' . __LINE__); return $xoops->makePass(); } @@ -241,7 +243,7 @@ function checkEmail($email, $antispam = false) { $xoops = Xoops::getInstance(); - $xoops->logger->addDeprecated(__FUNCTION__ . ' is deprecated since XOOPS 2.6.0. See how to replace in file ' . __FILE__ . ' line ' . __LINE__); + $xoops->logger->addDeprecated(__FUNCTION__ . ' is deprecated since XOOPS 2.6.0. See how to replace it in file ' . __FILE__ . ' line ' . __LINE__); return $xoops->checkEmail($email, $antispam); } @@ -252,7 +254,7 @@ function formatURL($url) { $xoops = Xoops::getInstance(); - $xoops->logger->addDeprecated(__FUNCTION__ . ' is deprecated since XOOPS 2.6.0. See how to replace in file ' . __FILE__ . ' line ' . __LINE__); + $xoops->logger->addDeprecated(__FUNCTION__ . ' is deprecated since XOOPS 2.6.0. See how to replace it in file ' . __FILE__ . ' line ' . __LINE__); return $xoops->formatURL($url); } @@ -264,7 +266,7 @@ function xoops_getbanner() { $xoops = Xoops::getInstance(); - $xoops->logger->addDeprecated(__FUNCTION__ . ' is deprecated since XOOPS 2.6.0. See how to replace in file ' . __FILE__ . ' line ' . __LINE__); + $xoops->logger->addDeprecated(__FUNCTION__ . ' is deprecated since XOOPS 2.6.0. See how to replace it in file ' . __FILE__ . ' line ' . __LINE__); return $xoops->getBanner(); } @@ -281,7 +283,7 @@ function redirect_header($url, $time = 3, $message = '', $addredirect = true, $allowExternalLink = false) { $xoops = Xoops::getInstance(); - $xoops->logger->addDeprecated(__FUNCTION__ . ' is deprecated since XOOPS 2.6.0. See how to replace in file ' . __FILE__ . ' line ' . __LINE__); + $xoops->logger->addDeprecated(__FUNCTION__ . ' is deprecated since XOOPS 2.6.0. See how to replace it in file ' . __FILE__ . ' line ' . __LINE__); $xoops->redirect($url, $time, $message, $addredirect, $allowExternalLink); } @@ -292,7 +294,7 @@ function xoops_getenv($key) { $xoops = Xoops::getInstance(); - $xoops->logger->addDeprecated(__FUNCTION__ . ' is deprecated since XOOPS 2.6.0. See how to replace in file ' . __FILE__ . ' line ' . __LINE__); + $xoops->logger->addDeprecated(__FUNCTION__ . ' is deprecated since XOOPS 2.6.0. See how to replace it in file ' . __FILE__ . ' line ' . __LINE__); return $xoops->getEnv($key); } @@ -305,7 +307,7 @@ function xoops_getcss($theme = '') { $xoops = Xoops::getInstance(); - $xoops->logger->addDeprecated(__FUNCTION__ . ' is deprecated since XOOPS 2.6.0. See how to replace in file ' . __FILE__ . ' line ' . __LINE__); + $xoops->logger->addDeprecated(__FUNCTION__ . ' is deprecated since XOOPS 2.6.0. See how to replace it in file ' . __FILE__ . ' line ' . __LINE__); return $xoops->getCss($theme); } @@ -315,7 +317,7 @@ function xoops_getMailer() { $xoops = Xoops::getInstance(); - $xoops->logger->addDeprecated(__FUNCTION__ . ' is deprecated since XOOPS 2.6.0. See how to replace in file ' . __FILE__ . ' line ' . __LINE__); + $xoops->logger->addDeprecated(__FUNCTION__ . ' is deprecated since XOOPS 2.6.0. See how to replace it in file ' . __FILE__ . ' line ' . __LINE__); return $xoops->getMailer(); } @@ -327,7 +329,7 @@ function xoops_getrank($rank_id = 0, $posts = 0) { $xoops = Xoops::getInstance(); - $xoops->logger->addDeprecated(__FUNCTION__ . ' is deprecated since XOOPS 2.6.0. See how to replace in file ' . __FILE__ . ' line ' . __LINE__); + $xoops->logger->addDeprecated(__FUNCTION__ . ' is deprecated since XOOPS 2.6.0. See how to replace it in file ' . __FILE__ . ' line ' . __LINE__); return $xoops->getRank($rank_id, $posts); } @@ -343,7 +345,7 @@ function xoops_substr($str, $start, $length, $trimmarker = '...') { $xoops = Xoops::getInstance(); - $xoops->logger->addDeprecated(__FUNCTION__ . ' is deprecated since XOOPS 2.6.0. See how to replace in file ' . __FILE__ . ' line ' . __LINE__); + $xoops->logger->addDeprecated(__FUNCTION__ . ' is deprecated since XOOPS 2.6.0. See how to replace it in file ' . __FILE__ . ' line ' . __LINE__); return $xoops->substr($str, $start, $length, $trimmarker); } @@ -354,7 +356,7 @@ function xoops_notification_deletebymodule($module_id) { $xoops = Xoops::getInstance(); - $xoops->logger->addDeprecated(__FUNCTION__ . ' is deprecated since XOOPS 2.6.0. See how to replace in file ' . __FILE__ . ' line ' . __LINE__); + $xoops->logger->addDeprecated(__FUNCTION__ . ' is deprecated since XOOPS 2.6.0. See how to replace it in file ' . __FILE__ . ' line ' . __LINE__); return $xoops->notificationDeleteByModule($module_id); } @@ -367,7 +369,7 @@ function xoops_notification_deletebyuser($user_id) { $xoops = Xoops::getInstance(); - $xoops->logger->addDeprecated(__FUNCTION__ . ' is deprecated since XOOPS 2.6.0. See how to replace in file ' . __FILE__ . ' line ' . __LINE__); + $xoops->logger->addDeprecated(__FUNCTION__ . ' is deprecated since XOOPS 2.6.0. See how to replace it in file ' . __FILE__ . ' line ' . __LINE__); return $xoops->notificationDeleteByUser($user_id); } @@ -382,7 +384,7 @@ function xoops_notification_deletebyitem($module_id, $category, $item_id) { $xoops = Xoops::getInstance(); - $xoops->logger->addDeprecated(__FUNCTION__ . ' is deprecated since XOOPS 2.6.0. See how to replace in file ' . __FILE__ . ' line ' . __LINE__); + $xoops->logger->addDeprecated(__FUNCTION__ . ' is deprecated since XOOPS 2.6.0. See how to replace it in file ' . __FILE__ . ' line ' . __LINE__); return $xoops->notificationDeleteByItem($module_id, $category, $item_id); } @@ -396,7 +398,7 @@ function xoops_comment_count($module_id, $item_id = null) { $xoops = Xoops::getInstance(); - $xoops->logger->addDeprecated(__FUNCTION__ . ' is deprecated since XOOPS 2.6.0. See how to replace in file ' . __FILE__ . ' line ' . __LINE__); + $xoops->logger->addDeprecated(__FUNCTION__ . ' is deprecated since XOOPS 2.6.0. See how to replace it in file ' . __FILE__ . ' line ' . __LINE__); return $xoops->commentCount($module_id, $item_id); } @@ -410,7 +412,7 @@ function xoops_comment_delete($module_id, $item_id) { $xoops = Xoops::getInstance(); - $xoops->logger->addDeprecated(__FUNCTION__ . ' is deprecated since XOOPS 2.6.0. See how to replace in file ' . __FILE__ . ' line ' . __LINE__); + $xoops->logger->addDeprecated(__FUNCTION__ . ' is deprecated since XOOPS 2.6.0. See how to replace it in file ' . __FILE__ . ' line ' . __LINE__); return $xoops->commentDelete($module_id, $item_id); } @@ -427,7 +429,7 @@ function xoops_groupperm_deletebymoditem($module_id, $perm_name, $item_id = null) { $xoops = Xoops::getInstance(); - $xoops->logger->addDeprecated(__FUNCTION__ . ' is deprecated since XOOPS 2.6.0. See how to replace in file ' . __FILE__ . ' line ' . __LINE__); + $xoops->logger->addDeprecated(__FUNCTION__ . ' is deprecated since XOOPS 2.6.0. See how to replace it in file ' . __FILE__ . ' line ' . __LINE__); return $xoops->grouppermDeleteByModItem($module_id, $perm_name, $item_id); } @@ -440,7 +442,7 @@ function xoops_utf8_encode(&$text) { $xoops = Xoops::getInstance(); - $xoops->logger->addDeprecated(__FUNCTION__ . ' is deprecated since XOOPS 2.6.0. See how to replace in file ' . __FILE__ . ' line ' . __LINE__); + $xoops->logger->addDeprecated(__FUNCTION__ . ' is deprecated since XOOPS 2.6.0. See how to replace it in file ' . __FILE__ . ' line ' . __LINE__); $xoops->utf8_encode($text); } @@ -453,7 +455,7 @@ function xoops_convert_encoding(&$text) { $xoops = Xoops::getInstance(); - $xoops->logger->addDeprecated(__FUNCTION__ . ' is deprecated since XOOPS 2.6.0. See how to replace in file ' . __FILE__ . ' line ' . __LINE__); + $xoops->logger->addDeprecated(__FUNCTION__ . ' is deprecated since XOOPS 2.6.0. See how to replace it in file ' . __FILE__ . ' line ' . __LINE__); $xoops->convertEncoding($text); } @@ -466,7 +468,7 @@ function xoops_trim($text) { $xoops = Xoops::getInstance(); - $xoops->logger->addDeprecated(__FUNCTION__ . ' is deprecated since XOOPS 2.6.0. See how to replace in file ' . __FILE__ . ' line ' . __LINE__); + $xoops->logger->addDeprecated(__FUNCTION__ . ' is deprecated since XOOPS 2.6.0. See how to replace it in file ' . __FILE__ . ' line ' . __LINE__); return $xoops->trim($text); } @@ -482,7 +484,7 @@ function xoops_getOption($option) { $xoops = Xoops::getInstance(); - $xoops->logger->addDeprecated(__FUNCTION__ . ' is deprecated since XOOPS 2.6.0. See how to replace in file ' . __FILE__ . ' line ' . __LINE__); + $xoops->logger->addDeprecated(__FUNCTION__ . ' is deprecated since XOOPS 2.6.0. See how to replace it in file ' . __FILE__ . ' line ' . __LINE__); return $xoops->getOption($option); } @@ -500,7 +502,7 @@ function xoops_getConfigOption($option, $type = 'XOOPS_CONF') { $xoops = Xoops::getInstance(); - $xoops->logger->addDeprecated(__FUNCTION__ . ' is deprecated since XOOPS 2.6.0. See how to replace in file ' . __FILE__ . ' line ' . __LINE__); + $xoops->logger->addDeprecated(__FUNCTION__ . ' is deprecated since XOOPS 2.6.0. See how to replace it in file ' . __FILE__ . ' line ' . __LINE__); return $xoops->getConfig($option, $type); } /** @@ -517,7 +519,7 @@ function xoops_setConfigOption($option, $new = null) { $xoops = Xoops::getInstance(); - $xoops->logger->addDeprecated(__FUNCTION__ . ' is deprecated since XOOPS 2.6.0. See how to replace in file ' . __FILE__ . ' line ' . __LINE__); + $xoops->logger->addDeprecated(__FUNCTION__ . ' is deprecated since XOOPS 2.6.0. See how to replace it in file ' . __FILE__ . ' line ' . __LINE__); $xoops->setConfig($option, $new); } @@ -536,7 +538,7 @@ function xoops_getModuleOption($option, $dirname = '') { $xoops = Xoops::getInstance(); - $xoops->logger->addDeprecated(__FUNCTION__ . ' is deprecated since XOOPS 2.6.0. See how to replace in file ' . __FILE__ . ' line ' . __LINE__); + $xoops->logger->addDeprecated(__FUNCTION__ . ' is deprecated since XOOPS 2.6.0. See how to replace it in file ' . __FILE__ . ' line ' . __LINE__); return $xoops->getModuleConfig($option, $dirname); } @@ -554,7 +556,7 @@ function xoops_getBaseDomain($url, $debug = 0) { $xoops = Xoops::getInstance(); - $xoops->logger->addDeprecated(__FUNCTION__ . ' is deprecated since XOOPS 2.6.0. See how to replace in file ' . __FILE__ . ' line ' . __LINE__); + $xoops->logger->addDeprecated(__FUNCTION__ . ' is deprecated since XOOPS 2.6.0. See how to replace it in file ' . __FILE__ . ' line ' . __LINE__); return $xoops->getBaseDomain($url, $debug); } @@ -571,7 +573,7 @@ function xoops_getUrlDomain($url) { $xoops = Xoops::getInstance(); - $xoops->logger->addDeprecated(__FUNCTION__ . ' is deprecated since XOOPS 2.6.0. See how to replace in file ' . __FILE__ . ' line ' . __LINE__); + $xoops->logger->addDeprecated(__FUNCTION__ . ' is deprecated since XOOPS 2.6.0. See how to replace it in file ' . __FILE__ . ' line ' . __LINE__); return $xoops->getUrlDomain($url); } @@ -585,7 +587,7 @@ function xoops_template_touch($tpl_id, $clear_old = true) { $xoops = Xoops::getInstance(); - $xoops->logger->addDeprecated(__FUNCTION__ . ' is deprecated since XOOPS 2.6.0. See how to replace in file ' . __FILE__ . ' line ' . __LINE__); + $xoops->logger->addDeprecated(__FUNCTION__ . ' is deprecated since XOOPS 2.6.0. See how to replace it in file ' . __FILE__ . ' line ' . __LINE__); return $xoops->templateTouch($tpl_id, $clear_old); } @@ -598,6 +600,6 @@ function xoops_template_clear_module_cache($mid) { $xoops = Xoops::getInstance(); - $xoops->logger->addDeprecated(__FUNCTION__ . ' is deprecated since XOOPS 2.6.0. See how to replace in file ' . __FILE__ . ' line ' . __LINE__); + $xoops->logger->addDeprecated(__FUNCTION__ . ' is deprecated since XOOPS 2.6.0. See how to replace it in file ' . __FILE__ . ' line ' . __LINE__); $xoops->templateClearModuleCache($mid); } \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |