Changeset 2132
- Timestamp:
- Oct 10, 2007, 12:43:09 AM (17 years ago)
- Location:
- trunk
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/feed.php
r2029 r2132 108 108 109 109 $rss = new UniversalFeedCreator(); 110 110 $rss->encoding=get_pwg_charset(); 111 111 $rss->title = $conf['gallery_title']; 112 112 $rss->title.= ' (as '.$user['username'].')'; -
trunk/include/feedcreator.class.php
r1900 r2132 392 392 foreach ($vars as $key => $value) { 393 393 // prevent overwriting of properties "contentType", "encoding"; do not copy "_feed" itself 394 if (!in_array($key, array("_feed", "contentType" , "encoding"))) {394 if (!in_array($key, array("_feed", "contentType"/*PWG, "encoding"*/))) { 395 395 $this->_feed->{$key} = $this->{$key}; 396 396 } -
trunk/include/functions.inc.php
r2127 r2132 1500 1500 $languages[] = $language; 1501 1501 } 1502 1503 1502 if ( !empty($user['language']) ) 1504 1503 { 1505 1504 $languages[] = $user['language']; 1505 } 1506 if ( defined('PHPWG_INSTALLED') ) 1507 { 1508 $languages[] = get_default_language(); 1506 1509 } 1507 1510 $languages[] = PHPWG_DEFAULT_LANGUAGE; -
trunk/include/functions_metadata.inc.php
r1900 r2132 90 90 $value = str_replace(chr(0x00), ' ', $value); 91 91 92 if ( preg_match('/[\x80-\xff]/', $value) ) 93 { 94 // apparently mac uses some MacRoman crap encoding. I don't know 95 // how to detect it so a plugin should do the trick. 96 $value = trigger_event('clean_iptc_value', $value); 97 $is_utf8 = seems_utf8($value); 98 $value = convert_charset( $value, 99 $is_utf8 ? 'utf-8' : 'iso-8859-1', 100 get_pwg_charset() ); 101 } 92 102 return $value; 93 103 } -
trunk/include/functions_user.inc.php
r2127 r2132 930 930 } 931 931 932 /**933 * return the file path of the given language filename, depending on the934 * availability of the file935 *936 * in descending order of preference:937 * param language, user language, default language938 * PhpWebGallery default language.939 *940 * @param string filename941 * @param string dirname942 * @param string language943 * @return string filepath944 */945 function get_language_filepath($filename, $dirname = '', $language = '')946 {947 global $user, $conf;948 949 if (empty($dirname))950 {951 $dirname = PHPWG_ROOT_PATH;952 }953 $dirname .= 'language'.'/';954 955 $dir_methods = array();956 957 if (!empty($language))958 {959 $dir_methods[] = 1;960 }961 962 $dir_methods[] = 2;963 $dir_methods[] = 3;964 $dir_methods[] = 4;965 966 foreach ($dir_methods as $dir_method)967 {968 switch ($dir_method)969 {970 case '1':971 {972 $directory = $dirname.$language;973 break;974 }975 case '2':976 {977 $directory = $dirname.$user['language'];978 break;979 }980 case '3':981 {982 $directory = $dirname.get_default_language();983 break;984 }985 case '4':986 default:987 {988 $directory = $dirname.PHPWG_DEFAULT_LANGUAGE;989 break;990 }991 {992 $directory = '.';993 }994 }995 996 $filepath = $directory.'/'.$filename;997 998 if (file_exists($filepath))999 {1000 return $filepath;1001 }1002 }1003 1004 return false;1005 }1006 932 1007 933 /**
Note: See TracChangeset
for help on using the changeset viewer.