From 89b9966e5cfb8aa1443c15d6af5afe5e53676037 Mon Sep 17 00:00:00 2001 From: lace <> Date: Fri, 23 Jul 2010 14:08:53 +0000 Subject: [PATCH] Fix compatibility with php-5.x. --- common.php | 67 ++++++++++++++++++++++++++++---------------------------------- config.php | 2 +- 2 files changed, 31 insertions(+), 38 deletions(-) diff --git a/common.php b/common.php index 2a3db70..3207af4 100644 --- a/common.php +++ b/common.php @@ -6,7 +6,7 @@ include("config.php"); // $viewcvs prepared by "config.php" - if ($viewcvs==$HTTP_SERVER_VARS["SCRIPT_NAME"]) + if ($viewcvs==$_SERVER["SCRIPT_NAME"]) unset($viewcvs); $cvs_id_split=split(" ",$cvs_id); if (count($cvs_id_split)==8) { @@ -24,24 +24,24 @@ $energie_base=""; unset($have_ent); - if (isset($HTTP_GET_VARS[ "have_ent"])) + if (isset($_GET[ "have_ent"])) $have_ent=true; - if (isset($HTTP_GET_VARS["amp;have_ent"])) + if (isset($_GET["amp;have_ent"])) $have_ent=false; - if ((!isset($detect_ent) || $detect_ent) && !isset($have_ent) && $HTTP_SERVER_VARS["REQUEST_METHOD"]=="GET") + if ((!isset($detect_ent) || $detect_ent) && !isset($have_ent) && $_SERVER["REQUEST_METHOD"]=="GET") $head.=''."\n"; fixampvars(); - $have_js=(isset($HTTP_GET_VARS["have_js"]) || isset($HTTP_POST_VARS["have_js"]) + $have_js=(isset($_GET["have_js"]) || isset($_POST["have_js"]) ? "?have_js=1" : ""); if (isset($detect_js) && !$have_js) $head.=''."\n"; - $user_agent=(!isset($HTTP_SERVER_VARS["HTTP_USER_AGENT"]) ? "" : $HTTP_SERVER_VARS["HTTP_USER_AGENT"]); + $user_agent=(!isset($_SERVER["HTTP_USER_AGENT"]) ? "" : $_SERVER["HTTP_USER_AGENT"]); if (ereg("[[:<:]]MSIE ([0-9]+)\\.",$user_agent,$msie_major_a)) $msie_major=$msie_major_a[1]; else if (ereg("[[:<:]]Mozilla/([0-9]+)\\.",$user_agent,$mozilla_major_a)) @@ -52,7 +52,7 @@ function fixampvars() { - $ars=array("HTTP_GET_VARS","HTTP_POST_VARS"); + $ars=array("_GET","_POST"); foreach ($ars as $ar) { foreach ($GLOBALS[$ar] as $key=>$val) { if (substr($key,0,4)!="amp;") @@ -75,12 +75,10 @@ function fatal($msg="UNKNOWN") function prepvar($name,$regex=".*",$require=true) { - global $HTTP_GET_VARS,$HTTP_POST_VARS; - - if (isset($HTTP_GET_VARS[$name])) - $v=$HTTP_GET_VARS[$name]; - else if (isset($HTTP_POST_VARS[$name])) - $v=$HTTP_POST_VARS[$name]; + if (isset($_GET[$name])) + $v=$_GET[$name]; + else if (isset($_POST[$name])) + $v=$_POST[$name]; else unset($v); @@ -259,13 +257,13 @@ function title_icons_table_month($year,$month,$month_last,$sequential,$has_conte print(""); } -function title_icons($year,$month) +function title_icons(&$year,&$month) { global $tb_obsah; print("

" .(isset($year) ? "" : "") - .title_name(&$year,&$month) + .title_name($year,$month) .(isset($year) ? "" : "") ."

\n"); @@ -326,18 +324,16 @@ function title_icons($year,$month) function title($year,$month) { if (isset($year) && isset($month)) - return(title_month( $year, $month)); + return(title_month($year,$month)); else - return(title_icons(&$year,&$month)); + return(title_icons($year,$month)); // $year and $month modified! } function image_supported($mime) { - global $HTTP_SERVER_VARS; - - if (!isset($HTTP_SERVER_VARS["HTTP_ACCEPT"])) + if (!isset($_SERVER["HTTP_ACCEPT"])) return(false); - $exp=explode(",",$HTTP_SERVER_VARS["HTTP_ACCEPT"]); + $exp=explode(",",$_SERVER["HTTP_ACCEPT"]); while (($s=array_shift($exp))) { $s=trim(ereg_replace(";.*","",$s)); if ($s==$mime) @@ -424,7 +420,6 @@ zvolte pros function format_fields_to_text($title="",$pfx="") { - global $HTTP_POST_VARS; $fields=array( "Název" ,"name", "Adresa" ,"adresa", @@ -452,25 +447,25 @@ function format_fields_to_text($title="",$pfx="") while ($fields) { $pretty=array_shift($fields); $var=$pfx.array_shift($fields); - if (!isset($HTTP_POST_VARS[$var])) + if (!isset($_POST[$var])) continue; - if (""==($value=trim($HTTP_POST_VARS[$var]))) + if (""==($value=trim($_POST[$var]))) continue; $r.="$tab$pretty:\t$value\n"; } while ($bools) { $pretty=array_shift($bools); $var=$pfx.array_shift($bools); - if (!isset($HTTP_POST_VARS[$var])) + if (!isset($_POST[$var])) continue; - $r.="$tab$pretty:\t".($HTTP_POST_VARS[$var] ? "ANO" : "NE")."\n"; + $r.="$tab$pretty:\t".($_POST[$var] ? "ANO" : "NE")."\n"; } while ($texts) { $pretty=array_shift($texts); $var=$pfx.array_shift($texts); - if (!isset($HTTP_POST_VARS[$var])) + if (!isset($_POST[$var])) continue; - if (""==($value=trim(ereg_replace("[\r\n]+","\n",$HTTP_POST_VARS[$var])))) + if (""==($value=trim(ereg_replace("[\r\n]+","\n",$_POST[$var])))) continue; $r.="$tab$pretty:".ereg_replace("\n","\\0\t","\n".$value)."\n"; } @@ -544,9 +539,7 @@ function gsm_table($total,$varsym) function return_to_homepage() { - global $HTTP_SERVER_VARS; - - return("

Nyní se mù¾ete vrátit na úvodní stránku.

\n"); + return("

Nyní se mù¾ete vrátit na úvodní stránku.

\n"); } function input_text($name,$size,$default_value="",$addons="") @@ -567,7 +560,7 @@ function form_charset() // _cannot_ know the encoding used by the client (moreover it IGNORES POST // data MIME type, even if provided by Lynx 2.8.4dev.11, Mozilla 1.0.0 // doesn't provide anything). - // "iso-8859-2" should be replaced by $HTTP_SERVER_VARS["HTTP_X_CLIENT_CHARSET"] + // "iso-8859-2" should be replaced by $_SERVER["HTTP_X_CLIENT_CHARSET"] // and "csacekRecodeInput On"(default) when CSacek fixes support of "utf-8" // input-decoding, details in my mail <20020620134930.GA18761@short.ucw.cz>. @@ -671,10 +664,10 @@ function footer($delimit=true) exit(); $footer_passed=true; - global $cvs_id_html,$viewcvs,$viewcvs,$HTTP_SERVER_VARS,$energie_base; + global $cvs_id_html,$viewcvs,$viewcvs,$energie_base; if ($delimit) print("

 

\n"); - $uri="uri=".urlencode("http://".$HTTP_SERVER_VARS["HTTP_HOST"].$HTTP_SERVER_VARS["REQUEST_URI"]); + $uri="uri=".urlencode("http://".$_SERVER["HTTP_HOST"].$_SERVER["REQUEST_URI"]); ?>
@@ -712,7 +705,7 @@ function heading($title=true,$indexme=true) return; $heading_done=true; - // $HTTP_SERVER_VARS["CLIENT_CHARSET"] ignored (mod_czech support dropped!) + // $_SERVER["CLIENT_CHARSET"] ignored (mod_czech support dropped!) $client_charset=(isset($force_charset) ? $force_charset : "iso-8859-2"); header("Content-type: text/html; charset=$client_charset"); header("Content-Style-Type: text/css"); diff --git a/config.php b/config.php index 644ff50..45301fd 100644 --- a/config.php +++ b/config.php @@ -4,7 +4,7 @@ # All CVS mails now go to $admin_mail #$cvs_mailhost="vellum.cz"; $mail_to="web-www.energie.vellum.cz@jankratochvil.net,karel.kratochvil@centrum.cz"; - $viewcvs=ereg_replace("^/","http://cvs.jankratochvil.net/viewcvs/energie/",$HTTP_SERVER_VARS["SCRIPT_NAME"]); + $viewcvs=ereg_replace("^/","http://cvs.jankratochvil.net/viewcvs/energie/",$_SERVER["SCRIPT_NAME"]); $title_prefix="Energie & peníze"; $detect_ent=false; // used only for w3.org footer, not worth the cost -- 1.8.3.1