* Minor bugfixes with addressbooks

* Local addresses now list again when you hit the Addresses button on the
  compose.php form.

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@1071 7612ce4b-ef26-0410-bec9-ea0150e637f0

diff --git a/functions/abook_local_file.php b/functions/abook_local_file.php
index ab2be30eb6c6159c7e90058f5f9e6cf8e80a82b9..26588d117801eeea8cae662b9c7f49d72f26384b 100644 (file)
--- a/functions/abook_local_file.php
+++ b/functions/abook_local_file.php
@@ -125,7 +125,7 @@
 
      // Overwrite the file with data from $rows
      // NOTE! Previous locks are broken by this function
 
      // Overwrite the file with data from $rows
      // NOTE! Previous locks are broken by this function

-     function overwrite($rows) {
+     function overwrite(&$rows) {

        $newfh = @fopen($this->filename, 'w');
        if(!$newfh)
         return $this->set_error("$file: " . _("Open failed"));
        $newfh = @fopen($this->filename, 'w');
        if(!$newfh)
         return $this->set_error("$file: " . _("Open failed"));


@@ -286,7 +286,7 @@
        }
 
        // Write data back
        }
 
        // Write data back

-       if(!$this->overwrite(&$rows)) {
+       if(!$this->overwrite($rows)) {

         $this->unlock();
         return false;
        }
         $this->unlock();
         return false;
        }


@@ -330,7 +330,7 @@
        }
 
        // Write data back
        }
 
        // Write data back

-       if(!$this->overwrite(&$rows)) {
+       if(!$this->overwrite($rows)) {

         $this->unlock();
         return false;
        }
         $this->unlock();
         return false;
        }

diff --git a/functions/addressbook.php b/functions/addressbook.php
index fa53c7e30c5e591f678331c921b1de314ec45640..8385ca3c4c2982fcf288b027fe6718d25e246fe1 100644 (file)
--- a/functions/addressbook.php
+++ b/functions/addressbook.php
@@ -112,7 +112,7 @@
         $ret = array();
         for($i = 1 ; $i <= $this->numbackends ; $i++) {
            if(empty($type) || $type == $this->backends[$i]->btype) {
         $ret = array();
         for($i = 1 ; $i <= $this->numbackends ; $i++) {
            if(empty($type) || $type == $this->backends[$i]->btype) {

-              array_push($ret, &$this->backends[$i]);
+              $ret[] = &$this->backends[$i];

            }
         }
         return $ret;
            }
         }
         return $ret;

diff --git a/src/addrbook_search_html.php b/src/addrbook_search_html.php
index 3e1c696ffdcb6f83ee264fed74533515d97a639a..94590191f5fc3a249a5fa91a3f84d138c033f1a3 100644 (file)
--- a/src/addrbook_search_html.php
+++ b/src/addrbook_search_html.php
@@ -109,7 +109,7 @@
    // --- End functions ---
 
    displayPageHeader($color, 'None');
    // --- End functions ---
 
    displayPageHeader($color, 'None');

-
+   

    // Initialize addressbook
    $abook = addressbook_init();
 
    // Initialize addressbook
    $abook = addressbook_init();
 


@@ -131,7 +131,7 @@
    printf("  <nobr><STRONG>%s</STRONG>\n", _("Search for"));
    addr_insert_hidden();
    if (! isset($addrquery))
    printf("  <nobr><STRONG>%s</STRONG>\n", _("Search for"));
    addr_insert_hidden();
    if (! isset($addrquery))

-       $addrquery = "";
+       $addrquery = '';

    printf("  <INPUT TYPE=text NAME=addrquery VALUE=\"%s\" SIZE=26>\n",
           htmlspecialchars($addrquery));
 
    printf("  <INPUT TYPE=text NAME=addrquery VALUE=\"%s\" SIZE=26>\n",
           htmlspecialchars($addrquery));
 


@@ -166,10 +166,10 @@
    // End search form
 
    // Show personal addressbook
    // End search form
 
    // Show personal addressbook

-   if(!isset($addrquery) || !empty($listall)) {
+   if($addrquery == '' || !empty($listall)) {

 
 

-      if(! isset($backend) || $backend != -1 || !isset($addrquery)) {
-         if(!isset($addrquery)) 
+      if(! isset($backend) || $backend != -1 || $addrquery == '') {
+         if($addrquery == '')

             $backend = $abook->localbackend;
 
          //printf("<H3 ALIGN=center>%s</H3>\n", $abook->backends[$backend]->sname);
             $backend = $abook->localbackend;
 
          //printf("<H3 ALIGN=center>%s</H3>\n", $abook->backends[$backend]->sname);


@@ -212,7 +212,7 @@
       }
    }
 
       }
    }
 

-   if (!$addrquery || sizeof($res) == 0) {  
+   if ($addrquery == '' || sizeof($res) == 0) {  

       printf('<center><FORM METHOD=post NAME=k ACTION="compose.php">'."\n", $PHP_SELF);
       addr_insert_hidden();
       printf("<INPUT TYPE=submit VALUE=\"%s\" NAME=return>\n", _("Return"));
       printf('<center><FORM METHOD=post NAME=k ACTION="compose.php">'."\n", $PHP_SELF);
       addr_insert_hidden();
       printf("<INPUT TYPE=submit VALUE=\"%s\" NAME=return>\n", _("Return"));