11 files changed, 249 insertions, 30 deletions

diff --git a/h-source/Library/Lang/En/DbCondStrings.php b/h-source/Library/Lang/En/DbCondStrings.php
index bfc5867..0c72d95 100644
--- a/h-source/Library/Lang/En/DbCondStrings.php
+++ b/h-source/Library/Lang/En/DbCondStrings.php
@@ -2,7 +2,7 @@
 
 // EasyGiant is a PHP framework for creating and managing dynamic content
 //
-// Copyright (C) 2009 - 2011  Antonio Gallo
+// Copyright (C) 2009 - 2014  Antonio Gallo (info@laboratoriolibero.com)
 // See COPYRIGHT.txt and LICENSE.txt.
 //
 // This file is part of EasyGiant
@@ -23,12 +23,12 @@
 if (!defined('EG')) die('Direct access not allowed!');
 
 //error strings in the case database conditions are not satisfied
-class Lang_En_DbCondStrings {
+class Lang_En_DbCondStrings extends Lang_En_ValCondStrings {
 
 	//get the error string in the case that the value of the field $field is already present in the table $table
 	public function getNotUniqueString($field)
 	{
-		return "<div class='alert'>The value of <i>". $field ."</i> is already present. Please choose a different value.</div>\n";
+		return "<div class='alert'>The value of <i>". getFieldLabel($field) ."</i> is already present. Please choose a different value.</div>\n".$this->getHiddenAlertElement($field);
 	}
 
 }
diff --git a/h-source/Library/Lang/En/Formats/Fields.php b/h-source/Library/Lang/En/Formats/Fields.php
new file mode 100644
index 0000000..c91a1f0
--- /dev/null
+++ b/h-source/Library/Lang/En/Formats/Fields.php
@@ -0,0 +1,46 @@
+<?php
+
+// EasyGiant is a PHP framework for creating and managing dynamic content
+//
+// Copyright (C) 2009 - 2014  Antonio Gallo (info@laboratoriolibero.com)
+// See COPYRIGHT.txt and LICENSE.txt.
+//
+// This file is part of EasyGiant
+//
+// EasyGiant is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// EasyGiant is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with EasyGiant.  If not, see <http://www.gnu.org/licenses/>.
+
+if (!defined('EG')) die('Direct access not allowed!');
+
+class Lang_En_Formats_Fields
+{
+	
+	public static function getLabel($fieldName)
+	{
+		if (strstr($fieldName,","))
+		{
+			$temp = explode(",",$fieldName);
+			for ($i=0; $i< count($temp); $i++)
+			{
+				$temp[$i] = self::getLabel($temp[$i]);
+			}
+			return implode (" and ",$temp);
+		}
+		else
+		{
+			$fieldName = str_replace("_"," ", $fieldName);
+			return ucfirst($fieldName);
+		}
+	}
+	
+}
diff --git a/h-source/Library/Lang/En/Formats/From/Mysql.php b/h-source/Library/Lang/En/Formats/From/Mysql.php
new file mode 100644
index 0000000..5e4ea07
--- /dev/null
+++ b/h-source/Library/Lang/En/Formats/From/Mysql.php
@@ -0,0 +1,64 @@
+<?php
+
+// EasyGiant is a PHP framework for creating and managing dynamic content
+//
+// Copyright (C) 2009 - 2014  Antonio Gallo (info@laboratoriolibero.com)
+// See COPYRIGHT.txt and LICENSE.txt.
+//
+// This file is part of EasyGiant
+//
+// EasyGiant is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// EasyGiant is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with EasyGiant.  If not, see <http://www.gnu.org/licenses/>.
+
+if (!defined('EG')) die('Direct access not allowed!');
+
+class Lang_En_Formats_From_Mysql
+{
+
+	//convert the string from MySQL decimal format to En decimal format
+	public function decimal($string)
+	{
+		return $string;
+	}
+	
+	//convert the string from MySQL float format to En float format 
+	public function float($string)
+	{
+		return $string;
+	}
+	
+	//convert the string from MySQL double format to En double format 
+	public function double($string)
+	{
+		return $string;
+	}
+	
+	
+	//convert the string from MySQL date format to En date format 
+	public function date($date)
+	{
+		if (preg_match('/^[0-9]{4}\-[0-9]{2}\-[0-9]{2}$/',$date))
+		{
+			$dateArray = explode('-',$date);
+			return $dateArray[1]."-".$dateArray[2]."-".$dateArray[0];
+		}
+		return $date;
+	}
+	
+	//convert the string from MySQL enum format to En enum format 
+	public function enum($string)
+	{
+		return $string;
+	}
+	
+}
\ No newline at end of file
diff --git a/h-source/Library/Lang/En/Formats/From/index.html b/h-source/Library/Lang/En/Formats/From/index.html
new file mode 100755
index 0000000..8d1c8b6
--- /dev/null
+++ b/h-source/Library/Lang/En/Formats/From/index.html
@@ -0,0 +1 @@
+ 
diff --git a/h-source/Library/Lang/En/Formats/To/Mysql.php b/h-source/Library/Lang/En/Formats/To/Mysql.php
new file mode 100644
index 0000000..31daab8
--- /dev/null
+++ b/h-source/Library/Lang/En/Formats/To/Mysql.php
@@ -0,0 +1,62 @@
+<?php
+
+// EasyGiant is a PHP framework for creating and managing dynamic content
+//
+// Copyright (C) 2009 - 2014  Antonio Gallo (info@laboratoriolibero.com)
+// See COPYRIGHT.txt and LICENSE.txt.
+//
+// This file is part of EasyGiant
+//
+// EasyGiant is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// EasyGiant is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with EasyGiant.  If not, see <http://www.gnu.org/licenses/>.
+
+if (!defined('EG')) die('Direct access not allowed!');
+
+class Lang_En_Formats_To_Mysql
+{
+
+	//convert the string from En decimal format to MySQL decimal format
+	public function decimal($string)
+	{
+		return $string;
+	}
+	
+	//convert the string from En float format to MySQL float format
+	public function float($string)
+	{
+		return $string;
+	}
+	
+		//convert the string from En double format to MySQL double format
+	public function double($string)
+	{
+		return $string;
+	}
+	
+	//convert the string from En date format to MySQL date format
+	public function date($date)
+	{
+		if (preg_match('/^[0-9]{2}\-[0-9]{2}\-[0-9]{4}$/',$date))
+		{
+			$dateArray = explode('-',$date);
+			return $dateArray[2]."-".$dateArray[0]."-".$dateArray[1];
+		}
+		return $date;
+	}
+	
+	//convert the string from En enum format  to MySQL enum format
+	public function enum($string)
+	{
+		return $string;
+	}
+}
\ No newline at end of file
diff --git a/h-source/Library/Lang/En/Formats/To/index.html b/h-source/Library/Lang/En/Formats/To/index.html
new file mode 100755
index 0000000..8d1c8b6
--- /dev/null
+++ b/h-source/Library/Lang/En/Formats/To/index.html
@@ -0,0 +1 @@
+ 
diff --git a/h-source/Library/Lang/En/Formats/index.html b/h-source/Library/Lang/En/Formats/index.html
new file mode 100755
index 0000000..8d1c8b6
--- /dev/null
+++ b/h-source/Library/Lang/En/Formats/index.html
@@ -0,0 +1 @@
+ 
diff --git a/h-source/Library/Lang/En/Generic.php b/h-source/Library/Lang/En/Generic.php
index c940949..8df27a9 100644
--- a/h-source/Library/Lang/En/Generic.php
+++ b/h-source/Library/Lang/En/Generic.php
@@ -2,7 +2,7 @@
 
 // EasyGiant is a PHP framework for creating and managing dynamic content
 //
-// Copyright (C) 2009 - 2011  Antonio Gallo
+// Copyright (C) 2009 - 2014  Antonio Gallo (info@laboratoriolibero.com)
 // See COPYRIGHT.txt and LICENSE.txt.
 //
 // This file is part of EasyGiant
@@ -50,6 +50,8 @@ class Lang_En_Generic
 		'filter'	=>	'filter',
 		'clear the filter'	=>	'clear the filter',
 		'Save'		=>	'Save',
+		'Actions'	=>	'Actions',
+		'-- Select bulk action --' => '-- Select bulk action --',
 	);
 
 	public function gtext($string)
diff --git a/h-source/Library/Lang/En/ModelStrings.php b/h-source/Library/Lang/En/ModelStrings.php
index cf26b8f..266b1d2 100644
--- a/h-source/Library/Lang/En/ModelStrings.php
+++ b/h-source/Library/Lang/En/ModelStrings.php
@@ -2,7 +2,7 @@
 
 // EasyGiant is a PHP framework for creating and managing dynamic content
 //
-// Copyright (C) 2009 - 2011  Antonio Gallo
+// Copyright (C) 2009 - 2014  Antonio Gallo (info@laboratoriolibero.com)
 // See COPYRIGHT.txt and LICENSE.txt.
 //
 // This file is part of EasyGiant
@@ -24,13 +24,19 @@ if (!defined('EG')) die('Direct access not allowed!');
 
 class Lang_En_ModelStrings extends Lang_ResultStrings {
 	
-	public $string = array(
-		"error" => "<div class='alert'>Query error: Contact the administrator!</div>\n",
-		"executed" => "<div class='executed'>Operation executed!</div>\n",
-		"associate" => "<div class='alert'>Referential integrity problem: record associated to some other record in a child table. Break the association before.</div>\n",
-		"no-id" => "<div class='alert'>Alert: record identifier not defined!</div>\n",
-		"not-linked" => "<div class='alert'>The Item is not associated : you can't dissociate it</div>",
-		"linked" => "<div class='alert'>The Item is already associated: you can't associate it another time</div>"
-	);
+	public function __construct() {
+
+		$this->string = array(
+			"error" => "<div class='".Params::$errorStringClassName."'>Query error: Contact the administrator!</div>\n",
+			"executed" => "<div class='".Params::$infoStringClassName."'>Operation executed!</div>\n",
+			"associate" => "<div class='".Params::$errorStringClassName."'>Referential integrity problem: record associated to some other record in a child table. Break the association before.</div>\n",
+			"no-id" => "<div class='".Params::$errorStringClassName."'>Alert: record identifier not defined!</div>\n",
+			"not-linked" => "<div class='".Params::$errorStringClassName."'>The Item is not associated : you can't dissociate it</div>",
+			"linked" => "<div class='".Params::$errorStringClassName."'>The Item is already associated: you can't associate it another time</div>",
+			"not-existing-fields" => "<div class='".Params::$errorStringClassName."'>Some fields in the query do not exist</div>\n",
+			"no-fields" => "<div class='".Params::$errorStringClassName."'>There are no values in the insert/update query</div>\n",
+		);
+
+	}
 	
 }
diff --git a/h-source/Library/Lang/En/UploadStrings.php b/h-source/Library/Lang/En/UploadStrings.php
index 61bc0c5..572f7bb 100644
--- a/h-source/Library/Lang/En/UploadStrings.php
+++ b/h-source/Library/Lang/En/UploadStrings.php
@@ -2,7 +2,7 @@
 
 // EasyGiant is a PHP framework for creating and managing dynamic content
 //
-// Copyright (C) 2009 - 2011  Antonio Gallo
+// Copyright (C) 2009 - 2014  Antonio Gallo (info@laboratoriolibero.com)
 // See COPYRIGHT.txt and LICENSE.txt.
 //
 // This file is part of EasyGiant
diff --git a/h-source/Library/Lang/En/ValCondStrings.php b/h-source/Library/Lang/En/ValCondStrings.php
index 7f4e7ea..8742c23 100644
--- a/h-source/Library/Lang/En/ValCondStrings.php
+++ b/h-source/Library/Lang/En/ValCondStrings.php
@@ -2,7 +2,7 @@
 
 // EasyGiant is a PHP framework for creating and managing dynamic content
 //
-// Copyright (C) 2009 - 2011  Antonio Gallo
+// Copyright (C) 2009 - 2014  Antonio Gallo (info@laboratoriolibero.com)
 // See COPYRIGHT.txt and LICENSE.txt.
 //
 // This file is part of EasyGiant
@@ -24,70 +24,106 @@ if (!defined('EG')) die('Direct access not allowed!');
 
 class Lang_En_ValCondStrings {
 	
+	//get the HTMl of the hidden alert notices
+	public function getHiddenAlertElement($element)
+	{
+		$html = "";
+		$t = explode(",",$element);
+		
+		foreach ($t as $el)
+		{
+			$html .= "<div style='display:none;' rel='hidden_alert_notice'>$el</div>";
+		}
+		
+		return $html;
+	}
+	
 	//if the element is not defined
 	public function getNotDefinedResultString($element)
 	{
-		return "<div class='alert'>". $element ." not defined!</div>\n";
+		return "<div class='".Params::$errorStringClassName."'>Please fill the field <i>". getFieldLabel($element) ."</i>.</div>\n".$this->getHiddenAlertElement($element);
 	}
 	
 	//if the elements are not equal
 	public function getNotEqualResultString($element)
 	{
-		return "<div class='alert'>Different values: $element</div>\n";
+		return "<div class='".Params::$errorStringClassName."'>Please check that the fields <i>".getFieldLabel($element)."</i> are equal</div>\n".$this->getHiddenAlertElement($element);
 	}
 	
 	//if the element is not alphabetic
 	public function getNotAlphabeticResultString($element)
 	{
-		return "<div class='alert'>".$element." has to be alphabetic</div>\n";
+		return "<div class='".Params::$errorStringClassName."'>Please check that the field <i>".getFieldLabel($element)."</i> is alphabetic</div>\n".$this->getHiddenAlertElement($element);
 	}
 
 	//if the element is not alphanumeric
 	public function getNotAlphanumericResultString($element)
 	{
-		return "<div class='alert'>".$element." has to be alphanumeric</div>\n";
+		return "<div class='".Params::$errorStringClassName."'>Please check that the field <i>".getFieldLabel($element)."</i> has to be alphanumeric</div>\n".$this->getHiddenAlertElement($element);
 	}
 	
 	//if the element is not a decimal digit
 	public function getNotDecimalDigitResultString($element)
 	{
-		return "<div class='alert'>".$element." has to be a decimal digit</div>\n";
+		return "<div class='".Params::$errorStringClassName."'>Please check that the field <i>".getFieldLabel($element)."</i> is a decimal digit</div>\n".$this->getHiddenAlertElement($element);
 	}
-
-	//if the element has the mail format
+	
+	//if the element hasn't the mail format
 	public function getNotMailFormatResultString($element)
 	{
-		return "<div class='alert'>".$element." doesn't seem an e-mail address</div>\n";
+		return "<div class='".Params::$errorStringClassName."'>Please check that the field <i>".getFieldLabel($element)."</i> is an e-mail address</div>\n".$this->getHiddenAlertElement($element);
 	}
 
-	//if the element is numeric
+	//if the element is not numeric
 	public function getNotNumericResultString($element)
 	{
-		return "<div class='alert'>".$element." has to be a numeric</div>\n";
+		return "<div class='".Params::$errorStringClassName."'>Please check that the field <i>".getFieldLabel($element)."</i> is numeric</div>\n".$this->getHiddenAlertElement($element);
+	}
+	
+	//if the element is not an integer
+	public function getNotIntegerFormatResultString($element)
+	{
+		return "<div class='".Params::$errorStringClassName."'>Please check that the field <i>".getFieldLabel($element)."</i> is an integer number</div>\n".$this->getHiddenAlertElement($element);
+	}
+	
+	//if the element is not a real date
+	public function getNotDateResultString($element)
+	{
+		return "<div class='".Params::$errorStringClassName."'>Please check that the field <i>".getFieldLabel($element)."</i> is a real date</div>\n".$this->getHiddenAlertElement($element);
 	}
 	
 	//if the element (string) length exceeds the value of characters (defined by $maxLength)
 	public function getLengthExceedsResultString($element,$maxLength)
 	{
-		return "<div class='alert'>".$element." exceeds the value of $maxLength characters</div>\n";
+		return "<div class='".Params::$errorStringClassName."'>Please check that the field <i>".getFieldLabel($element)."</i> does not exceed the value of $maxLength characters</div>\n".$this->getHiddenAlertElement($element);
 	}
 
 	//if the element is one of the strings indicated by $stringList (a comma-separated list of strings)
 	public function getIsForbiddenStringResultString($element,$stringList)
 	{
-		return "<div class='alert'>".$element." can't be one of the following strings: $stringList</div>\n";
+		return "<div class='".Params::$errorStringClassName."'>Please check that the field <i>".getFieldLabel($element)."</i> is not one of the following strings: $stringList</div>\n".$this->getHiddenAlertElement($element);
 	}
 
 	//if the element is not one of the strings indicated by $stringList (a comma-separated list of strings)
 	public function getIsNotStringResultString($element,$stringList)
 	{
-		return "<div class='alert'>".$element." has to be one of the following strings: $stringList</div>\n";
+		return "<div class='".Params::$errorStringClassName."'>Please check that the field <i>".getFieldLabel($element)."</i> is one of the following strings: $stringList</div>\n".$this->getHiddenAlertElement($element);
 	}
 
-	//if the element is not one of the strings indicated by $stringList (a comma-separated list of strings)
+	//if the element does not match the reg expr indicated by $regExp
 	public function getDoesntMatchResultString($element,$regExp)
 	{
-		return "<div class='alert'>".$element." has to match the following regular expression: $regExp</div>\n";
+		return "<div class='".Params::$errorStringClassName."'>Please check that the field <i>".getFieldLabel($element)."</i> matchs the following regular expression: $regExp</div>\n".$this->getHiddenAlertElement($element);
+	}
+	
+	//if the element is not decimal
+	public function getNotDecimalResultString($element, $format)
+	{
+		$t = explode(",",$format);
+		$M = (int)$t[0];
+		$D = (int)$t[1];
+		$I = $M - $D;
+		return "<div class='".Params::$errorStringClassName."'>Please check that the field <i>".getFieldLabel($element)."</i> is a decimal number (maximum number of integer digits:$I, maximum number of decimal digits: $D)</div>\n".$this->getHiddenAlertElement($element);
 	}
 	
 }