Changeset 3548 in subversion

Timestamp:

Apr 23, 2010 5:25:22 AM (3 years ago)

Author:

alec

Message:

• code formatting

Location:

trunk/plugins

Files:

• virtuser_file/virtuser_file.php (modified) (4 diffs)
• virtuser_query/virtuser_query.php (modified) (2 diffs)

trunk/plugins/virtuser_file/virtuser_file.php

@@ -19 +19 @@
     function init()
     {
-        $this->app = rcmail::get_instance();
-        $this->file = $this->app->config->get('virtuser_file');
+            $this->app = rcmail::get_instance();
+            $this->file = $this->app->config->get('virtuser_file');
 
-        if ($this->file) {
-            $this->add_hook('user2email', array($this, 'user2email'));
-            $this->add_hook('email2user', array($this, 'email2user'));
-        }
+            if ($this->file) {
+                $this->add_hook('user2email', array($this, 'user2email'));
+                $this->add_hook('email2user', array($this, 'email2user'));
+            }
     }
 
@@ -34 +34 @@
     {
         $r = $this->findinvirtual('/\s' . preg_quote($p['user'], '/') . '\s*$/');
-        $result = array();
+            $result = array();
 
-        for ($i=0; $i<count($r); $i++)
-        {
-            $arr = preg_split('/\s+/', $r[$i]);
+            for ($i=0; $i<count($r); $i++)
+            {
+                $arr = preg_split('/\s+/', $r[$i]);
 
-            if (count($arr) > 0 && strpos($arr[0], '@'))
-            {
-                $result[] = trim(str_replace('\\@', '@', $arr[0]));
+                if (count($arr) > 0 && strpos($arr[0], '@')) {
+                        $result[] = trim(str_replace('\\@', '@', $arr[0]));
 
-                if ($p['first']) {
-                    $p['email'] = $result[0];
-                    break;
-                }
+                        if ($p['first']) {
+                            $p['email'] = $result[0];
+                            break;
+                        }
+                }
             }
-        }
 
-        $p['email'] = empty($result) ? NULL : $result;
+            $p['email'] = empty($result) ? NULL : $result;
 
-        return $p;
+            return $p;
     }
 
@@ -61 +60 @@
     function email2user($p)
     {
-        $r = $this->findinvirtual('/^' . preg_quote($p['email'], '/') . '\s/');
+            $r = $this->findinvirtual('/^' . preg_quote($p['email'], '/') . '\s/');
 
-        for ($i=0; $i<count($r); $i++)
-        {
-            $arr = preg_split('/\s+/', trim($r[$i]));
+            for ($i=0; $i<count($r); $i++) {
+                $arr = preg_split('/\s+/', trim($r[$i]));
             
-            if (count($arr) > 0) {
-                $p['user'] = trim($arr[count($arr)-1]);
-                break;
+                if (count($arr) > 0) {
+                        $p['user'] = trim($arr[count($arr)-1]);
+                        break;
+                }
             }
-        }
 
-        return $p;
+            return $p;
     }
 
@@ -84 +82 @@
     private function findinvirtual($pattern)
     {
-        $result = array();
-        $virtual = null;
+            $result = array();
+            $virtual = null;
         
-        if ($this->file)
-            $virtual = file($virtuser_file);
+            if ($this->file)
+                $virtual = file($virtuser_file);
         
-        if (empty($virtual))
+            if (empty($virtual))
+                return $result;
+        
+            // check each line for matches
+            foreach ($virtual as $line) {
+                $line = trim($line);
+                if (empty($line) || $line[0]=='#')
+                    continue;
+        
+                if (preg_match($pattern, $line))
+                    $result[] = $line;
+            }
+        
             return $result;
-        
-        // check each line for matches
-        foreach ($virtual as $line)
-        {
-            $line = trim($line);
-            if (empty($line) || $line[0]=='#')
-                continue;
-        
-            if (preg_match($pattern, $line))
-                $result[] = $line;
-        }
-        
-        return $result;
     }
 

trunk/plugins/virtuser_query/virtuser_query.php

@@ -23 +23 @@
     function init()
     {
-        $this->app = rcmail::get_instance();
-        $this->query = $this->app->config->get('virtuser_query');
+            $this->app = rcmail::get_instance();
+            $this->query = $this->app->config->get('virtuser_query');
 
-        if ($this->query) {
-            $this->add_hook('user2email', array($this, 'user2email'));
-//          $this->add_hook('email2user', array($this, 'email2user'));
-        }
+            if ($this->query) {
+                $this->add_hook('user2email', array($this, 'user2email'));
+//              $this->add_hook('email2user', array($this, 'email2user'));
+            }
     }
 
@@ -37 +37 @@
     function user2email($p)
     {
-    $rcmail = rcmail::get_instance();
-        $dbh = $rcmail->get_dbh();
+            $dbh = $this->app->get_dbh();
 
-        $sql_result = $dbh->query(preg_replace('/%u/', $dbh->escapeSimple($p['user']), $this->query));
+            $sql_result = $dbh->query(preg_replace('/%u/', $dbh->escapeSimple($p['user']), $this->query));
 
-        while ($sql_arr = $dbh->fetch_array($sql_result)) {
-            if (strpos($sql_arr[0], '@')) {
-                if ($p['extended'] && count($sql_arr) > 1) {
-                    $result[] = array(
-                        'email'         => $sql_arr[0],
-                        'name'          => $sql_arr[1],
-                        'organization'  => $sql_arr[2],
-                        'reply-to'      => $sql_arr[3],
-                        'bcc'           => $sql_arr[4],
-                        'signature'     => $sql_arr[5],
-                        'html_signature' => (int)$sql_arr[6],
-                    );
-                }
-                else {
-                    $result[] = $sql_arr[0];
-                }
+            while ($sql_arr = $dbh->fetch_array($sql_result)) {
+                if (strpos($sql_arr[0], '@')) {
+                        if ($p['extended'] && count($sql_arr) > 1) {
+                            $result[] = array(
+                                    'email'         => $sql_arr[0],
+                                'name'              => $sql_arr[1],
+                                    'organization'  => $sql_arr[2],
+                                'reply-to'          => $sql_arr[3],
+                                    'bcc'                   => $sql_arr[4],
+                                    'signature'         => $sql_arr[5],
+                                'html_signature' => (int)$sql_arr[6],
+                        );
+                        }
+                        else {
+                            $result[] = $sql_arr[0];
+                        }
 
-                if ($p['first'])
-                    break;
+                        if ($p['first'])
+                            break;
+                }
             }
-        }
         
-        $p['email'] = $result;
+            $p['email'] = $result;
 
-        return $p;
+            return $p;
     }