Indentation fixes and minor cleanups

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

diff --git a/src/addrbook_search.php b/src/addrbook_search.php
index ded84c022c080c39225cd2355f575c20d2599e25..f8617a5c5c2685f8a6d72dd79caef29eb588e6f5 100644 (file)
--- a/src/addrbook_search.php
+++ b/src/addrbook_search.php
@@ -206,23 +206,23 @@ $abook = addressbook_init();
 /* Create search form */
 if ($show == 'form' && empty($listall)) {
     echo '<form name="sform" target="abookres" action="addrbook_search.php'. 
-         '" method="post">' . "\n" .
+            '" method="post">' . "\n" .
          html_tag( 'table', '', '', '', 'border="0" width="100%" height="100%"' ) .
          html_tag( 'tr' ) .
          html_tag( 'td', '  <strong>' . _("Search for") . "</strong>\n", 'left', '', 'nowrap valign="middle" width="10%"' ) .
          html_tag( 'td', '', 'left', '', '' ) .
-            addInput('query', $query, 28);
+         addInput('query', $query, 28);
 
     /* List all backends to allow the user to choose where to search */
     if ($abook->numbackends > 1) {
         echo '<strong>' . _("in") . '</strong>&nbsp;'."\n".
-       $selopts['-1'] = _("All address books");
-       
+             $selopts['-1'] = _("All address books");
+
         $ret = $abook->get_backend_list();
         while (list($undef,$v) = each($ret)) {
             $selopts[$v->bnum] = $v->sname;
         }
-       echo addSelect('backend', $selopts, '-1', TRUE);
+        echo addSelect('backend', $selopts, '-1', TRUE);
     } else {
         echo addHidden('backend', '-1');
     }

diff --git a/src/addressbook.php b/src/addressbook.php
index aaeb00fd893ba55d592fe8b21b8c6bcbd671cfa7..c0ff11ff9b4dec2f14897fc251c18cbefd5890f0 100644 (file)
--- a/src/addressbook.php
+++ b/src/addressbook.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * addressbook.php
  *
@@ -360,35 +361,35 @@ if ($showaddrlist) {
             if($prevbackend != $row['backend']) {
                 if($prevbackend < 0) {
                     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"' )
-                                    ) .
-                                    html_tag( 'tr',
-                                          html_tag( 'td', '&nbsp;<br />', '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"' )
+                                ) .
+                            html_tag( 'tr',
+                                html_tag( 'td', '&nbsp;<br />', 'center', '', 'colspan="5"' )
+                                ),
+                            'center' );
                     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%"' ) . "\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";
+                         html_tag( 'table', '', 'center', '', 'border="0" cellpadding="1" cellspacing="0" width="90%"' ) .
+                         html_tag( 'tr', "\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&nbs