From 2b1ad1e8d365c503ac1ee03898fc52965bc5b4e0 Mon Sep 17 00:00:00 2001
From: Benedikt Wildenhain <github.com@benedikt-wildenhain.de>
Date: Tue, 4 Mar 2014 15:22:54 +0100
Subject: [PATCH] Renamed option 'imap_ssl' into 'imap_ssl_novalidate' to
 better reflect its meaning

---
 settings.php           | 4 ++--
 templates/settings.php | 2 +-
 user_imap.php          | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/settings.php b/settings.php
index 6d6d122..cbdf8e1 100644
--- a/settings.php
+++ b/settings.php
@@ -20,7 +20,7 @@
  * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-$params = array('imap_host', 'imap_port', 'imap_ssl');
+$params = array('imap_host', 'imap_port', 'imap_ssl_novalidate');
 
 OCP\Util::addscript('user_imap', 'settings');
 
@@ -29,7 +29,7 @@
                if(isset($_POST[$param])){
                        OCP\Config::setAppValue('user_imap', $param, $_POST[$param]);
                }
-               elseif('imap_ssl' == $param) {
+               elseif('imap_ssl_novalidate' == $param) {
                        // unchecked checkboxes are not included in the post paramters
                        OCP\Config::setAppValue('user_imap', $param, 0);
                }
diff --git a/templates/settings.php b/templates/settings.php
index 3b9f39d..43fc004 100644
--- a/templates/settings.php
+++ b/templates/settings.php
@@ -3,7 +3,7 @@
                <legend><?php echo $l->t('IMAP'); ?></legend>
                <p><label for="imap_host"><?php echo $l->t('Host');?></label><input type="text" id="imap_host" name="imap_host" value="<?php echo $_['imap_host']; ?>"></p>
                <p><label for="imap_port"><?php echo $l->t('Port');?></label><input type="text" id="imap_port" name="imap_port" value="<?php echo $_['imap_port']; ?>" /></p>
-               <p><input type="checkbox" id="imap_ssl" name="imap_ssl" value="1"<?php if ($_['imap_ssl']) echo ' checked'; ?>><label for="imap_ssl"><?php echo $l->t('Don\'t validate SSL certificate');?></label></p>
+               <p><input type="checkbox" id="imap_ssl_novalidate" name="imap_ssl_novalidate" value="1"<?php if ($_['imap_ssl_novalidate']) echo ' checked'; ?>><label for="imap_ssl_novalidate"><?php echo $l->t('Don\'t validate SSL certificate');?></label></p>
        <input type="submit" value="<?php echo $l->t('Save'); ?>" />
        </fieldset>
 </form>
diff --git a/user_imap.php b/user_imap.php
index 427f95c..8230e8d 100644
--- a/user_imap.php
+++ b/user_imap.php
@@ -28,12 +28,12 @@ class OC_USER_IMAP extends OC_User_Backend {
        // cached settings
         protected $imap_host;
         protected $imap_port;
-        protected $imap_ssl;
+        protected $imap_ssl_novalidate;
 
        public function __construct() {
                 $this->imap_host = OCP\Config::getAppValue('user_imap', 'imap_host','');
                 $this->imap_port = OCP\Config::getAppValue('user_imap', 'imap_port', OC_USER_BACKEND_IMAP_DEFAULT_PORT);
-                $this->imap_ssl = OCP\Config::getAppValue('user_imap', 'imap_ssl', false);
+                $this->imap_ssl_novalidate = OCP\Config::getAppValue('user_imap', 'imap_ssl_novalidate', false);
        }
 
        /**
@@ -51,7 +51,7 @@ public function checkPassword($uid, $password){
                 try
                 {
                        $url = $this->imap_host.":".$this->imap_port;
-                       if ($this->imap_ssl) {
+                       if ($this->imap_ssl_novalidate) {
 		               $url .= "/imap/ssl/notls/novalidate-cert";
                                error_log("========= $url ====");
                        }