XOOPS / XoopsCore25

htdocs/modules/profile/register.php

Spacing +17 added lines, -17 removed lines

@@ -18,15 +18,15 @@ 
  * @author              trabis <lusopoemas@gmail.com>
  */
 
-include __DIR__ . '/header.php';
+include __DIR__.'/header.php';
 
 if ($GLOBALS['xoopsUser']) {
-    header('location: userinfo.php?uid= ' . $GLOBALS['xoopsUser']->getVar('uid'));
+    header('location: userinfo.php?uid= '.$GLOBALS['xoopsUser']->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();
 }
 
@@ -71,7 +71,7 @@ 
 $regstep_handler = xoops_getModuleHandler('regstep');
 
 if (!$steps = $regstep_handler->getAll($criteria, null, false, false)) {
-    redirect_header(XOOPS_URL . '/', 6, _PROFILE_MA_NOSTEPSAVAILABLE);
+    redirect_header(XOOPS_URL.'/', 6, _PROFILE_MA_NOSTEPSAVAILABLE);
 }
 
 foreach (array_keys($steps) as $key) {
@@ -85,7 +85,7 @@ 
 $GLOBALS['xoopsTpl']->assign('lang_register_steps', _PROFILE_MA_REGISTER_STEPS);
 
 $xoBreadcrumbs[] = array(
-    'link'  => XOOPS_URL . '/modules/' . $GLOBALS['xoopsModule']->getVar('dirname', 'n') . '/register.php',
+    'link'  => XOOPS_URL.'/modules/'.$GLOBALS['xoopsModule']->getVar('dirname', 'n').'/register.php',
     'title' => _PROFILE_MA_REGISTER);
 if (isset($steps[$current_step])) {
     $xoBreadcrumbs[] = array('title' => $steps[$current_step]['step_name']);
@@ -167,7 +167,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(_FORM_ENTER, $title) . '<br>';
+            $stop .= sprintf(_FORM_ENTER, $title).'<br>';
         }
     }
 }
@@ -183,7 +183,7 @@ 
 
     if ($GLOBALS['xoopsConfigUser']['reg_dispdsclmr'] != 0 && $GLOBALS['xoopsConfigUser']['reg_disclaimer'] !== '') {
         if (empty($agree_disc)) {
-            $stop .= _US_UNEEDAGREE . '<br>';
+            $stop .= _US_UNEEDAGREE.'<br>';
         }
     }
 
@@ -237,7 +237,7 @@ 
 
         // Insert/update user and check if we have succeded
         if (!$member_handler->insertUser($newuser)) {
-            $stop .= _US_REGISTERNG . '<br>';
+            $stop .= _US_REGISTERNG.'<br>';
             $stop .= implode('<br>', $newuser->getErrors());
         } else {
             // User inserted! Now insert custom profile fields
@@ -247,7 +247,7 @@ 
             // We are good! If this is 'was' a new user then we handle notification
             if ($isNew) {
                 if ($GLOBALS['xoopsConfigUser']['new_user_notify'] == 1 && !empty($GLOBALS['xoopsConfigUser']['new_user_notify_group'])) {
-                    $xoopsMailer =& xoops_getMailer();
+                    $xoopsMailer = & xoops_getMailer();
                     $xoopsMailer->reset();
                     $xoopsMailer->useMail();
                     $xoopsMailer->setToGroups($member_handler->getGroup($GLOBALS['xoopsConfigUser']['new_user_notify_group']));
@@ -260,19 +260,19 @@ 
 
                 $message = '';
                 if (!$member_handler->addUserToGroup(XOOPS_GROUP_USERS, $newuser->getVar('uid'))) {
-                    $message = _PROFILE_MA_REGISTER_NOTGROUP . '<br>';
+                    $message = _PROFILE_MA_REGISTER_NOTGROUP.'<br>';
                 } else {
                     if ($GLOBALS['xoopsConfigUser']['activation_type'] == 1) {
                         XoopsUserUtility::sendWelcome($newuser);
                     } else {
                         if ($GLOBALS['xoopsConfigUser']['activation_type'] == 0) {
-                            $xoopsMailer =& xoops_getMailer();
+                            $xoopsMailer = & xoops_getMailer();
                             $xoopsMailer->reset();
                             $xoopsMailer->useMail();
                             $xoopsMailer->setTemplate('register.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('X_UPASS', $_POST['vpass']);
                             $xoopsMailer->setToUsers($newuser);
                             $xoopsMailer->setFromEmail($GLOBALS['xoopsConfig']['adminmail']);
@@ -285,16 +285,16 @@ 
                             }
                         } else {
                             if ($GLOBALS['xoopsConfigUser']['activation_type'] == 2) {
-                                $xoopsMailer =& xoops_getMailer();
+                                $xoopsMailer = & xoops_getMailer();
                                 $xoopsMailer->reset();
                                 $xoopsMailer->useMail();
                                 $xoopsMailer->setTemplate('adminactivate.tpl');
                                 $xoopsMailer->assign('USERNAME', $newuser->getVar('uname'));
                                 $xoopsMailer->assign('USEREMAIL', $newuser->getVar('email'));
-                                $xoopsMailer->assign('USERACTLINK', XOOPS_URL . '/modules/' . $GLOBALS['xoopsModule']->getVar('dirname', 'n') . '/activate.php?id=' . $newuser->getVar('uid') . '&actkey=' . $newuser->getVar('actkey', 'n'));
+                                $xoopsMailer->assign('USERACTLINK', XOOPS_URL.'/modules/'.$GLOBALS['xoopsModule']->getVar('dirname', 'n').'/activate.php?id='.$newuser->getVar('uid').'&actkey='.$newuser->getVar('actkey', 'n'));
                                 $xoopsMailer->assign('SITENAME', $GLOBALS['xoopsConfig']['sitename']);
                                 $xoopsMailer->assign('ADMINMAIL', $GLOBALS['xoopsConfig']['adminmail']);
-                                $xoopsMailer->assign('SITEURL', XOOPS_URL . '/');
+                                $xoopsMailer->assign('SITEURL', XOOPS_URL.'/');
                                 $xoopsMailer->setToGroups($member_handler->getGroup($GLOBALS['xoopsConfigUser']['activation_group']));
                                 $xoopsMailer->setFromEmail($GLOBALS['xoopsConfig']['adminmail']);
                                 $xoopsMailer->setFromName($GLOBALS['xoopsConfig']['sitename']);
@@ -318,7 +318,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($GLOBALS['xoopsTpl']);
@@ -341,4 +341,4 @@ 
     $_SESSION['profile_post'] = null;
 }
 
-include __DIR__ . '/footer.php';
+include __DIR__.'/footer.php';

htdocs/modules/profile/changepass.php

Spacing +3 added lines, -3 removed lines

@@ -18,7 +18,7 @@ 
  */
 
 $xoopsOption['pagetype'] = 'user';
-include __DIR__ . '/header.php';
+include __DIR__.'/header.php';
 if (!$GLOBALS['xoopsUser']) {
     redirect_header(XOOPS_URL, 2, _NOPERM);
 }
@@ -67,7 +67,7 @@ 
             $msg = _PROFILE_MA_PASSWORDCHANGED;
         }
     }
-    redirect_header(XOOPS_URL . '/modules/' . $GLOBALS['xoopsModule']->getVar('dirname', 'n') . '/userinfo.php?uid=' . $GLOBALS['xoopsUser']->getVar('uid'), 2, $msg);
+    redirect_header(XOOPS_URL.'/modules/'.$GLOBALS['xoopsModule']->getVar('dirname', 'n').'/userinfo.php?uid='.$GLOBALS['xoopsUser']->getVar('uid'), 2, $msg);
 }
 
-include __DIR__ . '/footer.php';
+include __DIR__.'/footer.php';

htdocs/modules/profile/activate.php

Spacing +11 added lines, -11 removed lines

@@ -18,7 +18,7 @@ 
  */
 
 $xoopsOption['pagetype'] = 'user';
-include __DIR__ . '/header.php';
+include __DIR__.'/header.php';
 
 include $GLOBALS['xoops']->path('header.php');
 if (!empty($_GET['id']) && !empty($_GET['actkey'])) {
@@ -34,10 +34,10 @@ 
         redirect_header(XOOPS_URL, 1, '');
     }
     if ($thisuser->getVar('actkey') != $actkey) {
-        redirect_header(XOOPS_URL . '/', 5, _US_ACTKEYNOT);
+        redirect_header(XOOPS_URL.'/', 5, _US_ACTKEYNOT);
     } else {
         if ($thisuser->getVar('level') > 0) {
-            redirect_header(XOOPS_URL . '/modules/' . $GLOBALS['xoopsModule']->getVar('dirname', 'n') . '/index.php', 5, _US_ACONTACT, false);
+            redirect_header(XOOPS_URL.'/modules/'.$GLOBALS['xoopsModule']->getVar('dirname', 'n').'/index.php', 5, _US_ACONTACT, false);
         } else {
             if (false !== $member_handler->activateUser($thisuser)) {
                 $xoopsPreload = XoopsPreload::getInstance();
@@ -47,12 +47,12 @@ 
                 $GLOBALS['xoopsConfigUser'] = $config_handler->getConfigsByCat(XOOPS_CONF_USER);
                 if ($GLOBALS['xoopsConfigUser']['activation_type'] == 2) {
                     $myts        = MyTextSanitizer::getInstance();
-                    $xoopsMailer =& xoops_getMailer();
+                    $xoopsMailer = & xoops_getMailer();
                     $xoopsMailer->useMail();
                     $xoopsMailer->setTemplate('activated.tpl');
                     $xoopsMailer->assign('SITENAME', $GLOBALS['xoopsConfig']['sitename']);
                     $xoopsMailer->assign('ADMINMAIL', $GLOBALS['xoopsConfig']['adminmail']);
-                    $xoopsMailer->assign('SITEURL', XOOPS_URL . '/');
+                    $xoopsMailer->assign('SITEURL', XOOPS_URL.'/');
                     $xoopsMailer->setToUsers($thisuser);
                     $xoopsMailer->setFromEmail($GLOBALS['xoopsConfig']['adminmail']);
                     $xoopsMailer->setFromName($GLOBALS['xoopsConfig']['sitename']);
@@ -63,12 +63,12 @@ 
                     } else {
                         printf(_US_ACTVMAILOK, $thisuser->getVar('uname'));
                     }
-                    include __DIR__ . '/footer.php';
+                    include __DIR__.'/footer.php';
                 } else {
-                    redirect_header(XOOPS_URL . '/user.php', 5, _US_ACTLOGIN, false);
+                    redirect_header(XOOPS_URL.'/user.php', 5, _US_ACTLOGIN, false);
                 }
             } else {
-                redirect_header(XOOPS_URL . '/index.php', 5, 'Activation failed!');
+                redirect_header(XOOPS_URL.'/index.php', 5, 'Activation failed!');
             }
         }
     }
@@ -84,12 +84,12 @@ 
     if ($getuser[0]->isActive()) {
         redirect_header(XOOPS_URL, 2, sprintf(_US_USERALREADYACTIVE, $getuser[0]->getVar('email')));
     }
-    $xoopsMailer =& xoops_getMailer();
+    $xoopsMailer = & xoops_getMailer();
     $xoopsMailer->useMail();
     $xoopsMailer->setTemplate('register.tpl');
     $xoopsMailer->assign('SITENAME', $GLOBALS['xoopsConfig']['sitename']);
     $xoopsMailer->assign('ADMINMAIL', $GLOBALS['xoopsConfig']['adminmail']);
-    $xoopsMailer->assign('SITEURL', XOOPS_URL . '/');
+    $xoopsMailer->assign('SITEURL', XOOPS_URL.'/');
     $xoopsMailer->setToUsers($getuser[0]);
     $xoopsMailer->setFromEmail($GLOBALS['xoopsConfig']['adminmail']);
     $xoopsMailer->setFromName($GLOBALS['xoopsConfig']['sitename']);
@@ -108,4 +108,4 @@ 
 }
 
 $xoBreadcrumbs[] = array('title' => _PROFILE_MA_REGISTER);
-include __DIR__ . '/footer.php';
+include __DIR__.'/footer.php';

htdocs/modules/profile/edituser.php

Spacing +23 added lines, -23 removed lines

@@ -18,7 +18,7 @@ 
  */
 
 $xoopsOption['pagetype'] = 'user';
-include __DIR__ . '/header.php';
+include __DIR__.'/header.php';
 include_once $GLOBALS['xoops']->path('class/xoopsformloader.php');
 
 // If not a user, redirect
@@ -34,12 +34,12 @@ 
 
 if ($op === 'save') {
     if (!$GLOBALS['xoopsSecurity']->check()) {
-        redirect_header(XOOPS_URL . '/modules/' . $GLOBALS['xoopsModule']->getVar('dirname', 'n') . '/', 3, _US_NOEDITRIGHT . '<br>' . implode('<br>', $GLOBALS['xoopsSecurity']->getErrors()));
+        redirect_header(XOOPS_URL.'/modules/'.$GLOBALS['xoopsModule']->getVar('dirname', 'n').'/', 3, _US_NOEDITRIGHT.'<br>'.implode('<br>', $GLOBALS['xoopsSecurity']->getErrors()));
         exit();
     }
     $uid      = $GLOBALS['xoopsUser']->getVar('uid');
     $errors   = array();
-    $edituser =& $GLOBALS['xoopsUser'];
+    $edituser = & $GLOBALS['xoopsUser'];
     if ($GLOBALS['xoopsUser']->isAdmin()) {
         $edituser->setVar('uname', trim($_POST['uname']));
         $edituser->setVar('email', trim($_POST['email']));
@@ -83,7 +83,7 @@ 
             $profile->setVar('profile_id', $edituser->getVar('uid'));
             $profile_handler->insert($profile);
             unset($_SESSION['xoopsUserTheme']);
-            redirect_header(XOOPS_URL . '/modules/' . $GLOBALS['xoopsModule']->getVar('dirname', 'n') . '/userinfo.php?uid=' . $edituser->getVar('uid'), 2, _US_PROFUPDATED);
+            redirect_header(XOOPS_URL.'/modules/'.$GLOBALS['xoopsModule']->getVar('dirname', 'n').'/userinfo.php?uid='.$edituser->getVar('uid'), 2, _US_PROFUPDATED);
         }
     }
 }
@@ -91,7 +91,7 @@ 
 if ($op === 'editprofile') {
     $GLOBALS['xoopsOption']['template_main'] = 'profile_editprofile.tpl';
     include_once $GLOBALS['xoops']->path('header.php');
-    include_once __DIR__ . '/include/forms.php';
+    include_once __DIR__.'/include/forms.php';
     $form = profile_getUserForm($GLOBALS['xoopsUser']);
     $form->assign($GLOBALS['xoopsTpl']);
     if (!empty($stop)) {
@@ -108,13 +108,13 @@ 
 
     $oldavatar = $GLOBALS['xoopsUser']->getVar('user_avatar');
     if (!empty($oldavatar) && $oldavatar !== 'blank.gif') {
-        $GLOBALS['xoopsTpl']->assign('old_avatar', XOOPS_UPLOAD_URL . '/' . $oldavatar);
+        $GLOBALS['xoopsTpl']->assign('old_avatar', XOOPS_UPLOAD_URL.'/'.$oldavatar);
     }
     if ($GLOBALS['xoopsConfigUser']['avatar_allow_upload'] == 1 && $GLOBALS['xoopsUser']->getVar('posts') >= $GLOBALS['xoopsConfigUser']['avatar_minposts']) {
         include_once $GLOBALS['xoops']->path('class/xoopsformloader.php');
-        $form = new XoopsThemeForm(_US_UPLOADMYAVATAR, 'uploadavatar', XOOPS_URL . '/modules/' . $GLOBALS['xoopsModule']->getVar('dirname', 'n') . '/edituser.php', 'post', true);
+        $form = new XoopsThemeForm(_US_UPLOADMYAVATAR, 'uploadavatar', XOOPS_URL.'/modules/'.$GLOBALS['xoopsModule']->getVar('dirname', 'n').'/edituser.php', 'post', true);
         $form->setExtra('enctype="multipart/form-data"');
-        $form->addElement(new XoopsFormLabel(_US_MAXPIXEL, $GLOBALS['xoopsConfigUser']['avatar_width'] . ' x ' . $GLOBALS['xoopsConfigUser']['avatar_height']));
+        $form->addElement(new XoopsFormLabel(_US_MAXPIXEL, $GLOBALS['xoopsConfigUser']['avatar_width'].' x '.$GLOBALS['xoopsConfigUser']['avatar_height']));
         $form->addElement(new XoopsFormLabel(_US_MAXIMGSZ, $GLOBALS['xoopsConfigUser']['avatar_maxsize']));
         $form->addElement(new XoopsFormFile(_US_SELFILE, 'avatarfile', $GLOBALS['xoopsConfigUser']['avatar_maxsize']), true);
         $form->addElement(new XoopsFormHidden('op', 'avatarupload'));
@@ -123,18 +123,18 @@ 
         $form->assign($GLOBALS['xoopsTpl']);
     }
     $avatar_handler  = xoops_getHandler('avatar');
-    $form2           = new XoopsThemeForm(_US_CHOOSEAVT, 'chooseavatar', XOOPS_URL . '/modules/' . $GLOBALS['xoopsModule']->getVar('dirname', 'n') . '/edituser.php', 'post', true);
+    $form2           = new XoopsThemeForm(_US_CHOOSEAVT, 'chooseavatar', XOOPS_URL.'/modules/'.$GLOBALS['xoopsModule']->getVar('dirname', 'n').'/edituser.php', 'post', true);
     $avatar_select   = new XoopsFormSelect('', 'user_avatar', $GLOBALS['xoopsUser']->getVar('user_avatar'));
     $avatar_list     = $avatar_handler->getList('S', true);
     $avatar_selected = $GLOBALS['xoopsUser']->getVar('user_avatar', 'E');
     //    $avatar_selected = in_array($avatar_selected, array_keys($avatar_list)) ? $avatar_selected : "blank.gif";
     $avatar_selected = array_key_exists($avatar_selected, $avatar_list) ? $avatar_selected : 'blank.gif';
     $avatar_select->addOptionArray($avatar_list);
-    $avatar_select->setExtra("onchange='showImgSelected(\"avatar\", \"user_avatar\", \"uploads\", \"\", \"" . XOOPS_URL . "\")'");
+    $avatar_select->setExtra("onchange='showImgSelected(\"avatar\", \"user_avatar\", \"uploads\", \"\", \"".XOOPS_URL."\")'");
     $avatar_tray = new XoopsFormElementTray(_US_AVATAR, '&nbsp;');
     $avatar_tray->addElement($avatar_select);
-    $avatar_tray->addElement(new XoopsFormLabel('', "<a href=\"javascript:openWithSelfMain('" . XOOPS_URL . "/misc.php?action=showpopups&amp;type=avatars','avatars',600,400);\">" . _LIST . '</a><br>'));
-    $avatar_tray->addElement(new XoopsFormLabel('', "<br><img src='" . XOOPS_UPLOAD_URL . '/' . $avatar_selected . "' name='avatar' id='avatar' alt='' />"));
+    $avatar_tray->addElement(new XoopsFormLabel('', "<a href=\"javascript:openWithSelfMain('".XOOPS_URL."/misc.php?action=showpopups&amp;type=avatars','avatars',600,400);\">"._LIST.'</a><br>'));
+    $avatar_tray->addElement(new XoopsFormLabel('', "<br><img src='".XOOPS_UPLOAD_URL.'/'.$avatar_selected."' name='avatar' id='avatar' alt='' />"));
     $form2->addElement($avatar_tray);
     $form2->addElement(new XoopsFormHidden('uid', $GLOBALS['xoopsUser']->getVar('uid')));
     $form2->addElement(new XoopsFormHidden('op', 'avatarchoose'));
@@ -144,7 +144,7 @@ 
 
 if ($op === 'avatarupload') {
     if (!$GLOBALS['xoopsSecurity']->check()) {
-        redirect_header('index.php', 3, _US_NOEDITRIGHT . '<br>' . implode('<br>', $GLOBALS['xoopsSecurity']->getErrors()));
+        redirect_header('index.php', 3, _US_NOEDITRIGHT.'<br>'.implode('<br>', $GLOBALS['xoopsSecurity']->getErrors()));
         exit;
     }
     $xoops_upload_file = array();
@@ -160,7 +160,7 @@ 
     }
     if ($GLOBALS['xoopsConfigUser']['avatar_allow_upload'] == 1 && $GLOBALS['xoopsUser']->getVar('posts') >= $GLOBALS['xoopsConfigUser']['avatar_minposts']) {
         include_once $GLOBALS['xoops']->path('class/uploader.php');
-        $uploader = new XoopsMediaUploader(XOOPS_UPLOAD_PATH . '/avatars', array(
+        $uploader = new XoopsMediaUploader(XOOPS_UPLOAD_PATH.'/avatars', array(
             'image/gif',
             'image/jpeg',
             'image/pjpeg',
@@ -172,7 +172,7 @@ 
                 /* @var $avt_handler XoopsAvatarHandler */
                 $avt_handler = xoops_getHandler('avatar');
                 $avatar      = $avt_handler->create();
-                $avatar->setVar('avatar_file', 'avatars/' . $uploader->getSavedFileName());
+                $avatar->setVar('avatar_file', 'avatars/'.$uploader->getSavedFileName());
                 $avatar->setVar('avatar_name', $GLOBALS['xoopsUser']->getVar('uname'));
                 $avatar->setVar('avatar_mimetype', $uploader->getMediaType());
                 $avatar->setVar('avatar_display', 1);
@@ -185,16 +185,16 @@ 
                         $avatars = $avt_handler->getObjects(new Criteria('avatar_file', $oldavatar));
                         if (!empty($avatars) && count($avatars) == 1 && is_object($avatars[0])) {
                             $avt_handler->delete($avatars[0]);
-                            $oldavatar_path = realpath(XOOPS_UPLOAD_PATH . '/' . $oldavatar);
+                            $oldavatar_path = realpath(XOOPS_UPLOAD_PATH.'/'.$oldavatar);
                             if (0 === strpos($oldavatar_path, XOOPS_UPLOAD_PATH) && is_file($oldavatar_path)) {
                                 unlink($oldavatar_path);
                             }
                         }
                     }
-                    $sql = sprintf('UPDATE %s SET user_avatar = %s WHERE uid = %u', $GLOBALS['xoopsDB']->prefix('users'), $GLOBALS['xoopsDB']->quoteString('avatars/' . $uploader->getSavedFileName()), $GLOBALS['xoopsUser']->getVar('uid'));
+                    $sql = sprintf('UPDATE %s SET user_avatar = %s WHERE uid = %u', $GLOBALS['xoopsDB']->prefix('users'), $GLOBALS['xoopsDB']->quoteString('avatars/'.$uploader->getSavedFileName()), $GLOBALS['xoopsUser']->getVar('uid'));
                     $GLOBALS['xoopsDB']->query($sql);
                     $avt_handler->addUser($avatar->getVar('avatar_id'), $GLOBALS['xoopsUser']->getVar('uid'));
-                    redirect_header('userinfo.php?t=' . time() . '&amp;uid=' . $GLOBALS['xoopsUser']->getVar('uid'), 3, _US_PROFUPDATED);
+                    redirect_header('userinfo.php?t='.time().'&amp;uid='.$GLOBALS['xoopsUser']->getVar('uid'), 3, _US_PROFUPDATED);
                 }
             }
         }
@@ -204,7 +204,7 @@ 
 
 if ($op === 'avatarchoose') {
     if (!$GLOBALS['xoopsSecurity']->check()) {
-        redirect_header('index.php', 3, _US_NOEDITRIGHT . '<br>' . implode('<br>', $GLOBALS['xoopsSecurity']->getErrors()));
+        redirect_header('index.php', 3, _US_NOEDITRIGHT.'<br>'.implode('<br>', $GLOBALS['xoopsSecurity']->getErrors()));
         exit;
     }
     $uid = 0;
@@ -226,7 +226,7 @@ 
         }
         unset($avatars, $criteria_avatar);
     }
-    $user_avatarpath = realpath(XOOPS_UPLOAD_PATH . '/' . $user_avatar);
+    $user_avatarpath = realpath(XOOPS_UPLOAD_PATH.'/'.$user_avatar);
     if (0 === strpos($user_avatarpath, realpath(XOOPS_UPLOAD_PATH)) && is_file($user_avatarpath)) {
         $oldavatar = $GLOBALS['xoopsUser']->getVar('user_avatar');
         $GLOBALS['xoopsUser']->setVar('user_avatar', $user_avatar);
@@ -243,7 +243,7 @@ 
             $avatars = $avt_handler->getObjects(new Criteria('avatar_file', $oldavatar));
             if (!empty($avatars) && count($avatars) == 1 && is_object($avatars[0])) {
                 $avt_handler->delete($avatars[0]);
-                $oldavatar_path = realpath(XOOPS_UPLOAD_PATH . '/' . $oldavatar);
+                $oldavatar_path = realpath(XOOPS_UPLOAD_PATH.'/'.$oldavatar);
                 if (0 === strpos($oldavatar_path, realpath(XOOPS_UPLOAD_PATH)) && is_file($oldavatar_path)) {
                     unlink($oldavatar_path);
                 }
@@ -256,6 +256,6 @@ 
             }
         }
     }
-    redirect_header('userinfo.php?uid=' . $uid, 0, _US_PROFUPDATED);
+    redirect_header('userinfo.php?uid='.$uid, 0, _US_PROFUPDATED);
 }
-include __DIR__ . '/footer.php';
+include __DIR__.'/footer.php';

htdocs/modules/profile/class/field.php

Indentation +2 added lines, -2 removed lines

@@ -466,7 +466,7 @@ 
         if (!($obj instanceof $this->className)) {
             return false;
         }
-         /* @var $profile_handler ProfileProfileHandler */
+            /* @var $profile_handler ProfileProfileHandler */
         $profile_handler = xoops_getModuleHandler('profile', 'profile');
         $obj->setVar('field_name', str_replace(' ', '_', $obj->getVar('field_name')));
         $obj->cleanVars();
@@ -608,7 +608,7 @@ 
         if (!($obj instanceof $this->className)) {
             return false;
         }
-         /* @var $profile_handler ProfileProfileHandler */
+            /* @var $profile_handler ProfileProfileHandler */
         $profile_handler = xoops_getModuleHandler('profile', 'profile');
         // remove column from table
         $sql = 'ALTER TABLE ' . $profile_handler->table . ' DROP `' . $obj->getVar('field_name', 'n') . '`';

Spacing +9 added lines, -9 removed lines

@@ -139,7 +139,7 @@ 
 
                     $eltmsg                          = empty($caption) ? sprintf(_FORM_ENTER, $name) : sprintf(_FORM_ENTER, $caption);
                     $eltmsg                          = str_replace('"', '\"', stripslashes($eltmsg));
-                    $element->customValidationCode[] = "\nvar hasSelected = false; var selectBox = myform.{$name};" . "for (i = 0; i < selectBox.options.length; i++) { if (selectBox.options[i].selected == true && selectBox.options[i].value != '') { hasSelected = true; break; } }" . "if (!hasSelected) { window.alert(\"{$eltmsg}\"); selectBox.focus(); return false; }";
+                    $element->customValidationCode[] = "\nvar hasSelected = false; var selectBox = myform.{$name};"."for (i = 0; i < selectBox.options.length; i++) { if (selectBox.options[i].selected == true && selectBox.options[i].value != '') { hasSelected = true; break; } }"."if (!hasSelected) { window.alert(\"{$eltmsg}\"); selectBox.focus(); return false; }";
                 }
                 $element->addOptionArray($options);
                 break;
@@ -226,7 +226,7 @@ 
      **/
     public function getOutputValue(&$user, $profile)
     {
-        if (file_exists($file = $GLOBALS['xoops']->path('modules/profile/language/' . $GLOBALS['xoopsConfig']['language'] . '/modinfo.php'))) {
+        if (file_exists($file = $GLOBALS['xoops']->path('modules/profile/language/'.$GLOBALS['xoopsConfig']['language'].'/modinfo.php'))) {
             include_once $file;
         } else {
             include_once $GLOBALS['xoops']->path('modules/profile/language/english/modinfo.php');
@@ -239,7 +239,7 @@ 
             case 'textbox':
                 $value = is_array($value) ? $value[0] : $value;
                 if ($this->getVar('field_name') === 'url' && $value !== '') {
-                    return '<a href="' . formatURL($value) . '" rel="external">' . $value . '</a>';
+                    return '<a href="'.formatURL($value).'" rel="external">'.$value.'</a>';
                 } else {
                     return $value;
                 }
@@ -333,10 +333,10 @@ 
                 $userrank       = $user->rank();
                 $user_rankimage = '';
                 if (isset($userrank['image']) && $userrank['image'] !== '') {
-                    $user_rankimage = '<img src="' . XOOPS_UPLOAD_URL . '/' . $userrank['image'] . '" alt="' . $userrank['title'] . '" /><br>';
+                    $user_rankimage = '<img src="'.XOOPS_UPLOAD_URL.'/'.$userrank['image'].'" alt="'.$userrank['title'].'" /><br>';
                 }
 
-                return $user_rankimage . $userrank['title'];
+                return $user_rankimage.$userrank['title'];
                 break;
 
             case 'yesno':
@@ -443,7 +443,7 @@ 
             $this->table_link = $this->db->prefix('profile_category');
             $criteria         = new Criteria('o.field_id', 0, '!=');
             $criteria->setSort('l.cat_weight ASC, o.field_weight');
-            $field_objs =& $this->getByLink($criteria, array('o.*'), true, 'cat_id', 'cat_id');
+            $field_objs = & $this->getByLink($criteria, array('o.*'), true, 'cat_id', 'cat_id');
             foreach (array_keys($field_objs) as $i) {
                 $fields[$field_objs[$i]->getVar('field_name')] = $field_objs[$i];
             }
@@ -529,7 +529,7 @@ 
                 //update column information
                 $changetype = 'MODIFY COLUMN';
             }
-            $maxlengthstring = $obj->getVar('field_maxlength') > 0 ? '(' . $obj->getVar('field_maxlength') . ')' : '';
+            $maxlengthstring = $obj->getVar('field_maxlength') > 0 ? '('.$obj->getVar('field_maxlength').')' : '';
 
             //set type
             switch ($obj->getVar('field_valuetype')) {
@@ -579,7 +579,7 @@ 
                     break;
             }
 
-            $sql = 'ALTER TABLE `' . $profile_handler->table . '` ' . $changetype . ' `' . $obj->cleanVars['field_name'] . '` ' . $type . $maxlengthstring . ' NULL';
+            $sql = 'ALTER TABLE `'.$profile_handler->table.'` '.$changetype.' `'.$obj->cleanVars['field_name'].'` '.$type.$maxlengthstring.' NULL';
             $result = $force ? $this->db->queryF($sql) : $this->db->query($sql);
             if (!$result) {
                 $obj->setErrors($this->db->error());
@@ -611,7 +611,7 @@ 
          /* @var $profile_handler ProfileProfileHandler */
         $profile_handler = xoops_getModuleHandler('profile', 'profile');
         // remove column from table
-        $sql = 'ALTER TABLE ' . $profile_handler->table . ' DROP `' . $obj->getVar('field_name', 'n') . '`';
+        $sql = 'ALTER TABLE '.$profile_handler->table.' DROP `'.$obj->getVar('field_name', 'n').'`';
         if ($this->db->query($sql)) {
             //change this to update the cached field information storage
             if (!parent::delete($obj, $force)) {

htdocs/modules/profile/class/visibility.php

Spacing +2 added lines, -2 removed lines

@@ -59,8 +59,8 @@
     public function getVisibleFields($profile_groups, $user_groups = null)
     {
         $profile_groups[] = $user_groups[] = 0;
-        $sql  = "SELECT field_id FROM {$this->table} WHERE profile_group IN (" . implode(',', $profile_groups) . ')';
-        $sql .= ' AND user_group IN (' . implode(',', $user_groups) . ')';
+        $sql  = "SELECT field_id FROM {$this->table} WHERE profile_group IN (".implode(',', $profile_groups).')';
+        $sql .= ' AND user_group IN ('.implode(',', $user_groups).')';
         $field_ids = array();
         if ($result = $this->db->query($sql)) {
             while (false !== (list($field_id) = $this->db->fetchRow($result))) {

htdocs/modules/profile/class/profile.php

Spacing +11 added lines, -11 removed lines

@@ -235,9 +235,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->db->error() . '</span>';
+            $msg = '&nbsp;&nbsp;<span class="red">ERROR: Could not insert field <strong>'.$vars['name'].'</strong> into the database. '.implode(' ', $field->getErrors()).$this->db->error().'</span>';
         }
         unset($field);
 
@@ -295,32 +295,32 @@ 
         $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);
         }
 
-        $sql_select = 'SELECT ' . (empty($searchvars) ? 'u.*, p.*' : implode(', ', $sv));
-        $sql_from   = ' FROM ' . $this->db->prefix('users') . ' AS u LEFT JOIN ' . $this->table . ' AS p ON u.uid=p.profile_id' . (empty($groups) ? '' : ' LEFT JOIN ' . $this->db->prefix('groups_users_link') . ' AS g ON u.uid=g.uid');
+        $sql_select = 'SELECT '.(empty($searchvars) ? 'u.*, p.*' : implode(', ', $sv));
+        $sql_from   = ' FROM '.$this->db->prefix('users').' AS u LEFT JOIN '.$this->table.' AS p ON u.uid=p.profile_id'.(empty($groups) ? '' : ' LEFT JOIN '.$this->db->prefix('groups_users_link').' AS g ON u.uid=g.uid');
         $sql_clause = ' WHERE 1=1';
         $sql_order  = '';
 
         $limit = $start = 0;
         if (isset($criteria) && is_subclass_of($criteria, 'CriteriaElement')) {
-            $sql_clause .= ' AND ' . $criteria->render();
+            $sql_clause .= ' AND '.$criteria->render();
             if ($criteria->getSort() !== '') {
-                $sql_order = ' ORDER BY ' . $criteria->getSort() . ' ' . $criteria->getOrder();
+                $sql_order = ' ORDER BY '.$criteria->getSort().' '.$criteria->getOrder();
             }
             $limit = $criteria->getLimit();
             $start = $criteria->getStart();
         }
 
         if (!empty($groups)) {
-            $sql_clause .= ' AND g.groupid IN (' . implode(', ', $groups) . ')';
+            $sql_clause .= ' AND g.groupid IN ('.implode(', ', $groups).')';
         }
 
-        $sql_users = $sql_select . $sql_from . $sql_clause . $sql_order;
+        $sql_users = $sql_select.$sql_from.$sql_clause.$sql_order;
         $result    = $this->db->query($sql_users, $limit, $start);
 
         if (!$result) {
@@ -347,7 +347,7 @@ 
 
         $count = count($users);
         if ((!empty($limit) && $count >= $limit) || !empty($start)) {
-            $sql_count = 'SELECT COUNT(*)' . $sql_from . $sql_clause;
+            $sql_count = 'SELECT COUNT(*)'.$sql_from.$sql_clause;
             $result    = $this->db->query($sql_count);
             list($count) = $this->db->fetchRow($result);
         }

htdocs/modules/profile/admin/category.php

Indentation +3 added lines, -3 removed lines

@@ -89,9 +89,9 @@
             }
         } else {
             xoops_confirm(array(
-                              'ok' => 1,
-                              'id' => $_REQUEST['id'],
-                              'op' => 'delete'), $_SERVER['REQUEST_URI'], sprintf(_PROFILE_AM_RUSUREDEL, $obj->getVar('cat_title')));
+                                'ok' => 1,
+                                'id' => $_REQUEST['id'],
+                                'op' => 'delete'), $_SERVER['REQUEST_URI'], sprintf(_PROFILE_AM_RUSUREDEL, $obj->getVar('cat_title')));
         }
         break;
 }

Spacing +6 added lines, -6 removed lines

@@ -17,11 +17,11 @@ 
  * @author         XOOPS Development Team
  */
 
-include_once __DIR__ . '/admin_header.php';
+include_once __DIR__.'/admin_header.php';
 xoops_cp_header();
 $indexAdmin = new ModuleAdmin();
 
-$indexAdmin->addItemButton(_ADD . ' ' . _PROFILE_AM_CATEGORY, 'category.php?op=new', 'add', '');
+$indexAdmin->addItemButton(_ADD.' '._PROFILE_AM_CATEGORY, 'category.php?op=new', 'add', '');
 
 echo $indexAdmin->addNavigation(basename(__FILE__));
 echo $indexAdmin->renderButton('right', '');
@@ -41,14 +41,14 @@ 
         break;
 
     case 'new':
-        include_once dirname(__DIR__) . '/include/forms.php';
+        include_once dirname(__DIR__).'/include/forms.php';
         $obj  = $handler->create();
         $form = $obj->getForm();
         $form->display();
         break;
 
     case 'edit':
-        include_once dirname(__DIR__) . '/include/forms.php';
+        include_once dirname(__DIR__).'/include/forms.php';
         $obj  = $handler->get($_REQUEST['id']);
         $form = $obj->getForm();
         $form->display();
@@ -69,7 +69,7 @@ 
         if ($handler->insert($obj)) {
             redirect_header('category.php', 3, sprintf(_PROFILE_AM_SAVEDSUCCESS, _PROFILE_AM_CATEGORY));
         }
-        include_once dirname(__DIR__) . '/include/forms.php';
+        include_once dirname(__DIR__).'/include/forms.php';
         echo $obj->getHtmlErrors();
         /* @var  $form XoopsThemeForm */
         $form = $obj->getForm();
@@ -98,4 +98,4 @@ 
 if (isset($template_main)) {
     $GLOBALS['xoopsTpl']->display("db:{$template_main}");
 }
-include_once __DIR__ . '/admin_footer.php';
+include_once __DIR__.'/admin_footer.php';

htdocs/modules/profile/admin/admin_header.php

Spacing +7 added lines, -7 removed lines

@@ -17,9 +17,9 @@ 
  */
 
 $path = dirname(dirname(dirname(__DIR__)));
-include_once $path . '/mainfile.php';
-include_once $path . '/include/cp_functions.php';
-require_once $path . '/include/cp_header.php';
+include_once $path.'/mainfile.php';
+include_once $path.'/include/cp_functions.php';
+require_once $path.'/include/cp_header.php';
 
 global $xoopsModule;
 
@@ -33,18 +33,18 @@ 
 xoops_loadLanguage('modinfo', $thisModuleDir);
 xoops_loadLanguage('main', $thisModuleDir);
 
-$pathIcon16      = '../' . $xoopsModule->getInfo('icons16');
-$pathIcon32      = '../' . $xoopsModule->getInfo('icons32');
+$pathIcon16      = '../'.$xoopsModule->getInfo('icons16');
+$pathIcon32      = '../'.$xoopsModule->getInfo('icons32');
 $pathModuleAdmin = $xoopsModule->getInfo('dirmoduleadmin');
 
 $myts = MyTextSanitizer::getInstance();
 
 if (!isset($xoopsTpl) || !is_object($xoopsTpl)) {
-    include_once XOOPS_ROOT_PATH . '/class/template.php';
+    include_once XOOPS_ROOT_PATH.'/class/template.php';
     $xoopsTpl = new XoopsTpl();
 }
 
-include_once $GLOBALS['xoops']->path($pathModuleAdmin . '/moduleadmin.php');
+include_once $GLOBALS['xoops']->path($pathModuleAdmin.'/moduleadmin.php');
 
 xoops_loadLanguage('user');
 if (!isset($GLOBALS['xoopsTpl']) || !is_object($GLOBALS['xoopsTpl'])) {