XOOPS /
XoopsCore
@@ -8,8 +8,8 @@ |
||
| 8 | 8 | <meta http-equiv="Content-Type" content="text/html; charset=<?php echo _UPGRADE_CHARSET ?>" /> |
| 9 | 9 | <link rel="stylesheet" type="text/css" media="all" href="style.css" /> |
| 10 | 10 | <?php |
| 11 | - if (file_exists('language/' . $upgrade_language . '/style.css')) { |
|
| 12 | - echo '<link rel="stylesheet" type="text/css" media="all" href="language/' . $upgrade_language . '/style.css" />'; |
|
| 11 | + if (file_exists('language/'.$upgrade_language.'/style.css')) { |
|
| 12 | + echo '<link rel="stylesheet" type="text/css" media="all" href="language/'.$upgrade_language.'/style.css" />'; |
|
| 13 | 13 | } |
| 14 | 14 | ?> |
| 15 | 15 | </head> |
@@ -28,7 +28,7 @@ discard block |
||
| 28 | 28 | $xoopsOption['checkadmin'] = true; |
| 29 | 29 | $xoopsOption['hascommon'] = true; |
| 30 | 30 | |
| 31 | -require_once __DIR__ . '/include/common.inc.php'; |
|
| 31 | +require_once __DIR__.'/include/common.inc.php'; |
|
| 32 | 32 | |
| 33 | 33 | $xoops = Xoops::getInstance(); |
| 34 | 34 | |
@@ -63,10 +63,10 @@ discard block |
||
| 63 | 63 | $criteria->setSort('conf_catid ASC, conf_order'); |
| 64 | 64 | $configs = $config_handler->getConfigs($criteria); |
| 65 | 65 | |
| 66 | -include XOOPS_INSTALL_PATH . '/include/createconfigform.php'; |
|
| 66 | +include XOOPS_INSTALL_PATH.'/include/createconfigform.php'; |
|
| 67 | 67 | $wizard->form = createConfigform($configs); |
| 68 | 68 | |
| 69 | 69 | $_SESSION['pageHasHelp'] = true; |
| 70 | 70 | $_SESSION['pageHasForm'] = true; |
| 71 | 71 | $_SESSION['content'] = $wizard->CreateForm(); |
| 72 | -include XOOPS_INSTALL_PATH . '/include/install_tpl.php'; |
|
| 72 | +include XOOPS_INSTALL_PATH.'/include/install_tpl.php'; |
|
@@ -25,5 +25,5 @@ |
||
| 25 | 25 | * @version $Id$ |
| 26 | 26 | */ |
| 27 | 27 | |
| 28 | -require_once __DIR__ . '/page_langselect.php'; |
|
| 28 | +require_once __DIR__.'/page_langselect.php'; |
|
| 29 | 29 | exit(); |
@@ -19,9 +19,9 @@ |
||
| 19 | 19 | * @version $Id$ |
| 20 | 20 | */ |
| 21 | 21 | |
| 22 | -include __DIR__ . '/mainfile.php'; |
|
| 22 | +include __DIR__.'/mainfile.php'; |
|
| 23 | 23 | |
| 24 | 24 | \Xoops::getInstance()->events()->triggerEvent('core.image'); |
| 25 | 25 | |
| 26 | 26 | header('Content-type: image/gif'); |
| 27 | -readfile(\XoopsBaseConfig::get('uploads-path') . '/blank.gif'); |
|
| 27 | +readfile(\XoopsBaseConfig::get('uploads-path').'/blank.gif'); |
|
@@ -95,8 +95,8 @@ |
||
| 95 | 95 | <input type='hidden' name='vpass' value='" . $myts->htmlSpecialChars($vpass) . "' /> |
| 96 | 96 | <input type='hidden' name='user_mailok' value='" . $user_mailok . "' /> |
| 97 | 97 | <br /><br /><input type='hidden' name='op' value='finish' />" |
| 98 | - . $xoops->security()->getTokenHTML() |
|
| 99 | - . "<input type='submit' value='" . XoopsLocale::A_FINISH . "' /></form>"; |
|
| 98 | + . $xoops->security()->getTokenHTML() |
|
| 99 | + . "<input type='submit' value='" . XoopsLocale::A_FINISH . "' /></form>"; |
|
| 100 | 100 | } else { |
| 101 | 101 | echo "<span class='red'>$stop</span>"; |
| 102 | 102 | include $xoops->path('include/registerform.php'); |
@@ -62,31 +62,31 @@ discard block |
||
| 62 | 62 | } |
| 63 | 63 | |
| 64 | 64 | switch ($op) { |
| 65 | - case 'newuser': |
|
| 66 | - $xoops->header(); |
|
| 67 | - $xoops->tpl()->assign('xoops_pagetitle', XoopsLocale::USER_REGISTRATION); |
|
| 68 | - $stop = ''; |
|
| 69 | - if (!$xoops->security()->check()) { |
|
| 70 | - $stop .= implode('<br />', $xoops->security()->getErrors()) . '<br />'; |
|
| 71 | - } |
|
| 72 | - if (0 != $xoopsConfigUser['reg_dispdsclmr'] && '' != $xoopsConfigUser['reg_disclaimer']) { |
|
| 73 | - if (empty($agree_disc)) { |
|
| 74 | - $stop .= XoopsLocale::E_YOU_HAVE_TO_AGREE_TO_DISCLAIMER . '<br />'; |
|
| 65 | + case 'newuser': |
|
| 66 | + $xoops->header(); |
|
| 67 | + $xoops->tpl()->assign('xoops_pagetitle', XoopsLocale::USER_REGISTRATION); |
|
| 68 | + $stop = ''; |
|
| 69 | + if (!$xoops->security()->check()) { |
|
| 70 | + $stop .= implode('<br />', $xoops->security()->getErrors()) . '<br />'; |
|
| 75 | 71 | } |
| 76 | - } |
|
| 77 | - $stop .= XoopsUserUtility::validate($uname, $email, $pass, $vpass); |
|
| 78 | - if (empty($stop)) { |
|
| 79 | - echo XoopsLocale::USERNAME . ': ' . $myts->htmlSpecialChars($uname) . '<br />'; |
|
| 80 | - echo XoopsLocale::EMAIL . ': ' . $myts->htmlSpecialChars($email) . '<br />'; |
|
| 81 | - if ('' != $url) { |
|
| 82 | - $url = $xoops->formatURL($url); |
|
| 83 | - echo XoopsLocale::WEBSITE . ': ' . $myts->htmlSpecialChars($url) . '<br />'; |
|
| 72 | + if (0 != $xoopsConfigUser['reg_dispdsclmr'] && '' != $xoopsConfigUser['reg_disclaimer']) { |
|
| 73 | + if (empty($agree_disc)) { |
|
| 74 | + $stop .= XoopsLocale::E_YOU_HAVE_TO_AGREE_TO_DISCLAIMER . '<br />'; |
|
| 75 | + } |
|
| 84 | 76 | } |
| 85 | - echo XoopsLocale::TIME_ZONE . ": $timezone<br />"; |
|
| 86 | - echo "<form action='register.php' method='post'>"; |
|
| 87 | - $captcha = new Xoops\Form\Captcha(); |
|
| 88 | - echo '<br />' . $captcha->getCaption() . ': ' . $captcha->render(); |
|
| 89 | - echo "<input type='hidden' name='uname' value='" . $myts->htmlSpecialChars($uname) . "' /> |
|
| 77 | + $stop .= XoopsUserUtility::validate($uname, $email, $pass, $vpass); |
|
| 78 | + if (empty($stop)) { |
|
| 79 | + echo XoopsLocale::USERNAME . ': ' . $myts->htmlSpecialChars($uname) . '<br />'; |
|
| 80 | + echo XoopsLocale::EMAIL . ': ' . $myts->htmlSpecialChars($email) . '<br />'; |
|
| 81 | + if ('' != $url) { |
|
| 82 | + $url = $xoops->formatURL($url); |
|
| 83 | + echo XoopsLocale::WEBSITE . ': ' . $myts->htmlSpecialChars($url) . '<br />'; |
|
| 84 | + } |
|
| 85 | + echo XoopsLocale::TIME_ZONE . ": $timezone<br />"; |
|
| 86 | + echo "<form action='register.php' method='post'>"; |
|
| 87 | + $captcha = new Xoops\Form\Captcha(); |
|
| 88 | + echo '<br />' . $captcha->getCaption() . ': ' . $captcha->render(); |
|
| 89 | + echo "<input type='hidden' name='uname' value='" . $myts->htmlSpecialChars($uname) . "' /> |
|
| 90 | 90 | <input type='hidden' name='email' value='" . $myts->htmlSpecialChars($email) . "' /> |
| 91 | 91 | <input type='hidden' name='user_viewemail' value='" . $user_viewemail . "' /> |
| 92 | 92 | <input type='hidden' name='timezone' value='" . $timezone . "' /> |
@@ -95,199 +95,199 @@ discard block |
||
| 95 | 95 | <input type='hidden' name='vpass' value='" . $myts->htmlSpecialChars($vpass) . "' /> |
| 96 | 96 | <input type='hidden' name='user_mailok' value='" . $user_mailok . "' /> |
| 97 | 97 | <br /><br /><input type='hidden' name='op' value='finish' />" |
| 98 | - . $xoops->security()->getTokenHTML() |
|
| 99 | - . "<input type='submit' value='" . XoopsLocale::A_FINISH . "' /></form>"; |
|
| 100 | - } else { |
|
| 101 | - echo "<span class='red'>$stop</span>"; |
|
| 102 | - include $xoops->path('include/registerform.php'); |
|
| 103 | - $reg_form->display(); |
|
| 104 | - } |
|
| 105 | - $xoops->footer(); |
|
| 106 | - break; |
|
| 107 | - case 'finish': |
|
| 108 | - $xoops->header(); |
|
| 109 | - $stop = XoopsUserUtility::validate($uname, $email, $pass, $vpass); |
|
| 110 | - if (!$xoops->security()->check()) { |
|
| 111 | - $stop .= implode('<br />', $xoops->security()->getErrors()) . '<br />'; |
|
| 112 | - } |
|
| 113 | - $xoopsCaptcha = XoopsCaptcha::getInstance(); |
|
| 114 | - if (!$xoopsCaptcha->verify()) { |
|
| 115 | - $stop .= $xoopsCaptcha->getMessage() . '<br />'; |
|
| 116 | - } |
|
| 117 | - if (empty($stop)) { |
|
| 118 | - $member_handler = $xoops->getHandlerMember(); |
|
| 119 | - $newuser = $member_handler->createUser(); |
|
| 120 | - $newuser->setVar('user_viewemail', $user_viewemail); |
|
| 121 | - $newuser->setVar('uname', $uname); |
|
| 122 | - $newuser->setVar('email', $email); |
|
| 123 | - if ('' != $url) { |
|
| 124 | - $newuser->setVar('url', $xoops->formatURL($url)); |
|
| 125 | - } |
|
| 126 | - $newuser->setVar('user_avatar', 'blank.gif'); |
|
| 127 | - $actkey = mb_substr(\Xmf\Random::generateKey(), 16, 8); |
|
| 128 | - $newuser->setVar('actkey', $actkey); |
|
| 129 | - $newuser->setVar('pass', password_hash($pass, PASSWORD_DEFAULT)); |
|
| 130 | - $newuser->setVar('last_pass_change', time()); |
|
| 131 | - $newuser->setVar('timezone', $timezone); |
|
| 132 | - $newuser->setVar('user_regdate', time()); |
|
| 133 | - $newuser->setVar('uorder', $xoops->getConfig('com_order')); |
|
| 134 | - $newuser->setVar('umode', $xoops->getConfig('com_mode')); |
|
| 135 | - $newuser->setVar('theme', $xoops->getConfig('theme_set')); |
|
| 136 | - $newuser->setVar('user_mailok', $user_mailok); |
|
| 137 | - if (1 == $xoopsConfigUser['activation_type']) { |
|
| 138 | - $newuser->setVar('level', 1); |
|
| 98 | + . $xoops->security()->getTokenHTML() |
|
| 99 | + . "<input type='submit' value='" . XoopsLocale::A_FINISH . "' /></form>"; |
|
| 139 | 100 | } else { |
| 140 | - $newuser->setVar('level', 0); |
|
| 141 | - } |
|
| 142 | - if (!$member_handler->insertUser($newuser)) { |
|
| 143 | - echo XoopsLocale::E_USER_NOT_REGISTERED; |
|
| 144 | - $xoops->footer(); |
|
| 101 | + echo "<span class='red'>$stop</span>"; |
|
| 102 | + include $xoops->path('include/registerform.php'); |
|
| 103 | + $reg_form->display(); |
|
| 145 | 104 | } |
| 146 | - $newid = $newuser->getVar('uid'); |
|
| 147 | - if (!$member_handler->addUserToGroup(FixedGroups::USERS, $newid)) { |
|
| 148 | - echo XoopsLocale::E_USER_NOT_REGISTERED; |
|
| 149 | - $xoops->footer(); |
|
| 105 | + $xoops->footer(); |
|
| 106 | + break; |
|
| 107 | + case 'finish': |
|
| 108 | + $xoops->header(); |
|
| 109 | + $stop = XoopsUserUtility::validate($uname, $email, $pass, $vpass); |
|
| 110 | + if (!$xoops->security()->check()) { |
|
| 111 | + $stop .= implode('<br />', $xoops->security()->getErrors()) . '<br />'; |
|
| 150 | 112 | } |
| 151 | - if (1 == $xoopsConfigUser['activation_type']) { |
|
| 152 | - XoopsUserUtility::sendWelcome($newuser); |
|
| 153 | - $xoops->redirect( |
|
| 154 | - 'index.php', |
|
| 155 | - 4, |
|
| 156 | - XoopsLocale::S_YOUR_ACCOUNT_ACTIVATED . ' ' . XoopsLocale::LOGIN_WITH_REGISTERED_PASSWORD |
|
| 157 | - ); |
|
| 113 | + $xoopsCaptcha = XoopsCaptcha::getInstance(); |
|
| 114 | + if (!$xoopsCaptcha->verify()) { |
|
| 115 | + $stop .= $xoopsCaptcha->getMessage() . '<br />'; |
|
| 158 | 116 | } |
| 159 | - // Sending notification email to user for self activation |
|
| 160 | - if (0 == $xoopsConfigUser['activation_type']) { |
|
| 161 | - $xoopsMailer = $xoops->getMailer(); |
|
| 162 | - $xoopsMailer->useMail(); |
|
| 163 | - $xoopsMailer->setTemplate('register.tpl'); |
|
| 164 | - $xoopsMailer->assign('SITENAME', $xoops->getConfig('sitename')); |
|
| 165 | - $xoopsMailer->assign('ADMINMAIL', $xoops->getConfig('adminmail')); |
|
| 166 | - $xoopsMailer->assign('SITEURL', $xoops_url . '/'); |
|
| 167 | - $xoopsMailer->setToUsers(new XoopsUser($newid)); |
|
| 168 | - $xoopsMailer->setFromEmail($xoops->getConfig('adminmail')); |
|
| 169 | - $xoopsMailer->setFromName($xoops->getConfig('sitename')); |
|
| 170 | - $xoopsMailer->setSubject(sprintf(XoopsLocale::F_USER_ACTIVATION_KEY_FOR, $uname)); |
|
| 171 | - if (!$xoopsMailer->send()) { |
|
| 172 | - echo XoopsLocale::S_YOU_ARE_NOW_REGISTERED . ' ' |
|
| 173 | - . XoopsLocale::EMAIL_HAS_NOT_BEEN_SENT_WITH_ACTIVATION_KEY; |
|
| 117 | + if (empty($stop)) { |
|
| 118 | + $member_handler = $xoops->getHandlerMember(); |
|
| 119 | + $newuser = $member_handler->createUser(); |
|
| 120 | + $newuser->setVar('user_viewemail', $user_viewemail); |
|
| 121 | + $newuser->setVar('uname', $uname); |
|
| 122 | + $newuser->setVar('email', $email); |
|
| 123 | + if ('' != $url) { |
|
| 124 | + $newuser->setVar('url', $xoops->formatURL($url)); |
|
| 125 | + } |
|
| 126 | + $newuser->setVar('user_avatar', 'blank.gif'); |
|
| 127 | + $actkey = mb_substr(\Xmf\Random::generateKey(), 16, 8); |
|
| 128 | + $newuser->setVar('actkey', $actkey); |
|
| 129 | + $newuser->setVar('pass', password_hash($pass, PASSWORD_DEFAULT)); |
|
| 130 | + $newuser->setVar('last_pass_change', time()); |
|
| 131 | + $newuser->setVar('timezone', $timezone); |
|
| 132 | + $newuser->setVar('user_regdate', time()); |
|
| 133 | + $newuser->setVar('uorder', $xoops->getConfig('com_order')); |
|
| 134 | + $newuser->setVar('umode', $xoops->getConfig('com_mode')); |
|
| 135 | + $newuser->setVar('theme', $xoops->getConfig('theme_set')); |
|
| 136 | + $newuser->setVar('user_mailok', $user_mailok); |
|
| 137 | + if (1 == $xoopsConfigUser['activation_type']) { |
|
| 138 | + $newuser->setVar('level', 1); |
|
| 174 | 139 | } else { |
| 175 | - echo XoopsLocale::S_YOU_ARE_NOW_REGISTERED . ' ' |
|
| 176 | - . XoopsLocale::EMAIL_HAS_BEEN_SENT_WITH_ACTIVATION_KEY; |
|
| 140 | + $newuser->setVar('level', 0); |
|
| 177 | 141 | } |
| 178 | - // Sending notification email to administrator for activation |
|
| 179 | - } elseif (2 == $xoopsConfigUser['activation_type']) { |
|
| 180 | - $xoopsMailer = $xoops->getMailer(); |
|
| 181 | - $xoopsMailer->useMail(); |
|
| 182 | - $xoopsMailer->setTemplate('adminactivate.tpl'); |
|
| 183 | - $xoopsMailer->assign('USERNAME', $uname); |
|
| 184 | - $xoopsMailer->assign('USEREMAIL', $email); |
|
| 185 | - $xoopsMailer->assign( |
|
| 186 | - 'USERACTLINK', |
|
| 187 | - $xoops_url . '/register.php?op=actv&id=' . $newid . '&actkey=' . $actkey |
|
| 188 | - ); |
|
| 189 | - $xoopsMailer->assign('SITENAME', $xoops->getConfig('sitename')); |
|
| 190 | - $xoopsMailer->assign('ADMINMAIL', $xoops->getConfig('adminmail')); |
|
| 191 | - $xoopsMailer->assign('SITEURL', $xoops_url . '/'); |
|
| 192 | - $member_handler = $xoops->getHandlerMember(); |
|
| 193 | - $xoopsMailer->setToGroups($member_handler->getGroup($xoopsConfigUser['activation_group'])); |
|
| 194 | - $xoopsMailer->setFromEmail($xoops->getConfig('adminmail')); |
|
| 195 | - $xoopsMailer->setFromName($xoops->getConfig('sitename')); |
|
| 196 | - $xoopsMailer->setSubject(sprintf(XoopsLocale::F_USER_ACTIVATION_KEY_FOR, $uname)); |
|
| 197 | - if (!$xoopsMailer->send()) { |
|
| 198 | - echo XoopsLocale::S_YOU_ARE_NOW_REGISTERED . ' ' |
|
| 142 | + if (!$member_handler->insertUser($newuser)) { |
|
| 143 | + echo XoopsLocale::E_USER_NOT_REGISTERED; |
|
| 144 | + $xoops->footer(); |
|
| 145 | + } |
|
| 146 | + $newid = $newuser->getVar('uid'); |
|
| 147 | + if (!$member_handler->addUserToGroup(FixedGroups::USERS, $newid)) { |
|
| 148 | + echo XoopsLocale::E_USER_NOT_REGISTERED; |
|
| 149 | + $xoops->footer(); |
|
| 150 | + } |
|
| 151 | + if (1 == $xoopsConfigUser['activation_type']) { |
|
| 152 | + XoopsUserUtility::sendWelcome($newuser); |
|
| 153 | + $xoops->redirect( |
|
| 154 | + 'index.php', |
|
| 155 | + 4, |
|
| 156 | + XoopsLocale::S_YOUR_ACCOUNT_ACTIVATED . ' ' . XoopsLocale::LOGIN_WITH_REGISTERED_PASSWORD |
|
| 157 | + ); |
|
| 158 | + } |
|
| 159 | + // Sending notification email to user for self activation |
|
| 160 | + if (0 == $xoopsConfigUser['activation_type']) { |
|
| 161 | + $xoopsMailer = $xoops->getMailer(); |
|
| 162 | + $xoopsMailer->useMail(); |
|
| 163 | + $xoopsMailer->setTemplate('register.tpl'); |
|
| 164 | + $xoopsMailer->assign('SITENAME', $xoops->getConfig('sitename')); |
|
| 165 | + $xoopsMailer->assign('ADMINMAIL', $xoops->getConfig('adminmail')); |
|
| 166 | + $xoopsMailer->assign('SITEURL', $xoops_url . '/'); |
|
| 167 | + $xoopsMailer->setToUsers(new XoopsUser($newid)); |
|
| 168 | + $xoopsMailer->setFromEmail($xoops->getConfig('adminmail')); |
|
| 169 | + $xoopsMailer->setFromName($xoops->getConfig('sitename')); |
|
| 170 | + $xoopsMailer->setSubject(sprintf(XoopsLocale::F_USER_ACTIVATION_KEY_FOR, $uname)); |
|
| 171 | + if (!$xoopsMailer->send()) { |
|
| 172 | + echo XoopsLocale::S_YOU_ARE_NOW_REGISTERED . ' ' |
|
| 199 | 173 | . XoopsLocale::EMAIL_HAS_NOT_BEEN_SENT_WITH_ACTIVATION_KEY; |
| 200 | - echo XoopsLocale::S_YOU_ARE_NOW_REGISTERED . ' ' |
|
| 201 | - . XoopsLocale::PLEASE_WAIT_FOR_ACCOUNT_ACTIVATION; |
|
| 174 | + } else { |
|
| 175 | + echo XoopsLocale::S_YOU_ARE_NOW_REGISTERED . ' ' |
|
| 176 | + . XoopsLocale::EMAIL_HAS_BEEN_SENT_WITH_ACTIVATION_KEY; |
|
| 177 | + } |
|
| 178 | + // Sending notification email to administrator for activation |
|
| 179 | + } elseif (2 == $xoopsConfigUser['activation_type']) { |
|
| 180 | + $xoopsMailer = $xoops->getMailer(); |
|
| 181 | + $xoopsMailer->useMail(); |
|
| 182 | + $xoopsMailer->setTemplate('adminactivate.tpl'); |
|
| 183 | + $xoopsMailer->assign('USERNAME', $uname); |
|
| 184 | + $xoopsMailer->assign('USEREMAIL', $email); |
|
| 185 | + $xoopsMailer->assign( |
|
| 186 | + 'USERACTLINK', |
|
| 187 | + $xoops_url . '/register.php?op=actv&id=' . $newid . '&actkey=' . $actkey |
|
| 188 | + ); |
|
| 189 | + $xoopsMailer->assign('SITENAME', $xoops->getConfig('sitename')); |
|
| 190 | + $xoopsMailer->assign('ADMINMAIL', $xoops->getConfig('adminmail')); |
|
| 191 | + $xoopsMailer->assign('SITEURL', $xoops_url . '/'); |
|
| 192 | + $member_handler = $xoops->getHandlerMember(); |
|
| 193 | + $xoopsMailer->setToGroups($member_handler->getGroup($xoopsConfigUser['activation_group'])); |
|
| 194 | + $xoopsMailer->setFromEmail($xoops->getConfig('adminmail')); |
|
| 195 | + $xoopsMailer->setFromName($xoops->getConfig('sitename')); |
|
| 196 | + $xoopsMailer->setSubject(sprintf(XoopsLocale::F_USER_ACTIVATION_KEY_FOR, $uname)); |
|
| 197 | + if (!$xoopsMailer->send()) { |
|
| 198 | + echo XoopsLocale::S_YOU_ARE_NOW_REGISTERED . ' ' |
|
| 199 | + . XoopsLocale::EMAIL_HAS_NOT_BEEN_SENT_WITH_ACTIVATION_KEY; |
|
| 200 | + echo XoopsLocale::S_YOU_ARE_NOW_REGISTERED . ' ' |
|
| 201 | + . XoopsLocale::PLEASE_WAIT_FOR_ACCOUNT_ACTIVATION; |
|
| 202 | + } |
|
| 202 | 203 | } |
| 204 | + if (1 == $xoopsConfigUser['new_user_notify'] && !empty($xoopsConfigUser['new_user_notify_group'])) { |
|
| 205 | + $xoopsMailer = $xoops->getMailer(); |
|
| 206 | + $xoopsMailer->reset(); |
|
| 207 | + $xoopsMailer->useMail(); |
|
| 208 | + $member_handler = $xoops->getHandlerMember(); |
|
| 209 | + $xoopsMailer->setToGroups($member_handler->getGroup($xoopsConfigUser['new_user_notify_group'])); |
|
| 210 | + $xoopsMailer->setFromEmail($xoops->getConfig('adminmail')); |
|
| 211 | + $xoopsMailer->setFromName($xoops->getConfig('sitename')); |
|
| 212 | + $xoopsMailer->setSubject( |
|
| 213 | + sprintf(XoopsLocale::F_NEW_USER_REGISTRATION_AT, $xoops->getConfig('sitename')) |
|
| 214 | + ); |
|
| 215 | + $xoopsMailer->setBody(sprintf(XoopsLocale::F_HAS_JUST_REGISTERED, $uname)); |
|
| 216 | + $xoopsMailer->send(); |
|
| 217 | + } |
|
| 218 | + } else { |
|
| 219 | + echo "<span class='red bold'>{$stop}</span>"; |
|
| 220 | + include $xoops->path('include/registerform.php'); |
|
| 221 | + $reg_form->display(); |
|
| 203 | 222 | } |
| 204 | - if (1 == $xoopsConfigUser['new_user_notify'] && !empty($xoopsConfigUser['new_user_notify_group'])) { |
|
| 205 | - $xoopsMailer = $xoops->getMailer(); |
|
| 206 | - $xoopsMailer->reset(); |
|
| 207 | - $xoopsMailer->useMail(); |
|
| 208 | - $member_handler = $xoops->getHandlerMember(); |
|
| 209 | - $xoopsMailer->setToGroups($member_handler->getGroup($xoopsConfigUser['new_user_notify_group'])); |
|
| 210 | - $xoopsMailer->setFromEmail($xoops->getConfig('adminmail')); |
|
| 211 | - $xoopsMailer->setFromName($xoops->getConfig('sitename')); |
|
| 212 | - $xoopsMailer->setSubject( |
|
| 213 | - sprintf(XoopsLocale::F_NEW_USER_REGISTRATION_AT, $xoops->getConfig('sitename')) |
|
| 214 | - ); |
|
| 215 | - $xoopsMailer->setBody(sprintf(XoopsLocale::F_HAS_JUST_REGISTERED, $uname)); |
|
| 216 | - $xoopsMailer->send(); |
|
| 223 | + $xoops->footer(); |
|
| 224 | + break; |
|
| 225 | + case 'actv': |
|
| 226 | + case 'activate': |
|
| 227 | + if (empty($id)) { |
|
| 228 | + $xoops->redirect('index.php', 1, ''); |
|
| 229 | + exit(); |
|
| 217 | 230 | } |
| 218 | - } else { |
|
| 219 | - echo "<span class='red bold'>{$stop}</span>"; |
|
| 220 | - include $xoops->path('include/registerform.php'); |
|
| 221 | - $reg_form->display(); |
|
| 222 | - } |
|
| 223 | - $xoops->footer(); |
|
| 224 | - break; |
|
| 225 | - case 'actv': |
|
| 226 | - case 'activate': |
|
| 227 | - if (empty($id)) { |
|
| 228 | - $xoops->redirect('index.php', 1, ''); |
|
| 229 | - exit(); |
|
| 230 | - } |
|
| 231 | - $member_handler = $xoops->getHandlerMember(); |
|
| 232 | - $thisuser = $member_handler->getUser($id); |
|
| 233 | - if (!is_object($thisuser)) { |
|
| 234 | - exit(); |
|
| 235 | - } |
|
| 236 | - if ($thisuser->getVar('actkey') != $actkey) { |
|
| 237 | - $xoops->redirect('index.php', 5, XoopsLocale::E_ACTIVATION_KEY_INCORRECT); |
|
| 238 | - } else { |
|
| 239 | - if ($thisuser->getVar('level') > 0) { |
|
| 240 | - $xoops->redirect('user.php', 5, XoopsLocale::E_SELECTED_ACCOUNT_IS_ALREADY_ACTIVATED, false); |
|
| 231 | + $member_handler = $xoops->getHandlerMember(); |
|
| 232 | + $thisuser = $member_handler->getUser($id); |
|
| 233 | + if (!is_object($thisuser)) { |
|
| 234 | + exit(); |
|
| 235 | + } |
|
| 236 | + if ($thisuser->getVar('actkey') != $actkey) { |
|
| 237 | + $xoops->redirect('index.php', 5, XoopsLocale::E_ACTIVATION_KEY_INCORRECT); |
|
| 241 | 238 | } else { |
| 242 | - if (false != $member_handler->activateUser($thisuser)) { |
|
| 243 | - $xoopsConfigUser = $xoops->getConfigs(); |
|
| 244 | - if (2 == $xoopsConfigUser['activation_type']) { |
|
| 245 | - $myts = \Xoops\Core\Text\Sanitizer::getInstance(); |
|
| 246 | - $xoopsMailer = $xoops->getMailer(); |
|
| 247 | - $xoopsMailer->useMail(); |
|
| 248 | - $xoopsMailer->setTemplate('activated.tpl'); |
|
| 249 | - $xoopsMailer->assign('SITENAME', $xoops->getConfig('sitename')); |
|
| 250 | - $xoopsMailer->assign('ADMINMAIL', $xoops->getConfig('adminmail')); |
|
| 251 | - $xoopsMailer->assign('SITEURL', $xoops_url . '/'); |
|
| 252 | - $xoopsMailer->setToUsers($thisuser); |
|
| 253 | - $xoopsMailer->setFromEmail($xoops->getConfig('adminmail')); |
|
| 254 | - $xoopsMailer->setFromName($xoops->getConfig('sitename')); |
|
| 255 | - $xoopsMailer->setSubject( |
|
| 256 | - sprintf(XoopsLocale::F_YOUR_ACCOUNT_AT, $xoops->getConfig('sitename')) |
|
| 257 | - ); |
|
| 258 | - $xoops->header(); |
|
| 259 | - if (!$xoopsMailer->send()) { |
|
| 260 | - printf(XoopsLocale::EF_NOTIFICATION_EMAIL_NOT_SENT_TO, $thisuser->getVar('uname')); |
|
| 239 | + if ($thisuser->getVar('level') > 0) { |
|
| 240 | + $xoops->redirect('user.php', 5, XoopsLocale::E_SELECTED_ACCOUNT_IS_ALREADY_ACTIVATED, false); |
|
| 241 | + } else { |
|
| 242 | + if (false != $member_handler->activateUser($thisuser)) { |
|
| 243 | + $xoopsConfigUser = $xoops->getConfigs(); |
|
| 244 | + if (2 == $xoopsConfigUser['activation_type']) { |
|
| 245 | + $myts = \Xoops\Core\Text\Sanitizer::getInstance(); |
|
| 246 | + $xoopsMailer = $xoops->getMailer(); |
|
| 247 | + $xoopsMailer->useMail(); |
|
| 248 | + $xoopsMailer->setTemplate('activated.tpl'); |
|
| 249 | + $xoopsMailer->assign('SITENAME', $xoops->getConfig('sitename')); |
|
| 250 | + $xoopsMailer->assign('ADMINMAIL', $xoops->getConfig('adminmail')); |
|
| 251 | + $xoopsMailer->assign('SITEURL', $xoops_url . '/'); |
|
| 252 | + $xoopsMailer->setToUsers($thisuser); |
|
| 253 | + $xoopsMailer->setFromEmail($xoops->getConfig('adminmail')); |
|
| 254 | + $xoopsMailer->setFromName($xoops->getConfig('sitename')); |
|
| 255 | + $xoopsMailer->setSubject( |
|
| 256 | + sprintf(XoopsLocale::F_YOUR_ACCOUNT_AT, $xoops->getConfig('sitename')) |
|
| 257 | + ); |
|
| 258 | + $xoops->header(); |
|
| 259 | + if (!$xoopsMailer->send()) { |
|
| 260 | + printf(XoopsLocale::EF_NOTIFICATION_EMAIL_NOT_SENT_TO, $thisuser->getVar('uname')); |
|
| 261 | + } else { |
|
| 262 | + printf(XoopsLocale::SF_NOTIFICATION_EMAIL_SENT_TO, $thisuser->getVar('uname')); |
|
| 263 | + } |
|
| 264 | + $xoops->footer(); |
|
| 261 | 265 | } else { |
| 262 | - printf(XoopsLocale::SF_NOTIFICATION_EMAIL_SENT_TO, $thisuser->getVar('uname')); |
|
| 266 | + $xoops->redirect( |
|
| 267 | + 'user.php', |
|
| 268 | + 5, |
|
| 269 | + XoopsLocale::S_YOUR_ACCOUNT_ACTIVATED . ' ' . XoopsLocale::LOGIN_WITH_REGISTERED_PASSWORD, |
|
| 270 | + false |
|
| 271 | + ); |
|
| 263 | 272 | } |
| 264 | - $xoops->footer(); |
|
| 265 | 273 | } else { |
| 266 | - $xoops->redirect( |
|
| 267 | - 'user.php', |
|
| 268 | - 5, |
|
| 269 | - XoopsLocale::S_YOUR_ACCOUNT_ACTIVATED . ' ' . XoopsLocale::LOGIN_WITH_REGISTERED_PASSWORD, |
|
| 270 | - false |
|
| 271 | - ); |
|
| 274 | + $xoops->redirect('index.php', 5, XoopsLocale::E_ACTIVATION_FAILED); |
|
| 272 | 275 | } |
| 273 | - } else { |
|
| 274 | - $xoops->redirect('index.php', 5, XoopsLocale::E_ACTIVATION_FAILED); |
|
| 275 | 276 | } |
| 276 | 277 | } |
| 277 | - } |
|
| 278 | - break; |
|
| 279 | - case 'register': |
|
| 280 | - default: |
|
| 281 | - $xoops->header(); |
|
| 282 | - $xoops->tpl()->assign('xoops_pagetitle', XoopsLocale::USER_REGISTRATION); |
|
| 283 | - $xoops->theme()->addMeta( |
|
| 284 | - 'meta', |
|
| 285 | - 'keywords', |
|
| 286 | - XoopsLocale::USER_REGISTRATION . ', ' . XoopsLocale::USERNAME |
|
| 287 | - ); // FIXME! |
|
| 288 | - $xoops->theme()->addMeta('meta', 'description', strip_tags($xoopsConfigUser['reg_disclaimer'])); |
|
| 289 | - include $xoops->path('include/registerform.php'); |
|
| 290 | - $reg_form->display(); |
|
| 291 | - $xoops->footer(); |
|
| 292 | - break; |
|
| 278 | + break; |
|
| 279 | + case 'register': |
|
| 280 | + default: |
|
| 281 | + $xoops->header(); |
|
| 282 | + $xoops->tpl()->assign('xoops_pagetitle', XoopsLocale::USER_REGISTRATION); |
|
| 283 | + $xoops->theme()->addMeta( |
|
| 284 | + 'meta', |
|
| 285 | + 'keywords', |
|
| 286 | + XoopsLocale::USER_REGISTRATION . ', ' . XoopsLocale::USERNAME |
|
| 287 | + ); // FIXME! |
|
| 288 | + $xoops->theme()->addMeta('meta', 'description', strip_tags($xoopsConfigUser['reg_disclaimer'])); |
|
| 289 | + include $xoops->path('include/registerform.php'); |
|
| 290 | + $reg_form->display(); |
|
| 291 | + $xoops->footer(); |
|
| 292 | + break; |
|
| 293 | 293 | } |
@@ -23,7 +23,7 @@ discard block |
||
| 23 | 23 | * @author Kazumi Ono <[email protected]> |
| 24 | 24 | * @version $Id$ |
| 25 | 25 | */ |
| 26 | -include __DIR__ . '/mainfile.php'; |
|
| 26 | +include __DIR__.'/mainfile.php'; |
|
| 27 | 27 | |
| 28 | 28 | $xoops = Xoops::getInstance(); |
| 29 | 29 | $xoops_url = \XoopsBaseConfig::get('url'); |
@@ -67,36 +67,36 @@ discard block |
||
| 67 | 67 | $xoops->tpl()->assign('xoops_pagetitle', XoopsLocale::USER_REGISTRATION); |
| 68 | 68 | $stop = ''; |
| 69 | 69 | if (!$xoops->security()->check()) { |
| 70 | - $stop .= implode('<br />', $xoops->security()->getErrors()) . '<br />'; |
|
| 70 | + $stop .= implode('<br />', $xoops->security()->getErrors()).'<br />'; |
|
| 71 | 71 | } |
| 72 | 72 | if (0 != $xoopsConfigUser['reg_dispdsclmr'] && '' != $xoopsConfigUser['reg_disclaimer']) { |
| 73 | 73 | if (empty($agree_disc)) { |
| 74 | - $stop .= XoopsLocale::E_YOU_HAVE_TO_AGREE_TO_DISCLAIMER . '<br />'; |
|
| 74 | + $stop .= XoopsLocale::E_YOU_HAVE_TO_AGREE_TO_DISCLAIMER.'<br />'; |
|
| 75 | 75 | } |
| 76 | 76 | } |
| 77 | 77 | $stop .= XoopsUserUtility::validate($uname, $email, $pass, $vpass); |
| 78 | 78 | if (empty($stop)) { |
| 79 | - echo XoopsLocale::USERNAME . ': ' . $myts->htmlSpecialChars($uname) . '<br />'; |
|
| 80 | - echo XoopsLocale::EMAIL . ': ' . $myts->htmlSpecialChars($email) . '<br />'; |
|
| 79 | + echo XoopsLocale::USERNAME.': '.$myts->htmlSpecialChars($uname).'<br />'; |
|
| 80 | + echo XoopsLocale::EMAIL.': '.$myts->htmlSpecialChars($email).'<br />'; |
|
| 81 | 81 | if ('' != $url) { |
| 82 | 82 | $url = $xoops->formatURL($url); |
| 83 | - echo XoopsLocale::WEBSITE . ': ' . $myts->htmlSpecialChars($url) . '<br />'; |
|
| 83 | + echo XoopsLocale::WEBSITE.': '.$myts->htmlSpecialChars($url).'<br />'; |
|
| 84 | 84 | } |
| 85 | - echo XoopsLocale::TIME_ZONE . ": $timezone<br />"; |
|
| 85 | + echo XoopsLocale::TIME_ZONE.": $timezone<br />"; |
|
| 86 | 86 | echo "<form action='register.php' method='post'>"; |
| 87 | 87 | $captcha = new Xoops\Form\Captcha(); |
| 88 | - echo '<br />' . $captcha->getCaption() . ': ' . $captcha->render(); |
|
| 89 | - echo "<input type='hidden' name='uname' value='" . $myts->htmlSpecialChars($uname) . "' /> |
|
| 90 | - <input type='hidden' name='email' value='" . $myts->htmlSpecialChars($email) . "' /> |
|
| 91 | - <input type='hidden' name='user_viewemail' value='" . $user_viewemail . "' /> |
|
| 92 | - <input type='hidden' name='timezone' value='" . $timezone . "' /> |
|
| 93 | - <input type='hidden' name='url' value='" . $myts->htmlSpecialChars($url) . "' /> |
|
| 94 | - <input type='hidden' name='pass' value='" . $myts->htmlSpecialChars($pass) . "' /> |
|
| 95 | - <input type='hidden' name='vpass' value='" . $myts->htmlSpecialChars($vpass) . "' /> |
|
| 96 | - <input type='hidden' name='user_mailok' value='" . $user_mailok . "' /> |
|
| 88 | + echo '<br />'.$captcha->getCaption().': '.$captcha->render(); |
|
| 89 | + echo "<input type='hidden' name='uname' value='".$myts->htmlSpecialChars($uname)."' /> |
|
| 90 | + <input type='hidden' name='email' value='" . $myts->htmlSpecialChars($email)."' /> |
|
| 91 | + <input type='hidden' name='user_viewemail' value='" . $user_viewemail."' /> |
|
| 92 | + <input type='hidden' name='timezone' value='" . $timezone."' /> |
|
| 93 | + <input type='hidden' name='url' value='" . $myts->htmlSpecialChars($url)."' /> |
|
| 94 | + <input type='hidden' name='pass' value='" . $myts->htmlSpecialChars($pass)."' /> |
|
| 95 | + <input type='hidden' name='vpass' value='" . $myts->htmlSpecialChars($vpass)."' /> |
|
| 96 | + <input type='hidden' name='user_mailok' value='" . $user_mailok."' /> |
|
| 97 | 97 | <br /><br /><input type='hidden' name='op' value='finish' />" |
| 98 | 98 | . $xoops->security()->getTokenHTML() |
| 99 | - . "<input type='submit' value='" . XoopsLocale::A_FINISH . "' /></form>"; |
|
| 99 | + . "<input type='submit' value='".XoopsLocale::A_FINISH."' /></form>"; |
|
| 100 | 100 | } else { |
| 101 | 101 | echo "<span class='red'>$stop</span>"; |
| 102 | 102 | include $xoops->path('include/registerform.php'); |
@@ -108,11 +108,11 @@ discard block |
||
| 108 | 108 | $xoops->header(); |
| 109 | 109 | $stop = XoopsUserUtility::validate($uname, $email, $pass, $vpass); |
| 110 | 110 | if (!$xoops->security()->check()) { |
| 111 | - $stop .= implode('<br />', $xoops->security()->getErrors()) . '<br />'; |
|
| 111 | + $stop .= implode('<br />', $xoops->security()->getErrors()).'<br />'; |
|
| 112 | 112 | } |
| 113 | 113 | $xoopsCaptcha = XoopsCaptcha::getInstance(); |
| 114 | 114 | if (!$xoopsCaptcha->verify()) { |
| 115 | - $stop .= $xoopsCaptcha->getMessage() . '<br />'; |
|
| 115 | + $stop .= $xoopsCaptcha->getMessage().'<br />'; |
|
| 116 | 116 | } |
| 117 | 117 | if (empty($stop)) { |
| 118 | 118 | $member_handler = $xoops->getHandlerMember(); |
@@ -153,7 +153,7 @@ discard block |
||
| 153 | 153 | $xoops->redirect( |
| 154 | 154 | 'index.php', |
| 155 | 155 | 4, |
| 156 | - XoopsLocale::S_YOUR_ACCOUNT_ACTIVATED . ' ' . XoopsLocale::LOGIN_WITH_REGISTERED_PASSWORD |
|
| 156 | + XoopsLocale::S_YOUR_ACCOUNT_ACTIVATED.' '.XoopsLocale::LOGIN_WITH_REGISTERED_PASSWORD |
|
| 157 | 157 | ); |
| 158 | 158 | } |
| 159 | 159 | // Sending notification email to user for self activation |
@@ -163,16 +163,16 @@ discard block |
||
| 163 | 163 | $xoopsMailer->setTemplate('register.tpl'); |
| 164 | 164 | $xoopsMailer->assign('SITENAME', $xoops->getConfig('sitename')); |
| 165 | 165 | $xoopsMailer->assign('ADMINMAIL', $xoops->getConfig('adminmail')); |
| 166 | - $xoopsMailer->assign('SITEURL', $xoops_url . '/'); |
|
| 166 | + $xoopsMailer->assign('SITEURL', $xoops_url.'/'); |
|
| 167 | 167 | $xoopsMailer->setToUsers(new XoopsUser($newid)); |
| 168 | 168 | $xoopsMailer->setFromEmail($xoops->getConfig('adminmail')); |
| 169 | 169 | $xoopsMailer->setFromName($xoops->getConfig('sitename')); |
| 170 | 170 | $xoopsMailer->setSubject(sprintf(XoopsLocale::F_USER_ACTIVATION_KEY_FOR, $uname)); |
| 171 | 171 | if (!$xoopsMailer->send()) { |
| 172 | - echo XoopsLocale::S_YOU_ARE_NOW_REGISTERED . ' ' |
|
| 172 | + echo XoopsLocale::S_YOU_ARE_NOW_REGISTERED.' ' |
|
| 173 | 173 | . XoopsLocale::EMAIL_HAS_NOT_BEEN_SENT_WITH_ACTIVATION_KEY; |
| 174 | 174 | } else { |
| 175 | - echo XoopsLocale::S_YOU_ARE_NOW_REGISTERED . ' ' |
|
| 175 | + echo XoopsLocale::S_YOU_ARE_NOW_REGISTERED.' ' |
|
| 176 | 176 | . XoopsLocale::EMAIL_HAS_BEEN_SENT_WITH_ACTIVATION_KEY; |
| 177 | 177 | } |
| 178 | 178 | // Sending notification email to administrator for activation |
@@ -184,20 +184,20 @@ discard block |
||
| 184 | 184 | $xoopsMailer->assign('USEREMAIL', $email); |
| 185 | 185 | $xoopsMailer->assign( |
| 186 | 186 | 'USERACTLINK', |
| 187 | - $xoops_url . '/register.php?op=actv&id=' . $newid . '&actkey=' . $actkey |
|
| 187 | + $xoops_url.'/register.php?op=actv&id='.$newid.'&actkey='.$actkey |
|
| 188 | 188 | ); |
| 189 | 189 | $xoopsMailer->assign('SITENAME', $xoops->getConfig('sitename')); |
| 190 | 190 | $xoopsMailer->assign('ADMINMAIL', $xoops->getConfig('adminmail')); |
| 191 | - $xoopsMailer->assign('SITEURL', $xoops_url . '/'); |
|
| 191 | + $xoopsMailer->assign('SITEURL', $xoops_url.'/'); |
|
| 192 | 192 | $member_handler = $xoops->getHandlerMember(); |
| 193 | 193 | $xoopsMailer->setToGroups($member_handler->getGroup($xoopsConfigUser['activation_group'])); |
| 194 | 194 | $xoopsMailer->setFromEmail($xoops->getConfig('adminmail')); |
| 195 | 195 | $xoopsMailer->setFromName($xoops->getConfig('sitename')); |
| 196 | 196 | $xoopsMailer->setSubject(sprintf(XoopsLocale::F_USER_ACTIVATION_KEY_FOR, $uname)); |
| 197 | 197 | if (!$xoopsMailer->send()) { |
| 198 | - echo XoopsLocale::S_YOU_ARE_NOW_REGISTERED . ' ' |
|
| 198 | + echo XoopsLocale::S_YOU_ARE_NOW_REGISTERED.' ' |
|
| 199 | 199 | . XoopsLocale::EMAIL_HAS_NOT_BEEN_SENT_WITH_ACTIVATION_KEY; |
| 200 | - echo XoopsLocale::S_YOU_ARE_NOW_REGISTERED . ' ' |
|
| 200 | + echo XoopsLocale::S_YOU_ARE_NOW_REGISTERED.' ' |
|
| 201 | 201 | . XoopsLocale::PLEASE_WAIT_FOR_ACCOUNT_ACTIVATION; |
| 202 | 202 | } |
| 203 | 203 | } |
@@ -248,7 +248,7 @@ discard block |
||
| 248 | 248 | $xoopsMailer->setTemplate('activated.tpl'); |
| 249 | 249 | $xoopsMailer->assign('SITENAME', $xoops->getConfig('sitename')); |
| 250 | 250 | $xoopsMailer->assign('ADMINMAIL', $xoops->getConfig('adminmail')); |
| 251 | - $xoopsMailer->assign('SITEURL', $xoops_url . '/'); |
|
| 251 | + $xoopsMailer->assign('SITEURL', $xoops_url.'/'); |
|
| 252 | 252 | $xoopsMailer->setToUsers($thisuser); |
| 253 | 253 | $xoopsMailer->setFromEmail($xoops->getConfig('adminmail')); |
| 254 | 254 | $xoopsMailer->setFromName($xoops->getConfig('sitename')); |
@@ -266,7 +266,7 @@ discard block |
||
| 266 | 266 | $xoops->redirect( |
| 267 | 267 | 'user.php', |
| 268 | 268 | 5, |
| 269 | - XoopsLocale::S_YOUR_ACCOUNT_ACTIVATED . ' ' . XoopsLocale::LOGIN_WITH_REGISTERED_PASSWORD, |
|
| 269 | + XoopsLocale::S_YOUR_ACCOUNT_ACTIVATED.' '.XoopsLocale::LOGIN_WITH_REGISTERED_PASSWORD, |
|
| 270 | 270 | false |
| 271 | 271 | ); |
| 272 | 272 | } |
@@ -283,7 +283,7 @@ discard block |
||
| 283 | 283 | $xoops->theme()->addMeta( |
| 284 | 284 | 'meta', |
| 285 | 285 | 'keywords', |
| 286 | - XoopsLocale::USER_REGISTRATION . ', ' . XoopsLocale::USERNAME |
|
| 286 | + XoopsLocale::USER_REGISTRATION.', '.XoopsLocale::USERNAME |
|
| 287 | 287 | ); // FIXME! |
| 288 | 288 | $xoops->theme()->addMeta('meta', 'description', strip_tags($xoopsConfigUser['reg_disclaimer'])); |
| 289 | 289 | include $xoops->path('include/registerform.php'); |
@@ -17,7 +17,7 @@ |
||
| 17 | 17 | * @author Richard Griffith <[email protected]> |
| 18 | 18 | * @link https://xoops.org |
| 19 | 19 | */ |
| 20 | -include __DIR__ . '/header.php'; |
|
| 20 | +include __DIR__.'/header.php'; |
|
| 21 | 21 | $xoops = Xoops::getInstance(); |
| 22 | 22 | $xoops->header(); |
| 23 | 23 | $aboutAdmin = new \Xoops\Module\Admin(); |
@@ -17,7 +17,7 @@ |
||
| 17 | 17 | * @package phpmailer |
| 18 | 18 | * @author Richard Griffith <[email protected]> |
| 19 | 19 | */ |
| 20 | -include __DIR__ . '/header.php'; |
|
| 20 | +include __DIR__.'/header.php'; |
|
| 21 | 21 | |
| 22 | 22 | $xoops = Xoops::getInstance(); |
| 23 | 23 | |
@@ -17,4 +17,4 @@ |
||
| 17 | 17 | * @package phpmailer |
| 18 | 18 | * @author Richard Griffith <[email protected]> |
| 19 | 19 | */ |
| 20 | -require_once dirname(dirname(dirname(__DIR__))) . '/include/cp_header.php'; |
|
| 20 | +require_once dirname(dirname(dirname(__DIR__))).'/include/cp_header.php'; |
|
@@ -34,7 +34,7 @@ discard block |
||
| 34 | 34 | */ |
| 35 | 35 | public static function eventCoreServiceLocateEmail(Provider $provider) |
| 36 | 36 | { |
| 37 | - $path = dirname(__DIR__) . '/class/PhpMailerEmailProvider.php'; |
|
| 37 | + $path = dirname(__DIR__).'/class/PhpMailerEmailProvider.php'; |
|
| 38 | 38 | require $path; |
| 39 | 39 | $object = new PhpMailerEmailProvider(); |
| 40 | 40 | $provider->register($object); |
@@ -49,7 +49,7 @@ discard block |
||
| 49 | 49 | */ |
| 50 | 50 | public static function eventCoreServiceLocateUserEmailMessage(Provider $provider) |
| 51 | 51 | { |
| 52 | - $path = dirname(__DIR__) . '/class/PhpMailerMessageProvider.php'; |
|
| 52 | + $path = dirname(__DIR__).'/class/PhpMailerMessageProvider.php'; |
|
| 53 | 53 | require $path; |
| 54 | 54 | $object = new PhpMailerMessageProvider(); |
| 55 | 55 | $provider->register($object); |
