We use cookies to ensure you get the best experience on our website
Inicio Explorar Ayuda
Registro Iniciar sesión
0ct0pu5
/
squirrelmail
1
0
Fork 0
Archivos Incidencias 0 Pull Requests 0 Wiki
Explorar el Código

Took out cvs confusion

lbergman hace 24 años
padre
46f6a04943
commit
aaa4f68bc8
Se han modificado 5 ficheros con 114 adiciones y 115 borrados
Unificar vista Mostrar estadísticas de diff
  1. 7 7
      src/addrbook_popup.php
  2. 26 26
      src/addrbook_search.php
  3. 29 29
      src/addrbook_search_html.php
  4. 30 30
      src/addressbook.php
  5. 22 23
      src/webmail.php

+ 7 - 7
src/addrbook_popup.php
Ver fichero 

@@ -13,21 +13,21 @@
 
    session_start();
 
    session_start();
 
 
 
    if (!isset($i18n_php))
 
    if (!isset($i18n_php))
 
-      include("../functions/i18n.php");
 
+      include('../functions/i18n.php');
 
    if (!isset($config_php))
 
    if (!isset($config_php))
 
-      include("../config/config.php");
 
+      include('../config/config.php');
 
    if (!isset($page_header_php))
 
    if (!isset($page_header_php))
 
-      include("../functions/page_header.php");
 
+      include('../functions/page_header.php');
 
    if (!isset($auth_php))
 
    if (!isset($auth_php))
 
-      include("../functions/auth.php");
 
+      include('../functions/auth.php');
 
    if (!isset($addressbook_php))
 
    if (!isset($addressbook_php))
 
-      include("../functions/addressbook.php");
 
+      include('../functions/addressbook.php');
 
 
 
    is_logged_in();
 
    is_logged_in();
 
 
 
-   include("../src/load_prefs.php");
 
+   include('../src/load_prefs.php');
 
    
    
-   set_up_language(getPref($data_dir, $username, "language"));
 
+   set_up_language(getPref($data_dir, $username, 'language'));
 
    
    
 ?>
 
 ?>
 
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Frameset//EN">
 
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Frameset//EN">

+ 26 - 26
src/addrbook_search.php
Ver fichero 

@@ -91,7 +91,7 @@ function bcc_address($addr) {
 
       insert_javascript();
 
       insert_javascript();
 
 
 
       $line = 0;
 
       $line = 0;
 
-      print "<TABLE BORDER=0 WIDTH=\"98%\" ALIGN=center>";
 
+      print '<TABLE BORDER="0" WIDTH="98%" ALIGN=center>';
 
       printf("<TR BGCOLOR=\"$color[9]\"><TH ALIGN=left>&nbsp;".
 
       printf("<TR BGCOLOR=\"$color[9]\"><TH ALIGN=left>&nbsp;".
 
 	     "<TH ALIGN=left>&nbsp;%s<TH ALIGN=left>&nbsp;%s".
 
 	     "<TH ALIGN=left>&nbsp;%s<TH ALIGN=left>&nbsp;%s".
 
 	     "<TH ALIGN=left>&nbsp;%s",
 
 	     "<TH ALIGN=left>&nbsp;%s",
 
@@ -121,7 +121,7 @@ function bcc_address($addr) {
 
 	 print "</TR>\n";
 
 	 print "</TR>\n";
 
 	 $line++;
 
 	 $line++;
 
       }
 
       }
 
-      print "</TABLE>";
 
+      print '</TABLE>';
 
    }
 
    }
 
 
 
    /* ================= End of functions ================= */
 
    /* ================= End of functions ================= */
 
@@ -129,42 +129,42 @@ function bcc_address($addr) {
 
    session_start();
 
    session_start();
 
    
    
    if (!isset($i18n_php))
 
    if (!isset($i18n_php))
 
-      include("../functions/i18n.php");
 
+      include('../functions/i18n.php');
 
 
 
    if(!isset($logged_in) || !isset($username) || !isset($key)) {
 
    if(!isset($logged_in) || !isset($username) || !isset($key)) {
 
-      include ("../themes/default_theme.php");
 
-      include ("../functions/display_messages.php");
 
+      include ('../themes/default_theme.php');
 
+      include ('../functions/display_messages.php');
 
       printf('<html><BODY TEXT="%s" BGCOLOR="%s" LINK="%s" VLINK="%s" ALINK="%s">',
 
       printf('<html><BODY TEXT="%s" BGCOLOR="%s" LINK="%s" VLINK="%s" ALINK="%s">',
 
               $color[8], $color[4], $color[7], $color[7], $color[7]);
 
               $color[8], $color[4], $color[7], $color[7], $color[7]);
 
       plain_error_message(_("You need a valid user and password to access this page!")
 
       plain_error_message(_("You need a valid user and password to access this page!")
 
-                          . "<br><a href=\"../src/login.php\">"
 
+                          . '<br><a href="../src/login.php">'
 
                           . _("Click here to log back in.") . "</a>.", $color);
 
                           . _("Click here to log back in.") . "</a>.", $color);
 
-      echo "</body></html>";
 
+      echo '</body></html>';
 
       exit;
 
       exit;
 
    }
 
    }
 
    if (!isset($config_php))
 
    if (!isset($config_php))
 
-      include("../config/config.php");
 
+      include('../config/config.php');
 
    if (!isset($array_php))
 
    if (!isset($array_php))
 
-      include("../functions/array.php");
 
+      include('../functions/array.php');
 
    if (!isset($auth_php))
 
    if (!isset($auth_php))
 
-      include("../functions/auth.php");
 
+      include('../functions/auth.php');
 
    if (!isset($strings_php))
 
    if (!isset($strings_php))
 
-      include("../functions/strings.php");
 
+      include('../functions/strings.php');
 
    if (!isset($page_header_php))
 
    if (!isset($page_header_php))
 
-      include("../functions/page_header.php");
 
+      include('../functions/page_header.php');
 
    if (!isset($addressbook_php))
 
    if (!isset($addressbook_php))
 
-      include("../functions/addressbook.php");
 
+      include('../functions/addressbook.php');
 
 
 
    is_logged_in();
 
    is_logged_in();
 
-   include("../src/load_prefs.php");
 
+   include('../src/load_prefs.php');
 
 
 
    displayHtmlHeader();
 
    displayHtmlHeader();
 
 
 
    // Choose correct colors for top and bottom frame
 
    // Choose correct colors for top and bottom frame
 
-   if($show == "form") {
 
+   if($show == 'form') {
 
       echo "<BODY BGCOLOR=\"$color[3]\" TEXT=\"$color[6]\" ";
 
       echo "<BODY BGCOLOR=\"$color[3]\" TEXT=\"$color[6]\" ";
 
       echo "LINK=\"$color[6]\" VLINK=\"$color[6]\" ALINK=\"$color[6]\" ";
 
       echo "LINK=\"$color[6]\" VLINK=\"$color[6]\" ALINK=\"$color[6]\" ";
 
-      echo "OnLoad=\"document.sform.query.focus();\">";  
+      echo 'OnLoad="document.sform.query.focus();">';  
    } else {
 
    } else {
 
       echo "<BODY TEXT=\"$color[8]\" BGCOLOR=\"$color[4]\" ";
 
       echo "<BODY TEXT=\"$color[8]\" BGCOLOR=\"$color[4]\" ";
 
       echo "LINK=\"$color[7]\" VLINK=\"$color[7]\" ALINK=\"$color[7]\">\n";
 
       echo "LINK=\"$color[7]\" VLINK=\"$color[7]\" ALINK=\"$color[7]\">\n";
 
@@ -181,11 +181,11 @@ function bcc_address($addr) {
 
    $abook = addressbook_init();
 
    $abook = addressbook_init();
 
 
 
    // Create search form 
    // Create search form 
-   if($show == "form") {
 
+   if($show == 'form') {
 
       printf("<FORM NAME=sform TARGET=abookres ACTION=\"%s\" METHOD=\"POST\">\n",
 
       printf("<FORM NAME=sform TARGET=abookres ACTION=\"%s\" METHOD=\"POST\">\n",
 
 	     $PHP_SELF);
 
 	     $PHP_SELF);
 
-      printf("<TABLE BORDER=0 WIDTH=\"100%%\" HEIGHT=\"100%%\">");
 
-      printf("<TR><TD NOWRAP VALIGN=middle>\n");
 
+      print('<TABLE BORDER="0" WIDTH="100%" HEIGHT="100%">');
 
+      print("<TR><TD NOWRAP VALIGN=middle>\n");
 
       printf("  <STRONG>%s</STRONG>\n", _("Search for"));
 
       printf("  <STRONG>%s</STRONG>\n", _("Search for"));
 
       printf("  <INPUT TYPE=text NAME=query VALUE=\"%s\" SIZE=26>\n",
 
       printf("  <INPUT TYPE=text NAME=query VALUE=\"%s\" SIZE=26>\n",
 
 	     htmlspecialchars($query));
 
 	     htmlspecialchars($query));
 
@@ -199,26 +199,26 @@ function bcc_address($addr) {
 
 	 $ret = $abook->get_backend_list();
 
 	 $ret = $abook->get_backend_list();
 
 	 while(list($undef,$v) = each($ret)) 
 	 while(list($undef,$v) = each($ret)) 
 	    printf("<OPTION VALUE=%d>%s\n", $v->bnum, $v->sname);
 
 	    printf("<OPTION VALUE=%d>%s\n", $v->bnum, $v->sname);
 
-	 printf("</SELECT>\n");
 
+	 print "</SELECT>\n";
 
       } else {
 
       } else {
 
-	 printf("<INPUT TYPE=hidden NAME=backend VALUE=-1>\n");
 
+	 print "<INPUT TYPE=hidden NAME=backend VALUE=-1>\n";
 
       }
 
       }
 
 
 
       printf("<INPUT TYPE=submit VALUE=\"%s\">",
 
       printf("<INPUT TYPE=submit VALUE=\"%s\">",
 
 	     _("Search"));
 
 	     _("Search"));
 
       printf("&nbsp;|&nbsp;<INPUT TYPE=submit VALUE=\"%s\" NAME=listall>\n",
 
       printf("&nbsp;|&nbsp;<INPUT TYPE=submit VALUE=\"%s\" NAME=listall>\n",
 
              _("List all"));
 
              _("List all"));
 
-      printf("</TD><TD ALIGN=right>\n");
 
+      print "</TD><TD ALIGN=right>\n";
 
       printf("<INPUT TYPE=button VALUE=\"%s\" onclick=\"parent.close();\">\n",
 
       printf("<INPUT TYPE=button VALUE=\"%s\" onclick=\"parent.close();\">\n",
 
              _("Close window"));
 
              _("Close window"));
 
-      printf("</TD></TR></TABLE></FORM>\n");
 
+      print "</TD></TR></TABLE></FORM>\n";
 
    } else
 
    } else
 
 
 
    // Show personal addressbook
 
    // Show personal addressbook
 
-   if($show == "blank" || !empty($listall)) {
 
+   if($show == 'blank' || !empty($listall)) {
 
 
 
-      if($backend != -1 || $show == "blank") {
 
-	 if($show == "blank") 
+      if($backend != -1 || $show == 'blank') {
 
+	 if($show == 'blank') 
 	    $backend = $abook->localbackend;
 
 	    $backend = $abook->localbackend;
 
 
 
 	 //printf("<H3 ALIGN=center>%s</H3>\n", $abook->backends[$backend]->sname);
 
 	 //printf("<H3 ALIGN=center>%s</H3>\n", $abook->backends[$backend]->sname);

+ 29 - 29
src/addrbook_search_html.php
Ver fichero 

@@ -19,42 +19,42 @@
 
    session_start();
 
    session_start();
 
 
 
    if (!isset($config_php))
 
    if (!isset($config_php))
 
-      include("../config/config.php");
 
+      include('../config/config.php');
 
    if (!isset($strings_php))
 
    if (!isset($strings_php))
 
-      include("../functions/strings.php");
 
+      include('../functions/strings.php');
 
    if (!isset($auth_php))
 
    if (!isset($auth_php))
 
-      include("../functions/auth.php");
 
+      include('../functions/auth.php');
 
    if (!isset($page_header_php))
 
    if (!isset($page_header_php))
 
-      include("../functions/page_header.php");
 
+      include('../functions/page_header.php');
 
    if (!isset($date_php))
 
    if (!isset($date_php))
 
-      include("../functions/date.php");
 
+      include('../functions/date.php');
 
    if (!isset($smtp_php))
 
    if (!isset($smtp_php))
 
-      include("../functions/smtp.php");
 
+      include('../functions/smtp.php');
 
    if (!isset($display_messages_php))
 
    if (!isset($display_messages_php))
 
-      include("../functions/display_messages.php");
 
+      include('../functions/display_messages.php');
 
    if (!isset($addressbook_php))
 
    if (!isset($addressbook_php))
 
-      include("../functions/addressbook.php");
 
+      include('../functions/addressbook.php');
 
    if (!isset($plugin_php))
 
    if (!isset($plugin_php))
 
-      include("../functions/plugin.php");
 
+      include('../functions/plugin.php');
 
 
 
-   include("../src/load_prefs.php");
 
+   include('../src/load_prefs.php');
 
 
 
    // Insert hidden data
 
    // Insert hidden data
 
    function addr_insert_hidden() {
 
    function addr_insert_hidden() {
 
       global $body, $subject, $send_to, $send_to_cc, $send_to_bcc;
 
       global $body, $subject, $send_to, $send_to_cc, $send_to_bcc;
 
       
       
-      echo "<input type=hidden value=\"";
 
+      echo '<input type=hidden value="';
 
       if (substr($body, 0, 1) == "\r")
 
       if (substr($body, 0, 1) == "\r")
 
           echo "\n";
 
           echo "\n";
 
-      echo htmlspecialchars($body) . "\" name=body>\n";
 
-      echo "<input type=hidden value=\"" . htmlspecialchars($subject)
 
-          . "\" name=subject>\n";
 
-      echo "<input type=hidden value=\"" . htmlspecialchars($send_to)
 
-          . "\" name=send_to>\n";
 
+      echo htmlspecialchars($body) . '" name=body>\n"';
 
+      echo '<input type=hidden value="' . htmlspecialchars($subject)
 
+          . '" name=subject>\n"';
 
+      echo '<input type=hidden value="' . htmlspecialchars($send_to)
 
+          . '" name=send_to>\n"';
 
       echo "<input type=hidden value=\"" . htmlspecialchars($send_to_cc)
 
       echo "<input type=hidden value=\"" . htmlspecialchars($send_to_cc)
 
-          . "\" name=send_to_cc>\n";
 
+          . '" name=send_to_cc>\n"';
 
       echo "<input type=hidden value=\"" . htmlspecialchars($send_to_bcc)
 
       echo "<input type=hidden value=\"" . htmlspecialchars($send_to_bcc)
 
-          . "\" name=send_to_bcc>\n";
 
+          . '" name=send_to_bcc>\n"';
 
       echo "<input type=hidden value=\"true\" name=from_htmladdr_search>\n";
 
       echo "<input type=hidden value=\"true\" name=from_htmladdr_search>\n";
 
    }
 
    }
 
 
 
@@ -101,14 +101,14 @@
 
              'NAME="addr_search_done" VALUE="%s"></TD></TR>',
 
              'NAME="addr_search_done" VALUE="%s"></TD></TR>',
 
              4 + ($includesource ? 1 : 0), 
              4 + ($includesource ? 1 : 0), 
              _("Use Addresses"));
 
              _("Use Addresses"));
 
-      print "</TABLE>";
 
+      print '</TABLE>';
 
       print '<INPUT TYPE=hidden VALUE=1 NAME="html_addr_search_done">';
 
       print '<INPUT TYPE=hidden VALUE=1 NAME="html_addr_search_done">';
 
-      print "</FORM>";
 
+      print '</FORM>';
 
    }
 
    }
 
 
 
    // --- End functions ---
 
    // --- End functions ---
 
 
 
-   displayPageHeader($color, "None");
 
+   displayPageHeader($color, 'None');
 
 
 
    // Initialize addressbook
 
    // Initialize addressbook
 
    $abook = addressbook_init();
 
    $abook = addressbook_init();
 
@@ -131,7 +131,7 @@
 
    // Search form
 
    // Search form
 
    print "<CENTER>\n";
 
    print "<CENTER>\n";
 
    print "<TABLE BORDER=0>\n";
 
    print "<TABLE BORDER=0>\n";
 
-   printf("<TR><TD NOWRAP VALIGN=middle>\n");
 
+   print "<TR><TD NOWRAP VALIGN=middle>\n";
 
    printf('<FORM METHOD=post NAME=f ACTION="%s?html_addr_search=true">'."\n", $PHP_SELF);
 
    printf('<FORM METHOD=post NAME=f ACTION="%s?html_addr_search=true">'."\n", $PHP_SELF);
 
    print "<CENTER>\n";
 
    print "<CENTER>\n";
 
    printf("  <nobr><STRONG>%s</STRONG>\n", _("Search for"));
 
    printf("  <nobr><STRONG>%s</STRONG>\n", _("Search for"));
 
@@ -154,20 +154,20 @@
 
                 $v->bnum, 
                 $v->bnum, 
                 ($backend == $v->bnum) ? "SELECTED" : "",
 
                 ($backend == $v->bnum) ? "SELECTED" : "",
 
                 $v->sname);
 
                 $v->sname);
 
-      printf("</SELECT>\n");
 
+      print "</SELECT>\n";
 
    } else {
 
    } else {
 
-      printf("<INPUT TYPE=hidden NAME=backend VALUE=-1>\n");
 
+      print "<INPUT TYPE=hidden NAME=backend VALUE=-1>\n";
 
    }
 
    }
 
    printf("<INPUT TYPE=submit VALUE=\"%s\">",
 
    printf("<INPUT TYPE=submit VALUE=\"%s\">",
 
           _("Search"));
 
           _("Search"));
 
    printf("&nbsp;|&nbsp;<INPUT TYPE=submit VALUE=\"%s\" NAME=listall>\n",
 
    printf("&nbsp;|&nbsp;<INPUT TYPE=submit VALUE=\"%s\" NAME=listall>\n",
 
           _("List all"));
 
           _("List all"));
 
-   print "</FORM></center>";
 
+   print '</FORM></center>';
 
 
 
-   printf("</TD></TR></TABLE>\n");
 
+   print "</TD></TR></TABLE>\n";
 
    addr_insert_hidden();
 
    addr_insert_hidden();
 
    print "</CENTER>";
 
    print "</CENTER>";
 
-   do_hook("addrbook_html_search_below");
 
+   do_hook('addrbook_html_search_below');
 
    // End search form
 
    // End search form
 
 
 
    // Show personal addressbook
 
    // Show personal addressbook
 
@@ -221,8 +221,8 @@
 
       printf('<center><FORM METHOD=post NAME=k ACTION="compose.php">'."\n", $PHP_SELF);
 
       printf('<center><FORM METHOD=post NAME=k ACTION="compose.php">'."\n", $PHP_SELF);
 
       addr_insert_hidden();
 
       addr_insert_hidden();
 
       printf("<INPUT TYPE=submit VALUE=\"%s\" NAME=return>\n", _("Return"));
 
       printf("<INPUT TYPE=submit VALUE=\"%s\" NAME=return>\n", _("Return"));
 
-      printf('</form>');
 
-      printf("</center></nobr>");
 
+      print '</form>';
 
+      print '</center></nobr>';
 
    }   
    }   
 
 
 ?>
 
 ?>

+ 30 - 30
src/addressbook.php
Ver fichero 

@@ -13,30 +13,30 @@
 
    session_start();
 
    session_start();
 
 
 
    if (!isset($strings_php))
 
    if (!isset($strings_php))
 
-      include("../functions/strings.php");
 
+      include('../functions/strings.php');
 
    if (!isset($config_php))
 
    if (!isset($config_php))
 
-      include("../config/config.php");
 
+      include('../config/config.php');
 
    if (!isset($array_php))
 
    if (!isset($array_php))
 
-      include("../functions/array.php");
 
+      include('../functions/array.php');
 
    if (!isset($auth_php))
 
    if (!isset($auth_php))
 
-      include("../functions/auth.php");
 
+      include('../functions/auth.php');
 
    if (!isset($page_header_php))
 
    if (!isset($page_header_php))
 
-      include("../functions/page_header.php");
 
+      include('../functions/page_header.php');
 
    if (!isset($display_messages_php))
 
    if (!isset($display_messages_php))
 
-      include("../functions/display_messages.php");
 
+      include('../functions/display_messages.php');
 
    if (!isset($addressbook_php))
 
    if (!isset($addressbook_php))
 
-      include("../functions/addressbook.php");
 
+      include('../functions/addressbook.php');
 
 
 
    is_logged_in();
 
    is_logged_in();
 
 
 
    // Sort array by the key "name"
 
    // Sort array by the key "name"
 
    function alistcmp($a,$b) {   
    function alistcmp($a,$b) {   
-      if($a["backend"] > $b["backend"]) 
+      if($a['backend'] > $b['backend']) 
 	 return 1;
 
 	 return 1;
 
-      else if($a["backend"] < $b["backend"]) 
+      else if($a['backend'] < $b['backend']) 
 	 return -1;
 
 	 return -1;
 
       
       
-      return (strtolower($a["name"]) > strtolower($b["name"])) ? 1 : -1;
 
+      return (strtolower($a['name']) > strtolower($b['name'])) ? 1 : -1;
 
    }
 
    }
 
 
 
    // Output form to add and modify address data
 
    // Output form to add and modify address data
 
@@ -49,8 +49,8 @@
 
 	     "<INPUT NAME=\"%s[nickname]\" SIZE=15 VALUE=\"%s\">".
 
 	     "<INPUT NAME=\"%s[nickname]\" SIZE=15 VALUE=\"%s\">".
 
 	     "&nbsp;<SMALL>%s</SMALL></TD></TR>\n",
 
 	     "&nbsp;<SMALL>%s</SMALL></TD></TR>\n",
 
 	     $color[4], $name, 
 	     $color[4], $name, 
-	     (isset($values["nickname"]))?
 
-	         htmlspecialchars($values["nickname"]):"",
 
+	     (isset($values['nickname']))?
 
+	         htmlspecialchars($values['nickname']):"",
 
 	     _("Must be unique"));
 
 	     _("Must be unique"));
 
       printf("<TR><TD WIDTH=50 BGCOLOR=\"$color[4]\" ALIGN=RIGHT>%s:</TD>",
 
       printf("<TR><TD WIDTH=50 BGCOLOR=\"$color[4]\" ALIGN=RIGHT>%s:</TD>",
 
 	     _("E-mail address"));
 
 	     _("E-mail address"));
 
@@ -89,7 +89,7 @@
 
    }
 
    }
 
 
 
 
 
-   include("../src/load_prefs.php");
 
+   include('../src/load_prefs.php');
 
 
 
    // Open addressbook, with error messages on but without LDAP (the
 
    // Open addressbook, with error messages on but without LDAP (the
 
    // second "true"). Don't need LDAP here anyway
 
    // second "true"). Don't need LDAP here anyway
 
@@ -99,23 +99,23 @@
 
       exit();
 
       exit();
 
    }
 
    }
 
 
 
-   displayPageHeader($color, "None");
 
+   displayPageHeader($color, 'None');
 
 
 
 
 
    $defdata   = array();
 
    $defdata   = array();
 
-   $formerror = "";
 
+   $formerror = '';
 
    $abortform = false;
 
    $abortform = false;
 
    $showaddrlist = true;
 
    $showaddrlist = true;
 
    $defselected  = array();
 
    $defselected  = array();
 
 
 
 
 
    // Handle user's actions
 
    // Handle user's actions
 
-   if($REQUEST_METHOD == "POST") {
 
+   if($REQUEST_METHOD == 'POST') {
 
 
 
       // ***********************************************
 
       // ***********************************************
 
       // Add new address
 
       // Add new address
 
       // ***********************************************
 
       // ***********************************************
 
-      if(!empty($addaddr["nickname"])) {
 
+      if(!empty($addaddr['nickname'])) {
 
 	 
 	 
 	 $r = $abook->add($addaddr, $abook->localbackend);
 
 	 $r = $abook->add($addaddr, $abook->localbackend);
 
 
 
@@ -123,7 +123,7 @@
 
 	 if(!$r) {
 
 	 if(!$r) {
 
 	    // Remove backend name from error string
 
 	    // Remove backend name from error string
 
 	    $errstr = $abook->error;
 
 	    $errstr = $abook->error;
 
-	    $errstr = ereg_replace("^\[.*\] *", "", $errstr);
 
+	    $errstr = ereg_replace('^\[.*\] *', '', $errstr);
 
 
 
 	    $formerror = $errstr;
 
 	    $formerror = $errstr;
 
 	    $showaddrlist = false;
 
 	    $showaddrlist = false;
 
@@ -148,7 +148,7 @@
 
 	 $delfailed = false;
 
 	 $delfailed = false;
 
 
 
 	 for($i = 0 ; (($i < sizeof($sel)) && !$delfailed) ; $i++) {
 
 	 for($i = 0 ; (($i < sizeof($sel)) && !$delfailed) ; $i++) {
 
-	    list($sbackend, $snick) = split(":", $sel[$i]);
 
+	    list($sbackend, $snick) = split(':', $sel[$i]);
 
 
 
 	    // When we get to a new backend, process addresses in
 
 	    // When we get to a new backend, process addresses in
 
 	    // previous one.
 
 	    // previous one.
 
@@ -201,7 +201,7 @@
 
 	       $olddata = $abook->lookup($enick, $ebackend);
 
 	       $olddata = $abook->lookup($enick, $ebackend);
 
 
 
 	       // Display the "new address" form
 
 	       // Display the "new address" form
 
-	       printf("<FORM ACTION=\"%s\" METHOD=\"POST\">\n", $PHP_SELF);
 
+	       print "<FORM ACTION=\"$PHP_SELF\" METHOD=\"POST\">\n";
 
 	       print "<TABLE WIDTH=100% COLS=1 ALIGN=CENTER>\n";
 
 	       print "<TABLE WIDTH=100% COLS=1 ALIGN=CENTER>\n";
 
 	       print "<TR><TD BGCOLOR=\"$color[0]\" ALIGN=CENTER>\n<STRONG>";
 
 	       print "<TR><TD BGCOLOR=\"$color[0]\" ALIGN=CENTER>\n<STRONG>";
 
 	       print _("Update address");
 
 	       print _("Update address");
 
@@ -213,7 +213,7 @@
 
 	       printf("<INPUT TYPE=hidden NAME=backend VALUE=\"%s\">\n",
 
 	       printf("<INPUT TYPE=hidden NAME=backend VALUE=\"%s\">\n",
 
 		      htmlspecialchars($olddata["backend"]));
 
 		      htmlspecialchars($olddata["backend"]));
 
 	       print "<INPUT TYPE=hidden NAME=doedit VALUE=1>\n";
 
 	       print "<INPUT TYPE=hidden NAME=doedit VALUE=1>\n";
 
-	       print "</FORM>";
 
+	       print '</FORM>';
 
 	    }
 
 	    }
 
 	 }
 
 	 }
 
 
 
@@ -245,7 +245,7 @@
 
 	       printf("<INPUT TYPE=hidden NAME=backend VALUE=\"%s\">\n",
 
 	       printf("<INPUT TYPE=hidden NAME=backend VALUE=\"%s\">\n",
 
 		      htmlspecialchars($backend));
 
 		      htmlspecialchars($backend));
 
 	       print "<INPUT TYPE=hidden NAME=doedit VALUE=1>\n";
 
 	       print "<INPUT TYPE=hidden NAME=doedit VALUE=1>\n";
 
-	       print "</FORM>";	       
+	       print '</FORM>';	       
 
 
 	       $abortform = true;
 
 	       $abortform = true;
 
 	    }
 
 	    }
 
@@ -303,7 +303,7 @@
 
 	 // New table header for each backend
 
 	 // New table header for each backend
 
 	 if($prevbackend != $row["backend"]) {
 
 	 if($prevbackend != $row["backend"]) {
 
 	    if($prevbackend >= 0) {
 
 	    if($prevbackend >= 0) {
 
-	       print "<TR><TD COLSPAN=5 ALIGN=center>";
 
+	       print '<TR><TD COLSPAN="5" ALIGN=center>';
 
 	       print "&nbsp;<BR></TD></TR></TABLE>\n";
 
 	       print "&nbsp;<BR></TD></TR></TABLE>\n";
 
 	    }
 
 	    }
 
 
 
@@ -313,7 +313,7 @@
 
 	    print "<STRONG>\n</TD></TR>\n";
 
 	    print "<STRONG>\n</TD></TR>\n";
 
 	    print "</TABLE>\n";
 
 	    print "</TABLE>\n";
 
 
 
-	    print '<TABLE COLS=5 BORDER=0 CELLPADDING=1 CELLSPACING=0 WIDTH="90%" ALIGN=center>';
 
+	    print '<TABLE COLS="5" BORDER="0" CELLPADDING="1" CELLSPACING="0" WIDTH="90%" ALIGN="center">';
 
 	    printf('<TR BGCOLOR="%s"><TH ALIGN=left WIDTH="%s">&nbsp;'.
 
 	    printf('<TR BGCOLOR="%s"><TH ALIGN=left WIDTH="%s">&nbsp;'.
 
 		   '<TH ALIGN=left WIDTH="%s">%s<TH ALIGN=left WIDTH="%s">%s'.
 
 		   '<TH ALIGN=left WIDTH="%s">%s<TH ALIGN=left WIDTH="%s">%s'.
 
 		   '<TH ALIGN=left WIDTH="%s">%s<TH ALIGN=left WIDTH="%s">%s'.
 
 		   '<TH ALIGN=left WIDTH="%s">%s<TH ALIGN=left WIDTH="%s">%s'.
 
@@ -326,13 +326,13 @@
 
 	    $headerprinted = true;
 
 	    $headerprinted = true;
 
 	 } // End of header
 
 	 } // End of header
 
 
 
-	 $prevbackend = $row["backend"];
 
+	 $prevbackend = $row['backend'];
 
 
 
 	 // Check if this user is selected
 
 	 // Check if this user is selected
 
-	 if(in_array($row["backend"].":".$row["nickname"], $defselected)) 
-	    $selected = "CHECKED";
 
+	 if(in_array($row['backend'].':'.$row['nickname'], $defselected)) 
+	    $selected = 'CHECKED';
 
 	 else
 
 	 else
 
-	    $selected = "";
 
+	    $selected = '';
 
       
       
 	 // Print one row
 
 	 // Print one row
 
 	 printf("<TR%s>",
 
 	 printf("<TR%s>",
 
@@ -371,8 +371,8 @@
 
    printf(_("Add to %s"), $abook->localbackendname);
 
    printf(_("Add to %s"), $abook->localbackendname);
 
    print "<STRONG>\n</TD></TR>\n";
 
    print "<STRONG>\n</TD></TR>\n";
 
    print "</TABLE>\n";
 
    print "</TABLE>\n";
 
-   address_form("addaddr", _("Add address"), $defdata);
 
-   print "</FORM>";
 
+   address_form('addaddr', _("Add address"), $defdata);
 
+   print '</FORM>';
 
 
 
    // Add hook for anything that wants on the bottom
 
    // Add hook for anything that wants on the bottom
 
    do_hook("addressbook_bottom");
 
    do_hook("addressbook_bottom");

+ 22 - 23
src/webmail.php
Ver fichero 

@@ -16,41 +16,40 @@
 
    session_start();
 
    session_start();
 
 
 
    if (!isset($i18n_php))
 
    if (!isset($i18n_php))
 
-      include ("../functions/i18n.php");
 
+      include ('../functions/i18n.php');
 
 
 
    if(!isset($username)) {
 
    if(!isset($username)) {
 
       set_up_language($squirrelmail_language);
 
       set_up_language($squirrelmail_language);
 
-	  include ("../themes/default_theme.php");
 
-	  include ("../functions/display_messages.php");
 
+	  include ('../themes/default_theme.php');
 
+	  include ('../functions/display_messages.php');
 
 	  printf('<html><BODY TEXT="%s" BGCOLOR="%s" LINK="%s" VLINK="%s" ALINK="%s">',
 
 	  printf('<html><BODY TEXT="%s" BGCOLOR="%s" LINK="%s" VLINK="%s" ALINK="%s">',
 
 			  $color[8], $color[4], $color[7], $color[7], $color[7]);
 
 			  $color[8], $color[4], $color[7], $color[7], $color[7]);
 
 	  plain_error_message(_("You need a valid user and password to access this page!") 
 	  plain_error_message(_("You need a valid user and password to access this page!") 
 	                      . "<br><a href=\"../src/login.php\">" 
 	                      . "<br><a href=\"../src/login.php\">" 
 						  . _("Click here to log back in.") . "</a>.", $color);
 
 						  . _("Click here to log back in.") . "</a>.", $color);
 
-	  echo "</body></html>";
 
+	  echo '</body></html>';
 
       exit;
 
       exit;
 
    }
 
    }
 
 
 
    if (!isset($strings_php))
 
    if (!isset($strings_php))
 
-      include ("../functions/strings.php");
 
-   include ("../config/config.php");
 
-   include ("../functions/prefs.php");
 
-   include ("../functions/imap.php");
 
+      include ('../functions/strings.php');
 
+   include ('../config/config.php');
 
+   include ('../functions/prefs.php');
 
+   include ('../functions/imap.php');
 
    if (!isset($plugin_php))
 
    if (!isset($plugin_php))
 
-      include ("../functions/plugin.php");
 
+      include ('../functions/plugin.php');
 
    if (!isset($auth_php))
 
    if (!isset($auth_php))
 
-      include ("../functions/auth.php");
 
+      include ('../functions/auth.php');
 
 
 
-
 
-   include ("../src/load_prefs.php");
 
+   include ('../src/load_prefs.php');
 
 
 
    // We'll need this to later have a noframes version
 
    // We'll need this to later have a noframes version
 
-   set_up_language(getPref($data_dir, $username, "language"));
 
+   set_up_language(getPref($data_dir, $username, 'language'));
 
 
 
    echo "<html><head>\n";
 
    echo "<html><head>\n";
 
-   echo "<TITLE>";
 
-   echo "$org_title";
 
-   echo "</TITLE>";
 
+   echo '<TITLE>';
 
+   echo $org_title;
 
+   echo '</TITLE>';
 
    
    
    $bar_size = $left_size;
 
    $bar_size = $left_size;
 
    
    
@@ -73,13 +72,13 @@
 
     This was done to create a pure HTML way of refreshing the folder list since
 
     This was done to create a pure HTML way of refreshing the folder list since
 
     we would like to use as little Javascript as possible.
 
     we would like to use as little Javascript as possible.
 
 **/
 
 **/
 
-   if ($right_frame == "right_main.php") {
 
+   if ($right_frame == 'right_main.php') {
 
       $urlMailbox = urlencode($mailbox);
 
       $urlMailbox = urlencode($mailbox);
 
       $right_frame_url = "right_main.php?mailbox=$urlMailbox&sort=$sort&startMessage=$startMessage";
 
       $right_frame_url = "right_main.php?mailbox=$urlMailbox&sort=$sort&startMessage=$startMessage";
 
-   } else if ($right_frame == "options.php") {
 
-      $right_frame_url = "options.php";
 
-   } else if ($right_frame == "folders.php") {
 
-      $right_frame_url = "folders.php";
 
+   } else if ($right_frame == 'options.php') {
 
+      $right_frame_url = 'options.php';
 
+   } else if ($right_frame == 'folders.php') {
 
+      $right_frame_url = 'folders.php';
 
    } else {
 
    } else {
 
       if (!isset($just_logged_in)) $just_logged_in = 0;
 
       if (!isset($just_logged_in)) $just_logged_in = 0;
 
       $right_frame_url = "right_main.php?just_logged_in=$just_logged_in";
 
       $right_frame_url = "right_main.php?just_logged_in=$just_logged_in";
 
@@ -88,11 +87,11 @@
 
    if ($location_of_bar == 'right')
 
    if ($location_of_bar == 'right')
 
    {
 
    {
 
       echo "<FRAME SRC=\"$right_frame_url\" NAME=\"right\">";
 
       echo "<FRAME SRC=\"$right_frame_url\" NAME=\"right\">";
 
-      echo "<FRAME SRC=\"left_main.php\" NAME=\"left\">";
 
+      echo '<FRAME SRC="left_main.php" NAME="left">';
 
    }
 
    }
 
    else
 
    else
 
    {
 
    {
 
-      echo "<FRAME SRC=\"left_main.php\" NAME=\"left\">";
 
+      echo '<FRAME SRC="left_main.php" NAME="left">';
 
       echo "<FRAME SRC=\"$right_frame_url\" NAME=\"right\">";
 
       echo "<FRAME SRC=\"$right_frame_url\" NAME=\"right\">";
 
    }
 
    }

Contact | Legal | Takedown | Status
Self-hosted public services - About
NibbleSpot by 0ct0pu5