tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity
2,853 Commits 31 Branches 527 Tags 162 MiB
5b0ecd913f
Commit Graph

91 Commits

Author SHA1 Message Date
Ingo Schommer
bdd30fa4fd API CHANGE Don't reflect changes in File and Folder property setters on filesystem before write() is called, to ensure that validate() applies in all cases. This fixes a problem where File->setName() would circumvent restrictions in File::$allowed_extensions (fixes #5693) 
API CHANGE Removed File->resetFilename(), use File->updateFilesystem() to update the filesystem, and File->getRelativePath() to just update the "Filename" property without any filesystem changes (emulating the old $renamePhysicalFile method argument in resetFilename())
API CHANGE Removed File->autosetFilename(), please set the "Filename" property via File->getRelativePath()
MINOR Added unit tests to FileTest and FolderTest (some of them copied from FileTest, to test Folder behaviour separately)
ENHANCEMENT Added File::$allowed_extensions (backport from 2.4 to enable File->validate() security fix)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@108062 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:27:36 +13:00
Andrew O'Neil
ad7c4eca89 reverted 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@88282 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:27:33 +13:00
Andrew O'Neil
e21297ecc0 BUGFIX: Ensure ASSETS_PATH is respected 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@88281 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:27:33 +13:00
Sam Minnee
98dda12a9d API CHANGE: Added increase_time_limit_to(), which respects safe_mode. 
API CHANGE: Added no-arg option to increase_memory_limit_to() (from r80241)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@88176 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:27:33 +13:00
Sam Minnee
6f83864d46 BUGFIX: Don't show the upload tab on readonly folders. 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@76726 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:27:23 +13:00
Sam Minnee
89d57e89d8 ENHANCEMENT #3920: Alllow searching within subfolders in Files and Images section 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@75228 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:27:18 +13:00
Normann Lou
3861c33bc1 APICHANGE: add documentation to changeset r74858. 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@74901 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:27:15 +13:00
Normann Lou
5c612beb36 APICHANGE: pass argument $includerelations into DataObject::fieldLabels() default as true; 
APICHANGE: BulkLoader::getImportSpec() call DataObject::fieldLables() with $includerelations as false, so that the relations is separated from column fields

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@74858 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:27:15 +13:00
Will Rossiter
23044a94dd BUGFIX: fixed issue with greyscale GD - patch from camspiers 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@74272 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:27:13 +13:00
Hamish Friedlander
8a38580159 MINOR: Add disabled class to InlineFormAction, adjust Folder to use InlineFormAction rather than LiteralField for "Delete unused thumbnails" button. 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@74168 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:27:12 +13:00
Saophalkun Ponlu
531c7b1d4d FEATURE: added after uploading notify method 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@73670 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:27:12 +13:00
Michael Andrewartha
07ef4d77f9 MINOR check for existing file object 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@73529 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:27:11 +13:00
Sean Harvey
4513631a54 BUGFIX Fixed possible SQL injection in file name part for File::find() 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@73437 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:27:11 +13:00
Sean Harvey
7169b9aee7 BUGFIX Validating $_FILES in Upload->validate() (Merged from r73254) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@73290 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:27:10 +13:00
Sam Minnee
abd3ac4979 BUGFIX #3590: Allow subclassing of Folder 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@72694 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:27:09 +13:00
Will Rossiter
64e61cc250 MINOR: added empty statics to allow decoration 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@70409 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:27:00 +13:00
Sean Harvey
53c87fe7e0 BUGFIX Fixed issue of not enough space in the AssetAdmin "Upload" tab for multiple file uploading, mostly affecting IE6/7 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@70130 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:26:58 +13:00
Sam Minnee
48a9a5c0ba BUGFIX #3329: Improved speed of folder creation in files + images 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@69943 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:26:57 +13:00
Ingo Schommer
345ec4e885 MINOR Making Folder->getCMSFields() translatable 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@68760 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:26:50 +13:00
Sean Harvey
c96d891c2c MINOR Removed whitespace after ?> end PHP tag 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@67467 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:26:45 +13:00
Saophalkun Ponlu
080be5ef98 Moved LegacyIDs from BlogEntry and File to Decorators 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@67131 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:26:40 +13:00
Saophalkun Ponlu
39e386bbe7 Added LegacyID for keeping orginal ID. Used for site migration 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@67114 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:26:40 +13:00
Sean Harvey
8b57dc223d MINOR Moved File::find() to the top of the class for consistency with other classes 
MINOR Added phpDoc comments for File::find()
MINOR Removed unused private static $dataobject_select in File

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@66631 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:26:37 +13:00
Sean Harvey
ed3ac6924f MINOR Code formatting cleanup in File->getAbsoluteSize() 
MINOR phpDoc comments for File->getAbsoluteSize()

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@66630 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:26:37 +13:00
Sean Harvey
5e3726ff43 ENHANCEMENT Added more known file extensions (tiff, js, html, css, ico) to File->getFileType() 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@66320 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:26:36 +13:00
Will Rossiter
a92d2120a1 Merged pre-2.3-oct08 into branches/2.3 (via trunk) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@66084 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:26:33 +13:00
Ingo Schommer
1b65a6bf46 MINOR removed debug commits from r65523 in Folder.php 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@65537 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-11-10 11:33:29 +00:00
Sam Minnee
58dbe416ee Merged from branches/2.2 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@65523 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-11-10 03:51:35 +00:00
Ingo Schommer
cfde8adaee API CHANGE Removed Folder->userCan*() and File->userCan*()permissions and added more consistent behaviour with Folder->can*() and File->can*() 
ENHANCEMENT Allowing decoration of can*() methods in File and Folder

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@65452 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-11-07 12:17:42 +00:00
Sean Harvey
d145c50cc2 ENHANCEMENT Folder name can now be used for uploading files. Ticket #3026 - Thanks simon_w! 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@65266 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-11-05 03:56:22 +00:00
Sam Minnee
5f177b9f08 BUGFIX #2056: Removed all references to deprecated Member::isAdmin() 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@65232 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-11-04 23:31:33 +00:00
Ingo Schommer
3edc358ead ENHANCEMENT Added fieldLabels() overloading to various DataObject subclasses. Use this method instead of directly calling _t() in getCMSFields(), and use fieldLabel('MyField') to get the label for a specific FormField. This way, we can transparently support formfield scaffolding and re-use the labels for search fields automatically. 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@65072 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-11-02 20:04:10 +00:00
Ingo Schommer
252f739919 API CHANGE Removed deprecated File->setMaxFileSize(), use Upload class 
API CHANGE Removed deprecated File->getMaxFileSize(), use Upload class
API CHANGE Removed File::sync(), use Filesystem::sync()
API CHANGE Removed deprecated File::fixfiles()
API CHANGE Removed deprecated File::loadContent(), use Upload class
API CHANGE Removed deprecated File::loadallcontent(), use Upload class

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@64402 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-10-16 11:05:57 +00:00
Ingo Schommer
b3f57dd454 API CHANGE Removed Filesystem::moverootfilesto() 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@64401 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-10-16 11:03:45 +00:00
Sean Harvey
31df9f440f ENHANCEMENT Added additional known file types, for audio and video files 
MINOR Tweaked text of file type descriptions slightly

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@64356 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-10-16 03:55:33 +00:00
Ingo Schommer
72047aa3a1 BUGFIX Fixing AssetAdmin translations which were previously moved to Folder.php - i18n::include_by_class() doesn't like filenames/namespaces which are in a different folder than the language file they're referenced in (see #2359) - started in r64076 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@64077 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-10-10 17:35:24 +00:00
Ingo Schommer
f009e8de8a API CHANGE Moved PostBackup class to module (see r63758) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@63759 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-10-07 16:42:25 +00:00
Ingo Schommer
5927bf2399 BUGFIX Fixed Upload->isValidExtension() - was checking array keys instead of array values .... 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@63467 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-10-01 18:31:08 +00:00
Ingo Schommer
9371f4688b ENHANCEMENT Introduced constants for system paths like /sapphire in preparation for a more flexible directory reorganisation. Instead of hardcoding your path, please use the following constants: BASE_PATH, BASE_URL, SAPPHIRE_DIR, SAPPHIRE_PATH, CMS_DIR, CMS_PATH, THIRDPARTY_DIR, THIRDPARTY_PATH, ASSETS_DIR, ASSETS_PATH, THEMES_DIR, THEMES_PATH 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@63154 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-09-27 16:02:38 +00:00
Ingo Schommer
f0feea5109 API CHANGE Removed useless File->test() method 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@63077 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-09-25 12:38:36 +00:00
Sam Minnee
f2c619d10c FEATURE: Files & Images tree now shows filename rather than meta-data title, to make it easier to find the file you're looking for 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@62284 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-09-12 01:05:11 +00:00
Geoff Munn
864875c2fa Multiple 'protected' variable declaration fixed 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@62184 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-09-10 22:01:09 +00:00
Sam Minnee
5fb17f1eca Improved File tests 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@61462 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-08-25 01:42:27 +00:00
Sam Minnee
53cc576dab Reverted Folder::CanEdit() to its original behaviour; that of returning a many-many join. Note that this conflicts with DataObject::CanEdit() now. 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60911 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-08-18 00:51:35 +00:00
Sam Minnee
4acd84a837 Trap potential data-integrity bug 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60778 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-08-14 22:20:14 +00:00
Hayden Smith
19da6e3128 Refactored [47088]: File::getFullPath now compares the filename with Director::baseFolder and returns filename if the filename stars with Director::baseFolder. 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60529 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-08-12 22:26:52 +00:00
Sam Minnee
0bd9bc4ff8 Merged changes from 2.2.2-assets - everything except the asset refactoring 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60468 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-08-12 02:51:33 +00:00
Andrew O'Neil
1107757128 MINOR: #2445 - Function getFilename in File.php cehcks for Name, but returns Filename (Blynx) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@56944 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-06-25 05:52:58 +00:00
Andrew O'Neil
5ec9ff8862 FEATURE: #2166 - Ability to set deafult for all resampeld JPEGs (dio5) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@56939 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-06-25 05:22:56 +00:00
Ingo Schommer
60860cc1b9 MINOR Unified @package PHPdoc (added where missing, removed duplicates) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@56212 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-06-15 13:33:53 +00:00