@@ -396,8 +392,8 @@
'be_users',
'uid=' . $userId,
array (
- 'deleted' => 1,
- 'tstamp' => $GLOBALS['ACCESS_TIME']
+ 'deleted' => 1,
+ 'tstamp' => $GLOBALS['ACCESS_TIME']
)
);
@@ -411,14 +407,14 @@
*
* @param int $id: Id of the BE user
* @param array $action: sys_action record.
- * @return mixed the record of the BE user if found, otherwise false
+ * @return mixed the record of the BE user if found, otherwise FALSE
*/
protected function isCreatedByUser($id, $action) {
$record = t3lib_BEfunc::getRecord(
'be_users',
$id,
'*',
- ' AND cruser_id=' . $GLOBALS['BE_USER']->user['uid'] . ' AND createdByAction=' . intval($action['uid'])
+ ' AND cruser_id=' . $GLOBALS['BE_USER']->user['uid'] . ' AND createdByAction=' . $action['uid']
);
if (is_array($record)) {
@@ -438,7 +434,7 @@
*/
protected function getCreatedUsers($action, $selectedUser) {
$content = '';
- $lines = array();
+ $userList = array();
// List of users
$res = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
@@ -459,13 +455,13 @@
$line = '
' . $line . '';
}
- $lines[] = $line;
+ $userList[] = $line;
}
$GLOBALS['TYPO3_DB']->sql_free_result($res);
// if any records found
- if (count($lines)) {
- $content .= '
' . $this->taskObject->doc->section($GLOBALS['LANG']->getLL('action_t1_listOfUsers'), implode('
', $lines));
+ if (count($userList)) {
+ $content .= '
' . $this->taskObject->doc->section($GLOBALS['LANG']->getLL('action_t1_listOfUsers'), implode('
', $userList));
}
return $content;
@@ -507,8 +503,6 @@
* @return int Id of the new/updated user
*/
protected function saveNewBackendUser($record, $vars) {
- $content = '';
-
// check if the db mount is a page the current user is allowed to.);
$vars['db_mountpoints'] = $this->fixDbMount($vars['db_mountpoints']);
// check if the usergroup is allowed
@@ -709,6 +703,13 @@
}
}
+ /**
+ * Get all allowed usergroups which can be applied to a user record
+ *
+ * @param array $record sys_action record
+ * @param array $vars Selected be_user record
+ * @return string rendered user groups
+ */
protected function getUsergroups($record, $vars) {
$content = '';
// do nothing if no groups are allowed
@@ -750,7 +751,7 @@
*/
protected function viewEditRecord($record) {
$content = '';
- $lines = array();
+ $actionList = array();
$dbAnalysis = t3lib_div::makeInstance('t3lib_loadDBGroup');
$dbAnalysis->fromTC = 0;
@@ -767,7 +768,7 @@
$description .= ' - ' . t3lib_BEfunc::dateTimeAge($record['crdate']);
}
- $lines[$el['id']] = array(
+ $actionList[$el['id']] = array(
'title' => $title,
'description' => t3lib_BEfunc::getRecordTitle($el['table'], $dbAnalysis->results[$el['table']][$el['id']]),
'descriptionHtml' => $description,
@@ -777,7 +778,7 @@
}
// render the record list
- $content .= $this->taskObject->renderListMenu($lines);
+ $content .= $this->taskObject->renderListMenu($actionList);
return $content;
}
@@ -801,7 +802,6 @@
$fullsearch->formW = 40;
$fullsearch->noDownloadB = 1;
-
$type = $sql_query['qC']['search_query_makeQuery'];
$res = $GLOBALS['TYPO3_DB']->sql_query($sql_query['qSelect']);
@@ -823,14 +823,14 @@
// Admin users are allowed to see and edit the query
if ($GLOBALS['BE_USER']->isAdmin()) {
$actionContent .= '
' . $fullsearch->tableWrap($sql_query['qSelect']);
- $actionContent .= '
getLL('action_editQuery') . '" href="' . $GLOBALS['BACK_PATH'] . t3lib_extMgm::extRelPath('lowlevel') . 'dbint/index.php?id=' .
'&SET[function]=search' .
'&SET[search]=query' .
'&storeControl[STORE]=-' . $record['uid'] .
'&storeControl[LOAD]=1' .
'">
' .
- $GLOBALS['LANG']->getLL('action_editQuery') . '';
+ $GLOBALS['LANG']->getLL('action_editQuery') . '
';
}
$content .= $this->taskObject->doc->section($GLOBALS['LANG']->getLL('action_t2_result'), $actionContent, 0, 1);
@@ -838,7 +838,7 @@
// query is not configured
$flashMessage = t3lib_div::makeInstance (
't3lib_FlashMessage',
- $GLOBALS['LANG']->getLL('action_notReady', true),
+ $GLOBALS['LANG']->getLL('action_notReady', TRUE),
$GLOBALS['LANG']->getLL('action_error'),
t3lib_FlashMessage::ERROR
);
@@ -848,7 +848,7 @@
// required sysext lowlevel is not installed
$flashMessage = t3lib_div::makeInstance (
't3lib_FlashMessage',
- $GLOBALS['LANG']->getLL('action_lowlevelMissing', true),
+ $GLOBALS['LANG']->getLL('action_lowlevelMissing', TRUE),
$GLOBALS['LANG']->getLL('action_error'),
t3lib_FlashMessage::ERROR
);
@@ -872,7 +872,7 @@
if ($this->id == 0 || $this->table == '') {
$flashMessage = t3lib_div::makeInstance(
't3lib_FlashMessage',
- $GLOBALS['LANG']->getLL('action_lowlevelMissing', true),
+ $GLOBALS['LANG']->getLL('action_lowlevelMissing', TRUE),
$GLOBALS['LANG']->getLL('action_error'),
t3lib_FlashMessage::ERROR
);
@@ -884,15 +884,10 @@
require_once($GLOBALS['BACK_PATH'] . 'class.db_list.inc');
require_once($GLOBALS['BACK_PATH'] . 'class.db_list_extra.inc');
-
- // Start document template object:
-// $this->doc = t3lib_div::makeInstance('template');
-
// Loading current page record and checking access:
$this->pageinfo = t3lib_BEfunc::readPageAccess($this->id,$this->taskObject->perms_clause);
$access = is_array($this->pageinfo) ? 1 : 0;
-
// If there is access to the page, then render the list contents and set up the document template object:
if ($access) {
// Initialize the dblist object:
@@ -978,7 +973,6 @@
// Setting up the context sensitive menu:
$this->taskObject->doc->getContextMenuCode();
-
// Begin to compile the whole page
$content .= '