Changeset 974

Timestamp:

02/25/06 10:08:12 (3 years ago)

Author:

max-horvath

Message:

"2006-02-25 Max Horvath <max.horvath@maxspot.de>

• fixed undefined variable bugs in statistic classes (use of date_from and
  date_to), variables were processed directly from request, without any
  check
  This fixes ticket #71.
  
• clicking on a username in user logs now generates a individual user
  report as it does when clicking on a username on the online users page
  
• Changing the value of the \"Is persistent\" checkbox doesn't have to
  saved when JavaScript? is enabled in the browser. Before this change
  you had to save a content. So if you wanted to delete a persistant content
  you first had to uncheck this checkbox, save the content and delete the
  content after saving it. If JavaScript? is enabled in your browser you
  can go straight ahead, uncheck the checkbox and delete the content.
  This fixes ticket #73.
  
• when processing global arrays if magic quotes is enabled, WiFiDog will
  check for type variables
  This fixes ticket #84.
  
• the RSS feed of nodes now delivers the correct link to the nodes homepage
  This fixes ticket #80.
  
• small fix in schema_validate.php which should affect nobody (in schema
  version 9)
  This fixes ticket #79.
  
• fixed \"Show all available contents for this hotspot\" link which didn't
  work if WiFiDog wasn't located in the root folder of the webserver
  
• the \"Show all available contents for this hotspot\" link won't be shown
  anymore unless all requirements are meet that all content of a hotspot
  would be shown. The requirements are: you need to have at least one
  Content Group tagged artistic and locative content, with at least one
  content group element available for display.
  This fixes ticket #35.
  
• adjusting the location of a node via the Google maps geocoding service)
  and clicking the button \"Use these coordinates\" didn't work
  This fixes ticket #81 and #82.
  
• the content select box now only shows the content to a user of which is
  is the owner from (same mechanism has already been used on the content
  manager page) or all content if the user is a superadmin
  
• wifidog/admin/content_admin.php removed, because the content manager now
  uses the generic object administration interface
  
• the creation date of a network can be changed now (this value wasn't
  displayed in the admin interface, even though it was present in the
  database)
  
• revamped administration sidebar, cleaner interface for the superadmin,
  for the owner of a node nothing changes
  
• added \"server administration\" section to the administration interface
  
• Added administration of webservers. For one webserver not much changes.
  The SSL available setting has been moved to this section (and removed
  from config.php). Running WiFiDog on two or more webserver (with one
  database) you now can define the different hostnames of the webserver.
  Of course you can also define, which of those webserver serves SSL. This
  is for example essential for the Google maps feature (different API keys
  for different hostnames)
  
• for every network you now can define it's own Google Map initial values
  and map types
  
• Hotspots map page now supports different maps for different networks
  
• Hotspots map page now supports different map types for different networks
  This fixes ticket #69
  
• Hotspots map page now offers full multilingual support (text in the
  JavaScript? file was english only)
  
• Hotspots map page now uses a Smarty template to render HTML page"
  

Files:

• trunk/wifidog-auth/CHANGELOG (modified) (1 diff)
• trunk/wifidog-auth/wifidog/admin/content_admin.php (deleted)
• trunk/wifidog-auth/wifidog/admin/generic_object_admin.php (modified) (4 diffs)
• trunk/wifidog-auth/wifidog/admin/hotspot_location_map.php (modified) (1 diff)
• trunk/wifidog-auth/wifidog/admin/templates/user_log.html (modified) (1 diff)
• trunk/wifidog-auth/wifidog/classes/AbstractDbPostgres.php (modified) (2 diffs)
• trunk/wifidog-auth/wifidog/classes/Content.php (modified) (1 diff)
• trunk/wifidog-auth/wifidog/classes/Content/File/File.php (modified) (1 diff)
• trunk/wifidog-auth/wifidog/classes/Network.php (modified) (10 diffs)
• trunk/wifidog-auth/wifidog/classes/Node.php (modified) (3 diffs)
• trunk/wifidog-auth/wifidog/classes/Server.php (added)
• trunk/wifidog-auth/wifidog/classes/StatisticReport/UserReport.php (modified) (8 diffs)
• trunk/wifidog-auth/wifidog/classes/Statistics.php (modified) (2 diffs)
• trunk/wifidog-auth/wifidog/classes/User.php (modified) (3 diffs)
• trunk/wifidog-auth/wifidog/config.php (modified) (2 diffs)
• trunk/wifidog-auth/wifidog/hotspot_status.php (modified) (1 diff)
• trunk/wifidog-auth/wifidog/hotspots_map.php (modified) (2 diffs)
• trunk/wifidog-auth/wifidog/include/common.php (modified) (2 diffs)
• trunk/wifidog-auth/wifidog/include/init_php.php (modified) (1 diff)
• trunk/wifidog-auth/wifidog/include/schema_validate.php (modified) (38 diffs)
• trunk/wifidog-auth/wifidog/js/hotspots_status_map.js (modified) (13 diffs)
• trunk/wifidog-auth/wifidog/portal/index.php (modified) (3 diffs)
• trunk/wifidog-auth/wifidog/templates/classes/MainUI_ToolSection.tpl (modified) (2 diffs)
• trunk/wifidog-auth/wifidog/templates/sites/hotspots_map.tpl (added)

trunk/wifidog-auth/CHANGELOG

@@ +1 @@
+2006-02-25 Max Horváth <max.horvath@maxspot.de>
+        * fixed undefined variable bugs in statistic classes (use of date_from and
+          date_to), variables were processed directly from request, without any
+          check
+          This fixes ticket #71.
+        * clicking on a username in user logs now generates a individual user
+          report as it does when clicking on a username on the online users page
+        * Changing the value of the "Is persistent" checkbox doesn't have to
+          saved when JavaScript is enabled in the browser. Before this change
+          you had to save a content. So if you wanted to delete a persistant content
+          you first had to uncheck this checkbox, save the content and delete the
+          content after saving it. If JavaScript is enabled in your browser you
+          can go straight ahead, uncheck the checkbox and delete the content.
+          This fixes ticket #73.
+        * when processing global arrays if magic quotes is enabled, WiFiDog will
+          check for type variables
+          This fixes ticket #84.
+        * the RSS feed of nodes now delivers the correct link to the nodes homepage
+          This fixes ticket #80.
+        * small fix in schema_validate.php which should affect nobody (in schema
+          version 9)
+          This fixes ticket #79.
+        * fixed "Show all available contents for this hotspot" link which didn't
+          work if WiFiDog wasn't located in the root folder of the webserver
+        * the "Show all available contents for this hotspot" link won't be shown
+          anymore unless all requirements are meet that all content of a hotspot
+          would be shown. The requirements are: you need to have at least one
+          Content Group tagged artistic and locative content, with at least one
+          content group element available for display.
+          This fixes ticket #35.
+        * adjusting the location of a node via the Google maps geocoding service)
+          and clicking the button "Use these coordinates" didn't work
+          This fixes ticket #81 and #82.
+        * the content select box now only shows the content to a user of which is
+          is the owner from (same mechanism has already been used on the content
+          manager page) or all content if the user is a superadmin
+        * wifidog/admin/content_admin.php removed, because the content manager now
+          uses the generic object administration interface
+        * the creation date of a network can be changed now (this value wasn't
+          displayed in the admin interface, even though it was present in the
+          database)
+        * revamped administration sidebar, cleaner interface for the superadmin,
+          for the owner of a node nothing changes
+        * added "server administration" section to the administration interface
+        * Added administration of webservers. For one webserver not much changes.
+          The SSL available setting has been moved to this section (and removed
+          from config.php). Running WiFiDog on two or more webserver (with one
+          database) you now can define the different hostnames of the webserver.
+          Of course you can also define, which of those webserver serves SSL. This
+          is for example essential for the Google maps feature (different API keys
+          for different hostnames)
+        * for every network you now can define it's own Google Map initial values
+          and map types
+        * Hotspots map page now supports different maps for different networks
+        * Hotspots map page now supports different map types for different networks
+          This fixes ticket #69
+        * Hotspots map page now offers full multilingual support (text in the
+          JavaScript file was english only)
+        * Hotspots map page now uses a Smarty template to render HTML page
+
-2006-02-21 Max Horváth <max.horvath@maxspot.de>
-        * fixed access restriction for HTMLeditor in templates folder

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

@@ -62 +62 @@
-require_once('classes/GenericObject.php');
-require_once('classes/MainUI.php');
+require_once('classes/User.php');
+require_once('classes/Node.php');
-require_once('classes/Network.php');
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    echo "<pre>";
-    print_r($_REQUEST);
@@ -70 +96 @@
-}
-
-
-
+
+
+
+
-    echo "<div class='errormsg'>"._("Sorry, the 'object_class' parameter must be specified")."</div>\n";
-    exit;
@@ -78 +106 @@
-}
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    $_REQUEST['action'] = 'edit';
-
-
-
-
+
+
+
+
+
+
-        echo "<div class='errormsg'>"._("Sorry, the object couldn't be created.  You probably didn't fill the form properly")."</div>\n";
-        exit;
-    }
+
-    $_REQUEST['action'] = 'edit';
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    $object->processAdminUI();
-    //$object = call_user_func(array ($class, 'getObject'), $_REQUEST['object_id']);
-    $_REQUEST['action'] = 'edit';
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-        $node_id = null;
-        $node = null;
-    } else {
-        $node_id = $_REQUEST['node_id'];
- :: 
- :: 
-
-.$node->getName()."</h1><p
-
-
+::
+::
+
+ . $node->getName() . "</h1><br><br
+
+
-    if (!empty ($_REQUEST['debug'])) {
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-    $html .= $common_input;
-
-    $name = "node_id";
- :: 
+::
-
-    if (method_exists($object, "getUserUI")) {
@@ -184 +186 @@
-    }
-
-\n
-\n
+
+
-    $html .= '</form>';
-
+    $html .= "<form action='" . GENERIC_OBJECT_ADMIN_ABS_HREF . "' method='post'>";
+    $html .= $common_input;
+    $html .= "<input type='hidden' name='action' value='edit'>";
+    $html .= "<input type=submit name='edit_submit' value='"._("Edit")." " . get_class($object) . "'>";
+    $html .= '</form>';
+    break;
+
+case "delete":
+    // Gets called only if no JavaScript was enabled in the browser
+    if ($object->delete($errmsg) == true) {
+        $html .= "<div class='successmsg'>" . _("Object successfully deleted") . "</div>";
+    } else {
+        $html .= "<div class='errormsg'>" . _("Deletion failed, error was: ") . "<br />$errmsg</div>";
+        $_REQUEST['action'] = 'edit';
+    }
+    break;
+
+default:
+    // Do nothing
+    break;
+}
+
+/*
+ * Process action requests (deleting with enabled JavaScript)
+ */
+switch ($_REQUEST['action_delete']) {
+case "delete":
+    // First save the object so we can catch any "persistent content" changes
+    $object->processAdminUI();
+
+    // Renew information about the object
+    $object = call_user_func(array($class, 'getObject'), $_REQUEST['object_id']);
+
+    // Now try to delete the content
+    if ($object->delete($errmsg) == true) {
+        $html .= "<div class='successmsg'>" . _("Object successfully deleted") . "</div>";
+        $_REQUEST['action'] = "";
+    } else {
+        $html .= "<div class='errormsg'>" . _("Deletion failed, error was: ") . "<br />$errmsg</div>";
+        $_REQUEST['action'] = 'edit';
+    }
+    break;
+
+default:
+    // Do nothing
+    break;
+}
+
+/*
+ * Process action requests (new and edit)
+ */
+switch ($_REQUEST['action']) {
+case "list":
+    $createAllowed = false;
+
+    switch ($_REQUEST['object_class']) {
+    case "Content":
+        $displayShowAllButton = true;
+        $objectSelector = Content::getSelectContentUI('object_id', null, ((isset($_REQUEST['display_content']) && $_REQUEST['display_content'] == "all_content") ? false : true), "content_type", "table");
+        $displayEditButton = false;
+        break;
+
+    case "Node":
+        $newLongText = $addLongText;
+        $objectSelector = Node::getSelectNodeUI('object_id');
+        break;
+
+    case "Network":
+        $objectSelector = Network::getSelectNetworkUI('object_id');
+        break;
+
+    case "Server":
+        $newLongText = $addLongText;
+        $objectSelector = Server::getSelectServerUI('object_id');
+        break;
+
+    default:
+        $objectSelector = "";
+        break;
+    }
+
+    if (User::getCurrentUser()->isSuperAdmin() || (User::getCurrentUser()->isOwner() && $createAllowed)) {
+        $html .= "<form action='" . GENERIC_OBJECT_ADMIN_ABS_HREF . "' method='post'>";
+        $html .= "<input type='hidden' name='object_class' value='$class'>";
+        $html .= "<input type='hidden' name='action' value='new_ui'>";
+        $html .= "<input type='submit' name='new_submit' value='$newLongText'>\n";
+        $html .= '</form>';
+    }
+
+    if ($displayShowAllButton) {
+        $html .= "<form action='" . GENERIC_OBJECT_ADMIN_ABS_HREF . "' method='post'>";
+        $html .= "<input type='hidden' name='object_class' value='$class'>";
+        $html .= "<input type='hidden' name='action' value='list'>\n";
+
+        if (isset($_REQUEST['display_content']) && $_REQUEST['display_content'] == "all_content") {
+            $html .= "<input type='submit' name='list_submit' value='$listPersistantText'>\n";
+        } else {
+            $html .= "<input type='hidden' name='display_content' value='all_content'>\n";
+            $html .= "<input type='submit' name='list_submit' value='$listAllText'>\n";
+        }
+
+        $html .= '</form>';
+    }
+
+    if ($objectSelector != "") {
+        if ($displayEditButton) {
+            $html .= "<form action='" . GENERIC_OBJECT_ADMIN_ABS_HREF . "' method='post'>";
+            $html .= "<input type='hidden' name='object_class' value='$class'>";
+            $html .= "<input type='hidden' name='action' value='edit'>";
+            $html .= $objectSelector;
+            $html .= "<input type='submit' name='edit_submit' value='$editText'>\n";
+            $html .= '</form>';
+        } else {
+            $html .= $objectSelector;
+        }
+    }
+    break;
+
+case "new_ui":
+    switch ($_REQUEST['object_class']) {
+    case "Node":
+    case "Server":
+    case "Content":
+        $newText = $addText;
+        break;
+
+    default:
+        break;
+    }
+
+    $html .= "<form action='" . GENERIC_OBJECT_ADMIN_ABS_HREF . "' method='post'>";
+    $html .= "<input type='hidden' name='object_class' value='$class'>";
+    $html .= call_user_func(array($class, 'getCreateNewObjectUI'));
+    $html .= "<input type='hidden' name='action' value='process_new_ui'>";
+    $html .= "<input type=submit name='new_ui_submit' value='$newText'>";
+    $html .= '</form>';
+    break;
+
+case "edit":
+    switch ($_REQUEST['object_class']) {
+    case "Network":
+    case "Server":
+        $supportsPreview = false;
+        break;
+
+    default:
+        break;
+    }
+
+    if (!$object) {
+        echo "<div class='errormsg'>" . _("Sorry, the 'object_id' parameter must be specified") . "</div>";
+        exit;
+    }
+
+    if (!empty ($_REQUEST['debug'])) {
+        $common_input .= "<input type='hidden' name='debug' value='true'>";
+    }
+
+    $common_input .= "<input type='hidden' name='object_id' value='" . $object->GetId() . "'>";
+    $common_input .= "<input type='hidden' name='object_class' value='" . get_class($object) . "'>";
+
+    $html .= "<form enctype='multipart/form-data' action='" . GENERIC_OBJECT_ADMIN_ABS_HREF . "' method='post'>";
+    $html .= $common_input;
+    $html .= $object->getAdminUI();
+    $html .= "<input type='hidden' name='action' value='save'>";
+    $html .= "<input type=submit name='save_submit' value='" . _("Save") . " " . get_class($object) . "'>";
+    $html .= "<script type='text/javascript'>";
+    $html .= "document.write(\"<br />\");";
+    $html .= "document.write(\"<input type='hidden' name='action_delete' value='no' id='form_action_delete' />\");";
+    $html .= "document.write(\"<input type='submit' name='action_delete_submit' onmouseup='document.getElementById(\\\"form_action_delete\\\").value = \\\"delete\\\"' onkeyup='document.getElementById(\\\"form_action_delete\\\").value = \\\"delete\\\"' value='" . _("Delete") . " " . get_class($object) . "' />\");";
+    $html .= "</script>";
+    $html .= '</form>';
+
+    if ($supportsPreview) {
+        $html .= "<form action='" . GENERIC_OBJECT_ADMIN_ABS_HREF . "' target='_blank' method='post'>";
+        $html .= $common_input;
+        $html .= "<input type='hidden' name='action' value='preview'>";
+        $html .= "<input type=submit name='preview_submit' value='" . _("Preview") . " " . get_class($object) . "'>";
+        $html .= '</form>';
+    }
+
+    // Display delete button (without check for unchecked persitant switch) only if JavaScript has been disabled
+    $html .= "<noscript>";
-    $html .= "<form action='".GENERIC_OBJECT_ADMIN_ABS_HREF."' method='post'>";
-    $html .= $common_input;
-edit'>\n
-edit_submit' value='"._("Edit")." ".get_class($object)."'>\n
+delete'>
+delete_submit' value='" . _("Delete") . " " . get_class($object) . "'>
-    $html .= '</form>';
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-$ui->setTitle(_("Generic object editor"));
-$ui->setHtmlHeader("<script type='text/javascript' src='" . BASE_SSL_PATH . "js/interface.js'></script>");
-
+
+
-$ui->display();
-

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

@@ -91 +91 @@
-    $script .= "var current_marker = new GMarker(current_marker_point);\n";
-    $script .= "map.addOverlay(current_marker);\n";
-.$node->getId()
-.$node->getId().
+ . md5($node->getId()) 
+ . md5($node->getId()) . 
-    $script .= "function setLocationInOriginalWindow() {\n";
-    $script .= "  window.opener.document.getElementById(\"$gis_lat_name\").value = current_marker_point.y;\n";

trunk/wifidog-auth/wifidog/admin/templates/user_log.html

@@ -21 +21 @@
-{section name=i loop=$users_array}
-<tr>
-user_id={$users_array[i].user_id}
+Statistics={$users_array[i].account_origin}&distinguish_users_by=user_id&stats_selected_users={$users_array[i].username}&UserReport=on&user_id={$users_array[i].user_id}&action=generate
-        <td>{$users_array[i].account_origin}</td>
-    <td>{$users_array[i].reg_date|date_format:"%Y/%m/%d"}</td>

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

@@ -204 +204 @@
-         * Executes an SQL for which, we predict to get a unique match, if that's not the case, this function will throw an error message
-         *
-
-
-
+
+
+
+
+
-         * @return TRUE si la requete a été effectuée avec succés, FALSE autrement.
-         */
-
+, $silent = false
-        {
-                $retval = true;
@@ -236 +238 @@
-                        echo "<p>".sprintf(_("Elapsed time for query execution : %6f second(s)"), $sql_timetaken)."</p>\n";
-
-
-
-
-
+
+
+
+
+
+
-                        $retval = false;
-
-
-
+
-                        $resultSet = pg_fetch_all($result);
-                        $retRow = $resultSet[0];

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

@@ -629 +629 @@
-    }
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        global $db;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    }
-

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

@@ -406 +406 @@
-     * @return bool True if file is local
-     *
-ivate
-
-ivate
+otected
+
+otected
-    {
-        return is_null($this->files_row['url']);

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

@@ -51 +51 @@
-require_once('classes/User.php');
-require_once('classes/Node.php');
+require_once('classes/GisPoint.php');
-require_once('classes/Cache.php');
-
@@ -60 +61 @@
- * @package    WiFiDogAuthServer
- * @author     Benoit Gregoire <bock@step.polymtl.ca>
+ * @author     Max Horvath <max.horvath@maxspot.de>
- * @copyright  2005-2006 Benoit Gregoire, Technologies Coeus inc.
+ * @copyright  2006 Max Horvath, maxspot GmbH
- */
-class Network implements GenericObject
@@ -164 +167 @@
-        }
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        public static function getSelectNetworkUI($user_prefix, $pre_selected_network = null, $additional_where = null)
-        {
@@ -247 +260 @@
-        {
-                $html = '';
-new network with id
+a new network with ID
-                $name = "new_network_id";
-                $html .= "<input type='text' size='10' name='{$name}'>\n";
@@ -351 +364 @@
-        /**
-         * Retrieves the network's creation date
-
+
+
-         */
-        public function getCreationDate()
-        {
-                return $this->mRow['creation_date'];
+        }
+
+        /**
+         * Set the network's creation date
+         *
+         * @param string $value The new creation date
+         *
+         * @return bool True on success, false on failure
+         *
+         * @access public
+         */
+        public function setCreationDate($value)
+        {
+            // Define globals
+                global $db;
+
+            // Init values
+                $_retVal = true;
+
+                if ($value != $this->getCreationDate()) {
+                        $value = $db->escapeString($value);
+                        $_retVal = $db->execSqlUpdate("UPDATE networks SET creation_date = '{$value}' WHERE network_id = '{$this->getId()}'", false);
+                        $this->refresh();
+                }
+
+                return $_retVal;
-        }
-
@@ -567 +607 @@
-                }
-                return $retval;
+        }
+
+        /**
+         * Get a GisPoint object
+         *
+         * @return object GisPoint object
+         *
+         * @access public
+         */
+        public function getGisLocation()
+        {
+                return new GisPoint($this->mRow['gmaps_initial_latitude'], $this->mRow['gmaps_initial_longitude'], $this->mRow['gmaps_initial_zoom_level']);