From fc0db15ebce101602fb1cbfa8f6a5cc0f8b58be4 Mon Sep 17 00:00:00 2001 From: Fabio Bas Date: Mon, 6 Jan 2014 22:41:46 +0100 Subject: Happy 2014! (cherry picked from commit 7915cde127eba2a5143fd45c6b32e81ad91bdfae) Conflicts: framework/Data/Common/Mssql/TMssqlMetaData.php framework/Data/Common/Mysql/TMysqlMetaData.php framework/Data/Common/Oracle/TOracleMetaData.php framework/Data/Common/Pgsql/TPgsqlMetaData.php framework/Data/Common/Sqlite/TSqliteMetaData.php framework/Data/Common/TDbMetaData.php framework/Web/UI/ActiveControls/TCallbackClientScript.php framework/Web/UI/JuiControls/TJuiAutoComplete.php framework/Web/UI/JuiControls/TJuiControlAdapter.php framework/Web/UI/JuiControls/TJuiDraggable.php framework/Web/UI/JuiControls/TJuiDroppable.php framework/Web/UI/JuiControls/TJuiResizable.php framework/Web/UI/JuiControls/TJuiSelectable.php framework/Web/UI/JuiControls/TJuiSortable.php framework/Wsat/TWsatARGenerator.php framework/Wsat/TWsatService.php framework/Wsat/pages/TWsatGenerateAR.php framework/Wsat/pages/TWsatHome.php framework/Wsat/pages/TWsatLogin.php framework/Wsat/pages/TWsatScaffolding.php --- COPYRIGHT | 2 +- bin/prado-cli.php | 2 +- build.xml | 2 +- buildscripts/apigen/pradosoft/@layout.latte | 2 +- buildscripts/texbuilder/quickstart/quickstart.tex | 4 +- demos/quickstart/protected/controls/Layout.tpl | 2 +- .../quickstart/protected/controls/SampleLayout.tpl | 2 +- .../protected/controls/es/SampleLayout.tpl | 2 +- .../protected/controls/fr/SampleLayout.tpl | 2 +- framework/Caching/TAPCCache.php | 8 +- framework/Caching/TCache.php | 2 +- framework/Caching/TDbCache.php | 2 +- framework/Caching/TEACache.php | 2 +- framework/Caching/TMemCache.php | 26 +- framework/Caching/TSqliteCache.php | 2 +- framework/Caching/TXCache.php | 2 +- framework/Collections/TAttributeCollection.php | 2 +- framework/Collections/TDummyDataSource.php | 2 +- framework/Collections/TList.php | 18 +- framework/Collections/TListItemCollection.php | 2 +- framework/Collections/TMap.php | 4 +- framework/Collections/TPagedDataSource.php | 2 +- framework/Collections/TPagedList.php | 2 +- framework/Collections/TPriorityList.php | 138 ++++---- framework/Collections/TPriorityMap.php | 70 ++-- framework/Collections/TQueue.php | 4 +- framework/Collections/TStack.php | 4 +- .../Exceptions/TActiveRecordException.php | 2 +- .../Relations/TActiveRecordBelongsTo.php | 2 +- .../Relations/TActiveRecordHasMany.php | 2 +- .../Relations/TActiveRecordHasManyAssociation.php | 2 +- .../ActiveRecord/Relations/TActiveRecordHasOne.php | 2 +- .../Relations/TActiveRecordRelation.php | 2 +- .../Relations/TActiveRecordRelationContext.php | 2 +- .../Scaffold/InputBuilder/TIbmScaffoldInput.php | 2 +- .../Scaffold/InputBuilder/TMssqlScaffoldInput.php | 2 +- .../Scaffold/InputBuilder/TMysqlScaffoldInput.php | 2 +- .../Scaffold/InputBuilder/TPgsqlScaffoldInput.php | 2 +- .../Scaffold/InputBuilder/TScaffoldInputBase.php | 2 +- .../Scaffold/InputBuilder/TScaffoldInputCommon.php | 2 +- .../Scaffold/InputBuilder/TSqliteScaffoldInput.php | 2 +- .../Data/ActiveRecord/Scaffold/TScaffoldBase.php | 2 +- .../ActiveRecord/Scaffold/TScaffoldEditView.php | 2 +- .../ActiveRecord/Scaffold/TScaffoldListView.php | 2 +- .../Data/ActiveRecord/Scaffold/TScaffoldSearch.php | 2 +- .../Data/ActiveRecord/Scaffold/TScaffoldView.php | 2 +- framework/Data/ActiveRecord/TActiveRecord.php | 2 +- .../Data/ActiveRecord/TActiveRecordConfig.php | 2 +- .../Data/ActiveRecord/TActiveRecordCriteria.php | 2 +- .../Data/ActiveRecord/TActiveRecordGateway.php | 2 +- .../Data/ActiveRecord/TActiveRecordManager.php | 2 +- .../Data/Common/Mssql/TMssqlCommandBuilder.php | 2 +- framework/Data/Common/Mssql/TMssqlMetaData.php | 2 +- framework/Data/Common/Mssql/TMssqlTableColumn.php | 2 +- framework/Data/Common/Mssql/TMssqlTableInfo.php | 2 +- .../Data/Common/Mysql/TMysqlCommandBuilder.php | 2 +- framework/Data/Common/Mysql/TMysqlMetaData.php | 2 +- framework/Data/Common/Mysql/TMysqlTableColumn.php | 2 +- framework/Data/Common/Mysql/TMysqlTableInfo.php | 2 +- .../Data/Common/Oracle/TOracleCommandBuilder.php | 8 +- framework/Data/Common/Oracle/TOracleMetaData.php | 4 +- .../Data/Common/Oracle/TOracleTableColumn.php | 4 +- framework/Data/Common/Oracle/TOracleTableInfo.php | 2 +- .../Data/Common/Pgsql/TPgsqlCommandBuilder.php | 2 +- framework/Data/Common/Pgsql/TPgsqlMetaData.php | 2 +- framework/Data/Common/Pgsql/TPgsqlTableColumn.php | 2 +- framework/Data/Common/Pgsql/TPgsqlTableInfo.php | 2 +- .../Data/Common/Sqlite/TSqliteCommandBuilder.php | 2 +- framework/Data/Common/Sqlite/TSqliteMetaData.php | 2 +- .../Data/Common/Sqlite/TSqliteTableColumn.php | 2 +- framework/Data/Common/Sqlite/TSqliteTableInfo.php | 2 +- framework/Data/Common/TDbCommandBuilder.php | 2 +- framework/Data/Common/TDbMetaData.php | 2 +- framework/Data/Common/TDbTableColumn.php | 2 +- framework/Data/Common/TDbTableInfo.php | 2 +- framework/Data/DataGateway/TDataGatewayCommand.php | 2 +- framework/Data/DataGateway/TSqlCriteria.php | 2 +- framework/Data/DataGateway/TTableGateway.php | 2 +- .../Data/SqlMap/Configuration/TDiscriminator.php | 2 +- .../Configuration/TInlineParameterMapParser.php | 6 +- .../Data/SqlMap/Configuration/TParameterMap.php | 8 +- .../SqlMap/Configuration/TParameterProperty.php | 4 +- framework/Data/SqlMap/Configuration/TResultMap.php | 2 +- .../Data/SqlMap/Configuration/TResultProperty.php | 4 +- .../SqlMap/Configuration/TSimpleDynamicParser.php | 2 +- .../SqlMap/Configuration/TSqlMapCacheModel.php | 2 +- .../Data/SqlMap/Configuration/TSqlMapStatement.php | 4 +- .../Configuration/TSqlMapXmlConfiguration.php | 2 +- .../DataMapper/TFastSqlMapApplicationCache.php | 14 +- framework/Data/SqlMap/DataMapper/TLazyLoadList.php | 2 +- .../Data/SqlMap/DataMapper/TPropertyAccess.php | 2 +- framework/Data/SqlMap/DataMapper/TSqlMapCache.php | 2 +- .../Data/SqlMap/DataMapper/TSqlMapPagedList.php | 2 +- .../DataMapper/TSqlMapTypeHandlerRegistry.php | 2 +- .../Data/SqlMap/Statements/TCachingStatement.php | 2 +- .../SqlMap/Statements/TDeleteMappedStatement.php | 2 +- .../SqlMap/Statements/TInsertMappedStatement.php | 2 +- .../Data/SqlMap/Statements/TMappedStatement.php | 8 +- .../Data/SqlMap/Statements/TPreparedCommand.php | 2 +- .../Data/SqlMap/Statements/TPreparedStatement.php | 14 +- .../Statements/TPreparedStatementFactory.php | 2 +- .../SqlMap/Statements/TSelectMappedStatement.php | 2 +- .../Data/SqlMap/Statements/TSimpleDynamicSql.php | 2 +- framework/Data/SqlMap/Statements/TStaticSql.php | 2 +- .../SqlMap/Statements/TUpdateMappedStatement.php | 2 +- framework/Data/SqlMap/TSqlMapConfig.php | 2 +- framework/Data/SqlMap/TSqlMapGateway.php | 2 +- framework/Data/SqlMap/TSqlMapManager.php | 2 +- framework/Data/TDataSourceConfig.php | 2 +- framework/Data/TDbCommand.php | 6 +- framework/Data/TDbConnection.php | 4 +- framework/Data/TDbDataReader.php | 2 +- framework/Data/TDbTransaction.php | 2 +- framework/Exceptions/TErrorHandler.php | 2 +- framework/Exceptions/TException.php | 4 +- framework/I18N/TChoiceFormat.php | 4 +- framework/I18N/TDateFormat.php | 8 +- framework/I18N/TGlobalization.php | 2 +- framework/I18N/TGlobalizationAutoDetect.php | 4 +- framework/I18N/TI18NControl.php | 2 +- framework/I18N/TNumberFormat.php | 4 +- framework/I18N/TTranslate.php | 4 +- framework/I18N/TTranslateParameter.php | 2 +- framework/I18N/Translation.php | 4 +- framework/IO/TTextWriter.php | 2 +- framework/PradoBase.php | 2 +- framework/Security/IUserManager.php | 2 +- framework/Security/TAuthManager.php | 10 +- framework/Security/TAuthorizationRule.php | 2 +- framework/Security/TDbUserManager.php | 2 +- framework/Security/TSecurityManager.php | 2 +- framework/Security/TUser.php | 2 +- framework/Security/TUserManager.php | 6 +- framework/TApplication.php | 26 +- framework/TApplicationComponent.php | 2 +- framework/TComponent.php | 386 ++++++++++----------- framework/TModule.php | 2 +- framework/TService.php | 2 +- framework/TShellApplication.php | 2 +- framework/Util/TCallChain.php | 34 +- framework/Util/TDataFieldAccessor.php | 4 +- framework/Util/TDateTimeStamp.php | 6 +- framework/Util/TLogRouter.php | 12 +- framework/Util/TLogger.php | 10 +- framework/Util/TParameterModule.php | 2 +- framework/Util/TSimpleDateFormatter.php | 6 +- framework/Util/TVarDumper.php | 2 +- framework/Web/Javascripts/TJavaScript.php | 6 +- framework/Web/Services/TFeedService.php | 4 +- framework/Web/Services/TJsonService.php | 4 +- framework/Web/Services/TPageService.php | 12 +- framework/Web/Services/TSoapService.php | 4 +- framework/Web/TAssetManager.php | 2 +- framework/Web/TCacheHttpSession.php | 2 +- framework/Web/THttpRequest.php | 4 +- framework/Web/THttpResponse.php | 2 +- framework/Web/THttpResponseAdapter.php | 2 +- framework/Web/THttpSession.php | 4 +- framework/Web/THttpUtility.php | 2 +- framework/Web/TUrlManager.php | 4 +- framework/Web/TUrlMapping.php | 4 +- framework/Web/UI/ActiveControls/TActiveButton.php | 4 +- .../Web/UI/ActiveControls/TActiveCheckBox.php | 6 +- .../Web/UI/ActiveControls/TActiveCheckBoxList.php | 2 +- .../Web/UI/ActiveControls/TActiveClientScript.php | 8 +- .../UI/ActiveControls/TActiveControlAdapter.php | 2 +- .../UI/ActiveControls/TActiveCustomValidator.php | 2 +- .../Web/UI/ActiveControls/TActiveDatePicker.php | 28 +- .../Web/UI/ActiveControls/TActiveDropDownList.php | 2 +- .../Web/UI/ActiveControls/TActiveHiddenField.php | 2 +- .../Web/UI/ActiveControls/TActiveHyperLink.php | 2 +- framework/Web/UI/ActiveControls/TActiveImage.php | 2 +- .../Web/UI/ActiveControls/TActiveImageButton.php | 2 +- framework/Web/UI/ActiveControls/TActiveLabel.php | 2 +- .../Web/UI/ActiveControls/TActiveLinkButton.php | 4 +- framework/Web/UI/ActiveControls/TActiveListBox.php | 2 +- .../ActiveControls/TActiveListControlAdapter.php | 2 +- .../Web/UI/ActiveControls/TActivePageAdapter.php | 2 +- framework/Web/UI/ActiveControls/TActivePager.php | 46 +-- framework/Web/UI/ActiveControls/TActivePanel.php | 4 +- .../Web/UI/ActiveControls/TActiveRadioButton.php | 4 +- .../UI/ActiveControls/TActiveRadioButtonList.php | 2 +- .../Web/UI/ActiveControls/TActiveRatingList.php | 4 +- framework/Web/UI/ActiveControls/TActiveTextBox.php | 2 +- framework/Web/UI/ActiveControls/TAutoComplete.php | 2 +- .../Web/UI/ActiveControls/TBaseActiveControl.php | 2 +- framework/Web/UI/ActiveControls/TCallback.php | 2 +- .../UI/ActiveControls/TCallbackClientScript.php | 13 +- .../Web/UI/ActiveControls/TCallbackClientSide.php | 6 +- .../UI/ActiveControls/TCallbackEventParameter.php | 2 +- .../Web/UI/ActiveControls/TCallbackOptions.php | 2 +- .../UI/ActiveControls/TCallbackResponseAdapter.php | 2 +- framework/Web/UI/ActiveControls/TDropContainer.php | 2 +- .../UI/ActiveControls/TEventTriggeredCallback.php | 2 +- .../Web/UI/ActiveControls/TInPlaceTextBox.php | 8 +- .../UI/ActiveControls/TTimeTriggeredCallback.php | 2 +- .../Web/UI/ActiveControls/TTriggeredCallback.php | 2 +- .../UI/ActiveControls/TValueTriggeredCallback.php | 2 +- framework/Web/UI/TCachePageStatePersister.php | 2 +- framework/Web/UI/TClientScriptManager.php | 8 +- framework/Web/UI/TCompositeControl.php | 2 +- framework/Web/UI/TControl.php | 2 +- framework/Web/UI/TControlAdapter.php | 2 +- framework/Web/UI/TForm.php | 4 +- framework/Web/UI/THtmlWriter.php | 4 +- framework/Web/UI/TPage.php | 4 +- framework/Web/UI/TPageStatePersister.php | 2 +- framework/Web/UI/TSessionPageStatePersister.php | 2 +- framework/Web/UI/TTemplateControl.php | 2 +- framework/Web/UI/TTemplateManager.php | 2 +- framework/Web/UI/TThemeManager.php | 2 +- framework/Web/UI/WebControls/TAccordion.php | 18 +- framework/Web/UI/WebControls/TBaseDataList.php | 2 +- framework/Web/UI/WebControls/TBaseValidator.php | 4 +- framework/Web/UI/WebControls/TBoundColumn.php | 2 +- framework/Web/UI/WebControls/TBulletedList.php | 2 +- framework/Web/UI/WebControls/TButton.php | 2 +- framework/Web/UI/WebControls/TButtonColumn.php | 2 +- framework/Web/UI/WebControls/TCaptcha.php | 2 +- framework/Web/UI/WebControls/TCaptchaValidator.php | 2 +- framework/Web/UI/WebControls/TCheckBox.php | 6 +- framework/Web/UI/WebControls/TCheckBoxColumn.php | 2 +- framework/Web/UI/WebControls/TCheckBoxList.php | 16 +- framework/Web/UI/WebControls/TClientScript.php | 4 +- framework/Web/UI/WebControls/TColorPicker.php | 8 +- framework/Web/UI/WebControls/TCompareValidator.php | 2 +- framework/Web/UI/WebControls/TConditional.php | 2 +- framework/Web/UI/WebControls/TContent.php | 2 +- .../Web/UI/WebControls/TContentPlaceHolder.php | 2 +- framework/Web/UI/WebControls/TCustomValidator.php | 2 +- framework/Web/UI/WebControls/TDataBoundControl.php | 2 +- framework/Web/UI/WebControls/TDataGrid.php | 4 +- framework/Web/UI/WebControls/TDataGridColumn.php | 2 +- .../Web/UI/WebControls/TDataGridItemRenderer.php | 2 +- .../Web/UI/WebControls/TDataGridPagerStyle.php | 2 +- framework/Web/UI/WebControls/TDataList.php | 2 +- .../Web/UI/WebControls/TDataListItemRenderer.php | 2 +- framework/Web/UI/WebControls/TDataRenderer.php | 2 +- .../Web/UI/WebControls/TDataSourceControl.php | 2 +- framework/Web/UI/WebControls/TDataSourceView.php | 2 +- .../Web/UI/WebControls/TDataTypeValidator.php | 2 +- framework/Web/UI/WebControls/TDatePicker.php | 6 +- framework/Web/UI/WebControls/TDropDownList.php | 4 +- .../Web/UI/WebControls/TDropDownListColumn.php | 2 +- .../Web/UI/WebControls/TEditCommandColumn.php | 2 +- .../Web/UI/WebControls/TEmailAddressValidator.php | 2 +- framework/Web/UI/WebControls/TExpression.php | 2 +- framework/Web/UI/WebControls/TFileUpload.php | 4 +- framework/Web/UI/WebControls/TFont.php | 2 +- framework/Web/UI/WebControls/THead.php | 2 +- framework/Web/UI/WebControls/THeader1.php | 10 +- framework/Web/UI/WebControls/THeader2.php | 10 +- framework/Web/UI/WebControls/THeader3.php | 10 +- framework/Web/UI/WebControls/THeader4.php | 10 +- framework/Web/UI/WebControls/THeader5.php | 10 +- framework/Web/UI/WebControls/THeader6.php | 10 +- framework/Web/UI/WebControls/THiddenField.php | 4 +- framework/Web/UI/WebControls/THtmlArea.php | 4 +- framework/Web/UI/WebControls/THtmlArea4.php | 6 +- framework/Web/UI/WebControls/THtmlElement.php | 10 +- framework/Web/UI/WebControls/THyperLink.php | 10 +- framework/Web/UI/WebControls/THyperLinkColumn.php | 10 +- framework/Web/UI/WebControls/TImage.php | 2 +- framework/Web/UI/WebControls/TImageButton.php | 2 +- framework/Web/UI/WebControls/TImageMap.php | 2 +- framework/Web/UI/WebControls/TInlineFrame.php | 2 +- framework/Web/UI/WebControls/TItemDataRenderer.php | 2 +- framework/Web/UI/WebControls/TJavascriptLogger.php | 4 +- framework/Web/UI/WebControls/TKeyboard.php | 2 +- framework/Web/UI/WebControls/TLabel.php | 2 +- framework/Web/UI/WebControls/TLinkButton.php | 2 +- framework/Web/UI/WebControls/TListBox.php | 4 +- framework/Web/UI/WebControls/TListControl.php | 4 +- .../Web/UI/WebControls/TListControlValidator.php | 2 +- framework/Web/UI/WebControls/TListItem.php | 2 +- framework/Web/UI/WebControls/TLiteral.php | 2 +- framework/Web/UI/WebControls/TLiteralColumn.php | 2 +- framework/Web/UI/WebControls/TMarkdown.php | 2 +- framework/Web/UI/WebControls/TMultiView.php | 2 +- framework/Web/UI/WebControls/TOutputCache.php | 6 +- framework/Web/UI/WebControls/TPager.php | 4 +- framework/Web/UI/WebControls/TPanel.php | 2 +- framework/Web/UI/WebControls/TPanelStyle.php | 2 +- framework/Web/UI/WebControls/TPlaceHolder.php | 2 +- framework/Web/UI/WebControls/TRadioButton.php | 2 +- framework/Web/UI/WebControls/TRadioButtonList.php | 2 +- framework/Web/UI/WebControls/TRangeValidator.php | 2 +- framework/Web/UI/WebControls/TRatingList.php | 6 +- .../UI/WebControls/TRegularExpressionValidator.php | 2 +- framework/Web/UI/WebControls/TRepeatInfo.php | 2 +- framework/Web/UI/WebControls/TRepeater.php | 2 +- .../Web/UI/WebControls/TRepeaterItemRenderer.php | 2 +- .../Web/UI/WebControls/TRequiredFieldValidator.php | 8 +- framework/Web/UI/WebControls/TSafeHtml.php | 2 +- framework/Web/UI/WebControls/TSlider.php | 16 +- framework/Web/UI/WebControls/TStatements.php | 2 +- framework/Web/UI/WebControls/TStyle.php | 2 +- framework/Web/UI/WebControls/TStyleSheet.php | 2 +- framework/Web/UI/WebControls/TTabPanel.php | 8 +- framework/Web/UI/WebControls/TTable.php | 2 +- framework/Web/UI/WebControls/TTableCell.php | 2 +- framework/Web/UI/WebControls/TTableFooterRow.php | 2 +- framework/Web/UI/WebControls/TTableHeaderCell.php | 2 +- framework/Web/UI/WebControls/TTableHeaderRow.php | 2 +- framework/Web/UI/WebControls/TTableRow.php | 2 +- framework/Web/UI/WebControls/TTemplateColumn.php | 2 +- framework/Web/UI/WebControls/TTextBox.php | 2 +- framework/Web/UI/WebControls/TTextHighlighter.php | 2 +- framework/Web/UI/WebControls/TTextProcessor.php | 2 +- .../Web/UI/WebControls/TValidationSummary.php | 2 +- framework/Web/UI/WebControls/TWebControl.php | 16 +- .../Web/UI/WebControls/TWebControlAdapter.php | 2 +- .../Web/UI/WebControls/TWebControlDecorator.php | 132 +++---- framework/Web/UI/WebControls/TWizard.php | 2 +- .../WebControls/TWizardNavigationButtonStyle.php | 2 +- framework/Web/UI/WebControls/TXmlTransform.php | 2 +- framework/Web/UI/WebControls/assets/captcha.php | 4 +- framework/Xml/TXmlDocument.php | 2 +- framework/interfaces.php | 2 +- framework/prado.php | 2 +- index.html | 4 +- 321 files changed, 968 insertions(+), 967 deletions(-) diff --git a/COPYRIGHT b/COPYRIGHT index daa3d02c..4d7a65d8 100644 --- a/COPYRIGHT +++ b/COPYRIGHT @@ -1,7 +1,7 @@ The PRADO framework and the included demos are free software. They are released under the terms of the following BSD License. -Copyright 2004-2013, The PRADO Group (http://www.pradosoft.com) +Copyright 2004-2014, The PRADO Group (http://www.pradosoft.com) All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/bin/prado-cli.php b/bin/prado-cli.php index b4b43062..d8232fe2 100755 --- a/bin/prado-cli.php +++ b/bin/prado-cli.php @@ -5,7 +5,7 @@ * * @author Wei Zhuo * @link http://www.pradosoft.com/ - * @copyright Copyright © 2005-2013 PradoSoft + * @copyright Copyright © 2005-2014 PradoSoft * @license http://www.pradosoft.com/license/ * @version $Id: prado-cli.php 3316 2013-08-20 13:51:25Z ctrlaltca $ */ diff --git a/build.xml b/build.xml index 023debe2..6ffdc523 100644 --- a/build.xml +++ b/build.xml @@ -1,6 +1,6 @@