Changeset 1167

Timestamp:

01/15/07 02:59:25 (6 years ago)

Author:

benoitg

Message:

• Content.php: Make hasDisplayableMetadata() consider Authors, and make it a bit faster.

Location:

trunk/wifidog-auth

Files:

• CHANGELOG (modified) (1 diff)
• wifidog/classes/Content.php (modified) (3 diffs)
• wifidog/classes/Content/Avatar/Avatar.php (modified) (3 diffs)
• wifidog/classes/Content/SimplePicture/SimplePicture.php (modified) (1 diff)

trunk/wifidog-auth/CHANGELOG

@@ -1 +1 @@
 2007-01-14 Benoit Grégoire  <bock@step.polymtl.ca>
         * Dependencies.php, AuthenticatorRadius.php:  Fix bug #287 (Dependencies not being detected properly)
-
+        * Content.php: Make hasDisplayableMetadata() consider Authors, and make it a bit faster.
+        
 2007-01-13 Benoit Grégoire  <bock@step.polymtl.ca>
         * Content.php:  Add setUserUIMainDisplayContent() and setUserUIMainInteractionArea()

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

@@ -921 +921 @@
                 //Delete the KVP
                 $retval = $db->execSqlUpdate("DELETE FROM content_key_value_pairs WHERE content_id='" . $this->getId() . "' AND key='$key_sql'", false);
-                        if(isset ($this->kvps[$key])) {
-                                unset ($this->kvps[$key]);
-                        }
+                if(isset ($this->kvps[$key])) {
+                        unset ($this->kvps[$key]);
+                }
         } else if (!isset ($this->kvps[$key])) {
                 //This is a new key
@@ -1134 +1134 @@
         return false;
     }
-    
+
     /** This function will be called by MainUI for each Content BEFORE any getUserUI function is called to allow two pass Content display.
      * Two pass Content display allows such things as modyfying headers, title, creating content type that accumulate content from other pieces (like RSS feeds)
@@ -1148 +1148 @@
         $retval = false;
         $metadata = $this->getTitle();
-        if ($metadata  && $this->titleShouldDisplay()){
+        if ($metadata && $this->titleShouldDisplay()){
                 $retval = true;
         }
-        $metadata = $this->getDescription();
-        if ($metadata){
+        elseif ($this->getDescription()){
                 $retval = true;
         }
-        $metadata = $this->getLongDescription();
-        if ($metadata){
+        elseif ($this->getLongDescription()){
                 $retval = true;
         }
-        $metadata = $this->getProjectInfo();
-        if ($metadata){
+        elseif ($this->getProjectInfo()){
+                $retval = true;
+        }
+        elseif($this->getAuthors()) {
                 $retval = true;
         }

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

@@ -46 +46 @@
  * Load Picture content class
  */
-require_once('classes/Content/Picture/Picture.php');
+require_once('classes/Content/SimplePicture/SimplePicture.php');
 
 /**
@@ -56 +56 @@
  * @copyright  2005-2006 Francois Proulx, Technologies Coeus inc.
  */
-class Avatar extends Picture
+class Avatar extends SimplePicture
 {
     /**
@@ -66 +66 @@
     {
         parent :: __construct($content_id);
-    }
-
-    /**
-     * Shows the administration interface for Avatar
-     *
-     * @param string $subclass_admin_interface HTML code to be added after the
-     *                                         administration interface
-     *
-     * @return string HTML code for the administration interface
-     */
-    public function getAdminUI($subclass_admin_interface = null, $title=null)
-    {
-        // Init values
-        $html = '';
-                $html .= "<ul class='admin_element_list'>\n";
-        // Show File admin UI + display the picture
-        $html .= "<li class='admin_element_item_container'>\n";
-        $html .= "<div class='admin_element_data'>\n";
-        $html .= "<div class='admin_element_label'>"._("Picture preview")." : </div>\n";
-        $html .= "<br>\n";
-
-        $html .= "<img src='".htmlentities($this->getFileUrl())."' alt='".$this->getFileName()."''>";
-        $html .= "</div>\n";
-        $html .= "</li>\n";
-
-        $html .= "<li class='admin_element_item_container'>\n";
-        $html .= "<div class='admin_element_label'>";
-        $html .= "<input type='radio' name='file_mode".$this->getId()."' value='by_upload' ". ($this->isLocalFile() ? "CHECKED" : "").">";
-        $html .= _("Upload a new file (Uploading a new one will replace any existing file)")." : </div>\n";
-        $html .= "<div class='admin_element_data'>\n";
-        $html .= '<input type="hidden" name="MAX_FILE_SIZE" value="1073741824" />';
-        $html .= '<input name="file_file_upload'.$this->getId().'" type="file" />';
-        $html .= "</div>\n";
-        $html .= "</li>\n";
-
-        $html .= "<li class='admin_element_item_container'>\n";
-        $html .= "<div class='admin_element_label'>";
-        $html .= "<input type='radio' name='file_mode".$this->getId()."' value='remote' ". (!$this->isLocalFile() ? "CHECKED" : "").">";
-        $html .= _("Remote file via URL")." : </div>\n";
-        $html .= "<div class='admin_element_data'>\n";
-
-        if ($this->isLocalFile()) {
-            $html .= "<input name='file_url".$this->getId()."' type='text' size='50'/>";
-        } else {
-            $html .= "<input name='file_url".$this->getId()."' type='text' size='50' value='".$this->getFileUrl()."'/>";
-        }
-
-        $html .= "</div>\n";
-        $html .= "</li>\n";
-
-        if (!$this->isLocalFile()) {
-            $html .= "<li class='admin_element_item_container'>\n";
-            $html .= "<div class='admin_element_label'>"._("File URL")." : </div>\n";
-            $html .= "<div class='admin_element_data'>\n";
-            $html .= $this->getFileUrl();
-            $html .= "</div>\n";
-            $html .= "</li>\n";
-        }
-                $html .= "</ul>\n";
-        $html .= $subclass_admin_interface;
-        return parent :: getAdminUI($html, $title);
-    }
-
-    /**
-     * Processes the input of the administration interface for RssAggregator
-     *
-     * @return void
-     */
-    public function processAdminUI()
-    {
-        if ($this->isOwner(User :: getCurrentUser()) || User :: getCurrentUser()->isSuperAdmin()) {
-            parent :: processAdminUI();
-        }
-    }
-
-    /**
-     * Retreives the user interface of this object.
-     *
-     * @return string The HTML fragment for this interface
-     */
-    public function getUserUI()
-    {
-        // Init values
-        $html = '';
-
-        $html .= "<div class='user_ui_container ".get_class($this)."'>\n";
-
-        $html .= "<img src='".htmlentities($this->getFileUrl())."' alt='".$this->getFileName()."''>";
-        $html .= "</div>\n";
-
-        return $html;
     }
 

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

@@ -46 +46 @@
  * Load required classes
  */
-
+require_once('classes/Content/Picture/Picture.php');
 /**
  * Represents a simple picture (no title, description, etc.)