Menu
▾
▴
[xoops-svn] SF.net SVN: xoops:[7989] XoopsCore/branches/2.6.x/2.6.0/htdocs
|
From: <tr...@us...> - 2011-10-28 20:46:38
|
Revision: 7989
http://xoops.svn.sourceforge.net/xoops/?rev=7989&view=rev
Author: trabis
Date: 2011-10-28 20:46:30 +0000 (Fri, 28 Oct 2011)
Log Message:
-----------
Adding get methods for kernel handlers
Modified Paths:
--------------
XoopsCore/branches/2.6.x/2.6.0/htdocs/Frameworks/art/functions.config.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/class/auth/auth_provisionning.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/class/auth/auth_xoops.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/class/cache/model.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/class/commentrenderer.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/class/theme.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/class/theme_blocks.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/class/userutility.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoops.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsform/formselectcheckgroup.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsform/formselectgroup.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsform/formselectuser.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsform/grouppermform.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsmailer.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/edituser.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/image.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/imagemanager.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/include/checklogin.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/include/common.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/include/functions.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/index.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/lostpass.php
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/Frameworks/art/functions.config.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/Frameworks/art/functions.config.php 2011-10-27 23:15:24 UTC (rev 7988)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/Frameworks/art/functions.config.php 2011-10-28 20:46:30 UTC (rev 7989)
@@ -69,14 +69,12 @@
}
$xoops = Xoops::getInstance();
- /* @var $module_handler XoopsModuleHandler */
- $module_handler = $xoops->getHandler('module');
+ $module_handler = $xoops->getModuleHandler();
if (!$module = $module_handler->getByDirname($dirname)) {
trigger_error("Module '{$dirname}' does not exist", E_USER_WARNING);
return null;
}
- /* @var $config_handler XoopsConfigHandler */
- $config_handler = $xoops->getHandler('config');
+ $config_handler = $xoops->getConfigHandler();
$criteria = new CriteriaCompo(new Criteria('conf_modid', $module->getVar('mid')));
$configs = $config_handler->getConfigs($criteria);
$moduleConfig = array();
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/class/auth/auth_provisionning.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/class/auth/auth_provisionning.php 2011-10-27 23:15:24 UTC (rev 7988)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/class/auth/auth_provisionning.php 2011-10-28 20:46:30 UTC (rev 7989)
@@ -101,8 +101,7 @@
public function getXoopsUser($uname)
{
$xoops = Xoops::getInstance();
- /* @var $member_handler XoopsMemberHandler */
- $member_handler = $xoops->getHandler('member');
+ $member_handler = $xoops->getMemberHandler();
$criteria = new Criteria('uname', $uname);
$getuser = $member_handler->getUsers($criteria);
if (count($getuser) == 1) {
@@ -152,8 +151,7 @@
{
$xoops = Xoops::getInstance();
$ret = false;
- /* @var $member_handler XoopsMemberHandler */
- $member_handler = $xoops->getHandler('member');
+ $member_handler = $xoops->getMemberHandler();
// Create XOOPS Database User
$newuser = $member_handler->createUser();
$newuser->setVar('uname', $uname);
@@ -196,8 +194,7 @@
{
$xoops = Xoops::getInstance();
$ret = false;
- /* @var $member_handler XoopsMemberHandler */
- $member_handler = $xoops->getHandler('member');
+ $member_handler = $xoops->getMemberHandler();
$xoopsUser->setVar('pass', md5(stripslashes($pwd)));
$tab_mapping = explode('|', $this->ldap_field_mapping);
foreach ($tab_mapping as $mapping) {
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/class/auth/auth_xoops.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/class/auth/auth_xoops.php 2011-10-27 23:15:24 UTC (rev 7988)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/class/auth/auth_xoops.php 2011-10-28 20:46:30 UTC (rev 7989)
@@ -51,8 +51,7 @@
public function authenticate($uname, $pwd = null)
{
$xoops = Xoops::getInstance();
- /* @var $member_handler XoopsMemberHandler */
- $member_handler = $xoops->getHandler('member');
+ $member_handler = $xoops->getMemberHandler();
$user = $member_handler->loginUser($uname, $pwd);
if ($user == false) {
$this->setErrors(1, _US_INCORRECTLOGIN);
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/class/cache/model.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/class/cache/model.php 2011-10-27 23:15:24 UTC (rev 7988)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/class/cache/model.php 2011-10-28 20:46:30 UTC (rev 7989)
@@ -89,7 +89,7 @@
$defaults = array('fields' => array('data', 'expires'));
$this->settings = array_merge($defaults, $this->settings);
$this->fields = $this->settings['fields'];
- $this->model = Xoops::getInstance()->getHandler('cachemodel');
+ $this->model = Xoops::getInstance()->getCachemodelHandler();
return true;
}
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/class/commentrenderer.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/class/commentrenderer.php 2011-10-27 23:15:24 UTC (rev 7988)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/class/commentrenderer.php 2011-10-28 20:46:30 UTC (rev 7989)
@@ -326,9 +326,7 @@
{
$poster['id'] = intval($poster_id);
if ($poster['id'] > 0) {
- /* @var $memberHandler XoopsMemberHandler */
- $memberHandler = Xoops::getInstance()->getHandler('member');
- $com_poster = $memberHandler->getUser($poster['id']);
+ $com_poster = Xoops::getInstance()->getMemberHandler()->getUser($poster['id']);
if (!is_object($com_poster)) {
$poster['id'] = 0;
}
@@ -349,8 +347,7 @@
$poster['id'] = intval($poster_id);
if ($poster['id'] > 0) {
$xoops = Xoops::getInstance();
- /* @var $member_handler XoopsMemberHandler */
- $member_handler = $xoops->getHandler('member');
+ $member_handler = $xoops->getMemberHandler();
$com_poster = $member_handler->getUser($poster['id']);
if (is_object($com_poster)) {
$poster['uname'] = XoopsUserUtility::getUnameFromId($poster['id'], false, true);
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/class/theme.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/class/theme.php 2011-10-27 23:15:24 UTC (rev 7988)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/class/theme.php 2011-10-28 20:46:30 UTC (rev 7989)
@@ -316,8 +316,7 @@
}
// Meta tags
- /* @var $config_handler XoopsConfigHandler */
- $config_handler = $xoops->getHandler('config');
+ $config_handler = $xoops->getConfigHandler();
$criteria = new CriteriaCompo(new Criteria('conf_modid', 0));
$criteria->add(new Criteria('conf_catid', XOOPS_CONF_METAFOOTER));
$config = $config_handler->getConfigs($criteria, true);
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/class/theme_blocks.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/class/theme_blocks.php 2011-10-27 23:15:24 UTC (rev 7988)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/class/theme_blocks.php 2011-10-28 20:46:30 UTC (rev 7989)
@@ -111,8 +111,7 @@
$template = null;
$template = new XoopsTpl();
}
- /* @var $block_handler XoopsBlockHandler */
- $block_handler = $xoops->getHandler('block');
+ $block_handler = $xoops->getBlockHandler();
$block_arr = $block_handler->getAllByGroupModule($groups, $mid, $isStart, XOOPS_BLOCK_VISIBLE);
$xoops->preload->triggerEvent('core.class.theme_blocks.retrieveBlocks', array(&$this, &$template, &$block_arr));
foreach ($block_arr as $block) {
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/class/userutility.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/class/userutility.php 2011-10-27 23:15:24 UTC (rev 7988)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/class/userutility.php 2011-10-28 20:46:30 UTC (rev 7989)
@@ -43,8 +43,7 @@
}
if (!empty($user) && !is_object($user)) {
- /* @var $member_handler XoopsMemberHandler */
- $member_handler = $xoops->gethandler('member');
+ $member_handler = $xoops->getMemberHandler();
$user = $member_handler->getUser($user);
}
if (!is_object($user)) {
@@ -166,8 +165,7 @@
// Check if uname/email already exists if the user is a new one
$uid = is_object($user) ? $user->getVar('uid') : 0;
- /* @var $user_handler XoopsUserHandler */
- $user_handler = $xoops->getHandler('user');
+ $user_handler = $xoops->getUserHandler();
$myts = MyTextSanitizer::getInstance();
$criteria = new CriteriaCompo(new Criteria('uname', $myts->addSlashes($uname)));
@@ -278,8 +276,8 @@
if (count($userid) > 0) {
$criteria = new CriteriaCompo(new Criteria('level', 0, '>'));
$criteria->add(new Criteria('uid', "('" . implode(',', array_unique($userid)) . "')", 'IN'));
- /* @var $user_handler XoopsUserHandler */
- $user_handler = $xoops->getHandler('user');
+
+ $user_handler = $xoops->getUserHandler();
if (!$rows = $user_handler->getAll($criteria, array('uid', 'uname', 'name'), false, true)) {
return $users;
}
@@ -315,8 +313,7 @@
$userid = intval($userid);
$username = '';
if ($userid > 0) {
- /* @var $member_handler XoopsMemberHandler */
- $member_handler = $xoops->gethandler('member');
+ $member_handler = $xoops->getMemberhandler();
$user = $member_handler->getUser($userid);
if (is_object($user)) {
if ($usereal && $user->getVar('name')) {
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 23:15:24 UTC (rev 7988)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoops.php 2011-10-28 20:46:30 UTC (rev 7989)
@@ -447,7 +447,7 @@
* @param mixed $optional
* @return XoopsObjectHandler|XoopsPersistableObjectHandler|null
*/
- public function getHandler($name, $optional = false)
+ public function getKernel($name, $optional = false)
{
$name = strtolower(trim($name));
$class = '';
@@ -471,12 +471,221 @@
}
/**
+ * @param mixed $optional
+ * @return XoopsAvatarHandler
+ */
+ public function getAvatarHandler($optional = false)
+ {
+ return $this->getKernel('avatar', $optional);
+ }
+
+ /**
+ * @param mixed $optional
+ * @return XoopsBlockHandler
+ */
+ public function getBlockHandler($optional = false)
+ {
+ return $this->getKernel('block', $optional);
+ }
+
+ /**
+ * @param mixed $optional
+ * @return XoopsCachemodelHandler
+ */
+ public function getCachemodelHandler($optional = false)
+ {
+ return $this->getKernel('cachemodel', $optional);
+ }
+
+ /**
+ * @param mixed $optional
+ * @return XoopsConfigHandler
+ */
+ public function getConfigHandler($optional = false)
+ {
+ return $this->getKernel('config', $optional);
+ }
+
+ /**
+ * @param mixed $optional
+ * @return XoopsCommentHandler
+ */
+ public function getCommentHandler($optional = false)
+ {
+ return $this->getKernel('comment', $optional);
+ }
+
+ /**
+ * @param mixed $optional
+ * @return XoopsConfigitemHandler
+ */
+ public function getConfigitemHandler($optional = false)
+ {
+ return $this->getKernel('configitem', $optional);
+ }
+
+ /**
+ * @param mixed $optional
+ * @return XoopsConfigoptionHandler
+ */
+ public function getConfigoptionHandler($optional = false)
+ {
+ return $this->getKernel('configoption', $optional);
+ }
+
+ /**
+ * @param mixed $optional
+ * @return XoopsGroupHandler
+ */
+ public function getGroupHandler($optional = false)
+ {
+ return $this->getKernel('group', $optional);
+ }
+
+ /**
+ * @param mixed $optional
+ * @return XoopsGrouppermHandler
+ */
+ public function getGrouppermHandler($optional = false)
+ {
+ return $this->getKernel('groupperm', $optional);
+ }
+
+ /**
+ * @param mixed $optional
+ * @return XoopsImageHandler
+ */
+ public function getImageHandler($optional = false)
+ {
+ return $this->getKernel('image', $optional);
+ }
+
+ /**
+ * @param mixed $optional
+ * @return XoopsImagecategoryHandler
+ */
+ public function getImagecategoryHandler($optional = false)
+ {
+ return $this->getKernel('imagecategory', $optional);
+ }
+
+ /**
+ * @param mixed $optional
+ * @return XoopsImagesetHandler
+ */
+ public function getImagesetHandler($optional = false)
+ {
+ return $this->getKernel('imageset', $optional);
+ }
+
+ /**
+ * @param mixed $optional
+ * @return XoopsImagesetimgHandler
+ */
+ public function getImagesetimgHandler($optional = false)
+ {
+ return $this->getKernel('imagesetimg', $optional);
+ }
+
+ /**
+ * @param mixed $optional
+ * @return XoopsMemberHandler
+ */
+ public function getMemberHandler($optional = false)
+ {
+ return $this->getKernel('member', $optional);
+ }
+
+ /**
+ * @param mixed $optional
+ * @return XoopsConfigoptionHandler
+ */
+ public function getMembershipHandler($optional = false)
+ {
+ return $this->getKernel('membership', $optional);
+ }
+
+ /**
+ * @param mixed $optional
+ * @return XoopsModuleHandler
+ */
+ public function getModuleHandler($optional = false)
+ {
+ return $this->getKernel('module', $optional);
+ }
+
+ /**
+ * @param mixed $optional
+ * @return XoopsNotificationHandler
+ */
+ public function getNotificationHandler($optional = false)
+ {
+ return $this->getKernel('notification', $optional);
+ }
+
+ /**
+ * @param mixed $optional
+ * @return XoopsOnlineHandler
+ */
+ public function getOnlineHandler($optional = false)
+ {
+ return $this->getKernel('online', $optional);
+ }
+
+ /**
+ * @param mixed $optional
+ * @return XoopsPrivmessageHandler
+ */
+ public function getPrivmessageHandler($optional = false)
+ {
+ return $this->getKernel('privmessage', $optional);
+ }
+
+
+ /**
+ * @param mixed $optional
+ * @return XoopsSessionHandler
+ */
+ public function getSessionHandler($optional = false)
+ {
+ return $this->getKernel('session', $optional);
+ }
+
+ /**
+ * @param mixed $optional
+ * @return XoopsTplfileHandler
+ */
+ public function getTplfileHandler($optional = false)
+ {
+ return $this->getKernel('tplfile', $optional);
+ }
+
+ /**
+ * @param mixed $optional
+ * @return XoopsTplsetHandler
+ */
+ public function getTplsetHandler($optional = false)
+ {
+ return $this->getKernel('tplset', $optional);
+ }
+
+ /**
+ * @param mixed $optional
+ * @return XoopsUserHandler
+ */
+ public function getUserHandler($optional = false)
+ {
+ return $this->getKernel('user', $optional);
+ }
+
+
+ /**
* @param string|null $name
* @param string|null $module_dir
* @param bool $optional
* @return bool
*/
- public function getModuleHandler($name = null, $module_dir = null, $optional = false)
+ public function getHandler($name = null, $module_dir = null, $optional = false)
{
// if $module_dir is not specified
if (!isset($module_dir)) {
@@ -1071,14 +1280,7 @@
}
include_once XOOPS_ROOT_PATH . '/class/xoopsmailer.php';
- if (file_exists($file = XOOPS_ROOT_PATH . '/language/' . Xoops::getInstance()->config['language'] . '/xoopsmailerlocal.php')) {
- include_once $file;
- } else {
- if (file_exists($file = XOOPS_ROOT_PATH . '/language/english/xoopsmailerlocal.php')) {
- include_once $file;
- }
- }
- unset($mailer);
+ $this->loadLanguage('xoopsmailerlocal');
if (class_exists('XoopsMailerLocal')) {
$mailer = new XoopsMailerLocal();
} else {
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsform/formselectcheckgroup.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsform/formselectcheckgroup.php 2011-10-27 23:15:24 UTC (rev 7988)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsform/formselectcheckgroup.php 2011-10-28 20:46:30 UTC (rev 7989)
@@ -35,9 +35,7 @@
{
parent::__construct($caption, $name, $value, '', true);
$this->columns = 3;
- /* @var XoopsMemberHandler $member_handler */
- $member_handler = Xoops::getInstance()->getHandler('member');
- $this->userGroups = $member_handler->getGroupList();
+ $this->userGroups = Xoops::getInstance()->getMemberHandler()->getGroupList();
foreach ($this->userGroups as $group_id => $group_name) {
$this->addOption($group_id, $group_name);
}
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsform/formselectgroup.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsform/formselectgroup.php 2011-10-27 23:15:24 UTC (rev 7988)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsform/formselectgroup.php 2011-10-28 20:46:30 UTC (rev 7989)
@@ -38,8 +38,7 @@
public function __construct($caption, $name, $include_anon = false, $value = null, $size = 1, $multiple = false)
{
parent::__construct($caption, $name, $value, $size, $multiple);
- /* @var $member_handler XoopsMemberHandler */
- $member_handler = Xoops::getInstance()->getHandler('member');
+ $member_handler = Xoops::getInstance()->getMemberHandler();
if (!$include_anon) {
$this->addOptionArray($member_handler->getGroupList(new Criteria('groupid', XOOPS_GROUP_ANONYMOUS, '!=')));
} else {
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsform/formselectuser.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsform/formselectuser.php 2011-10-27 23:15:24 UTC (rev 7988)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsform/formselectuser.php 2011-10-28 20:46:30 UTC (rev 7989)
@@ -46,8 +46,7 @@
if ($include_anon) {
$select_element->addOption(0, $xoops->config['anonymous']);
}
- /* @var $member_handler XoopsMemberHandler */
- $member_handler = $xoops->getHandler('member');
+ $member_handler = $xoops->getMemberHandler();
$user_count = $member_handler->getUserCount();
$value = is_array($value) ? $value : (empty($value) ? array() : array($value));
if ($user_count > $limit && count($value) > 0) {
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsform/grouppermform.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsform/grouppermform.php 2011-10-27 23:15:24 UTC (rev 7988)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsform/grouppermform.php 2011-10-28 20:46:30 UTC (rev 7989)
@@ -134,10 +134,8 @@
$this->_itemTree[$item_id]['allchild'] = array();
$this->_loadAllChildItemIds($item_id, $this->_itemTree[$item_id]['allchild']);
}
- /* @var $gperm_handler XoopsGrouppermHandler */
- $gperm_handler = $xoops->getHandler('groupperm');
- /* @var $member_handler XoopsMemberHandler */
- $member_handler = $xoops->getHandler('member');
+ $gperm_handler = $xoops->getGrouppermHandler();
+ $member_handler = $xoops->getMemberHandler();
$glist = $member_handler->getGroupList();
foreach (array_keys($glist) as $i) {
if ($i == XOOPS_GROUP_ANONYMOUS && !$this->_showAnonymous) {
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsmailer.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsmailer.php 2011-10-27 23:15:24 UTC (rev 7988)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsmailer.php 2011-10-28 20:46:30 UTC (rev 7989)
@@ -441,12 +441,12 @@
private function sendPM($uid, $subject, $body)
{
$xoops = Xoops::getInstance();
- $pm_handler = $xoops->getHandler('privmessage');
+ $pm_handler = $xoops->getPrivmessageHandler();
$pm = $pm_handler->create();
$pm->setVar("subject", $subject);
// RMV-NOTIFY
- $pm->setVar('from_userid', !empty($this->fromUser) ? $this->fromUser->getVar('uid')
- : (!$xoops->isUser() ? 1 : $xoops->user->getVar('uid')));
+ $pm->setVar('from_userid', !empty($this->fromUser) ? $this->fromUser->getVar('uid') : (!$xoops->isUser() ? 1
+ : $xoops->user->getVar('uid')));
$pm->setVar("msg_text", $body);
$pm->setVar("to_userid", $uid);
if (!$pm_handler->insert($pm)) {
@@ -602,9 +602,8 @@
public function setToGroups(XoopsGroup $group)
{
if (!is_array($group)) {
- /* @var $member_handler XoopsMemberHandler */
- $member_handler = Xoops::getInstance()->getHandler('member');
- $this->setToUsers($member_handler->getUsersByGroup($group->getVar('groupid'), true));
+ $this->setToUsers(Xoops::getInstance()->getMemberHandler()
+ ->getUsersByGroup($group->getVar('groupid'), true));
} else {
foreach ($group as $g) {
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/edituser.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/edituser.php 2011-10-27 23:15:24 UTC (rev 7988)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/edituser.php 2011-10-28 20:46:30 UTC (rev 7989)
@@ -38,8 +38,7 @@
$op = $_GET['op'];
}
-/* @var $config_handler XoopsConfigHandler */
-$config_handler = $xoops->getHandler('config');
+$config_handler = $xoops->getConfigHandler();
$xoopsConfigUser = $config_handler->getConfigsByCat(XOOPS_CONF_USER);
$myts = MyTextSanitizer::getInstance();
if ($op == 'saveuser') {
@@ -90,8 +89,7 @@
echo '</div><br />';
$op = 'editprofile';
} else {
- /* @var $member_handler XoopsMemberHandler */
- $member_handler = $xoops->getHandler('member');
+ $member_handler = $xoops->getMemberHandler();
$edituser = $member_handler->getUser($uid);
$edituser->setVar('name', $_POST['name']);
if ($xoopsConfigUser['allow_chgmail'] == 1) {
@@ -258,7 +256,7 @@
$form->addElement(new XoopsFormButton('', 'submit', _SUBMIT, 'submit'));
$form->display();
}
- $avatar_handler = $xoops->getHandler('avatar');
+ $avatar_handler = $xoops->getAvatarHandler();
$form2 = new XoopsThemeForm(_US_CHOOSEAVT, 'uploadavatar', 'edituser.php', 'post', true);
$avatar_select = new XoopsFormSelect('', 'user_avatar', $xoops->user->getVar('user_avatar'));
$avatar_list = $avatar_handler->getList('S', true);
@@ -305,7 +303,7 @@
if ($uploader->fetchMedia($_POST['xoops_upload_file'][0])) {
$uploader->setPrefix('cavt');
if ($uploader->upload()) {
- $avt_handler = $xoops->getHandler('avatar');
+ $avt_handler = $xoops->getAvatarHandler();
$avatar = $avt_handler->create();
$avatar->setVar('avatar_file', 'avatars/' . $uploader->getSavedFileName());
$avatar->setVar('avatar_name', $xoops->user->getVar('uname'));
@@ -351,8 +349,7 @@
exit();
}
$user_avatar = '';
- /* @var $avt_handler XoopsAvatarHandler */
- $avt_handler = $xoops->getHandler('avatar');
+ $avt_handler = $xoops->getAvatarHandler();
if (!empty($_POST['user_avatar'])) {
$user_avatar = $myts->addSlashes(trim($_POST['user_avatar']));
$criteria_avatar = new CriteriaCompo(new Criteria('avatar_file', $user_avatar));
@@ -367,7 +364,7 @@
if (0 === strpos($user_avatarpath, realpath(XOOPS_UPLOAD_PATH)) && is_file($user_avatarpath)) {
$oldavatar = $xoops->user->getVar('user_avatar');
$xoops->user->setVar('user_avatar', $user_avatar);
- $member_handler = $xoops->getHandler('member');
+ $member_handler = $xoops->getMemberHandler();
if (!$member_handler->insertUser($xoops->user)) {
$xoops->header();
echo $xoops->user->getHtmlErrors();
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/image.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/image.php 2011-10-27 23:15:24 UTC (rev 7988)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/image.php 2011-10-28 20:46:30 UTC (rev 7989)
@@ -45,7 +45,7 @@
$xoops->db = XoopsDatabaseFactory::getDatabaseConnection();
// ################# Include class manager file ##############
-$imagehandler = $xoops->getHandler('image');
+$imagehandler = $xoops->getImageHandler();
$criteria = new CriteriaCompo(new Criteria('i.image_display', 1));
$criteria->add(new Criteria('i.image_id', $image_id));
$image = $imagehandler->getObjects($criteria, false, true);
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/imagemanager.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/imagemanager.php 2011-10-27 23:15:24 UTC (rev 7988)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/imagemanager.php 2011-10-28 20:46:30 UTC (rev 7989)
@@ -42,7 +42,7 @@
$xoopsTpl->assign('sitename', htmlspecialchars($xoops->config['sitename'], ENT_QUOTES));
$target = htmlspecialchars($target, ENT_QUOTES);
$xoopsTpl->assign('target', $target);
- $imgcat_handler = $xoops->getHandler('imagecategory');
+ $imgcat_handler = $xoops->getImagecategoryHandler();
$catlist = $imgcat_handler->getList($group, 'imgcat_read', 1);
$catcount = count($catlist);
$xoopsTpl->assign('lang_align', _ALIGN);
@@ -67,12 +67,12 @@
}
$xoopsTpl->assign('cat_options', $cat_options);
if ($catshow > 0) {
- $image_handler = $xoops->getHandler('image');
+ $image_handler = $xoops->getImageHandler();
$criteria = new CriteriaCompo(new Criteria('imgcat_id', $catshow));
$criteria->add(new Criteria('image_display', 1));
$total = $image_handler->getCount($criteria);
if ($total > 0) {
- $imgcat_handler = $xoops->getHandler('imagecategory');
+ $imgcat_handler = $xoops->getImagecategoryHandler();
$imgcat = $imgcat_handler->get($catshow);
$xoopsTpl->assign('image_total', $total);
$xoopsTpl->assign('lang_image', _IMAGE);
@@ -132,15 +132,14 @@
}
if ($op == 'upload') {
- $imgcat_handler = $xoops->getHandler('imagecategory');
+ $imgcat_handler = $xoops->getImagecategoryHandler();
$imgcat_id = intval($_GET['imgcat_id']);
$imgcat = $imgcat_handler->get($imgcat_id);
$error = false;
if (!is_object($imgcat)) {
$error = true;
} else {
- /* @var $imgcatperm_handler XoopsGrouppermHandler */
- $imgcatperm_handler = $xoops->getHandler('groupperm');
+ $imgcatperm_handler = $xoops->getGrouppermHandler();
if ($xoops->isUser()) {
if (!$imgcatperm_handler->checkRight('imgcat_write', $imgcat_id, $xoops->user->getGroups())) {
$error = true;
@@ -184,13 +183,13 @@
$image_nicename = isset($_POST['image_nicename']) ? $_POST['image_nicename'] : '';
$xoops_upload_file = isset($_POST['xoops_upload_file']) ? $_POST['xoops_upload_file'] : array();
$imgcat_id = isset($_POST['imgcat_id']) ? intval($_POST['imgcat_id']) : 0;
- $imgcat_handler = $xoops->getHandler('imagecategory');
+ $imgcat_handler = $xoops->getImagecategoryHandler();
$imgcat = $imgcat_handler->get($imgcat_id);
$error = false;
if (!is_object($imgcat)) {
$error = true;
} else {
- $imgcatperm_handler = $xoops->getHandler('groupperm');
+ $imgcatperm_handler = $xoops->getGrouppermHandler();
if ($xoops->isUser()) {
if (!$imgcatperm_handler->checkRight('imgcat_write', $imgcat_id, $xoops->user->getGroups())) {
$error = true;
@@ -218,7 +217,7 @@
if (!$uploader->upload()) {
$err = $uploader->getErrors();
} else {
- $image_handler = xoops_gethandler('image');
+ $image_handler = $xoops->getImageHandler();;
$image = $image_handler->create();
$image->setVar('image_name', $uploader->getSavedFileName());
$image->setVar('image_nicename', $image_nicename);
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/include/checklogin.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/include/checklogin.php 2011-10-27 23:15:24 UTC (rev 7988)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/include/checklogin.php 2011-10-28 20:46:30 UTC (rev 7989)
@@ -20,7 +20,7 @@
defined('XOOPS_ROOT_PATH') or die('Restricted access');
$xoops = Xoops::getInstance();
-xoops_loadLanguage('user');
+$xoops->loadLanguage('user');
$uname = !isset($_POST['uname']) ? '' : trim($_POST['uname']);
$pass = !isset($_POST['pass']) ? '' : trim($_POST['pass']);
@@ -28,11 +28,11 @@
redirect_header(XOOPS_URL . '/user.php', 1, _US_INCORRECTLOGIN);
exit();
}
-/* @var $member_handler XoopsMemberHandler */
-$member_handler = xoops_gethandler('member');
+
+$member_handler = $xoops->getMemberHandler();
$myts = MyTextsanitizer::getInstance();
-xoops_loadLanguage('auth');
+$xoops->loadLanguage('auth');
$xoopsAuth = XoopsAuthFactory::getAuthConnection($myts->addSlashes($uname));
$user = $xoopsAuth->authenticate($myts->addSlashes($uname), $myts->addSlashes($pass));
@@ -59,8 +59,8 @@
$user->setVar('last_login', time());
if (!$member_handler->insertUser($user)) {
}
- // Regenrate a new session id and destroy old session
- $xoops->sess_handler->regenerate_id(true);
+ // Regenerate a new session id and destroy old session
+ $xoops->getSessionHandler()->regenerate_id(true);
$_SESSION = array();
$_SESSION['xoopsUserId'] = $user->getVar('uid');
$_SESSION['xoopsUserGroups'] = $user->getGroups();
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/include/common.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/include/common.php 2011-10-27 23:15:24 UTC (rev 7988)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/include/common.php 2011-10-28 20:46:30 UTC (rev 7989)
@@ -22,6 +22,7 @@
date_default_timezone_set('Europe/London');
global $xoops;
+$GLOBALS['xoops'] =& $xoops;
/**
* YOU SHOULD NEVER USE THE FOLLOWING TO CONSTANTS, THEY WILL BE REMOVED
@@ -59,7 +60,7 @@
$xoops = Xoops::getInstance();
$xoops->pathTranslation();
-$xoops->preload = XoopsPreload::getInstance();
+$xoops->preload = $xoopsPreload;
$xoops->option =& $GLOBALS['xoopsOption'];
/**
@@ -134,7 +135,7 @@
* Start of Error Reportings.
*/
if ($xoops->getConfig('debug_mode') == 1 || $xoops->getConfig('debug_mode') == 2) {
- xoops_loadLanguage('logger');
+ $xoops->loadLanguage('logger');
$xoops->logger->enable();
$xoops->logger->usePopup = ($xoops->getConfig('debug_mode') == 2);
} else {
@@ -150,17 +151,14 @@
* Load Language settings and defines
*/
$xoops->preload->triggerEvent('core.include.common.language');
-xoops_loadLanguage('global');
-xoops_loadLanguage('errors');
+$xoops->loadLanguage('global');
+$xoops->loadLanguage('errors');
/**
* User Sessions
*/
-/* @var $member_handler XoopsMemberHandler */
-$member_handler = $xoops->gethandler('member');
-/* @var $sess_handler XoopsSessionHandler */
-$xoops->sess_handler = $xoops->gethandler('session');
-$sess_handler =& $xoops->sess_handler;
+$member_handler = $xoops->getMemberHandler();
+$sess_handler = $xoops->getSessionHandler();
if ($xoops->getConfig('use_ssl') && isset($_POST[$xoops->getConfig('sslpost_name')]) && $_POST[$xoops->getConfig('sslpost_name')] != ''
) {
@@ -177,8 +175,8 @@
}
}
session_set_save_handler(
- array(&$xoops->sess_handler, 'open'), array(&$xoops->sess_handler, 'close'), array(&$xoops->sess_handler, 'read'),
- array(&$xoops->sess_handler, 'write'), array(&$xoops->sess_handler, 'destroy'), array(&$xoops->sess_handler, 'gc'));
+ array(&$sess_handler, 'open'), array(&$sess_handler, 'close'), array(&$sess_handler, 'read'),
+ array(&$sess_handler, 'write'), array(&$sess_handler, 'destroy'), array(&$sess_handler, 'gc'));
session_start();
/**
@@ -211,13 +209,12 @@
setcookie($xoops->getConfig('usercookie'), 0, -1, '/');
} else {
if ((intval($xoops->user->getVar('last_login')) + 60 * 5) < time()) {
- /* @var $user_handler XoopsUserHandler */
- $user_handler = $xoops->gethandler('user');
+ $user_handler = $xoops->getUserHandler();
$criteria = new Criteria('uid', $_SESSION['xoopsUserId']);
$user_handler->updateAll('last_login', time(), $criteria, true);
unset($criteria);
}
- $xoops->sess_handler->update_cookie();
+ $sess_handler->update_cookie();
if (isset($_SESSION['xoopsUserGroups'])) {
$xoops->user->setGroups($_SESSION['xoopsUserGroups']);
} else {
@@ -263,8 +260,7 @@
$xoops->moduleDirname = 'system';
if (file_exists('./xoops_version.php')) {
$url_arr = explode('/', strstr($_SERVER['PHP_SELF'], '/modules/'));
- /* @var $module_handler XoopsModuleHandler */
- $module_handler = $xoops->gethandler('module');
+ $module_handler = $xoops->getModulehandler();
$xoops->module = $module_handler->getByDirname($url_arr[2]);
$xoops->moduleDirname = $url_arr[2];
unset($url_arr);
@@ -274,8 +270,7 @@
echo '<h4>' . _MODULENOEXIST . '</h4>';
$xoops->footer();
}
- /* @var $moduleperm_handler XoopsGrouppermHandler */
- $moduleperm_handler = $xoops->gethandler('groupperm');
+ $moduleperm_handler = $xoops->getGrouppermHandler();
if ($xoops->isUser()) {
if (!$moduleperm_handler->checkRight('module_read', $xoops->module->getVar('mid'), $xoops->user->getGroups())) {
$xoops->redirect(XOOPS_URL, 1, _NOPERM, false);
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 23:15:24 UTC (rev 7988)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/include/functions.php 2011-10-28 20:46:30 UTC (rev 7989)
@@ -27,7 +27,8 @@
{
$xoops = Xoops::getInstance();
$xoops->logger->addDeprecated(__FUNCTION__ . ' is deprecated. See how to replace it in file ' . __FILE__ . ' line ' . __LINE__);
- return $xoops->getHandler($name, $optional);
+ $method = 'get' . ucfirst(strtolower(trim($name))) . 'Handler';
+ return $xoops->$method($optional);
}
/**
@@ -40,7 +41,7 @@
{
$xoops = Xoops::getInstance();
$xoops->logger->addDeprecated(__FUNCTION__ . ' is deprecated. See how to replace it in file ' . __FILE__ . ' line ' . __LINE__);
- return $xoops->getModuleHandler($name, $module_dir, $optional);
+ return $xoops->getHandler($name, $module_dir, $optional);
}
/**
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/index.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/index.php 2011-10-27 23:15:24 UTC (rev 7988)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/index.php 2011-10-28 20:46:30 UTC (rev 7989)
@@ -25,38 +25,33 @@
$xoops->preload->triggerEvent('core.index.start');
//check if start page is defined
-if (isset($xoops->config['startpage']) && $xoops->config['startpage'] != "" && $xoops->config['startpage'] != "--" && xoops_isActiveModule($xoops->config['startpage'])) {
+if ($xoops->getConfig('startpage') != "" && $xoops->getConfig('startpage') != "--" && $xoops->isActiveModule($xoops->getConfig('startpage'))) {
// Temporary solution for start page redirection
define("XOOPS_STARTPAGE_REDIRECTED", 1);
- /* @var $module_handler XoopsModuleHandler */
- $module_handler = xoops_gethandler('module');
- $xoops->module = $module_handler->getByDirname($xoops->config['startpage']);
+ $module_handler = $xoops->getModuleHandler();
+ $xoops->module = $module_handler->getByDirname($xoops->getConfig('startpage'));
if (!$xoops->isModule() || !$xoops->module->getVar('isactive')) {
$xoops->header();
echo "<h4>" . _MODULENOEXIST . "</h4>";
$xoops->footer();
- exit();
}
- /* @var $moduleperm_handler XoopsGrouppermHandler */
- $moduleperm_handler = xoops_gethandler('groupperm');
+ $moduleperm_handler = $xoops->getGrouppermHandler();
if ($xoops->isUser()) {
if (!$moduleperm_handler->checkRight('module_read', $xoops->module->getVar('mid'), $xoops->user->getGroups())) {
- redirect_header(XOOPS_URL, 1, _NOPERM, false);
- exit();
+ $xoops->redirect(XOOPS_URL, 1, _NOPERM, false);
}
$xoops->userIsAdmin = $xoops->user->isAdmin($xoops->module->getVar('mid'));
} else {
if (!$moduleperm_handler->checkRight('module_read', $xoops->module->getVar('mid'), XOOPS_GROUP_ANONYMOUS)) {
- redirect_header(XOOPS_URL . "/user.php", 1, _NOPERM);
- exit();
+ $xoops->redirect(XOOPS_URL . "/user.php", 1, _NOPERM);
}
}
if ($xoops->module->getVar('hasconfig') == 1 || $xoops->module->getVar('hascomments') == 1 || $xoops->module->getVar('hasnotification') == 1) {
- $xoops->moduleConfig = $config_handler->getConfigsByCat(0, $xoops->module->getVar('mid'));
+ $xoops->moduleConfig = $xoops->getModuleConfigs();
}
- chdir('modules/' . $xoops->config['startpage'] . '/');
- xoops_loadLanguage('main', $xoops->module->getVar('dirname', 'n'));
+ chdir('modules/' . $xoops->getConfig('startpage') . '/');
+ $xoops->loadLanguage('main', $xoops->module->getVar('dirname', 'n'));
$parsed = parse_url(XOOPS_URL);
$url = isset($parsed['scheme']) ? $parsed['scheme'] . '://' : 'http://';
if (isset($parsed['host'])) {
@@ -68,12 +63,11 @@
$url .= $_SERVER['HTTP_HOST'];
}
- $_SERVER['REQUEST_URI'] = substr(XOOPS_URL, strlen($url)) . '/modules/' . $xoops->config['startpage'] . '/index.php';
- include $xoops->path('modules/' . $xoops->config['startpage'] . '/index.php');
+ $_SERVER['REQUEST_URI'] = substr(XOOPS_URL, strlen($url)) . '/modules/' . $xoops->getConfig('startpage') . '/index.php';
+ include $xoops->path('modules/' . $xoops->getConfig('startpage') . '/index.php');
exit();
} else {
$xoops->option['show_cblock'] = 1;
$xoops->header("db:system_homepage.html");
$xoops->footer();
-}
-?>
\ No newline at end of file
+}
\ No newline at end of file
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/lostpass.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/lostpass.php 2011-10-27 23:15:24 UTC (rev 7988)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/lostpass.php 2011-10-28 20:46:30 UTC (rev 7989)
@@ -31,8 +31,7 @@
}
$myts = MyTextSanitizer::getInstance();
-/* @var $member_handler XoopsMemberHandler */
-$member_handler = xoops_gethandler('member');
+$member_handler = $xoops->getMemberHandler();
$getuser = $member_handler->getUsers(new Criteria('email', $myts->addSlashes($email)));
if (empty($getuser)) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
