Completed
Branch master (c92e39)
by Michael
02:32
created
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.
answer.php 1 patch
Spacing   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -8,7 +8,7 @@  discard block
 block discarded – undo
8 8
 
9 9
 use Xmf\Request;
10 10
 
11
-include_once __DIR__ . '/header.php';
11
+include_once __DIR__.'/header.php';
12 12
 
13 13
 global $xoopsUser, $xoopsConfig, $xoopsModuleConfig, $xoopsModule;
14 14
 
@@ -129,12 +129,12 @@  discard block
 block discarded – undo
129 129
 
130 130
         // Storing the FAQ object in the database
131 131
         if (!$faqObj->store()) {
132
-            redirect_header('javascript:history.go(-1)', 3, _MD_SF_SUBMIT_ERROR . sf_formatErrors($faqObj->getErrors()));
132
+            redirect_header('javascript:history.go(-1)', 3, _MD_SF_SUBMIT_ERROR.sf_formatErrors($faqObj->getErrors()));
133 133
         }
134 134
 
135 135
         // Storing the answer object in the database
136 136
         if (!$newAnswerObj->store()) {
137
-            redirect_header('javascript:history.go(-1)', 3, _MD_SF_SUBMIT_ERROR . sf_formatErrors($newAnswerObj->getErrors()));
137
+            redirect_header('javascript:history.go(-1)', 3, _MD_SF_SUBMIT_ERROR.sf_formatErrors($newAnswerObj->getErrors()));
138 138
         }
139 139
 
140 140
         $notificationHandler = xoops_getHandler('notification');
@@ -150,7 +150,7 @@  discard block
 block discarded – undo
150 150
             case 2:
151 151
                 // Answer for an open question submitted, auto-approved; became Q&A, need approbation
152 152
                 if (isset($_POST['notifypub']) && $_POST['notifypub'] == 1) {
153
-                    include_once XOOPS_ROOT_PATH . '/include/notification_constants.php';
153
+                    include_once XOOPS_ROOT_PATH.'/include/notification_constants.php';
154 154
                     $notificationHandler->subscribe('faq', $faqObj->faqid(), 'approved', XOOPS_NOTIFICATION_MODE_SENDONCETHENDELETE);
155 155
                 }
156 156
                 // Send notifications
@@ -160,7 +160,7 @@  discard block
 block discarded – undo
160 160
             case 3:
161 161
                 // Answer submitted, needs approbation
162 162
                 if (isset($_POST['notifypub']) && $_POST['notifypub'] == 1) {
163
-                    include_once XOOPS_ROOT_PATH . '/include/notification_constants.php';
163
+                    include_once XOOPS_ROOT_PATH.'/include/notification_constants.php';
164 164
                     $notificationHandler->subscribe('question', $newAnswerObj->answerid(), 'approved', XOOPS_NOTIFICATION_MODE_SENDONCETHENDELETE);
165 165
                 }
166 166
                 // Send notifications
@@ -175,7 +175,7 @@  discard block
 block discarded – undo
175 175
                 // New answer submitted for a published Q&A, need approbation
176 176
                 // Send notifications
177 177
                 if (isset($_POST['notifypub']) && $_POST['notifypub'] == 1) {
178
-                    include_once XOOPS_ROOT_PATH . '/include/notification_constants.php';
178
+                    include_once XOOPS_ROOT_PATH.'/include/notification_constants.php';
179 179
                     $notificationHandler->subscribe('faq', $newAnswerObj->answerid(), 'answer_approved', XOOPS_NOTIFICATION_MODE_SENDONCETHENDELETE);
180 180
                 }
181 181
 
@@ -212,20 +212,20 @@  discard block
 block discarded – undo
212 212
         }
213 213
 
214 214
         $GLOBALS['xoopsOption']['template_main'] = 'smartfaq_submit.tpl';
215
-        include_once XOOPS_ROOT_PATH . '/header.php';
216
-        include_once __DIR__ . '/footer.php';
215
+        include_once XOOPS_ROOT_PATH.'/header.php';
216
+        include_once __DIR__.'/footer.php';
217 217
 
218 218
         $name = $xoopsUser ? ucwords($xoopsUser->getVar('uname')) : 'Anonymous';
219 219
 
220
-        $moduleName =& $myts->displayTarea($xoopsModule->getVar('name'));
220
+        $moduleName = & $myts->displayTarea($xoopsModule->getVar('name'));
221 221
         $xoopsTpl->assign('whereInSection', $moduleName);
222 222
         $xoopsTpl->assign('lang_submit', _MD_SF_SUBMITANSWER);
223 223
 
224 224
         $xoopsTpl->assign('lang_intro_title', sprintf(_MD_SF_SUBMITANSWERTO, ucwords($xoopsModule->name())));
225
-        $xoopsTpl->assign('lang_intro_text', _MD_SF_GOODDAY . "<b>$name</b>, " . _MD_SF_SUBMITANSWER_INTRO);
225
+        $xoopsTpl->assign('lang_intro_text', _MD_SF_GOODDAY."<b>$name</b>, "._MD_SF_SUBMITANSWER_INTRO);
226 226
 
227
-        include_once __DIR__ . '/include/answer.inc.php';
227
+        include_once __DIR__.'/include/answer.inc.php';
228 228
 
229
-        include_once XOOPS_ROOT_PATH . '/footer.php';
229
+        include_once XOOPS_ROOT_PATH.'/footer.php';
230 230
         break;
231 231
 }
Please login to merge, or discard this patch.
index.php 1 patch
Spacing   +17 added lines, -17 removed lines patch added patch discarded remove patch
@@ -5,13 +5,13 @@  discard block
 block discarded – undo
5 5
  * Author: The SmartFactory <www.smartfactory.ca>
6 6
  * Licence: GNU
7 7
  */
8
-include_once __DIR__ . '/header.php';
8
+include_once __DIR__.'/header.php';
9 9
 
10 10
 // At which record shall we start for the Categories
11
-$catstart = isset($_GET['catstart']) ? (int)$_GET['catstart'] : 0;
11
+$catstart = isset($_GET['catstart']) ? (int) $_GET['catstart'] : 0;
12 12
 
13 13
 // At which record shall we start for the FAQ
14
-$start = isset($_GET['start']) ? (int)$_GET['start'] : 0;
14
+$start = isset($_GET['start']) ? (int) $_GET['start'] : 0;
15 15
 
16 16
 // Creating the category handler object
17 17
 $categoryHandler = sf_gethandler('category');
@@ -37,8 +37,8 @@  discard block
 block discarded – undo
37 37
 
38 38
 $GLOBALS['xoopsOption']['template_main'] = 'smartfaq_index.tpl';
39 39
 
40
-include_once XOOPS_ROOT_PATH . '/header.php';
41
-include_once __DIR__ . '/footer.php';
40
+include_once XOOPS_ROOT_PATH.'/header.php';
41
+include_once __DIR__.'/footer.php';
42 42
 
43 43
 // Creating the categories objects
44 44
 $categoriesObj = $categoryHandler->getCategories($xoopsModuleConfig['catperpage'], $catstart);
@@ -61,7 +61,7 @@  discard block
 block discarded – undo
61 61
     // Get the last smartfaq in each category
62 62
     $last_qnaObj = $faqHandler->getLastPublishedByCat();
63 63
 }
64
-$lastfaqsize = (int)$xoopsModuleConfig['lastfaqsize'];
64
+$lastfaqsize = (int) $xoopsModuleConfig['lastfaqsize'];
65 65
 $categories  = array();
66 66
 foreach ($categoriesObj as $cat_id => $category) {
67 67
     $total = 0;
@@ -71,7 +71,7 @@  discard block
 block discarded – undo
71 71
             if (isset($totalQnas[$subcat_id]) && $totalQnas[$subcat_id] > 0) {
72 72
                 if (isset($last_qnaObj[$subcat_id])) {
73 73
                     $subcat->setVar('last_faqid', $last_qnaObj[$subcat_id]->getVar('faqid'));
74
-                    $subcat->setVar('last_question_link', "<a href='faq.php?faqid=" . $last_qnaObj[$subcat_id]->getVar('faqid') . "'>" . $last_qnaObj[$subcat_id]->question($lastfaqsize) . '</a>');
74
+                    $subcat->setVar('last_question_link', "<a href='faq.php?faqid=".$last_qnaObj[$subcat_id]->getVar('faqid')."'>".$last_qnaObj[$subcat_id]->question($lastfaqsize).'</a>');
75 75
                 }
76 76
                 $subcat->setVar('faqcount', $totalQnas[$subcat_id]);
77 77
                 if ($xoopsModuleConfig['displaysubcatonindex']) {
@@ -89,7 +89,7 @@  discard block
 block discarded – undo
89 89
     if ($total > 0) {
90 90
         if (isset($last_qnaObj[$cat_id])) {
91 91
             $category->setVar('last_faqid', $last_qnaObj[$cat_id]->getVar('faqid'));
92
-            $category->setVar('last_question_link', "<a href='faq.php?faqid=" . $last_qnaObj[$cat_id]->getVar('faqid') . "'>" . $last_qnaObj[$cat_id]->question($lastfaqsize) . '</a>');
92
+            $category->setVar('last_question_link', "<a href='faq.php?faqid=".$last_qnaObj[$cat_id]->getVar('faqid')."'>".$last_qnaObj[$cat_id]->question($lastfaqsize).'</a>');
93 93
         }
94 94
         $category->setVar('faqcount', $total);
95 95
         if (!isset($categories[$cat_id])) {
@@ -127,7 +127,7 @@  discard block
 block discarded – undo
127 127
         }
128 128
 
129 129
         $memberHandler = xoops_getHandler('member');
130
-        $users         = $memberHandler->getUsers(new Criteria('uid', '(' . implode(',', array_keys($userids)) . ')', 'IN'), true);
130
+        $users         = $memberHandler->getUsers(new Criteria('uid', '('.implode(',', array_keys($userids)).')', 'IN'), true);
131 131
         for ($i = 0; $i < $totalQnasOnPage; ++$i) {
132 132
             $faq = $faqsObj[$i]->toArray(null, $allcategories);
133 133
 
@@ -153,14 +153,14 @@  discard block
 block discarded – undo
153 153
 }
154 154
 
155 155
 // Language constants
156
-$moduleName =& $myts->displayTarea($xoopsModule->getVar('name'));
156
+$moduleName = & $myts->displayTarea($xoopsModule->getVar('name'));
157 157
 $xoopsTpl->assign('whereInSection', $moduleName);
158 158
 $xoopsTpl->assign('displaysubcatonindex', $xoopsModuleConfig['displaysubcatonindex']);
159 159
 $xoopsTpl->assign('displaylastfaqs', $xoopsModuleConfig['displaylastfaqs']);
160 160
 $xoopsTpl->assign('display_categoryname', true);
161 161
 $xoopsTpl->assign('displayFull', $xoopsModuleConfig['displaytype'] === 'full');
162 162
 
163
-$xoopsTpl->assign('lang_mainhead', _MD_SF_MAINHEAD . ' ' . $moduleName);
163
+$xoopsTpl->assign('lang_mainhead', _MD_SF_MAINHEAD.' '.$moduleName);
164 164
 $xoopsTpl->assign('lang_mainintro', $myts->displayTarea($xoopsModuleConfig['indexwelcomemsg'], 1));
165 165
 $xoopsTpl->assign('lang_total', _MD_SF_TOTAL_SMARTFAQS);
166 166
 $xoopsTpl->assign('lang_home', _MD_SF_HOME);
@@ -179,20 +179,20 @@  discard block
 block discarded – undo
179 179
 $xoopsTpl->assign('lang_comments', _MD_SF_COMMENTS);
180 180
 
181 181
 // Category Navigation Bar
182
-include_once XOOPS_ROOT_PATH . '/class/pagenav.php';
182
+include_once XOOPS_ROOT_PATH.'/class/pagenav.php';
183 183
 $pagenav = new XoopsPageNav($totalCategories, $xoopsModuleConfig['catperpage'], $catstart, 'catstart', '');
184 184
 if ($xoopsModuleConfig['useimagenavpage'] == 1) {
185
-    $xoopsTpl->assign('catnavbar', '<div style="text-align:right;">' . $pagenav->renderImageNav() . '</div>');
185
+    $xoopsTpl->assign('catnavbar', '<div style="text-align:right;">'.$pagenav->renderImageNav().'</div>');
186 186
 } else {
187
-    $xoopsTpl->assign('catnavbar', '<div style="text-align:right;">' . $pagenav->renderNav() . '</div>');
187
+    $xoopsTpl->assign('catnavbar', '<div style="text-align:right;">'.$pagenav->renderNav().'</div>');
188 188
 }
189 189
 
190 190
 // FAQ Navigation Bar
191 191
 $pagenav = new XoopsPageNav($totalFaqs, $xoopsModuleConfig['indexperpage'], $start, 'start', '');
192 192
 if ($xoopsModuleConfig['useimagenavpage'] == 1) {
193
-    $xoopsTpl->assign('navbar', '<div style="text-align:right;">' . $pagenav->renderImageNav() . '</div>');
193
+    $xoopsTpl->assign('navbar', '<div style="text-align:right;">'.$pagenav->renderImageNav().'</div>');
194 194
 } else {
195
-    $xoopsTpl->assign('navbar', '<div style="text-align:right;">' . $pagenav->renderNav() . '</div>');
195
+    $xoopsTpl->assign('navbar', '<div style="text-align:right;">'.$pagenav->renderNav().'</div>');
196 196
 }
197 197
 
198 198
 // Page Title Hack by marcan
@@ -200,4 +200,4 @@  discard block
 block discarded – undo
200 200
 $xoopsTpl->assign('xoops_pagetitle', $module_name);
201 201
 // End Page Title Hack by marcan
202 202
 
203
-include_once XOOPS_ROOT_PATH . '/footer.php';
203
+include_once XOOPS_ROOT_PATH.'/footer.php';
Please login to merge, or discard this patch.