From 88c00c20e642043675459659e7d3266fbc6fb1ec Mon Sep 17 00:00:00 2001
From: Chad Little <clittle@users.sourceforge.net>
Date: Thu, 2 Sep 2004 18:43:32 +0000
Subject: Updated to $_GET

---
 admin.php                        |  2 +-
 day.php                          |  4 ++--
 functions/init.inc.php           | 12 ++++++------
 functions/userauth_functions.php | 10 +++++-----
 includes/login.php               |  4 ++--
 includes/todo.php                |  2 +-
 preferences.php                  |  4 ++--
 print.php                        |  2 +-
 rss/rss.php                      |  2 +-
 search.php                       |  4 ++--
 10 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/admin.php b/admin.php
index dfee055..a00eb2b 100644
--- a/admin.php
+++ b/admin.php
@@ -13,7 +13,7 @@ if ($allow_admin != "yes") {
 
 // Load variables from forms and query strings into local scope
 if($_POST) 	{extract($_POST, EXTR_PREFIX_SAME, "post_");}
-if($HTTP_GET_VARS)  	{extract($HTTP_GET_VARS, EXTR_PREFIX_SAME, "get_");}
+if($_GET)  	{extract($_GET, EXTR_PREFIX_SAME, "get_");}
 
 if (!isset($action)) $action = '';
 
diff --git a/day.php b/day.php
index 2d3f647..f06e8f7 100644
--- a/day.php
+++ b/day.php
@@ -1,6 +1,6 @@
 <?php
-if (isset($HTTP_GET_VARS['jumpto_day'])) {
-	$jumpto_day_time = strtotime($HTTP_GET_VARS['jumpto_day']);
+if (isset($_GET['jumpto_day'])) {
+	$jumpto_day_time = strtotime($_GET['jumpto_day']);
 	if ($jumpto_day_time == -1) {
 		$getdate = date('Ymd', strtotime("now + $second_offset seconds"));
 	} else {
diff --git a/functions/init.inc.php b/functions/init.inc.php
index ad9658b..30b5a83 100644
--- a/functions/init.inc.php
+++ b/functions/init.inc.php
@@ -35,7 +35,7 @@ if ($cookie_uri == '') {
 if ($bleed_time == '') $bleed_time = $day_start;
 
 // Grab the action (login or logout).
-if (isset($HTTP_GET_VARS['action']))			$action = $HTTP_GET_VARS['action'];
+if (isset($_GET['action']))			$action = $_GET['action'];
 else if (isset($_POST['action']))		$action = $_POST['action'];
 else											$action = '';
 	
@@ -58,8 +58,8 @@ if (file_exists(realpath($lang_file))) {
 }
 
 if (!isset($getdate)) {
-	if (isset($HTTP_GET_VARS['getdate']) && ($HTTP_GET_VARS['getdate'] !== '')) {
-		$getdate = $HTTP_GET_VARS['getdate'];
+	if (isset($_GET['getdate']) && ($_GET['getdate'] !== '')) {
+		$getdate = $_GET['getdate'];
 	} else {
 		$getdate = date('Ymd', strtotime("now + $second_offset seconds"));
 	}
@@ -76,8 +76,8 @@ if ($calendar_path == '') {
 }
 
 $is_webcal = FALSE;
-if (isset($HTTP_GET_VARS['cal']) && $HTTP_GET_VARS['cal'] != '') {
-	$cal_filename = urldecode($HTTP_GET_VARS['cal']);
+if (isset($_GET['cal']) && $_GET['cal'] != '') {
+	$cal_filename = urldecode($_GET['cal']);
 } else {
 	if (isset($default_cal_check)) {
 		if ($default_cal_check != $ALL_CALENDARS_COMBINED) {
@@ -115,7 +115,7 @@ if ($is_webcal == TRUE) {
 		$cal_filelist = array();
 		array_push($cal_filelist,$filename);
 	} else {
-		exit(error($lang['l_error_remotecal'], $HTTP_GET_VARS['cal']));
+		exit(error($lang['l_error_remotecal'], $_GET['cal']));
 	}
 } else {
 	$cal_displayname = str_replace('32', ' ', $cal_filename);
diff --git a/functions/userauth_functions.php b/functions/userauth_functions.php
index ea4ea17..017841e 100644
--- a/functions/userauth_functions.php
+++ b/functions/userauth_functions.php
@@ -43,7 +43,7 @@ function logout_querys() {
 // if no valid login is found. Returns a boolean invalid_login to
 // indicate that the login is invalid.
 function user_login() {
-	global $_COOKIE, $HTTP_GET_VARS, $_POST, $_SERVER;
+	global $_COOKIE, $_GET, $_POST, $_SERVER;
 	global $login_cookies, $cookie_uri, $locked_map;
 	
 	// Initialize return values.
@@ -83,11 +83,11 @@ function user_login() {
 	}
 	
 	// Look for a new username and password.
-	if (isset($HTTP_GET_VARS['username']) &&
-		isset($HTTP_GET_VARS['password']))
+	if (isset($_GET['username']) &&
+		isset($_GET['password']))
 	{
-		$username = $HTTP_GET_VARS['username'];
-		$password = $HTTP_GET_VARS['password'];
+		$username = $_GET['username'];
+		$password = $_GET['password'];
 	} else if (isset($_POST['username']) &&
 			   isset($_POST['password']))
 	{
diff --git a/includes/login.php b/includes/login.php
index 38bbd5b..e7713c1 100644
--- a/includes/login.php
+++ b/includes/login.php
@@ -10,11 +10,11 @@
 
 		echo '<form style="margin-bottom:0;" action="'.$form_action.'" method="POST">';
 		echo '<input type="hidden" name="action" value="login">';
-		foreach (array_keys($HTTP_GET_VARS) as $key) {
+		foreach (array_keys($_GET) as $key) {
 			if ($key == 'action' || $key == 'username' || $key == 'password') {
 				continue;
 			}
-			echo '<input type="hidden" name="'.$key.'" value="'.$HTTP_GET_VARS[$key].'">';
+			echo '<input type="hidden" name="'.$key.'" value="'.$_GET[$key].'">';
 		}
 		
 		// If the attempted login was invalid, change the box title.
diff --git a/includes/todo.php b/includes/todo.php
index b8d5766..2a45d35 100644
--- a/includes/todo.php
+++ b/includes/todo.php
@@ -5,7 +5,7 @@ include_once(BASE.'functions/init.inc.php');
 include_once(BASE.'functions/date_functions.php');
 require_once(BASE.'functions/template.php');
 
-$vtodo_array = unserialize(base64_decode($HTTP_GET_VARS['vtodo_array']));
+$vtodo_array = unserialize(base64_decode($_GET['vtodo_array']));
 
 // Set the variables from the array
 $vtodo_text		= (isset($vtodo_array['vtodo_text'])) ? $vtodo_array['vtodo_text'] : ('');
diff --git a/preferences.php b/preferences.php
index 7ed6c13..41c0745 100644
--- a/preferences.php
+++ b/preferences.php
@@ -14,8 +14,8 @@ $current_view = "preferences";
 $back_page = BASE.$default_view.'.php?cal='.$cal.'&amp;getdate='.$getdate;
 if ($allow_preferences == 'no') header("Location: $back_page");
 
-if (isset($HTTP_GET_VARS['action'])) {
-	$action = $HTTP_GET_VARS['action'];
+if (isset($_GET['action'])) {
+	$action = $_GET['action'];
 } else {
 	$action = '';
 } 
diff --git a/print.php b/print.php
index 66f6bcc..1bc96da 100644
--- a/print.php
+++ b/print.php
@@ -9,7 +9,7 @@ header("Content-Type: text/html; charset=$charset");
 $start_week_time 	= strtotime(dateOfWeek($getdate, $week_start_day));
 $end_week_time 		= $start_week_time + (6 * 25 * 60 * 60);
 $parse_month 		= date ("Ym", strtotime($getdate));
-$printview 			= $HTTP_GET_VARS['printview'];
+$printview 			= $_GET['printview'];
 $cal_displayname 	= str_replace("32", " ", $cal);
 $events_week 		= 0;
 $unix_time 			= strtotime($getdate);
diff --git a/rss/rss.php b/rss/rss.php
index e849bd1..bc22fca 100644
--- a/rss/rss.php
+++ b/rss/rss.php
@@ -13,7 +13,7 @@ $end_week_time = $start_week_time + (6 * 25 * 60 * 60);
 $start_week = localizeDate($dateFormat_week, $start_week_time);
 $end_week =  localizeDate($dateFormat_week, $end_week_time);
 $parse_month = date ("Ym", strtotime($getdate));
-$rssview = $HTTP_GET_VARS['rssview'];
+$rssview = $_GET['rssview'];
 $cal_displayname = str_replace("32", " ", $cal);
 $events_week = 0;
 
diff --git a/search.php b/search.php
index 4ddcefe..885f482 100644
--- a/search.php
+++ b/search.php
@@ -15,8 +15,8 @@ if (isset($HTTP_SERVER_VARS['HTTP_REFERER']) && $HTTP_SERVER_VARS['HTTP_REFERER'
 }
 
 $search_valid = false;
-if (isset($HTTP_GET_VARS['query']) && $HTTP_GET_VARS['query'] != '') {
-	$query = $HTTP_GET_VARS['query'];
+if (isset($_GET['query']) && $_GET['query'] != '') {
+	$query = $_GET['query'];
 	$search_valid = true;
 }
 
-- 
cgit v1.2.3