Changeset 1085

Timestamp:

08/31/06 07:31:33 (7 years ago)

Author:

benoitg

Message:

• 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.
• 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)

Location:

trunk/wifidog-auth

Files:

• CHANGELOG (modified) (1 diff)
• wifidog/classes/Content.php (modified) (14 diffs)
• wifidog/classes/Content/ContentGroup/ContentGroup.php (modified) (49 diffs)
• wifidog/classes/Network.php (modified) (3 diffs)
• wifidog/classes/Server.php (modified) (1 diff)
• wifidog/include/schema_validate.php (modified) (2 diffs)
• wifidog/media/base_theme/stylesheet.css (modified) (1 diff)

trunk/wifidog-auth/CHANGELOG

@@ +1 @@
+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.
+        * 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.
+        * 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)
+        
 2006-08-29 Max Horváth <max.horvath@maxspot.de>
         * Cleaned up PHPdoc tags

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

@@ -874 +874 @@
     }
 
-    /**
-     * Get content sponsor info
-     * @return content a content sub-class
-     */
-    public function getSponsorInfo() {
-        try {
-            return self :: getObject($this->content_row['sponsor_info']);
-        } catch (Exception $e) {
-            return null;
-        }
-    }
-
     /** Set the object type of this object
      * Note that after using this, the object must be re-instanciated to have the right type
@@ -1040 +1028 @@
         $html .= "<div class='user_ui_main_inner'>\n";
 
-        if (!empty ($this->content_row['title'])) {
+        if (!empty ($this->content_row['title'])  && $this->titleShouldDisplay()) {
             $html .= "<div class='user_ui_title'>\n";
             $title = self :: getObject($this->content_row['title']);
@@ -1076 +1064 @@
         }
 
-        if (!empty ($this->content_row['project_info']) || !empty ($this->content_row['sponsor_info'])) {
+        if (!empty ($this->content_row['project_info']) ) {
             if (!empty ($this->content_row['project_info'])) {
                 $html .= "<div class='user_ui_projet_info'>\n";
@@ -1086 +1074 @@
                     $project_info->setLoggingStatus(false);
                 $html .= $project_info->getUserUI();
-                $html .= "</div>\n";
-            }
-
-            if (!empty ($this->content_row['sponsor_info'])) {
-                $html .= "<div class='user_ui_sponsor_info'>\n";
-                $html .= "<b>"._("Project sponsor:")."</b>";
-                $sponsor_info = self :: getObject($this->content_row['sponsor_info']);
-                $sponsor_info->setLogAsContent($this);
-                // If the content logging is disabled, all the children will inherit this property temporarly
-                if ($this->getLoggingStatus() == false)
-                    $sponsor_info->setLoggingStatus(false);
-                $html .= $sponsor_info->getUserUI();
                 $html .= "</div>\n";
             }
@@ -1194 +1170 @@
             $html .= FormSelectGenerator :: generateFromArray($tab, null, "content_".$this->id."_content_type", "Content", false);
         } else {
+           // Content metadata
             if ($this->is_trivial_content == false) {
                         $html .= "<fieldset class='admin_element_group'>\n";
                                 $html .= "<legend>".sprintf(_("%s MetaData"),get_class($this))."</legend>\n";
 
+                /* title_is_displayed */
+                $html_title_is_displayed = _("Display the title?").": \n";
+                $name = "content_".$this->id."_title_is_displayed";
+                $this->titleShouldDisplay() ? $checked = 'CHECKED' : $checked = '';
+                $html_title_is_displayed .= "<input type='checkbox' name='$name' $checked>\n";
+                
                 /* title */
                 $html .= "<li class='admin_element_item_container admin_section_edit_title'>\n";
-                $html .= "<div class='admin_element_data'>\n";
+                $html .= "<div class='admin_element_data'>\n";  
                 if (empty ($this->content_row['title'])) {
-                    $html .= self :: getNewContentUI("title_{$this->id}_new", null, _("Title:"));
+                    $html .= self :: getNewContentUI("title_{$this->id}_new", null, _("Title:"));                
                     $html .= "</div>\n";
                 } else {
+                    $html .= $html_title_is_displayed; 
                     $title = self :: getObject($this->content_row['title']);
                     $html .= $title->getAdminUI(null, _("Title:"));
@@ -1214 +1198 @@
                 }
                 $html .= "</li>\n";
-
-
 
                 /* description */
@@ -1267 +1249 @@
                 }
                 $html .= "</li>\n";
-
-                /* sponsor_info */
-                $html .= "<li class='admin_element_item_container admin_section_edit_sponsor'>\n";
-                $html .= "<div class='admin_element_data'>\n";
-                if (empty ($this->content_row['sponsor_info'])) {
-                    $html .= self :: getNewContentUI("sponsor_info_{$this->id}_new", null, _("Sponsor of this project:"));
-                    $html .= "</div>\n";
-                } else {
-                    $sponsor_info = self :: getObject($this->content_row['sponsor_info']);
-                    $html .= $sponsor_info->getAdminUI(null, _("Sponsor of this project:"));
-                    $html .= "</div>\n";
-                    $html .= "<div class='admin_element_tools'>\n";
-                    $name = "content_".$this->id."_sponsor_info_erase";
-                    $html .= "<input type='submit' class='submit' name='$name' value='".sprintf(_("Delete %s (%s)"),_("sponsor"),get_class($sponsor_info))."'>";
-                    $html .= "</div>\n";
-                }
-                $html .= "</li>\n";
-                $html .= "</fieldset>\n";
-
-                        $html .= "<fieldset class='admin_element_group'>\n";
+            }//End content medatada
+            
+            if ($this->is_trivial_content == false || $this->isPersistent()) {                  
+                $html .= "<fieldset class='admin_element_group'>\n";
                                 $html .= "<legend>".sprintf(_("%s access control"),get_class($this))."</legend>\n";
 
@@ -1295 +1261 @@
                 $name = "content_".$this->id."_is_persistent";
                 $this->isPersistent() ? $checked = 'CHECKED' : $checked = '';
-                $html .= "<input type='checkbox' name='$name' $checked>\n";
+                $html .= "<input type='checkbox' name='$name' $checked onChange='submit();'>\n";
                 $html .= "</div>\n";
                 $html .= "</li>\n";
@@ -1338 +1304 @@
                 $html .= "</li>\n";
                 $html .= "</fieldset>\n";
-            }//End if is trivial content
+
+            }
         }
         $html .= $subclass_admin_interface;
@@ -1355 +1322 @@
                 $this->setContentType($content_type);
             } else
+            {//Content medatada
+                            /* title_is_displayed */
+                if (!empty ($this->content_row['title'])){
+                $name = "content_".$this->id."_title_is_displayed";
+                !empty ($_REQUEST[$name]) ? $this->setTitleIsDisplayed(true) : $this->setTitleIsDisplayed(false);
+                }
+                
                 if ($this->is_trivial_content == false) {
                     /* title */
@@ -1427 +1401 @@
                         }
                     }
-
-                    /* sponsor_info */
-                    if (empty ($this->content_row['sponsor_info'])) {
-                        $sponsor_info = self :: processNewContentUI("sponsor_info_{$this->id}_new");
-                        if ($sponsor_info != null) {
-                            $sponsor_info_id = $sponsor_info->GetId();
-                            $db->execSqlUpdate("UPDATE content SET sponsor_info = '$sponsor_info_id' WHERE content_id = '$this->id'", FALSE);
-                        }
-                    } else {
-                        $sponsor_info = self :: getObject($this->content_row['sponsor_info']);
-                        $name = "content_".$this->id."_sponsor_info_erase";
-                        if (!empty ($_REQUEST[$name]) && $_REQUEST[$name] == true) {
-                            $db->execSqlUpdate("UPDATE content SET sponsor_info = NULL WHERE content_id = '$this->id'", FALSE);
-                            $sponsor_info->delete($errmsg);
-                        } else {
-                            $sponsor_info->processAdminUI();
-                        }
-                    }
-
+                }//End content metadata
+
+           if ($this->is_trivial_content == false || $this->isPersistent()) {
                     /* is_persistent */
                     $name = "content_".$this->id."_is_persistent";
@@ -1482 +1440 @@
                         $this->addOwner($user);
                     }
-
+           }
                 }
             $this->refresh();
@@ -1513 +1471 @@
     public function unsubscribe(User $user) {
         return $user->removeContent($this);
+    }
+
+    /** If the title is not empty, should it be displayed?
+    * @return true or false */
+    public function titleShouldDisplay() {
+        if ($this->content_row['title_is_displayed'] == 't') {
+            $retval = true;
+        } else {
+            $retval = false;
+        }
+        return $retval;
+    }
+
+    /** If the title is not empty, should it be displayed?
+     * @param $should_display true or false
+     * */
+    public function setTitleIsDisplayed($should_display) {
+        if ($should_display != $this->titleShouldDisplay()) /* Only update database if there is an actual change */ {
+            $should_display ? $should_display_sql = 'TRUE' : $should_display_sql = 'FALSE';
+            global $db;
+            $db->execSqlUpdate("UPDATE content SET title_is_displayed = $should_display_sql WHERE content_id = '$this->id'", false);
+            $this->refresh();
+        }
+
     }
 
@@ -1525 +1507 @@
         return $retval;
     }
-
+    
     /** Set if the content group is persistent
      * @param $is_locative_content true or false

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

@@ -1 +1 @@
 <?php
+
 
 /* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
@@ -46 +47 @@
  * Load ContentGroupElement class
  */
-require_once('classes/Content/ContentGroup/ContentGroupElement.php');
+require_once ('classes/Content/ContentGroup/ContentGroupElement.php');
 
 /**
@@ -56 +57 @@
  * @copyright  2005-2006 Benoit Grégoire, Technologies Coeus inc.
  */
-class ContentGroup extends Content
-{
-
-    private $CONTENT_ORDERING_MODES = array ('RANDOM' => "Pick content elements randomly", 'SEQUENTIAL' => "Pick content elements in sequential order");
-    private $CONTENT_CHANGES_ON_MODES = array ('ALWAYS' => "Content always rotates", 'NEXT_DAY' => "Content rotates once per day", 'NEXT_LOGIN' => "Content rotates once per session", 'NEXT_NODE' => "Content rotates each time you change node");
-    private $ALLOW_REPEAT_MODES = array ('YES' => "Content can be shown more than once", 'NO' => "Content can only be shown once", 'ONCE_PER_NODE' => "Content can be shown more than once, but not at the same node");
+class ContentGroup extends Content {
+
+    private $CONTENT_ORDERING_MODES = array (
+        'RANDOM' => "Pick content elements randomly",
+        'PSEUDO_RANDOM' => "Pick content elements randomly, but do not display the same content twice untill all content has been seen",
+        'SEQUENTIAL' => "Pick content elements in sequential order"
+    );
+    private $CONTENT_CHANGES_ON_MODES = array (
+        'ALWAYS' => "Content always rotates",
+        'NEXT_DAY' => "Content rotates once per day",
+        'NEXT_LOGIN' => "Content rotates once per session",
+        'NEXT_NODE' => "Content rotates each time you change node"
+    );
+    private $ALLOW_REPEAT_MODES = array (
+        'YES' => "Content can be shown more than once",
+        'NO' => "Content can only be shown once",
+        'ONCE_PER_NODE' => "Content can be shown more than once, but not at the same node"
+    );
 
     protected $is_artistic_content;
@@ -75 +88 @@
     private $content_group_row;
 
-    protected function __construct($content_id)
-    {
+    protected function __construct($content_id) {
         // Define globals
         global $db;
@@ -89 +101 @@
         $sql = "SELECT * FROM content_group WHERE content_group_id='$content_id'";
         $db->execSqlUniqueRes($sql, $row, false);
-        if ($row == null)
-        {
+        if ($row == null) {
             /*Since the parent Content exists, the necessary data in content_group had not yet been created */
             $sql = "INSERT INTO content_group (content_group_id) VALUES ('$content_id')";
@@ -96 +107 @@
             $sql = "SELECT * FROM content_group WHERE content_group_id='$content_id'";
             $db->execSqlUniqueRes($sql, $row, false);
-            if ($row == null)
-            {
-                throw new Exception(_("The content with the following id could not be found in the database: ").$content_id);
+            if ($row == null) {
+                throw new Exception(_("The content with the following id could not be found in the database: ") . $content_id);
             }
 
@@ -111 +121 @@
     /** Is the content group artistic in nature?
      * @return true or false */
-    public function isArtisticContent()
-    {
-        if ($this->content_group_row['is_artistic_content'] == 't')
-        {
-            $retval = true;
-        }
-        else
-        {
+    public function isArtisticContent() {
+        if ($this->content_group_row['is_artistic_content'] == 't') {
+            $retval = true;
+        } else {
             $retval = false;
         }
@@ -126 +132 @@
     /** Set if the content group is artistic in nature,
      * @param $is_artistic_content true or false*/
-    public function setIsArtisticContent($is_artistic_content)
-    {
-        if ($is_artistic_content != $this->isArtisticContent()) /* Only update database if there is an actual change */
-        {
+    public function setIsArtisticContent($is_artistic_content) {
+        if ($is_artistic_content != $this->isArtisticContent()) /* Only update database if there is an actual change */ {
             $is_artistic_content ? $is_artistic_content_sql = 'TRUE' : $is_artistic_content_sql = 'FALSE';
 
@@ -141 +145 @@
     /** Does the content shown or generated by the content group directly related to where it is viewed from?
      * @return true or false */
-    public function isLocativeContent()
-    {
-        if ($this->content_group_row['is_locative_content'] == 't')
-        {
-            $retval = true;
-        }
-        else
-        {
+    public function isLocativeContent() {
+        if ($this->content_group_row['is_locative_content'] == 't') {
+            $retval = true;
+        } else {
             $retval = false;
         }
@@ -157 +157 @@
      * @param $is_locative_content true or false
      * */
-    public function setIsLocativeContent($is_locative_content)
-    {
-        if ($is_locative_content != $this->isLocativeContent()) /* Only update database if there is an actual change */
-        {
+    public function setIsLocativeContent($is_locative_content) {
+        if ($is_locative_content != $this->isLocativeContent()) /* Only update database if there is an actual change */ {
             $is_locative_content ? $is_locative_content_sql = 'TRUE' : $is_locative_content_sql = 'FALSE';
 
@@ -172 +170 @@
     /** In what order is the content displayed to the user
     * @return string, a key of CONTENT_SELECTION_MODES */
-    public function getContentOrderingMode()
-    {
+    public function getContentOrderingMode() {
         return $this->content_group_row['content_ordering_mode'];
     }
@@ -181 +178 @@
      * @return true if successfull
      * */
-    protected function setContentOrderingMode($content_ordering_mode, & $errormsg = null)
-    {
+    protected function setContentOrderingMode($content_ordering_mode, & $errormsg = null) {
         $retval = false;
-        if (isset ($this->CONTENT_ORDERING_MODES[$content_ordering_mode]) && $content_ordering_mode != $this->getContentOrderingMode()) /* Only update database if the mode is valid and there is an actual change */
-        {
+        if (isset ($this->CONTENT_ORDERING_MODES[$content_ordering_mode]) && $content_ordering_mode != $this->getContentOrderingMode()) /* Only update database if the mode is valid and there is an actual change */ {
             global $db;
             $content_ordering_mode = $db->escapeString($content_ordering_mode);
@@ -192 +187 @@
             $retval = true;
         }
-        elseif (!isset ($this->CONTENT_ORDERING_MODES[$content_ordering_mode]))
-        {
+        elseif (!isset ($this->CONTENT_ORDERING_MODES[$content_ordering_mode])) {
             $errormsg = _("Invalid content selection mode (must be part of CONTENT_ORDERING_MODES)");
             $retval = false;
-        }
-        else
-        {
+        } else {
             /* Successfull, but nothing modified */
             $retval = true;
@@ -207 +199 @@
     /** When does the content rotate?
     * @return string, a key of CONTENT_SELECTION_MODES */
-    public function getContentChangesOnMode()
-    {
+    public function getContentChangesOnMode() {
         return $this->content_group_row['content_changes_on_mode'];
     }
@@ -216 +207 @@
      * @return true if successfull
      * */
-    protected function setContentChangesOnMode($content_changes_on_mode, & $errormsg = null)
-    {
+    protected function setContentChangesOnMode($content_changes_on_mode, & $errormsg = null) {
         $retval = false;
-        if (isset ($this->CONTENT_CHANGES_ON_MODES[$content_changes_on_mode]) && $content_changes_on_mode != $this->getContentChangesOnMode()) /* Only update database if the mode is valid and there is an actual change */
-        {
+        if (isset ($this->CONTENT_CHANGES_ON_MODES[$content_changes_on_mode]) && $content_changes_on_mode != $this->getContentChangesOnMode()) /* Only update database if the mode is valid and there is an actual change */ {
             global $db;
             $content_changes_on_mode = $db->escapeString($content_changes_on_mode);
@@ -227 +216 @@
             $retval = true;
         }
-        elseif (!isset ($this->CONTENT_CHANGES_ON_MODES[$content_changes_on_mode]))
-        {
+        elseif (!isset ($this->CONTENT_CHANGES_ON_MODES[$content_changes_on_mode])) {
             $errormsg = _("Invalid content selection mode (must be part of CONTENT_CHANGES_ON_MODES)");
             $retval = false;
-        }
-        else
-        {
+        } else {
             /* Successfull, but nothing modified */
             $retval = true;
@@ -242 +228 @@
     /** Can the same content be shown twice
      * @return 'YES', 'NO', 'ONCE_PER_NODE' */
-    public function getAllowRepeat()
-    {
+    public function getAllowRepeat() {
         return $this->content_group_row['allow_repeat'];
     }
@@ -251 +236 @@
      * @return true if successfull
      * */
-    protected function setAllowRepeat($allow_repeat, & $errormsg = null)
-    {
+    protected function setAllowRepeat($allow_repeat, & $errormsg = null) {
         $retval = false;
-        if (isset ($this->ALLOW_REPEAT_MODES[$allow_repeat]) && $allow_repeat != $this->getAllowRepeat()) /* Only update database if the mode is valid and there is an actual change */
-        {
+        if (isset ($this->ALLOW_REPEAT_MODES[$allow_repeat]) && $allow_repeat != $this->getAllowRepeat()) /* Only update database if the mode is valid and there is an actual change */ {
             global $db;
             $allow_repeat = $db->escapeString($allow_repeat);
@@ -262 +245 @@
             $retval = true;
         }
-        elseif (!isset ($this->ALLOW_REPEAT_MODES[$allow_repeat]))
-        {
+        elseif (!isset ($this->ALLOW_REPEAT_MODES[$allow_repeat])) {
             $errormsg = _("Invalid content selection mode (must be part of ALLOW_REPEAT_MODES)");
             $retval = false;
-        }
-        else
-        {
+        } else {
             /* Successfull, but nothing modified */
             $retval = true;
@@ -277 +257 @@
     /** How many element should be picked for display at once?
     * @return integer */
-    public function getDisplayNumElements()
-    {
-        if($this->temporary_display_num_elements == null)
+    public function getDisplayNumElements() {
+        if ($this->temporary_display_num_elements == null)
             return $this->content_group_row['display_num_elements'];
         else
@@ -289 +268 @@
     * @return true if successfull
     * */
-    protected function setDisplayNumElements($display_num_elements, & $errormsg = null)
-    {
+    protected function setDisplayNumElements($display_num_elements, & $errormsg = null) {
         $retval = false;
-        if (($display_num_elements > 0) && $display_num_elements != $this->getDisplayNumElements()) /* Only update database if the mode is valid and there is an actual change */
-        {
+        if (($display_num_elements > 0) && $display_num_elements != $this->getDisplayNumElements()) /* Only update database if the mode is valid and there is an actual change */ {
             global $db;
             $display_num_elements = $db->escapeString($display_num_elements);
@@ -300 +277 @@
             $retval = true;
         }
-        elseif ($display_num_elements <= 0)
-        {
+        elseif ($display_num_elements <= 0) {
             $errormsg = _("You must display at least one element");
             $retval = false;
-        }
-        else
-        {
+        } else {
             /* Successfull, but nothing modified */
             $retval = true;
@@ -318 +292 @@
      * at once
      */
-    private function setTemporaryDisplayNumElements($temporary_num_elements)
-    {
+    private function setTemporaryDisplayNumElements($temporary_num_elements) {
         $this->temporary_display_num_elements = $temporary_num_elements;
     }
 
-    public function getAdminUI($subclass_admin_interface = null, $title=null)
-    {
+    public function getAdminUI($subclass_admin_interface = null, $title = null) {
         $html = '';
-                $html .= "<fieldset class='admin_element_group'>\n";
-                $html .= "<legend>".sprintf(_("%s configuration"),get_class($this))."</legend>\n";
+        $html .= "<fieldset class='admin_element_group'>\n";
+        $html .= "<legend>" . sprintf(_("%s configuration"), get_class($this)) . "</legend>\n";
 
         /* is_artistic_content */
@@ -333 +305 @@
         $html .= "<div class='admin_element_label'>Is artistic content?: </div>\n";
         $html .= "<div class='admin_element_data'>\n";
-        $name = "content_group_".$this->id."_is_artistic_content";
+        $name = "content_group_" . $this->id . "_is_artistic_content";
         $this->isArtisticContent() ? $checked = 'CHECKED' : $checked = '';
         $html .= "<input type='checkbox' name='$name' $checked>\n";
@@ -341 +313 @@
         /* is_locative_content */
         $html .= "<li class='admin_element_item_container'>\n";
-        $html .= "<div class='admin_element_label'>". ("Is locative content?").": </div>\n";
+        $html .= "<div class='admin_element_label'>" . ("Is locative content?") . ": </div>\n";
         $html .= "<div class='admin_element_data'>\n";
-        $name = "content_group_".$this->id."_is_locative_content";
+        $name = "content_group_" . $this->id . "_is_locative_content";
         $this->isLocativeContent() ? $checked = 'CHECKED' : $checked = '';
         $html .= "<input type='checkbox' name='$name' $checked>\n";
@@ -351 +323 @@
         /* content_ordering_mode */
         $html .= "<li class='admin_element_item_container'>\n";
-        $html .= "<div class='admin_element_label'>"._("In what order should the content displayed?").": </div>\n";
+        $html .= "<div class='admin_element_label'>" . _("In what order should the content displayed?") . ": </div>\n";
         $html .= "<div class='admin_element_data'>\n";
-        $name = "content_group_".$this->id."_content_ordering_mode";
+        $name = "content_group_" . $this->id . "_content_ordering_mode";
 
         $i = 0;
         $tab = null;
-        foreach ($this->CONTENT_ORDERING_MODES as $select_mode_id => $select_mode_descr)
-        {
+        foreach ($this->CONTENT_ORDERING_MODES as $select_mode_id => $select_mode_descr) {
             $tab[$i][0] = $select_mode_id;
             $tab[$i][1] = $select_mode_descr;
-            $i ++;
+            $i++;
         }
         $html .= FormSelectGenerator :: generateFromArray($tab, $this->getContentOrderingMode(), $name, null, false);
@@ -369 +340 @@
         /*content_changes_on_mode */
         $html .= "<li class='admin_element_item_container'>\n";
-        $html .= "<div class='admin_element_label'>"._("When does the content rotate?").": </div>\n";
+        $html .= "<div class='admin_element_label'>" . _("When does the content rotate?") . ": </div>\n";
         $html .= "<div class='admin_element_data'>\n";
-        $name = "content_group_".$this->id."_content_changes_on_mode";
+        $name = "content_group_" . $this->id . "_content_changes_on_mode";
         $i = 0;
         $tab = null;
-        foreach ($this->CONTENT_CHANGES_ON_MODES as $select_mode_id => $select_mode_descr)
-        {
+        foreach ($this->CONTENT_CHANGES_ON_MODES as $select_mode_id => $select_mode_descr) {
             $tab[$i][0] = $select_mode_id;
             $tab[$i][1] = $select_mode_descr;
-            $i ++;
+            $i++;
         }
         $html .= FormSelectGenerator :: generateFromArray($tab, $this->getContentChangesOnMode(), $name, null, false);
@@ -386 +356 @@
         /* allow_repeat*/
         $html .= "<li class='admin_element_item_container'>\n";
-        $html .= "<div class='admin_element_label'>"._("Can content be shown more than once to the same user?").": </div>\n";
+        $html .= "<div class='admin_element_label'>" . _("Can content be shown more than once to the same user?") . ": </div>\n";
         $html .= "<div class='admin_element_data'>\n";
-        $name = "content_group_".$this->id."_allow_repeat";
+        $name = "content_group_" . $this->id . "_allow_repeat";
         $i = 0;
         $tab = null;
-        foreach ($this->ALLOW_REPEAT_MODES as $select_mode_id => $select_mode_descr)
-        {
+        foreach ($this->ALLOW_REPEAT_MODES as $select_mode_id => $select_mode_descr) {
             $tab[$i][0] = $select_mode_id;
             $tab[$i][1] = $select_mode_descr;
-            $i ++;
+            $i++;
         }
         $html .= FormSelectGenerator :: generateFromArray($tab, $this->getAllowRepeat(), $name, null, false);
@@ -403 +372 @@
         /*display_num_elements*/
         $html .= "<li class='admin_element_item_container'>\n";
-        $html .= "<div class='admin_element_label'>". ("Pick how many elements for each display?").": </div>\n";
+        $html .= "<div class='admin_element_label'>" . ("Pick how many elements for each display?") . ": </div>\n";
         $html .= "<div class='admin_element_data'>\n";
-        $name = "content_group_".$this->id."_display_num_elements";
+        $name = "content_group_" . $this->id . "_display_num_elements";
         $value = $this->getDisplayNumElements();
         $html .= "<input type='text' size='2' value='$value' name='$name'>\n";
@@ -411 +380 @@
         $html .= "</li>\n";
         $html .= "</fieldset>\n";
-        
+
         $html .= "<li class='admin_element_item_container'>\n";
         $html .= "<fieldset class='admin_element_group'>\n";
-                $html .= "<legend>".sprintf(_("%s display element list"),get_class($this))."</legend>\n";
+        $html .= "<legend>" . sprintf(_("%s display element list"), get_class($this)) . "</legend>\n";
 
         /* content_group_element*/
 
         $html .= "<ul class='admin_element_list'>\n";
-        foreach ($this->getElements() as $element)
-        {
+        foreach ($this->getElements() as $element) {
             $html .= "<li class='admin_element_item_container'>\n";
             $html .= $element->getAdminUI(null, sprintf(_("%s %d"), get_class($element), $element->getDisplayOrder()));
             $html .= "<div class='admin_element_tools'>\n";
-            $name = "content_group_".$this->id."_element_".$element->GetId()."_erase";
-            $html .= "<input type='submit' class='submit' name='$name' value='".sprintf(_("Delete %s %d"),get_class($element), $element->getDisplayOrder())."'>";
+            $name = "content_group_" . $this->id . "_element_" . $element->GetId() . "_erase";
+            $html .= "<input type='submit' class='submit' name='$name' value='" . sprintf(_("Delete %s %d"), get_class($element), $element->getDisplayOrder()) . "'>";
             $html .= "</div>\n";
             $html .= "</li>\n";
         }
         $html .= "<li class='admin_element_item_container'>\n";
-        $html .= self :: getNewContentUI("content_group_{$this->id}_new_element")."<br>";
+        $html .= self :: getNewContentUI("content_group_{$this->id}_new_element") . "<br>";
         $html .= "</li>\n";
         $html .= "<li class='admin_element_item_container'>\n";
@@ -442 +410 @@
     }
 
-    function processAdminUI()
-    {
+    function processAdminUI() {
         // Init values
         $errmsg = null;
 
-        if ($this->isOwner(User :: getCurrentUser()) || User :: getCurrentUser()->isSuperAdmin())
-        {
+        if ($this->isOwner(User :: getCurrentUser()) || User :: getCurrentUser()->isSuperAdmin()) {
             parent :: processAdminUI();
 
             /* is_artistic_content */
-            $name = "content_group_".$this->id."_is_artistic_content";
+            $name = "content_group_" . $this->id . "_is_artistic_content";
             !empty ($_REQUEST[$name]) ? $this->setIsArtisticContent(true) : $this->setIsArtisticContent(false);
 
             /* is_locative_content */
-            $name = "content_group_".$this->id."_is_locative_content";
+            $name = "content_group_" . $this->id . "_is_locative_content";
             !empty ($_REQUEST[$name]) ? $this->setIsLocativeContent(true) : $this->setIsLocativeContent(false);
 
             /* content_ordering_mode */
-            $name = "content_group_".$this->id."_content_ordering_mode";
+            $name = "content_group_" . $this->id . "_content_ordering_mode";
             $this->setContentOrderingMode(FormSelectGenerator :: getResult($name, null));
 
             /*content_changes_on_mode */
-            $name = "content_group_".$this->id."_content_changes_on_mode";
+            $name = "content_group_" . $this->id . "_content_changes_on_mode";
             $this->setContentChangesOnMode(FormSelectGenerator :: getResult($name, null));
 
             /* allow_repeat*/
-            $name = "content_group_".$this->id."_allow_repeat";
+            $name = "content_group_" . $this->id . "_allow_repeat";
             $this->setAllowRepeat(FormSelectGenerator :: getResult($name, null));
 
             /*display_num_elements*/
-            $name = "content_group_".$this->id."_display_num_elements";
+            $name = "content_group_" . $this->id . "_display_num_elements";
             $this->setDisplayNumElements($_REQUEST[$name]);
 
             /* content_group_element */
-            foreach ($this->getElements() as $element)
-            {
-                $name = "content_group_".$this->id."_element_".$element->GetId()."_erase";
-                if (!empty ($_REQUEST[$name]) && $_REQUEST[$name] == true)
-                {
+            foreach ($this->getElements() as $element) {
+                $name = "content_group_" . $this->id . "_element_" . $element->GetId() . "_erase";
+                if (!empty ($_REQUEST[$name]) && $_REQUEST[$name] == true) {
                     $element->delete($errmsg);
-                }
-                else
-                {
+                } else {
                     $element->processAdminUI();
                 }
@@ -500 +462 @@
      * @param $node Node, optionnal
      * @return true or false */
-    public function isDisplayableAt($node)
-    {
-        $old_curent_node = Node::getCurrentNode();
-        Node::setCurrentNode($node);
-
-        if (count($this->getDisplayElements())>0) {
+    public function isDisplayableAt($node) {
+        $old_curent_node = Node :: getCurrentNode();
+        Node :: setCurrentNode($node);
+
+        if (count($this->getDisplayElements()) > 0) {
             $retval = true;
         } else {
@@ -512 +473 @@
 
         if ($old_curent_node != null) {
-            Node::setCurrentNode($old_curent_node);
-        }
-
-        return $retval;
-    }
-
+            Node :: setCurrentNode($old_curent_node);
+        }
+
+        return $retval;
+    }
 
     /**Get the next element or elements to be displayed, depending on the display mode
     * @return an array of ContentGroupElement or an empty arrray */
-    function getDisplayElements()
-    {
+    function getDisplayElements() {
         // Define globals
         global $db;
@@ -533 +492 @@
         $element_rows = null;
 
-        if ($user)
-        {
+        if ($user) {
             $user_id = $user->getId();
-        }
-        else
-        {
+        } else {
             $user_id = '';
         }
         $node = Node :: getCurrentNode();
-        if ($node)
-        {
+        if ($node) {
             $node_id = $node->getId();
-        }
-        else
-        {
+        } else {
             $node_id = '';
         }
@@ -560 +513 @@
 
         $redisplay_objects = array ();
-        if ($content_changes_on_mode != 'ALWAYS')
-        {
+        if ($content_changes_on_mode != 'ALWAYS') {
             $sql = "SELECT content_group_element_id FROM content_group_element \n";
             $sql .= "JOIN content_display_log ON (content_group_element_id=content_id) \n";
             $sql .= " WHERE content_group_id='$this->id' \n";
 
-            if ($content_changes_on_mode == 'NEXT_DAY')
-            {
+            if ($content_changes_on_mode == 'NEXT_DAY') {
                 $sql .= "AND date_trunc('day', last_display_timestamp) = date_trunc('day', CURRENT_DATE) \n";
             }
-            if ($content_changes_on_mode == 'NEXT_LOGIN')
-            {
+            if ($content_changes_on_mode == 'NEXT_LOGIN') {
                 /**@todo Must fix, this will fail if the user never really connected from a hotspot... */
                 $sql .= "AND last_display_timestamp > (SELECT timestamp_in FROM connections WHERE user_id='$user_id' ORDER BY timestamp_in DESC LIMIT 1) \n";
             }
-            if ($content_changes_on_mode == 'NEXT_NODE')
-            {
+            if ($content_changes_on_mode == 'NEXT_NODE') {
                 /** We find the close time of the last connection from another node */
                 $sql .= "AND last_display_timestamp > (SELECT timestamp_out FROM connections WHERE user_id='$user_id' AND node_id != '$node_id' ORDER BY timestamp_in DESC LIMIT 1) \n";
@@ -584 +533 @@
             $db->execSql($sql, $redisplay_rows, false);
             $redisplay_objects = array ();
-            if ($redisplay_rows != null)
-            {
-                foreach ($redisplay_rows as $redisplay_row)
-                {
+            if ($redisplay_rows != null) {
+                foreach ($redisplay_rows as $redisplay_row) {
                     $object = self :: getObject($redisplay_row['content_group_element_id']);
                     if ($object->isDisplayableAt(Node :: GetCurrentNode()) == true) /** Only content available at this hotspot are considered */
-                    {
+                        {
                         $redisplay_objects[] = $object;
                     }
@@ -601 +548 @@
 
         $new_objects = array ();
-        if (count($redisplay_objects) < $display_num_elements)
-        {
-            /* We need new content */
-
-            $sql = "SELECT content_group_element_id FROM content_group_element WHERE content_group_id='$this->id' \n";
+        if (count($redisplay_objects) < $display_num_elements) {
+            /* There aren't enough elements to redisplay, We need new content */
+
+            $sql_base = "SELECT content_group_element_id FROM content_group_element WHERE content_group_id='$this->id' \n";
+                        $sql = $sql_base;
 
             /*'YES' => "Content can be shown more than once", 'NO' => "Content can only be shown once", 'ONCE_PER_NODE' => "Content can be shown more than once, but not at the same node"*/
             $allow_repeat = $this->getAllowRepeat();
-
-            if ($allow_repeat == 'NO')
-            {
-                $sql .= "AND content_group_element_id NOT IN (SELECT content_id FROM content_display_log WHERE user_id = '$user_id') \n";
-            }
-            elseif ($allow_repeat == 'ONCE_PER_NODE')
-            {
-                $sql .= "AND content_group_element_id NOT IN (SELECT content_id FROM content_display_log WHERE user_id = '$user_id' AND  node_id = '$node_id') \n";
-            }
-
-            /* 'RANDOM' => "Pick content elements randomly",'SEQUENTIAL' => "Pick content elements in sequential order" */
-            $content_ordering_mode = $this->getContentOrderingMode();
-
-            if ($content_ordering_mode == 'SEQUENTIAL')
-            {
-                $order_by = ' ORDER BY display_order ';
-            $sql_last_order = "SELECT display_order FROM content_group_element \n";
-            $sql_last_order .= "JOIN content_display_log ON (content_group_element_id=content_id) \n";
-            $sql_last_order .= " WHERE content_group_id='$this->id' \n";
-            $sql_last_order .= " ORDER BY last_display_timestamp DESC LIMIT 1";
-            $db->execSqlUniqueRes($sql_last_order, $last_order_row, false);
-            if($last_order_row['display_order']!=null)
-            {
-            $last_order=$last_order_row['display_order'];
+            if ($allow_repeat == 'NO') {
+                $sql_repeat .= "AND content_group_element_id NOT IN (SELECT content_id FROM content_display_log WHERE user_id = '$user_id') \n";
+            }
+            elseif ($allow_repeat == 'ONCE_PER_NODE') {
+                $sql_repeat .= "AND content_group_element_id NOT IN (SELECT content_id FROM content_display_log WHERE user_id = '$user_id' AND  node_id = '$node_id') \n";
             }
             else
             {
-            $last_order=0;
-            }
-            }
-            else
-            {
+            $sql_repeat=null;
+            }
+            $sql .= $sql_repeat;
+
+            $content_ordering_mode = $this->getContentOrderingMode();
+            if ($content_ordering_mode == 'SEQUENTIAL') {
+                $order_by = ' ORDER BY display_order ';
+                //Find the last content displayed
+                $sql_last_order = "SELECT display_order FROM content_group_element \n";
+                $sql_last_order .= "JOIN content_display_log ON (content_group_element_id=content_id) \n";
+                $sql_last_order .= " WHERE content_group_id='$this->id' \n";
+                $sql_last_order .= " ORDER BY last_display_timestamp DESC LIMIT 1";
+                $db->execSqlUniqueRes($sql_last_order, $last_order_row, false);
+                if ($last_order_row['display_order'] != null) {
+                    $last_order = $last_order_row['display_order'];
+                } else {
+                    $last_order = 0;
+                }
+            } else {
                 $order_by = ' ';
             }
             $sql .= $order_by;
 
+$element_rows = null;
+if ($content_ordering_mode == 'PSEUDO_RANDOM') {
+    //Special case, first get only the rows that haven't been displayed before'
+                    $sql_no_repeat = " AND content_group_element_id NOT IN (SELECT content_id FROM content_display_log WHERE user_id = '$user_id') \n";
+                    $db->execSql($sql_base.$sql_no_repeat, $element_rows, false);
+}
+//Normal case, or there wasn't any undisplayed content in PSEUDO_RANDOM
+ if ($element_rows == null) {
             $db->execSql($sql, $element_rows, false);
-            if ($element_rows == null)
-            {
+ }
+            if ($element_rows == null) {
                 $element_rows = array ();
             }
-            foreach ($element_rows as $element_row)
-            {
+            foreach ($element_rows as $element_row) {
                 $object = self :: getObject($element_row['content_group_element_id']);
                 if ($object->isDisplayableAt(Node :: GetCurrentNode()) == true) /** Only content available at this hotspot are considered */
-                {
+                    {
                     $new_objects[] = $object;
                 }
             }
 
-            if ($content_ordering_mode == 'RANDOM')
-            {
+            if ($content_ordering_mode == 'RANDOM' || $content_ordering_mode == 'PSEUDO_RANDOM') {
                 shuffle($new_objects);
             }
-            elseif($content_ordering_mode == 'SEQUENTIAL')
-            {
-                foreach($new_objects as $object)
-                {
-                    if($object->getDisplayOrder()<=$last_order)
-                    {
-                        array_push ( $new_objects, array_shift ( $new_objects ));
+            elseif ($content_ordering_mode == 'SEQUENTIAL') {
+                foreach ($new_objects as $object) {
+                    if ($object->getDisplayOrder() <= $last_order) {
+                        array_push($new_objects, array_shift($new_objects));
                         //echo " Pushed ".$object->getDisplayOrder();
                     }
@@ -676 +621 @@
 
             /** Pick the proper number of elements */
-            $num_to_pick = $display_num_elements - count($redisplay_objects);
+            $num_to_pick = $display_num_elements -count($redisplay_objects);
             $new_objects = array_slice($new_objects, 0, $num_to_pick);
         }
@@ -685 +630 @@
         print_r($new_objects);
         echo "</pre>";
-*/
+        */
         $retval = array_merge($new_objects, $redisplay_objects);
         //echo count($retval).' returned <br>';
@@ -696 +641 @@
      * @param $status boolean
      */
-    protected function setIsExpandable($status)
-    {
-        if(is_bool($status))
+    protected function setIsExpandable($status) {
+        if (is_bool($status))
             $this->is_expandable = $status;
     }
@@ -705 +649 @@
      * Tells if this object could be expanded
      */
-    protected function isExpandable()
-    {
+    protected function isExpandable() {
         return $this->is_expandable;
     }
@@ -714 +657 @@
      * @param $status boolean
      */
-    public function setExpandStatus($status)
-    {
-        if($this->isExpandable() && is_bool($status))
-        {
+    public function setExpandStatus($status) {
+        if ($this->isExpandable() && is_bool($status)) {
             //TODO: Try to find a better solution to this problem...
-            if($status == true)
+            if ($status == true)
                 $this->setTemporaryDisplayNumElements(3000);
             else
@@ -733 +674 @@
      * NON expandable contents ie PatternLanguage will NEVER return true
      */
-    public function getExpandStatus()
-    {
-        if($this->expand_status == null)
+    public function getExpandStatus() {
+        if ($this->expand_status == null)
             return false;
         return $this->expand_status;
@@ -746 +686 @@
      * elements that need to be hidden before subscription
      * @return The HTML fragment for this interface */
-    public function getUserUI($subclass_user_interface = null, $hide_elements = false)
-    {
+    public function getUserUI($subclass_user_interface = null, $hide_elements = false) {
         $html = '';
-        $html .= "<div class='user_ui_container  ".get_class($this)."'>\n";
-
-        if($hide_elements == false)
-        {
+        $html .= "<div class='user_ui_container  " . get_class($this) . "'>\n";
+
+        if ($hide_elements == false) {
             $display_elements = $this->getDisplayElements();
-            if (count($display_elements) > 0)
-            {
-                foreach ($display_elements as $display_element)
-                {
+            if (count($display_elements) > 0) {
+                foreach ($display_elements as $display_element) {
                     // If the content group logging is disabled, all the children will inherit this property temporarly
-                    if($this->getLoggingStatus() == false)
+                    if ($this->getLoggingStatus() == false)
                         $display_element->setLoggingStatus(false);
                     $html .= $display_element->getUserUI();
                 }
-            }
-            else
-            {
-                $html .= '<p class="warningmsg">'._("Sorry, no elements available at this hotspot or all elements of the content group have already been shown")."</p>\n";
+            } else {
+                $html .= '<p class="warningmsg">' . _("Sorry, no elements available at this hotspot or all elements of the content group have already been shown") . "</p>\n";
             }
         }
@@ -778 +712 @@
     /**Get all elements
      * @return an array of ContentGroupElement or an empty arrray */
-    function getElements()
-    {
+    function getElements() {
         // Define globals
         global $db;
@@ -789 +722 @@
         $sql = "SELECT content_group_element_id FROM content_group_element WHERE content_group_id='$this->id' ORDER BY display_order";
         $db->execSql($sql, $element_rows, false);
-        if ($element_rows != null)
-        {
-            foreach ($element_rows as $element_row)
-            {
+        if ($element_rows != null) {
+            foreach ($element_rows as $element_row) {
                 $retval[] = self :: getObject($element_row['content_group_element_id']);
             }
@@ -801 +732 @@
     /** Delete this Content from the database
     */
-    public function delete(& $errmsg)
-    {
-        if ($this->isPersistent() == false)
-        {
-            foreach ($this->getElements() as $element)
-            {
+    public function delete(& $errmsg) {
+        if ($this->isPersistent() == false) {
+            foreach ($this->getElements() as $element) {
                 $element->delete($errmsg);
             }
@@ -812 +740 @@
         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
-     * constructor from the wrong scope */
-    private function refresh()
-    {
+    /** 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 */
+    private function refresh() {
         $this->__construct($this->id);
     }
@@ -829 +756 @@
  * End:
  */
-
-

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

@@ -177 +177 @@
         $html = '';
         $name = $user_prefix;
-        $html .= _("Network:")." \n";
 
         if ($pre_selected_network) {
@@ -202 +201 @@
                 $i ++;
             }
+            $html .= _("Network:")." \n";
             $html .= FormSelectGenerator :: generateFromArray($tab, $selected_id, $name, null, false);
 
@@ -208 +208 @@
             foreach ($network_rows as $network_row) //iterates only once...
                 {
-                $html .= " $network_row[name] ";
+                //$html .= _("Network:")." \n";
+                //$html .= " $network_row[name] ";
                 $html .= "<input type='hidden' name='$name' value='".htmlspecialchars($network_row['network_id'], ENT_QUOTES, 'UTF-8')."'>";
             }

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

@@ -222 +222 @@
 
                 if ($_server_row == null && !$silent) {
-                        throw new Exception(_("Server::getCurrentServer: Fatal error: Unable to find current server in the database!"));
+                        throw new Exception(sprintf(_("Server::getCurrentServer: Fatal error: Unable to find a server matching hostname %s in the database!"), $_SERVER['SERVER_NAME']));
                 } else if ($_server_row != null) {
                 $_retVal = new self($_server_row['server_id']);

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

@@ -47 +47 @@
  * Define current database schema version
  */
-define('REQUIRED_SCHEMA_VERSION', 44);
+define('REQUIRED_SCHEMA_VERSION', 45);
 
 /**
@@ -909 +909 @@
         }
 
+        $new_schema_version = 45;
+        if ($schema_version < $new_schema_version) {
+            printUpdateVersion($new_schema_version);
+            $sql .= "\n\nUPDATE schema_info SET value='$new_schema_version' WHERE tag='schema_version';\n";
+            $sql .= "ALTER TABLE content DROP COLUMN sponsor_info;\n";
+            $sql .= "ALTER TABLE users DROP CONSTRAINT account_origin_fkey;\n";
+            $sql .= "ALTER TABLE users ADD CONSTRAINT account_origin_fkey FOREIGN KEY (account_origin) REFERENCES networks (network_id) ON UPDATE CASCADE ON DELETE CASCADE;\n";
+            $sql .= "ALTER TABLE nodes DROP CONSTRAINT network_id_fkey;\n";
+            $sql .= "ALTER TABLE nodes ADD CONSTRAINT network_id_fkey FOREIGN KEY (network_id) REFERENCES networks (network_id) ON UPDATE CASCADE ON DELETE CASCADE;\n";
+                $sql .= "ALTER TABLE users DROP CONSTRAINT check_account_origin_not_empty;\n";
+                $sql .= "ALTER TABLE connections DROP CONSTRAINT fk_nodes;\n";
+                $sql .= "ALTER TABLE connections ADD CONSTRAINT fk_nodes FOREIGN KEY (node_id) REFERENCES nodes (node_id) ON UPDATE CASCADE ON DELETE CASCADE;\n";
+                $sql .= "ALTER TABLE connections DROP CONSTRAINT fk_users;\n";
+                $sql .= "ALTER TABLE connections ADD CONSTRAINT fk_users FOREIGN KEY (user_id) REFERENCES users (user_id) ON UPDATE CASCADE ON DELETE CASCADE;\n";
+                $sql .= "ALTER TABLE node_stakeholders DROP CONSTRAINT \"$2\";\n";
+                $sql .= "ALTER TABLE node_stakeholders ADD CONSTRAINT fk_users FOREIGN KEY (user_id) REFERENCES users (user_id) ON UPDATE CASCADE ON DELETE CASCADE;\n";
+                        $sql .= "ALTER TABLE network_stakeholders DROP CONSTRAINT \"$1\";\n";   
+                        $sql .= "ALTER TABLE network_stakeholders ADD CONSTRAINT fk_network FOREIGN KEY (network_id) REFERENCES networks (network_id) ON UPDATE CASCADE ON DELETE CASCADE;\n";
+                        $sql .= "ALTER TABLE network_stakeholders DROP CONSTRAINT \"$2\";\n";
+                        $sql .= "ALTER TABLE network_stakeholders ADD CONSTRAINT fk_users FOREIGN KEY (user_id) REFERENCES users (user_id) ON UPDATE CASCADE ON DELETE CASCADE;\n";
+                        $sql .= "ALTER TABLE content ADD COLUMN title_is_displayed bool;\n";
+                        $sql .= "ALTER TABLE content ALTER COLUMN title_is_displayed SET DEFAULT true;\n";
+            $sql .= "UPDATE content SET title_is_displayed=true;\n";            
+            $sql .= "ALTER TABLE content ALTER COLUMN title_is_displayed SET NOT NULL;\n\n";
+                                
+        
+        }
         /*
         $new_schema_version = 44;

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

@@ -565 +565 @@
     background-color: rgb(235, 235, 235);
 }
-.user_ui_sponsor_info {
-    background-color: rgb(235, 235, 235);
-}
 .list_ui_container {
     display: inline;