- Add line number in logged error messages

git-svn-id: https://svn.roundcube.net/trunk@4199 208e9e7b-5314-0410-a742-e7e81cd9613c

6 files changed, 11 insertions, 10 deletions

diff --git a/plugins/password/drivers/chpasswd.php b/plugins/password/drivers/chpasswd.php
index 5c6bde2d2..8450af154 100644
--- a/plugins/password/drivers/chpasswd.php
+++ b/plugins/password/drivers/chpasswd.php
@@ -27,7 +27,7 @@ function password_save($currpass, $newpass)
         raise_error(array(
             'code' => 600,
             'type' => 'php',
-            'file' => __FILE__,
+            'file' => __FILE__, 'line' => __LINE__,
             'message' => "Password plugin: Unable to execute $cmd"
             ), true, false);
     }
diff --git a/plugins/password/drivers/pam.php b/plugins/password/drivers/pam.php
index b1b3e9f03..e9363cc5a 100644
--- a/plugins/password/drivers/pam.php
+++ b/plugins/password/drivers/pam.php
@@ -21,7 +21,7 @@ function password_save($currpass, $newpass)
             raise_error(array(
                 'code' => 600,
                 'type' => 'php',
-                'file' => __FILE__,
+                'file' => __FILE__, 'line' => __LINE__,
                 'message' => "Password plugin: PAM authentication failed for user $user: $error"
                 ), true, false);
         }
@@ -30,7 +30,7 @@ function password_save($currpass, $newpass)
         raise_error(array(
             'code' => 600,
             'type' => 'php',
-            'file' => __FILE__,
+            'file' => __FILE__, 'line' => __LINE__,
             'message' => "Password plugin: PECL-PAM module not loaded"
             ), true, false);
     }
diff --git a/plugins/password/drivers/sasl.php b/plugins/password/drivers/sasl.php
index 0031563c2..f8ac5c606 100644
--- a/plugins/password/drivers/sasl.php
+++ b/plugins/password/drivers/sasl.php
@@ -33,7 +33,7 @@ function password_save($currpass, $newpass)
         raise_error(array(
             'code' => 600,
             'type' => 'php',
-            'file' => __FILE__,
+            'file' => __FILE__, 'line' => __LINE__,
             'message' => "Password plugin: Unable to execute $curdir/chgsaslpasswd"
             ), true, false);
     }
diff --git a/plugins/password/drivers/sql.php b/plugins/password/drivers/sql.php
index 31686c76f..70e564396 100644
--- a/plugins/password/drivers/sql.php
+++ b/plugins/password/drivers/sql.php
@@ -76,7 +76,7 @@ function password_save($curpass, $passwd)
         }
         $sql = str_replace('%D', $db->quote($newpass), $sql);
     }
-    
+
     // hashed passwords
     if (preg_match('/%[n|q]/', $sql)) {
 
@@ -84,10 +84,11 @@ function password_save($curpass, $passwd)
 	        raise_error(array(
 	            'code' => 600,
 		        'type' => 'php',
-		        'file' => __FILE__,
+		        'file' => __FILE__, 'line' => __LINE__,
 		        'message' => "Password plugin: 'hash' extension not loaded!"
 		    ), true, false);
-	        return PASSWORD_ERROR;			    
+
+	        return PASSWORD_ERROR;
 	    }
 
 	    if (!($hash_algo = strtolower($rcmail->config->get('password_hash_algorithm'))))
diff --git a/plugins/password/drivers/virtualmin.php b/plugins/password/drivers/virtualmin.php
index e2dfbc2e5..96200d61c 100644
--- a/plugins/password/drivers/virtualmin.php
+++ b/plugins/password/drivers/virtualmin.php
@@ -29,7 +29,7 @@ function password_save($currpass, $newpass)
         raise_error(array(
             'code' => 600,
             'type' => 'php',
-            'file' => __FILE__,
+            'file' => __FILE__, 'line' => __LINE__,
             'message' => "Password plugin: Unable to execute $curdir/chgvirtualminpasswd"
             ), true, false);
     }
diff --git a/plugins/password/drivers/xmail.php b/plugins/password/drivers/xmail.php
index 8b827248c..39d1e7186 100644
--- a/plugins/password/drivers/xmail.php
+++ b/plugins/password/drivers/xmail.php
@@ -33,7 +33,7 @@ function password_save($currpass, $newpass)
         raise_error(array(
             'code' => 600,
             'type' => 'php',
-            'file' => __FILE__,
+            'file' => __FILE__, 'line' => __LINE__,
             'message' => "Password plugin: Unable to connect to mail server"
         ), true, false);
         return PASSWORD_CONNECT_ERROR;
@@ -42,7 +42,7 @@ function password_save($currpass, $newpass)
         raise_error(array(
             'code' => 600,
             'type' => 'php',
-            'file' => __FILE__,
+            'file' => __FILE__, 'line' => __LINE__,
             'message' => "Password plugin: Unable to change password"
         ), true, false);
         return PASSWORD_ERROR;