diff --git a/gulliver/js/common/core/common.js b/gulliver/js/common/core/common.js index bce499d8e..2041b1a0f 100755 --- a/gulliver/js/common/core/common.js +++ b/gulliver/js/common/core/common.js @@ -1785,8 +1785,8 @@ function highlightRow(o, color){ * @Param * @Return */ -String.prototype.trim = function() { - return this.replace(/^\s+|\s+get/g,""); +String.prototype.trim = function () { + return this.replace(/^\s+|\s+$/g, ""); } function clearCalendar(id){ @@ -2114,10 +2114,21 @@ function _() return trn; } +/** + * String Replace function, if StrSearch has special characters "(", "[", must be escape "\\(", "\\[". + */ +function stringReplace(strSearch, stringReplace, str) +{ + var expression = eval("/" + strSearch + "/g"); + + return str.replace(expression, stringReplace); +} + var mb_strlen = function(str) { var len = 0; for (var i = 0; i < str.length; i++) { len += str.charCodeAt(i) < 0 || str.charCodeAt(i) > 255 ? 2 : 1; } return len; -}; \ No newline at end of file +}; + diff --git a/gulliver/js/ext/pmos-common.js b/gulliver/js/ext/pmos-common.js index bd38119ec..2b582eaa5 100755 --- a/gulliver/js/ext/pmos-common.js +++ b/gulliver/js/ext/pmos-common.js @@ -473,9 +473,8 @@ Ext.util.Format.capitalize = (function(){ /** * left and right delete the blank characteres (String prototype) */ -String.prototype.trim = function() { - return this.replace(/^\s+|\s+get/g,""); - //return Ext.util.Format.trim(this); +String.prototype.trim = function () { + return this.replace(/^\s+|\s+$/g, ""); } String.prototype.nl2br = function () { diff --git a/gulliver/js/form/core/form.js b/gulliver/js/form/core/form.js index fc8085959..4b26f6852 100755 --- a/gulliver/js/form/core/form.js +++ b/gulliver/js/form/core/form.js @@ -1060,7 +1060,7 @@ function G_Text(form, element, name) tamMask = aux[0].length; sw = true; } - if (tamData >= tamMask){ + if (tamData >= tamMask){ var minusExi; for (var numI = 0; newValue.length > numI; numI++) { var campVal = newValue[numI]; @@ -1073,7 +1073,7 @@ function G_Text(form, element, name) } } } - + if (!(keyCode == 45 || (minusExi && tamMask >= tamData))) { if (sw && !swPeriod && testData.indexOf(me.comma_separator) == -1){ action = 'none'; @@ -1081,7 +1081,7 @@ function G_Text(form, element, name) if (!sw) action = 'none'; } } - } + } switch(action){ case 'mask': case 'move': dataNewMask = me.replaceMasks(newValue, newCursor); @@ -3547,11 +3547,5 @@ function dateSetMask(mask) { return mask; } -function stringReplace(strSearch, stringReplace, str) -{ - var expression = eval("/" + strSearch + "/g"); - - return str.replace(expression, stringReplace); -} - /* end file */ + diff --git a/gulliver/js/widgets/suggest/bsn.AutoSuggest_2.1.3.js b/gulliver/js/widgets/suggest/bsn.AutoSuggest_2.1.3.js index 439282a35..73428a0b7 100755 --- a/gulliver/js/widgets/suggest/bsn.AutoSuggest_2.1.3.js +++ b/gulliver/js/widgets/suggest/bsn.AutoSuggest_2.1.3.js @@ -11,6 +11,7 @@ //static variable for suggest responses. @By Erik var Static_AutosuggestResponseData; +var swStoreEntry = 1; if (typeof(bsn) == "undefined") @@ -28,7 +29,7 @@ _b.AutoSuggest = function (id, param) // if (!document.getElementById) return 0; - + // get field via DOM // this.fld = _b.DOM.gE(id); @@ -42,12 +43,12 @@ _b.AutoSuggest = function (id, param) this.nInpC = 0; this.aSug = []; this.iHigh = 0; - + // parameters object // this.oP = param ? param : {}; - - // defaults + + // defaults // var k, def = {minchars:1, meth:"get", varname:"input", className:"autosuggest", timeout:5000, delay:50, offsety:-5, shownoresults: true, noresults: "No results!", maxheight: 250, cache: true, maxentries: 25}; //timeout::2500 //delay was modified of 5000 or 500 by 5, I don't sure.. ;) can't remember... <-erik notes->' @@ -56,107 +57,124 @@ _b.AutoSuggest = function (id, param) if (typeof(this.oP[k]) != typeof(def[k])) this.oP[k] = def[k]; } - + // set keyup handler for field // and prevent autocomplete from client // var p = this; - + // NOTE: not using addEventListener because UpArrow fired twice in Safari //_b.DOM.addEvent( this.fld, 'keyup', function(ev){ return pointer.onKeyPress(ev); } ); - + this.fld.onkeypress = function(ev){ return p.onKeyPress(ev); }; this.fld.onkeyup = function(ev){ return p.onKeyUp(ev); }; - + this.fld.setAttribute("autocomplete","off"); }; -_b.AutoSuggest.prototype.onKeyPress = function(ev) +_b.AutoSuggest.prototype.onKeyPress = function (ev) { - - var key = (window.event) ? window.event.keyCode : ev.keyCode; + var key = (window.event)? window.event.keyCode : ev.keyCode; - var RETURN = 13; - var TAB = 9; - var ESC = 27; - - var bubble = 1; + var RETURN = 13; + var TAB = 9; + var ESC = 27; - switch(key) - { - case RETURN: - this.setHighlightedValue(); - bubble = 0; - //added by erik, this is for enter press, no new line into text area - return false; - break; + var bubble = 1; - case ESC: - this.clearSuggestions(); - break; - } + switch (key) { + case RETURN: + if (typeof this.oP.storeEntryData != "undefined" && this.oP.storeEntryData[0] == 1) { + var elem = document.getElementById(this.oP.storeEntryData[1]); - return bubble; + if (elem.value != "" && swStoreEntry == 1 && + typeof Static_AutosuggestResponseData != "undefined" && Static_AutosuggestResponseData.results.length > 0 + ) { + for (var i = 0 ; i <= Static_AutosuggestResponseData.results.length - 1; i++) { + if (Static_AutosuggestResponseData.results[i].value == elem.value) { + swStoreEntry = 0; + } + } + } + + if (elem.value == "") { + swStoreEntry = 0; + } + + if (swStoreEntry == 1) { + storeEntryProcessAjax( + elem, + this.oP.storeEntryData[2], + this.oP.storeEntryData[3], + this.oP.storeEntryData[4], + this.oP.storeEntryData[5], + this.oP.storeEntryData[6] + ); + } + } + + this.setHighlightedValue(); + bubble = 0; + //added by erik, this is for enter press, no new line into text area + return false; + break; + case ESC: + this.clearSuggestions(); + break; + default: + swStoreEntry = 1; + break; + } + + return bubble; }; - - -_b.AutoSuggest.prototype.onKeyUp = function(ev) +_b.AutoSuggest.prototype.onKeyUp = function (ev) { - var key = (window.event) ? window.event.keyCode : ev.keyCode; + var key = (window.event)? window.event.keyCode : ev.keyCode; - var ARRUP = 38; - var ARRDN = 40; - - var bubble = 1; + var ARRUP = 38; + var ARRDN = 40; - switch(key) - { - case ARRUP: - this.changeHighlight(key); - this.setHighlightedValue2(); - bubble = 0; - break; + var bubble = 1; + switch (key) { + case ARRUP: + this.changeHighlight(key); + this.setHighlightedValue2(); + bubble = 0; + swStoreEntry = 0; + break; + case ARRDN: + this.changeHighlight(key); + this.setHighlightedValue2(); + bubble = 0; + swStoreEntry = 0; + break; + default: + this.getSuggestions(this.fld.value); + break; + } - case ARRDN: - this.changeHighlight(key); - this.setHighlightedValue2(); - bubble = 0; - break; - - - default: - this.getSuggestions(this.fld.value); - } - - return bubble; - + return bubble; }; - - - - - - - _b.AutoSuggest.prototype.getSuggestions = function (val) { - + // if input stays the same, do nothing // if (val == this.sInp) return 0; - + // kill list // _b.DOM.remE(this.idAs); - - + + this.sInp = val; - + // input length is less than the min required to trigger a request // do nothing // @@ -166,7 +184,7 @@ _b.AutoSuggest.prototype.getSuggestions = function (val) this.nInpC = val.length; return 0; } - + var ol = this.nInpC; // old length this.nInpC = val.length ? val.length : 0; @@ -185,7 +203,7 @@ _b.AutoSuggest.prototype.getSuggestions = function (val) arr.push( this.aSug[i] ); } this.aSug = arr; - + this.createList(this.aSug); return false; } @@ -221,13 +239,13 @@ _b.AutoSuggest.prototype.doAjaxRequest = function (input) var url = this.oP.script(encodeURIComponent(this.sInp)); else var url = this.oP.script+this.oP.varname+"="+encodeURIComponent(this.sInp); - + if (!url) return false; - + var meth = this.oP.meth; var input = this.sInp; - + var onSuccessFunc = function (req) { pointer.setSuggestions(req, input) }; var onErrorFunc = function (status) { alert("AJAX error: "+status); }; @@ -244,15 +262,15 @@ _b.AutoSuggest.prototype.setSuggestions = function (req, input) return false; this.aSug = []; - - + + if (this.oP.json) { - + var jsondata = eval('(' + req.responseText + ')'); if( jsondata.status == 0 ){ - + Static_AutosuggestResponseData = jsondata; for (var i=0;i" + val.substring(st, st+this.sInp.length) + "" + val.substring(st+this.sInp.length); - - + + var span = _b.DOM.cE("span", {}, output, true); if (arr[i].info != "") { @@ -337,46 +355,46 @@ _b.AutoSuggest.prototype.createList = function(arr) var small = _b.DOM.cE("small", {}, arr[i].info); span.appendChild(small); } - + var a = _b.DOM.cE("a", { href:"#" }); - + var tl = _b.DOM.cE("span", {className:"tl"}, " "); var tr = _b.DOM.cE("span", {className:"tr"}, " "); a.appendChild(tl); a.appendChild(tr); - + a.appendChild(span); - + a.name = i+1; a.onclick = function () { pointer.setHighlightedValue(); return false; }; - a.onmouseover = function () { - pointer.setHighlight(this.name); + a.onmouseover = function () { + pointer.setHighlight(this.name); // Commented by Bug 6672 // pointer.setHighlightedValue2(); - + }; - + var li = _b.DOM.cE( "li", {}, a ); - + ul.appendChild( li ); } - - + + // no results // if (arr.length == 0 && this.oP.shownoresults) { var li = _b.DOM.cE( "li", {className:"as_warning"}, this.oP.noresults ); ul.appendChild( li ); - + //By Erik AO Static_AutosuggestResponseData.results.length = 0; } - - + + div.appendChild( ul ); - - + + var fcorner = _b.DOM.cE("div", {className:"as_corner"}); var fbar = _b.DOM.cE("div", {className:"as_bar"}); var footer = _b.DOM.cE("div", {className:"as_footer"}); @@ -389,7 +407,7 @@ _b.AutoSuggest.prototype.createList = function(arr) // set width of holding div to width of field // var pos = _b.DOM.getPos(this.fld); - + div.style.left = pos.x + "px"; div.style.top = ( pos.y + this.fld.offsetHeight + this.oP.offsety ) + "px"; div.style.width = this.fld.offsetWidth + "px"; @@ -408,7 +426,7 @@ _b.AutoSuggest.prototype.createList = function(arr) // currently no item is highlighted // this.iHigh = 0; - + // remove list after an interval // var pointer = this; @@ -416,25 +434,25 @@ _b.AutoSuggest.prototype.createList = function(arr) }; _b.AutoSuggest.prototype.changeHighlight = function(key) -{ +{ var list = _b.DOM.gE("as_ul"); if (!list) return false; - + var n; if (key == 40) n = this.iHigh + 1; else if (key == 38) n = this.iHigh - 1; - - + + if (n > list.childNodes.length) n = list.childNodes.length; if (n < 1) n = 1; - - + + this.setHighlight(n); }; @@ -443,12 +461,12 @@ _b.AutoSuggest.prototype.setHighlight = function(n) var list = _b.DOM.gE("as_ul"); if (!list) return false; - + if (this.iHigh > 0) this.clearHighlight(); - + this.iHigh = Number(n); - + list.childNodes[this.iHigh-1].className = "as_highlight"; @@ -460,7 +478,7 @@ _b.AutoSuggest.prototype.clearHighlight = function() var list = _b.DOM.gE("as_ul"); if (!list) return false; - + if (this.iHigh > 0) { list.childNodes[this.iHigh-1].className = ""; @@ -475,21 +493,21 @@ _b.AutoSuggest.prototype.setHighlightedValue = function () { /** * @autor Erik Amaru Ortiz - * This fix when a item on suggestion list have html wntities sent by json like & + * This fix when a item on suggestion list have html wntities sent by json like & */ if(this.aSug[ this.iHigh-1 ]) this.sInp = this.fld.value = html_entity_decode(this.aSug[ this.iHigh-1 ].value);; // - + // move cursor to end of input (safari) // this.fld.focus(); if (this.fld.selectionStart) this.fld.setSelectionRange(this.sInp.length, this.sInp.length); - + this.clearSuggestions(); - + // pass selected object to callback function, if exists // if (typeof(this.oP.callback) == "function") @@ -503,16 +521,16 @@ _b.AutoSuggest.prototype.setHighlightedValue2 = function () { if(this.aSug[ this.iHigh-1 ]) this.sInp = this.fld.value = html_entity_decode(this.aSug[ this.iHigh-1 ].value); - + // move cursor to end of input (safari) // /*this.fld.focus(); if (this.fld.selectionStart) this.fld.setSelectionRange(this.sInp.length, this.sInp.length); - + */ //this.clearSuggestions(); - + // pass selected object to callback function, if exists // /*if (typeof(this.oP.callback) == "function") @@ -534,9 +552,9 @@ _b.AutoSuggest.prototype.resetTimeout = function() _b.AutoSuggest.prototype.clearSuggestions = function () { - + this.killTimeout(); - + var ele = _b.DOM.gE(this.idAs); var pointer = this; if (ele) @@ -559,15 +577,15 @@ _b.Ajax = function () _b.Ajax.prototype.makeRequest = function (url, meth, onComp, onErr) { - + if (meth != "POST") meth = "GET"; - + this.onComplete = onComp; this.onError = onErr; - + var pointer = this; - + // branch for native XMLHttpRequest object if (window.XMLHttpRequest) { @@ -591,7 +609,7 @@ _b.Ajax.prototype.makeRequest = function (url, meth, onComp, onErr) _b.Ajax.prototype.processReqChange = function() { - + // only if req shows "loaded" if (this.req.readyState == 4) { // only if "OK" @@ -615,12 +633,12 @@ _b.DOM.cE = function ( type, attr, cont, html ) var ne = document.createElement( type ); if (!ne) return 0; - + for (var a in attr) ne[a] = attr[a]; - + var t = typeof(cont); - + if (t == "string" && !html) ne.appendChild( document.createTextNode(cont) ); else if (t == "string" && html) @@ -657,7 +675,7 @@ _b.DOM.gE = function ( e ) _b.DOM.remE = function ( ele ) { var e = this.gE(ele); - + if (!e) return 0; else if (e.parentNode.removeChild(e)) @@ -684,9 +702,9 @@ _b.DOM.getPos = function ( e ) } else if (obj.x) curleft += obj.x; - + var obj = e; - + var curtop = 0; if (obj.offsetParent) { @@ -708,22 +726,22 @@ if (typeof(_b.Fader) == "undefined") _b.Fader = {}; _b.Fader = function (ele, from, to, fadetime, callback) -{ +{ if (!ele) return 0; - + this.e = ele; - + this.from = from; this.to = to; - + this.cb = callback; - + this.nDur = fadetime; - + this.nInt = 50; this.nTime = 0; - + var p = this; this.nID = setInterval(function() { p._fade() }, this.nInt); }; @@ -731,16 +749,16 @@ _b.Fader = function (ele, from, to, fadetime, callback) _b.Fader.prototype._fade = function() { this.nTime += this.nInt; - + var ieop = Math.round( this._tween(this.nTime, this.from, this.to, this.nDur) * 100 ); var op = ieop / 100; - + if (this.e.filters) // internet explorer { try { this.e.filters.item("DXImageTransform.Microsoft.Alpha").opacity = ieop; - } catch (e) { + } catch (e) { // If it is not set initially, the browser will throw an error. This will set it if it is not set yet. this.e.style.filter = 'progid:DXImageTransform.Microsoft.Alpha(opacity='+ieop+')'; } @@ -749,8 +767,8 @@ _b.Fader.prototype._fade = function() { this.e.style.opacity = op; } - - + + if (this.nTime == this.nDur) { clearInterval( this.nID ); @@ -764,41 +782,97 @@ _b.Fader.prototype._tween = function(t,b,c,d) return b + ( (c-b) * (t/d) ); }; - - -function storeEntry(o, cnn, table, pk, pkt, fld){ - if( typeof('Static_AutosuggestResponseData') != 'undefined' && Static_AutosuggestResponseData.results.length == 0 ){ - //alert('store it '+ ' -> '+o.id+' val '+ o.value); - var myAjax = new _b.Ajax(); - myAjax.makeRequest('../gulliver/genericAjax?request=storeInTmp'+'&cnn='+cnn+'&table='+table+'&pk='+pk+'&pkt='+pkt+'&fld='+fld+'&value='+o.value, 'POST', - function(req){ - var response = eval('('+req.responseText+')'); - if( response.status != 0 ){ - alert(response.message); - } - }, - function(req){ - //alert(req) - } ); - } +function storeEntryMessageHide(id) +{ + if (document.getElementById(id)) { + document.getElementById(id).parentNode.removeChild(document.getElementById(id)); + } } -function html_entity_decode( string, quote_style ) { - var histogram = {}, symbol = '', tmp_str = '', entity = ''; - tmp_str = string.toString(); - - if (false === (histogram = get_html_translation_table('HTML_ENTITIES', quote_style))) { - return false; - } - - // & must be the last character when decoding! - delete(histogram['&']); - histogram['&'] = '&'; - - for (symbol in histogram) { - entity = histogram[symbol]; - tmp_str = tmp_str.split(entity).join(symbol); - } - +function storeEntryProcessAjax(o, cnn, table, pk, pkt, fld) +{ + var myAjax = new _b.Ajax(); + + myAjax.makeRequest( + "../gulliver/genericAjax?request=storeInTmp" + "&cnn=" + cnn + "&table=" + table + "&pk=" + pk + "&pkt=" + pkt + "&fld=" + fld + "&value=" + o.value, + "POST", + function (req) + { + var response = eval("(" + req.responseText + ")"); + + switch (response.status) { + case 1: + var w1 = document.documentElement.clientWidth; + var sbX1 = document.documentElement.scrollLeft; + var sbY1 = document.documentElement.scrollTop; + + var w2 = document.body.clientWidth; + var sbX2 = document.body.scrollLeft; + var sbY2 = document.body.scrollTop; + + var bodyW = (w1 > 0)? w1 : w2; + var scrollbarX = (sbX1 > 0)? sbX1 : sbX2; + var scrollbarY = (sbY1 > 0)? sbY1 : sbY2; + + storeEntryMessageHide("myIframe"); + + var myIframe = document.createElement("iframe"); + myIframe.setAttribute("id", "myIframe"); + myIframe.style.position = "absolute"; + myIframe.style.left = (parseInt(bodyW / 2) - 200 + scrollbarX) + "px"; + myIframe.style.top = (scrollbarY + 5) + "px"; + myIframe.src = "about:blank"; + myIframe.frameBorder = 0; + myIframe.scrolling = "no"; + myIframe.style.width = "400px"; + myIframe.style.height = "45px"; + + leimnud.event.add( + myIframe, + "load", + function (evt) + { + document.getElementById("myIframe").contentWindow.document.body.style.margin = 0; + document.getElementById("myIframe").contentWindow.document.body.style.padding = 0; + document.getElementById("myIframe").contentWindow.document.body.innerHTML = "
\"\"" + _("ID_FIELD_DYNAFORM_SUGGEST_MESSAGE_TEMPORAL") + "
"; + } + ); + + document.body.appendChild(myIframe); + + setTimeout("storeEntryMessageHide(\"myIframe\")", 1750); + + swStoreEntry = 0; + break; + default: + alert(response.message); + break; + } + }, + function (req) + { + //alert(req); + } + ); +} + +function html_entity_decode( string, quote_style ) { + var histogram = {}, symbol = '', tmp_str = '', entity = ''; + tmp_str = string.toString(); + + if (false === (histogram = get_html_translation_table('HTML_ENTITIES', quote_style))) { + return false; + } + + // & must be the last character when decoding! + delete(histogram['&']); + histogram['&'] = '&'; + + for (symbol in histogram) { + entity = histogram[symbol]; + tmp_str = tmp_str.split(entity).join(symbol); + } + return tmp_str; -} \ No newline at end of file +} + diff --git a/gulliver/methods/genericAjax.php b/gulliver/methods/genericAjax.php index 0bd10729a..bc7c8cdfc 100755 --- a/gulliver/methods/genericAjax.php +++ b/gulliver/methods/genericAjax.php @@ -1,4 +1,4 @@ - $value) { - if ($key != $_POST['rowpos']) { + if ($key != $_POST['rowpos']) { $oFields[$initialKey] = $value; - $initialKey++; + $initialKey++; } } unset($_SESSION[$_POST['formID']][$_POST['gridname']]); - $_SESSION[$_POST['formID']][$_POST['gridname']] = $oFields; - + $_SESSION[$_POST['formID']][$_POST['gridname']] = $oFields; + /* if( isset($_SESSION['APPLICATION']) ){ G::LoadClass('case'); $oApp= new Cases(); @@ -31,9 +31,9 @@ if( isset($request) ){ $oFields[$initialKey] = $value; $initialKey++; $aFields['APP_DATA'][$_POST['gridname']] = $oFields; - } + } $oApp->updateCase($_SESSION['APPLICATION'], $aFields); - } + } */ break; /** widgets **/ @@ -41,8 +41,8 @@ if( isset($request) ){ try { if(isset($_GET["inputEnconde64"])) { - $_GET['input'] = base64_decode($_GET['input']); - } + $_GET['input'] = base64_decode($_GET['input']); + } $sData = base64_decode(str_rot13($_GET['hash'])); list($SQL, $DB_UID) = explode('@|', $sData); // Remplace values for dependent fields @@ -57,7 +57,7 @@ if( isset($request) ){ $parser = new PHPSQLParser($SQL); // Verif parsed array - // print_r($parser->parsed); + // print_r($parser->parsed); $SQL = queryModified($parser->parsed, $_GET['input']); $aRows = Array(); @@ -130,7 +130,7 @@ if( isset($request) ){ $arr = array(); $aReplace = array("(\r\n)", "(\n\r)", "(\n)", "(\r)"); for ($i=0;$iexecuteQuery("INSERT INTO {$_GET['table']} ({$_GET['pk']}, {$_GET['fld']}) VALUES ('$gKey', '{$_GET['value']}');"); - echo '{status:0, message:"success"}'; - }catch( Exception $e){ + + echo "{status: 1, message: \"success\"}"; + } catch (Exception $e) { $err = $e->getMessage(); //$err = eregi_replace("[\n|\r|\n\r]", ' ', $err); - $err = preg_replace("[\n|\r|\n\r]", ' ', $err); // Made compatible to PHP 5.3 - echo '{result:1, message:"'.$err.'"}'; + $err = preg_replace("[\n|\r|\n\r]", " ", $err); //Made compatible to PHP 5.3 + + echo "{status: 0, message: \"" . $err . "\"}"; } break; } @@ -213,31 +215,31 @@ function sortByChar($aRows, $charSel) * Converts a SQL array parsing to a SQL string. * @param string $sqlParsed * @param string $inputSel default value empty string - * @return string + * @return string */ -function queryModified($sqlParsed, $inputSel = "") +function queryModified($sqlParsed, $inputSel = "") { if(!empty($sqlParsed['SELECT'])) { - + $sqlSelect = "SELECT "; $aSelect = $sqlParsed['SELECT']; $sFieldSel = (count($aSelect)>1 ) ? $aSelect[1]['base_expr'] : $aSelect[0]['base_expr']; foreach($aSelect as $key => $value ) { - if($key != 0) + if($key != 0) $sqlSelect .= ", "; $sAlias = str_replace("`","", $aSelect[$key]['alias']); $sBaseExpr = $aSelect[$key]['base_expr']; switch($aSelect[$key]['expr_type']){ case 'colref' : if($sAlias === $sBaseExpr) $sqlSelect .= $sAlias; - else + else $sqlSelect .= $sBaseExpr . ' AS ' . $sAlias; break; - case 'expression' : if($sAlias === $sBaseExpr) + case 'expression' : if($sAlias === $sBaseExpr) $sqlSelect .= $sBaseExpr; - else + else $sqlSelect .= $sBaseExpr . ' AS ' . $sAlias; break; case 'subquery' : if(strpos($sAlias, $sBaseExpr,0) != 0) @@ -245,9 +247,9 @@ function queryModified($sqlParsed, $inputSel = "") else $sqlSelect .= $sBaseExpr . " AS " . $sAlias; break; - case 'operator' : $sqlSelect .= $sBaseExpr; + case 'operator' : $sqlSelect .= $sBaseExpr; break; - default : $sqlSelect .= $sBaseExpr; + default : $sqlSelect .= $sBaseExpr; break; } } @@ -260,7 +262,7 @@ function queryModified($sqlParsed, $inputSel = "") if($key == 0) { $sqlFrom .= $aFrom[$key]['table'] . (($aFrom[$key]['table'] == $aFrom[$key]['alias'])?"" : " " . $aFrom[$key]['alias']); } else { - $sqlFrom .= " " . (($aFrom[$key]['join_type']=='JOIN')?"INNER": $aFrom[$key]['join_type']) . " JOIN " . $aFrom[$key]['table'] + $sqlFrom .= " " . (($aFrom[$key]['join_type']=='JOIN')?"INNER": $aFrom[$key]['join_type']) . " JOIN " . $aFrom[$key]['table'] . (($aFrom[$key]['table'] == $aFrom[$key]['alias'])?"" : " " . $aFrom[$key]['alias']) . " " . $aFrom[$key]['ref_type'] . " " . $aFrom[$key]['ref_clause'] ; } @@ -271,48 +273,48 @@ function queryModified($sqlParsed, $inputSel = "") if(!empty($sqlParsed['WHERE'])){ $sqlWhere = " WHERE "; $aWhere = $sqlParsed['WHERE']; - foreach($aWhere as $key => $value ){ + foreach($aWhere as $key => $value ){ $sqlWhere .= $value['base_expr'] . " "; } $sqlWhere .= " AND " . $sFieldSel . " LIKE '%". $inputSel . "%'"; - } + } else { $sqlWhere = " WHERE " . $sFieldSel . " LIKE '%". $inputSel ."%' "; } $sqlGroupBy = ""; - if(!empty($sqlParsed['GROUP'])){ + if(!empty($sqlParsed['GROUP'])){ $sqlGroupBy = "GROUP BY "; $aGroup = $sqlParsed['GROUP']; - foreach($aGroup as $key => $value ){ - if($key != 0) + foreach($aGroup as $key => $value ){ + if($key != 0) $sqlGroupBy .= ", "; if($value['direction'] == 'ASC' ) $sqlGroupBy .= $value['base_expr']; - else + else $sqlGroupBy .= $value['base_expr'] . " " . $value['direction']; } } $sqlHaving = ""; - if(!empty($sqlParsed['HAVING'])){ + if(!empty($sqlParsed['HAVING'])){ $sqlHaving = "HAVING "; $aHaving = $sqlParsed['HAVING']; - foreach($aHaving as $key => $value ){ + foreach($aHaving as $key => $value ){ $sqlHaving .= $value['base_expr'] . " "; } } $sqlOrderBy = ""; - if(!empty($sqlParsed['ORDER'])){ + if(!empty($sqlParsed['ORDER'])){ $sqlOrderBy = "ORDER BY "; $aOrder = $sqlParsed['ORDER']; - foreach($aOrder as $key => $value ){ - if($key != 0) + foreach($aOrder as $key => $value ){ + if($key != 0) $sqlOrderBy .= ", "; if($value['direction'] == 'ASC' ) $sqlOrderBy .= $value['base_expr']; - else + else $sqlOrderBy .= $value['base_expr'] . " " . $value['direction']; } } else { @@ -320,7 +322,7 @@ function queryModified($sqlParsed, $inputSel = "") } $sqlLimit = ""; - if(!empty($sqlParsed['LIMIT'])){ + if(!empty($sqlParsed['LIMIT'])){ $sqlLimit = "LIMIT ". $sqlParsed['LIMIT']['start'] . ", " . $sqlParsed['LIMIT']['end']; } @@ -329,15 +331,15 @@ function queryModified($sqlParsed, $inputSel = "") if(!empty($sqlParsed['CALL'])){ $sCall = "CALL "; $aCall = $sqlParsed['CALL']; - foreach($aCall as $key => $value ){ + foreach($aCall as $key => $value ){ $sCall .= $value . " "; - } + } return $sCall; } if(!empty($sqlParsed['EXECUTE'])){ $sCall = "EXECUTE "; $aCall = $sqlParsed['EXECUTE']; - foreach($aCall as $key => $value ){ + foreach($aCall as $key => $value ){ $sCall .= $value . " "; } return $sCall; @@ -345,7 +347,7 @@ function queryModified($sqlParsed, $inputSel = "") if(!empty($sqlParsed[''])){ $sCall = ""; $aCall = $sqlParsed['']; - foreach($aCall as $key => $value ){ + foreach($aCall as $key => $value ){ $sCall .= $value . " "; } return $sCall; diff --git a/gulliver/system/class.xmlform.php b/gulliver/system/class.xmlform.php index d714065cb..e30e58362 100755 --- a/gulliver/system/class.xmlform.php +++ b/gulliver/system/class.xmlform.php @@ -1167,9 +1167,12 @@ class XmlForm_Field_Suggest extends XmlForm_Field_SimpleText //by neyek 'size' => '"'.$this->size.'"', ); - $storeEntry = ''; - if($this->store_new_entry){ - $storeEntry = 'onchange="storeEntry(this, \''.$this->sqlConnection.'\', \''.$this->table.'\', \''.$this->primary_key.'\', \''.$this->primary_key_type.'\', \''.$this->field.'\')"'; + $storeEntry = null; + $storeEntryData = ", storeEntryData: [0]"; + + if ($this->store_new_entry) { + $storeEntry = ' title="' . G::LoadTranslation("ID_FIELD_DYNAFORM_SUGGEST_INPUT_TITLE") . '"'; + $storeEntryData = ", storeEntryData: [1, \"form[". $this->name . "_label]\", \"" . $this->sqlConnection . "\", \"" . $this->table . "\", \"" . $this->primary_key . "\", \"" . $this->primary_key_type . "\", \"" . $this->field . "\"]"; } $formVariableValue = ''; @@ -1269,10 +1272,11 @@ class XmlForm_Field_Suggest extends XmlForm_Field_SimpleText //by neyek $setValue = ($this->savelabel == '1') ? 'obj.value' : 'obj.id'; - $sOptions .= 'callback: function(obj){'; - + $sOptions .= 'callback: function (obj) { '; + $sOptions .= 'if (typeof obj != "undefined") { '; $sOptions .= ' var jField = { };'; $sOptions .= ' var sField = "[]"; '; + if ($count > 0) { for ($cnt = 0; $cnt < $count; $cnt++ ) { $sOptions .= 'if ( "' . $this->name . '" == "' . $aDepFields[$cnt] . '" ) {'; @@ -1286,7 +1290,6 @@ class XmlForm_Field_Suggest extends XmlForm_Field_SimpleText //by neyek $sOptions .= ' var sField = "["+ encodeURIComponent(jField.toJSONString()) + "]"; '; $sOptions .= $sCallBack . '; getField("' . $this->name . '").value = obj.id;'; - $sOptions .= 'var response = ajax_function("../gulliver/defaultAjaxDynaform", "reloadField", '; $sOptions .= ' "form=' . $owner->id . '&fields=" + sField, "POST"); '; @@ -1316,11 +1319,12 @@ class XmlForm_Field_Suggest extends XmlForm_Field_SimpleText //by neyek $sOptions .= '} else { '; $sOptions .= ' alert(\'Invalid response: \' + response); ' ; $sOptions .= '} '; - - $sOptions .= 'return false; }'; + $sOptions .= '} '; + $sOptions .= 'return false; '; + $sOptions .= '}'; $str .= ''; return $str; diff --git a/workflow/engine/js/dbConnections/main.js b/workflow/engine/js/dbConnections/main.js index dce01b2ec..9c3c193c4 100755 --- a/workflow/engine/js/dbConnections/main.js +++ b/workflow/engine/js/dbConnections/main.js @@ -1,14 +1,13 @@ /* - * Data base connection javascript routines - * @Author Erik Amatu Ortiz + * Data base connection javascript routines + * @Author Erik Amatu Ortiz * @Update date May 20th, 2009 */ var PROCESS_REQUEST_FILE = '../dbConnections/dbConnectionsAjax'; -String.prototype.trim = function() -{ - return this.replace(/^\s+|\s+get/g,""); +String.prototype.trim = function () { + return this.replace(/^\s+|\s+$/g, ""); } var oPanel; @@ -86,7 +85,7 @@ function saveEditDBConnection() if( getField('DBS_PORT').value.trim() == '' || getField('DBS_PORT').value.trim() == '0' ) { onChangeType(); } - + var dbs_uid = currentEditDBS_UID; var type = $('form[DBS_TYPE]').value; var server = $('form[DBS_SERVER]').value; @@ -375,16 +374,16 @@ function validateFields() if( getField('DBS_PORT').value.trim() == '' || getField('DBS_PORT').value.trim() == '0' ) { onChangeType(); } - + var res = true; var o = new input(getField('DBS_SERVER')); if($('form[DBS_SERVER]').value == '') { //new leimnud.module.app.alert().make({label: G_STRINGS.DBCONNECTIONS_MSG4}); o.failed(); res = false; - } else + } else o.passed(); - + var o = new input(getField('DBS_DATABASE_NAME')); if($('form[DBS_DATABASE_NAME]').value == '') { //new leimnud.module.app.alert().make({label: G_STRINGS.DBCONNECTIONS_MSG5}); @@ -392,7 +391,7 @@ function validateFields() res = false; } else o.passed(); - + var o = new input(getField('DBS_USERNAME')); if($('form[DBS_USERNAME]').value == '') { //new leimnud.module.app.alert().make({label: G_STRINGS.DBCONNECTIONS_MSG6}); @@ -400,22 +399,22 @@ function validateFields() res = false; } else o.passed(); - + /*var o = new input(getField('DBS_PORT')); if($('form[DBS_PORT]').value == '') { o.failed(); res = false; } else o.passed();*/ - + var o = new input(getField('DBS_TYPE')); if($('form[DBS_TYPE]').value == '0') { o.failed(); res = false; } else o.passed(); - - oType = getField('DBS_TYPE'); + + oType = getField('DBS_TYPE'); if( oType.value != 'mssql' && oType.value != 'oracle' ){ var o = new input(getField('DBS_ENCODE')); if($('form[DBS_ENCODE]').value == '0') { @@ -425,7 +424,7 @@ function validateFields() o.passed(); } - + if(!res){ new leimnud.module.app.alert().make({label: G_STRINGS.DBCONNECTIONS_ALERT}); } @@ -434,7 +433,7 @@ function validateFields() var onChangeType = function() { var oAux = getField('DBS_PORT'); - + switch(getField('DBS_TYPE').value) { case 'mysql': oAux.value = '3306'; @@ -451,11 +450,11 @@ var onChangeType = function() { default: oAux.value = ''; } - + }; function showEncodes(pre){ - oType = getField('DBS_TYPE'); + oType = getField('DBS_TYPE'); //if( oType.value != 'mssql' && oType.value != 'oracle' ){ if( oType.value != 'oracle' ){ showRowById('DBS_ENCODE'); @@ -465,29 +464,29 @@ function showEncodes(pre){ res = false; } else o.passed(); - + var o = getField('DBS_TYPE'); - + var oRPC = new leimnud.module.rpc.xmlhttp({ url : PROCESS_REQUEST_FILE, args: 'action=showEncodes&engine='+o.value }); - + oRPC.callback = function(rpc){ var oEnc = getField('DBS_ENCODE'); response = eval('{'+oRPC.xmlhttp.responseText+'}'); - + oEnc.options.length = 0; //set news for(i=0; i @@PME_XMLNODE_NAME AND XMLNODE_NAME <> "" AND ( TYPE="text" or TYPE="textarea" or TYPE="dropdown" or TYPE="listbox" or TYPE="hidden" or TYPE="suggest") ]]>Dependent Fields - + Hint @@ -140,39 +140,44 @@ select XMLNODE_NAME, XMLNODE_NAME AS NAME FROM dynaForm WHERE XMLNODE_NAME <> @@ Save - + @@ getField('PME_PRIMARY_KEY_TYPE_DATA').value = this.value.trim(); }); - function getTablesNames(){ - var s0 = getField('PME_XMLNODE_VALUE').value; - var s = getField('PME_XMLNODE_VALUE').value.toUpperCase(); + function getTablesNames() { + var strSql = getField("PME_XMLNODE_VALUE").value; + + strSql = stringReplace("\\x0A", " ", strSql); //\n 10 + strSql = stringReplace("\\x0D", " ", strSql); //\r 13 + strSql = stringReplace("\\x09", " ", strSql); //\t 9 + + var s0 = strSql; + var s = strSql.toUpperCase(); p1 = s.indexOf(" FROM "); if(p1 > 0){ @@ -218,7 +229,7 @@ select XMLNODE_NAME, XMLNODE_NAME AS NAME FROM dynaForm WHERE XMLNODE_NAME <> @@ ss = s0.substring(p1, p2); ss = ss.replace("FROM", "").trim(); ss = ss.replace("from", "").trim(); - + aTables = ss.split(','); otable = getField('PME_TABLE'); @@ -230,16 +241,26 @@ select XMLNODE_NAME, XMLNODE_NAME AS NAME FROM dynaForm WHERE XMLNODE_NAME <> @@ var newOption = new Option("", "0"); otable.options[0] = newOption; - for(i=0; i= 0){ @@ -258,9 +279,13 @@ select XMLNODE_NAME, XMLNODE_NAME AS NAME FROM dynaForm WHERE XMLNODE_NAME <> @@ var newOption = new Option("", "0"); otable.options[0] = newOption; - for(i=0; i - + diff --git a/workflow/engine/xmlform/roles/roles_Options.xml b/workflow/engine/xmlform/roles/roles_Options.xml index 2271a8739..eeb7dbc30 100755 --- a/workflow/engine/xmlform/roles/roles_Options.xml +++ b/workflow/engine/xmlform/roles/roles_Options.xml @@ -33,27 +33,27 @@ function saveNewRole() new leimnud.module.app.alert().make({label: G_STRINGS.ID_ROLES_MSG3}); return false; } - + var uri = 'request=verifyNewRole&code='+code; var ajax = AJAX(); ajax.open("POST", PROCESS_REQUEST_FILE, true); - ajax.setRequestHeader("Content-Type", "application/x-www-form-urlencoded;"); - ajax.onreadystatechange = function() { + ajax.setRequestHeader("Content-Type", "application/x-www-form-urlencoded;"); + ajax.onreadystatechange = function() { if(ajax.readyState == 4) { - + if(eval(ajax.responseText.trim())){ try{ parent = $('form[ROL_PARENT]').value; }catch(e){} code = $('form[ROL_CODE]').value; status = $('form[ROL_STATUS]').value; - var uri = 'request=saveNewRole&code='+code+'&parent='+parent+'&status='+status+'&name='+name; - + var uri = 'request=saveNewRole&code='+code+'&parent='+parent+'&status='+status+'&name='+name; + var oRPC = new leimnud.module.rpc.xmlhttp({ url : PROCESS_REQUEST_FILE, args: uri }); - + oRPC.callback = function(rpc){ var oRPC = new leimnud.module.rpc.xmlhttp({ url : PROCESS_REQUEST_FILE, @@ -62,38 +62,38 @@ function saveNewRole() args : 'request=show&r='+Math.random() }); oRPC.make(); - $('publisherContent[0]').innerHTML = oRPC.xmlhttp.responseText; + $('publisherContent[0]').innerHTML = oRPC.xmlhttp.responseText; window.location = 'roles_List'; }.extend(this); oRPC.make(); currentPopupWindow.remove(); } - + if(!eval(ajax.responseText.trim())){ new leimnud.module.app.alert().make({label: G_STRINGS.ID_ROLES_MSG2}); return false; } - } + } } ajax.send(uri); } function editRole(ROL_UID) -{ +{ if(ROL_UID!='00000000000000000000000000000002') - { - var uri = 'request=editRole&ROL_UID='+ROL_UID; + { + var uri = 'request=editRole&ROL_UID='+ROL_UID; popupWindow('', '../roles/roles_Ajax?'+uri, 350, 265); } else - { - new leimnud.module.app.alert().make({label: G_STRINGS.ID_ROLES_MSG}); - } + { + new leimnud.module.app.alert().make({label: G_STRINGS.ID_ROLES_MSG}); + } } function updateRole(ROL_UID) { - + code = $('form[ROL_CODE]').value; name = $('form[ROL_NAME]').value; if(code == '') { @@ -111,16 +111,16 @@ function updateRole(ROL_UID) { try{ parent = $('form[ROL_PARENT]').value; }catch(e){} - + status = $('form[ROL_STATUS]').value; - - var uri = 'request=updateRole&code='+code+'&parent='+parent+'&status='+status+'&rol_uid='+ROL_UID+'&name='+name; - + + var uri = 'request=updateRole&code='+code+'&parent='+parent+'&status='+status+'&rol_uid='+ROL_UID+'&name='+name; + var oRPC = new leimnud.module.rpc.xmlhttp({ url : PROCESS_REQUEST_FILE, args: uri }); - + oRPC.callback = function(rpc){ var oRPC = new leimnud.module.rpc.xmlhttp({ url : PROCESS_REQUEST_FILE, @@ -140,21 +140,21 @@ function deleteRole(ROL_UID) { var uri = 'request=canDeleteRole&ROL_UID='+ROL_UID; var ajax = AJAX(); ajax.open("POST", PROCESS_REQUEST_FILE, true); - ajax.setRequestHeader("Content-Type", "application/x-www-form-urlencoded;"); - ajax.onreadystatechange = function() { + ajax.setRequestHeader("Content-Type", "application/x-www-form-urlencoded;"); + ajax.onreadystatechange = function() { if(ajax.readyState == 4) { - - if(eval(ajax.responseText.trim())){ + + if(eval(ajax.responseText.trim())){ new leimnud.module.app.confirm().make({ label:G_STRINGS.ID_REMOVE_ROLE, action:function() { - var uri = 'request=deleteRole&ROL_UID='+ROL_UID; - + var uri = 'request=deleteRole&ROL_UID='+ROL_UID; + var oRPC = new leimnud.module.rpc.xmlhttp({ url : PROCESS_REQUEST_FILE, args: uri }); - + oRPC.callback = function(rpc){ var oRPC = new leimnud.module.rpc.xmlhttp({ url : PROCESS_REQUEST_FILE, @@ -167,16 +167,16 @@ function deleteRole(ROL_UID) { window.location = 'roles_List'; }.extend(this); oRPC.make(); - + }.extend(this) }); - } + } else { new leimnud.module.app.alert().make({label: G_STRINGS.ID_ROLES_CAN_NOT_DELETE}); return false; } - } + } } ajax.send(uri); }; @@ -189,7 +189,7 @@ function usersIntoRole(ROL_UID) } function deleteUserRole(ROL_UID, USR_UID){ - + new leimnud.module.app.confirm().make({ label:G_STRINGS.ID_MSG_CONFIRM, action:function(){ @@ -219,7 +219,7 @@ oPanel = new leimnud.module.panel(); fx :{modal:true,opacity:true,blinkToFront:false,fadeIn:false,drag:true} }; oPanel.events = { - remove: function() { + remove: function() { delete(oPanel); resetChecks(); }.extend(this) @@ -237,7 +237,7 @@ oPanel = new leimnud.module.panel(); }); oRPC.make(); currentPopupWindow.clearContent(); - currentPopupWindow.addContent(oRPC.xmlhttp.responseText); + currentPopupWindow.addContent(oRPC.xmlhttp.responseText); } var checks_selected_Rolid = new Array(); function showUsersLoad( ROL_UID ){ @@ -253,7 +253,7 @@ function showUsersLoad( ROL_UID ){ fx :{modal:true,opacity:true,blinkToFront:false,fadeIn:false,drag:true} }; oPanel.events = { - remove: function() { + remove: function() { delete(oPanel); resetChecks(); }.extend(this) @@ -267,7 +267,7 @@ function showUsersLoad( ROL_UID ){ }); //currentPopupWindow.clearContent(); - //currentPopupWindow.addContent(oRPC.xmlhttp.responseText); + //currentPopupWindow.addContent(oRPC.xmlhttp.responseText); checks_selected_Rolid.push(ROL_UID); oRPC.callback = function(rpc) { oPanel.loader.hide(); @@ -287,11 +287,11 @@ function showUsersLoad( ROL_UID ){ }; }catch(e){alert(e)} } - } + } }.extend(this); oRPC.make(); - + } function assignUserToRole(ROL_UID, USR_UID) { @@ -303,13 +303,13 @@ function assignUserToRole(ROL_UID, USR_UID) }); oRPC.make(); currentPopupWindow.clearContent(); - currentPopupWindow.addContent(oRPC.xmlhttp.responseText); + currentPopupWindow.addContent(oRPC.xmlhttp.responseText); } function viewPermitions(ROL_UID) { var uri = 'request=viewPermitions&ROL_UID='+ROL_UID; - popupWindow('', '../roles/roles_Ajax?'+uri, 500, 450); + popupWindow('', '../roles/roles_Ajax?'+uri, 500, 450); } function showPermissions(ROL_UID) @@ -327,7 +327,7 @@ function showPermissions(ROL_UID) function assignPermissionToRole(ROL_UID, PER_UID) { - + var oRPC = new leimnud.module.rpc.xmlhttp({ url : PROCESS_REQUEST_FILE, async : false, @@ -336,11 +336,11 @@ function assignPermissionToRole(ROL_UID, PER_UID) }); oRPC.make(); currentPopupWindow.clearContent(); - currentPopupWindow.addContent(oRPC.xmlhttp.responseText); + currentPopupWindow.addContent(oRPC.xmlhttp.responseText); } function deletePermissionRole(ROL_UID, PER_UID){ - + new leimnud.module.app.confirm().make({ label:G_STRINGS.ID_MSG_CONFIRM, action:function(){ @@ -382,14 +382,14 @@ function backUsers(ROL_UID) currentPopupWindow.clearContent(); currentPopupWindow.addContent(oRPC.xmlhttp.responseText); } - - - -function AJAX() + + + +function AJAX() { try { xmlhttp = new XMLHttpRequest(); - } + } catch(generic_error) { try { xmlhttp = new ActiveXObject("Msxml2.XMLHTTP"); @@ -403,10 +403,9 @@ function AJAX() } return xmlhttp; } - -String.prototype.trim = function() -{ - return this.replace(/^\s+|\s+get/g,""); + +String.prototype.trim = function () { + return this.replace(/^\s+|\s+$/g, ""); } function $(id){ @@ -433,7 +432,7 @@ function saveUsers(){ resetChecks(); oRPC.make(); currentPopupWindow.remove(); - + usersIntoRole(rolUid); }