*** empty log message ***
authorKasper Skårhøj <kasper@typo3.org>
Thu, 29 Jan 2004 17:31:55 +0000 (17:31 +0000)
committerKasper Skårhøj <kasper@typo3.org>
Thu, 29 Jan 2004 17:31:55 +0000 (17:31 +0000)
git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@125 709f56b5-9817-0410-a4d7-c38de5d9e867

TODO.txt
t3lib/class.t3lib_div.php
t3lib/class.t3lib_extfilefunc.php
t3lib/class.t3lib_install.php
t3lib/class.t3lib_tceforms.php
t3lib/config_default.php
typo3/index.php
typo3/template.php

index 59ba266..224af4d 100755 (executable)
--- a/TODO.txt
+++ b/TODO.txt
@@ -91,6 +91,7 @@ TCEmain/TCEforms for FlexForms:
        - Displaying partial branch of the data structure (and to a certain level)
        - FlexForms cannot be possible if the record is not saved? No, should be ok, BUT a data source can of course not be referenced from another field since that fields value is NOT actually there! So only for fixed references to flex form definitions can this be done.
        - If you have a multiple selector field (or checkbox array) an array of objects could be forced to reflect exactly the fieldnames there 1-1 thus giving us configuration option possibilities per field! For newloginbox extension: You set up a selector box with multiple choice where you can select fields from the fe_users table to display. In an array of elements in the DS you configure that the VALUE of that field is dictating that the same number of objects should be shown for configuration of each field. A "hidden" value would point each object to which value from the field it was for! The same would be very useful for M-M lists of records.
+       - Implement "<displayCond>EXT:templavoila:LOADED:true</displayCond>" for flexforms. (needed for mininews!!)
                
                
 TCEforms:
index 76d99fb..3fb9ded 100755 (executable)
@@ -1085,8 +1085,8 @@ class t3lib_div {
         * @return      boolean         Returns true if the $email address (input string) is valid; Has a "@", domain name with at least one period and only allowed a-z characters.
         */
        function validEmail($email)     {
-               if (strstr($email,' '))  return 0;
-               return ereg('^[A-Za-z0-9\._-]*[@][A-Za-z0-9\._-]*[\.].[A-Za-z0-9]*$',$email) ? 1 : 0;
+               if (strstr($email,' '))  return FALSE;
+               return ereg('^[A-Za-z0-9\._-]+[@][A-Za-z0-9\._-]*[\.].[A-Za-z0-9]*$',$email) ? TRUE : FALSE;
        }
 
        /**
index 8eadb04..8bf9f0d 100755 (executable)
@@ -798,7 +798,7 @@ top.goToModule("file_list");
        function func_edit($cmds)       {
                if (!$this->isInit) return false;
                $theTarget = $cmds['target'];
-               $content = stripslashes($cmds['data']);
+               $content = $cmds['data'];       // Slashes ARE stripped earlier in this function; t3lib_div::stripSlashesOnArray($this->datamap);
                $extList = $GLOBALS['TYPO3_CONF_VARS']['SYS']['textfile_ext'];
                $type = filetype($theTarget);
                if ($type=='file')      {               // $type MUST BE file
index 2753bba..2c323cc 100755 (executable)
@@ -1650,6 +1650,7 @@ Number of files at a time:
                reset($paths);
                while(list($k,$v)=each($paths)) {
                        reset($programs);
+                       if (!ereg('\/$',$v)) $v.='/';
                        while(list(,$filename)=each($programs)) {
 #                              if (@file_exists($v) && @is_file($v.$filename.$isExt))    {       // file_exists was necessary on windows, because is_file issued a warning if the path was not correct.
                                if($this->_checkImageMagick_getVersion($v.$filename.$isExt) > 0 ) {
@@ -1657,9 +1658,13 @@ Number of files at a time:
                                }
                        }
                        if (count($index[$v])>=3)       {$this->config_array["im"]=1;}
-                       if ($index[$v]["composite"] && !$index[$v]["combine"])  {
+                       
+                       if ($index[$v]["composite"] && !$index[$v]["combine"])  {
                                $this->config_array["im_combine_filename"]="composite";
-                       }
+                       } elseif (!$index[$v]["composite"] && $index[$v]["combine"]) {
+                               $this->config_array["im_combine_filename"]="combine";
+                       }       
+                                       
                        if (isset($index[$v]["convert"]) && $this->checkIMlzw)  {
                                $index[$v]["gif_capability"] = "".$this->_checkImageMagickGifCapability($v);
                        }
@@ -2395,8 +2400,8 @@ Number of files at a time:
         */
        function getGDSoftwareInfo()    {
                return trim("
-               You can get GDLib in the PNG version from ".$this->linkIt("http://www.boutell.com/gd/")." or you can get the patched GIF version from ".$this->linkIt("http://www.typo3.com/?software").".<BR>FreeType is for download at ".$this->linkIt("http://www.freetype.org/")."</a>.
-               If you're using a Windows server, you'll be happy to know that all this is compiled into a PHP4-distribution for download at ".$this->linkIt("http://www.php4win.de/")."</a>.
+               You can get GDLib in the PNG version from ".$this->linkIt("http://www.boutell.com/gd/").".<BR>FreeType is for download at ".$this->linkIt("http://www.freetype.org/")."</a>.
+               Generally, software for TYPO3 is found at ".$this->linkIt("http://typo3.sunsite.dk/software/")." and packages listed at ".$this->linkIt("http://typo3.org/1274.0.html").".
                ");
        }
 
index 263f4d8..6caaf8e 100755 (executable)
@@ -1712,6 +1712,8 @@ class t3lib_TCEforms      {
                $PA['table']=$table;
                $PA['field']=$field;
                $PA['row']=$row;
+               
+               $PA['pObj']=&$this;
 
                return t3lib_div::callUserFunction($PA['fieldConf']['config']['userFunc'],$PA,$this);
        }
index a2c4783..60be67f 100755 (executable)
@@ -88,8 +88,8 @@ $TYPO3_CONF_VARS = Array(
                )
        ),
        'BE' => Array(          // Backend Configuration.
-               'unzip_path' => '',                                             // Path to unzip.
-               'diff_path' => 'diff',                                  // Path to diff. For Windows this program can be downloaded here: http://www.e-missions.de/tools/diff.exe (or from www.typo3.com/?software)
+               'unzip_path' => '',                                             // Path to "unzip".
+               'diff_path' => 'diff',                                  // Path to "diff". For Windows this program can be downloaded here: http://unxutils.sourceforge.net/
                'fileadminDir' => 'fileadmin/',                 // Path to the fileadmin dir. This is relative to PATH_site. (Automatically mounted for admin-users if set)
                'RTE_imageStorageDir' => 'uploads/',    // Storage directory for Rich Text Editor files
                'staticFileEditPath' => 'fileadmin/static/',    // Path to directory with static files for editing (see table sys_staticfiles_edit). Relative to PATH_site.
index bbf895f..862747a 100755 (executable)
@@ -174,6 +174,9 @@ class SC_index {
                        // Checking, if we should make a redirect.
                        // Might set JavaScript in the header to close window.
                $this->checkRedirect();
+
+                       // Initialize interface selectors:                      
+               $this->makeInterfaceSelectorBox();
                
                        // Creating form based on whether there is a login or not:              
                if (!$BE_USER->user['uid'])     {
@@ -197,9 +200,6 @@ class SC_index {
                        // Add login form:
                $this->content.=$this->wrapLoginForm($loginForm);
 
-                       // Initialize interface selectors:                      
-               $this->makeInterfaceSelectorBox();
-
                        // Ending form:
                $this->content.= '
                        <input type="hidden" name="userident" value="" />
@@ -453,7 +453,7 @@ class SC_index {
                $this->interfaceSelector = '';
                $this->interfaceSelector_hidden='';
                $this->interfaceSelector_jump = '';
-               
+#debug($this->redirect_url);           
                        // If interfaces are defined AND no input redirect URL in GET vars:
                if ($TYPO3_CONF_VARS['BE']['interfaces'] && !$this->redirect_url)       {
                        $parts = t3lib_div::trimExplode(',',$TYPO3_CONF_VARS['BE']['interfaces']);
index 1a77f3b..77c1af4 100755 (executable)
@@ -214,6 +214,10 @@ class template {
 
                        // Setting default scriptID:
                $this->scriptID = ereg_replace('^.*\/(sysext|ext)\/','ext/',substr(PATH_thisScript,strlen(PATH_site)));
+               if (TYPO3_mainDir!='typo3/' && substr($this->scriptID,0,strlen(TYPO3_mainDir)) == TYPO3_mainDir)        {
+                       $this->scriptID = 'typo3/'.substr($this->scriptID,strlen(TYPO3_mainDir));       // This fixes if TYPO3_mainDir has been changed so the script ids are STILL "typo3/..."
+               }
+               
                $this->bodyTagId = ereg_replace('[^[:alnum:]-]','-',$this->scriptID);
 
                        // Individual configuration per script? If so, make a recursive merge of the arrays: