Changeset 2134
- Timestamp:
- Oct 11, 2007, 2:10:41 AM (17 years ago)
- Location:
- trunk
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/comments.php
r2107 r2134 182 182 183 183 'F_ACTION'=>PHPWG_ROOT_PATH.'comments.php', 184 'F_KEYWORD'=>@html entities(stripslashes($_GET['keyword'])),185 'F_AUTHOR'=>@html entities(stripslashes($_GET['author'])),184 'F_KEYWORD'=>@htmlspecialchars(stripslashes($_GET['keyword'])), 185 'F_AUTHOR'=>@htmlspecialchars(stripslashes($_GET['author'])), 186 186 187 187 'U_HOME' => make_index_url(), -
trunk/include/functions.inc.php
r2132 r2134 517 517 } 518 518 else 519 { // probably english that is the same in all ISO-xxx and UTF-8 519 { // UTF-8 520 $language_name = convert_charset($language_name, 521 'utf-8', $target_charset); 520 522 $languages[$file] = $language_name; 521 523 } … … 700 702 $output.= "\n".'(total time : '; 701 703 $output.= number_format( ($time+$start-$t2), 3, '.', ' ').' s)'; 704 if ( $result!=null and preg_match('/\s*SELECT\s+/i',$query) ) 705 { 706 $output.= "\n".'(num rows : '; 707 $output.= mysql_num_rows($result).' )'; 708 } 709 elseif ( $result!=null 710 and preg_match('/\s*INSERT|UPDATE|REPLACE|DELETE\s+/i',$query) ) 711 { 712 $output.= "\n".'(affected rows : '; 713 $output.= mysql_affected_rows().' )'; 714 } 702 715 $output.= "</pre>\n"; 703 716 … … 1530 1543 } 1531 1544 1532 // universal language (like Eng) no conversion required1545 // UTF-8 ? 1533 1546 $f = $dir.'/'.$filename; 1534 1547 if (file_exists($f)) 1535 1548 { 1549 $source_charset = 'utf-8'; 1536 1550 $source_file = $f; 1537 1551 break; … … 1544 1558 { 1545 1559 $source_charset = 'iso-8859-1'; 1546 $source_file = $f;1547 break;1548 }1549 }1550 1551 if ($target_charset=='iso-8859-1' and1552 in_array( substr($language,2), array('en','fr','de','es','it','nl') )1553 )1554 { // we accept conversion from UTF-8 to ISO-8859-1 for backward compatibility ONLY1555 $f = $dir.'.utf-8/'.$filename;1556 if (file_exists($f))1557 {1558 $source_charset = 'utf-8';1559 1560 $source_file = $f; 1560 1561 break; … … 1600 1601 else 1601 1602 { 1602 $lang = array_merge( $lang, $load_lang );1603 $lang_info = array_merge( $lang_info, $load_lang_info );1603 $lang = array_merge( $lang, (array)$load_lang ); 1604 $lang_info = array_merge( $lang_info, (array)$load_lang_info ); 1604 1605 } 1605 1606 return true; -
trunk/tools/ws.htm
r1912 r2134 3 3 <head> 4 4 <title>PWG web service explorer</title> 5 <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> 5 6 <script type="text/javascript" src="prototype.js" ></script> 6 7 … … 170 171 var acceptArray = method.params[i].acceptArray; 171 172 var defaultValue = method.params[i].defaultValue == null ? '' : method.params[i].defaultValue; 172 173 173 174 row.insertCell(0).innerHTML = method.params[i].name; 174 175 row.insertCell(1).innerHTML = '<span title="parameter is '+(isOptional ? 'optional':'required') +'">'+(isOptional ? '?':'*')+'</span>' … … 334 335 <table> 335 336 <tr style="vertical-align:top"> 336 337 337 338 <td> 338 339 <div id="methodDescription"></div> … … 347 348 </td> 348 349 </tr> 349 350 350 351 <tr> 351 352 <td>Response format:</td> … … 365 366 </p> 366 367 </td> 367 368 368 369 369 370 <td> … … 381 382 </table> 382 383 </td> 383 384 384 385 </tr> 385 386 </table> 386 387 387 388 <div style="display:none;"> 388 389 <!-- hiddenForm for POST -->
Note: See TracChangeset
for help on using the changeset viewer.