Completed
Pull Request — master (#616)
by Richard
13:56
created
htdocs/modules/page/admin/related.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -21,7 +21,7 @@  discard block
 block discarded – undo
21 21
  * @author          Mage Grégory (AKA Mage)
22 22
  * @version         $Id$
23 23
  */
24
-include __DIR__ . '/header.php';
24
+include __DIR__.'/header.php';
25 25
 
26 26
 // Call header
27 27
 $xoops->header('admin:page/page_admin_related.tpl');
@@ -106,8 +106,8 @@  discard block
 block discarded – undo
106 106
             if (count($datas_delete) != 0) {
107 107
                 $criteria = $criteria = new CriteriaCompo();
108 108
                 $criteria->add(new Criteria('link_related_id', $related_id));
109
-                $criteria->add(new Criteria('link_content_id', '(' . implode(', ', $datas_delete) . ')', 'IN'));
110
-                $links_ids =  $link_Handler->getIds($criteria);
109
+                $criteria->add(new Criteria('link_content_id', '('.implode(', ', $datas_delete).')', 'IN'));
110
+                $links_ids = $link_Handler->getIds($criteria);
111 111
                 if (!$link_Handler->DeleteByIds($links_ids)) {
112 112
                 }
113 113
             }
@@ -172,7 +172,7 @@  discard block
 block discarded – undo
172 172
                 array('ok' => 1, 'related_id' => $related_id, 'op' => 'delete'),
173 173
                 'related.php',
174 174
                 XoopsLocale::Q_ARE_YOU_SURE_YOU_WANT_TO_DELETE_THIS_ITEM
175
-                . '<br /><span class="red">' . $obj->getvar('related_name') . '<span>'
175
+                . '<br /><span class="red">'.$obj->getvar('related_name').'<span>'
176 176
             );
177 177
         }
178 178
         break;
Please login to merge, or discard this patch.
htdocs/modules/page/admin/menu.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -34,7 +34,7 @@
 block discarded – undo
34 34
 $adminmenu[$i]['link'] = 'admin/related.php';
35 35
 $adminmenu[$i]['icon'] = 'groupmod.png';
36 36
 ++$i;
37
-$adminmenu[$i]['title'] =PageLocale::SYSTEM_PERMISSIONS;
37
+$adminmenu[$i]['title'] = PageLocale::SYSTEM_PERMISSIONS;
38 38
 $adminmenu[$i]['link'] = 'admin/permissions.php';
39 39
 $adminmenu[$i]['icon'] = 'permissions.png';
40 40
 ++$i;
Please login to merge, or discard this patch.
htdocs/modules/page/admin/permissions.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -22,7 +22,7 @@  discard block
 block discarded – undo
22 22
  * @version         $Id$
23 23
  */
24 24
 
25
-include __DIR__ . '/header.php';
25
+include __DIR__.'/header.php';
26 26
 
27 27
 // Get Action type
28 28
 $op = Request::getString('op', 'global');
@@ -71,13 +71,13 @@  discard block
 block discarded – undo
71 71
                 $groups_ids_view = $gperm_Handler->getGroupIds('page_view_item', $content_id, $module_id);
72 72
                 $groups_ids_view = array_values($groups_ids_view);
73 73
                 foreach (array_keys($group_list) as $j) {
74
-                    $perms .= '<img id="loading_display' . $content_id . '_' . $j .'" src="' . $xoops->url('media/xoops/images/spinner.gif') . '" style="display:none;" alt="' . XoopsLocale::LOADING . '" />';
74
+                    $perms .= '<img id="loading_display'.$content_id.'_'.$j.'" src="'.$xoops->url('media/xoops/images/spinner.gif').'" style="display:none;" alt="'.XoopsLocale::LOADING.'" />';
75 75
                     if (in_array($j, $groups_ids_view)) {
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: '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 . "\" />";
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: '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."\" />";
77 77
                     } else {
78
-                        $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 . "\" />";
78
+                        $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."\" />";
79 79
                     }
80
-                    $perms .= $group_list[$j] . '<br />';
80
+                    $perms .= $group_list[$j].'<br />';
81 81
                 }
82 82
                 $content['id'] = $content_id;
83 83
                 $content['title'] = $content_arr[$i]->getVar('content_title');
Please login to merge, or discard this patch.
htdocs/modules/page/admin/index.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
 
24 24
 // heaser
25 25
 $xoops->header();
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
@@ -21,7 +21,7 @@
 block discarded – undo
21 21
  * @author          Mage Grégory (AKA Mage)
22 22
  * @version         $Id$
23 23
  */
24
-require_once dirname(dirname(dirname(__DIR__))) . '/include/cp_header.php';
24
+require_once dirname(dirname(dirname(__DIR__))).'/include/cp_header.php';
25 25
 
26 26
 // Get main instance
27 27
 XoopsLoad::load('system', 'system');
Please login to merge, or discard this patch.
htdocs/modules/page/pdf.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -57,7 +57,7 @@
 block discarded – undo
57 57
 
58 58
 $tpl->assign('xoops_sitename', $xoops->getConfig('sitename'));
59 59
 // Meta
60
-$tpl->assign('xoops_pagetitle', strip_tags($view_content->getVar('content_title') . ' - ' . XoopsLocale::A_PRINT . ' - ' . $xoopsModule->name()));
60
+$tpl->assign('xoops_pagetitle', strip_tags($view_content->getVar('content_title').' - '.XoopsLocale::A_PRINT.' - '.$xoopsModule->name()));
61 61
 
62 62
 $content = $tpl->fetch('module:page/page_pdf.tpl');
63 63
 
Please login to merge, or discard this patch.
htdocs/modules/page/jquery_rating.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -31,14 +31,14 @@
 block discarded – undo
31 31
     $time = time();
32 32
     $content_id = Request::getInt('content_id', 0);
33 33
     $option = Request::getInt('option', 0);
34
-    if (!isset($_SESSION['page_rating' . $content_id]) || $_SESSION['page_rating' . $content_id] < $time) {
35
-        $_SESSION['page_rating' . $content_id] = $time + $interval;
34
+    if (!isset($_SESSION['page_rating'.$content_id]) || $_SESSION['page_rating'.$content_id] < $time) {
35
+        $_SESSION['page_rating'.$content_id] = $time + $interval;
36 36
 
37 37
         // Test if the page exist
38 38
         $contentObj = $content_Handler->get($content_id);
39 39
         if (($contentObj === null)
40 40
 //            || $contentObj->getVar('content_author') == $uid
41
-            || $contentObj->getVar('content_status') == 0 ||  $contentObj->getVar('content_dorating') == 0) {
41
+            || $contentObj->getVar('content_status') == 0 || $contentObj->getVar('content_dorating') == 0) {
42 42
             echo json_encode($ret);
43 43
             exit();
44 44
         }
Please login to merge, or discard this patch.
htdocs/modules/page/xoops_version.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -44,7 +44,7 @@  discard block
 block discarded – undo
44 44
 // paypal
45 45
 $modversion['paypal']                  = array();
46 46
 $modversion['paypal']['business']      = '[email protected]';
47
-$modversion['paypal']['item_name']     = 'Donation : ' . PageLocale::MODULE_DESC;
47
+$modversion['paypal']['item_name']     = 'Donation : '.PageLocale::MODULE_DESC;
48 48
 $modversion['paypal']['amount']        = 0;
49 49
 $modversion['paypal']['currency_code'] = 'USD';
50 50
 
@@ -67,7 +67,7 @@  discard block
 block discarded – undo
67 67
 $modversion['hasMain'] = 1;
68 68
 
69 69
 // Mysql file
70
-$modversion['schema']           = 'sql/schema.yml';
70
+$modversion['schema'] = 'sql/schema.yml';
71 71
 //$modversion['sqlfile']['mysql'] = 'sql/mysql.sql';
72 72
 
73 73
 // Tables created by sql file (without prefix!)
Please login to merge, or discard this patch.
htdocs/modules/page/print.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -58,6 +58,6 @@
 block discarded – undo
58 58
 
59 59
 $tpl->assign('xoops_sitename', $xoops->getConfig('sitename'));
60 60
 // Meta
61
-$tpl->assign('xoops_pagetitle', strip_tags($view_content->getVar('content_title') . ' - ' . XoopsLocale::A_PRINT . ' - ' . $xoopsModule->name()));
61
+$tpl->assign('xoops_pagetitle', strip_tags($view_content->getVar('content_title').' - '.XoopsLocale::A_PRINT.' - '.$xoopsModule->name()));
62 62
 
63 63
 $tpl->display('module:page/page_print.tpl');
Please login to merge, or discard this patch.