X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=src%2Faddressbook.php;h=7c3ae718ad57ec236ee792cdfe91c993f06f1565;hp=39211b87295821d385e72a3c4f347dae8e6ab4c4;hb=19d01c6b200dfd6317e4a933325d903ba2901726;hpb=30967a1e09679c395b31929cbdb1a0e88b13f01e

diff --git a/src/addressbook.php b/src/addressbook.php
index 39211b87..7c3ae718 100644
--- a/src/addressbook.php
+++ b/src/addressbook.php
@@ -1,5 +1,4 @@
 <?php
-
 /**
  * addressbook.php
  *
@@ -42,7 +41,10 @@ sqgetGlobalVar('deladdr',   $deladdr,   SQ_POST);
 sqgetGlobalVar('sel',       $sel,       SQ_POST);
 sqgetGlobalVar('oldnick',   $oldnick,   SQ_POST);
 sqgetGlobalVar('backend',   $backend,   SQ_POST);
-sqgetGlobalVar('doedit',    $doedit,    SQ_POST); 
+sqgetGlobalVar('doedit',    $doedit,    SQ_POST);
+
+/* Get sorting order */
+$abook_sort_order = get_abook_sort();
 
 /**
  * Make an input field
@@ -59,7 +61,7 @@ function addressbook_inp_field($label, $field, $name, $size, $values, $add) {
     
     $td_str = addInput($name.'['.$field.']', $value, $size)
         . $add ;
-	
+
     return html_tag( 'tr' ,
         html_tag( 'td', $label . ':', 'right', $color[4]) .
         html_tag( 'td', $td_str, 'left', $color[4])
@@ -82,7 +84,7 @@ function address_form($name, $submittext, $values = array()) {
                        addressbook_inp_field(_("Last name"),    'lastname', $name, 45, $values, '') .
                        addressbook_inp_field(_("First name"),  'firstname', $name, 45, $values, '') .
                        addressbook_inp_field(_("Additional info"), 'label', $name, 45, $values, '') .
-		       list_writable_backends($name) .
+                   list_writable_backends($name) .
                        html_tag( 'tr',
                            html_tag( 'td',
                                        '<INPUT TYPE=submit NAME="' . htmlentities($name) . '[SUBMIT]" VALUE="' .
@@ -98,7 +100,7 @@ function address_form($name, $submittext, $values = array()) {
                        addressbook_inp_field(_("First name"),  'firstname', $name, 45, $values, '') .
                        addressbook_inp_field(_("Last name"),    'lastname', $name, 45, $values, '') .
                        addressbook_inp_field(_("Additional info"), 'label', $name, 45, $values, '') .
-		       list_writable_backends($name) .
+                   list_writable_backends($name) .
                        html_tag( 'tr',
                            html_tag( 'td',
                                        '<INPUT TYPE=submit NAME="' . htmlentities($name) . '[SUBMIT]" VALUE="' .
@@ -117,18 +119,18 @@ function list_writable_backends($name) {
     $backends = $abook->get_backend_list();
     while (list($undef,$v) = each($backends)) {
       if ($v->writeable) {
-	$ret .= '<OPTION VALUE=' . $v->bnum;
-	$ret .= '>' . $v->sname . "\n";
+        $ret .= '<OPTION VALUE=' . $v->bnum;
+        $ret .= '>' . $v->sname . "\n";
       }
     }
     $ret .= "</select>";
     return html_tag( 'tr',
-		     html_tag( 'td', _("Add to:"),'right', $color[4] ) .
-		     html_tag( 'td', $ret, 'left', $color[4] )) . "\n";
+                     html_tag( 'td', _("Add to:"),'right', $color[4] ) .
+                     html_tag( 'td', $ret, 'left', $color[4] )) . "\n";
   } else {
   return html_tag( 'tr',
-		   html_tag( 'td',
-		             addHidden('backend', '1'),
+                   html_tag( 'td',
+                             addHidden('backend', '1'),
                              'center', $color[4], 'colspan="2"')) . "\n";
   }
 }
@@ -160,14 +162,11 @@ if(sqgetGlobalVar('REQUEST_METHOD', $req_method, SQ_SERVER) && $req_method == 'P
      * Add new address                                *
      **************************************************/
     if (isset($addaddr)) {
-        foreach( $addaddr as $k => $adr ) {
-            $addaddr[$k] = strip_tags( $adr );
+        if (isset($backend)) {
+            $r = $abook->add($addaddr, $backend);
+        } else {
+            $r = $abook->add($addaddr, $abook->localbackend);
         }
-	if (isset($backend)) {
-	  $r = $abook->add($addaddr, $backend);
-	} else {
-	  $r = $abook->add($addaddr, $abook->localbackend);
-	}
 
         /* Handle error messages */
         if (!$r) {
@@ -258,9 +257,9 @@ if(sqgetGlobalVar('REQUEST_METHOD', $req_method, SQ_SERVER) && $req_method == 'P
                                    ),
                              'center', '', 'width="100%" ' );
                         address_form("editaddr", _("Update address"), $olddata);
-			echo addHidden('oldnick', $olddata['nickname']).
+                        echo addHidden('oldnick', $olddata['nickname']).
                              addHidden('backend', $olddata['backend']).
-			     addHidden('doedit', '1').
+                             addHidden('doedit', '1').
                              '</FORM>';
                     }
                 } else {
@@ -294,9 +293,9 @@ if(sqgetGlobalVar('REQUEST_METHOD', $req_method, SQ_SERVER) && $req_method == 'P
                                  'center', '', 'width="100%"' );
                             address_form("editaddr", _("Update address"), $newdata);
                             echo 
-			    	addHidden('oldnick', $oldnick).
-				addHidden('backend', $backend).
-				addHidden('doedit',  '1').
+                              addHidden('oldnick', $oldnick).
+                              addHidden('backend', $backend).
+                              addHidden('doedit',  '1').
                                  "\n" . '</FORM>';
                             $abortform = true;
                         }
@@ -373,23 +372,37 @@ if ($showaddrlist) {
                                           html_tag( 'td', '&nbsp;<br>', 'center', '', 'colspan="5"' )
                                     ) ,
                              'center' );
-                }
-    
-                echo html_tag( 'table',
-                                html_tag( 'tr',
-                                    html_tag( 'td', "\n" . '<strong>' . $row['source'] . '</strong>' . "\n", 'center', $color[0] )
-                                ) ,
-                        'center', '', 'width="95%"' ) ."\n" .
-		    "<!-- start of address book table -->\n" .
-            	  html_tag( 'table', '', 'center', '', 'border="0" cellpadding="1" cellspacing="0" width="90%"' ) .
+                    echo "\n<!-- start of address book table -->\n" .
+                      html_tag( 'table', '', 'center', '', 'border="0" cellpadding="1" cellspacing="0" width="90%"' ) .
                       html_tag( 'tr', "\n" .
-                          html_tag( 'th', '&nbsp;', 'left', '', 'width="1%"' ) .
-                          html_tag( 'th', _("Nickname"), 'left', '', 'width="1%"' ) .
-                          html_tag( 'th', _("Name"), 'left', '', 'width="1%"' ) .
-                          html_tag( 'th', _("E-mail"), 'left', '', 'width="1%"' ) .
-                          html_tag( 'th', _("Info"), 'left', '', 'width="1%"' ) ,
-                      '', $color[9] ) . "\n";
-    
+                          html_tag( 'th', '&nbsp;', 'left', '', 'width="1%"' ) . "\n" .
+                          html_tag( 'th', _("Nickname") .
+                                    show_abook_sort_button($abook_sort_order, _("sort by nickname"), 0, 1)
+                                    , 'left', '', 'width="1%"' ) . "\n" .
+                          html_tag( 'th', _("Name") . 
+                                    show_abook_sort_button($abook_sort_order, _("sort by name"), 2, 3)
+                                    , 'left', '', 'width="1%"' ) . "\n" .
+                          html_tag( 'th', _("E-mail") . 
+                                    show_abook_sort_button($abook_sort_order, _("sort by email"), 4, 5)
+                                    , 'left', '', 'width="1%"' ) . "\n" .
+                          html_tag( 'th', _("Info") .
+                                    show_abook_sort_button($abook_sort_order, _("sort by info"), 6, 7)
+                                    , 'left', '', 'width="1%"' ) . "\n",
+                                '', $color[9] ) . "\n";
+                }
+
+                // Separate different backends with <hr />
+                if($prevbackend > 0) {
+                    echo  html_tag( 'tr',
+                        html_tag( 'td', "<hr />", 'center', '' ,'colspan="5"' )
+                      );
+                }
+
+                // Print backend name
+                echo  html_tag( 'tr',
+                        html_tag( 'td', "\n" . '<strong>' . $row['source'] . '</strong>' . "\n", 'center', $color[0] ,'colspan="5"' )
+                      );
+
                 $line = 0;
                 $headerprinted = true;
             } /* End of header */
@@ -399,28 +412,43 @@ if ($showaddrlist) {
             /* Check if this user is selected */
             $selected = in_array($row['backend'] . ':' . $row['nickname'], $defselected);
     
-            /* Print one row */
-            $tr_bgcolor = '';
-            if ($line % 2) { $tr_bgcolor = $color[0]; }
+            /* Print one row, with alternating color */
+            if ($line % 2) { 
+                $tr_bgcolor = $color[12];
+            } else {
+                $tr_bgcolor = $color[4];
+            }
             if ($squirrelmail_language == 'ja_JP')
                 {
-            echo html_tag( 'tr', '', '', $tr_bgcolor) .
-                html_tag( 'td',
+            echo html_tag( 'tr', '', '', $tr_bgcolor);
+            if ($abook->backends[$row['backend']]->writeable) {
+                echo html_tag( 'td',
                           '<small>' .
-			  addCheckBox('sel[]', $selected, $row['backend'].':'.$row['nickname']).
+                          addCheckBox('sel[]', $selected, $row['backend'].':'.$row['nickname']).
                           '</small>' ,
-                          'center', '', 'valign="top" width="1%"' ) .
-                html_tag( 'td', '&nbsp;' . $row['nickname'] . '&nbsp;', 'left', '', 'valign="top" width="1%" nowrap' ) . 
+                          'center', '', 'valign="top" width="1%"' );
+            } else {
+                echo html_tag( 'td',
+                        '&nbsp;' ,
+                        'center', '', 'valign="top" width="1%"' );
+            }
+            echo html_tag( 'td', '&nbsp;' . $row['nickname'] . '&nbsp;', 'left', '', 'valign="top" width="1%" nowrap' ) . 
                 html_tag( 'td', '&nbsp;' . $row['lastname'] . ' ' . $row['firstname'] . '&nbsp;', 'left', '', 'valign="top" width="1%" nowrap' ) .
                 html_tag( 'td', '', 'left', '', 'valign="top" width="1%" nowrap' ) . '&nbsp;';
                 } else {
-            echo html_tag( 'tr', '', '', $tr_bgcolor) .
-            html_tag( 'td',
+            echo html_tag( 'tr', '', '', $tr_bgcolor);
+            if ($abook->backends[$row['backend']]->writeable) {
+                echo html_tag( 'td',
                 '<small>' .
                 '<input type=checkbox ' . $selected . ' name="sel[]" value="' .
                 $row['backend'] . ':' . $row['nickname'] . '" /></small>' ,
-                'center', '', 'valign="top" width="1%"' ) .
-            html_tag( 'td', '&nbsp;' . $row['nickname'] . '&nbsp;', 'left', '', 'valign="top" width="1%" nowrap' ) .
+                'center', '', 'valign="top" width="1%"' );
+            } else {
+                echo html_tag( 'td',
+                        '&nbsp;' ,
+                        'center', '', 'valign="top" width="1%"' );
+            }
+            echo html_tag( 'td', '&nbsp;' . $row['nickname'] . '&nbsp;', 'left', '', 'valign="top" width="1%" nowrap' ) .
             html_tag( 'td', '&nbsp;' . $row['name'] . '&nbsp;', 'left', '', 'valign="top" width="1%" nowrap' ) .
             html_tag( 'td', '', 'left', '', 'valign="top" width="1%" nowrap' ) . '&nbsp;';
                 }
@@ -431,22 +459,22 @@ if ($showaddrlist) {
             html_tag( 'td', '&nbsp;' . htmlspecialchars($row['label']) . '&nbsp;', 'left', '', 'valign="top" width="1%"' ) .
             "</tr>\n";
             $line++;
-	    echo "</table>\n".
-		"<!-- end of address book table -->\n";
         }
-    
+        echo "</table>" .
+          "\n<!-- end of address book table -->\n";
+
         /* End of list. Add edit/delete select buttons */
         if ($headerprinted) {
             echo html_tag( 'table',
-		    html_tag( 'tr',
-                        html_tag( 'td',
-                                '<input type="submit" name="editaddr" value="' . _("Edit selected") .
-                                "\" />\n" .
-                                '<input type="submit" name="deladdr" value="' . _("Delete selected") .
-                                "\" />\n",
-                         'center', '', 'colspan="5"' )
-                    ),
-		'center' );
+                           html_tag( 'tr',
+                                     html_tag( 'td',
+                                               '<input type="submit" name="editaddr" value="' . _("Edit selected") .
+                                               "\" />\n" .
+                                               '<input type="submit" name="deladdr" value="' . _("Delete selected") .
+                                               "\" />\n",
+                                               'center', '', 'colspan="5"' )
+                                     ),
+                           'center' );
         }
         echo "</form>\n";
     }
@@ -470,4 +498,4 @@ echo "</form>\n";
 do_hook('addressbook_bottom');
 ?>
 
-</body></html>
\ No newline at end of file
+</body></html>