Changeset 1269

Timestamp:

07/25/07 11:02:14 (6 years ago)

Author:

benoitg

Message:

• VirtualHost.php: Fix critical problem preventing new Virtual Hosts from being created.
• StatisticGraph?.php: Fix a bad return by reference that prevented graphs from being displayed. Thanks to Daniel Lemay for finding it.
• Content.php: Fix warning when selecting owners. Fix dangling metadata objects when deleting an object.

Location:

trunk/wifidog-auth

Files:

• CHANGELOG (modified) (1 diff)
• wifidog/classes/Content.php (modified) (5 diffs)
• wifidog/classes/StatisticGraph.php (modified) (1 diff)
• wifidog/classes/VirtualHost.php (modified) (4 diffs)

trunk/wifidog-auth/CHANGELOG

@@ -1 +1 @@
 # $Id$
+2007-07-25 Benoit Grégoire  <bock@step.polymtl.ca>
+        * VirtualHost.php:  Fix critical problem preventing new Virtual Hosts from being created.
+        * StatisticGraph.php:  Fix a bad return by reference that prevented graphs from being displayed.  Thanks to Daniel Lemay for finding it.
+        * Content.php:  Fix warning when selecting owners. Fix dangling metadata objects when deleting an object.
+
 2007-07-22 Benoit Grégoire  <bock@step.polymtl.ca>
         * generic_object_admin.pgp:  Fix problems when creating new content objects.  Fix problems including the content type classes.

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

@@ -590 +590 @@
                 $object->setContentType($contentType);
                 if($processNewUIHasData) {
-                //If there was data to processs, process it for real
-                call_user_func(array ($contentType, 'processNewUI'), $contentId, false);
+                    //If there was data to processs, process it for real
+                    call_user_func(array ($contentType, 'processNewUI'), $contentId, false);
                 }
             }
@@ -1802 +1802 @@
                         }
                     }
-                    $user = User :: processSelectUserUI("content_{$this->id}_new_owner");
+                    $errMsg=null;
+                    $user = User :: processSelectUserUI("content_{$this->id}_new_owner", $errMsg);
                     $name = "content_{$this->id}_add_owner_submit";
                     if (!empty ($_REQUEST[$name]) && $user != null) {
@@ -1925 +1926 @@
             $db = AbstractDb :: getObject();
             if ($this->DEPRECATEDisOwner(User :: getCurrentUser()) || User :: getCurrentUser()->DEPRECATEDisSuperAdmin()) {
+
+                $sql = "DELETE FROM content WHERE content_id='$this->id'";
+                $db->execSqlUpdate($sql, false);
+                //Metadata mmust be deleted AFTER the main content.
+                $errmsgTmp = null;
                 $metadata = $this->getTitle();
                 if ($metadata){
-                    $metadata->delete();
+                    $metadata->delete($errmsgTmp);
                 }
+                $errmsg .= $errmsgTmp;
+                $errmsgTmp = null;
                 $metadata = $this->getDescription();
                 if ($metadata){
-                    $metadata->delete();
+                    $metadata->delete($errmsgTmp);
                 }
+                $errmsg .= $errmsgTmp;
+                $errmsgTmp = null;
                 $metadata = $this->getLongDescription();
                 if ($metadata){
-                    $metadata->delete();
+                    $metadata->delete($errmsgTmp);
                 }
+                $errmsg .= $errmsgTmp;
+                $errmsgTmp = null;
                 $metadata = $this->getProjectInfo();
                 if ($metadata){
-                    $metadata->delete();
+                    $metadata->delete($errmsgTmp);
                 }
-                $sql = "DELETE FROM content WHERE content_id='$this->id'";
-                $db->execSqlUpdate($sql, false);
+                $errmsg .= $errmsgTmp;
                 $retval = true;
             } else {
@@ -1950 +1961 @@
         return $retval;
     }
-       /** Menu hook function */
+    /** Menu hook function */
     static public function hookMenu() {
         $items = array();
@@ -1964 +1975 @@
         return $items;
     }
-    
+
 
 } // End class

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

@@ -69 +69 @@
     {
         require_once('classes/StatisticGraph/' . $classname . '.php');
-        return new $classname ();
+        $retval = new $classname ();
+        return $retval;
     }
 

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

@@ -245 +245 @@
      * @access public
      */
-    public static function createNewObject($server_id = null)
+    public static function createNewObject($hostname)
     {
          
         $db = AbstractDb::getObject();
 
-        if (empty($server_id)) {
-            $server_id = get_guid();
-        }
-
-        $server_id = $db->escapeString($server_id);
-
-        $sql = "INSERT INTO servers (server_id) VALUES ('$server_id')";
+        if (empty($id)) {
+            $id = get_guid();
+        }
+
+        $id = $db->escapeString($id);
+        $hostname = $db->escapeString($hostname);
+        $networkId = Network::getCurrentNetwork()->getId();
+        $sql = "INSERT INTO virtual_hosts (virtual_host_id, hostname, default_network) VALUES ('$id', '$hostname', '$networkId')";
 
         if (!$db->execSqlUpdate($sql, false)) {
@@ -262 +263 @@
         }
 
-        $_object = self::getObject($server_id);
+        $_object = self::getObject($id);
 
         return $_object;
@@ -370 +371 @@
         $html = '';
 
-        $name = "new_server_id";
-
-        $html .= _("Add a new virtual host with ID") . ": ";
-        $html .= "<input type='text' size='10' name='{$name}'>";
+        $name = "new_vhost_hostname";
+
+        $html .= _("Add a new virtual host for hostname") . ": ";
+        $html .= "<input type='text' size='60' name='{$name}'>";
 
         return $html;
@@ -393 +394 @@
         $retVal = null;
 
-        $name = "new_server_id";
+        $name = "new_vhost_hostname";
 
         if (!empty($_REQUEST[$name])) {
-            $_serverId = $_REQUEST[$name];
-
-            if ($_serverId) {
+            $hostname = $_REQUEST[$name];
+
+            if ($hostname) {
                 if (!User::getCurrentUser()->DEPRECATEDisSuperAdmin()) {
                     throw new Exception(_("Access denied"));
                 }
-
-
-                $retVal = self::createNewObject($_serverId);
+                $retVal = self::createNewObject($hostname);
             }
         }
-
         return $retVal;
     }