geekwright / XoopsCore

htdocs/install/page_siteinit.php

Spacing +17 added lines, -17 removed lines

@@ -23,13 +23,13 @@ 
  * @author      DuGris (aka L. JEN) <dugris@frxoops.org>
  */
 
-require_once __DIR__ . '/include/common.inc.php';
+require_once __DIR__.'/include/common.inc.php';
 
 set_time_limit(0); // don't want this to timeout
 
 function exception_handler($exception)
 {
-    echo "Uncaught exception: " , $exception->getMessage(), "\n";
+    echo "Uncaught exception: ", $exception->getMessage(), "\n";
     var_dump($exception->getTrace());
 }
 
@@ -54,8 +54,8 @@ 
 $xoops->loadLocale('system');
 
 // Install system module
-include_once $root . "/modules/system/class/module.php";
-include_once $root . "/modules/system/class/system.php";
+include_once $root."/modules/system/class/module.php";
+include_once $root."/modules/system/class/system.php";
 
 $system_module = new SystemModule();
 $system = System::getInstance();
@@ -114,7 +114,7 @@ 
         exit();
     }
 
-    $res = $dbm->query("SELECT COUNT(*) FROM " . $dbm->db->prefix('system_user'));
+    $res = $dbm->query("SELECT COUNT(*) FROM ".$dbm->db->prefix('system_user'));
     list ($isadmin) = $dbm->db->fetchRow($res);
 }
 
@@ -123,7 +123,7 @@ 
 if ($isadmin) {
     $pageHasForm = false;
     $pageHasHelp = false;
-    echo "<div class='x2-note errorMsg'>" . ADMIN_EXIST . "</div>\n";
+    echo "<div class='x2-note errorMsg'>".ADMIN_EXIST."</div>\n";
 } else {
     ?>
 <fieldset>
@@ -132,20 +132,20 @@ 
     <?php
             echo '<script type="text/javascript">
                 var desc = new Array();
-                desc[0] = "' . PASSWORD_DESC . '";
-                desc[1] = "' . PASSWORD_VERY_WEAK . '";
-                desc[2] = "' . PASSWORD_WEAK . '";
-                desc[3] = "' . PASSWORD_BETTER . '";
-                desc[4] = "' . PASSWORD_MEDIUM . '";
-                desc[5] = "' . PASSWORD_STRONG . '";
-                desc[6] = "' . PASSWORD_STRONGEST . '";
+                desc[0] = "' . PASSWORD_DESC.'";
+                desc[1] = "' . PASSWORD_VERY_WEAK.'";
+                desc[2] = "' . PASSWORD_WEAK.'";
+                desc[3] = "' . PASSWORD_BETTER.'";
+                desc[4] = "' . PASSWORD_MEDIUM.'";
+                desc[5] = "' . PASSWORD_STRONG.'";
+                desc[6] = "' . PASSWORD_STRONGEST.'";
         </script>';
 
     echo xoFormField('adminname', $siteconfig['adminname'], ADMIN_LOGIN_LABEL);
     if (!empty($error["name"])) {
         echo '<ul class="diags1">';
         foreach ($error["name"] as $errmsg) {
-            echo '<li class="failure">' . $errmsg . '</li>';
+            echo '<li class="failure">'.$errmsg.'</li>';
         }
         echo '</ul>';
     }
@@ -154,7 +154,7 @@ 
     if (!empty($error["email"])) {
         echo '<ul class="diags1">';
         foreach ($error["email"] as $errmsg) {
-            echo '<li class="failure">' . $errmsg . '</li>';
+            echo '<li class="failure">'.$errmsg.'</li>';
         }
         echo '</ul>';
     }
@@ -168,7 +168,7 @@ 
         if (!empty($error["pass"])) {
             echo '<ul class="diags1">';
             foreach ($error["pass"] as $errmsg) {
-                echo '<li class="failure">' . $errmsg . '</li>';
+                echo '<li class="failure">'.$errmsg.'</li>';
             }
             echo '</ul>';
         }
@@ -211,4 +211,4 @@ 
 $_SESSION['pageHasHelp'] = $pageHasHelp;
 $_SESSION['pageHasForm'] = $pageHasForm;
 $_SESSION['content'] = $content;
-include XOOPS_INSTALL_PATH . '/include/install_tpl.php';
+include XOOPS_INSTALL_PATH.'/include/install_tpl.php';

htdocs/readpmsg.php

Spacing +2 added lines, -2 removed lines

@@ -22,7 +22,7 @@ 
  * @version         $Id$
  */
 
-include __DIR__ . '/mainfile.php';
+include __DIR__.'/mainfile.php';
 $xoops = Xoops::getInstance();
 $xoops->events()->triggerEvent('core.readpmsg.start');
 
@@ -96,7 +96,7 @@ 
             }
         } else {
             $xoops->tpl()->assign('subject', $obj->getVar("subject"));
-            echo $xoops->confirm(array("ok" => 1, "msg_id" => $id, "op" => "delete"), 'readpmsg.php', XoopsLocale::Q_ARE_YOU_SURE_YOU_WANT_TO_DELETE_THIS_MESSAGES . '<br />' . $obj->getVar("subject"));
+            echo $xoops->confirm(array("ok" => 1, "msg_id" => $id, "op" => "delete"), 'readpmsg.php', XoopsLocale::Q_ARE_YOU_SURE_YOU_WANT_TO_DELETE_THIS_MESSAGES.'<br />'.$obj->getVar("subject"));
         }
         break;
 }

htdocs/misc.php

Indentation +2 added lines, -2 removed lines

@@ -88,8 +88,8 @@
                     $ymail = isset($_POST['ymail']) ? trim($_POST['ymail']) : '';
                 }
                 if (!isset($_POST['yname']) || trim($_POST['yname']) == "" || $ymail == ''
-				|| !isset($_POST['fname']) || trim($_POST['fname']) == "" || !isset($_POST['fmail'])
-				|| trim($_POST['fmail']) == '') {
+                || !isset($_POST['fname']) || trim($_POST['fname']) == "" || !isset($_POST['fmail'])
+                || trim($_POST['fmail']) == '') {
                     $xoops->redirect($xoops_url . "/misc.php?action=showpopups&type=friend&op=sendform", 2, XoopsLocale::E_YOU_NEED_TO_ENTER_REQUIRED_INFO);
                     exit();
                 }

Spacing +8 added lines, -8 removed lines

@@ -24,7 +24,7 @@ 
  * @version         $Id$
  */
 
-include __DIR__ . '/mainfile.php';
+include __DIR__.'/mainfile.php';
 
 $xoops = Xoops::getInstance();
 $xoops->logger()->quiet();
@@ -90,21 +90,21 @@ 
                 if (!isset($_POST['yname']) || trim($_POST['yname']) == "" || $ymail == ''
 				|| !isset($_POST['fname']) || trim($_POST['fname']) == "" || !isset($_POST['fmail'])
 				|| trim($_POST['fmail']) == '') {
-                    $xoops->redirect($xoops_url . "/misc.php?action=showpopups&type=friend&op=sendform", 2, XoopsLocale::E_YOU_NEED_TO_ENTER_REQUIRED_INFO);
+                    $xoops->redirect($xoops_url."/misc.php?action=showpopups&type=friend&op=sendform", 2, XoopsLocale::E_YOU_NEED_TO_ENTER_REQUIRED_INFO);
                     exit();
                 }
                 $yname = trim($_POST['yname']);
                 $fname = trim($_POST['fname']);
                 $fmail = trim($_POST['fmail']);
                 if (!$xoops->checkEmail($fmail) || !$xoops->checkEmail($ymail) || preg_match("/[\\0-\\31]/", $yname)) {
-                    $errormessage = XoopsLocale::EMAIL_PROVIDED_IS_INVALID . "<br />" . XoopsLocale::E_CHECK_EMAIL_AND_TRY_AGAIN . "";
-                    $xoops->redirect($xoops_url . "/misc.php?action=showpopups&amp;type=friend&amp;op=sendform", 2, $errormessage);
+                    $errormessage = XoopsLocale::EMAIL_PROVIDED_IS_INVALID."<br />".XoopsLocale::E_CHECK_EMAIL_AND_TRY_AGAIN."";
+                    $xoops->redirect($xoops_url."/misc.php?action=showpopups&amp;type=friend&amp;op=sendform", 2, $errormessage);
                 }
                 $xoopsMailer = $xoops->getMailer();
                 $xoopsMailer->setTemplate("tellfriend.tpl");
                 $xoopsMailer->assign("SITENAME", $xoops->getConfig('sitename'));
                 $xoopsMailer->assign("ADMINMAIL", $xoops->getConfig('adminmail'));
-                $xoopsMailer->assign("SITEURL", $xoops_url . "/");
+                $xoopsMailer->assign("SITEURL", $xoops_url."/");
                 $xoopsMailer->assign("YOUR_NAME", $yname);
                 $xoopsMailer->assign("FRIEND_NAME", $fname);
                 $xoopsMailer->setToEmails($fmail);
@@ -144,11 +144,11 @@ 
                     $onlineUsers[$i]['name'] = $user->getVar('uname');
                     $response = $xoops->service("Avatar")->getAvatarUrl($user);
                     $avatar = $response->getValue();
-                    $avatar = empty($avatar) ? $xoops_upload_url . '/blank.gif' : $avatar;
+                    $avatar = empty($avatar) ? $xoops_upload_url.'/blank.gif' : $avatar;
                     $onlineUsers[$i]['avatar'] = $avatar;
                 } else {
                     $onlineUsers[$i]['name'] = $xoops->getConfig('anonymous');
-                    $onlineUsers[$i]['avatar'] = $xoops_upload_url . '/blank.gif';
+                    $onlineUsers[$i]['avatar'] = $xoops_upload_url.'/blank.gif';
                 }
             }
 
@@ -166,7 +166,7 @@ 
             if ($xoops->getConfig('use_ssl') && isset($_POST[$xoops->getConfig('sslpost_name')]) && $xoops->isUser()) {
                 $xoops->loadLanguage('user');
                 echo sprintf(XoopsLocale::E_INCORRECT_LOGIN, $xoops->user->getVar('uname'));
-                echo '<div style="text-align:center;"><input class="formButton" value="' . XoopsLocale::A_CLOSE . '" type="button" onclick="window.opener.location.reload();window.close();" /></div>';
+                echo '<div style="text-align:center;"><input class="formButton" value="'.XoopsLocale::A_CLOSE.'" type="button" onclick="window.opener.location.reload();window.close();" /></div>';
                 $closebutton = false;
             }
             break;

htdocs/image.php

Spacing +2 added lines, -2 removed lines

@@ -19,9 +19,9 @@
  * @version         $Id$
  */
 
-include __DIR__ . '/mainfile.php';
+include __DIR__.'/mainfile.php';
 
 \Xoops::getInstance()->events()->triggerEvent('core.image');
 
 header('Content-type: image/gif');
-readfile(\XoopsBaseConfig::get('uploads-path') . '/blank.gif');
+readfile(\XoopsBaseConfig::get('uploads-path').'/blank.gif');

htdocs/browse.php

Spacing +8 added lines, -8 removed lines

@@ -20,7 +20,7 @@ 
  */
 
 $xoopsOption['nocommon'] = true;
-require_once __DIR__ . '/mainfile.php';
+require_once __DIR__.'/mainfile.php';
 
 //error_reporting(0);
 
@@ -42,7 +42,7 @@ 
 
 $path_type = substr($path, 0, strpos($path, '/'));
 if (!isset($xoops->paths[$path_type])) {
-    $path = "XOOPS/" . $path;
+    $path = "XOOPS/".$path;
     $path_type = "XOOPS";
 }
 
@@ -56,7 +56,7 @@ 
 $dir = realpath($xoops->paths[$path_type][0]);
 
 //We are not allowing directory traversal either
-if ($file===false || $dir===false || !strstr($file, $dir)) {
+if ($file === false || $dir === false || !strstr($file, $dir)) {
     header("HTTP/1.0 404 Not Found");
     exit();
 }
@@ -94,11 +94,11 @@ 
 
 // Output now
 // seconds, minutes, hours, days
-$expires = 60*60*24*15;
+$expires = 60 * 60 * 24 * 15;
 //header("Pragma: public");
-header("Cache-Control: public, max-age=" . $expires);
-header('Expires: ' . gmdate('D, d M Y H:i:s', time() + $expires) . ' GMT');
-header('Last-Modified: ' . gmdate('D, d M Y H:i:s T', $mtime));
-header('Content-type: ' . $mimetype);
+header("Cache-Control: public, max-age=".$expires);
+header('Expires: '.gmdate('D, d M Y H:i:s', time() + $expires).' GMT');
+header('Last-Modified: '.gmdate('D, d M Y H:i:s T', $mtime));
+header('Content-type: '.$mimetype);
 readfile($file);
 exit;

htdocs/notifications.php

Spacing +1 added lines, -1 removed lines

@@ -19,7 +19,7 @@
  * @version         $Id$
  */
 
-include __DIR__ . '/mainfile.php';
+include __DIR__.'/mainfile.php';
 
 $xoops = Xoops::getInstance();
 if ($xoops->isActiveModule('notifications')) {

htdocs/admin.php

Spacing +9 added lines, -9 removed lines

@@ -20,7 +20,7 @@ 
  * @version     $Id$
  */
 
-include __DIR__ . '/mainfile.php';
+include __DIR__.'/mainfile.php';
 
 $xoops = Xoops::getInstance();
 $xoops->isAdminSide = true;
@@ -94,23 +94,23 @@ 
     //$rssurl[] = 'http://sourceforge.net/export/rss2_projnews.php?group_id=41586&rss_fulltext=1';
     $rssurl[] = 'http://www.xoops.org/backend.php';
     $rssurl = array_unique(array_merge($rssurl, XoopsLocale::getAdminRssUrls()));
-    $rssfile = 'admin/rss/adminnews-' . $xoops->getConfig('locale');
+    $rssfile = 'admin/rss/adminnews-'.$xoops->getConfig('locale');
     $xoops->cache()->delete($rssfile);
-    $items = $xoops->cache()->cacheRead($rssfile, 'buildRssFeedCache', 24*60*60, $rssurl);
+    $items = $xoops->cache()->cacheRead($rssfile, 'buildRssFeedCache', 24 * 60 * 60, $rssurl);
     if ($items != '') {
         $ret = '<table class="outer width100">';
         foreach (array_keys($items) as $i) {
-            $ret .= '<tr class="head"><td><a href="' . htmlspecialchars($items[$i]['link']) . '" rel="external">';
-            $ret .= htmlspecialchars($items[$i]['title']) . '</a> (' . htmlspecialchars($items[$i]['pubdate']) . ')</td></tr>';
+            $ret .= '<tr class="head"><td><a href="'.htmlspecialchars($items[$i]['link']).'" rel="external">';
+            $ret .= htmlspecialchars($items[$i]['title']).'</a> ('.htmlspecialchars($items[$i]['pubdate']).')</td></tr>';
             if ($items[$i]['description'] != "") {
-                $ret .= '<tr><td class="odd">' . $items[$i]['description'];
+                $ret .= '<tr><td class="odd">'.$items[$i]['description'];
                 if (!empty($items[$i]['guid'])) {
-                    $ret .= '&nbsp;&nbsp;<a href="' . htmlspecialchars($items[$i]['guid']) . '" rel="external" title="">' . XoopsLocale::MORE . '</a>';
+                    $ret .= '&nbsp;&nbsp;<a href="'.htmlspecialchars($items[$i]['guid']).'" rel="external" title="">'.XoopsLocale::MORE.'</a>';
                 }
                 $ret .= '</td></tr>';
             } else {
                 if ($items[$i]['guid'] != "") {
-                    $ret .= '<tr><td class="even aligntop"></td><td colspan="2" class="odd"><a href="' . htmlspecialchars($items[$i]['guid']) . '" rel="external">' . _MORE . '</a></td></tr>';
+                    $ret .= '<tr><td class="even aligntop"></td><td colspan="2" class="odd"><a href="'.htmlspecialchars($items[$i]['guid']).'" rel="external">'._MORE.'</a></td></tr>';
                 }
             }
         }
@@ -137,7 +137,7 @@ 
                 for ($i = 0; $i < $count; $i++) {
                     // $_items[$i]['title'] = XoopsLocale::convert_encoding($_items[$i]['title'], XoopsLocale::getCharset(), 'UTF-8');
                     // $_items[$i]['description'] = XoopsLocale::convert_encoding($_items[$i]['description'], XoopsLocale::getCharset(), 'UTF-8');
-                    $items[(string)(strtotime($_items[$i]['pubdate'])) . "-" . (string)(++$cnt)] = $_items[$i];
+                    $items[(string)(strtotime($_items[$i]['pubdate']))."-".(string)(++$cnt)] = $_items[$i];
                 }
             } else {
                 echo $rss2parser->getErrors();

htdocs/register.php

Indentation +2 added lines, -2 removed lines

@@ -95,8 +95,8 @@
                   <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' />"
-                  . $xoops->security()->getTokenHTML()
-                  . "<input type='submit' value='" . XoopsLocale::A_FINISH . "' /></form>";
+                    . $xoops->security()->getTokenHTML()
+                    . "<input type='submit' value='" . XoopsLocale::A_FINISH . "' /></form>";
         } else {
             echo "<span class='red'>$stop</span>";
             include $xoops->path('include/registerform.php');

Switch Indentation +203 added lines, -203 removed lines

@@ -62,31 +62,31 @@ 
 }
 
 switch ($op) {
-    case 'newuser':
-        $xoops->header();
-        $xoops->tpl()->assign('xoops_pagetitle', XoopsLocale::USER_REGISTRATION);
-        $stop = '';
-        if (!$xoops->security()->check()) {
-            $stop .= implode('<br />', $xoops->security()->getErrors()) . "<br />";
-        }
-        if ($xoopsConfigUser['reg_dispdsclmr'] != 0 && $xoopsConfigUser['reg_disclaimer'] != '') {
-            if (empty($agree_disc)) {
-                $stop .= XoopsLocale::E_YOU_HAVE_TO_AGREE_TO_DISCLAIMER . '<br />';
+        case 'newuser':
+            $xoops->header();
+            $xoops->tpl()->assign('xoops_pagetitle', XoopsLocale::USER_REGISTRATION);
+            $stop = '';
+            if (!$xoops->security()->check()) {
+                $stop .= implode('<br />', $xoops->security()->getErrors()) . "<br />";
             }
-        }
-        $stop .= XoopsUserUtility::validate($uname, $email, $pass, $vpass);
-        if (empty($stop)) {
-            echo XoopsLocale::USERNAME . ": " . $myts->htmlSpecialChars($uname) . "<br />";
-            echo XoopsLocale::EMAIL . ": " . $myts->htmlSpecialChars($email) . "<br />";
-            if ($url != '') {
-                $url = $xoops->formatURL($url);
-                echo XoopsLocale::WEBSITE . ': ' . $myts->htmlSpecialChars($url) . '<br />';
+            if ($xoopsConfigUser['reg_dispdsclmr'] != 0 && $xoopsConfigUser['reg_disclaimer'] != '') {
+                if (empty($agree_disc)) {
+                    $stop .= XoopsLocale::E_YOU_HAVE_TO_AGREE_TO_DISCLAIMER . '<br />';
+                }
             }
-            echo XoopsLocale::TIME_ZONE . ": $timezone<br />";
-            echo "<form action='register.php' method='post'>";
-            $captcha = new Xoops\Form\Captcha();
-            echo "<br />" . $captcha->getCaption() . ": " . $captcha->render();
-            echo "<input type='hidden' name='uname' value='" . $myts->htmlSpecialChars($uname) . "' />
+            $stop .= XoopsUserUtility::validate($uname, $email, $pass, $vpass);
+            if (empty($stop)) {
+                echo XoopsLocale::USERNAME . ": " . $myts->htmlSpecialChars($uname) . "<br />";
+                echo XoopsLocale::EMAIL . ": " . $myts->htmlSpecialChars($email) . "<br />";
+                if ($url != '') {
+                    $url = $xoops->formatURL($url);
+                    echo XoopsLocale::WEBSITE . ': ' . $myts->htmlSpecialChars($url) . '<br />';
+                }
+                echo XoopsLocale::TIME_ZONE . ": $timezone<br />";
+                echo "<form action='register.php' method='post'>";
+                $captcha = new Xoops\Form\Captcha();
+                echo "<br />" . $captcha->getCaption() . ": " . $captcha->render();
+                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' value='" . $timezone . "' />
@@ -95,202 +95,202 @@ 
                   <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' />"
-                  . $xoops->security()->getTokenHTML()
-                  . "<input type='submit' value='" . XoopsLocale::A_FINISH . "' /></form>";
-        } else {
-            echo "<span class='red'>$stop</span>";
-            include $xoops->path('include/registerform.php');
-            $reg_form->display();
-        }
-        $xoops->footer();
-        break;
-
-    case 'finish':
-        $xoops->header();
-        $stop = XoopsUserUtility::validate($uname, $email, $pass, $vpass);
-        if (!$xoops->security()->check()) {
-            $stop .= implode('<br />', $xoops->security()->getErrors()) . "<br />";
-        }
-        $xoopsCaptcha = XoopsCaptcha::getInstance();
-        if (!$xoopsCaptcha->verify()) {
-            $stop .= $xoopsCaptcha->getMessage() . "<br />";
-        }
-        if (empty($stop)) {
-            $member_handler = $xoops->getHandlerMember();
-            $newuser = $member_handler->createUser();
-            $newuser->setVar('user_viewemail', $user_viewemail);
-            $newuser->setVar('uname', $uname);
-            $newuser->setVar('email', $email);
-            if ($url != '') {
-                $newuser->setVar('url', $xoops->formatURL($url));
-            }
-            $newuser->setVar('user_avatar', 'blank.gif');
-            $actkey = substr(\Xmf\Random::generateKey(), 16, 8);
-            $newuser->setVar('actkey', $actkey);
-            $newuser->setVar('pass', password_hash($pass, PASSWORD_DEFAULT));
-            $newuser->setVar('last_pass_change', time());
-            $newuser->setVar('timezone', $timezone);
-            $newuser->setVar('user_regdate', time());
-            $newuser->setVar('uorder', $xoops->getConfig('com_order'));
-            $newuser->setVar('umode', $xoops->getConfig('com_mode'));
-            $newuser->setVar('theme', $xoops->getConfig('theme_set'));
-            $newuser->setVar('user_mailok', $user_mailok);
-            if ($xoopsConfigUser['activation_type'] == 1) {
-                $newuser->setVar('level', 1);
+                      . $xoops->security()->getTokenHTML()
+                      . "<input type='submit' value='" . XoopsLocale::A_FINISH . "' /></form>";
             } else {
-                $newuser->setVar('level', 0);
-            }
-            if (!$member_handler->insertUser($newuser)) {
-                echo XoopsLocale::E_USER_NOT_REGISTERED;
-                $xoops->footer();
+                echo "<span class='red'>$stop</span>";
+                include $xoops->path('include/registerform.php');
+                $reg_form->display();
             }
-            $newid = $newuser->getVar('uid');
-            if (!$member_handler->addUserToGroup(FixedGroups::USERS, $newid)) {
-                echo XoopsLocale::E_USER_NOT_REGISTERED;
-                $xoops->footer();
+            $xoops->footer();
+            break;
+
+        case 'finish':
+            $xoops->header();
+            $stop = XoopsUserUtility::validate($uname, $email, $pass, $vpass);
+            if (!$xoops->security()->check()) {
+                $stop .= implode('<br />', $xoops->security()->getErrors()) . "<br />";
             }
-            if ($xoopsConfigUser['activation_type'] == 1) {
-                XoopsUserUtility::sendWelcome($newuser);
-                $xoops->redirect(
-                    'index.php',
-                    4,
-                    XoopsLocale::S_YOUR_ACCOUNT_ACTIVATED . ' ' . XoopsLocale::LOGIN_WITH_REGISTERED_PASSWORD
-                );
+            $xoopsCaptcha = XoopsCaptcha::getInstance();
+            if (!$xoopsCaptcha->verify()) {
+                $stop .= $xoopsCaptcha->getMessage() . "<br />";
             }
-            // Sending notification email to user for self activation
-            if ($xoopsConfigUser['activation_type'] == 0) {
-                $xoopsMailer = $xoops->getMailer();
-                $xoopsMailer->useMail();
-                $xoopsMailer->setTemplate('register.tpl');
-                $xoopsMailer->assign('SITENAME', $xoops->getConfig('sitename'));
-                $xoopsMailer->assign('ADMINMAIL', $xoops->getConfig('adminmail'));
-                $xoopsMailer->assign('SITEURL', $xoops_url . "/");
-                $xoopsMailer->setToUsers(new XoopsUser($newid));
-                $xoopsMailer->setFromEmail($xoops->getConfig('adminmail'));
-                $xoopsMailer->setFromName($xoops->getConfig('sitename'));
-                $xoopsMailer->setSubject(sprintf(XoopsLocale::F_USER_ACTIVATION_KEY_FOR, $uname));
-                if (!$xoopsMailer->send()) {
-                    echo XoopsLocale::S_YOU_ARE_NOW_REGISTERED . ' '
-                    . XoopsLocale::EMAIL_HAS_NOT_BEEN_SENT_WITH_ACTIVATION_KEY;
+            if (empty($stop)) {
+                $member_handler = $xoops->getHandlerMember();
+                $newuser = $member_handler->createUser();
+                $newuser->setVar('user_viewemail', $user_viewemail);
+                $newuser->setVar('uname', $uname);
+                $newuser->setVar('email', $email);
+                if ($url != '') {
+                    $newuser->setVar('url', $xoops->formatURL($url));
+                }
+                $newuser->setVar('user_avatar', 'blank.gif');
+                $actkey = substr(\Xmf\Random::generateKey(), 16, 8);
+                $newuser->setVar('actkey', $actkey);
+                $newuser->setVar('pass', password_hash($pass, PASSWORD_DEFAULT));
+                $newuser->setVar('last_pass_change', time());
+                $newuser->setVar('timezone', $timezone);
+                $newuser->setVar('user_regdate', time());
+                $newuser->setVar('uorder', $xoops->getConfig('com_order'));
+                $newuser->setVar('umode', $xoops->getConfig('com_mode'));
+                $newuser->setVar('theme', $xoops->getConfig('theme_set'));
+                $newuser->setVar('user_mailok', $user_mailok);
+                if ($xoopsConfigUser['activation_type'] == 1) {
+                    $newuser->setVar('level', 1);
                 } else {
-                    echo XoopsLocale::S_YOU_ARE_NOW_REGISTERED . ' '
-                    . XoopsLocale::EMAIL_HAS_BEEN_SENT_WITH_ACTIVATION_KEY;
+                    $newuser->setVar('level', 0);
                 }
-                // Sending notification email to administrator for activation
-            } elseif ($xoopsConfigUser['activation_type'] == 2) {
-                $xoopsMailer = $xoops->getMailer();
-                $xoopsMailer->useMail();
-                $xoopsMailer->setTemplate('adminactivate.tpl');
-                $xoopsMailer->assign('USERNAME', $uname);
-                $xoopsMailer->assign('USEREMAIL', $email);
-                $xoopsMailer->assign(
-                    'USERACTLINK',
-                    $xoops_url . '/register.php?op=actv&id=' . $newid . '&actkey=' . $actkey
-                );
-                $xoopsMailer->assign('SITENAME', $xoops->getConfig('sitename'));
-                $xoopsMailer->assign('ADMINMAIL', $xoops->getConfig('adminmail'));
-                $xoopsMailer->assign('SITEURL', $xoops_url . "/");
-                $member_handler = $xoops->getHandlerMember();
-                $xoopsMailer->setToGroups($member_handler->getGroup($xoopsConfigUser['activation_group']));
-                $xoopsMailer->setFromEmail($xoops->getConfig('adminmail'));
-                $xoopsMailer->setFromName($xoops->getConfig('sitename'));
-                $xoopsMailer->setSubject(sprintf(XoopsLocale::F_USER_ACTIVATION_KEY_FOR, $uname));
-                if (!$xoopsMailer->send()) {
-                    echo XoopsLocale::S_YOU_ARE_NOW_REGISTERED . ' '
+                if (!$member_handler->insertUser($newuser)) {
+                    echo XoopsLocale::E_USER_NOT_REGISTERED;
+                    $xoops->footer();
+                }
+                $newid = $newuser->getVar('uid');
+                if (!$member_handler->addUserToGroup(FixedGroups::USERS, $newid)) {
+                    echo XoopsLocale::E_USER_NOT_REGISTERED;
+                    $xoops->footer();
+                }
+                if ($xoopsConfigUser['activation_type'] == 1) {
+                    XoopsUserUtility::sendWelcome($newuser);
+                    $xoops->redirect(
+                        'index.php',
+                        4,
+                        XoopsLocale::S_YOUR_ACCOUNT_ACTIVATED . ' ' . XoopsLocale::LOGIN_WITH_REGISTERED_PASSWORD
+                    );
+                }
+                // Sending notification email to user for self activation
+                if ($xoopsConfigUser['activation_type'] == 0) {
+                    $xoopsMailer = $xoops->getMailer();
+                    $xoopsMailer->useMail();
+                    $xoopsMailer->setTemplate('register.tpl');
+                    $xoopsMailer->assign('SITENAME', $xoops->getConfig('sitename'));
+                    $xoopsMailer->assign('ADMINMAIL', $xoops->getConfig('adminmail'));
+                    $xoopsMailer->assign('SITEURL', $xoops_url . "/");
+                    $xoopsMailer->setToUsers(new XoopsUser($newid));
+                    $xoopsMailer->setFromEmail($xoops->getConfig('adminmail'));
+                    $xoopsMailer->setFromName($xoops->getConfig('sitename'));
+                    $xoopsMailer->setSubject(sprintf(XoopsLocale::F_USER_ACTIVATION_KEY_FOR, $uname));
+                    if (!$xoopsMailer->send()) {
+                        echo XoopsLocale::S_YOU_ARE_NOW_REGISTERED . ' '
                         . XoopsLocale::EMAIL_HAS_NOT_BEEN_SENT_WITH_ACTIVATION_KEY;
-                    echo XoopsLocale::S_YOU_ARE_NOW_REGISTERED . ' '
-                        . XoopsLocale::PLEASE_WAIT_FOR_ACCOUNT_ACTIVATION;
+                    } else {
+                        echo XoopsLocale::S_YOU_ARE_NOW_REGISTERED . ' '
+                        . XoopsLocale::EMAIL_HAS_BEEN_SENT_WITH_ACTIVATION_KEY;
+                    }
+                    // Sending notification email to administrator for activation
+                } elseif ($xoopsConfigUser['activation_type'] == 2) {
+                    $xoopsMailer = $xoops->getMailer();
+                    $xoopsMailer->useMail();
+                    $xoopsMailer->setTemplate('adminactivate.tpl');
+                    $xoopsMailer->assign('USERNAME', $uname);
+                    $xoopsMailer->assign('USEREMAIL', $email);
+                    $xoopsMailer->assign(
+                        'USERACTLINK',
+                        $xoops_url . '/register.php?op=actv&id=' . $newid . '&actkey=' . $actkey
+                    );
+                    $xoopsMailer->assign('SITENAME', $xoops->getConfig('sitename'));
+                    $xoopsMailer->assign('ADMINMAIL', $xoops->getConfig('adminmail'));
+                    $xoopsMailer->assign('SITEURL', $xoops_url . "/");
+                    $member_handler = $xoops->getHandlerMember();
+                    $xoopsMailer->setToGroups($member_handler->getGroup($xoopsConfigUser['activation_group']));
+                    $xoopsMailer->setFromEmail($xoops->getConfig('adminmail'));
+                    $xoopsMailer->setFromName($xoops->getConfig('sitename'));
+                    $xoopsMailer->setSubject(sprintf(XoopsLocale::F_USER_ACTIVATION_KEY_FOR, $uname));
+                    if (!$xoopsMailer->send()) {
+                        echo XoopsLocale::S_YOU_ARE_NOW_REGISTERED . ' '
+                            . XoopsLocale::EMAIL_HAS_NOT_BEEN_SENT_WITH_ACTIVATION_KEY;
+                        echo XoopsLocale::S_YOU_ARE_NOW_REGISTERED . ' '
+                            . XoopsLocale::PLEASE_WAIT_FOR_ACCOUNT_ACTIVATION;
+                    }
                 }
+                if ($xoopsConfigUser['new_user_notify'] == 1 && !empty($xoopsConfigUser['new_user_notify_group'])) {
+                    $xoopsMailer = $xoops->getMailer();
+                    $xoopsMailer->reset();
+                    $xoopsMailer->useMail();
+                    $member_handler = $xoops->getHandlerMember();
+                    $xoopsMailer->setToGroups($member_handler->getGroup($xoopsConfigUser['new_user_notify_group']));
+                    $xoopsMailer->setFromEmail($xoops->getConfig('adminmail'));
+                    $xoopsMailer->setFromName($xoops->getConfig('sitename'));
+                    $xoopsMailer->setSubject(
+                        sprintf(XoopsLocale::F_NEW_USER_REGISTRATION_AT, $xoops->getConfig('sitename'))
+                    );
+                    $xoopsMailer->setBody(sprintf(XoopsLocale::F_HAS_JUST_REGISTERED, $uname));
+                    $xoopsMailer->send();
+                }
+            } else {
+                echo "<span class='red bold'>{$stop}</span>";
+                include $xoops->path('include/registerform.php');
+                $reg_form->display();
             }
-            if ($xoopsConfigUser['new_user_notify'] == 1 && !empty($xoopsConfigUser['new_user_notify_group'])) {
-                $xoopsMailer = $xoops->getMailer();
-                $xoopsMailer->reset();
-                $xoopsMailer->useMail();
-                $member_handler = $xoops->getHandlerMember();
-                $xoopsMailer->setToGroups($member_handler->getGroup($xoopsConfigUser['new_user_notify_group']));
-                $xoopsMailer->setFromEmail($xoops->getConfig('adminmail'));
-                $xoopsMailer->setFromName($xoops->getConfig('sitename'));
-                $xoopsMailer->setSubject(
-                    sprintf(XoopsLocale::F_NEW_USER_REGISTRATION_AT, $xoops->getConfig('sitename'))
-                );
-                $xoopsMailer->setBody(sprintf(XoopsLocale::F_HAS_JUST_REGISTERED, $uname));
-                $xoopsMailer->send();
-            }
-        } else {
-            echo "<span class='red bold'>{$stop}</span>";
-            include $xoops->path('include/registerform.php');
-            $reg_form->display();
-        }
-        $xoops->footer();
-        break;
+            $xoops->footer();
+            break;
 
-    case 'actv':
-    case 'activate':
-        if (empty($id)) {
-            $xoops->redirect('index.php', 1, '');
-            exit();
-        }
-        $member_handler = $xoops->getHandlerMember();
-        $thisuser = $member_handler->getUser($id);
-        if (!is_object($thisuser)) {
-            exit();
-        }
-        if ($thisuser->getVar('actkey') != $actkey) {
-            $xoops->redirect('index.php', 5, XoopsLocale::E_ACTIVATION_KEY_INCORRECT);
-        } else {
-            if ($thisuser->getVar('level') > 0) {
-                $xoops->redirect('user.php', 5, XoopsLocale::E_SELECTED_ACCOUNT_IS_ALREADY_ACTIVATED, false);
+        case 'actv':
+        case 'activate':
+            if (empty($id)) {
+                $xoops->redirect('index.php', 1, '');
+                exit();
+            }
+            $member_handler = $xoops->getHandlerMember();
+            $thisuser = $member_handler->getUser($id);
+            if (!is_object($thisuser)) {
+                exit();
+            }
+            if ($thisuser->getVar('actkey') != $actkey) {
+                $xoops->redirect('index.php', 5, XoopsLocale::E_ACTIVATION_KEY_INCORRECT);
             } else {
-                if (false != $member_handler->activateUser($thisuser)) {
-                    $xoopsConfigUser = $xoops->getConfigs();
-                    if ($xoopsConfigUser['activation_type'] == 2) {
-                        $myts = \Xoops\Core\Text\Sanitizer::getInstance();
-                        $xoopsMailer = $xoops->getMailer();
-                        $xoopsMailer->useMail();
-                        $xoopsMailer->setTemplate('activated.tpl');
-                        $xoopsMailer->assign('SITENAME', $xoops->getConfig('sitename'));
-                        $xoopsMailer->assign('ADMINMAIL', $xoops->getConfig('adminmail'));
-                        $xoopsMailer->assign('SITEURL', $xoops_url . "/");
-                        $xoopsMailer->setToUsers($thisuser);
-                        $xoopsMailer->setFromEmail($xoops->getConfig('adminmail'));
-                        $xoopsMailer->setFromName($xoops->getConfig('sitename'));
-                        $xoopsMailer->setSubject(
-                            sprintf(XoopsLocale::F_YOUR_ACCOUNT_AT, $xoops->getConfig('sitename'))
-                        );
-                        $xoops->header();
-                        if (!$xoopsMailer->send()) {
-                            printf(XoopsLocale::EF_NOTIFICATION_EMAIL_NOT_SENT_TO, $thisuser->getVar('uname'));
+                if ($thisuser->getVar('level') > 0) {
+                    $xoops->redirect('user.php', 5, XoopsLocale::E_SELECTED_ACCOUNT_IS_ALREADY_ACTIVATED, false);
+                } else {
+                    if (false != $member_handler->activateUser($thisuser)) {
+                        $xoopsConfigUser = $xoops->getConfigs();
+                        if ($xoopsConfigUser['activation_type'] == 2) {
+                            $myts = \Xoops\Core\Text\Sanitizer::getInstance();
+                            $xoopsMailer = $xoops->getMailer();
+                            $xoopsMailer->useMail();
+                            $xoopsMailer->setTemplate('activated.tpl');
+                            $xoopsMailer->assign('SITENAME', $xoops->getConfig('sitename'));
+                            $xoopsMailer->assign('ADMINMAIL', $xoops->getConfig('adminmail'));
+                            $xoopsMailer->assign('SITEURL', $xoops_url . "/");
+                            $xoopsMailer->setToUsers($thisuser);
+                            $xoopsMailer->setFromEmail($xoops->getConfig('adminmail'));
+                            $xoopsMailer->setFromName($xoops->getConfig('sitename'));
+                            $xoopsMailer->setSubject(
+                                sprintf(XoopsLocale::F_YOUR_ACCOUNT_AT, $xoops->getConfig('sitename'))
+                            );
+                            $xoops->header();
+                            if (!$xoopsMailer->send()) {
+                                printf(XoopsLocale::EF_NOTIFICATION_EMAIL_NOT_SENT_TO, $thisuser->getVar('uname'));
+                            } else {
+                                printf(XoopsLocale::SF_NOTIFICATION_EMAIL_SENT_TO, $thisuser->getVar('uname'));
+                            }
+                            $xoops->footer();
                         } else {
-                            printf(XoopsLocale::SF_NOTIFICATION_EMAIL_SENT_TO, $thisuser->getVar('uname'));
+                            $xoops->redirect(
+                                'user.php',
+                                5,
+                                XoopsLocale::S_YOUR_ACCOUNT_ACTIVATED . ' ' . XoopsLocale::LOGIN_WITH_REGISTERED_PASSWORD,
+                                false
+                            );
                         }
-                        $xoops->footer();
                     } else {
-                        $xoops->redirect(
-                            'user.php',
-                            5,
-                            XoopsLocale::S_YOUR_ACCOUNT_ACTIVATED . ' ' . XoopsLocale::LOGIN_WITH_REGISTERED_PASSWORD,
-                            false
-                        );
+                        $xoops->redirect('index.php', 5, XoopsLocale::E_ACTIVATION_FAILED);
                     }
-                } else {
-                    $xoops->redirect('index.php', 5, XoopsLocale::E_ACTIVATION_FAILED);
                 }
             }
-        }
-        break;
+            break;
 
-    case 'register':
-    default:
-        $xoops->header();
-        $xoops->tpl()->assign('xoops_pagetitle', XoopsLocale::USER_REGISTRATION);
-        $xoops->theme()->addMeta(
-            'meta',
-            'keywords',
-            XoopsLocale::USER_REGISTRATION . ", " . XoopsLocale::USERNAME
-        ); // FIXME!
-        $xoops->theme()->addMeta('meta', 'description', strip_tags($xoopsConfigUser['reg_disclaimer']));
-        include $xoops->path('include/registerform.php');
-        $reg_form->display();
-        $xoops->footer();
-        break;
+        case 'register':
+        default:
+            $xoops->header();
+            $xoops->tpl()->assign('xoops_pagetitle', XoopsLocale::USER_REGISTRATION);
+            $xoops->theme()->addMeta(
+                'meta',
+                'keywords',
+                XoopsLocale::USER_REGISTRATION . ", " . XoopsLocale::USERNAME
+            ); // FIXME!
+            $xoops->theme()->addMeta('meta', 'description', strip_tags($xoopsConfigUser['reg_disclaimer']));
+            include $xoops->path('include/registerform.php');
+            $reg_form->display();
+            $xoops->footer();
+            break;
 }

Spacing +30 added lines, -30 removed lines

@@ -23,7 +23,7 @@ 
  * @author          Kazumi Ono <webmaster@myweb.ne.jp>
  * @version         $Id$
  */
-include __DIR__ . '/mainfile.php';
+include __DIR__.'/mainfile.php';
 
 $xoops = Xoops::getInstance();
 $xoops_url = \XoopsBaseConfig::get('url');
@@ -67,36 +67,36 @@ 
         $xoops->tpl()->assign('xoops_pagetitle', XoopsLocale::USER_REGISTRATION);
         $stop = '';
         if (!$xoops->security()->check()) {
-            $stop .= implode('<br />', $xoops->security()->getErrors()) . "<br />";
+            $stop .= implode('<br />', $xoops->security()->getErrors())."<br />";
         }
         if ($xoopsConfigUser['reg_dispdsclmr'] != 0 && $xoopsConfigUser['reg_disclaimer'] != '') {
             if (empty($agree_disc)) {
-                $stop .= XoopsLocale::E_YOU_HAVE_TO_AGREE_TO_DISCLAIMER . '<br />';
+                $stop .= XoopsLocale::E_YOU_HAVE_TO_AGREE_TO_DISCLAIMER.'<br />';
             }
         }
         $stop .= XoopsUserUtility::validate($uname, $email, $pass, $vpass);
         if (empty($stop)) {
-            echo XoopsLocale::USERNAME . ": " . $myts->htmlSpecialChars($uname) . "<br />";
-            echo XoopsLocale::EMAIL . ": " . $myts->htmlSpecialChars($email) . "<br />";
+            echo XoopsLocale::USERNAME.": ".$myts->htmlSpecialChars($uname)."<br />";
+            echo XoopsLocale::EMAIL.": ".$myts->htmlSpecialChars($email)."<br />";
             if ($url != '') {
                 $url = $xoops->formatURL($url);
-                echo XoopsLocale::WEBSITE . ': ' . $myts->htmlSpecialChars($url) . '<br />';
+                echo XoopsLocale::WEBSITE.': '.$myts->htmlSpecialChars($url).'<br />';
             }
-            echo XoopsLocale::TIME_ZONE . ": $timezone<br />";
+            echo XoopsLocale::TIME_ZONE.": $timezone<br />";
             echo "<form action='register.php' method='post'>";
             $captcha = new Xoops\Form\Captcha();
-            echo "<br />" . $captcha->getCaption() . ": " . $captcha->render();
-            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' value='" . $timezone . "' />
-                  <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 . "' />
+            echo "<br />".$captcha->getCaption().": ".$captcha->render();
+            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' value='" . $timezone."' />
+                  <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' />"
                   . $xoops->security()->getTokenHTML()
-                  . "<input type='submit' value='" . XoopsLocale::A_FINISH . "' /></form>";
+                  . "<input type='submit' value='".XoopsLocale::A_FINISH."' /></form>";
         } else {
             echo "<span class='red'>$stop</span>";
             include $xoops->path('include/registerform.php');
@@ -109,11 +109,11 @@ 
         $xoops->header();
         $stop = XoopsUserUtility::validate($uname, $email, $pass, $vpass);
         if (!$xoops->security()->check()) {
-            $stop .= implode('<br />', $xoops->security()->getErrors()) . "<br />";
+            $stop .= implode('<br />', $xoops->security()->getErrors())."<br />";
         }
         $xoopsCaptcha = XoopsCaptcha::getInstance();
         if (!$xoopsCaptcha->verify()) {
-            $stop .= $xoopsCaptcha->getMessage() . "<br />";
+            $stop .= $xoopsCaptcha->getMessage()."<br />";
         }
         if (empty($stop)) {
             $member_handler = $xoops->getHandlerMember();
@@ -154,7 +154,7 @@ 
                 $xoops->redirect(
                     'index.php',
                     4,
-                    XoopsLocale::S_YOUR_ACCOUNT_ACTIVATED . ' ' . XoopsLocale::LOGIN_WITH_REGISTERED_PASSWORD
+                    XoopsLocale::S_YOUR_ACCOUNT_ACTIVATED.' '.XoopsLocale::LOGIN_WITH_REGISTERED_PASSWORD
                 );
             }
             // Sending notification email to user for self activation
@@ -164,16 +164,16 @@ 
                 $xoopsMailer->setTemplate('register.tpl');
                 $xoopsMailer->assign('SITENAME', $xoops->getConfig('sitename'));
                 $xoopsMailer->assign('ADMINMAIL', $xoops->getConfig('adminmail'));
-                $xoopsMailer->assign('SITEURL', $xoops_url . "/");
+                $xoopsMailer->assign('SITEURL', $xoops_url."/");
                 $xoopsMailer->setToUsers(new XoopsUser($newid));
                 $xoopsMailer->setFromEmail($xoops->getConfig('adminmail'));
                 $xoopsMailer->setFromName($xoops->getConfig('sitename'));
                 $xoopsMailer->setSubject(sprintf(XoopsLocale::F_USER_ACTIVATION_KEY_FOR, $uname));
                 if (!$xoopsMailer->send()) {
-                    echo XoopsLocale::S_YOU_ARE_NOW_REGISTERED . ' '
+                    echo XoopsLocale::S_YOU_ARE_NOW_REGISTERED.' '
                     . XoopsLocale::EMAIL_HAS_NOT_BEEN_SENT_WITH_ACTIVATION_KEY;
                 } else {
-                    echo XoopsLocale::S_YOU_ARE_NOW_REGISTERED . ' '
+                    echo XoopsLocale::S_YOU_ARE_NOW_REGISTERED.' '
                     . XoopsLocale::EMAIL_HAS_BEEN_SENT_WITH_ACTIVATION_KEY;
                 }
                 // Sending notification email to administrator for activation
@@ -185,20 +185,20 @@ 
                 $xoopsMailer->assign('USEREMAIL', $email);
                 $xoopsMailer->assign(
                     'USERACTLINK',
-                    $xoops_url . '/register.php?op=actv&id=' . $newid . '&actkey=' . $actkey
+                    $xoops_url.'/register.php?op=actv&id='.$newid.'&actkey='.$actkey
                 );
                 $xoopsMailer->assign('SITENAME', $xoops->getConfig('sitename'));
                 $xoopsMailer->assign('ADMINMAIL', $xoops->getConfig('adminmail'));
-                $xoopsMailer->assign('SITEURL', $xoops_url . "/");
+                $xoopsMailer->assign('SITEURL', $xoops_url."/");
                 $member_handler = $xoops->getHandlerMember();
                 $xoopsMailer->setToGroups($member_handler->getGroup($xoopsConfigUser['activation_group']));
                 $xoopsMailer->setFromEmail($xoops->getConfig('adminmail'));
                 $xoopsMailer->setFromName($xoops->getConfig('sitename'));
                 $xoopsMailer->setSubject(sprintf(XoopsLocale::F_USER_ACTIVATION_KEY_FOR, $uname));
                 if (!$xoopsMailer->send()) {
-                    echo XoopsLocale::S_YOU_ARE_NOW_REGISTERED . ' '
+                    echo XoopsLocale::S_YOU_ARE_NOW_REGISTERED.' '
                         . XoopsLocale::EMAIL_HAS_NOT_BEEN_SENT_WITH_ACTIVATION_KEY;
-                    echo XoopsLocale::S_YOU_ARE_NOW_REGISTERED . ' '
+                    echo XoopsLocale::S_YOU_ARE_NOW_REGISTERED.' '
                         . XoopsLocale::PLEASE_WAIT_FOR_ACCOUNT_ACTIVATION;
                 }
             }
@@ -250,7 +250,7 @@ 
                         $xoopsMailer->setTemplate('activated.tpl');
                         $xoopsMailer->assign('SITENAME', $xoops->getConfig('sitename'));
                         $xoopsMailer->assign('ADMINMAIL', $xoops->getConfig('adminmail'));
-                        $xoopsMailer->assign('SITEURL', $xoops_url . "/");
+                        $xoopsMailer->assign('SITEURL', $xoops_url."/");
                         $xoopsMailer->setToUsers($thisuser);
                         $xoopsMailer->setFromEmail($xoops->getConfig('adminmail'));
                         $xoopsMailer->setFromName($xoops->getConfig('sitename'));
@@ -268,7 +268,7 @@ 
                         $xoops->redirect(
                             'user.php',
                             5,
-                            XoopsLocale::S_YOUR_ACCOUNT_ACTIVATED . ' ' . XoopsLocale::LOGIN_WITH_REGISTERED_PASSWORD,
+                            XoopsLocale::S_YOUR_ACCOUNT_ACTIVATED.' '.XoopsLocale::LOGIN_WITH_REGISTERED_PASSWORD,
                             false
                         );
                     }
@@ -286,7 +286,7 @@ 
         $xoops->theme()->addMeta(
             'meta',
             'keywords',
-            XoopsLocale::USER_REGISTRATION . ", " . XoopsLocale::USERNAME
+            XoopsLocale::USER_REGISTRATION.", ".XoopsLocale::USERNAME
         ); // FIXME!
         $xoops->theme()->addMeta('meta', 'description', strip_tags($xoopsConfigUser['reg_disclaimer']));
         include $xoops->path('include/registerform.php');

htdocs/search.php

Spacing +2 added lines, -2 removed lines

@@ -24,13 +24,13 @@
  * @todo            Modularize; Both search algorithms and interface will be redesigned
  */
 
-include __DIR__ . '/mainfile.php';
+include __DIR__.'/mainfile.php';
 
 $xoops = Xoops::getInstance();
 $uri = '';
 if ($xoops->isActiveModule('search')) {
     foreach (Request::get() as $k => $v) {
-        $uri .= urlencode($k) . '=' . urlencode($v) . '&';
+        $uri .= urlencode($k).'='.urlencode($v).'&';
     }
     $xoops->redirect("modules/search/index.php?{$uri}", 0);
 } else {