Completed
Push — master ( ee3296...251d30 )
by Michael
01:55
created
class/Tree.php 1 patch
Spacing   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -32,7 +32,7 @@  discard block
 block discarded – undo
32 32
      */
33 33
     public function _makePagesAdminOptions($key, &$ret, $prefix_orig, $objInsinstr, $class = 'odd', $prefix_curr = '')
34 34
     {
35
-        $pathIcon16    = \Xmf\Module\Admin::iconUrl('', 16);
35
+        $pathIcon16 = \Xmf\Module\Admin::iconUrl('', 16);
36 36
         if ($key > 0) {
37 37
 
38 38
             //
@@ -59,7 +59,7 @@  discard block
 block discarded – undo
59 59
             // Действие - удаление
60 60
             $act_del = ($num_childs > 0) ? '<img src="../assets/images/icons/16/application_key.png" alt="' . _AM_INSTR_NODELPAGE . '" title="' . _AM_INSTR_NODELPAGE . '" />' : '<a href="instr.php?op=delpage&pageid='
61 61
                                                                                                                                                                       . $pageid
62
-                                                                                                                                                                      . '"><img src="'. $pathIcon16 . '/delete.png" alt="'
62
+                                                                                                                                                                      . '"><img src="' . $pathIcon16 . '/delete.png" alt="'
63 63
                                                                                                                                                                       . _AM_INSTRUCTION_DEL
64 64
                                                                                                                                                                       . '" title="'
65 65
                                                                                                                                                                       . _AM_INSTRUCTION_DEL
@@ -77,7 +77,7 @@  discard block
 block discarded – undo
77 77
             // Просмотре без кэша
78 78
             $ret .= ' <a href="' . XOOPS_URL . '/modules/' . INST_DIRNAME . '/page.php?id=' . $pageid . '&amp;nocache=1"><img src="../assets/images/icons/16/database_black.png" alt="' . _AM_INSTR_DISPLAY_NOCACHE . '" title="' . _AM_INSTR_DISPLAY_NOCACHE . '" /></a> ';
79 79
             // Добавить подстраницу
80
-            $ret .= ' <a href="instr.php?op=editpage&instrid=' . $instrid . '&pid=' . $pageid . '"><img src="'. $pathIcon16 . '/add.png" alt="' . _AM_INSTRUCTION_ADDSUBPAGE . '" title="' . _AM_INSTRUCTION_ADDSUBPAGE . '" /></a> ';
80
+            $ret .= ' <a href="instr.php?op=editpage&instrid=' . $instrid . '&pid=' . $pageid . '"><img src="' . $pathIcon16 . '/add.png" alt="' . _AM_INSTRUCTION_ADDSUBPAGE . '" title="' . _AM_INSTRUCTION_ADDSUBPAGE . '" /></a> ';
81 81
 
82 82
             if ($pagestatus) {
83 83
                 $ret .= ' <img src="../assets/images/icons/16/lock.png" alt="' . _AM_INSTRUCTION_LOCK . '" title="' . _AM_INSTRUCTION_LOCK . '"> ';
@@ -85,7 +85,7 @@  discard block
 block discarded – undo
85 85
                 $ret .= ' <img src="../assets/images/icons/16/lock_open.png" alt="' . _AM_INSTRUCTION_UNLOCK . '" title="' . _AM_INSTRUCTION_UNLOCK . '"> ';
86 86
             }
87 87
 
88
-            $ret .= ' <a href="instr.php?op=editpage&pageid=' . $pageid . '"><img src="'. $pathIcon16 . '/edit.png" alt="' . _AM_INSTRUCTION_EDIT . '" title="' . _AM_INSTRUCTION_EDIT . '"></a> ' . $act_del . '
88
+            $ret .= ' <a href="instr.php?op=editpage&pageid=' . $pageid . '"><img src="' . $pathIcon16 . '/edit.png" alt="' . _AM_INSTRUCTION_EDIT . '" title="' . _AM_INSTRUCTION_EDIT . '"></a> ' . $act_del . '
89 89
       </td>
90 90
     </tr>';
91 91
 
@@ -93,7 +93,7 @@  discard block
 block discarded – undo
93 93
             $prefix_curr .= $prefix_orig;
94 94
         }
95 95
 
96
-        if (isset($this->tree[$key]['child']) && !empty($this->tree[$key]['child'])) {
96
+        if (isset($this->tree[$key]['child']) && ! empty($this->tree[$key]['child'])) {
97 97
             foreach ($this->tree[$key]['child'] as $childkey) {
98 98
                 $this->_makePagesAdminOptions($childkey, $ret, $prefix_orig, $objInsinstr, $class, $prefix_curr);
99 99
             }
@@ -123,7 +123,7 @@  discard block
 block discarded – undo
123 123
         $this->_makePagesAdminOptions($key, $ret, $prefix, $objInsinstr);
124 124
 
125 125
         $ret .= '<tr class="foot">
126
-      <td><a href="instr.php?op=editpage&instrid=' . $objInsinstr->getVar('instrid') . '"><img src="'. $pathIcon16 . '/add.png" alt="' . _AM_INSTRUCTION_ADDPAGE . '" title="' . _AM_INSTRUCTION_ADDPAGE . '"></a></td>
126
+      <td><a href="instr.php?op=editpage&instrid=' . $objInsinstr->getVar('instrid') . '"><img src="' . $pathIcon16 . '/add.png" alt="' . _AM_INSTRUCTION_ADDPAGE . '" title="' . _AM_INSTRUCTION_ADDPAGE . '"></a></td>
127 127
       <td colspan="2">
128 128
         <input type="hidden" name="instrid" value="' . $objInsinstr->getVar('instrid') . '" />
129 129
         <input type="hidden" name="op" value="updpage" />
@@ -150,7 +150,7 @@  discard block
 block discarded – undo
150 150
      */
151 151
     public function _makeCatsAdminOptions($key, &$ret, $prefix_orig, $cidinstrids = [], &$class = 'odd', $prefix_curr = '')
152 152
     {
153
-        $pathIcon16    = \Xmf\Module\Admin::iconUrl('', 16);
153
+        $pathIcon16 = \Xmf\Module\Admin::iconUrl('', 16);
154 154
         if ($key > 0) {
155 155
 
156 156
             //
@@ -173,15 +173,15 @@  discard block
 block discarded – undo
173 173
             $num_instrs = isset($cidinstrids[$catid]) ? $cidinstrids[$catid] : 0;
174 174
 
175 175
             // Действие - удаление
176
-            $act_del = (($num_instrs > 0) || ($num_childs > 0)) ? '<img src="'. $pathIcon16 . '/delete.png" alt="' . _AM_INSTR_NODELCAT . '" title="' . _AM_INSTR_NODELCAT . '" />' : '<a href="cat.php?op=delcat&cid='
176
+            $act_del = (($num_instrs > 0) || ($num_childs > 0)) ? '<img src="' . $pathIcon16 . '/delete.png" alt="' . _AM_INSTR_NODELCAT . '" title="' . _AM_INSTR_NODELCAT . '" />' : '<a href="cat.php?op=delcat&cid='
177 177
                                                                                                                                                                                            . $catid
178
-                                                                                                                                                                                           . '"><img src="'. $pathIcon16 . '/delete.png" alt="'
178
+                                                                                                                                                                                           . '"><img src="' . $pathIcon16 . '/delete.png" alt="'
179 179
                                                                                                                                                                                            . _AM_INSTRUCTION_DEL
180 180
                                                                                                                                                                                            . '" title="'
181 181
                                                                                                                                                                                            . _AM_INSTRUCTION_DEL
182 182
                                                                                                                                                                                            . '" /></a>';
183 183
             // Действие - просмотр
184
-            $act_view = ($num_instrs > 0) ? '<a href="instr.php?cid=' . $catid . '"><img src="'. $pathIcon16 . '/view.png" alt="' . _AM_INSTR_VIEWINSTR . '" title="' . _AM_INSTR_VIEWINSTR . '" /></a>' : '<img src="../assets/images/icons/16/document_protect.png" alt="'
184
+            $act_view = ($num_instrs > 0) ? '<a href="instr.php?cid=' . $catid . '"><img src="' . $pathIcon16 . '/view.png" alt="' . _AM_INSTR_VIEWINSTR . '" title="' . _AM_INSTR_VIEWINSTR . '" /></a>' : '<img src="../assets/images/icons/16/document_protect.png" alt="'
185 185
                                                                                                                                                                                                              . _AM_INSTR_NOVIEWINSTR
186 186
                                                                                                                                                                                                              . '" title="'
187 187
                                                                                                                                                                                                              . _AM_INSTR_NOVIEWINSTR
@@ -193,7 +193,7 @@  discard block
 block discarded – undo
193 193
       <td align="center" width="100">' . $num_instrs . '</td>
194 194
       <td align="center" width="150">
195 195
         ' . $act_view . '
196
-        <a href="cat.php?op=editcat&cid=' . $catid . '"><img src="'. $pathIcon16 . '/edit.png" alt="' . _AM_INSTRUCTION_EDIT . '" title="' . _AM_INSTRUCTION_EDIT . '"></a>
196
+        <a href="cat.php?op=editcat&cid=' . $catid . '"><img src="' . $pathIcon16 . '/edit.png" alt="' . _AM_INSTRUCTION_EDIT . '" title="' . _AM_INSTRUCTION_EDIT . '"></a>
197 197
         ' . $act_del . '
198 198
       </td>
199 199
     </tr>';
@@ -202,7 +202,7 @@  discard block
 block discarded – undo
202 202
             $prefix_curr .= $prefix_orig;
203 203
         }
204 204
 
205
-        if (isset($this->tree[$key]['child']) && !empty($this->tree[$key]['child'])) {
205
+        if (isset($this->tree[$key]['child']) && ! empty($this->tree[$key]['child'])) {
206 206
             foreach ($this->tree[$key]['child'] as $childkey) {
207 207
                 $this->_makeCatsAdminOptions($childkey, $ret, $prefix_orig, $cidinstrids, $class, $prefix_curr);
208 208
             }
@@ -332,7 +332,7 @@  discard block
 block discarded – undo
332 332
         }
333 333
 
334 334
         // Рекурсия
335
-        if (isset($this->tree[$key]['child']) && !empty($this->tree[$key]['child'])) {
335
+        if (isset($this->tree[$key]['child']) && ! empty($this->tree[$key]['child'])) {
336 336
             foreach ($this->tree[$key]['child'] as $childkey) {
337 337
                 $this->_makePagesUserTree($childkey, $ret, $currpageid, $lastpageids, $level);
338 338
             }
@@ -401,7 +401,7 @@  discard block
 block discarded – undo
401 401
         }
402 402
 
403 403
         // Рекурсия
404
-        if (isset($this->tree[$key]['child']) && !empty($this->tree[$key]['child'])) {
404
+        if (isset($this->tree[$key]['child']) && ! empty($this->tree[$key]['child'])) {
405 405
             foreach ($this->tree[$key]['child'] as $childkey) {
406 406
                 $this->_makePagesUserCalc($childkey, $currpageid, $prevpages, $nextpages, $lastpageids, $level);
407 407
             }
Please login to merge, or discard this patch.
page.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -59,7 +59,7 @@  discard block
 block discarded – undo
59 59
 
60 60
 // Права на просмотр инструкции
61 61
 $categories = Xoopsmodules\instruction\Utility::getItemIds();
62
-if (!in_array($objInsinstr->getVar('cid'), $categories)) {
62
+if ( ! in_array($objInsinstr->getVar('cid'), $categories)) {
63 63
     redirect_header(XOOPS_URL . '/modules/' . $moduleDirName . '/', 3, _NOPERM);
64 64
     exit();
65 65
 }
@@ -95,7 +95,7 @@  discard block
 block discarded – undo
95 95
                           . $moduleDirName
96 96
                           . '/admin/instr.php?op=editpage&pageid='
97 97
                           . $pages['pageid']
98
-                          . '"><img style="width:16px;" src="'. $pathIcon16 . '/edit.png" alt='
98
+                          . '"><img style="width:16px;" src="' . $pathIcon16 . '/edit.png" alt='
99 99
                           . _EDIT
100 100
                           . ' title='
101 101
                           . _EDIT
@@ -105,7 +105,7 @@  discard block
 block discarded – undo
105 105
                           . $moduleDirName
106 106
                           . '/admin/instr.php?op=delpage&pageid='
107 107
                           . $pages['pageid']
108
-                          . '"><img style="width:16px;" src="'. $pathIcon16 . '/delete.png" alt='
108
+                          . '"><img style="width:16px;" src="' . $pathIcon16 . '/delete.png" alt='
109 109
                           . _DELETE
110 110
                           . ' title='
111 111
                           . _DELETE
@@ -114,7 +114,7 @@  discard block
 block discarded – undo
114 114
     $pages['adminlink'] = '&nbsp;';
115 115
     // Если можно редактировать
116 116
     if ($gpermHandler->checkRight($moduleDirName . '_edit', $objInsinstr->getVar('cid'), $groups, $GLOBALS['xoopsModule']->getVar('mid'))) {
117
-        $pages['adminlink'] .= '<a href="' . XOOPS_URL . '/modules/' . $moduleDirName . '/submit.php?op=editpage&pageid=' . $pages['pageid'] . '"><img style="width:16px;" src="'. $pathIcon16 . '/edit.png" alt=' . _EDIT . ' title=' . _EDIT . '></a>';
117
+        $pages['adminlink'] .= '<a href="' . XOOPS_URL . '/modules/' . $moduleDirName . '/submit.php?op=editpage&pageid=' . $pages['pageid'] . '"><img style="width:16px;" src="' . $pathIcon16 . '/edit.png" alt=' . _EDIT . ' title=' . _EDIT . '></a>';
118 118
     }
119 119
 
120 120
     $pages['adminlink'] .= '&nbsp;';
Please login to merge, or discard this patch.