Browse Source

[svn r21152] Minor change to avoid fatal error (return value in write context)

Yannick Warnier 16 years ago
parent
commit
419bd6bf46
1 changed files with 53 additions and 52 deletions
  1. 53 52
      main/metadata/phpdig/config.php

+ 53 - 52
main/metadata/phpdig/config.php

@@ -72,7 +72,8 @@ if ((isset($_SERVER['SCRIPT_NAME'])) && (eregi("config.php",$_SERVER['SCRIPT_NAM
 if ((isset($_SERVER['PATH_TRANSLATED'])) && (eregi("config.php",$_SERVER['PATH_TRANSLATED']))) {
   exit();
 }
-if ((isset(api_get_self())) && (eregi("config.php",api_get_self()))) {
+$self = api_get_self();
+if ((isset($self)) && (eregi('config.php',$self))) {
   exit();
 }
 
@@ -144,20 +145,20 @@ define('PHPDIG_ENCODING', strtolower($charset));
 // replace/edit phpdig_string_subst/phpdig_words_chars for encodings as needed
 // note: you may need to alter table keywords modify keyword varchar(64) binary; for certain encodings
 
-$phpdig_string_subst['iso-8859-1'] = 'A:ÀÁÂÃÄÅ,a:àáâãäå,O:ÒÓÔÕÖØ,o:òóôõöø,E:ÈÉÊË,e:èéêë,C:Ç,c:ç,I:ÌÍÎÏ,i:ìíîï,U:ÙÚÛÜ,u:ùúûü,Y:Ý,y:ÿý,N:Ñ,n:ñ';
-$phpdig_string_subst['iso-8859-2'] = 'A:ÁÂÄá,C:ÇÆÈ,D:ÏÐ,E:ÉËÊÌ,I:ÍÎ,L:Å¥£,N:ÑÒ,O:ÓÔÖÕ,R:ÀØ,S:¦ª©,T:Þ«,U:ÚÜÙÛ,Y:Ý,Z:¬¯®,a:áâäã±,c:çæè,d:ïð,e:éëêì,i:íî,l:åµ³,n:ñò,o:óôöõ,r:àø,s:¶º¹,t:þ»,u:úüùû,y:ý,z:¼¿¾';
+$phpdig_string_subst['iso-8859-1'] = 'A:������,a:������,O:������,o:������,E:����,e:����,C:�,c:�,I:����,i:����,U:����,u:����,Y:�,y:��,N:�,n:�';
+$phpdig_string_subst['iso-8859-2'] = 'A:���á,C:���,D:��,E:����,I:��,L:ť�,N:��,O:����,R:��,S:���,T:ޫ,U:����,Y:�,Z:���,a:����,c:���,d:��,e:����,i:��,l:嵳,n:��,o:����,r:��,s:���,t:��,u:����,y:�,z:���';
 $phpdig_string_subst['iso-8859-6'] = 'Q:Q,q:q';
-//$phpdig_string_subst['iso-8859-7'] = 'é:ßú,á:Ü,å:Ý,ç:Þ,ï:ü,õ:ýû,ù:þ';
-$phpdig_string_subst['iso-8859-7'] = 'á:Á¶Ü,â:Â,ã:Ã,ä:Ä,å:ŸÝ,æ:Æ,ç:Þǹ,è:è,é:ßúɺ,ê:Ê,ë:Ë,ì:Ì,í:Í,î:Î,ï:ü¼Ï,ð:Ð,ñ:Ñ,ó:Óò,ô:Ô,õ:ýûÕ¾,ö:Ö,÷:×,ø:Ø,ù:þÙ¿';
+//$phpdig_string_subst['iso-8859-7'] = '�:��,�:�,�:�,�:�,�:�,�:��,�:�';
+$phpdig_string_subst['iso-8859-7'] = '�:���,�:�,�:�,�:�,�:Ÿ�,�:�,�:�ǹ,�:�,�:��ɺ,�:�,�:�,�:�,�:�,�:�,�:��,�:�,�:�,�:��,�:�,�:��վ,�:�,�:�,�:�,�:�ٿ';
 $phpdig_string_subst['tis-620'] = 'Q:Q,q:q';
-$phpdig_string_subst['windows-1251'] = 'À:à,Á:á,Â:â,Ã:ã,Ä:ä,Å:å,Æ:æ,Ç:ç,È:è,É:é,Ê:ê,Ë:ë,Ì:ì,Í:í,Î:î,Ï:ï,Ð:ð,Ñ:ñ,Ò:ò,Ó:ó,Ô:ô,Õ:õ,Ö:ö,×:÷,Ø:ø,Ù:ù,Ú:ú,Û:û,Ü:ü,Ý:ý,Þ:þ,ß:ÿ';
+$phpdig_string_subst['windows-1251'] = '�:�,�:�,�:�,�:�,�:�,�:�,�:�,�:�,�:�,�:�,�:�,�:�,�:�,�:�,�:�,�:�,�:�,�:�,�:�,�:�,�:�,�:�,�:�,�:�,�:�,�:�,�:�,�:�,�:�,�:�,�:�,�:�';
 
-$phpdig_words_chars['iso-8859-1'] = '[:alnum:]ðþßµ';
-$phpdig_words_chars['iso-8859-2'] = '[:alnum:]ðþßµ';
-$phpdig_words_chars['iso-8859-6'] = '[:alnum:]¤¬»¿ÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖ×ØÙÚàáâãäåæçèéêëìíîïðñò';
-$phpdig_words_chars['iso-8859-7'] = '[:alnum:]ÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÓÔÕÖ×ØÙ¢¸¹º¼¾¿ÚÛáâãäåæçèéêëìíîïðñóôõö÷øùÜÝÞßüýþúûÀà';
-$phpdig_words_chars['tis-620'] = '[:alnum:]¡¢£¤¥¦§¨©ª«¬_®¯°±²³´µ¶·¸¹º»¼½¾¿ÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖ×ØÙÚÜßàáâãäåæçèéêëìíîïðñòóôõö÷øùúû';
-$phpdig_words_chars['windows-1251'] = '[:alnum:]ÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖ×ØÙÚÛÜÝÞßàáâãäåæçèéêëìíîïðñòóôõö÷øùúûüýþÿ';
+$phpdig_words_chars['iso-8859-1'] = '[:alnum:]��ߵ';
+$phpdig_words_chars['iso-8859-2'] = '[:alnum:]��ߵ';
+$phpdig_words_chars['iso-8859-6'] = '[:alnum:]�������������������������������������������������';
+$phpdig_words_chars['iso-8859-7'] = '[:alnum:]�����������������������٢�������������������������������������������';
+$phpdig_words_chars['tis-620'] = '[:alnum:]������������_���������������������������������������������������������������������������';
+$phpdig_words_chars['windows-1251'] = '[:alnum:]����������������������������������������������������������������';
 
 // start is AND OPERATOR, exact is EXACT PHRASE, and any is OR OPERATOR
 define('SEARCH_DEFAULT_MODE','start');  // default search mode (start|exact|any)
@@ -285,55 +286,55 @@ define('FORBIDDEN_EXTENSIONS','\.(rm|ico|cab|swf|css|gz|z|tar|zip|tgz|msi|arj|zo
 
 //----------HTML ENTITIES
 $spec = array( "&amp" => "&",
-               "&agrave" => "à",
-               "&egrave" => "è",
-               "&ugrave" => "ù",
-               "ó" => "ó",
-               "&eacute" => "é",
-               "&icirc" => "î",
-               "&ocirc" => "ô",
-               "&ucirc" => "û",
-               "&ecirc" => "ê",
-               "&ccedil" => "ç",
+               "&agrave" => "�",
+               "&egrave" => "�",
+               "&ugrave" => "�",
+               "ó" => "�",
+               "&eacute" => "�",
+               "&icirc" => "�",
+               "&ocirc" => "�",
+               "&ucirc" => "�",
+               "&ecirc" => "�",
+               "&ccedil" => "�",
                "&#156" => "oe",
                "&gt" => " ",
                "&lt" => " ",
                "&deg" => " ",
                "&apos" => "'",
                "&quot" => " ",
-               "&acirc" => "â",
-               "&iuml" => "ï",
-               "&euml" => "ë",
-               "&auml" => "ä",
-               "&Auml" => "Ä",
-               "&Euml" => "Ë",
-               "&Iuml" => "Ï",
-               "&Uuml" => "Ü",
-               "&ouml" => "ö",
-               "&uuml" => "ü",
+               "&acirc" => "�",
+               "&iuml" => "�",
+               "&euml" => "�",
+               "&auml" => "�",
+               "&Auml" => "�",
+               "&Euml" => "�",
+               "&Iuml" => "�",
+               "&Uuml" => "�",
+               "&ouml" => "�",
+               "&uuml" => "�",
                "&nbsp" => " ",
-               "&szlig" => "ß",
-               "&iacute" => "í",
+               "&szlig" => "�",
+               "&iacute" => "�",
                "&reg" => " ",
                "&copy" => " ",
-               "&aacute" => "á",
-               "&Aacute" => "Á",
-               "&eth" => "ð",
-               "&ETH" => "Ð",
-               "&Eacute" => "É",
-               "&Iacute" => "Í",
-               "&Oacute" => "Ó",
-               "&uacute" => "ú",
-               "&Uacute" => "Ú",
-               "&THORN" => "Þ",
-               "&thorn" => "þ",
-               "&Ouml" => "Ö",
-               "&aelig" => "æ",
-               "&AELIG" => "Æ",
-               "&aring" => "å",
-               "&Aring" => "Å",
-               "&oslash" => "ø",
-               "&Oslash" => "Ø"
+               "&aacute" => "�",
+               "&Aacute" => "�",
+               "&eth" => "�",
+               "&ETH" => "�",
+               "&Eacute" => "�",
+               "&Iacute" => "�",
+               "&Oacute" => "�",
+               "&uacute" => "�",
+               "&Uacute" => "�",
+               "&THORN" => "�",
+               "&thorn" => "�",
+               "&Ouml" => "�",
+               "&aelig" => "�",
+               "&AELIG" => "�",
+               "&aring" => "�",
+               "&Aring" => "�",
+               "&oslash" => "�",
+               "&Oslash" => "�"
                );
 
 //month names in iso dates