@@ -21,7 +21,7 @@ discard block |
||
| 21 | 21 | * @author Taiwen Jiang <[email protected]> |
| 22 | 22 | */ |
| 23 | 23 | |
| 24 | -include __DIR__ . '/header.php'; |
|
| 24 | +include __DIR__.'/header.php'; |
|
| 25 | 25 | $xoops = Xoops::getInstance(); |
| 26 | 26 | $xoops->header(); |
| 27 | 27 | |
@@ -51,4 +51,4 @@ discard block |
||
| 51 | 51 | $message = _PROFILE_AM_USER_NOT_DEACTIVATED; |
| 52 | 52 | } |
| 53 | 53 | } |
| 54 | -$xoops->redirect($xoops->url('modules/profile/userinfo.php?uid=' . $user->getVar('uid')), 3, $message); |
|
| 54 | +$xoops->redirect($xoops->url('modules/profile/userinfo.php?uid='.$user->getVar('uid')), 3, $message); |
|
@@ -19,7 +19,7 @@ discard block |
||
| 19 | 19 | * @author Taiwen Jiang <[email protected]> |
| 20 | 20 | */ |
| 21 | 21 | |
| 22 | -include __DIR__ . '/header.php'; |
|
| 22 | +include __DIR__.'/header.php'; |
|
| 23 | 23 | // Get main instance |
| 24 | 24 | $system = System::getInstance(); |
| 25 | 25 | $xoops = Xoops::getInstance(); |
@@ -37,7 +37,7 @@ discard block |
||
| 37 | 37 | switch ($op) { |
| 38 | 38 | case "list": |
| 39 | 39 | default: |
| 40 | - $admin_page->addItemButton(XoopsLocale::A_ADD . ' ' . _PROFILE_AM_CATEGORY, 'category.php?op=new', 'add'); |
|
| 40 | + $admin_page->addItemButton(XoopsLocale::A_ADD.' '._PROFILE_AM_CATEGORY, 'category.php?op=new', 'add'); |
|
| 41 | 41 | $admin_page->renderButton(); |
| 42 | 42 | $criteria = new CriteriaCompo(); |
| 43 | 43 | $criteria->setSort('cat_weight'); |
@@ -55,7 +55,7 @@ discard block |
||
| 55 | 55 | break; |
| 56 | 56 | |
| 57 | 57 | case "edit": |
| 58 | - $admin_page->addItemButton(XoopsLocale::A_ADD . ' ' . _PROFILE_AM_CATEGORY, 'category.php?op=new', 'add'); |
|
| 58 | + $admin_page->addItemButton(XoopsLocale::A_ADD.' '._PROFILE_AM_CATEGORY, 'category.php?op=new', 'add'); |
|
| 59 | 59 | $admin_page->addItemButton(_PROFILE_AM_CATEGORY_LIST, 'category.php', 'application-view-detail'); |
| 60 | 60 | $admin_page->renderButton(); |
| 61 | 61 | $id = $system->cleanVars($_REQUEST, 'id', 0, 'int'); |
@@ -90,7 +90,7 @@ discard block |
||
| 90 | 90 | break; |
| 91 | 91 | |
| 92 | 92 | case "delete": |
| 93 | - $admin_page->addItemButton(XoopsLocale::A_ADD . ' ' . _PROFILE_AM_CATEGORY, 'category.php?op=new', 'add'); |
|
| 93 | + $admin_page->addItemButton(XoopsLocale::A_ADD.' '._PROFILE_AM_CATEGORY, 'category.php?op=new', 'add'); |
|
| 94 | 94 | $admin_page->addItemButton(_PROFILE_AM_CATEGORY_LIST, 'category.php', 'application-view-detail'); |
| 95 | 95 | $admin_page->renderButton(); |
| 96 | 96 | $id = $system->cleanVars($_REQUEST, 'id', 0, 'int'); |
@@ -112,7 +112,7 @@ discard block |
||
| 112 | 112 | echo $xoops->confirm( |
| 113 | 113 | array("ok" => 1, "id" => $id, "op" => "delete"), |
| 114 | 114 | 'category.php', |
| 115 | - sprintf(_PROFILE_AM_RUSUREDEL, $obj->getVar('cat_title')) . '<br />' |
|
| 115 | + sprintf(_PROFILE_AM_RUSUREDEL, $obj->getVar('cat_title')).'<br />' |
|
| 116 | 116 | ); |
| 117 | 117 | } |
| 118 | 118 | } else { |
@@ -21,7 +21,7 @@ discard block |
||
| 21 | 21 | * @author Jan Pedersen |
| 22 | 22 | * @author Taiwen Jiang <[email protected]> |
| 23 | 23 | */ |
| 24 | -include __DIR__ . '/header.php'; |
|
| 24 | +include __DIR__.'/header.php'; |
|
| 25 | 25 | // Get main instance |
| 26 | 26 | $system = System::getInstance(); |
| 27 | 27 | $xoops = Xoops::getInstance(); |
@@ -75,7 +75,7 @@ discard block |
||
| 75 | 75 | $opform->display(); |
| 76 | 76 | |
| 77 | 77 | $module_id = $xoops->module->getVar('mid'); |
| 78 | -$form = new Xoops\Form\GroupPermissionForm($title_of_form, $module_id, $perm_name, $perm_desc, 'admin/permissions.php?op=' . $op, $anonymous); |
|
| 78 | +$form = new Xoops\Form\GroupPermissionForm($title_of_form, $module_id, $perm_name, $perm_desc, 'admin/permissions.php?op='.$op, $anonymous); |
|
| 79 | 79 | |
| 80 | 80 | if ($op === 'access') { |
| 81 | 81 | $member_handler = $xoops->getHandlerMember(); |
@@ -21,7 +21,7 @@ discard block |
||
| 21 | 21 | * @author Jan Pedersen |
| 22 | 22 | * @author Taiwen Jiang <[email protected]> |
| 23 | 23 | */ |
| 24 | -include __DIR__ . '/header.php'; |
|
| 24 | +include __DIR__.'/header.php'; |
|
| 25 | 25 | |
| 26 | 26 | $xoops = Xoops::getInstance(); |
| 27 | 27 | $xoops->header(); |
@@ -51,7 +51,7 @@ discard block |
||
| 51 | 51 | |
| 52 | 52 | case "new": |
| 53 | 53 | $xoops->loadLanguage("main", $xoops->module->getVar('dirname', 'n')); |
| 54 | - include_once dirname(__DIR__) . '/include/forms.php'; |
|
| 54 | + include_once dirname(__DIR__).'/include/forms.php'; |
|
| 55 | 55 | $obj = $handler->createUser(); |
| 56 | 56 | $obj->setGroups(array(FixedGroups::USERS)); |
| 57 | 57 | $form = profile_getUserForm($obj); |
@@ -65,7 +65,7 @@ discard block |
||
| 65 | 65 | // If not webmaster trying to edit a webmaster - disallow |
| 66 | 66 | $xoops->redirect("user.php", 3, XoopsLocale::E_NO_ACTION_PERMISSION); |
| 67 | 67 | } |
| 68 | - include_once dirname(__DIR__) . '/include/forms.php'; |
|
| 68 | + include_once dirname(__DIR__).'/include/forms.php'; |
|
| 69 | 69 | $form = profile_getUserForm($obj); |
| 70 | 70 | $form->display(); |
| 71 | 71 | break; |
@@ -76,7 +76,7 @@ discard block |
||
| 76 | 76 | $xoops->redirect( |
| 77 | 77 | 'user.php', |
| 78 | 78 | 3, |
| 79 | - XoopsLocale::E_NO_ACTION_PERMISSION . "<br />" |
|
| 79 | + XoopsLocale::E_NO_ACTION_PERMISSION."<br />" |
|
| 80 | 80 | . implode('<br />', $xoops->security()->getErrors()) |
| 81 | 81 | ); |
| 82 | 82 | exit; |
@@ -195,7 +195,7 @@ discard block |
||
| 195 | 195 | } |
| 196 | 196 | } |
| 197 | 197 | $user->setGroups($new_groups); |
| 198 | - include_once dirname(__DIR__) . '/include/forms.php'; |
|
| 198 | + include_once dirname(__DIR__).'/include/forms.php'; |
|
| 199 | 199 | echo $user->getHtmlErrors(); |
| 200 | 200 | $form = profile_getUserForm($user, $profile); |
| 201 | 201 | $form->display(); |
@@ -222,7 +222,7 @@ discard block |
||
| 222 | 222 | $xoops->redirect( |
| 223 | 223 | 'user.php', |
| 224 | 224 | 3, |
| 225 | - sprintf(_PROFILE_AM_DELETEDSUCCESS, $obj->getVar('uname') . " (" . $obj->getVar('email') . ")"), |
|
| 225 | + sprintf(_PROFILE_AM_DELETEDSUCCESS, $obj->getVar('uname')." (".$obj->getVar('email').")"), |
|
| 226 | 226 | false |
| 227 | 227 | ); |
| 228 | 228 | } else { |
@@ -236,7 +236,7 @@ discard block |
||
| 236 | 236 | echo $xoops->confirm( |
| 237 | 237 | array('ok' => 1, 'id' => $_REQUEST['id'], 'op' => 'delete'), |
| 238 | 238 | $_SERVER['REQUEST_URI'], |
| 239 | - sprintf(_PROFILE_AM_RUSUREDEL, $obj->getVar('uname') . " (" . $obj->getVar('email') . ")") |
|
| 239 | + sprintf(_PROFILE_AM_RUSUREDEL, $obj->getVar('uname')." (".$obj->getVar('email').")") |
|
| 240 | 240 | ); |
| 241 | 241 | } |
| 242 | 242 | break; |
@@ -19,5 +19,5 @@ |
||
| 19 | 19 | * @author Taiwen Jiang <[email protected]> |
| 20 | 20 | */ |
| 21 | 21 | |
| 22 | -require_once dirname(dirname(dirname(__DIR__))) . '/include/cp_header.php'; |
|
| 22 | +require_once dirname(dirname(dirname(__DIR__))).'/include/cp_header.php'; |
|
| 23 | 23 | XoopsLoad::load('system', 'system'); |
@@ -21,7 +21,7 @@ discard block |
||
| 21 | 21 | * @author Jan Pedersen |
| 22 | 22 | * @author Taiwen Jiang <[email protected]> |
| 23 | 23 | */ |
| 24 | -include __DIR__ . '/header.php'; |
|
| 24 | +include __DIR__.'/header.php'; |
|
| 25 | 25 | // Get main instance |
| 26 | 26 | $system = System::getInstance(); |
| 27 | 27 | $xoops = Xoops::getInstance(); |
@@ -43,7 +43,7 @@ discard block |
||
| 43 | 43 | switch ($op) { |
| 44 | 44 | default: |
| 45 | 45 | case "list": |
| 46 | - $admin_page->addItemButton(XoopsLocale::A_ADD . ' ' . _PROFILE_AM_FIELD, 'field.php?op=new', 'add'); |
|
| 46 | + $admin_page->addItemButton(XoopsLocale::A_ADD.' '._PROFILE_AM_FIELD, 'field.php?op=new', 'add'); |
|
| 47 | 47 | $admin_page->renderButton(); |
| 48 | 48 | $fields = $field_handler->getObjects(null, true, false); |
| 49 | 49 | $modules = $xoops->getHandlerModule()->getObjectsArray(null, true); |
@@ -110,7 +110,7 @@ discard block |
||
| 110 | 110 | break; |
| 111 | 111 | |
| 112 | 112 | case "edit": |
| 113 | - $admin_page->addItemButton(XoopsLocale::A_ADD . ' ' . _PROFILE_AM_FIELD, 'field.php?op=new', 'add'); |
|
| 113 | + $admin_page->addItemButton(XoopsLocale::A_ADD.' '._PROFILE_AM_FIELD, 'field.php?op=new', 'add'); |
|
| 114 | 114 | $admin_page->addItemButton(_PROFILE_AM_FIELD_LIST, 'field.php', 'application-view-detail'); |
| 115 | 115 | $admin_page->renderButton(); |
| 116 | 116 | $id = $system->cleanVars($_REQUEST, 'id', 0, 'int'); |
@@ -143,7 +143,7 @@ discard block |
||
| 143 | 143 | $errors = array(); |
| 144 | 144 | //if there are changed fields, fetch the fieldcategory objects |
| 145 | 145 | $fields = $field_handler->getObjects( |
| 146 | - new Criteria('field_id', "(" . implode(',', $ids) . ")", "IN"), |
|
| 146 | + new Criteria('field_id', "(".implode(',', $ids).")", "IN"), |
|
| 147 | 147 | true |
| 148 | 148 | ); |
| 149 | 149 | foreach ($ids as $i) { |
@@ -281,7 +281,7 @@ discard block |
||
| 281 | 281 | $removed_groups = array_diff(array_keys($groups), $_REQUEST[$perm]); |
| 282 | 282 | if (count($removed_groups) > 0) { |
| 283 | 283 | $criteria->add( |
| 284 | - new Criteria('gperm_groupid', "(" . implode(',', $removed_groups) . ")", "IN") |
|
| 284 | + new Criteria('gperm_groupid', "(".implode(',', $removed_groups).")", "IN") |
|
| 285 | 285 | ); |
| 286 | 286 | $groupperm_handler->deleteAll($criteria); |
| 287 | 287 | } |
@@ -292,7 +292,7 @@ discard block |
||
| 292 | 292 | unset($criteria); |
| 293 | 293 | } |
| 294 | 294 | } |
| 295 | - $url = $redirect_to_edit ? 'field.php?op=edit&id=' . $obj->getVar('field_id') : 'field.php'; |
|
| 295 | + $url = $redirect_to_edit ? 'field.php?op=edit&id='.$obj->getVar('field_id') : 'field.php'; |
|
| 296 | 296 | $xoops->redirect($url, 3, sprintf(_PROFILE_AM_SAVEDSUCCESS, _PROFILE_AM_FIELD)); |
| 297 | 297 | } |
| 298 | 298 | echo $xoops->alert('error', $obj->getHtmlErrors()); |
@@ -301,7 +301,7 @@ discard block |
||
| 301 | 301 | break; |
| 302 | 302 | |
| 303 | 303 | case "delete": |
| 304 | - $admin_page->addItemButton(XoopsLocale::A_ADD . ' ' . _PROFILE_AM_FIELD, 'field.php?op=new', 'add'); |
|
| 304 | + $admin_page->addItemButton(XoopsLocale::A_ADD.' '._PROFILE_AM_FIELD, 'field.php?op=new', 'add'); |
|
| 305 | 305 | $admin_page->addItemButton(_PROFILE_AM_FIELD_LIST, 'field.php', 'application-view-detail'); |
| 306 | 306 | $admin_page->renderButton(); |
| 307 | 307 | $id = $system->cleanVars($_REQUEST, 'id', 0, 'int'); |
@@ -323,7 +323,7 @@ discard block |
||
| 323 | 323 | echo $xoops->confirm( |
| 324 | 324 | array("ok" => 1, "id" => $id, "op" => "delete"), |
| 325 | 325 | 'field.php', |
| 326 | - sprintf(_PROFILE_AM_RUSUREDEL, $obj->getVar('field_title')) . '<br />' |
|
| 326 | + sprintf(_PROFILE_AM_RUSUREDEL, $obj->getVar('field_title')).'<br />' |
|
| 327 | 327 | ); |
| 328 | 328 | } |
| 329 | 329 | } else { |
@@ -44,7 +44,7 @@ |
||
| 44 | 44 | // paypal |
| 45 | 45 | $modversion['paypal'] = array( |
| 46 | 46 | 'business' => '[email protected]', |
| 47 | - 'item_name' => 'Donation : ' . _PROFILE_MI_DESC, |
|
| 47 | + 'item_name' => 'Donation : '._PROFILE_MI_DESC, |
|
| 48 | 48 | 'amount' => 0, |
| 49 | 49 | 'currency_code' => 'USD', |
| 50 | 50 | ); |
@@ -24,16 +24,16 @@ discard block |
||
| 24 | 24 | * @author trabis <[email protected]> |
| 25 | 25 | */ |
| 26 | 26 | |
| 27 | -include __DIR__ . '/header.php'; |
|
| 27 | +include __DIR__.'/header.php'; |
|
| 28 | 28 | $xoops = Xoops::getInstance(); |
| 29 | 29 | |
| 30 | 30 | if ($xoops->isUser()) { |
| 31 | - header('location: userinfo.php?uid= ' . $xoops->user->getVar('uid')); |
|
| 31 | + header('location: userinfo.php?uid= '.$xoops->user->getVar('uid')); |
|
| 32 | 32 | exit(); |
| 33 | 33 | } |
| 34 | 34 | |
| 35 | 35 | if (!empty($_GET['op']) && in_array($_GET['op'], array('actv', 'activate'))) { |
| 36 | - header("location: ./activate.php" . (empty($_SERVER['QUERY_STRING']) ? "" : "?" . $_SERVER['QUERY_STRING'])); |
|
| 36 | + header("location: ./activate.php".(empty($_SERVER['QUERY_STRING']) ? "" : "?".$_SERVER['QUERY_STRING'])); |
|
| 37 | 37 | exit(); |
| 38 | 38 | } |
| 39 | 39 | |
@@ -59,7 +59,7 @@ discard block |
||
| 59 | 59 | $regstep_handler = \Xoops::getModuleHelper('profile')->getHandler('regstep'); |
| 60 | 60 | |
| 61 | 61 | if (!$steps = $regstep_handler->getAll($criteria, null, false, false)) { |
| 62 | - $xoops->redirect(\XoopsBaseConfig::get('url') . '/', 6, _PROFILE_MA_NOSTEPSAVAILABLE); |
|
| 62 | + $xoops->redirect(\XoopsBaseConfig::get('url').'/', 6, _PROFILE_MA_NOSTEPSAVAILABLE); |
|
| 63 | 63 | } |
| 64 | 64 | |
| 65 | 65 | foreach (array_keys($steps) as $key) { |
@@ -72,7 +72,7 @@ discard block |
||
| 72 | 72 | $xoops->tpl()->assign('lang_register_steps', _PROFILE_MA_REGISTER_STEPS); |
| 73 | 73 | |
| 74 | 74 | $xoops->registry()->get('profile_breadcrumbs')->addItem( |
| 75 | - new Link(['caption' => _PROFILE_MA_REGISTER, 'link' => $xoops->url('modules/profile/register.php'),]) |
|
| 75 | + new Link(['caption' => _PROFILE_MA_REGISTER, 'link' => $xoops->url('modules/profile/register.php'), ]) |
|
| 76 | 76 | ); |
| 77 | 77 | |
| 78 | 78 | if (isset($steps[$current_step])) { |
@@ -160,7 +160,7 @@ discard block |
||
| 160 | 160 | if (isset($_POST['step']) && isset($_SESSION['profile_required'])) { |
| 161 | 161 | foreach ($_SESSION['profile_required'] as $name => $title) { |
| 162 | 162 | if (!isset($_POST[$name]) || empty($_POST[$name])) { |
| 163 | - $stop .= sprintf(XoopsLocale::F_ENTER, $title) . '<br />'; |
|
| 163 | + $stop .= sprintf(XoopsLocale::F_ENTER, $title).'<br />'; |
|
| 164 | 164 | } |
| 165 | 165 | } |
| 166 | 166 | } |
@@ -176,7 +176,7 @@ discard block |
||
| 176 | 176 | |
| 177 | 177 | if ($xoops->getConfig('reg_dispdsclmr') != 0 && $xoops->getConfig('reg_disclaimer') != '') { |
| 178 | 178 | if (empty($agree_disc)) { |
| 179 | - $stop .= XoopsLocale::E_YOU_HAVE_TO_AGREE_TO_DISCLAIMER . '<br />'; |
|
| 179 | + $stop .= XoopsLocale::E_YOU_HAVE_TO_AGREE_TO_DISCLAIMER.'<br />'; |
|
| 180 | 180 | } |
| 181 | 181 | } |
| 182 | 182 | |
@@ -223,7 +223,7 @@ discard block |
||
| 223 | 223 | |
| 224 | 224 | // Insert/update user and check if we have succeded |
| 225 | 225 | if (!$member_handler->insertUser($newuser)) { |
| 226 | - $stop .= XoopsLocale::E_USER_NOT_REGISTERED . "<br />"; |
|
| 226 | + $stop .= XoopsLocale::E_USER_NOT_REGISTERED."<br />"; |
|
| 227 | 227 | $stop .= implode('<br />', $newuser->getErrors()); |
| 228 | 228 | } else { |
| 229 | 229 | // User inserted! Now insert custom profile fields |
@@ -246,7 +246,7 @@ discard block |
||
| 246 | 246 | |
| 247 | 247 | $message = ""; |
| 248 | 248 | if (!$member_handler->addUserToGroup(FixedGroups::USERS, $newuser->getVar('uid'))) { |
| 249 | - $message = _PROFILE_MA_REGISTER_NOTGROUP . "<br />"; |
|
| 249 | + $message = _PROFILE_MA_REGISTER_NOTGROUP."<br />"; |
|
| 250 | 250 | } else { |
| 251 | 251 | if ($xoops->getConfig('activation_type') == 1) { |
| 252 | 252 | XoopsUserUtility::sendWelcome($newuser); |
@@ -258,7 +258,7 @@ discard block |
||
| 258 | 258 | $xoopsMailer->setTemplate('register.tpl'); |
| 259 | 259 | $xoopsMailer->assign('SITENAME', $xoops->getConfig('sitename')); |
| 260 | 260 | $xoopsMailer->assign('ADMINMAIL', $xoops->getConfig('adminmail')); |
| 261 | - $xoopsMailer->assign('SITEURL', \XoopsBaseConfig::get('url') . "/"); |
|
| 261 | + $xoopsMailer->assign('SITEURL', \XoopsBaseConfig::get('url')."/"); |
|
| 262 | 262 | $xoopsMailer->assign('X_UPASS', $_POST['vpass']); |
| 263 | 263 | $xoopsMailer->setToUsers($newuser); |
| 264 | 264 | $xoopsMailer->setFromEmail($xoops->getConfig('adminmail')); |
@@ -277,10 +277,10 @@ discard block |
||
| 277 | 277 | $xoopsMailer->setTemplate('adminactivate.tpl'); |
| 278 | 278 | $xoopsMailer->assign('USERNAME', $newuser->getVar('uname')); |
| 279 | 279 | $xoopsMailer->assign('USEREMAIL', $newuser->getVar('email')); |
| 280 | - $xoopsMailer->assign('USERACTLINK', \XoopsBaseConfig::get('url') . "/modules/" . $xoops->module->getVar('dirname', 'n') . '/activate.php?id=' . $newuser->getVar('uid') . '&actkey=' . $newuser->getVar('actkey', 'n')); |
|
| 280 | + $xoopsMailer->assign('USERACTLINK', \XoopsBaseConfig::get('url')."/modules/".$xoops->module->getVar('dirname', 'n').'/activate.php?id='.$newuser->getVar('uid').'&actkey='.$newuser->getVar('actkey', 'n')); |
|
| 281 | 281 | $xoopsMailer->assign('SITENAME', $xoops->getConfig('sitename')); |
| 282 | 282 | $xoopsMailer->assign('ADMINMAIL', $xoops->getConfig('adminmail')); |
| 283 | - $xoopsMailer->assign('SITEURL', \XoopsBaseConfig::get('url') . "/"); |
|
| 283 | + $xoopsMailer->assign('SITEURL', \XoopsBaseConfig::get('url')."/"); |
|
| 284 | 284 | $xoopsMailer->setToGroups($member_handler->getGroup($xoops->getConfig('activation_group'))); |
| 285 | 285 | $xoopsMailer->setFromEmail($xoops->getConfig('adminmail')); |
| 286 | 286 | $xoopsMailer->setFromName($xoops->getConfig('sitename')); |
@@ -303,7 +303,7 @@ discard block |
||
| 303 | 303 | } |
| 304 | 304 | |
| 305 | 305 | if (!empty($stop) || isset($steps[$current_step])) { |
| 306 | - include_once __DIR__ . '/include/forms.php'; |
|
| 306 | + include_once __DIR__.'/include/forms.php'; |
|
| 307 | 307 | $current_step = empty($stop) ? $current_step : $current_step - 1; |
| 308 | 308 | $reg_form = profile_getRegisterForm($newuser, $profile, $steps[$current_step]); |
| 309 | 309 | $reg_form->assign($xoops->tpl()); |
@@ -321,14 +321,14 @@ discard block |
||
| 321 | 321 | if (isset($_SESSION['profile_post']['_message_'])) { |
| 322 | 322 | //todo, if user is activated by admin, then we should inform it along with error messages. _US_YOURREGMAILNG is not enough |
| 323 | 323 | $messages = array( |
| 324 | - XoopsLocale::S_YOU_ARE_NOW_REGISTERED . ' ' . XoopsLocale::EMAIL_HAS_NOT_BEEN_SENT_WITH_ACTIVATION_KEY, |
|
| 325 | - XoopsLocale::S_YOU_ARE_NOW_REGISTERED . ' ' . XoopsLocale::EMAIL_HAS_BEEN_SENT_WITH_ACTIVATION_KEY, |
|
| 326 | - XoopsLocale::S_YOU_ARE_NOW_REGISTERED . ' ' . XoopsLocale::EMAIL_HAS_NOT_BEEN_SENT_WITH_ACTIVATION_KEY, |
|
| 327 | - XoopsLocale::S_YOU_ARE_NOW_REGISTERED . ' ' . XoopsLocale::PLEASE_WAIT_FOR_ACCOUNT_ACTIVATION |
|
| 324 | + XoopsLocale::S_YOU_ARE_NOW_REGISTERED.' '.XoopsLocale::EMAIL_HAS_NOT_BEEN_SENT_WITH_ACTIVATION_KEY, |
|
| 325 | + XoopsLocale::S_YOU_ARE_NOW_REGISTERED.' '.XoopsLocale::EMAIL_HAS_BEEN_SENT_WITH_ACTIVATION_KEY, |
|
| 326 | + XoopsLocale::S_YOU_ARE_NOW_REGISTERED.' '.XoopsLocale::EMAIL_HAS_NOT_BEEN_SENT_WITH_ACTIVATION_KEY, |
|
| 327 | + XoopsLocale::S_YOU_ARE_NOW_REGISTERED.' '.XoopsLocale::PLEASE_WAIT_FOR_ACCOUNT_ACTIVATION |
|
| 328 | 328 | ); |
| 329 | 329 | $xoops->tpl()->assign('finish_message', $messages[$_SESSION['profile_post']['_message_']]); |
| 330 | 330 | } |
| 331 | 331 | $_SESSION['profile_post'] = null; |
| 332 | 332 | } |
| 333 | 333 | |
| 334 | -include __DIR__ . '/footer.php'; |
|
| 334 | +include __DIR__.'/footer.php'; |
|
@@ -25,7 +25,7 @@ discard block |
||
| 25 | 25 | * @author Taiwen Jiang <[email protected]> |
| 26 | 26 | */ |
| 27 | 27 | |
| 28 | -include __DIR__ . '/header.php'; |
|
| 28 | +include __DIR__.'/header.php'; |
|
| 29 | 29 | $xoops = Xoops::getInstance(); |
| 30 | 30 | $myts = \Xoops\Core\Text\Sanitizer::getInstance(); |
| 31 | 31 | |
@@ -82,11 +82,11 @@ discard block |
||
| 82 | 82 | switch ($fields[$i]->getVar('field_type')) { |
| 83 | 83 | case "textbox": |
| 84 | 84 | if ($fields[$i]->getVar('field_valuetype') == Dtype::TYPE_INTEGER) { |
| 85 | - $searchform->addElement(new Xoops\Form\Text(sprintf(_PROFILE_MA_LARGERTHAN, $fields[$i]->getVar('field_title')), $fields[$i]->getVar('field_name') . "_larger", 35, 35)); |
|
| 86 | - $searchform->addElement(new Xoops\Form\Text(sprintf(_PROFILE_MA_SMALLERTHAN, $fields[$i]->getVar('field_title')), $fields[$i]->getVar('field_name') . "_smaller", 35, 35)); |
|
| 85 | + $searchform->addElement(new Xoops\Form\Text(sprintf(_PROFILE_MA_LARGERTHAN, $fields[$i]->getVar('field_title')), $fields[$i]->getVar('field_name')."_larger", 35, 35)); |
|
| 86 | + $searchform->addElement(new Xoops\Form\Text(sprintf(_PROFILE_MA_SMALLERTHAN, $fields[$i]->getVar('field_title')), $fields[$i]->getVar('field_name')."_smaller", 35, 35)); |
|
| 87 | 87 | } else { |
| 88 | 88 | $tray = new Xoops\Form\ElementTray($fields[$i]->getVar('field_title')); |
| 89 | - $tray->addElement(new Xoops\Form\SelectMatchOption('', $fields[$i]->getVar('field_name') . "_match")); |
|
| 89 | + $tray->addElement(new Xoops\Form\SelectMatchOption('', $fields[$i]->getVar('field_name')."_match")); |
|
| 90 | 90 | $tray->addElement(new Xoops\Form\Text('', $fields[$i]->getVar('field_name'), 35, $fields[$i]->getVar('field_maxlength'))); |
| 91 | 91 | $searchform->addElement($tray); |
| 92 | 92 | unset($tray); |
@@ -114,11 +114,11 @@ discard block |
||
| 114 | 114 | |
| 115 | 115 | case "date": |
| 116 | 116 | case "datetime": |
| 117 | - $dt1 = new Xoops\Form\DateSelect(sprintf(_PROFILE_MA_LATERTHAN, $fields[$i]->getVar('field_title')), $fields[$i]->getVar('field_name') . "_larger"); |
|
| 118 | - $dt1->set('value',''); |
|
| 117 | + $dt1 = new Xoops\Form\DateSelect(sprintf(_PROFILE_MA_LATERTHAN, $fields[$i]->getVar('field_title')), $fields[$i]->getVar('field_name')."_larger"); |
|
| 118 | + $dt1->set('value', ''); |
|
| 119 | 119 | $searchform->addElement(clone $dt1); |
| 120 | - $dt2 = new Xoops\Form\DateSelect(sprintf(_PROFILE_MA_EARLIERTHAN, $fields[$i]->getVar('field_title')), $fields[$i]->getVar('field_name') . "_smaller", ''); |
|
| 121 | - $dt2->set('value',''); |
|
| 120 | + $dt2 = new Xoops\Form\DateSelect(sprintf(_PROFILE_MA_EARLIERTHAN, $fields[$i]->getVar('field_title')), $fields[$i]->getVar('field_name')."_smaller", ''); |
|
| 121 | + $dt2->set('value', ''); |
|
| 122 | 122 | $searchform->addElement(clone $dt2); |
| 123 | 123 | break; |
| 124 | 124 | |
@@ -193,16 +193,16 @@ discard block |
||
| 193 | 193 | break; |
| 194 | 194 | |
| 195 | 195 | case XOOPS_MATCH_END: |
| 196 | - $string = "%" . $string; |
|
| 196 | + $string = "%".$string; |
|
| 197 | 197 | break; |
| 198 | 198 | |
| 199 | 199 | case XOOPS_MATCH_CONTAIN: |
| 200 | - $string = "%" . $string . "%"; |
|
| 200 | + $string = "%".$string."%"; |
|
| 201 | 201 | break; |
| 202 | 202 | } |
| 203 | 203 | $criteria->add(new Criteria('uname', $string, "LIKE")); |
| 204 | - $search_url[] = "uname=" . $_REQUEST['uname']; |
|
| 205 | - $search_url[] = "uname_match=" . $_REQUEST['uname_match']; |
|
| 204 | + $search_url[] = "uname=".$_REQUEST['uname']; |
|
| 205 | + $search_url[] = "uname_match=".$_REQUEST['uname_match']; |
|
| 206 | 206 | $searchvars[] = "uname"; |
| 207 | 207 | } |
| 208 | 208 | if (isset($_REQUEST['email']) && $_REQUEST['email'] != '') { |
@@ -213,16 +213,16 @@ discard block |
||
| 213 | 213 | break; |
| 214 | 214 | |
| 215 | 215 | case XOOPS_MATCH_END: |
| 216 | - $string = "%" . $string; |
|
| 216 | + $string = "%".$string; |
|
| 217 | 217 | break; |
| 218 | 218 | |
| 219 | 219 | case XOOPS_MATCH_CONTAIN: |
| 220 | - $string = "%" . $string . "%"; |
|
| 220 | + $string = "%".$string."%"; |
|
| 221 | 221 | break; |
| 222 | 222 | } |
| 223 | 223 | $searchvars[] = "email"; |
| 224 | - $search_url[] = "email=" . $_REQUEST['email']; |
|
| 225 | - $search_url[] = "email_match=" . $_REQUEST['email_match']; |
|
| 224 | + $search_url[] = "email=".$_REQUEST['email']; |
|
| 225 | + $search_url[] = "email_match=".$_REQUEST['email_match']; |
|
| 226 | 226 | $criteria->add(new Criteria('email', $string, "LIKE")); |
| 227 | 227 | $criteria->add(new Criteria('user_viewemail', 1)); |
| 228 | 228 | } |
@@ -244,7 +244,7 @@ discard block |
||
| 244 | 244 | case Dtype::TYPE_INTEGER: |
| 245 | 245 | $value = array_map('intval', $_REQUEST[$fieldname]); |
| 246 | 246 | $searchvars[] = $fieldname; |
| 247 | - $criteria->add(new Criteria($fieldname, "(" . implode(',', $value) . ")", "IN")); |
|
| 247 | + $criteria->add(new Criteria($fieldname, "(".implode(',', $value).")", "IN")); |
|
| 248 | 248 | break; |
| 249 | 249 | |
| 250 | 250 | case Dtype::TYPE_URL: |
@@ -252,11 +252,11 @@ discard block |
||
| 252 | 252 | case Dtype::TYPE_TEXT_AREA: |
| 253 | 253 | $value = array_map(array($xoopsDB, "quoteString"), $_REQUEST[$fieldname]); |
| 254 | 254 | $searchvars[] = $fieldname; |
| 255 | - $criteria->add(new Criteria($fieldname, "(" . implode(',', $value) . ")", "IN")); |
|
| 255 | + $criteria->add(new Criteria($fieldname, "(".implode(',', $value).")", "IN")); |
|
| 256 | 256 | break; |
| 257 | 257 | } |
| 258 | 258 | foreach ($_REQUEST[$fieldname] as $value) { |
| 259 | - $search_url[] = $fieldname . "[]=" . $value; |
|
| 259 | + $search_url[] = $fieldname."[]=".$value; |
|
| 260 | 260 | } |
| 261 | 261 | } else { |
| 262 | 262 | //Other fields (not radio, not select) |
@@ -266,25 +266,25 @@ discard block |
||
| 266 | 266 | switch ($fields[$i]->getVar('field_type')) { |
| 267 | 267 | case "date": |
| 268 | 268 | case "datetime": |
| 269 | - if (isset($_REQUEST[$fieldname . "_larger"])) { |
|
| 270 | - $value = $_REQUEST[$fieldname . "_larger"]; |
|
| 271 | - if (!($value = strtotime($_REQUEST[$fieldname . "_larger"]))) { |
|
| 272 | - $value = (int)($_REQUEST[$fieldname . "_larger"]); |
|
| 269 | + if (isset($_REQUEST[$fieldname."_larger"])) { |
|
| 270 | + $value = $_REQUEST[$fieldname."_larger"]; |
|
| 271 | + if (!($value = strtotime($_REQUEST[$fieldname."_larger"]))) { |
|
| 272 | + $value = (int)($_REQUEST[$fieldname."_larger"]); |
|
| 273 | 273 | } |
| 274 | 274 | if ($value > 0) { |
| 275 | - $search_url[] = $fieldname . "_larger=" . $value; |
|
| 275 | + $search_url[] = $fieldname."_larger=".$value; |
|
| 276 | 276 | $searchvars[] = $fieldname; |
| 277 | 277 | $criteria->add(new Criteria($fieldname, $value, ">=")); |
| 278 | 278 | } |
| 279 | 279 | } |
| 280 | 280 | |
| 281 | - if (isset($_REQUEST[$fieldname . "_smaller"])) { |
|
| 282 | - $value = $_REQUEST[$fieldname . "_smaller"]; |
|
| 283 | - if (!($value = strtotime($_REQUEST[$fieldname . "_smaller"]))) { |
|
| 284 | - $value = (int)($_REQUEST[$fieldname . "_smaller"]); |
|
| 281 | + if (isset($_REQUEST[$fieldname."_smaller"])) { |
|
| 282 | + $value = $_REQUEST[$fieldname."_smaller"]; |
|
| 283 | + if (!($value = strtotime($_REQUEST[$fieldname."_smaller"]))) { |
|
| 284 | + $value = (int)($_REQUEST[$fieldname."_smaller"]); |
|
| 285 | 285 | } |
| 286 | 286 | if ($value > 0) { |
| 287 | - $search_url[] = $fieldname . "_smaller=" . $value; |
|
| 287 | + $search_url[] = $fieldname."_smaller=".$value; |
|
| 288 | 288 | $searchvars[] = $fieldname; |
| 289 | 289 | $criteria->add(new Criteria($fieldname, $value + 24 * 3600, "<=")); |
| 290 | 290 | } |
@@ -293,33 +293,33 @@ discard block |
||
| 293 | 293 | break; |
| 294 | 294 | |
| 295 | 295 | default: |
| 296 | - if (isset($_REQUEST[$fieldname . "_larger"]) && (int)($_REQUEST[$fieldname . "_larger"]) != 0) { |
|
| 297 | - $value = (int)($_REQUEST[$fieldname . "_larger"]); |
|
| 298 | - $search_url[] = $fieldname . "_larger=" . $value; |
|
| 296 | + if (isset($_REQUEST[$fieldname."_larger"]) && (int)($_REQUEST[$fieldname."_larger"]) != 0) { |
|
| 297 | + $value = (int)($_REQUEST[$fieldname."_larger"]); |
|
| 298 | + $search_url[] = $fieldname."_larger=".$value; |
|
| 299 | 299 | $searchvars[] = $fieldname; |
| 300 | 300 | $criteria->add(new Criteria($fieldname, $value, ">=")); |
| 301 | 301 | } |
| 302 | 302 | |
| 303 | - if (isset($_REQUEST[$fieldname . "_smaller"]) && (int)($_REQUEST[$fieldname . "_smaller"]) != 0) { |
|
| 304 | - $value = (int)($_REQUEST[$fieldname . "_smaller"]); |
|
| 305 | - $search_url[] = $fieldname . "_smaller=" . $value; |
|
| 303 | + if (isset($_REQUEST[$fieldname."_smaller"]) && (int)($_REQUEST[$fieldname."_smaller"]) != 0) { |
|
| 304 | + $value = (int)($_REQUEST[$fieldname."_smaller"]); |
|
| 305 | + $search_url[] = $fieldname."_smaller=".$value; |
|
| 306 | 306 | $searchvars[] = $fieldname; |
| 307 | 307 | $criteria->add(new Criteria($fieldname, $value, "<=")); |
| 308 | 308 | } |
| 309 | 309 | break; |
| 310 | 310 | } |
| 311 | 311 | |
| 312 | - if (isset($_REQUEST[$fieldname]) && !isset($_REQUEST[$fieldname . "_smaller"]) && !isset($_REQUEST[$fieldname . "_larger"])) { |
|
| 312 | + if (isset($_REQUEST[$fieldname]) && !isset($_REQUEST[$fieldname."_smaller"]) && !isset($_REQUEST[$fieldname."_larger"])) { |
|
| 313 | 313 | if (!is_array($_REQUEST[$fieldname])) { |
| 314 | 314 | $value = (int)($_REQUEST[$fieldname]); |
| 315 | - $search_url[] = $fieldname . "=" . $value; |
|
| 315 | + $search_url[] = $fieldname."=".$value; |
|
| 316 | 316 | $criteria->add(new Criteria($fieldname, $value, "=")); |
| 317 | 317 | } else { |
| 318 | 318 | $value = array_map("intval", $_REQUEST[$fieldname]); |
| 319 | 319 | foreach ($value as $thisvalue) { |
| 320 | - $search_url[] = $fieldname . "[]=" . $thisvalue; |
|
| 320 | + $search_url[] = $fieldname."[]=".$thisvalue; |
|
| 321 | 321 | } |
| 322 | - $criteria->add(new Criteria($fieldname, "(" . implode(',', $value) . ")", "IN")); |
|
| 322 | + $criteria->add(new Criteria($fieldname, "(".implode(',', $value).")", "IN")); |
|
| 323 | 323 | } |
| 324 | 324 | |
| 325 | 325 | $searchvars[] = $fieldname; |
@@ -330,11 +330,11 @@ discard block |
||
| 330 | 330 | if (isset($_REQUEST[$fieldname]) && $_REQUEST[$fieldname] != "") { |
| 331 | 331 | $workingArray = Request::getArray($fieldname, []); |
| 332 | 332 | foreach ($workingArray as $tempValue) { |
| 333 | - $inArray[] = "'" . $tempValue . "'"; |
|
| 333 | + $inArray[] = "'".$tempValue."'"; |
|
| 334 | 334 | } |
| 335 | 335 | $value = implode(',', $inArray); |
| 336 | - $search_url[] = $fieldname . "=" . implode(',', $workingArray); |
|
| 337 | - $criteria->add(new Criteria($fieldname, '(' . $value . ')', 'IN')); |
|
| 336 | + $search_url[] = $fieldname."=".implode(',', $workingArray); |
|
| 337 | + $criteria->add(new Criteria($fieldname, '('.$value.')', 'IN')); |
|
| 338 | 338 | $searchvars[] = $fieldname; |
| 339 | 339 | } |
| 340 | 340 | break; |
@@ -344,21 +344,21 @@ discard block |
||
| 344 | 344 | case Dtype::TYPE_TEXT_AREA: |
| 345 | 345 | if (isset($_REQUEST[$fieldname]) && $_REQUEST[$fieldname] != "") { |
| 346 | 346 | $value = trim($_REQUEST[$fieldname]); |
| 347 | - switch ($_REQUEST[$fieldname . '_match']) { |
|
| 347 | + switch ($_REQUEST[$fieldname.'_match']) { |
|
| 348 | 348 | case XOOPS_MATCH_START: |
| 349 | 349 | $value .= "%"; |
| 350 | 350 | break; |
| 351 | 351 | |
| 352 | 352 | case XOOPS_MATCH_END: |
| 353 | - $value = "%" . $value; |
|
| 353 | + $value = "%".$value; |
|
| 354 | 354 | break; |
| 355 | 355 | |
| 356 | 356 | case XOOPS_MATCH_CONTAIN: |
| 357 | - $value = "%" . $value . "%"; |
|
| 357 | + $value = "%".$value."%"; |
|
| 358 | 358 | break; |
| 359 | 359 | } |
| 360 | - $search_url[] = $fieldname . "=" . $_REQUEST[$fieldname]; |
|
| 361 | - $search_url[] = $fieldname . "_match=" . $_REQUEST[$fieldname . '_match']; |
|
| 360 | + $search_url[] = $fieldname."=".$_REQUEST[$fieldname]; |
|
| 361 | + $search_url[] = $fieldname."_match=".$_REQUEST[$fieldname.'_match']; |
|
| 362 | 362 | $operator = "LIKE"; |
| 363 | 363 | $criteria->add(new Criteria($fieldname, $value, $operator)); |
| 364 | 364 | $searchvars[] = $fieldname; |
@@ -390,7 +390,7 @@ discard block |
||
| 390 | 390 | if ($xoops->isAdmin()) { |
| 391 | 391 | $searchgroups = empty($_REQUEST['selgroups']) ? array() : array_map("intval", $_REQUEST['selgroups']); |
| 392 | 392 | foreach ($searchgroups as $group) { |
| 393 | - $search_url[] = 'selgroups[]=' . $group; |
|
| 393 | + $search_url[] = 'selgroups[]='.$group; |
|
| 394 | 394 | } |
| 395 | 395 | } |
| 396 | 396 | |
@@ -405,13 +405,13 @@ discard block |
||
| 405 | 405 | |
| 406 | 406 | list($users, $profiles, $total_users) = $profile_handler->search($criteria, $searchvars, $searchgroups); |
| 407 | 407 | |
| 408 | - $total = sprintf(_PROFILE_MA_FOUNDUSER, "<span class='red'>{$total_users}</span>") . " "; |
|
| 408 | + $total = sprintf(_PROFILE_MA_FOUNDUSER, "<span class='red'>{$total_users}</span>")." "; |
|
| 409 | 409 | $xoops->tpl()->assign('total_users', $total); |
| 410 | 410 | |
| 411 | 411 | //Sort information |
| 412 | 412 | foreach (array_keys($users) as $k) { |
| 413 | 413 | $userarray = array(); |
| 414 | - $userarray["output"][] = "<a href='userinfo.php?uid=" . $users[$k]->getVar('uid') . "' title=''>" . $users[$k]->getVar('uname') . "</a>"; |
|
| 414 | + $userarray["output"][] = "<a href='userinfo.php?uid=".$users[$k]->getVar('uid')."' title=''>".$users[$k]->getVar('uname')."</a>"; |
|
| 415 | 415 | $userarray["output"][] = ($users[$k]->getVar('user_viewemail') == 1 || $xoops->user->isAdmin()) |
| 416 | 416 | ? $users[$k]->getVar('email') : ""; |
| 417 | 417 | |
@@ -436,9 +436,9 @@ discard block |
||
| 436 | 436 | |
| 437 | 437 | if ($total_users > $limit) { |
| 438 | 438 | $search_url[] = "op=results"; |
| 439 | - $search_url[] = "order=" . $order; |
|
| 440 | - $search_url[] = "sortby=" . htmlspecialchars($sortby); |
|
| 441 | - $search_url[] = "limit=" . $limit; |
|
| 439 | + $search_url[] = "order=".$order; |
|
| 440 | + $search_url[] = "sortby=".htmlspecialchars($sortby); |
|
| 441 | + $search_url[] = "limit=".$limit; |
|
| 442 | 442 | if (isset($search_url)) { |
| 443 | 443 | $args = implode("&", $search_url); |
| 444 | 444 | } |
@@ -447,4 +447,4 @@ discard block |
||
| 447 | 447 | } |
| 448 | 448 | break; |
| 449 | 449 | } |
| 450 | -include __DIR__ . '/footer.php'; |
|
| 450 | +include __DIR__.'/footer.php'; |
|