Restructuring SQLForm GUI API (qualipro)

Products/zms/ZMSZCatalogConnector.py

@@ -253,7 +253,7 @@ def search_xml(self, q, page_index=0, page_size=10, debug=0, REQUEST=None, RESPO
       xml += '<lst name="responseHeader">'
       xml += '<int name="status">%i</int>'%status
       xml += '<lst name="params">'
-      for key in REQUEST.form.keys():
+      for key in REQUEST.form:
         xml += '<str name="%s">%s</str>'%(key, standard.html_quote(REQUEST.form[key]))
       xml += '</lst>'
       xml += '</lst>'

Products/zms/conf/metaobj_manager/com.zms.foundation.zcatalog.opensearch/opensearch/script.js

@@ -70,7 +70,7 @@ $(function() {
 				hit['snippet'] = source['attachment']['content'];
 			}
 			if (hit['snippet'].length > 200) {
-				hit['snippet'] = hit['snippet'].substr(0,200) + '...';
+				hit['snippet'] = hit['snippet'].substring(0,200) + '...';
 			}
 			res_processed.hits.push(hit)
 		})

Products/zms/conf/metaobj_manager/com.zms.foundation/ZMSLib/show_version.zpt

@@ -3,11 +3,10 @@
 <tal:block tal:define="global zmscontext options/zmscontext">
 	<tal:block tal:condition="python:zmscontext.getHistory()">
 		<script>
-		<!--
 			function showHistory(el) {
 				var v = $(el).val();
-				var version_nr = v.substr(0,v.indexOf(" "));
-				var version_dt = v.substr(v.indexOf(" ")+1);
+				var version_nr = v.substring(0,v.indexOf(" "));
+				var version_dt = v.substring(v.indexOf(" ")+1);
 				// $(el).prop('selectedIndex',0);
 				$.get("ajaxBodyContentObjHistory",{lang:$("input#lang").val(),version_nr:version_nr,revision:1,ts:new Date()},function(data) {
 					var $xml = $( data );
@@ -62,7 +61,6 @@
 				historyselect.prop("selectedIndex", 1);
 			}
 			});
-		-->
 		</script>
 		<input type="hidden" id="lang" name="lang" tal:attributes="value request/lang"/>
 		<select onchange="showHistory(this)">

Products/zms/conf/metaobj_manager/com.zms.foundation/ZMSLinkElement/inferface0.zpt

@@ -98,7 +98,7 @@ $(function(){
 								var attr_ref = $input.attr("data-value");
 								if (v!="") {
 									attr_ref = attr_ref.replace(/;lang\=\w*/gi,'');
-									attr_ref = attr_ref.substr(0,attr_ref.indexOf('}'));
+									attr_ref = attr_ref.substring(0,attr_ref.indexOf('}'));
 									attr_ref += ';lang='+v+'}';
 								}
 								$input.val(attr_ref).change();

Products/zms/conf/metaobj_manager/com.zms.foundation/ZMSObjectSet/script.zmi.js

@@ -88,7 +88,7 @@ $(function() {
 	// always collapse last-modified-accordion
 	$(".attr_last_modified a.card-toggle").each(function(){
 			var data_root = $("body").attr('data-root');
-			var id = $(this).attr('href').substr(1);
+			var id = $(this).attr('href').substring(1);
 			var key = "ZMS."+data_root+".collapse-"+id;
 			console.log("$ZMILocalStorageAPI.set("+key+",0)");
 			$ZMILocalStorageAPI.set(key,'0');
@@ -139,7 +139,7 @@ $(function() {
 			for (var i in localStorage) {
 				if (i.indexOf(prefix)==0) {
 					console.log("i="+i);
-					params[i.substr(prefix.length)] = localStorage[i];
+					params[i.substring(prefix.length)] = localStorage[i];
 				}
 			}
 			// Force to ZMI language

Products/zms/conf/metaobj_manager/com.zms.foundation/ZMSTable/interface0.zpt

@@ -354,7 +354,7 @@
 							xml += '<item key="colspan" type="int">' + 1 + '</item>\n';
 							var el_inputs = $('textarea,input',el_tds[j]);
 							for ( var k=0; k < el_inputs.length; k++) {
-								var key = el_inputs[k].id.substr(0,el_inputs[k].id.indexOf('_'));
+								var key = el_inputs[k].id.substring(0,el_inputs[k].id.indexOf('_'));
 								xml += '<item key="' + key + '"><![CDATA[' + $(el_inputs[k]).val() + ']]></item>\n';
 							}
 							xml += '</dictionary></item>\n';
@@ -382,7 +382,7 @@
 				function table_cell_edit(el_td) {
 					var el = $('textarea',el_td);
 					var el_name = el.attr('id');
-					table_cell_id = el_name.substr(el_name.indexOf('_')+1);
+					table_cell_id = el_name.substring(el_name.indexOf('_')+1);
 					// Set cell background.
 					el_td.addClass("active");
 					// Apply values.
@@ -575,7 +575,7 @@
 						// Remove table with inline-links (if exists).
 						$('table',this).remove();
 						$('textarea,input',this).each(function() {
-								var key = this.id.substr(0,this.id.indexOf('_'));
+								var key = this.id.substring(0,this.id.indexOf('_'));
 								$(this).attr( 'id', key + '_' + table_cell_uid);
 								$(this).attr( 'name', key + '_' + table_cell_uid);
 								if ( key.indexOf('format') == 0) {

Products/zms/manage_addzmsform.zpt

@@ -84,10 +84,10 @@
 		}
 		else {
 			if (v.indexOf('-')>0) {
-				v = v.substr(0,v.indexOf('-'));
+				v = v.substring(0,v.indexOf('-'));
 			}
 			if (v.indexOf('.')>0) {
-				v = v.substr(0,v.indexOf('.'));
+				v = v.substring(0,v.indexOf('.'));
 			}
 			img_src = v+'.png';
 			if (v.indexOf('http://')<0) {

Products/zms/plugins/rte/ckeditor/manage_form.zpt

@@ -30,7 +30,7 @@ Fix for can't edit fields of CKEditor in jQuery UI modal dialog
 
 function zmiStandardOnSubmitEventHandler(fm) {
   for (var id in CKEDITOR.instances) {
-    var elName = id.substr(id.indexOf('_')+1);
+    var elName = id.substring(id.indexOf('_')+1);
     var el = document.getElementById('zmiStandardEditor'+elName);
     if ( el != null && el.style.display != 'none' && el.style.visibility != 'hidden') {
       var data = $('#'+elName).val();
@@ -46,7 +46,7 @@ function zmiStandardOnSubmitEventHandler(fm) {
 
 function zmiRichtextOnSubmitEventHandler(fm) {
   for (var id in CKEDITOR.instances) {
-    var elName = id.substr(id.indexOf('_')+1);
+    var elName = id.substring(id.indexOf('_')+1);
     var el = document.getElementById('zmiRichtextEditor'+elName);
     if ( el != null && el.style.display != 'none' && el.style.visibility != 'hidden') {
       // Get value from editor.

Products/zms/plugins/rte/tinymce/manage_form.zpt

@@ -20,7 +20,7 @@ function zmiStandardOnSubmitEventHandler(fm) {
 
 function zmiRichtextOnSubmitEventHandler(fm) {
 	for (var id in tinyMCE.editors) {
-		var elName = id.substr(id.indexOf('_')+1);
+		var elName = id.substring(id.indexOf('_')+1);
 		var el = document.getElementById('zmiRichtextEditor'+elName);
 		if ( el != null && el.style.display != 'none' && el.style.visibility != 'hidden') {
 			// Get value from editor.

Products/zms/plugins/www/bootstrap/plugin/bootstrap.plugin.zmi.js

@@ -75,15 +75,15 @@ $ZMI.registerReady(function(){
 				$change_dt.each(function() {
 					var $el = $(this);
 					var mydate = $el.attr("title");
-					if (typeof mydate!="undefined") {
+					if (typeof mydate !== "undefined") {
 						var myformat = getZMILangStr('DATETIME_FMT');
 						var dtsplit=mydate.split(/[\/ .:]/);
 						var dfsplit=myformat.split(/[\/ .:]/);
 						// creates assoc array for date
 						df = new Array();
 						for(dc=0;dc<dtsplit.length;dc++) {
 							df[dfsplit[dc]]=dtsplit[dc];
-							df[dfsplit[dc].substr(1)]=parseInt(dtsplit[dc]);
+							df[dfsplit[dc].substring(1)]=parseInt(dtsplit[dc]);
 						}
 						var dstring = df['%Y']+'-'+df['%m']+'-'+df['%d']+' '+df['%H']+':'+df['%M']+':'+df['%S'];
 						var date = new Date(df['Y'],df['m']-1,df['d']);
@@ -528,9 +528,9 @@ $ZMI.registerReady(function(){
 	$("#subTab ul.nav.nav-tabs").each(function() {
 		var anchor = $("a:first",this).attr("href");
 		if (self.location.href.indexOf("#")>0) {
-			anchor = self.location.href.substr(self.location.href.indexOf("#")+1);
+			anchor = self.location.href.substring(self.location.href.indexOf("#")+1);
 			if (anchor.indexOf('_')==0) {
-				anchor = anchor.substr(1);
+				anchor = anchor.substring(1);
 			}
 			anchor = '#'+anchor;
 		}
@@ -618,7 +618,7 @@ ZMI.prototype.initInputFields = function(container) {
 			$("i:first",$(".collapse.show",context).prev('.card-header')).removeClass("fa-caret-right").addClass("fa-caret-down");
 			$("a.card-toggle",this).click(function(){
 				$(this).blur();
-				var id = $(this).attr('href').substr(1);
+				var id = $(this).attr('href').substring(1);
 				var key = "ZMS."+data_root+".collapse-"+id;
 				var $icon = $("i:first",this);
 				var showing = $icon.hasClass("fa-caret-down")?1:0;
@@ -1019,7 +1019,7 @@ ZMI.prototype.initInputFields = function(container) {
 			var $richedits = $('div[id^="zmiStandardEditor"]',this);
 			if ($richedits.length > 0) {
 				$richedits.each(function() {
-					var elName = $(this).attr("id").substr("zmiStandardEditor".length);
+					var elName = $(this).attr("id").substring("zmiStandardEditor".length);
 					zmiRichtextInit(elName);
 					var v = $("#"+elName).val();
 					function matchAll(source, regexp) {
@@ -1212,9 +1212,9 @@ ZMI.prototype.iframe = function(href, data, opt) {
 			var $result = $(result);
 			if ($("div#system_msg",$result).length>0) {
 				var manage_tabs_message = $("div#system_msg",$result).text();
-				manage_tabs_message = manage_tabs_message.substr(0,manage_tabs_message.lastIndexOf("("));
+				manage_tabs_message = manage_tabs_message.substring(0,manage_tabs_message.lastIndexOf("("));
 				var href = self.location.href;
-				href = href.substr(0,href.indexOf("?"))+"?lang="+getZMILang()+"&manage_tabs_message="+manage_tabs_message;
+				href = href.substring(0,href.indexOf("?"))+"?lang="+getZMILang()+"&manage_tabs_message="+manage_tabs_message;
 				self.location.href = href;
 			} else {
 				opt['body'] = result;
@@ -1259,7 +1259,7 @@ ZMIObjectTree.prototype.init = function(s,href,p) {
 		for (var i = 0; i < pages.length; i++) {
 			var $page = $(pages[i]);
 			var page_home_id = $page.attr("home_id");
-			var page_id = $page.attr("id").substr(page_home_id.length+1);
+			var page_id = $page.attr("id").substring(page_home_id.length+1);
 			var html = that.addPages([pages[i]]);
 			$(context).append(html);
 			if (typeof that.p['addPages.callback'] == 'function') {
@@ -1285,7 +1285,7 @@ ZMIObjectTree.prototype.addPages = function(pages) {
 		var titlealt = "";
 		var page_uid = $page.attr("uid");
 		var page_home_id = $page.attr("home_id");
-		var page_id = $page.attr("id").substr(page_home_id.length+1);
+		var page_id = $page.attr("id").substring(page_home_id.length+1);
 		var page_absolute_url = $page.attr("absolute_url");
 		var page_physical_path = $page.attr("physical_path");
 		var link_url = $page.attr("index_html");
@@ -1373,7 +1373,7 @@ ZMIObjectTree.prototype.toggleClick = function(toggle, callback) {
 			href = '/'+homeId+href;
 		}
 		var base = $ZMI.getPhysicalPath();
-		base = base.substr(0,base.indexOf('/'+homeId));
+		base = base.substring(0,base.indexOf('/'+homeId));
 		// Set wait-cursor.
 		$container.append('<div id="loading" class="zmi-page"><i class="fas fa-spinner fa-spin"></i>&nbsp;&nbsp;'+getZMILangStr('MSG_LOADING')+'</div>');
 		// JQuery.AJAX.get
@@ -1500,7 +1500,7 @@ ZMIActionList.prototype.over = function(el, e, cb) {
 		if (!$(el).hasClass("loading")) {
 			if ($(".fa-plus-sign",this).length==0) {
 				var action = self.location.href;
-				action = action.substr(0,action.lastIndexOf("/")+1);
+				action = action.substring(0,action.lastIndexOf("/")+1);
 				if (context_id=="") {
 					action += "manage_properties";
 				}
@@ -1521,7 +1521,7 @@ ZMIActionList.prototype.over = function(el, e, cb) {
 	});
 	// Build action and params.
 	var action = zmiParams['base_url'];
-	action = action.substr(0,action.lastIndexOf("/"));
+	action = action.substring(0,action.lastIndexOf("/"));
 	action += "/manage_ajaxZMIActions";
 	var params = {};
 	params['lang'] = lang;
@@ -1543,8 +1543,8 @@ ZMIActionList.prototype.over = function(el, e, cb) {
 			var action = actions[1];
 			var optlabel = action[0];
 			var opticon = '<i class="fas fa-plus-sign"></i>';
-			optlabel = optlabel.substr("-----".length);
-			optlabel = optlabel.substr(0,optlabel.lastIndexOf("-----"));
+			optlabel = optlabel.substring("-----".length);
+			optlabel = optlabel.substring(0,optlabel.lastIndexOf("-----"));
 			optlabel = optlabel.basicTrim();
 			$("button.split-left",el).html(opticon+' '+optlabel);
 		}
@@ -1559,8 +1559,8 @@ ZMIActionList.prototype.over = function(el, e, cb) {
 			var opttitle = action.length>3?action[3]:'';
 			if (optlabel.indexOf("-----") == 0 && optlabel.lastIndexOf("-----") > 0) {
 				opticon = '<i class="fas fa-caret-down"></i>';
-				optlabel = optlabel.substr("-----".length);
-				optlabel = optlabel.substr(0,optlabel.lastIndexOf("-----"));
+				optlabel = optlabel.substring("-----".length);
+				optlabel = optlabel.substring(0,optlabel.lastIndexOf("-----"));
 				optlabel = optlabel.basicTrim();
 				$ul.append('<div class="dropdown-header '+optvalue+'">'+opticon+' '+optlabel+'</div>');
 			}
@@ -1688,7 +1688,7 @@ ZMIActionList.prototype.exec = function(sender, label, target, meta_id='') {
 		$input.prop("checked",true);
 		zmiActionButtonsRefresh(sender);
 		var params = $ZMI.parseURLParams(target);
-		var target = target.indexOf("?")>0?target.substr(0,target.indexOf("?")):target;
+		var target = target.indexOf("?")>0?target.substring(0,target.indexOf("?")):target;
 		if (this.confirm($fm,target,params)) {
 			var c = 0;
 			for (var k in params) {
@@ -1914,7 +1914,7 @@ function untagSelected(tag, leftDelimiter, rightDelimiter) {
 		range = range.slice(0,range.length-1);
 		post = " " + post;
 	}
-	var tagName = tag.indexOf(" ")>0?tag.substr(0,tag.indexOf(" ")):tag;
+	var tagName = tag.indexOf(" ")>0?tag.substring(0,tag.indexOf(" ")):tag;
 	var startTag = leftDelimiter + tag + rightDelimiter;
 	var startRe = new RegExp(leftDelimiter + tag + "(.*?)" + rightDelimiter, "gi");
 	var endTag = leftDelimiter + "/" + tagName + rightDelimiter; 
@@ -1947,8 +1947,8 @@ function tagSelected(tag, leftDelimiter, rightDelimiter) {
 		range = range.slice(0,range.length-1);
 		post = " " + post;
 	}
-	var tagName = tag.indexOf(" ")>0?tag.substr(0,tag.indexOf(" ")):tag;
-	var tagAttrs = tag.indexOf(" ")>0?tag.substr(tag.indexOf(" ")):"";
+	var tagName = tag.indexOf(" ")>0?tag.substring(0,tag.indexOf(" ")):tag;
+	var tagAttrs = tag.indexOf(" ")>0?tag.substring(tag.indexOf(" ")):"";
 	if (tagName == 'a' && tagAttrs == '') {
 		if (range.indexOf("@") > 0) {
 			tagAttrs = ' href="mailto:'+range+'"';

Products/zms/plugins/www/zmi.core.js

@@ -14,8 +14,8 @@ Array.prototype.contains = function(obj) {var i,listed=false;for(i=0;i<this.leng
  */
 ZMI.prototype.parseURLParams = function(url) {
 	var qd = {};
-	var search = url.indexOf("?")>0?url.substr(url.indexOf("?")):"?";
-	search.substr(1).split("&").forEach(function(item) {
+	var search = url.indexOf("?")>0?url.substring(url.indexOf("?")):"?";
+	search.substring(1).split("&").forEach(function(item) {
 				var s = item.split("="),
 					k = s[0],
 					v = s[1] && decodeURIComponent(s[1]);
@@ -36,15 +36,15 @@ $ZMI.registerReady(function(){
 		var delimiter = delimiter_list[h];
 		var i = base_url.indexOf(delimiter);
 		if (i > 0) {
-			base_url = base_url.substr(0,i);
+			base_url = base_url.substring(0,i);
 		}
 		var i = href.indexOf(delimiter);
 		if (i > 0) {
-			var query_string = href.substr(i+1);
+			var query_string = href.substring(i+1);
 			if (h < delimiter_list.length-1) {
 				i = query_string.indexOf(delimiter_list[h+1]);
 				if (i > 0) {
-					query_string = query_string.substr(0,i);
+					query_string = query_string.substring(0,i);
 				}
 			}
 			var l = query_string.split('&');
@@ -53,8 +53,8 @@ $ZMI.registerReady(function(){
 				if (i < 0) {
 					break;
 				}
-				if (typeof zmiParams[l[j].substr(0,i)] == "undefined") {
-					zmiParams[l[j].substr(0,i)] = unescape(l[j].substr(i+1));
+				if (typeof zmiParams[l[j].substring(0,i)] == "undefined") {
+					zmiParams[l[j].substring(0,i)] = unescape(l[j].substring(i+1));
 				}
 			}
 		}
@@ -282,7 +282,7 @@ ZMI.prototype.getReqProperty = function(key, defaultValue) {
 	};
 	var url = this.getPhysicalPath();
 	if (url.indexOf('/content/')>0 || url.slice(-8)=='/content' ) {
-		url = url.substr(0,url.indexOf('/content')+'/content'.length);
+		url = url.substring(0,url.indexOf('/content')+'/content'.length);
 	} else {
 		url='';
 	};
@@ -301,7 +301,7 @@ ZMI.prototype.getReqProperty = function(key, defaultValue) {
 ZMI.prototype.getBaseUrl = function(key, defaultValue) {
 		var url = this.getPhysicalPath();
 		if (url.indexOf('/content/')>0 || url.slice(-8)=='/content' ) {
-			url = url.substr(0,url.indexOf('/content')+'/content'.length);
+			url = url.substring(0,url.indexOf('/content')+'/content'.length);
 		} else {
 			url='';
 		};
@@ -364,7 +364,7 @@ ZMI.prototype.display_icon = function(meta_type) {
 		data['meta_type'] = meta_type;
 		var url = this.getPhysicalPath();
 		if (url.indexOf('/content/')>0 || url.slice(-8)=='/content' ) {
-			url = url.substr(0,url.indexOf('/content')+'/content'.length);
+			url = url.substring(0,url.indexOf('/content')+'/content'.length);
 		} else {
 			url='';
 		}

Products/zms/plugins/www/zmi.internal.js

@@ -41,9 +41,9 @@ ZMI.prototype.getCoords = function(theElement, thePosition) {
 ZMI.prototype.getDescendantLanguages = function() {
 	var base = self.location.href;
 	if (base.indexOf('?') > 0) {
-		base = base.substr(0,base.indexOf('?'));
+		base = base.substring(0,base.indexOf('?'));
 	}
-	base = base.substr(0,base.lastIndexOf('/'));
+	base = base.substring(0,base.lastIndexOf('/'));
 	var response = $.ajax({
 		url: base+'/getDescendantLanguages',
 		data:{id:getZMILang()},
@@ -82,10 +82,10 @@ ZMI.prototype.getServerUrl = function(url) {
 		return "";
 	}
 	var protocol = url;
-	protocol = protocol.substr(0,protocol.indexOf(":")+3);
+	protocol = protocol.substring(0,protocol.indexOf(":")+3);
 	var server_url = url;
-	server_url = server_url.substr(protocol.length);
-	server_url = protocol + server_url.substr(0,server_url.indexOf("/"));
+	server_url = server_url.substring(protocol.length);
+	server_url = protocol + server_url.substring(0,server_url.indexOf("/"));
 	return server_url;
 }
 
@@ -101,8 +101,8 @@ ZMI.prototype.relativateUrl = function(url,anchor,page_abs_url) {
 	if (server_url.length > 0 && page_server_url.length > 0 && server_url != page_server_url) {
 		return url;
 	}
-	var currntPath = page_abs_url.substr(page_server_url.length);
-	var targetPath = url.substr(server_url.length);
+	var currntPath = page_abs_url.substring(page_server_url.length);
+	var targetPath = url.substring(server_url.length);
 	while ( currntPath.length > 0 && targetPath.length > 0) {
 		var i = currntPath.indexOf( '/');
 		var j = targetPath.indexOf( '/');