Merge pull request #530 from pradosoft/prado-3.2.43.2.4prado-3.2

Backports for Prado 3.2.4

15 files changed, 12 insertions, 75 deletions

diff --git a/buildscripts/apigen/pradosoft/@layout.latte b/buildscripts/apigen/pradosoft/@layout.latte
index 2790d92c..266f0e17 100644
--- a/buildscripts/apigen/pradosoft/@layout.latte
+++ b/buildscripts/apigen/pradosoft/@layout.latte
@@ -182,7 +182,7 @@ the file LICENSE.md that was distributed with this source code.
   <a href="/support/">Contact Us</a>
   <br/>
   {$config->title} API documentation generated by <a href="http://apigen.org">{$generator} {$version}</a>
-  <br/>Copyright &copy; 2006-2013 by the PRADO Group.<br/>
+  <br/>Copyright &copy; 2006-2014 by the PRADO Group.<br/>
   <a title="Powered by PRADO" href="http://www.pradosoft.com/"><img src="http://www.pradosoft.com/images/powered2.gif" style="border-width:0px;" alt="Powered by PRADO" /></a>
 </div>
 
diff --git a/buildscripts/classtree/DWExtension.php b/buildscripts/classtree/DWExtension.php
index 8849efea..a7a1ca30 100644
--- a/buildscripts/classtree/DWExtension.php
+++ b/buildscripts/classtree/DWExtension.php
@@ -252,4 +252,3 @@ class PradoTagChooser
 		return $this->_document->saveXML();
 	}
 }
-?>
\ No newline at end of file
diff --git a/buildscripts/index/build.php b/buildscripts/index/build.php
index bbe151e6..a2e57286 100644
--- a/buildscripts/index/build.php
+++ b/buildscripts/index/build.php
@@ -61,5 +61,3 @@ else
 {
 	echo "Usage: 'php build.php quickstart' or 'php build.php api'\n";
 }
-
-?>
diff --git a/buildscripts/index/quickstart_index.php b/buildscripts/index/quickstart_index.php
index 61e21514..5df0f549 100644
--- a/buildscripts/index/quickstart_index.php
+++ b/buildscripts/index/quickstart_index.php
@@ -104,4 +104,3 @@ class quickstart_index
 		echo "\nSaving search index ({$count}) to {$this->_dir}\n\n";
 	}
 }
-?>
\ No newline at end of file
diff --git a/buildscripts/index/search.php b/buildscripts/index/search.php
index 23948ca5..ff83e629 100644
--- a/buildscripts/index/search.php
+++ b/buildscripts/index/search.php
@@ -11,7 +11,7 @@ require_once('Zend/Search/Lucene.php');
 
 if($keyword!=='')
 {
-	$search=new Zend_Search_Lucene(realpath(dirname(__FILE__)));		
+	$search=new Zend_Search_Lucene(realpath(dirname(__FILE__)));
 	$results=$search->find(strtolower($keyword));
 	$content='';
 	foreach($results as $entry)
@@ -32,5 +32,3 @@ $page=preg_replace('/<!-- content begin -->.*<!-- content end -->/ms',$content,$
 if($keyword!=='')
 	$page=preg_replace('/<input type="text" name="keyword"/','<input type="text" name="keyword" value="'.htmlentities($keyword).'"',$page);
 echo $page;
-
-?>
\ No newline at end of file
diff --git a/buildscripts/phing/tasks/PradoPearTask.php b/buildscripts/phing/tasks/PradoPearTask.php
index 5d615084..541c972e 100644
--- a/buildscripts/phing/tasks/PradoPearTask.php
+++ b/buildscripts/phing/tasks/PradoPearTask.php
@@ -129,5 +129,3 @@ class PradoPearTask extends Task
 			echo $e->getMessage();
 	}
 }
-
-?>
\ No newline at end of file
diff --git a/buildscripts/phpbuilder/build.php b/buildscripts/phpbuilder/build.php
index 17e02806..47b7bec4 100644
--- a/buildscripts/phpbuilder/build.php
+++ b/buildscripts/phpbuilder/build.php
@@ -144,5 +144,3 @@ function unfold_file($fileName)
 	}
 	return $content;
 }
-
-?>
\ No newline at end of file
diff --git a/buildscripts/setup.php b/buildscripts/setup.php
deleted file mode 100644
index 59d636b8..00000000
--- a/buildscripts/setup.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-/**
- * Setup script for build system. You could run this script to install or upgrade Phing
- * with dependencies. Please make sure to change the PEAR_CMD constant to how you want
- * to execute the PEAR installer.
- * 
- * @author Knut Urdalen
- */
-
-// Where to find the PEAR installer
-define('PEAR_CMD', 'sudo pear');
-
-// Storing your preferred_state
-$preferred_state = exec(PEAR_CMD.' config-get preferred_state');
-
-// Setting preferred state temporary to development to automatically get all dependencies
-system(PEAR_CMD.' config-set preferred_state devel');
-
-// Ensure that the PEAR channel protocol is updated
-system(PEAR_CMD.' channel-update pear.php.net');
-
-// Ensure that the Phing PEAR channel is added
-system(PEAR_CMD.' channel-discover pear.phing.info');
-
-// and channel protocol is updated
-system(PEAR_CMD.' channel-update pear.phing.info');
-
-// Checking if Phing is already installed
-$result = exec(PEAR_CMD.' info phing/phing');
-if(strstr($result, 'No information found for')) { // Install
-  system(PEAR_CMD.' install --alldeps phing/phing');
-} else { // Try to upgrade
-  system(PEAR_CMD.' upgrade --alldeps phing/phing');
-}
-
-// Setting your preferred state back to what it was
-system(PEAR_CMD.' config-set preferred_state '.$preferred_state);
-
-?>
\ No newline at end of file
diff --git a/buildscripts/texbuilder/Page2Tex.php b/buildscripts/texbuilder/Page2Tex.php
index b0d37149..ce2ece7f 100644
--- a/buildscripts/texbuilder/Page2Tex.php
+++ b/buildscripts/texbuilder/Page2Tex.php
@@ -343,5 +343,3 @@ class Page2Tex
 		 return "<p id=\"".($page + (++self::$p_count))."\" class=\"block-content\">";
 	}
 }
-
-?>
diff --git a/buildscripts/texbuilder/quickstart/build.php b/buildscripts/texbuilder/quickstart/build.php
index a42d6be3..6a824125 100644
--- a/buildscripts/texbuilder/quickstart/build.php
+++ b/buildscripts/texbuilder/quickstart/build.php
@@ -76,6 +76,3 @@ if($argv[1] == 'pdf')
 		echo " Unable to find pdfLatex executable $pdflatexExec";
 	}
 }
-
-
-?>
diff --git a/buildscripts/texbuilder/quickstart/pages.php b/buildscripts/texbuilder/quickstart/pages.php
index cd11c4b1..d16878c9 100644
--- a/buildscripts/texbuilder/quickstart/pages.php
+++ b/buildscripts/texbuilder/quickstart/pages.php
@@ -9,13 +9,14 @@ $pages['Getting Started'] = array(
 	'GettingStarted/AboutPrado.page',
 	'GettingStarted/Installation.page',
 	'GettingStarted/NewFeatures.page',
-	'GettingStarted/Upgrading.page'
+	'GettingStarted/Upgrading.page',
+	'GettingStarted/Wsat.page',
+	'GettingStarted/CommandLine.page'
 	);
 
 $pages['Tutorials'] = array(
 	'GettingStarted/HelloWorld.page',
 	'Fundamentals/Hangman.page',
-	'GettingStarted/CommandLine.page'
 	);
 
 $pages['Tutorial: Currency Converter'] = array(
@@ -26,13 +27,10 @@ $pages['Tutorial: Building an AJAX Chat Application'] = array(
 	'Tutorial/AjaxChat.page'
 	);
 
-$pages['Tutorial: Addressbook'] = array(
-	'Tutorial/AddressBook.page'
-	);
-
 $pages['Fundamentals'] = array(
 	'Fundamentals/Architecture.page',
-	'Fundamentals/Components.page',
+	'Fundamentals/Components1.page',
+	'Fundamentals/Components2.page',
 	'Fundamentals/Controls.page',
 	'Fundamentals/Pages.page',
 	'Fundamentals/Modules.page',
@@ -66,6 +64,7 @@ $pages['Control Reference : Standard Controls'] = array(
 	'Controls/Head.page',
 	'Controls/HiddenField.page',
 	'Controls/HtmlArea.page',
+	'Controls/HtmlArea4.page',
 	'Controls/HyperLink.page',
 	'Controls/Image.page',
 	'Controls/ImageButton.page',
@@ -76,6 +75,7 @@ $pages['Control Reference : Standard Controls'] = array(
 	'Controls/Label.page',
 	'Controls/LinkButton.page',
 	'Controls/Literal.page',
+	'Controls/Markdown.page',
 	'Controls/MultiView.page',
 	'Controls/OutputCache.page',
 	'Controls/Pager.page',
@@ -177,5 +177,3 @@ $pages['Client-side Scripting'] = array(
 
 return $pages;
 //-------------- END CONFIG ----------------
-
-?>
\ No newline at end of file
diff --git a/buildscripts/texbuilder/quickstart/quickstart.tex b/buildscripts/texbuilder/quickstart/quickstart.tex
index 41258800..396f7bb3 100644
--- a/buildscripts/texbuilder/quickstart/quickstart.tex
+++ b/buildscripts/texbuilder/quickstart/quickstart.tex
@@ -52,8 +52,8 @@
 
 %----------------- TITLE --------------
 
-\title{\Huge \bfseries PRADO v3.2.3 Quickstart Tutorial
-    \thanks{Copyright 2004-2013. All Rights Reserved.}
+\title{\Huge \bfseries PRADO v3.2.4 Quickstart Tutorial
+    \thanks{Copyright 2004-2014. All Rights Reserved.}
 }
 \author{Qiang Xue and Wei Zhuo}
 \date{\today}
@@ -78,7 +78,7 @@ Prado quick start doc
 \chapter*{License}
 \addcontentsline{toc}{chapter}{License}
 PRADO is free software 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/buildscripts/texbuilder/sqlmap/build.php b/buildscripts/texbuilder/sqlmap/build.php
index 4ea4d75e..066af486 100644
--- a/buildscripts/texbuilder/sqlmap/build.php
+++ b/buildscripts/texbuilder/sqlmap/build.php
@@ -76,6 +76,3 @@ if($argv[1] == 'pdf')
 		echo " Unable to find pdfLatex executable $pdflatexExec";
 	}
 }
-
-
-?>
diff --git a/buildscripts/texbuilder/sqlmap/pages.php b/buildscripts/texbuilder/sqlmap/pages.php
index 57fff767..b0b7bca0 100644
--- a/buildscripts/texbuilder/sqlmap/pages.php
+++ b/buildscripts/texbuilder/sqlmap/pages.php
@@ -58,5 +58,3 @@ $pages['Advanced Topics'] = array(
 );
 
 return $pages;
-
-?>
\ No newline at end of file
diff --git a/buildscripts/texbuilder/time-tracker/pages.php b/buildscripts/texbuilder/time-tracker/pages.php
index 732f675d..a9c32347 100644
--- a/buildscripts/texbuilder/time-tracker/pages.php
+++ b/buildscripts/texbuilder/time-tracker/pages.php
@@ -14,5 +14,3 @@ $pages['Testing Business Code'] = array(
 	'Docs/UserClassAndExceptions.page'
 	);
 return $pages;
-
-?>
\ No newline at end of file