Added license headers to driver files, CS fixes

1 files changed, 22 insertions, 7 deletions

diff --git a/plugins/password/drivers/poppassd.php b/plugins/password/drivers/poppassd.php
index e18ec2660..8ddbef5d3 100644
--- a/plugins/password/drivers/poppassd.php
+++ b/plugins/password/drivers/poppassd.php
@@ -8,6 +8,20 @@
  * @version 2.0
  * @author Philip Weir
  *
+ * Copyright (C) 2005-2013, The Roundcube Dev Team
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/.
  */
 
 class rcube_poppassd_password
@@ -16,9 +30,9 @@ class rcube_poppassd_password
     {
         if (preg_match('/^\d\d\d\s+(\S.*)\s*$/', $line, $matches)) {
             return array('code' => $code, 'message' => $matches[1]);
-        } else {
-            return $code;
         }
+
+        return $code;
     }
 
     function save($curpass, $passwd)
@@ -40,14 +54,14 @@ class rcube_poppassd_password
             else {
                 $poppassd->writeLine("user ". $_SESSION['username']);
                 $result = $poppassd->readLine();
-                if(!preg_match('/^[23]\d\d/', $result) ) {
+                if (!preg_match('/^[23]\d\d/', $result) ) {
                     $poppassd->disconnect();
                     return $this->format_error_result(PASSWORD_CONNECT_ERROR, $result);
                 }
                 else {
                     $poppassd->writeLine("pass ". $curpass);
                     $result = $poppassd->readLine();
-                    if(!preg_match('/^[23]\d\d/', $result) ) {
+                    if (!preg_match('/^[23]\d\d/', $result) ) {
                         $poppassd->disconnect();
                         return $this->format_error_result(PASSWORD_ERROR, $result);
                     }
@@ -55,10 +69,11 @@ class rcube_poppassd_password
                         $poppassd->writeLine("newpass ". $passwd);
                         $result = $poppassd->readLine();
                         $poppassd->disconnect();
-                        if (!preg_match('/^2\d\d/', $result))
+                        if (!preg_match('/^2\d\d/', $result)) {
                             return $this->format_error_result(PASSWORD_ERROR, $result);
-                        else
-                            return PASSWORD_SUCCESS;
+                        }
+
+                        return PASSWORD_SUCCESS;
                     }
                 }
             }