Changeset 1083

Timestamp:

08/28/06 19:07:33 (7 years ago)

Author:

max-horvath

Message:

"2006-08-28 Benoit Gregoire <bock@…>

• Add SimplePicture? content type
• Fix #225 (For both nodes and networks)"

Location:

trunk/wifidog-auth

Files:

• CHANGELOG (modified) (1 diff)
• wifidog/classes/Content/Langstring/Langstring.php (modified) (1 diff)
• wifidog/classes/Content/SimplePicture (added)
• wifidog/classes/Content/SimplePicture/SimplePicture.php (added)
• wifidog/classes/Content/TrivialLangstring/TrivialLangstring.php (modified) (1 diff)
• wifidog/classes/Network.php (modified) (6 diffs)
• wifidog/classes/Node.php (modified) (5 diffs)

trunk/wifidog-auth/CHANGELOG

@@ +1 @@
+2006-08-28 Benoit Grégoire  <bock@step.polymtl.ca>
+        * Add SimplePicture content type
+        * Fix #225 (For both nodes and networks)
+        
 2006-08-28 Max Horváth <max.horvath@maxspot.de>
         * Integrated KML node list export

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

@@ -129 +129 @@
 
             if ($row == null) {
-                $retval = sprintf(_("(Empty $s)"), get_class($this));
+                $retval = sprintf(_("(Empty %s)"), get_class($this));
             } else {
                 $retval = $row['value'];

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

@@ -50 +50 @@
 
 /**
- * Represents a trivial Langstring (no title, description, etc.)
+ * Represents a simple Langstring (no title, description, etc.)
  *
  * @package    WiFiDogAuthServer

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

@@ -1237 +1237 @@
         $html .= "<legend>"._("Network management")."</legend>\n";
         $html .= "<ul class='admin_element_list'>\n";
+
+        // Content management
+        $title = _("Network content");
+        $name = "network_".$this->id."_content";
+        $data = Content :: getLinkedContentUI($name, "network_has_content", "network_id", $this->id, $display_page = "portal");
+        $html .= InterfaceElements :: generateAdminSectionContainer("network_content", $title, $data);
+
         // network_id
         $html .= "<li class='admin_element_item_container'>\n";
@@ -1243 +1250 @@
         $value = htmlspecialchars($this->getId(), ENT_QUOTES);
         $html .= $value;
-        $html .= "</div>\n";
-        $html .= "</li>\n";
-
-        // creation_date
-        $name = "network_".$this->getId()."_creation_date";
-        $value = htmlspecialchars($this->getCreationDate(), ENT_QUOTES);
-
-        $html .= "<li class='admin_element_item_container'>\n";
-        $html .= "<div class='admin_element_label'>"._("Network creation date").":</div>\n";
-        $html .= "<div class='admin_element_data'>\n";
-        $html .= "<input type='text' size ='50' value='$value' name='$name'>\n";
         $html .= "</div>\n";
         $html .= "</li>\n";
@@ -1267 +1263 @@
         $html .= "</li>\n";
 
+        // creation_date
+        $name = "network_".$this->getId()."_creation_date";
+        $value = htmlspecialchars($this->getCreationDate(), ENT_QUOTES);
+
+        $html .= "<li class='admin_element_item_container'>\n";
+        $html .= "<div class='admin_element_label'>"._("Network creation date").":</div>\n";
+        $html .= "<div class='admin_element_data'>\n";
+        $html .= "<input type='text' size ='50' value='$value' name='$name'>\n";
+        $html .= "</div>\n";
+        $html .= "</li>\n";
+        
         // homepage_url
         $html .= "<li class='admin_element_item_container'>\n";
@@ -1440 +1447 @@
         $html .= "</li>\n";
 
-        // Content management
-        $title = _("Network content");
-        $name = "network_".$this->id."_content";
-        $data = Content :: getLinkedContentUI($name, "network_has_content", "network_id", $this->id, $display_page = "portal");
-        $html .= InterfaceElements :: generateAdminSectionContainer("network_content", $title, $data);
         $html .= "</ul>\n";
         $html .= "</fieldset>\n";
@@ -1458 +1460 @@
             throw new Exception(_('Access denied!'));
         }
-
+        
+        // Content management
+        $name = "network_".$this->id."_content";
+        Content :: processLinkedContentUI($name, 'network_has_content', 'network_id', $this->id);
+
+        // name
+        $name = "network_".$this->getId()."_name";
+        $this->setName($_REQUEST[$name]);
+        
         // creation_date
         $name = "network_".$this->getId()."_creation_date";
         $this->setCreationDate($_REQUEST[$name]);
-
-        // name
-        $name = "network_".$this->getId()."_name";
-        $this->setName($_REQUEST[$name]);
 
         // homepage_url
@@ -1535 +1541 @@
             header("Location: {$url}");
         }
-        // Content management
-        $name = "network_".$this->id."_content";
-        Content :: processLinkedContentUI($name, 'network_has_content', 'network_id', $this->id);
     }
 

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

@@ -810 +810 @@
                 $_html_node_information[] = InterfaceElements::generateAdminSectionContainer("node_id", $_title, $_data);
 
-                // Creation date
-                $_title = _("Creation date");
-                if ($_userIsAdmin) {
-            $_data = DateTime::getSelectDateTimeUI(new DateTime($this->getCreationDate()), "node_" . $hashed_node_id . "_creation_date", DateTime::INTERFACE_DATETIME_FIELD, "node_creation_date_input");
-                } else {
-            $_data  = htmlspecialchars($this->getCreationDate(), ENT_QUOTES);
-                $_data .= InterfaceElements::generateInputHidden("node_" . $hashed_node_id . "_creation_date", $this->getCreationDate());
-                }
-                $_html_node_information[] = InterfaceElements::generateAdminSectionContainer("node_creation_date", $_title, $_data);
-
-                // Name
+        //Node content
+        $_html_content = array();
+        $_title = _("Node content");
+        $_data = Content::getLinkedContentUI("node_" . $hashed_node_id . "_content", "node_has_content", "node_id", $this->id, "portal");
+        $html .= InterfaceElements::generateAdminSectionContainer("node_content", $_title, $_data);
+ 
+                // Name
                 $_title = _("Name");
                 $_data = InterfaceElements::generateInputText("node_" . $hashed_node_id . "_name", $this->getName(), "node_name_input");
                 $_html_node_information[] = InterfaceElements::generateAdminSectionContainer("node_name", $_title, $_data);
+
+        // Creation date
+        $_title = _("Creation date");
+        if ($_userIsAdmin) {
+            $_data = DateTime::getSelectDateTimeUI(new DateTime($this->getCreationDate()), "node_" . $hashed_node_id . "_creation_date", DateTime::INTERFACE_DATETIME_FIELD, "node_creation_date_input");
+        } else {
+            $_data  = htmlspecialchars($this->getCreationDate(), ENT_QUOTES);
+            $_data .= InterfaceElements::generateInputHidden("node_" . $hashed_node_id . "_creation_date", $this->getCreationDate());
+        }
+        $_html_node_information[] = InterfaceElements::generateAdminSectionContainer("node_creation_date", $_title, $_data);
 
                 // Description
@@ -984 +990 @@
                 $html .= InterfaceElements::generateAdminSectionContainer("node_access_rights", _("Access rights"), implode(null, $_html_access_rights));
 
-                /*
-                 * Node content
-                 */
-                $_html_content = array();
-
-                // Node content
-                $_title = _("Node content");
-                $_data = Content::getLinkedContentUI("node_" . $this->id . "_content", "node_has_content", "node_id", $this->id, "portal");
-                $_html_content[] = InterfaceElements::generateAdminSectionContainer("node_content", $_title, $_data);
-
-                // Build section
-                $html .= InterfaceElements::generateAdminSectionContainer("node_content", _("Node content"), implode(null, $_html_content));
-
                 $html .= "</ul>\n";
                 $html .= "</fieldset>";
@@ -1021 +1014 @@
                 // Hashed node_id (this is a workaround since PHP auto-converts HTTP vars var periods, spaces or underscores )
                 $hashed_node_id = md5($this->getId());
+       // Content processing
+        $name = "node_{$hashed_node_id}_content";
+        Content::processLinkedContentUI($name, 'node_has_content', 'node_id', $this->id);
 
                 // Name
@@ -1030 +1026 @@
                 }
 
-                // Creation date
+                // Creation date
                 if ($_userIsAdmin) {
                 $name = "node_".$hashed_node_id."_creation_date";
@@ -1204 +1200 @@
                 }
 
-                // Content processing
-                $name = "node_{$this->id}_content";
-                Content::processLinkedContentUI($name, 'node_has_content', 'node_id', $this->id);
-
-                // Name
+                // Id
                 $name = "node_".$hashed_node_id."_id";
                 $this->setId($_REQUEST[$name]);