* Fixed intl. of addrbook_search_html.php

* Added administrator's strings .
* Translated administrator into spanish.
* Added ldap define to administrator.

plugins/administrator/defines.php

@@ -26,6 +26,7 @@ define('SMOPT_TYPE_NUMLIST', 8);
 define('SMOPT_TYPE_TITLE', 9);
 define('SMOPT_TYPE_THEME', 10);
 define('SMOPT_TYPE_PLUGINS', 11);
+define('SMOPT_TYPE_LDAP', 12);
 
 global $languages;
 

plugins/administrator/options.php

@@ -195,9 +195,12 @@ foreach ( $newcfg as $k => $v ) {
         $type = SMOPT_TYPE_THEME;
     } else if ( substr( $k, 0, 9 ) == '$plugins[' ) {
         $type = SMOPT_TYPE_PLUGINS;
+    } else if ( substr( $k, 0, 13 ) == '$ldap_server[' ) {
+        $type = SMOPT_TYPE_LDAP;
     }
 
     switch ( $type ) {
+    case SMOPT_TYPE_LDAP:
     case SMOPT_TYPE_PLUGINS:
     case SMOPT_TYPE_THEME:
     case SMOPT_TYPE_HIDDEN:

po/xgetpo

@@ -38,5 +38,7 @@ xgettext --keyword=_ -keyword=N_  --default-domain=squirrelmail -j \
     -C squirrelmail/plugins/listcommands/*.php --output-dir=squirrelmail/po/
 xgettext --keyword=_ -keyword=N_  --default-domain=squirrelmail -j \
     -C squirrelmail/plugins/delete_move_next/*.php --output-dir=squirrelmail/po/
+xgettext --keyword=_ -keyword=N_  --default-domain=squirrelmail -j \
+    -C squirrelmail/plugins/administrator/*.php --output-dir=squirrelmail/po/
 
 cd squirrelmail/po

src/addrbook_search_html.php

@@ -31,8 +31,9 @@ function addr_insert_hidden() {
            $identity;
 
    echo '<input type=hidden value="';
-   if (substr($body, 0, 1) == "\r")
+   if (substr($body, 0, 1) == "\r") {
        echo "\n";
+   }
    echo htmlspecialchars($body) . '" name=body>' . "\n" .
         '<input type=hidden value="' . htmlspecialchars($subject) .
         '" name=subject>' . "\n" .
@@ -78,11 +79,11 @@ function addr_display_result($res, $includesource = true) {
         if ($line % 2) { echo ' bgcolor="' . $color[0] . '"'; }
         echo ' nowrap><td nowrap align=center width="5%">' .
              '<input type=checkbox name="send_to_search[T' . $line . ']" value = "' .
-             htmlspecialchars($row['email']) . '">&nbsp;To&nbsp;' .
+             htmlspecialchars($row['email']) . '">&nbsp;' . _("To") . '&nbsp;' .
              '<input type=checkbox name="send_to_search[C' . $line . ']" value = "' .
-             htmlspecialchars($row['email']) . '">&nbsp;Cc&nbsp;' .
+             htmlspecialchars($row['email']) . '">&nbsp;' . _("Cc") . '&nbsp;' .
              '<input type=checkbox name="send_to_search[B' . $line . ']" value = "' .
-             htmlspecialchars($row['email']) . '">&nbsp;Bcc&nbsp;' . 
+             htmlspecialchars($row['email']) . '">&nbsp;' . _("Bcc") . '&nbsp;' . 
              '</td><td nowrap>&nbsp;' . $row['name'] . '&nbsp;</td>' .
              '<td nowrap>&nbsp;' . $row['email'] . '&nbsp;</td>' .
              '<td nowrap>&nbsp;' . $row['label'] . '&nbsp;</td>';
@@ -224,4 +225,4 @@ if ($addrquery == '' || sizeof($res) == 0) {
 }
 
 ?>
-</body></html>
+</body></html>