Changeset 1088

Timestamp:

09/02/06 23:35:06 (4 years ago)

Author:

max-horvath

Message:

"2006-09-02 Max Horvath <max.horvath@…>

• Installation script checks for PHP session extension (fixes #139)
• Removed \"Call-time pass-by-reference has been deprecated\" warnings (fixes #239)
• Revert changes of FCKeditor implementation (fixes #240)
• Fix of FCKeditor implementation, now also supports FCKeditor 2.3+ (fixes #145)
• Hotspots/Nodes are sorted case-insensitive now (fixes #109)
• Fix #141
• templates/sites/index.tpl: fix wrong user count (fixes #236)
• Added more trash mail services to the black list (fixes #149)"

Location:

trunk/wifidog-auth

Files:

• CHANGELOG (modified) (15 diffs)
• INSTALL (modified) (1 diff)
• wifidog/classes/Content/ContentGroup/ContentGroup.php (modified) (2 diffs)
• wifidog/classes/Content/ContentGroup/ContentGroupElement.php (modified) (3 diffs)
• wifidog/classes/Content/EmbeddedContent/EmbeddedContent.php (modified) (1 diff)
• wifidog/classes/Content/HTMLeditor/HTMLeditor.php (modified) (5 diffs)
• wifidog/classes/Mail.php (modified) (1 diff)
• wifidog/classes/Node.php (modified) (3 diffs)
• wifidog/classes/NodeLists/NodeListHTML.php (modified) (1 diff)
• wifidog/classes/NodeLists/NodeListJiWireCSV.php (modified) (1 diff)
• wifidog/classes/NodeLists/NodeListRSS.php (modified) (1 diff)
• wifidog/classes/NodeLists/NodeListXML.php (modified) (1 diff)
• wifidog/classes/Statistics.php (modified) (2 diffs)
• wifidog/content/HTMLeditor (deleted)
• wifidog/install.php (modified) (2 diffs)
• wifidog/js/HTMLeditor.js (modified) (1 diff)
• wifidog/node_list.php (modified) (1 diff)
• wifidog/templates/sites/index.tpl (modified) (1 diff)

trunk/wifidog-auth/CHANGELOG

@@ +1 @@
+2006-09-02 Max Horváth <max.horvath@maxspot.de>
+        * Installation script checks for PHP session extension (fixes #139)
+        * Removed "Call-time pass-by-reference has been deprecated" warnings
+          (fixes #239)
+        * Revert changes of FCKeditor implementation (fixes #240)
+        * Fix of FCKeditor implementation, now also supports FCKeditor 2.3+
+          (fixes #145)
+        * Hotspots/Nodes are sorted case-insensitive now (fixes #109)
+        * Fix #141
+        * templates/sites/index.tpl: fix wrong user count (fixes #236)
+        * Added more trash mail services to the black list (fixes #149)
+
 2006-09-01 Benoit Grégoire  <bock@step.polymtl.ca>
-        * Fix #189, #173, 
+        * Fix #189, #173,
 
 2006-09-01 Benoit Grégoire  <bock@step.polymtl.ca>
         * Content.php:  Improve handling of simple but persistent content.
-        
+
 2006-08-31 Benoit Grégoire  <bock@step.polymtl.ca>
-        * Server.php:  Make sure getCurrentServer returns the default server if the hostname isn't recognised.
+        * Server.php:  Make sure getCurrentServer returns the default server if the
+          hostname isn't recognised.
         * Content manager:
-                -Allow deleting simple (trivial) but persistent content
-                -Remove the sponsor info field from Content Metadata.  Best practices is now to use the project info field to show this information.
-        * Add the necessary schema constraints to allow manually deleting networks, nodes and users.  Be carefull, removing any of theses will remove all traces of connection statistics as well.  You've been warned.
+                - Allow deleting simple (trivial) but persistent content
+                - Remove the sponsor info field from Content Metadata.  Best practices
+                  is now to use the project info field to show this information.
+        * Add the necessary schema constraints to allow manually deleting networks,
+          nodes and users.  Be carefull, removing any of theses will remove all
+          traces of connection statistics as well.  You've been warned.
         * Do not display the network in the login interface if there is only one.
-        * Add a pseudo-random content ordering mode.  Pick content elements randomly, but do not display the same content twice untill all content has been seen.
-        * Allow setting a title but not displaying it (very usefull for reusable content)
-        
+        * Add a pseudo-random content ordering mode.  Pick content elements
+          randomly, but do not display the same content twice untill all content
+          has been seen.
+        * Allow setting a title but not displaying it (very usefull for reusable
+          content)
+
 2006-08-29 Max Horváth <max.horvath@maxspot.de>
         * Cleaned up PHPdoc tags
@@ -31 +50 @@
 
 2006-08-27 Benoit Grégoire  <bock@step.polymtl.ca>
-        * clickthrough.php, HyperLink.php:  Implement working hyperlink clickthrough tracking (no reporting yet).
-          Works for Langstring, FlickrPhotoStream, Picture, RssAggregator and their subclasses.
-        * 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.
+        * clickthrough.php, HyperLink.php:  Implement working hyperlink
+          clickthrough tracking (no reporting yet).
+          Works for Langstring, FlickrPhotoStream, Picture, RssAggregator and their
+          subclasses.
+        * 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).
+        * Now using Sprintf formatted strings in some Smarty templates (see
+          example in templates/sites/index.tpl).
         * Integrated back the SQL profiling functions
 
@@ -49 +73 @@
 2006-07-05 Benoit Grégoire  <bock@step.polymtl.ca>
         * 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
-        understand how to properly control it's logging level.
+        * 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 understand how to
+          properly control it's logging level.
 
 2006-06-18 François Proulx <francois.proulx@gmail.com>
-        * Added creation_date , last_update_date support to File content (with proper HTTP caching handling)
+        * Added creation_date , last_update_date support to File content (with
+          proper HTTP caching handling)
         * Added hyperlinks URL support in Picture content
         * Fixed constants in Flickr Content
@@ -71 +100 @@
 
 2006-06-08 Benoit Grégoire  <bock@step.polymtl.ca>
-        * Completely refactor the look and html of the content manager, statistics and most object's administrative interfaces.
-        Should be much simpler and clearer now.
-        No refactoring of the editing flow has been done yet.
+        * Completely refactor the look and html of the content manager, statistics
+          and most object's administrative interfaces.
+          Should be much simpler and clearer now.
+          No refactoring of the editing flow has been done yet.
         * Spell check the french translation, and add a few of the missing strings.
 
@@ -80 +110 @@
 
 2006-05-26 François Proulx <francois.proulx@gmail.com>
-        * Added Japanese translation .po file (Thanks to taedu AT ninjin-net DOT net)
+        * Added Japanese translation .po file
+          (Thanks to taedu AT ninjin-net DOT net)
 
 2006-05-24 François Proulx <francois.proulx@gmail.com>
@@ -90 +121 @@
 
 2006-05-23 Benoit Grégoire  <bock@step.polymtl.ca>
-        * config.php:  Disable USE_CACHE_LITE, it's definitely not stable, and causes very hard to track down problems with Internet Explorer.
+        * config.php:  Disable USE_CACHE_LITE, it's definitely not stable, and
+          causes very hard to track down problems with Internet Explorer.
 
 2006-05-22 François Proulx <francois.proulx@gmail.com>
@@ -124 +156 @@
 
 2006-05-20 François Proulx <francois.proulx@gmail.com>
-        * Various stylesheet improvements, started working on Île Sans Fil network specific theme pack
+        * Various stylesheet improvements, started working on Île Sans Fil network
+          specific theme pack
         * Fixed a few layout bugs
 
 2006-05-20 Benoit Grégoire  <bock@step.polymtl.ca>
-        * USE_BASE_NON_SSL_PATH for hotspot map, else internet explorer whines endlessly
+        * USE_BASE_NON_SSL_PATH for hotspot map, else internet explorer whines
+          endlessly
 
 2006-05-20 Benoit Grégoire  <bock@step.polymtl.ca>
-        * index.tpl:  Fix link to the map not being displayed at a hotspot, even when you are logged in.  There needs to be much better logick before we export such things to smarty templates.
+        * index.tpl:  Fix link to the map not being displayed at a hotspot, even
+          when you are logged in.  There needs to be much better logick before we
+          export such things to smarty templates.
 
 2006-05-20 François Proulx <francois.proulx@gmail.com>
         * Added /wifidog/contrib and /wifidog/contrib/xslt directories
-        * Posted Île Sans Fil XSLT example stylesheet for converting the hotspot_status page
+        * Posted Île Sans Fil XSLT example stylesheet for converting the
+          hotspot_status page
                 * Browser view
                 * PDA view (by Jean-Pierre Lessard <jplprog@videotron.ca>)
                 * Simply use in this manner :
-                http://wifidog-server.org/hotspot_status.php?format=XML&xslt=http://wifidog-server.org/contrib/xslt/hotspot_status_browser.xsl
+                  http://wifidog-server.org/hotspot_status.php?format=XML&xslt=http://wifidog-server.org/contrib/xslt/hotspot_status_browser.xsl
 
 2006-05-20 Benoit Grégoire  <bock@step.polymtl.ca>
-        * page.php:  Fix bugs in various files preventing the system from working from the command line.
+        * page.php:  Fix bugs in various files preventing the system from working
+          from the command line.
 
 2006-05-20 Benoit Grégoire  <bock@step.polymtl.ca>
-        * More install script fixes:  Phlickr wouldn't install, and the permissions of wifidog/tmp/smarty/cache weren't checked.
+        * More install script fixes:  Phlickr wouldn't install, and the permissions
+          of wifidog/tmp/smarty/cache weren't checked.
 
 2006-05-20 Benoit Grégoire  <bock@step.polymtl.ca>
@@ -151 +190 @@
 
 2006-05-18 Benoit Grégoire  <bock@step.polymtl.ca>
-        * Fix loging form incorrectly attempting to validate the password, preventing many existing
-        accounts from logging-in.
-        * Interim commit, begin simplifying the html ans stylesheets, and re-doing the general look.
-        This is incomplete, this commit was done to fix the problem above.
-        * install.php:  Fix path problems, make shel command errors visible.  Update magpie and smarty url to latest versions (note that this won't
-        automatically update an existing install).  Didn't touch phlickr as I didn't know the implications
-        * Add interactive scripts in sql/ to easily backup and restore a wifidog auth server database.
+        * Fix loging form incorrectly attempting to validate the password,
+          preventing many existing accounts from logging-in.
+        * Interim commit, begin simplifying the html ans stylesheets, and re-doing
+          the general look.
+          This is incomplete, this commit was done to fix the problem above.
+        * install.php:  Fix path problems, make shel command errors visible.  Update
+          magpie and smarty url to latest versions (note that this won't
+          automatically update an existing install).  Didn't touch phlickr as I
+          didn't know the implications
+        * Add interactive scripts in sql/ to easily backup and restore a wifidog
+          auth server database.
 
 2006-05-10 François Proulx <francois.proulx@gmail.com>
@@ -163 +206 @@
 
 2006-05-10 François Proulx <francois.proulx@gmail.com>
-        * Added sweetTitles tooltips script, now if you need to add tooltips simply add the 'title' attribute to you html <a>, <attr>, <accroym> tags
+        * Added sweetTitles tooltips script, now if you need to add tooltips simply
+          add the 'title' attribute to you html <a>, <attr>, <accroym> tags
         * Fixed usort bug in MainUI
         * Fixed download (wget) in install.php
 
 2006-05-09 Benoit Grégoire  <bock@step.polymtl.ca>
-        * Working (if slightly basic) theme manager.  You can pick the theme in the network configuration.
-        To add your own theme, read wifidog/media/network_theme_packs/README.txt
+        * Working (if slightly basic) theme manager.  You can pick the theme in the
+          network configuration.
+          To add your own theme, read wifidog/media/network_theme_packs/README.txt
         * Cleanup and document the wifidog directory structure
         * Minor HTML corrections for content types
-        * Completely rip out the old local_content system, and a bunch of obsolete defines and config variables.
+        * Completely rip out the old local_content system, and a bunch of obsolete
+          defines and config variables.
         * Get rid of PHP generated stylesheets
 
 2006-05-09 Benoit Grégoire  <bock@step.polymtl.ca>
         * Finish content assignation system
-        * Content ordering is now global (network, nodes and everywhere content cand now be in mixed order).
+        * Content ordering is now global (network, nodes and everywhere content cand
+          now be in mixed order).
         * Implement 'everywhere' content
         * Change MainUI::apendContent to MainUI::addContent
@@ -185 +232 @@
 
 2006-04-28 Benoit Grégoire  <bock@step.polymtl.ca>
-        * wifidog/login/index.php: Correctly use DEFAULT_NODE_ID from config.php instead of hardcoded 'default'
+        * wifidog/login/index.php: Correctly use DEFAULT_NODE_ID from config.php
+          instead of hardcoded 'default'
 
 2006-04-28 François Proulx <francois.proulx@gmail.com>
@@ -202 +250 @@
 
 2006-04-24 Benoit Grégoire  <bock@step.polymtl.ca>
-        * Major system locale handling overhaull.  Hopefully abstract out the UTF8 problems once and for all,
-        allowing everyone to define them the same way.  Fix a few bugs along the way.
-        Should also be a little faster.
+        * Major system locale handling overhaull.  Hopefully abstract out the UTF8
+          problems once and for all, allowing everyone to define them the same way.
+          Fix a few bugs along the way. Should also be a little faster.
 
 2006-04-24 Benoit Grégoire  <bock@step.polymtl.ca>
-        * Revert Rob's SYSTEM_PATH change.  Sorry about that.  The devs spent hours to finally get the PATH
-         stuff consistent and fixing the countless bugs that this process introduced.
-         Maybe some links still need to use BASE_URL_PATH instead of BASE_SSL_PATH,
-        (or vice-versa) but it was on purpose that SYSTEM_PATH was not made available to Smarty.
-        We already have 3 defines to be used for links and html refs, that's enough
-         BASE_SSL_PATH should be used to enter SSL mode (if available)
-         BASE_NON_SSL_PATH should be used to break out of SSL mode of when we
-         explicitely do not want someting to be referenced over http
-         BASE_URL_PATH should be used in all other cases to avoid needless SSL warning
+        * Revert Rob's SYSTEM_PATH change.  Sorry about that.  The devs spent hours
+          to finally get the PATH stuff consistent and fixing the countless bugs
+          that this process introduced.
+          Maybe some links still need to use BASE_URL_PATH instead of BASE_SSL_PATH,
+          (or vice-versa) but it was on purpose that SYSTEM_PATH was not made
+          available to Smarty.
+          We already have 3 defines to be used for links and html refs, that's
+          enough BASE_SSL_PATH should be used to enter SSL mode (if available)
+          BASE_NON_SSL_PATH should be used to break out of SSL mode of when we
+          explicitely do not want someting to be referenced over http
+          BASE_URL_PATH should be used in all other cases to avoid needless
+          SSL warning
 
 2006-04-17 Rob Janes <janes.rob@gmail.com>
@@ -221 +272 @@
         * help text (untranslated).
         * EVENT_LOGGING enabling/disabling flag.
-        * use SYSTEM_PATH instead of BASE_URL_PATH and BASE_SSL_PATH where ever appropriate.
-        * standardize Smarty variables for Network and User info by adding assignSmartyValues($smarty, $self) to Network and User.
+        * use SYSTEM_PATH instead of BASE_URL_PATH and BASE_SSL_PATH where ever
+          appropriate.
+        * standardize Smarty variables for Network and User info by adding
+          assignSmartyValues($smarty, $self) to Network and User.
         * change_password only allowed if logged in.
         * non-superadmin can only use change_password to change their own password.
-        * superadmin can use change_password to change any user password by entering in their password for the old password.
+        * superadmin can use change_password to change any user password by
+          entering in their password for the old password.
         * page_header div defined and positioned in MainUI
 
 2006-04-04 Benoit Grégoire  <bock@step.polymtl.ca>
-        * /classes/Content/IFrame/IFrame.php: Change a few methods from private to protected as the private methods broke IFrameRest
+        * /classes/Content/IFrame/IFrame.php: Change a few methods from private
+          to protected as the private methods broke IFrameRest
 
 2006-04-01 François Proulx <francois.proulx@gmail.com>
@@ -235 +290 @@
 
 2006-03-31 Benoit Grégoire  <bock@step.polymtl.ca>
-        * dump_initial_data_postgres.sh:  Add the content_available_display_pages table to the dump, can someone re-generate the initial data from a working install
+        * dump_initial_data_postgres.sh:  Add the content_available_display_pages
+          table to the dump, can someone re-generate the initial data from a
+          working install
         * Remove the ?> tags from all the classes.
 
@@ -252 +309 @@
         * First step in massive simplification of CSS and templates
         * Implement the new main CSS structure
-        * Implement working content assignation interface and content ordering for both network and nodes.
-        * Display of content according to assignation work on 'portal' and 'login'.  'everywhere' not yet implemented
+        * Implement working content assignation interface and content ordering for
+          both network and nodes.
+        * Display of content according to assignation work on 'portal' and 'login'.
+          'everywhere' not yet implemented
         * Get rid of some ISF specific interface elements
-        * Finally replace the overly complicated start button by a "Use the Internet" link that will not
-         get you out of your working tab
+        * Finally replace the overly complicated start button by a
+          "Use the Internet" link that will not get you out of your working tab
         * Fix #118
 
 2006-03-26 Benoit Grégoire  <bock@step.polymtl.ca>
-        * init_php.php: Fix stripslashes_cb() so it actually works, this means the aust server should work properly with auth servers with magic quotes turned on.
-        This is still not recommended however.
+        * init_php.php: Fix stripslashes_cb() so it actually works, this means the
+          auth server should work properly with auth servers with magic quotes
+          turned on.
+          This is still not recommended however.
         * Remove some spurious error ouptut on logout.
         * Remove potential error in network id parsing
@@ -267 +328 @@
 2006-03-22 François Proulx <francois.proulx@gmail.com>
         * Fixed Google Maps URLs bug
-        * Since Google Maps does not provide Javascript over SSL (it does but the certificate does not match)
-          the code path to the map does not use SSL, but the outgoing URLs do.
+        * Since Google Maps does not provide Javascript over SSL (it does but the
+          certificate does not match) the code path to the map does not use SSL, but
+          the outgoing URLs do.
         * Removed lost echo in Locale.php
 
 2006-03-21 Benoit Grégoire  <bock@step.polymtl.ca>
-        * login/index.php: Remove huge security hole introduced by stylistic changes in the file.
-        A user could login to any hotspot by simply filling a blank form because of a gratuitous
-        change from empty to is_null everywhere.  Remove escaping or REQUEST parameters in non SQL
-         related code, as this would lead to double unescaping down the line.  Remove logic dependent
-          on encapsulated side effects of object method call.
+        * login/index.php: Remove huge security hole introduced by stylistic
+          changes in the file. A user could login to any hotspot by simply filling
+          a blank form because of a gratuitous change from empty to is_null
+          everywhere.  Remove escaping or REQUEST parameters in non SQL
+          related code, as this would lead to double unescaping down the line.
+          Remove logic dependent on encapsulated side effects of object method call.
 
 2006-03-19 François Proulx <francois.proulx@gmail.com>

trunk/wifidog-auth/INSTALL

@@ -14 +14 @@
 - Magpierss (http://magpierss.sourceforge.net/) (Required for RSS support. RSS
   support must be manually disabled if you do not install it)
-- FCKeditor 2.2 (http://www.fckeditor.net/) (Required if you want to edit
+- FCKeditor 2.3+ (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

trunk/wifidog-auth/wifidog/classes/Content/ContentGroup/ContentGroup.php

@@ -730 +730 @@
     }
 
-    /** Delete this Content from the database
-    */
+    /**
+     * Delete this Content from the database
+     */
     public function delete(& $errmsg) {
         if ($this->isPersistent() == false) {
@@ -738 +739 @@
             }
         }
-        return parent :: delete($errmsg);
-    }
+        return parent::delete($errmsg);
+    }
+
     /** Reloads the object from the database.  Should normally be called after a set operation.
     * This function is private because calling it from a subclass will call the

trunk/wifidog-auth/wifidog/classes/Content/ContentGroup/ContentGroupElement.php

@@ -273 +273 @@
         $html .= "<fieldset class='admin_element_group'>\n";
                 $html .= "<legend>". sprintf(_("%s %d display order and location"), get_class($this), $this->getDisplayOrder())."</legend>\n";
-        
+
         $allowed_node_rows = null;
                 $html .= "<ul class='admin_element_list'>\n";
@@ -319 +319 @@
         $html .= "</li'>\n";
         $html .= "</ul>\n";
-        
+
         $html .= "</li>\n";
         $html .= "</fieldset>\n";
         $html .= "</li>\n";
-        
+
         /* displayed_content_id */
         $html .= "<li class='admin_element_item_container'>\n";
@@ -535 +535 @@
         if ($this->isPersistent() == false && !empty ($this->content_group_element_row['displayed_content_id'])) {
             $displayed_content = self::getObject($this->content_group_element_row['displayed_content_id']);
-            $displayed_content->delete(& $errmsg);
-            parent::delete(& $errmsg);
+            $displayed_content->delete($errmsg);
+            parent::delete($errmsg);
         }
     }

trunk/wifidog-auth/wifidog/classes/Content/EmbeddedContent/EmbeddedContent.php

@@ -412 +412 @@
         }
 
-        return parent :: delete($errmsg);
+        return parent::delete($errmsg);
     }
 

trunk/wifidog-auth/wifidog/classes/Content/HTMLeditor/HTMLeditor.php

@@ -57 +57 @@
  * @copyright  2005-2006 Max Horvath, maxspot GmbH
  */
-class HTMLeditor extends Langstring
+class HTMLeditor extends Content
 {
 
@@ -98 +98 @@
             $this->_FCKeditorAvailable = true;
         }
+    }
+
+    /**
+     * Return string in the language requested by the user.
+     *
+     * @return string UTF-8 string of content.
+     *
+     * @access private
+     */
+    private function getString()
+    {
+        // Init values
+        $_retval = null;
+        $_row = null;
+        $_useCache = false;
+        $_cachedData = null;
+
+        // Create new cache objects
+        $_cacheLanguage = new Cache('langstrings_' . $this->id . '_substring_' . substr(Locale::getCurrentLocale()->getId(), 0, 2) . '_string', $this->id);
+        $_cache = new Cache('langstrings_' . $this->id . '_substring__string', $this->id);
+
+        // Check if caching has been enabled.
+        if ($_cacheLanguage->isCachingEnabled) {
+            $_cachedData = $_cacheLanguage->getCachedData();
+
+            if ($_cachedData) {
+                // Return cached data.
+                $_useCache = true;
+                $_retval = $_cachedData;
+            } else {
+                // Language specific cached data has not been found.
+                // Try to get language independent cached data.
+                $_cachedData = $_cache->getCachedData();
+
+                if ($_cachedData) {
+                    // Return cached data.
+                    $_useCache = true;
+                    $_retval = $_cachedData;
+                }
+            }
+        }
+
+        if (!$_useCache) {
+            // Get string in the prefered language of the user
+            $_sql = "SELECT value, locales_id, \n";
+            $_sql .= Locale::getSqlCaseStringSelect(Locale::getCurrentLocale()->getId());
+            $_sql .= " as score FROM content_langstring_entries WHERE content_langstring_entries.langstrings_id = '{$this->id}' AND value!='' ORDER BY score LIMIT 1";
+            $this->mBd->execSqlUniqueRes($_sql, $_row, false);
+
+            if ($_row == null) {
+                // String has not been found
+                $_retval = "(Empty string)";
+            } else {
+                // String has been found
+                $_retval = $_row['value'];
+
+                // Check if caching has been enabled.
+                if ($_cache->isCachingEnabled) {
+                    // Save data into cache, because it wasn't saved into cache before.
+                    $_cache->saveCachedData($_retval);
+                }
+            }
+        }
+
+        return $_retval;
+    }
+
+    /**
+     * Adds the string associated with the locale.
+     *
+     * @param string $string             String to be added
+     * @param string $locale             Locale of string (i.e. 'fr_CA') - can
+     *                                   be NULL
+     * @param bool   $allow_empty_string Defines if string may be empty
+     *
+     * @return bool True if string has been added, otherwise false.
+     *
+     * @access private
+     */
+    private function addString($string, $locale, $allow_empty_string = false)
+    {
+        // Init values
+        $_retval = false;
+        $_id = 'NULL';
+        $_idSQL = $_id;
+
+        if ($locale) {
+            // Set locale of string
+            $_language = new Locale($locale);
+
+            $_id = $_language->GetId();
+            $_idSQL = "'" . $_id . "'";
+        }
+
+        if ($allow_empty_string || ($string != null && $string != '')) {
+            // Save string in database
+            $string = $this->mBd->escapeString($string);
+            $this->mBd->execSqlUpdate("INSERT INTO content_langstring_entries (langstring_entries_id, langstrings_id, locales_id, value) VALUES ('" . get_guid() . "', '$this->id', $_idSQL , '$string')", FALSE);
+
+            // Create new cache object.
+            $_cache = new Cache('langstrings_' . $this->id . '_substring_' .  $_id . '_string', $this->id);
+
+            // Check if caching has been enabled.
+            if ($_cache->isCachingEnabled) {
+                // Remove old cached data.
+                $_cache->eraseCachedData();
+
+                // Save data into cache.
+                $_cache->saveCachedData($string);
+            }
+
+            $_retval = true;
+        }
+
+        return $_retval;
+    }
+
+    /**
+     * Updates the string associated with the locale.
+     *
+     * @param string $string String to be updated.
+     * @param string $locale Locale of string (i.e. 'fr_CA') - can be NULL.
+     *
+     * @return bool True if string has been updated, otherwise false.
+     *
+     * @access private
+     */
+    private function UpdateString($string, $locale)
+    {
+        // Init values
+        $_retval = false;
+        $_id = 'NULL';
+        $_row = null;
+
+        if ($locale) {
+            // Set locale of string
+            $_language = new Locale($locale);
+
+            $_id = $_language->GetId();
+            $_idSQL = "'" . $_id . "'";
+        }
+
+        if ($string != null && $string != '') {
+            $string = $this->mBd->escapeString($string);
+
+            // If the update returns 0 (no update), try inserting the record
+            $this->mBd->execSqlUniqueRes("SELECT * FROM content_langstring_entries WHERE locales_id = $_idSQL AND langstrings_id = '$this->id'", $_row, false);
+
+            if ($_row != null) {
+                $this->mBd->execSqlUpdate("UPDATE content_langstring_entries SET value = '$string' WHERE langstrings_id = '$this->id' AND locales_id = $_idSQL", false);
+
+                // Create new cache object.
+                $_cache = new Cache('langstrings_' . $this->id . '_substring_' .  $_id . '_string', $this->id);
+
+                // Check if caching has been enabled.
+                if ($_cache->isCachingEnabled) {
+                    // Remove old cached data.
+                    $_cache->eraseCachedData();
+
+                    // Save data into cache.
+                    $_cache->saveCachedData($string);
+                }
+            } else {
+                $this->addString($string, $locale);
+            }
+
+            $_retval = true;
+        }
+        return $_retval;
     }
 
@@ -118 +287 @@
             $_html = '';
             $_languages = new LocaleList();
-                        $html .= "<ul class='admin_element_list'>\n";
+                        $_html .= "<ul class='admin_element_list'>\n";
 
             $_html .= "<li class='admin_element_item_container content_html_editor'>\n";
@@ -223 +392 @@
         // Check FCKeditor support
         if ($this->_FCKeditorAvailable) {
-            return parent::processAdminUI();
-        }
-    }
+            // Init values
+            $_result = null;
+
+            if ($this->isOwner(User::getCurrentUser()) || User::getCurrentUser()->isSuperAdmin()) {
+                parent::processAdminUI();
+
+                $_form_select = new FormSelectGenerator();
+
+                $_sql = "SELECT * FROM content_langstring_entries WHERE content_langstring_entries.langstrings_id = '$this->id'";
+                $this->mBd->execSql($_sql, $_result, FALSE);
+
+                if ($_result != null) {
+                    while (list($_key, $_value) = each($_result)) {
+                        $_language = $_form_select->getResult("langstrings_" . $this->id . "_substring_" . $_value["langstring_entries_id"] . "_language", 'Langstring::AfficherInterfaceAdmin');
+
+                        if (empty ($_language)) {
+                            $_language = '';
+                            $_languageSQL = 'NULL';
+                        } else {
+                            $_languageSQL = "'" . $_language . "'";
+                        }
+
+                        if (!empty ($_REQUEST["langstrings_" . $this->id . "_substring_" . $_value["langstring_entries_id"] . "_erase"]) && $_REQUEST["langstrings_" . $this->id . "_substring_" . $_value["langstring_entries_id"] . "_erase"] == true) {
+                            $this->mBd->execSqlUpdate("DELETE FROM content_langstring_entries WHERE langstrings_id = '$this->id' AND langstring_entries_id='" . $_value["langstring_entries_id"] . "'", FALSE);
+
+                            // Create new cache object.
+                            $_cache = new Cache('langstrings_' . $this->id . '_substring_' .  $_language . '_string', $this->id);
+
+                            // Check if caching has been enabled.
+                            if ($_cache->isCachingEnabled) {
+                                // Remove old cached data.
+                                $_cache->eraseCachedData();
+                            }
+                        } else {
+                            // Strip HTML tags!
+                            $string = $_REQUEST["langstrings_" . $this->id . "_substring_" . $_value["langstring_entries_id"] . "_string"];
+                            $string = $this->mBd->escapeString(strip_tags($string, self::ALLOWED_HTML_TAGS));
+
+                            // If PEAR::HTML_Safe is available strips down all potentially dangerous content
+                            $_HtmlSafe = new HtmlSafe();
+
+                            if ($_HtmlSafe->isHtmlSafeEnabled) {
+                                $string = $_HtmlSafe->parseHtml($string);
+                            }
+
+                            $this->mBd->execSqlUpdate("UPDATE content_langstring_entries SET locales_id = " . $_languageSQL . " , value = '$string' WHERE langstrings_id = '$this->id' AND langstring_entries_id='" . $_value["langstring_entries_id"] . "'", FALSE);
+
+                            // Create new cache object.
+                            $_cache = new Cache('langstrings_' . $this->id . '_substring_' .  $_language . '_string', $this->id);
+
+                            // Check if caching has been enabled.
+                            if ($_cache->isCachingEnabled) {
+                                // Remove old cached data.
+                                $_cache->eraseCachedData();
+
+                                // Save data into cache.
+                                $_cache->saveCachedData($string);
+                            }
+                        }
+                    }
+                }
+
+                $_new_substring_name = "langstrings_" . $this->id . "_substring_new_string";
+                $_new_substring_submit_name = "langstrings_" . $this->id . "_add_new_entry";
+                if ((isset ($_REQUEST[$_new_substring_submit_name]) && $_REQUEST[$_new_substring_submit_name] == true) || !empty ($_REQUEST[$_new_substring_name])) {
+                    $_language = $_form_select->getResult("langstrings_" . $this->id . "_substring_new_language", 'Langstring::AfficherInterfaceAdmin');
+
+                    if (empty($_language)) {
+                        $_language = null;
+                    }
+
+                    $this->addString($_REQUEST[$_new_substring_name], $_language, true);
+                }
+            }
+        }
+    }
+
+    /**
+     * Retreives the user interface of this object. Anything that overrides
+     * this method should call the parent method with it's output at the
+     * END of processing.
+     *
+     * @param string $subclass_admin_interface HTML content of the interface
+     *                                         element of a children.
+     *
+     * @return string The HTML fragment for this interface.
+     *
+     * @access public
+     */
+    public function getUserUI($subclass_user_interface = null)
+    {
+        // Init values
+        $_html = "";
+
+        $_html .= "<div class='user_ui_container ".get_class($this)."'>\n";
+        $_html .= "<div class='langstring'>\n";
+
+        // Check FCKeditor support
+        if ($this->_FCKeditorAvailable) {
+            $_html .= $this->getString();
+        } else {
+            $_html .= _("FCKeditor is not installed");
+        }
+
+        $_html .= $subclass_user_interface;
+        $_html .= "</div>\n";
+        $_html .= "</div>\n";
+
+        return parent::getUserUI($_html);
+    }
+
+    /**
+     * Reloads the object from the database. Should normally be called after
+     * a set operation. This function is private because calling it from a
+     * subclass will call the constructor from the wrong scope.
+     *
+     * @return void
+     *
+     * @access private
+     */
+    private function refresh()
+    {
+        $this->__construct($this->id);
+    }
+
+    /**
+     * Deletes a HTMLeditor object
+     *
+     * @param string $errmsg Reference to error message
+     *
+     * @return bool True if deletion was successful
+     *
+     * @access public
+     * @internal Persistent content will not be deleted
+     */
+    public function delete(& $errmsg) {
+        // Init values.
+        $_retval = false;
+
+        if ($this->isPersistent()) {
+            $errmsg = _("Content is persistent (you must make it non persistent before you can delete it)");
+        } else {
+            global $db;
+
+            if ($this->isOwner(User::getCurrentUser()) || User::getCurrentUser()->isSuperAdmin()) {
+                $_sql = "DELETE FROM content WHERE content_id='$this->id'";
+                $db->execSqlUpdate($_sql, false);
+                $_retval = true;
+
+                // Create new cache object.
+                $_cache = new Cache('all', $this->id);
+
+                // Check if caching has been enabled.
+                if ($_cache->isCachingEnabled) {
+                    // Remove old cached data.
+                    $_cache->eraseCachedGroupData();
+                }
+            } else {
+                $errmsg = _("Access denied (not owner of content)");
+            }
+        }
+
+        return $_retval;
+    }
+
 }
 
@@ -235 +566 @@
  * End:
  */
-
-

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

@@ -71 +71 @@
            "mytrashmail.com", "simplicato.net", "sneakemail.com", "sofort-mail.de",
            "spamcon.org", "spamex.com", "spamgourmet.com", "spamhole.com",
-           "spammotel.com", "trash-mail.de", "woodyland.org"
+           "spammotel.com", "trash-mail.de", "woodyland.org", "dumpmail.de",
+           "antispam24.de", "nervmich.net", "spamday.com", "throwaway.de"
            );
 

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

@@ -235 +235 @@
                 $html = '';
                 $name = "{$user_prefix}";
-                $sql = "SELECT node_id, name, node_deployment_status, is_splash_only_node from nodes WHERE 1=1 $sql_additional_where ORDER BY node_id";
+                $sql = "SELECT node_id, name, node_deployment_status, is_splash_only_node from nodes WHERE 1=1 $sql_additional_where ORDER BY lower(node_id)";
                 $node_rows = null;
                 $db->execSql($sql, $node_rows, false);
@@ -815 +815 @@
         $_data = Content::getLinkedContentUI("node_" . $hashed_node_id . "_content", "node_has_content", "node_id", $this->id, "portal");
         $html .= InterfaceElements::generateAdminSectionContainer("node_content", $_title, $_data);
- 
+
                 // Name
                 $_title = _("Name");
@@ -1453 +1453 @@
         }
 
-        /** Check if an node exists */
-        private function nodeExists($id)
-        {
-                global $db;
+        /**
+         * Checks if an node exists
+         *
+         * @param string $id Id of node to be checked
+         *
+         * @return bool True if node exists, else false
+         *
+         * @static
+         * @access private
+         */
+        private static function nodeExists($id)
+        {
+            // Define globals
+                global $db;
+
+                // Init values
                 $retval = false;
+
                 $id_str = $db->escapeString($id);
                 $sql = "SELECT * FROM nodes WHERE node_id='{$id_str}'";
                 $row = null;
                 $db->execSqlUniqueRes($sql, $row, false);
-                if ($row != null)
-                {
+
+                if ($row != null) {
                         $retval = true;
                 }
+
                 return $retval;
         }

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

@@ -133 +133 @@
 
         // Query the database, sorting by node name
-        $db->execSql("SELECT *, (NOW()-last_heartbeat_timestamp) AS since_last_heartbeat, EXTRACT(epoch FROM creation_date) as creation_date_epoch, CASE WHEN ((NOW()-last_heartbeat_timestamp) < interval '5 minutes') THEN true ELSE false END AS is_up FROM nodes WHERE network_id = '" . $db->escapeString($this->_network->getId()) . "' AND (node_deployment_status = 'DEPLOYED' OR node_deployment_status = 'NON_WIFIDOG_NODE') ORDER BY name", $this->_nodes, false);
+        $db->execSql("SELECT *, (NOW()-last_heartbeat_timestamp) AS since_last_heartbeat, EXTRACT(epoch FROM creation_date) as creation_date_epoch, CASE WHEN ((NOW()-last_heartbeat_timestamp) < interval '5 minutes') THEN true ELSE false END AS is_up FROM nodes WHERE network_id = '" . $db->escapeString($this->_network->getId()) . "' AND (node_deployment_status = 'DEPLOYED' OR node_deployment_status = 'NON_WIFIDOG_NODE') ORDER BY lower(name)", $this->_nodes, false);
     }
 

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

@@ -100 +100 @@
 
         // Query the database, sorting by node name
-        $db->execSql("SELECT *, (NOW()-last_heartbeat_timestamp) AS since_last_heartbeat, EXTRACT(epoch FROM creation_date) as creation_date_epoch, CASE WHEN ((NOW()-last_heartbeat_timestamp) < interval '5 minutes') THEN true ELSE false END AS is_up FROM nodes WHERE network_id = '" . $db->escapeString($this->_network->getId()) . "' AND (node_deployment_status = 'DEPLOYED' OR node_deployment_status = 'NON_WIFIDOG_NODE') ORDER BY name", $this->_nodes, false);
+        $db->execSql("SELECT *, (NOW()-last_heartbeat_timestamp) AS since_last_heartbeat, EXTRACT(epoch FROM creation_date) as creation_date_epoch, CASE WHEN ((NOW()-last_heartbeat_timestamp) < interval '5 minutes') THEN true ELSE false END AS is_up FROM nodes WHERE network_id = '" . $db->escapeString($this->_network->getId()) . "' AND (node_deployment_status = 'DEPLOYED' OR node_deployment_status = 'NON_WIFIDOG_NODE') ORDER BY lower(name)", $this->_nodes, false);
     }
 

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

@@ -107 +107 @@
 
         // Query the database, sorting by node name
-        $db->execSql("SELECT *, (NOW()-last_heartbeat_timestamp) AS since_last_heartbeat, EXTRACT(epoch FROM creation_date) as creation_date_epoch, CASE WHEN ((NOW()-last_heartbeat_timestamp) < interval '5 minutes') THEN true ELSE false END AS is_up FROM nodes WHERE network_id = '" . $db->escapeString($this->_network->getId()) . "' AND (node_deployment_status = 'DEPLOYED' OR node_deployment_status = 'NON_WIFIDOG_NODE') ORDER BY name", $this->_nodes, false);
+        $db->execSql("SELECT *, (NOW()-last_heartbeat_timestamp) AS since_last_heartbeat, EXTRACT(epoch FROM creation_date) as creation_date_epoch, CASE WHEN ((NOW()-last_heartbeat_timestamp) < interval '5 minutes') THEN true ELSE false END AS is_up FROM nodes WHERE network_id = '" . $db->escapeString($this->_network->getId()) . "' AND (node_deployment_status = 'DEPLOYED' OR node_deployment_status = 'NON_WIFIDOG_NODE') ORDER BY lower(name)", $this->_nodes, false);
     }
 

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

@@ -106 +106 @@
 
         // Query the database, sorting by node name
-        $db->execSql("SELECT *, (NOW()-last_heartbeat_timestamp) AS since_last_heartbeat, EXTRACT(epoch FROM creation_date) as creation_date_epoch, CASE WHEN ((NOW()-last_heartbeat_timestamp) < interval '5 minutes') THEN true ELSE false END AS is_up FROM nodes WHERE network_id = '" . $db->escapeString($this->_network->getId()) . "' AND (node_deployment_status = 'DEPLOYED' OR node_deployment_status = 'NON_WIFIDOG_NODE') ORDER BY name", $this->_nodes, false);
+        $db->execSql("SELECT *, (NOW()-last_heartbeat_timestamp) AS since_last_heartbeat, EXTRACT(epoch FROM creation_date) as creation_date_epoch, CASE WHEN ((NOW()-last_heartbeat_timestamp) < interval '5 minutes') THEN true ELSE false END AS is_up FROM nodes WHERE network_id = '" . $db->escapeString($this->_network->getId()) . "' AND (node_deployment_status = 'DEPLOYED' OR node_deployment_status = 'NON_WIFIDOG_NODE') ORDER BY lower(name)", $this->_nodes, false);
     }
 

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

@@ -394 +394 @@
             $sql_join = " JOIN node_stakeholders ON (nodes.node_id=node_stakeholders.node_id AND user_id='$user_id') ";
         }
-        $sql = "SELECT nodes.node_id, nodes.name from nodes $sql_join WHERE 1=1 ORDER BY node_id";
+        $sql = "SELECT nodes.node_id, nodes.name from nodes $sql_join WHERE 1=1 ORDER BY lower(node_id)";
         $node_rows = null;
         $db->execSql($sql, $node_rows, false);
@@ -599 +599 @@
             $html .= "<div class='admin_element_tools'><input type='checkbox' name='$key' $checked /></div>\n";
             $html .= "<div class='admin_element_label'>$name</div>\n";
-            
+
                 $html .= "</li>\n";
                 }

trunk/wifidog-auth/wifidog/install.php

@@ -242 +242 @@
         'note' => 'Required for RADIUS support'
     ),
+    'session' => array (
+        'needed' => 1,
+        'available' => 0,
+        'message' => '<B>session</B> extention is missing',
+        'note' => 'Required for core auth-server'
+    ),
     'xmlrpc' => array (
         'needed' => 0,
@@ -404 +410 @@
 function execVerbose($command, & $output, & $return_var) {
     print "$command";
-    $retval = exec($command.'  2>&1', & $output, & $return_var); 
+    $retval = exec($command.'  2>&1', & $output, & $return_var);
     if ($return_var != 0) {
         print "<p style='color:red'>Error:</em>  Command did not complete successfully  (returned $return_var): <br/>\n";

trunk/wifidog-auth/wifidog/js/HTMLeditor.js

@@ -42 +42 @@
 
 // WiFiDOG skin
-FCKConfig.SkinPath = FCKConfig.BasePath + '../../../content/HTMLeditor/';
+FCKConfig.SkinPath = FCKConfig.BasePath + 'skins/office2003/';
 
 // Path to our CSS defenitions
-FCKConfig.EditorAreaCSS = FCKConfig.BasePath + '../../../local_content/common/stylesheet.css';
+FCKConfig.EditorAreaCSS = FCKConfig.BasePath + '../../../media/base_theme/stylesheet.css';
+
+// Preload images
+FCKConfig.PreloadImages = [ FCKConfig.SkinPath + 'images/toolbar.start.gif', FCKConfig.SkinPath + 'images/toolbar.buttonarrow.gif' ] ;
 
 // Don't show script sources in source mode

trunk/wifidog-auth/wifidog/node_list.php

@@ -91 +91 @@
 }
 
+// Check if ordering should ignore uppper and lower case
+if ($sort_by_param == "name" || $sort_by_param == "node_id") {
+    $sort_by_param = "lower(" . $sort_by_param . ")";
+}
+
 // Sort according to above instructions
 if ($sort_by_using_sql === true)

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

@@ -70 +70 @@
 *}
         <p>
-                {if $networkNumOnlineUsers == 1}
+                {if $networkNumValidUsers == 1}
                         {"The %s network currently has one valid user."|_|sprintf:$networkName}
                 {else}