Changeset 608

Timestamp:

05/01/05 20:16:26 (8 years ago)

Author:

fproulx

Message:

2005-04-30 Francois Proulx <francois.proulx@…>

• Fixed bug that could potentially let non owners add content in /content through content groups
• Admin menu won't show node selector if the user is not owner of at least one hotspot
• Added Width, height support for Picture

Location:

trunk/wifidog-auth

Files:

• ChangeLog (modified) (1 diff)
• wifidog/classes/Content.php (modified) (2 diffs)
• wifidog/classes/Content/File.php (modified) (1 diff)
• wifidog/classes/Content/Picture.php (modified) (4 diffs)
• wifidog/classes/MainUI.php (modified) (1 diff)
• wifidog/classes/Node.php (modified) (2 diffs)
• wifidog/classes/User.php (modified) (10 diffs)
• wifidog/content/index.php (modified) (1 diff)
• wifidog/include/schema_validate.php (modified) (2 diffs)

trunk/wifidog-auth/ChangeLog

@@ +1 @@
+2005-04-30 Francois Proulx <francois.proulx@gmail.com>
+        * Fixed bug that could potentially let non owners add content in /content through content groups
+        * Admin menu won't show node selector if the user is not owner of at least one hotspot
+        * Added Width, height support for Picture
+        
 2005-04-30 Francois Proulx <francois.proulx@gmail.com>
         * Did my best for content styling ... ( it's 5h00 am )

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

@@ -481 +481 @@
                         {
                                 $html .= "<div class='user_ui_projet_info'>\n";
-                                $html .= _("Project information:");
+                                $html .= "<b>"._("Project information:")."</b>";
                                 $project_info = self :: getObject($this->content_row['project_info']);
                                 // If the content logging is disabled, all the children will inherit this property temporarly
@@ -493 +493 @@
                         {
                                 $html .= "<div class='user_ui_sponsor_info'>\n";
-                                $html .= _("Project sponsor:");
+                                $html .= "<b>"._("Project sponsor:")."</b>";
                                 $sponsor_info = self :: getObject($this->content_row['sponsor_info']);
                                 // If the content logging is disabled, all the children will inherit this property temporarly

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

@@ -295 +295 @@
         if ($this->isOwner(User :: getCurrentUser()) || User :: getCurrentUser()->isSuperAdmin())
         {
-                parent :: processAdminUI();
-            
-                // If no file was uploaded, update filename and mime type
-                if (!empty ($_REQUEST["file_mode".$this->getId()]))
-                {
-                $this->setFilename($_REQUEST["file_file_name".$this->getId()]);
-                $this->setMimeType($_REQUEST["file_mime_type".$this->getId()]);
-                
-                        $file_mode = $_REQUEST["file_mode".$this->getId()];
-                        if ($file_mode == "by_upload")
-                        {
-                                $this->setBinaryDataFromPostVar("file_file_upload".$this->getId());
-                                $this->setURL(null);
-                                // Reset the remote file size ( not used )
-                                $this->setRemoteFileSize(0);
-                        }
-                        else
-                        {
-                                if ($file_mode == "remote")
-                                {
-                                        $this->setURL($_REQUEST["file_url".$this->getId()]);
-                                        $this->setBinaryData(null);
-                                        // When switching from local to remote, this field does not exist yet
-                                        if (!empty ($_REQUEST["file_old_remote_size".$this->getId()]))
-                                        {
-                                                if ($_REQUEST["file_remote_size".$this->getId()] != $_REQUEST["file_old_remote_size".$this->getId()])
-                                                        $this->setRemoteFileSize($_REQUEST["file_remote_size".$this->getId()]);
-                                        }
-                                        else
-                                                $this->setRemoteFileSize(0);
-                                }
-                        }
-                }
+                        parent :: processAdminUI();
+                    
+                        // If no file was uploaded, update filename and mime type
+                        if (!empty ($_REQUEST["file_mode".$this->getId()]))
+                        {
+                                $this->setFilename($_REQUEST["file_file_name".$this->getId()]);
+                        
+                                $file_mode = $_REQUEST["file_mode".$this->getId()];
+                                if ($file_mode == "by_upload")
+                                {
+                                        $this->setMimeType($_REQUEST["file_mime_type".$this->getId()]);
+                                        $this->setBinaryDataFromPostVar("file_file_upload".$this->getId());
+                                        $this->setURL(null);
+                                        // Reset the remote file size ( not used )
+                                        $this->setRemoteFileSize(0);
+                                }
+                                else
+                                {
+                                        if ($file_mode == "remote")
+                                        {
+                                                $this->setURL($_REQUEST["file_url".$this->getId()]);
+                                                $this->setBinaryData(null);
+                                                // When switching from local to remote, this field does not exist yet
+                                                if (!empty ($_REQUEST["file_old_remote_size".$this->getId()]))
+                                                {
+                                                        if ($_REQUEST["file_remote_size".$this->getId()] != $_REQUEST["file_old_remote_size".$this->getId()])
+                                                                $this->setRemoteFileSize($_REQUEST["file_remote_size".$this->getId()]);
+                                                }
+                                                else
+                                                        $this->setRemoteFileSize(0);
+                                        }
+                                }
+                        }
         }
         }

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

@@ -39 +39 @@
         {
                 parent :: __construct($content_id);
+                global $db;
+
+                $content_id = $db->EscapeString($content_id);
+                $sql = "SELECT * FROM pictures WHERE pictures_id='$content_id'";
+                $db->ExecSqlUniqueRes($sql, $row, false);
+                if ($row == null)
+                {
+                        /*Since the parent Content exists, the necessary data in content_group had not yet been created */
+                        $sql = "INSERT INTO pictures (pictures_id) VALUES ('$content_id')";
+                        $db->ExecSqlUpdate($sql, false);
+
+                        $sql = "SELECT * FROM pictures WHERE pictures_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);
+                        }
+
+                }
+                $this->mBd = & $db;
+                $this->pictures_row = $row;
+        }
+        
+        function getWidth()
+        {
+                return $this->pictures_row['width'];
+        }
+        
+        function setWidth($width)
+        {
+                if(empty($width) || is_numeric($width))
+                {
+                        empty($width) ? $width = "NULL" : $width = $this->mBd->EscapeString($width) ;
+                        $this->mBd->ExecSqlUpdate("UPDATE pictures SET width =".$width." WHERE pictures_id='".$this->getId()."'", false);
+                        $this->refresh();
+                }
+        }
+        
+        function getHeight()
+        {
+                return $this->pictures_row['height'];
+        }
+        
+        function setHeight($height)
+        {
+                if(empty($height) || is_numeric($height))
+                {
+                        empty($height) ? $height = "NULL" : $height = $this->mBd->EscapeString($height) ;
+                        $this->mBd->ExecSqlUpdate("UPDATE pictures SET height =".$height." WHERE pictures_id='".$this->getId()."'", false);
+                        $this->refresh();
+                }
         }
 
@@ -47 +98 @@
         $html .= "<div class='admin_class'>Picture (".get_class($this)." instance)</div>\n";
         
+        $html .= "<div class='admin_section_container'>\n";
+                $html .= "<div class='admin_section_data'>\n";
+        $html .= "<div class='admin_section_title'>"._("Width (leave empty if you want to keep original width)")." : </div>\n";
+                $html .= "<input type='text' name='pictures_{$this->getId()}_width' value='{$this->getWidth()}'>";
+                $html .= "</div>\n";
+        $html .= "</div>\n";
+        
+        $html .= "<div class='admin_section_container'>\n";
+                $html .= "<div class='admin_section_data'>\n";
+        $html .= "<div class='admin_section_title'>"._("Height (leave empty if you want to keep original height)")." : </div>\n";
+                $html .= "<input type='text' name='pictures_{$this->getId()}_height' value='{$this->getHeight()}'>";
+                $html .= "</div>\n";
+        $html .= "</div>\n";
+        
         // Show File admin UI + display the picture
         $html .= "<div class='admin_section_container'>\n";
                 $html .= "<div class='admin_section_data'>\n";
         $html .= "<div class='admin_section_title'>"._("Picture preview")." : </div>\n";
-                $html .= "<img src='".htmlentities($this->getFileUrl())."' alt='".$this->getFileName()."''>";
+        
+        $width = $this->getWidth();
+                $height = $this->getHeight();
+                
+                if(empty($width))
+                        $width = "";
+                else
+                        $width = "width='$width'";
+                
+                if(empty($height))
+                        $height = "";
+                else
+                        $height = "height='$height'";
+                        
+                $html .= "<img src='".htmlentities($this->getFileUrl())."' $width $height alt='".$this->getFileName()."''>";
                 $html .= "</div>\n";
         $html .= "</div>\n";
@@ -57 +136 @@
         $html .= $subclass_admin_interface;
         return parent :: getAdminUI($html);
+        }
+        
+        function processAdminUI()
+        {
+        if ($this->isOwner(User :: getCurrentUser()) || User :: getCurrentUser()->isSuperAdmin())
+        {
+                        parent :: processAdminUI();
+                        
+                        $this->setWidth(intval($_REQUEST["pictures_{$this->getId()}_width"]));
+                        $this->setHeight(intval($_REQUEST["pictures_{$this->getId()}_height"]));
+        }
         }
 
@@ -67 +157 @@
                 $html .= "<div class='user_ui_container'>\n";
                 $html .= "<div class='user_ui_object_class'>Picture (".get_class($this)." instance)</div>\n";
-                $html .= "<img class='user_ui_picture' src='".htmlentities($this->getFileUrl())."' alt='".$this->getFileName()."''>";
+                
+                $width = $this->getWidth();
+                $height = $this->getHeight();
+                
+                if(empty($width))
+                        $width = "";
+                else
+                        $width = "width='$width'";
+                
+                if(empty($height))
+                        $height = "";
+                else
+                        $height = "height='$height'";
+                        
+                $html .= "<img src='".htmlentities($this->getFileUrl())."' $width $height alt='".$this->getFileName()."''>";
                 $html .= "</div>\n";
         return $html;

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

@@ -68 +68 @@
             }
 
-                        /* Node admin */
-                        $html .= "<div class='admin_section_container'>\n";
-                        $html .= '<form action="'.GENERIC_OBJECT_ADMIN_ABS_HREF.'" method="get">';
-                        $html .= "<div class='admin_section_title'>"._("Node administration:")." </div>\n";
-
-                        $html .= "<div class='admin_section_data'>\n";
-                        $html .= "<input type='hidden' name='action' value='edit'>\n";
-                        $html .= "<input type='hidden' name='object_class' value='Node'><br>\n";
-
-                        if ($current_user->isSuperAdmin())
-                        {
-                                $sql_additional_where = '';
-                        }
-                        else
-                        {
-                                $sql_additional_where = "AND node_id IN (SELECT node_id from node_owners WHERE user_id='".$current_user->getId()."')";
-                        }
-            $html .= "<div id='NodeSelector'>\n";
-                        $html .= Node :: getSelectNodeUI('object_id', $sql_additional_where);
-            $html .= "</div>\n";
-                        $html .= "</div>\n";
-                        $html .= "<div class='admin_section_tools'>\n";
-
-                        $html .= "<input type=submit name='edit_submit' value='"._("Edit")."'>\n";
-                        $html .= "</div>\n";
-                        $html .= '</form>';
-                        $html .= "</div>\n";
+                        // If the user is super admin OR owner of at least one hotspot show the menu
+                        if($current_user->isSuperAdmin() || $current_user->isOwner())
+                        {
+                                /* Node admin */
+                                $html .= "<div class='admin_section_container'>\n";
+                                $html .= '<form action="'.GENERIC_OBJECT_ADMIN_ABS_HREF.'" method="get">';
+                                $html .= "<div class='admin_section_title'>"._("Node administration:")." </div>\n";
+        
+                                $html .= "<div class='admin_section_data'>\n";
+                                $html .= "<input type='hidden' name='action' value='edit'>\n";
+                                $html .= "<input type='hidden' name='object_class' value='Node'><br>\n";
+
+                                if ($current_user->isSuperAdmin())
+                                        $sql_additional_where = '';
+                                else
+                                        $sql_additional_where = "AND node_id IN (SELECT node_id from node_owners WHERE user_id='".$current_user->getId()."')";
+                    $html .= "<div id='NodeSelector'>\n";
+                                $html .= Node :: getSelectNodeUI('object_id', $sql_additional_where);
+                    $html .= "</div>\n";
+                                $html .= "</div>\n";
+                                $html .= "<div class='admin_section_tools'>\n";
+        
+                                $html .= "<input type=submit name='edit_submit' value='"._("Edit")."'>\n";
+                                $html .= "</div>\n";
+                                $html .= '</form>';
+                                $html .= "</div>\n";
+                        }
 
                         /* Network admin */

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

@@ -454 +454 @@
         global $db;
         $retval = array ();
-        $sql = "SELECT * FROM content_group JOIN content ON (content.content_id = content_group.content_group_id) WHERE is_persistent = true AND is_artistic_content = true AND is_locative_content = true";
+        $sql = "SELECT * FROM content_group JOIN content ON (content.content_id = content_group.content_group_id) JOIN node_has_content ON (node_has_content.content_id = content_group.content_group_id AND node_has_content.node_id = '{$this->getId()}') WHERE is_persistent = true AND is_artistic_content = true AND is_locative_content = true";
         $db->ExecSql($sql, $content_rows, false);
         if ($content_rows != null)
@@ -464 +464 @@
                 if($content_group->getDisplayNumElements() >= 1)
                 {
-                    // Disable logging and allow content to expand ( if possible )
-                    $content_group->setExpandStatus(true);
-                    $content_group->setLoggingStatus(false);
-                    $retval[] = $content_group;
+                                if($content_group->isDisplayableAt($this))
+                                {
+                                                // Disable logging and allow content to expand ( if possible )
+                                                $content_group->setExpandStatus(true);
+                                                $content_group->setLoggingStatus(false);
+                                                $retval[] = $content_group;
+                                }
                 }
             }

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

@@ -1 +1 @@
 <?php
+
 
 /********************************************************************\
@@ -251 +252 @@
         }
 
-/** Get a user display suitable for a user list.  Will include link to the user profile. */
+        /** Get a user display suitable for a user list.  Will include link to the user profile. */
         function getUserListUI()
         {
-                                                $html = '';
-                                                $html .= $this->getUserName();
-                                                return $html;
+                $html = '';
+                $html .= $this->getUserName();
+                return $html;
         }
 
@@ -344 +345 @@
         }
 
-  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)) {
-     return true;
-    } else {
-     return false;
-    }
-
-  }
+        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))
+                {
+                        return true;
+                }
+                else
+                {
+                        return false;
+                }
+
+        }
+
+        /**
+         * Tells if the current user is owner of at least one hotspot.
+         */
+        public function isOwner()
+        {
+                global $db;
+                $db->ExecSqlUniqueRes("SELECT * FROM node_owners WHERE user_id='{$this->getId()}'", $row, false);
+                if ($row != null)
+                        return true;
+                return false;
+
+        }
+        
         function getValidationToken()
         {
@@ -413 +432 @@
                 return $connections;
         }
-    
-    function getAccountOrigin()
-    {
-        return $this->mRow['account_origin'];
-    }
+
+        function getAccountOrigin()
+        {
+                return $this->mRow['account_origin'];
+        }
 
         /** Return all the users
@@ -432 +451 @@
                 return $objects;
         }
-    
-    /**
-     * Logout the current user
-     * Destroying session and cleaning tokens
-     */
-    function logout()
-    {
-        global $session;
-        $session->destroy();
-        //TODO: Completed this part with Network::getObject()
-        /*
-        try {
-            $connections = $this->getConnections();
-            foreach($connections as $connection)
-                if($connection['token_status'] == TOKEN_UNUSED || $connection['token_status'] == TOKEN_INUSE)
-                    Network::getCurrentNetwork()->getAuthenticator()->logout(array('conn_id' => $connection['conn_id']), $errmsg);
-        } catch(Exception $e)
-        {
-            //TODO: Error management ( MainUI )
-        }*/
-    }
+
+        /**
+         * Logout the current user
+         * Destroying session and cleaning tokens
+         */
+        function logout()
+        {
+                global $session;
+                $session->destroy();
+                //TODO: Completed this part with Network::getObject()
+                /*
+                try {
+                    $connections = $this->getConnections();
+                    foreach($connections as $connection)
+                        if($connection['token_status'] == TOKEN_UNUSED || $connection['token_status'] == TOKEN_INUSE)
+                            Network::getCurrentNetwork()->getAuthenticator()->logout(array('conn_id' => $connection['conn_id']), $errmsg);
+                } catch(Exception $e)
+                {
+                    //TODO: Error management ( MainUI )
+                }*/
+        }
 
         function sendLostUsername()
@@ -462 +481 @@
                 $subject = HOTSPOT_NETWORK_NAME._(" lost username request");
                 $body = _("Hello,\nYou have requested that the authentication server send you your username:\nUsername: ").$username._("\n\nHave a nice day,\nThe Team");
-        
-        //TODO: Find a way to use correctly mb_encode_mimeheader 
-        $subject = mb_convert_encoding($subject, "ISO-8859-1","AUTO");
-        
+
+                //TODO: Find a way to use correctly mb_encode_mimeheader 
+                $subject = mb_convert_encoding($subject, "ISO-8859-1", "AUTO");
+
                 mail($this->getEmail(), $subject, $body, $headers);
         }
@@ -489 +508 @@
                                 $url = "http://".$_SERVER["SERVER_NAME"]."/validate.php?user_id=".$this->getId()."&token=".$this->getValidationToken();
                                 $body = _("Hello,\nPlease follow the link below to validate your account.\n").$url._("\n\nThank you,\nThe Team.");
-                
-                //TODO: Find a way to use correctly mb_encode_mimeheader 
-                $subject = mb_convert_encoding($subject, "ISO-8859-1","AUTO");
-        
+
+                                //TODO: Find a way to use correctly mb_encode_mimeheader 
+                                $subject = mb_convert_encoding($subject, "ISO-8859-1", "AUTO");
+
                                 mail($this->getEmail(), $subject, $body, $headers);
                         }
@@ -508 +527 @@
                 $headers = 'MIME-Version: 1.0'."\r\n";
                 $headers .= 'Content-type: text/plain; charset=UTF-8'."\r\n";
-        $headers .= "From: ".VALIDATION_EMAIL_FROM_ADDRESS;
+                $headers .= "From: ".VALIDATION_EMAIL_FROM_ADDRESS;
                 $subject = HOTSPOT_NETWORK_NAME._(" new password request");
                 $body = _("Hello,\nYou have requested that the authentication server send you a new password:\nUsername: ").$username._("\nPassword: ").$new_password._("\n\nHave a nice day,\nThe Team");
-        
-        //TODO: Find a way to use correctly mb_encode_mimeheader 
-        $subject = mb_convert_encoding($subject, "ISO-8859-1","AUTO");
-        
+
+                //TODO: Find a way to use correctly mb_encode_mimeheader 
+                $subject = mb_convert_encoding($subject, "ISO-8859-1", "AUTO");
+
                 mail($this->getEmail(), $subject, $body, $headers);
         }
@@ -580 +599 @@
                 return $html;
         }
-    
+
         /** Get the selected user, IF one was selected and is valid
          * @param $user_prefix A identifier provided by the programmer to recognise it's generated form
@@ -591 +610 @@
                 $name = "select_user_{$user_prefix}_username";
                 $username = $_REQUEST[$name];
-                return self::getUserByUsernameAndOrigin($username, $network->GetId());
-        }
-    
-    /** Add content to this user ( subscription ) */
-    public function addContent(Content $content)
-    {
-        global $db;
-        $content_id = $db->EscapeString($content->getId());
-        $sql = "INSERT INTO user_has_content (user_id, content_id) VALUES ('$this->id','$content_id')";
-        $db->ExecSqlUpdate($sql, false);
-        return true;
-    }
-
-    /** Remove content from this node */
-    public function removeContent(Content $content)
-    {
-        global $db;
-        $content_id = $db->EscapeString($content->getId());
-        $sql = "DELETE FROM user_has_content WHERE user_id='$this->id' AND content_id='$content_id'";
-        $db->ExecSqlUpdate($sql, false);
-        return true;
-    }
-
-    /**Get an array of all Content linked to this node
-    * @return an array of Content or an empty arrray */
-    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)
-            {
-                $retval[] = Content :: getObject($content_row['content_id']);
-            }
-        }
-        return $retval;
-    }
-    
+                return self :: getUserByUsernameAndOrigin($username, $network->GetId());
+        }
+
+        /** Add content to this user ( subscription ) */
+        public function addContent(Content $content)
+        {
+                global $db;
+                $content_id = $db->EscapeString($content->getId());
+                $sql = "INSERT INTO user_has_content (user_id, content_id) VALUES ('$this->id','$content_id')";
+                $db->ExecSqlUpdate($sql, false);
+                return true;
+        }
+
+        /** Remove content from this node */
+        public function removeContent(Content $content)
+        {
+                global $db;
+                $content_id = $db->EscapeString($content->getId());
+                $sql = "DELETE FROM user_has_content WHERE user_id='$this->id' AND content_id='$content_id'";
+                $db->ExecSqlUpdate($sql, false);
+                return true;
+        }
+
+        /**Get an array of all Content linked to this node
+        * @return an array of Content or an empty arrray */
+        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)
+                        {
+                                $retval[] = Content :: getObject($content_row['content_id']);
+                        }
+                }
+                return $retval;
+        }
+
 } // End class
 ?>

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

@@ -110 +110 @@
 
 /* Node section */
-$html .= "<div class='portal_node_section'>\n";
-$html .= "<img class='portal_section_logo' src='{$hotspot_logo_url}' alt=''>\n";
-$html .= "<span class='portal_section_title'>"._("Content from:")."</span>";
-
-$node_homepage = $node->getHomePageURL();
-if(!empty($node_homepage))
-{
-        $html .= "<a href='$node_homepage'>";
-}
-$html .= $node->getName();
-if(!empty($node_homepage))
-{
-        $html .= "</a>\n";
-}
-
 // Get all locative artistic content for this node
 $contents = $node->getAllLocativeArtisticContent();
-$html .= "<ul>\n";
-foreach ($contents as $content)
+if($contents)
 {
-    $html .= "<li>\n";
-        $html .= $content->getUserUI();
-    $html .= "</li>\n";
+        $html .= "<table width='100%'><tr><td>";
+        $html .= "<div class='portal_node_section'>\n";
+        $html .= "<img class='portal_section_logo' src='{$hotspot_logo_url}' alt=''>\n";
+        $html .= "<span class='portal_section_title'>"._("Content from:")." ";
+        
+        $node_homepage = $node->getHomePageURL();
+        if(!empty($node_homepage))
+        {
+                $html .= "<a href='$node_homepage'>";
+        }
+        $html .= $node->getName();
+        if(!empty($node_homepage))
+        {
+                $html .= "</a>\n";
+        }
+        $html .= "</span>";
+        $html .= "</td></tr></table>";
+        
+        foreach ($contents as $content)
+        {
+                $html .= "<div class='portal_content'>\n";
+                $html .= $content->getUserUI();
+                $html .= "</div>";
+        }
+        $html .= "</div>\n";
 }
-$html .= "</ul>\n";
-
-$html .= "</div>\n";
 
 $ui->setMainContent($html);

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

@@ -29 +29 @@
 require_once BASEPATH.'classes/AbstractDb.php';
 require_once BASEPATH.'classes/Session.php';
-define('REQUIRED_SCHEMA_VERSION', 13);
+define('REQUIRED_SCHEMA_VERSION', 14);
 
 /** Check that the database schema is up to date.  If it isn't, offer to update it. */
@@ -401 +401 @@
                         $sql .= "ALTER TABLE content_group ALTER COLUMN allow_repeat SET DEFAULT 'YES';\n";
                         $sql .= "ALTER TABLE content_group ALTER COLUMN allow_repeat SET NOT NULL;\n";
-                }       
+                }
+                
+                $new_schema_version = 14;
+        if($schema_version < $new_schema_version)
+        {
+            echo "<h2>Preparing SQL statements to update schema to version  $new_schema_version</h2>\n";
+            $sql .= "\n\nUPDATE schema_info SET value='$new_schema_version' WHERE tag='schema_version';\n"; 
+            $sql .= "CREATE TABLE pictures " .
+                        "( " .
+                        "pictures_id text NOT NULL PRIMARY KEY REFERENCES files ON DELETE CASCADE ON UPDATE CASCADE, " .
+                        "width int4, ".
+                        "height int4".
+                        ");\n";
+        }