Changeset 1441

Timestamp:

12/10/07 10:01:38 (10 months ago)

Author:

misja

Message:

Misja Hoebe <misja@curverider.co.uk> Merge r1440 in 0.9 branch

Files:

• releases/0.9/lib/typo3/class.t3lib_cs.php (modified) (15 diffs)
• releases/0.9/lib/typo3/class.t3lib_div.php (modified) (22 diffs)
• releases/0.9/lib/typo3/csconvtbl/ascii.tbl (copied) (copied from devel/lib/typo3/csconvtbl/ascii.tbl)

releases/0.9/lib/typo3/class.t3lib_cs.php

@@ -3 +3 @@
-*  Copyright notice
-*
-5
+6
-*  All rights reserved
-*
@@ -25 +25 @@
- * Class for conversion between charsets.
- *
-
+
+
- *
- * @author      Kasper Skaarhoj <kasperYYYY@typo3.com>
@@ -36 +37 @@
- *
- *  136: class t3lib_cs
-503
-22
+488
+07
- *
- *              SECTION: Charset Conversion functions
-75
-15
-32
-78
-21
-54
-88
-38
-83
+60
+00
+17
+63
+06
+39
+73
+23
+68
- *
- *              SECTION: Init functions
-26
-88
-213
-75
+11
+73
+198
+60
- *
- *              SECTION: String operation functions
-46
+31
- * 1384:     function strlen($charset,$string)
-2
-5
-499
-5
+4
+7
+501
+7
- *
- *              SECTION: Internal string operation functions
-5
+7
- *
- *              SECTION: Internal UTF-8 string operation functions
-0
-3
-4
-6
-19
-39
-0
-3
+2
+5
+6
+8
+23
+45
+6
+9
- *
- *              SECTION: Internal EUC string operation functions
-79
-08
-3
-0
-1
+85
+14
+9
+6
+7
- *
- * TOTAL FUNCTIONS: 35
@@ -245 +246 @@
-        );
-
-language (family)
-langfamily
+script
+script
-                        // iso-639:2 language codes, see:
-                        //  http://www.w3.org/WAI/ER/IG/ert/iso639.htm
+                        //  http://www.loc.gov/standards/iso639-2/langcodes.html
-                        //  http://www.unicode.org/onlinedat/languages.html
-                'ar' => 'arabic',
-
-
-
-
-
+
+
+
+
+
+
-                'et' => 'estonian',
-
-
-
+
+
+
+
+
+
-                'gr' => 'greek',
-
-
-
-
-
+
+
+
+
+
+
+
-                'ja' => 'japanese',
-
+       // Greenlandic
-                'ko' => 'korean',
-                'lt' => 'lithuanian',
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-                'th' => 'thai',
-
+            // Ukranian
-                'vi' => 'vietnamese',
-                'zh' => 'chinese',
-                        // MS language codes, see http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vclib/html/_crt_language_strings.asp
+                        // http://msdn.microsoft.com/library/default.asp?url=/library/en-us/wceinternational5/html/wce50conLanguageIdentifiersandLocales.asp
+                'ara' => 'arabic',
+                'bgr' => 'cyrillic',            // Bulgarian
+                'cat' => 'west_european',       // Catalan
-                'chs' => 'simpl_chinese',
-                'cht' => 'trad_chinese',
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                'ell' => 'greek',
-
-
-
-
+
+
+
+
+
+
-                'jpn' => 'japanese',
-                'kor' => 'korean',
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                'trk' => 'turkish',
+                'ukr' => 'cyrillic',    // Ukrainian
-                        // English language names
+                'arabic' => 'arabic',
+                'basque' => 'west_european',
+                'bosnian' => 'east_european',
-                'bulgarian' => 'east_european',
-                'catalan' => 'west_european',
@@ -331 +361 @@
-                'dutch' => 'west_european',
-                'english' => 'west_european',
+                'esperanto' => 'unicode',
+                'estonian' => 'estonian',
+                'faroese' => 'west_european',
+                'farsi' => 'arabic',
-                'finnish' => 'west_european',
-                'french' => 'west_european',
-                'galician' => 'west_european',
-                'german' => 'west_european',
+                'greek' => 'greek',
+                'greenlandic' => 'west_european',
+                'hebrew' => 'hebrew',
+                'hindi' => 'unicode',
-                'hungarian' => 'east_european',
-                'icelandic' => 'west_european',
@@ -340 +378 @@
-                'latvian' => 'west_european',
-                'lettish' => 'west_european',
+                'lithuanian' => 'lithuanian',
+                'malay' => 'west_european',
-                'norwegian' => 'west_european',
+                'persian' => 'arabic',
-                'polish' => 'east_european',
-                'portuguese' => 'west_european',
-                'russian' => 'cyrillic',
-                'romanian' => 'east_european',
+                'serbian' => 'cyrillic',
-                'slovak' => 'east_european',
-                'slovenian' => 'east_european',
-                'spanish' => 'west_european',
-                'svedish' => 'west_european',
-
+
+
-                'ukrainian' => 'cyrillic',
-        );
-
-                // mapping of language (family) names to charsets on Unix
-lang
+script
-                'west_european' => 'iso-8859-1',
-                'estonian' => 'iso-8859-1',
@@ -372 +415 @@
-                'trad_chinese' => 'big5',
-                'vietnamese' => '',
+                'unicode' => 'utf-8',
-        );
-
-                // mapping of language (family) names to charsets on Windows
-lang
+script
-                'east_european' => 'windows-1250',
-                'cyrillic' => 'windows-1251',
@@ -400 +444 @@
-                'ja_jp.ujis' => 'euc-jp',
-                'korean.euc' => 'euc-kr',
+                'sr@Latn' => 'iso-8859-2',
-                'zh_cn' => 'gb2312',
-                'zh_hk' => 'big5',
@@ -450 +495 @@
-                'my' => '',
-                'hi' => 'utf-8',
+                'fo' => 'utf-8',
+                'fa' => 'utf-8',
+                'sr' => 'utf-8'
-        );
-
-                // TYPO3 specific: Array with the iso names used for each system language in TYPO3:
-Empty values means sames
+Missing keys means: same
-        var $isoArray = array(
+                'ba' => 'bs',
+                'br' => 'pt_BR',
+                'ch' => 'zh_CN',
+                'cz' => 'cs',
-                'dk' => 'da',
-                'de' => '',
-                'no' => '',
-                'it' => '',
-                'fr' => '',
-                'es' => '',
-                'nl' => '',
-                'cz' => 'cs',
-                'pl' => '',
-                'si' => 'sl',
-                'fi' => '',
-                'tr' => '',
-                'se' => 'sv',
-
-
-
-
-
-
-
-
-
-
-
+
-                'gr' => 'el',
-                'hk' => 'zh_HK',
-
-
-
-
-
-
+
-                'ua' => 'uk',
-                'jp' => 'ja',
-                'lv' => '',
-                'vn' => 'vi',
-                'ca' => '',
-                'ba' => '', // Bosnian
-                'kr' => '',
-        );
-
@@ -540 +563 @@
-                        // get language
-                list($language,$country) = explode('_',$locale);
-langfamily[$language]))       $language = $this->lang_to_langfamily
+script[$language]))   $script = $this->lang_to_script
-
-                if (TYPO3_OS == 'WIN')  {
-lang_to_charset_windows[$language]
+script_to_charset_windows[$script] ? $this->script_to_charset_windows[$script] : 'window-1252'
-                } else {
-lang_to_charset_unix[$language]
-
-
- ? $cs : 'iso-8859-1'
+script_to_charset_unix[$script] ? $this->script_to_charset_unix[$script] : 'iso-8859-1'
+
+
+
-        }
-
@@ -587 +610 @@
-
-                        case 'iconv':
-TRANSLIT
+IGNORE
-                                if (false !== $conv_str)        return $conv_str;
-                                break;
@@ -646 +669 @@
-                                if (isset($this->twoByteSets[$charset]))        {       // If the charset has two bytes per char
-                                        $ord2 = ord($str{$a+1});
-&
+|
-
-                                        if (isset($this->parsedCharsets[$charset]['local'][$ord]))      {       // If the local char-number was found in parsed conv. table then we use that, otherwise 127 (no char?)
@@ -1519 +1542 @@
-                if ($GLOBALS['TYPO3_CONF_VARS']['SYS']['t3lib_cs_utils'] == 'mbstring' && (float)phpversion() >= 4.3)   {
-                        if ($case == 'toLower') {
-return
+$string =
-                        } else {
-return
+$string =
-                        }
-                } elseif ($charset == 'utf-8')  {
-return
+$string =
-                } elseif (isset($this->eucBasedSets[$charset])) {
-return
+$string =
-                } else {
-                                // treat everything else as single-byte encoding
-return
+$string =
-                }
-
@@ -1544 +1567 @@
-        function specCharsToASCII($charset,$string)     {
-                if ($charset == 'utf-8')        {
-return
+$string =
-                } elseif (isset($this->eucBasedSets[$charset])) {
-return
+$string =
-                } else {
-                                // treat everything else as single-byte encoding
-return
+$string =
-                }
-
@@ -1742 +1765 @@
-                        return mb_strrpos($haystack,$needle,'utf-8');
-                } elseif ($GLOBALS['TYPO3_CONF_VARS']['SYS']['t3lib_cs_utils'] == 'iconv')      {
-$offset,
+
-                }
-

releases/0.9/lib/typo3/class.t3lib_div.php

@@ -28 +28 @@
- * Contains the reknown class "t3lib_div" with general purpose functions
- *
-93 2005/12/26 23:59:37 kurfuerst
+2 2005/10/17 15:48:29 stronk7
- * Revised for TYPO3 3.6 July/2003 by Kasper Skaarhoj
- * XHTML compliant
@@ -467 +467 @@
-         * Returns a new string of max. $chars length.
-         * If the string is longer, it will be truncated and appended with '...'.
-
+I
-         * Usage: 39
-         *
-
-
+$string        
+$chars         
-         * @param       string          String to append to the output if it is truncated, default is '...'
-         * @return      string          new string
@@ -493 +493 @@
-         * If the string is longer, it will be truncated and prepended with '...'.
-         * This works like fixed_lgd, but is truncated in the start of the string instead of the end
-
+I
-         * Usage: 6
-         *
-
-
+$string        
+$chars         
-         * @return      string          new string
-         * @see fixed_lgd()
@@ -510 +510 @@
-         * Usage: 75
-         *
-
-
+$string        
+$chars         
-         * @return      string          New string
-         * @see fixed_lgd()
@@ -624 +624 @@
-         * Match fully qualified domain name with list of strings with wildcard
-         *
-T
-A
+$baseIP is t
+$list is a
-         * @return      boolean         True if a domain name mask from $list matches $baseIP
-         */
@@ -666 +666 @@
-         * Usage: 1
-         *
-
-
+$element       
+$list  
-         * @return      string          new comma-separated list of items
-         */
@@ -682 +682 @@
-         * Ranges are limited to 1000 values per range.
-         *
-
+$list  
-         * @return      string          new comma-separated list of items
-         * @author      Martin Kutschker <martin.kutschker@activesolution.at>
@@ -752 +752 @@
-
-        /**
-         * Returns true if the current TYPO3 version (or compatibility version) is compatible to the input version
-         *
-         * @param       string          Minimum version number required (format x.y.z)
-         * @return      boolean         true or false
-         */
-        function compat_version($verNumberStr)  {
-                global $TYPO3_CONF_VARS;
-                $currVersionStr = $TYPO3_CONF_VARS['SYS']['compat_version']?$TYPO3_CONF_VARS['SYS']['compat_version']:TYPO3_version;
-
-                if (t3lib_div::int_from_ver($currVersionStr) < t3lib_div::int_from_ver($verNumberStr))  {
-                        return FALSE;
-                } else {
-                        return TRUE;
-                }
-        }
-
-        /**
-         * Makes a positive integer hash out of the first 7 chars from the md5 hash of the input
-         * Usage: 5
@@ -798 +781 @@
-         *
-         * @param       string          Accept multiple parameters wich can be comma-separated lists of values and arrays.
-f
+s
-         * @return      string          Returns the list without any duplicates of values, space around values are trimmed
-         */
@@ -905 +888 @@
-        /**
-         * strtoupper which converts danish (and other characters) characters as well
-
+I
-         * Usage: 0
-         *
@@ -920 +903 @@
-         * Change umlaut characters to plain ASCII with normally two character target
-         * Only known characters will be converted, so don't expect a result for any character.
-
+I
-         *
-         * ä => ae, Ö => Oe
@@ -1210 +1193 @@
-         * Usage: 3
-         *
-
-
+$in_array              
+$item  
-         * @return      boolean         true if $item is in the one-dimensional array $in_array
-         * @internal
@@ -2093 +2076 @@
-
-                        // (Proxy support implemented by Arco <arco@appeltaart.mine.nu>)
- 
+
-                        //external URL without error checking.
-                        $ch = curl_init();
@@ -2114 +2097 @@
-                        curl_close ($ch);
-                        return $content;
-
-
-
+
-                        while (!feof($fd))      {
-4096
+5000
-                        }
-                        fclose($fd);
-                        return $content;
-                }
-
-                return false;
-        }
-
@@ -2136 +2115 @@
-         */
-        function writeFile($file,$content)      {
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-
-                        return true;
-                }
-
-                return false;
-        }
-
@@ -2499 +2469 @@
-         */
-        function debug($var="",$brOrHeader=0)   {
-   
-class="typo3-debug" border="0" cellpadding="0" cellspacing="0" bgcolor="white" style="border:0px; margin-top:3px; margin-bottom:3px;"><tr><td style="background-color:#bbbbbb; font-family: verdana,arial; font-weight: bold; font-size: 10px;">'.htmlspecialchars((string)$brOrHeader).'</td></tr><
-       
+ 
+border="0" cellpadding="0" cellspacing="0" bgcolor="white" style="border:0px; margin-top:3px; margin-bottom:3px;"><tr><td style="background-color:#bbbbbb; font-family: verdana,arial; font-weight: bold; font-size: 10px;">'.htmlspecialchars((string)$brOrHeader).'</td></
+ 
-                        for($a=0;$a<abs(intval($brOrHeader));$a++){echo '<br />';}
-                }
@@ -2511 +2481 @@
-                        print_r($var);
-                        echo '</pre>|</b>';
-    
+ 
-                        echo '<b>|'.htmlspecialchars((string)$var).'|</b>';
-                } else {
@@ -2517 +2487 @@
-                }
-
-   
+ 
-                        echo '</td></tr></table>';
-       
+ 
-                        for($a=0;$a<intval($brOrHeader);$a++){echo '<br />';}
-                }
-        }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-