Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/phpmyadmin/phpmyadmin.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/libraries/Config.class.php
diff options
context:
space:
mode:
Diffstat (limited to 'libraries/Config.class.php')
-rw-r--r--libraries/Config.class.php104
1 files changed, 45 insertions, 59 deletions
diff --git a/libraries/Config.class.php b/libraries/Config.class.php
index 24e6776d0d..dcb6b5b3ef 100644
--- a/libraries/Config.class.php
+++ b/libraries/Config.class.php
@@ -148,7 +148,7 @@ class PMA_Config
}
// disable output-buffering (if set to 'auto') for IE6, else enable it.
- if ($GLOBALS['PMA_String']->strtolower($this->get('OBGzip')) == 'auto') {
+ if (/*overload*/mb_strtolower($this->get('OBGzip')) == 'auto') {
if ($this->get('PMA_USR_BROWSER_AGENT') == 'IE'
&& $this->get('PMA_USR_BROWSER_VER') >= 6
&& $this->get('PMA_USR_BROWSER_VER') < 7
@@ -176,19 +176,16 @@ class PMA_Config
$HTTP_USER_AGENT = '';
}
- /** @var PMA_String $pmaString */
- $pmaString = $GLOBALS['PMA_String'];
-
// 1. Platform
- if ($pmaString->strstr($HTTP_USER_AGENT, 'Win')) {
+ if (/*overload*/mb_strstr($HTTP_USER_AGENT, 'Win')) {
$this->set('PMA_USR_OS', 'Win');
- } elseif ($pmaString->strstr($HTTP_USER_AGENT, 'Mac')) {
+ } elseif (/*overload*/mb_strstr($HTTP_USER_AGENT, 'Mac')) {
$this->set('PMA_USR_OS', 'Mac');
- } elseif ($pmaString->strstr($HTTP_USER_AGENT, 'Linux')) {
+ } elseif (/*overload*/mb_strstr($HTTP_USER_AGENT, 'Linux')) {
$this->set('PMA_USR_OS', 'Linux');
- } elseif ($pmaString->strstr($HTTP_USER_AGENT, 'Unix')) {
+ } elseif (/*overload*/mb_strstr($HTTP_USER_AGENT, 'Unix')) {
$this->set('PMA_USR_OS', 'Unix');
- } elseif ($pmaString->strstr($HTTP_USER_AGENT, 'OS/2')) {
+ } elseif (/*overload*/mb_strstr($HTTP_USER_AGENT, 'OS/2')) {
$this->set('PMA_USR_OS', 'OS/2');
} else {
$this->set('PMA_USR_OS', 'Other');
@@ -263,7 +260,7 @@ class PMA_Config
);
$this->set('PMA_USR_BROWSER_AGENT', 'SAFARI');
// Firefox
- } elseif (! $pmaString->strstr($HTTP_USER_AGENT, 'compatible')
+ } elseif (! /*overload*/mb_strstr($HTTP_USER_AGENT, 'compatible')
&& preg_match('@Firefox/([\w.]+)@', $HTTP_USER_AGENT, $log_version)
) {
$this->set(
@@ -306,7 +303,7 @@ class PMA_Config
if (@function_exists('gd_info')) {
$gd_nfo = gd_info();
- if ($GLOBALS['PMA_String']->strstr($gd_nfo["GD Version"], '2.')) {
+ if (/*overload*/mb_strstr($gd_nfo["GD Version"], '2.')) {
$this->set('PMA_IS_GD2', 1);
} else {
$this->set('PMA_IS_GD2', 0);
@@ -435,15 +432,13 @@ class PMA_Config
return;
}
- /** @var PMA_String $pmaString */
- $pmaString = $GLOBALS['PMA_String'];
$branch = false;
// are we on any branch?
//@TODO Implement strstr in PMA_String
- if ($pmaString->strstr($ref_head, '/')) {
- $ref_head = $pmaString->substr(trim($ref_head), 5);
- if ($pmaString->substr($ref_head, 0, 11) === 'refs/heads/') {
- $branch = $pmaString->substr($ref_head, 11);
+ if (/*overload*/mb_strstr($ref_head, '/')) {
+ $ref_head = /*overload*/mb_substr(trim($ref_head), 5);
+ if (/*overload*/mb_substr($ref_head, 0, 11) === 'refs/heads/') {
+ $branch = /*overload*/mb_substr($ref_head, 11);
} else {
$branch = basename($ref_head);
}
@@ -492,8 +487,8 @@ class PMA_Config
$commit = false;
if (! isset($_SESSION['PMA_VERSION_COMMITDATA_' . $hash])) {
$git_file_name = $git_folder . '/objects/'
- . $pmaString->substr($hash, 0, 2)
- . '/' . $pmaString->substr($hash, 2);
+ . /*overload*/mb_substr($hash, 0, 2)
+ . '/' . /*overload*/mb_substr($hash, 2);
if (file_exists($git_file_name) ) {
if (! $commit = @file_get_contents($git_file_name)) {
return;
@@ -512,7 +507,7 @@ class PMA_Config
// packs. (to look for them in .git/object/pack directory later)
foreach (explode("\n", $packs) as $line) {
// skip blank lines
- if ($pmaString->strlen(trim($line)) == 0) {
+ if (/*overload*/mb_strlen(trim($line)) == 0) {
continue;
}
// skip non pack lines
@@ -520,7 +515,7 @@ class PMA_Config
continue;
}
// parse names
- $pack_names[] = $pmaString->substr($line, 2);
+ $pack_names[] = /*overload*/mb_substr($line, 2);
}
} else {
// '.git/objects/info/packs' file can be missing
@@ -535,13 +530,13 @@ class PMA_Config
$file_name = $file_info->getFilename();
// if this is a .pack file
if ($file_info->isFile()
- && $pmaString->substr($file_name, -5) == '.pack'
+ && /*overload*/mb_substr($file_name, -5) == '.pack'
) {
$pack_names[] = $file_name;
}
}
}
- $hash = $pmaString->strtolower($hash);
+ $hash = /*overload*/mb_strtolower($hash);
foreach ($pack_names as $pack_name) {
$index_name = str_replace('.pack', '.idx', $pack_name);
@@ -553,22 +548,22 @@ class PMA_Config
continue;
}
// check format
- if ($pmaString->substr($index_data, 0, 4) != "\377tOc") {
+ if (/*overload*/mb_substr($index_data, 0, 4) != "\377tOc") {
continue;
}
// check version
- $version = unpack('N', $pmaString->substr($index_data, 4, 4));
+ $version = unpack('N', /*overload*/mb_substr($index_data, 4, 4));
if ($version[1] != 2) {
continue;
}
// parse fanout table
$fanout = unpack(
"N*",
- $pmaString->substr($index_data, 8, 256 * 4)
+ /*overload*/mb_substr($index_data, 8, 256 * 4)
);
// find where we should search
- $firstbyte = intval($pmaString->substr($hash, 0, 2), 16);
+ $firstbyte = intval(/*overload*/mb_substr($hash, 0, 2), 16);
// array is indexed from 1 and we need to get
// previous entry for start
if ($firstbyte == 0) {
@@ -582,9 +577,9 @@ class PMA_Config
$found = false;
$offset = 8 + (256 * 4);
for ($position = $start; $position < $end; $position++) {
- $sha = $pmaString->strtolower(
+ $sha = /*overload*/mb_strtolower(
bin2hex(
- $pmaString->substr(
+ /*overload*/mb_substr(
$index_data, $offset + ($position * 20), 20
)
)
@@ -601,7 +596,7 @@ class PMA_Config
$offset = 8 + (256 * 4) + (24 * $fanout[256]);
$pack_offset = unpack(
'N',
- $pmaString->substr($index_data, $offset + ($position * 4), 4)
+ /*overload*/mb_substr($index_data, $offset + ($position * 4), 4)
);
$pack_offset = $pack_offset[1];
@@ -616,14 +611,14 @@ class PMA_Config
fseek($pack_file, $pack_offset);
// parse header
- $header = $pmaString->ord(fread($pack_file, 1));
+ $header = /*overload*/mb_ord(fread($pack_file, 1));
$type = ($header >> 4) & 7;
$hasnext = ($header & 128) >> 7;
$size = $header & 0xf;
$offset = 4;
while ($hasnext) {
- $byte = $pmaString->ord(fread($pack_file, 1));
+ $byte = /*overload*/mb_ord(fread($pack_file, 1));
$size |= ($byte & 0x7f) << $offset;
$hasnext = ($byte & 128) >> 7;
$offset += 7;
@@ -787,21 +782,19 @@ class PMA_Config
$httpOk = 'HTTP/1.1 200 OK';
$httpNotFound = 'HTTP/1.1 404 Not Found';
- /** @var PMA_String $pmaString */
- $pmaString = $GLOBALS['PMA_String'];
- if ($pmaString->substr($data, 0, $pmaString->strlen($httpOk)) === $httpOk) {
+ if (/*overload*/mb_substr($data, 0, /*overload*/mb_strlen($httpOk)) === $httpOk) {
return $get_body
- ? $pmaString->substr(
+ ? /*overload*/mb_substr(
$data,
- $pmaString->strpos($data, "\r\n\r\n") + 4
+ /*overload*/mb_strpos($data, "\r\n\r\n") + 4
)
: true;
}
- $httpNOK = $pmaString->substr(
+ $httpNOK = /*overload*/mb_substr(
$data,
0,
- $pmaString->strlen($httpNotFound)
+ /*overload*/mb_strlen($httpNotFound)
);
if ($httpNOK === $httpNotFound) {
return false;
@@ -1297,9 +1290,7 @@ class PMA_Config
$pma_absolute_uri = $this->get('PmaAbsoluteUri');
$is_https = $this->detectHttps();
- /** @var PMA_String $pmaString */
- $pmaString = $GLOBALS['PMA_String'];
- if ($pmaString->strlen($pma_absolute_uri) < 5) {
+ if (/*overload*/mb_strlen($pma_absolute_uri) < 5) {
$url = array();
// If we don't have scheme, we didn't have full URL so we need to
@@ -1395,7 +1386,7 @@ class PMA_Config
$path = '';
}
// in vhost situations, there could be already an ending slash
- if ($pmaString->substr($path, -1) != '/') {
+ if (/*overload*/mb_substr($path, -1) != '/') {
$path .= '/';
}
$pma_absolute_uri .= $path;
@@ -1417,20 +1408,20 @@ class PMA_Config
// Adds a trailing slash et the end of the phpMyAdmin uri if it
// does not exist.
- if ($pmaString->substr($pma_absolute_uri, -1) != '/') {
+ if (/*overload*/mb_substr($pma_absolute_uri, -1) != '/') {
$pma_absolute_uri .= '/';
}
// If URI doesn't start with http:// or https://, we will add
// this.
- if ($pmaString->substr($pma_absolute_uri, 0, 7) != 'http://'
- && $pmaString->substr($pma_absolute_uri, 0, 8) != 'https://'
+ if (/*overload*/mb_substr($pma_absolute_uri, 0, 7) != 'http://'
+ && /*overload*/mb_substr($pma_absolute_uri, 0, 8) != 'https://'
) {
$pma_absolute_uri
= ($is_https ? 'https' : 'http')
. ':'
. (
- $pmaString->substr($pma_absolute_uri, 0, 2) == '//' ? '' : '//'
+ /*overload*/mb_substr($pma_absolute_uri, 0, 2) == '//' ? '' : '//'
)
. $pma_absolute_uri;
}
@@ -1525,7 +1516,7 @@ class PMA_Config
$this->set('enable_upload', true);
// if set "php_admin_value file_uploads Off" in httpd.conf
// ini_get() also returns the string "Off" in this case:
- if ('off' == $GLOBALS['PMA_String']->strtolower(ini_get('file_uploads'))) {
+ if ('off' == /*overload*/mb_strtolower(ini_get('file_uploads'))) {
$this->set('enable_upload', false);
}
}
@@ -1602,9 +1593,6 @@ class PMA_Config
}
}
- /** @var PMA_String $pmaString */
- $pmaString = $GLOBALS['PMA_String'];
-
// If we don't have scheme, we didn't have full URL so we need to
// dig deeper
if (empty($url['scheme'])) {
@@ -1612,19 +1600,19 @@ class PMA_Config
if (PMA_getenv('HTTP_SCHEME')) {
$url['scheme'] = PMA_getenv('HTTP_SCHEME');
} elseif (PMA_getenv('HTTPS')
- && $pmaString->strtolower(PMA_getenv('HTTPS')) == 'on'
+ && /*overload*/mb_strtolower(PMA_getenv('HTTPS')) == 'on'
) {
$url['scheme'] = 'https';
// A10 Networks load balancer:
} elseif (PMA_getenv('HTTP_HTTPS_FROM_LB')
- && $pmaString->strtolower(PMA_getenv('HTTP_HTTPS_FROM_LB')) == 'on'
+ && /*overload*/mb_strtolower(PMA_getenv('HTTP_HTTPS_FROM_LB')) == 'on'
) {
$url['scheme'] = 'https';
} elseif (PMA_getenv('HTTP_X_FORWARDED_PROTO')) {
$url['scheme']
- = $pmaString->strtolower(PMA_getenv('HTTP_X_FORWARDED_PROTO'));
+ = /*overload*/mb_strtolower(PMA_getenv('HTTP_X_FORWARDED_PROTO'));
} elseif (PMA_getenv('HTTP_FRONT_END_HTTPS')
- && $pmaString->strtolower(PMA_getenv('HTTP_FRONT_END_HTTPS')) == 'on'
+ && /*overload*/mb_strtolower(PMA_getenv('HTTP_FRONT_END_HTTPS')) == 'on'
) {
$url['scheme'] = 'https';
} else {
@@ -1863,9 +1851,7 @@ class PMA_Config
function setCookie($cookie, $value, $default = null, $validity = null,
$httponly = true
) {
- /** @var PMA_String $pmaString */
- $pmaString = $GLOBALS['PMA_String'];
- if ($pmaString->strlen($value) && null !== $default && $value === $default) {
+ if (/*overload*/mb_strlen($value) && null !== $default && $value === $default) {
// default value is used
if (isset($_COOKIE[$cookie])) {
// remove cookie
@@ -1874,7 +1860,7 @@ class PMA_Config
return false;
}
- if (!$pmaString->strlen($value) && isset($_COOKIE[$cookie])) {
+ if (!/*overload*/mb_strlen($value) && isset($_COOKIE[$cookie])) {
// remove cookie, value is empty
return $this->removeCookie($cookie);
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-27 12:28:57 +0300