XOOPS / XoopsCore25

htdocs/modules/profile/lostpass.php

Spacing +8 added lines, -8 removed lines

@@ -17,7 +17,7 @@ 
  * @author              Taiwen Jiang <phppp@users.sourceforge.net>
  */
 
-include __DIR__ . '/header.php';
+include __DIR__.'/header.php';
 $email = isset($_GET['email']) ? trim($_GET['email']) : '';
 $email = isset($_POST['email']) ? trim($_POST['email']) : $email;
 
@@ -40,12 +40,12 @@ 
     $areyou = substr($user->getVar('pass'), 0, 5);
     if ($code != '' && $areyou == $code) {
         $newpass     = xoops_makepass();
-        $xoopsMailer =& xoops_getMailer();
+        $xoopsMailer = & xoops_getMailer();
         $xoopsMailer->useMail();
         $xoopsMailer->setTemplate('lostpass2.tpl');
         $xoopsMailer->assign('SITENAME', $GLOBALS['xoopsConfig']['sitename']);
         $xoopsMailer->assign('ADMINMAIL', $GLOBALS['xoopsConfig']['adminmail']);
-        $xoopsMailer->assign('SITEURL', XOOPS_URL . '/');
+        $xoopsMailer->assign('SITEURL', XOOPS_URL.'/');
         $xoopsMailer->assign('IP', $_SERVER['REMOTE_ADDR']);
         $xoopsMailer->assign('NEWPWD', $newpass);
         $xoopsMailer->setToUsers($user);
@@ -66,21 +66,21 @@ 
         if (!$GLOBALS['xoopsDB']->queryF($sql)) {
             include $GLOBALS['xoops']->path('header.php');
             echo _US_MAILPWDNG;
-            include __DIR__ . '/footer.php';
+            include __DIR__.'/footer.php';
             exit();
         }
         redirect_header('user.php', 3, sprintf(_US_PWDMAILED, $user->getVar('uname')), false);
 
         // If no Code, send it
     } else {
-        $xoopsMailer =& xoops_getMailer();
+        $xoopsMailer = & xoops_getMailer();
         $xoopsMailer->useMail();
         $xoopsMailer->setTemplate('lostpass1.tpl');
         $xoopsMailer->assign('SITENAME', $GLOBALS['xoopsConfig']['sitename']);
         $xoopsMailer->assign('ADMINMAIL', $GLOBALS['xoopsConfig']['adminmail']);
-        $xoopsMailer->assign('SITEURL', XOOPS_URL . '/');
+        $xoopsMailer->assign('SITEURL', XOOPS_URL.'/');
         $xoopsMailer->assign('IP', $_SERVER['REMOTE_ADDR']);
-        $xoopsMailer->assign('NEWPWD_LINK', XOOPS_URL . "/modules/profile/lostpass.php?email={$email}&code=" . $areyou);
+        $xoopsMailer->assign('NEWPWD_LINK', XOOPS_URL."/modules/profile/lostpass.php?email={$email}&code=".$areyou);
         $xoopsMailer->setToUsers($user);
         $xoopsMailer->setFromEmail($GLOBALS['xoopsConfig']['adminmail']);
         $xoopsMailer->setFromName($GLOBALS['xoopsConfig']['sitename']);
@@ -92,6 +92,6 @@ 
         echo '<h4>';
         printf(_US_CONFMAIL, $user->getVar('uname'));
         echo '</h4>';
-        include __DIR__ . '/footer.php';
+        include __DIR__.'/footer.php';
     }
 }

htdocs/modules/profile/search.php

Switch Indentation +70 added lines, -70 removed lines

@@ -34,49 +34,49 @@ 
     'language');
 
 switch ($op) {
-    default:
-    case 'search':
-        $xoopsOption['cache_group']   = implode('', $groups);
-        $GLOBALS['xoopsOption']['template_main'] = 'profile_search.tpl';
-        include $GLOBALS['xoops']->path('header.php');
-        $xoBreadcrumbs[] = array('title' => _SEARCH);
-        $sortby_arr      = array();
-
-        // Dynamic fields
-        $profile_handler = xoops_getModuleHandler('profile');
-        // Get fields
-        $fields = $profile_handler->loadFields();
-        // Get ids of fields that can be searched
-        /* @var  $gperm_handler XoopsGroupPermHandler */
-        $gperm_handler     = xoops_getHandler('groupperm');
-        $searchable_fields = $gperm_handler->getItemIds('profile_search', $groups, $GLOBALS['xoopsModule']->getVar('mid'));
-
-        include_once $GLOBALS['xoops']->path('class/xoopsformloader.php');
-        $searchform = new XoopsThemeForm('', 'searchform', 'search.php', 'post');
-
-        $name_tray = new XoopsFormElementTray(_US_NICKNAME);
-        $name_tray->addElement(new XoopsFormSelectMatchOption('', 'uname_match'));
-        $name_tray->addElement(new XoopsFormText('', 'uname', 35, 255));
-        $searchform->addElement($name_tray);
-
-        $email_tray = new XoopsFormElementTray(_US_EMAIL);
-        $email_tray->addElement(new XoopsFormSelectMatchOption('', 'email_match'));
-        $email_tray->addElement(new XoopsFormText('', 'email', 35, 255));
-        $searchform->addElement($email_tray);
-
-        // add search groups , only for Webmasters
-        if ($GLOBALS['xoopsUser'] && $GLOBALS['xoopsUser']->isAdmin()) {
-            $group_tray = new XoopsFormElementTray(_US_GROUPS);
-            $group_tray->addElement(new XoopsFormSelectGroup('', 'selgroups', null, false, 5, true));
-            $searchform->addElement($group_tray);
-        }
-
-        foreach (array_keys($fields) as $i) {
-            if (!in_array($fields[$i]->getVar('field_id'), $searchable_fields) || !in_array($fields[$i]->getVar('field_type'), $searchable_types)) {
-                continue;
+        default:
+        case 'search':
+            $xoopsOption['cache_group']   = implode('', $groups);
+            $GLOBALS['xoopsOption']['template_main'] = 'profile_search.tpl';
+            include $GLOBALS['xoops']->path('header.php');
+            $xoBreadcrumbs[] = array('title' => _SEARCH);
+            $sortby_arr      = array();
+
+            // Dynamic fields
+            $profile_handler = xoops_getModuleHandler('profile');
+            // Get fields
+            $fields = $profile_handler->loadFields();
+            // Get ids of fields that can be searched
+            /* @var  $gperm_handler XoopsGroupPermHandler */
+            $gperm_handler     = xoops_getHandler('groupperm');
+            $searchable_fields = $gperm_handler->getItemIds('profile_search', $groups, $GLOBALS['xoopsModule']->getVar('mid'));
+
+            include_once $GLOBALS['xoops']->path('class/xoopsformloader.php');
+            $searchform = new XoopsThemeForm('', 'searchform', 'search.php', 'post');
+
+            $name_tray = new XoopsFormElementTray(_US_NICKNAME);
+            $name_tray->addElement(new XoopsFormSelectMatchOption('', 'uname_match'));
+            $name_tray->addElement(new XoopsFormText('', 'uname', 35, 255));
+            $searchform->addElement($name_tray);
+
+            $email_tray = new XoopsFormElementTray(_US_EMAIL);
+            $email_tray->addElement(new XoopsFormSelectMatchOption('', 'email_match'));
+            $email_tray->addElement(new XoopsFormText('', 'email', 35, 255));
+            $searchform->addElement($email_tray);
+
+            // add search groups , only for Webmasters
+            if ($GLOBALS['xoopsUser'] && $GLOBALS['xoopsUser']->isAdmin()) {
+                $group_tray = new XoopsFormElementTray(_US_GROUPS);
+                $group_tray->addElement(new XoopsFormSelectGroup('', 'selgroups', null, false, 5, true));
+                $searchform->addElement($group_tray);
             }
-            $sortby_arr[$i] = $fields[$i]->getVar('field_title');
-            switch ($fields[$i]->getVar('field_type')) {
+
+            foreach (array_keys($fields) as $i) {
+                if (!in_array($fields[$i]->getVar('field_id'), $searchable_fields) || !in_array($fields[$i]->getVar('field_type'), $searchable_types)) {
+                    continue;
+                }
+                $sortby_arr[$i] = $fields[$i]->getVar('field_title');
+                switch ($fields[$i]->getVar('field_type')) {
                 case 'textbox':
                     if ($fields[$i]->getVar('field_valuetype') == XOBJ_DTYPE_INT) {
                         $searchform->addElement(new XoopsFormText(sprintf(_PROFILE_MA_LARGERTHAN, $fields[$i]->getVar('field_title')), $fields[$i]->getVar('field_name') . '_larger', 35, 35));
@@ -128,7 +128,7 @@ 
                     $searchform->addElement($element);
                     unset($element);
                     break;
-            }
+                }
         }
         asort($sortby_arr);
         $sortby_arr    = array_merge(array('' => _NONE, 'uname' => _US_NICKNAME, 'email' => _US_EMAIL), $sortby_arr);
@@ -157,32 +157,32 @@ 
         $GLOBALS['xoopsTpl']->assign('total_users', $total);
         break;
 
-    case 'results':
-        $GLOBALS['xoopsOption']['template_main'] = 'profile_results.tpl';
-        include_once $GLOBALS['xoops']->path('header.php');
-        $GLOBALS['xoopsTpl']->assign('page_title', _PROFILE_MA_RESULTS);
-        $xoBreadcrumbs[] = array(
-            'link'  => XOOPS_URL . '/modules/' . $GLOBALS['xoopsModule']->getVar('dirname', 'n') . '/search.php',
-            'title' => _SEARCH);
-        $xoBreadcrumbs[] = array('title' => _PROFILE_MA_RESULTS);
-        /* @var $member_handler XoopsMemberHandler */
-        $member_handler = xoops_getHandler('member');
-        // Dynamic fields
-        $profile_handler = xoops_getModuleHandler('profile');
-        // Get fields
-        $fields = $profile_handler->loadFields();
-        // Get ids of fields that can be searched
-        /* @var  $gperm_handler XoopsGroupPermHandler */
-        $gperm_handler     = xoops_getHandler('groupperm');
-        $searchable_fields = $gperm_handler->getItemIds('profile_search', $groups, $GLOBALS['xoopsModule']->getVar('mid'));
-        $searchvars        = array();
-        $search_url        = array();
-
-        $criteria = new CriteriaCompo(new Criteria('level', 0, '>'));
-
-        if (isset($_REQUEST['uname']) && $_REQUEST['uname'] !== '') {
-            $string = $myts->addSlashes(trim($_REQUEST['uname']));
-            switch ($_REQUEST['uname_match']) {
+        case 'results':
+            $GLOBALS['xoopsOption']['template_main'] = 'profile_results.tpl';
+            include_once $GLOBALS['xoops']->path('header.php');
+            $GLOBALS['xoopsTpl']->assign('page_title', _PROFILE_MA_RESULTS);
+            $xoBreadcrumbs[] = array(
+                'link'  => XOOPS_URL . '/modules/' . $GLOBALS['xoopsModule']->getVar('dirname', 'n') . '/search.php',
+                'title' => _SEARCH);
+            $xoBreadcrumbs[] = array('title' => _PROFILE_MA_RESULTS);
+            /* @var $member_handler XoopsMemberHandler */
+            $member_handler = xoops_getHandler('member');
+            // Dynamic fields
+            $profile_handler = xoops_getModuleHandler('profile');
+            // Get fields
+            $fields = $profile_handler->loadFields();
+            // Get ids of fields that can be searched
+            /* @var  $gperm_handler XoopsGroupPermHandler */
+            $gperm_handler     = xoops_getHandler('groupperm');
+            $searchable_fields = $gperm_handler->getItemIds('profile_search', $groups, $GLOBALS['xoopsModule']->getVar('mid'));
+            $searchvars        = array();
+            $search_url        = array();
+
+            $criteria = new CriteriaCompo(new Criteria('level', 0, '>'));
+
+            if (isset($_REQUEST['uname']) && $_REQUEST['uname'] !== '') {
+                $string = $myts->addSlashes(trim($_REQUEST['uname']));
+                switch ($_REQUEST['uname_match']) {
                 case XOOPS_MATCH_START:
                     $string .= '%';
                     break;
@@ -194,7 +194,7 @@ 
                 case XOOPS_MATCH_CONTAIN:
                     $string = '%' . $string . '%';
                     break;
-            }
+                }
             $criteria->add(new Criteria('uname', $string, 'LIKE'));
             $search_url[] = 'uname=' . $_REQUEST['uname'];
             $search_url[] = 'uname_match=' . $_REQUEST['uname_match'];

Spacing +49 added lines, -49 removed lines

@@ -17,7 +17,7 @@ 
  * @author              Taiwen Jiang <phppp@users.sourceforge.net>
  */
 
-include __DIR__ . '/header.php';
+include __DIR__.'/header.php';
 $myts = MyTextSanitizer::getInstance();
 
 $limit_default    = 20;
@@ -36,7 +36,7 @@ 
 switch ($op) {
     default:
     case 'search':
-        $xoopsOption['cache_group']   = implode('', $groups);
+        $xoopsOption['cache_group'] = implode('', $groups);
         $GLOBALS['xoopsOption']['template_main'] = 'profile_search.tpl';
         include $GLOBALS['xoops']->path('header.php');
         $xoBreadcrumbs[] = array('title' => _SEARCH);
@@ -79,11 +79,11 @@ 
             switch ($fields[$i]->getVar('field_type')) {
                 case 'textbox':
                     if ($fields[$i]->getVar('field_valuetype') == XOBJ_DTYPE_INT) {
-                        $searchform->addElement(new XoopsFormText(sprintf(_PROFILE_MA_LARGERTHAN, $fields[$i]->getVar('field_title')), $fields[$i]->getVar('field_name') . '_larger', 35, 35));
-                        $searchform->addElement(new XoopsFormText(sprintf(_PROFILE_MA_SMALLERTHAN, $fields[$i]->getVar('field_title')), $fields[$i]->getVar('field_name') . '_smaller', 35, 35));
+                        $searchform->addElement(new XoopsFormText(sprintf(_PROFILE_MA_LARGERTHAN, $fields[$i]->getVar('field_title')), $fields[$i]->getVar('field_name').'_larger', 35, 35));
+                        $searchform->addElement(new XoopsFormText(sprintf(_PROFILE_MA_SMALLERTHAN, $fields[$i]->getVar('field_title')), $fields[$i]->getVar('field_name').'_smaller', 35, 35));
                     } else {
                         $tray = new XoopsFormElementTray($fields[$i]->getVar('field_title'));
-                        $tray->addElement(new XoopsFormSelectMatchOption('', $fields[$i]->getVar('field_name') . '_match'));
+                        $tray->addElement(new XoopsFormSelectMatchOption('', $fields[$i]->getVar('field_name').'_match'));
                         $tray->addElement(new XoopsFormText('', $fields[$i]->getVar('field_name'), 35, $fields[$i]->getVar('field_maxlength')));
                         $searchform->addElement($tray);
                         unset($tray);
@@ -111,8 +111,8 @@ 
 
                 case 'date':
                 case 'datetime':
-                    $searchform->addElement(new XoopsFormTextDateSelect(sprintf(_PROFILE_MA_LATERTHAN, $fields[$i]->getVar('field_title')), $fields[$i]->getVar('field_name') . '_larger', 15, 1));
-                    $searchform->addElement(new XoopsFormTextDateSelect(sprintf(_PROFILE_MA_EARLIERTHAN, $fields[$i]->getVar('field_title')), $fields[$i]->getVar('field_name') . '_smaller', 15, time()));
+                    $searchform->addElement(new XoopsFormTextDateSelect(sprintf(_PROFILE_MA_LATERTHAN, $fields[$i]->getVar('field_title')), $fields[$i]->getVar('field_name').'_larger', 15, 1));
+                    $searchform->addElement(new XoopsFormTextDateSelect(sprintf(_PROFILE_MA_EARLIERTHAN, $fields[$i]->getVar('field_title')), $fields[$i]->getVar('field_name').'_smaller', 15, time()));
                     break;
 
                 case 'timezone':
@@ -162,7 +162,7 @@ 
         include_once $GLOBALS['xoops']->path('header.php');
         $GLOBALS['xoopsTpl']->assign('page_title', _PROFILE_MA_RESULTS);
         $xoBreadcrumbs[] = array(
-            'link'  => XOOPS_URL . '/modules/' . $GLOBALS['xoopsModule']->getVar('dirname', 'n') . '/search.php',
+            'link'  => XOOPS_URL.'/modules/'.$GLOBALS['xoopsModule']->getVar('dirname', 'n').'/search.php',
             'title' => _SEARCH);
         $xoBreadcrumbs[] = array('title' => _PROFILE_MA_RESULTS);
         /* @var $member_handler XoopsMemberHandler */
@@ -188,16 +188,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'] !== '') {
@@ -208,16 +208,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));
         }
@@ -240,7 +240,7 @@ 
                     case XOBJ_DTYPE_INT:
                         $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 XOBJ_DTYPE_URL:
@@ -248,11 +248,11 @@ 
                     case XOBJ_DTYPE_TXTAREA:
                         $value        = array_map(array($GLOBALS['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)
@@ -262,55 +262,55 @@ 
                         switch ($fields[$i]->getVar('field_type')) {
                             case 'date':
                             case 'datetime':
-                                $value = $_REQUEST[$fieldname . '_larger'];
-                                if (!($value = strtotime($_REQUEST[$fieldname . '_larger']))) {
-                                    $value = (int)$_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, '>='));
                                 }
 
-                                $value = $_REQUEST[$fieldname . '_smaller'];
-                                if (!($value = strtotime($_REQUEST[$fieldname . '_smaller']))) {
-                                    $value = (int)$_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, '<='));
                                 }
                                 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;
@@ -322,21 +322,21 @@ 
                     case XOBJ_DTYPE_TXTAREA:
                         if (isset($_REQUEST[$fieldname]) && $_REQUEST[$fieldname] !== '') {
                             $value = $myts->addSlashes(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;
@@ -379,7 +379,7 @@ 
         if ($GLOBALS['xoopsUser'] && $GLOBALS['xoopsUser']->isAdmin()) {
             $searchgroups = empty($_REQUEST['selgroups']) ? array() : array_map('intval', $_REQUEST['selgroups']);
             foreach ($searchgroups as $group) {
-                $search_url[] = 'selgroups[]=' . $group;
+                $search_url[] = 'selgroups[]='.$group;
             }
         }
 
@@ -394,13 +394,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>").' ';
         $GLOBALS['xoopsTpl']->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 || (is_object($GLOBALS['xoopsUser']) && $GLOBALS['xoopsUser']->isAdmin())) ? $users[$k]->getVar('email') : '';
 
             foreach (array_keys($fields) as $i) {
@@ -424,11 +424,11 @@ 
 
         if ($total_users > $limit) {
             $search_url[] = 'op=results';
-            $search_url[] = 'order=' . $order;
+            $search_url[] = 'order='.$order;
             //TODO remove it for final release
             //            $search_url[] = "sortby=" . htmlspecialchars($_REQUEST['sortby']);
-            $search_url[] = 'sortby=' . htmlspecialchars($sortby); // change by zyspec
-            $search_url[] = 'limit=' . $limit;
+            $search_url[] = 'sortby='.htmlspecialchars($sortby); // change by zyspec
+            $search_url[] = 'limit='.$limit;
             if (isset($search_url)) {
                 $args = implode('&amp;', $search_url);
             }
@@ -439,4 +439,4 @@ 
         }
         break;
 }
-include __DIR__ . '/footer.php';
+include __DIR__.'/footer.php';

htdocs/modules/profile/preloads/core.php

Spacing +5 added lines, -5 removed lines

@@ -39,7 +39,7 @@ 
             $op = trim($_GET['op']);
         }
         if ($op !== 'login' && (empty($_GET['from']) || 'profile' !== $_GET['from'])) {
-            header('location: ./modules/profile/user.php' . (empty($_SERVER['QUERY_STRING']) ? '' : '?' . $_SERVER['QUERY_STRING']));
+            header('location: ./modules/profile/user.php'.(empty($_SERVER['QUERY_STRING']) ? '' : '?'.$_SERVER['QUERY_STRING']));
             exit();
         }
     }
@@ -49,7 +49,7 @@ 
      */
     public static function eventCoreEdituserStart($args)
     {
-        header('location: ./modules/profile/edituser.php' . (empty($_SERVER['QUERY_STRING']) ? '' : '?' . $_SERVER['QUERY_STRING']));
+        header('location: ./modules/profile/edituser.php'.(empty($_SERVER['QUERY_STRING']) ? '' : '?'.$_SERVER['QUERY_STRING']));
         exit();
     }
 
@@ -60,7 +60,7 @@ 
     {
         $email = isset($_GET['email']) ? trim($_GET['email']) : '';
         $email = isset($_POST['email']) ? trim($_POST['email']) : $email;
-        header("location: ./modules/profile/lostpass.php?email={$email}" . (empty($_GET['code']) ? '' : '&' . $_GET['code']));
+        header("location: ./modules/profile/lostpass.php?email={$email}".(empty($_GET['code']) ? '' : '&'.$_GET['code']));
         exit();
     }
 
@@ -69,7 +69,7 @@ 
      */
     public static function eventCoreRegisterStart($args)
     {
-        header('location: ./modules/profile/register.php' . (empty($_SERVER['QUERY_STRING']) ? '' : '?' . $_SERVER['QUERY_STRING']));
+        header('location: ./modules/profile/register.php'.(empty($_SERVER['QUERY_STRING']) ? '' : '?'.$_SERVER['QUERY_STRING']));
         exit();
     }
 
@@ -78,7 +78,7 @@ 
      */
     public static function eventCoreUserinfoStart($args)
     {
-        header('location: ./modules/profile/userinfo.php' . (empty($_SERVER['QUERY_STRING']) ? '' : '?' . $_SERVER['QUERY_STRING']));
+        header('location: ./modules/profile/userinfo.php'.(empty($_SERVER['QUERY_STRING']) ? '' : '?'.$_SERVER['QUERY_STRING']));
         exit();
     }
 }

htdocs/modules/profile/user.php

Spacing +13 added lines, -13 removed lines

@@ -18,7 +18,7 @@ 
  */
 
 $xoopsOption['pagetype'] = 'user';
-include __DIR__ . '/header.php';
+include __DIR__.'/header.php';
 
 $op = 'main';
 
@@ -47,7 +47,7 @@ 
         $GLOBALS['xoopsTpl']->assign('lang_youremail', _US_YOUREMAIL);
         $GLOBALS['xoopsTpl']->assign('lang_sendpassword', _US_SENDPASSWORD);
         $GLOBALS['xoopsTpl']->assign('mailpasswd_token', $GLOBALS['xoopsSecurity']->createToken());
-        include __DIR__ . '/footer.php';
+        include __DIR__.'/footer.php';
         exit();
     }
     if (!empty($_GET['xoops_redirect'])) {
@@ -60,11 +60,11 @@ 
             }
         }
         if (!$isExternal) {
-            header('Location: ' . $redirect);
+            header('Location: '.$redirect);
             exit();
         }
     }
-    header('Location: ./userinfo.php?uid=' . $GLOBALS['xoopsUser']->getVar('uid'));
+    header('Location: ./userinfo.php?uid='.$GLOBALS['xoopsUser']->getVar('uid'));
     exit();
 }
 
@@ -88,8 +88,8 @@ 
     }
     $xoopsPreload = XoopsPreload::getInstance();
     $xoopsPreload->triggerEvent('core.behavior.user.logout');
-    $message = _US_LOGGEDOUT . '<br>' . _US_THANKYOUFORVISIT;
-    redirect_header(XOOPS_URL . '/', 1, $message);
+    $message = _US_LOGGEDOUT.'<br>'._US_THANKYOUFORVISIT;
+    redirect_header(XOOPS_URL.'/', 1, $message);
 }
 
 if ($op === 'actv') {
@@ -103,18 +103,18 @@ 
     $config_handler             = xoops_getHandler('config');
     $GLOBALS['xoopsConfigUser'] = $config_handler->getConfigsByCat(XOOPS_CONF_USER);
     if (!$GLOBALS['xoopsUser'] || $GLOBALS['xoopsConfigUser']['self_delete'] != 1) {
-        redirect_header(XOOPS_URL . '/', 5, _US_NOPERMISS);
+        redirect_header(XOOPS_URL.'/', 5, _US_NOPERMISS);
     } else {
         $groups = $GLOBALS['xoopsUser']->getGroups();
         if (in_array(XOOPS_GROUP_ADMIN, $groups)) {
             // users in the webmasters group may not be deleted
-            redirect_header(XOOPS_URL . '/', 5, _US_ADMINNO);
+            redirect_header(XOOPS_URL.'/', 5, _US_ADMINNO);
         }
         $ok = !isset($_POST['ok']) ? 0 : (int)$_POST['ok'];
         if ($ok != 1) {
-            include __DIR__ . '/header.php';
-            xoops_confirm(array('op' => 'delete', 'ok' => 1), 'user.php', _US_SURETODEL . '<br>' . _US_REMOVEINFO);
-            include __DIR__ . '/footer.php';
+            include __DIR__.'/header.php';
+            xoops_confirm(array('op' => 'delete', 'ok' => 1), 'user.php', _US_SURETODEL.'<br>'._US_REMOVEINFO);
+            include __DIR__.'/footer.php';
         } else {
             $del_uid        = $GLOBALS['xoopsUser']->getVar('uid');
             /* @var $member_handler XoopsMemberHandler */
@@ -124,9 +124,9 @@ 
                 $online_handler = xoops_getHandler('online');
                 $online_handler->destroy($del_uid);
                 xoops_notification_deletebyuser($del_uid);
-                redirect_header(XOOPS_URL . '/', 5, _US_BEENDELED);
+                redirect_header(XOOPS_URL.'/', 5, _US_BEENDELED);
             }
-            redirect_header(XOOPS_URL . '/', 5, _US_NOPERMISS);
+            redirect_header(XOOPS_URL.'/', 5, _US_NOPERMISS);
         }
         exit();
     }

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

Spacing +1 added lines, -1 removed lines

@@ -44,7 +44,7 @@
 define('_PROFILE_AM_PROF_REGISTER', 'Show in registration form');
 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>');
+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>');
 define('_PROFILE_AM_FIELDVISIBLE', 'The field ');
 define('_PROFILE_AM_FIELDVISIBLEFOR', ' is visible for ');
 define('_PROFILE_AM_FIELDVISIBLEON', ' viewing a profile of ');

htdocs/modules/profile/include/forms.php

Spacing +5 added lines, -5 removed lines

@@ -143,7 +143,7 @@ 
                 $form->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>";
@@ -285,7 +285,7 @@ 
     if (empty($opkey)) {
         $opkey = 'profile_opname';
     }
-    $next_opname      = 'op' . mt_rand(10000, 99999);
+    $next_opname      = 'op'.mt_rand(10000, 99999);
     $_SESSION[$opkey] = $next_opname;
 
     include_once $GLOBALS['xoops']->path('class/xoopsformloader.php');
@@ -296,7 +296,7 @@ 
     }
     $action    = $_SERVER['REQUEST_URI'];
     $step_no   = $step['step_no'];
-    $use_token = $step['step_no'] > 0;// ? true : false;
+    $use_token = $step['step_no'] > 0; // ? true : false;
     $reg_form  = new XoopsThemeForm($step['step_name'], 'regform', $action, 'post', $use_token);
 
     if ($step['step_desc']) {
@@ -358,7 +358,7 @@ 
 
     if ($step_no == 1 && $GLOBALS['xoopsConfigUser']['reg_dispdsclmr'] != 0 && $GLOBALS['xoopsConfigUser']['reg_disclaimer'] != '') {
         $disc_tray = new XoopsFormElementTray(_US_DISCLAIMER, '<br>');
-        $disc_text = new XoopsFormLabel('', "<div class=\"pad5\">" . $GLOBALS['myts']->displayTarea($GLOBALS['xoopsConfigUser']['reg_disclaimer'], 1) . '</div>');
+        $disc_text = new XoopsFormLabel('', "<div class=\"pad5\">".$GLOBALS['myts']->displayTarea($GLOBALS['xoopsConfigUser']['reg_disclaimer'], 1).'</div>');
         $disc_tray->addElement($disc_text);
         $agree_chk = new XoopsFormCheckBox('', 'agree_disc');
         $agree_chk->addOption(1, _US_IAGREE);
@@ -439,7 +439,7 @@ 
         //If the user is an admin and is editing someone else
         $pwd_text  = new XoopsFormPassword('', 'password', 10, 32);
         $pwd_text2 = new XoopsFormPassword('', 'vpass', 10, 32);
-        $pwd_tray  = new XoopsFormElementTray(_US_PASSWORD . '<br>' . _US_TYPEPASSTWICE);
+        $pwd_tray  = new XoopsFormElementTray(_US_PASSWORD.'<br>'._US_TYPEPASSTWICE);
         $pwd_tray->addElement($pwd_text);
         $pwd_tray->addElement($pwd_text2);
         $elements[0][] = array('element' => $pwd_tray, 'required' => 0); //cannot set an element tray required

htdocs/modules/profile/include/install.php

Spacing +7 added lines, -7 removed lines

@@ -39,7 +39,7 @@ 
     xoops_loadLanguage('notification');
     xoops_loadLanguage('main', $module->getVar('dirname', 'n'));
     include_once $GLOBALS['xoops']->path('include/notification_constants.php');
-    $umode_options         = array(
+    $umode_options = array(
         'nest'   => _NESTED,
         'flat'   => _FLAT,
         'thread' => _THREADED);
@@ -92,9 +92,9 @@ 
 {
     global $module_id;
 
-    $GLOBALS['xoopsDB']->queryF('   INSERT INTO ' . $GLOBALS['xoopsDB']->prefix('profile_profile') . ' (profile_id) ' . '   SELECT uid ' . '   FROM ' . $GLOBALS['xoopsDB']->prefix('users'));
+    $GLOBALS['xoopsDB']->queryF('   INSERT INTO '.$GLOBALS['xoopsDB']->prefix('profile_profile').' (profile_id) '.'   SELECT uid '.'   FROM '.$GLOBALS['xoopsDB']->prefix('users'));
 
-    $sql = 'INSERT INTO ' . $GLOBALS['xoopsDB']->prefix('group_permission') . ' (gperm_groupid, gperm_itemid, gperm_modid, gperm_name) ' . ' VALUES ' . ' (' . XOOPS_GROUP_ADMIN . ', ' . XOOPS_GROUP_ADMIN . ", {$module_id}, 'profile_access'), " . ' (' . XOOPS_GROUP_ADMIN . ', ' . XOOPS_GROUP_USERS . ", {$module_id}, 'profile_access'), " . ' (' . XOOPS_GROUP_USERS . ', ' . XOOPS_GROUP_USERS . ", {$module_id}, 'profile_access'), " . ' (' . XOOPS_GROUP_ANONYMOUS . ', ' . XOOPS_GROUP_USERS . ", {$module_id}, 'profile_access') " . ' ';
+    $sql = 'INSERT INTO '.$GLOBALS['xoopsDB']->prefix('group_permission').' (gperm_groupid, gperm_itemid, gperm_modid, gperm_name) '.' VALUES '.' ('.XOOPS_GROUP_ADMIN.', '.XOOPS_GROUP_ADMIN.", {$module_id}, 'profile_access'), ".' ('.XOOPS_GROUP_ADMIN.', '.XOOPS_GROUP_USERS.", {$module_id}, 'profile_access'), ".' ('.XOOPS_GROUP_USERS.', '.XOOPS_GROUP_USERS.", {$module_id}, 'profile_access'), ".' ('.XOOPS_GROUP_ANONYMOUS.', '.XOOPS_GROUP_USERS.", {$module_id}, 'profile_access') ".' ';
     $GLOBALS['xoopsDB']->queryF($sql);
 }
 
@@ -188,11 +188,11 @@ 
 {
     $gperm_itemid = $field_id;
     $gperm_modid  = $module_id;
-    $sql          = 'INSERT INTO ' . $GLOBALS['xoopsDB']->prefix('group_permission') . ' (gperm_groupid, gperm_itemid, gperm_modid, gperm_name) ' . ' VALUES ' . ($canedit ? ' (' . XOOPS_GROUP_ADMIN . ", {$gperm_itemid}, {$gperm_modid}, 'profile_edit'), " : '') . ($canedit == 1 ? ' (' . XOOPS_GROUP_USERS . ", {$gperm_itemid}, {$gperm_modid}, 'profile_edit'), " : '') . ' (' . XOOPS_GROUP_ADMIN . ", {$gperm_itemid}, {$gperm_modid}, 'profile_search'), " . ' (' . XOOPS_GROUP_USERS . ", {$gperm_itemid}, {$gperm_modid}, 'profile_search') " . ' ';
+    $sql          = 'INSERT INTO '.$GLOBALS['xoopsDB']->prefix('group_permission').' (gperm_groupid, gperm_itemid, gperm_modid, gperm_name) '.' VALUES '.($canedit ? ' ('.XOOPS_GROUP_ADMIN.", {$gperm_itemid}, {$gperm_modid}, 'profile_edit'), " : '').($canedit == 1 ? ' ('.XOOPS_GROUP_USERS.", {$gperm_itemid}, {$gperm_modid}, 'profile_edit'), " : '').' ('.XOOPS_GROUP_ADMIN.", {$gperm_itemid}, {$gperm_modid}, 'profile_search'), ".' ('.XOOPS_GROUP_USERS.", {$gperm_itemid}, {$gperm_modid}, 'profile_search') ".' ';
     $GLOBALS['xoopsDB']->queryF($sql);
 
     if ($visible) {
-        $sql = 'INSERT INTO ' . $GLOBALS['xoopsDB']->prefix('profile_visibility') . ' (field_id, user_group, profile_group) ' . ' VALUES ' . " ({$gperm_itemid}, " . XOOPS_GROUP_ADMIN . ', ' . XOOPS_GROUP_ADMIN . '), ' . " ({$gperm_itemid}, " . XOOPS_GROUP_ADMIN . ', ' . XOOPS_GROUP_USERS . '), ' . " ({$gperm_itemid}, " . XOOPS_GROUP_USERS . ', ' . XOOPS_GROUP_ADMIN . '), ' . " ({$gperm_itemid}, " . XOOPS_GROUP_USERS . ', ' . XOOPS_GROUP_USERS . '), ' . " ({$gperm_itemid}, " . XOOPS_GROUP_ANONYMOUS . ', ' . XOOPS_GROUP_ADMIN . '), ' . " ({$gperm_itemid}, " . XOOPS_GROUP_ANONYMOUS . ', ' . XOOPS_GROUP_USERS . ')' . ' ';
+        $sql = 'INSERT INTO '.$GLOBALS['xoopsDB']->prefix('profile_visibility').' (field_id, user_group, profile_group) '.' VALUES '." ({$gperm_itemid}, ".XOOPS_GROUP_ADMIN.', '.XOOPS_GROUP_ADMIN.'), '." ({$gperm_itemid}, ".XOOPS_GROUP_ADMIN.', '.XOOPS_GROUP_USERS.'), '." ({$gperm_itemid}, ".XOOPS_GROUP_USERS.', '.XOOPS_GROUP_ADMIN.'), '." ({$gperm_itemid}, ".XOOPS_GROUP_USERS.', '.XOOPS_GROUP_USERS.'), '." ({$gperm_itemid}, ".XOOPS_GROUP_ANONYMOUS.', '.XOOPS_GROUP_ADMIN.'), '." ({$gperm_itemid}, ".XOOPS_GROUP_ANONYMOUS.', '.XOOPS_GROUP_USERS.')'.' ';
         $GLOBALS['xoopsDB']->queryF($sql);
     }
 }
@@ -203,7 +203,7 @@ 
  */
 function profile_install_addCategory($name, $weight)
 {
-    $GLOBALS['xoopsDB']->query('INSERT INTO ' . $GLOBALS['xoopsDB']->prefix('profile_category') . ' VALUES (0, ' . $GLOBALS['xoopsDB']->quote($name) . ", '', {$weight})");
+    $GLOBALS['xoopsDB']->query('INSERT INTO '.$GLOBALS['xoopsDB']->prefix('profile_category').' VALUES (0, '.$GLOBALS['xoopsDB']->quote($name).", '', {$weight})");
 }
 
 /**
@@ -214,5 +214,5 @@ 
  */
 function profile_install_addStep($name, $desc, $order, $save)
 {
-    $GLOBALS['xoopsDB']->query('INSERT INTO ' . $GLOBALS['xoopsDB']->prefix('profile_regstep') . ' VALUES (0, ' . $GLOBALS['xoopsDB']->quote($name) . ', ' . $GLOBALS['xoopsDB']->quote($desc) . ", {$order}, {$save})");
+    $GLOBALS['xoopsDB']->query('INSERT INTO '.$GLOBALS['xoopsDB']->prefix('profile_regstep').' VALUES (0, '.$GLOBALS['xoopsDB']->quote($name).', '.$GLOBALS['xoopsDB']->quote($desc).", {$order}, {$save})");
 }

htdocs/modules/profile/include/update.php

Spacing +21 added lines, -21 removed lines

@@ -17,7 +17,7 @@ 
  */
 
 $path = dirname(dirname(dirname(__DIR__)));
-require_once $path . '/include' . '/cp_header.php';
+require_once $path.'/include'.'/cp_header.php';
 
 /**
  * @param      $module
@@ -32,23 +32,23 @@ 
 function xoops_module_update_profile(XoopsModule $module, $oldversion = null)
 {
     if ($oldversion < 162) {
-        $GLOBALS['xoopsDB']->queryF('UPDATE `' . $GLOBALS['xoopsDB']->prefix('profile_field') . ' SET field_valuetype=2 WHERE field_name=umode');
+        $GLOBALS['xoopsDB']->queryF('UPDATE `'.$GLOBALS['xoopsDB']->prefix('profile_field').' SET field_valuetype=2 WHERE field_name=umode');
     }
 
     if ($oldversion < 100) {
 
         // Drop old category table
-        $sql = 'DROP TABLE ' . $GLOBALS['xoopsDB']->prefix('profile_category');
+        $sql = 'DROP TABLE '.$GLOBALS['xoopsDB']->prefix('profile_category');
         $GLOBALS['xoopsDB']->queryF($sql);
 
         // Drop old field-category link table
-        $sql = 'DROP TABLE ' . $GLOBALS['xoopsDB']->prefix('profile_fieldcategory');
+        $sql = 'DROP TABLE '.$GLOBALS['xoopsDB']->prefix('profile_fieldcategory');
         $GLOBALS['xoopsDB']->queryF($sql);
 
         // Create new tables for new profile module
-        $GLOBALS['xoopsDB']->queryFromFile(XOOPS_ROOT_PATH . '/modules/' . $module->getVar('dirname', 'n') . '/sql/mysql.sql');
+        $GLOBALS['xoopsDB']->queryFromFile(XOOPS_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);
         /* @var $goupperm_handler XoopsGroupPermHandler */
         $goupperm_handler = xoops_getHandler('groupperm');
@@ -57,7 +57,7 @@ 
         $skip_fields   = $field_handler->getUserVars();
         $skip_fields[] = 'newemail';
         $skip_fields[] = 'pm_link';
-        $sql           = 'SELECT * FROM `' . $GLOBALS['xoopsDB']->prefix('user_profile_field') . "` WHERE `field_name` NOT IN ('" . implode("', '", $skip_fields) . "')";
+        $sql           = 'SELECT * FROM `'.$GLOBALS['xoopsDB']->prefix('user_profile_field')."` WHERE `field_name` NOT IN ('".implode("', '", $skip_fields)."')";
         $result        = $GLOBALS['xoopsDB']->query($sql);
         $fields        = array();
         while (false !== ($myrow = $GLOBALS['xoopsDB']->fetchArray($result))) {
@@ -74,14 +74,14 @@ 
             $field_handler->insert($object, true);
 
             $gperm_itemid = $object->getVar('field_id');
-            $sql          = 'UPDATE ' . $GLOBALS['xoopsDB']->prefix('group_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 '.$GLOBALS['xoopsDB']->prefix('group_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')";
             $GLOBALS['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 ' . $GLOBALS['xoopsDB']->prefix('profile_visibility') . ' (field_id, user_group, profile_group) ' . ' VALUES ' . " ({$gperm_itemid}, {$ugid}, {$pgid})";
+                    $sql = 'INSERT INTO '.$GLOBALS['xoopsDB']->prefix('profile_visibility').' (field_id, user_group, profile_group) '.' VALUES '." ({$gperm_itemid}, {$ugid}, {$pgid})";
                     $GLOBALS['xoopsDB']->queryF($sql);
                 }
             }
@@ -92,48 +92,48 @@ 
 
         // Copy data from profile table
         foreach ($fields as $field) {
-            $GLOBALS['xoopsDB']->queryF('UPDATE `' . $GLOBALS['xoopsDB']->prefix('profile_profile') . '` u, `' . $GLOBALS['xoopsDB']->prefix('user_profile') . "` p SET u.{$field} = p.{$field} WHERE u.profile_id=p.profileid");
+            $GLOBALS['xoopsDB']->queryF('UPDATE `'.$GLOBALS['xoopsDB']->prefix('profile_profile').'` u, `'.$GLOBALS['xoopsDB']->prefix('user_profile')."` p SET u.{$field} = p.{$field} WHERE u.profile_id=p.profileid");
         }
 
         // Drop old profile table
-        $sql = 'DROP TABLE ' . $GLOBALS['xoopsDB']->prefix('user_profile');
+        $sql = 'DROP TABLE '.$GLOBALS['xoopsDB']->prefix('user_profile');
         $GLOBALS['xoopsDB']->queryF($sql);
 
         // Drop old field module
-        $sql = 'DROP TABLE ' . $GLOBALS['xoopsDB']->prefix('user_profile_field');
+        $sql = 'DROP TABLE '.$GLOBALS['xoopsDB']->prefix('user_profile_field');
         $GLOBALS['xoopsDB']->queryF($sql);
 
         // Remove not used items
-        $sql = 'DELETE FROM ' . $GLOBALS['xoopsDB']->prefix('group_permission') . '   WHERE `gperm_modid` = ' . $module->getVar('mid') . " AND `gperm_name` IN ('profile_show', 'profile_visible')";
+        $sql = 'DELETE FROM '.$GLOBALS['xoopsDB']->prefix('group_permission').'   WHERE `gperm_modid` = '.$module->getVar('mid')." AND `gperm_name` IN ('profile_show', 'profile_visible')";
         $GLOBALS['xoopsDB']->queryF($sql);
     }
 
     if ($oldversion < 162) {
-        $GLOBALS['xoopsDB']->queryF('UPDATE `' . $GLOBALS['xoopsDB']->prefix('profile_field') . "` SET `field_valuetype`=1 WHERE `field_name`='umode'");
+        $GLOBALS['xoopsDB']->queryF('UPDATE `'.$GLOBALS['xoopsDB']->prefix('profile_field')."` SET `field_valuetype`=1 WHERE `field_name`='umode'");
     }
 
     if ($oldversion < 186) {
         // delete old html template files
-        $templateDirectory = XOOPS_ROOT_PATH . '/modules/' . $module->getVar('dirname', 'n') . '/templates/';
+        $templateDirectory = XOOPS_ROOT_PATH.'/modules/'.$module->getVar('dirname', 'n').'/templates/';
         $template_list     = array_diff(scandir($templateDirectory), array('..', '.'));
         foreach ($template_list as $k => $v) {
-            $fileinfo = new SplFileInfo($templateDirectory . $v);
+            $fileinfo = new SplFileInfo($templateDirectory.$v);
             if ($fileinfo->getExtension() === 'html' && $fileinfo->getFilename() !== 'index.html') {
-                @unlink($templateDirectory . $v);
+                @unlink($templateDirectory.$v);
             }
         }
 
         xoops_load('xoopsfile');
         //delete /images directory
-        $imagesDirectory = XOOPS_ROOT_PATH . '/modules/' . $module->getVar('dirname', 'n') . '/images/';
+        $imagesDirectory = XOOPS_ROOT_PATH.'/modules/'.$module->getVar('dirname', 'n').'/images/';
         $folderHandler   = XoopsFile::getHandler('folder', $imagesDirectory);
         $folderHandler->delete($imagesDirectory);
         //delete /templates/style.css file
-        $cssFile       = XOOPS_ROOT_PATH . '/modules/' . $module->getVar('dirname', 'n') . '/templates/style.css';
+        $cssFile       = XOOPS_ROOT_PATH.'/modules/'.$module->getVar('dirname', 'n').'/templates/style.css';
         $folderHandler = XoopsFile::getHandler('file', $cssFile);
         $folderHandler->delete($cssFile);
         //delete .html entries from the tpl table
-        $sql = 'DELETE FROM ' . $GLOBALS['xoopsDB']->prefix('tplfile') . " WHERE `tpl_module` = '" . $module->getVar('dirname', 'n') . "' AND `tpl_file` LIKE '%.html%'";
+        $sql = 'DELETE FROM '.$GLOBALS['xoopsDB']->prefix('tplfile')." WHERE `tpl_module` = '".$module->getVar('dirname', 'n')."' AND `tpl_file` LIKE '%.html%'";
         $GLOBALS['xoopsDB']->queryF($sql);
     }
 
@@ -150,7 +150,7 @@ 
     $profile_handler->cleanOrphan($GLOBALS['xoopsDB']->prefix('users'), '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/header.php

Spacing +2 added lines, -2 removed lines

@@ -18,13 +18,13 @@
  */
 
 $xoopsOption['pagetype'] = 'user';
-include dirname(dirname(__DIR__)) . '/mainfile.php';
+include dirname(dirname(__DIR__)).'/mainfile.php';
 $xoopsOption['xoops_module_header'] = '<link rel="stylesheet" type="text/css" href="assets/css/style.css" />';
 
 $xoBreadcrumbs   = array();
 $xoBreadcrumbs[] = array(
     'title' => $GLOBALS['xoopsModule']->getVar('name'),
-    'link' => XOOPS_URL . '/modules/' . $GLOBALS['xoopsModule']->getVar('dirname', 'n') . '/');
+    'link' => XOOPS_URL.'/modules/'.$GLOBALS['xoopsModule']->getVar('dirname', 'n').'/');
 
 //disable cache
 $GLOBALS['xoopsConfig']['module_cache'][$GLOBALS['xoopsModule']->getVar('mid')] = 0;