Completed
Push — master ( 7efdcc...e9c2cc )
by Michael
01:41
created
admin/about.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -20,12 +20,12 @@
 block discarded – undo
20 20
  */
21 21
 
22 22
 // Call header
23
-require_once __DIR__ . '/admin_header.php';
23
+require_once __DIR__.'/admin_header.php';
24 24
 xoops_cp_header();
25 25
 
26 26
 $adminObject->displayNavigation(basename(__FILE__));
27 27
 $adminObject->setPaypal('[email protected]');
28 28
 $adminObject->displayAbout(false);
29 29
 
30
-require_once __DIR__ . '/admin_footer.php';
30
+require_once __DIR__.'/admin_footer.php';
31 31
 
Please login to merge, or discard this patch.
admin/log.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -22,7 +22,7 @@  discard block
 block discarded – undo
22 22
 use Xmf\Request;
23 23
 
24 24
 // Call header
25
-require __DIR__ . '/admin_header.php';
25
+require __DIR__.'/admin_header.php';
26 26
 // Display Admin header
27 27
 xoops_cp_header();
28 28
 // Define default value
@@ -51,6 +51,6 @@  discard block
 block discarded – undo
51 51
 
52 52
 $GLOBALS['xoopsTpl']->assign('navigation', $adminObject->displayNavigation(basename(__FILE__)));
53 53
 // Call template file
54
-$GLOBALS['xoopsTpl']->display(XOOPS_ROOT_PATH . '/modules/contact/templates/admin/contact_logs.tpl');
54
+$GLOBALS['xoopsTpl']->display(XOOPS_ROOT_PATH.'/modules/contact/templates/admin/contact_logs.tpl');
55 55
 // Call footer
56
-require __DIR__ . '/admin_footer.php';
56
+require __DIR__.'/admin_footer.php';
Please login to merge, or discard this patch.
admin/index.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -20,7 +20,7 @@  discard block
 block discarded – undo
20 20
  */
21 21
 
22 22
 // Call header
23
-require __DIR__ . '/admin_header.php';
23
+require __DIR__.'/admin_header.php';
24 24
 // Display Admin header
25 25
 xoops_cp_header();
26 26
 
@@ -32,6 +32,6 @@  discard block
 block discarded – undo
32 32
 $adminObject->displayIndex();
33 33
 
34 34
 // Call template file
35
-$GLOBALS['xoopsTpl']->display(XOOPS_ROOT_PATH . '/modules/contact/templates/admin/contact_index.tpl');
35
+$GLOBALS['xoopsTpl']->display(XOOPS_ROOT_PATH.'/modules/contact/templates/admin/contact_index.tpl');
36 36
 // Call footer
37
-require __DIR__ . '/admin_footer.php';
37
+require __DIR__.'/admin_footer.php';
Please login to merge, or discard this patch.
xoops_version.php 1 patch
Spacing   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -43,10 +43,10 @@  discard block
 block discarded – undo
43 43
     'help'                => 'page=help',
44 44
     // ------------------- Folders & Files -------------------
45 45
     'release_info'        => 'Changelog',
46
-    'release_file'        => XOOPS_URL . "/modules/$moduleDirName/docs/changelog.txt",
46
+    'release_file'        => XOOPS_URL."/modules/$moduleDirName/docs/changelog.txt",
47 47
     //
48 48
     'manual'              => 'link to manual file',
49
-    'manual_file'         => XOOPS_URL . "/modules/$moduleDirName/docs/install.txt",
49
+    'manual_file'         => XOOPS_URL."/modules/$moduleDirName/docs/install.txt",
50 50
     // images
51 51
     'image'               => 'assets/images/logoModule.png',
52 52
     'dirname'             => $moduleDirName,
@@ -79,7 +79,7 @@  discard block
 block discarded – undo
79 79
     // -------------------  PayPal ---------------------------
80 80
     'paypal'              => [
81 81
         'business'      => '[email protected]',
82
-        'item_name'     => 'Donation : ' . _MI_CONTACT_NAME,
82
+        'item_name'     => 'Donation : '._MI_CONTACT_NAME,
83 83
         'amount'        => 0,
84 84
         'currency_code' => 'USD'
85 85
     ],
@@ -100,35 +100,35 @@  discard block
 block discarded – undo
100 100
 // Templates
101 101
 $modversion['templates'] = array(
102 102
     array(
103
-        'file'                  =>  $moduleDirName . '_index.tpl',
103
+        'file'                  =>  $moduleDirName.'_index.tpl',
104 104
         'description'           =>  '_MI_CONTACT_TEMPLATES'
105 105
     ),
106 106
 );
107 107
 
108 108
 // Blocks
109 109
 $modversion['blocks'][] = array(
110
-    'file'                  =>  'block_' . $moduleDirName . '_form_map.php',
110
+    'file'                  =>  'block_'.$moduleDirName.'_form_map.php',
111 111
     'name'                  =>  _MI_B_CONTACT_FORM,
112 112
     'description'           =>  _MI_B_CONTACT_FORM_DESC,
113
-    'show_func'             =>  'block_' . $moduleDirName . '_form_show',
113
+    'show_func'             =>  'block_'.$moduleDirName.'_form_show',
114 114
     'options'               =>  '',
115
-    'template'              =>  'block_' . $moduleDirName . '_form.tpl'
115
+    'template'              =>  'block_'.$moduleDirName.'_form.tpl'
116 116
 );
117 117
 $modversion['blocks'][] = array(
118
-    'file'                  =>  'block_' . $moduleDirName . '_form_map.php',
118
+    'file'                  =>  'block_'.$moduleDirName.'_form_map.php',
119 119
     'name'                  =>  _MI_B_CONTACT_MAP,
120 120
     'description'           =>  _MI_B_CONTACT_MAP_DESC,
121
-    'show_func'             =>  'block_' . $moduleDirName . '_map_show',
121
+    'show_func'             =>  'block_'.$moduleDirName.'_map_show',
122 122
     'options'               =>  '',
123
-    'template'              =>  'block_' . $moduleDirName . '_map.tpl'
123
+    'template'              =>  'block_'.$moduleDirName.'_map.tpl'
124 124
 );
125 125
 $modversion['blocks'][] = array(
126
-    'file'                  =>  'block_' . $moduleDirName . '_form_map.php',
126
+    'file'                  =>  'block_'.$moduleDirName.'_form_map.php',
127 127
     'name'                  =>  _MI_B_CONTACT_FORM_MAP,
128 128
     'description'           =>  _MI_B_CONTACT_FORM_MAP_DESC,
129
-    'show_func'             =>  'block_' . $moduleDirName . '_form_map_show',
129
+    'show_func'             =>  'block_'.$moduleDirName.'_form_map_show',
130 130
     'options'               =>  '',
131
-    'template'              =>  'block_' . $moduleDirName . '_form_map.tpl'
131
+    'template'              =>  'block_'.$moduleDirName.'_form_map.tpl'
132 132
 );
133 133
 
134 134
 
Please login to merge, or discard this patch.
blocks/block_contact_form_map.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -70,7 +70,7 @@
 block discarded – undo
70 70
 
71 71
     xoops_loadLanguage('main', 'contact');
72 72
 
73
-    require_once XOOPS_ROOT_PATH . '/modules/contact/class/contact.php';
73
+    require_once XOOPS_ROOT_PATH.'/modules/contact/class/contact.php';
74 74
 
75 75
     $block['lng_username'] = 'name';
76 76
 
Please login to merge, or discard this patch.
send.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -22,10 +22,10 @@  discard block
 block discarded – undo
22 22
 
23 23
 use Xmf\Request;
24 24
 
25
-include __DIR__ . '/header.php';
25
+include __DIR__.'/header.php';
26 26
 $GLOBALS['xoopsOption']['template_main'] = 'contact_index.tpl';
27 27
 //unset($_SESSION);
28
-include XOOPS_ROOT_PATH . '/header.php';
28
+include XOOPS_ROOT_PATH.'/header.php';
29 29
 
30 30
 /** reCaptcha by google **/
31 31
 global $xoopsConfig, $xoopsModuleConfig;
@@ -41,7 +41,7 @@  discard block
 block discarded – undo
41 41
 if (!$captcha && $xoopsModuleConfig['recaptchause']) {
42 42
     redirect_header('index.php', 2, _MD_CONTACT_MES_NOCAPTCHA);
43 43
 } else {
44
-    $response = file_get_contents('https://www.google.com/recaptcha/api/siteverify?secret=' . $xoopsModuleConfig['recaptchakey'] . '&response=' . $captcha . '&remoteip=' . $_SERVER['REMOTE_ADDR']);
44
+    $response = file_get_contents('https://www.google.com/recaptcha/api/siteverify?secret='.$xoopsModuleConfig['recaptchakey'].'&response='.$captcha.'&remoteip='.$_SERVER['REMOTE_ADDR']);
45 45
     if ($response['success'] === false && $xoopsModuleConfig['recaptchause']) {
46 46
         redirect_header('index.php', 2, _MD_CONTACT_MES_CAPTCHAINCORRECT);
47 47
     } else {
@@ -87,4 +87,4 @@  discard block
 block discarded – undo
87 87
     }
88 88
 }
89 89
 
90
-include XOOPS_ROOT_PATH . '/footer.php';
90
+include XOOPS_ROOT_PATH.'/footer.php';
Please login to merge, or discard this patch.
header.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -20,9 +20,9 @@
 block discarded – undo
20 20
  */
21 21
 
22 22
 $moduleDirName = basename(__DIR__);
23
-require_once __DIR__ . '/../../include/cp_header.php';
24
-include __DIR__ . '/class/contact.php';
25
-require_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
23
+require_once __DIR__.'/../../include/cp_header.php';
24
+include __DIR__.'/class/contact.php';
25
+require_once XOOPS_ROOT_PATH.'/class/xoopsformloader.php';
26 26
 
27 27
 /** @var ContactContactHandler $contactHandler*/
28 28
 $contactHandler = xoops_getModuleHandler('contact', $moduleDirName);
Please login to merge, or discard this patch.
class/contact.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -79,7 +79,7 @@  discard block
 block discarded – undo
79 79
         $form->addElement(new XoopsFormLabel(_AM_CONTACT_TO, '', ''));
80 80
         $form->addElement(new XoopsFormText(_AM_CONTACT_NAMETO, 'contact_nameto', 50, 255, $this->getVar('contact_name')), true);
81 81
         $form->addElement(new XoopsFormText(_AM_CONTACT_MAILTO, 'contact_mailto', 50, 255, $this->getVar('contact_mail')), true);
82
-        $form->addElement(new XoopsFormText(_AM_CONTACT_SUBJECT, 'contact_subject', 50, 255, _RE . $this->getVar('contact_subject')), true);
82
+        $form->addElement(new XoopsFormText(_AM_CONTACT_SUBJECT, 'contact_subject', 50, 255, _RE.$this->getVar('contact_subject')), true);
83 83
         $form->addElement(new XoopsFormTextArea(_AM_CONTACT_MESSAGE, 'contact_message', '', 5, 60), true);
84 84
         $form->addElement(new XoopsFormButton('', 'submit', _SUBMIT, 'submit'));
85 85
 
@@ -94,7 +94,7 @@  discard block
 block discarded – undo
94 94
     public function toArray()
95 95
     {
96 96
         $ret  = array();
97
-        $vars =& $this->getVars();
97
+        $vars = & $this->getVars();
98 98
         foreach (array_keys($vars) as $i) {
99 99
             $ret [$i] = $this->getVar($i);
100 100
         }
@@ -216,9 +216,9 @@  discard block
 block discarded – undo
216 216
 
217 217
         $subjectPrefix = '';
218 218
         if ($GLOBALS['xoopsModuleConfig']['form_dept'] && $GLOBALS['xoopsModuleConfig']['subject_prefix'] && $GLOBALS['xoopsModuleConfig']['contact_dept']) {
219
-            $subjectPrefix = '[' . $GLOBALS['xoopsModuleConfig']['prefix_text'] . ' ' . $contact['contact_department'] . ']: ';
219
+            $subjectPrefix = '['.$GLOBALS['xoopsModuleConfig']['prefix_text'].' '.$contact['contact_department'].']: ';
220 220
         }
221
-        $xoopsMailer->setSubject($subjectPrefix . html_entity_decode($contact['contact_subject'], ENT_QUOTES, 'UTF-8'));
221
+        $xoopsMailer->setSubject($subjectPrefix.html_entity_decode($contact['contact_subject'], ENT_QUOTES, 'UTF-8'));
222 222
         $xoopsMailer->setBody(html_entity_decode($contact['contact_message'], ENT_QUOTES, 'UTF-8'));
223 223
         if ($xoopsMailer->send()) {
224 224
             $message = _MD_CONTACT_MES_SEND;
@@ -324,7 +324,7 @@  discard block
 block discarded – undo
324 324
         $criteria = new CriteriaCompo();
325 325
         $criteria->add(new Criteria('contact_cid', $contact_id));
326 326
         $criteria->add(new Criteria('contact_type', 'Contact'));
327
-        $contacts =& $this->getObjects($criteria, false);
327
+        $contacts = & $this->getObjects($criteria, false);
328 328
         if ($contacts) {
329 329
             $ret = array();
330 330
             /** @var Contact $root */
@@ -355,7 +355,7 @@  discard block
 block discarded – undo
355 355
         $criteria->setOrder($contact['order']);
356 356
         $criteria->setStart($contact['start']);
357 357
         $criteria->setLimit($contact['limit']);
358
-        $contacts =& $this->getObjects($criteria, false);
358
+        $contacts = & $this->getObjects($criteria, false);
359 359
         if ($contacts) {
360 360
             /** @var Contact $root */
361 361
             foreach ($contacts as $root) {
@@ -495,7 +495,7 @@  discard block
 block discarded – undo
495 495
         }
496 496
         $criteria->setSort('contact_create');
497 497
         $criteria->setOrder('DESC');
498
-        $contacts =& $this->getObjects($criteria, false);
498
+        $contacts = & $this->getObjects($criteria, false);
499 499
         if ($contacts) {
500 500
             /** @var Contact $root */
501 501
             foreach ($contacts as $root) {
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
@@ -17,27 +17,27 @@  discard block
 block discarded – undo
17 17
  * @author       XOOPS Development Team
18 18
  */
19 19
 
20
-require_once __DIR__ . '/../../../mainfile.php';
20
+require_once __DIR__.'/../../../mainfile.php';
21 21
 
22 22
 $moduleDirName = basename(dirname(__DIR__));
23 23
 $capsDirName   = strtoupper($moduleDirName);
24 24
 
25
-if (!defined($capsDirName . '_DIRNAME')) {
25
+if (!defined($capsDirName.'_DIRNAME')) {
26 26
     //if (!defined(constant($capsDirName . '_DIRNAME'))) {
27
-    define($capsDirName . '_DIRNAME', $GLOBALS['xoopsModule']->dirname());
28
-    define($capsDirName . '_PATH', XOOPS_ROOT_PATH . '/modules/' . constant($capsDirName . '_DIRNAME'));
29
-    define($capsDirName . '_URL', XOOPS_URL . '/modules/' . constant($capsDirName . '_DIRNAME'));
30
-    define($capsDirName . '_ADMIN', constant($capsDirName . '_URL') . '/admin/index.php');
31
-    define($capsDirName . '_ROOT_PATH', XOOPS_ROOT_PATH . '/modules/' . constant($capsDirName . '_DIRNAME'));
32
-    define($capsDirName . '_AUTHOR_LOGOIMG', constant($capsDirName . '_URL') . '/assets/images/logoModule.png');
27
+    define($capsDirName.'_DIRNAME', $GLOBALS['xoopsModule']->dirname());
28
+    define($capsDirName.'_PATH', XOOPS_ROOT_PATH.'/modules/'.constant($capsDirName.'_DIRNAME'));
29
+    define($capsDirName.'_URL', XOOPS_URL.'/modules/'.constant($capsDirName.'_DIRNAME'));
30
+    define($capsDirName.'_ADMIN', constant($capsDirName.'_URL').'/admin/index.php');
31
+    define($capsDirName.'_ROOT_PATH', XOOPS_ROOT_PATH.'/modules/'.constant($capsDirName.'_DIRNAME'));
32
+    define($capsDirName.'_AUTHOR_LOGOIMG', constant($capsDirName.'_URL').'/assets/images/logoModule.png');
33 33
 }
34 34
 
35 35
 // Define here the place where main upload path
36 36
 
37 37
 //$img_dir = $GLOBALS['xoopsModuleConfig']['uploaddir'];
38 38
 
39
-define($capsDirName . '_UPLOAD_URL', XOOPS_UPLOAD_URL . '/' . $moduleDirName); // WITHOUT Trailing slash
40
-define($capsDirName . '_UPLOAD_PATH', XOOPS_UPLOAD_PATH . '/' . $moduleDirName); // WITHOUT Trailing slash
39
+define($capsDirName.'_UPLOAD_URL', XOOPS_UPLOAD_URL.'/'.$moduleDirName); // WITHOUT Trailing slash
40
+define($capsDirName.'_UPLOAD_PATH', XOOPS_UPLOAD_PATH.'/'.$moduleDirName); // WITHOUT Trailing slash
41 41
 
42 42
 //constant($cloned_lang . '_CATEGORY_NOTIFY')
43 43
 
@@ -84,7 +84,7 @@  discard block
 block discarded – undo
84 84
             //            constant($capsDirName . '_UPLOAD_PATH') . '/midsize',
85 85
             //            constant($capsDirName . '_UPLOAD_PATH') . '/thumbs',
86 86
         ];
87
-        $this->blankFiles    = [
87
+        $this->blankFiles = [
88 88
             //            constant($capsDirName . '_UPLOAD_PATH'),
89 89
             //            constant($capsDirName . '_UPLOAD_PATH') . '/midsize',
90 90
             //            constant($capsDirName . '_UPLOAD_PATH') . '/thumbs',
@@ -96,13 +96,13 @@  discard block
 block discarded – undo
96 96
             '/templates/admin/'
97 97
 
98 98
         ];
99
-        $this->oldFiles        = [
99
+        $this->oldFiles = [
100 100
             '/include/functions.php',
101 101
             '/include/functions_update.php',
102 102
             '/LICENSE',
103 103
             '/readme.html',
104 104
         ];
105
-        $this->oldFolders      = [
105
+        $this->oldFolders = [
106 106
             '/images',
107 107
             '/css',
108 108
             '/js',
@@ -112,4 +112,4 @@  discard block
 block discarded – undo
112 112
 
113 113
 // module information
114 114
 $modCopyright = "<a href='https://xoops.org' title='XOOPS Project' target='_blank'>
115
-                     <img src='" . constant($capsDirName . '_AUTHOR_LOGOIMG') . '\' alt=\'XOOPS Project\' /></a>';
115
+                     <img src='" . constant($capsDirName.'_AUTHOR_LOGOIMG').'\' alt=\'XOOPS Project\' /></a>';
Please login to merge, or discard this patch.