Author: ralfbecker
New Revision: 35079
URL: http://www.egroupware.org/viewvc/egroupware?rev=35079&view=rev
Log:
- fixed silently not working statistic submit with Webkit browsers (Safari, Chrome, …)
- changed submit url to https://www.egroupware.org/usage-statistic to overcome unsecure submit warnings
Modified:
branches/1.8/admin/inc/class.admin_statistics.inc.php
Modified: branches/1.8/admin/inc/class.admin_statistics.inc.php
URL: http://www.egroupware.org/viewvc/egroupware/branches/1.8/admin/inc/class.admin_statistics.inc.php?rev=35079&r1=35078&r2=35079&view=diff
— branches/1.8/admin/inc/class.admin_statistics.inc.php (original)
+++ branches/1.8/admin/inc/class.admin_statistics.inc.php Tue May 31 11:26:47 2011
@@ -5,7 +5,7 @@
- @link http://www.egroupware.org
- @author Ralf Becker <RalfBecker-AT-outdoor-training.de>
- @package admin
-
- @copyright © 2009 by Ralf Becker <RalfBecker-AT-outdoor-training.de>
-
- @copyright © 2009-11 by Ralf Becker <RalfBecker-AT-outdoor-training.de>
- @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
-
@version $Id$
*/
@@ -23,8 +23,8 @@
const CONFIG_USAGE_TYPE = ‘usage_type_submit’;
const CONFIG_INSTALL_TYPE = ‘install_type_submit’;
- const SUBMIT_URL = ‘http://www.egroupware-server.org/usage-statistic’;
- const STATISTIC_URL = ‘http://www.egroupware-server.org/usage-statistic’;
-
const SUBMIT_URL = ‘https://www.egroupware.org/usage-statistic’;
-
const STATISTIC_URL = ‘http://www.egroupware.org/usage-statistic’;
const SUBMISION_RATE = 2592000; // 30 days
@@ -52,7 +52,7 @@
config::save_value(self::CONFIG_POSTPONE_SUBMIT,time()+$content[‘postpone’],self::CONFIG_APP);
$what = ‘postpone’;
}
-
elseif($content['submit'])
-
elseif(!$content['canceled']) { config::save_value(self::CONFIG_LAST_SUBMIT,time(),self::CONFIG_APP); config::save_value(self::CONFIG_SUBMIT_ID,empty($content['submit_id']) ? '***none***' : $content['submit_id'],self::CONFIG_APP);
@@ -128,18 +128,45 @@
if (!isset($config[self::CONFIG_LAST_SUBMIT]) || $config[self::CONFIG_LAST_SUBMIT ] <= time()-self::SUBMISION_RATE)
{
// clear etemplate_exec_id and replace form.action, before submitting the form
-
$content['onclick'] = "
-var action=this.form.action;
-var exec_id=this.form[‘etemplate_exec_id’].value;
-this.form.action=’$content[submit_url]’;
-this.form[‘etemplate_exec_id’].value=’’;
-this.form.target=’_blank’;
-if (!confirm(’".addslashes(lang(‘Submit displayed information?’))."’)) return false;
-this.form.submit();
-this.form.action = action;
-this.form[‘etemplate_exec_id’].value = exec_id;
-this.form.target = ‘’;
-return true;";
-
$content['onclick'] = "return submit_statistic(this.form,'$content[submit_url]','".addslashes(lang('Submit displayed information?'))."');"; -
// Webkit browsers (Chrome, Safari, ...) do NOT allow to call form.submit() from within onclick of a submit button. -
// Therefor we first store our own form action, replace it with egroupware.org submit url and set a timeout calling -
// submit_statistic again with just the form, to do the second submit to our own webserver -
$GLOBALS['egw_info']['flags']['java_script'] = "<script type=\"text/javascript\">
+var own_action;
+var own_exec_id;
+
+function submit_statistic(form,submit_url,confirm_msg)
+{
- if (submit_url) {
-
if (!confirm(confirm_msg)) return false; -
own_action = form.action; -
own_exec_id = form['etemplate_exec_id'].value; -
// submit to own webserver -
window.setTimeout(function() { -
submit_statistic(form); -
},100); -
// submit to egroupware.org -
form.action=submit_url; -
form['etemplate_exec_id'].value=''; -
form.target='_blank'; - } else {
-
// submit to own webserver -
form.action = own_action; -
form['etemplate_exec_id'].value=own_exec_id; -
form.target=''; -
form.submit(); - }
- return true;
+}
+
+";
}
else // we are not due --> tell it the user
{
Simplify data backup and recovery for your virtual environment with vRanger.
Installation’s a snap, and flexible recovery options mean your data is safe,
secure and there when you need it. Data protection magic?
Nope - It’s vRanger. Get your free trial download today.
http://p.sf.net/sfu/quest-sfdev2dev
eGroupWare-cvs mailing list
eGroupWare-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/egroupware-cvs