Remove NOOP checks

[squirrelmail.git] / plugins / calendar / calendar.php

diff --git a/plugins/calendar/calendar.php b/plugins/calendar/calendar.php
index 1c03cb6f6ee1139c0452572b6bf197373eb470bd..fa27c48f201542ef66d4d27c67441413cb5d3efb 100644 (file)
--- a/plugins/calendar/calendar.php
+++ b/plugins/calendar/calendar.php
@@ -20,6 +20,7 @@ require_once('../functions/date.php');
 require_once('../config/config.php');
 require_once('../functions/page_header.php');
 require_once('../src/load_prefs.php');
+require_once('../functions/html.php');
 
 //display upper part of month calendar view
 function startcalendar() {
@@ -32,28 +33,39 @@ function startcalendar() {
     $next_month = date( 'm', $next_date);
     $prev_year = date( 'Y', $prev_date);
     $next_year = date( 'Y', $next_date );
+    $self = 'calendar.php';
 
-    echo "<TR BGCOLOR=\"$color[0]\"><TD>" .
-         "<TABLE WIDTH=100% BORDER=0 CELLPADDING=2 CELLSPACING=1 BGCOLOR=\"$color[0]\">" .
-         '<tr>'.
-         "<th><a href=\"$self?year=".($year-1)."&month=$month\">&lt;&lt;&nbsp;".($year-1)."</a></th>\n".
-         "<th><a href=\"$self?year=$prev_year&month=$prev_month\">&lt;&nbsp;" .
-         date_intl( 'M', $prev_date). "</a></th>\n".
-         "<th bgcolor=$color[0] colspan=3>" .
-         date_intl( 'F Y', $act_date ) . "</th>\n" .
-         "<th><a href=\"$self?year=$next_year&month=$next_month\">" .
-         date_intl( 'M', $next_date) . "&nbsp;&gt;</a></th>".
-         "<th><a href=\"$self?year=".($year+1)."&month=$month\">".($year+1)."&nbsp;&gt;&gt;</a></th>".
-         '</tr><tr>'.
-         "<th WIDTH=\"14%\" bgcolor=$color[5] width=90>" . _("Sunday") . '</th>'.
-         "<th WIDTH=\"14%\" bgcolor=$color[5] width=90>" . _("Monday") . '</th>'.
-         "<th WIDTH=\"14%\" bgcolor=$color[5] width=90>" . _("Tuesday") . '</th>'.
-         "<th WIDTH=\"14%\" bgcolor=$color[5] width=90>" . _("Wednesday") . '</th>'.
-         "<th WIDTH=\"14%\" bgcolor=$color[5] width=90>" . _("Thursday") . '</th>'.
-         "<th WIDTH=\"14%\" bgcolor=$color[5] width=90>" . _("Friday") . '</th>'.
-         "<th WIDTH=\"14%\" bgcolor=$color[5] width=90>" . _("Saturday") . '</th>'.
-        '</tr>';
-
+    echo html_tag( 'tr', "\n".
+               html_tag( 'td', "\n".
+                   html_tag( 'table', '', '', $color[0], 'width="100%" border="0" cellpadding="2" cellspacing="1"' ) .
+                       html_tag( 'tr', "\n".
+                            html_tag( 'th',
+                                "<a href=\"$self?year=".($year-1)."&month=$month\">&lt;&lt;&nbsp;".($year-1)."</a>"
+                            ) . "\n".
+                            html_tag( 'th',
+                                "<a href=\"$self?year=$prev_year&month=$prev_month\">&lt;&nbsp;" .
+                                date_intl( 'M', $prev_date). "</a>"
+                            ) . "\n".
+                            html_tag( 'th', date_intl( 'F Y', $act_date ), '', $color[0], 'colspan="3"') .
+                            html_tag( 'th',
+                                "<a href=\"$self?year=$next_year&month=$next_month\">" .
+                                date_intl( 'M', $next_date) . "&nbsp;&gt;</a>"
+                            ) . "\n".
+                            html_tag( 'th',
+                                "<a href=\"$self?year=".($year+1)."&month=$month\">".($year+1)."&nbsp;&gt;&gt;</a>"
+                            )
+                       ) . "\n".
+                       html_tag( 'tr',
+                           html_tag( 'th', _("Sunday"), '', $color[5], 'width="14%" width="90"' ) ."\n" .
+                           html_tag( 'th', _("Monday"), '', $color[5], 'width="14%" width="90"' ) ."\n" .
+                           html_tag( 'th', _("Tuesday"), '', $color[5], 'width="14%" width="90"' ) ."\n" .
+                           html_tag( 'th', _("Wednesday"), '', $color[5], 'width="14%" width="90"' ) ."\n" .
+                           html_tag( 'th', _("Thursday"), '', $color[5], 'width="14%" width="90"' ) ."\n" .
+                           html_tag( 'th', _("Friday"), '', $color[5], 'width="14%" width="90"' ) ."\n" .
+                           html_tag( 'th', _("Saturday"), '', $color[5], 'width="14%" width="90"' ) ."\n"
+                       )
+               ) ,
+           '', $color[0] ) ."\n";
 }
 
 //main logic for month view of calendar
@@ -63,34 +75,34 @@ function drawmonthview() {
     $aday = 1 - date('w', mktime(0, 0, 0, $month, 1, $year));
     $days_in_month = date('t', mktime(0, 0, 0, $month, 1, $year));
     while ($aday <= $days_in_month) {
-        echo '<tr>';
+        echo html_tag( 'tr' );
         for ($j=1; $j<=7; $j++) {
             $cdate="$month";
             ($aday<10)?$cdate=$cdate."0$aday":$cdate=$cdate."$aday";
             $cdate=$cdate."$year";
             if ( $aday <= $days_in_month && $aday > 0){
-                echo "<TD BGCOLOR=\"$color[4]\" height=50 valign=top>\n" .
-                     "<div align=right>";
+                echo html_tag( 'td', '', 'left', $color[4], 'height="50" valign="top"' ) ."\n".
+                     html_tag( 'div', '', 'right' );
                 echo(($cdate==$todayis) ? "<font size=-1 color=$color[1]>[ " . _("TODAY") . " ] " : "<font size=-1>");
                 echo "<a href=day.php?year=$year&month=$month&day=";
                 echo(($aday<10) ? "0" : "");
                 echo "$aday>$aday</a></font></div>";
             } else {
-                echo "<TD BGCOLOR=\"$color[0]\">\n".
+                echo html_tag( 'td', '', 'left', $color[0]) ."\n".
                      "&nbsp;";
             }
             if (isset($calendardata[$cdate])){
                 $i=0;
                 while ($calfoo = each($calendardata[$cdate])) {
-                    $calbar = $calendardata[$cdate][$calfoo[key]];
-                    echo ($calbar[priority]==1) ? "<FONT COLOR=\"$color[1]\">$calbar[title]</FONT><br>\n" : "$calbar[title]<br>\n";
+                    $calbar = $calendardata[$cdate][$calfoo['key']];
+                    echo ($calbar['priority']==1) ? "<FONT COLOR=\"$color[1]\">$calbar[title]</FONT><br>\n" : "$calbar[title]<br>\n";
                     $i=$i+1;
                     if($i==2){
                         break;
                     }
                 }
             }
-            echo "\n</TD>\n";
+            echo "\n</td>\n";
             $aday++;
         }
         echo '</tr>';
@@ -101,7 +113,8 @@ function drawmonthview() {
 function endcalendar() {
     global $year, $month, $day, $color;
 
-    echo "          <TR><TD COLSPAN=7>\n".
+    echo html_tag( 'tr' ) ."\n" .
+           html_tag( 'td', '', 'left', '', 'colspan="7"' ) ."\n" .
          "          <FORM NAME=caljump ACTION=\"calendar.php\" METHOD=POST>\n".
          "          <SELECT NAME=\"year\">\n";
     select_option_year($year);
@@ -116,13 +129,13 @@ function endcalendar() {
 }
 
 
-if($month <= 0){
+if( !isset( $month ) || $month <= 0){
     $month = date( 'm' );
 }
-if($year <= 0){
+if( !isset($year) || $year <= 0){
     $year = date( 'Y' );
 }
-if($day <= 0){
+if( !isset($day) || $day <= 0){
     $day = date( 'd' );
 }