Completed
Push — master ( 454ebd...de22fe )
by Michael
03:58
created
category.php 1 patch
Spacing   +20 added lines, -20 removed lines patch added patch discarded remove patch
@@ -8,9 +8,9 @@  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
-$categoryid = isset($_GET['categoryid']) ? (int)$_GET['categoryid'] : 0;
13
+$categoryid = isset($_GET['categoryid']) ? (int) $_GET['categoryid'] : 0;
14 14
 
15 15
 // Creating the category handler object
16 16
 /** @var \XoopsModules\Smartfaq\CategoryHandler $categoryHandler */
@@ -35,11 +35,11 @@  discard block
 block discarded – undo
35 35
 }
36 36
 $GLOBALS['xoopsOption']['template_main'] = 'smartfaq_category.tpl';
37 37
 
38
-require_once XOOPS_ROOT_PATH . '/header.php';
39
-require_once __DIR__ . '/footer.php';
38
+require_once XOOPS_ROOT_PATH.'/header.php';
39
+require_once __DIR__.'/footer.php';
40 40
 
41 41
 // At which record shall we start
42
-$start = isset($_GET['start']) ? (int)$_GET['start'] : 0;
42
+$start = isset($_GET['start']) ? (int) $_GET['start'] : 0;
43 43
 
44 44
 // Creating the faq handler object
45 45
 /** @var \XoopsModules\Smartfaq\FaqHandler $faqHandler */
@@ -74,9 +74,9 @@  discard block
 block discarded – undo
74 74
     // Get the last smartfaq
75 75
     $last_qnaObj = $faqHandler->getLastPublishedByCat();
76 76
 }
77
-$lastfaqsize = (int)$xoopsModuleConfig['lastfaqsize'];
77
+$lastfaqsize = (int) $xoopsModuleConfig['lastfaqsize'];
78 78
 // Creating the sub-categories objects that belong to the selected category
79
-$subcatsObj    =& $categoryHandler->getCategories(0, 0, $categoryid);
79
+$subcatsObj    = & $categoryHandler->getCategories(0, 0, $categoryid);
80 80
 $total_subcats = count($subcatsObj);
81 81
 $total_faqs    = 0;
82 82
 if (0 != $total_subcats) {
@@ -86,18 +86,18 @@  discard block
 block discarded – undo
86 86
         if (isset($totalQnas[$subcat_id]) && $totalQnas[$subcat_id] > 0) {
87 87
             if (isset($last_qnaObj[$subcat_id])) {
88 88
                 $subcatsObj[$i]->setVar('last_faqid', $last_qnaObj[$subcat_id]->getVar('faqid'));
89
-                $subcatsObj[$i]->setVar('last_question_link', "<a href='faq.php?faqid=" . $last_qnaObj[$subcat_id]->getVar('faqid') . "'>" . $last_qnaObj[$subcat_id]->question($lastfaqsize) . '</a>');
89
+                $subcatsObj[$i]->setVar('last_question_link', "<a href='faq.php?faqid=".$last_qnaObj[$subcat_id]->getVar('faqid')."'>".$last_qnaObj[$subcat_id]->question($lastfaqsize).'</a>');
90 90
             }
91 91
         }
92 92
         $subcatsObj[$i]->setVar('faqcount', $totalQnas[$subcat_id]);
93 93
         $subcats[$subcat_id] = $subcatsObj[$i]->toArray();
94
-        $total_faqs          += $totalQnas[$subcat_id];
94
+        $total_faqs += $totalQnas[$subcat_id];
95 95
         //}replacé ligne 92
96 96
     }
97 97
     $xoopsTpl->assign('subcats', $subcats);
98 98
 }
99 99
 $thiscategory_faqcount = isset($totalQnas[$categoryid]) ? $totalQnas[$categoryid] : 0;
100
-$category['total']     = $thiscategory_faqcount + $total_faqs;
100
+$category['total']     = $thiscategory_faqcount+$total_faqs;
101 101
 
102 102
 if (count($faqsObj) > 0) {
103 103
     $userids = [];
@@ -114,7 +114,7 @@  discard block
 block discarded – undo
114 114
     }
115 115
 
116 116
     $memberHandler = xoops_getHandler('member');
117
-    $users         = $memberHandler->getUsers(new \Criteria('uid', '(' . implode(',', array_keys($userids)) . ')', 'IN'), true);
117
+    $users         = $memberHandler->getUsers(new \Criteria('uid', '('.implode(',', array_keys($userids)).')', 'IN'), true);
118 118
     // Adding the Q&As of the selected category
119 119
     foreach ($faqsObj as $iValue) {
120 120
         $faq = $iValue->toArray(null, $categoryObj);
@@ -140,7 +140,7 @@  discard block
 block discarded – undo
140 140
 
141 141
     if (isset($last_qnaObj) && $last_qnaObj) {
142 142
         $category['last_faqid']         = $last_qnaObj[$categoryObj->getVar('categoryid')]->getVar('faqid');
143
-        $category['last_question_link'] = "<a href='faq.php?faqid=" . $last_qnaObj[$categoryObj->getVar('categoryid')]->getVar('faqid') . "'>" . $last_qnaObj[$categoryObj->getVar('categoryid')]->question($lastfaqsize) . '</a>';
143
+        $category['last_question_link'] = "<a href='faq.php?faqid=".$last_qnaObj[$categoryObj->getVar('categoryid')]->getVar('faqid')."'>".$last_qnaObj[$categoryObj->getVar('categoryid')]->question($lastfaqsize).'</a>';
144 144
     }
145 145
 }
146 146
 
@@ -165,26 +165,26 @@  discard block
 block discarded – undo
165 165
 $xoopsTpl->assign('lang_comments', _MD_SF_COMMENTS);
166 166
 
167 167
 // The Navigation Bar
168
-require_once XOOPS_ROOT_PATH . '/class/pagenav.php';
169
-$pagenav = new \XoopsPageNav($thiscategory_faqcount, $xoopsModuleConfig['indexperpage'], $start, 'start', 'categoryid=' . $categoryObj->getVar('categoryid'));
168
+require_once XOOPS_ROOT_PATH.'/class/pagenav.php';
169
+$pagenav = new \XoopsPageNav($thiscategory_faqcount, $xoopsModuleConfig['indexperpage'], $start, 'start', 'categoryid='.$categoryObj->getVar('categoryid'));
170 170
 if (1 == $xoopsModuleConfig['useimagenavpage']) {
171
-    $xoopsTpl->assign('navbar', '<div style="text-align:right;">' . $pagenav->renderImageNav() . '</div>');
171
+    $xoopsTpl->assign('navbar', '<div style="text-align:right;">'.$pagenav->renderImageNav().'</div>');
172 172
 } else {
173
-    $xoopsTpl->assign('navbar', '<div style="text-align:right;">' . $pagenav->renderNav() . '</div>');
173
+    $xoopsTpl->assign('navbar', '<div style="text-align:right;">'.$pagenav->renderNav().'</div>');
174 174
 }
175 175
 
176 176
 $xoopsTpl->assign('category', $category);
177 177
 
178 178
 // Page Title Hack by marcan
179 179
 $module_name = $myts->htmlSpecialChars($xoopsModule->getVar('name'));
180
-$xoopsTpl->assign('xoops_pagetitle', $module_name . ' - ' . $category['name']);
180
+$xoopsTpl->assign('xoops_pagetitle', $module_name.' - '.$category['name']);
181 181
 // End Page Title Hack by marcan
182 182
 
183 183
 //code to include smartie
184
-if (file_exists(XOOPS_ROOT_PATH . '/modules/smarttie/smarttie_links.php')) {
185
-    require_once XOOPS_ROOT_PATH . '/modules/smarttie/smarttie_links.php';
184
+if (file_exists(XOOPS_ROOT_PATH.'/modules/smarttie/smarttie_links.php')) {
185
+    require_once XOOPS_ROOT_PATH.'/modules/smarttie/smarttie_links.php';
186 186
     $xoopsTpl->assign('smarttie', 1);
187 187
 }
188 188
 //end code for smarttie
189 189
 
190
-require_once XOOPS_ROOT_PATH . '/footer.php';
190
+require_once XOOPS_ROOT_PATH.'/footer.php';
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
@@ -10,7 +10,7 @@  discard block
 block discarded – undo
10 10
 
11 11
 // defined('XOOPS_ROOT_PATH') || die('Restricted access');
12 12
 
13
-require_once __DIR__ . '/preloads/autoloader.php';
13
+require_once __DIR__.'/preloads/autoloader.php';
14 14
 
15 15
 $moduleDirName = basename(__DIR__);
16 16
 
@@ -32,7 +32,7 @@  discard block
 block discarded – undo
32 32
 //$modversion['icons32']             = '../../Frameworks/moduleclasses/icons/32';
33 33
 $modversion['modicons16']          = 'assets/images/icons/16';
34 34
 $modversion['modicons32']          = 'assets/images/icons/32';
35
-$modversion['release_file']        = XOOPS_URL . '/modules/' . $modversion['dirname'] . '/docs/changelog.txt';
35
+$modversion['release_file']        = XOOPS_URL.'/modules/'.$modversion['dirname'].'/docs/changelog.txt';
36 36
 $modversion['module_website_url']  = 'www.xoops.org';
37 37
 $modversion['module_website_name'] = 'XOOPS';
38 38
 $modversion['min_php']             = '5.5';
@@ -102,9 +102,9 @@  discard block
 block discarded – undo
102 102
 
103 103
 // Tables created by sql file (without prefix!)
104 104
 $modversion['tables'] = [
105
-    $moduleDirName . '_' . 'categories',
106
-    $moduleDirName . '_' . 'faq',
107
-    $moduleDirName . '_' . 'answers'
105
+    $moduleDirName.'_'.'categories',
106
+    $moduleDirName.'_'.'faq',
107
+    $moduleDirName.'_'.'answers'
108 108
 ];
109 109
 
110 110
 // Search
Please login to merge, or discard this patch.
include/onupdate.inc.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -27,7 +27,7 @@
 block discarded – undo
27 27
 
28 28
     ob_start();
29 29
 
30
-    echo '<code>' . _SDU_UPDATE_UPDATING_DATABASE . '<br>';
30
+    echo '<code>'._SDU_UPDATE_UPDATING_DATABASE.'<br>';
31 31
 
32 32
     // Adding partialview field
33 33
     $table = new Smartfaq\SmartDbTable('smartfaq_faq');
Please login to merge, or discard this patch.
include/oninstall.php 1 patch
Spacing   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -30,16 +30,16 @@  discard block
 block discarded – undo
30 30
  */
31 31
 function xoops_module_pre_install_smartfaq(\XoopsModule $module)
32 32
 {
33
-    include __DIR__ . '/../preloads/autoloader.php';
33
+    include __DIR__.'/../preloads/autoloader.php';
34 34
     /** @var \XoopsModules\Smartfaq\Utility $utility */
35 35
     $utility = new \XoopsModules\Smartfaq\Utility();
36 36
     $xoopsSuccess = $utility::checkVerXoops($module);
37 37
     $phpSuccess   = $utility::checkVerPhp($module);
38 38
 
39
-    if (false !== $xoopsSuccess && false !==  $phpSuccess) {
40
-        $moduleTables =& $module->getInfo('tables');
39
+    if (false !== $xoopsSuccess && false !== $phpSuccess) {
40
+        $moduleTables = & $module->getInfo('tables');
41 41
         foreach ($moduleTables as $table) {
42
-            $GLOBALS['xoopsDB']->queryF('DROP TABLE IF EXISTS ' . $GLOBALS['xoopsDB']->prefix($table) . ';');
42
+            $GLOBALS['xoopsDB']->queryF('DROP TABLE IF EXISTS '.$GLOBALS['xoopsDB']->prefix($table).';');
43 43
         }
44 44
     }
45 45
 
@@ -55,8 +55,8 @@  discard block
 block discarded – undo
55 55
  */
56 56
 function xoops_module_install_smartfaq(\XoopsModule $module)
57 57
 {
58
-    require_once  __DIR__ . '/../../../mainfile.php';
59
-    require_once  __DIR__ . '/../include/config.php';
58
+    require_once  __DIR__.'/../../../mainfile.php';
59
+    require_once  __DIR__.'/../include/config.php';
60 60
 
61 61
     $moduleDirName = basename(dirname(__DIR__));
62 62
 
@@ -73,11 +73,11 @@  discard block
 block discarded – undo
73 73
     $moduleId2    = $helper->getModule()->mid();
74 74
     $gpermHandler = xoops_getHandler('groupperm');
75 75
     // access rights ------------------------------------------
76
-    $gpermHandler->addRight($moduleDirName . '_approve', 1, XOOPS_GROUP_ADMIN, $moduleId);
77
-    $gpermHandler->addRight($moduleDirName . '_submit', 1, XOOPS_GROUP_ADMIN, $moduleId);
78
-    $gpermHandler->addRight($moduleDirName . '_view', 1, XOOPS_GROUP_ADMIN, $moduleId);
79
-    $gpermHandler->addRight($moduleDirName . '_view', 1, XOOPS_GROUP_USERS, $moduleId);
80
-    $gpermHandler->addRight($moduleDirName . '_view', 1, XOOPS_GROUP_ANONYMOUS, $moduleId);
76
+    $gpermHandler->addRight($moduleDirName.'_approve', 1, XOOPS_GROUP_ADMIN, $moduleId);
77
+    $gpermHandler->addRight($moduleDirName.'_submit', 1, XOOPS_GROUP_ADMIN, $moduleId);
78
+    $gpermHandler->addRight($moduleDirName.'_view', 1, XOOPS_GROUP_ADMIN, $moduleId);
79
+    $gpermHandler->addRight($moduleDirName.'_view', 1, XOOPS_GROUP_USERS, $moduleId);
80
+    $gpermHandler->addRight($moduleDirName.'_view', 1, XOOPS_GROUP_ANONYMOUS, $moduleId);
81 81
 
82 82
     //  ---  CREATE FOLDERS ---------------
83 83
     if (count($configurator->uploadFolders) > 0) {
@@ -89,14 +89,14 @@  discard block
 block discarded – undo
89 89
 
90 90
     //  ---  COPY blank.png FILES ---------------
91 91
     if (count($configurator->copyBlankFiles) > 0) {
92
-        $file = __DIR__ . '/../assets/images/blank.png';
92
+        $file = __DIR__.'/../assets/images/blank.png';
93 93
         foreach (array_keys($configurator->copyBlankFiles) as $i) {
94
-            $dest = $configurator->copyBlankFiles[$i] . '/blank.png';
94
+            $dest = $configurator->copyBlankFiles[$i].'/blank.png';
95 95
             $utilityClass::copyFile($file, $dest);
96 96
         }
97 97
     }
98 98
     //delete .html entries from the tpl table
99
-    $sql = 'DELETE FROM ' . $xoopsDB->prefix('tplfile') . " WHERE `tpl_module` = '" . $xoopsModule->getVar('dirname', 'n') . "' AND `tpl_file` LIKE '%.html%'";
99
+    $sql = 'DELETE FROM '.$xoopsDB->prefix('tplfile')." WHERE `tpl_module` = '".$xoopsModule->getVar('dirname', 'n')."' AND `tpl_file` LIKE '%.html%'";
100 100
     $xoopsDB->queryF($sql);
101 101
 
102 102
     return true;
Please login to merge, or discard this patch.
include/request.inc.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -12,9 +12,9 @@
 block discarded – undo
12 12
 
13 13
 global $_POST;
14 14
 
15
-require_once XOOPS_ROOT_PATH . '/class/xoopstree.php';
16
-require_once XOOPS_ROOT_PATH . '/class/xoopslists.php';
17
-require_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
15
+require_once XOOPS_ROOT_PATH.'/class/xoopstree.php';
16
+require_once XOOPS_ROOT_PATH.'/class/xoopslists.php';
17
+require_once XOOPS_ROOT_PATH.'/class/xoopsformloader.php';
18 18
 
19 19
 $form = new \XoopsThemeForm(_MD_SF_REQUEST, 'form', xoops_getenv('PHP_SELF'), 'post', true);
20 20
 // CATEGORY
Please login to merge, or discard this patch.
include/search.inc.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -26,7 +26,7 @@
 block discarded – undo
26 26
 
27 27
     for ($i = 0, $iMax = count($faqsObj); $i < $iMax; ++$i) {
28 28
         $ret[$i]['image'] = 'assets/images/smartfaq.gif';
29
-        $ret[$i]['link']  = 'faq.php?faqid=' . $faqsObj[$i]->faqid();
29
+        $ret[$i]['link']  = 'faq.php?faqid='.$faqsObj[$i]->faqid();
30 30
         $ret[$i]['title'] = $faqsObj[$i]->question(50);
31 31
         $ret[$i]['time']  = $faqsObj[$i]->getVar('datesub');
32 32
         $ret[$i]['uid']   = $faqsObj[$i]->uid();
Please login to merge, or discard this patch.
include/config.php 1 patch
Spacing   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -21,26 +21,26 @@  discard block
 block discarded – undo
21 21
 {
22 22
     $moduleDirName      = basename(dirname(__DIR__));
23 23
     $moduleDirNameUpper = strtoupper($moduleDirName);
24
-    return (object)[
25
-        'name'           => strtoupper($moduleDirName) . ' Module Configurator',
24
+    return (object) [
25
+        'name'           => strtoupper($moduleDirName).' Module Configurator',
26 26
         'paths'          => [
27 27
             'dirname'    => $moduleDirName,
28
-            'admin'      => XOOPS_ROOT_PATH . '/modules/' . $moduleDirName . '/admin',
29
-            'modPath'    => XOOPS_ROOT_PATH . '/modules/' . $moduleDirName,
30
-            'modUrl'     => XOOPS_URL . '/modules/' . $moduleDirName,
31
-            'uploadPath' => XOOPS_UPLOAD_PATH . '/' . $moduleDirName,
32
-            'uploadUrl'  => XOOPS_UPLOAD_URL . '/' . $moduleDirName,
28
+            'admin'      => XOOPS_ROOT_PATH.'/modules/'.$moduleDirName.'/admin',
29
+            'modPath'    => XOOPS_ROOT_PATH.'/modules/'.$moduleDirName,
30
+            'modUrl'     => XOOPS_URL.'/modules/'.$moduleDirName,
31
+            'uploadPath' => XOOPS_UPLOAD_PATH.'/'.$moduleDirName,
32
+            'uploadUrl'  => XOOPS_UPLOAD_URL.'/'.$moduleDirName,
33 33
         ],
34 34
         'uploadFolders'  => [
35
-            constant($moduleDirNameUpper . '_UPLOAD_PATH'),
36
-            constant($moduleDirNameUpper . '_UPLOAD_PATH') . '/category',
37
-            constant($moduleDirNameUpper . '_UPLOAD_PATH') . '/screenshots',
35
+            constant($moduleDirNameUpper.'_UPLOAD_PATH'),
36
+            constant($moduleDirNameUpper.'_UPLOAD_PATH').'/category',
37
+            constant($moduleDirNameUpper.'_UPLOAD_PATH').'/screenshots',
38 38
             //XOOPS_UPLOAD_PATH . '/flags'
39 39
         ],
40 40
         'copyBlankFiles' => [
41
-            constant($moduleDirNameUpper . '_UPLOAD_PATH'),
42
-            constant($moduleDirNameUpper . '_UPLOAD_PATH') . '/category',
43
-            constant($moduleDirNameUpper . '_UPLOAD_PATH') . '/screenshots',
41
+            constant($moduleDirNameUpper.'_UPLOAD_PATH'),
42
+            constant($moduleDirNameUpper.'_UPLOAD_PATH').'/category',
43
+            constant($moduleDirNameUpper.'_UPLOAD_PATH').'/screenshots',
44 44
             //XOOPS_UPLOAD_PATH . '/flags'
45 45
         ],
46 46
 
@@ -75,6 +75,6 @@  discard block
 block discarded – undo
75 75
             '/images',
76 76
         ],
77 77
         'modCopyright'    => "<a href='https://xoops.org' title='XOOPS Project' target='_blank'>
78
-                     <img src='" . constant($moduleDirNameUpper . '_AUTHOR_LOGOIMG') . '\' alt=\'XOOPS Project\' /></a>',
78
+                     <img src='" . constant($moduleDirNameUpper.'_AUTHOR_LOGOIMG').'\' alt=\'XOOPS Project\' /></a>',
79 79
     ];
80 80
 }
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,24 +28,24 @@  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
                 //if (!file_exists($thumb_path.'/'.$source) && $imginfo[0] > $xoopsModuleConfig['max_img_width']) {
48
-                if (!file_exists($thumb_path . '/' . $source)) {
48
+                if (!file_exists($thumb_path.'/'.$source)) {
49 49
                     sf_createThumbnail($source, $xoopsModuleConfig['max_image_width']);
50 50
                 }
51 51
             }
@@ -54,27 +54,27 @@  discard block
 block discarded – undo
54 54
                 || $imginfo[1] > $xoopsModuleConfig['max_image_height']) {
55 55
                 $pseudo_width  = $xoopsModuleConfig['max_image_width'];
56 56
                 $pseudo_height = $xoopsModuleConfig['max_image_width'] * ($imginfo[1] / $imginfo[0]);
57
-                $pseudo_size   = "width='" . $pseudo_width . "px' height='" . $pseudo_height . "px'";
57
+                $pseudo_size   = "width='".$pseudo_width."px' height='".$pseudo_height."px'";
58 58
             }
59 59
             // irmtfan to fix Undefined variable: pseudo_height
60 60
             if (!empty($pseudo_height) && $xoopsModuleConfig['max_image_height'] > 0
61 61
                 && $pseudo_height > $xoopsModuleConfig['max_image_height']) {
62 62
                 $pseudo_height = $xoopsModuleConfig['max_image_height'];
63 63
                 $pseudo_width  = $xoopsModuleConfig['max_image_height'] * ($imginfo[0] / $imginfo[1]);
64
-                $pseudo_size   = "width='" . $pseudo_width . "px' height='" . $pseudo_height . "px'";
64
+                $pseudo_size   = "width='".$pseudo_width."px' height='".$pseudo_height."px'";
65 65
             }
66 66
         }
67 67
 
68 68
         if (file_exists($thumb)) {
69
-            $attachmentImage = '<a href="' . $image_url . '" title="' . $source . ' ' . $img_info . '" target="_blank">';
70
-            $attachmentImage .= '<img src="' . $thumb_url . '" alt="' . $source . ' ' . $img_info . '">';
69
+            $attachmentImage = '<a href="'.$image_url.'" title="'.$source.' '.$img_info.'" target="_blank">';
70
+            $attachmentImage .= '<img src="'.$thumb_url.'" alt="'.$source.' '.$img_info.'">';
71 71
             $attachmentImage .= '</a>';
72 72
         } elseif (!empty($pseudo_size)) {
73
-            $attachmentImage = '<a href="' . $image_url . '" title="' . $source . ' ' . $img_info . '" target="_blank">';
74
-            $attachmentImage .= '<img src="' . $image_url . '" ' . $pseudo_size . ' alt="' . $source . ' ' . $img_info . '">';
73
+            $attachmentImage = '<a href="'.$image_url.'" title="'.$source.' '.$img_info.'" target="_blank">';
74
+            $attachmentImage .= '<img src="'.$image_url.'" '.$pseudo_size.' alt="'.$source.' '.$img_info.'">';
75 75
             $attachmentImage .= '</a>';
76 76
         } elseif (file_exists($image)) {
77
-            $attachmentImage = '<img src="' . $image_url . '" alt="' . $source . ' ' . $img_info . '">';
77
+            $attachmentImage = '<img src="'.$image_url.'" alt="'.$source.' '.$img_info.'">';
78 78
         } else {
79 79
             $attachmentImage = '';
80 80
         }
@@ -91,10 +91,10 @@  discard block
 block discarded – undo
91 91
     {
92 92
         global $xoopsModuleConfig;
93 93
 
94
-        $img_path   = XOOPS_ROOT_PATH . '/' . $xoopsModuleConfig['dir_attachments'];
95
-        $thumb_path = $img_path . '/thumbs';
96
-        $src_file   = $img_path . '/' . $source;
97
-        $new_file   = $thumb_path . '/' . $source;
94
+        $img_path   = XOOPS_ROOT_PATH.'/'.$xoopsModuleConfig['dir_attachments'];
95
+        $thumb_path = $img_path.'/thumbs';
96
+        $src_file   = $img_path.'/'.$source;
97
+        $new_file   = $thumb_path.'/'.$source;
98 98
         //$imageLibs = sf_getImageLibs();
99 99
 
100 100
         if (!filesize($src_file) || !is_readable($src_file)) {
@@ -114,20 +114,20 @@  discard block
 block discarded – undo
114 114
             return false;
115 115
         }
116 116
 
117
-        $newWidth  = (int)min($imginfo[0], $thumb_width);
118
-        $newHeight = (int)($imginfo[1] * $newWidth / $imginfo[0]);
117
+        $newWidth  = (int) min($imginfo[0], $thumb_width);
118
+        $newHeight = (int) ($imginfo[1] * $newWidth / $imginfo[0]);
119 119
 
120 120
         if (1 == $xoopsModuleConfig['image_lib'] or 0 == $xoopsModuleConfig['image_lib']) {
121 121
             if (preg_match("#[A-Z]:|\\\\#Ai", __FILE__)) {
122 122
                 $cur_dir     = __DIR__;
123
-                $src_file_im = '"' . $cur_dir . '\\' . str_replace('/', '\\', $src_file) . '"';
124
-                $new_file_im = '"' . $cur_dir . '\\' . str_replace('/', '\\', $new_file) . '"';
123
+                $src_file_im = '"'.$cur_dir.'\\'.str_replace('/', '\\', $src_file).'"';
124
+                $new_file_im = '"'.$cur_dir.'\\'.str_replace('/', '\\', $new_file).'"';
125 125
             } else {
126 126
                 $src_file_im = @escapeshellarg($src_file);
127 127
                 $new_file_im = @escapeshellarg($new_file);
128 128
             }
129
-            $path           = empty($xoopsModuleConfig['path_magick']) ? '' : $xoopsModuleConfig['path_magick'] . '/';
130
-            $magick_command = $path . 'convert -quality 85 -antialias -sample ' . $newWidth . 'x' . $newHeight . ' ' . $src_file_im . ' +profile "*" ' . str_replace('\\', '/', $new_file_im) . '';
129
+            $path           = empty($xoopsModuleConfig['path_magick']) ? '' : $xoopsModuleConfig['path_magick'].'/';
130
+            $magick_command = $path.'convert -quality 85 -antialias -sample '.$newWidth.'x'.$newHeight.' '.$src_file_im.' +profile "*" '.str_replace('\\', '/', $new_file_im).'';
131 131
 
132 132
             @passthru($magick_command);
133 133
             if (file_exists($new_file)) {
@@ -136,13 +136,13 @@  discard block
 block discarded – undo
136 136
         }
137 137
 
138 138
         if (2 == $xoopsModuleConfig['image_lib'] or 0 == $xoopsModuleConfig['image_lib']) {
139
-            $path = empty($xoopsModuleConfig['path_netpbm']) ? '' : $xoopsModuleConfig['path_netpbm'] . '/';
139
+            $path = empty($xoopsModuleConfig['path_netpbm']) ? '' : $xoopsModuleConfig['path_netpbm'].'/';
140 140
             if (preg_match("/\.png/i", $source)) {
141
-                $cmd = $path . "pngtopnm $src_file | " . $path . "pnmscale -xysize $newWidth $newHeight | " . $path . "pnmtopng > $new_file";
141
+                $cmd = $path."pngtopnm $src_file | ".$path."pnmscale -xysize $newWidth $newHeight | ".$path."pnmtopng > $new_file";
142 142
             } elseif (preg_match("/\.(jpg|jpeg)/i", $source)) {
143
-                $cmd = $path . "jpegtopnm $src_file | " . $path . "pnmscale -xysize $newWidth $newHeight | " . $path . "ppmtojpeg -quality=90 > $new_file";
143
+                $cmd = $path."jpegtopnm $src_file | ".$path."pnmscale -xysize $newWidth $newHeight | ".$path."ppmtojpeg -quality=90 > $new_file";
144 144
             } elseif (preg_match("/\.gif/i", $source)) {
145
-                $cmd = $path . "giftopnm $src_file | " . $path . "pnmscale -xysize $newWidth $newHeight | ppmquant 256 | " . $path . "ppmtogif > $new_file";
145
+                $cmd = $path."giftopnm $src_file | ".$path."pnmscale -xysize $newWidth $newHeight | ppmquant 256 | ".$path."ppmtogif > $new_file";
146 146
             }
147 147
 
148 148
             @exec($cmd, $output, $retval);
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
@@ -13,9 +13,9 @@
 block discarded – undo
13 13
 
14 14
 global $_POST;
15 15
 
16
-require_once XOOPS_ROOT_PATH . '/class/xoopstree.php';
17
-require_once XOOPS_ROOT_PATH . '/class/xoopslists.php';
18
-require_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
16
+require_once XOOPS_ROOT_PATH.'/class/xoopstree.php';
17
+require_once XOOPS_ROOT_PATH.'/class/xoopslists.php';
18
+require_once XOOPS_ROOT_PATH.'/class/xoopsformloader.php';
19 19
 //require_once __DIR__ . '/functions.php';
20 20
 
21 21
 $mytree = new Smartfaq\Tree($xoopsDB->prefix('smartfaq_categories'), 'categoryid', 'parentid');
Please login to merge, or discard this patch.