Changeset 1082

Timestamp:

08/28/06 19:03:25 (6 years ago)

Author:

max-horvath

Message:

"2006-08-28 Max Horvath <max.horvath@…>

• Integrated KML node list export
• Integrated PDF node list export
• Updated Sprintf formatted strings in some Smarty templates"

Location:

trunk/wifidog-auth

Files:

• CHANGELOG (modified) (3 diffs)
• INSTALL (modified) (1 diff)
• wifidog/README.txt (modified) (1 diff)
• wifidog/classes/Dependencies.php (modified) (2 diffs)
• wifidog/classes/NodeLists/NodeListHTML.php (modified) (3 diffs)
• wifidog/classes/NodeLists/NodeListKML.php (added)
• wifidog/classes/NodeLists/NodeListPDF.php (added)
• wifidog/lib/fpdf (added)
• wifidog/templates/NodeLists (added)
• wifidog/templates/NodeLists/NodeListPDF.php (added)
• wifidog/templates/sites/hotspot_status.tpl (modified) (3 diffs)

trunk/wifidog-auth/CHANGELOG

@@ +1 @@
+2006-08-28 Max Horváth <max.horvath@maxspot.de>
+        * Integrated KML node list export
+        * Integrated PDF node list export
+        * Updated Sprintf formatted strings in some Smarty templates
+
 2006-08-27 Benoit Grégoire  <bock@step.polymtl.ca>
         * clickthrough.php, HyperLink.php:  Implement working hyperlink clickthrough tracking (no reporting yet).
@@ -4 +9 @@
         * Make HTMLeditor inherit from Langstring.  Allowed a massive reduction of line count and will stop the codebases from needlessly drifting apart.
         * Do not log content displayed as metadata, and log their clickthrough as the parent's.
-        
+
 2006-08-27 François Proulx <francois.proulx@gmail.com>
         * Updated French translations
         * Now using Sprintf formatted strings in some Smarty templates (see example in templates/sites/index.tpl).
         * Integrated back the SQL profiling functions
-        
+
 2006-07-20 Benoit Grégoire  <bock@step.polymtl.ca>
         * Fix a bug where having an empty username would break statistics.
@@ -17 +22 @@
 
 2006-07-05 Benoit Grégoire  <bock@step.polymtl.ca>
-        * Fix #175. 
+        * Fix #175.
         * Fix the "Registration Log" and "User registration report" reports giving incorrect statistics
         * Allow disabling EventLogging class in config.php, to make SQL debuging possible (The class was traping errors before AbstractDb could output them)
-        * Make EVENT_LOGGING default to false for now, as it turns out EventLogging was the cause of the 
-        Spurious PEAR output ("Runtime Notice: ") we've been seeing.  That is probably only because we don't 
+        * Make EVENT_LOGGING default to false for now, as it turns out EventLogging was the cause of the
+        Spurious PEAR output ("Runtime Notice: ") we've been seeing.  That is probably only because we don't
         understand how to properly control it's logging level.
 

trunk/wifidog-auth/INSTALL

@@ -16 +16 @@
 - FCKeditor 2.2 (http://www.fckeditor.net/) (Required if you want to edit
   content with a HTML text editor aka WYSIWYG editor)
+- FPDF 1.53+ (http://www.fpdf.org/) (Required if you want to export the node
+  list into a PDF file)
 - PEAR (if you need RADIUS auth support, see below)
 - Phlickr 0.2.5+ installed as a PEAR package (http://phlickr.sourceforge.net/)

trunk/wifidog-auth/wifidog/README.txt

@@ -3 +3 @@
 
 Subdirectories:
-admin:          PHP scripts for the adminstrative interface
-auth:           Gateway authentication responder
-classes:        All the PHP classes
-content:     Scripts and reports for specific content types (such as PatternLanguage)
-contrib:     Various scripts and templates given as examples
-cron:           PHP scripts meant to be executed on a regular basis
-include:        PHP includes
-js:             Javascripts
-lib:            PHP includes and classes maintained outside wifidog.  Some are merely installed there, some are distributed with wifidog.
-locale:         Gettext translation files and scripts
-login:          Login page
-media:          Static media files (stylesheets, theme packs, images)
-ping:           Gateway heartbeat and logging responder
-portal:         Portal page
-templates:      Smarty templates (Note that those are meant to ease development, not for customization)
-tmp:            Wifidog stores all it's temp files here
+admin:      PHP scripts for the adminstrative interface
+auth:       Gateway authentication responder
+classes:    All the PHP classes
+content:    Scripts and reports for specific content types (such as
+            PatternLanguage)
+contrib:    Various scripts and templates given as examples
+cron:       PHP scripts meant to be executed on a regular basis
+include:    PHP includes
+js:         Javascripts
+lib:        PHP includes and classes maintained outside wifidog.  Some are
+            merely installed there, some are distributed with wifidog.
+locale:     Gettext translation files and scripts
+login:      Login page
+media:      Static media files (stylesheets, theme packs, images)
+ping:       Gateway heartbeat and logging responder
+portal:     Portal page
+templates:  Smarty templates (Note that those are meant to ease development,
+            not for customization)
+tmp:        Wifidog stores all it's temp files here

trunk/wifidog-auth/wifidog/classes/Dependencies.php

@@ -43 +43 @@
  * @link       http://www.wifidog.org/
  */
-require_once ('classes/Locale.php');//Necessary in case gettext isn't defined
+
+// Detect Gettext support
+if (!function_exists('gettext')) {
+    require_once ('classes/Locale.php');
+}
+
 /**
  * This class checks the existence of components required by WiFiDog.
@@ -70 +75 @@
            "Radius" => array ("name" => "PEAR::RADIUS", "files" => array("Auth/RADIUS.php", "Crypt/CHAP.php"), "PhpExtension" => false, "localLib" => false),
            "FCKeditor" => array ("name" => "FCKeditor", "files" => "lib/FCKeditor/fckeditor.php", "PhpExtension" => false, "localLib" => true),
+           "FPDF" => array ("name" => "FPDF", "files" => "lib/fpdf/fpdf.php", "PhpExtension" => false, "localLib" => true),
            "Smarty" => array ("name" => "Smarty", "files" => "lib/smarty/Smarty.class.php", "PhpExtension" => false, "localLib" => true)
            );

trunk/wifidog-auth/wifidog/classes/NodeLists/NodeListHTML.php

@@ -46 +46 @@
  * Load required classes
  */
+require_once('classes/Dependencies.php');
 require_once('classes/Network.php');
 require_once('classes/Node.php');
@@ -178 +179 @@
         $this->_smarty->assign('nodes', array());
         $this->_smarty->assign('num_deployed_nodes', 0);
+        $this->_smarty->assign('PdfSupported', false);
 
         /*
@@ -196 +198 @@
             $this->_smarty->assign('GMapsEnabled', true);
         }
+
+        if (Dependencies::check("FPDF")) {
+            $this->_smarty->assign('PdfSupported', true);
+        }
+
         // Set section of Smarty template
         $this->_smarty->assign('sectionTOOLCONTENT', true);

trunk/wifidog-auth/wifidog/templates/sites/hotspot_status.tpl

@@ -56 +56 @@
                 <li><a href="{$base_non_ssl_path}hotspots_map.php">{"Deployed HotSpots map"|_}</a></li>
             {/if}
+            {if $PdfSupported}
+                <li><a href="?format=PDF">{"Get this list as a PDF file"|_}</a></li>
+            {/if}
+            <li><a href="?format=RSS">{"Get this list as a RSS feed"|_}</a></li>
+            <li><a href="?format=KML">{"Get this list for Google Earth"|_}</a></li>
             <li><a href="{$base_non_ssl_path}node_list.php">{"Full node technical status (includes non-deployed nodes)"|_}</a></li>
         </ul>
@@ -72 +77 @@
             <thead>
                 <tr>
-                    <th colspan=6>{"Status of the"|_} {$num_deployed_nodes} {"open"|_} {$hotspot_network_name} {"Hotspots (Get this list as a <a href='?format=RSS'>RSS feed</a>)"|_}</th>
+                    <th colspan="6">{"Status of the %d open %s Hotspots"|_|sprintf:$num_deployed_nodes:$hotspot_network_name}</th>
                 </tr>
                 <tr>
@@ -117 +122 @@
                         {/if}
 
-                        {"Opened on"|_} {$nodes[node].creation_date}
+                        {"Opened on %s"|_|sprintf:$nodes[node].creation_date}
                     </td>