Changeset 1092

Timestamp:

09/07/06 04:38:25 (4 years ago)

Author:

benoitg

Message:

• Fix #63
• Fix problem with my Splash only user fix (I used match on the

user_id instead of the username).

• Prevent the Splash only user from logging out, wrecking havock

in the tokens.

• Do not allow SplashOnlyUser? to set his preferences.
• Assigning a reusable content to a contentgroup element would

make it non-reusable.
Usability and UI fixes:

• Allow other users to log in when they are at a splash only

node.

• Make isSimpleContent class available for Simple content types.

Make it borderless and backgroundless in the default theme_pack.

• Simplify HTML output for simple content.
• Fix IE layout bug in node admin
• Content linked to nodes and networks now edits in a new

window.

• Remove "Add new node" menu item for consistency.

Location:

trunk/wifidog-auth

Files:

• CHANGELOG (modified) (1 diff)
• wifidog/admin/generic_object_admin.php (modified) (1 diff)
• wifidog/classes/Content.php (modified) (6 diffs)
• wifidog/classes/Content/ContentGroup/ContentGroupElement.php (modified) (1 diff)
• wifidog/classes/Content/Langstring/Langstring.php (modified) (1 diff)
• wifidog/classes/Content/RssAggregator/RssAggregator.php (modified) (19 diffs)
• wifidog/classes/Node.php (modified) (1 diff)
• wifidog/classes/User.php (modified) (45 diffs)
• wifidog/content/index.php (modified) (2 diffs)
• wifidog/include/common.php (modified) (1 diff)
• wifidog/login/index.php (modified) (1 diff)
• wifidog/media/base_theme/stylesheet.css (modified) (2 diffs)
• wifidog/templates/classes/MainUI_ToolSection.tpl (modified) (2 diffs)

trunk/wifidog-auth/CHANGELOG

@@ -1 +1 @@
 2006-09-06 Benoit Grégoire  <bock@step.polymtl.ca>
-
+        * Fix #63
+        * Fix problem with my Splash only user fix (I used match on the user_id instead of the username).
+        * Prevent the Splash only user from logging out, wrecking havock in the tokens.
+        * Do not allow SplashOnlyUser to set his preferences.
+        * Assigning a reusable content to a contentgroup element would make it non-reusable.
+Usability and UI fixes:
+        * Allow other users to log in when they are at a splash only node.
+        * Make isSimpleContent class available for Simple content types.  Make it borderless and backgroundless in the default theme_pack.
+        * Simplify HTML output for simple content.
+        * Fix IE layout bug in node admin
+        * Content linked to nodes and networks now edits in a new window.
+        * Remove "Add new node" menu item for consistency.
+        
+2006-09-06 Benoit Grégoire  <bock@step.polymtl.ca>
+        * Remove most inclusions of MainUI in classes. 
+        That completely broke authentication (circular dependencies). 
+        Fixes 245.
+    Unfixes 242. Exceptions should not be caught in the context
+    they are thrown in. Else there no point in throwing exception in the
+    first place. 
         * HyperLink.php:  Fix bug where a link with identical text as it's link would see the text replaced by the clickthrough-tracked equivalent.
 

trunk/wifidog-auth/wifidog/admin/generic_object_admin.php

@@ -236 +236 @@
     $object->processAdminUI();
 
-    // Renew information about the object
-    $object = call_user_func(array($class, 'getObject'), $_REQUEST['object_id']);
-
     // Now try to delete the content
     if ($object->delete($errmsg) == true) {

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

@@ -559 +559 @@
                 $html .= "<td>\n";
                 $name = "{$user_prefix}_" . $content->GetId() . "_edit";
-                $html .= "<input type='button' class='submit' name='$name' value='" . _("Edit") . "' onClick='window.location.href = \"" . GENERIC_OBJECT_ADMIN_ABS_HREF . "?object_class=Content&action=edit&object_id=" . $content->GetId() . "\";'>\n";
+                $html .= "<input type='button' class='submit' name='$name' value='" . _("Edit") . "' onClick='window.open(\"" . GENERIC_OBJECT_ADMIN_ABS_HREF . "?object_class=Content&action=edit&object_id=" . $content->GetId() . "\");'>\n";
                 $name = "{$user_prefix}_" . $content->GetId() . "_erase";
                 $html .= "<input type='submit' class='submit' name='$name' value='" . _("Remove") . "'>";
@@ -734 +734 @@
             }
 
-            $html .= _("Add existing content") . ": ";
+            $html .= _("Add reusable content from library") . ": ";
         }
 
@@ -1025 +1025 @@
     public function getUserUI($subclass_user_interface = null) {
         $html = '';
-        $html .= "<div class='user_ui_main_outer " . get_class($this) . "'>\n";
+        $this->isSimpleContent() ? $isSimpleContentClass = 'isSimpleContent' : $isSimpleContentClass = null;
+        $html .= "<div class='user_ui_main_outer " . get_class($this) . " $isSimpleContentClass'>\n";
         $html .= "<div class='user_ui_main_inner'>\n";
 
@@ -1039 +1040 @@
         }
 
-        $html .= "<table><tr>\n";
+if($this->isSimpleContent())
+{
+    $html .= "\n$subclass_user_interface\n";
+}
+else{
+$html .= "<table><tr>\n";
         $html .= "<td>\n$subclass_user_interface</td>\n";
-
         $html .= "<td>\n";
+}
         $authors = $this->getAuthors();
         if (count($authors) > 0) {
@@ -1077 +1083 @@
             }
         }
-
+if(!$this->isSimpleContent())
+{
         $html .= "</td>\n";
         $html .= "</tr></table>\n";
-
+}
         $html .= "</div>\n";
         $html .= "</div>\n";
@@ -1270 +1277 @@
                 /* is_persistent */
                 $html .= "<li class='admin_element_item_container admin_section_edit_persistant'>\n";
-                $html .= "<div class='admin_element_label'>" . _("Is persistent (reusable and read-only)?") . ": </div>\n";
+                $html .= "<div class='admin_element_label'>" . _("Is part of reusable content library (protected from deletion)?") . ": </div>\n";
                 $html .= "<div class='admin_element_data'>\n";
                 $name = "content_" . $this->id . "_is_persistent";

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

@@ -454 +454 @@
                                 $displayed_content_id = $displayed_content->GetId();
                                 $db->execSqlUpdate("UPDATE content_group_element SET displayed_content_id = '$displayed_content_id' WHERE content_group_element_id = '$this->id'", FALSE);
-                                $displayed_content->setIsPersistent(false);
                         }
                 } else {

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

@@ -494 +494 @@
         $html = '';
 
-        $html .= "<div class='user_ui_container ".get_class($this)."'>\n";
         $html .= "<div class='langstring'>\n";
         $html .= $this->getString();
         $html .= $subclass_user_interface;
-        $html .= "</div>\n";
         $html .= "</div>\n";
         /* Handle hyperlink clicktrough logging */

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

@@ -64 +64 @@
 class RssAggregator extends Content {
     /**
-
+    
      */
     private $content_rss_aggregator_row;
 
     /**
-
+    
      */
     private $content_rss_aggregator_feeds_rows;
 
     /**
-
+    
      */
     private $press_review;
@@ -114 +114 @@
         if ($content_rss_aggregator_rows != null) {
             $this->content_rss_aggregator_feeds_rows = $content_rss_aggregator_rows;
-        }
-        else {
+        } else {
             $this->content_rss_aggregator_feeds_rows = array ();
         }
@@ -139 +138 @@
                 }
             }
-        }
-        else {
+        } else {
             $html = _("RSS support is disabled");
         }
@@ -182 +180 @@
 
             $retval = false;
-        }
-        else {
+        } else {
             /*
              * Successfull, but nothing modified
@@ -239 +236 @@
 
             $retval = true;
-        }
-        else {
+        } else {
             /*
              * Successfull, but nothing modified
@@ -305 +301 @@
 
             $retval = false;
-        }
-        else {
+        } else {
             /*
              * Successfull, but nothing modified
@@ -405 +400 @@
         $html .= "<div class='admin_element_label'>\n";
         $html .= _("How much bonus feeds that do not publish as often get over feed that publish more often.
-                            The default is 0.75, with a typical range between 0 and 1.
-                            At 0, you have a classic RSS aggregator, meaning the n most recent entries picked from all feeds
-                            will be displayed. 1 is usually as high as you'll want to go:  Assuming that all
-                            an homogenous internal distribution (ex:  one feed publishes exactly one entry a day, the
-                            second once every two days, and the third once every three days), and you ask for 15 entries,
-                            there will be 5 of each.  While that may not sound usefull, it still is, as the feed's distribution is
-                            usually not homogenous.");
+                                            The default is 0.75, with a typical range between 0 and 1.
+                                            At 0, you have a classic RSS aggregator, meaning the n most recent entries picked from all feeds
+                                            will be displayed. 1 is usually as high as you'll want to go:  Assuming that all
+                                            an homogenous internal distribution (ex:  one feed publishes exactly one entry a day, the
+                                            second once every two days, and the third once every three days), and you ask for 15 entries,
+                                            there will be 5 of each.  While that may not sound usefull, it still is, as the feed's distribution is
+                                            usually not homogenous.");
         $html .= ": </div>\n";
         $html .= "<div class='admin_element_data'>\n";
@@ -428 +423 @@
         $html .= "<div class='admin_element_label'>\n";
         $html .= _("Set the oldest entries (in seconds) you are willing to see.  Any entries older than this will not
-                            be considered at all for display, even if it means that the configured number of items to be displayed isn't reached.
-                            It's only usefull if all your feed publish very rarely, and you don't want very old entries to show up.");
+                                            be considered at all for display, even if it means that the configured number of items to be displayed isn't reached.
+                                            It's only usefull if all your feed publish very rarely, and you don't want very old entries to show up.");
         $html .= ": </div>\n";
         $html .= "<div class='admin_element_data'>\n";
@@ -473 +468 @@
 
         $sql = "SELECT count, content_rss_aggregator_feeds.url, title FROM content_rss_aggregator_feeds
-                        JOIN (SELECT url, count(content_rss_aggregator_feeds.url) as count
-                        FROM content_rss_aggregator_feeds
-                        WHERE content_rss_aggregator_feeds.url NOT IN (SELECT url FROM content_rss_aggregator_feeds WHERE content_id='{$this->id}')
-                        GROUP BY content_rss_aggregator_feeds.content_id, content_rss_aggregator_feeds.url)
-                        AS available_feeds
-                        ON (available_feeds.url=content_rss_aggregator_feeds.url)
-                        ORDER by count DESC";
+                                        JOIN (SELECT url, count(content_rss_aggregator_feeds.url) as count
+                                        FROM content_rss_aggregator_feeds
+                                        WHERE content_rss_aggregator_feeds.url NOT IN (SELECT url FROM content_rss_aggregator_feeds WHERE content_id='{$this->id}')
+                                        GROUP BY content_rss_aggregator_feeds.content_id, content_rss_aggregator_feeds.url)
+                                        AS available_feeds
+                                        ON (available_feeds.url=content_rss_aggregator_feeds.url)
+                                        ORDER by count DESC";
 
         $db->execSql($sql, $feed_urls, false);
-
-        foreach ($feed_urls as $feed_row) {
-            $tab[$i][0] = $feed_row['url'];
-            empty ($feed_row['title']) ? $title = $feed_row['url'] : $title = $feed_row['title'];
-            $tab[$i][1] = sprintf(_("%s, used %d times"), $title, $feed_row['count']);
-            $i++;
-        }
-
+        if ($feed_urls) {
+            foreach ($feed_urls as $feed_row) {
+                $tab[$i][0] = $feed_row['url'];
+                empty ($feed_row['title']) ? $title = $feed_row['url'] : $title = $feed_row['title'];
+                $tab[$i][1] = sprintf(_("%s, used %d times"), $title, $feed_row['count']);
+                $i++;
+            }
+        }
         $name = "rss_aggregator_{$this->id}_feed_add";
         $html .= "<input type='text' size='60' value='' name='$name' id='$name'>\n";
@@ -563 +558 @@
      *
      * @return string HTML code for the administration interface
-
+    
      */
     private function getFeedAdminUI($feed_row) {
@@ -602 +597 @@
         if ($calculated_pub_interval == true) {
             $html .= sprintf(_("The feed publishes an item every %.2f day(s)"), $calculated_pub_interval / (60 * 60 * 24));
-        }
-        else {
+        } else {
             $html .= "<div class='admin_element_label'><span class='warningmsg'>" . _("WARNING:  This feed does not include the publication dates.
-                                                                                                 The system needs to be able to compute approximate publication
-                                                                                                 date for each entry, so the entry can be weighted against the
-                                                                                                 others. In order for the aggregator to do a good job, you need
-                                                                                                 to estimate fublication frequency of the items, in days.
-                                                                                                 If unset, defaults to one day.") . ": </span></div>\n";
+                                                                                                                             The system needs to be able to compute approximate publication
+                                                                                                                             date for each entry, so the entry can be weighted against the
+                                                                                                                             others. In order for the aggregator to do a good job, you need
+                                                                                                                             to estimate fublication frequency of the items, in days.
+                                                                                                                             If unset, defaults to one day.") . ": </span></div>\n";
             $html .= "<div class='admin_element_data'>\n";
             $name = "rss_aggregator_" . $this->id . "_feed_" . md5($feed_row['url']) . "_default_publication_interval";
@@ -615 +609 @@
             if (!empty ($feed_row['default_publication_interval'])) {
                 $value = $feed_row['default_publication_interval'] / (60 * 60 * 24);
-            }
-            else {
+            } else {
                 $value = '';
             }
@@ -631 +624 @@
         $html .= "<li class='admin_element_item_container'>\n";
         $html .= "<div class='admin_element_label'>" . _("The bias to be given to the source by the selection algorithm.
-                                                                Bias must be > 0 , typical values would be between 0.75 and 1.5
-                                                                and default is 1 (no bias).  A bias of 2 will cause the items
-                                                                to \"look\" twice as recent to the algorithm. A bias of 0.5 to
-                                                                look twice as old. Be carefull, a bias of 2 will statistically
-                                                                cause the feed to have MORE than twice as many items displayed.") . ": </div>\n";
+                                                                                    Bias must be > 0 , typical values would be between 0.75 and 1.5
+                                                                                    and default is 1 (no bias).  A bias of 2 will cause the items
+                                                                                    to \"look\" twice as recent to the algorithm. A bias of 0.5 to
+                                                                                    look twice as old. Be carefull, a bias of 2 will statistically
+                                                                                    cause the feed to have MORE than twice as many items displayed.") . ": </div>\n";
         $html .= "<div class='admin_element_data'>\n";
 
@@ -656 +649 @@
      *
      * @return void
-
+    
      */
     private function processFeedAdminUI($feed_row) {
@@ -680 +673 @@
         elseif (!is_numeric($bias) || $bias <= 0) {
             echo _("The bias must be a positive real number");
-        }
-        else {
+        } else {
             /*
              * Successfull, but nothing modified
@@ -709 +701 @@
             elseif (!is_numeric($bias) || $bias <= 0) {
                 echo _("The default publication must must be a positive integer or empty");
-            }
-            else {
+            } else {
                 /*
                  * Successfull, but nothing modified
@@ -732 +723 @@
         elseif (empty ($url)) {
             echo _("The URL cannot be empty!");
-        }
-        else {
+        } else {
             /*
              * Successfull, but nothing modified
@@ -754 +744 @@
             try {
                 $html = $this->press_review->get_rss_html($this->content_rss_aggregator_row['number_of_display_items']);
-            }
-            catch (Exception $e) {
+            } catch (Exception $e) {
                 $html = sprintf(_("Could not get RSS feed: %s"), $feed_row['url']);
             }
-        /* Handle hyperlink clicktrough logging */
-        $html = $this->replaceHyperLinks($html);
-
-        }
-        else {
+            /* Handle hyperlink clicktrough logging */
+            $html = $this->replaceHyperLinks($html);
+
+        } else {
             $html = _("RSS support is disabled");
         }
@@ -780 +768 @@
      *
      * @return void
-
+    
      */
     private function refresh() {

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

@@ -997 +997 @@
                 // custom_portal_redirect_url
                 if ($network->getCustomPortalRedirectAllowed()) {
-                $_title = _("URL to show instead of the portal (if this is not empty, the portal will be disabled and this URL will be shown instead)");
+                $_title = _("URL to show instead of the portal");
                 $_data = InterfaceElements::generateInputText("node_" . $hashed_node_id . "_custom_portal_redirect_url", $this->getCustomPortalRedirectUrl(), "node_custom_portal_redirect_url_input");
-                $_html_node_config[] = InterfaceElements::generateAdminSectionContainer("node_custom_portal_redirect_url", $_title, $_data);
+                $_data .= _("If this is not empty, the portal will be disabled and this URL will be shown instead");
+                 $_html_node_config[] = InterfaceElements::generateAdminSectionContainer("node_custom_portal_redirect_url", $_title, $_data);
                 }
 

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

@@ -1 +1 @@
 <?php
+
 
 /* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
@@ -45 +46 @@
  * Load required classes
  */
-require_once('classes/Network.php');
-require_once('classes/Mail.php');
-require_once('classes/InterfaceElements.php');
+require_once ('classes/Network.php');
+require_once ('classes/Mail.php');
+require_once ('classes/InterfaceElements.php');
 
 /**
@@ -56 +57 @@
  * @copyright  2005-2006 Benoit Grégoire, Technologies Coeus inc.
  */
-class User implements GenericObject
-{
+class User implements GenericObject {
     private $mRow;
     private $id;
@@ -65 +65 @@
      * @return a User object, or null if there was an error
      */
-    public static function getObject($id)
-    {
+    public static function getObject($id) {
         $object = null;
         $object = new self($id);
@@ -72 +71 @@
     }
 
-    static function createNewObject()
-    {
+    static function createNewObject() {
         echo "<h1>Use User::createUser() instead</h1>";
     }
@@ -79 +77 @@
     * @return html markup
     */
-    public static function getCreateNewObjectUI()
-    {
+    public static function getCreateNewObjectUI() {
         return null;
     }
@@ -90 +87 @@
      * @return the node object or null if no new node was created.
      */
-    static function processCreateNewObjectUI()
-    {
+    static function processCreateNewObjectUI() {
         return self :: createNewObject();
     }
@@ -98 +94 @@
      *
      * @return mixed A User object, or null if there was an error
-
-     */
-    public static function getCurrentUser()
-    {
-        require_once('classes/Session.php');
+    
+     */
+    public static function getCurrentUser() {
+        require_once ('classes/Session.php');
         $session = new Session();
         $user = null;
-        try
-        {
+        try {
             $user = self :: getObject($session->get(SESS_USER_ID_VAR));
             //$user = new User($session->get(SESS_USER_ID_VAR));
-        }
-        catch (Exception $e)
-        {
+        } catch (Exception $e) {
             /**If any problem occurs, the user should be considered logged out*/
             $session->set(SESS_USER_ID_VAR, null);
@@ -126 +118 @@
      *
      * @return bool True if everything went well setting the session
-
-     */
-    public static function setCurrentUser(User $user)
-    {
-        try
-        {
+    
+     */
+    public static function setCurrentUser(User $user) {
+        try {
             $session = new Session();
             $session->set(SESS_USER_ID_VAR, $user->getId());
             $session->set(SESS_PASSWORD_HASH_VAR, $user->getPasswordHash());
             return true;
-        }
-        catch (Exception $e)
-        {
+        } catch (Exception $e) {
             return false;
         }
@@ -147 +135 @@
      *
      * @return string Hostname of server
-
-     */
-    public static function getCurrentServer()
-    {
+    
+     */
+    public static function getCurrentServer() {
         return $_SERVER['SERVER_NAME'];
     }
@@ -159 +146 @@
      * @return a User object, or null if there was an error
      */
-    public static function getUserByUsernameAndOrigin($username, Network $account_origin)
-    {
+    public static function getUserByUsernameAndOrigin($username, Network $account_origin) {
         global $db;
         $object = null;
@@ -178 +164 @@
      * @return a User object, or null if there was an error
      */
-    public static function getUserByEmailAndOrigin($email, Network $account_origin)
-    {
+    public static function getUserByEmailAndOrigin($email, Network $account_origin) {
         global $db;
         $object = null;
@@ -195 +180 @@
      * @return The 32 character hash.
      */
-    public static function passwordHash($password)
-    {
+    public static function passwordHash($password) {
         /**
          * utf8_decode is used for backward compatibility with old passwords
@@ -209 +193 @@
      * @return the newly created User object, or null if there was an error
      */
-    static function createUser($id, $username, Network $account_origin, $email, $password)
-    {
+    static function createUser($id, $username, Network $account_origin, $email, $password) {
         global $db;
 
@@ -229 +212 @@
     }
 
-/*    public static function purgeUnvalidatedUsers($days_since_creation)
-    {
-        global $db;
-        $days_since_creation = $db->escapeString($days_since_creation);
-
-        //$db->execSqlUpdate("INSERT INTO users (user_id,username, account_origin,email,pass,account_status,validation_token,reg_date) VALUES ('$id_str','$username_str','$account_origin_str','$email_str','$password_hash','$status','$token',NOW())");
-    }*/
+    /*    public static function purgeUnvalidatedUsers($days_since_creation)
+        {
+            global $db;
+            $days_since_creation = $db->escapeString($days_since_creation);
+    
+            //$db->execSqlUpdate("INSERT INTO users (user_id,username, account_origin,email,pass,account_status,validation_token,reg_date) VALUES ('$id_str','$username_str','$account_origin_str','$email_str','$password_hash','$status','$token',NOW())");
+        }*/
 
     /** @param $object_id The id of the user */
-    function __construct($object_id)
-    {
+    function __construct($object_id) {
         global $db;
         $this->mDb = & $db;
@@ -245 +227 @@
         $sql = "SELECT * FROM users WHERE user_id='{$object_id_str}'";
         $db->execSqlUniqueRes($sql, $row, false);
-        if ($row == null)
-        {
+        if ($row == null) {
             throw new Exception(sprintf(_("User id: %s could not be found in the database"), $object_id_str));
         }
@@ -253 +234 @@
     } //End class
 
-    function getId()
-    {
+    function getId() {
         return $this->id;
     }
@@ -261 +241 @@
      * @return Network object (never returns null)
      */
-    public function getNetwork()
-    {
+    public function getNetwork() {
         return Network :: getObject($this->mRow['account_origin']);
     }
 
     /** Get a user display suitable for a user list.  Will include link to the user profile. */
-    function getListUI()
-    {
+    function getListUI() {
         /*    $roles = array ();
-
-    if ($current_node->isOwner($online_user)) {
+        
+        if ($current_node->isOwner($online_user)) {
         $roles[] = _("owner");
-    }
-
-    if ($current_node->isTechnicalOfficer($online_user)) {
+        }
+        
+        if ($current_node->isTechnicalOfficer($online_user)) {
         $roles[] = _("technical officer");
-    }
-
-    if ($roles) {
+        }
+        
+        if ($roles) {
         $rolenames = join($roles, ",");
-    }*/
+        }*/
         $html = '';
-        if($this->isSplashOnlyUser())
-        {
-                $html .= _("Guest");
+        if ($this->isSplashOnlyUser()) {
+            $html .= _("Guest");
         }
         $html .= $this->getUserName();
@@ -291 +268 @@
     }
 
-    function getUsername()
-    {
+    function getUsername() {
         return $this->mRow['username'];
     }
-    
-     /** Set the user's username
-     * @param $value The new value
-     * @return true on success, false on failure
-     * @throws exception if the user tries to set a duplicate username
-     */
+
+    /** Set the user's username
+    * @param $value The new value
+    * @return true on success, false on failure
+    * @throws exception if the user tries to set a duplicate username
+    */
     function setUsername($value) {
         $retval = true;
@@ -306 +282 @@
             global $db;
             $value = $db->escapeString($value);
-            $retval = @$db->execSqlUpdate("UPDATE users SET username = '{$value}' WHERE user_id='{$this->id}'", false);
-            if(!$retval)
-            {
-                throw new exception (sprintf(_("Sorry, the username %s is not available"), $value));
+            $retval = @ $db->execSqlUpdate("UPDATE users SET username = '{$value}' WHERE user_id='{$this->id}'", false);
+            if (!$retval) {
+                throw new exception(sprintf(_("Sorry, the username %s is not available"), $value));
             }
             $this->refresh();
@@ -316 +291 @@
     }
 
-    public function getEmail()
-    {
+    public function getEmail() {
         return $this->mRow['email'];
     }
 
-    public function setEmail($email)
-    {
-      $email_str = $this->mDb->escapeString($email);
-      if (!($update = $this->mDb->execSqlUpdate("UPDATE users SET email='{$email_str}' WHERE user_id='{$this->id}'")))
-        {
-          throw new Exception(_("Could not update email address."));
-        }
-      $this->mRow['email'] = $email; // unescaped
-    }
-
-    function setIsInvisible($value)
-    {
-      $retval = true;
-      if ($value != $this->isAdvertised())
-        {
-          global $db;
-          $value ? $value = 'TRUE' : $value = 'FALSE';
-          $retval = $db->execSqlUpdate("UPDATE users SET is_invisible = {$value} WHERE user_id = '{$this->getId()}'", false);
-          $this->refresh();
-        }
-      return $retval;
-    }
-
-    public function isInvisible()
-    {
-      return (($this->mRow['is_invisible'] == 't') ? true : false);
+    public function setEmail($email) {
+        $email_str = $this->mDb->escapeString($email);
+        if (!($update = $this->mDb->execSqlUpdate("UPDATE users SET email='{$email_str}' WHERE user_id='{$this->id}'"))) {
+            throw new Exception(_("Could not update email address."));
+        }
+        $this->mRow['email'] = $email; // unescaped
+    }
+
+    function setIsInvisible($value) {
+        $retval = true;
+        if ($value != $this->isAdvertised()) {
+            global $db;
+            $value ? $value = 'TRUE' : $value = 'FALSE';
+            $retval = $db->execSqlUpdate("UPDATE users SET is_invisible = {$value} WHERE user_id = '{$this->getId()}'", false);
+            $this->refresh();
+        }
+        return $retval;
+    }
+
+    public function isInvisible() {
+        return (($this->mRow['is_invisible'] == 't') ? true : false);
     }
 
     /**What locale (language) does the user prefer? */
-    public function getPreferedLocale()
-    {
-      global $session;
-      $locale = $this->mRow['prefered_locale'];
-      if (empty($locale) && !empty($session))
-        $locale = $session->get(SESS_LANGUAGE_VAR);
-      if (empty($locale))
-        $locale = DEFAULT_LANG;
-      return $locale;
-    }
-
-    public function setPreferedLocale($locale)
-    {
-      $locale_str = $this->mDb->escapeString($locale);
-      if (!($update = $this->mDb->execSqlUpdate("UPDATE users SET prefered_locale='{$locale_str}' WHERE user_id='{$this->id}'")))
-        {
-          throw new Exception(_("Could not update username locale."));
-        }
-      $this->mRow['prefered_locale'] = $locale;
+    public function getPreferedLocale() {
+        global $session;
+        $locale = $this->mRow['prefered_locale'];
+        if (empty ($locale) && !empty ($session))
+            $locale = $session->get(SESS_LANGUAGE_VAR);
+        if (empty ($locale))
+            $locale = DEFAULT_LANG;
+        return $locale;
+    }
+
+    public function setPreferedLocale($locale) {
+        $locale_str = $this->mDb->escapeString($locale);
+        if (!($update = $this->mDb->execSqlUpdate("UPDATE users SET prefered_locale='{$locale_str}' WHERE user_id='{$this->id}'"))) {
+            throw new Exception(_("Could not update username locale."));
+        }
+        $this->mRow['prefered_locale'] = $locale;
     }
 
     /** get the hashed password stored in the database */
-    public function getPasswordHash()
-    {
+    public function getPasswordHash() {
         return $this->mRow['pass'];
     }
@@ -380 +345 @@
      * @return Possible values are listed in common.php
     */
-    function getAccountStatus()
-    {
+    function getAccountStatus() {
         return $this->mRow['account_status'];
     }
 
-    function setAccountStatus($status)
-    {
+    function setAccountStatus($status) {
         global $db;
 
         $status_str = $db->escapeString($status);
-        if (!($update = $db->execSqlUpdate("UPDATE users SET account_status='{$status_str}' WHERE user_id='{$this->id}'")))
-        {
+        if (!($update = $db->execSqlUpdate("UPDATE users SET account_status='{$status_str}' WHERE user_id='{$this->id}'"))) {
             throw new Exception(_("Could not update status."));
         }
@@ -399 +361 @@
     /** Is the user valid?  Valid means that the account is validated or hasn't exhausted it's validation period.
      $errmsg: Returs the reason why the account is or isn't valid */
-    function isUserValid(& $errmsg = null)
-    {
+    function isUserValid(& $errmsg = null) {
         global $db;
         $retval = false;
         $account_status = $this->getAccountStatus();
-        if ($account_status == ACCOUNT_STATUS_ALLOWED)
-        {
+        if ($account_status == ACCOUNT_STATUS_ALLOWED) {
             $retval = true;
-        }
-        else
-            if ($account_status == ACCOUNT_STATUS_VALIDATION)
-            {
+        } else
+            if ($account_status == ACCOUNT_STATUS_VALIDATION) {
                 $sql = "SELECT CASE WHEN ((NOW() - reg_date) > networks.validation_grace_time) THEN true ELSE false END AS validation_grace_time_expired, networks.validation_grace_time FROM users  JOIN networks ON (users.account_origin = networks.network_id) WHERE (user_id='{$this->id}')";
                 $db->execSqlUniqueRes($sql, $user_info, false);
 
-                if ($user_info['validation_grace_time_expired'] == 't')
-                {
-                    $errmsg = sprintf(_("Sorry, your %s minutes grace period to retrieve your email and validate your account has now expired. You will have to connect to the internet and validate your account from another location or create a new account. For help, please %s click here %s."), $user_info['validation_grace_time_expired'], '<a href="'.BASE_URL_PATH.'faq.php'.'">', '</a>');
+                if ($user_info['validation_grace_time_expired'] == 't') {
+                    $errmsg = sprintf(_("Sorry, your %s minutes grace period to retrieve your email and validate your account has now expired. You will have to connect to the internet and validate your account from another location or create a new account. For help, please %s click here %s."), $user_info['validation_grace_time_expired'], '<a href="' . BASE_URL_PATH . 'faq.php' . '">', '</a>');
                     $retval = false;
-                }
-                else
-                {
+                } else {
                     $errmsg = _("Your account is currently valid.");
                     $retval = true;
                 }
-            }
-            else
-            {
-                $errmsg = _("Sorry, your account is not valid: ").$account_status_to_text[$account_status];
+            } else {
+                $errmsg = _("Sorry, your account is not valid: ") . $account_status_to_text[$account_status];
                 $retval = false;
             }
@@ -433 +386 @@
     }
 
-    public function isSuperAdmin()
-    {
+    public function isSuperAdmin() {
         global $db;
         //$this->session->dump();
 
         $db->execSqlUniqueRes("SELECT * FROM users NATURAL JOIN administrators WHERE (users.user_id='$this->id')", $user_info, false);
-        if (!empty ($user_info))
-        {
+        if (!empty ($user_info)) {
             return true;
-        }
-        else
-        {
+        } else {
             return false;
         }
@@ -453 +402 @@
      * Tells if the current user is owner of at least one hotspot.
      */
-    public function isOwner()
-    {
+    public function isOwner() {
         global $db;
         $db->execSql("SELECT * FROM node_stakeholders WHERE is_owner = true AND user_id='{$this->getId()}'", $row, false);
@@ -463 +411 @@
     }
 
-    public function isNobody()
-        {
-                global $db;
-                $db->execSqlUniqueRes("SELECT DISTINCT user_id FROM (SELECT user_id FROM network_stakeholders WHERE user_id='{$this->getId()}' UNION SELECT user_id FROM node_stakeholders WHERE user_id='{$this->getId()}' UNION SELECT user_id FROM administrators WHERE user_id='{$this->getId()}') as tmp", $row, false);
-                if ($row == null)
-                        return true;
-                return false;
-        }
-
-/** Is this user the Splash Only User() */
-    public function isSplashOnlyUser()
-        {
-if($this->mRow['user_id'] == "SPLASH_ONLY_USER") {
-return true;
-}
-else {
-return false;
-}
-        }
-        
-    function getValidationToken()
-    {
+    public function isNobody() {
+        global $db;
+        $db->execSqlUniqueRes("SELECT DISTINCT user_id FROM (SELECT user_id FROM network_stakeholders WHERE user_id='{$this->getId()}' UNION SELECT user_id FROM node_stakeholders WHERE user_id='{$this->getId()}' UNION SELECT user_id FROM administrators WHERE user_id='{$this->getId()}') as tmp", $row, false);
+        if ($row == null)
+            return true;
+        return false;
+    }
+
+    /** Is this user the Splash Only User() */
+    public function isSplashOnlyUser() {
+        if ($this->mRow['username'] == "SPLASH_ONLY_USER") {
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+    function getValidationToken() {
         return $this->mRow['validation_token'];
     }
@@ -491 +435 @@
     @return true on success, false on failure
     */
-    function generateConnectionToken()
-    {
-        if ($this->isUserValid())
-        {
+    function generateConnectionToken() {
+        if ($this->isUserValid()) {
             global $db;
             global $session;
 
             $token = self :: generateToken();
-            if ($_SERVER['REMOTE_ADDR'])
-            {
+            if ($_SERVER['REMOTE_ADDR']) {
                 $node_ip = $db->escapeString($_SERVER['REMOTE_ADDR']);
             }
 
-            if ($session && $node_ip && $session->get(SESS_GW_ID_VAR))
-            {
+            if ($session && $node_ip && $session->get(SESS_GW_ID_VAR)) {
                 $node_id = $db->escapeString($session->get(SESS_GW_ID_VAR));
-                $db->execSqlUpdate("INSERT INTO connections (user_id, token, token_status, timestamp_in, node_id, node_ip, last_updated) VALUES ('".$this->getId()."', '$token', '".TOKEN_UNUSED."', NOW(), '$node_id', '$node_ip', NOW())", false);
+                $db->execSqlUpdate("INSERT INTO connections (user_id, token, token_status, timestamp_in, node_id, node_ip, last_updated) VALUES ('" . $this->getId() . "', '$token', '" . TOKEN_UNUSED . "', NOW(), '$node_id', '$node_ip', NOW())", false);
                 $retval = $token;
-            }
-            else
+            } else
                 $retval = false;
-        }
-        else
-        {
+        } else {
             $retval = false;
         }
@@ -520 +457 @@
     }
 
-    function setPassword($password)
-    {
+    function setPassword($password) {
         global $db;
 
         $new_password_hash = User :: passwordHash($password);
-        if (!($update = $db->execSqlUpdate("UPDATE users SET pass='$new_password_hash' WHERE user_id='{$this->id}'")))
-        {
+        if (!($update = $db->execSqlUpdate("UPDATE users SET pass='$new_password_hash' WHERE user_id='{$this->id}'"))) {
             throw new Exception(_("Could not change user's password."));
         }
@@ -532 +467 @@
     }
 
-    function getAccountOrigin()
-    {
+    function getAccountOrigin() {
         return $this->mRow['account_origin'];
     }
@@ -539 +473 @@
     /** Return all the users
      */
-    static function getAllUsers()
-    {
+    static function getAllUsers() {
         global $db;
 
         $db->execSql("SELECT * FROM users", $objects, false);
-        if ($objects == null)
-        {
+        if ($objects == null) {
             throw new Exception(_("No users could not be found in the database"));
         }
@@ -551 +483 @@
     }
 
-    function sendLostUsername()
-    {
+    function sendLostUsername() {
         $network = $this->getNetwork();
         $mail = new Mail();
@@ -558 +489 @@
         $mail->setSenderEmail($network->getValidationEmailFromAddress());
         $mail->setRecipientEmail($this->getEmail());
-        $mail->setMessageSubject($network->getName()._(" lost username request"));
-        $mail->setMessageBody(_("Hello,\nYou have requested that the authentication server send you your username:\nUsername: ").$this->getUsername()._("\n\nHave a nice day,\nThe Team"));
+        $mail->setMessageSubject($network->getName() . _(" lost username request"));
+        $mail->setMessageBody(_("Hello,\nYou have requested that the authentication server send you your username:\nUsername: ") . $this->getUsername() . _("\n\nHave a nice day,\nThe Team"));
         $mail->send();
     }
 
-    function sendValidationEmail()
-    {
-        if ($this->getAccountStatus() != ACCOUNT_STATUS_VALIDATION)
-        {
+    function sendValidationEmail() {
+        if ($this->getAccountStatus() != ACCOUNT_STATUS_VALIDATION) {
             throw new Exception(_("The user is not in validation period."));
-        }
-        else
-        {
-            if ($this->getValidationToken() == "")
-            {
+        } else {
+            if ($this->getValidationToken() == "") {
                 throw new Exception(_("The validation token is empty."));
-            }
-            else
-            {
+            } else {
                 $network = $this->getNetwork();
 
@@ -583 +507 @@
                 $mail->setSenderEmail($network->getValidationEmailFromAddress());
                 $mail->setRecipientEmail($this->getEmail());
-                $mail->setMessageSubject($network->getName()._(" new user validation"));
-                $url = BASE_SSL_PATH . "validate.php?user_id=".$this->getId()."&token=".$this->getValidationToken();
-                $mail->setMessageBody(_("Hello,\nPlease follow the link below to validate your account.\n").$url._("\n\nThank you,\nThe Team."));
+                $mail->setMessageSubject($network->getName() . _(" new user validation"));
+                $url = BASE_SSL_PATH . "validate.php?user_id=" . $this->getId() . "&token=" . $this->getValidationToken();
+                $mail->setMessageBody(_("Hello,\nPlease follow the link below to validate your account.\n") . $url . _("\n\nThank you,\nThe Team."));
                 $mail->send();
             }
@@ -591 +515 @@
     }
 
-    function sendLostPasswordEmail()
-    {
+    function sendLostPasswordEmail() {
         $network = $this->getNetwork();
         $new_password = $this->randomPass();
@@ -601 +524 @@
         $mail->setSenderEmail($network->getValidationEmailFromAddress());
         $mail->setRecipientEmail($this->getEmail());
-        $mail->setMessageSubject($network->getName()._(" new password request"));
-        $mail->setMessageBody(_("Hello,\nYou have requested that the authentication server send you a new password:\nUsername: ").$this->getUsername()._("\nPassword: ").$new_password._("\n\nHave a nice day,\nThe Team"));
+        $mail->setMessageSubject($network->getName() . _(" new password request"));
+        $mail->setMessageBody(_("Hello,\nYou have requested that the authentication server send you a new password:\nUsername: ") . $this->getUsername() . _("\nPassword: ") . $new_password . _("\n\nHave a nice day,\nThe Team"));
         $mail->send();
     }
 
-    static function userExists($id)
-    {
+    static function userExists($id) {
         global $db;
         $id_str = $db->escapeString($id);
@@ -615 +537 @@
     }
 
-    public static function emailExists($id)
-    {
+    public static function emailExists($id) {
         global $db;
         $id_str = $db->escapeString($id);
@@ -624 +545 @@
     }
 
-    public static function randomPass()
-    {
+    public static function randomPass() {
         $rand_pass = ''; // makes sure the $pass var is empty.
-        for ($j = 0; $j < 3; $j ++)
-        {
-            $startnend = array ('b', 'c', 'd', 'f', 'g', 'h', 'j', 'k', 'l', 'm', 'n', 'p', 'q', 'r', 's', 't', 'v', 'w', 'x', 'y', 'z',);
-            $id = array ('a', 'e', 'i', 'o', 'u', 'y',);
+        for ($j = 0; $j < 3; $j++) {
+            $startnend = array (
+                'b',
+                'c',
+                'd',
+                'f',
+                'g',
+                'h',
+                'j',
+                'k',
+                'l',
+                'm',
+                'n',
+                'p',
+                'q',
+                'r',
+                's',
+                't',
+                'v',
+                'w',
+                'x',
+                'y',
+                'z',
+                
+            );
+            $id = array (
+                'a',
+                'e',
+                'i',
+                'o',
+                'u',
+                'y',
+                
+            );
             $count1 = count($startnend) - 1;
             $count2 = count($id) - 1;
 
-            for ($i = 0; $i < 3; $i ++)
-            {
-                if ($i != 1)
-                {
+            for ($i = 0; $i < 3; $i++) {
+                if ($i != 1) {
                     $rand_pass .= $startnend[rand(0, $count1)];
-                }
-                else
-                {
+                } else {
                     $rand_pass .= $id[rand(0, $count2)];
                 }
@@ -649 +595 @@
     }
 
-    public static function generateToken()
-    {
+    public static function generateToken() {
         return md5(uniqid(rand(), 1));
     }
@@ -663 +608 @@
      *
      * @return string HTML markup
-
-     */
-    public static function getSelectUserUI($user_prefix, $add_button_name = null, $add_button_value = null)
-    {
+    
+     */
+    public static function getSelectUserUI($user_prefix, $add_button_name = null, $add_button_value = null) {
         // Define globals
         global $db;
 
-        $_networkSelector = InterfaceElements::generateDiv(Network::getSelectNetworkUI($user_prefix), "admin_section_network_selector", "admin_section_network_selector_" . $user_prefix);
+        $_networkSelector = InterfaceElements :: generateDiv(Network :: getSelectNetworkUI($user_prefix), "admin_section_network_selector", "admin_section_network_selector_" . $user_prefix);
 
         // Check if we need to add an "add" button
         if ($add_button_name && $add_button_value) {
-            $_userSelector = _("Username") . ": " .  InterfaceElements::generateInputText("select_user_" . $user_prefix . "_username", "", "", "input_text", array("onkeypress" => "if ((event.which ? event.which : event.keyCode) == 13) {form.$add_button_name.click() }"));
-            $_userSelector .= InterfaceElements::generateInputSubmit($add_button_name, $add_button_value);
+            $_userSelector = _("Username") . ": " . InterfaceElements :: generateInputText("select_user_" . $user_prefix . "_username", "", "", "input_text", array (
+                "onkeypress" => "if ((event.which ? event.which : event.keyCode) == 13) {form.$add_button_name.click() }"
+            ));
+            $_userSelector .= InterfaceElements :: generateInputSubmit($add_button_name, $add_button_value);
         } else {
-            $_userSelector = _("Username") . ": " .  InterfaceElements::generateInputText("select_user_" . $user_prefix . "_username");
-        }
-        $_html = InterfaceElements::generateDiv($_networkSelector . $_userSelector, 'user_select_user_ui_container');
+            $_userSelector = _("Username") . ": " . InterfaceElements :: generateInputText("select_user_" . $user_prefix . "_username");
+        }
+        $_html = InterfaceElements :: generateDiv($_networkSelector . $_userSelector, 'user_select_user_ui_container');
 
         return $_html;
@@ -688 +634 @@
      * @return the User object, or null if the user is invalid or none was selected
      */
-    static function processSelectUserUI($user_prefix)
-    {
+    static function processSelectUserUI($user_prefix) {
         $object = null;
-        try
-        {
+        try {
             $network = Network :: processSelectNetworkUI($user_prefix);
             $name = "select_user_{$user_prefix}_username";
-            if (!empty ($_REQUEST[$name]))
-            {
+            if (!empty ($_REQUEST[$name])) {
                 $username = $_REQUEST[$name];
                 return self :: getUserByUsernameAndOrigin($username, $network);
-            }
-            else
+            } else
                 return null;
-        }
-        catch (Exception $e)
-        {
+        } catch (Exception $e) {
             return null;
         }
     }
 
-    public function getAdminUI()
-    {
-        global $db;
-        $currentUser= self::getCurrentUser();
+    public function getAdminUI() {
+        global $db;
+        $currentUser = self :: getCurrentUser();
         $html = '';
-        $html .= "<fieldset class='admin_container ".get_class($this)."'>\n";
+        $html .= "<fieldset class='admin_container " . get_class($this) . "'>\n";
         $html .= "<ul class='admin_element_list'>\n";
-if($this==$currentUser || $this->getNetwork()->hasAdminAccess($currentUser))
-{
-    //username
-        $html .= "<li class='admin_element_item_container'>\n";
-        $html .= "<div class='admin_element_label'>"._("Username")." : </div>\n";
-        $html .= "<div class='admin_element_data'>\n";
-        $name = "user_".$this->getId()."_username";
-        $html .= "<input type='text' name='$name' value='".htmlentities($this->getUsername())."' size=30>\n";
-        $html .= _("Be carefull when changing this: it's the username you use to log in!");
-        $html .= "</div>\n";
-        $html .= "</li>\n";
-}
-/*
-        $html .= "<li class='admin_element_item_container'>\n";
-        $html .= "<div class='admin_element_label'>"._("Real name")." : </div>\n";
-        $html .= "<div class='admin_element_data'>\n";
-        $name = "user_".$this->getId()."_real_name";
-        $html .= "<input type='text' name='$name' value='".htmlentities($this->getRealName())."' size=30 readonly>\n";
-        $html .= "</div>\n";
-        $html .= "</li>\n";
-
-        $html .= "<li class='admin_element_item_container'>\n";
-        $html .= "<div class='admin_element_label'>"._("Website URL")." : </div>\n";
-        $html .= "<div class='admin_element_data'>\n";
-        $name = "user_".$this->getId()."_website";
-        $html .= "<input type='text' name='$name' value='".htmlentities($this->getWebsiteURL())."' size=30 readonly>\n";
-        $html .= "</div>\n";
-        $html .= "</li>\n";
-*/
+        if (($this == $currentUser && !$this->isSplashOnlyUser() )|| $this->getNetwork()->hasAdminAccess($currentUser)) {
+            //username
+            $html .= "<li class='admin_element_item_container'>\n";
+            $html .= "<div class='admin_element_label'>" . _("Username") . " : </div>\n";
+            $html .= "<div class='admin_element_data'>\n";
+            $name = "user_" . $this->getId() . "_username";
+            $html .= "<input type='text' name='$name' value='" . htmlentities($this->getUsername()) . "' size=30>\n";
+            $html .= _("Be carefull when changing this: it's the username you use to log in!");
+            $html .= "</div>\n";
+            $html .= "</li>\n";
+        }
+        /*
+                $html .= "<li class='admin_element_item_container'>\n";
+                $html .= "<div class='admin_element_label'>"._("Real name")." : </div>\n";
+                $html .= "<div class='admin_element_data'>\n";
+                $name = "user_".$this->getId()."_real_name";
+                $html .= "<input type='text' name='$name' value='".htmlentities($this->getRealName())."' size=30 readonly>\n";
+                $html .= "</div>\n";
+                $html .= "</li>\n";
+        
+                $html .= "<li class='admin_element_item_container'>\n";
+                $html .= "<div class='admin_element_label'>"._("Website URL")." : </div>\n";
+                $html .= "<div class='admin_element_data'>\n";
+                $name = "user_".$this->getId()."_website";
+                $html .= "<input type='text' name='$name' value='".htmlentities($this->getWebsiteURL())."' size=30 readonly>\n";
+                $html .= "</div>\n";
+                $html .= "</li>\n";
+        */
         $html .= "</fieldset>\n";
         return $html;
     }
 
-    public function processAdminUI()
-    {
-                global $db;
-        $currentUser= self::getCurrentUser();
-        if($this==$currentUser || $this->getNetwork()->hasAdminAccess($currentUser))
-{
-    //username
-        $name = "user_".$this->getId()."_username";
-        $this->setUsername($_REQUEST[$name]);
- }
-    }
-
-    public function delete(& $errmsg)
-    {
-    }
-
-    public function getUserUI()
-        {
+    public function processAdminUI() {
+        global $db;
+        $currentUser = self :: getCurrentUser();
+        if ($this == $currentUser || $this->getNetwork()->hasAdminAccess($currentUser)) {
+            //username
+            $name = "user_" . $this->getId() . "_username";
+            $this->setUsername($_REQUEST[$name]);
+        }
+    }
+
+    public function delete(& $errmsg) {
+    }
+
+    public function getUserUI() {
         $html = "";
         $html .= $this->getRealName();
 
         return $html;
-        }
+    }
 
     /** Add content to this user ( subscription ) */
-    public function addContent(Content $content)
-    {
+    public function addContent(Content $content) {
         global $db;
         $content_id = $db->escapeString($content->getId());
@@ -784 +717 @@
 
     /** Remove content from this node */
-    public function removeContent(Content $content)
-    {
+    public function removeContent(Content $content) {
         global $db;
         $content_id = $db->escapeString($content->getId());
@@ -795 +727 @@
     /**Get an array of all Content linked to this node
     * @return an array of Content or an empty arrray */
-    function getAllContent()
-    {
+    function getAllContent() {
         global $db;
         $retval = array ();
         $sql = "SELECT * FROM user_has_content WHERE user_id='$this->id' ORDER BY subscribe_timestamp";
         $db->execSql($sql, $content_rows, false);
-        if ($content_rows != null)
-        {
-            foreach ($content_rows as $content_row)
-            {
+        if ($content_rows != null) {
+            foreach ($content_rows as $content_row) {
                 $retval[] = Content :: getObject($content_row['content_id']);
             }
@@ -812 +741 @@
 
     /** Reloads the object from the database.  Should normally be called after a set operation */
-    protected function refresh()
-    {
-      $this->__construct($this->id);
+    protected function refresh() {
+        $this->__construct($this->id);
     }
 
     /** Set Smarty template values.  Standardization routine. */
-        public static function assignSmartyValues($smarty, $user=null) {
-                if (!$user) $user = User::getCurrentUser();
-                $smarty->assign('username', $user ? $user->getUsername() : '');
+    public static function assignSmartyValues($smarty, $user = null) {
+        if (!$user)
+            $user = User :: getCurrentUser();
+        $smarty->assign('username', $user ? $user->getListUI() : '');
         $smarty->assign('userId', $user ? $user->getId() : '');
-                /**
-                 * Define user security levels for the template
-                 *
-                 * These values are used in the default template of WiFoDog but could be
-                 * used in a customized template to restrict certain links to specific
-                 * user access levels.
-                 */
-                $smarty->assign('isValidUser', $user ? true : false);
-                $smarty->assign('isSuperAdmin', $user && $user->isSuperAdmin());
-                $smarty->assign('isOwner', $user && $user->isOwner());
+        /**
+         * Define user security levels for the template
+         *
+         * These values are used in the default template of WiFoDog but could be
+         * used in a customized template to restrict certain links to specific
+         * user access levels.
+         */
+        $smarty->assign('isValidUser', $user && !$user->isSplashOnlyUser() ? true : false);
+        $smarty->assign('isSuperAdmin', $user && $user->isSuperAdmin());
+        $smarty->assign('isOwner', $user && $user->isOwner());
 
         if (isset ($_REQUEST['debug_request']) && ($user && $user->isSuperAdmin())) {
@@ -838 +767 @@
             $smarty->assign('debugOutput', print_r($_REQUEST, true));
         }
-        }
+    }
 }
 
@@ -848 +777 @@
  * End:
  */
-

trunk/wifidog-auth/wifidog/content/index.php

@@ -52 +52 @@
 require_once('include/common_interface.php');
 require_once('classes/Node.php');
-
-if (CONF_USE_CRON_FOR_DB_CLEANUP == false)
-{
-    garbage_collect();
-}
 
 $node = null;
@@ -142 +137 @@
     foreach ($contents as $content)
     {
-        $html .= "<div class='portal_content'>\n";
         $html .= $content->getUserUI();
-        $html .= "</div>";
     }
     $html .= "</div>\n";

trunk/wifidog-auth/wifidog/include/common.php

@@ -194 +194 @@
     $tzd = substr(chunk_split($tzd, 3, ':'), 0, 6);
     $date = date('Y-m-d\TH:i:s', $unix_timestamp).$tzd;
-
     return $date;
 }

trunk/wifidog-auth/wifidog/login/index.php

@@ -219 +219 @@
  * Once logged out, we display the login page
  */
-if ((!empty($logout) && $logout) && ($user = User::getCurrentUser()) != null) {
+if ((!empty($logout) && $logout) && ($user = User::getCurrentUser()) != null  && !$user->isSplashOnlyUser()) {
     $network->getAuthenticator()->logout();
 }

trunk/wifidog-auth/wifidog/media/base_theme/stylesheet.css

@@ -493 +493 @@
 }
 
-.portal_content {
-}
 .user_ui_main_outer {
 /*      display: inline;*/
@@ -504 +502 @@
     padding: 0.1em;
 }
+
+.isSimpleContent{
+    background: none;
+        border: none;
+        margin: 0em;
+    padding: 0.1em;
+}
+
 .user_ui_title .user_ui_main_outer,
 .user_ui_description .user_ui_main_outer {

trunk/wifidog-auth/wifidog/templates/classes/MainUI_ToolSection.tpl

@@ -77 +77 @@
                     <ul>
                         <li><a href="{$base_url_path}admin/generic_object_admin.php?object_class=Node&action=list">{"Nodes"|_}</a></li>
-                        <li><a href="{$base_url_path}admin/generic_object_admin.php?object_class=Node&action=new_ui">{"Add new Node"|_}</a></li>
                     </ul>
             {/if}
@@ -94 +93 @@
                     <ul>
                         <li><a href="{$base_url_path}admin/generic_object_admin.php?object_class=Server&action=list">{"Servers"|_}</a></li>
-                        <li><a href="{$base_url_path}admin/generic_object_admin.php?object_class=Content&action=list">{"Content library"|_}</a></li>
+                        <li><a href="{$base_url_path}admin/generic_object_admin.php?object_class=Content&action=list">{"Reusable content library"|_}</a></li>
                     </ul>
             </fieldset>