Merge branch '2.0' of git.colosa.net:processmaker into 2.0

Conflicts:
	workflow/engine/classes/class.languages.php

.gitignore

@@ -0,0 +1,5 @@
+nbproject
+workflow/engine/config/paths_installed.php
+gulliver/thirdparty/html2ps_pdf/cache
+*~
+

gulliver/system/class.xmlform.php

@@ -3119,9 +3119,7 @@ class XmlForm_Field_Date extends XmlForm_Field_SimpleText
      * By Erik A. O. <erik@colosa.com>
      * @package gulliver.system
      */
-    if($mask == 'yyyy-mm-dd')
-      $mask = '%Y-%m-%d';
-
+       
     if( strpos($mask, '%') === false ) {
       if( strpos($mask, '-') !== false ) { // case '-' saparator
         $maskparts = explode('-', $mask);
@@ -3129,6 +3127,14 @@ class XmlForm_Field_Date extends XmlForm_Field_SimpleText
         foreach($maskparts as $part) {
           if($mask != '')
             $mask .= '-';
+          if($part=='yyyy')
+          $part='Y';
+          if($part=='dd')
+          $part='d';
+          if($part=='mm')
+          $part='m';
+          if($part=='yy') 
+          $part='y';
           $mask .= '%'.$part;
         }
       }
@@ -3139,9 +3145,37 @@ class XmlForm_Field_Date extends XmlForm_Field_SimpleText
         foreach($maskparts as $part) {
           if($mask != '')
             $mask .= '/';
+          if($part=='yyyy')
+          $part='Y';
+          if($part=='dd')
+          $part='d';
+          if($part=='mm')
+          $part='m';
+          if($part=='yy')
+          $part='y';
           $mask .= '%'.$part;
         }
       }
+      
+    if( strpos($mask, '.') !== false ) { // case '.' saparator
+        $maskparts = explode('.', $mask);
+        $mask = '';
+        foreach($maskparts as $part) {
+          if($mask != '')
+            $mask .= '.';
+          if($part=='yyyy')
+          $part='Y';
+          if($part=='dd')
+          $part='d';
+          if($part=='mm')
+          $part='m';
+          if($part=='yy')
+          $part='y';
+          $mask .= '%'.$part;
+        }
+      }
+      
+      
     }
     /** - end - Backward compatibility **/
     $tmp = str_replace("%", "", $mask);
@@ -3196,14 +3230,14 @@ class XmlForm_Field_Date extends XmlForm_Field_SimpleText
                $value=$value1;
            }
         
-       
+      
         if ( $this->editable != "0") {
           $html = '<input id="'.$pID.'" name="'.$pID.'" pm:mask="'.$mask.'" pm:start="'.$startDate.'" pm:end="'.$endDate.'" pm:time="'.$Time.'" '.$onchange.' class="module_app_input___gray" size="'.$sizeend.'" value="'.$value.'" pm:defaultvalue="'.$value1.'"/>'
                 . '<a onclick="removeValue(\''.$pID.'\'); return false;"/> '
                 . '<img src="/images/icons_silk/calendar_x_button.png" style="position:relative;left:-17px;top:5px;"/></a>'
                 . '<a id="'.$pID.'[btn]"><img src="/images/pmdateicon.png" border="0" width="12" height="12" style="position:relative;left:-17px;top:0px;"/></a>'
                 . '<script>datePicker4("", \''.$pID.'\', \''.$mask.'\', \''.$startDate.'\', \''.$endDate.'\','.$Time.')</script>';
-        } else {
+        } else {   
           $html = '<input id="'.$pID.'" name="'.$pID.'" pm:mask="'.$mask.'" pm:start="'.$startDate.'" pm:end="'.$endDate.'" pm:time="'.$Time.'" '.$onchange.' class="module_app_input___gray" size="'.$sizeend.'" value="'.$value.'"pm:defaultvalue="'.$value1.'" readonly="readonly"/>'
                 . '<a onclick="removeValue(\''.$pID.'\'); return false;"/> '
                 . '<img src="/images/icons_silk/calendar_x_button.png" style="position:relative;left:-17px;top:5px;"/></a>'

gulliver/thirdparty/html2ps_pdf/classes/org/active-link/xml/XML.php

@@ -228,7 +228,7 @@ class XML_ extends Tree {
 			}
 			else {
 				foreach($this->nodes as $node) {
-					if(is_object($node) && strtolower(get_class($node)) == "xmlbranch")
+					if(strtolower(get_class($node)) == "xmlbranch")
 						if($node->tag->getTagName() == $tags[1]) {
 							$newTagPath = implode($this->pathSeparator, array_slice($tags, 1));
 							$attributeValue = $node->getTagAttribute($attributeName, $newTagPath);
@@ -255,7 +255,7 @@ class XML_ extends Tree {
 				$tagValue = $this->getXMLContent();
 			else {
 				foreach($this->nodes as $node) {
-					if(is_object($node) && strtolower(get_class($node)) == "xmlbranch")
+					if(strtolower(get_class($node)) == "xmlbranch")
 						if($node->tag->getTagName() == $tags[1]) {
 							$newTagPath = implode($this->pathSeparator, array_slice($tags, 1));
 							$tagValue = $node->getTagContent($newTagPath);
@@ -337,7 +337,7 @@ class XML_ extends Tree {
 	function hasBranch() {
 		$hasBranch = false;
 		foreach($this->nodes as $node) {
-			if(is_object($node) && strtolower(get_class($node)) == "xmlbranch") {
+			if(strtolower(get_class($node)) == "xmlbranch") {
 				$hasBranch = true;
 				break;
 			}
@@ -353,7 +353,7 @@ class XML_ extends Tree {
 	function hasLeaf() {
 		$hasLeaf = false;
 		foreach($this->nodes as $node) {
-			if(is_object($node) && strtolower(get_class($node)) == "xmlleaf") {
+			if(strtolower(get_class($node)) == "xmlleaf") {
 				$hasLeaf = true;
 				break;
 			}
@@ -407,7 +407,7 @@ class XML_ extends Tree {
 	  */
 	function removeAllBranches() {
 		foreach($this->nodes as $key => $value) {
-			if(is_object($value) && strtolower(get_class($value)) == "xmlbranch")
+			if(strtolower(get_class($value)) == "xmlbranch")
 				unset($this->nodes[$key]);
 		}
 	}
@@ -418,7 +418,7 @@ class XML_ extends Tree {
 	  */
 	function removeAllLeafs() {
 		foreach($this->nodes as $key => $value) {
-			if(is_object($value) && strtolower(get_class($value)) == "xmlleaf")
+			if(strtolower(get_class($value)) == "xmlleaf")
 				unset($this->nodes[$key]);
 		}
 	}
@@ -469,7 +469,7 @@ class XML_ extends Tree {
 	  */
 	function setBranchTag($branchId, $tag) {
 		$success = true;
-		if(is_object($this->nodes[$branchId]) && (strtolower(get_class($this->nodes[$branchId])) == "xmlbranch" && strtolower(get_class($tag)) == "tag"))
+		if(strtolower(get_class($this->nodes[$branchId])) == "xmlbranch" && strtolower(get_class($tag)) == "tag")
 			$this->nodes[$branchId]->setTag($tag);
 		else
 			$success = false;
@@ -484,7 +484,7 @@ class XML_ extends Tree {
 	  */
 	function setTag($tag) {
 		$success = true;
-		if(is_object($tag) && strtolower(get_class($tag)) == "tag")
+		if(strtolower(get_class($tag)) == "tag")
 			$this->tag = $tag;
 		else
 			$success = false;
@@ -513,7 +513,7 @@ class XML_ extends Tree {
 				$arrKeys = array_keys($this->nodes);
 				for($index = 0; $index < count($arrKeys); $index ++) {
 					$node =& $this->nodes[$arrKeys[$index]];
-					if(is_object($node) && strtolower(get_class($node)) == "xmlbranch")
+					if(strtolower(get_class($node)) == "xmlbranch")
 						if($node->tag->getTagName() == $tags[1]) {
 							$newTagPath = implode($this->pathSeparator, array_slice($tags, 1));
 							$success = $node->setTagAttribute($attributeName, $attributeValue, $newTagPath);
@@ -553,7 +553,7 @@ class XML_ extends Tree {
 				$arrKeys = array_keys($this->nodes);
 				for($index = 0; $index < count($arrKeys); $index ++) {
 					$node =& $this->nodes[$arrKeys[$index]];
-					if(is_object($node) && strtolower(get_class($node)) == "xmlbranch")
+					if(strtolower(get_class($node)) == "xmlbranch")
 						if($node->tag->getTagName() == $tags[1]) {
 							$newTagPath = implode($this->pathSeparator, array_slice($tags, 1));
 							$success = $node->setTagContent($content, $newTagPath);

gulliver/thirdparty/html2ps_pdf/classes/org/active-link/xml/XMLBranch.php

@@ -59,7 +59,7 @@ class XMLBranch extends XML_ {
 	  */
 	function setParentXML(&$xml) {
 		$success = false;
-		if(is_object($xml) == "xml" && (strtolower(get_class($xml)) == "xml" || strtolower(get_class($xml)) == "xmlbranch")) {
+		if(strtolower(get_class($xml)) == "xml" || strtolower(get_class($xml)) == "xmlbranch") {
 			$this->parentXML = &$xml;
 			$success = true;
 		}

gulliver/thirdparty/html2ps_pdf/classes/org/active-link/xml/XMLLeaf.php

@@ -61,7 +61,7 @@ class XMLLeaf extends Leaf {
 	  */
 	function setParentXML(&$xml) {
 		$success = false;
-		if((is_object($xml) == "xml" && strtolower(get_class($xml)) == "xml" || strtolower(get_class($xml)) == "xmlbranch")) {
+		if(strtolower(get_class($xml)) == "xml" || strtolower(get_class($xml)) == "xmlbranch") {
 			$this->parentXML = &$xml;
 			$success = true;
 		}