diff --git a/workflow/engine/methods/controls/buscador.php b/workflow/engine/methods/controls/buscador.php
index 6bd27a558..61dfef45d 100755
--- a/workflow/engine/methods/controls/buscador.php
+++ b/workflow/engine/methods/controls/buscador.php
@@ -1,52 +1,53 @@
-<?php
-/**
- * buscador.php
- *
- * ProcessMaker Open Source Edition
- * Copyright (C) 2004 - 2008 Colosa Inc.23
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- * For more information, contact Colosa Inc, 2566 Le Jeune Rd.,
- * Coral Gables, FL, 33134, USA, or email info@colosa.com.
- */
-$frm = $HTTP_GET_VARS;
-
-?>
-
-<h1>demo de buscador</h1>
-<form method=post action="buscador2.php">
-	<input type=hidden name=ticket value="<?php echo $frm['ticket'] ?>"> <input
+<?php
+/**
+ * buscador.php
+ *
+ * ProcessMaker Open Source Edition
+ * Copyright (C) 2004 - 2008 Colosa Inc.23
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * For more information, contact Colosa Inc, 2566 Le Jeune Rd.,
+ * Coral Gables, FL, 33134, USA, or email info@colosa.com.
+ */
+$frm = $HTTP_GET_VARS;
+
+?>
+
+<h1>demo de buscador</h1>
+<form method=post action="buscador2.php">
+	<input type=hidden name=ticket value="<?php echo $frm['ticket'] ?>"> <input
 		type=hidden name=tipo value="<?php echo $frm['tipo'] ?>">
-Buscador tipo : <?php echo $frm['tipo'] ?><br>
-
-	<table>
-		<tr>
-			<td>curso</td>
-			<td><select name=curso>
-					<option value="curso1">Curso 1</option>
-					<option value="curso2">Curso 2</option>
-					<option value="curso3">Curso 3</option>
-					<option value="curso4">Curso 4</4option>
-
-					<option value="curso5">Curso 5</option></td>
-		</tr>
-		<tr>
-			<td colspan=2><input type=submit></td>
-		</tr>
-	</table>
-</form>
-</body>
-</html>
-
+Buscador tipo : <?php echo $frm['tipo'] ?><br>
+
+	<table>
+		<tr>
+			<td>curso</td>
+			<td><select name=curso>
+					<option value="curso1">Curso 1</option>
+					<option value="curso2">Curso 2</option>
+					<option value="curso3">Curso 3</option>
+					<option value="curso4">Curso 4</4option>
+
+					<option value="curso5">Curso 5</option></td>
+		</tr>
+		<tr>
+			<td colspan=2><input type=submit></td>
+		</tr>
+	</table>
+</form>
+</body>
+</html>
+<?php
+
diff --git a/workflow/engine/methods/controls/buscador2.php b/workflow/engine/methods/controls/buscador2.php
index 301b360ae..caf25f13b 100755
--- a/workflow/engine/methods/controls/buscador2.php
+++ b/workflow/engine/methods/controls/buscador2.php
@@ -18,15 +18,16 @@ this program. If not, see
  * Coral Gables, FL, 33134, USA, or email info@colosa.com.
  *
  */
-<?php
-$frm = $HTTP_POST_VARS;
-
-$dbc = new dbconnection();
-$ses = new DBSession( $dbc );
-$sql = "update tickets set tipo = ' " . $frm['tipo'] . "', resultado = ' " . $frm['curso'] . "' where ticket =  '" . $frm['ticket'] . "' ";
-$ses->Execute( $sql );
+<?php
+$frm = $HTTP_POST_VARS;
+
+$dbc = new dbconnection();
+$ses = new DBSession( $dbc );
+$sql = "update tickets set tipo = ' " . $frm['tipo'] . "', resultado = ' " . $frm['curso'] . "' where ticket =  '" . $frm['ticket'] . "' ";
+$ses->Execute( $sql );
 ?>
 <script language="JavaScript">
   window.close();
 </script>
+<?php
 
diff --git a/workflow/engine/methods/controls/calendar.php b/workflow/engine/methods/controls/calendar.php
index ee4ad7a70..99a41d4fb 100755
--- a/workflow/engine/methods/controls/calendar.php
+++ b/workflow/engine/methods/controls/calendar.php
@@ -148,12 +148,13 @@ function set_datetime(n_datetime, b_close) {
 				</tr>
 				<tr>
 					<script language="JavaScript">
-<?php
+<?php
 // print weekdays titles
-for ($n = 0; $n < 7; $n ++)
-    print "<td bgcolor='#87cefa' align='center'><font color='#ffffff'>" . $ARR_WEEKDAYS[(NUM_WEEKSTART + n) % 7] . "</font></td>";
-print "</tr>";
-
+for ($n = 0; $n < 7; $n ++) {
+    print "<td bgcolor='#87cefa' align='center'><font color='#ffffff'>" . $ARR_WEEKDAYS[(NUM_WEEKSTART + n) % 7] . "</font></td>";
+}
+print "</tr>";
+
 ?>
 // print calendar table
 
@@ -194,10 +195,12 @@ if (obj_caller && obj_caller.time_comp) {
 }
 </script>
 
-			</table>
+    </table>
 
-	</tr>
-	</td>
+    </tr>
+    </td>
 </table>
 </body>
-</html>
\ No newline at end of file
+</html>
+<?php
+
diff --git a/workflow/engine/methods/controls/varsAjax.php b/workflow/engine/methods/controls/varsAjax.php
index 721f29d93..27004572c 100755
--- a/workflow/engine/methods/controls/varsAjax.php
+++ b/workflow/engine/methods/controls/varsAjax.php
@@ -1,152 +1,152 @@
-<?php
-/**
- * varsAjax.php
- *
- * ProcessMaker Open Source Edition
- * Copyright (C) 2004 - 2008 Colosa Inc.23
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- * For more information, contact Colosa Inc, 2566 Le Jeune Rd.,
- * Coral Gables, FL, 33134, USA, or email info@colosa.com.
- */
-G::LoadClass( 'xmlfield_InputPM' );
-$aFields = getDynaformsVars( $_POST['sProcess'], true, isset( $_POST['bIncMulSelFields'] ) ? $_POST['bIncMulSelFields'] : 0 );
-
-$sHTML = '<select name="_Var_Form_" id="_Var_Form_" size="' . count( $aFields ) . '" style="width:100%;' . (! isset( $_POST['sNoShowLeyend'] ) ? 'height:50%;' : '') . '" ondblclick="insertFormVar(\'' . $_POST['sFieldName'] . '\', this.value);">';
-foreach ($aFields as $aField) {
-    $sHTML .= '<option value="' . $_POST['sSymbol'] . $aField['sName'] . '">' . $_POST['sSymbol'] . $aField['sName'] . ' (' . $aField['sType'] . ')</option>';
-}
-
-$aRows[0] = Array ('fieldname' => 'char','variable' => 'char','type' => 'type','label' => 'char'
-);
-foreach ($aFields as $aField) {
-    $aRows[] = Array ('fieldname' => $_POST['sFieldName'],'variable' => $_POST['sSymbol'] . $aField['sName'],'variable_label' => '<div class="pm__dynavars"> <a id="dynalink" href=# onclick="insertFormVar(\'' . $_POST['sFieldName'] . '\',\'' . $_POST['sSymbol'] . $aField['sName'] . '\');">' . $_POST['sSymbol'] . $aField['sName'] . '</a></div>','type' => $aField['sType'],'label' => $aField['sLabel']
-    );
-}
-
-$sHTML .= '</select>';
-$sHTML = '';
-
-if (! isset( $_POST['sNoShowLeyend'] )) {
-    $sHTML = '<table width="100%">';
-    $sHTML .= '<tr><td align="center" class="module_app_input___gray" colspan="2"><b>Variables cast prefix</b></td></tr>';
-    if (isset( $_POST['sType'] )) {
-        $sHTML .= '<tr><td class="module_app_input___gray">' . G::LoadTranslation( 'ID_ESC' ) . '</td></tr>';
-        $sHTML .= '<tr><td class="module_app_input___gray">' . G::LoadTranslation( 'ID_NONEC' ) . '</td></tr>';
-        /*$sHTML .= '<tr><td class="module_app_input___gray">' . G::LoadTranslation('ID_EURL') . '</td></tr>';
-    $sHTML .= '<tr><td class="module_app_input___gray">' . G::LoadTranslation('ID_EVAL') . '</td></tr>';
-    $sHTML .= '<tr><td class="module_app_input___gray">' . G::LoadTranslation('ID_ESCJS') . '</td></tr>';
-    $sHTML .= '<tr><td class="module_app_input___gray">' . G::LoadTranslation('ID_ESCSJS') . '</td></tr>';
-    $sHTML .= '<tr><td class="module_app_input___gray">' . G::LoadTranslation('ID_FUNCTION') . '</td></tr>';*/
-    } else {
-        $sHTML .= '<tr><td class="module_app_input___gray" width="5%">@@</td><td class="module_app_input___gray">' . G::LoadTranslation( 'ID_TO_STRING' ) . '</td></tr>';
-        $sHTML .= '<tr><td class="module_app_input___gray" width="5%">@#</td><td class="module_app_input___gray">' . G::LoadTranslation( 'ID_TO_FLOAT' ) . '</td></tr>';
-        $sHTML .= '<tr><td class="module_app_input___gray" width="5%">@%</td><td class="module_app_input___gray">' . G::LoadTranslation( 'ID_TO_INTEGER' ) . '</td></tr>';
-        $sHTML .= '<tr><td class="module_app_input___gray" width="5%">@?</td><td class="module_app_input___gray">' . G::LoadTranslation( 'ID_TO_URL' ) . '</td></tr>';
-        $sHTML .= '<tr><td class="module_app_input___gray" width="5%">@$</td><td class="module_app_input___gray">' . G::LoadTranslation( 'ID_SQL_ESCAPE' ) . '</td></tr>';
-        $sHTML .= '<tr><td class="module_app_input___gray" width="5%">@=</td><td class="module_app_input___gray">' . G::LoadTranslation( 'ID_REPLACE_WITHOUT_CHANGES' ) . '</td></tr>';
-    }
-    $sHTML .= '<tr><td align="center" class="module_app_input___gray" colspan="2">&nbsp;</td></tr>';
-    //$sHTML .= '<tr><td align="center" class="module_app_input___gray" colspan="2">' . G::LoadTranslation('ID_DOCLICK') . '</td></tr>';
-    $sHTML .= '</table>';
-} else {
-    // please don't remove this definition if there isn't some sort of html tags before the css styles aren't loaded in IE
-    $sHTML = '<table width="100%">';
-    $sHTML .= '</table>';
-}
-$sStyle = " <style type=\"text/css\">
-
-.pm__dynavars a#dynalink{color:#000000;}
-
-/* begin css tabs */
-ul#tabnav { /* general settings */
-text-align: left; /* set to left, right or center */
-margin: 1em 0 1em 0; /* set margins as desired */
-font: bold 11px verdana, arial, sans-serif; /* set font as desired */
-border-bottom: 1px solid #ccc; /* set border COLOR as desired */
-list-style-type: none;
-padding: 3px 10px 3px 10px; /* THIRD number must change with respect to padding-top (X) below */
-}
-
-ul#tabnav li { /* do not change */
-display: inline;
-}
-
-div#all li.all, div#system li.system, div#process li.process, div#tab4 li.tab4 { /* settings for selected tab */
-border-bottom: 1px solid #fff; /* set border color to page background color */
-background-color: #fff; /* set background color to match above border color */
-}
-
-div#all li.all a, div#system li.system a, div#process li.process a, div#tab4 li.tab4 a { /* settings for selected tab link */
-background-color: #fff; /* set selected tab background color as desired */
-color: #000; /* set selected tab link color as desired */
-position: relative;
-top: 1px;
-padding-top: 4px; /* must change with respect to padding (X) above and below */
-}
-
-ul#tabnav li a { /* settings for all tab links */
-padding: 3px 4px; /* set padding (tab size) as desired; FIRST number must change with respect to padding-top (X) above */
-border: 1px solid #aaa; /* set border COLOR as desired; usually matches border color specified in #tabnav */
-background-color: #ccc; /* set unselected tab background color as desired */
-color: #666; /* set unselected tab link color as desired */
-margin-right: 10px; /* set additional spacing between tabs as desired */
-text-decoration: none;
-border-bottom: none;
-}
-
-ul#tabnav a:hover { /* settings for hover effect */
-background: #fff; /* set desired hover color */
-}
-
-/* end css tabs */
-
-</style>";
-$cssTabs = "<div id=\"all\">
-                <ul id=\"tabnav\">
-                    <li class=\"all\"><a href=\"#\" onclick=\"changeVariables('all','" . $_POST['sProcess'] . "','" . $_POST['sFieldName'] . "','" . $_POST['sSymbol'] . "','processVariablesContent');\">All variables</a></li>
-                    <li class=\"system\"><a href=\"#\" onclick=\"changeVariables('system','" . $_POST['sProcess'] . "','" . $_POST['sFieldName'] . "','" . $_POST['sSymbol'] . "','processVariablesContent');\">System</a></li>
-                    <li class=\"process\"><a href=\"#\" onclick=\"changeVariables('process','" . $_POST['sProcess'] . "','" . $_POST['sFieldName'] . "','" . $_POST['sSymbol'] . "','processVariablesContent');\">Process</a></li>
-                </ul>
-            </div>
-            ";
-echo $sHTML;
-echo $sStyle;
-
-////////////////////////////////////////////////////////
-
-
-echo "<div id=\"processVariablesContent\">";
-echo $cssTabs;
-G::LoadClass( 'ArrayPeer' );
-
-global $_DBArray;
-$_DBArray['dynavars'] = $aRows;
-$_SESSION['_DBArray'] = $_DBArray;
-
-G::LoadClass( 'ArrayPeer' );
-$oCriteria = new Criteria( 'dbarray' );
-$oCriteria->setDBArrayTable( 'dynavars' );
-
-$aFields = array ();
-
-$G_PUBLISH = new Publisher();
-$oHeadPublisher = & headPublisher::getSingleton();
-$oHeadPublisher->addScriptFile( "/jscore/controls/varsAjax.js" );
-$G_PUBLISH->AddContent( 'propeltable', 'paged-table', 'triggers/dynavars', $oCriteria );
-G::RenderPage( 'publish', 'raw' );
-
-echo "</div>";
-
+<?php
+/**
+ * varsAjax.php
+ *
+ * ProcessMaker Open Source Edition
+ * Copyright (C) 2004 - 2008 Colosa Inc.23
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * For more information, contact Colosa Inc, 2566 Le Jeune Rd.,
+ * Coral Gables, FL, 33134, USA, or email info@colosa.com.
+ */
+G::LoadClass( 'xmlfield_InputPM' );
+$aFields = getDynaformsVars( $_POST['sProcess'], true, isset( $_POST['bIncMulSelFields'] ) ? $_POST['bIncMulSelFields'] : 0 );
+
+$sHTML = '<select name="_Var_Form_" id="_Var_Form_" size="' . count( $aFields ) . '" style="width:100%;' . (! isset( $_POST['sNoShowLeyend'] ) ? 'height:50%;' : '') . '" ondblclick="insertFormVar(\'' . $_POST['sFieldName'] . '\', this.value);">';
+foreach ($aFields as $aField) {
+    $sHTML .= '<option value="' . $_POST['sSymbol'] . $aField['sName'] . '">' . $_POST['sSymbol'] . $aField['sName'] . ' (' . $aField['sType'] . ')</option>';
+}
+
+$aRows[0] = Array ('fieldname' => 'char','variable' => 'char','type' => 'type','label' => 'char'
+);
+foreach ($aFields as $aField) {
+    $aRows[] = Array ('fieldname' => $_POST['sFieldName'],'variable' => $_POST['sSymbol'] . $aField['sName'],'variable_label' => '<div class="pm__dynavars"> <a id="dynalink" href=# onclick="insertFormVar(\'' . $_POST['sFieldName'] . '\',\'' . $_POST['sSymbol'] . $aField['sName'] . '\');">' . $_POST['sSymbol'] . $aField['sName'] . '</a></div>','type' => $aField['sType'],'label' => $aField['sLabel']
+    );
+}
+
+$sHTML .= '</select>';
+$sHTML = '';
+
+if (! isset( $_POST['sNoShowLeyend'] )) {
+    $sHTML = '<table width="100%">';
+    $sHTML .= '<tr><td align="center" class="module_app_input___gray" colspan="2"><b>Variables cast prefix</b></td></tr>';
+    if (isset( $_POST['sType'] )) {
+        $sHTML .= '<tr><td class="module_app_input___gray">' . G::LoadTranslation( 'ID_ESC' ) . '</td></tr>';
+        $sHTML .= '<tr><td class="module_app_input___gray">' . G::LoadTranslation( 'ID_NONEC' ) . '</td></tr>';
+        /*$sHTML .= '<tr><td class="module_app_input___gray">' . G::LoadTranslation('ID_EURL') . '</td></tr>';
+        $sHTML .= '<tr><td class="module_app_input___gray">' . G::LoadTranslation('ID_EVAL') . '</td></tr>';
+        $sHTML .= '<tr><td class="module_app_input___gray">' . G::LoadTranslation('ID_ESCJS') . '</td></tr>';
+        $sHTML .= '<tr><td class="module_app_input___gray">' . G::LoadTranslation('ID_ESCSJS') . '</td></tr>';
+        $sHTML .= '<tr><td class="module_app_input___gray">' . G::LoadTranslation('ID_FUNCTION') . '</td></tr>';*/
+    } else {
+        $sHTML .= '<tr><td class="module_app_input___gray" width="5%">@@</td><td class="module_app_input___gray">' . G::LoadTranslation( 'ID_TO_STRING' ) . '</td></tr>';
+        $sHTML .= '<tr><td class="module_app_input___gray" width="5%">@#</td><td class="module_app_input___gray">' . G::LoadTranslation( 'ID_TO_FLOAT' ) . '</td></tr>';
+        $sHTML .= '<tr><td class="module_app_input___gray" width="5%">@%</td><td class="module_app_input___gray">' . G::LoadTranslation( 'ID_TO_INTEGER' ) . '</td></tr>';
+        $sHTML .= '<tr><td class="module_app_input___gray" width="5%">@?</td><td class="module_app_input___gray">' . G::LoadTranslation( 'ID_TO_URL' ) . '</td></tr>';
+        $sHTML .= '<tr><td class="module_app_input___gray" width="5%">@$</td><td class="module_app_input___gray">' . G::LoadTranslation( 'ID_SQL_ESCAPE' ) . '</td></tr>';
+        $sHTML .= '<tr><td class="module_app_input___gray" width="5%">@=</td><td class="module_app_input___gray">' . G::LoadTranslation( 'ID_REPLACE_WITHOUT_CHANGES' ) . '</td></tr>';
+    }
+    $sHTML .= '<tr><td align="center" class="module_app_input___gray" colspan="2">&nbsp;</td></tr>';
+    //$sHTML .= '<tr><td align="center" class="module_app_input___gray" colspan="2">' . G::LoadTranslation('ID_DOCLICK') . '</td></tr>';
+    $sHTML .= '</table>';
+} else {
+    // please don't remove this definition if there isn't some sort of html tags before the css styles aren't loaded in IE
+    $sHTML = '<table width="100%">';
+    $sHTML .= '</table>';
+}
+$sStyle = " <style type=\"text/css\">
+
+.pm__dynavars a#dynalink{color:#000000;}
+
+/* begin css tabs */
+ul#tabnav { /* general settings */
+text-align: left; /* set to left, right or center */
+margin: 1em 0 1em 0; /* set margins as desired */
+font: bold 11px verdana, arial, sans-serif; /* set font as desired */
+border-bottom: 1px solid #ccc; /* set border COLOR as desired */
+list-style-type: none;
+padding: 3px 10px 3px 10px; /* THIRD number must change with respect to padding-top (X) below */
+}
+
+ul#tabnav li { /* do not change */
+display: inline;
+}
+
+div#all li.all, div#system li.system, div#process li.process, div#tab4 li.tab4 { /* settings for selected tab */
+border-bottom: 1px solid #fff; /* set border color to page background color */
+background-color: #fff; /* set background color to match above border color */
+}
+
+div#all li.all a, div#system li.system a, div#process li.process a, div#tab4 li.tab4 a { /* settings for selected tab link */
+background-color: #fff; /* set selected tab background color as desired */
+color: #000; /* set selected tab link color as desired */
+position: relative;
+top: 1px;
+padding-top: 4px; /* must change with respect to padding (X) above and below */
+}
+
+ul#tabnav li a { /* settings for all tab links */
+padding: 3px 4px; /* set padding (tab size) as desired; FIRST number must change with respect to padding-top (X) above */
+border: 1px solid #aaa; /* set border COLOR as desired; usually matches border color specified in #tabnav */
+background-color: #ccc; /* set unselected tab background color as desired */
+color: #666; /* set unselected tab link color as desired */
+margin-right: 10px; /* set additional spacing between tabs as desired */
+text-decoration: none;
+border-bottom: none;
+}
+
+ul#tabnav a:hover { /* settings for hover effect */
+background: #fff; /* set desired hover color */
+}
+
+/* end css tabs */
+
+</style>";
+$cssTabs = "<div id=\"all\">
+                <ul id=\"tabnav\">
+                    <li class=\"all\"><a href=\"#\" onclick=\"changeVariables('all','" . $_POST['sProcess'] . "','" . $_POST['sFieldName'] . "','" . $_POST['sSymbol'] . "','processVariablesContent');\">All variables</a></li>
+                    <li class=\"system\"><a href=\"#\" onclick=\"changeVariables('system','" . $_POST['sProcess'] . "','" . $_POST['sFieldName'] . "','" . $_POST['sSymbol'] . "','processVariablesContent');\">System</a></li>
+                    <li class=\"process\"><a href=\"#\" onclick=\"changeVariables('process','" . $_POST['sProcess'] . "','" . $_POST['sFieldName'] . "','" . $_POST['sSymbol'] . "','processVariablesContent');\">Process</a></li>
+                </ul>
+            </div>
+            ";
+echo $sHTML;
+echo $sStyle;
+
+////////////////////////////////////////////////////////
+
+
+echo "<div id=\"processVariablesContent\">";
+echo $cssTabs;
+G::LoadClass( 'ArrayPeer' );
+
+global $_DBArray;
+$_DBArray['dynavars'] = $aRows;
+$_SESSION['_DBArray'] = $_DBArray;
+
+G::LoadClass( 'ArrayPeer' );
+$oCriteria = new Criteria( 'dbarray' );
+$oCriteria->setDBArrayTable( 'dynavars' );
+
+$aFields = array ();
+
+$G_PUBLISH = new Publisher();
+$oHeadPublisher = & headPublisher::getSingleton();
+$oHeadPublisher->addScriptFile( "/jscore/controls/varsAjax.js" );
+$G_PUBLISH->AddContent( 'propeltable', 'paged-table', 'triggers/dynavars', $oCriteria );
+G::RenderPage( 'publish', 'raw' );
+
+echo "</div>";
+
diff --git a/workflow/engine/methods/controls/varsAjaxByType.php b/workflow/engine/methods/controls/varsAjaxByType.php
index f86361002..eedeef09d 100755
--- a/workflow/engine/methods/controls/varsAjaxByType.php
+++ b/workflow/engine/methods/controls/varsAjaxByType.php
@@ -1,66 +1,65 @@
-<?php
-/**
- * varsAjax.php
- *
- * ProcessMaker Open Source Edition
- * Copyright (C) 2004 - 2008 Colosa Inc.23
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- * For more information, contact Colosa Inc, 2566 Le Jeune Rd.,
- * Coral Gables, FL, 33134, USA, or email info@colosa.com.
- */
-
-/**
- * the varAjaxByType file as the varAjax.php handle the render of the diferent
- * types of dynaform variables there are 3 of them system, process, and the default
- * that show both system and process variables.
- * uses almost the same variables passed to varsAjax, plus $_POST['type'] that is the
- * type of the variables. Then it render a propel table with all the variables
- * loaded for that type.
- *
- * @author Gustavo Cruz gustavo-at-colosa.com
- * @param $_POST variables
- */
-
-G::LoadClass( 'xmlfield_InputPM' );
-$aFields = getDynaformsVars( $_POST['sProcess'], true, isset( $_POST['bIncMulSelFields'] ) ? $_POST['bIncMulSelFields'] : 0 );
-$aType = $_POST['type'];
-
-$aRows[0] = Array ('fieldname' => 'char','variable' => 'char','type' => 'type','label' => 'char'
-);
-foreach ($aFields as $aField) {
-    switch ($aType) {
-        case "system":
-            if ($aField['sType'] == "system") {
-                $aRows[] = Array ('fieldname' => $_POST['sFieldName'],'variable' => $_POST['sSymbol'] . $aField['sName'],'variable_label' => '<div class="pm__dynavars"> <a id="dynalink" href=# onclick="insertFormVar(\'' . $_POST['sFieldName'] . '\',\'' . $_POST['sSymbol'] . $aField['sName'] . '\');">' . $_POST['sSymbol'] . $aField['sName'] . '</a></div>','type' => $aField['sType'],'label' => $aField['sLabel']
-                );
-            }
-            break;
-        case "process":
-            if ($aField['sType'] != "system") {
-                $aRows[] = Array ('fieldname' => $_POST['sFieldName'],'variable' => $_POST['sSymbol'] . $aField['sName'],'variable_label' => '<div class="pm__dynavars"> <a id="dynalink" href=# onclick="insertFormVar(\'' . $_POST['sFieldName'] . '\',\'' . $_POST['sSymbol'] . $aField['sName'] . '\');">' . $_POST['sSymbol'] . $aField['sName'] . '</a></div>','type' => $aField['sType'],'label' => $aField['sLabel']
-                );
-            }
-            break;
-        default:
-            $aRows[] = Array ('fieldname' => $_POST['sFieldName'],'variable' => $_POST['sSymbol'] . $aField['sName'],'variable_label' => '<div class="pm__dynavars"> <a id="dynalink" href=# onclick="insertFormVar(\'' . $_POST['sFieldName'] . '\',\'' . $_POST['sSymbol'] . $aField['sName'] . '\');">' . $_POST['sSymbol'] . $aField['sName'] . '</a></div>','type' => $aField['sType'],'label' => $aField['sLabel']
-            );
-            break;
-    }
-
-}
+<?php
+/**
+ * varsAjax.php
+ *
+ * ProcessMaker Open Source Edition
+ * Copyright (C) 2004 - 2008 Colosa Inc.23
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * For more information, contact Colosa Inc, 2566 Le Jeune Rd.,
+ * Coral Gables, FL, 33134, USA, or email info@colosa.com.
+ */
+
+/**
+ * the varAjaxByType file as the varAjax.php handle the render of the diferent
+ * types of dynaform variables there are 3 of them system, process, and the default
+ * that show both system and process variables.
+ * uses almost the same variables passed to varsAjax, plus $_POST['type'] that is the
+ * type of the variables. Then it render a propel table with all the variables
+ * loaded for that type.
+ *
+ * @author Gustavo Cruz gustavo-at-colosa.com
+ * @param $_POST variables
+ */
+
+G::LoadClass( 'xmlfield_InputPM' );
+$aFields = getDynaformsVars( $_POST['sProcess'], true, isset( $_POST['bIncMulSelFields'] ) ? $_POST['bIncMulSelFields'] : 0 );
+$aType = $_POST['type'];
+
+$aRows[0] = Array ('fieldname' => 'char','variable' => 'char','type' => 'type','label' => 'char');
+foreach ($aFields as $aField) {
+    switch ($aType) {
+        case "system":
+            if ($aField['sType'] == "system") {
+                $aRows[] = Array ('fieldname' => $_POST['sFieldName'],'variable' => $_POST['sSymbol'] . $aField['sName'],'variable_label' => '<div class="pm__dynavars"> <a id="dynalink" href=# onclick="insertFormVar(\'' . $_POST['sFieldName'] . '\',\'' . $_POST['sSymbol'] . $aField['sName'] . '\');">' . $_POST['sSymbol'] . $aField['sName'] . '</a></div>','type' => $aField['sType'],'label' => $aField['sLabel']
+                );
+            }
+            break;
+        case "process":
+            if ($aField['sType'] != "system") {
+                $aRows[] = Array ('fieldname' => $_POST['sFieldName'],'variable' => $_POST['sSymbol'] . $aField['sName'],'variable_label' => '<div class="pm__dynavars"> <a id="dynalink" href=# onclick="insertFormVar(\'' . $_POST['sFieldName'] . '\',\'' . $_POST['sSymbol'] . $aField['sName'] . '\');">' . $_POST['sSymbol'] . $aField['sName'] . '</a></div>','type' => $aField['sType'],'label' => $aField['sLabel']
+                );
+            }
+            break;
+        default:
+            $aRows[] = Array ('fieldname' => $_POST['sFieldName'],'variable' => $_POST['sSymbol'] . $aField['sName'],'variable_label' => '<div class="pm__dynavars"> <a id="dynalink" href=# onclick="insertFormVar(\'' . $_POST['sFieldName'] . '\',\'' . $_POST['sSymbol'] . $aField['sName'] . '\');">' . $_POST['sSymbol'] . $aField['sName'] . '</a></div>','type' => $aField['sType'],'label' => $aField['sLabel']
+            );
+            break;
+    }
+
+}
 // Use and make a load translation variable call to the titles of the tabs
 $cssTabs = "<div id=\"" . strtolower( $_POST['type'] ) . "\">
                 <ul id=\"tabnav\">
@@ -69,21 +68,21 @@ $cssTabs = "<div id=\"" . strtolower( $_POST['type'] ) . "\">
                     <li class=\"process\"><a href=\"#\" onclick=\"changeVariables('process','" . $_POST['sProcess'] . "','" . $_POST['sFieldName'] . "','" . $_POST['sSymbol'] . "','processVariablesContent');\">Process</a></li>
                 </ul>
             </div>
-            ";
-
-echo $cssTabs;
-G::LoadClass( 'ArrayPeer' );
-
-global $_DBArray;
-$_DBArray['dynavars'] = $aRows;
-$_SESSION['_DBArray'] = $_DBArray;
-
-G::LoadClass( 'ArrayPeer' );
-$oCriteria = new Criteria( 'dbarray' );
-$oCriteria->setDBArrayTable( 'dynavars' );
-
-$aFields = array ();
-$G_PUBLISH = new Publisher();
-$G_PUBLISH->AddContent( 'propeltable', 'paged-table', 'triggers/dynavars', $oCriteria );
-G::RenderPage( 'publish', 'raw' );
-
+            ";
+
+echo $cssTabs;
+G::LoadClass( 'ArrayPeer' );
+
+global $_DBArray;
+$_DBArray['dynavars'] = $aRows;
+$_SESSION['_DBArray'] = $_DBArray;
+
+G::LoadClass( 'ArrayPeer' );
+$oCriteria = new Criteria( 'dbarray' );
+$oCriteria->setDBArrayTable( 'dynavars' );
+
+$aFields = array ();
+$G_PUBLISH = new Publisher();
+$G_PUBLISH->AddContent( 'propeltable', 'paged-table', 'triggers/dynavars', $oCriteria );
+G::RenderPage( 'publish', 'raw' );
+