XOOPS / XoopsCore

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

Spacing +9 added lines, -9 removed lines

@@ -49,10 +49,10 @@ 
 define("_PROFILE_AM_PROF_SEARCH", "Searchable by these groups");
 define("_PROFILE_AM_PROF_ACCESS", "Profile accessible by these groups");
 define("_PROFILE_AM_PROF_ACCESS_DESC",
-        "<ul>" .
-        "<li>Admin groups: If a user belongs to admin groups, the current user has access if and only if one of the current user's groups is allowed to access admin group; else</li>" .
-        "<li>Non basic groups: If a user belongs to one or more non basic groups (NOT admin, user, anonymous), the current user has access if and only if one of the current user's groups is allowed to allowed to any of the non basic groups; else</li>" .
-        "<li>User group: If a user belongs to User group only, the current user has access if and only if one of his groups is allowed to access User group</li>" .
+        "<ul>".
+        "<li>Admin groups: If a user belongs to admin groups, the current user has access if and only if one of the current user's groups is allowed to access admin group; else</li>".
+        "<li>Non basic groups: If a user belongs to one or more non basic groups (NOT admin, user, anonymous), the current user has access if and only if one of the current user's groups is allowed to allowed to any of the non basic groups; else</li>".
+        "<li>User group: If a user belongs to User group only, the current user has access if and only if one of his groups is allowed to access User group</li>".
         "</ul>");
 
 define("_PROFILE_AM_FIELDVISIBLE", "The field ");
@@ -86,10 +86,10 @@ 
 // User management
 define("_PROFILE_AM_EDITUSER", "Edit User");
 define("_PROFILE_AM_SELECTUSER", "Select User");
-define("_PROFILE_AM_ADDUSER","Add User");
-define("_PROFILE_AM_THEME","Theme");
-define("_PROFILE_AM_RANK","Rank");
-define("_PROFILE_AM_USERDONEXIT","User doesn't exist!");
+define("_PROFILE_AM_ADDUSER", "Add User");
+define("_PROFILE_AM_THEME", "Theme");
+define("_PROFILE_AM_RANK", "Rank");
+define("_PROFILE_AM_USERDONEXIT", "User doesn't exist!");
 define("_PROFILE_MA_USERLEVEL", "User Level");
 
 define("_PROFILE_MA_ACTIVE", "Active");
@@ -118,4 +118,4 @@ 
 define("_PROFILE_AM_CATEGORY_LIST", "List of categories");
 define("_PROFILE_AM_STEP_LIST", "List of registration step");
 define("_PROFILE_AM_FIELD_LIST", "List of fields");
-define("_PROFILE_AM_ERROR_WEIGHT","You need a positive integer");
+define("_PROFILE_AM_ERROR_WEIGHT", "You need a positive integer");

htdocs/modules/profile/lostpass.php

Spacing +6 added lines, -6 removed lines

@@ -20,7 +20,7 @@ 
  * @author          Taiwen Jiang <phppp@users.sourceforge.net>
  */
 
-include __DIR__ . '/header.php';
+include __DIR__.'/header.php';
 $xoops = Xoops::getInstance();
 $email = isset($_GET['email']) ? trim($_GET['email']) : '';
 $email = isset($_POST['email']) ? trim($_POST['email']) : $email;
@@ -47,7 +47,7 @@ 
         $xoopsMailer->setTemplate("lostpass2.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("IP", $_SERVER['REMOTE_ADDR']);
         $xoopsMailer->assign("NEWPWD", $newpass);
         $xoopsMailer->setToUsers($user);
@@ -64,7 +64,7 @@ 
         if (!$xoopsDB->queryF($sql)) {
             $xoops->header();
             echo XoopsLocale::E_USER_NOT_UPDATED;
-            include __DIR__ . '/footer.php';
+            include __DIR__.'/footer.php';
         }
         $xoops->redirect("user.php", 3, sprintf(XoopsLocale::SF_PASSWORD_SENT_TO, $user->getVar("uname")), false);
         // If no Code, send it
@@ -74,9 +74,9 @@ 
         $xoopsMailer->setTemplate("lostpass1.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("IP", $_SERVER['REMOTE_ADDR']);
-        $xoopsMailer->assign("NEWPWD_LINK", \XoopsBaseConfig::get('url') . "/modules/profile/lostpass.php?email={$email}&code=" . $areyou);
+        $xoopsMailer->assign("NEWPWD_LINK", \XoopsBaseConfig::get('url')."/modules/profile/lostpass.php?email={$email}&code=".$areyou);
         $xoopsMailer->setToUsers($user);
         $xoopsMailer->setFromEmail($xoops->getConfig('adminmail'));
         $xoopsMailer->setFromName($xoops->getConfig('sitename'));
@@ -88,6 +88,6 @@ 
         echo "<h4>";
         printf(XoopsLocale::F_CONFIRMATION_EMAIL_SENT, $user->getVar('uname'));
         echo "</h4>";
-        include __DIR__ . '/footer.php';
+        include __DIR__.'/footer.php';
     }
 }

htdocs/modules/profile/user.php

Spacing +13 added lines, -13 removed lines

@@ -22,7 +22,7 @@ 
  * @author          Taiwen Jiang <phppp@users.sourceforge.net>
  */
 
-include __DIR__ . '/header.php';
+include __DIR__.'/header.php';
 
 $xoops = Xoops::getInstance();
 $op = 'main';
@@ -52,7 +52,7 @@ 
         $xoops->tpl()->assign('lang_youremail', XoopsLocale::C_YOUR_EMAIL);
         $xoops->tpl()->assign('lang_sendpassword', XoopsLocale::SEND_PASSWORD);
         $xoops->tpl()->assign('mailpasswd_token', $xoops->security()->createToken());
-        include __DIR__ . '/footer.php';
+        include __DIR__.'/footer.php';
     }
     if (!empty($_GET['xoops_redirect'])) {
         $redirect = trim($_GET['xoops_redirect']);
@@ -64,11 +64,11 @@ 
             }
         }
         if (!$isExternal) {
-            header('Location: ' . $redirect);
+            header('Location: '.$redirect);
             exit();
         }
     }
-    header('Location: ./userinfo.php?uid=' . $xoops->user->getVar('uid'));
+    header('Location: ./userinfo.php?uid='.$xoops->user->getVar('uid'));
     exit();
 }
 
@@ -85,8 +85,8 @@ 
     if ($xoops->isUser()) {
         $xoops->getHandlerOnline()->destroy($xoops->user->getVar('uid'));
     }
-    $message = XoopsLocale::S_YOU_ARE_NOW_LOGGED_OUT . '<br />' . XoopsLocale::S_THANK_YOU_FOR_VISITING_OUR_SITE;
-    $xoops->redirect(\XoopsBaseConfig::get('url') . '/', 1, $message);
+    $message = XoopsLocale::S_YOU_ARE_NOW_LOGGED_OUT.'<br />'.XoopsLocale::S_THANK_YOU_FOR_VISITING_OUR_SITE;
+    $xoops->redirect(\XoopsBaseConfig::get('url').'/', 1, $message);
 }
 
 if ($op === 'actv') {
@@ -98,18 +98,18 @@ 
 if ($op === 'delete') {
     $xoops->getConfigs();
     if (!$xoops->isUser() || $xoops->getConfig('self_delete') != 1) {
-        $xoops->redirect(\XoopsBaseConfig::get('url') . '/', 5, XoopsLocale::E_NO_ACTION_PERMISSION);
+        $xoops->redirect(\XoopsBaseConfig::get('url').'/', 5, XoopsLocale::E_NO_ACTION_PERMISSION);
     } else {
         $groups = $xoops->user->getGroups();
         if (in_array(FixedGroups::ADMIN, $groups)) {
             // users in the webmasters group may not be deleted
-            $xoops->redirect(\XoopsBaseConfig::get('url') . '/', 5, XoopsLocale::E_USER_IN_WEBMASTER_GROUP_CANNOT_BE_REMOVED);
+            $xoops->redirect(\XoopsBaseConfig::get('url').'/', 5, XoopsLocale::E_USER_IN_WEBMASTER_GROUP_CANNOT_BE_REMOVED);
         }
         $ok = !isset($_POST['ok']) ? 0 : (int)($_POST['ok']);
         if ($ok != 1) {
-            include __DIR__ . '/header.php';
-            echo $xoops->confirm(array('op' => 'delete', 'ok' => 1), 'user.php', XoopsLocale::Q_ARE_YOU_SURE_TO_DELETE_ACCOUNT . '<br/>' . XoopsLocale::THIS_WILL_REMOVE_ALL_YOUR_INFO);
-            include __DIR__ . '/footer.php';
+            include __DIR__.'/header.php';
+            echo $xoops->confirm(array('op' => 'delete', 'ok' => 1), 'user.php', XoopsLocale::Q_ARE_YOU_SURE_TO_DELETE_ACCOUNT.'<br/>'.XoopsLocale::THIS_WILL_REMOVE_ALL_YOUR_INFO);
+            include __DIR__.'/footer.php';
         } else {
             $del_uid = $xoops->user->getVar("uid");
             if (false != $xoops->getHandlerMember()->deleteUser($xoops->user)) {
@@ -118,9 +118,9 @@ 
                 if ($xoops->isActiveModule('notifications')) {
                     Notifications::getInstance()->getHandlerNotification()->unsubscribeByUser($del_uid);
                 }
-                $xoops->redirect(\XoopsBaseConfig::get('url') . '/', 5, XoopsLocale::S_YOUR_ACCOUNT_DELETED);
+                $xoops->redirect(\XoopsBaseConfig::get('url').'/', 5, XoopsLocale::S_YOUR_ACCOUNT_DELETED);
             }
-            $xoops->redirect(\XoopsBaseConfig::get('url') . '/', 5, XoopsLocale::E_NO_ACTION_PERMISSION);
+            $xoops->redirect(\XoopsBaseConfig::get('url').'/', 5, XoopsLocale::E_NO_ACTION_PERMISSION);
         }
     }
 }

htdocs/modules/profile/changepass.php

Spacing +4 added lines, -4 removed lines

@@ -22,7 +22,7 @@ 
  * @author          Taiwen Jiang <phppp@users.sourceforge.net>
  */
 
-include __DIR__ . '/header.php';
+include __DIR__.'/header.php';
 $xoops = Xoops::getInstance();
 
 if (!$xoops->isUser()) {
@@ -31,7 +31,7 @@ 
 
 // see https://github.com/dropbox/zxcvbn
 $zxcvbn_path = $xoops->url('modules/profile/assets/js/zxcvbn.js');
-$zxcvbn =<<<EOT
+$zxcvbn = <<<EOT
 (function(){
     var a;
     a=function(){
@@ -128,11 +128,11 @@ 
         }
     }
     $xoops->redirect(
-        \XoopsBaseConfig::get('url') . '/modules/' . $xoops->module->getVar('dirname', 'n') . '/userinfo.php?uid='
+        \XoopsBaseConfig::get('url').'/modules/'.$xoops->module->getVar('dirname', 'n').'/userinfo.php?uid='
         . $xoops->user->getVar('uid'),
         2,
         $msg
     );
 }
 
-include __DIR__ . '/footer.php';
+include __DIR__.'/footer.php';

htdocs/modules/profile/changemail.php

Spacing +5 added lines, -5 removed lines

@@ -21,13 +21,13 @@ 
  * @author          Taiwen Jiang <phppp@users.sourceforge.net>
  */
 
-include __DIR__ . '/header.php';
+include __DIR__.'/header.php';
 
 $xoops = Xoops::getInstance();
 $xoops->getConfigs();
 
 if (!$xoops->user || $xoops->getConfig('allow_chgmail') != 1) {
-    $xoops->redirect(\XoopsBaseConfig::get('url') . "/modules/" . $xoops->module->getVar('dirname', 'n') . "/", 2, XoopsLocale::E_NO_ACCESS_PERMISSION);
+    $xoops->redirect(\XoopsBaseConfig::get('url')."/modules/".$xoops->module->getVar('dirname', 'n')."/", 2, XoopsLocale::E_NO_ACCESS_PERMISSION);
 }
 
 $xoops->header('module:profile/profile_email.tpl');
@@ -67,7 +67,7 @@ 
             $xoopsMailer->setTemplate('emailchanged.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("NEWEMAIL", $email);
             $xoopsMailer->setToEmails($email);
             $xoopsMailer->setFromEmail($xoops->getConfig('adminmail'));
@@ -79,9 +79,9 @@ 
             $msg = implode('<br />', $xoops->user->getErrors());
         }
     }
-    $xoops->redirect(\XoopsBaseConfig::get('url') . '/modules/' . $xoops->module->getVar('dirname', 'n') . '/userinfo.php?uid=' . $xoops->user->getVar('uid'), 2, $msg);
+    $xoops->redirect(\XoopsBaseConfig::get('url').'/modules/'.$xoops->module->getVar('dirname', 'n').'/userinfo.php?uid='.$xoops->user->getVar('uid'), 2, $msg);
 }
 
 $xoops->registry()->get('profile_breadcrumbs')->addItem(new Link(['caption' => _PROFILE_MA_CHANGEMAIL]));
 
-include __DIR__ . '/footer.php';
+include __DIR__.'/footer.php';

htdocs/modules/profile/class/plugin/usermenu.php

Spacing +1 added lines, -1 removed lines

@@ -26,7 +26,7 @@
         // View Account
         $ret[] = [
             'name' => XoopsLocale::VIEW_ACCOUNT,
-            'link' => $helper->url('userinfo.php?uid=' . $helper->xoops()->user->getVar('uid')),
+            'link' => $helper->url('userinfo.php?uid='.$helper->xoops()->user->getVar('uid')),
             'icon' => 'glyphicon-user',
         ];
 

htdocs/modules/profile/class/plugin/menus.php

Spacing +1 added lines, -1 removed lines

@@ -39,7 +39,7 @@
         if (\Xoops::getInstance()->isUser()) {
             $ret[] = array('name' => _PROFILE_MI_EDITACCOUNT, 'url' => "edituser.php");
             $ret[] = array('name' => _PROFILE_MI_PAGE_SEARCH, 'url' => "search.php");
-            $ret[] = array('name' => _PROFILE_MI_CHANGEPASS,  'url' => "changepass.php");
+            $ret[] = array('name' => _PROFILE_MI_CHANGEPASS, 'url' => "changepass.php");
         }
         return $ret;
     }

htdocs/modules/profile/class/profile.php

Spacing +4 added lines, -4 removed lines

@@ -227,9 +227,9 @@ 
             $field->setVar('field_options', array());
         }
         if ($this->insertField($field)) {
-            $msg = '&nbsp;&nbsp;Field <strong>' . $vars['name'] . '</strong> added to the database';
+            $msg = '&nbsp;&nbsp;Field <strong>'.$vars['name'].'</strong> added to the database';
         } else {
-            $msg = '&nbsp;&nbsp;<span class="red">ERROR: Could not insert field <strong>' . $vars['name'] . '</strong> into the database. ' . implode(' ', $field->getErrors()) . $this->db2->errorInfo() . '</span>';
+            $msg = '&nbsp;&nbsp;<span class="red">ERROR: Could not insert field <strong>'.$vars['name'].'</strong> into the database. '.implode(' ', $field->getErrors()).$this->db2->errorInfo().'</span>';
         }
         unset($field);
         return $msg;
@@ -283,10 +283,10 @@ 
         $searchvars_profile = array_diff($searchvars, $uservars);
         $sv = array('u.uid, u.uname, u.email, u.user_viewemail');
         if (!empty($searchvars_user)) {
-            $sv[0] .= ",u." . implode(", u.", $searchvars_user);
+            $sv[0] .= ",u.".implode(", u.", $searchvars_user);
         }
         if (!empty($searchvars_profile)) {
-            $sv[] = "p." . implode(", p.", $searchvars_profile);
+            $sv[] = "p.".implode(", p.", $searchvars_profile);
         }
 
         $qb = $xoops->db()->createXoopsQueryBuilder();

htdocs/modules/profile/class/form/field.php

Spacing +1 added lines, -1 removed lines

@@ -124,7 +124,7 @@
                     $this->addElement($remove_options);
                 }
 
-                $option_text = "<table  cellspacing='1'><tr><td class='width20'>" . _PROFILE_AM_KEY . "</td><td>" . _PROFILE_AM_VALUE . "</td></tr>";
+                $option_text = "<table  cellspacing='1'><tr><td class='width20'>"._PROFILE_AM_KEY."</td><td>"._PROFILE_AM_VALUE."</td></tr>";
                 for ($i = 0; $i < 3; ++$i) {
                     $option_text .= "<tr><td><input type='text' name='addOption[{$i}][key]' id='addOption[{$i}][key]' size='15' /></td><td><input type='text' name='addOption[{$i}][value]' id='addOption[{$i}][value]' size='35' /></td></tr>";
                     $option_text .= "<tr height='3px'><td colspan='2'> </td></tr>";