Completed
Push — master ( 88111b...b3fce7 )
by Michael
05:58
created
include/customtag.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -22,7 +22,7 @@
 block discarded – undo
22 22
 }
23 23
 
24 24
 if (!defined('SMARTOBJECT_URL')) {
25
-    require_once XOOPS_ROOT_PATH . '/modules/smartobject/include/common.php';
25
+    require_once XOOPS_ROOT_PATH.'/modules/smartobject/include/common.php';
26 26
 }
27 27
 
28 28
 Smartobject\Utility::loadLanguageFile('smartobject', 'customtag');
Please login to merge, or discard this patch.
admin/rating.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -56,7 +56,7 @@  discard block
 block discarded – undo
56 56
     }
57 57
 }
58 58
 
59
-require_once __DIR__ . '/admin_header.php';
59
+require_once __DIR__.'/admin_header.php';
60 60
 //require_once SMARTOBJECT_ROOT_PATH . 'class/smartobjecttable.php';
61 61
 //require_once SMARTOBJECT_ROOT_PATH . 'class/rating.php';
62 62
 $smartobjectRatingHandler = Smartobject\Helper::getInstance()->getHandler('Rating');
@@ -75,7 +75,7 @@  discard block
 block discarded – undo
75 75
     case 'mod':
76 76
     case 'changedField':
77 77
 
78
-        $ratingid = isset($_GET['ratingid']) ? (int)$_GET['ratingid'] : 0;
78
+        $ratingid = isset($_GET['ratingid']) ? (int) $_GET['ratingid'] : 0;
79 79
 
80 80
         Smartobject\Utility::getXoopsCpHeader();
81 81
         $adminObject->displayNavigation(basename(__FILE__));
@@ -86,7 +86,7 @@  discard block
 block discarded – undo
86 86
     case 'addrating':
87 87
 //        require_once XOOPS_ROOT_PATH . '/modules/smartobject/class/smartobjectcontroller.php';
88 88
         $controller = new XoopsModules\Smartobject\ObjectController($smartobjectRatingHandler);
89
-        $controller->storeFromDefaultForm(_AM_SOBJECT_RATINGS_CREATED, _AM_SOBJECT_RATINGS_MODIFIED, SMARTOBJECT_URL . 'admin/rating.php');
89
+        $controller->storeFromDefaultForm(_AM_SOBJECT_RATINGS_CREATED, _AM_SOBJECT_RATINGS_MODIFIED, SMARTOBJECT_URL.'admin/rating.php');
90 90
 
91 91
         break;
92 92
 
@@ -154,4 +154,4 @@  discard block
 block discarded – undo
154 154
 
155 155
 //Smartobject\Utility::getModFooter();
156 156
 //xoops_cp_footer();
157
-require_once __DIR__ . '/admin_footer.php';
157
+require_once __DIR__.'/admin_footer.php';
Please login to merge, or discard this patch.
admin/update.php 1 patch
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -10,8 +10,8 @@  discard block
 block discarded – undo
10 10
 use XoopsModules\Wfdownloads;
11 11
 use XoopsModules\Smartobject;
12 12
 
13
-require_once __DIR__ . '/admin_header.php';
14
-require_once SMARTCONTENT_ROOT_PATH . 'class/dbupdater.php';
13
+require_once __DIR__.'/admin_header.php';
14
+require_once SMARTCONTENT_ROOT_PATH.'class/dbupdater.php';
15 15
 
16 16
 smartcontent_xoops_cp_header();
17 17
 
@@ -219,7 +219,7 @@  discard block
 block discarded – undo
219 219
     global $xoopsDB;
220 220
     $helperWfdownloads = \Xmf\Module\Helper::getHelper('wfdownloads');
221 221
     $catHandler = $helperWfdownloads->getHandler('Category');
222
-    $result     = $xoopsDB->query('SHOW COLUMNS FROM ' . $catHandler->table);
222
+    $result     = $xoopsDB->query('SHOW COLUMNS FROM '.$catHandler->table);
223 223
     while (false !== ($existing_field = $xoopsDB->fetchArray($result))) {
224 224
         $fields[$existing_field['field']] = $existing_field['type'];
225 225
     }
@@ -278,7 +278,7 @@  discard block
 block discarded – undo
278 278
         //$xoopsDB->query("ALTER TABLE ".$table." ADD ".$field." ".$type);
279 279
             //echo $field."(".$type.") <FONT COLOR='##22DD51'>Added</FONT><br>";
280 280
         } elseif ($existing_fields[$field] != $type) {
281
-            $table->addAlteredField($field, $field . ' ' . $type);
281
+            $table->addAlteredField($field, $field.' '.$type);
282 282
         // check $fields[$field]['type'] for things like "int(10) unsigned"
283 283
             //$xoopsDB->query("ALTER TABLE ".$table." CHANGE ".$field." ".$field." ".$type);
284 284
             //echo $field." <FONT COLOR='#FF6600'>Changed to</FONT> ".$type."<br>";
@@ -299,17 +299,17 @@  discard block
 block discarded – undo
299 299
 function get_table_info($table, $default_fields)
300 300
 {
301 301
     global $xoopsDB;
302
-    $result = $xoopsDB->query('SHOW COLUMNS FROM ' . $table);
302
+    $result = $xoopsDB->query('SHOW COLUMNS FROM '.$table);
303 303
     while (false !== ($existing_field = $xoopsDB->fetchArray($result))) {
304 304
         $fields[$existing_field['Field']] = $existing_field['Type'];
305 305
         if ('YES' !== $existing_field['Null']) {
306 306
             $fields[$existing_field['Field']] .= ' NOT NULL';
307 307
         }
308 308
         if ($existing_field['Extra']) {
309
-            $fields[$existing_field['Field']] .= ' ' . $existing_field['Extra'];
309
+            $fields[$existing_field['Field']] .= ' '.$existing_field['Extra'];
310 310
         }
311 311
         if ($default_fields[$existing_field['Field']]['Default']) {
312
-            $fields[$existing_field['Field']] .= " default '" . $existing_field['Default'] . "'";
312
+            $fields[$existing_field['Field']] .= " default '".$existing_field['Default']."'";
313 313
         }
314 314
     }
315 315
 
@@ -331,7 +331,7 @@  discard block
 block discarded – undo
331 331
         if (in_array($field, array_keys($renamed_fields))) {
332 332
             $new_field_name = $renamed_fields[$field];
333 333
             $new_field_type = $new_fields[$new_field_name]['Type'];
334
-            $table->addAltered($field, $new_field_name . ' ' . $new_field_type);
334
+            $table->addAltered($field, $new_field_name.' '.$new_field_type);
335 335
             //$xoopsDB->query("ALTER TABLE ".$table." CHANGE ".$field." ".$new_field_name." ".$new_field_type);
336 336
             //echo $field." Renamed to ".$new_field_name."<br>";
337 337
             $fields[$new_field_name] = $new_field_type;
@@ -340,7 +340,7 @@  discard block
 block discarded – undo
340 340
     //return $fields;
341 341
 }
342 342
 
343
-$op = isset($_REQUEST['op']) ? (int)$_REQUEST['op'] : 0;
343
+$op = isset($_REQUEST['op']) ? (int) $_REQUEST['op'] : 0;
344 344
 switch ($op) {
345 345
     case 1:
346 346
         // Make sure that nohtml is properly changed to dohtml
@@ -359,7 +359,7 @@  discard block
 block discarded – undo
359 359
 
360 360
     default:
361 361
         //ask what to do
362
-        include XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
362
+        include XOOPS_ROOT_PATH.'/class/xoopsformloader.php';
363 363
         $form = new \XoopsThemeForm('Upgrade WF-Downloads', 'form', $_SERVER['REQUEST_URI']);
364 364
 
365 365
         //Is MyDownloads installed?
@@ -384,4 +384,4 @@  discard block
 block discarded – undo
384 384
 }
385 385
 //wfdownloads_modFooter();
386 386
 //xoops_cp_footer();
387
-require_once __DIR__ . '/admin_footer.php';
387
+require_once __DIR__.'/admin_footer.php';
Please login to merge, or discard this patch.
admin/adsense.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -42,9 +42,9 @@  discard block
 block discarded – undo
42 42
     }
43 43
 }
44 44
 
45
-require_once __DIR__ . '/admin_header.php';
45
+require_once __DIR__.'/admin_header.php';
46 46
 //require_once SMARTOBJECT_ROOT_PATH . 'class/smartobjecttable.php';
47
-require_once SMARTOBJECT_ROOT_PATH . 'class/adsense.php';
47
+require_once SMARTOBJECT_ROOT_PATH.'class/adsense.php';
48 48
 
49 49
 //$helper = \XoopsModules\Smartobject\Helper::getInstance();
50 50
 //$helper = Smartobject\Helper::getInstance();
@@ -65,7 +65,7 @@  discard block
 block discarded – undo
65 65
 switch ($op) {
66 66
     case 'mod':
67 67
 
68
-        $adsenseid = isset($_GET['adsenseid']) ? (int)$_GET['adsenseid'] : 0;
68
+        $adsenseid = isset($_GET['adsenseid']) ? (int) $_GET['adsenseid'] : 0;
69 69
 
70 70
         Smartobject\Utility::getXoopsCpHeader();
71 71
         $adminObject->displayNavigation(basename(__FILE__));
@@ -75,7 +75,7 @@  discard block
 block discarded – undo
75 75
 
76 76
     case 'clone':
77 77
 
78
-        $adsenseid = isset($_GET['adsenseid']) ? (int)$_GET['adsenseid'] : 0;
78
+        $adsenseid = isset($_GET['adsenseid']) ? (int) $_GET['adsenseid'] : 0;
79 79
 
80 80
         Smartobject\Utility::getXoopsCpHeader();
81 81
         $adminObject->displayNavigation(basename(__FILE__));
@@ -84,7 +84,7 @@  discard block
 block discarded – undo
84 84
         break;
85 85
 
86 86
     case 'addadsense':
87
-        if (@require_once SMARTOBJECT_ROOT_PATH . 'include/captcha/captcha.php') {
87
+        if (@require_once SMARTOBJECT_ROOT_PATH.'include/captcha/captcha.php') {
88 88
             $xoopsCaptcha = XoopsCaptcha::getInstance();
89 89
             if (!$xoopsCaptcha->verify()) {
90 90
                 redirect_header('javascript:history.go(-1);', 3, $xoopsCaptcha->getMessage());
@@ -159,4 +159,4 @@  discard block
 block discarded – undo
159 159
 
160 160
 //Smartobject\Utility::getModFooter();
161 161
 //xoops_cp_footer();
162
-require_once __DIR__ . '/admin_footer.php';
162
+require_once __DIR__.'/admin_footer.php';
Please login to merge, or discard this patch.
admin/link.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -16,7 +16,7 @@  discard block
 block discarded – undo
16 16
 use XoopsModules\Smartobject\ObjectController;
17 17
 use XoopsModules\Smartobject\Table;
18 18
 
19
-require_once __DIR__ . '/admin_header.php';
19
+require_once __DIR__.'/admin_header.php';
20 20
 //require_once SMARTOBJECT_ROOT_PATH . 'class/smartobjecttable.php';
21 21
 //require_once SMARTOBJECT_ROOT_PATH . 'class/smartobjectlink.php';
22 22
 $adminObject = \Xmf\Module\Admin::getInstance();
@@ -46,7 +46,7 @@  discard block
 block discarded – undo
46 46
         $linkObj = $smartobjectLinkHandler->get($linkid);
47 47
 
48 48
         if ($linkObj->isNew()) {
49
-            redirect_header(SMARTOBJECT_URL . 'admin/link.php', 3, _AM_SOBJECT_LINK_NOT_FOUND);
49
+            redirect_header(SMARTOBJECT_URL.'admin/link.php', 3, _AM_SOBJECT_LINK_NOT_FOUND);
50 50
         }
51 51
 
52 52
         Smartobject\Utility::getXoopsCpHeader();
@@ -55,7 +55,7 @@  discard block
 block discarded – undo
55 55
 
56 56
         Smartobject\Utility::getCollapsableBar('sentlinks', _AM_SOBJECT_SENT_LINK_DISPLAY, _AM_SOBJECT_SENT_LINK_DISPLAY_INFO);
57 57
 
58
-        require_once XOOPS_ROOT_PATH . '/class/template.php';
58
+        require_once XOOPS_ROOT_PATH.'/class/template.php';
59 59
 
60 60
         // ---
61 61
         // 2012-01-01 PHP 5.3: Assigning the return value of new by reference is now deprecated.
@@ -105,4 +105,4 @@  discard block
 block discarded – undo
105 105
 
106 106
 //Smartobject\Utility::getModFooter();
107 107
 //xoops_cp_footer();
108
-require_once __DIR__ . '/admin_footer.php';
108
+require_once __DIR__.'/admin_footer.php';
Please login to merge, or discard this patch.
admin/tag.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -22,7 +22,7 @@  discard block
 block discarded – undo
22 22
     $tagObj = $smartobjectTagHandler->get($tagid);
23 23
 
24 24
     if ($tagObj->isNew()) {
25
-        $breadcrumb            = _AM_SOBJECT_TAGS . ' > ' . _AM_SOBJECT_TAG_CREATE;
25
+        $breadcrumb            = _AM_SOBJECT_TAGS.' > '._AM_SOBJECT_TAG_CREATE;
26 26
         $title                 = _AM_SOBJECT_TAG_CREATE;
27 27
         $info                  = _AM_SOBJECT_TAG_CREATE_INFO;
28 28
         $collaps_name          = 'tagcreate';
@@ -31,7 +31,7 @@  discard block
 block discarded – undo
31 31
     //$tagObj->stripMultilanguageFields();
32 32
     } else {
33 33
         if ($language) {
34
-            $breadcrumb            = _AM_SOBJECT_TAGS . ' > ' . _AM_SOBJECT_TAG_EDITING_LANGUAGE;
34
+            $breadcrumb            = _AM_SOBJECT_TAGS.' > '._AM_SOBJECT_TAG_EDITING_LANGUAGE;
35 35
             $title                 = _AM_SOBJECT_TAG_EDIT_LANGUAGE;
36 36
             $info                  = _AM_SOBJECT_TAG_EDIT_LANGUAGE_INFO;
37 37
             $collaps_name          = 'tageditlanguage';
@@ -39,7 +39,7 @@  discard block
 block discarded – undo
39 39
             $submit_button_caption = null;
40 40
             $tagObj->makeNonMLFieldReadOnly();
41 41
         } else {
42
-            $breadcrumb            = _AM_SOBJECT_TAGS . ' > ' . _AM_SOBJECT_EDITING;
42
+            $breadcrumb            = _AM_SOBJECT_TAGS.' > '._AM_SOBJECT_EDITING;
43 43
             $title                 = _AM_SOBJECT_TAG_EDIT;
44 44
             $info                  = _AM_SOBJECT_TAG_EDIT_INFO;
45 45
             $collaps_name          = 'tagedit';
@@ -58,7 +58,7 @@  discard block
 block discarded – undo
58 58
     Smartobject\Utility::closeCollapsable($collaps_name);
59 59
 }
60 60
 
61
-require_once __DIR__ . '/admin_header.php';
61
+require_once __DIR__.'/admin_header.php';
62 62
 //require_once SMARTOBJECT_ROOT_PATH . 'class/smartobjecttable.php';
63 63
 //require_once SMARTOBJECT_ROOT_PATH . 'class/smartobjecttag.php';
64 64
 
@@ -91,11 +91,11 @@  discard block
 block discarded – undo
91 91
         $controller = new ObjectController($smartobjectTagHandler);
92 92
         $tagObj     = $controller->storeSmartObject();
93 93
         if ($tagObj->hasError()) {
94
-            redirect_header($smart_previous_page, 3, _CO_SOBJECT_SAVE_ERROR . $tagObj->getHtmlErrors());
94
+            redirect_header($smart_previous_page, 3, _CO_SOBJECT_SAVE_ERROR.$tagObj->getHtmlErrors());
95 95
         }
96 96
 
97 97
         if ($tagObj->hasError()) {
98
-            redirect_header($smart_previous_page, 3, _CO_SOBJECT_SAVE_ERROR . $tagObj->getHtmlErrors());
98
+            redirect_header($smart_previous_page, 3, _CO_SOBJECT_SAVE_ERROR.$tagObj->getHtmlErrors());
99 99
         } else {
100 100
             redirect_header(Smartobject\Utility::getPageBeforeForm(), 3, _CO_SOBJECT_SAVE_SUCCESS);
101 101
         }
@@ -142,4 +142,4 @@  discard block
 block discarded – undo
142 142
 
143 143
 //Smartobject\Utility::getModFooter();
144 144
 //xoops_cp_footer();
145
-require_once __DIR__ . '/admin_footer.php';
145
+require_once __DIR__.'/admin_footer.php';
Please login to merge, or discard this patch.
admin/admin_header2.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -7,7 +7,7 @@
 block discarded – undo
7 7
  * Licence: GNU
8 8
  */
9 9
 
10
-require_once __DIR__ . '/../../../include/cp_header.php';
10
+require_once __DIR__.'/../../../include/cp_header.php';
11 11
 
12
-require_once XOOPS_ROOT_PATH . '/modules/smartobject/include/common.php';
12
+require_once XOOPS_ROOT_PATH.'/modules/smartobject/include/common.php';
13 13
 Smartobject\Utility::loadCommonLanguageFile();
Please login to merge, or discard this patch.
admin/currency.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -40,7 +40,7 @@  discard block
 block discarded – undo
40 40
     }
41 41
 }
42 42
 
43
-require_once __DIR__ . '/admin_header.php';
43
+require_once __DIR__.'/admin_header.php';
44 44
 //require_once SMARTOBJECT_ROOT_PATH . 'class/smartobjecttable.php';
45 45
 //require_once SMARTOBJECT_ROOT_PATH . 'class/currency.php';
46 46
 $smartobjectCurrencyHandler = Smartobject\Helper::getInstance()->getHandler('Currency');
@@ -56,7 +56,7 @@  discard block
 block discarded – undo
56 56
 
57 57
 switch ($op) {
58 58
     case 'mod':
59
-        $currencyid = isset($_GET['currencyid']) ? (int)$_GET['currencyid'] : 0;
59
+        $currencyid = isset($_GET['currencyid']) ? (int) $_GET['currencyid'] : 0;
60 60
 
61 61
         Smartobject\Utility::getXoopsCpHeader();
62 62
 
@@ -71,9 +71,9 @@  discard block
 block discarded – undo
71 71
 
72 72
         if (isset($_POST['default_currency'])) {
73 73
             $newDefaultCurrency = $_POST['default_currency'];
74
-            $sql                = 'UPDATE ' . $smartobjectCurrencyHandler->table . ' SET default_currency=0';
74
+            $sql                = 'UPDATE '.$smartobjectCurrencyHandler->table.' SET default_currency=0';
75 75
             $smartobjectCurrencyHandler->query($sql);
76
-            $sql = 'UPDATE ' . $smartobjectCurrencyHandler->table . ' SET default_currency=1 WHERE currencyid=' . $newDefaultCurrency;
76
+            $sql = 'UPDATE '.$smartobjectCurrencyHandler->table.' SET default_currency=1 WHERE currencyid='.$newDefaultCurrency;
77 77
             $smartobjectCurrencyHandler->query($sql);
78 78
         }
79 79
 
@@ -93,7 +93,7 @@  discard block
 block discarded – undo
93 93
     case 'addcurrency':
94 94
 //        require_once XOOPS_ROOT_PATH . '/modules/smartobject/class/smartobjectcontroller.php';
95 95
         $controller = new ObjectController($smartobjectCurrencyHandler);
96
-        $controller->storeFromDefaultForm(_AM_SOBJECT_CURRENCIES_CREATED, _AM_SOBJECT_CURRENCIES_MODIFIED, SMARTOBJECT_URL . 'admin/currency.php');
96
+        $controller->storeFromDefaultForm(_AM_SOBJECT_CURRENCIES_CREATED, _AM_SOBJECT_CURRENCIES_MODIFIED, SMARTOBJECT_URL.'admin/currency.php');
97 97
 
98 98
         break;
99 99
 
@@ -134,4 +134,4 @@  discard block
 block discarded – undo
134 134
 
135 135
 //Smartobject\Utility::getModFooter();
136 136
 //xoops_cp_footer();
137
-require_once __DIR__ . '/admin_footer.php';
137
+require_once __DIR__.'/admin_footer.php';
Please login to merge, or discard this patch.
admin/customtag.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -45,7 +45,7 @@  discard block
 block discarded – undo
45 45
     }
46 46
 }
47 47
 
48
-require_once __DIR__ . '/admin_header.php';
48
+require_once __DIR__.'/admin_header.php';
49 49
 Smartobject\Utility::loadLanguageFile('smartobject', 'customtag');
50 50
 
51 51
 //require_once SMARTOBJECT_ROOT_PATH . 'class/smartobjecttable.php';
@@ -66,7 +66,7 @@  discard block
 block discarded – undo
66 66
 switch ($op) {
67 67
     case 'mod':
68 68
 
69
-        $customtagid = isset($_GET['customtagid']) ? (int)$_GET['customtagid'] : 0;
69
+        $customtagid = isset($_GET['customtagid']) ? (int) $_GET['customtagid'] : 0;
70 70
 
71 71
         Smartobject\Utility::getXoopsCpHeader();
72 72
         $adminObject->displayNavigation(basename(__FILE__));
@@ -76,7 +76,7 @@  discard block
 block discarded – undo
76 76
 
77 77
     case 'clone':
78 78
 
79
-        $customtagid = isset($_GET['customtagid']) ? (int)$_GET['customtagid'] : 0;
79
+        $customtagid = isset($_GET['customtagid']) ? (int) $_GET['customtagid'] : 0;
80 80
 
81 81
         Smartobject\Utility::getXoopsCpHeader();
82 82
         $adminObject->displayNavigation(basename(__FILE__));
@@ -158,4 +158,4 @@  discard block
 block discarded – undo
158 158
 
159 159
 //Smartobject\Utility::getModFooter();
160 160
 //xoops_cp_footer();
161
-require_once __DIR__ . '/admin_footer.php';
161
+require_once __DIR__.'/admin_footer.php';
Please login to merge, or discard this patch.