Commit Graph

60 Commits

Author SHA1 Message Date
Will Rossiter
ce7cf0113c BUGFIX: fixed inclusion of environment file when document root is the web root
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@107585 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:37 +13:00
Ingo Schommer
a6d019bd76 MINOR Documentation
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@104996 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:25 +13:00
Sam Minnee
7c920762ae BUGFIX: Allow classes to be referred to with casing that differs from their definition.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@101131 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:02 +13:00
Sean Harvey
8a0a0b3263 MINOR Added brackets around strpos() check just to be sure it works
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@98898 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:32 +13:00
Sean Harvey
628cca92ba BUGFIX Fixed strpos() check in BASE_URL check
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@98897 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:32 +13:00
Sean Harvey
3a0a508911 BUGFIX Installer now opens if mod_rewrite is disabled. Using index.php instead of rewriting the URL didn't quite work with the new BASE_URL, so we need to take this case into account as well
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@98895 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:32 +13:00
Sam Minnee
a7318bf846 BUGFIX: Fixed infinite loop in FILE_TO_URL_MAPPING lookup when calling arbitrary scripts via CLI
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@98434 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:28 +13:00
Sam Minnee
c212f40bb5 BUGFIX Use BASE_PATH and BASE_URL instead of data from $_SERVER.
API CHANGE: Determine default BASE_PATH/BASE_URL from the __FILE__ content, so that the script that initiated the Sapphire process doesn't matter.  This means that index.php doesn't need to manipulate those variables.

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@97731 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:15 +13:00
Sam Minnee
9ac547d32d BUGFIX: Don't rely on the current working directory for any file access; use BASE_PATH.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@97728 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:15 +13:00
Geoff Munn
ed5c173366 BUG FIX: The 5.1 replacement array_fill_keys function now made available to the cron jobs
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@97300 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:10 +13:00
Sam Minnee
7923628b50 BUGFIX: Fixed bug in r97036
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@97051 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:10 +13:00
Sam Minnee
5718a6a3d1 BUGFIX: Use locally included Zend framework components in favour of those installed with PEAR
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@97036 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:09 +13:00
Sam Minnee
3c88905299 BUGFIX: Add a default list of allowed extensions so that the CMS works reasonably out of the box.
BUGFIX: Allow files that don't have an extension (most notably folders)
BUGFIX: Ensure that file URL rewriting works if you rename a page twice without publishing.
BUGFIX: Ensure that the page doesn't go green after URLs are rewritten
ENHANCEMENT: Recognise HTTP_X_FORWARDED_HOST header and use that in place of HTTP_HOST (from r93148)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@96752 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:06 +13:00
Sean Harvey
4eaa2f6001 BUGFIX #4661 Fix SS temporary directory bug with Windows environments - the directory would always be "silverstripe-cache" instead of a namespaced one so that multiple SS sites don't conflict with eachother
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@94134 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:17:55 +13:00
Ingo Schommer
03c5caea72 MINOR Updated paths from jsparty to sapphire/thirdparty, cms/thirdparty and sapphire/javascript
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@93611 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:17:52 +13:00
Sam Minnee
8f0d3c72c1 ENHANCEMENT #3638: There is no longer any need to have the class name match the PHP filename
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@83798 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-08-05 04:48:58 +00:00
Sam Minnee
73cfe3ab84 API CHANGE: Added increase_time_limit_to(), which respects safe_mode.
API CHANGE: Added no-arg option to increase_memory_limit_to()

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@80241 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-06-28 02:36:46 +00:00
Sam Minnee
bcbe95b825 BUGFIX: Ignore deprecation errors for improved PHP 5.3 support.
BUGFIX: Fix behaviour of FILE_TO_URL_MAPPING on Windows.

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@80131 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-06-26 02:46:14 +00:00
Sean Harvey
6c754d29e9 Merged from branches/2.3
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@79438 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-06-17 11:36:49 +00:00
Andrew Short
204415325e MINOR ajshort: Check that get_magic_quotes_gpc() is defined before calling it (was removed in PHP 6).
From: Andrew Short <andrewjshort@gmail.com>

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@79362 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-06-16 11:47:23 +00:00
Ingo Schommer
a7e93c3099 BUGFIX Moved set_include_path() directive for including sapphire/thirdparty from sapphire/_config.php to Core class - needs to be loaded before other _config.php files are parsed, to enable e.g. usage of the Money class in a static context
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@77435 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-20 23:19:08 +00:00
Ingo Schommer
23fc9380f2 BUGFIX Making $_SINGLETONS a global instead of a static in Core.php so it can be re-used in other places
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@73883 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-03-31 19:32:19 +00:00
Sam Minnee
41fb93b344 ENHANCEMENT #3032 ajshort: Use static methods for accessing static data
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@73036 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-03-14 00:16:32 +00:00
Sam Minnee
08a5a7c387 Merged from branches/2.3
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@72803 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-03-10 22:08:52 +00:00
Andrew O'Neil
60f75c5ca4 Merged changes from 2.3 branch
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@71172 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-02-01 23:49:53 +00:00
Sam Minnee
3d9532db83 Merged branches/2.3
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@66108 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-18 01:48:37 +00:00
Sam Minnee
2f25dda9de Get sapphire to self-allocate at least 64M of memory, if possible.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@65778 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-13 02:07:22 +00:00
Sam Minnee
b4977f8500 Added default for HTTP_USER_AGENT
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@65471 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-09 22:40:08 +00:00
Sam Minnee
c1d6e82248 API CHANGE: Removed manifest's dependency on database, by removing hastable information [17:47:04]
dquote> API CHANGE: Deprecate ClassInfo::ready() in favour of Security::database_is_ready()
dquote> API CHANGE: Create DataObject::has_own_table() to determine whether a DataObject has a table without looking at it.
dquote> API CHANGE: Exclude /tests/ directories from the manifest entirely except when tests are being run.
dquote> API CHANGE: Added ?usetestmanifest=1 flag to access the test manifest outside of test execution.
dquote> API CHANGE: Simplified Core.php manifest include to just call ManifestBuilder::include_manifest() - manifest takes care of its own cache file

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@65385 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-06 04:51:25 +00:00
Ingo Schommer
a51d7184a3 BUGFIX Using include_once() instead of include() for _ss_environment.php in install.php and Core.php to avoid PHP notice errors about double constant defines (see r64561)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@64562 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-10-20 13:26:52 +00:00
Ingo Schommer
c4cdc9ce87 ENHANCEMENT Made _t() global function in Core.php an alias for the new i18n::_t() method
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@64493 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-10-17 15:40:59 +00:00
Ingo Schommer
a9abe0e6ca ENHANCEMENT Using $locale in _t() instead of repeatedly calling i18n::get_locale()
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@64078 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-10-10 17:36:13 +00:00
Hayden Smith
f2474a0ae2 Moved error_reporting setting from main.php to Core.php
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@63821 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-10-08 03:35:28 +00:00
Sam Minnee
2af039785c ENHANCEMENT: Updated cli-script handling to be more in line with web calls, and improved Director::setBaseURL() calls.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@63321 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-09-29 23:41:50 +00:00
Ingo Schommer
21944a2e06 BUGFIX Moved *_PATH and PR_*constants from main.php/cli-script.php back to Core.php - was causing problems with installer (directly includes Core.php, but doesn't run through main.php) - see ticket #2867 for improvement suggestions in bootstrapping code to avoid these bugs
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@63290 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-09-29 12:33:07 +00:00
Ingo Schommer
a30532becb BUGFIX Moved TEMP_FOLDER define back from main.php/cli-script.php to Core.php, as it was causing problems with the installer
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@63204 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-09-28 23:03:28 +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
12a73455ac ENHANCEMENT Moved procedural bootstrapping code hiding away between function definitions in Core.php to main.php and cli-script.php (TEMP_FOLDER and PR_* constants)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@63153 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-09-27 13:17:58 +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
Ingo Schommer
bf9f349210 (merged from branches/roa. use "svn log -c <changeset> -g <module-svn-path>" for detailed commit message)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60276 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-11 00:03:57 +00:00
Matt Peel
7d13ba7fb8 Reverted geoffm's accidental commit to /open
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@50107 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-02-25 02:10:37 +00:00
Geoff Munn
bf3c09bec6 First post
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@50105 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-02-25 01:06:39 +00:00
Sam Minnee
d27937f448 Updated API documentation package tags
Fixed some whitespace

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@47725 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-01-08 06:37:50 +00:00
Andrew O'Neil
1df5d2b641 cache folder in webroot should just be called silverstripe-cache (merged from branches/2.2.0@45907, r45618)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@46111 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-12-02 21:34:18 +00:00
Andrew O'Neil
7acd5738be the silverstripe-cache folder is now named according to the location of the silverstripe install, meaning that there are no clashes of permissions on shared servers (merged from branches/2.2.0, r44847)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@44902 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-15 22:33:35 +00:00
Ingo Schommer
af68f3f298 FEATURE Sapphire files are now also scanned for _t calls
ENHANCEMENT Revised locale list
ENHANCEMENT Updated en_US generated files (and created for sapphire)
BUGFIX Fixed some _t() calls in the cms module

(merged from patch #1476 by bfojcapell)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@43654 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-10-20 23:49:14 +00:00
Andrew O'Neil
75f598de37 If there's a silverstripe-cache directory in the silverstripe folder, always use that instead of /tmp (merged from 2.1.0 branch, r41578)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@42912 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-10-02 04:34:36 +00:00
Ingo Schommer
8c3a21baa4 fixed bugs introduced during merging
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@42068 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-16 02:44:10 +00:00
Ingo Schommer
12afad7f1e mlanthaler: Check if TEMP_FOLDER was already defined before defining it so that the user can set the temporary folder himself.
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@41974 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-16 00:23:00 +00:00
Ingo Schommer
408c8d63d5 bfojcapell: better i18n support and more flexibility allowed in templates. Also fixed some possible warnings in 2.02rc1 if more than one language file is found with the same name. ManifestBuilder? now skips language files - they cannot be autoloaded and they are already loaded on demand, so no need to be in the manifest
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@41913 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-15 20:06:42 +00:00