XOOPS / XoopsCore

htdocs/modules/profile/admin/visibility.php

Spacing +1 added lines, -1 removed lines

@@ -24,7 +24,7 @@
  * @author          Jan Pedersen
  * @author          Taiwen Jiang <phppp@users.sourceforge.net>
  */
-include __DIR__ . '/header.php';
+include __DIR__.'/header.php';
 // Get main instance
 $system = System::getInstance();
 $xoops = Xoops::getInstance();

htdocs/modules/profile/admin/deactivate.php

Spacing +2 added lines, -2 removed lines

@@ -21,7 +21,7 @@ 
  * @author          Taiwen Jiang <phppp@users.sourceforge.net>
  */
 
-include __DIR__ . '/header.php';
+include __DIR__.'/header.php';
 $xoops = Xoops::getInstance();
 $xoops->header();
 
@@ -51,4 +51,4 @@ 
         $message = _PROFILE_AM_USER_NOT_DEACTIVATED;
     }
 }
-$xoops->redirect($xoops->url('modules/profile/userinfo.php?uid=' . $user->getVar('uid')), 3, $message);
+$xoops->redirect($xoops->url('modules/profile/userinfo.php?uid='.$user->getVar('uid')), 3, $message);

htdocs/modules/profile/admin/category.php

Spacing +5 added lines, -5 removed lines

@@ -19,7 +19,7 @@ 
  * @author          Taiwen Jiang <phppp@users.sourceforge.net>
  */
 
-include __DIR__ . '/header.php';
+include __DIR__.'/header.php';
 // Get main instance
 $system = System::getInstance();
 $xoops = Xoops::getInstance();
@@ -37,7 +37,7 @@ 
 switch ($op) {
     case "list":
     default:
-        $admin_page->addItemButton(XoopsLocale::A_ADD . ' ' . _PROFILE_AM_CATEGORY, 'category.php?op=new', 'add');
+        $admin_page->addItemButton(XoopsLocale::A_ADD.' '._PROFILE_AM_CATEGORY, 'category.php?op=new', 'add');
         $admin_page->renderButton();
         $criteria = new CriteriaCompo();
         $criteria->setSort('cat_weight');
@@ -55,7 +55,7 @@ 
         break;
 
     case "edit":
-        $admin_page->addItemButton(XoopsLocale::A_ADD . ' ' . _PROFILE_AM_CATEGORY, 'category.php?op=new', 'add');
+        $admin_page->addItemButton(XoopsLocale::A_ADD.' '._PROFILE_AM_CATEGORY, 'category.php?op=new', 'add');
         $admin_page->addItemButton(_PROFILE_AM_CATEGORY_LIST, 'category.php', 'application-view-detail');
         $admin_page->renderButton();
         $id = $system->cleanVars($_REQUEST, 'id', 0, 'int');
@@ -90,7 +90,7 @@ 
         break;
 
     case "delete":
-        $admin_page->addItemButton(XoopsLocale::A_ADD . ' ' . _PROFILE_AM_CATEGORY, 'category.php?op=new', 'add');
+        $admin_page->addItemButton(XoopsLocale::A_ADD.' '._PROFILE_AM_CATEGORY, 'category.php?op=new', 'add');
         $admin_page->addItemButton(_PROFILE_AM_CATEGORY_LIST, 'category.php', 'application-view-detail');
         $admin_page->renderButton();
         $id = $system->cleanVars($_REQUEST, 'id', 0, 'int');
@@ -112,7 +112,7 @@ 
                 echo $xoops->confirm(
                     array("ok" => 1, "id" => $id, "op" => "delete"),
                     'category.php',
-                    sprintf(_PROFILE_AM_RUSUREDEL, $obj->getVar('cat_title')) . '<br />'
+                    sprintf(_PROFILE_AM_RUSUREDEL, $obj->getVar('cat_title')).'<br />'
                 );
             }
         } else {

htdocs/modules/profile/admin/permissions.php

Spacing +2 added lines, -2 removed lines

@@ -21,7 +21,7 @@ 
  * @author          Jan Pedersen
  * @author          Taiwen Jiang <phppp@users.sourceforge.net>
  */
-include __DIR__ . '/header.php';
+include __DIR__.'/header.php';
 // Get main instance
 $system = System::getInstance();
 $xoops = Xoops::getInstance();
@@ -75,7 +75,7 @@ 
 $opform->display();
 
 $module_id = $xoops->module->getVar('mid');
-$form = new Xoops\Form\GroupPermissionForm($title_of_form, $module_id, $perm_name, $perm_desc, 'admin/permissions.php?op=' . $op, $anonymous);
+$form = new Xoops\Form\GroupPermissionForm($title_of_form, $module_id, $perm_name, $perm_desc, 'admin/permissions.php?op='.$op, $anonymous);
 
 if ($op === 'access') {
     $member_handler = $xoops->getHandlerMember();

htdocs/modules/profile/admin/user.php

Spacing +7 added lines, -7 removed lines

@@ -21,7 +21,7 @@ 
  * @author          Jan Pedersen
  * @author          Taiwen Jiang <phppp@users.sourceforge.net>
  */
-include __DIR__ . '/header.php';
+include __DIR__.'/header.php';
 
 $xoops = Xoops::getInstance();
 $xoops->header();
@@ -51,7 +51,7 @@ 
 
     case "new":
         $xoops->loadLanguage("main", $xoops->module->getVar('dirname', 'n'));
-        include_once dirname(__DIR__) . '/include/forms.php';
+        include_once dirname(__DIR__).'/include/forms.php';
         $obj = $handler->createUser();
         $obj->setGroups(array(FixedGroups::USERS));
         $form = profile_getUserForm($obj);
@@ -65,7 +65,7 @@ 
             // If not webmaster trying to edit a webmaster - disallow
             $xoops->redirect("user.php", 3, XoopsLocale::E_NO_ACTION_PERMISSION);
         }
-        include_once dirname(__DIR__) . '/include/forms.php';
+        include_once dirname(__DIR__).'/include/forms.php';
         $form = profile_getUserForm($obj);
         $form->display();
         break;
@@ -76,7 +76,7 @@ 
             $xoops->redirect(
                 'user.php',
                 3,
-                XoopsLocale::E_NO_ACTION_PERMISSION . "<br />"
+                XoopsLocale::E_NO_ACTION_PERMISSION."<br />"
                 . implode('<br />', $xoops->security()->getErrors())
             );
             exit;
@@ -195,7 +195,7 @@ 
             }
         }
         $user->setGroups($new_groups);
-        include_once dirname(__DIR__) . '/include/forms.php';
+        include_once dirname(__DIR__).'/include/forms.php';
         echo $user->getHtmlErrors();
         $form = profile_getUserForm($user, $profile);
         $form->display();
@@ -222,7 +222,7 @@ 
                     $xoops->redirect(
                         'user.php',
                         3,
-                        sprintf(_PROFILE_AM_DELETEDSUCCESS, $obj->getVar('uname') . " (" . $obj->getVar('email') . ")"),
+                        sprintf(_PROFILE_AM_DELETEDSUCCESS, $obj->getVar('uname')." (".$obj->getVar('email').")"),
                         false
                     );
                 } else {
@@ -236,7 +236,7 @@ 
             echo $xoops->confirm(
                 array('ok' => 1, 'id' => $_REQUEST['id'], 'op' => 'delete'),
                 $_SERVER['REQUEST_URI'],
-                sprintf(_PROFILE_AM_RUSUREDEL, $obj->getVar('uname') . " (" . $obj->getVar('email') . ")")
+                sprintf(_PROFILE_AM_RUSUREDEL, $obj->getVar('uname')." (".$obj->getVar('email').")")
             );
         }
         break;

htdocs/modules/profile/admin/header.php

Spacing +1 added lines, -1 removed lines

@@ -19,5 +19,5 @@
  * @author          Taiwen Jiang <phppp@users.sourceforge.net>
  */
 
-require_once dirname(dirname(dirname(__DIR__))) . '/include/cp_header.php';
+require_once dirname(dirname(dirname(__DIR__))).'/include/cp_header.php';
 XoopsLoad::load('system', 'system');

htdocs/modules/profile/admin/field.php

Spacing +8 added lines, -8 removed lines

@@ -21,7 +21,7 @@ 
  * @author          Jan Pedersen
  * @author          Taiwen Jiang <phppp@users.sourceforge.net>
  */
-include __DIR__ . '/header.php';
+include __DIR__.'/header.php';
 // Get main instance
 $system = System::getInstance();
 $xoops = Xoops::getInstance();
@@ -43,7 +43,7 @@ 
 switch ($op) {
     default:
     case "list":
-        $admin_page->addItemButton(XoopsLocale::A_ADD . ' ' . _PROFILE_AM_FIELD, 'field.php?op=new', 'add');
+        $admin_page->addItemButton(XoopsLocale::A_ADD.' '._PROFILE_AM_FIELD, 'field.php?op=new', 'add');
         $admin_page->renderButton();
         $fields = $field_handler->getObjects(null, true, false);
         $modules = $xoops->getHandlerModule()->getObjectsArray(null, true);
@@ -110,7 +110,7 @@ 
         break;
 
     case "edit":
-        $admin_page->addItemButton(XoopsLocale::A_ADD . ' ' . _PROFILE_AM_FIELD, 'field.php?op=new', 'add');
+        $admin_page->addItemButton(XoopsLocale::A_ADD.' '._PROFILE_AM_FIELD, 'field.php?op=new', 'add');
         $admin_page->addItemButton(_PROFILE_AM_FIELD_LIST, 'field.php', 'application-view-detail');
         $admin_page->renderButton();
         $id = $system->cleanVars($_REQUEST, 'id', 0, 'int');
@@ -143,7 +143,7 @@ 
                 $errors = array();
                 //if there are changed fields, fetch the fieldcategory objects
                 $fields = $field_handler->getObjects(
-                    new Criteria('field_id', "(" . implode(',', $ids) . ")", "IN"),
+                    new Criteria('field_id', "(".implode(',', $ids).")", "IN"),
                     true
                 );
                 foreach ($ids as $i) {
@@ -281,7 +281,7 @@ 
                         $removed_groups = array_diff(array_keys($groups), $_REQUEST[$perm]);
                         if (count($removed_groups) > 0) {
                             $criteria->add(
-                                new Criteria('gperm_groupid', "(" . implode(',', $removed_groups) . ")", "IN")
+                                new Criteria('gperm_groupid', "(".implode(',', $removed_groups).")", "IN")
                             );
                             $groupperm_handler->deleteAll($criteria);
                         }
@@ -292,7 +292,7 @@ 
                     unset($criteria);
                 }
             }
-            $url = $redirect_to_edit ? 'field.php?op=edit&amp;id=' . $obj->getVar('field_id') : 'field.php';
+            $url = $redirect_to_edit ? 'field.php?op=edit&amp;id='.$obj->getVar('field_id') : 'field.php';
             $xoops->redirect($url, 3, sprintf(_PROFILE_AM_SAVEDSUCCESS, _PROFILE_AM_FIELD));
         }
         echo $xoops->alert('error', $obj->getHtmlErrors());
@@ -301,7 +301,7 @@ 
         break;
 
     case "delete":
-        $admin_page->addItemButton(XoopsLocale::A_ADD . ' ' . _PROFILE_AM_FIELD, 'field.php?op=new', 'add');
+        $admin_page->addItemButton(XoopsLocale::A_ADD.' '._PROFILE_AM_FIELD, 'field.php?op=new', 'add');
         $admin_page->addItemButton(_PROFILE_AM_FIELD_LIST, 'field.php', 'application-view-detail');
         $admin_page->renderButton();
         $id = $system->cleanVars($_REQUEST, 'id', 0, 'int');
@@ -323,7 +323,7 @@ 
                 echo $xoops->confirm(
                     array("ok" => 1, "id" => $id, "op" => "delete"),
                     'field.php',
-                    sprintf(_PROFILE_AM_RUSUREDEL, $obj->getVar('field_title')) . '<br />'
+                    sprintf(_PROFILE_AM_RUSUREDEL, $obj->getVar('field_title')).'<br />'
                 );
             }
         } else {

htdocs/modules/profile/xoops_version.php

Spacing +1 added lines, -1 removed lines

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

htdocs/modules/profile/register.php

Spacing +18 added lines, -18 removed lines

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