Changeset 559

Timestamp:

04/20/05 13:08:14 (8 years ago)

Author:

fproulx

Message:

2005-04-20 Fran�ois Proulx <francois.proulx@…>

• Completed Flickr support ( explicit exceptions catching )
• Most of File object is done
• Fixed bug in generic_object_admin.php
• changed stylesheet class tags for Flickr

Location:

trunk/wifidog-auth

Files:

• ChangeLog (modified) (1 diff)
• wifidog/admin/generic_object_admin.php (modified) (1 diff)
• wifidog/admin/index.php (modified) (1 diff)
• wifidog/classes/Content/File.php (modified) (9 diffs)
• wifidog/classes/Content/FlickrPhotostream.php (modified) (1 diff)
• wifidog/local_content/default/stylesheet.css (modified) (3 diffs)

trunk/wifidog-auth/ChangeLog

@@ +1 @@
+2005-04-20 François Proulx <francois.proulx@gmail.com>
+        * Completed Flickr support ( explicit exceptions catching )
+        * Most of File object is done
+        * Fixed bug in generic_object_admin.php
+        * changed stylesheet class tags for Flickr
+        
 2005-04-18 François Proulx <francois.proulx@gmail.com>
         * Added Flickr content support

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

@@ -69 +69 @@
 if ($_REQUEST['action'] == 'save')
 {
-
         $html .= $object->processAdminUI();
+    $object = call_user_func(array ($class, 'getObject'), $_REQUEST['object_id']);
         $_REQUEST['action'] = 'edit';
 }

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

@@ -30 +30 @@
 
 $smarty->display("templates/header.html");
-$html = '';
-$html .= "<ul>\n";
-$html .= "<li><a href='user_log.php'>"._("User logs")."</a></li>\n";
-$html .= "<li><a href='online_users.php'>"._("Online Users")."</a></li>\n";
-$html .= "<li><a href='user_stats.php'>"._("Cumulative user statistics")."</a></li>\n";
-$html .= "<li><a href='hotspot_log.php'>"._("Hotspot logs")."</a></li>\n";
-$html .= "<li><a href='import_user_database.php'>"._("Import NoCat user database")."</a></li>\n";
-$html .= "<li><a href='hotspot.php'>"._("Hotspot creation and configuration")."</a> - Beta</li>\n";
-$html .= "<li><a href='owner_sendfiles.php'>"._("Hotspot owner administration")."</a> - Beta</li>\n";
-
-/* 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'>\n";
 
 $current_user = User :: getCurrentUser();
-if ($current_user->isSuperAdmin())
+if(!$current_user)
 {
-        $sql_additional_where = '';
+    $html = _('You must be logged in to access the administration panel.');
 }
 else
 {
-        $sql_additional_where = "AND node_id IN (SELECT node_id from node_owners WHERE user_id='".$current_user->getId()."')";
+    $html = '';
+    $html .= "<ul>\n";
+    $html .= "<li><a href='user_log.php'>"._("User logs")."</a></li>\n";
+    $html .= "<li><a href='online_users.php'>"._("Online Users")."</a></li>\n";
+    $html .= "<li><a href='user_stats.php'>"._("Cumulative user statistics")."</a></li>\n";
+    $html .= "<li><a href='hotspot_log.php'>"._("Hotspot logs")."</a></li>\n";
+    $html .= "<li><a href='import_user_database.php'>"._("Import NoCat user database")."</a></li>\n";
+    $html .= "<li><a href='hotspot.php'>"._("Hotspot creation and configuration")."</a> - Beta</li>\n";
+    $html .= "<li><a href='owner_sendfiles.php'>"._("Hotspot owner administration")."</a> - Beta</li>\n";
+    
+    /* 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'>\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 .= Node :: getSelectNodeUI('object_id', $sql_additional_where);
+    $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 */
+    $html .= "<div class='admin_section_container'>\n";
+    $html .= '<form action="'.GENERIC_OBJECT_ADMIN_ABS_HREF.'" method="post">';
+    $html .= "<div class='admin_section_title'>"._("Network 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='Network'>\n";
+    $html .= Network :: getSelectNetworkUI('object_id');
+    $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";
+    
+    $html .= "<li><a href='content_admin.php'>"._("Content manager")."</a></li>\n";
+    $html .= "</ul>\n";
 }
-$html .= Node :: getSelectNodeUI('object_id', $sql_additional_where);
-$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 */
-$html .= "<div class='admin_section_container'>\n";
-$html .= '<form action="'.GENERIC_OBJECT_ADMIN_ABS_HREF.'" method="post">';
-$html .= "<div class='admin_section_title'>"._("Network 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='Network'>\n";
-$html .= Network :: getSelectNetworkUI('object_id');
-$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";
-
-$html .= "<li><a href='content_admin.php'>"._("Content manager")."</a></li>\n";
-$html .= "</ul>\n";
 
 echo $html;

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

@@ -34 +34 @@
 class File extends Content
 {
+    /* File size units */
+    const UNIT_BYTES = 1;
+    const UNIT_KILOBYTES = 1024;
+    const UNIT_MEGABYTES = 1048576;
+    const UNIT_GIGABYTES = 1073741824;
+    
         /**Constructeur
         @param $content_id Content id
@@ -45 +51 @@
 
                 $content_id = $db->EscapeString($content_id);
-                $sql = "SELECT files_id, filename, mime_type FROM files WHERE files_id='$content_id'";
+                $sql = "SELECT files_id, filename, mime_type, url, octet_length(binary_data) AS size FROM files WHERE files_id='$content_id'";
                 $db->ExecSqlUniqueRes($sql, $row, false);
                 if ($row == null)
@@ -53 +59 @@
                         $db->ExecSqlUpdate($sql, false);
 
-                        $sql = "SELECT files_id, filename, mime_type FROM files WHERE files_id='$content_id'";
+                        $sql = "SELECT files_id, filename, mime_type, url, octet_length(binary_data) AS size FROM files WHERE files_id='$content_id'";
                         $db->ExecSqlUniqueRes($sql, $row, false);
                         if ($row == null)
@@ -129 +135 @@
                 $this->refresh();
         }
+    
+    function getFileSize($unit = self::UNIT_BYTES)
+    {
+        switch($unit)
+        {
+            case self::UNIT_KILOBYTES;
+            case self::UNIT_MEGABYTES:
+            case self::UNIT_GIGABYTES:
+            case self::UNIT_BYTES:
+                return round($this->files_row['size'] / $unit, 2);
+            default:
+                return $this->files_row['size'];
+                break;
+        }
+    }
+    
+    function getFileUrl()
+    {
+        //TODO: build local url + file generator
+        if(!isLocalFile())
+            return $this->files_row['url'];
+        else
+            return "http://";
+    }
+    
+    function setURL($url)
+    {
+        $url = $this->mBd->EscapeString($url);
+        $this->mBd->execSqlUpdate("UPDATE files SET url = '$url' WHERE files_id='".$this->getId()."'", false);
+        $this->refresh();
+    }
+    
+    function isLocalFile()
+    {
+        return !empty($this->files_row['url']);
+    }
 
         /**Affiche l'interface d'administration de l'objet */
@@ -137 +179 @@
         
                 $html .= "<div class='admin_section_container'>\n";
-        $html .= "<div class='admin_section_title'>"._("Upload a new file (This will replace any existing file)")." : </div>\n";
+        $html .= "<div class='admin_section_title'>";
+        $html .= "<input type='radio' name='file_by_upload".$this->getId()."' value='true' ".(!$this->isLocalFile()?"CHECKED":"").">";
+        $html .= _("Upload a new file (This will replace any existing file)")." : </div>\n";
         $html .= "<div class='admin_section_data'>\n";
         $html .= '<input type="hidden" name="MAX_FILE_SIZE" value="1073741824" />';
@@ -145 +189 @@
         
         $html .= "<div class='admin_section_container'>\n";
+        $html .= "<div class='admin_section_title'>";
+        $html .= "<input type='radio' name='file_by_url".$this->getId()."' value='true' ".($this->isLocalFile()?"CHECKED":"").">";
+        $html .= _("Remote file via URL")." : </div>\n";
+        $html .= "<div class='admin_section_data'>\n";
+        $html .= "<input name='file_url".$this->getId()."' type='text' size='50'/>";
+        $html .= "</div>\n";
+        $html .= "</div>\n";
+        
+        $html .= "<div class='admin_section_container'>\n";
         $html .= "<div class='admin_section_title'>"._("Filename")." : </div>\n";
         $html .= "<div class='admin_section_data'>\n";
@@ -158 +211 @@
         $html .= "</div>\n";
         
+        if($this->isLocalFile())
+        {
+            $html .= "<div class='admin_section_container'>\n";
+            $html .= "<div class='admin_section_title'>"._("File size")." : </div>\n";
+            $html .= "<div class='admin_section_data'>\n";
+            $html .= $this->getFileSize(self::UNIT_KILOBYTES)." "._("KB");
+            $html .= "</div>\n";
+            $html .= "</div>\n";
+        }
+        else
+        {
+            //TODO: implement user defined size
+        }
+        
                 return parent :: getAdminUI($html);
         }
@@ -166 +233 @@
         
         // If no file was uploaded, update filename and mime type
-        if(!$this->setBinaryDataFromPostVar("file_file_upload".$this->getId()))
-        {
-            $this->setMimeType($_REQUEST["file_mime_type".$this->getId()]);
-            $this->setFilename($_REQUEST["file_file_name".$this->getId()]);
-        }
+        if(!empty($_REQUEST["file_by_upload".$this->getId()]))
+        {
+            $this->setBinaryDataFromPostVar("file_file_upload".$this->getId());
+        }
+        else
+            if(!empty($_REQUEST["file_url".$this->getId()]))
+            {
+                $this->setURL($_REQUEST["file_url".$this->getId()]);
+            }
+        $this->setMimeType($_REQUEST["file_mime_type".$this->getId()]);
+        $this->setFilename($_REQUEST["file_file_name".$this->getId()]);
         }
 
@@ -179 +252 @@
          * @param $subclass_admin_interface Html content of the interface element of a children
          * @return The HTML fragment for this interface */
-        public function getUserUI($subclass_user_interface = null)
+        public function getUserUI()
         {
                 $html = '';
                 $html .= "<div class='user_ui_container'>\n";
                 $html .= "<div class='user_ui_object_class'>Langstring (".get_class($this)." instance)</div>\n";
-                $html .= $this->getString();
-                $html .= $subclass_user_interface;
+                $html .= "<a href='".$this->getFileUrl()."'>"._("Download this file")." (".$this->getFileSize(UNIT_KILOBYTES)." "._("KB").")</a>";
                 $html .= "</div>\n";
                 return parent :: getUserUI($html);

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

@@ -555 +555 @@
                     if(is_object($photo))
                     {
-                        $html .= '<div class="FlickrPhotoBlock">'."\n";
-                        $html .= '<div class="FlickrTitle"><h3>'.$photo->getTitle().'</h3></div>'."\n";
-                        $html .= '<div class="FlickrPhoto"><a href="'.$photo->buildUrl().'"><img src="'.$photo->buildImgUrl().'"></a></div>'."\n";
-                        $tags = $photo->getTags();
-                        if(!empty($tags))
+                        $html .= '<div class="flickr_photo_block">'."\n";
+                        if($this->shouldDisplayTitle())
+                            $html .= '<div class="flickr_title"><h3>'.$photo->getTitle().'</h3></div>'."\n";
+                        $html .= '<div class="flickr_photo"><a href="'.$photo->buildUrl().'"><img src="'.$photo->buildImgUrl().'"></a></div>'."\n";
+                        if($this->shouldDisplayTags())
                         {
-                            $html .= '<div class="FlickrTags">'."\n";
-                            $html .= '<h3>'._("Tags")."</h3>\n";
-                            $html .= '<ul>'."\n";
-                            foreach($tags as $tag)
+                            $tags = $photo->getTags();
+                            if(!empty($tags))
                             {
-                                $url_encoded_tag = urlencode($tag);
-                                $html .= '<li><a href="http://www.flickr.com/photos/tags/'.$url_encoded_tag.'/">'.$tag.'</a></li>'."\n";
+                                $html .= '<div class="flickr_tags">'."\n";
+                                $html .= '<h3>'._("Tags")."</h3>\n";
+                                $html .= '<ul>'."\n";
+                                foreach($tags as $tag)
+                                {
+                                    $url_encoded_tag = urlencode($tag);
+                                    $html .= '<li><a href="http://www.flickr.com/photos/tags/'.$url_encoded_tag.'/">'.$tag.'</a></li>'."\n";
+                                }
+                                $html .= '</ul>'."\n";
+                                $html .= '</div>'."\n";
                             }
-                            $html .= '</ul>'."\n";
-                            $html .= '</div>'."\n";
                         }
-                        $description = $photo->getDescription();
-                        if(!empty($description))
-                            $html .= '<div class="FlickrDescription">'.$description.'</div>'."\n";
+                        if($this->shouldDisplayDescription())
+                        {
+                            $description = $photo->getDescription();
+                            if(!empty($description))
+                                $html .= '<div class="flickr_description">'.$description.'</div>'."\n";
+                        }
                         $html .= '</div>'."\n";
                     }
                 }
                         }
+            catch (Phlickr_ConnectionException $e)
+            {
+                $html .= _("Unable to connect to Flickr API.");
+            }
+            catch (Phlickr_MethodFailureException $e)
+            {
+                $html .= _("Some of the request parameters provided to Flickr API are invalid.");
+            }
+            catch (Phlickr_XmlParseException $e)
+            {
+                $html .= _("Unable to parse Flickr's response.");
+            }
                         catch (Phlickr_Exception $e)
                         {
-                                $html .= _("Could not complete succesfully the request to Flickr API.");
+                                $html .= _("Could not get content from Flickr : ").$e;
                         }
 

trunk/wifidog-auth/wifidog/local_content/default/stylesheet.css

@@ -228 +228 @@
 max-width: 100px;
 }
-.FlickrPhotoBlock {
+.flickr_photo_block {
     margin:20px auto 20px auto;
     width:400px;
 }
-.FlickrPhotoBlock:hover > * {
+.flickr_photo_block:hover > * {
     visibility: visible;
 }
-.FlickrTitle {
+.flickr_title {
     visibility: hidden;
     width: 200px;
     background: #696969;
 }
-.FlickrTitle h3 {
+.flickr_title h3 {
     color: white;
     padding: 5px;
     margin: 0;
 }
-.FlickrPhoto {
+.flickr_photo {
     float:left;
 }
@@ -251 +251 @@
     border: 10px solid black;
 }
-.FlickrTags {
+.flickr_tags {
     visibility: hidden;
     background-color: #696969;
@@ -257 +257 @@
     margin-left: 260px;
 }
-.FlickrTags h3 {
+.flickr_tags h3 {
     padding-left: 5px;
     margin: 0;
 }
-.FlickrTags ul {
+.flickr_tags ul {
     margin-left: 20px;
     margin-top: 0px;
     padding: 0px;
 }
-.FlickrTags li {
+.flickr_tags li {
     list-style: none;
     list-style-image: none;
 }
-.FlickrTags li a {
+.flickr_tags li a {
     color: white;
     font-size: normal;
     text-decoration: none;
 }
-.FlickrTags li a:hover {
+.flickr_tags li a:hover {
     text-decoration: underline;
 }
-.FlickrDescription {
+.flickr_description {
     visibility: hidden;
     width: 180px;