[xoops-svn] SF.net SVN: xoops:[7962] XoopsCore/branches/2.6.x/2.6.0/htdocs

[<tr...@us...>]

Revision: 7962
          http://xoops.svn.sourceforge.net/xoops/?rev=7962&view=rev
Author:   trabis
Date:     2011-10-25 20:38:56 +0000 (Tue, 25 Oct 2011)
Log Message:
-----------
More refactoring ...

Modified Paths:
--------------
    XoopsCore/branches/2.6.x/2.6.0/htdocs/edituser.php
    XoopsCore/branches/2.6.x/2.6.0/htdocs/index.php
    XoopsCore/branches/2.6.x/2.6.0/htdocs/lostpass.php
    XoopsCore/branches/2.6.x/2.6.0/htdocs/pmlite.php
    XoopsCore/branches/2.6.x/2.6.0/htdocs/readpmsg.php
    XoopsCore/branches/2.6.x/2.6.0/htdocs/register.php
    XoopsCore/branches/2.6.x/2.6.0/htdocs/user.php
    XoopsCore/branches/2.6.x/2.6.0/htdocs/userinfo.php
    XoopsCore/branches/2.6.x/2.6.0/htdocs/viewpmsg.php

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-25 20:28:11 UTC (rev 7961)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/edituser.php	2011-10-25 20:38:56 UTC (rev 7962)
@@ -19,7 +19,6 @@
 include dirname(__FILE__) . DIRECTORY_SEPARATOR . 'mainfile.php';
 
 $xoops = Xoops::getInstance();
-$xoops->preload = XoopsPreload::getInstance();
 $xoops->preload->triggerEvent('core.edituser.start');
 
 xoops_loadLanguage('user');

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-25 20:28:11 UTC (rev 7961)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/index.php	2011-10-25 20:38:56 UTC (rev 7962)
@@ -22,7 +22,6 @@
 include dirname(__FILE__) . DIRECTORY_SEPARATOR . 'mainfile.php';
 
 $xoops = Xoops::getInstance();
-$xoops->preload = XoopsPreload::getInstance();
 $xoops->preload->triggerEvent('core.index.start');
 
 //check if start page is defined

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-25 20:28:11 UTC (rev 7961)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/lostpass.php	2011-10-25 20:38:56 UTC (rev 7962)
@@ -18,8 +18,6 @@
 
 include dirname(__FILE__) . DIRECTORY_SEPARATOR . 'mainfile.php';
 $xoops = Xoops::getInstance();
-
-$xoops->preload = XoopsPreload::getInstance();
 $xoops->preload->triggerEvent('core.lostpass.start');
 
 xoops_loadLanguage('user');

Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/pmlite.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/pmlite.php	2011-10-25 20:28:11 UTC (rev 7961)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/pmlite.php	2011-10-25 20:38:56 UTC (rev 7962)
@@ -18,7 +18,6 @@
 
 include dirname(__FILE__) . DIRECTORY_SEPARATOR . 'mainfile.php';
 $xoops = Xoops::getInstance();
-$xoops->preload = XoopsPreload::getInstance();
 $xoops->preload->triggerEvent('core.pmlite.start');
 
 xoops_loadLanguage('pmsg');

Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/readpmsg.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/readpmsg.php	2011-10-25 20:28:11 UTC (rev 7961)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/readpmsg.php	2011-10-25 20:38:56 UTC (rev 7962)
@@ -18,7 +18,6 @@
 
 include dirname(__FILE__) . DIRECTORY_SEPARATOR . 'mainfile.php';
 $xoops = Xoops::getInstance();
-$xoops->preload = XoopsPreload::getInstance();
 $xoops->preload->triggerEvent('core.readpmsg.start');
 
 xoops_loadLanguage('pmsg');

Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/register.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/register.php	2011-10-25 20:28:11 UTC (rev 7961)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/register.php	2011-10-25 20:38:56 UTC (rev 7962)
@@ -23,7 +23,6 @@
 include dirname(__FILE__) . DIRECTORY_SEPARATOR . 'mainfile.php';
 
 $xoops = Xoops::getInstance();
-$xoops->preload = XoopsPreload::getInstance();
 $xoops->preload->triggerEvent('core.register.start');
 
 xoops_loadLanguage('user');

Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/user.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/user.php	2011-10-25 20:28:11 UTC (rev 7961)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/user.php	2011-10-25 20:38:56 UTC (rev 7962)
@@ -23,7 +23,6 @@
 include dirname(__FILE__) . DIRECTORY_SEPARATOR . 'mainfile.php';
 
 $xoops = Xoops::getInstance();
-$xoops->preload = XoopsPreload::getInstance();
 $xoops->preload->triggerEvent('core.user.start');
 
 xoops_loadLanguage('user');

Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/userinfo.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/userinfo.php	2011-10-25 20:28:11 UTC (rev 7961)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/userinfo.php	2011-10-25 20:38:56 UTC (rev 7962)
@@ -21,50 +21,50 @@
  */
 
 include dirname(__FILE__) . DIRECTORY_SEPARATOR . 'mainfile.php';
-$xoopsPreload = XoopsPreload::getInstance();
-$xoopsPreload->triggerEvent('core.userinfo.start');
 
+$xoops = Xoops::getInstance();
+$xoops->preload->triggerEvent('core.userinfo.start');
+
 xoops_loadLanguage('user');
-include_once $GLOBALS['xoops']->path('modules/system/constants.php');
+include_once $xoops->path('modules/system/constants.php');
 
 $uid = intval($_GET['uid']);
 if ($uid <= 0) {
     redirect_header('index.php', 3, _US_SELECTNG);
     exit();
 }
-
+/* @var $gperm_handler XoopsGrouppermHandler */
 $gperm_handler = xoops_gethandler('groupperm');
-$groups = is_object($xoopsUser) ? $xoopsUser->getGroups() : XOOPS_GROUP_ANONYMOUS;
+$groups = $xoops->isUser() ? $xoops->user->getGroups() : XOOPS_GROUP_ANONYMOUS;
 
 $isAdmin = $gperm_handler->checkRight('system_admin', XOOPS_SYSTEM_USER, $groups);
-if (is_object($xoopsUser)) {
-    if ($uid == $xoopsUser->getVar('uid')) {
+if ($xoops->isUser()) {
+    if ($uid == $xoops->user->getVar('uid')) {
+        /* @var $config_handler XoopsConfigHandler */
         $config_handler = xoops_gethandler('config');
         $xoopsConfigUser = $config_handler->getConfigsByCat(XOOPS_CONF_USER);
-        $xoopsOption['template_main'] = 'system_userinfo.html';
-        include $GLOBALS['xoops']->path('header.php');
-        $xoopsTpl->assign('user_ownpage', true);
-        $xoopsTpl->assign('lang_editprofile', _US_EDITPROFILE);
-        $xoopsTpl->assign('lang_avatar', _US_AVATAR);
-        $xoopsTpl->assign('lang_inbox', _US_INBOX);
-        $xoopsTpl->assign('lang_logout', _US_LOGOUT);
+        $xoops->header('system_userinfo.html');
+        $xoops->tpl->assign('user_ownpage', true);
+        $xoops->tpl->assign('lang_editprofile', _US_EDITPROFILE);
+        $xoops->tpl->assign('lang_avatar', _US_AVATAR);
+        $xoops->tpl->assign('lang_inbox', _US_INBOX);
+        $xoops->tpl->assign('lang_logout', _US_LOGOUT);
         if ($xoopsConfigUser['self_delete'] == 1) {
-            $xoopsTpl->assign('user_candelete', true);
-            $xoopsTpl->assign('lang_deleteaccount', _US_DELACCOUNT);
+            $xoops->tpl->assign('user_candelete', true);
+            $xoops->tpl->assign('lang_deleteaccount', _US_DELACCOUNT);
         } else {
-            $xoopsTpl->assign('user_candelete', false);
+            $xoops->tpl->assign('user_candelete', false);
         }
-        $thisUser = $xoopsUser;
+        $thisUser = $xoops->user;
     } else {
+        /* @var $member_handler XoopsMemberHAndler */
         $member_handler = xoops_gethandler('member');
         $thisUser = $member_handler->getUser($uid);
-        if (! is_object($thisUser) || ! $thisUser->isActive()) {
+        if (!is_object($thisUser) || !$thisUser->isActive()) {
             redirect_header("index.php", 3, _US_SELECTNG);
-            exit();
         }
-        $xoopsOption['template_main'] = 'system_userinfo.html';
-        include $GLOBALS['xoops']->path('header.php');
-        $xoopsTpl->assign('user_ownpage', false);
+        $xoops->header('system_userinfo.html');
+        $xoops->tpl->assign('user_ownpage', false);
     }
 } else {
     $member_handler = xoops_gethandler('member');
@@ -73,92 +73,92 @@
         redirect_header("index.php", 3, _US_SELECTNG);
         exit();
     }
-    $xoopsOption['template_main'] = 'system_userinfo.html';
-    include $GLOBALS['xoops']->path('header.php');
-    $xoopsTpl->assign('user_ownpage', false);
+    $xoops->header('system_userinfo.html');
+    $xoops->tpl->assign('user_ownpage', false);
 }
 $myts = MyTextSanitizer::getInstance();
-if (is_object($xoopsUser) && $isAdmin) {
-    $xoopsTpl->assign('lang_editprofile', _US_EDITPROFILE);
-    $xoopsTpl->assign('lang_deleteaccount', _US_DELACCOUNT);
-    $xoopsTpl->assign('user_uid', $thisUser->getVar('uid'));
+if ($xoops->isUser() && $isAdmin) {
+    $xoops->tpl->assign('lang_editprofile', _US_EDITPROFILE);
+    $xoops->tpl->assign('lang_deleteaccount', _US_DELACCOUNT);
+    $xoops->tpl->assign('user_uid', $thisUser->getVar('uid'));
 }
-$xoopsOption['xoops_pagetitle'] = sprintf(_US_ALLABOUT, $thisUser->getVar('uname'));
-$xoopsTpl->assign('lang_allaboutuser', sprintf(_US_ALLABOUT, $thisUser->getVar('uname')));
-$xoopsTpl->assign('lang_avatar', _US_AVATAR);
 
+$xoops->tpl->assign('xoops_pagetitle', sprintf(_US_ALLABOUT, $thisUser->getVar('uname')));
+$xoops->tpl->assign('lang_allaboutuser', sprintf(_US_ALLABOUT, $thisUser->getVar('uname')));
+$xoops->tpl->assign('lang_avatar', _US_AVATAR);
+
 $avatar = "";
 if ($thisUser->getVar('user_avatar') && "blank.gif" != $thisUser->getVar('user_avatar')) {
     $avatar = XOOPS_UPLOAD_URL . "/" . $thisUser->getVar('user_avatar');
 }
-$xoopsTpl->assign('user_avatarurl', $avatar);
-$xoopsTpl->assign('lang_realname', _US_REALNAME);
-$xoopsTpl->assign('user_realname', $thisUser->getVar('name'));
-$xoopsTpl->assign('lang_website', _US_WEBSITE);
+$xoops->tpl->assign('user_avatarurl', $avatar);
+$xoops->tpl->assign('lang_realname', _US_REALNAME);
+$xoops->tpl->assign('user_realname', $thisUser->getVar('name'));
+$xoops->tpl->assign('lang_website', _US_WEBSITE);
 if ($thisUser->getVar('url', 'E') == '') {
-    $xoopsTpl->assign('user_websiteurl', '');
+    $xoops->tpl->assign('user_websiteurl', '');
 } else {
-    $xoopsTpl->assign('user_websiteurl', '<a href="' . $thisUser->getVar('url', 'E') . '" rel="external">' . $thisUser->getVar('url') . '</a>');
+    $xoops->tpl->assign('user_websiteurl', '<a href="' . $thisUser->getVar('url', 'E') . '" rel="external">' . $thisUser->getVar('url') . '</a>');
 }
-$xoopsTpl->assign('lang_email', _US_EMAIL);
-$xoopsTpl->assign('lang_privmsg', _US_PM);
-$xoopsTpl->assign('lang_icq', _US_ICQ);
-$xoopsTpl->assign('user_icq', $thisUser->getVar('user_icq'));
-$xoopsTpl->assign('lang_aim', _US_AIM);
-$xoopsTpl->assign('user_aim', $thisUser->getVar('user_aim'));
-$xoopsTpl->assign('lang_yim', _US_YIM);
-$xoopsTpl->assign('user_yim', $thisUser->getVar('user_yim'));
-$xoopsTpl->assign('lang_msnm', _US_MSNM);
-$xoopsTpl->assign('user_msnm', $thisUser->getVar('user_msnm'));
-$xoopsTpl->assign('lang_location', _US_LOCATION);
-$xoopsTpl->assign('user_location', $thisUser->getVar('user_from'));
-$xoopsTpl->assign('lang_occupation', _US_OCCUPATION);
-$xoopsTpl->assign('user_occupation', $thisUser->getVar('user_occ'));
-$xoopsTpl->assign('lang_interest', _US_INTEREST);
-$xoopsTpl->assign('user_interest', $thisUser->getVar('user_intrest'));
-$xoopsTpl->assign('lang_extrainfo', _US_EXTRAINFO);
+$xoops->tpl->assign('lang_email', _US_EMAIL);
+$xoops->tpl->assign('lang_privmsg', _US_PM);
+$xoops->tpl->assign('lang_icq', _US_ICQ);
+$xoops->tpl->assign('user_icq', $thisUser->getVar('user_icq'));
+$xoops->tpl->assign('lang_aim', _US_AIM);
+$xoops->tpl->assign('user_aim', $thisUser->getVar('user_aim'));
+$xoops->tpl->assign('lang_yim', _US_YIM);
+$xoops->tpl->assign('user_yim', $thisUser->getVar('user_yim'));
+$xoops->tpl->assign('lang_msnm', _US_MSNM);
+$xoops->tpl->assign('user_msnm', $thisUser->getVar('user_msnm'));
+$xoops->tpl->assign('lang_location', _US_LOCATION);
+$xoops->tpl->assign('user_location', $thisUser->getVar('user_from'));
+$xoops->tpl->assign('lang_occupation', _US_OCCUPATION);
+$xoops->tpl->assign('user_occupation', $thisUser->getVar('user_occ'));
+$xoops->tpl->assign('lang_interest', _US_INTEREST);
+$xoops->tpl->assign('user_interest', $thisUser->getVar('user_intrest'));
+$xoops->tpl->assign('lang_extrainfo', _US_EXTRAINFO);
 $var = $thisUser->getVar('bio', 'N');
-$xoopsTpl->assign('user_extrainfo', $myts->displayTarea($var, 0, 1, 1));
-$xoopsTpl->assign('lang_statistics', _US_STATISTICS);
-$xoopsTpl->assign('lang_membersince', _US_MEMBERSINCE);
+$xoops->tpl->assign('user_extrainfo', $myts->displayTarea($var, 0, 1, 1));
+$xoops->tpl->assign('lang_statistics', _US_STATISTICS);
+$xoops->tpl->assign('lang_membersince', _US_MEMBERSINCE);
 $var = $thisUser->getVar('user_regdate');
-$xoopsTpl->assign('user_joindate', formatTimestamp($var, 's'));
-$xoopsTpl->assign('lang_rank', _US_RANK);
-$xoopsTpl->assign('lang_posts', _US_POSTS);
-$xoopsTpl->assign('lang_basicInfo', _US_BASICINFO);
-$xoopsTpl->assign('lang_more', _US_MOREABOUT);
-$xoopsTpl->assign('lang_myinfo', _US_MYINFO);
-$xoopsTpl->assign('user_posts', $thisUser->getVar('posts'));
-$xoopsTpl->assign('lang_lastlogin', _US_LASTLOGIN);
-$xoopsTpl->assign('lang_notregistered', _US_NOTREGISTERED);
-$xoopsTpl->assign('lang_signature', _US_SIGNATURE);
+$xoops->tpl->assign('user_joindate', formatTimestamp($var, 's'));
+$xoops->tpl->assign('lang_rank', _US_RANK);
+$xoops->tpl->assign('lang_posts', _US_POSTS);
+$xoops->tpl->assign('lang_basicInfo', _US_BASICINFO);
+$xoops->tpl->assign('lang_more', _US_MOREABOUT);
+$xoops->tpl->assign('lang_myinfo', _US_MYINFO);
+$xoops->tpl->assign('user_posts', $thisUser->getVar('posts'));
+$xoops->tpl->assign('lang_lastlogin', _US_LASTLOGIN);
+$xoops->tpl->assign('lang_notregistered', _US_NOTREGISTERED);
+$xoops->tpl->assign('lang_signature', _US_SIGNATURE);
 $var = $thisUser->getVar('user_sig', 'N');
-$xoopsTpl->assign('user_signature', $myts->displayTarea($var, 0, 1, 1));
+$xoops->tpl->assign('user_signature', $myts->displayTarea($var, 0, 1, 1));
 if ($thisUser->getVar('user_viewemail') == 1) {
-    $xoopsTpl->assign('user_email', $thisUser->getVar('email', 'E'));
+    $xoops->tpl->assign('user_email', $thisUser->getVar('email', 'E'));
 } else {
-    if (is_object($xoopsUser)) {
+    if ($xoops->isUser()) {
         // All admins will be allowed to see emails, even those that are not allowed to edit users (I think it's ok like this)
-        if ($xoopsUserIsAdmin || ($xoopsUser->getVar("uid") == $thisUser->getVar("uid"))) {
-            $xoopsTpl->assign('user_email', $thisUser->getVar('email', 'E'));
+        if ($xoops->userIsAdmin || ($xoops->user->getVar("uid") == $thisUser->getVar("uid"))) {
+            $xoops->tpl->assign('user_email', $thisUser->getVar('email', 'E'));
         } else {
-            $xoopsTpl->assign('user_email', '&nbsp;');
+            $xoops->tpl->assign('user_email', '&nbsp;');
         }
     }
 }
-if (is_object($xoopsUser)) {
-    $xoopsTpl->assign('user_pmlink', "<a href=\"javascript:openWithSelfMain('" . XOOPS_URL . "/pmlite.php?send2=1&amp;to_userid=" . $thisUser->getVar('uid') . "', 'pmlite', 450, 380);\"><img src=\"" . XOOPS_URL . "/images/icons/pm.gif\" alt=\"" . sprintf(_SENDPMTO, $thisUser->getVar('uname')) . "\" /></a>");
+if ($xoops->isUser()) {
+    $xoops->tpl->assign('user_pmlink', "<a href=\"javascript:openWithSelfMain('" . XOOPS_URL . "/pmlite.php?send2=1&amp;to_userid=" . $thisUser->getVar('uid') . "', 'pmlite', 450, 380);\"><img src=\"" . XOOPS_URL . "/images/icons/pm.gif\" alt=\"" . sprintf(_SENDPMTO, $thisUser->getVar('uname')) . "\" /></a>");
 } else {
-    $xoopsTpl->assign('user_pmlink', '');
+    $xoops->tpl->assign('user_pmlink', '');
 }
 $userrank = $thisUser->rank();
 if (isset($userrank['image']) && $userrank['image']) {
-    $xoopsTpl->assign('user_rankimage', '<img src="' . XOOPS_UPLOAD_URL . '/' . $userrank['image'] . '" alt="" />');
+    $xoops->tpl->assign('user_rankimage', '<img src="' . XOOPS_UPLOAD_URL . '/' . $userrank['image'] . '" alt="" />');
 }
-$xoopsTpl->assign('user_ranktitle', $userrank['title']);
+$xoops->tpl->assign('user_ranktitle', $userrank['title']);
 $date = $thisUser->getVar("last_login");
-if (! empty($date)) {
-    $xoopsTpl->assign('user_lastlogin', formatTimestamp($date, "m"));
+if (!empty($date)) {
+    $xoops->tpl->assign('user_lastlogin', formatTimestamp($date, "m"));
 }
 $module_handler = xoops_gethandler('module');
 $criteria = new CriteriaCompo(new Criteria('hassearch', 1));
@@ -166,18 +166,19 @@
 $mids = array_keys($module_handler->getList($criteria));
 foreach ($mids as $mid) {
     if ($gperm_handler->checkRight('module_read', $mid, $groups)) {
+        /* @var $module XoopsModule */
         $module = $module_handler->get($mid);
         $results = $module->search('', '', 5, 0, $thisUser->getVar('uid'));
         $count = count($results);
         if (is_array($results) && $count > 0) {
-            for($i = 0; $i < $count; $i++) {
+            for ($i = 0; $i < $count; $i++) {
                 if (isset($results[$i]['image']) && $results[$i]['image'] != '') {
                     $results[$i]['image'] = 'modules/' . $module->getVar('dirname') . '/' . $results[$i]['image'];
                 } else {
                     $results[$i]['image'] = 'images/icons/posticon2.gif';
                 }
 
-                if (! preg_match("/^http[s]*:\/\//i", $results[$i]['link'])) {
+                if (!preg_match("/^http[s]*:\/\//i", $results[$i]['link'])) {
                     $results[$i]['link'] = "modules/" . $module->getVar('dirname') . "/" . $results[$i]['link'];
                 }
 
@@ -189,14 +190,12 @@
             } else {
                 $showall_link = '';
             }
-            $xoopsTpl->append('modules', array(
-                'name' => $module->getVar('name') ,
-                'results' => $results ,
-                'showall_link' => $showall_link));
+            $xoops->tpl->append('modules', array(
+                    'name' => $module->getVar('name'), 'results' => $results, 'showall_link' => $showall_link
+                ));
         }
         unset($module);
     }
 }
-include $GLOBALS['xoops']->path('footer.php');
-
+$xoops->footer();
 ?>
\ No newline at end of file

Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/viewpmsg.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/viewpmsg.php	2011-10-25 20:28:11 UTC (rev 7961)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/viewpmsg.php	2011-10-25 20:38:56 UTC (rev 7962)
@@ -19,7 +19,6 @@
 include dirname(__FILE__) . DIRECTORY_SEPARATOR . 'mainfile.php';
 
 $xoops = Xoops::getInstance();
-$xoops->preload = XoopsPreload::getInstance();
 $xoops->preload->triggerEvent('core.viewpmsg.start');
 
 xoops_loadLanguage('pmsg');

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.