Skip to content

Commit 3768b29

Browse files
fiammybefiammybe
authored
Icms2 fix icmsmodule (#19)
* $icmsModule transform to icms::$module * add missing index files * update version info * update readme * add deploy action * no src folder yet * move sourcecode to src folder * moving to src * moving to src, 3 * moving to src. images * github actions now pushes from src folder * icms_version constants added * Create index.html * re-adding admin folder * add block, class * Create index.html * Create index.html * Add default imageset * upload templates * upload include folder * cleanup $icmsModule * cleanup old $icmsModule * cleanup old $icmsModule * cleanup old $icmsModule * cleanup old $icmsModule * Update Crowdin configuration file * replace $GLOBALS["icmsModule"] with icms::$module
1 parent d03eda5 commit 3768b29

4 files changed

Lines changed: 18 additions & 18 deletions

File tree

‎src/class/online.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ public function show_online()
125125
$online['num_user'] = $num_user;
126126
$online['num_anonymous'] = $num_anonymous;
127127
$online["users"] = array();
128-
$administrator_list = iforum_isModuleAdministrators($users_id, $GLOBALS["icmsModule"]->getVar("mid"));
128+
$administrator_list = iforum_isModuleAdministrators($users_id, icms::$module->getVar("mid"));
129129
foreach ($users_online as $uid => $user)
130130
{
131131
if (!empty($administrator_list[$uid])) {

‎src/class/permission.php‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,9 @@ function getPermissions($type = "forum", $id = 0)
4646
$type = (strtolower($type) != "category")?"forum":
4747
"category";
4848

49-
if (is_object($GLOBALS["icmsModule"]) && $GLOBALS["icmsModule"]->getVar("dirname") == basename(dirname(__DIR__) ))
49+
if (is_object(icms::$module) && icms::$module->getVar("dirname") == basename(dirname(__DIR__) ))
5050
{
51-
$modid = $GLOBALS["icmsModule"]->getVar("mid");
51+
$modid = icms::$module->getVar("mid");
5252
}
5353
else
5454
{
@@ -165,7 +165,7 @@ function &permission_table($permission_set, $forum = 0, $topic_locked = false, $
165165
function deleteByForum($forum)
166166
{
167167
$gperm_handler = icms::handler('icms_member_groupperm');
168-
$criteria = new icms_db_criteria_Compo(new icms_db_criteria_Item('gperm_modid', $GLOBALS["icmsModule"]->getVar('mid')));
168+
$criteria = new icms_db_criteria_Compo(new icms_db_criteria_Item('gperm_modid', icms::$module->getVar('mid')));
169169
$criteria->add(new icms_db_criteria_Item('gperm_name', '('.FORUM_PERM_ITEMS.')', 'IN'));
170170
$criteria->add(new icms_db_criteria_Item('gperm_itemid', $forum));
171171
return $gperm_handler->deleteAll($criteria);
@@ -174,17 +174,17 @@ function deleteByForum($forum)
174174
function deleteByCategory($category)
175175
{
176176
$gperm_handler = icms::handler('icms_member_groupperm');
177-
$criteria = new icms_db_criteria_Compo(new icms_db_criteria_Item('gperm_modid', $GLOBALS["icmsModule"]->getVar('mid')));
177+
$criteria = new icms_db_criteria_Compo(new icms_db_criteria_Item('gperm_modid', icms::$module->getVar('mid')));
178178
$criteria->add(new icms_db_criteria_Item('gperm_name', 'category_access'));
179179
$criteria->add(new icms_db_criteria_Item('gperm_itemid', $category));
180180
return $gperm_handler->deleteAll($criteria);
181181
}
182182

183183
function setCategoryPermission($category, $groups = null)
184184
{
185-
if (is_object($GLOBALS["icmsModule"]) && $GLOBALS["icmsModule"]->getVar("dirname") == basename(dirname(__DIR__) ))
185+
if (is_object(icms::$module) && icms::$module->getVar("dirname") == basename(dirname(__DIR__) ))
186186
{
187-
$mid = $GLOBALS["icmsModule"]->getVar("mid");
187+
$mid = icms::$module->getVar("mid");
188188
}
189189
else
190190
{
@@ -217,9 +217,9 @@ function validateRight($perm, $itemid, $groupid, $mid = null)
217217
{
218218
if (empty($mid))
219219
{
220-
if (is_object($GLOBALS["icmsModule"]) && $GLOBALS["icmsModule"]->getVar("dirname") == basename(dirname(__DIR__) ))
220+
if (is_object(icms::$module) && icms::$module->getVar("dirname") == basename(dirname(__DIR__) ))
221221
{
222-
$mid = $GLOBALS["icmsModule"]->getVar("mid");
222+
$mid = icms::$module->getVar("mid");
223223
}
224224
else
225225
{
@@ -277,9 +277,9 @@ function deleteRight($perm, $itemid, $groupid, $mid = null)
277277
{
278278
if (empty($mid))
279279
{
280-
if (is_object($GLOBALS["icmsModule"]) && $GLOBALS["icmsModule"]->getVar("dirname") == basename(dirname(__DIR__) ))
280+
if (is_object(icms::$module) && icms::$module->getVar("dirname") == basename(dirname(__DIR__) ))
281281
{
282-
$mid = $GLOBALS["icmsModule"]->getVar("mid");
282+
$mid = icms::$module->getVar("mid");
283283
}
284284
else
285285
{
@@ -319,9 +319,9 @@ function applyTemplate($forum, $mid = null)
319319

320320
if (empty($mid))
321321
{
322-
if (is_object($GLOBALS["icmsModule"]) && $GLOBALS["icmsModule"]->getVar("dirname") == basename(dirname(__DIR__) ))
322+
if (is_object(icms::$module) && icms::$module->getVar("dirname") == basename(dirname(__DIR__) ))
323323
{
324-
$mid = $GLOBALS["icmsModule"]->getVar("mid");
324+
$mid = icms::$module->getVar("mid");
325325
}
326326
else
327327
{
@@ -363,4 +363,4 @@ function setTemplate($perms)
363363
{
364364
return mod_createCacheFile($perms, "perm_template", basename(dirname(__DIR__) ));
365365
}
366-
}
366+
}

‎src/include/functions.ini.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ function &iforum_load_config()
6464
return $moduleConfig;
6565
}
6666

67-
if (isset($GLOBALS["icmsModule"]) && is_object($GLOBALS["icmsModule"]) && $GLOBALS["icmsModule"]->getVar("dirname", "n") == basename(dirname(dirname(__FILE__ ) ) ))
67+
if (isset(icms::$module) && is_object(icms::$module) && icms::$module->getVar("dirname", "n") == basename(dirname(dirname(__FILE__ ) ) ))
6868
{
6969
if (!empty($GLOBALS["icmsModuleConfig"]))
7070
{
@@ -105,7 +105,7 @@ function getConfigForBlock()
105105
return $iforumConfig;
106106
}
107107

108-
if (is_object($GLOBALS["icmsModule"]) && $GLOBALS["icmsModule"]->getVar("dirname") == basename(dirname(dirname(__FILE__ ) ) ))
108+
if (is_object(icms::$module) && icms::$module->getVar("dirname") == basename(dirname(dirname(__FILE__ ) ) ))
109109
{
110110
$iforumConfig = & $GLOBALS["icmsModuleConfig"];
111111
}
@@ -148,4 +148,4 @@ function iforum_load_lang_file($filename, $module = '', $default = 'english' )
148148
function iforum_getIP($asString = false)
149149
{
150150
return mod_getIP($asString);
151-
}
151+
}

‎src/include/vars.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@
190190
*/
191191

192192
// include customized variables
193-
if (is_object($GLOBALS["icmsModule"]) && basename(dirname(dirname(__FILE__ ) ) ) == $GLOBALS["icmsModule"]->getVar("dirname", "n") )
193+
if (is_object(icms::$module) && basename(dirname(dirname(__FILE__ ) ) ) == icms::$module->getVar("dirname", "n") )
194194
{
195195
$GLOBALS["icmsModuleConfig"] = iforum_load_config();
196196
}

0 commit comments

Comments
 (0)