Skip to content

Commit 5e4bad2

Browse files
ggoffyggoffy
committed
corrected case mismatch: xoops_gethandler into xoops_getHandler
unnecessary parentheses: removed brackets unnecessary double quotes
1 parent 38ab27e commit 5e4bad2

10 files changed

Lines changed: 20 additions & 21 deletions

‎class/files/TDMCreateXoopsCode.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -639,7 +639,7 @@ public function getXcPermissionsHeader()
639639
$phpCodePHeader = TDMCreatePhpCode::getInstance();
640640
$ret = $phpCodePHeader->getPhpCodeCommentLine('Permission');
641641
$ret .= $phpCodePHeader->getPhpCodeIncludeDir('XOOPS_ROOT_PATH', 'class/xoopsform/grouppermform', true);
642-
$ret .= $this->getXcEqualsOperator('$gpermHandler', "xoops_gethandler('groupperm')", true);
642+
$ret .= $this->getXcEqualsOperator('$gpermHandler', "xoops_getHandler('groupperm')", true);
643643
$groups = $this->getXcEqualsOperator('$groups', '$xoopsUser->getGroups()');
644644
$elseGroups = $this->getXcEqualsOperator('$groups', 'XOOPS_GROUP_ANONYMOUS');
645645
$ret .= $phpCodePHeader->getPhpCodeConditions('is_object($xoopsUser)', '', $type = '', $groups, $elseGroups);

‎class/files/admin/AdminMenu.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ private function getAdminMenuHeader()
100100
$dirname = ['$dirname' => 'basename(dirname(__DIR__))'];
101101
$ret = $this->getAdminMenuArray($dirname);
102102
$mod = [
103-
'$moduleHandler' => "xoops_gethandler('module')",
103+
'$moduleHandler' => "xoops_getHandler('module')",
104104
'$xoopsModule' => 'XoopsModule::getByDirname($dirname)',
105105
'$moduleInfo' => "\$moduleHandler->get(\$xoopsModule->getVar('mid'))",
106106
];

‎class/files/admin/AdminPages.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -290,7 +290,7 @@ private function getAdminPagesSave($moduleDirname, $tableName, $tableCategory, $
290290
$contentInsert = $xc->getXcEqualsOperator('$newCatId', "\${$tableName}Obj->getNewInsertedId{$ucfTableName}()", null, false, $t . "\t");
291291
$ucfFieldId = $this->getCamelCase($fieldId, true);
292292
$contentInsert .= $pc->getPhpCodeTernaryOperator('permId', "isset(\$_REQUEST['{$fieldId}'])", "\${$ccFieldId}", "\$new{$ucfFieldId}", $t . "\t");
293-
$contentInsert .= $xc->getXcEqualsOperator('$gpermHandler', "xoops_gethandler('groupperm')", null, false, $t . "\t");
293+
$contentInsert .= $xc->getXcEqualsOperator('$gpermHandler', "xoops_getHandler('groupperm')", null, false, $t . "\t");
294294
$contentInsert .= $this->getPermissionsSave($moduleDirname, $fieldId, $ccFieldId, 'new' . $ucfFieldId);
295295
$contentInsert .= $this->getPermissionsSave($moduleDirname, $fieldId, $ccFieldId, 'new' . $ucfFieldId, 'submit');
296296
$contentInsert .= $this->getPermissionsSave($moduleDirname, $fieldId, $ccFieldId, 'new' . $ucfFieldId, 'approve');

‎class/files/classes/ClassFiles.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,7 @@ private function getFunctionForm($module, $table, $fieldId, $fieldInForm)
283283
$xModule = $pc->getPhpCodeGlobals('xoopsModule');
284284
if (1 != $tableCategory/* && (1 == $tablePermissions)*/) {
285285
$getForm .= $pc->getPhpCodeCommentLine('Permissions for', 'uploader', "\t\t");
286-
$getForm .= $xc->getXcEqualsOperator('$gpermHandler', "xoops_gethandler('groupperm')", null, true, "\t\t");
286+
$getForm .= $xc->getXcEqualsOperator('$gpermHandler', "xoops_getHandler('groupperm')", null, true, "\t\t");
287287
$getForm .= $pc->getPhpCodeTernaryOperator('groups', 'is_object('.$xUser.')', $xUser.'->getGroups()', 'XOOPS_GROUP_ANONYMOUS', "\t\t");
288288
$checkRight = $xc->getXcCheckRight('$gpermHandler', $permString = '', 32, '$groups', $xModule.'->getVar(\'mid\')', true);
289289
$ternaryOperator = $pc->getPhpCodeTernaryOperator('permissionUpload', $checkRight, 'true', 'false', "\t\t\t\t");
@@ -334,9 +334,9 @@ private function getPermissionsInForm($moduleDirname, $fieldId)
334334
$permissionSubmit = $this->getLanguage($moduleDirname, 'AM', 'PERMISSIONS_SUBMIT');
335335
$permissionView = $this->getLanguage($moduleDirname, 'AM', 'PERMISSIONS_VIEW');
336336
$ret = $pc->getPhpCodeCommentLine('Permissions', '', "\t\t");
337-
$ret .= $xc->getXcEqualsOperator('$memberHandler', "xoops_gethandler('member')", null, false, "\t\t");
337+
$ret .= $xc->getXcEqualsOperator('$memberHandler', "xoops_getHandler('member')", null, false, "\t\t");
338338
$ret .= $xc->getXcEqualsOperator('$groupList', '$memberHandler->getGroupList()', null, false, "\t\t");
339-
$ret .= $xc->getXcEqualsOperator('$gpermHandler', "xoops_gethandler('groupperm')", null, false, "\t\t");
339+
$ret .= $xc->getXcEqualsOperator('$gpermHandler', "xoops_getHandler('groupperm')", null, false, "\t\t");
340340
$ret .= $pc->getPhpCodeArrayType('fullList', 'keys', 'groupList', null, false, "\t\t");
341341
$fId = $xc->getXcGetVar('', 'this', $fieldId, true);
342342
$mId = $xc->getXcGetVar('', "GLOBALS['xoopsModule']", 'mid', true);
@@ -685,7 +685,7 @@ private function getClassByCategory($moduleDirname, $tableName, $tableFieldName,
685685

686686
$ret = $pc->getPhpCodeCommentMultiLine(["Get All {$ucfTableName} By" => "{$fieldNameDesc} Id", '@param int $start' => '', '@param int $limit' => '', '@param string $sort' => '', '@param string $order' => '', '@return' => 'array'], "\t");
687687

688-
$critAll = $xc->getXcEqualsOperator('$gpermHandler', "xoops_gethandler('groupperm')", null, true, "\t\t");
688+
$critAll = $xc->getXcEqualsOperator('$gpermHandler', "xoops_getHandler('groupperm')", null, true, "\t\t");
689689
$param1 = "'{$moduleDirname}_view'";
690690
$param2 = "\$GLOBALS['xoopsUser']->getGroups()";
691691
$param3 = "\$GLOBALS['xoopsModule']->getVar('mid')";

‎class/files/include/IncludeCommentFunctions.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,8 +90,8 @@ public function render()
9090
* @return bool
9191
*/
9292
function {$moduleDirname}CommentsUpdate(\$itemId, \$itemNumb) {
93-
\$itemId = (int) (\$itemId);
94-
\$itemNumb = (int) (\$itemNumb);
93+
\$itemId = (int)\$itemId;
94+
\$itemNumb = (int)\$itemNumb;
9595
\$article = new {$ucfModuleDirname}{$ucfTableName}(\$itemId);
9696
if (!\$article->updateComments(\$itemNumb)) {
9797
return false;

‎class/files/include/IncludeComments.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ public function renderCommentsNew($module, $filename)
105105
$content .= <<<EOT
106106
include __DIR__ . '/../../../mainfile.php';
107107
include_once XOOPS_ROOT_PATH.'/modules/{$moduleDirname}/class/{$tableName}.php';
108-
\$com_itemid = isset(\$_REQUEST['com_itemid']) ? (int) (\$_REQUEST['com_itemid']) : 0;
108+
\$com_itemid = isset(\$_REQUEST['com_itemid']) ? (int)\$_REQUEST['com_itemid'] : 0;
109109
if (\$com_itemid > 0) {
110110
\${$tableName}Handler = xoops_getModuleHandler('{$tableName}', '{$moduleDirname}');
111111
\${$tableName} = \${$tableName}handler->get(\$com_itemid);

‎class/files/include/IncludeFunctions.php‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -368,22 +368,21 @@ private function getRewriteFilter($moduleDirname, $tableName)
368368
*
369369
* @param string \$url string to transform
370370
* @param string \$type string replacement for any blank case
371-
* @param string \$module
372371
* @return string \$url
373372
*/
374-
function {$moduleDirname}_Filter(\$url, \$type = '', \$module = '{$moduleDirname}') {
373+
function {$moduleDirname}_Filter(\$url, \$type = '') {
375374
376375
// Get regular expression from module setting. default setting is : `[^a-z0-9]`i
377376
\${$moduleDirname} = {$ucfModuleDirname}Helper::getInstance();
378377
\${$tableName} = \${$moduleDirname}->getHandler('{$tableName}');
379378
\$regular_expression = \${$moduleDirname}->getConfig('regular_expression');
380379
381380
\$url = strip_tags(\$url);
382-
\$url = preg_replace("`\[.*\]`U", "", \$url);
383-
\$url = preg_replace('`&(amp;)?#?[a-z0-9]+;`i', '-', \$url);
384-
\$url = htmlentities(\$url, ENT_COMPAT, 'utf-8');
385-
\$url = preg_replace("`&([a-z])(acute|uml|circ|grave|ring|cedil|slash|tilde|caron|lig);`i", "\\1", \$url);
386-
\$url = preg_replace(array(\$regular_expression, "`[-]+`"), "-", \$url);
381+
\$url .= preg_replace("`\[.*\]`U", '', \$url);
382+
\$url .= preg_replace('`&(amp;)?#?[a-z0-9]+;`i', '-', \$url);
383+
\$url .= htmlentities(\$url, ENT_COMPAT, 'utf-8');
384+
\$url .= preg_replace("`&([a-z])(acute|uml|circ|grave|ring|cedil|slash|tilde|caron|lig);`i", "\\1", \$url);
385+
\$url .= preg_replace(array(\$regular_expression, "`[-]+`"), '-', \$url);
387386
\$url = (\$url == '') ? \$type : strtolower(trim(\$url, '-'));
388387
return \$url;
389388
}

‎class/files/include/IncludeSearch.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ function {$moduleDirname}_search(\$queryarray, \$andor, \$limit, \$offset, \$use
135135
global \$xoopsDB;
136136
\$sql = "SELECT '{$fieldId}', '{$fieldMain}' FROM " . \$xoopsDB->prefix('{$moduleDirname}_{$tableName}') . ' WHERE {$fieldId} != 0';
137137
if ( \$userid != 0 ) {
138-
\$sql .= ' AND {$tableFieldname}_submitter='.(int) (\$userid);
138+
\$sql .= ' AND {$tableFieldname}_submitter='.(int)\$userid;
139139
}
140140
if ( is_array(\$queryarray) && \$count = count(\$queryarray) )
141141
{

‎class/files/user/UserHeader.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ private function getUserHeader($moduleDirname)
9999
}
100100
$ret .= $pc->getPhpCodeCommentLine('Permission');
101101
$ret .= $pc->getPhpCodeIncludeDir('XOOPS_ROOT_PATH', 'class/xoopsform/grouppermform', true);
102-
$ret .= $xc->getXcEqualsOperator('$gpermHandler', "xoops_gethandler('groupperm')", null, true);
102+
$ret .= $xc->getXcEqualsOperator('$gpermHandler', "xoops_getHandler('groupperm')", null, true);
103103

104104
$condIf = $xc->getXcEqualsOperator('$groups ', '$xoopsUser->getGroups()', null, false, "\t");
105105
$condElse = $xc->getXcEqualsOperator('$groups ', 'XOOPS_GROUP_ANONYMOUS', null, false, "\t");

‎class/files/user/UserXoopsVersion.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -488,7 +488,7 @@ private function getXoopsVersionConfig($module, $tables, $language)
488488

489489
if (1 === $table_permissions) {
490490
$ret .= $phpCodeVConfig->getPhpCodeCommentLine('Get groups');
491-
$ret .= $xCodeVConfig->getXcEqualsOperator('$memberHandler ', "xoops_gethandler('member')", '', false);
491+
$ret .= $xCodeVConfig->getXcEqualsOperator('$memberHandler ', "xoops_getHandler('member')", '', false);
492492
$ret .= $xCodeVConfig->getXcEqualsOperator('$xoopsGroups ', '$memberHandler->getGroupList()');
493493
$group = $xCodeVConfig->getXcEqualsOperator('$groups[$group] ', '$key', null, false, "\t");
494494
$ret .= $phpCodeVConfig->getPhpCodeForeach('xoopsGroups', false, 'key', 'group', $group);
@@ -501,7 +501,7 @@ private function getXoopsVersionConfig($module, $tables, $language)
501501
$ret .= $phpCodeVConfig->getPhpCodeCommentLine('Get Admin groups');
502502
$ret .= $xCodeVConfig->getXcEqualsOperator('$criteria ', 'new CriteriaCompo()');
503503
$ret .= $this->getSimpleString("\$criteria->add( new Criteria( 'group_type', 'Admin' ) );");
504-
$ret .= $xCodeVConfig->getXcEqualsOperator('$memberHandler ', "xoops_gethandler('member')", '', false);
504+
$ret .= $xCodeVConfig->getXcEqualsOperator('$memberHandler ', "xoops_getHandler('member')", '', false);
505505
$ret .= $xCodeVConfig->getXcEqualsOperator('$adminXoopsGroups ', '$memberHandler->getGroupList($criteria)');
506506
$adminGroup = $xCodeVConfig->getXcEqualsOperator('$adminGroups[$adminGroup] ', '$key', null, false, "\t");
507507
$ret .= $phpCodeVConfig->getPhpCodeForeach('adminXoopsGroups', false, 'key', 'adminGroup', $adminGroup);

0 commit comments

Comments
 (0)