Changeset 10025

Timestamp:

Jan 7, 2009, 9:10:00 PM (11 years ago)

Author:

ebihara

Message:

#3388:changed the opConfig class implements ArrayAccess? now, and it allows accessing like array from templates

Location:

OpenPNE3/trunk/lib

Files:

• config/opConfig.class.php (modified) (2 diffs)
• config/sfOpenPNEApplicationConfiguration.class.php (modified) (2 diffs)
• form/SnsConfigForm.class.php (modified) (1 diff)

OpenPNE3/trunk/lib/config/opConfig.class.php

@@ -16 +16 @@
  * @author     Kousuke Ebihara <ebihara@tejimaya.com>
  */
-class opConfig extends sfConfig
+class opConfig extends sfConfig implements ArrayAccess
 {
-  /**
-   * Retrieves a config parameter.
-   *
-   * @param  string $name    A config parameter name
-   * @param  mixed  $default A default config parameter value
-   *
-   * @return mixed A config parameter value
-   */
+ /**
+  * Retrieves a config parameter.
+  *
+  * @param  string $name    A config parameter name
+  * @param  mixed  $default A default config parameter value
+  *
+  * @return mixed A config parameter value
+  */
   public static function get($name, $default = null)
   {
@@ -40 +40 @@
     }
 
-    return $result;
+    sfContext::getInstance()->getConfiguration()->loadHelpers('Escaping');
+    return sfOutputEscaper::escape(sfConfig::get('sf_escaping_method'), $result);
+  }
+
+ /**
+  * Returns if the offset exists
+  *
+  * @see ArrayAccess::offsetExists()
+  */
+  public function offsetExists($offset)
+  {
+    return(is_null(self::get($offset)));
+  }
+
+ /**
+  * Returns value at given offset
+  *
+  * @see ArrayAccess::offsetGet()
+  */
+  public function offsetGet($offset)
+  {
+    return self::get($offset);
+  }
+
+ /**
+  * @see ArrayAccess::offsetSet()
+  */
+  public function offsetSet($offset, $value)
+  {
+    // Nothing to do.
+    // This class is a read-only.
+  }
+
+ /**
+  * @see ArrayAccess::offsetUnSet()
+  */
+  public function offsetUnSet($offset)
+  {
+    // Nothing to do.
+    // This class is a read-only.
   }
 }

OpenPNE3/trunk/lib/config/sfOpenPNEApplicationConfiguration.class.php

@@ -23 +23 @@
   {
     $this->dispatcher->connect('task.cache.clear', array($this, 'clearPluginCache'));
+    $this->dispatcher->connect('template.filter_parameters', array($this, 'filterTemplateParameters'));
 
     $this->setConfigHandlers();
@@ -124 +125 @@
       $filesystem->remove(sfFinder::type('any')->discard('.sf')->in($subDir));
     }
+  }
+
+  /**
+   * Listens to the template.filter_parameters event.
+   *
+   * @param  sfEvent $event       An sfEvent instance
+   * @param  array   $parameters  An array of template parameters to filter
+   *
+   * @return array   The filtered parameters array
+   */
+  public function filterTemplateParameters(sfEvent $event, $parameters)
+  {
+    $parameters['op_config']  = new opConfig();
+    sfOutputEscaper::markClassAsSafe('opConfig');
+    return $parameters;
   }
 

OpenPNE3/trunk/lib/form/SnsConfigForm.class.php

@@ -25 +25 @@
     $defaults = array();
 
-    foreach (sfConfig::get('openpne_sns_config') as $key => $value) {
-      $default = $value['default'];
-      $config = SnsConfigPeer::retrieveByName($key);
-      if ($config) {
-        $default = $config->getValue();
-      }
-
+    foreach (sfConfig::get('openpne_sns_config') as $key => $value)
+    {
       $widgets[$key] = $this->generateWidget($value);
       $validators[$key] = $this->generateValidator($value);
       $labels[$key] = $value['caption'];
-      $defaults[$key] = opConfig::get($key, 'sns', $default);
+      $defaults[$key] = opConfig::get($key);
     }