Changeset 29136

Timestamp:

04/14/10 14:33:42 (3 years ago)

Author:

jp_morvan

Message:

add option to define gravatar's directories (by default :
sf_web_dir/sf_upload_dir/g_cache)

Files:

• plugins/vjCommentPlugin/TRUNK/README (modified) (2 diffs)
• plugins/vjCommentPlugin/TRUNK/lib/model/doctrine/PluginComment.class.php (modified) (1 diff)
• plugins/vjCommentPlugin/TRUNK/lib/tools/GravatarApi.class.php (modified) (2 diffs)
• plugins/vjCommentPlugin/TRUNK/package.xml.tmpl (modified) (1 diff)

plugins/vjCommentPlugin/TRUNK/README

@@ -114 +114 @@
-            enabled:        false
-
- or default image
+, image or directories
-
-  * edit apps/your_frontend_app/config/app.yml
@@ -122 +122 @@
-            default_size:   40
-            default_image:  ../web/images/gravatar_default.png
+            upload_dir:     .. # by default, this uses sf_upload_dir configuration
+            cache_dir_name: g_cache
-
-How to moderate comments and/or reports ?

plugins/vjCommentPlugin/TRUNK/lib/model/doctrine/PluginComment.class.php

@@ -13 +13 @@
-    public function getAuthor()
-    {
-        //var_dump( is_null( $this->getUserId() ) );
-        if( null !== $this->getUserId() )
-        {

plugins/vjCommentPlugin/TRUNK/lib/tools/GravatarApi.class.php

@@ -33 +33 @@
-  public function __construct($image_size = null, $rating = null)
-  {
-
-
-
+
-    if (!is_dir($this->cache_dir))
-    {
@@ -169 +167 @@
-    return str_replace(DIRECTORY_SEPARATOR, '/', $this->cache_dir_name).$to_return;
-  }
+
+  protected function setDirectories()
+  {
+    $gravatar_cache_dir_name = sfConfig::get('app_gravatar_cache_dir_name', 'g_cache');
+    
+    $this->cache_dir = $this->clearPath(sfConfig::get('sf_web_dir')
+                        .DIRECTORY_SEPARATOR
+                        .$this->getGravatarUploadDir()
+                        .DIRECTORY_SEPARATOR
+                        .$gravatar_cache_dir_name
+                        .DIRECTORY_SEPARATOR);
+    $this->cache_dir_name = str_replace(sfConfig::get('sf_web_dir'), '', $this->cache_dir);
+  }
+
+  protected function hasGravatarUploadDir()
+  {
+    return !is_null(sfConfig::get('app_gravatar_upload_dir'));
+  }
+
+  protected function getGravatarUploadDir()
+  {
+    return $this->clearPath(sfConfig::get('app_gravatar_upload_dir', str_replace(sfConfig::get('sf_web_dir'), '', sfConfig::get('sf_upload_dir'))));
+  }
+
+  protected function clearPath($path)
+  {
+    return str_replace("//", "/", $path);
+  }
-}

plugins/vjCommentPlugin/TRUNK/package.xml.tmpl

@@ -71 +71 @@
-        * fizyk: integrated functionality to make use of sfGuardUser
-        * fizyk: added relation to sfGuardUser
+        * jp_morvan: add option to define gravatar's directories (by default : sf_web_dir/sf_upload_dir/g_cache)
-      </notes>
-    </release>