2006-11-15 Sebastian Kurfuerst <sebastian@garbage-group.de>
authorSebastian Kurfürst <sebastian.kurfuerst@typo3.org>
Tue, 15 Nov 2005 23:47:52 +0000 (23:47 +0000)
committerSebastian Kurfürst <sebastian.kurfuerst@typo3.org>
Tue, 15 Nov 2005 23:47:52 +0000 (23:47 +0000)
* Fixed bug #569: The "Access Key" combination now added to the
"title" attribute of images
* Fixed bug #815: CLI-mode doesn't work with lockSSL enabled
* New feature #1518: override all admin panel values from
TSConfig

git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@864 709f56b5-9817-0410-a4d7-c38de5d9e867

ChangeLog
t3lib/class.t3lib_tsfebeuserauth.php
typo3/init.php
typo3/sysext/cms/tslib/class.tslib_menu.php

index b535feb..2e91cd6 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,12 @@
+2006-11-15  Sebastian Kurfuerst  <sebastian@garbage-group.de>
+
+       * Fixed bug #569: The "Access Key" combination now added to the "title" attribute of images
+       * Fixed bug #815: CLI-mode doesn't work with lockSSL enabled
+       * New feature #1518: override all admin panel values from TSConfig
+
 2005-11-12  Sebastian Kurfuerst  <sebastian@garbage-group.de>
 
-       * New feature 1573: switch back to admin user after user switch (SU-mode)
+       * New feature #1573: switch back to admin user after user switch (SU-mode)
 
 2005-11-11  Sebastian Kurfuerst  <sebastian@garbage-group.de>
 
index 7251bb6..56b623a 100755 (executable)
@@ -744,6 +744,14 @@ class t3lib_tsfeBeUserAuth extends t3lib_beUserAuth {
                                return true;
                        }
 
+                               // override all settings with user TSconfig
+                       if ($this->extAdminConfig['module.'][$pre.'.'][$val] && $val)   {
+                               return $this->extAdminConfig['module.'][$pre.'.'][$val];
+                       }
+                       if ($this->extAdminConfig['module.'][$pre])     {
+                               return $this->extAdminConfig['module.'][$pre];
+                       }
+
                        $retVal = $val ? $this->uc['TSFE_adminConfig'][$pre.'_'.$val] : 1;
 
                        if ($pre=='preview' && $this->ext_forcePreview) {
index 758df79..aaa3853 100755 (executable)
@@ -180,7 +180,7 @@ if (trim($TYPO3_CONF_VARS['BE']['IPmaskList']))     {
 // **********************
 // Check SSL (https)
 // **********************
-if (intval($TYPO3_CONF_VARS['BE']['lockSSL'])) {
+if (intval($TYPO3_CONF_VARS['BE']['lockSSL']) && !(defined('TYPO3_cliMode') && TYPO3_cliMode)) {
        if ($TYPO3_CONF_VARS['BE']['lockSSL'] == 3)     {
                $requestStr = substr(t3lib_div::getIndpEnv('TYPO3_REQUEST_SCRIPT'), strlen(t3lib_div::getIndpEnv('TYPO3_SITE_URL').TYPO3_mainDir));
                if($requestStr == 'index.php' && !t3lib_div::getIndpEnv('TYPO3_SSL'))   {
index 412c5a4..b2cae14 100755 (executable)
@@ -2160,10 +2160,17 @@ class tslib_gmenu extends tslib_menu {
                                        $this->I['noLink'] = ($this->I['spacer'] || $this->I['val']['noLink'] || !count($this->menuArr[$key]));         // !count($this->menuArr[$key]) means that this item is a dummyItem
                                        $this->I['name']='';
 
+                                               // Set access key
+                                       if ($this->mconf['accessKey'])  {
+                                               $this->I['accessKey'] = $this->accessKey($this->I['title']);
+                                       } else {
+                                               $this->I['accessKey']=Array();
+                                       }
+
                                                // Get link.
                                        $this->I['linkHREF'] = $this->link($key,$this->I['val']['altTarget'],$this->mconf['forceTypeValue']);
                                                // Title attribute of links:
-                                       $titleAttrValue = $this->WMcObj->stdWrap($this->I['val']['ATagTitle'],$this->I['val']['ATagTitle.']);
+                                       $titleAttrValue = $this->WMcObj->stdWrap($this->I['val']['ATagTitle'],$this->I['val']['ATagTitle.']).$this->I['accessKey']['alt'];
                                        if (strlen($titleAttrValue))    {
                                                $this->I['linkHREF']['title'] = $titleAttrValue;
                                        }
@@ -2184,12 +2191,6 @@ class tslib_gmenu extends tslib_menu {
                                                $GLOBALS['TSFE']->setJS('mouseOver');
                                                $this->extProc_RO($key);
                                        }
-                                               // Set access key
-                                       if ($this->mconf['accessKey'])  {
-                                               $this->I['accessKey'] = $this->accessKey($this->I['title']);
-                                       } else {
-                                               $this->I['accessKey']=Array();
-                                       }
 
                                                // Set altText
                                        $this->I['altText'] = $this->mconf['disableAltText'] ? '' : $this->I['title'].$this->I['accessKey']['alt'];