Merge branch 'pm_wysiwyg'

workflow/engine/PmBootstrap.php

@@ -91,6 +91,7 @@ class PmBootstrap extends Bootstrap
         $this->autoloader->registerClass('menu', PATH_GULLIVER . 'class.menu');
         $this->autoloader->registerClass('xmlMenu', PATH_GULLIVER . 'class.xmlMenu');
         $this->autoloader->registerClass('dvEditor', PATH_GULLIVER . 'class.dvEditor');
+        $this->autoloader->registerClass('wysiwygEditor', PATH_GULLIVER . 'class.wysiwygEditor');
         $this->autoloader->registerClass('Controller', PATH_GULLIVER . 'class.controller');
         $this->autoloader->registerClass('HttpProxyController', PATH_GULLIVER . 'class.httpProxyController');
         $this->autoloader->registerClass('PmException', PATH_GULLIVER . 'class.pmException');
@@ -147,6 +148,7 @@ class PmBootstrap extends Bootstrap
         $oHeadPublisher->addMaborakFile(PATH_GULLIVER_HOME . 'js' . PATH_SEP . 'common/core/effects.js' );
         $oHeadPublisher->addMaborakFile(PATH_GULLIVER_HOME . 'js' . PATH_SEP . 'common/core/webResource.js' );
         $oHeadPublisher->addMaborakFile(PATH_GULLIVER_HOME . 'js' . PATH_SEP . 'dveditor/core/dveditor.js' );
+        $oHeadPublisher->addMaborakFile(PATH_GULLIVER_HOME . 'js' . PATH_SEP . 'tinymce/jscripts/tiny_mce/tiny_mce.js' );
         $oHeadPublisher->addMaborakFile(PATH_GULLIVER_HOME . 'js' . PATH_SEP . 'common/tree/tree.js' );
         $oHeadPublisher->addMaborakFile(PATH_GULLIVER_HOME . 'js' . PATH_SEP . 'json/core/json.js' );
         $oHeadPublisher->addMaborakFile(PATH_GULLIVER_HOME . 'js' . PATH_SEP . 'form/core/form.js' );

workflow/engine/bin/tasks/libraries.json

@@ -79,6 +79,12 @@
                 "full": "gulliver/js/widgets/tooltip/pmtooltip.js",
                 "mini": "gulliver/js/widgets/tooltip/pmtooltip.js",
                 "minify": true
+            },
+            {
+                "name": "tinymce",
+                "full": "gulliver/js/tinymce/jscripts/tiny_mce/tiny_mce_src.js",
+                "mini": "gulliver/js/tinymce/jscripts/tiny_mce/tiny_mce_src.js",
+                "minify": true
             }
         ],
         "build" : true,

workflow/engine/classes/class.xmlfield_InputPM.php

@@ -207,7 +207,7 @@ class XmlForm_Field_TextareaPM extends XmlForm_Field
      * @param eter string owner
      * @return string
      */
-    public function renderGrid ($values = null, $owner)
+    public function renderGrid ($owner, $values = null)
     {
         $result = array ();
         $r = 1;
@@ -320,7 +320,7 @@ class XmlForm_Field_hours extends XmlForm_Field_SimpleText
      * @param eter string owner
      * @return string
      */
-    public function renderGrid ($values = array(), $owner)
+    public function renderGrid ($values = array(),$owner)
     {
         $result = array ();
         $r = 1;
@@ -380,8 +380,7 @@ function getDynaformsVars ($sProcessUID, $bSystemVars = true, $bIncMulSelFields
     if ($bSystemVars) {
         $aAux = G::getSystemConstants();
         foreach ($aAux as $sName => $sValue) {
-            $aFields[] = array ('sName' => $sName,'sType' => 'system','sLabel' => 'System variable'
-            );
+            $aFields[] = array ('sName' => $sName,'sType' => 'system','sLabel' => 'System variable');
         }
         //we're adding the ping variable to the system list
         $aFields[] = array ('sName' => 'PIN','sType' => 'system','sLabel' => 'System variable'

workflow/engine/classes/model/OutputDocument.php

@@ -108,6 +108,7 @@ class OutputDocument extends BaseOutputDocument
             if (!is_null($oOutputDocument)) {
                 $aFields = $oOutputDocument->toArray(BasePeer::TYPE_FIELDNAME);
                 $aFields['OUT_DOC_TITLE']       = $oOutputDocument->getOutDocTitle();
+                $aFields['PRO_UID']             = $oOutputDocument->getProUid();
                 $aFields['OUT_DOC_DESCRIPTION'] = $oOutputDocument->getOutDocDescription();
                 $aFields['OUT_DOC_FILENAME']    = $oOutputDocument->getOutDocFilename();
                 $aFields['OUT_DOC_TEMPLATE']    = $oOutputDocument->getOutDocTemplate();

workflow/engine/js/controls/variablePicker.js

@@ -0,0 +1,117 @@
+var setVariablePickerJS = function(){       
+    
+    document.getElementById('_Var_Form_').addEventListener('dblclick', function(){
+        if (this.getAttribute('displayOption')=='event'){
+            e.insertFormVar(this.value.substring(2), this.value.substring(2), 'dyn' );
+        } else {
+            insertFormVar(document.getElementById('selectedField').value, this.value);
+        }
+    });
+
+    var getVariableList = function (queryText, proUid, varType){
+        varType = varType.toLowerCase();
+        var responseData
+        var oRPC = new leimnud.module.rpc.xmlhttp({
+            url   : "../processes/processes_Ajax",
+            async : false,
+            method: "POST",
+            args  : "action=getVariableList&process="+proUid+"&queryText="+queryText+"&type="+varType
+        });
+
+        oRPC.make();
+        //alert(oRPC.xmlhttp.responseText);
+        responseData = eval ("(" +oRPC.xmlhttp.responseText+ ")");
+
+        return responseData;
+    }
+
+    var getPrefix = function (prefix) {
+        if(document.getElementById('prefix').value=='ID_TO_STRING')
+            prefix='@@';
+        else if(document.getElementById('prefix').value=='ID_TO_FLOAT')
+            prefix='@#';
+        else if(document.getElementById('prefix').value=='ID_TO_INTEGER')
+            prefix='@%';
+        else if(document.getElementById('prefix').value=='ID_TO_URL')
+            prefix='@?';
+        else if(document.getElementById('prefix').value=='ID_SQL_ESCAPE')
+            prefix='@$';
+        else if(document.getElementById('prefix').value=='ID_REPLACE_WITHOUT_CHANGES')
+            prefix='@=';
+        return prefix;
+    }
+
+    var getPrefixInfo = function (prefix){
+        var oRPC = new leimnud.module.rpc.xmlhttp({
+            url   : "../processes/processes_Ajax",
+            async : false,
+            method: "POST",
+            args  : "action=getVariablePrefix&prefix="+prefix
+        });    
+        oRPC.make();
+        return oRPC.xmlhttp.responseText;
+    }
+
+    leimnud.event.add(document.getElementById('type_variables'), 'change', function(event) {
+        var prefix=getPrefix(document.getElementById('prefix').value);
+        generateListValues(prefix);
+    });
+
+    leimnud.event.add(document.getElementById('prefix'), 'change', function(event) {
+        var prefix=getPrefix(document.getElementById('prefix').value);
+        generateListValues(prefix);
+    });
+
+    leimnud.event.add(document.getElementById('_Var_Form_'), 'change', function(event) {
+        document.getElementById('selectedVariableLabel').textContent = document.getElementById('_Var_Form_').value
+    });    
+
+    leimnud.event.add(document.getElementById('search'), 'keypress', function(e) {
+
+        var prefix=getPrefix(document.getElementById('prefix').value);
+        var key = e.keyCode;
+        if(key == '13'){
+            generateListValues(prefix);
+
+            e.cancelBubble = true;
+            e.returnValue  = false;
+            if (e.stopPropagation) {
+                e.stopPropagation();
+                e.preventDefault();
+            }
+        }
+    });
+
+    function generateListValues (prefix){
+        var list = getVariableList(document.getElementById('search').value, document.getElementById('process').value, document.getElementById('type_variables').value);
+        var combo = document.getElementById("_Var_Form_");
+        var option = document.createElement('option');
+
+        for(i=(combo.length-1); i>=0; i--)
+        {
+           aBorrar = combo.options[i];
+           aBorrar.parentNode.removeChild(aBorrar);
+        }
+
+        if(list.length>0){
+            for(i=0; i<list.length; i++)
+            {
+               option = document.createElement("OPTION");
+               option.value = prefix+list[i].sName;
+               option.text = prefix+list[i].sName+' ('+list[i].sLabel+')';
+               combo.add(option);
+            }
+        } else {
+            option = document.createElement("OPTION");
+            option.value = 0;
+            option.text = 'No results';
+            combo.add(option);
+        }  
+    }
+}
+if (document.readyState == 'complete'){
+    setVariablePickerJS();
+} else {
+    document.body.onload = setVariablePickerJS;
+}
+

workflow/engine/js/dynaformEditor/core/dynaformEditor.js

@@ -605,7 +605,7 @@ var dynaformEditor={
     delete myScripts;
   },
   refresh_htmlcode:function()
-  {
+  {    
     var dynaformEditorHTML = this.views["htmlcode"];
     if (this.htmlEditorLoaded)
     {
@@ -619,9 +619,9 @@ var dynaformEditor={
     }
     if ((response.error==0) && (this.htmlEditorLoaded))
     {
-      window._editorHTML.doc.body.innerHTML=response.html;
-      html_html2();
-      html2_html();
+//      window._editorHTML.doc.body.innerHTML=response.html;
+//      html_html2();
+//      html2_html();
     }
     else if ((response.error==0) && (!this.htmlEditorLoaded))
     {
@@ -844,9 +844,9 @@ var dynaformEditor={
   },
   restoreHTML:function()
   {
-    window._editorHTML.doc.body.innerHTML = this.ajax.restore_html(this.A);
-    html_html2();
-    html2_html();
+//    window._editorHTML.doc.body.innerHTML = this.ajax.restore_html(this.A);
+//    html_html2();
+//    html2_html();
   },
   displayError:function(err,rr)
   {

workflow/engine/js/events/events.js

@@ -161,8 +161,10 @@ var EventCompose = function(t){
 		oPanel.make();
 		oPanel.loader.show();
 		var oRPC = new leimnud.module.rpc.xmlhttp({
-		  	url : '../events/eventsAjax',
-		  	args: 'request=showDynavars'
+//		  	url : '../events/eventsAjax',
+//		  	args: 'request=showDynavars',
+		  	url : '../controls/varsAjax',
+		  	args: 'sSymbol=@@&displayOption=event'
 	  	});
 	  	oRPC.callback = function(rpc) {
 		  	oPanel.loader.hide();
@@ -197,6 +199,26 @@ var EventCompose = function(t){
 		newOption.selected=true;
 		o.options[o.options.length] = newOption;
 	}
+        this.insertFormVar= function(id, value, prefix){
+
+		if(this.exists(id)) {
+                    new leimnud.module.app.alert().make({label: G_STRINGS.EVENT_EMAILEXISTS});
+                    return false;
+		}
+
+		this.deselectAll();
+		o = getField(this.target);
+
+		if(prefix == 'dyn'){
+			var newOption = new Option('@#'+value, prefix+"|"+id);
+		} else {
+			var newOption = new Option(value, prefix+"|"+id);
+		}
+
+		newOption.selected=true;
+		o.options[o.options.length] = newOption;
+                oPanel.remove();
+	}
 	this.dropSel= function(){
 	    var o = getField(this.target);
 		c=0;

workflow/engine/methods/controls/varsAjax.php

@@ -21,12 +21,162 @@
  * 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 );
+G::pr($_SERVER);
+$_SERVER["QUERY_STRING"] = isset($_SERVER["QUERY_STRING"])?$_SERVER["QUERY_STRING"]:'';
+$_POST["sProcess"] = isset($_POST["sProcess"])?$_POST["sProcess"]:$_SESSION['PROCESS'];
+$_POST["sFieldName"] = isset($_POST["sFieldName"])?$_POST["sFieldName"]:'';
+$_POST['sSymbol']= isset($_POST["sSymbol"])?$_POST["sSymbol"]:'';
 
+$html = '<form action="uploader.php?'.$_SERVER["QUERY_STRING"].'&q=upload" onLoad="onLoad()" method="post" enctype="multipart/form-data" onsubmit="">';
+$html .= '<div id="d_variables">';
+$html .= '<table width="90%" align="center">';
+
+$html .= '<tr style="display:none; visibility:hidden;">';
+$html .= '<td colspan="3">';
+$html .= '<input type="hidden" id="process" value="'.$_REQUEST['sProcess'].'">';
+$html .= '<input type="hidden" id="selectedField" name="selectedField" value="'.$_REQUEST['sFieldName'].'"/> ';
+$html .= '</td>';
+$html .= '</tr>';
+
+$html .= '<tr>';
+$html .= '<td width="50%">';
+$html .= '<label for="type_label">Type Variable</label>';
+$html .= '</td>';
+
+$html .= '<td width="25%">';
+$html .= '<label for="prefix_label">Prefix</label>';
+$html .= '</td>';
+
+$html .= '<td width="25%">';
+$html .= '<label for="variables_label">Search</label>';
+$html .= '</td>';
+$html .= '</tr>';
+
+//$html = '<form action="uploader.php?'.$_SERVER["QUERY_STRING"].'&q=upload" method="post" enctype="multipart/form-data" onsubmit="">';
+
+$html .= '<tr>';
+$html .= '<td width="25%">';
+$html .= '<select name="type_variables" id="type_variables">';
+$html .= '<option value="all">All Variables</option>';
+$html .= '<option value="system">System Variables</option>';
+$html .= '<option value="process">Process Variables</option>';
+$html .= '</select> &nbsp;&nbsp;&nbsp;&nbsp;';
+$html .= '</td>';
+
+$html .= '<td width="25%">';
+//$html .= '<select name="prefix" id="prefix" onChange="Seleccionar(this);">';
+$html .= '<select name="prefix" id="prefix">';
+
+$html .= '<option value="ID_TO_STRING">@@</option>';
+$html .= '<option value="ID_TO_FLOAT">@#</option>';
+$html .= '<option value="ID_TO_INTEGER">@%</option>';
+$html .= '<option value="ID_TO_URL">@?</option>';
+$html .= '<option value="ID_SQL_ESCAPE">@$</option>';
+$html .= '<option value="ID_REPLACE_WITHOUT_CHANGES">@=</option>';
+/*
+$html .= '<option value="@@">@@</option>';
+$html .= '<option value="@#">@#</option>';
+$html .= '<option value="@%">@%</option>';
+$html .= '<option value="@?">@?</option>';
+$html .= '<option value="@$">@$</option>';
+$html .= '<option value="@=">@=</option>';
+*/
+$html .= '</select> &nbsp;&nbsp;&nbsp;&nbsp;';
+$html .= '</td>';
+
+$html .= '<td width="25%" valign="top">';
+$html .= '<input type="text" id="search" size="15">';
+$html .= '</td>';
+$html .= '</tr>';
+$html .= '<tr>';
+$html .= '<tr><td><label for="prefix_label">Variables</label></td></tr>';
+$html .= '<tr>';
+//onChange="Seleccionar(this);
+$html .= '<td colspan="3">';
+
+G::LoadClass( 'xmlfield_InputPM' );
+$aFields = getDynaformsVars( $_REQUEST['sProcess'], true, isset( $_POST['bIncMulSelFields'] ) ? $_POST['bIncMulSelFields'] : 0 );
+
+//$html .= '<select name="_Var_Form_" id="_Var_Form_" size="' . count( $aFields ) . '" style="width:100%;' . (! isset( $_POST['sNoShowLeyend'] ) ? 'height:50%;' : '') . '" ondblclick="insertFormVar(\'' . $_POST['sFieldName'] . '\', this.value);">';
+
+$displayOption = '';
+if (isset($_REQUEST['displayOption'])){
+    $displayOption = 'displayOption="'.$_REQUEST['displayOption'].'"';
+} else {
+    $displayOption = 'displayOption="normal"' ;
+}
+$html .= '<select name="_Var_Form_" id="_Var_Form_" size="8"  style="width:100%;' . (! isset( $_POST['sNoShowLeyend'] ) ? 'height:170;' : '') . '" '.$displayOption.'>';
+
+foreach ($aFields as $aField) {
+    $html .= '<option value="' . $_REQUEST['sSymbol'] . $aField['sName'] . '">' . $_REQUEST['sSymbol'] . $aField['sName'] . ' (' . $aField['sType'] . ')</option>';
+}
+
+$aRows[0] = Array ('fieldname' => 'char','variable' => 'char','type' => 'type','label' => 'char');
+foreach ($aFields as $aField) {
+    $aRows[] = Array ('fieldname' => $_REQUEST['sFieldName'], 'variable' => $_REQUEST['sSymbol'] . $aField['sName'],'variable_label' => '<div class="pm__dynavars"> <a id="dynalink" href=# onclick="insertFormVar(\'' . $_REQUEST['sFieldName'] . '\',\'' . $_REQUEST['sSymbol'] . $aField['sName'] . '\');">' . $_REQUEST['sSymbol'] . $aField['sName'] . '</a></div>','type' => $aField['sType'],'label' => $aField['sLabel']
+    );
+}
+$html .= '</select>';
+
+$html .= '</td>';
+$html .= '</tr>';
+$html .= '</table>';
+$html .= '</div>';
+
+$html .= '<br>';
+$html .= '<table border="1" width="90%" align="center">';
+$html .= '<tr width="40%">';
+$html .= '<td>Result</td>';
+$html .= '<td><span id="selectedVariableLabel">@@SYS_LANG</span></td>';
+$html .= '</tr>';
+$html .= '<tr width="60%">';
+$html .= '<td>Description</td>';
+$html .= '<td><span id="desc_variables">'.G::LoadTranslation('ID_SYSTEM').'</span></td>';
+$html .= '</tr>';
+$html .= '</table>';
+$html .= '</div>';
+$html .= '<br>';
+$html .= '<table width="90%" align="center">';
+$html .= '<tr><td>';
+$html .= '<label for="desc_prefix">*<span id="desc_prefix">' . G::LoadTranslation( 'ID_TO_STRING' ) . '</span></label>';
+$html .= '</td></tr>';
+$html .= '</div>';
+
+$html .= '</form>';
+
+$display     = 'raw';
+
+$G_PUBLISH = new Publisher();
+$oHeadPublisher = & headPublisher::getSingleton();
+$oHeadPublisher->addScriptFile('/jscore/controls/variablePicker.js');
+if (isset($_REQUEST['displayOption'])) {
+    if($_REQUEST['displayOption']=='tinyMCE'){
+        $display = 'blank';
+        $oHeadPublisher->addScriptFile('/js/tinymce/jscripts/tiny_mce/tiny_mce_popup.js');
+        $oHeadPublisher->addScriptFile('/js/tinymce/jscripts/tiny_mce/plugins/pmVariablePicker/editor_plugin_src.js');
+    }
+}
+
+echo $html;
+
+G::RenderPage( 'publish', $display );
+/*
+$alll = '<script type="text/javascript" language="javascript">';
+$alll .= 'function Seleccionar(combo){';
+$alll .= 'alert(combo.value);';
+$alll .= '}';
+$alll .= '</script>';
+
+echo $alll;
+*/
+
+
+
+//echo var_dump($aFields);
+/*
 $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>';
+    $html .= '<option value="' . $_POST['sSymbol'] . $aField['sName'] . '">' . $_POST['sSymbol'] . $aField['sName'] . ' (' . $aField['sType'] . ')</option>';
 }
 
 $aRows[0] = Array ('fieldname' => 'char','variable' => 'char','type' => 'type','label' => 'char'
@@ -36,117 +186,40 @@ foreach ($aFields as $aField) {
     );
 }
 
-$sHTML .= '</select>';
-$sHTML = '';
+$html .= '</select>';
 
-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\">
+$html .= '</td>';
+$html .= '</tr>';
+$html .= '</table>';
+$html .= '</div>';
 
-.pm__dynavars a#dynalink{color:#000000;}
+$html .= '<br>';
+$html .= '<div id="desc_variables">';
+$html .= '<table border="1" width="90%" align="center">';
+$html .= '<tr width="40%">';
+$html .= '<td>Result</td>';
+$html .= '<td>@#SYS_LANG</td>';
+$html .= '</tr>';
+$html .= '<tr width="60%">';
+$html .= '<td>Description</td>';
+$html .= '<td>Description @#SYS_LANG</td>';
+$html .= '</tr>';
+$html .= '</table>';
+$html .= '</div>';
+$html .= '<br>';
+$html .= '<div id="desc_variables">';
+$html .= '<table width="90%" align="center">';
+$html .= '<tr><td>';
+$html .= '<label for="desc_prefix">' . G::LoadTranslation( 'ID_TO_FLOAT' ) . '</label>';
+$html .= '</td></tr>';
+$html .= '</div>';
 
-/* 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 */
-}
+$html .= '</form>';
 
-ul#tabnav li { /* do not change */
-display: inline;
-}
+echo $html;
 
-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>";
-
+/*$G_PUBLISH->AddContent( 'propeltable', 'paged-table', 'triggers/dynavars', $oCriteria );
+G::RenderPage( 'publish', 'raw' );
+*/

workflow/engine/methods/dynaforms/dynaforms_Ajax.php

@@ -30,6 +30,7 @@ global $_DBArray;
 if (! isset( $_DBArray )) {
     $_DBArray = array ();
 }
+
 G::LoadClass( 'dynaformEditor' );
 $oDynaformEditorAjax = new dynaformEditorAjax( $_POST );
 

workflow/engine/methods/outputdocs/outputdocs_Ajax.php

@@ -1,27 +1,27 @@
 <?php
 
-$action = isset( $POST['action'] ) ? $POST['action'] : isset( $_GET['action'] ) ? $_GET['action'] : '';
+$action = isset( $_REQUEST['action'] ) ? $_REQUEST['action'] :'';
 
-// Function call from ajax_function for calling to lookForNameOutput.
+// Function call from ajax_function for calling to lookForNameOutput.
 if ($action == '') {
-    $action = isset( $_POST['function'] ) ? $_POST['function'] : '';
+    $action = isset( $_REQUEST['function'] ) ? $_REQUEST['function'] : '';
 }
 
 switch ($action) {
     case 'setTemplateFile':
-        //print_r($_FILES);
+        //print_r($_FILES);
         $_SESSION['outpudocs_tmpFile'] = PATH_DATA . $_FILES['templateFile']['name'];
-        //    file_put_contents($_FILES['templateFile']['name'], file_get_contents($_FILES['templateFile']['tmp_name']));
+        //    file_put_contents($_FILES['templateFile']['name'], file_get_contents($_FILES['templateFile']['tmp_name']));
         copy( $_FILES['templateFile']['tmp_name'], $_SESSION['outpudocs_tmpFile'] );
         $result = new stdClass();
-        
+
         $result->success = true;
         $result->msg = 'success - saved ' . $_SESSION['outpudocs_tmpFile'];
         echo G::json_encode( $result );
         break;
-    
+
     case 'getTemplateFile':
-        $aExtensions = array ("exe","com","dll","ocx","fon","ttf","doc","xls","mdb","rtf","bin","jpeg","jpg","jif","jfif","gif","tif","tiff","png","bmp","pdf","aac","mp3","mp3pro","vorbis","realaudio","vqf","wma","aiff","flac","wav","midi","mka","ogg","jpeg","ilbm","tar","zip","rar","arj","gzip","bzip2","afio","kgb","gz","asf","avi","mov","iff","ogg","ogm","mkv","3gp" 
+        $aExtensions = array ("exe","com","dll","ocx","fon","ttf","doc","xls","mdb","rtf","bin","jpeg","jpg","jif","jfif","gif","tif","tiff","png","bmp","pdf","aac","mp3","mp3pro","vorbis","realaudio","vqf","wma","aiff","flac","wav","midi","mka","ogg","jpeg","ilbm","tar","zip","rar","arj","gzip","bzip2","afio","kgb","gz","asf","avi","mov","iff","ogg","ogm","mkv","3gp"
         );
         $sFileName = strtolower( $_SESSION['outpudocs_tmpFile'] );
         $strRev = strrev( $sFileName );
@@ -31,24 +31,24 @@ switch ($action) {
         if (! in_array( $sExtension, $aExtensions ))
             echo $content = file_get_contents( $_SESSION['outpudocs_tmpFile'] );
         break;
-    
+
     case 'loadTemplateContent':
         require_once 'classes/model/OutputDocument.php';
         $ooutputDocument = new OutputDocument();
         if (isset( $_POST['OUT_DOC_UID'] )) {
             $aFields = $ooutputDocument->load( $_POST['OUT_DOC_UID'] );
-            
+
             echo $aFields['OUT_DOC_TEMPLATE'];
         }
         break;
-    
+
     case 'lookForNameOutput':
         require_once ('classes/model/Content.php');
         require_once ("classes/model/OutputDocument.php");
-        
+
         $snameInput = urldecode( $_POST['NAMEOUTPUT'] );
         $sPRO_UID = urldecode( $_POST['proUid'] );
-        
+
         $oCriteria = new Criteria( 'workflow' );
         $oCriteria->addSelectColumn( OutputDocumentPeer::OUT_DOC_UID );
         $oCriteria->add( OutputDocumentPeer::PRO_UID, $sPRO_UID );
@@ -57,7 +57,7 @@ switch ($action) {
         $flag = true;
         while ($oDataset->next() && $flag) {
             $aRow = $oDataset->getRow();
-            
+
             $oCriteria1 = new Criteria( 'workflow' );
             $oCriteria1->addSelectColumn( 'COUNT(*) AS OUTPUTS' );
             $oCriteria1->add( ContentPeer::CON_CATEGORY, 'OUT_DOC_TITLE' );
@@ -68,11 +68,37 @@ switch ($action) {
             $oDataset1->setFetchmode( ResultSet::FETCHMODE_ASSOC );
             $oDataset1->next();
             $aRow1 = $oDataset1->getRow();
-            
+
             if ($aRow1['OUTPUTS'])
                 $flag = false;
         }
         echo $flag;
-        // G::json_encode($flag);
+        // G::json_encode($flag);
         break;
-}
+
+    case 'loadOutputEditor':
+        global $G_PUBLISH;
+        $G_PUBLISH = new Publisher();
+        $fcontent  = '';
+        $proUid    = '';
+        $filename  = '';
+        $title  = '';
+
+        require_once 'classes/model/OutputDocument.php';
+        $oOutputDocument = new OutputDocument();
+        if (isset( $_REQUEST['OUT_DOC_UID'] )) {
+            $aFields = $oOutputDocument->load( $_REQUEST['OUT_DOC_UID'] );
+            $fcontent = $aFields['OUT_DOC_TEMPLATE'];
+            $proUid   = $aFields['PRO_UID'];
+            $filename = $aFields['OUT_DOC_FILENAME'];
+            $title    = $aFields['OUT_DOC_TITLE'];
+        }
+
+        $aData = Array ( 'PRO_UID' => $proUid,'OUT_DOC_TEMPLATE' => $fcontent, 'FILENAME' => $filename, 'OUT_DOC_UID'=> $_REQUEST['OUT_DOC_UID'], 'OUT_DOC_TITLE'=> $title);
+
+        $G_PUBLISH->AddContent( 'xmlform', 'xmlform', 'outputdocs/outputdocs_Edit', '', $aData );
+        
+        G::RenderPage( 'publish', 'raw' );
+        
+        break;
+}

workflow/engine/methods/outputdocs/testOut.php

@@ -0,0 +1,71 @@
+<?php
+/**
+ * groups.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.
+ */
+
+$access = $RBAC->userCanAccess( 'PM_USERS' );
+if ($access != 1) {
+    switch ($access) {
+        case - 1:
+            G::SendTemporalMessage( 'ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels' );
+            G::header( 'location: ../login/login' );
+            die();
+            break;
+        case - 2:
+            G::SendTemporalMessage( 'ID_USER_HAVENT_RIGHTS_SYSTEM', 'error', 'labels' );
+            G::header( 'location: ../login/login' );
+            die();
+            break;
+        default:
+            G::SendTemporalMessage( 'ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels' );
+            G::header( 'location: ../login/login' );
+            die();
+            break;
+    }
+}
+
+if (($RBAC_Response = $RBAC->userCanAccess( "PM_USERS" )) != 1) {
+    return $RBAC_Response;
+}
+
+$G_MAIN_MENU = 'processmaker';
+$G_SUB_MENU = 'users';
+$G_ID_MENU_SELECTED = 'USERS';
+$G_ID_SUB_MENU_SELECTED = 'GROUPS';
+
+$G_PUBLISH = new Publisher();
+
+G::LoadClass( 'configuration' );
+$c = new Configurations();
+$configPage = $c->getConfiguration( 'groupList', 'pageSize', '', $_SESSION['USER_LOGGED'] );
+$configEnv = $c->getConfiguration( 'ENVIRONMENT_SETTINGS', '' );
+$Config['pageSize'] = isset( $configPage['pageSize'] ) ? $configPage['pageSize'] : 20;
+
+//$oHeadPublisher->addExtJsScript( 'groups/groupsList', false ); //adding a javascript file .js
+//$oHeadPublisher->clearScripts();
+$oHeadPublisher->addScriptFile( '/js/tinymce/jscripts/tiny_mce/tiny_mce_src.js' );
+//$oHeadPublisher->addScriptFile( '/js/jquery/jquery-1.8.2.min.js' );
+//$oHeadPublisher->addScriptFile( '/js/jquery/jquery-1.7.1.min.js' );
+//$oHeadPublisher->addScriptFile( '/js/tinymce/pmScripts/editorEmailTemplate.js' );
+
+$G_PUBLISH->addContent( 'view', 'outputdocs/testOut' ); //adding a html file  .html.
+G::RenderPage( 'publish', 'blank' );

workflow/engine/methods/processes/processes_Ajax.php

@@ -446,16 +446,50 @@ try {
             }
             $fcontent = file_get_contents( $sDirectory );
             $extion = explode( ".", $_REQUEST['filename'] );
-
+//            $oHeadPublisher = &headPublisher::getSingleton();
+//            $oHeadPublisher->clearScripts();
+//            $oHeadPublisher->addScriptFile( '/js/tinymce/jscripts/tiny_mce/tiny_mce.js' );
+//            $jscriptCode .= '
+//                                        
+////                    var tmpArrToStr = Array.prototype.toStr;
+////                    var tmpObjToStr = Object.prototype.toStr;
+////                    var tmpObjConcat = Object.prototype.concat;
+////                    var tmpObjGetByKey = Object.prototype.get_by_key;
+////                    var tmpObjExpand = Object.prototype.expand;
+////                    var tmpObjSetParent = Object.prototype.setParent;
+////                    var tmpObjIsSetKey = Object.prototype.isset_key;
+////
+////                    delete Array.prototype.toStr;
+////                    delete Object.prototype.toStr;
+////                    delete Object.prototype.concat;
+////                    delete Object.prototype.get_by_key;
+////                    delete Object.prototype.expand;
+////                    delete Object.prototype.setParent;
+////                    delete Object.prototype.isset_key;
+////                alert ("hi");
+////                document.body.onload = function(){
+//                    alert ("hello");
+//                    tinyMCE.baseURL = "/js/tinymce/jscripts/tiny_mce";
+//                    tinyMCE.init({                
+//                        theme   : "advanced",                
+//                        plugins : "fullpage",
+//                        mode    : "specific_textareas",
+//                        editor_selector : "tmceEditor",
+//                        width   : "640",
+//                        height  : "300",                       
+//                        theme_advanced_buttons3_add : "fullpage"
+//                    });
+////                    alert ("goodbye");
+////                }
+//            ';
+//            $oHeadPublisher->addScriptCode($jscriptCode);
+            $_REQUEST['fcontent'] = $fcontent;  
             //if($extion[count($extion)-1]=='html' || $extion[count($extion)-1]=='txt'){
-            $aData = Array ('pro_uid' => $_REQUEST['pro_uid'],'fcontent' => $fcontent,'filename' => $_REQUEST['filename']
-            );
+            $aData = Array ( 'pro_uid' => $_REQUEST['pro_uid'],'fcontent' => $fcontent,'filename' => $_REQUEST['filename'] );
             $G_PUBLISH->AddContent( 'xmlform', 'xmlform', 'processes/processes_FileEdit', '', $aData );
-            G::RenderPage( 'publish', 'raw' );
-            /*}else{ echo 'krlos';
-	  		       $aMessage['MESSAGE'] = G::loadTranslation(	'HTML_FILES' );
-                   $G_PUBLISH->AddContent ( 'xmlform', 'xmlform', 'login/showMessage', '',$aMessage );
-	  		       }*/
+            G::RenderPage( 'publish', 'raw' );                                    
+//            $G_PUBLISH->AddContent( 'view', 'processes/processesFileEditEmail' );
+//            G::RenderPage( 'publish', 'blank' );
             break;
         case 'saveFile':
             global $G_PUBLISH;
@@ -488,6 +522,37 @@ try {
         case 'events':
             $oProcessMap->eventsList( $oData->pro_uid, $oData->type );
             break;
+        case 'getVariableList':
+            G::LoadClass('xmlfield_InputPM');
+            $proUid= isset( $_REQUEST['process'] )?$_REQUEST['process']:'';
+            $queryText= isset( $_REQUEST['queryText'] )?$_REQUEST['queryText']:'';            
+            if ($_REQUEST['type']=='system'){
+                $isSystem = true;
+            } else {
+                $isSystem = false;
+            }
+            if ($_REQUEST['type']=='all'){
+                $aFields = getDynaformsVars( $proUid );
+            } else {
+                $aFields = getDynaformsVars( $proUid, $isSystem, isset( $_REQUEST['bIncMulSelFields'] ) ? $_REQUEST['bIncMulSelFields'] : 1);
+            }
+            $aVariables = array();
+            foreach ($aFields as $key => $value){
+                if($queryText!='') {
+                    if(stristr($aFields[$key]['sName'], $queryText)){
+                        $aVariables[] = $aFields[$key];
+                    }
+                } else {
+                    $aVariables[] = $aFields[$key];
+                }
+            }      
+            $oJSON = new Services_JSON();            
+            echo $oJSON->encode( $aVariables );
+            break;
+        case 'getVariablePrefix':
+            $_REQUEST['prefix'] = $_REQUEST['prefix']!=null?$_REQUEST['prefix']:'ID_TO_STRING';
+            echo G::LoadTranslation($_REQUEST['prefix']);
+            break;
         /*
 	       case 'saveFile':
          global $G_PUBLISH;

workflow/engine/methods/triggers/triggers_CreateWizard.php

@@ -43,7 +43,7 @@ var showDynaformsFormVars = function(sFieldName, sAjaxServer, sProcess, sSymbol)
 	_oVarsPanel_ = new leimnud.module.panel();
 	_oVarsPanel_.options = {
     limit    : true,
-    size     : {w:550,h:675},
+    size     : {w:600,h:420},
     position : {x:0,y:0,center:true},
     title    : '',
     theme    : 'processmaker',

workflow/engine/methods/triggers/triggers_EditWizard.php

@@ -48,7 +48,7 @@ var showDynaformsFormVars = function(sFieldName, sAjaxServer, sProcess, sSymbol)
 	_oVarsPanel_ = new leimnud.module.panel();
 	_oVarsPanel_.options = {
     limit    : true,
-    size     : {w:550,h:675},
+    size     : {w:600,h:420},
     position : {x:0,y:0,center:true},
     title    : '',
     theme    : 'processmaker',