20080204_remove_altmain.diff

Administrator Admin, 2008-02-04 19:17

Download (3.87 KB)

View differences:

t3lib/class.t3lib_befunc.php (working copy)
3969 3969
		}
3970 3970
		return array('rows'=>$theRows,'list'=>$out);
3971 3971
	}
3972
	
3973
	/**
3974
	 * Returns the name of the backend script relative to the TYPO3 main directory.
3975
	 *
3976
	 * @param	string		Optional name of the backend interface. If no interface is given, the interface for the current backend user is used.
3977
	 * @return	string
3978
	 */
3979
	public static function getBackendScript($interface = '') {
3980
		if(!$interface) {
3981
			$interface = $GLOBALS['BE_USER']->uc['interfaceSetup'];
3982
		}
3983
		
3984
		switch($interface) {
3985
			case 'backend_old':
3986
				$script = 'alt_main.php';
3987
				break;
3988
			case 'frontend':
3989
				$script = '../.';
3990
				break;
3991
			case 'backend':
3992
			default:
3993
				$script = 'backend.php';
3994
				break;
3995
		}
3996
		
3997
		return $script;
3998
	}
3972 3999
}
3973 4000
?>
t3lib/class.t3lib_tsfebeuserauth.php (working copy)
429 429
							parent.opener.top.goToModule("'.$pageModule.'");
430 430
							parent.opener.top.focus();
431 431
						} else {
432
							vHWin=window.open(\''.TYPO3_mainDir.'alt_main.php\',\''.md5('Typo3Backend-'.$GLOBALS['TYPO3_CONF_VARS']['SYS']['sitename']).'\',\'status=1,menubar=1,scrollbars=1,resizable=1\');
432
							vHWin=window.open(\''.TYPO3_mainDir.t3lib_BEfunc::getBackendInterface().'\',\''.md5('Typo3Backend-'.$GLOBALS['TYPO3_CONF_VARS']['SYS']['sitename']).'\',\'status=1,menubar=1,scrollbars=1,resizable=1\');
433 433
							vHWin.focus();
434 434
						}
435 435
						return false;
t3lib/class.t3lib_userauth.php (working copy)
551 551

  
552 552
			if($GLOBALS['TYPO3_CONF_VARS']['BE']['lockSSL'] == 3 && $this->user_table == 'be_users')	{
553 553
				$requestStr = substr(t3lib_div::getIndpEnv('TYPO3_REQUEST_SCRIPT'), strlen(t3lib_div::getIndpEnv('TYPO3_SITE_URL').TYPO3_mainDir));
554
				if($requestStr == 'alt_main.php' && t3lib_div::getIndpEnv('TYPO3_SSL'))	{
554
				$backendScript = t3lib_BEfunc::getBackendScript();
555
				if($requestStr == $backendScript && t3lib_div::getIndpEnv('TYPO3_SSL'))	{
555 556
					list(,$url) = explode('://',t3lib_div::getIndpEnv('TYPO3_SITE_URL'),2);
556
					header('Location: http://'.$url.TYPO3_mainDir.'alt_main.php');
557
					header('Location: http://'.$url.TYPO3_mainDir.$backendScript);
557 558
					exit;
558 559
				}
559 560
			}
typo3/alt_shortcut.php (working copy)
677 677
			// Changing workspace and if so, reloading entire backend:
678 678
		if (strlen($this->changeWorkspace))	{
679 679
			$BE_USER->setWorkspace($this->changeWorkspace);
680
			return $this->doc->wrapScriptTags('top.location.href="alt_main.php";');
680
			return $this->doc->wrapScriptTags('top.location.href="'. t3lib_BEfunc::getBackendScript() . '";');
681 681
		}
682 682
			// Changing workspace and if so, reloading entire backend:
683 683
		if (strlen($this->changeWorkspacePreview))	{
typo3/mod/user/ws/index.php (working copy)
306 306
		if ($changeWorkspace != '') {
307 307
			$BE_USER->setWorkspace($changeWorkspace);
308 308
			$this->content = $this->doc->startPage($LANG->getLL('title'));
309
			$this->content .= $this->doc->wrapScriptTags('top.location.href="' . $BACK_PATH . 'alt_main.php";');
309
			$this->content .= $this->doc->wrapScriptTags('top.location.href="' . $BACK_PATH . t3lib_BEfunc::getBackendScript() . '";');
310 310
		}
311 311
		else {
312 312
				// Starting page: