nettika/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* libraries/charset_conversion.lib.php3,

Browse Source 
libraries/common.lib.php3,
      main.php3
        - added isset() before some configuration variables
This commit is contained in:
Robin Johnson
2002-06-19 08:07:03 +00:00
parent bdfa6852da
commit eb81d83b9d
4 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@@ -5,6 +5,12 @@ phpMyAdmin - Changelog
$Id$ $Id$
$Source$ $Source$
2002-06-19 Robin Johnson <robbat2@users.sourceforge.net>
* libraries/charset_conversion.lib.php3,
libraries/common.lib.php3,
main.php3
- added isset() before some configuration variables
2002-06-18 Marc Delisle <lem9@users.sourceforge.net> 2002-06-18 Marc Delisle <lem9@users.sourceforge.net>
* lang/chinese* updates, thanks to Siu Sun * lang/chinese* updates, thanks to Siu Sun
* lang/lithuanian updates, thanks to Vilius Zigmantas * lang/lithuanian updates, thanks to Vilius Zigmantas

12
libraries/charset_conversion.lib.php3
View File

@@ -13,10 +13,12 @@ if (!defined('PMA_CHARSET_CONVERSION_LIB_INCLUDED')){
/** /**
* Loads the recode or iconv extensions if any of it is not loaded yet * Loads the recode or iconv extensions if any of it is not loaded yet
*/ */
if ($cfg['AllowAnywhereRecoding'] && $allow_recoding && if ( isset($cfg['AllowAnywhereRecoding'])
((PMA_PHP_INT_VERSION >= 40000 && !@ini_get('safe_mode') && @ini_get('enable_dl')) && $cfg['AllowAnywhereRecoding']
&& $allow_recoding
&& ((PMA_PHP_INT_VERSION >= 40000 && !@ini_get('safe_mode') && @ini_get('enable_dl'))
|| (PMA_PHP_INT_VERSION > 30009 && !@get_cfg_var('safe_mode'))) || (PMA_PHP_INT_VERSION > 30009 && !@get_cfg_var('safe_mode')))
&& @function_exists('dl')) { && @function_exists('dl')) {
if (!(@extension_loaded('recode')||@extension_loaded('iconv'))) { if (!(@extension_loaded('recode')||@extension_loaded('iconv'))) {
if (PMA_IS_WINDOWS) { if (PMA_IS_WINDOWS) {
$suffix = '.dll'; $suffix = '.dll';
@@ -48,7 +50,7 @@ if (!defined('PMA_CHARSET_CONVERSION_LIB_INCLUDED')){
*/ */
function PMA_convert_display_charset($what) { function PMA_convert_display_charset($what) {
global $cfg, $allow_recoding, $charset, $convcharset; global $cfg, $allow_recoding, $charset, $convcharset;
if (!($cfg['AllowAnywhereRecoding'] && $allow_recoding)) { if (!(isset($cfg['AllowAnywhereRecoding']) && $cfg['AllowAnywhereRecoding'] && $allow_recoding)) {
return $what; return $what;
} else { } else {
if (is_array($what)) { if (is_array($what)) {
@@ -112,7 +114,7 @@ if (!defined('PMA_CHARSET_CONVERSION_LIB_INCLUDED')){
*/ */
function PMA_convert_charset($what) { function PMA_convert_charset($what) {
global $cfg, $allow_recoding, $charset, $convcharset; global $cfg, $allow_recoding, $charset, $convcharset;
if (!($cfg['AllowAnywhereRecoding'] && $allow_recoding)) { if (!(isset($cfg['AllowAnywhereRecoding']) && $cfg['AllowAnywhereRecoding'] && $allow_recoding)) {
return $what; return $what;
} else { } else {
if (@function_exists('iconv')) { if (@function_exists('iconv')) {

2
libraries/common.lib.php3
View File

@@ -583,7 +583,7 @@ h1 {font-family: sans-serif; font-size: large; font-weight: bold}
// http://cvs.apache.org/viewcvs.cgi/httpd-2.0/modules/aaa/mod_access.c?rev=1.37&content-type=text/vnd.viewcvs-markup // http://cvs.apache.org/viewcvs.cgi/httpd-2.0/modules/aaa/mod_access.c?rev=1.37&content-type=text/vnd.viewcvs-markup
// Look at: "static int check_dir_access(request_rec *r)" // Look at: "static int check_dir_access(request_rec *r)"
// Robbat2 - May 10, 2002 // Robbat2 - May 10, 2002
if ($cfg['Server']['AllowDeny']['order']) { if (isset($cfg['Server']['AllowDeny']) && $cfg['Server']['AllowDeny']['order']) {
include('./libraries/ip_allow_deny.lib.php3'); include('./libraries/ip_allow_deny.lib.php3');
$allowDeny_forbidden = FALSE; //default $allowDeny_forbidden = FALSE; //default

2
main.php3
View File

@@ -487,7 +487,7 @@ if (empty($cfg['Lang'])) {
echo "\n"; echo "\n";
?> ?>
<?php <?php
if ($cfg['AllowAnywhereRecoding'] && $allow_recoding) { if (isset($cfg['AllowAnywhereRecoding']) && $cfg['AllowAnywhereRecoding'] && $allow_recoding) {
?> ?>
<!-- Charset Selection --> <!-- Charset Selection -->
<tr> <tr>