XOOPS / XoopsCore

htdocs/modules/profile/xoops_version.php

Spacing +1 added lines, -1 removed lines

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

htdocs/modules/profile/register.php

Spacing +18 added lines, -18 removed lines

@@ -24,16 +24,16 @@ 
  * @author          trabis <lusopoemas@gmail.com>
  */
 
-include __DIR__ . '/header.php';
+include __DIR__.'/header.php';
 $xoops = Xoops::getInstance();
 
 if ($xoops->isUser()) {
-    header('location: userinfo.php?uid= ' . $xoops->user->getVar('uid'));
+    header('location: userinfo.php?uid= '.$xoops->user->getVar('uid'));
     exit();
 }
 
 if (!empty($_GET['op']) && in_array($_GET['op'], array('actv', 'activate'))) {
-    header("location: ./activate.php" . (empty($_SERVER['QUERY_STRING']) ? "" : "?" . $_SERVER['QUERY_STRING']));
+    header("location: ./activate.php".(empty($_SERVER['QUERY_STRING']) ? "" : "?".$_SERVER['QUERY_STRING']));
     exit();
 }
 
@@ -59,7 +59,7 @@ 
 $regstep_handler = \Xoops::getModuleHelper('profile')->getHandler('regstep');
 
 if (!$steps = $regstep_handler->getAll($criteria, null, false, false)) {
-    $xoops->redirect(\XoopsBaseConfig::get('url') . '/', 6, _PROFILE_MA_NOSTEPSAVAILABLE);
+    $xoops->redirect(\XoopsBaseConfig::get('url').'/', 6, _PROFILE_MA_NOSTEPSAVAILABLE);
 }
 
 foreach (array_keys($steps) as $key) {
@@ -72,7 +72,7 @@ 
 $xoops->tpl()->assign('lang_register_steps', _PROFILE_MA_REGISTER_STEPS);
 
 $xoops->registry()->get('profile_breadcrumbs')->addItem(
-    new Link(['caption' => _PROFILE_MA_REGISTER, 'link' => $xoops->url('modules/profile/register.php'),])
+    new Link(['caption' => _PROFILE_MA_REGISTER, 'link' => $xoops->url('modules/profile/register.php'), ])
 );
 
 if (isset($steps[$current_step])) {
@@ -160,7 +160,7 @@ 
 if (isset($_POST['step']) && isset($_SESSION['profile_required'])) {
     foreach ($_SESSION['profile_required'] as $name => $title) {
         if (!isset($_POST[$name]) || empty($_POST[$name])) {
-            $stop .= sprintf(XoopsLocale::F_ENTER, $title) . '<br />';
+            $stop .= sprintf(XoopsLocale::F_ENTER, $title).'<br />';
         }
     }
 }
@@ -176,7 +176,7 @@ 
 
     if ($xoops->getConfig('reg_dispdsclmr') != 0 && $xoops->getConfig('reg_disclaimer') != '') {
         if (empty($agree_disc)) {
-            $stop .= XoopsLocale::E_YOU_HAVE_TO_AGREE_TO_DISCLAIMER . '<br />';
+            $stop .= XoopsLocale::E_YOU_HAVE_TO_AGREE_TO_DISCLAIMER.'<br />';
         }
     }
 
@@ -223,7 +223,7 @@ 
 
     // Insert/update user and check if we have succeded
     if (!$member_handler->insertUser($newuser)) {
-        $stop .= XoopsLocale::E_USER_NOT_REGISTERED . "<br />";
+        $stop .= XoopsLocale::E_USER_NOT_REGISTERED."<br />";
         $stop .= implode('<br />', $newuser->getErrors());
     } else {
         // User inserted! Now insert custom profile fields
@@ -246,7 +246,7 @@ 
 
             $message = "";
             if (!$member_handler->addUserToGroup(FixedGroups::USERS, $newuser->getVar('uid'))) {
-                $message = _PROFILE_MA_REGISTER_NOTGROUP . "<br />";
+                $message = _PROFILE_MA_REGISTER_NOTGROUP."<br />";
             } else {
                 if ($xoops->getConfig('activation_type') == 1) {
                     XoopsUserUtility::sendWelcome($newuser);
@@ -258,7 +258,7 @@ 
                         $xoopsMailer->setTemplate('register.tpl');
                         $xoopsMailer->assign('SITENAME', $xoops->getConfig('sitename'));
                         $xoopsMailer->assign('ADMINMAIL', $xoops->getConfig('adminmail'));
-                        $xoopsMailer->assign('SITEURL', \XoopsBaseConfig::get('url') . "/");
+                        $xoopsMailer->assign('SITEURL', \XoopsBaseConfig::get('url')."/");
                         $xoopsMailer->assign('X_UPASS', $_POST['vpass']);
                         $xoopsMailer->setToUsers($newuser);
                         $xoopsMailer->setFromEmail($xoops->getConfig('adminmail'));
@@ -277,10 +277,10 @@ 
                             $xoopsMailer->setTemplate('adminactivate.tpl');
                             $xoopsMailer->assign('USERNAME', $newuser->getVar('uname'));
                             $xoopsMailer->assign('USEREMAIL', $newuser->getVar('email'));
-                            $xoopsMailer->assign('USERACTLINK', \XoopsBaseConfig::get('url') . "/modules/" . $xoops->module->getVar('dirname', 'n') . '/activate.php?id=' . $newuser->getVar('uid') . '&actkey=' . $newuser->getVar('actkey', 'n'));
+                            $xoopsMailer->assign('USERACTLINK', \XoopsBaseConfig::get('url')."/modules/".$xoops->module->getVar('dirname', 'n').'/activate.php?id='.$newuser->getVar('uid').'&actkey='.$newuser->getVar('actkey', 'n'));
                             $xoopsMailer->assign('SITENAME', $xoops->getConfig('sitename'));
                             $xoopsMailer->assign('ADMINMAIL', $xoops->getConfig('adminmail'));
-                            $xoopsMailer->assign('SITEURL', \XoopsBaseConfig::get('url') . "/");
+                            $xoopsMailer->assign('SITEURL', \XoopsBaseConfig::get('url')."/");
                             $xoopsMailer->setToGroups($member_handler->getGroup($xoops->getConfig('activation_group')));
                             $xoopsMailer->setFromEmail($xoops->getConfig('adminmail'));
                             $xoopsMailer->setFromName($xoops->getConfig('sitename'));
@@ -303,7 +303,7 @@ 
 }
 
 if (!empty($stop) || isset($steps[$current_step])) {
-    include_once __DIR__ . '/include/forms.php';
+    include_once __DIR__.'/include/forms.php';
     $current_step = empty($stop) ? $current_step : $current_step - 1;
     $reg_form = profile_getRegisterForm($newuser, $profile, $steps[$current_step]);
     $reg_form->assign($xoops->tpl());
@@ -321,14 +321,14 @@ 
     if (isset($_SESSION['profile_post']['_message_'])) {
         //todo, if user is activated by admin, then we should inform it along with error messages.  _US_YOURREGMAILNG is not enough
         $messages = array(
-            XoopsLocale::S_YOU_ARE_NOW_REGISTERED . ' ' . XoopsLocale::EMAIL_HAS_NOT_BEEN_SENT_WITH_ACTIVATION_KEY,
-            XoopsLocale::S_YOU_ARE_NOW_REGISTERED . ' ' . XoopsLocale::EMAIL_HAS_BEEN_SENT_WITH_ACTIVATION_KEY,
-            XoopsLocale::S_YOU_ARE_NOW_REGISTERED . ' ' . XoopsLocale::EMAIL_HAS_NOT_BEEN_SENT_WITH_ACTIVATION_KEY,
-            XoopsLocale::S_YOU_ARE_NOW_REGISTERED . ' ' . XoopsLocale::PLEASE_WAIT_FOR_ACCOUNT_ACTIVATION
+            XoopsLocale::S_YOU_ARE_NOW_REGISTERED.' '.XoopsLocale::EMAIL_HAS_NOT_BEEN_SENT_WITH_ACTIVATION_KEY,
+            XoopsLocale::S_YOU_ARE_NOW_REGISTERED.' '.XoopsLocale::EMAIL_HAS_BEEN_SENT_WITH_ACTIVATION_KEY,
+            XoopsLocale::S_YOU_ARE_NOW_REGISTERED.' '.XoopsLocale::EMAIL_HAS_NOT_BEEN_SENT_WITH_ACTIVATION_KEY,
+            XoopsLocale::S_YOU_ARE_NOW_REGISTERED.' '.XoopsLocale::PLEASE_WAIT_FOR_ACCOUNT_ACTIVATION
         );
         $xoops->tpl()->assign('finish_message', $messages[$_SESSION['profile_post']['_message_']]);
     }
     $_SESSION['profile_post'] = null;
 }
 
-include __DIR__ . '/footer.php';
+include __DIR__.'/footer.php';

htdocs/modules/profile/search.php

Spacing +54 added lines, -54 removed lines

@@ -25,7 +25,7 @@ 
  * @author          Taiwen Jiang <phppp@users.sourceforge.net>
  */
 
-include __DIR__ . '/header.php';
+include __DIR__.'/header.php';
 $xoops = Xoops::getInstance();
 $myts = \Xoops\Core\Text\Sanitizer::getInstance();
 
@@ -82,11 +82,11 @@ 
             switch ($fields[$i]->getVar('field_type')) {
                 case "textbox":
                     if ($fields[$i]->getVar('field_valuetype') == Dtype::TYPE_INTEGER) {
-                        $searchform->addElement(new Xoops\Form\Text(sprintf(_PROFILE_MA_LARGERTHAN, $fields[$i]->getVar('field_title')), $fields[$i]->getVar('field_name') . "_larger", 35, 35));
-                        $searchform->addElement(new Xoops\Form\Text(sprintf(_PROFILE_MA_SMALLERTHAN, $fields[$i]->getVar('field_title')), $fields[$i]->getVar('field_name') . "_smaller", 35, 35));
+                        $searchform->addElement(new Xoops\Form\Text(sprintf(_PROFILE_MA_LARGERTHAN, $fields[$i]->getVar('field_title')), $fields[$i]->getVar('field_name')."_larger", 35, 35));
+                        $searchform->addElement(new Xoops\Form\Text(sprintf(_PROFILE_MA_SMALLERTHAN, $fields[$i]->getVar('field_title')), $fields[$i]->getVar('field_name')."_smaller", 35, 35));
                     } else {
                         $tray = new Xoops\Form\ElementTray($fields[$i]->getVar('field_title'));
-                        $tray->addElement(new Xoops\Form\SelectMatchOption('', $fields[$i]->getVar('field_name') . "_match"));
+                        $tray->addElement(new Xoops\Form\SelectMatchOption('', $fields[$i]->getVar('field_name')."_match"));
                         $tray->addElement(new Xoops\Form\Text('', $fields[$i]->getVar('field_name'), 35, $fields[$i]->getVar('field_maxlength')));
                         $searchform->addElement($tray);
                         unset($tray);
@@ -114,11 +114,11 @@ 
 
                 case "date":
                 case "datetime":
-                    $dt1 = new Xoops\Form\DateSelect(sprintf(_PROFILE_MA_LATERTHAN, $fields[$i]->getVar('field_title')), $fields[$i]->getVar('field_name') . "_larger");
-                    $dt1->set('value','');
+                    $dt1 = new Xoops\Form\DateSelect(sprintf(_PROFILE_MA_LATERTHAN, $fields[$i]->getVar('field_title')), $fields[$i]->getVar('field_name')."_larger");
+                    $dt1->set('value', '');
                     $searchform->addElement(clone $dt1);
-                    $dt2 = new Xoops\Form\DateSelect(sprintf(_PROFILE_MA_EARLIERTHAN, $fields[$i]->getVar('field_title')), $fields[$i]->getVar('field_name') . "_smaller", '');
-                    $dt2->set('value','');
+                    $dt2 = new Xoops\Form\DateSelect(sprintf(_PROFILE_MA_EARLIERTHAN, $fields[$i]->getVar('field_title')), $fields[$i]->getVar('field_name')."_smaller", '');
+                    $dt2->set('value', '');
                     $searchform->addElement(clone $dt2);
                     break;
 
@@ -193,16 +193,16 @@ 
                     break;
 
                 case XOOPS_MATCH_END:
-                    $string = "%" . $string;
+                    $string = "%".$string;
                     break;
 
                 case XOOPS_MATCH_CONTAIN:
-                    $string = "%" . $string . "%";
+                    $string = "%".$string."%";
                     break;
             }
             $criteria->add(new Criteria('uname', $string, "LIKE"));
-            $search_url[] = "uname=" . $_REQUEST['uname'];
-            $search_url[] = "uname_match=" . $_REQUEST['uname_match'];
+            $search_url[] = "uname=".$_REQUEST['uname'];
+            $search_url[] = "uname_match=".$_REQUEST['uname_match'];
             $searchvars[] = "uname";
         }
         if (isset($_REQUEST['email']) && $_REQUEST['email'] != '') {
@@ -213,16 +213,16 @@ 
                     break;
 
                 case XOOPS_MATCH_END:
-                    $string = "%" . $string;
+                    $string = "%".$string;
                     break;
 
                 case XOOPS_MATCH_CONTAIN:
-                    $string = "%" . $string . "%";
+                    $string = "%".$string."%";
                     break;
             }
             $searchvars[] = "email";
-            $search_url[] = "email=" . $_REQUEST['email'];
-            $search_url[] = "email_match=" . $_REQUEST['email_match'];
+            $search_url[] = "email=".$_REQUEST['email'];
+            $search_url[] = "email_match=".$_REQUEST['email_match'];
             $criteria->add(new Criteria('email', $string, "LIKE"));
             $criteria->add(new Criteria('user_viewemail', 1));
         }
@@ -244,7 +244,7 @@ 
                     case Dtype::TYPE_INTEGER:
                         $value = array_map('intval', $_REQUEST[$fieldname]);
                         $searchvars[] = $fieldname;
-                        $criteria->add(new Criteria($fieldname, "(" . implode(',', $value) . ")", "IN"));
+                        $criteria->add(new Criteria($fieldname, "(".implode(',', $value).")", "IN"));
                         break;
 
                     case Dtype::TYPE_URL:
@@ -252,11 +252,11 @@ 
                     case Dtype::TYPE_TEXT_AREA:
                         $value = array_map(array($xoopsDB, "quoteString"), $_REQUEST[$fieldname]);
                         $searchvars[] = $fieldname;
-                        $criteria->add(new Criteria($fieldname, "(" . implode(',', $value) . ")", "IN"));
+                        $criteria->add(new Criteria($fieldname, "(".implode(',', $value).")", "IN"));
                         break;
                 }
                 foreach ($_REQUEST[$fieldname] as $value) {
-                    $search_url[] = $fieldname . "[]=" . $value;
+                    $search_url[] = $fieldname."[]=".$value;
                 }
             } else {
                 //Other fields (not radio, not select)
@@ -266,25 +266,25 @@ 
                         switch ($fields[$i]->getVar('field_type')) {
                             case "date":
                             case "datetime":
-                                if (isset($_REQUEST[$fieldname . "_larger"])) {
-                                    $value = $_REQUEST[$fieldname . "_larger"];
-                                    if (!($value = strtotime($_REQUEST[$fieldname . "_larger"]))) {
-                                        $value = (int)($_REQUEST[$fieldname . "_larger"]);
+                                if (isset($_REQUEST[$fieldname."_larger"])) {
+                                    $value = $_REQUEST[$fieldname."_larger"];
+                                    if (!($value = strtotime($_REQUEST[$fieldname."_larger"]))) {
+                                        $value = (int)($_REQUEST[$fieldname."_larger"]);
                                     }
                                     if ($value > 0) {
-                                        $search_url[] = $fieldname . "_larger=" . $value;
+                                        $search_url[] = $fieldname."_larger=".$value;
                                         $searchvars[] = $fieldname;
                                         $criteria->add(new Criteria($fieldname, $value, ">="));
                                     }
                                 }
 
-                                if (isset($_REQUEST[$fieldname . "_smaller"])) {
-                                    $value = $_REQUEST[$fieldname . "_smaller"];
-                                    if (!($value = strtotime($_REQUEST[$fieldname . "_smaller"]))) {
-                                        $value = (int)($_REQUEST[$fieldname . "_smaller"]);
+                                if (isset($_REQUEST[$fieldname."_smaller"])) {
+                                    $value = $_REQUEST[$fieldname."_smaller"];
+                                    if (!($value = strtotime($_REQUEST[$fieldname."_smaller"]))) {
+                                        $value = (int)($_REQUEST[$fieldname."_smaller"]);
                                     }
                                     if ($value > 0) {
-                                        $search_url[] = $fieldname . "_smaller=" . $value;
+                                        $search_url[] = $fieldname."_smaller=".$value;
                                         $searchvars[] = $fieldname;
                                         $criteria->add(new Criteria($fieldname, $value + 24 * 3600, "<="));
                                     }
@@ -293,33 +293,33 @@ 
                                 break;
 
                             default:
-                                if (isset($_REQUEST[$fieldname . "_larger"]) && (int)($_REQUEST[$fieldname . "_larger"]) != 0) {
-                                    $value = (int)($_REQUEST[$fieldname . "_larger"]);
-                                    $search_url[] = $fieldname . "_larger=" . $value;
+                                if (isset($_REQUEST[$fieldname."_larger"]) && (int)($_REQUEST[$fieldname."_larger"]) != 0) {
+                                    $value = (int)($_REQUEST[$fieldname."_larger"]);
+                                    $search_url[] = $fieldname."_larger=".$value;
                                     $searchvars[] = $fieldname;
                                     $criteria->add(new Criteria($fieldname, $value, ">="));
                                 }
 
-                                if (isset($_REQUEST[$fieldname . "_smaller"]) && (int)($_REQUEST[$fieldname . "_smaller"]) != 0) {
-                                    $value = (int)($_REQUEST[$fieldname . "_smaller"]);
-                                    $search_url[] = $fieldname . "_smaller=" . $value;
+                                if (isset($_REQUEST[$fieldname."_smaller"]) && (int)($_REQUEST[$fieldname."_smaller"]) != 0) {
+                                    $value = (int)($_REQUEST[$fieldname."_smaller"]);
+                                    $search_url[] = $fieldname."_smaller=".$value;
                                     $searchvars[] = $fieldname;
                                     $criteria->add(new Criteria($fieldname, $value, "<="));
                                 }
                                 break;
                         }
 
-                        if (isset($_REQUEST[$fieldname]) && !isset($_REQUEST[$fieldname . "_smaller"]) && !isset($_REQUEST[$fieldname . "_larger"])) {
+                        if (isset($_REQUEST[$fieldname]) && !isset($_REQUEST[$fieldname."_smaller"]) && !isset($_REQUEST[$fieldname."_larger"])) {
                             if (!is_array($_REQUEST[$fieldname])) {
                                 $value = (int)($_REQUEST[$fieldname]);
-                                $search_url[] = $fieldname . "=" . $value;
+                                $search_url[] = $fieldname."=".$value;
                                 $criteria->add(new Criteria($fieldname, $value, "="));
                             } else {
                                 $value = array_map("intval", $_REQUEST[$fieldname]);
                                 foreach ($value as $thisvalue) {
-                                    $search_url[] = $fieldname . "[]=" . $thisvalue;
+                                    $search_url[] = $fieldname."[]=".$thisvalue;
                                 }
-                                $criteria->add(new Criteria($fieldname, "(" . implode(',', $value) . ")", "IN"));
+                                $criteria->add(new Criteria($fieldname, "(".implode(',', $value).")", "IN"));
                             }
 
                             $searchvars[] = $fieldname;
@@ -330,11 +330,11 @@ 
                         if (isset($_REQUEST[$fieldname]) && $_REQUEST[$fieldname] != "") {
                             $workingArray = Request::getArray($fieldname, []);
                             foreach ($workingArray as $tempValue) {
-                                $inArray[] = "'" . $tempValue . "'";
+                                $inArray[] = "'".$tempValue."'";
                             }
                             $value = implode(',', $inArray);
-                            $search_url[] = $fieldname . "=" . implode(',', $workingArray);
-                            $criteria->add(new Criteria($fieldname, '(' . $value . ')', 'IN'));
+                            $search_url[] = $fieldname."=".implode(',', $workingArray);
+                            $criteria->add(new Criteria($fieldname, '('.$value.')', 'IN'));
                             $searchvars[] = $fieldname;
                         }
                         break;
@@ -344,21 +344,21 @@ 
                     case Dtype::TYPE_TEXT_AREA:
                         if (isset($_REQUEST[$fieldname]) && $_REQUEST[$fieldname] != "") {
                             $value = trim($_REQUEST[$fieldname]);
-                            switch ($_REQUEST[$fieldname . '_match']) {
+                            switch ($_REQUEST[$fieldname.'_match']) {
                                 case XOOPS_MATCH_START:
                                     $value .= "%";
                                     break;
 
                                 case XOOPS_MATCH_END:
-                                    $value = "%" . $value;
+                                    $value = "%".$value;
                                     break;
 
                                 case XOOPS_MATCH_CONTAIN:
-                                    $value = "%" . $value . "%";
+                                    $value = "%".$value."%";
                                     break;
                             }
-                            $search_url[] = $fieldname . "=" . $_REQUEST[$fieldname];
-                            $search_url[] = $fieldname . "_match=" . $_REQUEST[$fieldname . '_match'];
+                            $search_url[] = $fieldname."=".$_REQUEST[$fieldname];
+                            $search_url[] = $fieldname."_match=".$_REQUEST[$fieldname.'_match'];
                             $operator = "LIKE";
                             $criteria->add(new Criteria($fieldname, $value, $operator));
                             $searchvars[] = $fieldname;
@@ -390,7 +390,7 @@ 
         if ($xoops->isAdmin()) {
             $searchgroups = empty($_REQUEST['selgroups']) ? array() : array_map("intval", $_REQUEST['selgroups']);
             foreach ($searchgroups as $group) {
-                $search_url[] = 'selgroups[]=' . $group;
+                $search_url[] = 'selgroups[]='.$group;
             }
         }
 
@@ -405,13 +405,13 @@ 
 
         list($users, $profiles, $total_users) = $profile_handler->search($criteria, $searchvars, $searchgroups);
 
-        $total = sprintf(_PROFILE_MA_FOUNDUSER, "<span class='red'>{$total_users}</span>") . " ";
+        $total = sprintf(_PROFILE_MA_FOUNDUSER, "<span class='red'>{$total_users}</span>")." ";
         $xoops->tpl()->assign('total_users', $total);
 
         //Sort information
         foreach (array_keys($users) as $k) {
             $userarray = array();
-            $userarray["output"][] = "<a href='userinfo.php?uid=" . $users[$k]->getVar('uid') . "' title=''>" . $users[$k]->getVar('uname') . "</a>";
+            $userarray["output"][] = "<a href='userinfo.php?uid=".$users[$k]->getVar('uid')."' title=''>".$users[$k]->getVar('uname')."</a>";
             $userarray["output"][] = ($users[$k]->getVar('user_viewemail') == 1 || $xoops->user->isAdmin())
                     ? $users[$k]->getVar('email') : "";
 
@@ -436,9 +436,9 @@ 
 
         if ($total_users > $limit) {
             $search_url[] = "op=results";
-            $search_url[] = "order=" . $order;
-            $search_url[] = "sortby=" . htmlspecialchars($sortby);
-            $search_url[] = "limit=" . $limit;
+            $search_url[] = "order=".$order;
+            $search_url[] = "sortby=".htmlspecialchars($sortby);
+            $search_url[] = "limit=".$limit;
             if (isset($search_url)) {
                 $args = implode("&amp;", $search_url);
             }
@@ -447,4 +447,4 @@ 
         }
         break;
 }
-include __DIR__ . '/footer.php';
+include __DIR__.'/footer.php';

htdocs/modules/profile/preloads/core.php

Spacing +5 added lines, -5 removed lines

@@ -43,7 +43,7 @@ 
             $op = trim($_GET['op']);
         }
         if ($op !== 'login' && (empty($_GET['from']) || 'profile' !== $_GET['from'])) {
-            \Xoops::simpleRedirect("./modules/profile/user.php" . (empty($_SERVER['QUERY_STRING']) ? "" : "?" . $_SERVER['QUERY_STRING']));
+            \Xoops::simpleRedirect("./modules/profile/user.php".(empty($_SERVER['QUERY_STRING']) ? "" : "?".$_SERVER['QUERY_STRING']));
         }
     }
 
@@ -54,7 +54,7 @@ 
      */
     static public function eventCoreEdituserStart($args)
     {
-        \Xoops::simpleRedirect("./modules/profile/edituser.php" . (empty($_SERVER['QUERY_STRING']) ? "" : "?" . $_SERVER['QUERY_STRING']));
+        \Xoops::simpleRedirect("./modules/profile/edituser.php".(empty($_SERVER['QUERY_STRING']) ? "" : "?".$_SERVER['QUERY_STRING']));
     }
 
     /**
@@ -66,7 +66,7 @@ 
     {
         $email = isset($_GET['email']) ? trim($_GET['email']) : '';
         $email = isset($_POST['email']) ? trim($_POST['email']) : $email;
-        \Xoops::simpleRedirect("./modules/profile/lostpass.php?email={$email}" . (empty($_GET['code']) ? "" : "&" . $_GET['code']));
+        \Xoops::simpleRedirect("./modules/profile/lostpass.php?email={$email}".(empty($_GET['code']) ? "" : "&".$_GET['code']));
     }
 
     /**
@@ -76,7 +76,7 @@ 
      */
     static function eventCoreRegisterStart($args)
     {
-        \Xoops::simpleRedirect("./modules/profile/register.php" . (empty($_SERVER['QUERY_STRING']) ? "" : "?" . $_SERVER['QUERY_STRING']) );
+        \Xoops::simpleRedirect("./modules/profile/register.php".(empty($_SERVER['QUERY_STRING']) ? "" : "?".$_SERVER['QUERY_STRING']));
     }
 
     /**
@@ -86,6 +86,6 @@ 
      */
     static function eventCoreUserinfoStart($args)
     {
-        \Xoops::simpleRedirect("./modules/profile/userinfo.php" . (empty($_SERVER['QUERY_STRING']) ? "" : "?" . $_SERVER['QUERY_STRING']) );
+        \Xoops::simpleRedirect("./modules/profile/userinfo.php".(empty($_SERVER['QUERY_STRING']) ? "" : "?".$_SERVER['QUERY_STRING']));
     }
 }

htdocs/modules/profile/activate.php

Spacing +10 added lines, -10 removed lines

@@ -22,7 +22,7 @@ 
  * @author          Taiwen Jiang <phppp@users.sourceforge.net>
  */
 
-include __DIR__ . '/header.php';
+include __DIR__.'/header.php';
 $xoops = Xoops::getInstance();
 
 $xoops->header();
@@ -43,7 +43,7 @@ 
     } else {
         if ($thisuser->getVar('level') > 0) {
             $xoops->redirect(
-                $xoops->url('modules/' . $xoops->module->getVar('dirname', 'n'). '/index.php'),
+                $xoops->url('modules/'.$xoops->module->getVar('dirname', 'n').'/index.php'),
                 5,
                 XoopsLocale::E_SELECTED_ACCOUNT_IS_ALREADY_ACTIVATED,
                 false
@@ -58,7 +58,7 @@ 
                     $xoopsMailer->setTemplate('activated.tpl');
                     $xoopsMailer->assign('SITENAME', $xoops->getConfig('sitename'));
                     $xoopsMailer->assign('ADMINMAIL', $xoops->getConfig('adminmail'));
-                    $xoopsMailer->assign('SITEURL', \XoopsBaseConfig::get('url') . "/");
+                    $xoopsMailer->assign('SITEURL', \XoopsBaseConfig::get('url')."/");
                     $xoopsMailer->setToUsers($thisuser);
                     $xoopsMailer->setFromEmail($xoops->getConfig('adminmail'));
                     $xoopsMailer->setFromName($xoops->getConfig('sitename'));
@@ -69,12 +69,12 @@ 
                     } else {
                         printf(XoopsLocale::SF_NOTIFICATION_EMAIL_SENT_TO, $thisuser->getVar('uname'));
                     }
-                    include __DIR__ . '/footer.php';
+                    include __DIR__.'/footer.php';
                 } else {
                     $xoops->redirect(
-                        $xoops->url('modules/' . $xoops->module->getVar('dirname', 'n') . '/user.php'),
+                        $xoops->url('modules/'.$xoops->module->getVar('dirname', 'n').'/user.php'),
                         5,
-                        XoopsLocale::S_YOUR_ACCOUNT_ACTIVATED . ' ' . XoopsLocale::LOGIN_WITH_REGISTERED_PASSWORD,
+                        XoopsLocale::S_YOUR_ACCOUNT_ACTIVATED.' '.XoopsLocale::LOGIN_WITH_REGISTERED_PASSWORD,
                         false
                     );
                 }
@@ -101,15 +101,15 @@ 
     $xoopsMailer->setTemplate('register.tpl');
     $xoopsMailer->assign('SITENAME', $xoops->getConfig('sitename'));
     $xoopsMailer->assign('ADMINMAIL', $xoops->getConfig('adminmail'));
-    $xoopsMailer->assign('SITEURL', \XoopsBaseConfig::get('url') . "/");
+    $xoopsMailer->assign('SITEURL', \XoopsBaseConfig::get('url')."/");
     $xoopsMailer->setToUsers($getuser[0]);
     $xoopsMailer->setFromEmail($xoops->getConfig('adminmail'));
     $xoopsMailer->setFromName($xoops->getConfig('sitename'));
     $xoopsMailer->setSubject(sprintf(XoopsLocale::F_USER_ACTIVATION_KEY_FOR, $getuser->getVar('uname')));
     if (!$xoopsMailer->send()) {
-        echo XoopsLocale::S_YOU_ARE_NOW_REGISTERED . ' ' . XoopsLocale::EMAIL_HAS_NOT_BEEN_SENT_WITH_ACTIVATION_KEY;
+        echo XoopsLocale::S_YOU_ARE_NOW_REGISTERED.' '.XoopsLocale::EMAIL_HAS_NOT_BEEN_SENT_WITH_ACTIVATION_KEY;
     } else {
-        echo XoopsLocale::S_YOU_ARE_NOW_REGISTERED . ' ' . XoopsLocale::EMAIL_HAS_BEEN_SENT_WITH_ACTIVATION_KEY;
+        echo XoopsLocale::S_YOU_ARE_NOW_REGISTERED.' '.XoopsLocale::EMAIL_HAS_BEEN_SENT_WITH_ACTIVATION_KEY;
     }
 } else {
     $form = new Xoops\Form\ThemeForm('', 'form', 'activate.php');
@@ -120,4 +120,4 @@ 
 
 $xoops->registry()->get('profile_breadcrumbs')->addItem(new Link(['caption' => _PROFILE_MA_REGISTER]));
 
-include __DIR__ . '/footer.php';
+include __DIR__.'/footer.php';

htdocs/modules/profile/include/update.php

Spacing +13 added lines, -13 removed lines

@@ -30,23 +30,23 @@ 
     $xoops = Xoops::getInstance();
 
     if ($oldversion < 162) {
-        $xoopsDB->queryF("UPDATE `" . $xoopsDB->prefix("profile_field") . " SET field_valuetype=2 WHERE field_name=umode");
+        $xoopsDB->queryF("UPDATE `".$xoopsDB->prefix("profile_field")." SET field_valuetype=2 WHERE field_name=umode");
     }
 
     if ($oldversion < 100) {
 
         // Drop old category table
-        $sql = "DROP TABLE " . $xoopsDB->prefix("profile_category");
+        $sql = "DROP TABLE ".$xoopsDB->prefix("profile_category");
         $xoopsDB->queryF($sql);
 
         // Drop old field-category link table
-        $sql = "DROP TABLE " . $xoopsDB->prefix("profile_fieldcategory");
+        $sql = "DROP TABLE ".$xoopsDB->prefix("profile_fieldcategory");
         $xoopsDB->queryF($sql);
 
         // Create new tables for new profile module
-        $xoopsDB->queryFromFile(\XoopsBaseConfig::get('root-path') . "/modules/" . $module->getVar('dirname', 'n') . "/sql/mysql.sql");
+        $xoopsDB->queryFromFile(\XoopsBaseConfig::get('root-path')."/modules/".$module->getVar('dirname', 'n')."/sql/mysql.sql");
 
-        include_once __DIR__ . "/install.php";
+        include_once __DIR__."/install.php";
         xoops_module_install_profile($module);
         $goupperm_handler = $xoops->getHandlerGroupPermission();
 
@@ -55,7 +55,7 @@ 
         $skip_fields = $field_handler->getUserVars();
         $skip_fields[] = 'newemail';
         $skip_fields[] = 'pm_link';
-        $sql = "SELECT * FROM `" . $xoopsDB->prefix("user_profile_field") . "` WHERE `field_name` NOT IN ('" . implode("', '", $skip_fields) . "')";
+        $sql = "SELECT * FROM `".$xoopsDB->prefix("user_profile_field")."` WHERE `field_name` NOT IN ('".implode("', '", $skip_fields)."')";
         $result = $xoopsDB->query($sql);
         $fields = array();
         while (false !== ($myrow = $xoopsDB->fetchArray($result))) {
@@ -72,14 +72,14 @@ 
             $field_handler->insert($object, true);
 
             $gperm_itemid = $object->getVar('field_id');
-            $sql = "UPDATE " . $xoopsDB->prefix("system_permission") . " SET gperm_itemid = " . $gperm_itemid . "   WHERE gperm_itemid = " . $myrow['fieldid'] . "       AND gperm_modid = " . $module->getVar('mid') . "       AND gperm_name IN ('profile_edit', 'profile_search')";
+            $sql = "UPDATE ".$xoopsDB->prefix("system_permission")." SET gperm_itemid = ".$gperm_itemid."   WHERE gperm_itemid = ".$myrow['fieldid']."       AND gperm_modid = ".$module->getVar('mid')."       AND gperm_name IN ('profile_edit', 'profile_search')";
             $xoopsDB->queryF($sql);
 
             $groups_visible = $goupperm_handler->getGroupIds("profile_visible", $myrow['fieldid'], $module->getVar('mid'));
             $groups_show = $goupperm_handler->getGroupIds("profile_show", $myrow['fieldid'], $module->getVar('mid'));
             foreach ($groups_visible as $ugid) {
                 foreach ($groups_show as $pgid) {
-                    $sql = "INSERT INTO " . $xoopsDB->prefix("profile_visibility") . " (field_id, user_group, profile_group) " . " VALUES " . " ({$gperm_itemid}, {$ugid}, {$pgid})";
+                    $sql = "INSERT INTO ".$xoopsDB->prefix("profile_visibility")." (field_id, user_group, profile_group) "." VALUES "." ({$gperm_itemid}, {$ugid}, {$pgid})";
                     $xoopsDB->queryF($sql);
                 }
             }
@@ -90,19 +90,19 @@ 
 
         // Copy data from profile table
         foreach ($fields as $field) {
-            $xoopsDB->queryF("UPDATE `" . $xoopsDB->prefix("profile_profile") . "` u, `" . $xoopsDB->prefix("user_profile") . "` p SET u.{$field} = p.{$field} WHERE u.profile_id=p.profileid");
+            $xoopsDB->queryF("UPDATE `".$xoopsDB->prefix("profile_profile")."` u, `".$xoopsDB->prefix("user_profile")."` p SET u.{$field} = p.{$field} WHERE u.profile_id=p.profileid");
         }
 
         // Drop old profile table
-        $sql = "DROP TABLE " . $xoopsDB->prefix("user_profile");
+        $sql = "DROP TABLE ".$xoopsDB->prefix("user_profile");
         $xoopsDB->queryF($sql);
 
         // Drop old field module
-        $sql = "DROP TABLE " . $xoopsDB->prefix("user_profile_field");
+        $sql = "DROP TABLE ".$xoopsDB->prefix("user_profile_field");
         $xoopsDB->queryF($sql);
 
         // Remove not used items
-        $sql = "DELETE FROM " . $xoopsDB->prefix("system_permission") . "   WHERE `gperm_modid` = " . $module->getVar('mid') . " AND `gperm_name` IN ('profile_show', 'profile_visible')";
+        $sql = "DELETE FROM ".$xoopsDB->prefix("system_permission")."   WHERE `gperm_modid` = ".$module->getVar('mid')." AND `gperm_name` IN ('profile_show', 'profile_visible')";
         $xoopsDB->queryF($sql);
     }
 
@@ -110,7 +110,7 @@ 
     $profile_handler->cleanOrphan($xoopsDB->prefix("system_user"), "uid", "profile_id");
     $field_handler = $xoops->getModuleHandler('field', $module->getVar('dirname', 'n'));
     $user_fields = $field_handler->getUserVars();
-    $criteria = new Criteria("field_name", "('" . implode("', '", $user_fields) . "')", "IN");
+    $criteria = new Criteria("field_name", "('".implode("', '", $user_fields)."')", "IN");
     $field_handler->updateAll("field_config", 0, $criteria);
 
     return true;

htdocs/modules/profile/include/forms.php

Spacing +4 added lines, -4 removed lines

@@ -97,7 +97,7 @@ 
     $myts = \Xoops\Core\Text\Sanitizer::getInstance();
     if ($step_no == 1 && $xoops->getConfig('reg_dispdsclmr') != 0 && $xoops->getConfig('reg_disclaimer') != '') {
         $disc_tray = new Xoops\Form\ElementTray(XoopsLocale::DISCLAIMER, '<br />');
-        $disc_text = new Xoops\Form\Label("", "<div class=\"pad5\">" . $myts->displayTarea($xoops->getConfig('reg_disclaimer'), 1) . "</div>");
+        $disc_text = new Xoops\Form\Label("", "<div class=\"pad5\">".$myts->displayTarea($xoops->getConfig('reg_disclaimer'), 1)."</div>");
         $disc_tray->addElement($disc_text);
         $agree_chk = new Xoops\Form\Checkbox('', 'agree_disc');
         $agree_chk->addOption(1, XoopsLocale::I_AGREE_TO_THE_ABOVE);
@@ -169,7 +169,7 @@ 
         //If the user is an admin and is editing someone else
         $pwd_text = new Xoops\Form\Password('', 'password');
         $pwd_text2 = new Xoops\Form\Password('', 'vpass');
-        $pwd_tray = new Xoops\Form\ElementTray(XoopsLocale::PASSWORD . '<br />' . XoopsLocale::TYPE_NEW_PASSWORD_TWICE_TO_CHANGE_IT);
+        $pwd_tray = new Xoops\Form\ElementTray(XoopsLocale::PASSWORD.'<br />'.XoopsLocale::TYPE_NEW_PASSWORD_TWICE_TO_CHANGE_IT);
         $pwd_tray->addElement($pwd_text);
         $pwd_tray->addElement($pwd_text2);
         $elements[0][] = array('element' => $pwd_tray, 'required' => 0); //cannot set an element tray required
@@ -238,8 +238,8 @@ 
         $title = isset($categories[$k]) ? $categories[$k]['cat_title'] : _PROFILE_MA_DEFAULT;
         $desc = isset($categories[$k]) ? $categories[$k]['cat_description'] : "";
         //$form->addElement(new Xoops\Form\Label("<div class='break'>{$title}</div>", $desc), false);
-        $desc = ($desc != '' ? ' - ' . $desc : '');
-        $form->insertBreak($title . $desc);
+        $desc = ($desc != '' ? ' - '.$desc : '');
+        $form->insertBreak($title.$desc);
         foreach (array_keys($elements[$k]) as $i) {
             $form->addElement($elements[$k][$i]['element'], $elements[$k][$i]['required']);
         }

htdocs/modules/profile/include/install.php

Spacing +15 added lines, -15 removed lines

@@ -78,9 +78,9 @@ 
     global $xoopsDB;
     $module_id = $xoops->registry()->get('profile_id');
 
-    $xoopsDB->queryF("INSERT INTO " . $xoopsDB->prefix("profile_profile") . " (profile_id) " . " SELECT uid " . " FROM " . $xoopsDB->prefix("system_user"));
+    $xoopsDB->queryF("INSERT INTO ".$xoopsDB->prefix("profile_profile")." (profile_id) "." SELECT uid "." FROM ".$xoopsDB->prefix("system_user"));
 
-    $sql = "INSERT INTO " . $xoopsDB->prefix("system_permission") . " (gperm_groupid, gperm_itemid, gperm_modid, gperm_name) " . " VALUES " . " (" . FixedGroups::ADMIN . ", " . FixedGroups::ADMIN . ", {$module_id}, 'profile_access'), " . " (" . FixedGroups::ADMIN . ", " . FixedGroups::USERS . ", {$module_id}, 'profile_access'), " . " (" . FixedGroups::USERS . ", " . FixedGroups::USERS . ", {$module_id}, 'profile_access'), " . " (" . FixedGroups::ANONYMOUS . ", " . FixedGroups::USERS . ", {$module_id}, 'profile_access') " . " ";
+    $sql = "INSERT INTO ".$xoopsDB->prefix("system_permission")." (gperm_groupid, gperm_itemid, gperm_modid, gperm_name) "." VALUES "." (".FixedGroups::ADMIN.", ".FixedGroups::ADMIN.", {$module_id}, 'profile_access'), "." (".FixedGroups::ADMIN.", ".FixedGroups::USERS.", {$module_id}, 'profile_access'), "." (".FixedGroups::USERS.", ".FixedGroups::USERS.", {$module_id}, 'profile_access'), "." (".FixedGroups::ANONYMOUS.", ".FixedGroups::USERS.", {$module_id}, 'profile_access') "." ";
     $xoopsDB->queryF($sql);
 
 }
@@ -171,22 +171,22 @@ 
     global $xoopsDB;
     $gperm_itemid = $field_id;
     $gperm_modid = $module_id;
-    $sql = "INSERT INTO " . $xoopsDB->prefix("system_permission") . " (gperm_groupid, gperm_itemid, gperm_modid, gperm_name) " . " VALUES " . ($canedit
-            ? " (" . FixedGroups::ADMIN . ", {$gperm_itemid}, {$gperm_modid}, 'profile_edit'), " : "") . ($canedit == 1
-            ? " (" . FixedGroups::USERS . ", {$gperm_itemid}, {$gperm_modid}, 'profile_edit'), "
-            : "") . " (" . FixedGroups::ADMIN . ", {$gperm_itemid}, {$gperm_modid}, 'profile_search'), " . " (" . FixedGroups::USERS . ", {$gperm_itemid}, {$gperm_modid}, 'profile_search') " . " ";
+    $sql = "INSERT INTO ".$xoopsDB->prefix("system_permission")." (gperm_groupid, gperm_itemid, gperm_modid, gperm_name) "." VALUES ".($canedit
+            ? " (".FixedGroups::ADMIN.", {$gperm_itemid}, {$gperm_modid}, 'profile_edit'), " : "").($canedit == 1
+            ? " (".FixedGroups::USERS.", {$gperm_itemid}, {$gperm_modid}, 'profile_edit'), "
+            : "")." (".FixedGroups::ADMIN.", {$gperm_itemid}, {$gperm_modid}, 'profile_search'), "." (".FixedGroups::USERS.", {$gperm_itemid}, {$gperm_modid}, 'profile_search') "." ";
     $xoopsDB->queryF($sql);
 
     if ($visible) {
-        $sql = "INSERT INTO " . $xoopsDB->prefix("profile_visibility")
+        $sql = "INSERT INTO ".$xoopsDB->prefix("profile_visibility")
             . " (field_id, user_group, profile_group) "
             . " VALUES "
-            . " ({$gperm_itemid}, " . FixedGroups::ADMIN . ", " . FixedGroups::ADMIN . "), "
-            . " ({$gperm_itemid}, " . FixedGroups::ADMIN . ", " . FixedGroups::USERS . "), "
-            . " ({$gperm_itemid}, " . FixedGroups::USERS . ", " . FixedGroups::ADMIN . "), "
-            . " ({$gperm_itemid}, " . FixedGroups::USERS . ", " . FixedGroups::USERS . "), "
-            . " ({$gperm_itemid}, " . FixedGroups::ANONYMOUS . ", " . FixedGroups::ADMIN . "), "
-            . " ({$gperm_itemid}, " . FixedGroups::ANONYMOUS . ", " . FixedGroups::USERS . ")" . " ";
+            . " ({$gperm_itemid}, ".FixedGroups::ADMIN.", ".FixedGroups::ADMIN."), "
+            . " ({$gperm_itemid}, ".FixedGroups::ADMIN.", ".FixedGroups::USERS."), "
+            . " ({$gperm_itemid}, ".FixedGroups::USERS.", ".FixedGroups::ADMIN."), "
+            . " ({$gperm_itemid}, ".FixedGroups::USERS.", ".FixedGroups::USERS."), "
+            . " ({$gperm_itemid}, ".FixedGroups::ANONYMOUS.", ".FixedGroups::ADMIN."), "
+            . " ({$gperm_itemid}, ".FixedGroups::ANONYMOUS.", ".FixedGroups::USERS.")"." ";
         $xoopsDB->queryF($sql);
     }
 }
@@ -199,7 +199,7 @@ 
     $xoops = Xoops::getInstance();
     $xoops->db();
     global $xoopsDB;
-    $xoopsDB->query("INSERT INTO " . $xoopsDB->prefix("profile_category") . " VALUES (0, " . $xoopsDB->quote($name) . ", '', {$weight})");
+    $xoopsDB->query("INSERT INTO ".$xoopsDB->prefix("profile_category")." VALUES (0, ".$xoopsDB->quote($name).", '', {$weight})");
 }
 
 /**
@@ -212,5 +212,5 @@ 
     $xoops = Xoops::getInstance();
     $xoops->db();
     global $xoopsDB;
-    $xoopsDB->query("INSERT INTO " . $xoopsDB->prefix("profile_regstep") . " VALUES (0, " . $xoopsDB->quote($name) . ", " . $xoopsDB->quote($desc) . ", {$order}, {$save})");
+    $xoopsDB->query("INSERT INTO ".$xoopsDB->prefix("profile_regstep")." VALUES (0, ".$xoopsDB->quote($name).", ".$xoopsDB->quote($desc).", {$order}, {$save})");
 }

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

Spacing +1 added lines, -1 removed lines

@@ -54,4 +54,4 @@
 define("_PROFILE_MI_ABOUT", "About");
 define("_PROFILE_MI_HOME", "Home");
 
-define("_PROFILE_MA_THEME","Theme");
+define("_PROFILE_MA_THEME", "Theme");