Close to the final changes before the release of TYPO3 3.6.0RC1
authorKasper Skårhøj <kasper@typo3.org>
Tue, 23 Dec 2003 02:28:27 +0000 (02:28 +0000)
committerKasper Skårhøj <kasper@typo3.org>
Tue, 23 Dec 2003 02:28:27 +0000 (02:28 +0000)
git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@107 709f56b5-9817-0410-a4d7-c38de5d9e867

t3lib/class.t3lib_matchcondition.php
t3lib/class.t3lib_tceforms.php
t3lib/class.t3lib_tsfebeuserauth.php
t3lib/class.t3lib_tsparser_ext.php
typo3/browse_links.php
typo3/file_upload.php
typo3/mod/tools/em/index.php

index 1121bff..5b1170b 100644 (file)
@@ -88,6 +88,7 @@ class t3lib_matchCondition {
         * @link http://typo3.org/doc.0.html?&tx_extrepmgm_pi1[extUid]=270&tx_extrepmgm_pi1[tocEl]=292&cHash=c6c7d43d2f
         */
        function match($string) {
+
                if ($this->matchAll)    return true;
                if (count($this->matchAlternative))     {
                        return in_array($string,$this->matchAlternative);
index b154f93..263f4d8 100755 (executable)
@@ -1263,7 +1263,7 @@ class t3lib_TCEforms      {
                        $item.= $this->dbFileIcons($PA['itemFormElName'],'file',implode(',',$tempFT),$itemArray,'',$params,$PA['onFocus']);
 
                                // Adding the upload field:
-                       if ($this->edit_docModuleUpload)        $item.='<input type="file" name="'.$PA['itemFormElName_file'].'"'.$this->formWidth().' />';
+                       if ($this->edit_docModuleUpload)        $item.='<input type="file" name="'.$PA['itemFormElName_file'].'"'.$this->formWidth().' size="60" />';
                }
                
                        // If the element is of the internal type "db":
index 6f1e3b2..d93a9a0 100755 (executable)
@@ -160,7 +160,7 @@ class t3lib_tsfeBeUserAuth extends t3lib_beUserAuth {
                                        $this->extFw('<strong>'.$this->extGetLL('adminOptions').'</strong>')).$this->extFw(': '.$this->user['username']).
                                        '</td><td bgcolor="#9BA1A8"><img src="clear.gif" width="10" height="1" alt="" /></td><td bgcolor="#9BA1A8"><input type="hidden" name="TSFE_ADMIN_PANEL[display_top]" value="'.$this->uc['TSFE_adminConfig']['display_top'].'" />'.($this->extNeedUpdate?'<input type="submit" value="'.$this->extGetLL('update').'" />':'').'</td></tr>';
 
-               $out='<form name="TSFE_ADMIN_PANEL_FORM" action="'.htmlspecialchars(t3lib_div::getIndpEnv('REQUEST_URI')).'#TSFE_ADMIN" method="post"><table border="0" cellpadding="0" cellspacing="0" bgcolor="#F6F2E6">'.$header.$out.'</table></form>';
+               $out='<form name="TSFE_ADMIN_PANEL_FORM" action="'.htmlspecialchars(t3lib_div::getIndpEnv('REQUEST_URI')).'#TSFE_ADMIN" method="post" style="margin: 0 0 0 0;"><table border="0" cellpadding="0" cellspacing="0" bgcolor="#F6F2E6">'.$header.$out.'</table></form>';
                $out='<a name="TSFE_ADMIN"></a><table border="0" cellpadding="1" cellspacing="0" bgcolor="black"><tr><td>'.$out.'</td></tr></table>';
                if ($this->uc['TSFE_adminConfig']['display_top'])       {
                        $out.='<script type="text/javascript" src="t3lib/jsfunc.evalfield.js"></script>';
index ba126ef..682205b 100755 (executable)
@@ -1236,7 +1236,7 @@ class t3lib_tsparser_ext extends t3lib_TStemplate {
                                                                                }
                                                                                        // Upload?
                                                                                $p_field.='<BR>';
-                                                                               $p_field.='<input type="file" name="upload_'.$fN.'"'.$GLOBALS["TBE_TEMPLATE"]->formWidth().' onChange="uFormUrl('.$aname.')">';
+                                                                               $p_field.='<input type="file" name="upload_'.$fN.'"'.$GLOBALS["TBE_TEMPLATE"]->formWidth().' onChange="uFormUrl('.$aname.')" size="50" />';
                                                                        }
                                                                break;
                                                                case 'small':
index 2f24cc8..a76c339 100755 (executable)
@@ -2054,7 +2054,7 @@ class SC_browse_links {
                        
                        // Traverse the number of upload fields (default is 3):
                for ($a=1;$a<=$count;$a++)      {
-                       $code.='<input type="file" name="upload_'.$a.'"'.$this->doc->formWidth(30).' />
+                       $code.='<input type="file" name="upload_'.$a.'"'.$this->doc->formWidth(35).' size="50" />
                                <input type="hidden" name="file[upload]['.$a.'][target]" value="'.htmlspecialchars($path).'" />
                                <input type="hidden" name="file[upload]['.$a.'][data]" value="'.$a.'" /><br />';
                }
index d72e479..7ca7f68 100755 (executable)
@@ -196,8 +196,9 @@ class SC_file_upload {
                        <div id="c-upload">
                ';
                for ($a=0;$a<$this->number;$a++)        {
+                               // Adding 'size="50" ' for the sake of Mozilla!
                        $code.='
-                               <input type="file" name="upload_'.$a.'"'.$this->doc->formWidth(35).' onclick="changed=1;" />
+                               <input type="file" name="upload_'.$a.'"'.$this->doc->formWidth(35).' size="50" onclick="changed=1;" />
                                <input type="hidden" name="file[upload]['.$a.'][target]" value="'.htmlspecialchars($this->target).'" />
                                <input type="hidden" name="file[upload]['.$a.'][data]" value="'.$a.'" /><br />
                        ';
index 6d079ec..04ee260 100755 (executable)
@@ -688,7 +688,7 @@ class SC_mod_tools_em_index {
                if ($this->importAtAll())       {
                        $content= '</form><form action="index.php" enctype="'.$GLOBALS["TYPO3_CONF_VARS"]["SYS"]["form_enctype"].'" method="post">
                        Upload extension file (.t3x):<br />
-                               <input type="file" size="40" name="upload_ext_file"><br />
+                               <input type="file" size="60" name="upload_ext_file"><br />
                                ... in location:<br />
                                <select name="CMD[loc]">';
                                if ($this->importAsType("L"))   $content.='<option value="L">Local (../typo3conf/ext/)</option>';