From 9d195d6e82c3be4e543a47ef8ff1e9fe54bd0939 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Tue, 05 Jul 2011 13:09:25 -0400
Subject: [PATCH] - Added lost argument in delete_record() method
---
program/js/common.js | 248 +++++++++++++++++++++++++++++++------------------
1 files changed, 157 insertions(+), 91 deletions(-)
diff --git a/program/js/common.js b/program/js/common.js
index d23a133..cacf0ff 100644
--- a/program/js/common.js
+++ b/program/js/common.js
@@ -1,9 +1,9 @@
/*
+-----------------------------------------------------------------------+
- | RoundCube common js library |
+ | Roundcube common js library |
| |
- | This file is part of the RoundCube web development suite |
- | Copyright (C) 2005-2007, RoundCube Dev, - Switzerland |
+ | This file is part of the Roundcube web development suite |
+ | Copyright (C) 2005-2007, The Roundcube Dev Team |
| Licensed under the GNU GPL |
| |
+-----------------------------------------------------------------------+
@@ -25,70 +25,111 @@
*/
function roundcube_browser()
{
- this.ver = parseFloat(navigator.appVersion);
- this.appver = navigator.appVersion;
- this.agent = navigator.userAgent;
- this.name = navigator.appName;
- this.vendor = navigator.vendor ? navigator.vendor : '';
- this.vendver = navigator.vendorSub ? parseFloat(navigator.vendorSub) : 0;
- this.product = navigator.product ? navigator.product : '';
- this.platform = String(navigator.platform).toLowerCase();
- this.lang = (navigator.language) ? navigator.language.substring(0,2) :
- (navigator.browserLanguage) ? navigator.browserLanguage.substring(0,2) :
- (navigator.systemLanguage) ? navigator.systemLanguage.substring(0,2) : 'en';
+ var n = navigator;
- this.win = (this.platform.indexOf('win')>=0) ? true : false;
- this.mac = (this.platform.indexOf('mac')>=0) ? true : false;
- this.linux = (this.platform.indexOf('linux')>=0) ? true : false;
- this.unix = (this.platform.indexOf('unix')>=0) ? true : false;
+ this.ver = parseFloat(n.appVersion);
+ this.appver = n.appVersion;
+ this.agent = n.userAgent;
+ this.agent_lc = n.userAgent.toLowerCase();
+ this.name = n.appName;
+ this.vendor = n.vendor ? n.vendor : '';
+ this.vendver = n.vendorSub ? parseFloat(n.vendorSub) : 0;
+ this.product = n.product ? n.product : '';
+ this.platform = String(n.platform).toLowerCase();
+ this.lang = (n.language) ? n.language.substring(0,2) :
+ (n.browserLanguage) ? n.browserLanguage.substring(0,2) :
+ (n.systemLanguage) ? n.systemLanguage.substring(0,2) : 'en';
+
+ this.win = (this.platform.indexOf('win') >= 0);
+ this.mac = (this.platform.indexOf('mac') >= 0);
+ this.linux = (this.platform.indexOf('linux') >= 0);
+ this.unix = (this.platform.indexOf('unix') >= 0);
this.dom = document.getElementById ? true : false;
this.dom2 = (document.addEventListener && document.removeEventListener);
- this.ie = (document.all) ? true : false;
+ this.ie = (document.all && !window.opera);
this.ie4 = (this.ie && !this.dom);
this.ie5 = (this.dom && this.appver.indexOf('MSIE 5')>0);
this.ie8 = (this.dom && this.appver.indexOf('MSIE 8')>0);
this.ie7 = (this.dom && this.appver.indexOf('MSIE 7')>0);
this.ie6 = (this.dom && !this.ie8 && !this.ie7 && this.appver.indexOf('MSIE 6')>0);
- this.mz = (this.dom && this.ver>=5); // (this.dom && this.product=='Gecko')
- this.ns = ((this.ver<5 && this.name=='Netscape') || (this.ver>=5 && this.vendor.indexOf('Netscape')>=0));
- this.ns6 = (this.ns && parseInt(this.vendver)==6); // (this.mz && this.ns) ? true : false;
- this.ns7 = (this.ns && parseInt(this.vendver)==7); // this.agent.indexOf('Netscape/7')>0);
- this.safari = (this.agent.toLowerCase().indexOf('safari')>0 || this.agent.toLowerCase().indexOf('applewebkit')>0);
- this.konq = (this.agent.toLowerCase().indexOf('konqueror')>0);
+ this.ns = ((this.ver < 5 && this.name == 'Netscape') || (this.ver >= 5 && this.vendor.indexOf('Netscape') >= 0));
+ this.chrome = (this.agent_lc.indexOf('chrome') > 0);
+ this.safari = (!this.chrome && (this.agent_lc.indexOf('safari') > 0 || this.agent_lc.indexOf('applewebkit') > 0));
+ this.mz = (this.dom && !this.ie && !this.ns && !this.chrome && !this.safari && this.agent.indexOf('Mozilla') >= 0);
+ this.konq = (this.agent_lc.indexOf('konqueror') > 0);
+ this.iphone = (this.safari && this.agent_lc.indexOf('iphone') > 0);
+ this.ipad = (this.safari && this.agent_lc.indexOf('ipad') > 0);
+ this.opera = window.opera ? true : false;
- this.opera = (window.opera) ? true : false;
-
- if(this.opera && window.RegExp)
- this.vendver = (/opera(\s|\/)([0-9\.]+)/i.test(navigator.userAgent)) ? parseFloat(RegExp.$2) : -1;
- else if(!this.vendver && this.safari)
- this.vendver = (/(safari|applewebkit)\/([0-9]+)/i.test(this.agent)) ? parseInt(RegExp.$2) : 0;
- else if((!this.vendver && this.mz) || this.agent.indexOf('Camino')>0)
+ if (this.opera && window.RegExp)
+ this.vendver = (/opera(\s|\/)([0-9\.]+)/.test(this.agent_lc)) ? parseFloat(RegExp.$2) : -1;
+ else if (this.chrome && window.RegExp)
+ this.vendver = (/chrome\/([0-9\.]+)/.test(this.agent_lc)) ? parseFloat(RegExp.$1) : 0;
+ else if (!this.vendver && this.safari)
+ this.vendver = (/(safari|applewebkit)\/([0-9]+)/.test(this.agent_lc)) ? parseInt(RegExp.$2) : 0;
+ else if ((!this.vendver && this.mz) || this.agent.indexOf('Camino')>0)
this.vendver = (/rv:([0-9\.]+)/.test(this.agent)) ? parseFloat(RegExp.$1) : 0;
- else if(this.ie && window.RegExp)
- this.vendver = (/msie\s+([0-9\.]+)/i.test(this.agent)) ? parseFloat(RegExp.$1) : 0;
- else if(this.konq && window.RegExp)
- this.vendver = (/khtml\/([0-9\.]+)/i.test(this.agent)) ? parseFloat(RegExp.$1) : 0;
+ else if (this.ie && window.RegExp)
+ this.vendver = (/msie\s+([0-9\.]+)/.test(this.agent_lc)) ? parseFloat(RegExp.$1) : 0;
+ else if (this.konq && window.RegExp)
+ this.vendver = (/khtml\/([0-9\.]+)/.test(this.agent_lc)) ? parseFloat(RegExp.$1) : 0;
// get real language out of safari's user agent
- if(this.safari && (/;\s+([a-z]{2})-[a-z]{2}\)/i.test(this.agent)))
+ if (this.safari && (/;\s+([a-z]{2})-[a-z]{2}\)/.test(this.agent_lc)))
this.lang = RegExp.$1;
this.dhtml = ((this.ie4 && this.win) || this.ie5 || this.ie6 || this.ns4 || this.mz);
this.vml = (this.win && this.ie && this.dom && !this.opera);
- this.pngalpha = (this.mz || (this.opera && this.vendver>=6) || (this.ie && this.mac && this.vendver>=5) ||
- (this.ie && this.win && this.vendver>=5.5) || this.safari);
- this.opacity = (this.mz || (this.ie && this.vendver>=5.5 && !this.opera) || (this.safari && this.vendver>=100));
- this.cookies = navigator.cookieEnabled;
-
+ this.pngalpha = (this.mz || (this.opera && this.vendver >= 6) || (this.ie && this.mac && this.vendver >= 5) ||
+ (this.ie && this.win && this.vendver >= 5.5) || this.safari);
+ this.opacity = (this.mz || (this.ie && this.vendver >= 5.5 && !this.opera) || (this.safari && this.vendver >= 100));
+ this.cookies = n.cookieEnabled;
+
// test for XMLHTTP support
- this.xmlhttp_test = function() {
+ this.xmlhttp_test = function()
+ {
var activeX_test = new Function("try{var o=new ActiveXObject('Microsoft.XMLHTTP');return true;}catch(err){return false;}");
- this.xmlhttp = (window.XMLHttpRequest || (window.ActiveXObject && activeX_test())) ? true : false;
+ this.xmlhttp = (window.XMLHttpRequest || (window.ActiveXObject && activeX_test()));
return this.xmlhttp;
- }
+ };
+
+ // set class names to html tag according to the current user agent detection
+ // this allows browser-specific css selectors like "html.chrome .someclass"
+ this.set_html_class = function()
+ {
+ var classname = ' js';
+
+ if (this.ie) {
+ classname += ' ie';
+ if (this.ie5)
+ classname += ' ie5';
+ else if (this.ie6)
+ classname += ' ie6';
+ else if (this.ie7)
+ classname += ' ie7';
+ else if (this.ie8)
+ classname += ' ie8';
+ }
+ else if (this.opera)
+ classname += ' opera';
+ else if (this.konq)
+ classname += ' konqueror';
+ else if (this.safari)
+ classname += ' safari';
+
+ if (this.chrome)
+ classname += ' chrome';
+ else if (this.iphone)
+ classname += ' iphone';
+ else if (this.ipad)
+ classname += ' ipad';
+
+ if (document.documentElement)
+ document.documentElement.className += classname;
+ };
};
@@ -119,7 +160,7 @@
get_button: function(e)
{
e = e || window.event;
- return e && (typeof e.button != 'undefined') ? e.button : (e && e.which ? e.which : 0);
+ return e && e.button !== undefined ? e.button : (e && e.which ? e.which : 0);
},
/**
@@ -132,7 +173,7 @@
if (bw.mac && e) {
opcode += (e.metaKey && CONTROL_KEY) + (e.shiftKey && SHIFT_KEY);
- return opcode;
+ return opcode;
}
if (e) {
opcode += (e.ctrlKey && CONTROL_KEY) + (e.shiftKey && SHIFT_KEY);
@@ -146,7 +187,6 @@
get_mouse_pos: function(e)
{
if (!e) e = window.event;
-
var mX = (e.pageX) ? e.pageX : e.clientX,
mY = (e.pageY) ? e.pageY : e.clientY;
@@ -175,7 +215,7 @@
if (!p.object._rc_events)
p.object._rc_events = [];
-
+
var key = p.event + '*' + p.method;
if (!p.object._rc_events[key])
p.object._rc_events[key] = function(e){ return p.object[p.method](e); };
@@ -225,6 +265,11 @@
e.cancelBubble = true;
e.returnValue = false;
return false;
+},
+
+touchevent: function(e)
+{
+ return { pageX:e.pageX, pageY:e.pageY, offsetX:e.pageX - e.target.offsetLeft, offsetY:e.pageY - e.target.offsetTop, target:e.target, istouch:true };
}
};
@@ -253,7 +298,7 @@
this._events = {};
if (!this._events[evt])
this._events[evt] = [];
-
+
var e = {func:func, obj:obj ? obj : window};
this._events[evt][this._events[evt].length] = e;
},
@@ -266,9 +311,9 @@
*/
removeEventListener: function(evt, func, obj)
{
- if (typeof obj == 'undefined')
+ if (obj === undefined)
obj = window;
-
+
for (var h,i=0; this._events && this._events[evt] && i < this._events[evt].length; i++)
if ((h = this._events[evt][i]) && h.func == func && h.obj == obj)
this._events[evt][i] = null;
@@ -283,28 +328,33 @@
triggerEvent: function(evt, e)
{
var ret, h;
- if (typeof e == 'undefined')
+ if (e === undefined)
e = this;
- else if (typeof e == 'object')
+ else if (typeof e === 'object')
e.event = evt;
if (this._events && this._events[evt] && !this._event_exec) {
this._event_exec = true;
for (var i=0; i < this._events[evt].length; i++) {
if ((h = this._events[evt][i])) {
- if (typeof h.func == 'function')
+ if (typeof h.func === 'function')
ret = h.func.call ? h.func.call(h.obj, e) : h.func(e);
- else if (typeof h.obj[h.func] == 'function')
+ else if (typeof h.obj[h.func] === 'function')
ret = h.obj[h.func](e);
-
+
// cancel event execution
- if (typeof ret != 'undefined' && !ret)
+ if (ret !== undefined && !ret)
break;
}
}
+
+ if (ret)
+ delete ret.event;
}
this._event_exec = false;
+ delete e.event;
+
return ret;
}
@@ -313,14 +363,14 @@
/**
- * RoundCube generic layer (floating box) class
+ * Roundcube generic layer (floating box) class
*
* @constructor
*/
function rcube_layer(id, attributes)
{
this.name = id;
-
+
// create a new layer in the current document
this.create = function(arg)
{
@@ -333,20 +383,17 @@
parent = arg.parent,
obj = document.createElement('DIV');
- with (obj) {
- id = this.name;
- with (style) {
- position = 'absolute';
- visibility = (vis) ? (vis==2) ? 'inherit' : 'visible' : 'hidden';
- left = l+'px';
- top = t+'px';
- if (w)
- width = w.toString().match(/\%$/) ? w : w+'px';
- if (h)
- height = h.toString().match(/\%$/) ? h : h+'px';
- if(z) zIndex = z;
- }
- }
+ obj.id = this.name;
+ obj.style.position = 'absolute';
+ obj.style.visibility = (vis) ? (vis==2) ? 'inherit' : 'visible' : 'hidden';
+ obj.style.left = l+'px';
+ obj.style.top = t+'px';
+ if (w)
+ obj.style.width = w.toString().match(/\%$/) ? w : w+'px';
+ if (h)
+ obj.style.height = h.toString().match(/\%$/) ? h : h+'px';
+ if (z)
+ obj.style.zIndex = z;
if (parent)
parent.appendChild(obj);
@@ -357,14 +404,14 @@
};
// create new layer
- if(attributes != null) {
+ if (attributes != null) {
this.create(attributes);
this.name = this.elm.id;
}
else // just refer to the object
this.elm = document.getElementById(id);
- if(!this.elm)
+ if (!this.elm)
return false;
@@ -435,18 +482,37 @@
dtext = '[^\\x0d\\x5b-\\x5d\\x80-\\xff]',
atom = '[^\\x00-\\x20\\x22\\x28\\x29\\x2c\\x2e\\x3a-\\x3c\\x3e\\x40\\x5b-\\x5d\\x7f-\\xff]+',
quoted_pair = '\\x5c[\\x00-\\x7f]',
- domain_literal = '\\x5b('+dtext+'|'+quoted_pair+')*\\x5d',
quoted_string = '\\x22('+qtext+'|'+quoted_pair+')*\\x22',
- sub_domain = '('+atom+'|'+domain_literal+')',
+ // Use simplified domain matching, because we need to allow Unicode characters here
+ // So, e-mail address should be validated also on server side after idn_to_ascii() use
+ //domain_literal = '\\x5b('+dtext+'|'+quoted_pair+')*\\x5d',
+ //sub_domain = '('+atom+'|'+domain_literal+')',
+ // allow punycode/unicode top-level domain
+ domain = '([^@\\x2e]+\\x2e)+([^\\x00-\\x40\\x5b-\\x60\\x7b-\\x7f]{2,}|xn--[a-z0-9]{2,})',
+ // ICANN e-mail test (http://idn.icann.org/E-mail_test)
+ icann_domains = [
+ '\\u0645\\u062b\\u0627\\u0644\\x2e\\u0625\\u062e\\u062a\\u0628\\u0627\\u0631',
+ '\\u4f8b\\u5b50\\x2e\\u6d4b\\u8bd5',
+ '\\u4f8b\\u5b50\\x2e\\u6e2c\\u8a66',
+ '\\u03c0\\u03b1\\u03c1\\u03ac\\u03b4\\u03b5\\u03b9\\u03b3\\u03bc\\u03b1\\x2e\\u03b4\\u03bf\\u03ba\\u03b9\\u03bc\\u03ae',
+ '\\u0909\\u0926\\u093e\\u0939\\u0930\\u0923\\x2e\\u092a\\u0930\\u0940\\u0915\\u094d\\u0937\\u093e',
+ '\\u4f8b\\u3048\\x2e\\u30c6\\u30b9\\u30c8',
+ '\\uc2e4\\ub840\\x2e\\ud14c\\uc2a4\\ud2b8',
+ '\\u0645\\u062b\\u0627\\u0644\\x2e\\u0622\\u0632\\u0645\\u0627\\u06cc\\u0634\u06cc',
+ '\\u043f\\u0440\\u0438\\u043c\\u0435\\u0440\\x2e\\u0438\\u0441\\u043f\\u044b\\u0442\\u0430\\u043d\\u0438\\u0435',
+ '\\u0b89\\u0ba4\\u0bbe\\u0bb0\\u0ba3\\u0bae\\u0bcd\\x2e\\u0baa\\u0bb0\\u0bbf\\u0b9f\\u0bcd\\u0b9a\\u0bc8',
+ '\\u05d1\\u05f2\\u05b7\\u05e9\\u05e4\\u05bc\\u05d9\\u05dc\\x2e\\u05d8\\u05e2\\u05e1\\u05d8'
+ ],
+ icann_addr = 'mailtest\\x40('+icann_domains.join('|')+')',
word = '('+atom+'|'+quoted_string+')',
- domain = sub_domain+'(\\x2e'+sub_domain+')*',
- local_part = word+'(\\x2e'+word+')*',
- addr_spec = local_part+'\\x40'+domain,
delim = '[,;\s\n]',
+ local_part = word+'(\\x2e'+word+')*',
+ addr_spec = '(('+local_part+'\\x40'+domain+')|('+icann_addr+'))',
reg1 = inline ? new RegExp('(^|<|'+delim+')'+addr_spec+'($|>|'+delim+')', 'i') : new RegExp('^'+addr_spec+'$', 'i');
return reg1.test(input) ? true : false;
}
+
return false;
};
@@ -455,14 +521,14 @@
function rcube_clone_object(obj)
{
var out = {};
-
+
for (var key in obj) {
- if (obj[key] && typeof obj[key] == 'object')
+ if (obj[key] && typeof obj[key] === 'object')
out[key] = clone_object(obj[key]);
else
out[key] = obj[key];
}
-
+
return out;
};
@@ -533,17 +599,18 @@
{
var dc = document.cookie,
prefix = name + "=",
- end, begin = dc.indexOf("; " + prefix);
+ begin = dc.indexOf("; " + prefix);
if (begin == -1) {
begin = dc.indexOf(prefix);
if (begin != 0)
return null;
}
- else
+ else {
begin += 2;
+ }
- end = document.cookie.indexOf(";", begin);
+ var end = document.cookie.indexOf(";", begin);
if (end == -1)
end = dc.length;
@@ -566,7 +633,7 @@
else
msg += '\n--------------------------------------\n';
- // Konqueror doesn't allows to just change value of hidden element
+ // Konqueror doesn't allow to just change the value of hidden element
if (bw.konq) {
box.innerText += msg;
box.value = box.innerText;
@@ -584,8 +651,7 @@
};
var bw = new roundcube_browser();
-if (!window.console)
- console = new rcube_console();
+bw.set_html_class();
// Add escape() method to RegExp object
@@ -610,4 +676,4 @@
return obj;
}
-};
+}
--
Gitblit v1.9.1