View GitHub Repository XoopsCore

Schedule Inspection
Subscribe
Passed
Pull Request — master (#595)
by
unknown
17:03
created
Status
Category
Toggle Patches
htdocs/modules/profile/admin/about.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch 
@@ -20,7 +20,7 @@
 
 block discarded – undo
20 20 
  * @author          Mamba
21 21 
  */
22 22
23 
-include __DIR__ . '/header.php';
23 
+include __DIR__.'/header.php';
24 24
25 25 
 $xoops = Xoops::getInstance();
26 26 
 $xoops->header();
Please login to merge, or discard this patch.
htdocs/modules/profile/admin/step.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch 
@@ -19,7 +19,7 @@  discard block
 
 block discarded – undo
19 19 
  * @author          Jan Pedersen
20 20 
  * @author          Taiwen Jiang <[email protected]>
21 21 
  */
22 
-include __DIR__ . '/header.php';
22 
+include __DIR__.'/header.php';
23 23 
 // Get main instance
24 24 
 $system = System::getInstance();
25 25 
 $xoops = Xoops::getInstance();
 
@@ -39,7 +39,7 @@  discard block
 
 block discarded – undo
39 39 
     default:
40 40 
         // Add Scripts
41 41 
         $xoops->theme()->addScript('media/xoops/xoops.js');
42 
-        $admin_page->addItemButton(XoopsLocale::A_ADD . ' ' . _PROFILE_AM_STEP, 'step.php?op=new', 'add');
42 
+        $admin_page->addItemButton(XoopsLocale::A_ADD.' '._PROFILE_AM_STEP, 'step.php?op=new', 'add');
43 43 
         $admin_page->renderButton();
44 44 
         $xoops->tpl()->assign('steps', $regstep_Handler->getObjects(null, true, false));
45 45 
         $xoops->tpl()->assign('step', true);
 
@@ -54,7 +54,7 @@  discard block
 
 block discarded – undo
54 54 
         break;
55 55
56 56 
     case "edit":
57 
-        $admin_page->addItemButton(XoopsLocale::A_ADD . ' ' . _PROFILE_AM_STEP, 'step.php?op=new', 'add');
57 
+        $admin_page->addItemButton(XoopsLocale::A_ADD.' '._PROFILE_AM_STEP, 'step.php?op=new', 'add');
58 58 
         $admin_page->addItemButton(_PROFILE_AM_STEP_LIST, 'step.php', 'application-view-detail');
59 59 
         $admin_page->renderButton();
60 60 
         $id = $system->cleanVars($_REQUEST, 'id', 0, 'int');
 
@@ -90,7 +90,7 @@  discard block
 
 block discarded – undo
90 90 
         break;
91 91
92 92 
     case "delete":
93 
-        $admin_page->addItemButton(XoopsLocale::A_ADD . ' ' . _PROFILE_AM_STEP, 'step.php?op=new', 'add');
93 
+        $admin_page->addItemButton(XoopsLocale::A_ADD.' '._PROFILE_AM_STEP, 'step.php?op=new', 'add');
94 94 
         $admin_page->addItemButton(_PROFILE_AM_STEP_LIST, 'step.php', 'application-view-detail');
95 95 
         $admin_page->renderButton();
96 96 
         $id = $system->cleanVars($_REQUEST, 'id', 0, 'int');
 
@@ -112,7 +112,7 @@  discard block
 
 block discarded – undo
112 112 
                 echo $xoops->confirm(
113 113 
                     array("ok" => 1, "id" => $id, "op" => "delete"),
114 114 
                     'step.php',
115 
-                    sprintf(_PROFILE_AM_RUSUREDEL, $obj->getVar('step_name')) . '<br />'
115 
+                    sprintf(_PROFILE_AM_RUSUREDEL, $obj->getVar('step_name')).'<br />'
116 116 
                 );
117 117 
             }
118 118 
         } else {
Please login to merge, or discard this patch.
htdocs/modules/profile/admin/visibility.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch 
@@ -24,7 +24,7 @@
 
 block discarded – undo
24 24 
  * @author          Jan Pedersen
25 25 
  * @author          Taiwen Jiang <[email protected]>
26 26 
  */
27 
-include __DIR__ . '/header.php';
27 
+include __DIR__.'/header.php';
28 28 
 // Get main instance
29 29 
 $system = System::getInstance();
30 30 
 $xoops = Xoops::getInstance();
Please login to merge, or discard this patch.
htdocs/modules/profile/admin/deactivate.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch 
@@ -21,7 +21,7 @@  discard block
 
 block discarded – undo
21 21 
  * @author          Taiwen Jiang <[email protected]>
22 22 
  */
23 23
24 
-include __DIR__ . '/header.php';
24 
+include __DIR__.'/header.php';
25 25 
 $xoops = Xoops::getInstance();
26 26 
 $xoops->header();
27 27 
 
@@ -51,4 +51,4 @@  discard block
 
 block discarded – undo
51 51 
         $message = _PROFILE_AM_USER_NOT_DEACTIVATED;
52 52 
     }
53 53 
 }
54 
-$xoops->redirect($xoops->url('modules/profile/userinfo.php?uid=' . $user->getVar('uid')), 3, $message);
54 
+$xoops->redirect($xoops->url('modules/profile/userinfo.php?uid='.$user->getVar('uid')), 3, $message);
Please login to merge, or discard this patch.
htdocs/modules/profile/admin/category.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch 
@@ -19,7 +19,7 @@  discard block
 
 block discarded – undo
19 19 
  * @author          Taiwen Jiang <[email protected]>
20 20 
  */
21 21
22 
-include __DIR__ . '/header.php';
22 
+include __DIR__.'/header.php';
23 23 
 // Get main instance
24 24 
 $system = System::getInstance();
25 25 
 $xoops = Xoops::getInstance();
 
@@ -37,7 +37,7 @@  discard block
 
 block discarded – undo
37 37 
 switch ($op) {
38 38 
     case "list":
39 39 
     default:
40 
-        $admin_page->addItemButton(XoopsLocale::A_ADD . ' ' . _PROFILE_AM_CATEGORY, 'category.php?op=new', 'add');
40 
+        $admin_page->addItemButton(XoopsLocale::A_ADD.' '._PROFILE_AM_CATEGORY, 'category.php?op=new', 'add');
41 41 
         $admin_page->renderButton();
42 42 
         $criteria = new CriteriaCompo();
43 43 
         $criteria->setSort('cat_weight');
 
@@ -55,7 +55,7 @@  discard block
 
 block discarded – undo
55 55 
         break;
56 56
57 57 
     case "edit":
58 
-        $admin_page->addItemButton(XoopsLocale::A_ADD . ' ' . _PROFILE_AM_CATEGORY, 'category.php?op=new', 'add');
58 
+        $admin_page->addItemButton(XoopsLocale::A_ADD.' '._PROFILE_AM_CATEGORY, 'category.php?op=new', 'add');
59 59 
         $admin_page->addItemButton(_PROFILE_AM_CATEGORY_LIST, 'category.php', 'application-view-detail');
60 60 
         $admin_page->renderButton();
61 61 
         $id = $system->cleanVars($_REQUEST, 'id', 0, 'int');
 
@@ -90,7 +90,7 @@  discard block
 
 block discarded – undo
90 90 
         break;
91 91
92 92 
     case "delete":
93 
-        $admin_page->addItemButton(XoopsLocale::A_ADD . ' ' . _PROFILE_AM_CATEGORY, 'category.php?op=new', 'add');
93 
+        $admin_page->addItemButton(XoopsLocale::A_ADD.' '._PROFILE_AM_CATEGORY, 'category.php?op=new', 'add');
94 94 
         $admin_page->addItemButton(_PROFILE_AM_CATEGORY_LIST, 'category.php', 'application-view-detail');
95 95 
         $admin_page->renderButton();
96 96 
         $id = $system->cleanVars($_REQUEST, 'id', 0, 'int');
 
@@ -112,7 +112,7 @@  discard block
 
 block discarded – undo
112 112 
                 echo $xoops->confirm(
113 113 
                     array("ok" => 1, "id" => $id, "op" => "delete"),
114 114 
                     'category.php',
115 
-                    sprintf(_PROFILE_AM_RUSUREDEL, $obj->getVar('cat_title')) . '<br />'
115 
+                    sprintf(_PROFILE_AM_RUSUREDEL, $obj->getVar('cat_title')).'<br />'
116 116 
                 );
117 117 
             }
118 118 
         } else {
Please login to merge, or discard this patch.
htdocs/modules/profile/admin/permissions.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch 
@@ -21,7 +21,7 @@  discard block
 
 block discarded – undo
21 21 
  * @author          Jan Pedersen
22 22 
  * @author          Taiwen Jiang <[email protected]>
23 23 
  */
24 
-include __DIR__ . '/header.php';
24 
+include __DIR__.'/header.php';
25 25 
 // Get main instance
26 26 
 $system = System::getInstance();
27 27 
 $xoops = Xoops::getInstance();
 
@@ -75,7 +75,7 @@  discard block
 
 block discarded – undo
75 75 
 $opform->display();
76 76
77 77 
 $module_id = $xoops->module->getVar('mid');
78 
-$form = new Xoops\Form\GroupPermissionForm($title_of_form, $module_id, $perm_name, $perm_desc, 'admin/permissions.php?op=' . $op, $anonymous);
78 
+$form = new Xoops\Form\GroupPermissionForm($title_of_form, $module_id, $perm_name, $perm_desc, 'admin/permissions.php?op='.$op, $anonymous);
79 79
80 80 
 if ($op === 'access') {
81 81 
     $member_handler = $xoops->getHandlerMember();
Please login to merge, or discard this patch.
htdocs/modules/profile/admin/user.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch 
@@ -21,7 +21,7 @@  discard block
 
 block discarded – undo
21 21 
  * @author          Jan Pedersen
22 22 
  * @author          Taiwen Jiang <[email protected]>
23 23 
  */
24 
-include __DIR__ . '/header.php';
24 
+include __DIR__.'/header.php';
25 25
26 26 
 $xoops = Xoops::getInstance();
27 27 
 $xoops->header();
 
@@ -51,7 +51,7 @@  discard block
 
 block discarded – undo
51 51
52 52 
     case "new":
53 53 
         $xoops->loadLanguage("main", $xoops->module->getVar('dirname', 'n'));
54 
-        include_once dirname(__DIR__) . '/include/forms.php';
54 
+        include_once dirname(__DIR__).'/include/forms.php';
55 55 
         $obj = $handler->createUser();
56 56 
         $obj->setGroups(array(FixedGroups::USERS));
57 57 
         $form = profile_getUserForm($obj);
 
@@ -65,7 +65,7 @@  discard block
 
 block discarded – undo
65 65 
             // If not webmaster trying to edit a webmaster - disallow
66 66 
             $xoops->redirect("user.php", 3, XoopsLocale::E_NO_ACTION_PERMISSION);
67 67 
         }
68 
-        include_once dirname(__DIR__) . '/include/forms.php';
68 
+        include_once dirname(__DIR__).'/include/forms.php';
69 69 
         $form = profile_getUserForm($obj);
70 70 
         $form->display();
71 71 
         break;
 
@@ -76,7 +76,7 @@  discard block
 
 block discarded – undo
76 76 
             $xoops->redirect(
77 77 
                 'user.php',
78 78 
                 3,
79 
-                XoopsLocale::E_NO_ACTION_PERMISSION . "<br />"
79 
+                XoopsLocale::E_NO_ACTION_PERMISSION."<br />"
80 80 
                 . implode('<br />', $xoops->security()->getErrors())
81 81 
             );
82 82 
             exit;
 
@@ -195,7 +195,7 @@  discard block
 
 block discarded – undo
195 195 
             }
196 196 
         }
197 197 
         $user->setGroups($new_groups);
198 
-        include_once dirname(__DIR__) . '/include/forms.php';
198 
+        include_once dirname(__DIR__).'/include/forms.php';
199 199 
         echo $user->getHtmlErrors();
200 200 
         $form = profile_getUserForm($user, $profile);
201 201 
         $form->display();
 
@@ -222,7 +222,7 @@  discard block
 
 block discarded – undo
222 222 
                     $xoops->redirect(
223 223 
                         'user.php',
224 224 
                         3,
225 
-                        sprintf(_PROFILE_AM_DELETEDSUCCESS, $obj->getVar('uname') . " (" . $obj->getVar('email') . ")"),
225 
+                        sprintf(_PROFILE_AM_DELETEDSUCCESS, $obj->getVar('uname')." (".$obj->getVar('email').")"),
226 226 
                         false
227 227 
                     );
228 228 
                 } else {
 
@@ -236,7 +236,7 @@  discard block
 
 block discarded – undo
236 236 
             echo $xoops->confirm(
237 237 
                 array('ok' => 1, 'id' => $_REQUEST['id'], 'op' => 'delete'),
238 238 
                 $_SERVER['REQUEST_URI'],
239 
-                sprintf(_PROFILE_AM_RUSUREDEL, $obj->getVar('uname') . " (" . $obj->getVar('email') . ")")
239 
+                sprintf(_PROFILE_AM_RUSUREDEL, $obj->getVar('uname')." (".$obj->getVar('email').")")
240 240 
             );
241 241 
         }
242 242 
         break;
Please login to merge, or discard this patch.
htdocs/modules/profile/admin/header.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch 
@@ -19,5 +19,5 @@
 
 block discarded – undo
19 19 
  * @author          Taiwen Jiang <[email protected]>
20 20 
  */
21 21
22 
-require_once dirname(dirname(dirname(__DIR__))) . '/include/cp_header.php';
22 
+require_once dirname(dirname(dirname(__DIR__))).'/include/cp_header.php';
23 23 
 XoopsLoad::load('system', 'system');
Please login to merge, or discard this patch.
htdocs/modules/profile/admin/field.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch 
@@ -21,7 +21,7 @@  discard block
 
 block discarded – undo
21 21 
  * @author          Jan Pedersen
22 22 
  * @author          Taiwen Jiang <[email protected]>
23 23 
  */
24 
-include __DIR__ . '/header.php';
24 
+include __DIR__.'/header.php';
25 25 
 // Get main instance
26 26 
 $system = System::getInstance();
27 27 
 $xoops = Xoops::getInstance();
 
@@ -43,7 +43,7 @@  discard block
 
 block discarded – undo
43 43 
 switch ($op) {
44 44 
     default:
45 45 
     case "list":
46 
-        $admin_page->addItemButton(XoopsLocale::A_ADD . ' ' . _PROFILE_AM_FIELD, 'field.php?op=new', 'add');
46 
+        $admin_page->addItemButton(XoopsLocale::A_ADD.' '._PROFILE_AM_FIELD, 'field.php?op=new', 'add');
47 47 
         $admin_page->renderButton();
48 48 
         $fields = $field_handler->getObjects(null, true, false);
49 49 
         $modules = $xoops->getHandlerModule()->getObjectsArray(null, true);
 
@@ -110,7 +110,7 @@  discard block
 
 block discarded – undo
110 110 
         break;
111 111
112 112 
     case "edit":
113 
-        $admin_page->addItemButton(XoopsLocale::A_ADD . ' ' . _PROFILE_AM_FIELD, 'field.php?op=new', 'add');
113 
+        $admin_page->addItemButton(XoopsLocale::A_ADD.' '._PROFILE_AM_FIELD, 'field.php?op=new', 'add');
114 114 
         $admin_page->addItemButton(_PROFILE_AM_FIELD_LIST, 'field.php', 'application-view-detail');
115 115 
         $admin_page->renderButton();
116 116 
         $id = $system->cleanVars($_REQUEST, 'id', 0, 'int');
 
@@ -143,7 +143,7 @@  discard block
 
 block discarded – undo
143 143 
                 $errors = array();
144 144 
                 //if there are changed fields, fetch the fieldcategory objects
145 145 
                 $fields = $field_handler->getObjects(
146 
-                    new Criteria('field_id', "(" . implode(',', $ids) . ")", "IN"),
146 
+                    new Criteria('field_id', "(".implode(',', $ids).")", "IN"),
147 147 
                     true
148 148 
                 );
149 149 
                 foreach ($ids as $i) {
 
@@ -281,7 +281,7 @@  discard block
 
 block discarded – undo
281 281 
                         $removed_groups = array_diff(array_keys($groups), $_REQUEST[$perm]);
282 282 
                         if (count($removed_groups) > 0) {
283 283 
                             $criteria->add(
284 
-                                new Criteria('gperm_groupid', "(" . implode(',', $removed_groups) . ")", "IN")
284 
+                                new Criteria('gperm_groupid', "(".implode(',', $removed_groups).")", "IN")
285 285 
                             );
286 286 
                             $groupperm_handler->deleteAll($criteria);
287 287 
                         }
 
@@ -292,7 +292,7 @@  discard block
 
 block discarded – undo
292 292 
                     unset($criteria);
293 293 
                 }
294 294 
             }
295 
-            $url = $redirect_to_edit ? 'field.php?op=edit&amp;id=' . $obj->getVar('field_id') : 'field.php';
295 
+            $url = $redirect_to_edit ? 'field.php?op=edit&amp;id='.$obj->getVar('field_id') : 'field.php';
296 296 
             $xoops->redirect($url, 3, sprintf(_PROFILE_AM_SAVEDSUCCESS, _PROFILE_AM_FIELD));
297 297 
         }
298 298 
         echo $xoops->alert('error', $obj->getHtmlErrors());
 
@@ -301,7 +301,7 @@  discard block
 
 block discarded – undo
301 301 
         break;
302 302
303 303 
     case "delete":
304 
-        $admin_page->addItemButton(XoopsLocale::A_ADD . ' ' . _PROFILE_AM_FIELD, 'field.php?op=new', 'add');
304 
+        $admin_page->addItemButton(XoopsLocale::A_ADD.' '._PROFILE_AM_FIELD, 'field.php?op=new', 'add');
305 305 
         $admin_page->addItemButton(_PROFILE_AM_FIELD_LIST, 'field.php', 'application-view-detail');
306 306 
         $admin_page->renderButton();
307 307 
         $id = $system->cleanVars($_REQUEST, 'id', 0, 'int');
 
@@ -323,7 +323,7 @@  discard block
 
 block discarded – undo
323 323 
                 echo $xoops->confirm(
324 324 
                     array("ok" => 1, "id" => $id, "op" => "delete"),
325 325 
                     'field.php',
326 
-                    sprintf(_PROFILE_AM_RUSUREDEL, $obj->getVar('field_title')) . '<br />'
326 
+                    sprintf(_PROFILE_AM_RUSUREDEL, $obj->getVar('field_title')).'<br />'
327 327 
                 );
328 328 
             }
329 329 
         } else {
Please login to merge, or discard this patch.