Skip to content
Snippets Groups Projects
Commit 17322f94 authored by Xavier Perseguers's avatar Xavier Perseguers
Browse files

[BUGFIX] Some methods of SC_mod_web_perm_ajax should be static

Fix the method signatures that are statically called throughout the Core.

Change-Id: Ic415b271eb66950de9dbaf1a82b130112b026f35
Fixes: #30063
Releases: 4.6
Reviewed-on: http://review.typo3.org/5090
Reviewed-by: Xavier Perseguers
Tested-by: Xavier Perseguers
parent 775d8cde
Branches
Tags
No related merge requests found
......@@ -108,6 +108,7 @@ class SC_mod_web_perm_ajax {
if ($this->conf['page'] > 0) {
// Init TCE for execution of update
/** @var $tce t3lib_TCEmain */
$tce = t3lib_div::makeInstance('t3lib_TCEmain');
$tce->stripslashes_values = 1;
......@@ -129,7 +130,7 @@ class SC_mod_web_perm_ajax {
// Execute TCE Update
$tce->start($data, array());
$tce->process_datamap();
$content = $this->renderOwnername($this->conf['page'], $this->conf['new_owner_uid'], $this->conf['new_owner_username']);
$content = self::renderOwnername($this->conf['page'], $this->conf['new_owner_uid'], $this->conf['new_owner_username']);
} else {
$ajaxObj->setError('An error occured: No page owner uid specified.');
}
......@@ -152,7 +153,7 @@ class SC_mod_web_perm_ajax {
$tce->start($data, array());
$tce->process_datamap();
$content = $this->renderGroupname($this->conf['page'], $this->conf['new_group_uid'], $this->conf['new_group_username']);
$content = self::renderGroupname($this->conf['page'], $this->conf['new_group_uid'], $this->conf['new_group_username']);
} else {
$ajaxObj->setError('An error occured: No page group uid specified.');
}
......@@ -188,7 +189,7 @@ class SC_mod_web_perm_ajax {
$tce->start($data, array());
$tce->process_datamap();
$content = $this->renderPermissions($this->conf['permissions'], $this->conf['page'], $this->conf['who']);
$content = self::renderPermissions($this->conf['permissions'], $this->conf['page'], $this->conf['who']);
}
} else {
$ajaxObj->setError('This script cannot be called directly.');
......@@ -299,7 +300,7 @@ class SC_mod_web_perm_ajax {
* @param Boolean $validUser: Must be set to FALSE, if the user has no name or is deleted
* @return String The new group wrapped in HTML
*/
public function renderOwnername($page, $ownerUid, $username, $validUser = TRUE) {
public static function renderOwnername($page, $ownerUid, $username, $validUser = TRUE) {
$elementId = 'o_'.$page;
$ret = '<span id="' . $elementId . '"><a class="ug_selector" onclick="WebPermissions.showChangeOwnerSelector(' . $page . ', ' . $ownerUid . ', \'' . $elementId.'\', \'' . htmlspecialchars($username) . '\');">' . ($validUser ? ($username == '' ? ('<span class=not_set>['. $GLOBALS['LANG']->getLL('notSet') .']</span>') : htmlspecialchars(t3lib_div::fixed_lgd_cs($username, 20))) : ('<span class=not_set title="' . htmlspecialchars(t3lib_div::fixed_lgd_cs($username, 20)) . '">[' . $GLOBALS['LANG']->getLL('deleted') . ']</span>')) . '</a></span>';
return $ret;
......@@ -315,7 +316,7 @@ class SC_mod_web_perm_ajax {
* @param Boolean $validGroup: Must be set to FALSE, if the group has no name or is deleted
* @return String The new group wrapped in HTML
*/
public function renderGroupname($page, $groupUid, $groupname, $validGroup = TRUE) {
public static function renderGroupname($page, $groupUid, $groupname, $validGroup = TRUE) {
$elementId = 'g_'.$page;
$ret = '<span id="'.$elementId . '"><a class="ug_selector" onclick="WebPermissions.showChangeGroupSelector(' . $page . ', ' . $groupUid . ', \'' . $elementId . '\', \'' . htmlspecialchars($groupname) . '\');">'. ($validGroup ? ($groupname == '' ? ('<span class=not_set>['. $GLOBALS['LANG']->getLL('notSet') .']</span>') : htmlspecialchars(t3lib_div::fixed_lgd_cs($groupname, 20))) : ('<span class=not_set title="' . htmlspecialchars(t3lib_div::fixed_lgd_cs($groupname, 20)) . '">[' . $GLOBALS['LANG']->getLL('deleted') . ']</span>')) . '</a></span>';
return $ret;
......@@ -347,7 +348,7 @@ class SC_mod_web_perm_ajax {
* @param String $who: The scope (user, group or everybody)
* @return string HTML marked up x/* indications.
*/
public function renderPermissions($int, $pageId = 0, $who = 'user') {
public static function renderPermissions($int, $pageId = 0, $who = 'user') {
global $LANG;
$str = '';
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment