Changeset 7980

Timestamp:

03/19/08 18:23:13 (1 year ago)

Author:

fabien

Message:

added user information to the web debug toolbar

Files:

• branches/1.1/lib/debug/sfDebug.class.php (modified) (3 diffs)
• branches/1.1/lib/debug/sfWebDebug.class.php (modified) (2 diffs)
• branches/1.1/lib/user/sfUser.class.php (modified) (1 diff)

branches/1.1/lib/debug/sfDebug.class.php

@@ -106 +106 @@
-   * @return array The request parameter holders
-   */
-
+sfRequest 
-  {
-    if (!$request)
@@ -126 +126 @@
-   * @return array The response parameters
-   */
-
+sfResponse 
-  {
-    if (!$response)
@@ -145 +145 @@
-
-  /**
+   * Returns user parameters as an array.
+   *
+   * @param sfUser A sfUser instance
+   *
+   * @return array The user parameters
+   */
+  public static function userAsArray(sfUser $user)
+  {
+    if (!$user)
+    {
+      return array();
+    }
+
+    return array(
+      'options'         => $user->getOptions(),
+      'attributeHolder' => self::flattenParameterHolder($user->getAttributeHolder()),
+      'culture'         => $user->getCulture(),
+    );
+  }
+
+  /**
-   * Returns a parameter holder as an array.
-   *

branches/1.1/lib/debug/sfWebDebug.class.php

@@ -325 +325 @@
-    $result .= $this->formatArrayAsHtml('request',  sfDebug::requestAsArray($context->getRequest()));
-    $result .= $this->formatArrayAsHtml('response', sfDebug::responseAsArray($context->getResponse()));
+    $result .= $this->formatArrayAsHtml('user',     sfDebug::userAsArray($context->getUser()));
-    $result .= $this->formatArrayAsHtml('settings', sfDebug::settingsAsArray());
-    $result .= $this->formatArrayAsHtml('globals',  sfDebug::globalsAsArray());
@@ -346 +347 @@
-    $content = '
-    <h2>'.$id.' <a href="#" onclick="sfWebDebugToggle(\'sfWebDebug'.$id.'\'); return false;">'.image_tag(sfConfig::get('sf_web_debug_web_dir').'/images/toggle.gif').'</a></h2>
-@
+
-    ';
-

branches/1.1/lib/user/sfUser.class.php

@@ -118 +118 @@
-  }
-
+  public function getOptions()
+  {
+    return $this->options;
+  }
+
-  /**
-   * Sets the user culture.