webapp/postfixadmin
1
0
Fork 0
mirror of https://github.com/postfixadmin/postfixadmin.git synced 2025-12-05 11:22:03 +03:00
Code Activity

- replaced tabs with spaces in fetchmail.php and fetchmail.tpl

Browse Source 
- whitespace changes only, no other difference


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@164 a1433add-5e2c-0410-b055-b7f2511e0802
This commit is contained in:
Christian Boltz
2007-10-25 23:12:51 +00:00
parent 2f25e8bd42
commit 8fa1a46a2f
2 changed files with 141 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files

89
fetchmail.php
View File

@@ -73,38 +73,39 @@ $cancel = safepost("cancel") != "" ? 1:0;
$display_status = 1; $display_status = 1;
if ($new || $edit) $display_status = 0; if ($new || $edit) $display_status = 0;
$fm_struct=array( // list($editible,$view,$type,$title,$comment) $fm_struct=array( // list($editible,$view,$type,$title,$comment)
# first column: allow editing? # first column: allow editing?
# second column: display field? # second column: display field?
"id" =>array(0,0,'id', 'ID','Record ID'), # the others: type title help text (in edit form)
"mailbox" =>array(1,1,'enum', 'Mailbox','Local mailbox'), "id" => array(0,0,'id', 'ID', 'Record ID'),
"src_server" =>array(1,1,'text', 'Server','Remote Server'), "mailbox" => array(1,1,'enum', 'Mailbox', 'Local mailbox'),
"src_auth" =>array(1,1,'enum', 'Auth Type','Mostly password'), "src_server" => array(1,1,'text', 'Server', 'Remote Server'),
"src_user" =>array(1,1,'text', 'User','Remote User'), "src_auth" => array(1,1,'enum', 'Auth Type','Mostly password'),
"src_password" =>array(1,0,'password', 'Password','Remote Password'), "src_user" => array(1,1,'text', 'User', 'Remote User'),
"src_folder" =>array(1,1,'text', 'Folder','Remote Folder'), "src_password" => array(1,0,'password', 'Password', 'Remote Password'),
"poll_time" =>array(1,1,'num', 'Poll','Poll Time (min)'), "src_folder" => array(1,1,'text', 'Folder', 'Remote Folder'),
"fetchall" =>array(1,1,'bool', 'Fetch All','Retrieve both old (seen) and new messages'), "poll_time" => array(1,1,'num', 'Poll', 'Poll Time (min)'),
"keep" =>array(1,1,'bool', 'Keep','Keep retrieved messages on the remote mailserver'), "fetchall" => array(1,1,'bool', 'Fetch All','Retrieve both old (seen) and new messages'),
"protocol" =>array(1,1,'enum', 'Protocol','Protocol to use'), "keep" => array(1,1,'bool', 'Keep', 'Keep retrieved messages on the remote mailserver'),
"extra_options" =>array($extra_options,$extra_options,'longtext', 'Extra Options','Extra fetchmail Options'), "protocol" => array(1,1,'enum', 'Protocol', 'Protocol to use'),
"mda" =>array($extra_options,$extra_options,'longtext', 'MDA','Mail Delivery Agent'), "extra_options" => array($extra_options,$extra_options,'longtext', 'Extra Options','Extra fetchmail Options'),
"date" => array(0,$display_status,'text', 'Date','Date of last polling/configuration change'), "mda" => array($extra_options,$extra_options,'longtext', 'MDA', 'Mail Delivery Agent'),
"returned_text" => array(0,$display_status,'longtext', 'Returned Text','Text message from last polling'), "date" => array(0,$display_status, 'text', 'Date', 'Date of last polling/configuration change'),
"returned_text" => array(0,$display_status, 'longtext', 'Returned Text','Text message from last polling'),
); );
$SESSID_USERNAME = authentication_get_username(); $SESSID_USERNAME = authentication_get_username();
if (!$SESSID_USERNAME ) if (!$SESSID_USERNAME )
exit; exit;
$fm_defaults=array( $fm_defaults=array(
"id" =>0, "id" =>0,
"mailbox" => array($SESSID_USERNAME), "mailbox" => array($SESSID_USERNAME),
"poll_time" => 10, "poll_time" => 10,
"src_auth" => "src_auth" =>
array('password','kerberos_v5','kerberos','kerberos_v4','gssapi','cram-md5','otp','ntlm','msn','ssh','any'), array('password','kerberos_v5','kerberos','kerberos_v4','gssapi','cram-md5','otp','ntlm','msn','ssh','any'),
"protocol" => "protocol" =>
array('POP3','IMAP','POP2','ETRN','AUTO'), array('POP3','IMAP','POP2','ETRN','AUTO'),
); );
@@ -115,14 +116,14 @@ $sql="SELECT username FROM mailbox WHERE domain in ('".$user_domains_sql."')"; #
$res = db_query ($sql); $res = db_query ($sql);
if ($res['rows'] > 0){ if ($res['rows'] > 0){
$fm_defaults["mailbox"]=array(); $fm_defaults["mailbox"]=array();
while ($name = db_array ($res['result'])){ while ($name = db_array ($res['result'])){
$fm_defaults["mailbox"][] = $name["username"]; $fm_defaults["mailbox"][] = $name["username"];
} }
} }
else{ else{
$fm_defaults["mailbox"]=array(); $fm_defaults["mailbox"]=array();
$fm_defaults["mailbox"][]=$SESSID_USERNAME; # TODO: Does this really make sense? Or should we display a message "please create a mailbox first!"? $fm_defaults["mailbox"][]=$SESSID_USERNAME; # TODO: Does this really make sense? Or should we display a message "please create a mailbox first!"?
} }
$row_id = 0; $row_id = 0;
@@ -148,7 +149,7 @@ if ($row_id) {
if ($cancel) { if ($cancel) {
$edit=0; $edit=0;
} elseif ($delete) { } elseif ($delete) {
$result = db_query ("delete from fetchmail WHERE id=".$delete); $result = db_query ("delete from fetchmail WHERE id=".$delete);
if ($result['rows'] != 1) if ($result['rows'] != 1)
@@ -160,16 +161,16 @@ if ($cancel) {
$delete=0; $delete=0;
} elseif ( ($edit || $new) && $save) { } elseif ( ($edit || $new) && $save) {
$formvars=array(); $formvars=array();
foreach($fm_struct as $key=>$row){ foreach($fm_struct as $key=>$row){
list($editible,$view,$type,$title,$comment)=$row; list($editible,$view,$type,$title,$comment)=$row;
if ($editible != 0){ if ($editible != 0){
$func="_inp_".$type; $func="_inp_".$type;
$val=safepost($key); $val=safepost($key);
if ($type!="password" || strlen($val) > 0) { # skip on empty (aka unchanged) password if ($type!="password" || strlen($val) > 0) { # skip on empty (aka unchanged) password
$formvars[$key]= escape_string( function_exists($func) ?$func($val) :$val); $formvars[$key]= escape_string( function_exists($func) ?$func($val) :$val);
} }
} }
} }
$formvars['id'] = $edit; # results in 0 on $new $formvars['id'] = $edit; # results in 0 on $new
if (!in_array($formvars['mailbox'], $fm_defaults['mailbox'])) { if (!in_array($formvars['mailbox'], $fm_defaults['mailbox'])) {
@@ -234,21 +235,21 @@ if ($edit + $new == 0) { # display list
} }
function _inp_num($val){ function _inp_num($val){
return (int)($val); return (int)($val);
} }
function _inp_bool($val){ function _inp_bool($val){
return $val?db_get_boolean(true):db_get_boolean(false); return $val?db_get_boolean(true):db_get_boolean(false);
} }
function _inp_password($val){ function _inp_password($val){
return base64_encode($val); return base64_encode($val);
} }
include ("./templates/header.tpl"); include ("./templates/header.tpl");
include ("./templates/menu.tpl"); include ("./templates/menu.tpl");
include ("./templates/fetchmail.tpl"); include ("./templates/fetchmail.tpl");
include ("./templates/footer.tpl"); include ("./templates/footer.tpl");
/* vim: set expandtab softtabstop=3 tabstop=3 shiftwidth=3: */ /* vim: set expandtab softtabstop=3 tabstop=3 shiftwidth=3: */
?> ?>

192
templates/fetchmail.tpl
View File

@@ -1,12 +1,12 @@
<?php <?php
$headers=array(); $headers=array();
foreach($fm_struct as $row){ foreach($fm_struct as $row){
list($editible,$view,$type,$title,$comment)=$row; list($editible,$view,$type,$title,$comment)=$row;
if ($view){ if ($view){
$headers[]=$row; $headers[]=$row;
} }
} }
if ($edit || $new) { # edit mode if ($edit || $new) { # edit mode
echo '<div id="edit_form">'; echo '<div id="edit_form">';
@@ -17,36 +17,36 @@ if ($edit || $new) { # edit mode
print '<div id="overview">'; print '<div id="overview">';
print '<form name="overview" method="post">'; print '<form name="overview" method="post">';
print "<table id=\"log_table\" border=0>\n"; print "<table id=\"log_table\" border=0>\n";
print " <tr>\n"; print " <tr>\n";
print " <td colspan=\"".(sizeof($headers)+2)."\"><h3>".$PALANG['pFetchmail_welcome'].$user_domains."</h3></td>\n"; print " <td colspan=\"".(sizeof($headers)+2)."\"><h3>".$PALANG['pFetchmail_welcome'].$user_domains."</h3></td>\n";
print " </tr>\n"; print " </tr>\n";
print " <tr class=\"header\">\n"; print " <tr class=\"header\">\n";
foreach($headers as $row){ foreach($headers as $row){
list($editible,$view,$type,$title,$comment)=$row; list($editible,$view,$type,$title,$comment)=$row;
print " <td>" . $title . "</td>\n"; print " <td>" . $title . "</td>\n";
} }
print "<td>&nbsp;</td>"; print "<td>&nbsp;</td>";
print "<td>&nbsp;</td>"; print "<td>&nbsp;</td>";
print " </tr>\n"; print " </tr>\n";
if (sizeof ($tFmail) > 0){ if (sizeof ($tFmail) > 0){
foreach($tFmail as $row){ foreach($tFmail as $row){
print " <tr class=\"hilightoff\" onMouseOver=\"className='hilighton';\" onMouseOut=\"className='hilightoff';\">\n"; print " <tr class=\"hilightoff\" onMouseOver=\"className='hilighton';\" onMouseOut=\"className='hilightoff';\">\n";
foreach($row as $key=>$val){ foreach($row as $key=>$val){
if (!isset($fm_struct[$key])) continue; # TODO: not really nice, but avoids undefined index warnings ;-) if (!isset($fm_struct[$key])) continue; # TODO: not really nice, but avoids undefined index warnings ;-)
list($editible,$view,$type,$title,$comment)=$fm_struct[$key]; list($editible,$view,$type,$title,$comment)=$fm_struct[$key];
if ($view){ if ($view){
$func="_listview_".$type; $func="_listview_".$type;
print " <td nowrap>" . (function_exists($func)?$func($val):$val) . "</td>\n"; print " <td nowrap>" . (function_exists($func)?$func($val):$val) . "</td>\n";
} }
} }
print "<td><a href=\"fetchmail.php?edit=" . $row['id'] . "\">" . $PALANG['edit'] . "</a></td>"; print "<td><a href=\"fetchmail.php?edit=" . $row['id'] . "\">" . $PALANG['edit'] . "</a></td>";
print " <td><a href=\"fetchmail.php?delete=" . $row['id'] . "\"onclick=\"return confirm ('" print " <td><a href=\"fetchmail.php?delete=" . $row['id'] . "\"onclick=\"return confirm ('"
. $PALANG['confirm'] . $PALANG['pMenu_fetchmail'] . ": ". htmlentities($row['src_user']) . " @ " . $PALANG['confirm'] . $PALANG['pMenu_fetchmail'] . ": ". htmlentities($row['src_user']) . " @ "
. htmlentities($row['src_server']) . "')\">" . $PALANG['del'] . "</a></td>\n"; . htmlentities($row['src_server']) . "')\">" . $PALANG['del'] . "</a></td>\n";
print " </tr>\n"; print " </tr>\n";
} }
} }
print "</table>"; print "</table>";
@@ -54,121 +54,121 @@ if ($edit || $new) { # edit mode
print "</form>\n"; print "</form>\n";
print "</div>\n"; print "</div>\n";
print "<p><a href='?new=1'>".$PALANG['pFetchmail_new_entry']."</a></p>\n"; print "<p><a href='?new=1'>".$PALANG['pFetchmail_new_entry']."</a></p>\n";
} # end display mode } # end display mode
function fetchmail_edit_row($data=array()){ function fetchmail_edit_row($data=array()){
global $fm_struct,$fm_defaults,$PALANG; global $fm_struct,$fm_defaults,$PALANG;
$id=$data["id"]; $id=$data["id"];
$_id=$data["id"]*100+1; $_id=$data["id"]*100+1;
$ret="<table>"; $ret="<table>";
$ret .= '<tr><td colspan="3"><h3>' . $PALANG['pMenu_fetchmail'] . '</h3></td></tr>'; $ret .= '<tr><td colspan="3"><h3>' . $PALANG['pMenu_fetchmail'] . '</h3></td></tr>';
# TODO: $formvars possibly contains db-specific boolean values # TODO: $formvars possibly contains db-specific boolean values
# TODO: no problems with MySQL, to be tested with PgSQL # TODO: no problems with MySQL, to be tested with PgSQL
# TODO: undefined values may also occour # TODO: undefined values may also occour
foreach($fm_struct as $key=>$struct){ foreach($fm_struct as $key=>$struct){
list($editible,$view,$type,$title,$comment)=$struct; list($editible,$view,$type,$title,$comment)=$struct;
if ($editible){ if ($editible){
$ret.="<tr><td align=left valign=top><label for=${_id} style='width:20em;'>${title}:&nbsp;</label></td>"; $ret.="<tr><td align=left valign=top><label for=${_id} style='width:20em;'>${title}:&nbsp;</label></td>";
$ret.="<td align=left style='padding-left:.25em;padding-right:.25em;background-color:white;'>"; $ret.="<td align=left style='padding-left:.25em;padding-right:.25em;background-color:white;'>";
$func="_edit_".$type; $func="_edit_".$type;
if (! function_exists($func)) if (! function_exists($func))
$func="_edit_text"; $func="_edit_text";
$val=isset($data[$key]) $val=isset($data[$key])
?$data[$key] ?$data[$key]
:(! is_array($fm_defaults[$key]) :(! is_array($fm_defaults[$key])
?$fm_defaults[$key] ?$fm_defaults[$key]
:'' :''
); );
$fm_defaults_key = ""; if (isset($fm_defaults[$key])) $fm_defaults_key = $fm_defaults[$key]; $fm_defaults_key = ""; if (isset($fm_defaults[$key])) $fm_defaults_key = $fm_defaults[$key];
$ret.=$func($_id++,$key,$fm_defaults_key,$val); $ret.=$func($_id++,$key,$fm_defaults_key,$val);
$ret.="</td><td align=left valign=top><i>&nbsp;${comment}</i></td></tr>\n"; $ret.="</td><td align=left valign=top><i>&nbsp;${comment}</i></td></tr>\n";
} }
elseif($view){ elseif($view){
$func="_view_".$type; $func="_view_".$type;
$val=isset($data[$key]) $val=isset($data[$key])
?(function_exists($func) ?(function_exists($func)
?$func($data[$key]) ?$func($data[$key])
:nl2br($data[$key]) :nl2br($data[$key])
) )
:"--x--"; :"--x--";
$ret.="<tr><td align=left valign=top>${title}:&nbsp;</label></td>"; $ret.="<tr><td align=left valign=top>${title}:&nbsp;</label></td>";
$ret.="<td align=left valign=top style='padding-left:.25em;padding-right:.25em;background-color:white;'>".$val; $ret.="<td align=left valign=top style='padding-left:.25em;padding-right:.25em;background-color:white;'>".$val;
$ret.="</td><td align=left valign=top><i>&nbsp;${comment}</i></td></tr>\n"; $ret.="</td><td align=left valign=top><i>&nbsp;${comment}</i></td></tr>\n";
} }
} }
# TODO: pressing enter in the form "clicks" cancel button instead of submit button # TODO: pressing enter in the form "clicks" cancel button instead of submit button
$ret.="<tr><td align=left><input type=submit name=cancel value='Abbrechen'></td><td align=right><input type=submit name=save value='Save'></td><td align=right>"; $ret.="<tr><td align=left><input type=submit name=cancel value='Abbrechen'></td><td align=right><input type=submit name=save value='Save'></td><td align=right>";
if ($id){ if ($id){
$ret.="<input type=hidden name=edit value='${id}'>"; $ret.="<input type=hidden name=edit value='${id}'>";
} }
$ret.="</td></tr>\n"; $ret.="</td></tr>\n";
$ret.="</table>\n"; $ret.="</table>\n";
$ret.="<p />\n"; $ret.="<p />\n";
$ret.="</form>\n"; $ret.="</form>\n";
$ret.="</div>\n"; $ret.="</div>\n";
return $ret; return $ret;
} }
function _edit_text($id,$key,$def_vals,$val=""){ function _edit_text($id,$key,$def_vals,$val=""){
$val=htmlspecialchars($val); $val=htmlspecialchars($val);
return "<input type=text name=${key} id=${id} value='${val}'>"; return "<input type=text name=${key} id=${id} value='${val}'>";
} }
function _edit_password($id,$key,$def_vals,$val=""){ function _edit_password($id,$key,$def_vals,$val=""){
$val=preg_replace("{.}","*",$val); $val=preg_replace("{.}","*",$val);
return "<input type=password name=${key} id=${id} value='${val}'>"; return "<input type=password name=${key} id=${id} value='${val}'>";
} }
function _edit_num($id,$key,$def_vals,$val=""){ function _edit_num($id,$key,$def_vals,$val=""){
$val=(int)($val); $val=(int)($val);
return "<input type=text name=${key} id=${id} value='${val}'>"; return "<input type=text name=${key} id=${id} value='${val}'>";
} }
function _edit_bool($id,$key,$def_vals,$val=""){ function _edit_bool($id,$key,$def_vals,$val=""){
$ret="<input type=checkbox name=${key} id=${id}"; $ret="<input type=checkbox name=${key} id=${id}";
if ($val) if ($val)
$ret.=" checked"; $ret.=" checked";
$ret.=">"; $ret.=">";
return $ret; return $ret;
} }
function _edit_longtext($id,$key,$def_vals,$val=""){ function _edit_longtext($id,$key,$def_vals,$val=""){
$val=htmlspecialchars($val); $val=htmlspecialchars($val);
return "<textarea name=${key} id=${id} rows=2 style='width:20em;'>${val}</textarea>"; return "<textarea name=${key} id=${id} rows=2 style='width:20em;'>${val}</textarea>";
} }
function _edit_enum($id,$key,$def_vals,$val=""){ function _edit_enum($id,$key,$def_vals,$val=""){
$ret="<select name=${key} id=${id}>"; $ret="<select name=${key} id=${id}>";
foreach($def_vals as $opt_val){ foreach($def_vals as $opt_val){
$ret.="<option"; $ret.="<option";
if ($opt_val==$val) if ($opt_val==$val)
$ret.=" selected"; $ret.=" selected";
$ret.=">${opt_val}</option>\n"; $ret.=">${opt_val}</option>\n";
} }
$ret.="</select>\n"; $ret.="</select>\n";
return $ret; return $ret;
} }
function _listview_id($val){ function _listview_id($val){
return "<a href='?edit=${val}'>&nbsp;${val}&nbsp;</a>"; return "<a href='?edit=${val}'>&nbsp;${val}&nbsp;</a>";
} }
function _listview_bool($val){ function _listview_bool($val){
return $val?"+":""; return $val?"+":"";
} }
function _listview_longtext($val){ function _listview_longtext($val){
return strlen($val)?"Text - ".strlen($val)." chars":"--x--"; return strlen($val)?"Text - ".strlen($val)." chars":"--x--";
} }
function _listview_text($val){ function _listview_text($val){
return sizeof($val)?$val:"--x--"; return sizeof($val)?$val:"--x--";
} }
function _listview_password($val){ function _listview_password($val){
return preg_replace("{.}","*",$val); return preg_replace("{.}","*",$val);
} }
/* vim: set ft=php expandtab softtabstop=3 tabstop=3 shiftwidth=3: */ /* vim: set ft=php expandtab softtabstop=3 tabstop=3 shiftwidth=3: */