cvs: phpweb / cal.php
| From: | jim winstead | Date: | Thu, 02 May 2002 18:09:47 +0000 |
| Subject: | cvs: phpweb / cal.php | ||
| Groups: | php.mirrors | ||
| Request: | Send a blank email to php-mirrors+get-10004@lists.php.net to get a copy of this message | ||
jimw Thu May 2 14:09:47 2002 EDT
Modified files:
/phpweb cal.php
Log:
be less hamhanded about fixing xss problem.
Index: phpweb/cal.php
diff -u phpweb/cal.php:1.32 phpweb/cal.php:1.33
--- phpweb/cal.php:1.32 Thu May 2 01:45:19 2002
+++ phpweb/cal.php Thu May 2 14:09:47 2002
@@ -9,54 +9,51 @@
# month (or the month of the requested day)
$begun = 0;
+$id = (int)$id;
+$cy = (int)$cy;
+$cm = (int)$cm;
+$cd = (int)$cd;
-if (!is_numeric($id) || !is_numeric($cy) || !is_numeric($cd) || !is_numeric($cm)) {
- $errors[] = "invalid data specified";
- $hack = 1;
+if ($id) {
+ if ($event = load_event($id)) {
+ commonHeader("Event: ".htmlentities($event['sdesc']));
+ display_event($event, 0);
+ $begun++;
+ }
+ else {
+ $errors[] = "There is no event for specified id
('".htmlentities($id)."')";
+ }
}
-
-if (!$hack) {
- if ($id) {
- if ($event = load_event($id)) {
- commonHeader("Event: ".htmlentities($event['sdesc']));
- display_event($event, 0);
- $begun++;
- }
- else {
- $errors[] = "There is no event for specified id
('".htmlentities($id)."')";
- }
+elseif ($cy && $cm && $cd) {
+ if (checkdate($cm,$cd,$cy)) {
+ $date = mktime(0,0,1,$cm,$cd,$cy);
+ if ($events = load_events($date)) {
+ commonHeader("Events: ".date("F j, Y", $date));
+ echo "<h2>", date("F j, Y", $date), "</h2>\n";
+ foreach ($events as $event) {
+ display_event($event, 0);
+ }
+ $begun++;
+ }
+ else {
+ $errors[] = "There are no events for the specified date (".date("F j,
Y",$date).").";
+ }
}
- elseif ($cy && $cm && $cd) {
- if (checkdate($cm,$cd,$cy)) {
- $date = mktime(0,0,1,$cm,$cd,$cy);
- if ($events = load_events($date)) {
- commonHeader("Events: ".date("F j, Y", $date));
- echo "<h2>", date("F j, Y", $date), "</h2>\n";
- foreach ($events as $event) {
- display_event($event, 0);
- }
- $begun++;
- }
- else {
- $errors[] = "There are no events for the specified date (".date("F j,
Y",$date).").";
- }
- }
- else {
- $errors[] = "The specified date (".htmlentities("$cy/$cm/$cd").") was
not valid.";
- unset($cm); unset($cd); unset($cy);
- }
+ else {
+ $errors[] = "The specified date (".htmlentities("$cy/$cm/$cd").") was
not valid.";
+ unset($cm); unset($cd); unset($cy);
}
+}
- if ($cm && $cy && !checkdate($cm,1,$cy)) {
- $errors[] = "The specified year and month (".htmlentities("$cy, $cm").")
are not valid.";
- unset($cm); unset($cy);
- }
+if ($cm && $cy && !checkdate($cm,1,$cy)) {
+ $errors[] = "The specified year and month (".htmlentities("$cy, $cm").")
are not valid.";
+ unset($cm); unset($cy);
+}
- if (!$cm) $cm = date("m");
- if (!$cy) $cy = date("Y");
+if (!$cm) $cm = date("m");
+if (!$cy) $cy = date("Y");
- $date = mktime(0,0,1,$cm,1,$cy);
-}
+$date = mktime(0,0,1,$cm,1,$cy);
if (!$begun) {
commonHeader("Events: ".date("F Y", $date));