Changeset 17900

Timestamp:

10/03/08 16:58:36 (2 months ago)

Author:

bergie

Message:

Yet more debug removal

Files:

• trunk/midcom/midcom.core/midcom/application.php (modified) (3 diffs)
• trunk/midcom/midcom.core/midcom/baseclasses/components/request.php (modified) (7 diffs)
• trunk/midcom/midcom.core/midcom/baseclasses/core/dbobject.php (modified) (1 diff)
• trunk/midcom/midcom.core/midcom/baseclasses/database/attachment.php (modified) (3 diffs)
• trunk/midcom/midcom.core/midcom/services/auth.php (modified) (4 diffs)
• trunk/midcom/midcom.core/midcom/services/cache/module/content.php (modified) (2 diffs)

trunk/midcom/midcom.core/midcom/application.php

@@ -2303 +2303 @@
-
-        debug_push_class(__CLASS__, __FUNCTION__);
-
+//
-
-        $etag = md5("{$last_modified}{$attachment->name}{$attachment->mimetype}{$attachment->guid}");
@@ -2323 +2323 @@
-            while(@ob_end_flush());
-            //debug_add('headers sent, exit()ing so nothing has a chance the mess things up anymore');
-
+
+
-            exit();
-        }
@@ -2407 +2408 @@
-        fpassthru($f);
-        $attachment->close();
-
+//
-        debug_pop();
+        debug_add("End of MidCOM run: {$_SERVER['REQUEST_URI']}", MIDCOM_LOG_INFO);
-        exit();
-    }

trunk/midcom/midcom.core/midcom/baseclasses/components/request.php

@@ -545 +545 @@
-        if (! $result)
-        {
-debug_push_class($this, 'can_handle'
-
-
+//debug_push_class(__CLASS__, __FUNCTION__
+//
+//
-            return false;
-        }
@@ -558 +558 @@
-            $namespace = $argv[0];
-            $plugin = $argv[1];
-$this, 'can_handle'
+__CLASS__, __FUNCTION__
-            debug_add("Loading the plugin {$namespace}/{$plugin}");
-            debug_pop();
@@ -606 +606 @@
-                else
-                {
-debug_push_class($this, 'can_handle'
-
-
+//debug_push_class(__CLASS__, __FUNCTION__
+//
+//
-                    return false;
-                }
@@ -618 +618 @@
-        }
-        // No match
-debug_push_class($this, 'can_handle'
-
-
+//debug_push_class(__CLASS__, __FUNCTION__
+//
+//
-        return false;
-    }
@@ -665 +665 @@
-        if (! $result)
-        {
-
-
-
+//
+//
+//
-            return false;
-        }
@@ -775 +775 @@
-    public function show()
-    {
-         debug_push_class($this, 'show');
-
-        // Call the event handler
-        $result = $this->_on_show($this->_handler['id']);
-        if (! $result)
-        {
+            debug_push_class(__CLASS__, __FUNCTION__);
-            debug_add('The _on_show event handler returned false, aborting.');
-            debug_pop();
@@ -798 +797 @@
-
-        $this->_on_shown($this->_handler['id']);
-
-        debug_pop();
-    }
-

trunk/midcom/midcom.core/midcom/baseclasses/core/dbobject.php

@@ -1864 +1864 @@
-        if (count($result) == 0)
-        {
-
-
-
-
+//
+//
+//
+//
-            return Array();
-        }

trunk/midcom/midcom.core/midcom/baseclasses/database/attachment.php

@@ -103 +103 @@
-    function open()
-    {
-        debug_push_class(__CLASS__, __FUNCTION__);
-
-        if (! $this->id)
-        {
+            debug_push_class(__CLASS__, __FUNCTION__);
-            debug_add('Cannot open a non-persistent attachment..', MIDCOM_LOG_WARN);
-            debug_print_r('Object state:', $this);
@@ -115 +114 @@
-        if ($this->_open_handle !== null)
-        {
+            debug_push_class(__CLASS__, __FUNCTION__);
-            debug_add("Warning, the Attachment {$this->id} already had an open file handle, we close it impliciltly.", MIDCOM_LOG_WARN);
+            debug_pop();
-            fclose($this->_open_handle);
-            $this->_open_handle = null;
@@ -168 +169 @@
-        if (! $handle)
-        {
+            debug_push_class(__CLASS__, __FUNCTION__);
-            debug_add("Failed to open attachment with mode {$mode}, last Midgard error was:" . mgd_errstr(), MIDCOM_LOG_WARN);
+            debug_pop();
-        }
-
-        $this->_open_handle = $handle;
-
-        debug_pop();
-        return $handle;
-    }

trunk/midcom/midcom.core/midcom/services/auth.php

@@ -515 +515 @@
-    function _check_for_new_login_session()
-    {
-        debug_push_class(__CLASS__, __FUNCTION__);
-
-        $credentials = $this->_auth_frontend->read_authentication_data();
-
@@ -529 +527 @@
-        if (! $this->_auth_backend->create_login_session($credentials['username'], $credentials['password']))
-        {
+            debug_push_class(__CLASS__, __FUNCTION__);
-            debug_add('The login information passed to the system was invalid.', MIDCOM_LOG_ERROR);
-            debug_add("Username was {$credentials['username']}");
@@ -536 +535 @@
-        }
-
+        debug_push_class(__CLASS__, __FUNCTION__);
-        debug_add('Authentication was successful, we have a new login session now. Updating timestamps');
+        debug_pop();
-
-        $this->_sync_user_with_backend();
@@ -559 +560 @@
-            // This will exit.
-        }
-
-        debug_pop();
-        return true;
-    }

trunk/midcom/midcom.core/midcom/services/cache/module/content.php

@@ -1021 +1021 @@
-        $request_id = $this->generate_request_identifier($context);
-        
-
-
-
+//
+//
+//
-
-        if (!is_null($this->_expires))
@@ -1042 +1042 @@
-        $entry_data['last_modified'] = $this->_last_modified;
-        $entry_data['sent_headers'] = $this->_sent_headers;
+
-        /**
-         * Remove comment to debug cache
-         */
-        debug_push_class(__CLASS__, __FUNCTION__);        
-        debug_print_r("Writing meta-cache entry {$content_id}", $entry_data);
-        debug_pop();
-
+
+
-        $this->_meta_cache->open(true);
-        $this->_meta_cache->put($content_id, $entry_data);