Changeset 13362

Timestamp:

11/26/08 21:20:27 (1 year ago)

Author:

jillelaine

Message:

Added user configurable permissions to app.yml. Would apply to ticket 4580

Files:

• plugins/sfAssetsLibraryPlugin/branches/jillelaine/README (modified) (11 diffs)
• plugins/sfAssetsLibraryPlugin/branches/jillelaine/lib/model/sfAsset.php (modified) (1 diff)
• plugins/sfAssetsLibraryPlugin/branches/jillelaine/lib/model/sfAssetFolder.php (modified) (1 diff)
• plugins/sfAssetsLibraryPlugin/branches/jillelaine/lib/sfAssetsLibraryTools.class.php (modified) (20 diffs)
• plugins/sfAssetsLibraryPlugin/branches/jillelaine/modules/sfAsset/lib/BasesfAssetActions.class.php (modified) (1 diff)

plugins/sfAssetsLibraryPlugin/branches/jillelaine/README

@@ -20 +20 @@
-
- 1 - Install the plugin.
-
+
- The easiest way to install `sfAssetsLibraryPlugin` is to use the symfony command line:
-{{{
@@ -26 +26 @@
-}}}
-
- 
-
+
+
- If you use one of these alternative methods, you must copy or symlink the contents of the `myproject/plugins/sfAssetsLibraryPlugin/web/` directory into a `myproject/web/sfAssetsLibraryPlugin/` directory.
-
- 2 - Build the data structures
-
+
- Rebuild the model and generate the SQL code for the new tables:
-{{{
@@ -47 +47 @@
- Enable the `sfAsset` module in your backend application, via the `settings.yml` file.
-{{{
-//
+#
-all:
-  .settings:
@@ -53 +53 @@
-}}}
-
-
-
-// in myproject
+. Optionally, configure directory and asset permissions in `app.yml`
+
+# in myproject/apps/backend
-all:
-  sfAssetsLibrary:
-    upload_dir:               media
-
-
-
+
+
+
+
+
-
- 4 - Clear the cache to enable the autoloading to find the new classes:
@@ -72 +74 @@
-> php symfony sfassetlibrary-create-root backend
-}}}
-
+
- Note: *nix users must call this command with the same user group as the http server, because it will need write access to this directory.
-
+
- 6 - You can now start using the plugin by browsing to the backend module's default page:
- 
+
-http://myproject/backend_dev.php/sfAsset
-}}}
@@ -84 +86 @@
-You can modify the plugin settings by way of the configuration. Here is a list of the settings you can change in your application's `app.yml`:
-{{{
-
+myproject/
-all:
-  sfAssetsLibrary:
@@ -90 +92 @@
-    check_type:       false                  # Set to true if you want to restrict the type of assets
-    types:            ['image', txt, archive, pdf, xls, doc, ppt]  # Accepted asset types if check_type is true
+    dir_permissions:          0770           # default setting 0770 - Examples 0700, 0755, 0777
+    asset_permissions:        0644           # default setting 0644 - Examples 0600, 0644, 0666
-    thumbnail_dir:    thumbnail              # Where the image thumbnails are stored
-    use_ImageMagick:  false                  # Set to true if you have the convert command
@@ -171 +175 @@
-    model_class:      Post
-    theme:            default
-
+
-    edit:
-      fields:
@@ -197 +201 @@
-<?php echo input_sf_asset_tag('my_asset_field', '', array('images_only' => true)) ?>
-}}}
+
+== Troubleshooting ==
+
+If your image thumbnails do not display in sfAsset `list` and `edit` views, adjust the `dir_permissions` in `app.yml`. If you are not able to download or view your assets, adjust the `asset_permissions` in `app.yml`. If you need help with these settings, or have other problems with this plugin, please post to the General Plugins forum:
+http://www.symfony-project.org/forum/index.php/f/12/
-
-== TODO ==
@@ -209 +218 @@
-== Changelog ==
-
+=== 2008-11-26 | Branches/jillelaine ===
+
+ * jillelaine: Added user configurable directory and asset permissions
+
-=== 2008-06-25 | Trunk ===
-
@@ -218 +231 @@
- * francois: Fixed missing layout file in package
- * francois: Fixed layout inclusion in Windows
-
+
-=== 2008-06-12 | 0.8.1 Beta ===
-

plugins/sfAssetsLibraryPlugin/branches/jillelaine/lib/model/sfAsset.php

@@ -221 +221 @@
-      throw new sfAssetException('Filetype "%type%" not allowed', array('%type%' => $this->getType()));
-    }
-
+
+
+
+
-    if ($move)
-    {
+      // Add chmod to set permissions
+      chmod($asset_path, $asset_perms);
-      rename($asset_path, $this->getFullPath());
-    }
-    else
-    {
+      chmod($asset_path, $asset_perms);
-      copy($asset_path, $this->getFullPath());
-    }
+    // Restore orig umask value
+    umask($old);
-
-    if ($this->supportsThumbnails())

plugins/sfAssetsLibraryPlugin/branches/jillelaine/lib/model/sfAssetFolder.php

@@ -205 +205 @@
-    if (!is_dir($new_path) || !is_writable($new_path))
-    {
+      //Added user configurable directory permissions
-      $old = umask(0);
-
+
+
+
-      umask($old);
-    }

plugins/sfAssetsLibraryPlugin/branches/jillelaine/lib/sfAssetsLibraryTools.class.php

@@ -2 +2 @@
-/*
- * This file is part of the sfAssetsLibrary package.
- 
+
- * (c) 2007 William Garcia <wgarcia@clever-age.com>
- 
+
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
@@ -11 +11 @@
-/**
- * sfAssetsLibraryToolkit toolkit class
- 
+
- * @author William Garcia
- */
-class sfAssetsLibraryTools
-{
-
+
-  /**
-   * @return string
@@ -45 +45 @@
-    }
-  }
-
+
-  public static function isImage($ext)
-  {
-    return in_array(strtolower($ext), array('png', 'jpg', 'jpeg', 'gif'));
-  }
-
+
-  public static function isText($ext)
-  {
@@ -60 +60 @@
-    return in_array(strtolower($ext), array('zip', 'gz', 'tgz', 'rar'));
-  }
-
+
-  public static function getInfo($dir, $filename)
-  {
@@ -91 +91 @@
-    return $info;
-  }
-
+
-  public static function sanitizeName($file)
-  {
-    return preg_replace('/[^a-z0-9_\.-]/i', '_', $file);
-  }
-
+
-  public static function mkdir($dirName, $parentDirName)
-  {
-    $dirName = rtrim($dirName, '/');
-
+
-    if (!is_dir(self::getMediaDir(true) . $parentDirName))
-    {
@@ -113 +113 @@
-      }
-    }
-
+
-    if (!$dirName)
-    {
@@ -124 +124 @@
-    try
-    {
+      //Added user configurable directory permissions
+      $dir_perms = sfAssetsLibraryTools::getUserSetPermissions('dir_perms'); //validation function
-      $old = umask(0);
-      if (!is_dir($absCurrentDir))
-      {
-
+
+
-      }
-      if (!is_dir($absThumbDir))
-      {
-
+
+
-      }
-      umask($old);
@@ -143 +147 @@
-  }
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    {
-      return false;
-    }
- 
-
- 
+
+
+
-      {
-        self::deleteTree($dir);
-      }
-    }
-
+
-    return rmdir($root);
-  }
@@ -164 +239 @@
-    if ($thumbnail_type == 'full')
-    {
-    
+
-    }
-    else
@@ -170 +245 @@
-      return self::getMediaDir($file_system) . self::getThumbnailDir($path) . $thumbnail_type . '_' . $filename;
-    }
-  
-
+
+
-  public function getAssetImageTag($sf_media, $thumbnail_type = 'full', $file_system = false, $options = array())
-  {
@@ -178 +253 @@
-      'title' => $sf_media->getCopyright()
-    ));
-
+
-    return image_tag(self::getAssetUrl($sf_media, $thumbnail_type, $file_system), $options);
-  }
-
+
-  /**
-   * Retrieves a sfMedia object from a relative URL like
@@ -188 +263 @@
-   */
-  public static function getAssetFromUrl($url)
- 
-
+
+
-    $url = str_replace(sfConfig::get('app_sfAssetsLibrary_upload_dir', 'media'), '', $url);
-    $url = rtrim($url, '/');
@@ -195 +270 @@
-    $filename = array_pop($parts);
-    $relPath = '/' . implode('/', $parts);
-
+
-    $c = new Criteria();
-    $c->add(sfMediaPeer::FILENAME, $filename);
-    $c->add(sfMediaPeer::REL_PATH, $relPath ?  $relPath : null);
-
+
-    return sfMediaPeer::doSelectOne($c);
-  }
-
+
-  public static function getMediaDir($file_system = false)
-  {
@@ -217 +292 @@
-
-  /**
- 
+
-   *
-   * @param string $path
@@ -225 +300 @@
-  {
-    $thumb_dir = $path . '/' . sfConfig::get('app_sfAssetsLibrary_thumbnail_dir', 'thumbnail');
-
+
-    return rtrim($thumb_dir, '/').'/';
-  }
-
+
-  public static function getThumbnailPath($path, $filename, $thumbnail_type = 'full')
-  {
@@ -240 +315 @@
-    }
-  }
-
+
-  /**
-   * Create the thumbnails for image assets
@@ -264 +339 @@
-    }
-  }
-
-
- 
+
+
+
-   * Options : shave_all
-   * Recommanded when  "image source HEIGHT" < "image source WIDTH"
@@ -303 +378 @@
-    return false;
-  }
-
+
-  public static function getParent($path)
-  {
-    $dirs = explode('/', $path);
-    array_pop($dirs);
-
+
-    return join('/', $dirs);
-  }
@@ -324 +399 @@
-    $name = array_pop($dirs);
-    $relative_path =  implode($separator, $dirs);
-
+
-    return array($relative_path, $name);
-  }
-
+
-  public static function log($message, $color = '')
-  {
@@ -346 +421 @@
-    fwrite(STDOUT, $message);
-  }
-
+
-}

plugins/sfAssetsLibraryPlugin/branches/jillelaine/modules/sfAsset/lib/BasesfAssetActions.class.php

@@ -244 +244 @@
-      $folder->insertAsLastChildOf($this->parentFolder);
-      $folder->save();
+
+      // Give the user useful feedback, user_settings set in sfAssetsLibraryTools > getUserSetPermissions()
+      if ($this->getRequestParameter('user_settings') == 'broken')
+      {
+        $this->setFlash('notice', 'The folder was successfully created, but your app.yml permissions are invalid. The default permissions were used instead. Contact your system administrator.');
+      }
+      else
+      {
+        $this->setFlash('notice', 'The folder was successfully created.');
+      }
-
-      $this->redirectToPath('sfAsset/list?dir='.$folder->getRelativePath());