Skip to content

Add same optimizations applied to general.php catalog side to admin #264

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
acidvertigo wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Add same optimizations applied to general.php catalog side to admin #264

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a920aef
Add same optimizations applied to general.php catalog side
acidvertigo Nov 7, 2014
1a47ad1
Remove tep_string_to_int function
acidvertigo Nov 7, 2014
3158285
Merge pull request #172 from osCommerce/master
acidvertigo Nov 7, 2014
876ca28
Remove tep_parse_input_field_data function
acidvertigo Nov 10, 2014
df54db7
Add conditional check for $ip_addresses[] = $_SERVER['REMOTE_ADDR'];
acidvertigo Dec 19, 2014
ecc284e
Update tep_not_null function
acidvertigo Dec 23, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
57 changes: 31 additions & 26 deletions catalog/admin/includes/functions/general.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,20 +45,14 @@ function tep_redirect($url) {
exit;
}

////
// Parse the data used in the html tags to ensure the tags will not break
function tep_parse_input_field_data($data, $parse) {
return strtr(trim($data), $parse);
}

function tep_output_string($string, $translate = false, $protected = false) {
if ($protected == true) {
return htmlspecialchars($string);
} else {
if ($translate == false) {
return tep_parse_input_field_data($string, array('"' => '"'));
return strtr(trim($string), array('"' => '"'));
} else {
return tep_parse_input_field_data($string, $translate);
return strtr(trim($string), $translate);
}
}
}
Expand Down Expand Up @@ -118,17 +112,24 @@ function tep_get_path($current_category_id = '') {
}

function tep_get_all_get_params($exclude_array = '') {

if ($exclude_array == '') $exclude_array = array();
if (!is_array($exclude_array)) $exclude_array = array();

$exclude_array[] = session_name();
$exclude_array[] = 'error';
$exclude_array[] = 'x';
$exclude_array[] = 'y';

$get_url = '';

foreach ( $_GET as $key => $value ) {
if (($key != tep_session_name()) && ($key != 'error') && (!in_array($key, $exclude_array))) $get_url .= $key . '=' . $value . '&';
}

return $get_url;

if (is_array($_GET) && (!empty($_GET))) {
foreach ($_GET as $key => $value) {
if ( !in_array($key, $exclude_array) ) {
$get_url .= $key . '=' . rawurlencode($value) . '&';
}
}
}
return $get_url;
}

function tep_date_long($raw_date) {
if ( ($raw_date == '0000-00-00 00:00:00') || ($raw_date == '') ) return false;
Expand Down Expand Up @@ -318,13 +319,19 @@ function tep_get_zone_name($country_id, $zone_id, $default_zone) {

function tep_not_null($value) {
if (is_array($value)) {
if (sizeof($value) > 0) {
if (!empty($value)) {
return true;
} else {
return false;
}
} elseif(is_object($value)) {
if (count(get_object_vars($value)) === 0) {
return false;
} else {
return true;
}
} else {
if ( (is_string($value) || is_int($value)) && ($value != '') && ($value != 'NULL') && (strlen(trim($value)) > 0)) {
if (($value != '') && (strtolower($value) != 'null') && (strlen(trim($value)) > 0)) {
return true;
} else {
return false;
Expand Down Expand Up @@ -1344,16 +1351,13 @@ function tep_convert_linefeeds($from, $to, $string) {
return str_replace($from, $to, $string);
}

function tep_string_to_int($string) {
return (int)$string;
}

////
// Parse and secure the cPath parameter values
function tep_parse_category_path($cPath) {
// make sure the category IDs are integers
$cPath_array = array_map('tep_string_to_int', explode('_', $cPath));

$cPath_array = array_map(function ($string) {
return (int)$string;
}, explode('_', $cPath));
// make sure no duplicate category IDs exist which could lock the server in a loop
$tmp_array = array();
$n = sizeof($cPath_array);
Expand All @@ -1362,7 +1366,6 @@ function tep_parse_category_path($cPath) {
$tmp_array[] = $cPath_array[$i];
}
}

return $tmp_array;
}

Expand Down Expand Up @@ -1413,7 +1416,9 @@ function tep_get_ip_address() {
$ip_addresses[] = $_SERVER['HTTP_PROXY_USER'];
}

$ip_addresses[] = $_SERVER['REMOTE_ADDR'];
if ( isset($_SERVER['REMOTE_ADDR']) && !empty($_SERVER['REMOTE_ADDR']) ) {
$ip_addresses[] = $_SERVER['REMOTE_ADDR'];
}

foreach ( $ip_addresses as $ip ) {
if (!empty($ip) && tep_validate_ip_address($ip)) {
Expand Down