@@ -61,120 +61,120 @@ |
||
61 | 61 | } |
62 | 62 | |
63 | 63 | switch ($op) { |
64 | - case 'list': |
|
65 | - default: |
|
66 | - $xoops->tpl()->assign('uid', $xoops->user->getVar("uid")); |
|
67 | - $xoops->tpl()->assign('info_msg', $xoops->alert('info', $info_msg, XoopsLocale::INFORMATION_FOR_UPLOADS)); |
|
68 | - $oldavatar = $xoops->user->getVar('user_avatar'); |
|
69 | - if (!empty($oldavatar) && $oldavatar !== 'blank.gif') { |
|
70 | - $warning_msg = '<p>' . AvatarsLocale::ALERT_WARNING_OLD .'</p>'; |
|
71 | - $xoops_upload_url = \XoopsBaseConfig::get('uploads-url'); |
|
72 | - $warning_msg .= "<img src='" . $xoops_upload_url . '/' . $oldavatar ."' alt=' ' />"; |
|
73 | - $xoops->tpl()->assign('warning_msg', $xoops->alert('warning', $warning_msg, XoopsLocale::WARNING)); |
|
74 | - } |
|
64 | + case 'list': |
|
65 | + default: |
|
66 | + $xoops->tpl()->assign('uid', $xoops->user->getVar("uid")); |
|
67 | + $xoops->tpl()->assign('info_msg', $xoops->alert('info', $info_msg, XoopsLocale::INFORMATION_FOR_UPLOADS)); |
|
68 | + $oldavatar = $xoops->user->getVar('user_avatar'); |
|
69 | + if (!empty($oldavatar) && $oldavatar !== 'blank.gif') { |
|
70 | + $warning_msg = '<p>' . AvatarsLocale::ALERT_WARNING_OLD .'</p>'; |
|
71 | + $xoops_upload_url = \XoopsBaseConfig::get('uploads-url'); |
|
72 | + $warning_msg .= "<img src='" . $xoops_upload_url . '/' . $oldavatar ."' alt=' ' />"; |
|
73 | + $xoops->tpl()->assign('warning_msg', $xoops->alert('warning', $warning_msg, XoopsLocale::WARNING)); |
|
74 | + } |
|
75 | 75 | |
76 | - // Create form |
|
77 | - $obj = $avatar_Handler->create(); |
|
78 | - $form = $xoops->getModuleForm($obj, 'avatar_user', 'avatars'); |
|
79 | - // Assign form |
|
80 | - $xoops->tpl()->assign('form', $form->render()); |
|
81 | - break; |
|
76 | + // Create form |
|
77 | + $obj = $avatar_Handler->create(); |
|
78 | + $form = $xoops->getModuleForm($obj, 'avatar_user', 'avatars'); |
|
79 | + // Assign form |
|
80 | + $xoops->tpl()->assign('form', $form->render()); |
|
81 | + break; |
|
82 | 82 | |
83 | - case "save": |
|
84 | - // Check security |
|
85 | - if (!$xoops->security()->check()) { |
|
86 | - $xoops->redirect('/index.php', 3, implode('<br />', $xoops->security()->getErrors())); |
|
87 | - } |
|
88 | - $uid = Request::getInt('uid', 0); |
|
89 | - if (empty($uid) || $xoops->user->getVar('uid') != $uid) { |
|
90 | - $xoops->redirect('/index.php', 3, XoopsLocale::E_NO_ACCESS_PERMISSION); |
|
91 | - exit(); |
|
92 | - } |
|
93 | - $uploader_avatars_img = |
|
94 | - new XoopsMediaUploader(\XoopsBaseConfig::get('uploads-path') . '/avatars', $mimetypes, $upload_size, $width, $height); |
|
83 | + case "save": |
|
84 | + // Check security |
|
85 | + if (!$xoops->security()->check()) { |
|
86 | + $xoops->redirect('/index.php', 3, implode('<br />', $xoops->security()->getErrors())); |
|
87 | + } |
|
88 | + $uid = Request::getInt('uid', 0); |
|
89 | + if (empty($uid) || $xoops->user->getVar('uid') != $uid) { |
|
90 | + $xoops->redirect('/index.php', 3, XoopsLocale::E_NO_ACCESS_PERMISSION); |
|
91 | + exit(); |
|
92 | + } |
|
93 | + $uploader_avatars_img = |
|
94 | + new XoopsMediaUploader(\XoopsBaseConfig::get('uploads-path') . '/avatars', $mimetypes, $upload_size, $width, $height); |
|
95 | 95 | |
96 | - $obj = $avatar_Handler->create(); |
|
97 | - $error_msg = ''; |
|
98 | - if ($uploader_avatars_img->fetchMedia('user_avatar')) { |
|
99 | - $uploader_avatars_img->setPrefix('savt'); |
|
100 | - $uploader_avatars_img->fetchMedia('user_avatar'); |
|
101 | - if (!$uploader_avatars_img->upload()) { |
|
102 | - $error_msg .= $uploader_avatars_img->getErrors(); |
|
103 | - $obj->setVar('avatar_file', 'avatars/blank.gif'); |
|
104 | - } else { |
|
105 | - $obj->setVar('avatar_name', $xoops->user->getVar('uname')); |
|
106 | - $obj->setVar('avatar_mimetype', $uploader_avatars_img->getMediaType()); |
|
107 | - $obj->setVar('avatar_file', 'avatars/' . $uploader_avatars_img->getSavedFileName()); |
|
108 | - $obj->setVar('avatar_display', 1); |
|
109 | - $obj->setVar('avatar_type', 'C'); |
|
96 | + $obj = $avatar_Handler->create(); |
|
97 | + $error_msg = ''; |
|
98 | + if ($uploader_avatars_img->fetchMedia('user_avatar')) { |
|
99 | + $uploader_avatars_img->setPrefix('savt'); |
|
100 | + $uploader_avatars_img->fetchMedia('user_avatar'); |
|
101 | + if (!$uploader_avatars_img->upload()) { |
|
102 | + $error_msg .= $uploader_avatars_img->getErrors(); |
|
103 | + $obj->setVar('avatar_file', 'avatars/blank.gif'); |
|
104 | + } else { |
|
105 | + $obj->setVar('avatar_name', $xoops->user->getVar('uname')); |
|
106 | + $obj->setVar('avatar_mimetype', $uploader_avatars_img->getMediaType()); |
|
107 | + $obj->setVar('avatar_file', 'avatars/' . $uploader_avatars_img->getSavedFileName()); |
|
108 | + $obj->setVar('avatar_display', 1); |
|
109 | + $obj->setVar('avatar_type', 'C'); |
|
110 | 110 | |
111 | - if ($error_msg == '') { |
|
112 | - if ($avatar_Handler->insert($obj)) { |
|
113 | - $oldavatar = $xoops->user->getVar('user_avatar'); |
|
114 | - $criteria = new CriteriaCompo(); |
|
115 | - $criteria->add(new Criteria('avatar_type', 'C')); |
|
116 | - $criteria->add(new Criteria('avatar_file', $oldavatar)); |
|
117 | - $avatars = $avatar_Handler->getObjects($criteria); |
|
118 | - if (! empty($avatars) && count($avatars) == 1 && is_object($avatars[0])) { |
|
119 | - $avatar_Handler->delete($avatars[0]); |
|
120 | - $xoops_upload_path = \XoopsBaseConfig::get('uploads-path'); |
|
121 | - $oldavatar_path = realpath($xoops_upload_path . '/' . $oldavatar); |
|
122 | - if (0 === strpos($oldavatar_path, realpath($xoops_upload_path)) |
|
123 | - && is_file($oldavatar_path) |
|
124 | - ) { |
|
125 | - unlink($oldavatar_path); |
|
111 | + if ($error_msg == '') { |
|
112 | + if ($avatar_Handler->insert($obj)) { |
|
113 | + $oldavatar = $xoops->user->getVar('user_avatar'); |
|
114 | + $criteria = new CriteriaCompo(); |
|
115 | + $criteria->add(new Criteria('avatar_type', 'C')); |
|
116 | + $criteria->add(new Criteria('avatar_file', $oldavatar)); |
|
117 | + $avatars = $avatar_Handler->getObjects($criteria); |
|
118 | + if (! empty($avatars) && count($avatars) == 1 && is_object($avatars[0])) { |
|
119 | + $avatar_Handler->delete($avatars[0]); |
|
120 | + $xoops_upload_path = \XoopsBaseConfig::get('uploads-path'); |
|
121 | + $oldavatar_path = realpath($xoops_upload_path . '/' . $oldavatar); |
|
122 | + if (0 === strpos($oldavatar_path, realpath($xoops_upload_path)) |
|
123 | + && is_file($oldavatar_path) |
|
124 | + ) { |
|
125 | + unlink($oldavatar_path); |
|
126 | + } |
|
126 | 127 | } |
128 | + $sql = $xoops->db()->createXoopsQueryBuilder() |
|
129 | + ->updatePrefix('system_user') |
|
130 | + ->set('user_avatar', ':avatar') |
|
131 | + ->where('uid = :uid') |
|
132 | + ->setParameter(':uid', $xoops->user->getVar('uid'), ParameterType::INTEGER) |
|
133 | + ->setParameter( |
|
134 | + ':avatar', |
|
135 | + 'avatars/' . $uploader_avatars_img->getSavedFileName(), |
|
136 | + ParameterType::STRING |
|
137 | + ) |
|
138 | + ->execute(); |
|
139 | + $avatar_Handler->addUser($obj->getVar('avatar_id'), $xoops->user->getVar('uid')); |
|
140 | + $xoops->redirect($xoops->url('userinfo.php?uid=' . $uid), 2, XoopsLocale::S_ITEM_SAVED); |
|
127 | 141 | } |
128 | - $sql = $xoops->db()->createXoopsQueryBuilder() |
|
129 | - ->updatePrefix('system_user') |
|
130 | - ->set('user_avatar', ':avatar') |
|
131 | - ->where('uid = :uid') |
|
132 | - ->setParameter(':uid', $xoops->user->getVar('uid'), ParameterType::INTEGER) |
|
133 | - ->setParameter( |
|
134 | - ':avatar', |
|
135 | - 'avatars/' . $uploader_avatars_img->getSavedFileName(), |
|
136 | - ParameterType::STRING |
|
137 | - ) |
|
138 | - ->execute(); |
|
139 | - $avatar_Handler->addUser($obj->getVar('avatar_id'), $xoops->user->getVar('uid')); |
|
140 | - $xoops->redirect($xoops->url('userinfo.php?uid=' . $uid), 2, XoopsLocale::S_ITEM_SAVED); |
|
142 | + $error_msg .= $obj->getHtmlErrors(); |
|
141 | 143 | } |
142 | - $error_msg .= $obj->getHtmlErrors(); |
|
143 | 144 | } |
144 | - } |
|
145 | - } else { |
|
146 | - $user_avatar = Request::getString('user_avatar', 'blank.gif'); |
|
147 | - $oldavatar = $xoops->user->getVar('user_avatar'); |
|
148 | - $xoops->user->setVar('user_avatar', $user_avatar); |
|
149 | - $member_handler = $xoops->getHandlerMember(); |
|
150 | - if (!$member_handler->insertUser($xoops->user)) { |
|
151 | - echo $xoops->user->getHtmlErrors(); |
|
152 | - } |
|
153 | - $criteria = new CriteriaCompo(); |
|
154 | - $criteria->add(new Criteria('avatar_type', 'C')); |
|
155 | - $criteria->add(new Criteria('avatar_file', $oldavatar)); |
|
156 | - $avatars = $avatar_Handler->getObjects($criteria); |
|
157 | - if (!empty($avatars) && count($avatars) == 1 && is_object($avatars[0])) { |
|
158 | - $avatar_Handler->delete($avatars[0]); |
|
159 | - $xoops_upload_path = \XoopsBaseConfig::get('uploads-path'); |
|
160 | - $oldavatar_path = realpath($xoops_upload_path . '/' . $oldavatar); |
|
161 | - if (0 === strpos($oldavatar_path, realpath($xoops_upload_path)) && is_file($oldavatar_path)) { |
|
162 | - unlink($oldavatar_path); |
|
145 | + } else { |
|
146 | + $user_avatar = Request::getString('user_avatar', 'blank.gif'); |
|
147 | + $oldavatar = $xoops->user->getVar('user_avatar'); |
|
148 | + $xoops->user->setVar('user_avatar', $user_avatar); |
|
149 | + $member_handler = $xoops->getHandlerMember(); |
|
150 | + if (!$member_handler->insertUser($xoops->user)) { |
|
151 | + echo $xoops->user->getHtmlErrors(); |
|
163 | 152 | } |
164 | - } |
|
165 | - if ($user_avatar !== 'blank.gif') { |
|
166 | - $avatars = $avatar_Handler->getObjects(new Criteria('avatar_file', $user_avatar)); |
|
167 | - if (is_object($avatars[0])) { |
|
168 | - $avatar_Handler->addUser($avatars[0]->getVar('avatar_id'), $xoops->user->getVar('uid')); |
|
153 | + $criteria = new CriteriaCompo(); |
|
154 | + $criteria->add(new Criteria('avatar_type', 'C')); |
|
155 | + $criteria->add(new Criteria('avatar_file', $oldavatar)); |
|
156 | + $avatars = $avatar_Handler->getObjects($criteria); |
|
157 | + if (!empty($avatars) && count($avatars) == 1 && is_object($avatars[0])) { |
|
158 | + $avatar_Handler->delete($avatars[0]); |
|
159 | + $xoops_upload_path = \XoopsBaseConfig::get('uploads-path'); |
|
160 | + $oldavatar_path = realpath($xoops_upload_path . '/' . $oldavatar); |
|
161 | + if (0 === strpos($oldavatar_path, realpath($xoops_upload_path)) && is_file($oldavatar_path)) { |
|
162 | + unlink($oldavatar_path); |
|
163 | + } |
|
164 | + } |
|
165 | + if ($user_avatar !== 'blank.gif') { |
|
166 | + $avatars = $avatar_Handler->getObjects(new Criteria('avatar_file', $user_avatar)); |
|
167 | + if (is_object($avatars[0])) { |
|
168 | + $avatar_Handler->addUser($avatars[0]->getVar('avatar_id'), $xoops->user->getVar('uid')); |
|
169 | + } |
|
169 | 170 | } |
171 | + $xoops->redirect($xoops->url('userinfo.php?uid=' . $uid), 2, XoopsLocale::S_ITEM_SAVED); |
|
170 | 172 | } |
171 | - $xoops->redirect($xoops->url('userinfo.php?uid=' . $uid), 2, XoopsLocale::S_ITEM_SAVED); |
|
172 | - } |
|
173 | - $xoops->tpl()->assign('uid', $xoops->user->getVar("uid")); |
|
174 | - $xoops->tpl()->assign('info_msg', $xoops->alert('info', $info_msg, XoopsLocale::INFORMATION_FOR_UPLOADS)); |
|
175 | - $xoops->tpl()->assign('error_msg', $xoops->alert('error', $error_msg, XoopsLocale::ERRORS)); |
|
176 | - $form = $xoops->getModuleForm($obj, 'avatar_user'); |
|
177 | - $xoops->tpl()->assign('form', $form->render()); |
|
178 | - break; |
|
173 | + $xoops->tpl()->assign('uid', $xoops->user->getVar("uid")); |
|
174 | + $xoops->tpl()->assign('info_msg', $xoops->alert('info', $info_msg, XoopsLocale::INFORMATION_FOR_UPLOADS)); |
|
175 | + $xoops->tpl()->assign('error_msg', $xoops->alert('error', $error_msg, XoopsLocale::ERRORS)); |
|
176 | + $form = $xoops->getModuleForm($obj, 'avatar_user'); |
|
177 | + $xoops->tpl()->assign('form', $form->render()); |
|
178 | + break; |
|
179 | 179 | } |
180 | 180 | $xoops->footer(); |
@@ -22,7 +22,7 @@ discard block |
||
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 | $helper = $xoops->getModuleHelper('avatars'); |
@@ -67,9 +67,9 @@ discard block |
||
67 | 67 | $xoops->tpl()->assign('info_msg', $xoops->alert('info', $info_msg, XoopsLocale::INFORMATION_FOR_UPLOADS)); |
68 | 68 | $oldavatar = $xoops->user->getVar('user_avatar'); |
69 | 69 | if (!empty($oldavatar) && $oldavatar !== 'blank.gif') { |
70 | - $warning_msg = '<p>' . AvatarsLocale::ALERT_WARNING_OLD .'</p>'; |
|
70 | + $warning_msg = '<p>'.AvatarsLocale::ALERT_WARNING_OLD.'</p>'; |
|
71 | 71 | $xoops_upload_url = \XoopsBaseConfig::get('uploads-url'); |
72 | - $warning_msg .= "<img src='" . $xoops_upload_url . '/' . $oldavatar ."' alt=' ' />"; |
|
72 | + $warning_msg .= "<img src='".$xoops_upload_url.'/'.$oldavatar."' alt=' ' />"; |
|
73 | 73 | $xoops->tpl()->assign('warning_msg', $xoops->alert('warning', $warning_msg, XoopsLocale::WARNING)); |
74 | 74 | } |
75 | 75 | |
@@ -91,7 +91,7 @@ discard block |
||
91 | 91 | exit(); |
92 | 92 | } |
93 | 93 | $uploader_avatars_img = |
94 | - new XoopsMediaUploader(\XoopsBaseConfig::get('uploads-path') . '/avatars', $mimetypes, $upload_size, $width, $height); |
|
94 | + new XoopsMediaUploader(\XoopsBaseConfig::get('uploads-path').'/avatars', $mimetypes, $upload_size, $width, $height); |
|
95 | 95 | |
96 | 96 | $obj = $avatar_Handler->create(); |
97 | 97 | $error_msg = ''; |
@@ -104,7 +104,7 @@ discard block |
||
104 | 104 | } else { |
105 | 105 | $obj->setVar('avatar_name', $xoops->user->getVar('uname')); |
106 | 106 | $obj->setVar('avatar_mimetype', $uploader_avatars_img->getMediaType()); |
107 | - $obj->setVar('avatar_file', 'avatars/' . $uploader_avatars_img->getSavedFileName()); |
|
107 | + $obj->setVar('avatar_file', 'avatars/'.$uploader_avatars_img->getSavedFileName()); |
|
108 | 108 | $obj->setVar('avatar_display', 1); |
109 | 109 | $obj->setVar('avatar_type', 'C'); |
110 | 110 | |
@@ -115,10 +115,10 @@ discard block |
||
115 | 115 | $criteria->add(new Criteria('avatar_type', 'C')); |
116 | 116 | $criteria->add(new Criteria('avatar_file', $oldavatar)); |
117 | 117 | $avatars = $avatar_Handler->getObjects($criteria); |
118 | - if (! empty($avatars) && count($avatars) == 1 && is_object($avatars[0])) { |
|
118 | + if (!empty($avatars) && count($avatars) == 1 && is_object($avatars[0])) { |
|
119 | 119 | $avatar_Handler->delete($avatars[0]); |
120 | 120 | $xoops_upload_path = \XoopsBaseConfig::get('uploads-path'); |
121 | - $oldavatar_path = realpath($xoops_upload_path . '/' . $oldavatar); |
|
121 | + $oldavatar_path = realpath($xoops_upload_path.'/'.$oldavatar); |
|
122 | 122 | if (0 === strpos($oldavatar_path, realpath($xoops_upload_path)) |
123 | 123 | && is_file($oldavatar_path) |
124 | 124 | ) { |
@@ -132,12 +132,12 @@ discard block |
||
132 | 132 | ->setParameter(':uid', $xoops->user->getVar('uid'), ParameterType::INTEGER) |
133 | 133 | ->setParameter( |
134 | 134 | ':avatar', |
135 | - 'avatars/' . $uploader_avatars_img->getSavedFileName(), |
|
135 | + 'avatars/'.$uploader_avatars_img->getSavedFileName(), |
|
136 | 136 | ParameterType::STRING |
137 | 137 | ) |
138 | 138 | ->execute(); |
139 | 139 | $avatar_Handler->addUser($obj->getVar('avatar_id'), $xoops->user->getVar('uid')); |
140 | - $xoops->redirect($xoops->url('userinfo.php?uid=' . $uid), 2, XoopsLocale::S_ITEM_SAVED); |
|
140 | + $xoops->redirect($xoops->url('userinfo.php?uid='.$uid), 2, XoopsLocale::S_ITEM_SAVED); |
|
141 | 141 | } |
142 | 142 | $error_msg .= $obj->getHtmlErrors(); |
143 | 143 | } |
@@ -157,7 +157,7 @@ discard block |
||
157 | 157 | if (!empty($avatars) && count($avatars) == 1 && is_object($avatars[0])) { |
158 | 158 | $avatar_Handler->delete($avatars[0]); |
159 | 159 | $xoops_upload_path = \XoopsBaseConfig::get('uploads-path'); |
160 | - $oldavatar_path = realpath($xoops_upload_path . '/' . $oldavatar); |
|
160 | + $oldavatar_path = realpath($xoops_upload_path.'/'.$oldavatar); |
|
161 | 161 | if (0 === strpos($oldavatar_path, realpath($xoops_upload_path)) && is_file($oldavatar_path)) { |
162 | 162 | unlink($oldavatar_path); |
163 | 163 | } |
@@ -168,7 +168,7 @@ discard block |
||
168 | 168 | $avatar_Handler->addUser($avatars[0]->getVar('avatar_id'), $xoops->user->getVar('uid')); |
169 | 169 | } |
170 | 170 | } |
171 | - $xoops->redirect($xoops->url('userinfo.php?uid=' . $uid), 2, XoopsLocale::S_ITEM_SAVED); |
|
171 | + $xoops->redirect($xoops->url('userinfo.php?uid='.$uid), 2, XoopsLocale::S_ITEM_SAVED); |
|
172 | 172 | } |
173 | 173 | $xoops->tpl()->assign('uid', $xoops->user->getVar("uid")); |
174 | 174 | $xoops->tpl()->assign('info_msg', $xoops->alert('info', $info_msg, XoopsLocale::INFORMATION_FOR_UPLOADS)); |
@@ -51,7 +51,7 @@ discard block |
||
51 | 51 | while ($userinfo = $result->fetch(FetchMode::ASSOCIATIVE)) { |
52 | 52 | $response = $xoops->service("Avatar")->getAvatarUrl($userinfo); |
53 | 53 | $avatar = $response->getValue(); |
54 | - $avatar = empty($avatar) ? \XoopsBaseConfig::get('uploads-url') . '/blank.gif' : $avatar; |
|
54 | + $avatar = empty($avatar) ? \XoopsBaseConfig::get('uploads-url').'/blank.gif' : $avatar; |
|
55 | 55 | if ($prev_caption != $userinfo['groupname']) { |
56 | 56 | $prev_caption = $userinfo['groupname']; |
57 | 57 | $block['groups'][$i]['name'] = $myts->htmlSpecialChars($userinfo['groupname']); |
@@ -60,7 +60,7 @@ discard block |
||
60 | 60 | $block['groups'][$i]['users'][] = array( |
61 | 61 | 'id' => $userinfo['uid'], |
62 | 62 | 'name' => $myts->htmlSpecialChars($userinfo['uname']), |
63 | - 'pm_link' => \XoopsBaseConfig::get('url') . "/pmlite.php?send2=1&to_userid=" . $userinfo['uid'], |
|
63 | + 'pm_link' => \XoopsBaseConfig::get('url')."/pmlite.php?send2=1&to_userid=".$userinfo['uid'], |
|
64 | 64 | 'avatar' => $avatar |
65 | 65 | ); |
66 | 66 | } else { |
@@ -84,8 +84,8 @@ discard block |
||
84 | 84 | } else { |
85 | 85 | $block['showgroups'] = false; |
86 | 86 | } |
87 | - $block['logourl'] = \XoopsBaseConfig::get('url') . '/images/' . $options[2]; |
|
88 | - $block['recommendlink'] = "<a href=\"javascript:openWithSelfMain('" . \XoopsBaseConfig::get('url') . "/misc.php?action=showpopups&type=friend&op=sendform&t=" . time() . "','friend'," . $options[0] . "," . $options[1] . ")\">" . SystemLocale::RECOMMEND_US . "</a>"; |
|
87 | + $block['logourl'] = \XoopsBaseConfig::get('url').'/images/'.$options[2]; |
|
88 | + $block['recommendlink'] = "<a href=\"javascript:openWithSelfMain('".\XoopsBaseConfig::get('url')."/misc.php?action=showpopups&type=friend&op=sendform&t=".time()."','friend',".$options[0].",".$options[1].")\">".SystemLocale::RECOMMEND_US."</a>"; |
|
89 | 89 | return $block; |
90 | 90 | } |
91 | 91 | |
@@ -94,7 +94,7 @@ discard block |
||
94 | 94 | $block_form = new Xoops\Form\BlockForm(); |
95 | 95 | $block_form->addElement(new Xoops\Form\Text(SystemLocale::POPUP_WINDOW_WIDTH, 'options[0]', 1, 3, $options[0]), true); |
96 | 96 | $block_form->addElement(new Xoops\Form\Text(SystemLocale::POPUP_WINDOW_HEIGHT, 'options[1]', 1, 3, $options[1]), true); |
97 | - $block_form->addElement(new Xoops\Form\Text(sprintf(SystemLocale::F_LOGO_IMAGE_FILE_IS_LOCATED_UNDER, \XoopsBaseConfig::get('url') . "/images/"), 'options[2]', 5, 100, $options[2]), true); |
|
97 | + $block_form->addElement(new Xoops\Form\Text(sprintf(SystemLocale::F_LOGO_IMAGE_FILE_IS_LOCATED_UNDER, \XoopsBaseConfig::get('url')."/images/"), 'options[2]', 5, 100, $options[2]), true); |
|
98 | 98 | $block_form->addElement(new Xoops\Form\RadioYesNo(SystemLocale::SHOW_ADMIN_GROUPS, 'options[3]', $options[3])); |
99 | 99 | return $block_form->render(); |
100 | 100 | } |
@@ -44,7 +44,7 @@ discard block |
||
44 | 44 | */ |
45 | 45 | public function search($queryArray, $andor, $limit, $offset, $userid) |
46 | 46 | { |
47 | - $andor = strtolower($andor)==='and' ? 'and' : 'or'; |
|
47 | + $andor = strtolower($andor) === 'and' ? 'and' : 'or'; |
|
48 | 48 | |
49 | 49 | $qb = \Xoops::getInstance()->db()->createXoopsQueryBuilder(); |
50 | 50 | $eb = $qb->expr(); |
@@ -57,8 +57,8 @@ discard block |
||
57 | 57 | if (is_array($queryArray) && !empty($queryArray)) { |
58 | 58 | $queryParts = array(); |
59 | 59 | foreach ($queryArray as $i => $q) { |
60 | - $qterm = ':qterm' . $i; |
|
61 | - $qb->setParameter($qterm, '%' . $q . '%', ParameterType::STRING); |
|
60 | + $qterm = ':qterm'.$i; |
|
61 | + $qb->setParameter($qterm, '%'.$q.'%', ParameterType::STRING); |
|
62 | 62 | $queryParts[] = $eb -> orX( |
63 | 63 | $eb->like('content_title', $qterm), |
64 | 64 | $eb->like('content_text', $qterm), |
@@ -71,7 +71,7 @@ discard block |
||
71 | 71 | $qb->andWhere(call_user_func_array(array($eb, "orX"), $queryParts)); |
72 | 72 | } |
73 | 73 | } else { |
74 | - $qb->setParameter(':uid', (int) $userid, ParameterType::INTEGER); |
|
74 | + $qb->setParameter(':uid', (int)$userid, ParameterType::INTEGER); |
|
75 | 75 | $qb->andWhere($eb->eq('content_author', ':uid')); |
76 | 76 | } |
77 | 77 | |
@@ -79,12 +79,12 @@ discard block |
||
79 | 79 | $items = array(); |
80 | 80 | $result = $qb->execute(); |
81 | 81 | while ($myrow = $result->fetch(FetchMode::ASSOCIATIVE)) { |
82 | - $content = $myrow["content_shorttext"] . "<br /><br />" . $myrow["content_text"]; |
|
82 | + $content = $myrow["content_shorttext"]."<br /><br />".$myrow["content_text"]; |
|
83 | 83 | $content = $myts->displayTarea($content); |
84 | 84 | $items[] = array( |
85 | 85 | 'title' => $myrow['content_title'], |
86 | 86 | 'content' => Metagen::getSearchSummary($content, $queryArray), |
87 | - 'link' => "viewpage.php?id=" . $myrow["content_id"], |
|
87 | + 'link' => "viewpage.php?id=".$myrow["content_id"], |
|
88 | 88 | 'time' => $myrow['content_create'], |
89 | 89 | 'uid' => $myrow['content_author'], |
90 | 90 | 'image' => 'images/logo_small.png', |
@@ -31,23 +31,23 @@ |
||
31 | 31 | function xoops_module_install_smilies(&$module) |
32 | 32 | { |
33 | 33 | $data = array( |
34 | - array(':-D', 'smilies/smil3dbd4d4e4c4f2.gif', 'Very Happy', 1), |
|
35 | - array(':-)', 'smilies/smil3dbd4d6422f04.gif', 'Smile', 1), |
|
36 | - array(':-(', 'smilies/smil3dbd4d75edb5e.gif', 'Sad', 1), |
|
37 | - array(':-o', 'smilies/smil3dbd4d8676346.gif', 'Surprised', 1), |
|
38 | - array(':-?', 'smilies/smil3dbd4d99c6eaa.gif', 'Confused', 1), |
|
39 | - array('8-)', 'smilies/smil3dbd4daabd491.gif', 'Cool', 1), |
|
40 | - array(':lol:', 'smilies/smil3dbd4dbc14f3f.gif', 'Laughing', 1), |
|
41 | - array(':-x', 'smilies/smil3dbd4dcd7b9f4.gif', 'Mad', 1), |
|
42 | - array(':-P', 'smilies/smil3dbd4ddd6835f.gif', 'Razz', 1), |
|
43 | - array(':oops:', 'smilies/smil3dbd4df1944ee.gif', 'Embaressed', 0), |
|
44 | - array(':cry:', 'smilies/smil3dbd4e02c5440.gif', 'Crying (very sad)', 0), |
|
45 | - array(':evil:', 'smilies/smil3dbd4e1748cc9.gif', 'Evil or Very Mad', 0), |
|
46 | - array(':roll:', 'smilies/smil3dbd4e29bbcc7.gif', 'Rolling Eyes', 0), |
|
47 | - array(';-)', 'smilies/smil3dbd4e398ff7b.gif', 'Wink', 0), |
|
48 | - array(':pint:', 'smilies/smil3dbd4e4c2e742.gif', 'Another pint of beer', 0), |
|
49 | - array(':hammer:', 'smilies/smil3dbd4e5e7563a.gif', 'ToolTimes at work', 0), |
|
50 | - array(':idea:', 'smilies/smil3dbd4e7853679.gif', 'I have an idea', 0), |
|
34 | + array(':-D', 'smilies/smil3dbd4d4e4c4f2.gif', 'Very Happy', 1), |
|
35 | + array(':-)', 'smilies/smil3dbd4d6422f04.gif', 'Smile', 1), |
|
36 | + array(':-(', 'smilies/smil3dbd4d75edb5e.gif', 'Sad', 1), |
|
37 | + array(':-o', 'smilies/smil3dbd4d8676346.gif', 'Surprised', 1), |
|
38 | + array(':-?', 'smilies/smil3dbd4d99c6eaa.gif', 'Confused', 1), |
|
39 | + array('8-)', 'smilies/smil3dbd4daabd491.gif', 'Cool', 1), |
|
40 | + array(':lol:', 'smilies/smil3dbd4dbc14f3f.gif', 'Laughing', 1), |
|
41 | + array(':-x', 'smilies/smil3dbd4dcd7b9f4.gif', 'Mad', 1), |
|
42 | + array(':-P', 'smilies/smil3dbd4ddd6835f.gif', 'Razz', 1), |
|
43 | + array(':oops:', 'smilies/smil3dbd4df1944ee.gif', 'Embaressed', 0), |
|
44 | + array(':cry:', 'smilies/smil3dbd4e02c5440.gif', 'Crying (very sad)', 0), |
|
45 | + array(':evil:', 'smilies/smil3dbd4e1748cc9.gif', 'Evil or Very Mad', 0), |
|
46 | + array(':roll:', 'smilies/smil3dbd4e29bbcc7.gif', 'Rolling Eyes', 0), |
|
47 | + array(';-)', 'smilies/smil3dbd4e398ff7b.gif', 'Wink', 0), |
|
48 | + array(':pint:', 'smilies/smil3dbd4e4c2e742.gif', 'Another pint of beer', 0), |
|
49 | + array(':hammer:', 'smilies/smil3dbd4e5e7563a.gif', 'ToolTimes at work', 0), |
|
50 | + array(':idea:', 'smilies/smil3dbd4e7853679.gif', 'I have an idea', 0), |
|
51 | 51 | ); |
52 | 52 | $types = array(ParameterType::STRING, ParameterType::STRING, ParameterType::STRING, ParameterType::INTEGER); |
53 | 53 | $db = \Xoops::getInstance()->db(); |
@@ -22,7 +22,7 @@ |
||
22 | 22 | use XoopsModules\Publisher; |
23 | 23 | use Doctrine\DBAL\FetchMode; |
24 | 24 | |
25 | -require_once __DIR__ . '/admin_header.php'; |
|
25 | +require_once __DIR__.'/admin_header.php'; |
|
26 | 26 | |
27 | 27 | $xoops = Xoops::getInstance(); |
28 | 28 | $myts = Sanitizer::getInstance(); |
@@ -29,7 +29,7 @@ discard block |
||
29 | 29 | * @author trabis <[email protected]> |
30 | 30 | * @author The SmartFactory <www.smartfactory.ca> |
31 | 31 | */ |
32 | -require_once \dirname(__DIR__) . '/include/common.php'; |
|
32 | +require_once \dirname(__DIR__).'/include/common.php'; |
|
33 | 33 | |
34 | 34 | /** |
35 | 35 | * Class PermissionHandler |
@@ -164,7 +164,7 @@ discard block |
||
164 | 164 | // Save the new permissions |
165 | 165 | if (\count($groups) > 0) { |
166 | 166 | foreach ($groups as $group_id) { |
167 | - echo $group_id . '-'; |
|
167 | + echo $group_id.'-'; |
|
168 | 168 | echo $gpermHandler->addRight($perm_name, $itemid, $group_id, $module_id); |
169 | 169 | } |
170 | 170 | } |
@@ -655,9 +655,9 @@ |
||
655 | 655 | 'c.parentid', |
656 | 656 | 'ASC' |
657 | 657 | )->addOrderBy( |
658 | - 'i.categoryid', |
|
659 | - 'ASC' |
|
660 | - ); |
|
658 | + 'i.categoryid', |
|
659 | + 'ASC' |
|
660 | + ); |
|
661 | 661 | if ((int)$cat_id > 0) { |
662 | 662 | $qb->andWhere($qb->expr()->eq('i.categoryid', ':catid'))->setParameter(':catid', $cat_id, ParameterType::INTEGER); |
663 | 663 | } |
@@ -32,7 +32,7 @@ discard block |
||
32 | 32 | * @author trabis <[email protected]> |
33 | 33 | * @author The SmartFactory <www.smartfactory.ca> |
34 | 34 | */ |
35 | -require_once \dirname(__DIR__) . '/include/common.php'; |
|
35 | +require_once \dirname(__DIR__).'/include/common.php'; |
|
36 | 36 | |
37 | 37 | /** |
38 | 38 | * Items handler class. |
@@ -210,7 +210,7 @@ discard block |
||
210 | 210 | // Categories for which user has access |
211 | 211 | $categoriesGranted = $this->helper->getPermissionHandler()->getGrantedItems('category_read'); |
212 | 212 | if (!empty($categoriesGranted)) { |
213 | - $grantedCategories = new Criteria('categoryid', '(' . \implode(',', $categoriesGranted) . ')', 'IN'); |
|
213 | + $grantedCategories = new Criteria('categoryid', '('.\implode(',', $categoriesGranted).')', 'IN'); |
|
214 | 214 | $criteriaPermissions->add($grantedCategories, 'AND'); |
215 | 215 | } else { |
216 | 216 | return 0; |
@@ -357,7 +357,7 @@ discard block |
||
357 | 357 | // Categories for which user has access |
358 | 358 | $categoriesGranted = $this->helper->getPermissionHandler()->getGrantedItems('category_read'); |
359 | 359 | if (!empty($categoriesGranted)) { |
360 | - $grantedCategories = new Criteria('categoryid', '(' . \implode(',', $categoriesGranted) . ')', 'IN'); |
|
360 | + $grantedCategories = new Criteria('categoryid', '('.\implode(',', $categoriesGranted).')', 'IN'); |
|
361 | 361 | $criteriaPermissions->add($grantedCategories, 'AND'); |
362 | 362 | } else { |
363 | 363 | return []; |
@@ -495,7 +495,7 @@ discard block |
||
495 | 495 | if (\is_array($userid) && \count($userid) > 0) { |
496 | 496 | $userid = \array_map('\intval', $userid); |
497 | 497 | $criteriaUser = new CriteriaCompo(); |
498 | - $criteriaUser->add(new Criteria('uid', '(' . \implode(',', $userid) . ')', 'IN'), 'OR'); |
|
498 | + $criteriaUser->add(new Criteria('uid', '('.\implode(',', $userid).')', 'IN'), 'OR'); |
|
499 | 499 | } elseif (\is_numeric($userid) && $userid > 0) { |
500 | 500 | $criteriaUser = new CriteriaCompo(); |
501 | 501 | $criteriaUser->add(new Criteria('uid', $userid), 'OR'); |
@@ -506,19 +506,19 @@ discard block |
||
506 | 506 | foreach ($queryarray as $iValue) { |
507 | 507 | $criteriaKeyword = new CriteriaCompo(); |
508 | 508 | if (\in_array('title', $searchin)) { |
509 | - $criteriaKeyword->add(new Criteria('title', '%' . $iValue . '%', 'LIKE'), 'OR'); |
|
509 | + $criteriaKeyword->add(new Criteria('title', '%'.$iValue.'%', 'LIKE'), 'OR'); |
|
510 | 510 | } |
511 | 511 | if (\in_array('subtitle', $searchin)) { |
512 | - $criteriaKeyword->add(new Criteria('subtitle', '%' . $iValue . '%', 'LIKE'), 'OR'); |
|
512 | + $criteriaKeyword->add(new Criteria('subtitle', '%'.$iValue.'%', 'LIKE'), 'OR'); |
|
513 | 513 | } |
514 | 514 | if (\in_array('body', $searchin)) { |
515 | - $criteriaKeyword->add(new Criteria('body', '%' . $iValue . '%', 'LIKE'), 'OR'); |
|
515 | + $criteriaKeyword->add(new Criteria('body', '%'.$iValue.'%', 'LIKE'), 'OR'); |
|
516 | 516 | } |
517 | 517 | if (\in_array('summary', $searchin)) { |
518 | - $criteriaKeyword->add(new Criteria('summary', '%' . $iValue . '%', 'LIKE'), 'OR'); |
|
518 | + $criteriaKeyword->add(new Criteria('summary', '%'.$iValue.'%', 'LIKE'), 'OR'); |
|
519 | 519 | } |
520 | 520 | if (\in_array('meta_keywords', $searchin)) { |
521 | - $criteriaKeyword->add(new Criteria('meta_keywords', '%' . $iValue . '%', 'LIKE'), 'OR'); |
|
521 | + $criteriaKeyword->add(new Criteria('meta_keywords', '%'.$iValue.'%', 'LIKE'), 'OR'); |
|
522 | 522 | } |
523 | 523 | $criteriaKeywords->add($criteriaKeyword, $andor); |
524 | 524 | unset($criteriaKeyword); |
@@ -534,11 +534,11 @@ discard block |
||
534 | 534 | if (0 == \count($categoriesGranted)) { |
535 | 535 | return $ret; |
536 | 536 | } |
537 | - $grantedCategories = new Criteria('categoryid', '(' . \implode(',', $categoriesGranted) . ')', 'IN'); |
|
537 | + $grantedCategories = new Criteria('categoryid', '('.\implode(',', $categoriesGranted).')', 'IN'); |
|
538 | 538 | $criteriaPermissions->add($grantedCategories, 'AND'); |
539 | 539 | } elseif (\count($categories) > 0) { |
540 | 540 | $criteriaPermissions = new CriteriaCompo(); |
541 | - $grantedCategories = new Criteria('categoryid', '(' . \implode(',', $categories) . ')', 'IN'); |
|
541 | + $grantedCategories = new Criteria('categoryid', '('.\implode(',', $categories).')', 'IN'); |
|
542 | 542 | $criteriaPermissions->add($grantedCategories, 'AND'); |
543 | 543 | } |
544 | 544 | $criteriaItemsStatus = new CriteriaCompo(); |
@@ -603,7 +603,7 @@ discard block |
||
603 | 603 | |
604 | 604 | $subqb = $this->db2->createXoopsQueryBuilder(); |
605 | 605 | $subqb->select('categoryid', 'MAX(datesub) AS date')->fromPrefix('publisher_items', '')->where($subqb->expr()->in('status', $status))->andWhere($subqb->expr()->in('categoryid', $catIds))->groupBy('categoryid'); |
606 | - $subquery = '(' . $subqb->getSQL() . ')'; |
|
606 | + $subquery = '('.$subqb->getSQL().')'; |
|
607 | 607 | |
608 | 608 | $qb->from($subquery, 'mo')->joinPrefix('mo', 'publisher_items', 'mi', 'mi.datesub = mo.date'); |
609 | 609 | |
@@ -626,7 +626,7 @@ discard block |
||
626 | 626 | */ |
627 | 627 | public function countArticlesByCat($parentid, &$catsCount, $spaces = '', $resultCatCounts = []): int |
628 | 628 | { |
629 | - $newspaces = $spaces . '--'; |
|
629 | + $newspaces = $spaces.'--'; |
|
630 | 630 | $thecount = 0; |
631 | 631 | foreach ($catsCount[$parentid] as $subCatId => $count) { |
632 | 632 | $thecount = $thecount + $count; |
@@ -63,9 +63,9 @@ discard block |
||
63 | 63 | */ |
64 | 64 | public function getUserRank(Response $response, $userinfo) |
65 | 65 | { |
66 | - $uid = isset($userinfo['uid']) ? (int) $userinfo['uid'] : null; |
|
67 | - $posts = isset($userinfo['posts']) ? (int) $userinfo['posts'] : null; |
|
68 | - $rank = isset($userinfo['rank']) ? (int) $userinfo['rank'] : null; |
|
66 | + $uid = isset($userinfo['uid']) ? (int)$userinfo['uid'] : null; |
|
67 | + $posts = isset($userinfo['posts']) ? (int)$userinfo['posts'] : null; |
|
68 | + $rank = isset($userinfo['rank']) ? (int)$userinfo['rank'] : null; |
|
69 | 69 | if ($uid === null || $posts === null || $rank === null) { |
70 | 70 | $response->setSuccess(false)->addErrorMessage('User info is invalid'); |
71 | 71 | return; |
@@ -91,8 +91,8 @@ discard block |
||
91 | 91 | $rank = $result->fetch(FetchMode::ASSOCIATIVE); |
92 | 92 | |
93 | 93 | $rank['title'] = isset($rank['title']) ? $myts->htmlSpecialChars($rank['title']) : ''; |
94 | - $rank['image'] = \XoopsBaseConfig::get('uploads-url') . |
|
95 | - (isset($rank['image']) ? '/' . $rank['image'] : '/blank.gif'); |
|
94 | + $rank['image'] = \XoopsBaseConfig::get('uploads-url'). |
|
95 | + (isset($rank['image']) ? '/'.$rank['image'] : '/blank.gif'); |
|
96 | 96 | |
97 | 97 | $response->setValue($rank); |
98 | 98 | } |
@@ -101,7 +101,7 @@ discard block |
||
101 | 101 | // if an error occurs before a locale is established, |
102 | 102 | // we still need messages, so check and deal with it |
103 | 103 | |
104 | - $msg = ': ' . sprintf( |
|
104 | + $msg = ': '.sprintf( |
|
105 | 105 | (class_exists('\XoopsLocale', false) ? \XoopsLocale::EF_LOGGER_FILELINE : "%s in file %s line %s"), |
106 | 106 | $this->sanitizePath($errorString), |
107 | 107 | $this->sanitizePath($errorFile), |
@@ -110,23 +110,23 @@ discard block |
||
110 | 110 | |
111 | 111 | switch ($errorNumber) { |
112 | 112 | case E_USER_NOTICE: |
113 | - $msg = (class_exists('\XoopsLocale', false) ? \XoopsLocale::E_LOGGER_ERROR : '*Error:') . $msg; |
|
113 | + $msg = (class_exists('\XoopsLocale', false) ? \XoopsLocale::E_LOGGER_ERROR : '*Error:').$msg; |
|
114 | 114 | $this->log(LogLevel::NOTICE, $msg); |
115 | 115 | break; |
116 | 116 | case E_NOTICE: |
117 | - $msg = (class_exists('\XoopsLocale', false) ? \XoopsLocale::E_LOGGER_NOTICE : '*Notice:') . $msg; |
|
117 | + $msg = (class_exists('\XoopsLocale', false) ? \XoopsLocale::E_LOGGER_NOTICE : '*Notice:').$msg; |
|
118 | 118 | $this->log(LogLevel::NOTICE, $msg); |
119 | 119 | break; |
120 | 120 | case E_WARNING: |
121 | - $msg = (class_exists('\XoopsLocale', false) ? \XoopsLocale::E_LOGGER_WARNING : '*Warning:') . $msg; |
|
121 | + $msg = (class_exists('\XoopsLocale', false) ? \XoopsLocale::E_LOGGER_WARNING : '*Warning:').$msg; |
|
122 | 122 | $this->log(LogLevel::WARNING, $msg); |
123 | 123 | break; |
124 | 124 | case E_STRICT: |
125 | - $msg = (class_exists('\XoopsLocale', false) ? \XoopsLocale::E_LOGGER_STRICT : '*Strict:') . $msg; |
|
125 | + $msg = (class_exists('\XoopsLocale', false) ? \XoopsLocale::E_LOGGER_STRICT : '*Strict:').$msg; |
|
126 | 126 | $this->log(LogLevel::WARNING, $msg); |
127 | 127 | break; |
128 | 128 | case E_USER_ERROR: |
129 | - $msg = (class_exists('\XoopsLocale', false) ? \XoopsLocale::E_LOGGER_ERROR : '*Error:') . $msg; |
|
129 | + $msg = (class_exists('\XoopsLocale', false) ? \XoopsLocale::E_LOGGER_ERROR : '*Error:').$msg; |
|
130 | 130 | @$this->log(LogLevel::CRITICAL, $msg); |
131 | 131 | break; |
132 | 132 | case E_USER_DEPRECATED: |
@@ -134,7 +134,7 @@ discard block |
||
134 | 134 | \Xoops::getInstance()->events()->triggerEvent('core.deprecated', array($msg)); |
135 | 135 | break; |
136 | 136 | default: |
137 | - $msg = $this->getReadableErrorType($errorNumber) . $msg; |
|
137 | + $msg = $this->getReadableErrorType($errorNumber).$msg; |
|
138 | 138 | $this->log(LogLevel::ERROR, $msg); |
139 | 139 | break; |
140 | 140 | } |
@@ -157,7 +157,7 @@ discard block |
||
157 | 157 | } |
158 | 158 | } |
159 | 159 | } else { |
160 | - echo "<div style='color:#f0f0f0;background-color:#f0f0f0'>" . _XOOPS_FATAL_BACKTRACE . ":<br />"; |
|
160 | + echo "<div style='color:#f0f0f0;background-color:#f0f0f0'>"._XOOPS_FATAL_BACKTRACE.":<br />"; |
|
161 | 161 | foreach ($trace as $step) { |
162 | 162 | if (isset($step['file'])) { |
163 | 163 | printf("%s (%d)\n<br />", $this->sanitizePath($step['file']), $step['line']); |
@@ -239,7 +239,7 @@ discard block |
||
239 | 239 | */ |
240 | 240 | private function reportFatalError($msg) |
241 | 241 | { |
242 | - $msg=$this->sanitizePath($msg); |
|
242 | + $msg = $this->sanitizePath($msg); |
|
243 | 243 | if ('cli' === php_sapi_name()) { |
244 | 244 | fprintf(STDERR, "\nError : %s\n", $msg); |
245 | 245 | } else { |
@@ -262,18 +262,18 @@ discard block |
||
262 | 262 | public function sanitizePath($message) |
263 | 263 | { |
264 | 264 | $cleaners = [ |
265 | - ['\\', '/',], |
|
266 | - [\XoopsBaseConfig::get('var-path'), 'VAR',], |
|
267 | - [str_replace('\\', '/', realpath(\XoopsBaseConfig::get('var-path'))), 'VAR',], |
|
268 | - [\XoopsBaseConfig::get('lib-path'), 'LIB',], |
|
269 | - [str_replace('\\', '/', realpath(\XoopsBaseConfig::get('lib-path'))), 'LIB',], |
|
270 | - [\XoopsBaseConfig::get('root-path'), 'ROOT',], |
|
271 | - [str_replace('\\', '/', realpath(\XoopsBaseConfig::get('root-path'))), 'ROOT',], |
|
272 | - [\XoopsBaseConfig::get('db-name') . '.', '',], |
|
273 | - [\XoopsBaseConfig::get('db-name'), '',], |
|
274 | - [\XoopsBaseConfig::get('db-prefix') . '_', '',], |
|
275 | - [\XoopsBaseConfig::get('db-user'), '***',], |
|
276 | - [\XoopsBaseConfig::get('db-pass'), '***',], |
|
265 | + ['\\', '/', ], |
|
266 | + [\XoopsBaseConfig::get('var-path'), 'VAR', ], |
|
267 | + [str_replace('\\', '/', realpath(\XoopsBaseConfig::get('var-path'))), 'VAR', ], |
|
268 | + [\XoopsBaseConfig::get('lib-path'), 'LIB', ], |
|
269 | + [str_replace('\\', '/', realpath(\XoopsBaseConfig::get('lib-path'))), 'LIB', ], |
|
270 | + [\XoopsBaseConfig::get('root-path'), 'ROOT', ], |
|
271 | + [str_replace('\\', '/', realpath(\XoopsBaseConfig::get('root-path'))), 'ROOT', ], |
|
272 | + [\XoopsBaseConfig::get('db-name').'.', '', ], |
|
273 | + [\XoopsBaseConfig::get('db-name'), '', ], |
|
274 | + [\XoopsBaseConfig::get('db-prefix').'_', '', ], |
|
275 | + [\XoopsBaseConfig::get('db-user'), '***', ], |
|
276 | + [\XoopsBaseConfig::get('db-pass'), '***', ], |
|
277 | 277 | ]; |
278 | 278 | $stringsToClean = array_column($cleaners, 0); |
279 | 279 | $replacementStings = array_column($cleaners, 1); |
@@ -478,7 +478,7 @@ discard block |
||
478 | 478 | { |
479 | 479 | $this->deprecatedMessage(); |
480 | 480 | // legacy compatibility: turn off logger display for $xoopsLogger->activated = false; usage |
481 | - if ($var==='activated' && !$val) { |
|
481 | + if ($var === 'activated' && !$val) { |
|
482 | 482 | $this->quiet(); |
483 | 483 | } |
484 | 484 |