Completed
Push — master ( 721049...80219e )
by Michael
04:08
created
class/Common/ServerStats.php 1 patch
Spacing   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -34,19 +34,19 @@  discard block
 block discarded – undo
34 34
         //        $sql   .= " WHERE metakey='version' LIMIT 1";
35 35
         //        $query = $GLOBALS['xoopsDB']->query($sql);
36 36
         //        list($meta) = $GLOBALS['xoopsDB']->fetchRow($query);
37
-        $html .= "<fieldset><legend style='font-weight: bold; color: #900;'>" . constant('CO_' . $moduleDirNameUpper . '_IMAGEINFO') . "</legend>\n";
37
+        $html .= "<fieldset><legend style='font-weight: bold; color: #900;'>".constant('CO_'.$moduleDirNameUpper.'_IMAGEINFO')."</legend>\n";
38 38
         $html .= "<div style='padding: 8px;'>\n";
39 39
         //        $html .= '<div>' . constant('CO_' . $moduleDirNameUpper . '_METAVERSION') . $meta . "</div>\n";
40 40
         //        $html .= "<br>\n";
41 41
         //        $html .= "<br>\n";
42
-        $html .= '<div>' . constant('CO_' . $moduleDirNameUpper . '_SPHPINI') . "</div>\n";
42
+        $html .= '<div>'.constant('CO_'.$moduleDirNameUpper.'_SPHPINI')."</div>\n";
43 43
         $html .= "<ul>\n";
44 44
         //
45
-        $gdlib = function_exists('gd_info') ? '<span style="color: green;">' . constant('CO_' . $moduleDirNameUpper . '_GDON') . '</span>' : '<span style="color: red;">' . constant('CO_' . $moduleDirNameUpper . '_GDOFF') . '</span>';
46
-        $html  .= '<li>' . constant('CO_' . $moduleDirNameUpper . '_GDLIBSTATUS') . $gdlib;
45
+        $gdlib = function_exists('gd_info') ? '<span style="color: green;">'.constant('CO_'.$moduleDirNameUpper.'_GDON').'</span>' : '<span style="color: red;">'.constant('CO_'.$moduleDirNameUpper.'_GDOFF').'</span>';
46
+        $html .= '<li>'.constant('CO_'.$moduleDirNameUpper.'_GDLIBSTATUS').$gdlib;
47 47
         if (function_exists('gd_info')) {
48 48
             if (true === ($gdlib = gd_info())) {
49
-                $html .= '<li>' . constant('CO_' . $moduleDirNameUpper . '_GDLIBVERSION') . '<b>' . $gdlib['GD Version'] . '</b>';
49
+                $html .= '<li>'.constant('CO_'.$moduleDirNameUpper.'_GDLIBVERSION').'<b>'.$gdlib['GD Version'].'</b>';
50 50
             }
51 51
         }
52 52
         //
@@ -56,18 +56,18 @@  discard block
 block discarded – undo
56 56
         //    $registerglobals = (!ini_get('register_globals')) ? "<span style=\"color: green;\">" . constant('CO_' . $moduleDirNameUpper . '_OFF') . '</span>' : "<span style=\"color: red;\">" . constant('CO_' . $moduleDirNameUpper . '_ON') . '</span>';
57 57
         //    $html .= '<li>' . constant('CO_' . $moduleDirNameUpper . '_REGISTERGLOBALS . $registerglobals;
58 58
         //
59
-        $downloads = ini_get('file_uploads') ? '<span style="color: green;">' . constant('CO_' . $moduleDirNameUpper . '_ON') . '</span>' : '<span style="color: red;">' . constant('CO_' . $moduleDirNameUpper . '_OFF') . '</span>';
60
-        $html      .= '<li>' . constant('CO_' . $moduleDirNameUpper . '_SERVERUPLOADSTATUS') . $downloads;
59
+        $downloads = ini_get('file_uploads') ? '<span style="color: green;">'.constant('CO_'.$moduleDirNameUpper.'_ON').'</span>' : '<span style="color: red;">'.constant('CO_'.$moduleDirNameUpper.'_OFF').'</span>';
60
+        $html .= '<li>'.constant('CO_'.$moduleDirNameUpper.'_SERVERUPLOADSTATUS').$downloads;
61 61
         //
62
-        $html .= '<li>' . constant('CO_' . $moduleDirNameUpper . '_MAXUPLOADSIZE') . ' <b><span style="color: blue;">' . ini_get('upload_max_filesize') . "</span></b>\n";
63
-        $html .= '<li>' . constant('CO_' . $moduleDirNameUpper . '_MAXPOSTSIZE') . ' <b><span style="color: blue;">' . ini_get('post_max_size') . "</span></b>\n";
64
-        $html .= '<li>' . constant('CO_' . $moduleDirNameUpper . '_MEMORYLIMIT') . ' <b><span style="color: blue;">' . ini_get('memory_limit') . "</span></b>\n";
62
+        $html .= '<li>'.constant('CO_'.$moduleDirNameUpper.'_MAXUPLOADSIZE').' <b><span style="color: blue;">'.ini_get('upload_max_filesize')."</span></b>\n";
63
+        $html .= '<li>'.constant('CO_'.$moduleDirNameUpper.'_MAXPOSTSIZE').' <b><span style="color: blue;">'.ini_get('post_max_size')."</span></b>\n";
64
+        $html .= '<li>'.constant('CO_'.$moduleDirNameUpper.'_MEMORYLIMIT').' <b><span style="color: blue;">'.ini_get('memory_limit')."</span></b>\n";
65 65
         $html .= "</ul>\n";
66 66
         $html .= "<ul>\n";
67
-        $html .= '<li>' . constant('CO_' . $moduleDirNameUpper . '_SERVERPATH') . ' <b>' . XOOPS_ROOT_PATH . "</b>\n";
67
+        $html .= '<li>'.constant('CO_'.$moduleDirNameUpper.'_SERVERPATH').' <b>'.XOOPS_ROOT_PATH."</b>\n";
68 68
         $html .= "</ul>\n";
69 69
         $html .= "<br>\n";
70
-        $html .= constant('CO_' . $moduleDirNameUpper . '_UPLOADPATHDSC') . "\n";
70
+        $html .= constant('CO_'.$moduleDirNameUpper.'_UPLOADPATHDSC')."\n";
71 71
         $html .= '</div>';
72 72
         $html .= '</fieldset><br>';
73 73
 
Please login to merge, or discard this patch.
class/Common/FilesManagement.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -33,7 +33,7 @@  discard block
 block discarded – undo
33 33
                     throw new \RuntimeException(sprintf('Unable to create the %s directory', $folder));
34 34
                 }
35 35
 
36
-                file_put_contents($folder . '/index.html', '<script>history.go(-1);</script>');
36
+                file_put_contents($folder.'/index.html', '<script>history.go(-1);</script>');
37 37
             }
38 38
         } catch (\Exception $e) {
39 39
             echo 'Caught exception: ', $e->getMessage(), "\n", '<br>';
@@ -61,10 +61,10 @@  discard block
 block discarded – undo
61 61
         if (!mkdir($dst) && !is_dir($dst)) {
62 62
             while (false !== ($file = readdir($dir))) {
63 63
                 if (('.' !== $file) && ('..' !== $file)) {
64
-                    if (is_dir($src . '/' . $file)) {
65
-                        self::recurseCopy($src . '/' . $file, $dst . '/' . $file);
64
+                    if (is_dir($src.'/'.$file)) {
65
+                        self::recurseCopy($src.'/'.$file, $dst.'/'.$file);
66 66
                     } else {
67
-                        copy($src . '/' . $file, $dst . '/' . $file);
67
+                        copy($src.'/'.$file, $dst.'/'.$file);
68 68
                     }
69 69
                 }
70 70
             }
@@ -159,7 +159,7 @@  discard block
 block discarded – undo
159 159
                 self::rrmdir($fObj->getPathname());
160 160
             }
161 161
         }
162
-        $iterator = null;   // clear iterator Obj to close file/directory
162
+        $iterator = null; // clear iterator Obj to close file/directory
163 163
         return rmdir($src); // remove the directory & return results
164 164
     }
165 165
 
@@ -192,14 +192,14 @@  discard block
 block discarded – undo
192 192
         $iterator = new \DirectoryIterator($src);
193 193
         foreach ($iterator as $fObj) {
194 194
             if ($fObj->isFile()) {
195
-                rename($fObj->getPathname(), "{$dest}/" . $fObj->getFilename());
195
+                rename($fObj->getPathname(), "{$dest}/".$fObj->getFilename());
196 196
             } elseif (!$fObj->isDot() && $fObj->isDir()) {
197 197
                 // Try recursively on directory
198
-                self::rmove($fObj->getPathname(), "{$dest}/" . $fObj->getFilename());
198
+                self::rmove($fObj->getPathname(), "{$dest}/".$fObj->getFilename());
199 199
                 //                rmdir($fObj->getPath()); // now delete the directory
200 200
             }
201 201
         }
202
-        $iterator = null;   // clear iterator Obj to close file/directory
202
+        $iterator = null; // clear iterator Obj to close file/directory
203 203
         return rmdir($src); // remove the directory & return results
204 204
     }
205 205
 
@@ -235,9 +235,9 @@  discard block
 block discarded – undo
235 235
         $iterator = new \DirectoryIterator($src);
236 236
         foreach ($iterator as $fObj) {
237 237
             if ($fObj->isFile()) {
238
-                copy($fObj->getPathname(), "{$dest}/" . $fObj->getFilename());
238
+                copy($fObj->getPathname(), "{$dest}/".$fObj->getFilename());
239 239
             } elseif (!$fObj->isDot() && $fObj->isDir()) {
240
-                self::rcopy($fObj->getPathname(), "{$dest}/" . $fObj->getFilename());
240
+                self::rcopy($fObj->getPathname(), "{$dest}/".$fObj->getFilename());
241 241
             }
242 242
         }
243 243
         return true;
Please login to merge, or discard this patch.
class/GroupFormCheckBox.php 2 patches
Spacing   +20 added lines, -20 removed lines patch added patch discarded remove patch
@@ -27,12 +27,12 @@  discard block
 block discarded – undo
27 27
 
28 28
 // defined('XOOPS_ROOT_PATH') || die('Restricted access');
29 29
 
30
-require_once XOOPS_ROOT_PATH . '/class/xoopsform/formelement.php';
31
-require_once XOOPS_ROOT_PATH . '/class/xoopsform/formhidden.php';
32
-require_once XOOPS_ROOT_PATH . '/class/xoopsform/formhiddentoken.php';
33
-require_once XOOPS_ROOT_PATH . '/class/xoopsform/formbutton.php';
34
-require_once XOOPS_ROOT_PATH . '/class/xoopsform/formelementtray.php';
35
-require_once XOOPS_ROOT_PATH . '/class/xoopsform/form.php';
30
+require_once XOOPS_ROOT_PATH.'/class/xoopsform/formelement.php';
31
+require_once XOOPS_ROOT_PATH.'/class/xoopsform/formhidden.php';
32
+require_once XOOPS_ROOT_PATH.'/class/xoopsform/formhiddentoken.php';
33
+require_once XOOPS_ROOT_PATH.'/class/xoopsform/formbutton.php';
34
+require_once XOOPS_ROOT_PATH.'/class/xoopsform/formelementtray.php';
35
+require_once XOOPS_ROOT_PATH.'/class/xoopsform/form.php';
36 36
 
37 37
 /**
38 38
  * Renders checkbox options for a group permission form
@@ -109,7 +109,7 @@  discard block
 block discarded – undo
109 109
      */
110 110
     public function setOptionTree(&$optionTree)
111 111
     {
112
-        $this->_optionTree =& $optionTree;
112
+        $this->_optionTree = & $optionTree;
113 113
     }
114 114
 
115 115
     /**
@@ -134,34 +134,34 @@  discard block
 block discarded – undo
134 134
         $ret = '';
135 135
 
136 136
         if (count($this->_appendix) > 0) {
137
-            $ret  .= '<table class="outer"><tr>';
137
+            $ret .= '<table class="outer"><tr>';
138 138
             $cols = 1;
139 139
             foreach ($this->_appendix as $append) {
140 140
                 if ($cols > 4) {
141
-                    $ret  .= '</tr><tr>';
141
+                    $ret .= '</tr><tr>';
142 142
                     $cols = 1;
143 143
                 }
144 144
                 $checked = $append['selected'] ? 'checked' : '';
145
-                $name    = 'perms[' . $append['permname'] . ']';
145
+                $name    = 'perms['.$append['permname'].']';
146 146
                 $itemid  = $append['itemid'];
147 147
                 $itemid  = $append['itemid'];
148
-                $ret     .= "<td class=\"odd\"><input type=\"checkbox\" name=\"{$name}[groups][$this->_groupId][$itemid]\" id=\"{$name}[groups][$this->_groupId][$itemid]\" value=\"1\" $checked>{$append['itemname']}<input type=\"hidden\" name=\"{$name}[parents][$itemid]\" value=\"\"><input type=\"hidden\" name=\"{$name}[itemname][$itemid]\" value=\"{$append['itemname']}\"><br></td>";
148
+                $ret .= "<td class=\"odd\"><input type=\"checkbox\" name=\"{$name}[groups][$this->_groupId][$itemid]\" id=\"{$name}[groups][$this->_groupId][$itemid]\" value=\"1\" $checked>{$append['itemname']}<input type=\"hidden\" name=\"{$name}[parents][$itemid]\" value=\"\"><input type=\"hidden\" name=\"{$name}[itemname][$itemid]\" value=\"{$append['itemname']}\"><br></td>";
149 149
                 ++$cols;
150 150
             }
151 151
             $ret .= '</tr></table>';
152 152
         }
153 153
 
154
-        $ret  .= '<table class="outer"><tr>';
154
+        $ret .= '<table class="outer"><tr>';
155 155
         $cols = 1;
156 156
         foreach ($this->_optionTree[0]['children'] as $topitem) {
157 157
             if ($cols > 4) {
158
-                $ret  .= '</tr><tr>';
158
+                $ret .= '</tr><tr>';
159 159
                 $cols = 1;
160 160
             }
161 161
             $tree   = '<td class="odd">';
162 162
             $prefix = '';
163 163
             $this->renderOptionTree($tree, $this->_optionTree[$topitem], $prefix);
164
-            $ret .= $tree . '</td>';
164
+            $ret .= $tree.'</td>';
165 165
             ++$cols;
166 166
         }
167 167
         $ret .= '</tr></table>';
@@ -180,21 +180,21 @@  discard block
 block discarded – undo
180 180
      */
181 181
     private function renderOptionTree(&$tree, $option, $prefix, $parentIds = [])
182 182
     {
183
-        $tree .= $prefix . '<input type="checkbox" name="' . $this->getName() . '[groups][' . $this->_groupId . '][' . $option['id'] . ']" id="' . $this->getName() . '[groups][' . $this->_groupId . '][' . $option['id'] . ']" onclick="';
183
+        $tree .= $prefix.'<input type="checkbox" name="'.$this->getName().'[groups]['.$this->_groupId.']['.$option['id'].']" id="'.$this->getName().'[groups]['.$this->_groupId.']['.$option['id'].']" onclick="';
184 184
         // If there are parent elements, add javascript that will
185 185
         // make them selecteded when this element is checked to make
186 186
         // sure permissions to parent items are added as well.
187 187
         foreach ($parentIds as $pid) {
188
-            $parent_ele = $this->getName() . '[groups][' . $this->_groupId . '][' . $pid . ']';
189
-            $tree       .= "var ele = xoopsGetElementById('" . $parent_ele . "'); if (ele.checked !== true) {ele.checked = this.checked;}";
188
+            $parent_ele = $this->getName().'[groups]['.$this->_groupId.']['.$pid.']';
189
+            $tree .= "var ele = xoopsGetElementById('".$parent_ele."'); if (ele.checked !== true) {ele.checked = this.checked;}";
190 190
         }
191 191
         // If there are child elements, add javascript that will
192 192
         // make them unchecked when this element is unchecked to make
193 193
         // sure permissions to child items are not added when there
194 194
         // is no permission to this item.
195 195
         foreach ($option['allchild'] as $cid) {
196
-            $child_ele = $this->getName() . '[groups][' . $this->_groupId . '][' . $cid . ']';
197
-            $tree      .= "var ele = xoopsGetElementById('" . $child_ele . "'); if (this.checked !== true) {ele.checked = false;}";
196
+            $child_ele = $this->getName().'[groups]['.$this->_groupId.']['.$cid.']';
197
+            $tree .= "var ele = xoopsGetElementById('".$child_ele."'); if (this.checked !== true) {ele.checked = false;}";
198 198
         }
199 199
         $tree .= '" value="1"';
200 200
         if (null !== $this->_value && in_array($option['id'], $this->_value)) {
@@ -218,7 +218,7 @@  discard block
 block discarded – undo
218 218
         if (isset($option['children'])) {
219 219
             foreach ($option['children'] as $child) {
220 220
                 array_push($parentIds, $option['id']);
221
-                $this->renderOptionTree($tree, $this->_optionTree[$child], $prefix . '&nbsp;-', $parentIds);
221
+                $this->renderOptionTree($tree, $this->_optionTree[$child], $prefix.'&nbsp;-', $parentIds);
222 222
             }
223 223
         }
224 224
     }
Please login to merge, or discard this patch.
Indentation   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -379,20 +379,20 @@
 block discarded – undo
379 379
             $tree .= ' checked';
380 380
         }
381 381
         $tree .= '>'
382
-                 . $option['name']
383
-                 . '<input type="hidden" name="'
384
-                 . $this->getName()
385
-                 . '[parents]['
386
-                 . $option['id']
387
-                 . ']" value="'
388
-                 . implode(':', $parentIds)
389
-                 . '"><input type="hidden" name="'
390
-                 . $this->getName()
391
-                 . '[itemname]['
392
-                 . $option['id']
393
-                 . ']" value="'
394
-                 . htmlspecialchars($option['name'], ENT_QUOTES)
395
-                 . "\"><br>\n";
382
+                    . $option['name']
383
+                    . '<input type="hidden" name="'
384
+                    . $this->getName()
385
+                    . '[parents]['
386
+                    . $option['id']
387
+                    . ']" value="'
388
+                    . implode(':', $parentIds)
389
+                    . '"><input type="hidden" name="'
390
+                    . $this->getName()
391
+                    . '[itemname]['
392
+                    . $option['id']
393
+                    . ']" value="'
394
+                    . htmlspecialchars($option['name'], ENT_QUOTES)
395
+                    . "\"><br>\n";
396 396
         if (isset($option['children'])) {
397 397
             foreach ($option['children'] as $child) {
398 398
                 array_push($parentIds, $option['id']);
Please login to merge, or discard this patch.
preloads/autoloader.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -3,12 +3,12 @@  discard block
 block discarded – undo
3 3
 /**
4 4
  * @see http://www.php-fig.org/psr/psr-4/examples/
5 5
  */
6
-spl_autoload_register(function ($class) {
6
+spl_autoload_register(function($class) {
7 7
     // project-specific namespace prefix
8
-    $prefix = 'XoopsModules\\' . ucfirst(basename(dirname(__DIR__)));
8
+    $prefix = 'XoopsModules\\'.ucfirst(basename(dirname(__DIR__)));
9 9
 
10 10
     // base directory for the namespace prefix
11
-    $base_dir = __DIR__ . '/../class/';
11
+    $base_dir = __DIR__.'/../class/';
12 12
 
13 13
     // does the class use the namespace prefix?
14 14
     $len      = strlen($prefix);
@@ -23,7 +23,7 @@  discard block
 block discarded – undo
23 23
     // replace the namespace prefix with the base directory, replace namespace
24 24
     // separators with directory separators in the relative class name, append
25 25
     // with .php
26
-    $file           = $base_dir . str_replace('\\', '/', $relative_class) . '.php';
26
+    $file = $base_dir.str_replace('\\', '/', $relative_class).'.php';
27 27
 
28 28
     // if the file exists, require it
29 29
     if (file_exists($file)) {
Please login to merge, or discard this patch.
preloads/core.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -28,6 +28,6 @@
 block discarded – undo
28 28
      */
29 29
     public static function eventCoreIncludeCommonEnd($args)
30 30
     {
31
-        include __DIR__ . '/autoloader.php';
31
+        include __DIR__.'/autoloader.php';
32 32
     }
33 33
 }
Please login to merge, or discard this patch.
request.php 2 patches
Switch Indentation   +70 added lines, -70 removed lines patch added patch discarded remove patch
@@ -49,94 +49,94 @@
 block discarded – undo
49 49
 }
50 50
 
51 51
 switch ($op) {
52
-    case 'post':
52
+        case 'post':
53 53
 
54
-        global $xoopsUser, $xoopsConfig, $xoopsModule, $xoopsModuleConfig, $xoopsDB;
54
+            global $xoopsUser, $xoopsConfig, $xoopsModule, $xoopsModuleConfig, $xoopsDB;
55 55
 
56
-        $newFaqObj = $faqHandler->create();
56
+            $newFaqObj = $faqHandler->create();
57 57
 
58
-        if (!$xoopsUser) {
59
-            if (1 == $xoopsModuleConfig['anonpost']) {
60
-                $uid = 0;
58
+            if (!$xoopsUser) {
59
+                if (1 == $xoopsModuleConfig['anonpost']) {
60
+                    $uid = 0;
61
+                } else {
62
+                    redirect_header('index.php', 3, _NOPERM);
63
+                }
61 64
             } else {
62
-                redirect_header('index.php', 3, _NOPERM);
65
+                $uid = $xoopsUser->uid();
63 66
             }
64
-        } else {
65
-            $uid = $xoopsUser->uid();
66
-        }
67
-
68
-        // Putting the values about the FAQ in the FAQ object
69
-        $newFaqObj->setVar('categoryid', $_POST['categoryid']);
70
-        $newFaqObj->setVar('uid', $uid);
71
-        $newFaqObj->setVar('question', $_POST['question']);
72
-        $notifypub = isset($_POST['notifypub']) ? $_POST['notifypub'] : 0;
73
-        $newFaqObj->setVar('notifypub', $notifypub);
74
-
75
-        // Setting the status of the FAQ
76
-        if (1 == $xoopsModuleConfig['autoapprove_request']) {
77
-            $newFaqObj->setVar('status', Constants::SF_STATUS_OPENED);
78
-        } else {
79
-            $newFaqObj->setVar('status', Constants::SF_STATUS_ASKED);
80
-        }
81
-
82
-        // Storing the FAQ object in the database
83
-        if (!$newFaqObj->store()) {
84
-            redirect_header('javascript:history.go(-1)', 3, _MD_SF_REQUEST_ERROR . Smartfaq\Utility::formatErrors($newFaqObj->getErrors()));
85
-        }
86
-
87
-        // Get the cateopry object related to that FAQ
88
-        // If autoapprove_requested
89
-        if (1 == $xoopsModuleConfig['autoapprove_request']) {
90
-            // We do not not subscribe user to notification on publish since we publish it right away
91
-
92
-            // Send notifications
93
-            $newFaqObj->sendNotifications([Constants::SF_NOT_QUESTION_PUBLISHED]);
94
-
95
-            $redirect_msg = _MD_SF_REQUEST_RECEIVED_AND_PUBLISHED;
96
-        } else {
97
-            // Subscribe the user to On Published notification, if requested
98
-            if (1 == $notifypub) {
99
-                require_once XOOPS_ROOT_PATH . '/include/notification_constants.php';
100
-                $notificationHandler = xoops_getHandler('notification');
101
-                $notificationHandler->subscribe('question', $newFaqObj->faqid(), 'approved', XOOPS_NOTIFICATION_MODE_SENDONCETHENDELETE);
67
+
68
+            // Putting the values about the FAQ in the FAQ object
69
+            $newFaqObj->setVar('categoryid', $_POST['categoryid']);
70
+            $newFaqObj->setVar('uid', $uid);
71
+            $newFaqObj->setVar('question', $_POST['question']);
72
+            $notifypub = isset($_POST['notifypub']) ? $_POST['notifypub'] : 0;
73
+            $newFaqObj->setVar('notifypub', $notifypub);
74
+
75
+            // Setting the status of the FAQ
76
+            if (1 == $xoopsModuleConfig['autoapprove_request']) {
77
+                $newFaqObj->setVar('status', Constants::SF_STATUS_OPENED);
78
+            } else {
79
+                $newFaqObj->setVar('status', Constants::SF_STATUS_ASKED);
80
+            }
81
+
82
+            // Storing the FAQ object in the database
83
+            if (!$newFaqObj->store()) {
84
+                redirect_header('javascript:history.go(-1)', 3, _MD_SF_REQUEST_ERROR . Smartfaq\Utility::formatErrors($newFaqObj->getErrors()));
102 85
             }
103
-            // Send notifications
104
-            $newFaqObj->sendNotifications([Constants::SF_NOT_QUESTION_SUBMITTED]);
105 86
 
106
-            $redirect_msg = _MD_SF_REQUEST_RECEIVED_NEED_APPROVAL;
107
-        }
87
+            // Get the cateopry object related to that FAQ
88
+            // If autoapprove_requested
89
+            if (1 == $xoopsModuleConfig['autoapprove_request']) {
90
+                // We do not not subscribe user to notification on publish since we publish it right away
91
+
92
+                // Send notifications
93
+                $newFaqObj->sendNotifications([Constants::SF_NOT_QUESTION_PUBLISHED]);
94
+
95
+                $redirect_msg = _MD_SF_REQUEST_RECEIVED_AND_PUBLISHED;
96
+            } else {
97
+                // Subscribe the user to On Published notification, if requested
98
+                if (1 == $notifypub) {
99
+                    require_once XOOPS_ROOT_PATH . '/include/notification_constants.php';
100
+                    $notificationHandler = xoops_getHandler('notification');
101
+                    $notificationHandler->subscribe('question', $newFaqObj->faqid(), 'approved', XOOPS_NOTIFICATION_MODE_SENDONCETHENDELETE);
102
+                }
103
+                // Send notifications
104
+                $newFaqObj->sendNotifications([Constants::SF_NOT_QUESTION_SUBMITTED]);
105
+
106
+                $redirect_msg = _MD_SF_REQUEST_RECEIVED_NEED_APPROVAL;
107
+            }
108 108
 
109
-        //redirect_header("javascript:history.go(-2)", 3, $redirect_msg);
110
-        redirect_header('index.php', 2, $redirect_msg);
111
-        break;
109
+            //redirect_header("javascript:history.go(-2)", 3, $redirect_msg);
110
+            redirect_header('index.php', 2, $redirect_msg);
111
+            break;
112 112
 
113
-    case 'form':
114
-    default:
113
+        case 'form':
114
+        default:
115 115
 
116
-        global $xoopsUser, $myts;
116
+            global $xoopsUser, $myts;
117 117
 
118
-        $GLOBALS['xoopsOption']['template_main'] = 'smartfaq_submit.tpl';
119
-        require_once XOOPS_ROOT_PATH . '/header.php';
120
-        require_once __DIR__ . '/footer.php';
118
+            $GLOBALS['xoopsOption']['template_main'] = 'smartfaq_submit.tpl';
119
+            require_once XOOPS_ROOT_PATH . '/header.php';
120
+            require_once __DIR__ . '/footer.php';
121 121
 
122
-        $name = $xoopsUser ? ucwords($xoopsUser->getVar('uname')) : 'Anonymous';
122
+            $name = $xoopsUser ? ucwords($xoopsUser->getVar('uname')) : 'Anonymous';
123 123
 
124
-        $moduleName =& $myts->displayTarea($xoopsModule->getVar('name'));
125
-        $xoopsTpl->assign('whereInSection', $moduleName);
126
-        $xoopsTpl->assign('lang_submit', _MD_SF_REQUEST);
124
+            $moduleName =& $myts->displayTarea($xoopsModule->getVar('name'));
125
+            $xoopsTpl->assign('whereInSection', $moduleName);
126
+            $xoopsTpl->assign('lang_submit', _MD_SF_REQUEST);
127 127
 
128
-        $xoopsTpl->assign('lang_intro_title', _MD_SF_REQUEST);
129
-        $xoopsTpl->assign('lang_intro_text', _MD_SF_GOODDAY . "<b>$name</b>, " . $myts->displayTarea($xoopsModuleConfig['requestintromsg']));
128
+            $xoopsTpl->assign('lang_intro_title', _MD_SF_REQUEST);
129
+            $xoopsTpl->assign('lang_intro_text', _MD_SF_GOODDAY . "<b>$name</b>, " . $myts->displayTarea($xoopsModuleConfig['requestintromsg']));
130 130
 
131
-        require_once __DIR__ . '/include/request.inc.php';
131
+            require_once __DIR__ . '/include/request.inc.php';
132 132
 
133
-        $name = $xoopsUser ? ucwords($xoopsUser->getVar('uname')) : 'Anonymous';
133
+            $name = $xoopsUser ? ucwords($xoopsUser->getVar('uname')) : 'Anonymous';
134 134
 
135
-        $sectionname = $myts->htmlSpecialChars($xoopsModule->getVar('name'));
135
+            $sectionname = $myts->htmlSpecialChars($xoopsModule->getVar('name'));
136 136
 
137
-        require_once __DIR__ . '/include/request.inc.php';
137
+            require_once __DIR__ . '/include/request.inc.php';
138 138
 
139
-        require_once XOOPS_ROOT_PATH . '/footer.php';
139
+            require_once XOOPS_ROOT_PATH . '/footer.php';
140 140
 
141
-        break;
141
+            break;
142 142
 }
Please login to merge, or discard this patch.
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -9,8 +9,8 @@  discard block
 block discarded – undo
9 9
 use XoopsModules\Smartfaq;
10 10
 use XoopsModules\Smartfaq\Constants;
11 11
 
12
-require_once __DIR__ . '/header.php';
13
-require_once XOOPS_ROOT_PATH . '/header.php';
12
+require_once __DIR__.'/header.php';
13
+require_once XOOPS_ROOT_PATH.'/header.php';
14 14
 
15 15
 global $xoopsUser, $xoopsConfig, $xoopsModuleConfig, $xoopsModule;
16 16
 
@@ -81,7 +81,7 @@  discard block
 block discarded – undo
81 81
 
82 82
         // Storing the FAQ object in the database
83 83
         if (!$newFaqObj->store()) {
84
-            redirect_header('javascript:history.go(-1)', 3, _MD_SF_REQUEST_ERROR . Smartfaq\Utility::formatErrors($newFaqObj->getErrors()));
84
+            redirect_header('javascript:history.go(-1)', 3, _MD_SF_REQUEST_ERROR.Smartfaq\Utility::formatErrors($newFaqObj->getErrors()));
85 85
         }
86 86
 
87 87
         // Get the cateopry object related to that FAQ
@@ -96,7 +96,7 @@  discard block
 block discarded – undo
96 96
         } else {
97 97
             // Subscribe the user to On Published notification, if requested
98 98
             if (1 == $notifypub) {
99
-                require_once XOOPS_ROOT_PATH . '/include/notification_constants.php';
99
+                require_once XOOPS_ROOT_PATH.'/include/notification_constants.php';
100 100
                 $notificationHandler = xoops_getHandler('notification');
101 101
                 $notificationHandler->subscribe('question', $newFaqObj->faqid(), 'approved', XOOPS_NOTIFICATION_MODE_SENDONCETHENDELETE);
102 102
             }
@@ -116,27 +116,27 @@  discard block
 block discarded – undo
116 116
         global $xoopsUser, $myts;
117 117
 
118 118
         $GLOBALS['xoopsOption']['template_main'] = 'smartfaq_submit.tpl';
119
-        require_once XOOPS_ROOT_PATH . '/header.php';
120
-        require_once __DIR__ . '/footer.php';
119
+        require_once XOOPS_ROOT_PATH.'/header.php';
120
+        require_once __DIR__.'/footer.php';
121 121
 
122 122
         $name = $xoopsUser ? ucwords($xoopsUser->getVar('uname')) : 'Anonymous';
123 123
 
124
-        $moduleName =& $myts->displayTarea($xoopsModule->getVar('name'));
124
+        $moduleName = & $myts->displayTarea($xoopsModule->getVar('name'));
125 125
         $xoopsTpl->assign('whereInSection', $moduleName);
126 126
         $xoopsTpl->assign('lang_submit', _MD_SF_REQUEST);
127 127
 
128 128
         $xoopsTpl->assign('lang_intro_title', _MD_SF_REQUEST);
129
-        $xoopsTpl->assign('lang_intro_text', _MD_SF_GOODDAY . "<b>$name</b>, " . $myts->displayTarea($xoopsModuleConfig['requestintromsg']));
129
+        $xoopsTpl->assign('lang_intro_text', _MD_SF_GOODDAY."<b>$name</b>, ".$myts->displayTarea($xoopsModuleConfig['requestintromsg']));
130 130
 
131
-        require_once __DIR__ . '/include/request.inc.php';
131
+        require_once __DIR__.'/include/request.inc.php';
132 132
 
133 133
         $name = $xoopsUser ? ucwords($xoopsUser->getVar('uname')) : 'Anonymous';
134 134
 
135 135
         $sectionname = $myts->htmlSpecialChars($xoopsModule->getVar('name'));
136 136
 
137
-        require_once __DIR__ . '/include/request.inc.php';
137
+        require_once __DIR__.'/include/request.inc.php';
138 138
 
139
-        require_once XOOPS_ROOT_PATH . '/footer.php';
139
+        require_once XOOPS_ROOT_PATH.'/footer.php';
140 140
 
141 141
         break;
142 142
 }
Please login to merge, or discard this patch.
admin/admin_header.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -19,7 +19,7 @@  discard block
 block discarded – undo
19 19
 
20 20
 use XoopsModules\Smartfaq;
21 21
 
22
-require_once __DIR__ . '/../../../include/cp_header.php';
22
+require_once __DIR__.'/../../../include/cp_header.php';
23 23
 //require_once $GLOBALS['xoops']->path('www/class/xoopsformloader.php');
24 24
 
25 25
 // require_once __DIR__ . '/../class/Utility.php';
@@ -28,18 +28,18 @@  discard block
 block discarded – undo
28 28
 $moduleDirName = basename(dirname(__DIR__));
29 29
 
30 30
 $path = dirname(dirname(dirname(__DIR__)));
31
-require_once $path . '/kernel/module.php';
32
-require_once $path . '/class/xoopstree.php';
33
-require_once $path . '/class/xoopslists.php';
34
-require_once $path . '/class/pagenav.php';
35
-require_once $path . '/class/xoopsformloader.php';
31
+require_once $path.'/kernel/module.php';
32
+require_once $path.'/class/xoopstree.php';
33
+require_once $path.'/class/xoopslists.php';
34
+require_once $path.'/class/pagenav.php';
35
+require_once $path.'/class/xoopsformloader.php';
36 36
 
37 37
 //require_once __DIR__ . '/../include/functions.php';
38 38
 // require_once __DIR__ . '/../class/category.php';
39 39
 // require_once __DIR__ . '/../class/faq.php';
40 40
 // require_once __DIR__ . '/../class/answer.php';
41 41
 // require_once __DIR__ . '/../class/Utility.php';
42
-require_once __DIR__ . '/../include/common.php';
42
+require_once __DIR__.'/../include/common.php';
43 43
 /** @var Smartfaq\Helper $helper */
44 44
 $helper      = Smartfaq\Helper::getInstance();
45 45
 $adminObject = \Xmf\Module\Admin::getInstance();
Please login to merge, or discard this patch.
faq.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -8,7 +8,7 @@  discard block
 block discarded – undo
8 8
 
9 9
 use XoopsModules\Smartfaq;
10 10
 
11
-require_once __DIR__ . '/header.php';
11
+require_once __DIR__.'/header.php';
12 12
 
13 13
 $faqid = isset($_GET['faqid']) ? (int)$_GET['faqid'] : 0;
14 14
 
@@ -47,8 +47,8 @@  discard block
 block discarded – undo
47 47
     $faqObj->updateCounter();
48 48
 }
49 49
 $GLOBALS['xoopsOption']['template_main'] = 'smartfaq_faq.tpl';
50
-require_once XOOPS_ROOT_PATH . '/header.php';
51
-require_once __DIR__ . '/footer.php';
50
+require_once XOOPS_ROOT_PATH.'/header.php';
51
+require_once __DIR__.'/footer.php';
52 52
 
53 53
 $faq = $faqObj->toArray(null, $categoryObj, false);
54 54
 
@@ -83,7 +83,7 @@  discard block
 block discarded – undo
83 83
 $xoopsTpl->assign('display_categoryname', false);
84 84
 
85 85
 $xoopsTpl->assign('xcodes', $faqObj->getVar('xcodes'));
86
-$xoopsTpl->assign('mail_link', 'mailto:?subject=' . sprintf(_MD_SF_INTARTICLE, $xoopsConfig['sitename']) . '&amp;body=' . sprintf(_MD_SF_INTARTFOUND, $xoopsConfig['sitename']) . ':  ' . XOOPS_URL . '/modules/' . $xoopsModule->dirname() . '/faq.php?faqid=' . $faqObj->getVar('faqid'));
86
+$xoopsTpl->assign('mail_link', 'mailto:?subject='.sprintf(_MD_SF_INTARTICLE, $xoopsConfig['sitename']).'&amp;body='.sprintf(_MD_SF_INTARTFOUND, $xoopsConfig['sitename']).':  '.XOOPS_URL.'/modules/'.$xoopsModule->dirname().'/faq.php?faqid='.$faqObj->getVar('faqid'));
87 87
 $xoopsTpl->assign('lang_printerpage', _MD_SF_PRINTERFRIENDLY);
88 88
 $xoopsTpl->assign('lang_sendstory', _MD_SF_SENDSTORY);
89 89
 $xoopsTpl->assign('faqid', $faqObj->getVar('faqid'));
@@ -99,19 +99,19 @@  discard block
 block discarded – undo
99 99
 
100 100
 // Page Title Hack by marcan
101 101
 $module_name = $myts->htmlSpecialChars($xoopsModule->getVar('name'));
102
-$xoopsTpl->assign('xoops_pagetitle', $module_name . ' - ' . $categoryObj->name() . ' - ' . $faq['question']);
102
+$xoopsTpl->assign('xoops_pagetitle', $module_name.' - '.$categoryObj->name().' - '.$faq['question']);
103 103
 // End Page Title Hack by marcan
104 104
 
105 105
 // Include the comments if the selected FAQ supports comments
106 106
 if (1 == $faqObj->cancomment()) {
107
-    require_once XOOPS_ROOT_PATH . '/include/comment_view.php';
107
+    require_once XOOPS_ROOT_PATH.'/include/comment_view.php';
108 108
 }
109 109
 
110 110
 //code to include smartie
111
-if (file_exists(XOOPS_ROOT_PATH . '/modules/smarttie/smarttie_links.php')) {
112
-    require_once XOOPS_ROOT_PATH . '/modules/smarttie/smarttie_links.php';
111
+if (file_exists(XOOPS_ROOT_PATH.'/modules/smarttie/smarttie_links.php')) {
112
+    require_once XOOPS_ROOT_PATH.'/modules/smarttie/smarttie_links.php';
113 113
     $xoopsTpl->assign('smarttie', 1);
114 114
 }
115 115
 //end code for smarttie
116 116
 
117
-require_once XOOPS_ROOT_PATH . '/footer.php';
117
+require_once XOOPS_ROOT_PATH.'/footer.php';
Please login to merge, or discard this patch.
index.php 1 patch
Spacing   +15 added lines, -15 removed lines patch added patch discarded remove patch
@@ -9,7 +9,7 @@  discard block
 block discarded – undo
9 9
 use XoopsModules\Smartfaq;
10 10
 use XoopsModules\Smartfaq\Constants;
11 11
 
12
-require_once __DIR__ . '/header.php';
12
+require_once __DIR__.'/header.php';
13 13
 
14 14
 // At which record shall we start for the Categories
15 15
 $catstart = isset($_GET['catstart']) ? (int)$_GET['catstart'] : 0;
@@ -42,11 +42,11 @@  discard block
 block discarded – undo
42 42
 
43 43
 $GLOBALS['xoopsOption']['template_main'] = 'smartfaq_index.tpl';
44 44
 
45
-require_once XOOPS_ROOT_PATH . '/header.php';
46
-require_once __DIR__ . '/footer.php';
45
+require_once XOOPS_ROOT_PATH.'/header.php';
46
+require_once __DIR__.'/footer.php';
47 47
 
48 48
 // Creating the categories objects
49
-$categoriesObj =& $categoryHandler->getCategories($xoopsModuleConfig['catperpage'], $catstart);
49
+$categoriesObj = & $categoryHandler->getCategories($xoopsModuleConfig['catperpage'], $catstart);
50 50
 // If no categories are found, exit
51 51
 $totalCategoriesOnPage = count($categoriesObj);
52 52
 if (0 == $totalCategoriesOnPage) {
@@ -76,7 +76,7 @@  discard block
 block discarded – undo
76 76
             if (isset($totalQnas[$subcat_id]) && $totalQnas[$subcat_id] > 0) {
77 77
                 if (isset($last_qnaObj[$subcat_id])) {
78 78
                     $subcat->setVar('last_faqid', $last_qnaObj[$subcat_id]->getVar('faqid'));
79
-                    $subcat->setVar('last_question_link', "<a href='faq.php?faqid=" . $last_qnaObj[$subcat_id]->getVar('faqid') . "'>" . $last_qnaObj[$subcat_id]->question($lastfaqsize) . '</a>');
79
+                    $subcat->setVar('last_question_link', "<a href='faq.php?faqid=".$last_qnaObj[$subcat_id]->getVar('faqid')."'>".$last_qnaObj[$subcat_id]->question($lastfaqsize).'</a>');
80 80
                 }
81 81
                 $subcat->setVar('faqcount', $totalQnas[$subcat_id]);
82 82
                 if ($xoopsModuleConfig['displaysubcatonindex']) {
@@ -94,7 +94,7 @@  discard block
 block discarded – undo
94 94
     if ($total > 0) {
95 95
         if (isset($last_qnaObj[$cat_id])) {
96 96
             $category->setVar('last_faqid', $last_qnaObj[$cat_id]->getVar('faqid'));
97
-            $category->setVar('last_question_link', "<a href='faq.php?faqid=" . $last_qnaObj[$cat_id]->getVar('faqid') . "'>" . $last_qnaObj[$cat_id]->question($lastfaqsize) . '</a>');
97
+            $category->setVar('last_question_link', "<a href='faq.php?faqid=".$last_qnaObj[$cat_id]->getVar('faqid')."'>".$last_qnaObj[$cat_id]->question($lastfaqsize).'</a>');
98 98
         }
99 99
         $category->setVar('faqcount', $total);
100 100
         if (!isset($categories[$cat_id])) {
@@ -133,7 +133,7 @@  discard block
 block discarded – undo
133 133
         }
134 134
 
135 135
         $memberHandler = xoops_getHandler('member');
136
-        $users         = $memberHandler->getUsers(new \Criteria('uid', '(' . implode(',', array_keys($userids)) . ')', 'IN'), true);
136
+        $users         = $memberHandler->getUsers(new \Criteria('uid', '('.implode(',', array_keys($userids)).')', 'IN'), true);
137 137
         for ($i = 0; $i < $totalQnasOnPage; ++$i) {
138 138
             $faq = $faqsObj[$i]->toArray(null, $allcategories);
139 139
 
@@ -159,14 +159,14 @@  discard block
 block discarded – undo
159 159
 }
160 160
 
161 161
 // Language constants
162
-$moduleName =& $myts->displayTarea($xoopsModule->getVar('name'));
162
+$moduleName = & $myts->displayTarea($xoopsModule->getVar('name'));
163 163
 $xoopsTpl->assign('whereInSection', $moduleName);
164 164
 $xoopsTpl->assign('displaysubcatonindex', $xoopsModuleConfig['displaysubcatonindex']);
165 165
 $xoopsTpl->assign('displaylastfaqs', $xoopsModuleConfig['displaylastfaqs']);
166 166
 $xoopsTpl->assign('display_categoryname', true);
167 167
 $xoopsTpl->assign('displayFull', 'full' === $xoopsModuleConfig['displaytype']);
168 168
 
169
-$xoopsTpl->assign('lang_mainhead', _MD_SF_MAINHEAD . ' ' . $moduleName);
169
+$xoopsTpl->assign('lang_mainhead', _MD_SF_MAINHEAD.' '.$moduleName);
170 170
 $xoopsTpl->assign('lang_mainintro', $myts->displayTarea($xoopsModuleConfig['indexwelcomemsg'], 1));
171 171
 $xoopsTpl->assign('lang_total', _MD_SF_TOTAL_SMARTFAQS);
172 172
 $xoopsTpl->assign('lang_home', _MD_SF_HOME);
@@ -185,20 +185,20 @@  discard block
 block discarded – undo
185 185
 $xoopsTpl->assign('lang_comments', _MD_SF_COMMENTS);
186 186
 
187 187
 // Category Navigation Bar
188
-require_once XOOPS_ROOT_PATH . '/class/pagenav.php';
188
+require_once XOOPS_ROOT_PATH.'/class/pagenav.php';
189 189
 $pagenav = new \XoopsPageNav($totalCategories, $xoopsModuleConfig['catperpage'], $catstart, 'catstart', '');
190 190
 if (1 == $xoopsModuleConfig['useimagenavpage']) {
191
-    $xoopsTpl->assign('catnavbar', '<div style="text-align:right;">' . $pagenav->renderImageNav() . '</div>');
191
+    $xoopsTpl->assign('catnavbar', '<div style="text-align:right;">'.$pagenav->renderImageNav().'</div>');
192 192
 } else {
193
-    $xoopsTpl->assign('catnavbar', '<div style="text-align:right;">' . $pagenav->renderNav() . '</div>');
193
+    $xoopsTpl->assign('catnavbar', '<div style="text-align:right;">'.$pagenav->renderNav().'</div>');
194 194
 }
195 195
 
196 196
 // FAQ Navigation Bar
197 197
 $pagenav = new \XoopsPageNav($totalFaqs, $xoopsModuleConfig['indexperpage'], $start, 'start', '');
198 198
 if (1 == $xoopsModuleConfig['useimagenavpage']) {
199
-    $xoopsTpl->assign('navbar', '<div style="text-align:right;">' . $pagenav->renderImageNav() . '</div>');
199
+    $xoopsTpl->assign('navbar', '<div style="text-align:right;">'.$pagenav->renderImageNav().'</div>');
200 200
 } else {
201
-    $xoopsTpl->assign('navbar', '<div style="text-align:right;">' . $pagenav->renderNav() . '</div>');
201
+    $xoopsTpl->assign('navbar', '<div style="text-align:right;">'.$pagenav->renderNav().'</div>');
202 202
 }
203 203
 
204 204
 // Page Title Hack by marcan
@@ -206,4 +206,4 @@  discard block
 block discarded – undo
206 206
 $xoopsTpl->assign('xoops_pagetitle', $module_name);
207 207
 // End Page Title Hack by marcan
208 208
 
209
-require_once XOOPS_ROOT_PATH . '/footer.php';
209
+require_once XOOPS_ROOT_PATH.'/footer.php';
Please login to merge, or discard this patch.