Completed
Pull Request — master (#622)
by Richard
29:20 queued 24s
created
htdocs/modules/page/admin/permissions.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -20,7 +20,7 @@  discard block
 block discarded – undo
20 20
  * @author          Mage Grégory (AKA Mage)
21 21
  */
22 22
 
23
-include __DIR__ . '/header.php';
23
+include __DIR__.'/header.php';
24 24
 
25 25
 // Get Action type
26 26
 $op = Request::getString('op', 'global');
@@ -69,13 +69,13 @@  discard block
 block discarded – undo
69 69
                 $groups_ids_view = $gperm_Handler->getGroupIds('page_view_item', $content_id, $module_id);
70 70
                 $groups_ids_view = array_values($groups_ids_view);
71 71
                 foreach (array_keys($group_list) as $j) {
72
-                    $perms .= '<img id="loading_display' . $content_id . '_' . $j .'" src="' . $xoops->url('media/xoops/images/spinner.gif') . '" style="display:none;" alt="' . XoopsLocale::LOADING . '" />';
72
+                    $perms .= '<img id="loading_display'.$content_id.'_'.$j.'" src="'.$xoops->url('media/xoops/images/spinner.gif').'" style="display:none;" alt="'.XoopsLocale::LOADING.'" />';
73 73
                     if (in_array($j, $groups_ids_view)) {
74
-                        $perms .= "<img class=\"cursorpointer\" id=\"display" . $content_id . "_" . $j . "\" onclick=\"Xoops.changeStatus( 'permissions.php', { op: 'update_view', content_id: " . $content_id . ", group: " . $j . ", status: 'no' }, 'display" . $content_id . "_" . $j ."', 'permissions.php' )\" src=\"" . $xoops->url('modules/system/images/icons/default/success.png') . "\" alt=\"" . XoopsLocale::A_DISABLE . "\" title=\"" . XoopsLocale::A_DISABLE . "\" />";
74
+                        $perms .= "<img class=\"cursorpointer\" id=\"display".$content_id."_".$j."\" onclick=\"Xoops.changeStatus( 'permissions.php', { op: 'update_view', content_id: ".$content_id.", group: ".$j.", status: 'no' }, 'display".$content_id."_".$j."', 'permissions.php' )\" src=\"".$xoops->url('modules/system/images/icons/default/success.png')."\" alt=\"".XoopsLocale::A_DISABLE."\" title=\"".XoopsLocale::A_DISABLE."\" />";
75 75
                     } else {
76
-                        $perms .= "<img class=\"cursorpointer\" id=\"display" . $content_id . "_" . $j . "\" onclick=\"Xoops.changeStatus( 'permissions.php', { op: 'update_view', content_id: " . $content_id . ", group: " . $j . ", status: 'yes' }, 'display" . $content_id . "_" . $j ."', 'permissions.php' )\" src=\"" . $xoops->url('modules/system/images/icons/default/cancel.png') . "\" alt=\"" . XoopsLocale::A_ENABLE . "\" title=\"" . XoopsLocale::A_ENABLE . "\" />";
76
+                        $perms .= "<img class=\"cursorpointer\" id=\"display".$content_id."_".$j."\" onclick=\"Xoops.changeStatus( 'permissions.php', { op: 'update_view', content_id: ".$content_id.", group: ".$j.", status: 'yes' }, 'display".$content_id."_".$j."', 'permissions.php' )\" src=\"".$xoops->url('modules/system/images/icons/default/cancel.png')."\" alt=\"".XoopsLocale::A_ENABLE."\" title=\"".XoopsLocale::A_ENABLE."\" />";
77 77
                     }
78
-                    $perms .= $group_list[$j] . '<br />';
78
+                    $perms .= $group_list[$j].'<br />';
79 79
                 }
80 80
                 $content['id'] = $content_id;
81 81
                 $content['title'] = $content_arr[$i]->getVar('content_title');
Please login to merge, or discard this patch.
htdocs/modules/page/admin/header.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -19,7 +19,7 @@
 block discarded – undo
19 19
  * @package         page
20 20
  * @author          Mage Grégory (AKA Mage)
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
 
24 24
 // Get main instance
25 25
 XoopsLoad::load('system', 'system');
Please login to merge, or discard this patch.
htdocs/modules/page/print.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -52,7 +52,7 @@  discard block
 block discarded – undo
52 52
 $content = $view_content->getValues();
53 53
 $sanitizer = Sanitizer::getInstance();
54 54
 foreach ($content as $k => $v) {
55
-    if ($k === 'content_shorttext' ||$k === 'content_text') {
55
+    if ($k === 'content_shorttext' || $k === 'content_text') {
56 56
         $v = $sanitizer->displayTarea($v);
57 57
     }
58 58
     $tpl->assign($k, $v);
@@ -62,6 +62,6 @@  discard block
 block discarded – undo
62 62
 
63 63
 $tpl->assign('xoops_sitename', $xoops->getConfig('sitename'));
64 64
 // Meta
65
-$tpl->assign('xoops_pagetitle', strip_tags($view_content->getVar('content_title') . ' - ' . XoopsLocale::A_PRINT . ' - ' . $xoopsModule->name()));
65
+$tpl->assign('xoops_pagetitle', strip_tags($view_content->getVar('content_title').' - '.XoopsLocale::A_PRINT.' - '.$xoopsModule->name()));
66 66
 
67 67
 $tpl->display('module:page/page_print.tpl');
Please login to merge, or discard this patch.
htdocs/modules/page/pdf.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -51,7 +51,7 @@  discard block
 block discarded – undo
51 51
 $content = $view_content->getValues();
52 52
 $sanitizer = Sanitizer::getInstance();
53 53
 foreach ($content as $k => $v) {
54
-    if ($k === 'content_shorttext' ||$k === 'content_text') {
54
+    if ($k === 'content_shorttext' || $k === 'content_text') {
55 55
         $v = $sanitizer->displayTarea($v);
56 56
     }
57 57
     $tpl->assign($k, $v);
@@ -61,7 +61,7 @@  discard block
 block discarded – undo
61 61
 
62 62
 $tpl->assign('xoops_sitename', $xoops->getConfig('sitename'));
63 63
 // Meta
64
-$tpl->assign('xoops_pagetitle', strip_tags($view_content->getVar('content_title') . ' - ' . XoopsLocale::A_PRINT . ' - ' . $xoopsModule->name()));
64
+$tpl->assign('xoops_pagetitle', strip_tags($view_content->getVar('content_title').' - '.XoopsLocale::A_PRINT.' - '.$xoopsModule->name()));
65 65
 
66 66
 $content = $tpl->fetch('module:page/page_pdf.tpl');
67 67
 
Please login to merge, or discard this patch.
htdocs/modules/smilies/admin/savedata.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          Xoops Core Development Team - Mage Grégory (AKA Mage) - Laurent JEN (aka DuDris)
25 25
  */
26 26
 
27
-include __DIR__ . '/header.php';
27
+include __DIR__.'/header.php';
28 28
 $xoops = Xoops::getInstance();
29 29
 $xoops->header();
30 30
 $admin = new \Xoops\Module\Admin();
Please login to merge, or discard this patch.
htdocs/modules/smilies/admin/index.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -19,33 +19,33 @@
 block discarded – undo
19 19
  * @author          Mage Grégory (AKA Mage)
20 20
  * @version         $Id$
21 21
  */
22
-include __DIR__ . '/header.php';
22
+include __DIR__.'/header.php';
23 23
 
24 24
 $xoops->header();
25 25
 
26 26
 // smilies not display
27 27
 $criteria = new CriteriaCompo();
28 28
 $criteria->add(new Criteria('smiley_display', 0));
29
-$smilies_notdisplay =  $helper->getHandlerSmilies()->getCount($criteria);
29
+$smilies_notdisplay = $helper->getHandlerSmilies()->getCount($criteria);
30 30
 
31 31
 // smilies display
32 32
 $criteria = new CriteriaCompo();
33 33
 $criteria->add(new Criteria('smiley_display', 0, '!='));
34
-$smilies_display =  $helper->getHandlerSmilies()->getCount($criteria);
34
+$smilies_display = $helper->getHandlerSmilies()->getCount($criteria);
35 35
 
36 36
 // total smilies
37
-$smilies_total= $smilies_notdisplay + $smilies_display;
37
+$smilies_total = $smilies_notdisplay + $smilies_display;
38 38
 
39 39
 // folder path
40
-$folder_path = \XoopsBaseConfig::get('root-path') . '/uploads/smilies';
40
+$folder_path = \XoopsBaseConfig::get('root-path').'/uploads/smilies';
41 41
 
42 42
 $admin_page = new \Xoops\Module\Admin();
43 43
 $admin_page->displayNavigation('index.php');
44 44
 
45 45
 $admin_page->addInfoBox(_MI_SMILIES_SMILIES);
46 46
 $admin_page->addInfoBoxLine(sprintf(_AM_SMILIES_NBTOTAL, $smilies_total));
47
-$admin_page->addInfoBoxLine(sprintf(_AM_SMILIES_NBDISPLAY, '<span class="green">' . $smilies_display . '</span>'));
48
-$admin_page->addInfoBoxLine(sprintf(_AM_SMILIES_NBNOTDISPLAY, '<span class="red">' . $smilies_notdisplay . '</span>'));
47
+$admin_page->addInfoBoxLine(sprintf(_AM_SMILIES_NBDISPLAY, '<span class="green">'.$smilies_display.'</span>'));
48
+$admin_page->addInfoBoxLine(sprintf(_AM_SMILIES_NBNOTDISPLAY, '<span class="red">'.$smilies_notdisplay.'</span>'));
49 49
 
50 50
 $admin_page->addConfigBoxLine($folder_path, 'folder');
51 51
 $admin_page->addConfigBoxLine(array($folder_path, '755'), 'chmod');
Please login to merge, or discard this patch.
htdocs/modules/smilies/admin/about.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -19,7 +19,7 @@
 block discarded – undo
19 19
  * @author          Mage Grégory (AKA Mage)
20 20
  * @version         $Id$
21 21
  */
22
-include __DIR__ . '/header.php';
22
+include __DIR__.'/header.php';
23 23
 $xoops = Xoops::getInstance();
24 24
 $xoops->header();
25 25
 $admin = new \Xoops\Module\Admin();
Please login to merge, or discard this patch.
htdocs/modules/smilies/include/install.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -39,9 +39,9 @@  discard block
 block discarded – undo
39 39
     $mediaPath = $xoops->path('modules/smilies/media');
40 40
     $directory = dir($mediaPath);
41 41
     while ($filename = $directory->read()) {
42
-        $mediaFilename = $mediaPath . '/' . $filename;
42
+        $mediaFilename = $mediaPath.'/'.$filename;
43 43
         if (is_file($mediaFilename)) {
44
-            $target = $uploadDirectory . '/' . $filename;
44
+            $target = $uploadDirectory.'/'.$filename;
45 45
             if (!copy($mediaFilename, $target)) {
46 46
                 $module->setErrors("Failed copying: {$filename}");
47 47
                 return false;
@@ -52,9 +52,9 @@  discard block
 block discarded – undo
52 52
     $directory->close();
53 53
 
54 54
     $module->setMessage('Loading smilies table');
55
-    $countInserted = TableLoad::loadTableFromYamlFile('smilies', dirname(__DIR__) . '/sql/smiliesdata.yml');
55
+    $countInserted = TableLoad::loadTableFromYamlFile('smilies', dirname(__DIR__).'/sql/smiliesdata.yml');
56 56
 
57
-    if($countInserted < 1) {
57
+    if ($countInserted < 1) {
58 58
         $module->setErrors('Loading smilies table failed');
59 59
         return false;
60 60
     }
Please login to merge, or discard this patch.
htdocs/include/cp_header.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -22,7 +22,7 @@  discard block
 block discarded – undo
22 22
  * xoops_url/modules/module_directory_name/admin_directory_name/
23 23
  */
24 24
 
25
-require_once dirname(__DIR__) . '/mainfile.php';
25
+require_once dirname(__DIR__).'/mainfile.php';
26 26
 
27 27
 $xoops = Xoops::getInstance();
28 28
 $xoops_url = \XoopsBaseConfig::get('url');
@@ -40,7 +40,7 @@  discard block
 block discarded – undo
40 40
         $xoops->redirect($xoops_url, 1, XoopsLocale::E_NO_ACCESS_PERMISSION);
41 41
     }
42 42
 } else {
43
-    $xoops->redirect($xoops_url . '/user.php', 1, XoopsLocale::E_NO_ACCESS_PERMISSION);
43
+    $xoops->redirect($xoops_url.'/user.php', 1, XoopsLocale::E_NO_ACCESS_PERMISSION);
44 44
 }
45 45
 
46 46
 // set config values for this module
Please login to merge, or discard this patch.