Changeset 4199 in subversion

Timestamp:

Nov 9, 2010 3:37:54 AM (3 years ago)

Author:

alec

Message:

• Add line number in logged error messages

Location:

trunk/plugins/password/drivers

Files:

• chpasswd.php (modified) (1 diff)
• pam.php (modified) (2 diffs)
• sasl.php (modified) (1 diff)
• sql.php (modified) (2 diffs)
• virtualmin.php (modified) (1 diff)
• xmail.php (modified) (2 diffs)

trunk/plugins/password/drivers/chpasswd.php

@@ -28 +28 @@
             'code' => 600,
             'type' => 'php',
-            'file' => __FILE__,
+            'file' => __FILE__, 'line' => __LINE__,
             'message' => "Password plugin: Unable to execute $cmd"
             ), true, false);

trunk/plugins/password/drivers/pam.php

@@ -22 +22 @@
                 'code' => 600,
                 'type' => 'php',
-                'file' => __FILE__,
+                'file' => __FILE__, 'line' => __LINE__,
                 'message' => "Password plugin: PAM authentication failed for user $user: $error"
                 ), true, false);
@@ -31 +31 @@
             'code' => 600,
             'type' => 'php',
-            'file' => __FILE__,
+            'file' => __FILE__, 'line' => __LINE__,
             'message' => "Password plugin: PECL-PAM module not loaded"
             ), true, false);

trunk/plugins/password/drivers/sasl.php

@@ -34 +34 @@
             'code' => 600,
             'type' => 'php',
-            'file' => __FILE__,
+            'file' => __FILE__, 'line' => __LINE__,
             'message' => "Password plugin: Unable to execute $curdir/chgsaslpasswd"
             ), true, false);

trunk/plugins/password/drivers/sql.php

@@ -77 +77 @@
         $sql = str_replace('%D', $db->quote($newpass), $sql);
     }
-    
+
     // hashed passwords
     if (preg_match('/%[n|q]/', $sql)) {
@@ -85 +85 @@
                     '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;
             }
 

trunk/plugins/password/drivers/virtualmin.php

@@ -30 +30 @@
             'code' => 600,
             'type' => 'php',
-            'file' => __FILE__,
+            'file' => __FILE__, 'line' => __LINE__,
             'message' => "Password plugin: Unable to execute $curdir/chgvirtualminpasswd"
             ), true, false);

trunk/plugins/password/drivers/xmail.php

@@ -34 +34 @@
             'code' => 600,
             'type' => 'php',
-            'file' => __FILE__,
+            'file' => __FILE__, 'line' => __LINE__,
             'message' => "Password plugin: Unable to connect to mail server"
         ), true, false);
@@ -43 +43 @@
             'code' => 600,
             'type' => 'php',
-            'file' => __FILE__,
+            'file' => __FILE__, 'line' => __LINE__,
             'message' => "Password plugin: Unable to change password"
         ), true, false);