Bug #24973 ยป 17501.patch
| typo3/sysext/setup/mod/index.php (revision ) | ||
|---|---|---|
|
protected $passwordIsSubmitted = FALSE;
|
||
|
protected $setupIsUpdated = FALSE;
|
||
|
protected $tempDataIsCleared = FALSE;
|
||
|
protected $dataIsResetted = FALSE;
|
||
|
protected $installToolFileExists = FALSE;
|
||
|
protected $installToolFileKeep = FALSE;
|
||
| ... | ... | |
|
if ($d['setValuesToDefault']) {
|
||
|
// If every value should be default
|
||
|
$BE_USER->resetUC();
|
||
|
$this->dataIsResetted = TRUE;
|
||
|
} elseif ($d['clearSessionVars']) {
|
||
|
foreach ($BE_USER->uc as $key => $value) {
|
||
|
if (!isset($columns[$key])) {
|
||
| ... | ... | |
|
$this->content .= $this->doc->header($LANG->getLL('UserSettings').' - '.$BE_USER->user['realName'].' ['.$BE_USER->user['username'].']');
|
||
|
// show if setup was saved
|
||
|
if ($this->setupIsUpdated) {
|
||
|
if ($this->setupIsUpdated && !$this->tempDataIsCleared && !$this->dataIsResetted) {
|
||
|
$flashMessage = t3lib_div::makeInstance(
|
||
|
't3lib_FlashMessage',
|
||
|
$LANG->getLL('setupWasUpdated'),
|
||
| ... | ... | |
|
);
|
||
|
$this->content .= $flashMessage->render();
|
||
|
}
|
||
|
// Show if temporary data was cleared
|
||
|
if ($this->dataIsResetted) {
|
||
|
$flashMessage = t3lib_div::makeInstance(
|
||
|
't3lib_FlashMessage',
|
||
|
$LANG->getLL('dataResetted'),
|
||
|
$LANG->getLL('resetConfiguration')
|
||
|
);
|
||
|
$this->content .= $flashMessage->render();
|
||
|
}
|
||
|
// If password is updated, output whether it failed or was OK.
|
||
|
if ($this->passwordIsSubmitted) {
|
||
|
if ($this->passwordIsUpdated) {
|
||
| ... | ... | |
|
<input type="hidden" name="simUser" value="'.$this->simUser.'" />
|
||
|
<input type="hidden" name="formToken" value="' . $formToken . '" />
|
||
|
<input type="submit" name="data[save]" value="'.$LANG->getLL('save').'" />
|
||
|
<input type="submit" name="data[setValuesToDefault]" value="'.$LANG->getLL('resetConfiguration').'" onclick="return confirm(\''.$LANG->getLL('setToStandardQuestion').'\');" />
|
||
|
<input type="submit" name="data[clearSessionVars]" value="' . $LANG->getLL('clearSessionVars') . '" onclick="return confirm(\'' . $LANG->getLL('clearSessionVarsQuestion') . '\');" />'
|
||
|
<input type="button" value="' . $LANG->getLL('resetConfiguration') .
|
||
|
'" onclick="if(confirm(\''.$LANG->getLL('setToStandardQuestion').'\')) {document.getElementById(\'setValuesToDefault\').value=1;this.form.submit();}" />
|
||
|
<input type="button" value="' . $LANG->getLL('clearSessionVars') .
|
||
|
'" onclick="if(confirm(\'' . $LANG->getLL('clearSessionVarsQuestion') . '\')){document.getElementById(\'clearSessionVars\').value=1;this.form.submit();}" />
|
||
|
<input type="hidden" name="data[setValuesToDefault]" value="0" id="setValuesToDefault" />
|
||
|
<input type="hidden" name="data[clearSessionVars]" value="0" id="clearSessionVars" />'
|
||
|
);
|
||
|
// Notice
|
||
| ... | ... | |
|
$fieldArray = $this->getFieldsFromShowItem();
|
||
|
$this->dividers2tabs = isset($GLOBALS['TYPO3_USER_SETTINGS']['ctrl']['dividers2tabs']) ? intval($GLOBALS['TYPO3_USER_SETTINGS']['ctrl']['dividers2tabs']) : 0;
|
||
|
$tabLabel = '';
|
||
|
foreach ($fieldArray as $fieldName) {
|
||
|
$more = '';
|
||
| ... | ... | |
|
if (empty($GLOBALS['BE_USER']->uc['startModule'])) {
|
||
|
$GLOBALS['BE_USER']->uc['startModule'] = $GLOBALS['BE_USER']->uc_default['startModule'];
|
||
|
}
|
||
|
$startModuleSelect .= '<option value=""></option>';
|
||
|
$startModuleSelect = '<option value=""></option>';
|
||
|
foreach ($pObj->loadModules->modules as $mainMod => $modData) {
|
||
|
if (isset($modData['sub']) && is_array($modData['sub'])) {
|
||
|
$startModuleSelect .= '<option disabled="disabled">'.$GLOBALS['LANG']->moduleLabels['tabs'][$mainMod.'_tab'].'</option>';
|
||
| ... | ... | |
|
}
|
||
|
if ($parent->getInstallToolFileExists()) {
|
||
|
return '<input type="submit" name="deleteInstallToolEnableFile"' .
|
||
|
return '<input type="button" name="deleteInstallToolEnableFile"' .
|
||
|
($parent->getInstallToolFileKeep() ? ' disabled="disabled"' : '') .
|
||
|
' value="' . $GLOBALS['LANG']->sL('LLL:EXT:setup/mod/locallang.xml:enableInstallTool.deleteFile') . '" />';
|
||
|
' value="' . $GLOBALS['LANG']->sL('LLL:EXT:setup/mod/locallang.xml:enableInstallTool.deleteFile') . '" onclick="document.getElementById(\'deleteInstallToolEnableFile\').value=1;this.form.submit();" />
|
||
|
<input type="hidden" name="deleteInstallToolEnableFile" value="0" id="deleteInstallToolEnableFile" />
|
||
|
';
|
||
|
} else {
|
||
|
return '<input type="submit" name="createInstallToolEnableFile" value="' . $GLOBALS['LANG']->sL('LLL:EXT:setup/mod/locallang.xml:enableInstallTool.createFile') . '" />';
|
||
|
return '<input type="button" name="createInstallToolEnableFile" value="' .
|
||
|
$GLOBALS['LANG']->sL('LLL:EXT:setup/mod/locallang.xml:enableInstallTool.createFile') . '" onclick="document.getElementById(\'createInstallToolEnableFile\').value=1;this.form.submit();" />
|
||
|
<input type="hidden" name="createInstallToolEnableFile" value="0" id="createInstallToolEnableFile" />';
|
||
|
}
|
||
|
}
|
||
| typo3/sysext/setup/mod/locallang.xml (revision ) | ||
|---|---|---|
|
<label index="tempDataCleared">Temporary data cleared</label>
|
||
|
<label index="tempDataClearedFlashMessage">The temporary data has been cleared.</label>
|
||
|
<label index="tempDataClearedLog">Temporary data cleared</label>
|
||
|
<label index="dataResetted">User settings was resetted to default and temporary data has been cleared.</label>
|
||
|
<label index="debugInWindow">Display debug messages in a new browser window</label>
|
||
|
</languageKey>
|
||
|
</data>
|
||