fix for #35

3 files changed, 21 insertions, 3 deletions

diff --git a/HISTORY b/HISTORY
index 1fd305ff..cf46b590 100644
--- a/HISTORY
+++ b/HISTORY
@@ -11,6 +11,8 @@ EHN: Modify TActiveRecordConfig & TActiveRecordManager to allow custom subclassi
 EHN: Add methods quoteTableName, quoteColumnName, quoteColumnAlias to TDbMetaData & TDbConnection and add TDbConnection:getDbMetaData [TODO: customize TOracleMetaData] (Yves)
 EHN: Add method getHeaders to THttpRequest & THttpResponse (Yves)
 EHN: Modify TThemeManager to allow custom subclassing of TTheme (Yves)
+
+BUG: Issue  #35 - [840] Capital letters for the initial letter of the directories name (ctrlaltca)
 NEW: Issue  #83 - PHP configuration style (Carl)
 ENH: Issue #106 - TJavaScript::jsonEncode and TJavaScript::jsonDecode should use built-in PHP functions (ctrlaltca)
 ENH: Issue #173 - Add "dragdropextra" (supergsting) patch, mouse coordinates and key status to drag & drop controls (Christophe, DevWorx)
@@ -31,6 +33,7 @@ ENH: Issue #337 - Prado serialization optimizations (Gabor)
 BUG: Issue #341 - TSafeHtmlParser messes up UTF8-encoded strings (ctrlaltca)
 BUG: Issue #342 - TStyle does no accept style values with ":" (ctrlaltca)
 NEW: Issue #345 - Added TReCaptcha control (Gabor)
+BUG: Issue #346 - TJavaScript, TJSON documentation missing/misbehaving (ctrlaltca)
 BUG: Issue #348 - Scripts for dynamically created controls not registered properly in/after a callback (Gabor)
 BUG: Issue #351 - THtmlArea prone to double-registration, doesn't deregister properly (Gabor)
 BUG: Issue #353 - Accordion control behaves oddly if clicked too fast (Gabor)
@@ -42,9 +45,13 @@ BUG: Issue #367 - Parameterized RegularExpression property in UrlMapping raise T
 BUG: Issue #368 - Clearing selection of a TActiveDropDownList in callback should select its prompt (ctrlaltca)
 CHG: Issue #370 - Deprecated TSqliteCache since it's based on php's sqlite extension (ctrlaltca)
 BUG: Issue #371 - Sorting on TActiveDataGrid autogenerated column not work (ctrlaltca)
+ENH: Issue #372 - ActiveControls's Visible property should be reflected clientside on ajax requests (ctrlaltca)
 ENH: Performance (micro)optimization in TUrlMapping::loadUrlMappings - invoke `getDefaultMappingClass` outside of loop (Yves)
 BUG: TActiveMultiView must update clientside only when necessary to get other active controls work fine inside it (ctrlaltca)
 BUG: TListBox doesn't correctly reports selected indices to serverside on callback
+BUG: TErrorHandler: avoid an error when trying to hide the file path of a lambda function (ctrlaltca)
+BUG: TSecurityManager: avoid a race condition when first generating the encryptionkey or the validationkey (ctrlaltca)
+BUG: TActiveFileUpload: urlencode the base64'ed token since it can contain the "+" character (otherway it would be traslated to a space) (ctrlaltca)
 
 Version 3.1.10 Jul 17, 2011
 BUG: Added missing timeout on TCacheHttpSession (ctrlaltca)
diff --git a/UPGRADE b/UPGRADE
index a9af97a9..45d498bf 100644
--- a/UPGRADE
+++ b/UPGRADE
@@ -35,7 +35,10 @@ Upgrading from v3.1.x
   to mantain backwards compatibility) everything based on that extension.
   TSqliteCache should be abandoned in favour of TDbCache.
   The "sqlite" backend for message translation has been deprecated, use "Database" instead.
-
+- TPageService's default pages path has changed from "Application.pages" to "Application.Pages" (note the 
+  uppercase P). Using capital letters for the initial letter of the directories name is a long-time
+  convention in prado, and this has been changed to reflect it. TPageService has been patched anyway to
+  support even the old "Application.pages" to avoid breaking existing code.
 
 Upgrading from v3.1.10
 ----------------------
diff --git a/framework/Web/Services/TPageService.php b/framework/Web/Services/TPageService.php
index 0d2c1e86..a9b74724 100644
--- a/framework/Web/Services/TPageService.php
+++ b/framework/Web/Services/TPageService.php
@@ -92,7 +92,11 @@ class TPageService extends TService implements IPageEvents
 	/**

 	 * Default base path

 	 */

-	const DEFAULT_BASEPATH='pages';

+	const DEFAULT_BASEPATH='Pages';

+	/**

+	 * Fallback base path - used to be the default up to Prado < 3.2

+	 */

+	const FALLBACK_BASEPATH='pages';

 	/**

 	 * Prefix of ID used for storing parsed configuration in cache

 	 */

@@ -426,7 +430,11 @@ class TPageService extends TService implements IPageEvents
 		{

 			$basePath=$this->getApplication()->getBasePath().DIRECTORY_SEPARATOR.self::DEFAULT_BASEPATH;

 			if(($this->_basePath=realpath($basePath))===false || !is_dir($this->_basePath))

-				throw new TConfigurationException('pageservice_basepath_invalid',$basePath);

+			{

+				$basePath=$this->getApplication()->getBasePath().DIRECTORY_SEPARATOR.self::FALLBACK_BASEPATH;

+				if(($this->_basePath=realpath($basePath))===false || !is_dir($this->_basePath))

+					throw new TConfigurationException('pageservice_basepath_invalid',$basePath);

+			}

 		}

 		return $this->_basePath;

 	}