Changeset 17899

Timestamp:

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

Author:

bergie

Message:

Make MidCOM less chatty

Files:

• trunk/midcom/midcom.core/midcom/application.php (modified) (17 diffs)
• trunk/midcom/midcom.core/midcom/services/_i18n_l10n.php (modified) (1 diff)
• trunk/midcom/midcom.core/midcom/services/auth.php (modified) (4 diffs)
• trunk/midcom/midcom.core/midcom/services/auth/backend/simple.php (modified) (1 diff)
• trunk/midcom/midcom.core/midcom/services/cache/module/content.php (modified) (1 diff)
• trunk/midcom/midcom.core/midcom/services/i18n.php (modified) (3 diffs)

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

@@ -709 +709 @@
-    public function finish()
-    {
-        debug_push_class(__CLASS__, __FUNCTION__);
-        $this->_status = MIDCOM_STATUS_CLEANUP;
-
@@ -731 +730 @@
-        $this->cache->shutdown();
-
-        debug_add('Flushing...');
-        // This is here to avoid trouble with end-of-processing segfaults. Will block AFAIK
-        flush();
-        debug_pop();
-
-        debug_add("End of MidCOM run: {$_SERVER['REQUEST_URI']}", MIDCOM_LOG_INFO);
-    }
@@ -771 +767 @@
-     * @access private
-     */
-
-
-
+
+
-        $success = false;
-        $substyle = "";
@@ -785 +780 @@
-                    case 'substyle':
-                        $substyle = $value;
+                        debug_push_class(__CLASS__, __FUNCTION__);
-                        debug_add("Substyle '$substyle' selected", MIDCOM_LOG_INFO);
+                        debug_pop();
-                        break;
-
@@ -792 +789 @@
-                        if ($this->_parser->argc > 1)
-                        {
+                            debug_push_class(__CLASS__, __FUNCTION__);
-                            debug_add('Too many arguments remaining for serve_attachment.', MIDCOM_LOG_ERROR);
+                            debug_pop();
-                        }
-
-                        debug_add("Trying to serve Attachment with GUID {$value}", MIDCOM_LOG_INFO);
-
-                        $attachment = new midcom_baseclasses_database_attachment($value);
@@ -839 +836 @@
-                        {
-                            $this->cache->content->no_cache();
+                        }
+                        else
+                        {
+                            $this->generate_error(MIDCOM_ERRNOTFOUND, "Invalid cache request URL.");
+                            // This will exit;
-                        }
-                        break;
@@ -904 +906 @@
-
-                    case 'log':
-
+
+
+
-                            debug_add("Too many arguments remaining for debuglog.", MIDCOM_LOG_ERROR);
+                            debug_pop();
-                            $this->generate_error(MIDCOM_ERRNOTFOUND, "Failed to access debug log: Too many arguments for debuglog");
+                            // This will exit
-                        }
-                        $this->_showdebuglog($value);
@@ -939 +945 @@
-                || !$object->guid )
-            {
-
-
+
+
+
+
-            }
-
@@ -951 +959 @@
-            {
-                $path = 'midcom.core.nullcomponent';
-
-
+
+
+
-            }
-
@@ -1009 +1018 @@
-            && $this->skip_page_style == true)
-        {
-
+
+
+
-            $this->_status = MIDCOM_STATUS_CONTENT;
-
-            // Enter Context
-
+//
-            $oldcontext = $this->_currentcontext;
-            $this->_currentcontext = 0;
@@ -1021 +1032 @@
-
-            // Leave Context
-
+//
-            $this->style->leave_context();
-            $this->_currentcontext = $oldcontext;
@@ -1030 +1041 @@
-        else
-        {
-
+
+
-            $this->_status = MIDCOM_STATUS_CONTENT;
-
+//
-        }
-    }
@@ -1138 +1150 @@
-    private function _can_handle($object)
-    {
-        debug_push_class(__CLASS__, __FUNCTION__);
-
-        $path = $this->get_context_data(MIDCOM_CONTEXT_COMPONENT);
-
@@ -1145 +1155 @@
-        if ($this->_context[$this->_currentcontext][MIDCOM_CONTEXT_REQUESTTYPE] != MIDCOM_REQUEST_CONTENT)
-        {
+            debug_push_class(__CLASS__, __FUNCTION__);
-            debug_add("Unkown Request Type encountered:" . $this->_context[$this->current_context][MIDCOM_CONTEXT_REQUESTTYPE], MIDCOM_LOG_ERROR);
-            debug_pop();
@@ -1164 +1175 @@
-        if (! $component_interface->configure($config, $this->_currentcontext))
-        {
+            debug_push_class(__CLASS__, __FUNCTION__);
-            debug_add ("Component Configuration failed: " . $component_interface->errstr($this->_currentcontext), MIDCOM_LOG_ERROR);
-            debug_pop();
@@ -1172 +1184 @@
-        if (!$component_interface->can_handle($object, $this->_parser->argc, $this->_parser->argv, $this->_currentcontext))
-        {
+            debug_push_class(__CLASS__, __FUNCTION__);
-            debug_add("Component {$path} in {$object->name} declared unable to handle request.", MIDCOM_LOG_INFO);
-            debug_pop();
@@ -1177 +1190 @@
-        }
-
-
-
+//
+//
-        return true;
-    }

trunk/midcom/midcom.core/midcom/services/_i18n_l10n.php

@@ -243 +243 @@
-        if (! file_exists($filename))
-        {
-
-
+//
+//
-            $this->_stringdb[$lang] = Array();
-
+//
-            return;
-        }

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

@@ -488 +488 @@
-    function initialize()
-    {
-        debug_push_class(__CLASS__, __FUNCTION__);
-
-        $this->sessionmgr = new midcom_services_auth_sessionmgr($this);
-        
-1.9
+8.09beta
-        if (!is_integer($_MIDGARD['sitegroup']))
-        {
@@ -506 +504 @@
-            $this->_check_for_active_login_session();
-        }
-
-        debug_pop();
-    }
-
@@ -821 +817 @@
-        if (!isset($cached_privileges[$privilege_key]))
-        {
-
-
-
+//
+//
+//
-            $full_privileges = $this->get_privileges_byguid($object_guid, $object_class, $for_user);
-            foreach ($full_privileges as $priv => $value)
@@ -1123 +1119 @@
-        else
-        {
-
-
-
+//
+//
+//
-            if (   is_object($user)
-                && method_exists($user, 'get_privileges')

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

@@ -66 +66 @@
-        if (! array_key_exists($this->_cookie_id, $_COOKIE))
-        {
-
-
-
+//
+//
+//
-            return false;
-        }

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

@@ -1252 +1252 @@
-            }
-
-
-
-
+//
+//
+//
-
-            $header = "Last-Modified: " . gmdate('D, d M Y H:i:s', $time) . ' GMT';

trunk/midcom/midcom.core/midcom/services/i18n.php

@@ -551 +551 @@
-            $this->_current_language = $this->_cookie_data['language'];
-            $this->_current_charset = $this->_cookie_data['charset'];
-
-
-
+//
+//
+//
-            return;
-        }
@@ -562 +562 @@
-        {
-            $this->_current_language = $content_language;
-
-
-
+//
+//
+//
-            return;
-        }
@@ -580 +580 @@
-            }
-        }
-
-
-
+//
+//
+//
-    }
-