XOOPS / XoopsCore

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 {

htdocs/modules/phpmailer/admin/about.php

Spacing +1 added lines, -1 removed lines

@@ -17,7 +17,7 @@
  * @author    Richard Griffith <richard@geekwright.com>
  * @link      https://xoops.org
  */
-include __DIR__ . '/header.php';
+include __DIR__.'/header.php';
 $xoops = Xoops::getInstance();
 $xoops->header();
 $aboutAdmin = new \Xoops\Module\Admin();

htdocs/modules/phpmailer/admin/index.php

Spacing +1 added lines, -1 removed lines

@@ -17,7 +17,7 @@
  * @package   phpmailer
  * @author    Richard Griffith <richard@geekwright.com>
  */
-include __DIR__ . '/header.php';
+include __DIR__.'/header.php';
 
 $xoops = Xoops::getInstance();
 

htdocs/modules/phpmailer/admin/header.php

Spacing +1 added lines, -1 removed lines

@@ -17,4 +17,4 @@
  * @package   phpmailer
  * @author    Richard Griffith <richard@geekwright.com>
  */
-require_once dirname(dirname(dirname(__DIR__))) . '/include/cp_header.php';
+require_once dirname(dirname(dirname(__DIR__))).'/include/cp_header.php';

htdocs/modules/phpmailer/xoops_version.php

Spacing +1 added lines, -1 removed lines

@@ -43,7 +43,7 @@
 // paypal
 $modversion['paypal'] = array(
     'business'      => 'xoopsfoundation@gmail.com',
-    'item_name'     => 'Donation : ' . _MI_PHPMAILER_NAME,
+    'item_name'     => 'Donation : '._MI_PHPMAILER_NAME,
     'amount'        => 0,
     'currency_code' => 'USD',
 );

htdocs/modules/phpmailer/preloads/preload.php

Spacing +2 added lines, -2 removed lines

@@ -34,7 +34,7 @@ 
      */
     public static function eventCoreServiceLocateEmail(Provider $provider)
     {
-        $path = dirname(__DIR__) . '/class/PhpMailerEmailProvider.php';
+        $path = dirname(__DIR__).'/class/PhpMailerEmailProvider.php';
         require $path;
         $object = new PhpMailerEmailProvider();
         $provider->register($object);
@@ -49,7 +49,7 @@ 
      */
     public static function eventCoreServiceLocateUserEmailMessage(Provider $provider)
     {
-        $path = dirname(__DIR__) . '/class/PhpMailerMessageProvider.php';
+        $path = dirname(__DIR__).'/class/PhpMailerMessageProvider.php';
         require $path;
         $object = new PhpMailerMessageProvider();
         $provider->register($object);

htdocs/modules/phpmailer/language/english/modinfo.php

Spacing +2 added lines, -2 removed lines

@@ -15,8 +15,8 @@
  * @author    Richard Griffith <richard@geekwright.com>
  */
 
-define('_MI_PHPMAILER_NAME','PHPMailer');
-define('_MI_PHPMAILER_DESC','Use PHPMailer for Email service');
+define('_MI_PHPMAILER_NAME', 'PHPMailer');
+define('_MI_PHPMAILER_DESC', 'Use PHPMailer for Email service');
 
 define('_MI_PHPMAILER_CONF_SMTPHOST', 'SMTP host(s)');
 define('_MI_PHPMAILER_CONF_SMTPHOST_DESC', 'List of SMTP servers to try to connect to separated by a ";". Example: localhost:25;tls://smtp.example.com:587');

htdocs/modules/phpmailer/class/PhpMailerEmailProvider.php

Spacing +7 added lines, -7 removed lines

@@ -73,11 +73,11 @@ 
     {
         // Addresses
         $address = $email->getFromAddress();
-        $mailer->setFrom($address->getEmail(), (string) $address->getDisplayName());
+        $mailer->setFrom($address->getEmail(), (string)$address->getDisplayName());
 
         $list = $email->getToAddresses();
         foreach ($list->getEachAddress() as $address) {
-            $mailer->addAddress($address->getEmail(), (string) $address->getDisplayName());
+            $mailer->addAddress($address->getEmail(), (string)$address->getDisplayName());
         }
 
         $list = $email->getReplyToAddresses();
@@ -107,8 +107,8 @@ 
             foreach ($attachmentSet->getEachAttachment() as $attachment) {
                 $file = $attachment->getFilename();
                 $body = $attachment->getStringBody();
-                $name = (string) $attachment->getName();
-                $type = (string) $attachment->getMimeType();
+                $name = (string)$attachment->getName();
+                $type = (string)$attachment->getMimeType();
                 $inline = $attachment->getInlineAttribute();
                 if (null !== $file && !$inline) {
                     $mailer->addAttachment($file, $name, 'base64', $type);
@@ -133,7 +133,7 @@ 
         }
 
         $mailer->isHTML(false);
-        $mailer->Body= $email->getBody();
+        $mailer->Body = $email->getBody();
 
         return $mailer;
     }
@@ -163,8 +163,8 @@ 
             case 'smtp':
                 $mailer->isSMTP();
                 $mailer->Host = $helper->getConfig('smtp_host', $mailer->Host);
-                $mailer->SMTPAutoTLS = (bool) $helper->getConfig('smtp_usetls', true);
-                $mailer->SMTPDebug = (int) $helper->getConfig('smtp_debug', 0);
+                $mailer->SMTPAutoTLS = (bool)$helper->getConfig('smtp_usetls', true);
+                $mailer->SMTPDebug = (int)$helper->getConfig('smtp_debug', 0);
                 break;
             case 'mail':
             default: