Changeset 601

Timestamp:

04/29/05 14:21:46 (7 years ago)

Author:

fproulx

Message:

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

• Removed all inline unuseful javascript code on submit buttons onclick='submit()'
• This conflicted with the actual click on the submit button in Safari
• Fixed check in Network for isOwner, only check superAdmin
• Fixed bug so you can't add an existing content group to itself ( deadlock )
• Started coding Pattern language narrative display

Location:

trunk/wifidog-auth

Files:

• ChangeLog (modified) (1 diff)
• wifidog/admin/generic_object_admin.php (modified) (2 diffs)
• wifidog/admin/hotspot.php (modified) (1 diff)
• wifidog/classes/Content.php (modified) (13 diffs)
• wifidog/classes/Content/ContentGroup.php (modified) (4 diffs)
• wifidog/classes/Content/EmbeddedContent.php (modified) (2 diffs)
• wifidog/classes/Content/Langstring.php (modified) (2 diffs)
• wifidog/classes/Content/PatternLanguage.php (modified) (2 diffs)
• wifidog/classes/ContentGroupElement.php (modified) (4 diffs)
• wifidog/classes/Network.php (modified) (3 diffs)
• wifidog/classes/Node.php (modified) (2 diffs)

trunk/wifidog-auth/ChangeLog

@@ +1 @@
+2005-04-29 François Proulx <francois.proulx@gmail.com>
+        * Removed all inline unuseful javascript code on submit buttons onclick='submit()'
+        * This conflicted with the actual click on the submit button in Safari
+        * Fixed check in Network for isOwner, only check superAdmin
+        * Fixed bug so you can't add an existing content group to itself ( deadlock )
+        * Started coding Pattern language narrative display
+
 2005-04-29 François Proulx <francois.proulx@gmail.com>
         * Wrote User.php addcontent, removeContent, getAllContent()

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

@@ -113 +113 @@
                 $node = Node :: getObject($node_id);
                 Node :: setCurrentNode($node);
+        
+        $html .= "<h1>"._("Showing preview as it would appear at ").$node->getName()."</h1><p>"; 
         }
         $common_input = '';
@@ -127 +129 @@
         $name = "node_id";
         $html .= Node :: getSelectNodeUI($name);
-
+    
         $html .= $object->getUserUI();
         $html .= "<input type='hidden' name='action' value='preview'>\n";

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

@@ -167 +167 @@
         try {
                 $node = Node::getObject($node_id);
-            $node->delete();
+            $node->delete($errmsg);
         } catch (Exception $e) {
             echo '<p class="warning">'.$e->getMessage().'</p>'; 

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

@@ -172 +172 @@
                         $value = _("Add");
                 }
-                $html .= "<input type='submit' name='$name' value='$value'>"; // onclick='submit();'
+                $html .= "<input type='submit' name='$name' value='$value'>";
                 return $html;
         }
@@ -378 +378 @@
         public function isDisplayableAt($node)
         {
-
                 return true;
         }
@@ -598 +597 @@
                                         $html .= "<div class='admin_section_tools'>\n";
                                         $name = "content_".$this->id."_title_erase";
-                                        $html .= "<input type='submit' name='$name' value='"._("Delete")."' onclick='submit();'>";
+                                        $html .= "<input type='submit' name='$name' value='"._("Delete")."'>";
                                         $html .= "</div>\n";
                                 }
@@ -629 +628 @@
                                         $html .= "<div class='admin_section_tools'>\n";
                                         $name = "content_".$this->id."_description_erase";
-                                        $html .= "<input type='submit' name='$name' value='"._("Delete")."' onclick='submit();'>";
+                                        $html .= "<input type='submit' name='$name' value='"._("Delete")."'>";
                                         $html .= "</div>\n";
                                 }
@@ -650 +649 @@
                                         $html .= "<div class='admin_section_tools'>\n";
                                         $name = "content_".$this->id."_project_info_erase";
-                                        $html .= "<input type='submit' name='$name' value='"._("Delete")."' onclick='submit();'>";
+                                        $html .= "<input type='submit' name='$name' value='"._("Delete")."'>";
                                         $html .= "</div>\n";
                                 }
@@ -671 +670 @@
                                         $html .= "<div class='admin_section_tools'>\n";
                                         $name = "content_".$this->id."_sponsor_info_erase";
-                                        $html .= "<input type='submit' name='$name' value='"._("Delete")."' onclick='submit();'>";
+                                        $html .= "<input type='submit' name='$name' value='"._("Delete")."'>";
                                         $html .= "</div>\n";
                                 }
@@ -701 +700 @@
                                                 $html .= "<div class='admin_section_tools'>\n";
                                                 $name = "content_".$this->id."_owner_".$user->GetId()."_remove";
-                                                $html .= "<input type='submit' name='$name' value='"._("Remove")."' onclick='submit();'>";
+                                                $html .= "<input type='submit' name='$name' value='"._("Remove")."'>";
                                                 $html .= "</div>\n";
                                                 $html .= "</li>\n";
@@ -714 +713 @@
                                 $name = "content_{$this->id}_add_owner_submit";
                                 $value = _("Add owner");
-                                $html .= "<input type='submit' name='$name' value='$value' onclick='submit();'>";
+                                $html .= "<input type='submit' name='$name' value='$value'>";
                                 $html .= "</div>\n";
                                 $html .= "</li>\n";
@@ -757 +756 @@
                                         {
                                                 $db->ExecSqlUpdate("UPDATE content SET title = NULL WHERE content_id = '$this->id'", FALSE);
-                                                $title->delete();
+                                                $title->delete($errmsg);
                                         }
                                         else
@@ -786 +785 @@
                                         {
                                                 $db->ExecSqlUpdate("UPDATE content SET description = NULL WHERE content_id = '$this->id'", FALSE);
-                                                $description->delete();
+                                                $description->delete($errmsg);
                                         }
                                         else
@@ -811 +810 @@
                                         {
                                                 $db->ExecSqlUpdate("UPDATE content SET project_info = NULL WHERE content_id = '$this->id'", FALSE);
-                                                $project_info->delete();
+                                                $project_info->delete($errmsg);
                                         }
                                         else
@@ -836 +835 @@
                                         {
                                                 $db->ExecSqlUpdate("UPDATE content SET sponsor_info = NULL WHERE content_id = '$this->id'", FALSE);
-                                                $sponsor_info->delete();
+                                                $sponsor_info->delete($errmsg);
                                         }
                                         else
@@ -888 +887 @@
         }
         }
+    
+    /**
+     * Tell if a given user is already subscribed to this content
+     * @param User the given user
+     * @return boolean
+     */
+    public function isUserSubscribed(User $user)
+    {
+        global $db;
+        $sql = "SELECT content_id FROM user_has_content WHERE user_id = '{$user->getId()}' AND content_id = '{$this->getId()}';";
+        $db->ExecSqlUniqueRes($sql, $row, false);
+        
+        if($row)
+            return true;
+        else
+            return false;
+    }
+    
         /** Subscribe to the project 
          * @return true on success, false on failure */

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

@@ -390 +390 @@
                         $html .= "<div class='admin_section_tools'>\n";
                         $name = "content_group_".$this->id."_element_".$element->GetId()."_erase";
-                        $html .= "<input type='submit' name='$name' value='"._("Delete")."' onclick='submit();'>";
+                        $html .= "<input type='submit' name='$name' value='"._("Delete")."'>";
                         $html .= "</div>\n";
                         $html .= "</li>\n";
@@ -397 +397 @@
         $html .= "<b>"._("Add a new content OR select previously created content")."</b><br>";
                 $html .= self :: getNewContentUI("content_group_{$this->id}_new_element")."<br>";
-        $html .= self :: getSelectContentUI("content_group_{$this->id}_existing_element");
+        $html .= self :: getSelectContentUI("content_group_{$this->id}_existing_element", "AND content_id != '$this->id'");
         $html .= "<input type='submit' name='content_group_{$this->id}_existing_element_add' value='"._("Add")."'>";
         $html .= "</li>\n";
@@ -695 +695 @@
         /** Retreives the user interface of this object.  Anything that overrides this method should call the parent method with it's output at the END of processing.
          * @param $subclass_admin_interface Html content of the interface element of a children
+     * @param boolean $hide_elements allows the child class ( for example
+     * Pattern Language) to tell the content group not to display elements ) for
+     * elements that need to be hidden before subscription
          * @return The HTML fragment for this interface */
-        public function getUserUI($subclass_user_interface = null)
+        public function getUserUI($subclass_user_interface = null, $hide_elements = false)
         {
                 $html = '';
@@ -702 +705 @@
                 $html .= "<div class='user_ui_object_class'>ContentGroup (".get_class($this)." instance)</div>\n";
 
-                $display_elements = $this->getDisplayElements();
-                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)
-                    $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";
-                }
+                if($hide_elements == false)
+        {
+            $display_elements = $this->getDisplayElements();
+                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)
+                        $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";
+                }
+        }
 
                 $html .= $subclass_user_interface;

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

@@ -104 +104 @@
                         $html .= "</div>\n";
                         
-                        $html .= "<input type='submit' name='$name' value='"._("Delete")."'>"; //  onclick='submit();'
+                        $html .= "<input type='submit' name='$name' value='"._("Delete")."'>";
                         $html .= "</div>\n";
                 }
@@ -125 +125 @@
                         $html .= "<div class='admin_section_tools'>\n";
                         $name = "fallback_content_".$this->id."_fallback_content_erase";
-                        $html .= "<input type='submit' name='$name' value='"._("Delete")."'>"; // onclick='submit();'
+                        $html .= "<input type='submit' name='$name' value='"._("Delete")."'>";
                         $html .= "</div>\n";
                 }

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

@@ -164 +164 @@
                                                                 $html .= "<div class='admin_section_tools'>\n";
                                 $name = "langstrings_".$this->id."_substring_$value[langstring_entries_id]_erase";
-                                $html .= "<input type='submit' name='$name' value='"._("Delete string")."' onclick='submit();'>";
+                                $html .= "<input type='submit' name='$name' value='"._("Delete string")."'>";
                                                                 $html .= "</div>\n";
                                                                 $html .= "</li>\n";
@@ -189 +189 @@
                 
                 $new_substring_submit_name = "langstrings_".$this->id."_add_new_entry";
-                $html .= "<input type='submit' name='$new_substring_submit_name' value='"._("Add new string")."' onclick='submit();'>";
+                $html .= "<input type='submit' name='$new_substring_submit_name' value='"._("Add new string")."'>";
                 $html .= "</div>\n";
                 $html .= "</li>\n";

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

@@ -25 +25 @@
  */
 require_once BASEPATH.'classes/Content/ContentGroup.php';
+require_once BASEPATH.'classes/User.php';
 
 /** Pattern Language is a location-aware fiction project by Kate Armstrong that attaches patterns of narrative to individuals as they move through the city of Montreal. Each person's path is logged in the system and compiled into a document that can be read online. The work is meant to engage with the rhythms of the city: by evolving according to the patterns of an individual, each story forms both a map or trace of movement and a fabric of sound. 
@@ -44 +45 @@
         $this->setIsExpandable(false);
         }
+    
+    /** Retreives the user interface of this object.  Anything that overrides this method should call the parent method with it's output at the END of processing.
+     * @param $subclass_admin_interface Html content of the interface element of a children
+     * @return The HTML fragment for this interface */
+     
+     //TODO: complete this
+     /*
+    public function getUserUI($subclass_user_interface = null)
+    {
+        $html = '';
+        $html .= "<div class='user_ui_container'>\n";
+        $html .= "<div class='user_ui_object_class'>PatternLanguage (".get_class($this)." instance)</div>\n";
+        
+        // Check if the user has already subscribed to Pattern language
+        $current_user = User::getCurrentUser();
+        if($current_user == null || $this->isUserSubscribed($current_user) == false)
+        {
+            // hyperlink to all users narrative
+            
+            // Until subscription is done DO NOT log this !
+            $this->setLoggingStatus(false);
+            // Tell the content group not to display elements until subscription is done
+            $parent_output = parent :: getUserUI($html, true);
+        }
+        else
+        {
+            // The user is subscribed to the pattern language show an element !
+            // hyperlink to user's narrative
+            
+            // Display the random pattern
+            $parent_output = parent :: getUserUI($html);
+        }
+        
+        $html .= $subclass_user_interface;
+        $html .= "</div>\n";
+        
+        return $parent_output;
+    }*/
 
         /** Display the narrative

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

@@ -142 +142 @@
                                 $html .= "<div class='admin_section_tools'>\n";
                                 $name = "content_group_element_".$this->id."_allowed_node_".$node->GetId()."_remove";
-                                $html .= "<input type='submit' name='$name' value='"._("Remove")."' onclick='submit();'>";
+                                $html .= "<input type='submit' name='$name' value='"._("Remove")."'>";
                                 $html .= "</div>\n";
                                 $html .= "</li>\n";
@@ -155 +155 @@
                 $html .= Node :: getSelectNodeUI($name, $sql_additional_where);
                 $name = "content_group_element_{$this->id}_new_allowed_node_submit";
-                $html .= "<input type='submit' name='$name' value='"._("Add new allowed node")."' onclick='submit();'>";
+                $html .= "<input type='submit' name='$name' value='"._("Add new allowed node")."'>";
                 $html .= "</li'>\n";
 
@@ -168 +168 @@
             $html .= "<b>"._("Add a new displayed content OR select an existing one")."</b><br>";
                         $html .= self :: getNewContentUI("content_group_element_{$this->id}_new_displayed_content")."<br>";
-            $html .= self :: getSelectContentUI("content_group_element_{$this->id}_new_displayed_existing_element");
+            $html .= self :: getSelectContentUI("content_group_element_{$this->id}_new_displayed_existing_element", "AND content_id != '$this->id'");
             $html .= "<input type='submit' name='content_group_element_{$this->id}_new_displayed_existing_element_add' value='"._("Add")."'>";
                 }
@@ -177 +177 @@
                         $html .= "<div class='admin_section_tools'>\n";
                         $name = "content_group_element_{$this->id}_erase_displayed_content";
-                        $html .= "<input type='submit' name='$name' value='"._("Delete")."' onclick='submit();'>";
+                        $html .= "<input type='submit' name='$name' value='"._("Delete")."'>";
                         $html .= "</div>\n";
                 }

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

@@ -207 +207 @@
                         $html .= "<div class='admin_section_tools'>\n";
                         $name = "content_group_".$this->id."_element_".$content->GetId()."_erase";
-                        $html .= "<input type='submit' name='$name' value='"._("Remove")."' onclick='submit();'>";
+                        $html .= "<input type='submit' name='$name' value='"._("Remove")."'>";
                         $html .= "</div>\n";
                         $html .= "</li>\n";
@@ -215 +215 @@
                 $html .= Content :: getSelectContentUI($name, "AND content_id NOT IN (SELECT content_id FROM network_has_content WHERE network_id='$this->id')");
                 $name = "network_{$this->id}_new_content_submit";
-                $html .= "<input type='submit' name='$name' value='"._("Add")."' onclick='submit();'>";
+                $html .= "<input type='submit' name='$name' value='"._("Add")."'>";
                 $html .= "</li>\n";
                 $html .= "</ul>\n";
@@ -227 +227 @@
         {
         $user = User::getCurrentUser();
-        if (!$this->isOwner($user) && !$user->isSuperAdmin())
+        if (!$user->isSuperAdmin())
         {
             throw new Exception(_('Access denied!'));

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

@@ -354 +354 @@
                         $html .= "<div class='admin_section_tools'>\n";
                         $name = "node_".$this->id."_content_".$content->GetId()."_erase";
-                        $html .= "<input type='submit' name='$name' value='"._("Remove")."' onclick='submit();'>";
+                        $html .= "<input type='submit' name='$name' value='"._("Remove")."'>";
                         $html .= "</div>\n";
                         $html .= "</li>\n";
@@ -362 +362 @@
                 $html .= Content :: getSelectContentUI($name, "AND content_id NOT IN (SELECT content_id FROM node_has_content WHERE node_id='$this->id')");
                 $name = "node_{$this->id}_new_content_submit";
-                $html .= "<input type='submit' name='$name' value='"._("Add")."' onclick='submit();'>";
+                $html .= "<input type='submit' name='$name' value='"._("Add")."'>";
                 $html .= "</li>\n";
                 $html .= "</ul>\n";