[Devel] r184 - trunk

[svn AT agendadulibre.org]

Author: thomas
Date: Sat Sep  9 22:03:20 2006
New Revision: 184

Modified:
   trunk/funcs.inc.php
   trunk/map.php

Log:

 * funcs.inc.php:

  - Retrait du commit précédent, qui ne marche pas.

 * map.php:

  - Faire fonctionner les liens des cartes en https://. Enfin, un
    essai, au moins.




Modified: trunk/funcs.inc.php
==============================================================================
--- trunk/funcs.inc.php (original)
+++ trunk/funcs.inc.php Sat Sep  9 22:03:20 2006
@@ -25,14 +25,11 @@
  *
  * @param[in] Relative URL in the website
  */
-function calendar_absolute_url($url="", $protocol="")
+function calendar_absolute_url($url="", $protocol="http")
 {
   global $root;
   $root = rtrim ($root, "/");
-  if ($protocol != "")
-    return $protocol . "://" . $root . "/" . $url;
-  else
-    return $root . "/" . $url;
+  return $protocol . "://" . $root . "/" . $url;
 }
 
 function calendar_setlocale()

Modified: trunk/map.php
==============================================================================
--- trunk/map.php       (original)
+++ trunk/map.php       Sat Sep  9 22:03:20 2006
@@ -46,8 +46,8 @@
 
       echo "<b>" . $region->name . "</b><br/> ";
 
-      echo "<a href=\"" . calendar_absolute_url ("rss.php?region=" . 
$region->id) . "\"><i>rss</i></a> - \n";
-      echo "<a href=\"" . calendar_absolute_url ("ical.php?region=" . 
$region->id) . "\"><i>ical</i></a>\n";
+      echo "<a href=\"rss.php?region=" . $region->id) . "\"><i>rss</i></a> - 
\n";
+      echo "<a href=\"ical.php?region=" . $region->id . 
"\"><i>ical</i></a>\n";
 
       echo "</dt>\n";
 
@@ -72,9 +72,9 @@
              $end_time_str   = strftime ("%A %d %B", date_mysql2timestamp 
($event->end_time));
 
              if ($start_time_str != $end_time_str)
-               echo "<li><i>" . $start_time_str . " au " . $end_time_str . 
"</i> <a href=\"" . calendar_absolute_url("showevent.php?id=" . $event->id) . 
"\">" . $event->title . "</a> � " . $event->city . "</li>";
+               echo "<li><i>" . $start_time_str . " au " . $end_time_str . 
"</i> <a href=\"showevent.php?id=" . $event->id) . "\">" . $event->title . 
"</a> � " . $event->city . "</li>";
              else
-               echo "<li><i>" . $start_time_str . "</i> <a href=\"" . 
calendar_absolute_url("showevent.php?id=" . $event->id) . "\">" . 
$event->title . "</a> � " . $event->city . "</li>";
+               echo "<li><i>" . $start_time_str . "</i> <a 
href=\"showevent.php?id=" . $event->id) . "\">" . $event->title . "</a> � " . 
$event->city . "</li>";
            }
 
          echo " </ul>\n";