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

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

Revision: 7956
          http://xoops.svn.sourceforge.net/xoops/?rev=7956&view=rev
Author:   trabis
Date:     2011-10-24 23:45:36 +0000 (Mon, 24 Oct 2011)
Log Message:
-----------
More refactoring..

Modified Paths:
--------------
    XoopsCore/branches/2.6.x/2.6.0/htdocs/backend.php
    XoopsCore/branches/2.6.x/2.6.0/htdocs/banners.php
    XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoops.php
    XoopsCore/branches/2.6.x/2.6.0/htdocs/edituser.php
    XoopsCore/branches/2.6.x/2.6.0/htdocs/imagemanager.php
    XoopsCore/branches/2.6.x/2.6.0/htdocs/lostpass.php
    XoopsCore/branches/2.6.x/2.6.0/htdocs/notifications.php
    XoopsCore/branches/2.6.x/2.6.0/htdocs/pda.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

Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/backend.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/backend.php	2011-10-24 22:28:21 UTC (rev 7955)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/backend.php	2011-10-24 23:45:36 UTC (rev 7956)
@@ -53,16 +53,17 @@
     $tpl->assign('image_height', $height);
     if (file_exists($fileinc = $xoops->path('modules/news/class/class.newsstory.php'))) {
         include $fileinc;
-        $sarray =NewsStory::getAllPublished(10, 0, true);
+        $sarray = NewsStory::getAllPublished(10, 0, true);
     }
     if (!empty($sarray) && is_array($sarray)) {
         foreach ($sarray as $story) {
             $tpl->append('items', array(
-                'title' => XoopsLocal::convert_encoding(htmlspecialchars($story->title(), ENT_QUOTES)) ,
-                'link' => XOOPS_URL . '/modules/news/article.php?storyid=' . $story->storyid() ,
-                'guid' => XOOPS_URL . '/modules/news/article.php?storyid=' . $story->storyid() ,
-                'pubdate' => formatTimestamp($story->published(), 'rss') ,
-                'description' => XoopsLocal::convert_encoding(htmlspecialchars($story->hometext(), ENT_QUOTES))));
+                    'title' => XoopsLocal::convert_encoding(htmlspecialchars($story->title(), ENT_QUOTES)),
+                    'link' => XOOPS_URL . '/modules/news/article.php?storyid=' . $story->storyid(),
+                    'guid' => XOOPS_URL . '/modules/news/article.php?storyid=' . $story->storyid(),
+                    'pubdate' => formatTimestamp($story->published(), 'rss'),
+                    'description' => XoopsLocal::convert_encoding(htmlspecialchars($story->hometext(), ENT_QUOTES))
+                ));
         }
     }
 }

Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/banners.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/banners.php	2011-10-24 22:28:21 UTC (rev 7955)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/banners.php	2011-10-24 23:45:36 UTC (rev 7956)
@@ -11,6 +11,7 @@
  *
  * @copyright       The XOOPS Project http://sourceforge.net/projects/xoops/
  * @license         GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html)
+ * @package         core
  * @since           2.0.0
  * @author          Kazumi Ono <web...@my...>
  * @author          Taiwen Jiang <ph...@us...>
@@ -23,79 +24,83 @@
 
 xoops_loadLanguage('banners');
 
-/********************************************/
-/* Function to let your client login to see */
-/* the stats                                */
-/********************************************/
+
+/**
+ * Function to let your client login to see the stats
+ *
+ * @return void
+ */
 function clientlogin()
 {
     $xoops = Xoops::getInstance();
-    include $xoops->path('header.php');
+    $xoops->header();
     $xoops->theme->addStylesheet(null, null, '
         #login_window  {
-            max-width:                          480px;
-            margin:                             1em auto;
-            background-color:                   #f8f8f8;
-            color:                              inherit;
-            border:                             1px solid #000;
+            max-width: 480px;
+            margin: 1em auto;
+            background-color: #f8f8f8;
+            color: inherit;
+            border: 1px solid #000;
         }
-        #login_window  h2 {
-            margin:                             .5em;
-            padding:                            130px 0 0;
-            background:                         url( images/password.png) no-repeat center top;
-            text-align:                         center;
+
+        #login_window h2 {
+            margin: .5em;
+            padding: 130px 0 0;
+            background: url(images/password.png) no-repeat center top;
+            text-align: center;
         }
-        .login_form  .credentials {
-            margin:                             .5em 1em;
-            padding:                            1em;
-            background-color:                   #ccc;
-            color:                              inherit;
+        .login_form.credentials {
+            margin: .5em 1em;
+            padding: 1em;
+            background-color: #ccc;
+            color: inherit;
         }
-        .login_form  .credentials label {
-            display:                            inline-block;
-            width:                              33%;
-            margin:                             1px;
+        .login_form.credentials label {
+            display: inline-block;
+            width: 33 %;
+            margin: 1px;
         }
-        .login_form  .credentials input {
-            width:                              50%;
-            margin:                             1px;
-            padding:                            1px;
-            border:                             1px solid #000;
+        .login_form . credentials input {
+            width:50%;
+            margin: 1px;
+            padding: 1px;
+            border: 1px solid #000;
         }
-        .login_form  .credentials input:focus {
-            border:                             1px solid #2266cc;
+        .login_form.credentials input:focus {
+            border: 1px solid #2266cc;
         }
-        .login_form  .actions {
-            padding:                            1.5em .5em .5em;
-            text-align:                         center;
+        .login_form.actions {
+            padding: 1.5em .5em .5em;
+            text-align: center;
         }
         .login_info {
-            margin:                             .5em 1em;
-            text-align:                         center;
+            margin: .5em 1em;
+            text-align: center;
         }
         .content_title {
-            font-size:                          1.2em;
+            font-size: 1.2em;
         }
     ');
     echo "<div id='login_window'>
           <h2 class='content_title'>" . _BANNERS_LOGIN_TITLE . "</h2>
-          <form method='post' action='banners.php' class='login_form'>
+          <form method='post' action='banners . php' class='login_form'>
           <div class='credentials'>
-          <label for='login_form-login'>" . _BANNERS_LOGIN_LOGIN . "</label>
-          <input type='text' name='login' id='login_form-login' value='' /><br />
-          <label for='login_form-password'>" . _BANNERS_LOGIN_PASS . "</label>
-          <input type='password' name='pass' id='login_form-password' value='' /><br />
+          <label for='login_form - login'>" . _BANNERS_LOGIN_LOGIN . "</label>
+          <input type='text' name='login' id='login_form - login' value='' /><br />
+          <label for='login_form - password'>" . _BANNERS_LOGIN_PASS . "</label>
+          <input type='password' name='pass' id='login_form - password' value='' /><br />
           </div>
           <div class='actions'><input type='hidden' name='op' value='Ok' /><button type='submit'>" . _BANNERS_LOGIN_OK . "</button></div>
           <div class='login_info'>" . _BANNERS_LOGIN_INFO . "</div>" . $xoops->security->getTokenHTML("BANNER_LOGIN") . "
           </form></div>";
-    include $xoops->path('footer.php');
+    $xoops->footer();
 }
 
-/*********************************************/
-/* Function to display the banners stats for */
-/* each client                               */
-/*********************************************/
+/**
+ * Function to display the banners stats for each client
+ *
+ * @return void
+ */
 function bannerstats()
 {
     $xoops = Xoops::getInstance();
@@ -106,12 +111,10 @@
     $result = $xoops->db->query(sprintf("SELECT cid, name, passwd FROM %s WHERE login=%s", $xoops->db->prefix("bannerclient"), $xoops->db->quoteString($_SESSION['banner_login'])));
     list ($cid, $name, $passwd) = $xoops->db->fetchRow($result);
     if ($_SESSION['banner_pass'] == $passwd) {
-        include $xoops->path('header.php');
-        $xoops->theme->addStylesheet(null, null, '
+        $xoops->header();
+        $xoops->theme->addStylesheet(null, null,'
             #bannerstats {}
-            #bannerstats td {
-                text-align: center;
-            }
+            #bannerstats td {text-align: center;}
         ');
 
         echo "<div id='bannerstats'>
@@ -149,7 +152,7 @@
                   <td>{$left}</td>
                   <td>{$clicks}</td>
                   <td>{$percent}%</td>
-                  <td><a href='banners.php?op=EmailStats&amp;cid={$cid}&amp;bid={$bid}' title='" . _BANNERS_STATS . "'>" . _BANNERS_STATS . "</a></td></tr></tbody>";
+                  <td><a href='banners . php ? op = EmailStats & amp;cid ={$cid}&amp;bid ={$bid}' title='" . _BANNERS_STATS . "'>" . _BANNERS_STATS . "</a></td></tr></tbody>";
             $i++;
         }
         echo "</table>
@@ -163,10 +166,11 @@
                 echo "<br />";
             }
             if (!empty($htmlbanner) && !empty($htmlcode)) {
+                $myts = MyTextSanitizer::getInstance();
                 echo $myts->displayTarea($htmlcode);
             } else {
                 if (strtolower(substr($imageurl, strrpos($imageurl, "."))) == ".swf") {
-                    echo "<object type='application/x-shockwave-flash' width='468' height='60' data='{$imageurl}'>";
+                    echo "<object type='application / x - shockwave - flash' width='468' height='60' data='{$imageurl}'>";
                     echo "<param name='movie' value='{$imageurl}' />";
                     echo "<param name='quality' value='high' />";
                     echo "</object>";
@@ -174,11 +178,11 @@
                     echo "<img src='{$imageurl}' alt='' />";
                 }
             }
-            echo "<br /><strong>" . _BANNERS_ID . $bid . "</strong><br />" . sprintf(_BANNERS_SEND_STATS, 'banners.php?op=EmailStats&amp;cid=' . $cid . '&amp;bid=' . $bid) . "<br />";
+            echo "<br /><strong>" . _BANNERS_ID . $bid . "</strong><br />" . sprintf(_BANNERS_SEND_STATS, 'banners.php?op=EmailStats&amp;cid = ' . $cid . '&amp;bid=' . $bid) . "<br />";
             if (!$htmlbanner) {
                 $clickurl = htmlspecialchars($clickurl, ENT_QUOTES);
                 echo sprintf(_BANNERS_POINTS, $clickurl) . "<br />
-                <form action='banners.php' method='post'>" . _BANNERS_URL . "
+                <form action='banners . php' method='post'>" . _BANNERS_URL . "
                 <input type='text' name='url' size='50' maxlength='200' value='{$clickurl}' />
                 <input type='hidden' name='bid' value='{$bid}' />
                 <input type='hidden' name='cid' value='{$cid}' />
@@ -219,17 +223,20 @@
             }
             echo "</table></div>";
         }
-        include $xoops->path('footer.php');
+        $xoops->footer();
     } else {
         redirect_header("banners.php", 2);
         exit();
     }
 }
 
-/*********************************************/
-/* Function to let the client E-mail his     */
-/* banner Stats                              */
-/*********************************************/
+/**
+ * Function to let the client E-mail his banner Stats
+ *
+ * @param int $cid
+ * @param int $bid
+ * @return void
+ */
 function EmailStats($cid, $bid)
 {
     $xoops = Xoops::getInstance();
@@ -278,10 +285,14 @@
     exit();
 }
 
-/*********************************************/
-/* Function to let the client to change the  */
-/* url for his banner                        */
-/*********************************************/
+/**
+ * Function to let the client to change the url for his banner
+ *
+ * @param int $cid
+ * @param int $bid
+ * @param string $url
+ * @return void
+ */
 function change_banner_url_by_client($cid, $bid, $url)
 {
     $xoops = Xoops::getInstance();
@@ -304,6 +315,10 @@
     exit();
 }
 
+/**
+ * @param int $bid
+ * @return void
+ */
 function clickbanner($bid)
 {
     $xoops = Xoops::getInstance();
@@ -329,8 +344,10 @@
 $op = '';
 if (!empty($_POST['op'])) {
     $op = $_POST['op'];
-} else if (!empty($_GET['op'])) {
-    $op = $_GET['op'];
+} else {
+    if (!empty($_GET['op'])) {
+        $op = $_GET['op'];
+    }
 }
 
 $myts = MyTextSanitizer::getInstance();
@@ -356,7 +373,7 @@
         break;
     case _BANNERS_CHANGE:
         if (!$xoops->security->check(true, false, "BANNER_EDIT")) {
-            redirect_header("banners.php", 3, implode('<br />', $xoops->security->getErrors()));
+            redirect_header("banners.php", 3, implode(' <br />', $xoops->security->getErrors()));
             exit();
         }
         $bid = $cid = 0;

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-24 22:28:21 UTC (rev 7955)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoops.php	2011-10-24 23:45:36 UTC (rev 7956)
@@ -270,10 +270,15 @@
 
     /**
      * @param string $tpl_file
-     * @return void
+     * @return bool
      */
     public function header($tpl_file = '')
     {
+        static $included = false;
+        if ($included) {
+            return false;
+        }
+        $included = true;
         $this->tpl_file = $tpl_file;
 
         $this->preload->triggerEvent('core.header.start');
@@ -340,13 +345,18 @@
         $this->logger->startTime('Module display');
 
         $this->preload->triggerEvent('core.header.end');
+        return true;
     }
 
     /**
-     * @return void
+     * @return bool
      */
     public function footer()
     {
+        static $included = false;
+        if ($included) {
+            return false;
+        }
         $this->preload->triggerEvent('core.footer.start');
 
         $this->logger->stopTime('Module display');
@@ -373,6 +383,7 @@
         $xoops->logger->stopTime();
 
         $xoops->preload->triggerEvent('core.footer.end');
+        return true;
     }
 
     /**

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-24 22:28:21 UTC (rev 7955)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/edituser.php	2011-10-24 23:45:36 UTC (rev 7956)
@@ -11,7 +11,7 @@
  *
  * @copyright       The XOOPS Project http://sourceforge.net/projects/xoops/
  * @license         GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html)
- * @package         kernel
+ * @package         core
  * @since           2.0.0
  * @version         $Id$
  */
@@ -19,8 +19,8 @@
 include dirname(__FILE__) . DIRECTORY_SEPARATOR . 'mainfile.php';
 
 $xoops = Xoops::getInstance();
-$xoopsPreload = XoopsPreload::getInstance();
-$xoopsPreload->triggerEvent('core.edituser.start');
+$xoops->preload = XoopsPreload::getInstance();
+$xoops->preload->triggerEvent('core.edituser.start');
 
 xoops_loadLanguage('user');
 
@@ -83,7 +83,7 @@
         }
     }
     if (count($errors) > 0) {
-        include $xoops->path('header.php');
+        $xoops->header();
         echo '<div>';
         foreach ($errors as $er) {
             echo '<span class="red bold">' . $er . '</span><br />';
@@ -127,9 +127,9 @@
             setcookie($xoops->config['usercookie']);
         }
         if (! $member_handler->insertUser($edituser)) {
-            include $xoops->path('header.php');
+            $xoops->header();
             echo $edituser->getHtmlErrors();
-            include $xoops->path('footer.php');
+            $xoops->footer();
         } else {
             redirect_header('userinfo.php?uid=' . $uid, 1, _US_PROFUPDATED);
         }
@@ -138,7 +138,7 @@
 }
 
 if ($op == 'editprofile') {
-    include_once $xoops->path('header.php');
+    $xoops->header();
     include_once $xoops->path('include/comment_constants.php');
     echo '<a href="userinfo.php?uid=' . $xoops->user->getVar('uid') . '" title="">' . _US_PROFILE . '</a>&nbsp;<span class="bold">&raquo;&raquo;</span>&nbsp;' . _US_EDITPROFILE . '<br /><br />';
     $form = new XoopsThemeForm(_US_EDITPROFILE, 'userinfo', 'edituser.php', 'post', true);
@@ -187,7 +187,7 @@
         XOOPS_COMMENT_NEW1ST => _NEWESTFIRST));
     // RMV-NOTIFY
     // TODO: add this to admin user-edit functions...
-    include_once $xoops->path('language/' . $xoops->config['language'] . '/notification.php');
+    xoops_loadLanguage('notification');
     include_once $xoops->path('include/notification_constants.php');
     $notify_method_select = new XoopsFormSelect(_NOT_NOTIFYMETHOD, 'notify_method', $xoops->user->getVar('notify_method'));
     $notify_method_select->addOptionArray(array(
@@ -231,17 +231,17 @@
     $form->addElement($mailok_radio);
     $form->addElement($uid_hidden);
     $form->addElement($op_hidden);
-    $form->addElement($token_hidden);
+    //$form->addElement($token_hidden);
     $form->addElement($submit_button);
     if ($xoopsConfigUser['allow_chgmail'] == 1) {
         $form->setRequired($email_text);
     }
     $form->display();
-    include $xoops->path('footer.php');
+    $xoops->footer();
 }
 
 if ($op == 'avatarform') {
-    include $xoops->path('header.php');
+    $xoops->header();
     echo '<a href="userinfo.php?uid=' . $xoops->user->getVar('uid') . '">' . _US_PROFILE . '</a>&nbsp;<span class="bold">&raquo;&raquo;</span>&nbsp;' . _US_UPLOADMYAVATAR . '<br /><br />';
     $oldavatar = $xoops->user->getVar('user_avatar');
     if (!empty($oldavatar) && $oldavatar != 'blank.gif') {
@@ -276,7 +276,7 @@
     $form2->addElement(new XoopsFormHidden('op', 'avatarchoose'));
     $form2->addElement(new XoopsFormButton('', 'submit2', _SUBMIT, 'submit'));
     $form2->display();
-    include $xoops->path('footer.php');
+    $xoops->footer();
 }
 
 if ($op == 'avatarupload') {
@@ -370,9 +370,9 @@
         $xoops->user->setVar('user_avatar', $user_avatar);
         $member_handler = xoops_gethandler('member');
         if (!$member_handler->insertUser($xoops->user)) {
-            include $xoops->path('header.php');
+            $xoops->header();
             echo $xoops->user->getHtmlErrors();
-            include $xoops->path('footer.php');
+            $xoops->footer();
             exit();
         }
         if ($oldavatar && preg_match("/^cavt/", strtolower(substr($oldavatar,8)))) {

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-24 22:28:21 UTC (rev 7955)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/imagemanager.php	2011-10-24 23:45:36 UTC (rev 7956)
@@ -192,7 +192,7 @@
             $error = true;
         } else {
             $imgcatperm_handler = xoops_gethandler('groupperm');
-            if (is_object($xoopsUser)) {
+            if ($xoops->isUser()) {
                 if (!$imgcatperm_handler->checkRight('imgcat_write', $imgcat_id, $xoops->user->getGroups())) {
                     $error = true;
                 }

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-24 22:28:21 UTC (rev 7955)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/lostpass.php	2011-10-24 23:45:36 UTC (rev 7956)
@@ -64,9 +64,9 @@
         // Next step: add the new password to the database
         $sql = sprintf("UPDATE %s SET pass = '%s' WHERE uid = %u", $xoops->db->prefix("users"), md5($newpass), $getuser[0]->getVar('uid'));
         if (!$xoops->db->queryF($sql)) {
-            include $xoops->path('header.php');
+            $xoops->header();
             echo _US_MAILPWDNG;
-            include $xoops->path('footer.php');
+            $xoops->footer();
             exit();
         }
         redirect_header("user.php", 3, sprintf(_US_PWDMAILED, $getuser[0]->getVar("uname")), false);
@@ -85,14 +85,14 @@
         $xoopsMailer->setFromEmail($xoops->config['adminmail']);
         $xoopsMailer->setFromName($xoops->config['sitename']);
         $xoopsMailer->setSubject(sprintf(_US_NEWPWDREQ, $xoops->config['sitename']));
-        include $xoops->path('header.php');
+        $xoops->header();
         if (!$xoopsMailer->send()) {
             echo $xoopsMailer->getErrors();
         }
         echo "<h4>";
         printf(_US_CONFMAIL, $getuser[0]->getVar("uname"));
         echo "</h4>";
-        include $xoops->path('footer.php');
+        $xoops->footer();
     }
 }
 

Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/notifications.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/notifications.php	2011-10-24 22:28:21 UTC (rev 7955)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/notifications.php	2011-10-24 23:45:36 UTC (rev 7956)
@@ -138,8 +138,7 @@
                 'event_title' => $event_info['title'], 'user_id' => $n->getVar('not_uid')
             );
         }
-        $xoops->option['template_main'] = 'system_notification_list.html';
-        include $xoops->path('header.php');
+        $xoops->header('system_notification_list.html');
         $xoops->tpl->assign('modules', $modules);
         $user_info = array('uid' => $xoops->user->getVar('uid'));
         $xoops->tpl->assign('user', $user_info);
@@ -155,7 +154,7 @@
         $xoops->tpl->assign('lang_itemname', _NOT_ITEMNAME);
         $xoops->tpl->assign('lang_activenotifications', _NOT_ACTIVENOTIFICATIONS);
         $xoops->tpl->assign('notification_token', $xoops->security->createToken());
-        include $xoops->path('footer.php');
+        $xoops->footer();
 
         // TODO: another display mode... instead of one notification per line,
         // show one line per item_id, with checkboxes for the available options...
@@ -174,13 +173,13 @@
         if (empty($_POST['del_not'])) {
             redirect_header('notifications.php', 2, _NOT_NOTHINGTODELETE);
         }
-        include $xoops->path('header.php');
+        $xoops->header();
         $hidden_vars = array(
             'uid' => $uid, 'delete_ok' => 1, 'del_not' => $_POST['del_not']
         );
         echo '<h4>' . _NOT_DELETINGNOTIFICATIONS . '</h4>';
         xoops_confirm($hidden_vars, xoops_getenv('PHP_SELF'), _NOT_RUSUREDEL);
-        include $xoops->path('footer.php');
+        $xoops->footer();
         // FIXME: There is a problem here... in xoops_confirm it treats arrays as
         // optional radio arguments on the confirmation page... change this or
         // write new function...

Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/pda.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/pda.php	2011-10-24 22:28:21 UTC (rev 7955)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/pda.php	2011-10-24 23:45:36 UTC (rev 7956)
@@ -17,25 +17,26 @@
  */
 
 include dirname(__FILE__) . DIRECTORY_SEPARATOR . 'mainfile.php';
+$xoops = Xoops::getInstance();
 
 header("Content-Type: text/html");
-echo "<html><head><title>" . htmlspecialchars($xoopsConfig['sitename']) . "</title>
+echo "<html><head><title>" . htmlspecialchars($xoops->config['sitename']) . "</title>
       <meta name='HandheldFriendly' content='True' />
       <meta name='PalmComputingPlatform' content='True' />
       </head>
       <body>";
 
-$sql = "SELECT storyid, title FROM " . $xoopsDB->prefix("stories") . " WHERE published>0 AND published<" . time() . " ORDER BY published DESC";
-$result = $xoopsDB->query($sql, 10, 0);
+$sql = "SELECT storyid, title FROM " . $xoops->db->prefix("stories") . " WHERE published>0 AND published<" . time() . " ORDER BY published DESC";
+$result = $xoops->db->query($sql, 10, 0);
 //TODO Remove this hardcoded string
 if (!$result) {
     echo "An error occured";
 } else {
-    echo "<img src='images/logo.gif' alt='" . htmlspecialchars($xoopsConfig['sitename'], ENT_QUOTES) . "' border='0' /><br />";
-    echo "<h2>" . htmlspecialchars($xoopsConfig['slogan']) . "</h2>";
+    echo "<img src='images/logo.gif' alt='" . htmlspecialchars($xoops->config['sitename'], ENT_QUOTES) . "' border='0' /><br />";
+    echo "<h2>" . htmlspecialchars($xoops->config['slogan']) . "</h2>";
     echo "<div>";
-    while (list ($storyid, $title) = $xoopsDB->fetchRow($result)) {
-        echo "<a href='" . XOOPS_URL . "/modules/news/print.php?storyid=$storyid'>" . htmlspecialchars($title) . "</a><br />";
+    while (list ($storyid, $title) = $xoops->db->fetchRow($result)) {
+        echo "<a href='" . XOOPS_URL . "/modules/news/print.php?storyid={$storyid}'>" . htmlspecialchars($title) . "</a><br />";
     }
     echo "</div>";
 }

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-24 22:28:21 UTC (rev 7955)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/pmlite.php	2011-10-24 23:45:36 UTC (rev 7956)
@@ -17,14 +17,15 @@
  */
 
 include dirname(__FILE__) . DIRECTORY_SEPARATOR . 'mainfile.php';
-$xoopsPreload = XoopsPreload::getInstance();
-$xoopsPreload->triggerEvent('core.pmlite.start');
+$xoops = Xoops::getInstance();
+$xoops->preload = XoopsPreload::getInstance();
+$xoops->preload->triggerEvent('core.pmlite.start');
 
 xoops_loadLanguage('pmsg');
 
 
 //------------------------------ mamba
-$icon='';
+$icon = '';
 $icons_radio = new XoopsFormRadio(_MESSAGEICON, 'icon', $icon);
 $subject_icons = XoopsLists::getSubjectsList();
 //------------------------------- mamba
@@ -38,44 +39,48 @@
     $jump = "pmlite.php?refresh=" . time() . "";
     if ($send == 1) {
         $jump .= "&amp;send=" . $send . "";
-    } else if ($send2 == 1) {
-        $jump .= "&amp;send2=" . $send2 . "&amp;to_userid=" . $to_userid . "";
-    } else if ($reply == 1) {
-        $jump .= "&amp;reply=" . $reply . "&amp;msg_id=" . $msg_id . "";
     } else {
+        if ($send2 == 1) {
+            $jump .= "&amp;send2=" . $send2 . "&amp;to_userid=" . $to_userid . "";
+        } else {
+            if ($reply == 1) {
+                $jump .= "&amp;reply=" . $reply . "&amp;msg_id=" . $msg_id . "";
+            } else {
+            }
+        }
     }
     echo "<html><head><meta http-equiv='Refresh' content='0; url=" . $jump . "' /></head><body></body></html>";
     exit();
 }
 
 xoops_header();
-if (is_object($xoopsUser)) {
+if ($xoops->isUser()) {
     $myts = MyTextSanitizer::getInstance();
     if (isset($_POST['op']) && $_POST['op'] == "submit") {
-        if (!$GLOBALS['xoopsSecurity']->check()) {
+        if (!$xoops->security->check()) {
             $security_error = true;
         }
-        $res = $xoopsDB->query("SELECT COUNT(*) FROM " . $xoopsDB->prefix("users") . " WHERE uid=" . intval($_POST['to_userid']) . "");
-        list ($count) = $xoopsDB->fetchRow($res);
+        $res = $xoops->db->query("SELECT COUNT(*) FROM " . $xoops->db->prefix("users") . " WHERE uid=" . intval($_POST['to_userid']) . "");
+        list ($count) = $xoops->db->fetchRow($res);
         if ($count != 1) {
             echo "<br /><br /><div><h4>" . _PM_USERNOEXIST . "<br />";
             echo _PM_PLZTRYAGAIN . "</h4><br />";
             if (isset($security_error) && $security_error == true) {
-                echo implode('<br />', $GLOBALS['xoopsSecurity']->getErrors());
+                echo implode('<br />', $xoops->security->getErrors());
             }
             echo "[ <a href='javascript:history.go(-1)' title=''>" . _PM_GOBACK . "</a> ]</div>";
         } else {
             $pm_handler = xoops_gethandler('privmessage');
             $pm = $pm_handler->create();
-//------------------ mamba
-if (isset($_POST['icon'])) {
-            $pm->setVar("msg_image", $_POST['icon']);
+            //------------------ mamba
+            if (isset($_POST['icon'])) {
+                $pm->setVar("msg_image", $_POST['icon']);
             }
-//----------------- mamba
+            //----------------- mamba
             $pm->setVar("subject", $_POST['subject']);
             $pm->setVar("msg_text", $_POST['message']);
             $pm->setVar("to_userid", $_POST['to_userid']);
-            $pm->setVar("from_userid", $xoopsUser->getVar("uid"));
+            $pm->setVar("from_userid", $xoops->user->getVar("uid"));
             if (!$pm_handler->insert($pm)) {
                 echo $pm->getHtmlErrors();
                 echo "<br /><a href='javascript:history.go(-1)' title=''>" . _PM_GOBACK . "</a>";
@@ -83,82 +88,87 @@
                 echo "<br /><br /><div style='text-align:center;'><h4>" . _PM_MESSAGEPOSTED . "</h4><br /><a href=\"javascript:window.opener.location='" . XOOPS_URL . "/viewpmsg.php';window.close();\" title=\"\">" . _PM_CLICKHERE . "</a><br /><br /><a href=\"javascript:window.close();\" title=\"\">" . _PM_ORCLOSEWINDOW . "</a></div>";
             }
         }
-    } else if ($reply == 1 || $send == 1 || $send2 == 1) {
-        if ($reply == 1) {
-            $pm_handler = xoops_gethandler('privmessage');
-            $pm = $pm_handler->get($msg_id);
-            if ($pm->getVar("to_userid") == $xoopsUser->getVar('uid')) {
-                $pm_uname = XoopsUser::getUnameFromId($pm->getVar("from_userid"));
-                $message = "[quote]\n";
-                $message .= sprintf(_PM_USERWROTE, $pm_uname);
-                $message .= "\n" . $pm->getVar("msg_text", "E") . "\n[/quote]";
+    } else {
+        if ($reply == 1 || $send == 1 || $send2 == 1) {
+            if ($reply == 1) {
+                $pm_handler = xoops_gethandler('privmessage');
+                $pm = $pm_handler->get($msg_id);
+                if ($pm->getVar("to_userid") == $xoops->user->getVar('uid')) {
+                    $pm_uname = XoopsUser::getUnameFromId($pm->getVar("from_userid"));
+                    $message = "[quote]\n";
+                    $message .= sprintf(_PM_USERWROTE, $pm_uname);
+                    $message .= "\n" . $pm->getVar("msg_text", "E") . "\n[/quote]";
+                } else {
+                    $reply = $send2 = 0;
+                }
+            }
+            echo "<form action='pmlite.php' method='post' name='coolsus'>\n";
+            echo "<table style=' text-align:left;' class='outer'><tr><td class='head txtright' style='width:25%'>" . _PM_TO . "</td>";
+            if ($reply == 1) {
+                echo "<td class='even'><input type='hidden' name='to_userid' value='" . $pm->getVar("from_userid") . "' />" . $pm_uname . "</td>";
             } else {
-                unset($pm);
-                $reply = $send2 = 0;
+                if ($send2 == 1) {
+                    $to_username = XoopsUser::getUnameFromId($to_userid);
+                    echo "<td class='even'><input type='hidden' name='to_userid' value='" . $to_userid . "' />" . $to_username . "</td>";
+                } else {
+                    $user_sel = new XoopsFormSelectUser("", "to_userid");
+                    echo "<td class='even'>" . $user_sel->render();
+                    echo "</td>";
+                }
             }
-        }
-        echo "<form action='pmlite.php' method='post' name='coolsus'>\n";
-        echo "<table style=' text-align:left;' class='outer'><tr><td class='head txtright' style='width:25%'>" . _PM_TO . "</td>";
-        if ($reply == 1) {
-            echo "<td class='even'><input type='hidden' name='to_userid' value='" . $pm->getVar("from_userid") . "' />" . $pm_uname . "</td>";
-        } else if ($send2 == 1) {
-            $to_username = XoopsUser::getUnameFromId($to_userid);
-            echo "<td class='even'><input type='hidden' name='to_userid' value='" . $to_userid . "' />" . $to_username . "</td>";
-        } else {
-            $user_sel = new XoopsFormSelectUser("", "to_userid");
-            echo "<td class='even'>" . $user_sel->render();
-            echo "</td>";
-        }
-        echo "</tr>";
-        echo "<tr><td class='head txtright' style='width:25%;'>" . _PM_SUBJECTC . "</td>";
-        if ($reply == 1) {
-            $subject = $pm->getVar('subject', 'E');
-            //TODO Fix harcoded string
-            if (!preg_match("/^" . _RE . "/i", $subject)) {
-                $subject = _RE . ' ' . $subject;
+
+            echo "</tr>";
+            echo "<tr><td class='head txtright' style='width:25%;'>" . _PM_SUBJECTC . "</td>";
+            if ($reply == 1) {
+                $subject = $pm->getVar('subject', 'E');
+                //TODO Fix harcoded string
+                if (!preg_match("/^" . _RE . "/i", $subject)) {
+                    $subject = _RE . ' ' . $subject;
+                }
+                echo "<td class='even'><input type='text' name='subject' value='" . $subject . "' size='30' maxlength='100' /></td>";
+            } else {
+                echo "<td class='even'><input type='text' name='subject' size='30' maxlength='100' /></td>";
             }
-            echo "<td class='even'><input type='text' name='subject' value='" . $subject . "' size='30' maxlength='100' /></td>";
-        } else {
-            echo "<td class='even'><input type='text' name='subject' size='30' maxlength='100' /></td>";
-        }
-        echo "</tr>";
+            echo "</tr>";
+            unset($pm);
 
-//----------------------------- mamba
-       echo "<tr>";
-       echo "<td class='head txtright' style='width:25%;'>" . _MESSAGEICON. "</td>";
-       foreach ($subject_icons as $iconfile) {
-         $icons_radio->addOption($iconfile, '<img src="' . XOOPS_URL . '/images/subject/' . $iconfile . '" alt="" />');
-        }
-       echo "<td class='even'>" . $icons_radio->render();
-       echo "</td>";
-       echo "</tr>";
-//------------------------------- mamba
+            //----------------------------- mamba
+            echo "<tr>";
+            echo "<td class='head txtright' style='width:25%;'>" . _MESSAGEICON . "</td>";
+            foreach ($subject_icons as $iconfile) {
+                $icons_radio->addOption($iconfile, '<img src="' . XOOPS_URL . '/images/subject/' . $iconfile . '" alt="" />');
+            }
+            echo "<td class='even'>" . $icons_radio->render();
+            echo "</td>";
+            echo "</tr>";
+            //------------------------------- mamba
 
-        echo "<tr style='vertical-align:top;'><td style='width:25%;' class='head txtright'>" . _PM_MESSAGEC . "</td>";
-        echo "<td class='even'>";
-        $content = isset($GLOBALS[$textarea_id]) ? $GLOBALS[$textarea_id] : '';
-        $text_editor = new XoopsFormDhtmlTextArea('', 'message', $content, 8, 37, 'xoopsHiddenText');
-        $text_editor->htmlEditor = null;
-        //$text_editor->smilies = false;
-        echo $text_editor->render();
-        $myts = MyTextSanitizer::getInstance();
-        $smiles = $myts->getSmileys(FALSE);
-        $count = count($smiles);
-        for($i = 0; $i < $count; $i ++) {
-            echo "<img src='" . XOOPS_UPLOAD_URL . "/" . htmlspecialchars($smiles[$i]['smile_url'], ENT_QUOTES) . "' border='0' alt='' onclick='xoopsCodeSmilie(\"{$message}\", \" " . $smiles[$i]['code'] . " \");' onmouseover='style.cursor=\"hand\"' />";
-        }
-        echo "&nbsp;[<a href='#moresmiley' onmouseover='style.cursor=\"hand\"' alt='' onclick='openWithSelfMain(\"" . XOOPS_URL . "/misc.php?action=showpopups&amp;type=smilies&amp;target={$message}\",\"smilies\",300,475);'>" . _MORE . "</a>]";
+            echo "<tr style='vertical-align:top;'><td style='width:25%;' class='head txtright'>" . _PM_MESSAGEC . "</td>";
+            echo "<td class='even'>";
+            $content = isset($GLOBALS[$textarea_id]) ? $GLOBALS[$textarea_id] : '';
+            $text_editor = new XoopsFormDhtmlTextArea('', 'message', $content, 8, 37, 'xoopsHiddenText');
+            $text_editor->htmlEditor = null;
+            //$text_editor->smilies = false;
+            echo $text_editor->render();
+            $myts = MyTextSanitizer::getInstance();
+            $smiles = $myts->getSmileys(FALSE);
+            $count = count($smiles);
+            for ($i = 0; $i < $count; $i++) {
+                echo "<img src='" . XOOPS_UPLOAD_URL . "/" . htmlspecialchars($smiles[$i]['smile_url'], ENT_QUOTES) . "' border='0' alt='' onclick='xoopsCodeSmilie(\"{$message}\", \" " . $smiles[$i]['code'] . " \");' onmouseover='style.cursor=\"hand\"' />";
+            }
+            echo "&nbsp;[<a href='#moresmiley' onmouseover='style.cursor=\"hand\"' alt='' onclick='openWithSelfMain(\"" . XOOPS_URL . "/misc.php?action=showpopups&amp;type=smilies&amp;target={$message}\",\"smilies\",300,475);'>" . _MORE . "</a>]";
 
 
-        echo "</td>";
-        echo "</tr>";
-        echo "<tr><td class='head'>&nbsp;</td><td class='even'>
-        <input type='hidden' name='op' value='submit' />" . $GLOBALS['xoopsSecurity']->getTokenHTML() . "
+            echo "</td>";
+            echo "</tr>";
+            echo "<tr><td class='head'>&nbsp;</td><td class='even'>
+        <input type='hidden' name='op' value='submit' />" . $xoops->security->getTokenHTML() . "
         <input type='submit' class='formButton' name='submit' value='" . _PM_SUBMIT . "' />&nbsp;
         <input type='reset' class='formButton' value='" . _PM_CLEAR . "' />
         &nbsp;<input type='button' class='formButton' name='cancel' value='" . _PM_CANCELSEND . "' onclick='javascript:window.close();' />
         </td></tr></table>\n";
-        echo "</form>\n";
+            echo "</form>\n";
+        }
     }
 } else {
     echo _PM_SORRY . "<br /><br /><a href='" . XOOPS_URL . "/register.php' title=''>" . _PM_REGISTERNOW . "</a>.";

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-24 22:28:21 UTC (rev 7955)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/readpmsg.php	2011-10-24 23:45:36 UTC (rev 7956)
@@ -17,28 +17,30 @@
  */
 
 include dirname(__FILE__) . DIRECTORY_SEPARATOR . 'mainfile.php';
-$xoopsPreload = XoopsPreload::getInstance();
-$xoopsPreload->triggerEvent('core.readpmsg.start');
+$xoops = Xoops::getInstance();
+$xoops->preload = XoopsPreload::getInstance();
+$xoops->preload->triggerEvent('core.readpmsg.start');
 
 xoops_loadLanguage('pmsg');
 
-if (!is_object($xoopsUser)) {
+if (!$xoops->isUser()) {
     redirect_header("user.php", 0);
     exit();
 } else {
+    /* @var $pm_handler XoopsPrivmessageHandler */
     $pm_handler = xoops_gethandler('privmessage');
     if (!empty($_POST['delete'])) {
-        if (!$GLOBALS['xoopsSecurity']->check()) {
-            echo implode('<br />', $GLOBALS['xoopsSecurity']->getErrors());
+        if (!$xoops->security->check()) {
+            echo implode('<br />', $xoops->security->getErrors());
             exit();
         } else if (empty($_REQUEST['ok'])) {
-            include $GLOBALS['xoops']->path('header.php');
+            $xoops->header();
             xoops_confirm(array('ok' => 1, 'delete' => 1, 'msg_id'=> intval($_POST['msg_id'])), $_SERVER['REQUEST_URI'], _PM_SURE_TO_DELETE);
-            include $GLOBALS['xoops']->path('footer.php');
+            $xoops->footer();
             exit();
         }
         $pm = $pm_handler->get(intval($_POST['msg_id']));
-        if (!is_object($pm) || $pm->getVar('to_userid') != $xoopsUser->getVar('uid') || !$pm_handler->delete($pm)) {
+        if (!is_object($pm) || $pm->getVar('to_userid') != $xoops->user->getVar('uid') || !$pm_handler->delete($pm)) {
             exit();
         } else {
             redirect_header("viewpmsg.php", 1, _PM_DELETED);
@@ -47,13 +49,13 @@
     }
     $start = !empty($_GET['start']) ? intval($_GET['start']) : 0;
     $total_messages = !empty($_GET['total_messages']) ? intval($_GET['total_messages']) : 0;
-    include $GLOBALS['xoops']->path('header.php');
-    $criteria = new Criteria('to_userid', $xoopsUser->getVar('uid'));
+    $xoops->header();
+    $criteria = new Criteria('to_userid', $xoops->user->getVar('uid'));
     $criteria->setLimit(1);
     $criteria->setStart($start);
     $criteria->setSort('msg_time');
     $pm_arr = $pm_handler->getObjects($criteria);
-    echo "<div><h4>" . _PM_PRIVATEMESSAGE . "</h4></div><br /><a href='userinfo.php?uid=" . $xoopsUser->getVar("uid") . "' title=''>" . _PM_PROFILE . "</a>&nbsp;<span class='bold'>&raquo;&raquo;</span>&nbsp;<a href='viewpmsg.php' title=''>" . _PM_INBOX . "</a>&nbsp;<span class='bold'>&raquo;&raquo;</span>&nbsp;\n";
+    echo "<div><h4>" . _PM_PRIVATEMESSAGE . "</h4></div><br /><a href='userinfo.php?uid=" . $xoops->user->getVar("uid") . "' title=''>" . _PM_PROFILE . "</a>&nbsp;<span class='bold'>&raquo;&raquo;</span>&nbsp;<a href='viewpmsg.php' title=''>" . _PM_INBOX . "</a>&nbsp;<span class='bold'>&raquo;&raquo;</span>&nbsp;\n";
     if (empty($pm_arr)) {
         echo '<br /><br />' . _PM_YOUDONTHAVE;
     } else {
@@ -78,7 +80,7 @@
                 echo "<span class='red bold'>" . _PM_ONLINE . "</span><br /><br />\n";
             }
         } else {
-            echo $xoopsConfig['anonymous']; // we need to do this for deleted users
+            echo $xoops->config['anonymous']; // we need to do this for deleted users
         }
 //------------- mamba
         $iconName=$pm_arr[0]->getVar("msg_image", "E");
@@ -97,7 +99,7 @@
             echo "<a href='#' onclick='javascript:openWithSelfMain(\"" . XOOPS_URL . "/pmlite.php?reply=1&amp;msg_id=" . $pm_arr[0]->getVar("msg_id") . "\",\"pmlite\",565,500);'><img src='" . XOOPS_URL . "/images/icons/reply.gif' alt='" . _PM_REPLY . "' /></a>\n";
         }
         echo "<input type='hidden' name='delete' value='1' />";
-        echo $GLOBALS['xoopsSecurity']->getTokenHTML();
+        echo $xoops->security->getTokenHTML();
         echo "<input type='hidden' name='msg_id' value='" . $pm_arr[0]->getVar("msg_id") . "' />";
         echo "<a href='#" . $pm_arr[0]->getVar("msg_id") . "' onclick='javascript:document.delete" . $pm_arr[0]->getVar("msg_id") . ".submit();'><img src='" . XOOPS_URL . "/images/icons/delete.gif' alt='" . _PM_DELETE . "' /></a>";
         echo "</td></tr><tr><td class='txtright' colspan='2'>";
@@ -115,6 +117,6 @@
         }
         echo "</td></tr></table></form>\n";
     }
-    include $GLOBALS['xoops']->path('footer.php');
+    $xoops->footer();
 }
 ?>
\ No newline at end of file

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-24 22:28:21 UTC (rev 7955)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/register.php	2011-10-24 23:45:36 UTC (rev 7956)
@@ -24,13 +24,15 @@
  */
 include dirname(__FILE__) . DIRECTORY_SEPARATOR . 'mainfile.php';
 
-$xoopsPreload = XoopsPreload::getInstance();
-$xoopsPreload->triggerEvent('core.register.start');
+$xoops = Xoops::getInstance();
+$xoops->preload = XoopsPreload::getInstance();
+$xoops->preload->triggerEvent('core.register.start');
 
 xoops_loadLanguage('user');
 
 $myts = MyTextSanitizer::getInstance();
 
+/* @var $config_handler XoopsConfigHandler */
 $config_handler = xoops_gethandler('config');
 $xoopsConfigUser = $config_handler->getConfigsByCat(XOOPS_CONF_USER);
 
@@ -45,18 +47,18 @@
 $url = isset($_POST['url']) ? trim($myts->stripSlashesGPC($_POST['url'])) : '';
 $pass = isset($_POST['pass']) ? $myts->stripSlashesGPC($_POST['pass']) : '';
 $vpass = isset($_POST['vpass']) ? $myts->stripSlashesGPC($_POST['vpass']) : '';
-$timezone_offset = isset($_POST['timezone_offset']) ? (float) $_POST['timezone_offset'] : $xoopsConfig['default_TZ'];
+$timezone_offset = isset($_POST['timezone_offset']) ? (float)$_POST['timezone_offset'] : $xoops->config['default_TZ'];
 $user_viewemail = (isset($_POST['user_viewemail']) && intval($_POST['user_viewemail'])) ? 1 : 0;
 $user_mailok = (isset($_POST['user_mailok']) && intval($_POST['user_mailok'])) ? 1 : 0;
 $agree_disc = (isset($_POST['agree_disc']) && intval($_POST['agree_disc'])) ? 1 : 0;
 
 switch ($op) {
     case 'newuser':
-        $xoopsOption['xoops_pagetitle'] = _US_USERREG;
-        include $GLOBALS['xoops']->path('header.php');
+        $xoops->header();
+        $xoops->tpl->assign('xoops_pagetitle', _US_USERREG);
         $stop = '';
-        if (!$GLOBALS['xoopsSecurity']->check()) {
-            $stop .= implode('<br />', $GLOBALS['xoopsSecurity']->getErrors()) . "<br />";
+        if (!$xoops->security->check()) {
+            $stop .= implode('<br />', $xoops->security->getErrors()) . "<br />";
         }
         if ($xoopsConfigUser['reg_dispdsclmr'] != 0 && $xoopsConfigUser['reg_disclaimer'] != '') {
             if (empty($agree_disc)) {
@@ -79,33 +81,32 @@
             echo "<input type='hidden' name='uname' value='" . $myts->htmlSpecialChars($uname) . "' />
                   <input type='hidden' name='email' value='" . $myts->htmlSpecialChars($email) . "' />
                   <input type='hidden' name='user_viewemail' value='" . $user_viewemail . "' />
-                  <input type='hidden' name='timezone_offset' value='" . (float) $timezone_offset . "' />
+                  <input type='hidden' name='timezone_offset' value='" . (float)$timezone_offset . "' />
                   <input type='hidden' name='url' value='" . $myts->htmlSpecialChars($url) . "' />
                   <input type='hidden' name='pass' value='" . $myts->htmlSpecialChars($pass) . "' />
                   <input type='hidden' name='vpass' value='" . $myts->htmlSpecialChars($vpass) . "' />
                   <input type='hidden' name='user_mailok' value='" . $user_mailok . "' />
-                  <br /><br /><input type='hidden' name='op' value='finish' />"
-                  . $GLOBALS['xoopsSecurity']->getTokenHTML()
-                  . "<input type='submit' value='" . _US_FINISH . "' /></form>";
+                  <br /><br /><input type='hidden' name='op' value='finish' />" . $GLOBALS['xoopsSecurity']->getTokenHTML() . "<input type='submit' value='" . _US_FINISH . "' /></form>";
         } else {
             echo "<span class='red'>$stop</span>";
-            include $GLOBALS['xoops']->path('include/registerform.php');
+            include $xoops->path('include/registerform.php');
             $reg_form->display();
         }
-        include $GLOBALS['xoops']->path('footer.php');
+        $xoops->footer();
         break;
 
     case 'finish':
-        include $GLOBALS['xoops']->path('header.php');
+        $xoops->header();
         $stop = XoopsUserUtility::validate($uname, $email, $pass, $vpass);
-        if (!$GLOBALS['xoopsSecurity']->check()) {
-            $stop .= implode('<br />', $GLOBALS['xoopsSecurity']->getErrors()) . "<br />";
+        if (!$xoops->security->check()) {
+            $stop .= implode('<br />', $xoops->security->getErrors()) . "<br />";
         }
         $xoopsCaptcha = XoopsCaptcha::getInstance();
         if (!$xoopsCaptcha->verify()) {
             $stop .= $xoopsCaptcha->getMessage() . "<br />";
         }
         if (empty($stop)) {
+            /* @var $member_handler XoopsMemberHandler */
             $member_handler = xoops_gethandler('member');
             $newuser = $member_handler->createUser();
             $newuser->setVar('user_viewemail', $user_viewemail, true);
@@ -120,9 +121,9 @@
             $newuser->setVar('pass', md5($pass), true);
             $newuser->setVar('timezone_offset', $timezone_offset, true);
             $newuser->setVar('user_regdate', time(), true);
-            $newuser->setVar('uorder', $GLOBALS['xoopsConfig']['com_order'], true);
-            $newuser->setVar('umode', $GLOBALS['xoopsConfig']['com_mode'], true);
-            $newuser->setVar('theme', $GLOBALS['xoopsConfig']['theme_set'], true);
+            $newuser->setVar('uorder', $xoops->config['com_order'], true);
+            $newuser->setVar('umode', $xoops->config['com_mode'], true);
+            $newuser->setVar('theme', $xoops->config['theme_set'], true);
             $newuser->setVar('user_mailok', $user_mailok, true);
             if ($xoopsConfigUser['activation_type'] == 1) {
                 $newuser->setVar('level', 1, true);
@@ -131,13 +132,13 @@
             }
             if (!$member_handler->insertUser($newuser)) {
                 echo _US_REGISTERNG;
-                include $GLOBALS['xoops']->path('footer.php');
+                $xoops->footer();
                 exit();
             }
             $newid = $newuser->getVar('uid');
             if (!$member_handler->addUserToGroup(XOOPS_GROUP_USERS, $newid)) {
                 echo _US_REGISTERNG;
-                include $GLOBALS['xoops']->path('footer.php');
+                $xoops->footer();
                 exit();
             }
             if ($xoopsConfigUser['activation_type'] == 1) {
@@ -150,14 +151,14 @@
                 $xoopsMailer = xoops_getMailer();
                 $xoopsMailer->useMail();
                 $xoopsMailer->setTemplate('register.tpl');
-                $xoopsMailer->assign('SITENAME', $xoopsConfig['sitename']);
-                $xoopsMailer->assign('ADMINMAIL', $xoopsConfig['adminmail']);
+                $xoopsMailer->assign('SITENAME', $xoops->config['sitename']);
+                $xoopsMailer->assign('ADMINMAIL', $xoops->config['adminmail']);
                 $xoopsMailer->assign('SITEURL', XOOPS_URL . "/");
                 $xoopsMailer->setToUsers(new XoopsUser($newid));
-                $xoopsMailer->setFromEmail($xoopsConfig['adminmail']);
-                $xoopsMailer->setFromName($xoopsConfig['sitename']);
+                $xoopsMailer->setFromEmail($xoops->config['adminmail']);
+                $xoopsMailer->setFromName($xoops->config['sitename']);
                 $xoopsMailer->setSubject(sprintf(_US_USERKEYFOR, $uname));
-                if (! $xoopsMailer->send()) {
+                if (!$xoopsMailer->send()) {
                     echo _US_YOURREGMAILNG;
                 } else {
                     echo _US_YOURREGISTERED;
@@ -170,15 +171,15 @@
                 $xoopsMailer->assign('USERNAME', $uname);
                 $xoopsMailer->assign('USEREMAIL', $email);
                 $xoopsMailer->assign('USERACTLINK', XOOPS_URL . '/register.php?op=actv&id=' . $newid . '&actkey=' . $actkey);
-                $xoopsMailer->assign('SITENAME', $xoopsConfig['sitename']);
-                $xoopsMailer->assign('ADMINMAIL', $xoopsConfig['adminmail']);
+                $xoopsMailer->assign('SITENAME', $xoops->config['sitename']);
+                $xoopsMailer->assign('ADMINMAIL', $xoops->config['adminmail']);
                 $xoopsMailer->assign('SITEURL', XOOPS_URL . "/");
                 $member_handler = xoops_gethandler('member');
                 $xoopsMailer->setToGroups($member_handler->getGroup($xoopsConfigUser['activation_group']));
-                $xoopsMailer->setFromEmail($xoopsConfig['adminmail']);
-                $xoopsMailer->setFromName($xoopsConfig['sitename']);
+                $xoopsMailer->setFromEmail($xoops->config['adminmail']);
+                $xoopsMailer->setFromName($xoops->config['sitename']);
                 $xoopsMailer->setSubject(sprintf(_US_USERKEYFOR, $uname));
-                if (! $xoopsMailer->send()) {
+                if (!$xoopsMailer->send()) {
                     echo _US_YOURREGMAILNG;
                 } else {
                     echo _US_YOURREGISTERED2;
@@ -198,10 +199,10 @@
             }
         } else {
             echo "<span class='red bold'>{$stop}</span>";
-            include $GLOBALS['xoops']->path('include/registerform.php');
+            include $xoops->path('include/registerform.php');
             $reg_form->display();
         }
-        include $GLOBALS['xoops']->path('footer.php');
+        $xoops->footer();
         break;
 
     case 'actv':
@@ -231,20 +232,20 @@
                         $xoopsMailer = xoops_getMailer();
                         $xoopsMailer->useMail();
                         $xoopsMailer->setTemplate('activated.tpl');
-                        $xoopsMailer->assign('SITENAME', $xoopsConfig['sitename']);
-                        $xoopsMailer->assign('ADMINMAIL', $xoopsConfig['adminmail']);
+                        $xoopsMailer->assign('SITENAME', $xoops->config['sitename']);
+                        $xoopsMailer->assign('ADMINMAIL', $xoops->config['adminmail']);
                         $xoopsMailer->assign('SITEURL', XOOPS_URL . "/");
                         $xoopsMailer->setToUsers($thisuser);
-                        $xoopsMailer->setFromEmail($xoopsConfig['adminmail']);
-                        $xoopsMailer->setFromName($xoopsConfig['sitename']);
-                        $xoopsMailer->setSubject(sprintf(_US_YOURACCOUNT, $xoopsConfig['sitename']));
-                        include $GLOBALS['xoops']->path('header.php');
+                        $xoopsMailer->setFromEmail($xoops->config['adminmail']);
+                        $xoopsMailer->setFromName($xoops->config['sitename']);
+                        $xoopsMailer->setSubject(sprintf(_US_YOURACCOUNT, $xoops->config['sitename']));
+                        $xoops->header();
                         if (!$xoopsMailer->send()) {
                             printf(_US_ACTVMAILNG, $thisuser->getVar('uname'));
                         } else {
                             printf(_US_ACTVMAILOK, $thisuser->getVar('uname'));
                         }
-                        include $GLOBALS['xoops']->path('footer.php');
+                        $xoops->footer();
                     } else {
                         redirect_header('user.php', 5, _US_ACTLOGIN, false);
                     }
@@ -257,13 +258,13 @@
 
     case 'register':
     default:
-        $xoopsOption['xoops_pagetitle'] = _US_USERREG;
-        include $GLOBALS['xoops']->path('header.php');
-        $xoTheme->addMeta('meta', 'keywords', _US_USERREG . ", " . _US_NICKNAME); // FIXME!
-        $xoTheme->addMeta('meta', 'description', strip_tags($xoopsConfigUser['reg_disclaimer']));
-        include $GLOBALS['xoops']->path('include/registerform.php');
+        $xoops->header();
+        $xoops->tpl->assign('xoops_pagetitle', _US_USERREG);
+        $xoops->theme->addMeta('meta', 'keywords', _US_USERREG . ", " . _US_NICKNAME); // FIXME!
+        $xoops->theme->addMeta('meta', 'description', strip_tags($xoopsConfigUser['reg_disclaimer']));
+        include $xoops->path('include/registerform.php');
         $reg_form->display();
-        include $GLOBALS['xoops']->path('footer.php');
+        $xoops->footer();
         break;
 }
 ?>
\ No newline at end of file

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