summaryrefslogtreecommitdiff
path: root/plugins/kolab_activesync
diff options
context:
space:
mode:
authorAleksander Machniak <machniak@kolabsys.com>2013-10-14 07:43:32 (GMT)
committerAleksander Machniak <machniak@kolabsys.com>2013-10-14 07:43:32 (GMT)
commitef1bf946da3b67ffbcc7dc598abdfd169c7a118d (patch)
treef7b86822402eaebda84fdbd147991da47aaec86a /plugins/kolab_activesync
parent5a1a2a89155dec932a0af438a8d9841dded19b53 (diff)
downloadroundcubemail-plugins-kolab-ef1bf946da3b67ffbcc7dc598abdfd169c7a118d.tar.gz
Cleanup
Diffstat (limited to 'plugins/kolab_activesync')
-rw-r--r--plugins/kolab_activesync/kolab_activesync.js2
-rw-r--r--plugins/kolab_activesync/kolab_activesync.php6
-rw-r--r--plugins/kolab_activesync/kolab_activesync_ui.php15
-rw-r--r--plugins/kolab_activesync/localization/en_US.inc7
4 files changed, 3 insertions, 27 deletions
diff --git a/plugins/kolab_activesync/kolab_activesync.js b/plugins/kolab_activesync/kolab_activesync.js
index c5fb6d1..d9e2943 100644
--- a/plugins/kolab_activesync/kolab_activesync.js
+++ b/plugins/kolab_activesync/kolab_activesync.js
@@ -109,8 +109,6 @@ function kolab_activesync_config()
cmd: 'save',
id: rcmail.env.active_device,
devicealias: $('#config-device-alias').val()
-// syncmode: $('#config-device-mode option:selected').val(),
-// laxpic: $('#config-device-laxpic').get(0).checked ? 1 : 0
};
if (data.devicealias == data.id)
diff --git a/plugins/kolab_activesync/kolab_activesync.php b/plugins/kolab_activesync/kolab_activesync.php
index a53961c..ccd1d5c 100644
--- a/plugins/kolab_activesync/kolab_activesync.php
+++ b/plugins/kolab_activesync/kolab_activesync.php
@@ -7,7 +7,7 @@
* @author Aleksander Machniak <machniak@kolabsys.com>
* @author Thomas Bruederli <bruederli@kolabsys.com>
*
- * Copyright (C) 2011-2012, Kolab Systems AG <contact@kolabsys.com>
+ * Copyright (C) 2011-2013, Kolab Systems AG <contact@kolabsys.com>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
@@ -70,11 +70,7 @@ class kolab_activesync extends rcube_plugin
$device = $devices[$imei];
$subscriptions = (array) get_input_value('subscribed', RCUBE_INPUT_POST);
$devicealias = get_input_value('devicealias', RCUBE_INPUT_POST, true);
-// $syncmode = intval(get_input_value('syncmode', RCUBE_INPUT_POST));
-// $laxpic = intval(get_input_value('laxpic', RCUBE_INPUT_POST));
$device['ALIAS'] = $devicealias;
-// $device['MODE'] = $syncmode;
-// $device['LAXPIC'] = $laxpic;
$err = !$this->device_update($device, $imei);
diff --git a/plugins/kolab_activesync/kolab_activesync_ui.php b/plugins/kolab_activesync/kolab_activesync_ui.php
index 0c753c9..6dcdcaa 100644
--- a/plugins/kolab_activesync/kolab_activesync_ui.php
+++ b/plugins/kolab_activesync/kolab_activesync_ui.php
@@ -7,7 +7,7 @@
* @author Thomas Bruederli <bruederli@kolabsys.com>
* @author Aleksander Machniak <machniak@kolabsys.com>
*
- * Copyright (C) 2011-2012, Kolab Systems AG <contact@kolabsys.com>
+ * Copyright (C) 2011-2013, Kolab Systems AG <contact@kolabsys.com>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
@@ -68,18 +68,7 @@ class kolab_activesync_ui
$input = new html_inputfield(array('name' => 'devicealias', 'id' => $field_id, 'size' => 40));
$table->add('title', html::label($field_id, $this->plugin->gettext('devicealias')));
$table->add(null, $input->show($this->device['ALIAS'] ? $this->device['ALIAS'] : $this->device['_id']));
-/*
- $field_id = 'config-device-mode';
- $select = new html_select(array('name' => 'syncmode', 'id' => $field_id));
- $select->add(array($this->plugin->gettext('modeauto'), $this->plugin->gettext('modeflat'), $this->plugin->gettext('modefolder')), array('-1', '0', '1'));
- $table->add('title', html::label($field_id, $this->plugin->gettext('syncmode')));
- $table->add(null, $select->show('-1'));
-
- $field_id = 'config-device-laxpic';
- $checkbox = new html_checkbox(array('name' => 'laxpic', 'value' => '1', 'id' => $field_id));
- $table->add('title', $this->plugin->gettext('imageformat'));
- $table->add(null, html::label($field_id, $checkbox->show() . ' ' . $this->plugin->gettext('laxpiclabel')));
-*/
+
// read-only device information
$info = $this->plugin->device_info($this->device['ID']);
diff --git a/plugins/kolab_activesync/localization/en_US.inc b/plugins/kolab_activesync/localization/en_US.inc
index 4672b12..e3145b5 100644
--- a/plugins/kolab_activesync/localization/en_US.inc
+++ b/plugins/kolab_activesync/localization/en_US.inc
@@ -1,13 +1,8 @@
<?php
-$labels = array();
$labels['tabtitle'] = 'Activesync';
$labels['devices'] = 'Devices';
$labels['devicealias'] = 'Device name';
-$labels['syncmode'] = 'Sync Mode';
-$labels['modeauto'] = 'Determine automatically';
-$labels['modeflat'] = 'Force flat mode';
-$labels['modefolder'] = 'Force folder mode';
$labels['synchronize'] = 'Synchronize';
$labels['withalarms'] = 'With alarms';
$labels['syncsettings'] = 'Synchronization settings';
@@ -20,8 +15,6 @@ $labels['task'] = 'Tasks';
$labels['note'] = 'Notes';
$labels['configuration'] = 'Configuration';
$labels['deletedevice'] = 'Delete device';
-$labels['imageformat'] = 'Image format';
-$labels['laxpiclabel'] = 'Allow PNG and GIF images';
$labels['nodevices'] = 'There are currently no devices registered.<br/><br/>In order to register a device, please connect it to the server first, using <a href="http://wiki.kolab.org/Setup_ActiveSync">the instructions in the Wiki</a>. Afterwards the device should become available for configuration here.';
$labels['savingdata'] = 'Saving data...';
$labels['savingerror'] = 'Failed to save configuration';