Completed
Push — master ( 5061b6...0c98dc )
by Richard
12s
created
htdocs/modules/smilies/admin/smilies.php 2 patches
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -155,7 +155,7 @@
 block discarded – undo
155 155
         } else {
156 156
             $smilies_img = ($obj->getVar('smiley_url')) ? $obj->getVar('smiley_url') : 'blank.gif';
157 157
             echo $xoops->confirm(array(
158
-                                 'ok' => 1, 'smiley_id' => $smiley_id, 'op' => 'del'
158
+                                    'ok' => 1, 'smiley_id' => $smiley_id, 'op' => 'del'
159 159
                             ), \XoopsBaseConfig::get('url') . '/modules/smilies/admin/smilies.php', sprintf(_AM_SMILIES_SUREDEL) . '<br /><strong>' . $obj->getVar('smiley_emotion') . '</strong><br /><img src="' . \XoopsBaseConfig::get('uploads-url') . '/' . $smilies_img . '" alt="' . $obj->getVar('smiley_emotion') . '"><br />');
160 160
         }
161 161
         break;
Please login to merge, or discard this 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
  * @version         $Id$
23 23
  */
24 24
 
25
-include __DIR__ . '/header.php';
25
+include __DIR__.'/header.php';
26 26
 
27 27
 // Call Header & ...
28 28
 $xoops->header('admin:smilies/smilies_smilies.tpl');
@@ -93,7 +93,7 @@  discard block
 block discarded – undo
93 93
         }
94 94
 
95 95
         $smiley_id = Request::getInt('smiley_id', 0);
96
-        if (isset($smiley_id) && $smiley_id !=0) {
96
+        if (isset($smiley_id) && $smiley_id != 0) {
97 97
             $obj = $helper->getHandlerSmilies()->get($smiley_id);
98 98
         } else {
99 99
             $obj = $helper->getHandlerSmilies()->create();
@@ -102,19 +102,19 @@  discard block
 block discarded – undo
102 102
         $obj->setVar('smiley_code', Request::getString('smiley_code', ''));
103 103
         $obj->setVar('smiley_emotion', Request::getString('smiley_emotion', ''));
104 104
         $obj->setVar('smiley_display', Request::getBool('smiley_display', true));
105
-        $obj->setVar('smiley_url', 'smilies/' . Request::getPath('smiley_url', ''));
105
+        $obj->setVar('smiley_url', 'smilies/'.Request::getPath('smiley_url', ''));
106 106
         $xoops_upload_file = Request::getArray('xoops_upload_file', array());
107 107
 
108 108
         $error_msg = '';
109 109
         if ($_FILES[$xoops_upload_file[0]]['error'] === 0) {
110
-            $uploader = new XoopsMediaUploader(\XoopsBaseConfig::get('uploads-path') . '/smilies', $mimetypes, $upload_size, null, null);
110
+            $uploader = new XoopsMediaUploader(\XoopsBaseConfig::get('uploads-path').'/smilies', $mimetypes, $upload_size, null, null);
111 111
             if ($uploader->fetchMedia($xoops_upload_file[0])) {
112 112
                 $uploader->setPrefix('smil');
113 113
                 if (!$uploader->upload()) {
114 114
                     $error_msg .= $uploader->getErrors();
115 115
                     $obj->setVar('smiley_url', 'blank.gif');
116 116
                 } else {
117
-                    $obj->setVar('smiley_url', 'smilies/' . $uploader->getSavedFileName());
117
+                    $obj->setVar('smiley_url', 'smilies/'.$uploader->getSavedFileName());
118 118
                 }
119 119
             }
120 120
         }
@@ -142,7 +142,7 @@  discard block
 block discarded – undo
142 142
             if (!$xoops->security()->check()) {
143 143
                 $xoops->redirect('smilies.php', 3, implode(',', $xoops->security()->getErrors()));
144 144
             }
145
-            $path_file = \XoopsBaseConfig::get('uploads-path') . '/' . $obj->getVar('smile_url');
145
+            $path_file = \XoopsBaseConfig::get('uploads-path').'/'.$obj->getVar('smile_url');
146 146
             if ($helper->getHandlerSmilies()->delete($obj)) {
147 147
                 if (is_file($path_file)) {
148 148
                     chmod($path_file, 0777);
@@ -156,7 +156,7 @@  discard block
 block discarded – undo
156 156
             $smilies_img = ($obj->getVar('smiley_url')) ? $obj->getVar('smiley_url') : 'blank.gif';
157 157
             echo $xoops->confirm(array(
158 158
                                  'ok' => 1, 'smiley_id' => $smiley_id, 'op' => 'del'
159
-                            ), \XoopsBaseConfig::get('url') . '/modules/smilies/admin/smilies.php', sprintf(_AM_SMILIES_SUREDEL) . '<br /><strong>' . $obj->getVar('smiley_emotion') . '</strong><br /><img src="' . \XoopsBaseConfig::get('uploads-url') . '/' . $smilies_img . '" alt="' . $obj->getVar('smiley_emotion') . '"><br />');
159
+                            ), \XoopsBaseConfig::get('url').'/modules/smilies/admin/smilies.php', sprintf(_AM_SMILIES_SUREDEL).'<br /><strong>'.$obj->getVar('smiley_emotion').'</strong><br /><img src="'.\XoopsBaseConfig::get('uploads-url').'/'.$smilies_img.'" alt="'.$obj->getVar('smiley_emotion').'"><br />');
160 160
         }
161 161
         break;
162 162
 
Please login to merge, or discard this patch.
htdocs/modules/smilies/xoops_version.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -48,7 +48,7 @@  discard block
 block discarded – undo
48 48
 // paypal
49 49
 $modversion['paypal'] = array(
50 50
     'business'      => '[email protected]',
51
-    'item_name'     => 'Donation : ' . _MI_SMILIES_DESC,
51
+    'item_name'     => 'Donation : '._MI_SMILIES_DESC,
52 52
     'amount'        => 0,
53 53
     'currency_code' => 'USD',
54 54
 );
@@ -70,7 +70,7 @@  discard block
 block discarded – undo
70 70
 
71 71
 // sql
72 72
 $modversion['schema']           = 'sql/schema.yml';
73
-$modversion['sqlfile']['mysql'] = 'sql/mysql.' . Xoops::getInstance()->getConfig('language') . '.sql';
73
+$modversion['sqlfile']['mysql'] = 'sql/mysql.'.Xoops::getInstance()->getConfig('language').'.sql';
74 74
 
75 75
 // Tables created by sql file (without prefix!)
76 76
 $modversion['tables'] = array(
Please login to merge, or discard this patch.
htdocs/modules/smilies/preloads/preload.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -34,7 +34,7 @@  discard block
 block discarded – undo
34 34
      */
35 35
     public static function eventCoreServiceLocateEmoji(Provider $provider)
36 36
     {
37
-        require dirname(__DIR__) . '/class/SmiliesProvider.php';
37
+        require dirname(__DIR__).'/class/SmiliesProvider.php';
38 38
         $provider->register(new SmiliesProvider());
39 39
     }
40 40
 
@@ -50,7 +50,7 @@  discard block
 block discarded – undo
50 50
     {
51 51
         $path = dirname(__DIR__);
52 52
         XoopsLoad::addMap(array(
53
-            'smilies' => $path . '/class/helper.php',
53
+            'smilies' => $path.'/class/helper.php',
54 54
         ));
55 55
     }
56 56
 }
Please login to merge, or discard this patch.
htdocs/modules/smilies/include/popup.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
  * @author          Mage Grégory (AKA Mage)
23 23
  */
24 24
 
25
-include dirname(dirname(dirname(__DIR__))) . '/mainfile.php';
25
+include dirname(dirname(dirname(__DIR__))).'/mainfile.php';
26 26
 
27 27
 $xoops = Xoops::getInstance();
28 28
 $xoops->logger()->quiet();
Please login to merge, or discard this patch.
htdocs/modules/smilies/language/english/admin.php 1 patch
Spacing   +23 added lines, -23 removed lines patch added patch discarded remove patch
@@ -19,32 +19,32 @@
 block discarded – undo
19 19
  * @author          Mage Grégory (AKA Mage)
20 20
  * @version         $Id$
21 21
  */
22
-define("_AM_SMILIES_ACTION","Action");
22
+define("_AM_SMILIES_ACTION", "Action");
23 23
 define("_AM_SMILIES_ADD", "Add a new smilie");
24
-define("_AM_SMILIES_CODE","Code");
25
-define("_AM_SMILIES_DELETE","Delete smilie");
26
-define("_AM_SMILIES_DELETED","Smilies deleted");
27
-define("_AM_SMILIES_DESCRIPTION","Description");
28
-define("_AM_SMILIES_DISPLAY","Display in form");
29
-define("_AM_SMILIES_EDIT","Edit smilie");
30
-define("_AM_SMILIES_FILE","Smilie file");
31
-define("_AM_SMILIES_IMAGE_PATH","Files exist in: %s");
24
+define("_AM_SMILIES_CODE", "Code");
25
+define("_AM_SMILIES_DELETE", "Delete smilie");
26
+define("_AM_SMILIES_DELETED", "Smilies deleted");
27
+define("_AM_SMILIES_DESCRIPTION", "Description");
28
+define("_AM_SMILIES_DISPLAY", "Display in form");
29
+define("_AM_SMILIES_EDIT", "Edit smilie");
30
+define("_AM_SMILIES_FILE", "Smilie file");
31
+define("_AM_SMILIES_IMAGE_PATH", "Files exist in: %s");
32 32
 define("_AM_SMILIES_LIST", "List of smilies");
33
-define("_AM_SMILIES_NBTOTAL","There are %s smilies in our database");
34
-define("_AM_SMILIES_NBDISPLAY","There are %s visible smilies");
35
-define("_AM_SMILIES_NBNOTDISPLAY","There are %s smilies not visible");
36
-define("_AM_SMILIES_OFF","Display in the form ");
37
-define("_AM_SMILIES_ON","Does not display in the form");
38
-define("_AM_SMILIES_SAVE","Smilie saved");
39
-define("_AM_SMILIES_SUREDEL","Are you sure you want to delete this smilie?");
40
-define("_AM_SMILIES_SMILIE","Smilie");
41
-define("_AM_SMILIES_UPLOADS","Upload");
33
+define("_AM_SMILIES_NBTOTAL", "There are %s smilies in our database");
34
+define("_AM_SMILIES_NBDISPLAY", "There are %s visible smilies");
35
+define("_AM_SMILIES_NBNOTDISPLAY", "There are %s smilies not visible");
36
+define("_AM_SMILIES_OFF", "Display in the form ");
37
+define("_AM_SMILIES_ON", "Does not display in the form");
38
+define("_AM_SMILIES_SAVE", "Smilie saved");
39
+define("_AM_SMILIES_SUREDEL", "Are you sure you want to delete this smilie?");
40
+define("_AM_SMILIES_SMILIE", "Smilie");
41
+define("_AM_SMILIES_UPLOADS", "Upload");
42 42
 
43 43
 // Alert
44
-define("_AM_SMILIES_ALERT_ERROR_TITLE","Errors");
45
-define("_AM_SMILIES_ALERT_INFO_TITLE","Information for uploads");
46
-define("_AM_SMILIES_ALERT_INFO_MAXFILE","Max uploaded files size: %s");
47
-define("_AM_SMILIES_ALERT_INFO_MIMETYPES","Authorized mime types: %s");
44
+define("_AM_SMILIES_ALERT_ERROR_TITLE", "Errors");
45
+define("_AM_SMILIES_ALERT_INFO_TITLE", "Information for uploads");
46
+define("_AM_SMILIES_ALERT_INFO_MAXFILE", "Max uploaded files size: %s");
47
+define("_AM_SMILIES_ALERT_INFO_MIMETYPES", "Authorized mime types: %s");
48 48
 
49 49
 // Tips
50
-define("_AM_SMILIES_TIPS","<ul><li>Add, update or delete smilies</li></ul>");
50
+define("_AM_SMILIES_TIPS", "<ul><li>Add, update or delete smilies</li></ul>");
Please login to merge, or discard this patch.
htdocs/modules/smilies/class/smiley.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -95,9 +95,9 @@
 block discarded – undo
95 95
         $criteria->setSort('smiley_id');
96 96
         $criteria->setOrder('ASC');
97 97
         $results = $this->getAll($criteria, false, $fetchAsObjects);
98
-        $uploadPath = \XoopsBaseConfig::get('uploads-url') . '/';
98
+        $uploadPath = \XoopsBaseConfig::get('uploads-url').'/';
99 99
         foreach ($results as $i => $smile) {
100
-            $results[$i]['smiley_url'] = $uploadPath . $smile['smiley_url'];
100
+            $results[$i]['smiley_url'] = $uploadPath.$smile['smiley_url'];
101 101
         }
102 102
 
103 103
         return $results;
Please login to merge, or discard this patch.
htdocs/modules/smilies/class/form/smilies.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -41,13 +41,13 @@
 block discarded – undo
41 41
         $this->addElement(new Xoops\Form\Text(_AM_SMILIES_DESCRIPTION, 'smiley_emotion', 4, 50, $obj->getVar('smiley_emotion')), true);
42 42
 
43 43
         $imgtray_img = new Xoops\Form\ElementTray(_AM_SMILIES_FILE, '<br />');
44
-        $imgpath_img = sprintf(_AM_SMILIES_IMAGE_PATH, $xoops->path('uploads/smilies') . '/');
44
+        $imgpath_img = sprintf(_AM_SMILIES_IMAGE_PATH, $xoops->path('uploads/smilies').'/');
45 45
         $imageselect_img = new Xoops\Form\Select($imgpath_img, 'smiley_url', $blank_img);
46 46
         \Xoops\Core\Lists\ImageFile::setOptionsArray($imageselect_img, $xoops->path('uploads/smilies'));
47 47
 
48
-        $imageselect_img->setExtra('onchange="showImgSelected(\'xo-smilies-img\', \'smiley_url\', \'smilies\', \'\', \'' . \XoopsBaseConfig::get('uploads-url') . '\' )"');
48
+        $imageselect_img->setExtra('onchange="showImgSelected(\'xo-smilies-img\', \'smiley_url\', \'smilies\', \'\', \''.\XoopsBaseConfig::get('uploads-url').'\' )"');
49 49
         $imgtray_img->addElement($imageselect_img, false);
50
-        $imgtray_img->addElement(new Xoops\Form\Label('', "<br /><img src='" . \XoopsBaseConfig::get('uploads-url') . "/smilies/" . $blank_img . "' name='image_img' id='xo-smilies-img' alt=''>"));
50
+        $imgtray_img->addElement(new Xoops\Form\Label('', "<br /><img src='".\XoopsBaseConfig::get('uploads-url')."/smilies/".$blank_img."' name='image_img' id='xo-smilies-img' alt=''>"));
51 51
 
52 52
         $fileseltray_img = new Xoops\Form\ElementTray('<br />', '<br /><br />');
53 53
         $fileseltray_img->addElement(new Xoops\Form\File(_AM_SMILIES_UPLOADS, 'smiley_url'), false);
Please login to merge, or discard this patch.
htdocs/modules/page/viewpage.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -48,11 +48,11 @@  discard block
 block discarded – undo
48 48
 
49 49
 // hits
50 50
 if ($view_content->getVar('content_author') != $uid && $view_content->getVar('content_dohits') != false) {
51
-    if (!isset( $_SESSION['page_hits' . $content_id] ) || isset( $_SESSION['page_hits' . $content_id] ) && ($_SESSION['page_hits' . $content_id]['content_time'] + $interval) <  time()) {
51
+    if (!isset($_SESSION['page_hits'.$content_id]) || isset($_SESSION['page_hits'.$content_id]) && ($_SESSION['page_hits'.$content_id]['content_time'] + $interval) < time()) {
52 52
         $hits = $view_content->getVar('content_hits') + 1;
53 53
         $view_content->setVar('content_hits', $hits);
54 54
         $content_Handler->insert($view_content);
55
-        $_SESSION['page_hits' . $content_id]['content_time'] = time();
55
+        $_SESSION['page_hits'.$content_id]['content_time'] = time();
56 56
     }
57 57
 }
58 58
 
@@ -70,7 +70,7 @@  discard block
 block discarded – undo
70 70
 // get token for rating
71 71
 $xoops->tpl()->assign('security', $xoops->security()->createToken());
72 72
 // Meta
73
-$xoops->tpl()->assign('xoops_pagetitle', strip_tags($view_content->getVar('content_title')  . ' - ' . $xoops->module->name()));
73
+$xoops->tpl()->assign('xoops_pagetitle', strip_tags($view_content->getVar('content_title').' - '.$xoops->module->name()));
74 74
 $xoops->theme()->addMeta('meta', 'description', strip_tags($view_content->getVar('content_mdescription')));
75 75
 $xoops->theme()->addMeta('meta', 'keywords', strip_tags($view_content->getVar('content_mkeyword')));
76 76
 $xoops->footer();
Please login to merge, or discard this patch.
htdocs/modules/page/admin/content.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -21,7 +21,7 @@  discard block
 block discarded – undo
21 21
  * @author          Mage Grégory (AKA Mage)
22 22
  * @version         $Id$
23 23
  */
24
-include __DIR__ . '/header.php';
24
+include __DIR__.'/header.php';
25 25
 
26 26
 // Call header
27 27
 $xoops->header('admin:page/page_admin_content.tpl');
@@ -130,7 +130,7 @@  discard block
 block discarded – undo
130 130
 
131 131
         if (preg_match('/^\d+$/', Request::getInt('content_weight', 0)) == false) {
132 132
             $error = true;
133
-            $error_message .= PageLocale::E_WEIGHT . '<br />';
133
+            $error_message .= PageLocale::E_WEIGHT.'<br />';
134 134
             $obj->setVar('content_weight', 0);
135 135
         } else {
136 136
             $obj->setVar('content_weight', Request::getInt('content_weight', 0));
@@ -150,7 +150,7 @@  discard block
 block discarded – undo
150 150
                     $tags = array();
151 151
                     $tags['MODULE_NAME'] = 'page';
152 152
                     $tags['ITEM_NAME'] = Request::getString('content_title', '');
153
-                    $tags['ITEM_URL'] = \XoopsBaseConfig::get('url') . '/modules/page/viewpage.php?id=' . $newcontent_id;
153
+                    $tags['ITEM_URL'] = \XoopsBaseConfig::get('url').'/modules/page/viewpage.php?id='.$newcontent_id;
154 154
                     $notification_handler->triggerEvent('global', 0, 'newcontent', $tags);
155 155
                     $notification_handler->triggerEvent('item', $newcontent_id, 'newcontent', $tags);
156 156
                 }
@@ -200,7 +200,7 @@  discard block
 block discarded – undo
200 200
                 array('ok' => 1, 'content_id' => $content_id, 'op' => 'delete'),
201 201
                 'content.php',
202 202
                 XoopsLocale::Q_ARE_YOU_SURE_YOU_WANT_TO_DELETE_THIS_ITEM
203
-                . '<br /><span class="red">' . $obj->getvar('content_title') . '<span>'
203
+                . '<br /><span class="red">'.$obj->getvar('content_title').'<span>'
204 204
             );
205 205
         }
206 206
         break;
Please login to merge, or discard this patch.