#913 - PRADO Copyright notice in HTML source

3 files changed, 32 insertions, 9 deletions

diff --git a/HISTORY b/HISTORY
index 89733919..a857d097 100644
--- a/HISTORY
+++ b/HISTORY
@@ -1,10 +1,5 @@
 Version 3.1.3 To Be Released
 ============================
-ENH: Ticket#822 - Not receiving emails from TEmailLogRoute (Carl)
-ENH: Ticket#809 - "LIMIT 1" for ActiveRecord find() and findBy() (Carl)
-BUG: Ticket#856 - Assets PRADO_CHMOD constant missing in several places (Carl)
-ENH: Ticket#848 - TCache "set" and "add" with empty values (Carl)
-ENH: Ticket#756 - TDateFormat & TNumberFormat - allow settings default text when Value isn't set. (Carl)
 BUG: Ticket#834 - TDbCommandBuilder::applyOrdering(): Add support for function calls in ORDER BY clause (Knut)
 BUG: Ticket#836 - TRatingList downgrade (Christophe)
 BUG: Ticket#841 - Strange output from THttpResponse (Christophe)
@@ -36,6 +31,12 @@ ENH: Ticket#911 - prado-cli: Better error message if database connection fails w
 CHG: Ticket#844 - Upgraded TinyMCE to 3.1.0.1 (Christophe)
 NEW: Ticket#935 - Add TDatePicker (Brad, Christophe)
 NEW: Ticket#853 - Add Drag and drop components (Christophe)
+ENH: Ticket#809 - "LIMIT 1" for ActiveRecord find() and findBy() (Carl)
+BUG: Ticket#856 - Assets PRADO_CHMOD constant missing in several places (Carl)
+ENH: Ticket#848 - TCache "set" and "add" with empty values (Carl)
+ENH: Ticket#756 - TDateFormat & TNumberFormat - allow settings default text when Value isn't set. (Carl)
+ENH: Ticket#822 - Not receiving emails from TEmailLogRoute (Carl)
+ENH: Ticket#913 - PRADO Copyright notice in HTML source (Carl)
 
 Version 3.1.2 April 21, 2008
 ============================
diff --git a/framework/PradoBase.php b/framework/PradoBase.php
index e6a77136..ead66e1b 100644
--- a/framework/PradoBase.php
+++ b/framework/PradoBase.php
@@ -7,7 +7,7 @@
  *

  * @author Qiang Xue <qiang.xue@gmail.com>

  * @link http://www.pradosoft.com/

- * @copyright Copyright &copy; 2005-2008 PradoSoft
+ * @copyright Copyright &copy; 2005-2008 PradoSoft

  * @license http://www.pradosoft.com/license/

  * @version $Id$

  * @package System

@@ -114,6 +114,11 @@ class PradoBase
 			$url='http://www.pradosoft.com/images/'.$logoName.'.gif';

 		return '<a title="Powered by PRADO" href="http://www.pradosoft.com/" target="_blank"><img src="'.$url.'" style="border-width:0px;" alt="Powered by PRADO" /></a>';

 	}

+	

+	public static function metaGenerator()

+	{

+		return 'PRADO - http://www.pradosoft.com/';

+	}

 

 	/**

 	 * PHP error handler.

@@ -611,4 +616,4 @@ PradoBase::using('System.TComponent');
 PradoBase::using('System.Exceptions.TException');

 PradoBase::using('System.Util.TLogger');

 

-?>
+?>

diff --git a/framework/Web/UI/WebControls/THead.php b/framework/Web/UI/WebControls/THead.php
index 1b51f8ae..62ee46d3 100644
--- a/framework/Web/UI/WebControls/THead.php
+++ b/framework/Web/UI/WebControls/THead.php
@@ -4,7 +4,7 @@
  *

  * @author Marcus Nyeholt <tanus@users.sourceforge.net> and Qiang Xue <qiang.xue@gmail.com>

  * @link http://www.pradosoft.com/

- * @copyright Copyright &copy; 2005-2008 PradoSoft
+ * @copyright Copyright &copy; 2005-2008 PradoSoft

  * @license http://www.pradosoft.com/license/

  * @version $Id$

  * @package System.Web.UI

@@ -29,6 +29,13 @@
  *   <com:TMetaTag Name="keywords" Content="Prado" />

  * </com:THead>

  * </code>

+ * 

+ * A MetaTag for "generator" is added by default if you haven't specified your own generator meta tag. You can override

+ * the property by adding the following code to your template:

+ * <com:THead>

+ *   <com:TMetaTag Name="generator" Content="Custom name" />

+ * </com:THead>

+ * </code>

  *

  * Note, {@link TPage} has a property {@link TPage::getHead Head} that refers to

  * the THead control currently on the page. A page can have at most once THead

@@ -155,14 +162,24 @@ class THead extends TControl
 		if(($icon=$this->getShortcutIcon())!=='')

 			$writer->write('<link rel="shortcut icon" href="'.$icon."\" />\n");

 

+		$generatorAdded = false;

 		if(($metaTags=$this->getMetaTags())!==null)

 		{

 			foreach($metaTags as $metaTag)

 			{

+				if(strtolower($metaTag->getName()) == 'generator')

+					$generatorAdded = true;

 				$metaTag->render($writer);

 				$writer->writeLine();

 			}

 		}

+		if(!$generatorAdded)

+		{

+			$metaTag = new TMetaTag();

+			$metaTag->setName('generator');

+			$metaTag->setContent(Prado::metaGenerator());

+			$metaTag->render($writer);

+		}

 		$cs=$page->getClientScript();

 		$cs->renderStyleSheetFiles($writer);

 		$cs->renderStyleSheets($writer);

@@ -374,4 +391,4 @@ class TMetaTagCollection extends TList
 	}

 }

 

-?>
+?>