Completed
Branch master (c92e39)
by Michael
02:32
created
include/blocksadmin.inc.php 2 patches
Indentation   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -71,18 +71,18 @@
 block discarded – undo
71 71
     $myblock->setVar('title', $myts->stripSlashesGPC($btitle));
72 72
     $myblock->setVar('content', $myts->stripSlashesGPC($bcontent));
73 73
     $dummyhtml = '<html><head><meta http-equiv="content-type" content="text/html; charset='
74
-                 . _CHARSET
75
-                 . '" /><meta http-equiv="content-language" content="'
76
-                 . _LANGCODE
77
-                 . '" /><title>'
78
-                 . $xoopsConfig['sitename']
79
-                 . '</title><link rel="stylesheet" type="text/css" media="all" href="'
80
-                 . getcss($xoopsConfig['theme_set'])
81
-                 . '" /></head><body><table><tr><th>'
82
-                 . $myblock->getVar('title')
83
-                 . '</th></tr><tr><td>'
84
-                 . $myblock->getContent('S', $bctype)
85
-                 . '</td></tr></table></body></html>';
74
+                    . _CHARSET
75
+                    . '" /><meta http-equiv="content-language" content="'
76
+                    . _LANGCODE
77
+                    . '" /><title>'
78
+                    . $xoopsConfig['sitename']
79
+                    . '</title><link rel="stylesheet" type="text/css" media="all" href="'
80
+                    . getcss($xoopsConfig['theme_set'])
81
+                    . '" /></head><body><table><tr><th>'
82
+                    . $myblock->getVar('title')
83
+                    . '</th></tr><tr><td>'
84
+                    . $myblock->getContent('S', $bctype)
85
+                    . '</td></tr></table></body></html>';
86 86
 
87 87
     $dummyfile = '_dummyfile_' . time() . '.html';
88 88
     $fp        = fopen(XOOPS_CACHE_PATH . '/' . $dummyfile, 'w');
Please login to merge, or discard this patch.
Spacing   +22 added lines, -22 removed lines patch added patch discarded remove patch
@@ -28,8 +28,8 @@  discard block
 block discarded – undo
28 28
 if (!is_object($xoopsUser) || !is_object($xoopsModule) || !$xoopsUser->isAdmin($xoopsModule->mid())) {
29 29
     exit('Access Denied');
30 30
 }
31
-include_once XOOPS_ROOT_PATH . '/class/xoopsblock.php';
32
-include XOOPS_ROOT_PATH . '/modules/system/admin/blocksadmin/blocksadmin.php';
31
+include_once XOOPS_ROOT_PATH.'/class/xoopsblock.php';
32
+include XOOPS_ROOT_PATH.'/modules/system/admin/blocksadmin/blocksadmin.php';
33 33
 
34 34
 $op = 'list';
35 35
 if (isset($HTTP_POST_VARS)) {
@@ -44,13 +44,13 @@  discard block
 block discarded – undo
44 44
         || $HTTP_GET_VARS['op'] === 'previewpopup'
45 45
     ) {
46 46
         $op  = $HTTP_GET_VARS['op'];
47
-        $bid = isset($HTTP_GET_VARS['bid']) ? (int)$HTTP_GET_VARS['bid'] : 0;
47
+        $bid = isset($HTTP_GET_VARS['bid']) ? (int) $HTTP_GET_VARS['bid'] : 0;
48 48
     }
49 49
 }
50 50
 
51 51
 if (isset($previewblock)) {
52 52
     xoops_cp_header();
53
-    include_once XOOPS_ROOT_PATH . '/class/template.php';
53
+    include_once XOOPS_ROOT_PATH.'/class/template.php';
54 54
     $xoopsTpl = new XoopsTpl();
55 55
     $xoopsTpl->xoops_setCaching(0);
56 56
     if (isset($bid)) {
@@ -84,8 +84,8 @@  discard block
 block discarded – undo
84 84
                  . $myblock->getContent('S', $bctype)
85 85
                  . '</td></tr></table></body></html>';
86 86
 
87
-    $dummyfile = '_dummyfile_' . time() . '.html';
88
-    $fp        = fopen(XOOPS_CACHE_PATH . '/' . $dummyfile, 'w');
87
+    $dummyfile = '_dummyfile_'.time().'.html';
88
+    $fp        = fopen(XOOPS_CACHE_PATH.'/'.$dummyfile, 'w');
89 89
     fwrite($fp, $dummyhtml);
90 90
     fclose($fp);
91 91
     $block['edit_form'] = false;
@@ -96,24 +96,24 @@  discard block
 block discarded – undo
96 96
     $block['visible']   = $bvisible;
97 97
     $block['title']     = $myblock->getVar('title', 'E');
98 98
     $block['content']   = $myblock->getVar('content', 'E');
99
-    $block['modules']   =& $bmodule;
99
+    $block['modules']   = & $bmodule;
100 100
     $block['ctype']     = isset($bctype) ? $bctype : $myblock->getVar('c_type');
101 101
     $block['is_custom'] = true;
102
-    $block['cachetime'] = (int)$bcachetime;
103
-    echo '<a href="admin.php?fct=blocksadmin">' . _AM_BADMIN . '</a>&nbsp;<span style="font-weight:bold;">&raquo;&raquo;</span>&nbsp;' . $block['form_title'] . '<br><br>';
104
-    include XOOPS_ROOT_PATH . '/modules/system/admin/blocksadmin/blockform.php';
102
+    $block['cachetime'] = (int) $bcachetime;
103
+    echo '<a href="admin.php?fct=blocksadmin">'._AM_BADMIN.'</a>&nbsp;<span style="font-weight:bold;">&raquo;&raquo;</span>&nbsp;'.$block['form_title'].'<br><br>';
104
+    include XOOPS_ROOT_PATH.'/modules/system/admin/blocksadmin/blockform.php';
105 105
     $form->display();
106 106
     xoops_cp_footer();
107 107
     echo '<script type="text/javascript">
108 108
     <!--//
109
-    preview_window = openWithSelfMain("' . XOOPS_URL . '/modules/system/admin.php?fct=blocksadmin&op=previewpopup&file=' . $dummyfile . '", "popup", 250, 200);
109
+    preview_window = openWithSelfMain("' . XOOPS_URL.'/modules/system/admin.php?fct=blocksadmin&op=previewpopup&file='.$dummyfile.'", "popup", 250, 200);
110 110
     //-->
111 111
     </script>';
112 112
     exit();
113 113
 }
114 114
 
115 115
 if ($op === 'previewpopup') {
116
-    $file = str_replace('..', '', XOOPS_CACHE_PATH . '/' . trim($HTTP_GET_VARS['file']));
116
+    $file = str_replace('..', '', XOOPS_CACHE_PATH.'/'.trim($HTTP_GET_VARS['file']));
117 117
     if (file_exists($file)) {
118 118
         include $file;
119 119
         @unlink($file);
@@ -151,7 +151,7 @@  discard block
 block discarded – undo
151 151
 }
152 152
 
153 153
 if ($op === 'update') {
154
-    $bcachetime = isset($bcachetime) ? (int)$bcachetime : 0;
154
+    $bcachetime = isset($bcachetime) ? (int) $bcachetime : 0;
155 155
     $options    = isset($options) ? $options : array();
156 156
     $bcontent   = isset($bcontent) ? $bcontent : '';
157 157
     $bctype     = isset($bctype) ? $bctype : '';
@@ -252,27 +252,27 @@  discard block
 block discarded – undo
252 252
         $sql = sprintf('DELETE FROM %s WHERE block_id = %u', $db->prefix('block_module_link'), $bid);
253 253
         $db->query($sql);
254 254
         foreach ($bmodule as $bmid) {
255
-            $sql = sprintf('INSERT INTO %s (block_id, module_id) VALUES (%u, %d)', $db->prefix('block_module_link'), $bid, (int)$bmid);
255
+            $sql = sprintf('INSERT INTO %s (block_id, module_id) VALUES (%u, %d)', $db->prefix('block_module_link'), $bid, (int) $bmid);
256 256
             $db->query($sql);
257 257
         }
258
-        include_once XOOPS_ROOT_PATH . '/class/template.php';
258
+        include_once XOOPS_ROOT_PATH.'/class/template.php';
259 259
         $xoopsTpl = new XoopsTpl();
260 260
         $xoopsTpl->xoops_setCaching(2);
261 261
         if ($myblock->getVar('template') != '') {
262
-            if ($xoopsTpl->is_cached('db:' . $myblock->getVar('template'))) {
263
-                if (!$xoopsTpl->clear_cache('db:' . $myblock->getVar('template'))) {
264
-                    $msg = 'Unable to clear cache for block ID' . $bid;
262
+            if ($xoopsTpl->is_cached('db:'.$myblock->getVar('template'))) {
263
+                if (!$xoopsTpl->clear_cache('db:'.$myblock->getVar('template'))) {
264
+                    $msg = 'Unable to clear cache for block ID'.$bid;
265 265
                 }
266 266
             }
267 267
         } else {
268
-            if ($xoopsTpl->is_cached('db:system_dummy.tpl', 'block' . $bid)) {
269
-                if (!$xoopsTpl->clear_cache('db:system_dummy.tpl', 'block' . $bid)) {
270
-                    $msg = 'Unable to clear cache for block ID' . $bid;
268
+            if ($xoopsTpl->is_cached('db:system_dummy.tpl', 'block'.$bid)) {
269
+                if (!$xoopsTpl->clear_cache('db:system_dummy.tpl', 'block'.$bid)) {
270
+                    $msg = 'Unable to clear cache for block ID'.$bid;
271 271
                 }
272 272
             }
273 273
         }
274 274
     } else {
275
-        $msg = 'Failed update of block. ID:' . $bid;
275
+        $msg = 'Failed update of block. ID:'.$bid;
276 276
     }
277 277
 
278 278
     return $msg; // GIJ +
Please login to merge, or discard this patch.
include/onupdate.inc.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -9,9 +9,9 @@  discard block
 block discarded – undo
9 9
 function xoops_module_update_smartfaq($module)
10 10
 {
11 11
     // Load SmartDbUpdater from the SmartObject Framework if present
12
-    $smartdbupdater = XOOPS_ROOT_PATH . '/modules/smartobject/class/smartdbupdater.php';
12
+    $smartdbupdater = XOOPS_ROOT_PATH.'/modules/smartobject/class/smartdbupdater.php';
13 13
     if (!file_exists($smartdbupdater)) {
14
-        $smartdbupdater = XOOPS_ROOT_PATH . '/modules/smartfaq/class/smartdbupdater.php';
14
+        $smartdbupdater = XOOPS_ROOT_PATH.'/modules/smartfaq/class/smartdbupdater.php';
15 15
     }
16 16
     include_once $smartdbupdater;
17 17
 
@@ -19,7 +19,7 @@  discard block
 block discarded – undo
19 19
 
20 20
     ob_start();
21 21
 
22
-    echo '<code>' . _SDU_UPDATE_UPDATING_DATABASE . '<br>';
22
+    echo '<code>'._SDU_UPDATE_UPDATING_DATABASE.'<br>';
23 23
 
24 24
     // Adding partialview field
25 25
     $table = new SmartDbTable('smartfaq_faq');
@@ -70,7 +70,7 @@  discard block
 block discarded – undo
70 70
     /**
71 71
      * Check for items with categoryid=0
72 72
      */
73
-    include_once XOOPS_ROOT_PATH . '/modules/smartfaq/include/functions.php';
73
+    include_once XOOPS_ROOT_PATH.'/modules/smartfaq/include/functions.php';
74 74
     $smartfaq_faqHandler      = $answerHandler = sf_gethandler('faq');
75 75
     $smartfaq_categoryHandler = $answerHandler = sf_gethandler('category');
76 76
 
@@ -104,7 +104,7 @@  discard block
 block discarded – undo
104 104
 {
105 105
     ob_start();
106 106
 
107
-    include_once XOOPS_ROOT_PATH . '/modules/' . $module->getVar('dirname') . '/include/functions.php';
107
+    include_once XOOPS_ROOT_PATH.'/modules/'.$module->getVar('dirname').'/include/functions.php';
108 108
 
109 109
     $feedback = ob_get_clean();
110 110
     if (method_exists($module, 'setMessage')) {
Please login to merge, or discard this patch.
include/answer.inc.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -9,9 +9,9 @@
 block discarded – undo
9 9
 
10 10
 global $_POST;
11 11
 
12
-include_once XOOPS_ROOT_PATH . '/class/xoopstree.php';
13
-include_once XOOPS_ROOT_PATH . '/class/xoopslists.php';
14
-include_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
12
+include_once XOOPS_ROOT_PATH.'/class/xoopstree.php';
13
+include_once XOOPS_ROOT_PATH.'/class/xoopslists.php';
14
+include_once XOOPS_ROOT_PATH.'/class/xoopsformloader.php';
15 15
 //include_once __DIR__ . '/functions.php';
16 16
 
17 17
 $mytree = new XoopsTree($xoopsDB->prefix('smartfaq_categories'), 'categoryid', 'parentid');
Please login to merge, or discard this patch.
include/displayfaqs.php 2 patches
Indentation   +26 added lines, -26 removed lines patch added patch discarded remove patch
@@ -51,25 +51,25 @@  discard block
 block discarded – undo
51 51
     for ($i = 0; $i < $totalFaqsOnPage; ++$i) {
52 52
         $categoryObj = $allCats[$faqsObj[$i]->categoryid()];
53 53
         $modify      = "<a href='faq.php?op=mod&amp;faqid="
54
-                       . $faqsObj[$i]->faqid()
55
-                       . "'><img src='"
56
-                       . $pathIcon16
57
-                       . '/edit.png'
58
-                       . "' title='"
59
-                       . _AM_SF_EDITART
60
-                       . "' alt='"
61
-                       . _AM_SF_EDITART
62
-                       . "' /></a>";
54
+                        . $faqsObj[$i]->faqid()
55
+                        . "'><img src='"
56
+                        . $pathIcon16
57
+                        . '/edit.png'
58
+                        . "' title='"
59
+                        . _AM_SF_EDITART
60
+                        . "' alt='"
61
+                        . _AM_SF_EDITART
62
+                        . "' /></a>";
63 63
         $delete      = "<a href='faq.php?op=del&amp;faqid="
64
-                       . $faqsObj[$i]->faqid()
65
-                       . "'><img src='"
66
-                       . $pathIcon16
67
-                       . '/delete.png'
68
-                       . "' title='"
69
-                       . _AM_SF_EDITART
70
-                       . "' alt='"
71
-                       . _AM_SF_DELETEART
72
-                       . "'/></a>";
64
+                        . $faqsObj[$i]->faqid()
65
+                        . "'><img src='"
66
+                        . $pathIcon16
67
+                        . '/delete.png'
68
+                        . "' title='"
69
+                        . _AM_SF_EDITART
70
+                        . "' alt='"
71
+                        . _AM_SF_DELETEART
72
+                        . "'/></a>";
73 73
 
74 74
         //adding name of the Question Submitter
75 75
         $requester = sf_getLinkedUnameFromId($faqsObj[$i]->uid(), $smartModuleConfig['userealname']);
@@ -100,14 +100,14 @@  discard block
 block discarded – undo
100 100
         echo "<td class='head' align='center'>" . $faqsObj[$i]->faqid() . '</td>';
101 101
         echo "<td class='even' align='left'>" . $categoryObj->name() . '</td>';
102 102
         echo "<td class='even' align='left'><a href='"
103
-             . XOOPS_URL
104
-             . '/modules/'
105
-             . $xoopsModule->dirname()
106
-             . '/faq.php?faqid='
107
-             . $faqsObj[$i]->faqid()
108
-             . "'>"
109
-             . $faqsObj[$i]->question(100)
110
-             . '</a></td>';
103
+                . XOOPS_URL
104
+                . '/modules/'
105
+                . $xoopsModule->dirname()
106
+                . '/faq.php?faqid='
107
+                . $faqsObj[$i]->faqid()
108
+                . "'>"
109
+                . $faqsObj[$i]->question(100)
110
+                . '</a></td>';
111 111
 
112 112
         echo "<td class='even' align='center'>" . $requester . '</td>';
113 113
         echo "<td class='even' align='center'>" . $answerSubmitter . '</td>';
Please login to merge, or discard this patch.
Spacing   +18 added lines, -18 removed lines patch added patch discarded remove patch
@@ -23,9 +23,9 @@  discard block
 block discarded – undo
23 23
 
24 24
 sf_collapsableBar('toptable', 'toptableicon');
25 25
 
26
-echo "<img id='toptableicon' src=" . XOOPS_URL . '/modules/' . $xoopsModule->dirname() . "/assets/images/icon/close12.gif alt='' /></a>&nbsp;" . $faqs_title . '</h3>';
26
+echo "<img id='toptableicon' src=".XOOPS_URL.'/modules/'.$xoopsModule->dirname()."/assets/images/icon/close12.gif alt='' /></a>&nbsp;".$faqs_title.'</h3>';
27 27
 echo "<div id='toptable'>";
28
-echo '<span style="color: #567; margin: 3px 0 12px 0; font-size: small; display: block; ">' . $faqs_info . '</span>';
28
+echo '<span style="color: #567; margin: 3px 0 12px 0; font-size: small; display: block; ">'.$faqs_info.'</span>';
29 29
 
30 30
 // Get the total number of published FAQs
31 31
 $totalfaqs = $faqHandler->getFaqsCount($sel_cat, array(_SF_STATUS_PUBLISHED, _SF_STATUS_NEW_ANSWER));
@@ -33,18 +33,18 @@  discard block
 block discarded – undo
33 33
 // creating the FAQ objects that are published
34 34
 $faqsObj         = $faqHandler->getAllPublished($xoopsModuleConfig['perpage'], $startfaq, $sel_cat);
35 35
 $totalFaqsOnPage = count($faqsObj);
36
-$allCats         =& $categoryHandler->getObjects(null, true);
36
+$allCats         = & $categoryHandler->getObjects(null, true);
37 37
 echo "<table width='100%' cellspacing=1 cellpadding=3 border=0 class = outer>";
38 38
 echo '<tr>';
39
-echo "<th width='40' class='bg3' align='center'><b>" . _AM_SF_ARTID . '</b></td>';
40
-echo "<th width='20%' class='bg3' align='left'><b>" . _AM_SF_ARTCOLNAME . '</b></td>';
41
-echo "<th class='bg3' align='left'><b>" . _AM_SF_QUESTION . '</b></td>';
39
+echo "<th width='40' class='bg3' align='center'><b>"._AM_SF_ARTID.'</b></td>';
40
+echo "<th width='20%' class='bg3' align='left'><b>"._AM_SF_ARTCOLNAME.'</b></td>';
41
+echo "<th class='bg3' align='left'><b>"._AM_SF_QUESTION.'</b></td>';
42 42
 
43
-echo "<th width='90' class='bg3' align='center'><b>" . _AM_SF_ASKED . '</b></td>';
44
-echo "<th width='90' class='bg3' align='center'><b>" . _AM_SF_ANSWERED . '</b></td>';
43
+echo "<th width='90' class='bg3' align='center'><b>"._AM_SF_ASKED.'</b></td>';
44
+echo "<th width='90' class='bg3' align='center'><b>"._AM_SF_ANSWERED.'</b></td>';
45 45
 
46
-echo "<th width='90' class='bg3' align='center'><b>" . _AM_SF_CREATED . '</b></td>';
47
-echo "<th width='60' class='bg3' align='center'><b>" . _AM_SF_ACTION . '</b></td>';
46
+echo "<th width='90' class='bg3' align='center'><b>"._AM_SF_CREATED.'</b></td>';
47
+echo "<th width='60' class='bg3' align='center'><b>"._AM_SF_ACTION.'</b></td>';
48 48
 echo '</tr>';
49 49
 if ($totalfaqs > 0) {
50 50
     global $pathIcon16, $smartModuleConfig;
@@ -60,7 +60,7 @@  discard block
 block discarded – undo
60 60
                        . "' alt='"
61 61
                        . _AM_SF_EDITART
62 62
                        . "' /></a>";
63
-        $delete      = "<a href='faq.php?op=del&amp;faqid="
63
+        $delete = "<a href='faq.php?op=del&amp;faqid="
64 64
                        . $faqsObj[$i]->faqid()
65 65
                        . "'><img src='"
66 66
                        . $pathIcon16
@@ -97,8 +97,8 @@  discard block
 block discarded – undo
97 97
         }
98 98
 
99 99
         echo '<tr>';
100
-        echo "<td class='head' align='center'>" . $faqsObj[$i]->faqid() . '</td>';
101
-        echo "<td class='even' align='left'>" . $categoryObj->name() . '</td>';
100
+        echo "<td class='head' align='center'>".$faqsObj[$i]->faqid().'</td>';
101
+        echo "<td class='even' align='left'>".$categoryObj->name().'</td>';
102 102
         echo "<td class='even' align='left'><a href='"
103 103
              . XOOPS_URL
104 104
              . '/modules/'
@@ -109,22 +109,22 @@  discard block
 block discarded – undo
109 109
              . $faqsObj[$i]->question(100)
110 110
              . '</a></td>';
111 111
 
112
-        echo "<td class='even' align='center'>" . $requester . '</td>';
113
-        echo "<td class='even' align='center'>" . $answerSubmitter . '</td>';
112
+        echo "<td class='even' align='center'>".$requester.'</td>';
113
+        echo "<td class='even' align='center'>".$answerSubmitter.'</td>';
114 114
 
115
-        echo "<td class='even' align='center'>" . $faqsObj[$i]->datesub('s') . '</td>';
115
+        echo "<td class='even' align='center'>".$faqsObj[$i]->datesub('s').'</td>';
116 116
         echo "<td class='even' align='center'> $modify $delete </td>";
117 117
         echo '</tr>';
118 118
     }
119 119
 } else {
120 120
     $faqid = -1;
121 121
     echo '<tr>';
122
-    echo "<td class='head' align='center' colspan= '7'>" . _AM_SF_NOFAQS . '</td>';
122
+    echo "<td class='head' align='center' colspan= '7'>"._AM_SF_NOFAQS.'</td>';
123 123
     echo '</tr>';
124 124
 }
125 125
 echo "</table>\n";
126 126
 echo "<br>\n";
127 127
 
128 128
 $pagenav = new XoopsPageNav($totalfaqs, $xoopsModuleConfig['perpage'], $startfaq, 'startfaq', $pagenav_extra_args);
129
-echo '<div style="text-align:right;">' . $pagenav->renderNav() . '</div>';
129
+echo '<div style="text-align:right;">'.$pagenav->renderNav().'</div>';
130 130
 echo '</div>';
Please login to merge, or discard this patch.
include/submit.inc.php 2 patches
Indentation   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -82,16 +82,16 @@
 block discarded – undo
82 82
     $delete_attach_checkbox = new XoopsFormCheckBox(_MD_SF_ATTACHED_FILES, 'delete_attach[]');
83 83
     foreach ($attachments as $key => $attachment) {
84 84
         $attach = ' '
85
-                  . _DELETE
86
-                  . ' <a href='
87
-                  . XOOPS_URL
88
-                  . '/'
89
-                  . $xoopsModuleConfig['dir_attachments']
90
-                  . '/'
91
-                  . $attachment['name_saved']
92
-                  . ' rel="external">'
93
-                  . $attachment['name_display']
94
-                  . '</a><br>';
85
+                    . _DELETE
86
+                    . ' <a href='
87
+                    . XOOPS_URL
88
+                    . '/'
89
+                    . $xoopsModuleConfig['dir_attachments']
90
+                    . '/'
91
+                    . $attachment['name_saved']
92
+                    . ' rel="external">'
93
+                    . $attachment['name_display']
94
+                    . '</a><br>';
95 95
         $delete_attach_checkbox->addOption($key, $attach);
96 96
     }
97 97
     $form->addElement($delete_attach_checkbox);
Please login to merge, or discard this patch.
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -9,11 +9,11 @@  discard block
 block discarded – undo
9 9
 
10 10
 global $_POST, $xoopsDB;
11 11
 
12
-include_once XOOPS_ROOT_PATH . '/class/xoopstree.php';
13
-include_once XOOPS_ROOT_PATH . '/class/xoopslists.php';
14
-include_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
12
+include_once XOOPS_ROOT_PATH.'/class/xoopstree.php';
13
+include_once XOOPS_ROOT_PATH.'/class/xoopslists.php';
14
+include_once XOOPS_ROOT_PATH.'/class/xoopsformloader.php';
15 15
 
16
-include_once __DIR__ . '/functions.php';
16
+include_once __DIR__.'/functions.php';
17 17
 
18 18
 $mytree = new XoopsTree($xoopsDB->prefix('smartfaq_categories'), 'categoryid', 'parentid');
19 19
 $form   = new XoopsThemeForm(_MD_SF_SUB_SMNAME, 'form', xoops_getenv('PHP_SELF'));
@@ -70,11 +70,11 @@  discard block
 block discarded – undo
70 70
 //    $upload_tray->addElement(new XoopsFormFile('', 'userfile', ($forum_obj->getVar('attach_maxkb') * 1024)));
71 71
 $upload_tray->addElement(new XoopsFormFile('', 'userfile', $xoopsModuleConfig['max_image_size'] * 1024));
72 72
 $upload_tray->addElement(new XoopsFormButton('', 'contents_upload', _MD_SF_UPLOAD, 'submit'));
73
-$upload_tray->addElement(new XoopsFormLabel('<br><br>' . _MD_SF_MAX_FILESIZE . ':', $xoopsModuleConfig['max_image_size'] . 'Kb; '));
73
+$upload_tray->addElement(new XoopsFormLabel('<br><br>'._MD_SF_MAX_FILESIZE.':', $xoopsModuleConfig['max_image_size'].'Kb; '));
74 74
 $extensions = trim(str_replace('|', ' ', $xoopsModuleConfig['attach_ext']));
75 75
 $extensions = (empty($extensions) || $extensions === '*') ? _ALL : $extensions;
76
-$upload_tray->addElement(new XoopsFormLabel(_MD_SF_ALLOWED_EXTENSIONS . ':', $extensions));
77
-$upload_tray->addElement(new XoopsFormLabel('<br>' . sprintf(_MD_SF_MAXPIC, $xoopsModuleConfig['max_img_height'], $xoopsModuleConfig['max_img_width'])));
76
+$upload_tray->addElement(new XoopsFormLabel(_MD_SF_ALLOWED_EXTENSIONS.':', $extensions));
77
+$upload_tray->addElement(new XoopsFormLabel('<br>'.sprintf(_MD_SF_MAXPIC, $xoopsModuleConfig['max_img_height'], $xoopsModuleConfig['max_img_width'])));
78 78
 $form->addElement($upload_tray);
79 79
 //}
80 80
 
@@ -102,7 +102,7 @@  discard block
 block discarded – undo
102 102
     $delete_attach_checkbox = new XoopsFormCheckBox(_MD_REMOVE, 'delete_tmp[]');
103 103
     $url_prefix             = str_replace(XOOPS_ROOT_PATH, XOOPS_URL, XOOPS_CACHE_PATH);
104 104
     foreach ($attachments_tmp as $key => $attachment) {
105
-        $attach = ' <a href="' . $url_prefix . '/' . $attachment[0] . '" rel="external">' . $attachment[1] . '</a><br>';
105
+        $attach = ' <a href="'.$url_prefix.'/'.$attachment[0].'" rel="external">'.$attachment[1].'</a><br>';
106 106
         $delete_attach_checkbox->addOption($key, $attach);
107 107
     }
108 108
     $form->addElement($delete_attach_checkbox);
Please login to merge, or discard this patch.
include/functions.image.php 1 patch
Spacing   +31 added lines, -31 removed lines patch added patch discarded remove patch
@@ -28,25 +28,25 @@  discard block
 block discarded – undo
28 28
     {
29 29
         global $xoopsModuleConfig;
30 30
 
31
-        $img_path   = XOOPS_ROOT_PATH . '/' . $xoopsModuleConfig['dir_attachments'];
32
-        $img_url    = XOOPS_URL . '/' . $xoopsModuleConfig['dir_attachments'];
33
-        $thumb_path = $img_path . '/thumbs';
34
-        $thumb_url  = $img_url . '/thumbs';
31
+        $img_path   = XOOPS_ROOT_PATH.'/'.$xoopsModuleConfig['dir_attachments'];
32
+        $img_url    = XOOPS_URL.'/'.$xoopsModuleConfig['dir_attachments'];
33
+        $thumb_path = $img_path.'/thumbs';
34
+        $thumb_url  = $img_url.'/thumbs';
35 35
 
36
-        $thumb     = $thumb_path . '/' . $source;
37
-        $image     = $img_path . '/' . $source;
38
-        $thumb_url = $thumb_url . '/' . $source;
39
-        $image_url = $img_url . '/' . $source;
36
+        $thumb     = $thumb_path.'/'.$source;
37
+        $image     = $img_path.'/'.$source;
38
+        $thumb_url = $thumb_url.'/'.$source;
39
+        $image_url = $img_url.'/'.$source;
40 40
 
41 41
         $imginfo  = @getimagesize($image);
42
-        $img_info = (count($imginfo) > 0) ? $imginfo[0] . 'X' . $imginfo[1] . ' px' : '';
42
+        $img_info = (count($imginfo) > 0) ? $imginfo[0].'X'.$imginfo[1].' px' : '';
43 43
 
44 44
         if ($xoopsModuleConfig['max_image_width'] > 0 && $xoopsModuleConfig['max_image_height'] > 0) {
45 45
             if ($imginfo[0] > $xoopsModuleConfig['max_image_width']
46 46
                 || $imginfo[1] > $xoopsModuleConfig['max_image_height']
47 47
             ) {
48 48
                 //if (!file_exists($thumb_path.'/'.$source) && $imginfo[0] > $xoopsModuleConfig['max_img_width']) {
49
-                if (!file_exists($thumb_path . '/' . $source)) {
49
+                if (!file_exists($thumb_path.'/'.$source)) {
50 50
                     sf_createThumbnail($source, $xoopsModuleConfig['max_image_width']);
51 51
                 }
52 52
             }
@@ -56,7 +56,7 @@  discard block
 block discarded – undo
56 56
             ) {
57 57
                 $pseudo_width  = $xoopsModuleConfig['max_image_width'];
58 58
                 $pseudo_height = $xoopsModuleConfig['max_image_width'] * ($imginfo[1] / $imginfo[0]);
59
-                $pseudo_size   = "width='" . $pseudo_width . "px' height='" . $pseudo_height . "px'";
59
+                $pseudo_size   = "width='".$pseudo_width."px' height='".$pseudo_height."px'";
60 60
             }
61 61
             // irmtfan to fix Undefined variable: pseudo_height
62 62
             if (!empty($pseudo_height) && $xoopsModuleConfig['max_image_height'] > 0
@@ -64,20 +64,20 @@  discard block
 block discarded – undo
64 64
             ) {
65 65
                 $pseudo_height = $xoopsModuleConfig['max_image_height'];
66 66
                 $pseudo_width  = $xoopsModuleConfig['max_image_height'] * ($imginfo[0] / $imginfo[1]);
67
-                $pseudo_size   = "width='" . $pseudo_width . "px' height='" . $pseudo_height . "px'";
67
+                $pseudo_size   = "width='".$pseudo_width."px' height='".$pseudo_height."px'";
68 68
             }
69 69
         }
70 70
 
71 71
         if (file_exists($thumb)) {
72
-            $attachmentImage = '<a href="' . $image_url . '" title="' . $source . ' ' . $img_info . '" target="_blank">';
73
-            $attachmentImage .= '<img src="' . $thumb_url . '" alt="' . $source . ' ' . $img_info . '" />';
72
+            $attachmentImage = '<a href="'.$image_url.'" title="'.$source.' '.$img_info.'" target="_blank">';
73
+            $attachmentImage .= '<img src="'.$thumb_url.'" alt="'.$source.' '.$img_info.'" />';
74 74
             $attachmentImage .= '</a>';
75 75
         } elseif (!empty($pseudo_size)) {
76
-            $attachmentImage = '<a href="' . $image_url . '" title="' . $source . ' ' . $img_info . '" target="_blank">';
77
-            $attachmentImage .= '<img src="' . $image_url . '" ' . $pseudo_size . ' alt="' . $source . ' ' . $img_info . '" />';
76
+            $attachmentImage = '<a href="'.$image_url.'" title="'.$source.' '.$img_info.'" target="_blank">';
77
+            $attachmentImage .= '<img src="'.$image_url.'" '.$pseudo_size.' alt="'.$source.' '.$img_info.'" />';
78 78
             $attachmentImage .= '</a>';
79 79
         } elseif (file_exists($image)) {
80
-            $attachmentImage = '<img src="' . $image_url . '" alt="' . $source . ' ' . $img_info . '" />';
80
+            $attachmentImage = '<img src="'.$image_url.'" alt="'.$source.' '.$img_info.'" />';
81 81
         } else {
82 82
             $attachmentImage = '';
83 83
         }
@@ -94,10 +94,10 @@  discard block
 block discarded – undo
94 94
     {
95 95
         global $xoopsModuleConfig;
96 96
 
97
-        $img_path   = XOOPS_ROOT_PATH . '/' . $xoopsModuleConfig['dir_attachments'];
98
-        $thumb_path = $img_path . '/thumbs';
99
-        $src_file   = $img_path . '/' . $source;
100
-        $new_file   = $thumb_path . '/' . $source;
97
+        $img_path   = XOOPS_ROOT_PATH.'/'.$xoopsModuleConfig['dir_attachments'];
98
+        $thumb_path = $img_path.'/thumbs';
99
+        $src_file   = $img_path.'/'.$source;
100
+        $new_file   = $thumb_path.'/'.$source;
101 101
         //$imageLibs = sf_getImageLibs();
102 102
 
103 103
         if (!filesize($src_file) || !is_readable($src_file)) {
@@ -117,20 +117,20 @@  discard block
 block discarded – undo
117 117
             return false;
118 118
         }
119 119
 
120
-        $newWidth  = (int)min($imginfo[0], $thumb_width);
121
-        $newHeight = (int)($imginfo[1] * $newWidth / $imginfo[0]);
120
+        $newWidth  = (int) min($imginfo[0], $thumb_width);
121
+        $newHeight = (int) ($imginfo[1] * $newWidth / $imginfo[0]);
122 122
 
123 123
         if ($xoopsModuleConfig['image_lib'] == 1 or $xoopsModuleConfig['image_lib'] == 0) {
124 124
             if (preg_match("#[A-Z]:|\\\\#Ai", __FILE__)) {
125 125
                 $cur_dir     = __DIR__;
126
-                $src_file_im = '"' . $cur_dir . '\\' . strtr($src_file, '/', '\\') . '"';
127
-                $new_file_im = '"' . $cur_dir . '\\' . strtr($new_file, '/', '\\') . '"';
126
+                $src_file_im = '"'.$cur_dir.'\\'.strtr($src_file, '/', '\\').'"';
127
+                $new_file_im = '"'.$cur_dir.'\\'.strtr($new_file, '/', '\\').'"';
128 128
             } else {
129 129
                 $src_file_im = @escapeshellarg($src_file);
130 130
                 $new_file_im = @escapeshellarg($new_file);
131 131
             }
132
-            $path           = empty($xoopsModuleConfig['path_magick']) ? '' : $xoopsModuleConfig['path_magick'] . '/';
133
-            $magick_command = $path . 'convert -quality 85 -antialias -sample ' . $newWidth . 'x' . $newHeight . ' ' . $src_file_im . ' +profile "*" ' . str_replace('\\', '/', $new_file_im) . '';
132
+            $path           = empty($xoopsModuleConfig['path_magick']) ? '' : $xoopsModuleConfig['path_magick'].'/';
133
+            $magick_command = $path.'convert -quality 85 -antialias -sample '.$newWidth.'x'.$newHeight.' '.$src_file_im.' +profile "*" '.str_replace('\\', '/', $new_file_im).'';
134 134
 
135 135
             @passthru($magick_command);
136 136
             if (file_exists($new_file)) {
@@ -139,13 +139,13 @@  discard block
 block discarded – undo
139 139
         }
140 140
 
141 141
         if ($xoopsModuleConfig['image_lib'] == 2 or $xoopsModuleConfig['image_lib'] == 0) {
142
-            $path = empty($xoopsModuleConfig['path_netpbm']) ? '' : $xoopsModuleConfig['path_netpbm'] . '/';
142
+            $path = empty($xoopsModuleConfig['path_netpbm']) ? '' : $xoopsModuleConfig['path_netpbm'].'/';
143 143
             if (preg_match("/\.png/i", $source)) {
144
-                $cmd = $path . "pngtopnm $src_file | " . $path . "pnmscale -xysize $newWidth $newHeight | " . $path . "pnmtopng > $new_file";
144
+                $cmd = $path."pngtopnm $src_file | ".$path."pnmscale -xysize $newWidth $newHeight | ".$path."pnmtopng > $new_file";
145 145
             } elseif (preg_match("/\.(jpg|jpeg)/i", $source)) {
146
-                $cmd = $path . "jpegtopnm $src_file | " . $path . "pnmscale -xysize $newWidth $newHeight | " . $path . "ppmtojpeg -quality=90 > $new_file";
146
+                $cmd = $path."jpegtopnm $src_file | ".$path."pnmscale -xysize $newWidth $newHeight | ".$path."ppmtojpeg -quality=90 > $new_file";
147 147
             } elseif (preg_match("/\.gif/i", $source)) {
148
-                $cmd = $path . "giftopnm $src_file | " . $path . "pnmscale -xysize $newWidth $newHeight | ppmquant 256 | " . $path . "ppmtogif > $new_file";
148
+                $cmd = $path."giftopnm $src_file | ".$path."pnmscale -xysize $newWidth $newHeight | ppmquant 256 | ".$path."ppmtogif > $new_file";
149 149
             }
150 150
 
151 151
             @exec($cmd, $output, $retval);
Please login to merge, or discard this patch.
include/functions.render.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -11,7 +11,7 @@  discard block
 block discarded – undo
11 11
 
12 12
 // defined('XOOPS_ROOT_PATH') || exit('XOOPS root path not defined');
13 13
 
14
-defined('NEWBB_FUNCTIONS_INI') || include __DIR__ . '/functions.ini.php';
14
+defined('NEWBB_FUNCTIONS_INI') || include __DIR__.'/functions.ini.php';
15 15
 define('NEWBB_FUNCTIONS_RENDER_LOADED', true);
16 16
 
17 17
 if (!defined('NEWBB_FUNCTIONS_RENDER')):
@@ -56,16 +56,16 @@  discard block
 block discarded – undo
56 56
             // decode xcode
57 57
             if ($image != 0) {
58 58
                 // image allowed
59
-                $text =& $myts->xoopsCodeDecode($text);
59
+                $text = & $myts->xoopsCodeDecode($text);
60 60
             } else {
61 61
                 // image not allowed
62
-                $text =& $myts->xoopsCodeDecode($text, 0);
62
+                $text = & $myts->xoopsCodeDecode($text, 0);
63 63
             }
64 64
         }
65 65
         if ($br != 0) {
66
-            $text =& $myts->nl2Br($text);
66
+            $text = & $myts->nl2Br($text);
67 67
         }
68
-        $text = $myts->codeConv($text, $xcode, $image);    // Ryuji_edit(2003-11-18)
68
+        $text = $myts->codeConv($text, $xcode, $image); // Ryuji_edit(2003-11-18)
69 69
 
70 70
         return $text;
71 71
     }
@@ -95,7 +95,7 @@  discard block
 block discarded – undo
95 95
     {
96 96
         $button = "<input type='button' name='{$button}' {$extra} value='{$alt}' onclick='window.location.href={$link}' />";
97 97
         if (empty($asImage)) {
98
-            $button = "<a href='{$link}' title='{$alt}' {$extra}>" . sf_displayImage($button, $alt, true) . '</a>';
98
+            $button = "<a href='{$link}' title='{$alt}' {$extra}>".sf_displayImage($button, $alt, true).'</a>';
99 99
         }
100 100
 
101 101
         return $button;
@@ -147,7 +147,7 @@  discard block
 block discarded – undo
147 147
         }
148 148
 
149 149
         if (!class_exists('NewbbIconHandler')) {
150
-            require_once __DIR__ . '/../class/icon.php';
150
+            require_once __DIR__.'/../class/icon.php';
151 151
         }
152 152
 
153 153
         $iconHandler           = NewbbIconHandler::getInstance();
Please login to merge, or discard this patch.
xoops_version.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -25,7 +25,7 @@  discard block
 block discarded – undo
25 25
 //$modversion['icons32']             = '../../Frameworks/moduleclasses/icons/32';
26 26
 $modversion['modicons16']          = 'assets/images/icons/16';
27 27
 $modversion['modicons32']          = 'assets/images/icons/32';
28
-$modversion['release_file']        = XOOPS_URL . '/modules/' . $modversion['dirname'] . '/docs/changelog.txt';
28
+$modversion['release_file']        = XOOPS_URL.'/modules/'.$modversion['dirname'].'/docs/changelog.txt';
29 29
 $modversion['module_website_url']  = 'www.xoops.org';
30 30
 $modversion['module_website_name'] = 'XOOPS';
31 31
 $modversion['min_php']             = '5.5';
@@ -95,9 +95,9 @@  discard block
 block discarded – undo
95 95
 
96 96
 // Tables created by sql file (without prefix!)
97 97
 $modversion['tables'] = [
98
-    $moduleDirName . '_' . 'categories',
99
-    $moduleDirName . '_' . 'faq',
100
-    $moduleDirName . '_' . 'answers'
98
+    $moduleDirName.'_'.'categories',
99
+    $moduleDirName.'_'.'faq',
100
+    $moduleDirName.'_'.'answers'
101 101
 ];
102 102
 
103 103
 // Search
@@ -151,7 +151,7 @@  discard block
 block discarded – undo
151 151
             $modversion['sub'][2]['url']  = 'request.php?op=add';
152 152
         }
153 153
 
154
-        include_once XOOPS_ROOT_PATH . '/modules/smartfaq/include/functions.php';
154
+        include_once XOOPS_ROOT_PATH.'/modules/smartfaq/include/functions.php';
155 155
 
156 156
         // Creating the FAQ handler object
157 157
         $faqHandler = sf_gethandler('faq');
Please login to merge, or discard this patch.
print.php 2 patches
Indentation   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -53,25 +53,25 @@
 block discarded – undo
53 53
 echo "<body bgcolor='#ffffff' text='#000000' onload='window.print()'>
54 54
      <div style='width: 650px; border: 1px solid #000; padding: 20px;'>
55 55
      <div style='text-align: center; display: block; margin: 0 0 6px 0;'><img src='"
56
-     . XOOPS_URL
57
-     . "/modules/smartfaq/assets/images/logo_module.png' border='0' alt='' /><h2 style='margin: 0;'>"
58
-     . $faqObj->question()
59
-     . "</h2></div>
56
+        . XOOPS_URL
57
+        . "/modules/smartfaq/assets/images/logo_module.png' border='0' alt='' /><h2 style='margin: 0;'>"
58
+        . $faqObj->question()
59
+        . "</h2></div>
60 60
      <div align='center'>"
61
-     . $who_where
62
-     . "</div>
61
+        . $who_where
62
+        . "</div>
63 63
                 <div style='text-align: center; display: block; padding-bottom: 12px; margin: 0 0 6px 0; border-bottom: 2px solid #ccc;'></div>
64 64
                 <div></div>
65 65
                 <b><p>"
66
-     . $faqObj->question()
67
-     . '</p></b>
66
+        . $faqObj->question()
67
+        . '</p></b>
68 68
                 <p>'
69
-     . $answerObj->answer()
70
-     . "</p>
69
+        . $answerObj->answer()
70
+        . "</p>
71 71
                 <div style='padding-top: 12px; border-top: 2px solid #ccc;'></div>
72 72
                 <p>"
73
-     . $comeFrom
74
-     . '</p>
73
+        . $comeFrom
74
+        . '</p>
75 75
             </div>
76 76
     <br>';
77 77
 
Please login to merge, or discard this patch.
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -6,9 +6,9 @@  discard block
 block discarded – undo
6 6
  * Licence: GNU
7 7
  */
8 8
 
9
-include_once __DIR__ . '/header.php';
9
+include_once __DIR__.'/header.php';
10 10
 
11
-$faqid = isset($_GET['faqid']) ? (int)$_GET['faqid'] : 0;
11
+$faqid = isset($_GET['faqid']) ? (int) $_GET['faqid'] : 0;
12 12
 
13 13
 if ($faqid == 0) {
14 14
     redirect_header('javascript:history.go(-1)', 1, _MD_SF_NOFAQSELECTED);
@@ -43,12 +43,12 @@  discard block
 block discarded – undo
43 43
 
44 44
 echo "<!DOCTYPE HTML PUBLIC '-//W3C//DTD HTML 4.01 Transitional//EN'>\n";
45 45
 echo "<html>\n<head>\n";
46
-echo '<title>' . _MD_SF_FAQCOMEFROM . ' ' . $xoopsConfig['sitename'] . "</title>\n";
47
-echo "<meta http-equiv='Content-Type' content='text/html; charset=" . _CHARSET . "' />\n";
48
-echo "<meta name='AUTHOR' content='" . $xoopsConfig['sitename'] . "' />\n";
49
-echo "<meta name='COPYRIGHT' content='Copyright (c) 2001 by " . $xoopsConfig['sitename'] . "' />\n";
50
-echo "<meta name='DESCRIPTION' content='" . $xoopsConfig['slogan'] . "' />\n";
51
-echo "<meta name='GENERATOR' content='" . XOOPS_VERSION . "' />\n\n\n";
46
+echo '<title>'._MD_SF_FAQCOMEFROM.' '.$xoopsConfig['sitename']."</title>\n";
47
+echo "<meta http-equiv='Content-Type' content='text/html; charset="._CHARSET."' />\n";
48
+echo "<meta name='AUTHOR' content='".$xoopsConfig['sitename']."' />\n";
49
+echo "<meta name='COPYRIGHT' content='Copyright (c) 2001 by ".$xoopsConfig['sitename']."' />\n";
50
+echo "<meta name='DESCRIPTION' content='".$xoopsConfig['slogan']."' />\n";
51
+echo "<meta name='GENERATOR' content='".XOOPS_VERSION."' />\n\n\n";
52 52
 
53 53
 echo "<body bgcolor='#ffffff' text='#000000' onload='window.print()'>
54 54
      <div style='width: 650px; border: 1px solid #000; padding: 20px;'>
Please login to merge, or discard this patch.