Commit b54b40db authored by Michael Stucki's avatar Michael Stucki
Browse files

* Display empty tag contents in the backend (e.g. <link email@hostname.com></link>)

* Fixed bug #0000750: Resolve relative links in the backend (caused problems with some firewalls)
* Install tool now shows which image is the reference when doing image tests (thanks to Dimitri Tarassenko)
* Small changes in t3lib_div::quoted_printable()
* !!! t3lib_htmlmail::quoted_printable() is now obsolete. Please call t3lib_div::quoted_printable() instead.
* simulateStaticDocuments_addTitle is now set to 30 if the value is 1 (cause 1 doesn't make sense, does it?)
* Display a warning message if this installation is obviously insecure!! These warnings are only displayed to admin users.
* Added a link to re-login if the session has timed out


git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@591 709f56b5-9817-0410-a4d7-c38de5d9e867
parent 1d9d9a8b
2005-04-01 Michael Stucki <michael@typo3.org>
* Display empty tag contents in the backend (e.g. <link email@hostname.com></link>)
* Fixed bug #0000750: Resolve relative links in the backend (caused problems with some firewalls)
* Install tool now shows which image is the reference when doing image tests (thanks to Dimitri Tarassenko)
* Small changes in t3lib_div::quoted_printable()
* !!! t3lib_htmlmail::quoted_printable() is now obsolete. Please call t3lib_div::quoted_printable() instead.
* simulateStaticDocuments_addTitle is now set to 30 if the value is 1 (cause 1 doesn't make sense, does it?)
* Display a warning message if this installation is obviously insecure!! These warnings are only displayed to admin users.
* Added a link to re-login if the session has timed out
2005-03-29 Michael Stucki <michael@typo3.org>
* Added a Russian flag (thanks to Michael Shigorin)
......
......@@ -3046,6 +3046,41 @@ class t3lib_BEfunc {
return $cNotice;
}
/**
* Display some warning messages if this installation is obviously insecure!!
* These warnings are only displayed to admin users
*
* @return void
*/
function displayWarningMessages() {
if($GLOBALS['BE_USER']->isAdmin()) {
$warnings = array();
// Check if the Install Tool Password is still default: joh316
if($GLOBALS['TYPO3_CONF_VARS']['BE']['installToolPassword']==md5('joh316')) {
$warnings[] = 'The password of your Install Tool is still using the default value "joh316"';
}
// Check if there is still a default user 'admin' with password 'password' (MD5sum = 5f4dcc3b5aa765d61d8327deb882cf99)
$where_clause = 'username="admin" AND password="5f4dcc3b5aa765d61d8327deb882cf99"'.t3lib_BEfunc::deleteClause('be_users');
$res = $GLOBALS['TYPO3_DB']->exec_SELECTquery('username, password', 'be_users', $where_clause);
if ($GLOBALS['TYPO3_DB']->sql_num_rows($res)) {
$warnings[] = 'The backend user "admin" with password "password" is still existing';
}
if(count($warnings)) {
$content = '<br />'.
'<p class="typo3-red" style="font-weight: bold;">Security warning:<br />'.
'- '.implode('<br />- ', $warnings).'<br /><br />'.
'It is highly recommended that you change this immediately.<br />&nbsp;</p>';
unset($warnings);
return $content;
}
}
return '<p>&nbsp;</p>';
}
/**
* Returns "web" if the $path (absolute) is within the DOCUMENT ROOT - and thereby qualifies as a "web" folder.
* Usage: 4
......
......@@ -189,7 +189,7 @@ class t3lib_beUserAuth extends t3lib_userAuthGroup {
function backendCheckLogin() {
if (!$this->user['uid']) {
if (!defined('TYPO3_PROCEED_IF_NO_USER') || !TYPO3_PROCEED_IF_NO_USER) {
t3lib_BEfunc::typo3PrintError ('Login-error','No user logged in! Sorry, I can\'t proceed then!<br /><br />(You must have cookies enabled!)',0);
t3lib_BEfunc::typo3PrintError ('Login-error or session timed-out', 'No user logged in! Sorry, I can\'t proceed then!<br /><br />(You must have cookies enabled!)<br /><br />If your session has just timed-out, you may<br /><a href="'.t3lib_div::locationHeaderUrl(t3lib_div::getIndpEnv('TYPO3_SITE_URL').'typo3/index.php'.'" target="_top">click here to re-login</a>.',0));
exit;
}
} else { // ...and if that's the case, call these functions
......
......@@ -3413,7 +3413,7 @@ class t3lib_div {
/**
* Implementation of quoted-printable encode.
* This functions is buggy. It seems that in the part where the lines are breaked every 76th character, that it fails if the break happens right in a quoted_printable encode character!
* (Originally taken from class.t3lib_htmlmail.php - which may be updated if this function should ever be improved!
* Important: For the ease of use, this function internally uses Unix linebreaks ("\n") for breaking lines, but the output must use "\r\n" instead!
* See RFC 1521, section 5.1 Quoted-Printable Content-Transfer-Encoding
* Usage: 2
*
......@@ -3422,31 +3422,33 @@ class t3lib_div {
* @return string The QP encoded string
*/
function quoted_printable($string,$maxlen=76) {
$newString = '';
$theLines = explode(chr(10),$string); // Break lines. Doesn't work with mac eol's which seems to be 13. But 13-10 or 10 will work
while (list(,$val)=each($theLines)) {
$val = ereg_replace(chr(13).'$','',$val); // removes possible character 13 at the end of line
// Make sure the string contains only Unix linebreaks
$string = str_replace(chr(13).chr(10), chr(10), $string); // Replace Windows breaks (\r\n)
$string = str_replace(chr(13), chr(10), $string); // Replace Mac breaks (\r)
$newString = '';
$theLines = explode(chr(10),$string); // Split lines
foreach($theLines as $val) {
$newVal = '';
$theValLen = strlen($val);
$len = 0;
for ($index=0;$index<$theValLen;$index++) {
for ($index=0; $index < $theValLen; $index++) { // Walk through each character of this line
$char = substr($val,$index,1);
$ordVal =Ord($char);
$ordVal = ord($char);
if ($len>($maxlen-4) || ($len>(($maxlen-10)-4)&&$ordVal==32)) {
$len=0;
$newVal.='='.chr(13).chr(10);
$newVal.='='.chr(13).chr(10); // Add a line break
$len=0; // Reset the length counter
}
if (($ordVal>=33 && $ordVal<=60) || ($ordVal>=62 && $ordVal<=126) || $ordVal==9 || $ordVal==32) {
$newVal.=$char;
$newVal.=$char; // This character is ok, add it to the message
$len++;
} else {
$newVal.=sprintf('=%02X',$ordVal);
$newVal.=sprintf('=%02X',$ordVal); // Special character, needs to be encoded
$len+=3;
}
}
$newVal = ereg_replace(chr(32).'$','=20',$newVal); // replaces a possible SPACE-character at the end of a line
$newVal = ereg_replace(chr(9).'$','=09',$newVal); // replaces a possible TAB-character at the end of a line
$newVal = ereg_replace(chr(32).'$','=20',$newVal); // Replaces a possible SPACE-character at the end of a line
$newVal = ereg_replace(chr(9).'$','=09',$newVal); // Replaces a possible TAB-character at the end of a line
$newString.=$newVal.chr(13).chr(10);
}
return ereg_replace(chr(13).chr(10).'$','',$newString);
......
......@@ -294,7 +294,7 @@ class t3lib_htmlmail {
* @return [type] ...
*/
function encodeMsg($content) {
return $this->alt_base64 ? $this->makeBase64($content) : $this->quoted_printable($content);
return $this->alt_base64 ? $this->makeBase64($content) : t3lib_div::quoted_printable($content, 76);
}
/**
......@@ -1369,41 +1369,15 @@ class t3lib_htmlmail {
}
/**
* [Describe function...]
* Implementation of quoted-printable encode.
* This function was a duplicate of t3lib_div::quoted_printable, thus it's going to be removed.
*
* @param [type] $string: ...
* @return [type] ...
* @param string Content to encode
* @return string The QP encoded string
* @obsolete
*/
function quoted_printable($string) {
// This functions is buggy. It seems that in the part where the lines are breaked every 76th character, that it fails if the break happens right in a quoted_printable encode character!
$newString = "";
$theLines = explode(chr(10),$string); // Break lines. Doesn't work with mac eol's which seems to be 13. But 13-10 or 10 will work
while (list(,$val)=each($theLines)) {
$val = ereg_replace(chr(13)."$","",$val); // removes possible character 13 at the end of line
$newVal = "";
$theValLen = strlen($val);
$len = 0;
for ($index=0;$index<$theValLen;$index++) {
$char = substr($val,$index,1);
$ordVal =Ord($char);
if ($len>(76-4) || ($len>(66-4)&&$ordVal==32)) {
$len=0;
$newVal.="=".chr(13).chr(10);
}
if (($ordVal>=33 && $ordVal<=60) || ($ordVal>=62 && $ordVal<=126) || $ordVal==9 || $ordVal==32) {
$newVal.=$char;
$len++;
} else {
$newVal.=sprintf("=%02X",$ordVal);
$len+=3;
}
}
$newVal = ereg_replace(chr(32)."$","=20",$newVal); // replaces a possible SPACE-character at the end of a line
$newVal = ereg_replace(chr(9)."$","=09",$newVal); // replaces a possible TAB-character at the end of a line
$newString.=$newVal.chr(13).chr(10);
}
return $newString;
return t3lib_div::quoted_printable($string, 76);
}
/**
......
......@@ -2379,7 +2379,7 @@ class t3lib_TCEmain {
if (is_array($TCA[$table]) && $id) {
$res = $GLOBALS['TYPO3_DB']->exec_SELECTquery('*', $table, 'uid='.intval($id));
if ($row = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($res)) {
// Traverse arrow of values that was inserted into the database and compare with the actually stored value:
// Traverse array of values that was inserted into the database and compare with the actually stored value:
$errorString = array();
foreach($fieldArray as $key => $value) {
if ($this->checkStoredRecords_loose && !$value && !$row[$key]) {
......
......@@ -104,20 +104,16 @@ class SC_alt_intro {
$TBE_TEMPLATE->divClass = $TBE_TEMPLATE->bodyTagId;
$this->content.= $TBE_TEMPLATE->startPage('About modules');
$this->content.= sprintf('
<h1>%s<br />%s</h1>
$this->content .= '
<h1>TYPO3 '.TYPO3_version.'<br />'.$LANG->getLL('introtext').'</h1>
<p>%s</p>
<p>&nbsp;%s</p>
<p>%s</p>',
'TYPO3 '.TYPO3_version,
$LANG->getLL('introtext'),
t3lib_BEfunc::TYPO3_copyRightNotice(),
$this->displayWarningIfPasswordIsDefault(),
$LANG->getLL('introtext2')
);
<p>'.t3lib_BEfunc::TYPO3_copyRightNotice().'</p>';
$this->content .= '
'.t3lib_BEfunc::displayWarningMessages();
$this->content .= '
<p>'.$LANG->getLL('introtext2').'</p>';
// Printing the description of the modules available
......@@ -151,23 +147,6 @@ class SC_alt_intro {
function printContent() {
echo $this->content;
}
/**
* Display a warning message if the Install Tool Password is still the default: joh316
* The warning is only displayed to admin users
*
* @return void
*/
function displayWarningIfPasswordIsDefault() {
if($GLOBALS['BE_USER']->isAdmin() && $GLOBALS['TYPO3_CONF_VARS']['BE']['installToolPassword']==md5('joh316')) {
return '&nbsp;</p>
<p class="typo3-red" style="font-weight: bold;">Security warning: The password of your install tool is still "joh316" which is the default.<br />
It is highly recommended to change this immediately.<br />
&nbsp;';
} else {
return '';
}
}
}
// Include extension?
......
......@@ -139,6 +139,8 @@ class alt_menu_functions {
$link_sub = 0;
}
$link = t3lib_div::resolveBackPath($link);
$moduleKey = $moduleName.'_tab';
$moduleCSSId = 'ID_'.t3lib_div::md5int($moduleName);
......@@ -203,7 +205,7 @@ class alt_menu_functions {
</tr>';
}
$link = $subInfo['script'];
$link = t3lib_div::resolveBackPath($subInfo['script']);
$prefix=$this->getNavFramePrefix ($moduleInfo, $subInfo);
$subKey = $moduleName.'_'.$subName.'_tab';
......@@ -247,7 +249,8 @@ class alt_menu_functions {
if (!$BE_USER->uc['condensedMode'] && $moduleInfo['navFrameScript']) {
// use special nav script from sub module, otherwise from the main module
$subNavFrameScript = $subInfo['navFrameScript'] ? $subInfo['navFrameScript'] : $moduleInfo['navFrameScript'] ;
$subNavFrameScript = $subInfo['navFrameScript'] ? $subInfo['navFrameScript'] : $moduleInfo['navFrameScript'];
$subNavFrameScript = t3lib_div::resolveBackPath($subNavFrameScript);
// add GET params for sub module to the nav script
$subNavFrameScript = $this->wrapLinkWithAB($subNavFrameScript).$subInfo['navFrameScriptParam'];
......@@ -405,12 +408,15 @@ class alt_menu_functions {
$prefix = '';
$navFrameScriptParam = $subModuleInfo['navFrameScriptParam'] ? $subModuleInfo['navFrameScriptParam'] : $moduleInfo['navFrameScriptParam'];
if ($moduleInfo['navFrameScript']) {
$navFrameScript = t3lib_div::resolveBackPath($moduleInfo['navFrameScript']);
$navFrameScript = $this->wrapLinkWithAB($navFrameScript);
if ($BE_USER->uc['condensedMode']) {
$prefix=$this->wrapLinkWithAB($moduleInfo['navFrameScript']).$navFrameScriptParam.'&currentSubScript=';
$prefix=$navFrameScript.$navFrameScriptParam.'&currentSubScript=';
} else {
$prefix='alt_mod_frameset.php?'.
'fW="+top.TS.navFrameWidth+"'.
'&nav="+top.TS.PATH_typo3+"'.rawurlencode($this->wrapLinkWithAB($moduleInfo['navFrameScript']).$navFrameScriptParam).
'&nav="+top.TS.PATH_typo3+"'.rawurlencode($navFrameScript.$navFrameScriptParam).
'&script=';
}
}
......
......@@ -89,12 +89,12 @@ class recordHistory {
var $listType = 0; // This value determines the kind of list build. The variable is used as a parameter from some functions.
// Internal, static. GPvars:
var $sh_uid; // sh_uid is the id-number of the sys_history log item to SHOW
var $sh_uid; // sh_uid is the id-number of the sys_history log item to SHOW
var $element; // Element reference, syntax [tablename]:[uid]
var $saveState; // Saving states: Points to a sys_history UID which should be saved.
var $returnUrl; // Return URL - kept in links, used to link back to calling module.
var $revert; // String identifying mode of reverting: Either all fields or only a single field to revert. See function revertToPreviousValues()
var $sumUp; // Generally used as a pointer to a sys_history uid as a state.
var $sumUp; // Generally used as a pointer to a sys_history uid as a state.
var $doReturn; // If set, function revertToPreviousValues() will perform a redirect to returnUrl
......
......@@ -1646,7 +1646,7 @@ class tx_cms_layout extends recordList {
if ($row['CType']=='text' || $row['CType']=='textpic') {
if ($row['bodytext']) {
$this->getProcessedValue('tt_content','text_align,text_face,text_size,text_color,text_properties',$row,$infoArr);
$out.= $this->infoGif($infoArr).
$out.= $this->infoGif($infoArr).
$this->linkEditContent($this->renderText($row['bodytext']),$row).'<br />';
}
}
......@@ -2107,7 +2107,7 @@ class tx_cms_layout extends recordList {
* @return string Output string
*/
function renderText($input) {
$input = strip_tags($input);
$input = $this->strip_tags($input, true);
$input = t3lib_div::fixed_lgd_cs($input,1500);
return nl2br(htmlspecialchars(trim($this->wordWrapper($input))));
}
......@@ -2534,6 +2534,30 @@ class tx_cms_layout extends recordList {
// Return the content:
return $out;
}
/**
* Enhancement for the strip_tags function that provides the feature to fill in empty tags.
* Example <link email@hostname.com></link> is accepted by TYPO3 but would not displayed in the Backend otherwise.
*
* @param string Input string
* @param boolean If true, empty tags will be filled with the first attribute of the tag before.
* @return string Input string with all HTML and PHP tags stripped
*/
function strip_tags($input, $fillEmptyContent=false) {
if($fillEmptyContent && ereg('><', $input)) {
$matches = explode('</', $input);
foreach($matches as $key=>$val) {
if($key==count($matches)-1) { continue; } // skip the last match
if(ereg('>$', $val)) {
$tagContent = ereg_replace('.*<[^ ]* ([^ ]*).*>', '\1', $val); // Returns the first attribut of a given tag
$matches[$key] .= $tagContent;
}
}
$output = implode('</', $matches);
}
return strip_tags($output);
}
}
......
......@@ -912,7 +912,7 @@ class tslib_cObj {
}
// Image Object supplied:
if (is_array($imgConf) || $imgConf['file']) {
if (is_array($imgConf)) {
if ($this->image_effects[$image_effects]) {
$imgConf['file.']['params'].= ' '.$this->image_effects[$image_effects];
}
......
......@@ -2931,6 +2931,9 @@ if (version == "n3") {
*/
function makeSimulFileName($inTitle,$page,$type,$addParams='',$no_cache='') {
$titleChars = intval($this->config['config']['simulateStaticDocuments_addTitle']);
// Default value is 30 but values > 1 will be override this
if($titleChars==1) { $titleChars = 30; }
$out = '';
if ($titleChars) {
$out = $this->fileNameASCIIPrefix($inTitle, $titleChars);
......
......@@ -5,32 +5,67 @@ these differences:
--- gmenu_layers.php 2005-03-27 23:23:20.000000000 +0200
+++ tmenu_layers.php 2005-03-27 23:23:13.000000000 +0200
@@ -25,9 +25,9 @@
* This copyright notice MUST APPEAR in all copies of the script!
***************************************************************/
/**
- * Contains the GMENU_LAYERS extension class, tslib_gmenu_layers
+ * Contains the TMENU_LAYERS extension class, tslib_tmenu_layers
*
- * $Id$
+ * $Id$
* Revised for TYPO3 3.6 June/2003 by Kasper Skaarhoj
* XHTML compliant
*
@@ -38,7 +38,7 @@
*
*
*
- * 84: class tslib_gmenu_layers extends tslib_gmenu
+ * 84: class tslib_tmenu_layers extends tslib_tmenu
* 116: function extProc_init()
* 134: function extProc_RO($key)
* 150: function extProc_beforeLinking($key)
@@ -72,8 +72,8 @@
28c28
< * GMENU_LAYERS extension classs
---
> * TMENU_LAYERS extension classs
37c37,40
< class tslib_gmenu_layers extends tslib_gmenu {
---
> class tslib_tmenu_layers extends tslib_tmenu {
>
>
> // FULL DUPLICATE FROM gmenu_layers BEGIN:
39d41
< // FULL DUPLICATE TO tmenu_layers BEGIN:
411d412
< // FULL DUPLICATE TO tmenu_layers END:
413c414,417
< $GLOBALS["TSFE"]->tmpl->menuclasses.=",gmenu_layers";
---
> // FULL DUPLICATE FROM gmenu_layers END:
>
>
> $GLOBALS["TSFE"]->tmpl->menuclasses.=",tmenu_layers";
415,416c419,420
< if (defined("TYPO3_MODE") && $TYPO3_CONF_VARS[TYPO3_MODE]["XCLASS"]["media/scripts/gmenu_layers.php"]) {
< include_once($TYPO3_CONF_VARS[TYPO3_MODE]["XCLASS"]["media/scripts/gmenu_layers.php"]);
---
> if (defined("TYPO3_MODE") && $TYPO3_CONF_VARS[TYPO3_MODE]["XCLASS"]["media/scripts/tmenu_layers.php"]) {
> include_once($TYPO3_CONF_VARS[TYPO3_MODE]["XCLASS"]["media/scripts/tmenu_layers.php"]);
/**
- * Class extending tslib_gmenu for the creation of DHTML menus
- * NOTICE: The contents of this class is made so that it can be copied EXACTLY AS IS to the tmenu_layers class! See notes in class (for BEGIN/END) and also "diff.xmenu_layers.txt"
+ * Class extending tslib_tmenu for the creation of text based DHTML menus
+ * NOTICE: The contents of this class is copied EXACTLY AS IS from gmenu_layers class! See notes in class (for BEGIN/END) and also 'diff.xmenu_layers.txt'
*
* @author Kasper Skaarhoj <kasperYYYY@typo3.com>
* @package TYPO3
@@ -81,9 +81,9 @@
* @link http://typo3.org/doc.0.html?&tx_extrepmgm_pi1[extUid]=270&tx_extrepmgm_pi1[tocEl]=385&cHash=648519dd66
* @see diff.xmenu_layers.txt
*/
-class tslib_gmenu_layers extends tslib_gmenu {
+class tslib_tmenu_layers extends tslib_tmenu {
-// FULL DUPLICATE TO tmenu_layers BEGIN:
+// FULL DUPLICATE FROM gmenu_layers BEGIN:
var $GMENU_fixKey='layers';
var $divLayers=Array();
@@ -460,13 +460,13 @@
}
}
-// FULL DUPLICATE TO tmenu_layers END:
+// FULL DUPLICATE FROM gmenu_layers END:
-$GLOBALS['TSFE']->tmpl->menuclasses.=',gmenu_layers';
+$GLOBALS['TSFE']->tmpl->menuclasses.=',tmenu_layers';
-if (defined('TYPO3_MODE') && $TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['media/scripts/gmenu_layers.php']) {
- include_once($TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['media/scripts/gmenu_layers.php']);
+if (defined('TYPO3_MODE') && $TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['media/scripts/tmenu_layers.php']) {
+ include_once($TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['media/scripts/tmenu_layers.php']);
}
?>
......@@ -42,11 +42,11 @@
* 116: function extProc_init()
* 134: function extProc_RO($key)
* 150: function extProc_beforeLinking($key)
* 201: function extProc_afterLinking($key)
* 236: function extProc_beforeAllWrap($item,$key)
* 249: function isSetIntval($in)
* 258: function extProc_finish ()
* 434: function extCalcBorderWithin($kind,$integer)
* 205: function extProc_afterLinking($key)
* 240: function extProc_beforeAllWrap($item,$key)
* 253: function isSetIntval($in)
* 262: function extProc_finish ()
* 444: function extCalcBorderWithin($kind,$integer)
*
* TOTAL FUNCTIONS: 8
* (This index is automatically created/updated by the extension "extdeveval")
......@@ -73,7 +73,7 @@
/**
* Class extending tslib_gmenu for the creation of DHTML menus
* NOTICE: The contents of this class is made so that it can be copied EXACTLY AS IS to the tmenu_layers class! See noties in class (for BEGIN/END) and also "diff.xmenu_layers.txt"
* NOTICE: The contents of this class is made so that it can be copied EXACTLY AS IS to the tmenu_layers class! See notes in class (for BEGIN/END) and also "diff.xmenu_layers.txt"
*
* @author Kasper Skaarhoj <kasperYYYY@typo3.com>
* @package TYPO3
......@@ -221,6 +221,7 @@ GLV_restoreMenu["'.$this->WMid.'"] = "'.$this->WMactiveKey.'";
GL_getObjCss("Menu'.$this->WMid.$key.'").visibility = "hidden";';
$this->WMlastKey = 'Menu'.$this->WMid.$key;
}
if (!$this->mconf['lockPosition_addSelf']) {
$this->WMy+=(strcmp($this->mconf['setFixedHeight'],'')?$this->mconf['setFixedHeight']:$this->I['val']['output_h'])+intval($this->mconf['lockPosition_adjust']);
$this->WMx+=(strcmp($this->mconf['setFixedWidth'],'')?$this->mconf['setFixedWidth']:$this->I['val']['output_w'])+intval($this->mconf['lockPosition_adjust']);
......@@ -459,9 +460,9 @@ GLV_timeout_count++;
}
}
// FULL DUPLICATE TO tmenu_layers END:
$GLOBALS['TSFE']->tmpl->menuclasses.=',gmenu_layers';
if (defined('TYPO3_MODE') && $TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['media/scripts/gmenu_layers.php']) {
......
......@@ -39,14 +39,14 @@
*
*
* 84: class tslib_tmenu_layers extends tslib_tmenu
* 117: function extProc_init()
* 135: function extProc_RO($key)
* 151: function extProc_beforeLinking($key)
* 202: function extProc_afterLinking($key)
* 237: function extProc_beforeAllWrap($item,$key)
* 250: function isSetIntval($in)
* 259: function extProc_finish ()
* 435: function extCalcBorderWithin($kind,$integer)
* 116: function extProc_init()
* 134: function extProc_RO($key)
* 150: function extProc_beforeLinking($key)
* 205: function extProc_afterLinking($key)
* 240: function extProc_beforeAllWrap($item,$key)
* 253: function isSetIntval($in)
* 262: function extProc_finish ()
* 444: function extCalcBorderWithin($kind,$integer)
*
* TOTAL FUNCTIONS: 8
* (This index is automatically created/updated by the extension "extdeveval")
......@@ -73,7 +73,7 @@
/**
* Class extending tslib_tmenu for the creation of text based DHTML menus
* NOTICE: The contents of this class is copied EXACTLY AS IS from gmenu_layers class! See noties in class (for BEGIN/END) and also 'diff.xmenu_layers.txt'
* NOTICE: The contents of this class is copied EXACTLY AS IS from gmenu_layers class! See notes in class (for BEGIN/END) and also 'diff.xmenu_layers.txt'
*
* @author Kasper Skaarhoj <kasperYYYY@typo3.com>
* @package TYPO3
......@@ -83,7 +83,6 @@
*/
class tslib_tmenu_layers extends tslib_tmenu {
// FULL DUPLICATE FROM gmenu_layers BEGIN:
var $GMENU_fixKey='layers';
......@@ -186,7 +185,7 @@ GLV_restoreMenu["'.$this->WMid.'"] = "'.$this->WMactiveKey.'";
}
$this->I['linkHREF']['onMouseout'].=$event;
} else {
$this->I['linkHREF']['onMouseover']='GL_hideAll("'.$this->WMid.'");'.$this->I['linkHREF']['onMouseover'];
$this->I['linkHREF']['onMouseover'] = 'GL_hideAll("'.$this->WMid.'");'.$this->I['linkHREF']['onMouseover'];
// IESelectFix - Hides IFRAME layer below menu
if ($this->mconf['ieSelectFix']) $this->I['linkHREF']['onMouseover'] = $this->I['linkHREF']['onMouseover'].'GL_iframer(\''.$this->WMid.'\',\'\',false);';
$event='GL_resetAll("'.$this->WMid.'");';
......
......@@ -2996,7 +2996,8 @@ From sub-directory:
$ex_rows.='<td>'.$verifyImgCode.'</td>';
$ex_rows.='</tr>';
$ex_rows.=$this->getTwinImageMessage("", t3lib_div::formatSize($destImg["filesize"]).", ".$destImg[0]."x".$destImg[1]." pixels", t3lib_div::formatSize($verifyImg["filesize"]).", ".$verifyImg[0]."x".$verifyImg[1]." pixels");
$ex_rows.=$this->getTwinImageMessage('', 'Your server:', 'Reference:');
$ex_rows.=$this->getTwinImageMessage('', t3lib_div::formatSize($destImg['filesize']).', '.$destImg[0].'x'.$destImg[1].' pixels', t3lib_div::formatSize($verifyImg['filesize']).', '.$verifyImg[0].'x'.$verifyImg[1].' pixels');
if ($destImg["filesize"]!=$verifyImg["filesize"]) {
if (intval($destImg["filesize"]) && abs(($verifyImg["filesize"]/$destImg["filesize"])-1) < 0.05) {
......
......@@ -672,9 +672,9 @@ $str.=$this->docBodyTagBegin().
$this->parseTime().
($this->form?'
</form>':'');
if ($this->docType!='xhtml_frames') {
$str .= ($this->divClass?'
<!-- Wrapping DIV-section for whole page END -->
......@@ -1847,4 +1847,4 @@ $LANG->init($BE_USER->uc['lang']);
// The template is loaded
// ******************************
$TBE_TEMPLATE = t3lib_div::makeInstance('template');
?>
?>
\ No newline at end of file
Supports Markdown
0% or