@@ -23,13 +23,13 @@ discard block |
||
23 | 23 | * @author DuGris (aka L. JEN) <[email protected]> |
24 | 24 | */ |
25 | 25 | |
26 | -require_once __DIR__ . '/include/common.inc.php'; |
|
26 | +require_once __DIR__.'/include/common.inc.php'; |
|
27 | 27 | |
28 | 28 | set_time_limit(0); // don't want this to timeout |
29 | 29 | |
30 | 30 | function exception_handler($exception) |
31 | 31 | { |
32 | - echo "Uncaught exception: " , $exception->getMessage(), "\n"; |
|
32 | + echo "Uncaught exception: ", $exception->getMessage(), "\n"; |
|
33 | 33 | var_dump($exception->getTrace()); |
34 | 34 | } |
35 | 35 | |
@@ -54,8 +54,8 @@ discard block |
||
54 | 54 | $xoops->loadLocale('system'); |
55 | 55 | |
56 | 56 | // Install system module |
57 | -include_once $root . "/modules/system/class/module.php"; |
|
58 | -include_once $root . "/modules/system/class/system.php"; |
|
57 | +include_once $root."/modules/system/class/module.php"; |
|
58 | +include_once $root."/modules/system/class/system.php"; |
|
59 | 59 | |
60 | 60 | $system_module = new SystemModule(); |
61 | 61 | $system = System::getInstance(); |
@@ -114,7 +114,7 @@ discard block |
||
114 | 114 | exit(); |
115 | 115 | } |
116 | 116 | |
117 | - $res = $dbm->query("SELECT COUNT(*) FROM " . $dbm->db->prefix('system_user')); |
|
117 | + $res = $dbm->query("SELECT COUNT(*) FROM ".$dbm->db->prefix('system_user')); |
|
118 | 118 | list ($isadmin) = $dbm->db->fetchRow($res); |
119 | 119 | } |
120 | 120 | |
@@ -123,7 +123,7 @@ discard block |
||
123 | 123 | if ($isadmin) { |
124 | 124 | $pageHasForm = false; |
125 | 125 | $pageHasHelp = false; |
126 | - echo "<div class='x2-note errorMsg'>" . ADMIN_EXIST . "</div>\n"; |
|
126 | + echo "<div class='x2-note errorMsg'>".ADMIN_EXIST."</div>\n"; |
|
127 | 127 | } else { |
128 | 128 | ?> |
129 | 129 | <fieldset> |
@@ -132,20 +132,20 @@ discard block |
||
132 | 132 | <?php |
133 | 133 | echo '<script type="text/javascript"> |
134 | 134 | var desc = new Array(); |
135 | - desc[0] = "' . PASSWORD_DESC . '"; |
|
136 | - desc[1] = "' . PASSWORD_VERY_WEAK . '"; |
|
137 | - desc[2] = "' . PASSWORD_WEAK . '"; |
|
138 | - desc[3] = "' . PASSWORD_BETTER . '"; |
|
139 | - desc[4] = "' . PASSWORD_MEDIUM . '"; |
|
140 | - desc[5] = "' . PASSWORD_STRONG . '"; |
|
141 | - desc[6] = "' . PASSWORD_STRONGEST . '"; |
|
135 | + desc[0] = "' . PASSWORD_DESC.'"; |
|
136 | + desc[1] = "' . PASSWORD_VERY_WEAK.'"; |
|
137 | + desc[2] = "' . PASSWORD_WEAK.'"; |
|
138 | + desc[3] = "' . PASSWORD_BETTER.'"; |
|
139 | + desc[4] = "' . PASSWORD_MEDIUM.'"; |
|
140 | + desc[5] = "' . PASSWORD_STRONG.'"; |
|
141 | + desc[6] = "' . PASSWORD_STRONGEST.'"; |
|
142 | 142 | </script>'; |
143 | 143 | |
144 | 144 | echo xoFormField('adminname', $siteconfig['adminname'], ADMIN_LOGIN_LABEL); |
145 | 145 | if (!empty($error["name"])) { |
146 | 146 | echo '<ul class="diags1">'; |
147 | 147 | foreach ($error["name"] as $errmsg) { |
148 | - echo '<li class="failure">' . $errmsg . '</li>'; |
|
148 | + echo '<li class="failure">'.$errmsg.'</li>'; |
|
149 | 149 | } |
150 | 150 | echo '</ul>'; |
151 | 151 | } |
@@ -154,7 +154,7 @@ discard block |
||
154 | 154 | if (!empty($error["email"])) { |
155 | 155 | echo '<ul class="diags1">'; |
156 | 156 | foreach ($error["email"] as $errmsg) { |
157 | - echo '<li class="failure">' . $errmsg . '</li>'; |
|
157 | + echo '<li class="failure">'.$errmsg.'</li>'; |
|
158 | 158 | } |
159 | 159 | echo '</ul>'; |
160 | 160 | } |
@@ -168,7 +168,7 @@ discard block |
||
168 | 168 | if (!empty($error["pass"])) { |
169 | 169 | echo '<ul class="diags1">'; |
170 | 170 | foreach ($error["pass"] as $errmsg) { |
171 | - echo '<li class="failure">' . $errmsg . '</li>'; |
|
171 | + echo '<li class="failure">'.$errmsg.'</li>'; |
|
172 | 172 | } |
173 | 173 | echo '</ul>'; |
174 | 174 | } |
@@ -211,4 +211,4 @@ discard block |
||
211 | 211 | $_SESSION['pageHasHelp'] = $pageHasHelp; |
212 | 212 | $_SESSION['pageHasForm'] = $pageHasForm; |
213 | 213 | $_SESSION['content'] = $content; |
214 | -include XOOPS_INSTALL_PATH . '/include/install_tpl.php'; |
|
214 | +include XOOPS_INSTALL_PATH.'/include/install_tpl.php'; |
@@ -22,7 +22,7 @@ discard block |
||
22 | 22 | * @version $Id$ |
23 | 23 | */ |
24 | 24 | |
25 | -include __DIR__ . '/mainfile.php'; |
|
25 | +include __DIR__.'/mainfile.php'; |
|
26 | 26 | $xoops = Xoops::getInstance(); |
27 | 27 | $xoops->events()->triggerEvent('core.readpmsg.start'); |
28 | 28 | |
@@ -96,7 +96,7 @@ discard block |
||
96 | 96 | } |
97 | 97 | } else { |
98 | 98 | $xoops->tpl()->assign('subject', $obj->getVar("subject")); |
99 | - 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")); |
|
99 | + 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")); |
|
100 | 100 | } |
101 | 101 | break; |
102 | 102 | } |
@@ -88,8 +88,8 @@ |
||
88 | 88 | $ymail = isset($_POST['ymail']) ? trim($_POST['ymail']) : ''; |
89 | 89 | } |
90 | 90 | if (!isset($_POST['yname']) || trim($_POST['yname']) == "" || $ymail == '' |
91 | - || !isset($_POST['fname']) || trim($_POST['fname']) == "" || !isset($_POST['fmail']) |
|
92 | - || trim($_POST['fmail']) == '') { |
|
91 | + || !isset($_POST['fname']) || trim($_POST['fname']) == "" || !isset($_POST['fmail']) |
|
92 | + || trim($_POST['fmail']) == '') { |
|
93 | 93 | $xoops->redirect($xoops_url . "/misc.php?action=showpopups&type=friend&op=sendform", 2, XoopsLocale::E_YOU_NEED_TO_ENTER_REQUIRED_INFO); |
94 | 94 | exit(); |
95 | 95 | } |
@@ -24,7 +24,7 @@ discard block |
||
24 | 24 | * @version $Id$ |
25 | 25 | */ |
26 | 26 | |
27 | -include __DIR__ . '/mainfile.php'; |
|
27 | +include __DIR__.'/mainfile.php'; |
|
28 | 28 | |
29 | 29 | $xoops = Xoops::getInstance(); |
30 | 30 | $xoops->logger()->quiet(); |
@@ -90,21 +90,21 @@ discard block |
||
90 | 90 | if (!isset($_POST['yname']) || trim($_POST['yname']) == "" || $ymail == '' |
91 | 91 | || !isset($_POST['fname']) || trim($_POST['fname']) == "" || !isset($_POST['fmail']) |
92 | 92 | || trim($_POST['fmail']) == '') { |
93 | - $xoops->redirect($xoops_url . "/misc.php?action=showpopups&type=friend&op=sendform", 2, XoopsLocale::E_YOU_NEED_TO_ENTER_REQUIRED_INFO); |
|
93 | + $xoops->redirect($xoops_url."/misc.php?action=showpopups&type=friend&op=sendform", 2, XoopsLocale::E_YOU_NEED_TO_ENTER_REQUIRED_INFO); |
|
94 | 94 | exit(); |
95 | 95 | } |
96 | 96 | $yname = trim($_POST['yname']); |
97 | 97 | $fname = trim($_POST['fname']); |
98 | 98 | $fmail = trim($_POST['fmail']); |
99 | 99 | if (!$xoops->checkEmail($fmail) || !$xoops->checkEmail($ymail) || preg_match("/[\\0-\\31]/", $yname)) { |
100 | - $errormessage = XoopsLocale::EMAIL_PROVIDED_IS_INVALID . "<br />" . XoopsLocale::E_CHECK_EMAIL_AND_TRY_AGAIN . ""; |
|
101 | - $xoops->redirect($xoops_url . "/misc.php?action=showpopups&type=friend&op=sendform", 2, $errormessage); |
|
100 | + $errormessage = XoopsLocale::EMAIL_PROVIDED_IS_INVALID."<br />".XoopsLocale::E_CHECK_EMAIL_AND_TRY_AGAIN.""; |
|
101 | + $xoops->redirect($xoops_url."/misc.php?action=showpopups&type=friend&op=sendform", 2, $errormessage); |
|
102 | 102 | } |
103 | 103 | $xoopsMailer = $xoops->getMailer(); |
104 | 104 | $xoopsMailer->setTemplate("tellfriend.tpl"); |
105 | 105 | $xoopsMailer->assign("SITENAME", $xoops->getConfig('sitename')); |
106 | 106 | $xoopsMailer->assign("ADMINMAIL", $xoops->getConfig('adminmail')); |
107 | - $xoopsMailer->assign("SITEURL", $xoops_url . "/"); |
|
107 | + $xoopsMailer->assign("SITEURL", $xoops_url."/"); |
|
108 | 108 | $xoopsMailer->assign("YOUR_NAME", $yname); |
109 | 109 | $xoopsMailer->assign("FRIEND_NAME", $fname); |
110 | 110 | $xoopsMailer->setToEmails($fmail); |
@@ -144,11 +144,11 @@ discard block |
||
144 | 144 | $onlineUsers[$i]['name'] = $user->getVar('uname'); |
145 | 145 | $response = $xoops->service("Avatar")->getAvatarUrl($user); |
146 | 146 | $avatar = $response->getValue(); |
147 | - $avatar = empty($avatar) ? $xoops_upload_url . '/blank.gif' : $avatar; |
|
147 | + $avatar = empty($avatar) ? $xoops_upload_url.'/blank.gif' : $avatar; |
|
148 | 148 | $onlineUsers[$i]['avatar'] = $avatar; |
149 | 149 | } else { |
150 | 150 | $onlineUsers[$i]['name'] = $xoops->getConfig('anonymous'); |
151 | - $onlineUsers[$i]['avatar'] = $xoops_upload_url . '/blank.gif'; |
|
151 | + $onlineUsers[$i]['avatar'] = $xoops_upload_url.'/blank.gif'; |
|
152 | 152 | } |
153 | 153 | } |
154 | 154 | |
@@ -166,7 +166,7 @@ discard block |
||
166 | 166 | if ($xoops->getConfig('use_ssl') && isset($_POST[$xoops->getConfig('sslpost_name')]) && $xoops->isUser()) { |
167 | 167 | $xoops->loadLanguage('user'); |
168 | 168 | echo sprintf(XoopsLocale::E_INCORRECT_LOGIN, $xoops->user->getVar('uname')); |
169 | - echo '<div style="text-align:center;"><input class="formButton" value="' . XoopsLocale::A_CLOSE . '" type="button" onclick="window.opener.location.reload();window.close();" /></div>'; |
|
169 | + echo '<div style="text-align:center;"><input class="formButton" value="'.XoopsLocale::A_CLOSE.'" type="button" onclick="window.opener.location.reload();window.close();" /></div>'; |
|
170 | 170 | $closebutton = false; |
171 | 171 | } |
172 | 172 | break; |
@@ -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'); |
@@ -20,7 +20,7 @@ discard block |
||
20 | 20 | */ |
21 | 21 | |
22 | 22 | $xoopsOption['nocommon'] = true; |
23 | -require_once __DIR__ . '/mainfile.php'; |
|
23 | +require_once __DIR__.'/mainfile.php'; |
|
24 | 24 | |
25 | 25 | //error_reporting(0); |
26 | 26 | |
@@ -42,7 +42,7 @@ discard block |
||
42 | 42 | |
43 | 43 | $path_type = substr($path, 0, strpos($path, '/')); |
44 | 44 | if (!isset($xoops->paths[$path_type])) { |
45 | - $path = "XOOPS/" . $path; |
|
45 | + $path = "XOOPS/".$path; |
|
46 | 46 | $path_type = "XOOPS"; |
47 | 47 | } |
48 | 48 | |
@@ -56,7 +56,7 @@ discard block |
||
56 | 56 | $dir = realpath($xoops->paths[$path_type][0]); |
57 | 57 | |
58 | 58 | //We are not allowing directory traversal either |
59 | -if ($file===false || $dir===false || !strstr($file, $dir)) { |
|
59 | +if ($file === false || $dir === false || !strstr($file, $dir)) { |
|
60 | 60 | header("HTTP/1.0 404 Not Found"); |
61 | 61 | exit(); |
62 | 62 | } |
@@ -94,11 +94,11 @@ discard block |
||
94 | 94 | |
95 | 95 | // Output now |
96 | 96 | // seconds, minutes, hours, days |
97 | -$expires = 60*60*24*15; |
|
97 | +$expires = 60 * 60 * 24 * 15; |
|
98 | 98 | //header("Pragma: public"); |
99 | -header("Cache-Control: public, max-age=" . $expires); |
|
100 | -header('Expires: ' . gmdate('D, d M Y H:i:s', time() + $expires) . ' GMT'); |
|
101 | -header('Last-Modified: ' . gmdate('D, d M Y H:i:s T', $mtime)); |
|
102 | -header('Content-type: ' . $mimetype); |
|
99 | +header("Cache-Control: public, max-age=".$expires); |
|
100 | +header('Expires: '.gmdate('D, d M Y H:i:s', time() + $expires).' GMT'); |
|
101 | +header('Last-Modified: '.gmdate('D, d M Y H:i:s T', $mtime)); |
|
102 | +header('Content-type: '.$mimetype); |
|
103 | 103 | readfile($file); |
104 | 104 | exit; |
@@ -19,7 +19,7 @@ |
||
19 | 19 | * @version $Id$ |
20 | 20 | */ |
21 | 21 | |
22 | -include __DIR__ . '/mainfile.php'; |
|
22 | +include __DIR__.'/mainfile.php'; |
|
23 | 23 | |
24 | 24 | $xoops = Xoops::getInstance(); |
25 | 25 | if ($xoops->isActiveModule('notifications')) { |
@@ -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 ($xoopsConfigUser['reg_dispdsclmr'] != 0 && $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 ($xoopsConfigUser['reg_dispdsclmr'] != 0 && $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,202 +95,202 @@ 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 | - |
|
108 | - case 'finish': |
|
109 | - $xoops->header(); |
|
110 | - $stop = XoopsUserUtility::validate($uname, $email, $pass, $vpass); |
|
111 | - if (!$xoops->security()->check()) { |
|
112 | - $stop .= implode('<br />', $xoops->security()->getErrors()) . "<br />"; |
|
113 | - } |
|
114 | - $xoopsCaptcha = XoopsCaptcha::getInstance(); |
|
115 | - if (!$xoopsCaptcha->verify()) { |
|
116 | - $stop .= $xoopsCaptcha->getMessage() . "<br />"; |
|
117 | - } |
|
118 | - if (empty($stop)) { |
|
119 | - $member_handler = $xoops->getHandlerMember(); |
|
120 | - $newuser = $member_handler->createUser(); |
|
121 | - $newuser->setVar('user_viewemail', $user_viewemail); |
|
122 | - $newuser->setVar('uname', $uname); |
|
123 | - $newuser->setVar('email', $email); |
|
124 | - if ($url != '') { |
|
125 | - $newuser->setVar('url', $xoops->formatURL($url)); |
|
126 | - } |
|
127 | - $newuser->setVar('user_avatar', 'blank.gif'); |
|
128 | - $actkey = substr(\Xmf\Random::generateKey(), 16, 8); |
|
129 | - $newuser->setVar('actkey', $actkey); |
|
130 | - $newuser->setVar('pass', password_hash($pass, PASSWORD_DEFAULT)); |
|
131 | - $newuser->setVar('last_pass_change', time()); |
|
132 | - $newuser->setVar('timezone', $timezone); |
|
133 | - $newuser->setVar('user_regdate', time()); |
|
134 | - $newuser->setVar('uorder', $xoops->getConfig('com_order')); |
|
135 | - $newuser->setVar('umode', $xoops->getConfig('com_mode')); |
|
136 | - $newuser->setVar('theme', $xoops->getConfig('theme_set')); |
|
137 | - $newuser->setVar('user_mailok', $user_mailok); |
|
138 | - if ($xoopsConfigUser['activation_type'] == 1) { |
|
139 | - $newuser->setVar('level', 1); |
|
98 | + . $xoops->security()->getTokenHTML() |
|
99 | + . "<input type='submit' value='" . XoopsLocale::A_FINISH . "' /></form>"; |
|
140 | 100 | } else { |
141 | - $newuser->setVar('level', 0); |
|
142 | - } |
|
143 | - if (!$member_handler->insertUser($newuser)) { |
|
144 | - echo XoopsLocale::E_USER_NOT_REGISTERED; |
|
145 | - $xoops->footer(); |
|
101 | + echo "<span class='red'>$stop</span>"; |
|
102 | + include $xoops->path('include/registerform.php'); |
|
103 | + $reg_form->display(); |
|
146 | 104 | } |
147 | - $newid = $newuser->getVar('uid'); |
|
148 | - if (!$member_handler->addUserToGroup(FixedGroups::USERS, $newid)) { |
|
149 | - echo XoopsLocale::E_USER_NOT_REGISTERED; |
|
150 | - $xoops->footer(); |
|
105 | + $xoops->footer(); |
|
106 | + break; |
|
107 | + |
|
108 | + case 'finish': |
|
109 | + $xoops->header(); |
|
110 | + $stop = XoopsUserUtility::validate($uname, $email, $pass, $vpass); |
|
111 | + if (!$xoops->security()->check()) { |
|
112 | + $stop .= implode('<br />', $xoops->security()->getErrors()) . "<br />"; |
|
151 | 113 | } |
152 | - if ($xoopsConfigUser['activation_type'] == 1) { |
|
153 | - XoopsUserUtility::sendWelcome($newuser); |
|
154 | - $xoops->redirect( |
|
155 | - 'index.php', |
|
156 | - 4, |
|
157 | - XoopsLocale::S_YOUR_ACCOUNT_ACTIVATED . ' ' . XoopsLocale::LOGIN_WITH_REGISTERED_PASSWORD |
|
158 | - ); |
|
114 | + $xoopsCaptcha = XoopsCaptcha::getInstance(); |
|
115 | + if (!$xoopsCaptcha->verify()) { |
|
116 | + $stop .= $xoopsCaptcha->getMessage() . "<br />"; |
|
159 | 117 | } |
160 | - // Sending notification email to user for self activation |
|
161 | - if ($xoopsConfigUser['activation_type'] == 0) { |
|
162 | - $xoopsMailer = $xoops->getMailer(); |
|
163 | - $xoopsMailer->useMail(); |
|
164 | - $xoopsMailer->setTemplate('register.tpl'); |
|
165 | - $xoopsMailer->assign('SITENAME', $xoops->getConfig('sitename')); |
|
166 | - $xoopsMailer->assign('ADMINMAIL', $xoops->getConfig('adminmail')); |
|
167 | - $xoopsMailer->assign('SITEURL', $xoops_url . "/"); |
|
168 | - $xoopsMailer->setToUsers(new XoopsUser($newid)); |
|
169 | - $xoopsMailer->setFromEmail($xoops->getConfig('adminmail')); |
|
170 | - $xoopsMailer->setFromName($xoops->getConfig('sitename')); |
|
171 | - $xoopsMailer->setSubject(sprintf(XoopsLocale::F_USER_ACTIVATION_KEY_FOR, $uname)); |
|
172 | - if (!$xoopsMailer->send()) { |
|
173 | - echo XoopsLocale::S_YOU_ARE_NOW_REGISTERED . ' ' |
|
174 | - . XoopsLocale::EMAIL_HAS_NOT_BEEN_SENT_WITH_ACTIVATION_KEY; |
|
118 | + if (empty($stop)) { |
|
119 | + $member_handler = $xoops->getHandlerMember(); |
|
120 | + $newuser = $member_handler->createUser(); |
|
121 | + $newuser->setVar('user_viewemail', $user_viewemail); |
|
122 | + $newuser->setVar('uname', $uname); |
|
123 | + $newuser->setVar('email', $email); |
|
124 | + if ($url != '') { |
|
125 | + $newuser->setVar('url', $xoops->formatURL($url)); |
|
126 | + } |
|
127 | + $newuser->setVar('user_avatar', 'blank.gif'); |
|
128 | + $actkey = substr(\Xmf\Random::generateKey(), 16, 8); |
|
129 | + $newuser->setVar('actkey', $actkey); |
|
130 | + $newuser->setVar('pass', password_hash($pass, PASSWORD_DEFAULT)); |
|
131 | + $newuser->setVar('last_pass_change', time()); |
|
132 | + $newuser->setVar('timezone', $timezone); |
|
133 | + $newuser->setVar('user_regdate', time()); |
|
134 | + $newuser->setVar('uorder', $xoops->getConfig('com_order')); |
|
135 | + $newuser->setVar('umode', $xoops->getConfig('com_mode')); |
|
136 | + $newuser->setVar('theme', $xoops->getConfig('theme_set')); |
|
137 | + $newuser->setVar('user_mailok', $user_mailok); |
|
138 | + if ($xoopsConfigUser['activation_type'] == 1) { |
|
139 | + $newuser->setVar('level', 1); |
|
175 | 140 | } else { |
176 | - echo XoopsLocale::S_YOU_ARE_NOW_REGISTERED . ' ' |
|
177 | - . XoopsLocale::EMAIL_HAS_BEEN_SENT_WITH_ACTIVATION_KEY; |
|
141 | + $newuser->setVar('level', 0); |
|
178 | 142 | } |
179 | - // Sending notification email to administrator for activation |
|
180 | - } elseif ($xoopsConfigUser['activation_type'] == 2) { |
|
181 | - $xoopsMailer = $xoops->getMailer(); |
|
182 | - $xoopsMailer->useMail(); |
|
183 | - $xoopsMailer->setTemplate('adminactivate.tpl'); |
|
184 | - $xoopsMailer->assign('USERNAME', $uname); |
|
185 | - $xoopsMailer->assign('USEREMAIL', $email); |
|
186 | - $xoopsMailer->assign( |
|
187 | - 'USERACTLINK', |
|
188 | - $xoops_url . '/register.php?op=actv&id=' . $newid . '&actkey=' . $actkey |
|
189 | - ); |
|
190 | - $xoopsMailer->assign('SITENAME', $xoops->getConfig('sitename')); |
|
191 | - $xoopsMailer->assign('ADMINMAIL', $xoops->getConfig('adminmail')); |
|
192 | - $xoopsMailer->assign('SITEURL', $xoops_url . "/"); |
|
193 | - $member_handler = $xoops->getHandlerMember(); |
|
194 | - $xoopsMailer->setToGroups($member_handler->getGroup($xoopsConfigUser['activation_group'])); |
|
195 | - $xoopsMailer->setFromEmail($xoops->getConfig('adminmail')); |
|
196 | - $xoopsMailer->setFromName($xoops->getConfig('sitename')); |
|
197 | - $xoopsMailer->setSubject(sprintf(XoopsLocale::F_USER_ACTIVATION_KEY_FOR, $uname)); |
|
198 | - if (!$xoopsMailer->send()) { |
|
199 | - echo XoopsLocale::S_YOU_ARE_NOW_REGISTERED . ' ' |
|
143 | + if (!$member_handler->insertUser($newuser)) { |
|
144 | + echo XoopsLocale::E_USER_NOT_REGISTERED; |
|
145 | + $xoops->footer(); |
|
146 | + } |
|
147 | + $newid = $newuser->getVar('uid'); |
|
148 | + if (!$member_handler->addUserToGroup(FixedGroups::USERS, $newid)) { |
|
149 | + echo XoopsLocale::E_USER_NOT_REGISTERED; |
|
150 | + $xoops->footer(); |
|
151 | + } |
|
152 | + if ($xoopsConfigUser['activation_type'] == 1) { |
|
153 | + XoopsUserUtility::sendWelcome($newuser); |
|
154 | + $xoops->redirect( |
|
155 | + 'index.php', |
|
156 | + 4, |
|
157 | + XoopsLocale::S_YOUR_ACCOUNT_ACTIVATED . ' ' . XoopsLocale::LOGIN_WITH_REGISTERED_PASSWORD |
|
158 | + ); |
|
159 | + } |
|
160 | + // Sending notification email to user for self activation |
|
161 | + if ($xoopsConfigUser['activation_type'] == 0) { |
|
162 | + $xoopsMailer = $xoops->getMailer(); |
|
163 | + $xoopsMailer->useMail(); |
|
164 | + $xoopsMailer->setTemplate('register.tpl'); |
|
165 | + $xoopsMailer->assign('SITENAME', $xoops->getConfig('sitename')); |
|
166 | + $xoopsMailer->assign('ADMINMAIL', $xoops->getConfig('adminmail')); |
|
167 | + $xoopsMailer->assign('SITEURL', $xoops_url . "/"); |
|
168 | + $xoopsMailer->setToUsers(new XoopsUser($newid)); |
|
169 | + $xoopsMailer->setFromEmail($xoops->getConfig('adminmail')); |
|
170 | + $xoopsMailer->setFromName($xoops->getConfig('sitename')); |
|
171 | + $xoopsMailer->setSubject(sprintf(XoopsLocale::F_USER_ACTIVATION_KEY_FOR, $uname)); |
|
172 | + if (!$xoopsMailer->send()) { |
|
173 | + echo XoopsLocale::S_YOU_ARE_NOW_REGISTERED . ' ' |
|
200 | 174 | . XoopsLocale::EMAIL_HAS_NOT_BEEN_SENT_WITH_ACTIVATION_KEY; |
201 | - echo XoopsLocale::S_YOU_ARE_NOW_REGISTERED . ' ' |
|
202 | - . XoopsLocale::PLEASE_WAIT_FOR_ACCOUNT_ACTIVATION; |
|
175 | + } else { |
|
176 | + echo XoopsLocale::S_YOU_ARE_NOW_REGISTERED . ' ' |
|
177 | + . XoopsLocale::EMAIL_HAS_BEEN_SENT_WITH_ACTIVATION_KEY; |
|
178 | + } |
|
179 | + // Sending notification email to administrator for activation |
|
180 | + } elseif ($xoopsConfigUser['activation_type'] == 2) { |
|
181 | + $xoopsMailer = $xoops->getMailer(); |
|
182 | + $xoopsMailer->useMail(); |
|
183 | + $xoopsMailer->setTemplate('adminactivate.tpl'); |
|
184 | + $xoopsMailer->assign('USERNAME', $uname); |
|
185 | + $xoopsMailer->assign('USEREMAIL', $email); |
|
186 | + $xoopsMailer->assign( |
|
187 | + 'USERACTLINK', |
|
188 | + $xoops_url . '/register.php?op=actv&id=' . $newid . '&actkey=' . $actkey |
|
189 | + ); |
|
190 | + $xoopsMailer->assign('SITENAME', $xoops->getConfig('sitename')); |
|
191 | + $xoopsMailer->assign('ADMINMAIL', $xoops->getConfig('adminmail')); |
|
192 | + $xoopsMailer->assign('SITEURL', $xoops_url . "/"); |
|
193 | + $member_handler = $xoops->getHandlerMember(); |
|
194 | + $xoopsMailer->setToGroups($member_handler->getGroup($xoopsConfigUser['activation_group'])); |
|
195 | + $xoopsMailer->setFromEmail($xoops->getConfig('adminmail')); |
|
196 | + $xoopsMailer->setFromName($xoops->getConfig('sitename')); |
|
197 | + $xoopsMailer->setSubject(sprintf(XoopsLocale::F_USER_ACTIVATION_KEY_FOR, $uname)); |
|
198 | + if (!$xoopsMailer->send()) { |
|
199 | + echo XoopsLocale::S_YOU_ARE_NOW_REGISTERED . ' ' |
|
200 | + . XoopsLocale::EMAIL_HAS_NOT_BEEN_SENT_WITH_ACTIVATION_KEY; |
|
201 | + echo XoopsLocale::S_YOU_ARE_NOW_REGISTERED . ' ' |
|
202 | + . XoopsLocale::PLEASE_WAIT_FOR_ACCOUNT_ACTIVATION; |
|
203 | + } |
|
203 | 204 | } |
205 | + if ($xoopsConfigUser['new_user_notify'] == 1 && !empty($xoopsConfigUser['new_user_notify_group'])) { |
|
206 | + $xoopsMailer = $xoops->getMailer(); |
|
207 | + $xoopsMailer->reset(); |
|
208 | + $xoopsMailer->useMail(); |
|
209 | + $member_handler = $xoops->getHandlerMember(); |
|
210 | + $xoopsMailer->setToGroups($member_handler->getGroup($xoopsConfigUser['new_user_notify_group'])); |
|
211 | + $xoopsMailer->setFromEmail($xoops->getConfig('adminmail')); |
|
212 | + $xoopsMailer->setFromName($xoops->getConfig('sitename')); |
|
213 | + $xoopsMailer->setSubject( |
|
214 | + sprintf(XoopsLocale::F_NEW_USER_REGISTRATION_AT, $xoops->getConfig('sitename')) |
|
215 | + ); |
|
216 | + $xoopsMailer->setBody(sprintf(XoopsLocale::F_HAS_JUST_REGISTERED, $uname)); |
|
217 | + $xoopsMailer->send(); |
|
218 | + } |
|
219 | + } else { |
|
220 | + echo "<span class='red bold'>{$stop}</span>"; |
|
221 | + include $xoops->path('include/registerform.php'); |
|
222 | + $reg_form->display(); |
|
204 | 223 | } |
205 | - if ($xoopsConfigUser['new_user_notify'] == 1 && !empty($xoopsConfigUser['new_user_notify_group'])) { |
|
206 | - $xoopsMailer = $xoops->getMailer(); |
|
207 | - $xoopsMailer->reset(); |
|
208 | - $xoopsMailer->useMail(); |
|
209 | - $member_handler = $xoops->getHandlerMember(); |
|
210 | - $xoopsMailer->setToGroups($member_handler->getGroup($xoopsConfigUser['new_user_notify_group'])); |
|
211 | - $xoopsMailer->setFromEmail($xoops->getConfig('adminmail')); |
|
212 | - $xoopsMailer->setFromName($xoops->getConfig('sitename')); |
|
213 | - $xoopsMailer->setSubject( |
|
214 | - sprintf(XoopsLocale::F_NEW_USER_REGISTRATION_AT, $xoops->getConfig('sitename')) |
|
215 | - ); |
|
216 | - $xoopsMailer->setBody(sprintf(XoopsLocale::F_HAS_JUST_REGISTERED, $uname)); |
|
217 | - $xoopsMailer->send(); |
|
218 | - } |
|
219 | - } else { |
|
220 | - echo "<span class='red bold'>{$stop}</span>"; |
|
221 | - include $xoops->path('include/registerform.php'); |
|
222 | - $reg_form->display(); |
|
223 | - } |
|
224 | - $xoops->footer(); |
|
225 | - break; |
|
224 | + $xoops->footer(); |
|
225 | + break; |
|
226 | 226 | |
227 | - case 'actv': |
|
228 | - case 'activate': |
|
229 | - if (empty($id)) { |
|
230 | - $xoops->redirect('index.php', 1, ''); |
|
231 | - exit(); |
|
232 | - } |
|
233 | - $member_handler = $xoops->getHandlerMember(); |
|
234 | - $thisuser = $member_handler->getUser($id); |
|
235 | - if (!is_object($thisuser)) { |
|
236 | - exit(); |
|
237 | - } |
|
238 | - if ($thisuser->getVar('actkey') != $actkey) { |
|
239 | - $xoops->redirect('index.php', 5, XoopsLocale::E_ACTIVATION_KEY_INCORRECT); |
|
240 | - } else { |
|
241 | - if ($thisuser->getVar('level') > 0) { |
|
242 | - $xoops->redirect('user.php', 5, XoopsLocale::E_SELECTED_ACCOUNT_IS_ALREADY_ACTIVATED, false); |
|
227 | + case 'actv': |
|
228 | + case 'activate': |
|
229 | + if (empty($id)) { |
|
230 | + $xoops->redirect('index.php', 1, ''); |
|
231 | + exit(); |
|
232 | + } |
|
233 | + $member_handler = $xoops->getHandlerMember(); |
|
234 | + $thisuser = $member_handler->getUser($id); |
|
235 | + if (!is_object($thisuser)) { |
|
236 | + exit(); |
|
237 | + } |
|
238 | + if ($thisuser->getVar('actkey') != $actkey) { |
|
239 | + $xoops->redirect('index.php', 5, XoopsLocale::E_ACTIVATION_KEY_INCORRECT); |
|
243 | 240 | } else { |
244 | - if (false != $member_handler->activateUser($thisuser)) { |
|
245 | - $xoopsConfigUser = $xoops->getConfigs(); |
|
246 | - if ($xoopsConfigUser['activation_type'] == 2) { |
|
247 | - $myts = \Xoops\Core\Text\Sanitizer::getInstance(); |
|
248 | - $xoopsMailer = $xoops->getMailer(); |
|
249 | - $xoopsMailer->useMail(); |
|
250 | - $xoopsMailer->setTemplate('activated.tpl'); |
|
251 | - $xoopsMailer->assign('SITENAME', $xoops->getConfig('sitename')); |
|
252 | - $xoopsMailer->assign('ADMINMAIL', $xoops->getConfig('adminmail')); |
|
253 | - $xoopsMailer->assign('SITEURL', $xoops_url . "/"); |
|
254 | - $xoopsMailer->setToUsers($thisuser); |
|
255 | - $xoopsMailer->setFromEmail($xoops->getConfig('adminmail')); |
|
256 | - $xoopsMailer->setFromName($xoops->getConfig('sitename')); |
|
257 | - $xoopsMailer->setSubject( |
|
258 | - sprintf(XoopsLocale::F_YOUR_ACCOUNT_AT, $xoops->getConfig('sitename')) |
|
259 | - ); |
|
260 | - $xoops->header(); |
|
261 | - if (!$xoopsMailer->send()) { |
|
262 | - printf(XoopsLocale::EF_NOTIFICATION_EMAIL_NOT_SENT_TO, $thisuser->getVar('uname')); |
|
241 | + if ($thisuser->getVar('level') > 0) { |
|
242 | + $xoops->redirect('user.php', 5, XoopsLocale::E_SELECTED_ACCOUNT_IS_ALREADY_ACTIVATED, false); |
|
243 | + } else { |
|
244 | + if (false != $member_handler->activateUser($thisuser)) { |
|
245 | + $xoopsConfigUser = $xoops->getConfigs(); |
|
246 | + if ($xoopsConfigUser['activation_type'] == 2) { |
|
247 | + $myts = \Xoops\Core\Text\Sanitizer::getInstance(); |
|
248 | + $xoopsMailer = $xoops->getMailer(); |
|
249 | + $xoopsMailer->useMail(); |
|
250 | + $xoopsMailer->setTemplate('activated.tpl'); |
|
251 | + $xoopsMailer->assign('SITENAME', $xoops->getConfig('sitename')); |
|
252 | + $xoopsMailer->assign('ADMINMAIL', $xoops->getConfig('adminmail')); |
|
253 | + $xoopsMailer->assign('SITEURL', $xoops_url . "/"); |
|
254 | + $xoopsMailer->setToUsers($thisuser); |
|
255 | + $xoopsMailer->setFromEmail($xoops->getConfig('adminmail')); |
|
256 | + $xoopsMailer->setFromName($xoops->getConfig('sitename')); |
|
257 | + $xoopsMailer->setSubject( |
|
258 | + sprintf(XoopsLocale::F_YOUR_ACCOUNT_AT, $xoops->getConfig('sitename')) |
|
259 | + ); |
|
260 | + $xoops->header(); |
|
261 | + if (!$xoopsMailer->send()) { |
|
262 | + printf(XoopsLocale::EF_NOTIFICATION_EMAIL_NOT_SENT_TO, $thisuser->getVar('uname')); |
|
263 | + } else { |
|
264 | + printf(XoopsLocale::SF_NOTIFICATION_EMAIL_SENT_TO, $thisuser->getVar('uname')); |
|
265 | + } |
|
266 | + $xoops->footer(); |
|
263 | 267 | } else { |
264 | - printf(XoopsLocale::SF_NOTIFICATION_EMAIL_SENT_TO, $thisuser->getVar('uname')); |
|
268 | + $xoops->redirect( |
|
269 | + 'user.php', |
|
270 | + 5, |
|
271 | + XoopsLocale::S_YOUR_ACCOUNT_ACTIVATED . ' ' . XoopsLocale::LOGIN_WITH_REGISTERED_PASSWORD, |
|
272 | + false |
|
273 | + ); |
|
265 | 274 | } |
266 | - $xoops->footer(); |
|
267 | 275 | } else { |
268 | - $xoops->redirect( |
|
269 | - 'user.php', |
|
270 | - 5, |
|
271 | - XoopsLocale::S_YOUR_ACCOUNT_ACTIVATED . ' ' . XoopsLocale::LOGIN_WITH_REGISTERED_PASSWORD, |
|
272 | - false |
|
273 | - ); |
|
276 | + $xoops->redirect('index.php', 5, XoopsLocale::E_ACTIVATION_FAILED); |
|
274 | 277 | } |
275 | - } else { |
|
276 | - $xoops->redirect('index.php', 5, XoopsLocale::E_ACTIVATION_FAILED); |
|
277 | 278 | } |
278 | 279 | } |
279 | - } |
|
280 | - break; |
|
280 | + break; |
|
281 | 281 | |
282 | - case 'register': |
|
283 | - default: |
|
284 | - $xoops->header(); |
|
285 | - $xoops->tpl()->assign('xoops_pagetitle', XoopsLocale::USER_REGISTRATION); |
|
286 | - $xoops->theme()->addMeta( |
|
287 | - 'meta', |
|
288 | - 'keywords', |
|
289 | - XoopsLocale::USER_REGISTRATION . ", " . XoopsLocale::USERNAME |
|
290 | - ); // FIXME! |
|
291 | - $xoops->theme()->addMeta('meta', 'description', strip_tags($xoopsConfigUser['reg_disclaimer'])); |
|
292 | - include $xoops->path('include/registerform.php'); |
|
293 | - $reg_form->display(); |
|
294 | - $xoops->footer(); |
|
295 | - break; |
|
282 | + case 'register': |
|
283 | + default: |
|
284 | + $xoops->header(); |
|
285 | + $xoops->tpl()->assign('xoops_pagetitle', XoopsLocale::USER_REGISTRATION); |
|
286 | + $xoops->theme()->addMeta( |
|
287 | + 'meta', |
|
288 | + 'keywords', |
|
289 | + XoopsLocale::USER_REGISTRATION . ", " . XoopsLocale::USERNAME |
|
290 | + ); // FIXME! |
|
291 | + $xoops->theme()->addMeta('meta', 'description', strip_tags($xoopsConfigUser['reg_disclaimer'])); |
|
292 | + include $xoops->path('include/registerform.php'); |
|
293 | + $reg_form->display(); |
|
294 | + $xoops->footer(); |
|
295 | + break; |
|
296 | 296 | } |
@@ -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 ($xoopsConfigUser['reg_dispdsclmr'] != 0 && $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'); |
@@ -109,11 +109,11 @@ discard block |
||
109 | 109 | $xoops->header(); |
110 | 110 | $stop = XoopsUserUtility::validate($uname, $email, $pass, $vpass); |
111 | 111 | if (!$xoops->security()->check()) { |
112 | - $stop .= implode('<br />', $xoops->security()->getErrors()) . "<br />"; |
|
112 | + $stop .= implode('<br />', $xoops->security()->getErrors())."<br />"; |
|
113 | 113 | } |
114 | 114 | $xoopsCaptcha = XoopsCaptcha::getInstance(); |
115 | 115 | if (!$xoopsCaptcha->verify()) { |
116 | - $stop .= $xoopsCaptcha->getMessage() . "<br />"; |
|
116 | + $stop .= $xoopsCaptcha->getMessage()."<br />"; |
|
117 | 117 | } |
118 | 118 | if (empty($stop)) { |
119 | 119 | $member_handler = $xoops->getHandlerMember(); |
@@ -154,7 +154,7 @@ discard block |
||
154 | 154 | $xoops->redirect( |
155 | 155 | 'index.php', |
156 | 156 | 4, |
157 | - XoopsLocale::S_YOUR_ACCOUNT_ACTIVATED . ' ' . XoopsLocale::LOGIN_WITH_REGISTERED_PASSWORD |
|
157 | + XoopsLocale::S_YOUR_ACCOUNT_ACTIVATED.' '.XoopsLocale::LOGIN_WITH_REGISTERED_PASSWORD |
|
158 | 158 | ); |
159 | 159 | } |
160 | 160 | // Sending notification email to user for self activation |
@@ -164,16 +164,16 @@ discard block |
||
164 | 164 | $xoopsMailer->setTemplate('register.tpl'); |
165 | 165 | $xoopsMailer->assign('SITENAME', $xoops->getConfig('sitename')); |
166 | 166 | $xoopsMailer->assign('ADMINMAIL', $xoops->getConfig('adminmail')); |
167 | - $xoopsMailer->assign('SITEURL', $xoops_url . "/"); |
|
167 | + $xoopsMailer->assign('SITEURL', $xoops_url."/"); |
|
168 | 168 | $xoopsMailer->setToUsers(new XoopsUser($newid)); |
169 | 169 | $xoopsMailer->setFromEmail($xoops->getConfig('adminmail')); |
170 | 170 | $xoopsMailer->setFromName($xoops->getConfig('sitename')); |
171 | 171 | $xoopsMailer->setSubject(sprintf(XoopsLocale::F_USER_ACTIVATION_KEY_FOR, $uname)); |
172 | 172 | if (!$xoopsMailer->send()) { |
173 | - echo XoopsLocale::S_YOU_ARE_NOW_REGISTERED . ' ' |
|
173 | + echo XoopsLocale::S_YOU_ARE_NOW_REGISTERED.' ' |
|
174 | 174 | . XoopsLocale::EMAIL_HAS_NOT_BEEN_SENT_WITH_ACTIVATION_KEY; |
175 | 175 | } else { |
176 | - echo XoopsLocale::S_YOU_ARE_NOW_REGISTERED . ' ' |
|
176 | + echo XoopsLocale::S_YOU_ARE_NOW_REGISTERED.' ' |
|
177 | 177 | . XoopsLocale::EMAIL_HAS_BEEN_SENT_WITH_ACTIVATION_KEY; |
178 | 178 | } |
179 | 179 | // Sending notification email to administrator for activation |
@@ -185,20 +185,20 @@ discard block |
||
185 | 185 | $xoopsMailer->assign('USEREMAIL', $email); |
186 | 186 | $xoopsMailer->assign( |
187 | 187 | 'USERACTLINK', |
188 | - $xoops_url . '/register.php?op=actv&id=' . $newid . '&actkey=' . $actkey |
|
188 | + $xoops_url.'/register.php?op=actv&id='.$newid.'&actkey='.$actkey |
|
189 | 189 | ); |
190 | 190 | $xoopsMailer->assign('SITENAME', $xoops->getConfig('sitename')); |
191 | 191 | $xoopsMailer->assign('ADMINMAIL', $xoops->getConfig('adminmail')); |
192 | - $xoopsMailer->assign('SITEURL', $xoops_url . "/"); |
|
192 | + $xoopsMailer->assign('SITEURL', $xoops_url."/"); |
|
193 | 193 | $member_handler = $xoops->getHandlerMember(); |
194 | 194 | $xoopsMailer->setToGroups($member_handler->getGroup($xoopsConfigUser['activation_group'])); |
195 | 195 | $xoopsMailer->setFromEmail($xoops->getConfig('adminmail')); |
196 | 196 | $xoopsMailer->setFromName($xoops->getConfig('sitename')); |
197 | 197 | $xoopsMailer->setSubject(sprintf(XoopsLocale::F_USER_ACTIVATION_KEY_FOR, $uname)); |
198 | 198 | if (!$xoopsMailer->send()) { |
199 | - echo XoopsLocale::S_YOU_ARE_NOW_REGISTERED . ' ' |
|
199 | + echo XoopsLocale::S_YOU_ARE_NOW_REGISTERED.' ' |
|
200 | 200 | . XoopsLocale::EMAIL_HAS_NOT_BEEN_SENT_WITH_ACTIVATION_KEY; |
201 | - echo XoopsLocale::S_YOU_ARE_NOW_REGISTERED . ' ' |
|
201 | + echo XoopsLocale::S_YOU_ARE_NOW_REGISTERED.' ' |
|
202 | 202 | . XoopsLocale::PLEASE_WAIT_FOR_ACCOUNT_ACTIVATION; |
203 | 203 | } |
204 | 204 | } |
@@ -250,7 +250,7 @@ discard block |
||
250 | 250 | $xoopsMailer->setTemplate('activated.tpl'); |
251 | 251 | $xoopsMailer->assign('SITENAME', $xoops->getConfig('sitename')); |
252 | 252 | $xoopsMailer->assign('ADMINMAIL', $xoops->getConfig('adminmail')); |
253 | - $xoopsMailer->assign('SITEURL', $xoops_url . "/"); |
|
253 | + $xoopsMailer->assign('SITEURL', $xoops_url."/"); |
|
254 | 254 | $xoopsMailer->setToUsers($thisuser); |
255 | 255 | $xoopsMailer->setFromEmail($xoops->getConfig('adminmail')); |
256 | 256 | $xoopsMailer->setFromName($xoops->getConfig('sitename')); |
@@ -268,7 +268,7 @@ discard block |
||
268 | 268 | $xoops->redirect( |
269 | 269 | 'user.php', |
270 | 270 | 5, |
271 | - XoopsLocale::S_YOUR_ACCOUNT_ACTIVATED . ' ' . XoopsLocale::LOGIN_WITH_REGISTERED_PASSWORD, |
|
271 | + XoopsLocale::S_YOUR_ACCOUNT_ACTIVATED.' '.XoopsLocale::LOGIN_WITH_REGISTERED_PASSWORD, |
|
272 | 272 | false |
273 | 273 | ); |
274 | 274 | } |
@@ -286,7 +286,7 @@ discard block |
||
286 | 286 | $xoops->theme()->addMeta( |
287 | 287 | 'meta', |
288 | 288 | 'keywords', |
289 | - XoopsLocale::USER_REGISTRATION . ", " . XoopsLocale::USERNAME |
|
289 | + XoopsLocale::USER_REGISTRATION.", ".XoopsLocale::USERNAME |
|
290 | 290 | ); // FIXME! |
291 | 291 | $xoops->theme()->addMeta('meta', 'description', strip_tags($xoopsConfigUser['reg_disclaimer'])); |
292 | 292 | include $xoops->path('include/registerform.php'); |
@@ -24,13 +24,13 @@ |
||
24 | 24 | * @todo Modularize; Both search algorithms and interface will be redesigned |
25 | 25 | */ |
26 | 26 | |
27 | -include __DIR__ . '/mainfile.php'; |
|
27 | +include __DIR__.'/mainfile.php'; |
|
28 | 28 | |
29 | 29 | $xoops = Xoops::getInstance(); |
30 | 30 | $uri = ''; |
31 | 31 | if ($xoops->isActiveModule('search')) { |
32 | 32 | foreach (Request::get() as $k => $v) { |
33 | - $uri .= urlencode($k) . '=' . urlencode($v) . '&'; |
|
33 | + $uri .= urlencode($k).'='.urlencode($v).'&'; |
|
34 | 34 | } |
35 | 35 | $xoops->redirect("modules/search/index.php?{$uri}", 0); |
36 | 36 | } else { |
@@ -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(); |