Merge pull request #374 from hector-cortez/BUG-8753

BUG 8753 Short Tags are Still Present as of Version 2.0.38 SOLVED
2012-07-23 08:40:54 -07:00
parent 7c1d485179 9bbf93da0c
commit d2e823f028
19 changed files with 69 additions and 69 deletions
--- a/workflow/engine/includes/inc.JSForms.php
+++ b/workflow/engine/includes/inc.JSForms.php
@@ -58,18 +58,18 @@ function RefreshDependentFields(ObjectName, Fields, InitValue) {

        if(FldObj){
        	if(FldObj.type == 'text'){
-        		refillText( Fields[i],'<?=$serverAjax?>', 'function=text&field=' + Fields[i] + '&parent=' + ObjectName + '&value=' + TheObject.value + '<?=$Dynaform?>'+ '&application=' + '<?=$appid?>'+ '&Dynaform=' + '<?=$Dynaform?>' );
+                refillText( Fields[i],'<?php echo $serverAjax?>', 'function=text&field=' + Fields[i] + '&parent=' + ObjectName + '&value=' + TheObject.value + '<?php echo $Dynaform?>'+ '&application=' + '<?php echo $appid?>'+ '&Dynaform=' + '<?php echo $Dynaform?>' );
        	}
        	if(FldObj.type == 'hidden'){
-        		refillText( Fields[i],'<?=$serverAjax?>', 'function=text&field=' + Fields[i] + '&parent=' + ObjectName + '&value=' + TheObject.value + '<?=$Dynaform?>'+ '&application=' + '<?=$appid?>'+ '&Dynaform=' + '<?=$Dynaform?>' );
+                refillText( Fields[i],'<?php echo $serverAjax?>', 'function=text&field=' + Fields[i] + '&parent=' + ObjectName + '&value=' + TheObject.value + '<?php echo $Dynaform?>'+ '&application=' + '<?php echo $appid?>'+ '&Dynaform=' + '<?php echo $Dynaform?>' );
        	}
        	
        	if(FldObj.type == 'select-one') {
-        		refillDropdown( Fields[i],'<?=$serverAjax?>', 'function=dropdown&field=' + Fields[i] + '&parent=' + ObjectName + '&value=' + TheObject.value + '<?=$Dynaform?>'+ '&application=' + '<?=$appid?>'+ '&Dynaform=' + '<?=$Dynaform?>'+ '&InitValue=' + InitValue , InitValue);
+                refillDropdown( Fields[i],'<?php echo $serverAjax?>', 'function=dropdown&field=' + Fields[i] + '&parent=' + ObjectName + '&value=' + TheObject.value + '<?php echo $Dynaform?>'+ '&application=' + '<?php echo $appid?>'+ '&Dynaform=' + '<?php echo $Dynaform?>'+ '&InitValue=' + InitValue , InitValue);
        	}
        }else{
        	if(DivObj)
-        		refillCaption( Fields[i],'<?=$serverAjax?>', 'function=text&field=' + Fields[i] + '&parent=' + ObjectName + '&value=' + TheObject.value + '<?=$Dynaform?>'+ '&application=' + '<?=$appid?>'+ '&Dynaform=' + '<?=$Dynaform?>' );
+                refillCaption( Fields[i],'<?php echo $serverAjax?>', 'function=text&field=' + Fields[i] + '&parent=' + ObjectName + '&value=' + TheObject.value + '<?php echo $Dynaform?>'+ '&application=' + '<?php echo $appid?>'+ '&Dynaform=' + '<?php echo $Dynaform?>' );
        }
      }
    }
@@ -111,7 +111,7 @@ else
    break;
  }
 ?>
-  myDatePicker.displayDateFormat = '<?=$TheDateFormat?>';
+  myDatePicker.displayDateFormat = '<?php echo $TheDateFormat?>';
  myDatePicker.fieldName  = fieldName;
 	myDatePicker.loadSkin('win2k');
 	myDatePicker.daysNumChars = 2;
--- a/workflow/engine/methods/cases/cases_StepToRevise.php
+++ b/workflow/engine/methods/cases/cases_StepToRevise.php
@@ -153,7 +153,7 @@ if (!isset($_GET['ex'])) {
 // DEPRECATED this JS section is marked for removal
 function setSelect()
 {
-  var ex=<?=$_GET['ex']?>;
+  var ex=<?php echo $_GET['ex']?>;
  try {
    for(i=1; i<50; i++) {
      if (i == ex) {
--- a/workflow/engine/methods/cases/cases_StepToReviseInputs.php
+++ b/workflow/engine/methods/cases/cases_StepToReviseInputs.php
@@ -161,7 +161,7 @@ G::RenderPage('publish', 'blank');
 //Deprecated Section since the interface are now movig to ExtJS
 function setSelect()
 {
-    var ex=<?=$_GET['ex']?>;
+    var ex=<?php echo $_GET['ex']?>;
    try {
        for (i=1; i<50; i++) {
            if (i == ex) {
--- a/workflow/engine/methods/cases/cases_StepToReviseOutputs.php
+++ b/workflow/engine/methods/cases/cases_StepToReviseOutputs.php
@@ -84,7 +84,7 @@ if (!isset($_GET['ex'])) {
 //Deprecated Section since the interface are now movig to ExtJS
 function setSelect()
 {
-    var ex=<?=$_GET['ex']?>;
+    var ex=<?php echo $_GET['ex']?>;
    try{
        for (i=1; i<50; i++) {
            if (i == ex) {
--- a/workflow/engine/methods/cases/cases_ToReviseOutputDocView.php
+++ b/workflow/engine/methods/cases/cases_ToReviseOutputDocView.php
@@ -101,7 +101,7 @@ if(!isset($_GET['ex'])) $_GET['ex']=0;
 /*------------------------------ To Revise Routines ---------------------------*/
 function setSelect()
 {
-  var ex=<?=$_GET['ex']?>;
+  var ex=<?php echo $_GET['ex']?>;
  try{
    for(i=1; i<50; i++)
    {
--- a/workflow/engine/methods/controls/buscador.php
+++ b/workflow/engine/methods/controls/buscador.php
@@ -28,9 +28,9 @@

 <h1>demo de buscador</h1>
 <form method=post action="buscador2.php">
-<input type=hidden name=ticket value="<?= $frm['ticket'] ?>" >
-<input type=hidden name=tipo value="<?= $frm['tipo'] ?>" >
-Buscador tipo : <?= $frm['tipo'] ?><br>
+<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>
--- a/workflow/engine/methods/dynaforms/dynaforms_FlatEditor.php
+++ b/workflow/engine/methods/dynaforms/dynaforms_FlatEditor.php
@@ -193,12 +193,12 @@ if (($RBAC_Response=$RBAC->userCanAccess("PM_FACTORY"))!=1) return $RBAC_Respons
 <script>
  var toolbar = document.getElementById('fields_Toolbar')
  var fieldsList = document.getElementById('dynaformEditor[0]')
-  var tableHeight=<?= $config['FieldsList']['height'] ?>;
-  var tableWidth=<?= $config['FieldsList']['width'] ?>;
-  var toolbarTop=<?= $config['Toolbar']['top'] ?>;
-  var toolbarLeft=<?= $config['Toolbar']['left'] ?>;
-  var fieldsListTop=<?= $config['FieldsList']['top'] ?>//(toolbarTop+toolbar.clientHeight+44+8 );
-  var fieldsListLeft=<?= $config['FieldsList']['left'] ?>;
+  var tableHeight=<?php echo $config['FieldsList']['height'] ?>;
+  var tableWidth=<?php echo $config['FieldsList']['width'] ?>;
+  var toolbarTop=<?php echo $config['Toolbar']['top'] ?>;
+  var toolbarLeft=<?php echo $config['Toolbar']['left'] ?>;
+  var fieldsListTop=<?php echo $config['FieldsList']['top'] ?>//(toolbarTop+toolbar.clientHeight+44+8 );
+  var fieldsListLeft=<?php echo $config['FieldsList']['left'] ?>;
  mainPanel.elements.headerBar.style.backgroundColor='#CBDAEF';
  mainPanel.elements.headerBar.style.borderBottom='1px solid #808080';
  mainPanel.elements.headerBar.appendChild(toolbar);
--- a/workflow/engine/methods/services/demoSoap.php
+++ b/workflow/engine/methods/services/demoSoap.php
@@ -67,7 +67,7 @@ a.krumo-name {
 	<ul class="krumo-node krumo-first">
 	  <div class="krumo-element" >
 			End Point <input type="text" size="80" maxlength="160" name="epr" 
-          value="<?= $endpoint ?>" >
+          value="<?php echo $endpoint ?>" >
 			<input type="submit" value="change endpoint" name="action">
 	  </div>
 	</ul>
@@ -238,17 +238,17 @@ a.krumo-name {
 	  <div class="krumo-element" >
 			status_code
 			(<em class="krumo-type">Integer</em>)
-			<strong class="krumo-integer"><?= $result->error->number ?></strong> 
+			<strong class="krumo-integer"><?php echo $result->error->number ?></strong>
 	  </div>
 	  <div class="krumo-element" >
 			message
 			(<em class="krumo-type">string</em>)
-			<strong class="krumo-integer"><?= $result->error->name ?></strong> 
+			<strong class="krumo-integer"><?php echo $result->error->name ?></strong>
 	  </div>
 	  <div class="krumo-element" >
 			timestamp
 			(<em class="krumo-type">string</em>)
-			<strong class="krumo-integer"><?= $result->error->description ?></strong> 
+			<strong class="krumo-integer"><?php echo $result->error->description ?></strong>
 	  </div>
    </li>
 	</ul>
--- a/workflow/engine/methods/setup/language.php
+++ b/workflow/engine/methods/setup/language.php
@@ -40,7 +40,7 @@ if (($RBAC_Response=$RBAC->userCanAccess("PM_SETUP"))!=1) return $RBAC_Response;
    
    if((DESCRIPTION.value == ""))   
    {
-    	alert ("<?= G::LoadTranslation("ID_MSG_ERROR_LANGUAGE_DESCRIPTION")?>"); 
+        alert ("<?php echo G::LoadTranslation("ID_MSG_ERROR_LANGUAGE_DESCRIPTION")?>");
    	DESCRIPTION.focus();
    	return;
    }
--- a/workflow/engine/methods/setup/location.php
+++ b/workflow/engine/methods/setup/location.php
@@ -70,21 +70,21 @@ G::RenderPage( 'publish' );
 ?>

 <script language="javascript">
-rowNumber=<?=$r?>;
+rowNumber=<?php echo $r?>;
 attachFunctionEventOnChange(document.getElementById('form[USR_CITY]'),changeRegion);
 attachFunctionEventOnChange(document.getElementById('form[USR_COUNTRY]'),changeRegion);
 function changeCity()
 {
 	var country=document.getElementById('form[USR_COUNTRY]');
 	var city=document.getElementById('form[USR_CITY]');
-	ajax_function('<?=G::encryptLink('cityAjax.php')?>','changeCity','row='+rowNumber+'&country='+encodeURIComponent(country.value)+'&city='+encodeURIComponent(city.value));
+	ajax_function('<?php echo G::encryptLink('cityAjax.php')?>','changeCity','row='+rowNumber+'&country='+encodeURIComponent(country.value)+'&city='+encodeURIComponent(city.value));
 }
 function addLocation()
 {
 	var lr = document.getElementById('lastRow');
 	var city=document.getElementById('form[USR_CITY]');
 	if (newLocation.value=='') return;
-	lr.outerHTML=ajax_function('<?=G::encryptLink('cityAjax.php')?>','newLocation','row='+rowNumber+'&location='+encodeURIComponent(newLocation.value)+'&city='+encodeURIComponent(city.value));
+	lr.outerHTML=ajax_function('<?php echo G::encryptLink('cityAjax.php')?>','newLocation','row='+rowNumber+'&location='+encodeURIComponent(newLocation.value)+'&city='+encodeURIComponent(city.value));
 	rowNumber++;
 	newLocation.value='';
 }
@@ -92,7 +92,7 @@ function deleteLocation(locat)
 {
 	var lr = document.getElementById('DIV_LOCATIONS');
 	var city=document.getElementById('form[USR_CITY]');
-	lr.innerHTML=ajax_function('<?=G::encryptLink('cityAjax.php')?>','delLocation','row='+rowNumber+'&uid='+encodeURIComponent(locat)+'&city='+encodeURIComponent(city.value));
+	lr.innerHTML=ajax_function('<?php echo G::encryptLink('cityAjax.php')?>','delLocation','row='+rowNumber+'&uid='+encodeURIComponent(locat)+'&city='+encodeURIComponent(city.value));
 	rowNumber--;
 }
 function changeRegion()
@@ -105,23 +105,23 @@ function changeRegion()
 	{
 		var city=document.getElementById('form[USR_CITY]');
 		var lr = document.getElementById('DIV_LOCATIONS');
-		lr.innerHTML=ajax_function('<?=G::encryptLink('cityAjax.php')?>','changeRegion','city='+encodeURIComponent(city.value));
-		rowNumber=ajax_function('<?=G::encryptLink('cityAjax.php')?>','getRowRegion','city='+encodeURIComponent(city.value));
+		lr.innerHTML=ajax_function('<?php echo G::encryptLink('cityAjax.php')?>','changeRegion','city='+encodeURIComponent(city.value));
+		rowNumber=ajax_function('<?php echo G::encryptLink('cityAjax.php')?>','getRowRegion','city='+encodeURIComponent(city.value));
 	}
 }
 function changeCities()
 {
 	var country=document.getElementById('form[USR_COUNTRY]');
 	var lr = document.getElementById('DIV_LOCATIONS');
-	lr.innerHTML=ajax_function('<?=G::encryptLink('cityAjax.php')?>','changecities','country='+encodeURIComponent(country.value));
-	rowNumber=ajax_function('<?=G::encryptLink('cityAjax.php')?>','getRowCities','country='+encodeURIComponent(country.value));
+	lr.innerHTML=ajax_function('<?php echo G::encryptLink('cityAjax.php')?>','changecities','country='+encodeURIComponent(country.value));
+	rowNumber=ajax_function('<?php echo G::encryptLink('cityAjax.php')?>','getRowCities','country='+encodeURIComponent(country.value));
 }
 function addCity()
 {
 	var lr = document.getElementById('lastRow');
 	var country=document.getElementById('form[USR_COUNTRY]');
 	if (newCity.value=='') return;
-	lr.outerHTML=ajax_function('<?=G::encryptLink('cityAjax.php')?>','addCity','row='+rowNumber+'&city='+encodeURIComponent(newCity.value)+'&country='+encodeURIComponent(country.value));
+	lr.outerHTML=ajax_function('<?php echo G::encryptLink('cityAjax.php')?>','addCity','row='+rowNumber+'&city='+encodeURIComponent(newCity.value)+'&country='+encodeURIComponent(country.value));
 	rowNumber++;
 	newCity.value='';
 	//Refresh the city's dropdown
@@ -135,7 +135,7 @@ function deleteCity(locat)
 {
 	var lr = document.getElementById('DIV_LOCATIONS');
 	var country=document.getElementById('form[USR_COUNTRY]');
-	lr.innerHTML=ajax_function('<?=G::encryptLink('cityAjax.php')?>','delCity','row='+rowNumber+'&uid='+encodeURIComponent(locat)+'&country='+encodeURIComponent(country.value));
+	lr.innerHTML=ajax_function('<?php echo G::encryptLink('cityAjax.php')?>','delCity','row='+rowNumber+'&uid='+encodeURIComponent(locat)+'&country='+encodeURIComponent(country.value));
 	rowNumber--;
 	//Refresh the city's dropdown
 	attachFunctionEventOnChange(document.getElementById('form[USR_CITY]'),null);
--- a/workflow/engine/methods/setup/weekend.php
+++ b/workflow/engine/methods/setup/weekend.php
@@ -72,7 +72,7 @@ function on_submit(myForm)
 		days+=','+cb.id;
 		values+=','+cb.checked;
 	}
-	ajax_function('<?=G::encryptLink('weekendAjax.php');?>','setDays','days='+days+'&values='+values);
+	ajax_function('<?php echo G::encryptLink('weekendAjax.php');?>','setDays','days='+days+'&values='+values);
 	document.location.reload(true);
 }
 function ajax_function(ajax_server, funcion, parameters)
--- a/workflow/engine/templates/dynaforms/fieldsHandler.php
+++ b/workflow/engine/templates/dynaforms/fieldsHandler.php
@@ -77,7 +77,7 @@

      ?>
      <script>
-        parent.jsMeta = "<? echo $boot_strap['__ATTRIBUTES__']['meta'] ?>";
+        parent.jsMeta = "<?php echo $boot_strap['__ATTRIBUTES__']['meta'] ?>";
      </script>
      <?php
 		}