SF.net SVN: postfixadmin: [164] trunk
Brought to you by:
christian_boltz,
gingerdog
Menu
▾
▴
SF.net SVN: postfixadmin: [164] trunk
|
From: <chr...@us...> - 2007-10-25 23:12:50
|
Revision: 164
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=164&view=rev
Author: christian_boltz
Date: 2007-10-25 16:12:51 -0700 (Thu, 25 Oct 2007)
Log Message:
-----------
- replaced tabs with spaces in fetchmail.php and fetchmail.tpl
- whitespace changes only, no other difference
Modified Paths:
--------------
trunk/fetchmail.php
trunk/templates/fetchmail.tpl
Modified: trunk/fetchmail.php
===================================================================
--- trunk/fetchmail.php 2007-10-25 22:59:52 UTC (rev 163)
+++ trunk/fetchmail.php 2007-10-25 23:12:51 UTC (rev 164)
@@ -73,38 +73,39 @@
$display_status = 1;
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?
# second column: display field?
- "id" =>array(0,0,'id', 'ID','Record ID'),
- "mailbox" =>array(1,1,'enum', 'Mailbox','Local mailbox'),
- "src_server" =>array(1,1,'text', 'Server','Remote Server'),
- "src_auth" =>array(1,1,'enum', 'Auth Type','Mostly password'),
- "src_user" =>array(1,1,'text', 'User','Remote User'),
- "src_password" =>array(1,0,'password', 'Password','Remote Password'),
- "src_folder" =>array(1,1,'text', 'Folder','Remote Folder'),
- "poll_time" =>array(1,1,'num', 'Poll','Poll Time (min)'),
- "fetchall" =>array(1,1,'bool', 'Fetch All','Retrieve both old (seen) and new messages'),
- "keep" =>array(1,1,'bool', 'Keep','Keep retrieved messages on the remote mailserver'),
- "protocol" =>array(1,1,'enum', 'Protocol','Protocol to use'),
- "extra_options" =>array($extra_options,$extra_options,'longtext', 'Extra Options','Extra fetchmail Options'),
- "mda" =>array($extra_options,$extra_options,'longtext', 'MDA','Mail Delivery Agent'),
- "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'),
+ # the others: type title help text (in edit form)
+ "id" => array(0,0,'id', 'ID', 'Record ID'),
+ "mailbox" => array(1,1,'enum', 'Mailbox', 'Local mailbox'),
+ "src_server" => array(1,1,'text', 'Server', 'Remote Server'),
+ "src_auth" => array(1,1,'enum', 'Auth Type','Mostly password'),
+ "src_user" => array(1,1,'text', 'User', 'Remote User'),
+ "src_password" => array(1,0,'password', 'Password', 'Remote Password'),
+ "src_folder" => array(1,1,'text', 'Folder', 'Remote Folder'),
+ "poll_time" => array(1,1,'num', 'Poll', 'Poll Time (min)'),
+ "fetchall" => array(1,1,'bool', 'Fetch All','Retrieve both old (seen) and new messages'),
+ "keep" => array(1,1,'bool', 'Keep', 'Keep retrieved messages on the remote mailserver'),
+ "protocol" => array(1,1,'enum', 'Protocol', 'Protocol to use'),
+ "extra_options" => array($extra_options,$extra_options,'longtext', 'Extra Options','Extra fetchmail Options'),
+ "mda" => array($extra_options,$extra_options,'longtext', 'MDA', 'Mail Delivery Agent'),
+ "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();
if (!$SESSID_USERNAME )
- exit;
+ exit;
$fm_defaults=array(
- "id" =>0,
- "mailbox" => array($SESSID_USERNAME),
+ "id" =>0,
+ "mailbox" => array($SESSID_USERNAME),
"poll_time" => 10,
- "src_auth" =>
- array('password','kerberos_v5','kerberos','kerberos_v4','gssapi','cram-md5','otp','ntlm','msn','ssh','any'),
- "protocol" =>
- array('POP3','IMAP','POP2','ETRN','AUTO'),
+ "src_auth" =>
+ array('password','kerberos_v5','kerberos','kerberos_v4','gssapi','cram-md5','otp','ntlm','msn','ssh','any'),
+ "protocol" =>
+ array('POP3','IMAP','POP2','ETRN','AUTO'),
);
@@ -115,14 +116,14 @@
$res = db_query ($sql);
if ($res['rows'] > 0){
- $fm_defaults["mailbox"]=array();
- while ($name = db_array ($res['result'])){
- $fm_defaults["mailbox"][] = $name["username"];
- }
+ $fm_defaults["mailbox"]=array();
+ while ($name = db_array ($res['result'])){
+ $fm_defaults["mailbox"][] = $name["username"];
+ }
}
else{
- $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"]=array();
+ $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;
@@ -148,7 +149,7 @@
if ($cancel) {
- $edit=0;
+ $edit=0;
} elseif ($delete) {
$result = db_query ("delete from fetchmail WHERE id=".$delete);
if ($result['rows'] != 1)
@@ -160,16 +161,16 @@
$delete=0;
} elseif ( ($edit || $new) && $save) {
$formvars=array();
- foreach($fm_struct as $key=>$row){
- list($editible,$view,$type,$title,$comment)=$row;
- if ($editible != 0){
- $func="_inp_".$type;
- $val=safepost($key);
+ foreach($fm_struct as $key=>$row){
+ list($editible,$view,$type,$title,$comment)=$row;
+ if ($editible != 0){
+ $func="_inp_".$type;
+ $val=safepost($key);
if ($type!="password" || strlen($val) > 0) { # skip on empty (aka unchanged) password
$formvars[$key]= escape_string( function_exists($func) ?$func($val) :$val);
}
- }
- }
+ }
+ }
$formvars['id'] = $edit; # results in 0 on $new
if (!in_array($formvars['mailbox'], $fm_defaults['mailbox'])) {
@@ -234,21 +235,21 @@
}
function _inp_num($val){
- return (int)($val);
+ return (int)($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){
- return base64_encode($val);
+ return base64_encode($val);
}
- include ("./templates/header.tpl");
- include ("./templates/menu.tpl");
- include ("./templates/fetchmail.tpl");
- include ("./templates/footer.tpl");
+include ("./templates/header.tpl");
+include ("./templates/menu.tpl");
+include ("./templates/fetchmail.tpl");
+include ("./templates/footer.tpl");
/* vim: set expandtab softtabstop=3 tabstop=3 shiftwidth=3: */
?>
Modified: trunk/templates/fetchmail.tpl
===================================================================
--- trunk/templates/fetchmail.tpl 2007-10-25 22:59:52 UTC (rev 163)
+++ trunk/templates/fetchmail.tpl 2007-10-25 23:12:51 UTC (rev 164)
@@ -1,12 +1,12 @@
<?php
- $headers=array();
- foreach($fm_struct as $row){
- list($editible,$view,$type,$title,$comment)=$row;
- if ($view){
- $headers[]=$row;
- }
- }
+$headers=array();
+foreach($fm_struct as $row){
+ list($editible,$view,$type,$title,$comment)=$row;
+ if ($view){
+ $headers[]=$row;
+ }
+}
if ($edit || $new) { # edit mode
echo '<div id="edit_form">';
@@ -17,36 +17,36 @@
print '<div id="overview">';
print '<form name="overview" method="post">';
print "<table id=\"log_table\" border=0>\n";
- print " <tr>\n";
- print " <td colspan=\"".(sizeof($headers)+2)."\"><h3>".$PALANG['pFetchmail_welcome'].$user_domains."</h3></td>\n";
- print " </tr>\n";
- print " <tr class=\"header\">\n";
- foreach($headers as $row){
- list($editible,$view,$type,$title,$comment)=$row;
- print " <td>" . $title . "</td>\n";
- }
+ print " <tr>\n";
+ print " <td colspan=\"".(sizeof($headers)+2)."\"><h3>".$PALANG['pFetchmail_welcome'].$user_domains."</h3></td>\n";
+ print " </tr>\n";
+ print " <tr class=\"header\">\n";
+ foreach($headers as $row){
+ list($editible,$view,$type,$title,$comment)=$row;
+ print " <td>" . $title . "</td>\n";
+ }
print "<td> </td>";
print "<td> </td>";
- print " </tr>\n";
-
+ print " </tr>\n";
+
if (sizeof ($tFmail) > 0){
foreach($tFmail as $row){
- print " <tr class=\"hilightoff\" onMouseOver=\"className='hilighton';\" onMouseOut=\"className='hilightoff';\">\n";
- foreach($row as $key=>$val){
+ print " <tr class=\"hilightoff\" onMouseOver=\"className='hilighton';\" onMouseOut=\"className='hilightoff';\">\n";
+ 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];
- if ($view){
- $func="_listview_".$type;
- print " <td nowrap>" . (function_exists($func)?$func($val):$val) . "</td>\n";
- }
+ if ($view){
+ $func="_listview_".$type;
+ 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?delete=" . $row['id'] . "\"onclick=\"return confirm ('"
. $PALANG['confirm'] . $PALANG['pMenu_fetchmail'] . ": ". htmlentities($row['src_user']) . " @ "
. htmlentities($row['src_server']) . "')\">" . $PALANG['del'] . "</a></td>\n";
- print " </tr>\n";
+ print " </tr>\n";
}
}
print "</table>";
@@ -54,121 +54,121 @@
print "</form>\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
function fetchmail_edit_row($data=array()){
- global $fm_struct,$fm_defaults,$PALANG;
- $id=$data["id"];
- $_id=$data["id"]*100+1;
- $ret="<table>";
+ global $fm_struct,$fm_defaults,$PALANG;
+ $id=$data["id"];
+ $_id=$data["id"]*100+1;
+ $ret="<table>";
$ret .= '<tr><td colspan="3"><h3>' . $PALANG['pMenu_fetchmail'] . '</h3></td></tr>';
# TODO: $formvars possibly contains db-specific boolean values
# TODO: no problems with MySQL, to be tested with PgSQL
# TODO: undefined values may also occour
- foreach($fm_struct as $key=>$struct){
- list($editible,$view,$type,$title,$comment)=$struct;
- if ($editible){
- $ret.="<tr><td align=left valign=top><label for=${_id} style='width:20em;'>${title}: </label></td>";
- $ret.="<td align=left style='padding-left:.25em;padding-right:.25em;background-color:white;'>";
- $func="_edit_".$type;
- if (! function_exists($func))
- $func="_edit_text";
- $val=isset($data[$key])
- ?$data[$key]
- :(! is_array($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.="</td><td align=left valign=top><i> ${comment}</i></td></tr>\n";
- }
- elseif($view){
- $func="_view_".$type;
- $val=isset($data[$key])
- ?(function_exists($func)
- ?$func($data[$key])
- :nl2br($data[$key])
- )
- :"--x--";
- $ret.="<tr><td align=left valign=top>${title}: </label></td>";
- $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> ${comment}</i></td></tr>\n";
- }
- }
+ foreach($fm_struct as $key=>$struct){
+ list($editible,$view,$type,$title,$comment)=$struct;
+ if ($editible){
+ $ret.="<tr><td align=left valign=top><label for=${_id} style='width:20em;'>${title}: </label></td>";
+ $ret.="<td align=left style='padding-left:.25em;padding-right:.25em;background-color:white;'>";
+ $func="_edit_".$type;
+ if (! function_exists($func))
+ $func="_edit_text";
+ $val=isset($data[$key])
+ ?$data[$key]
+ :(! is_array($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.="</td><td align=left valign=top><i> ${comment}</i></td></tr>\n";
+ }
+ elseif($view){
+ $func="_view_".$type;
+ $val=isset($data[$key])
+ ?(function_exists($func)
+ ?$func($data[$key])
+ :nl2br($data[$key])
+ )
+ :"--x--";
+ $ret.="<tr><td align=left valign=top>${title}: </label></td>";
+ $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> ${comment}</i></td></tr>\n";
+ }
+ }
# 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>";
- if ($id){
- $ret.="<input type=hidden name=edit value='${id}'>";
- }
- $ret.="</td></tr>\n";
- $ret.="</table>\n";
+ $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){
+ $ret.="<input type=hidden name=edit value='${id}'>";
+ }
+ $ret.="</td></tr>\n";
+ $ret.="</table>\n";
$ret.="<p />\n";
$ret.="</form>\n";
$ret.="</div>\n";
- return $ret;
+ return $ret;
}
function _edit_text($id,$key,$def_vals,$val=""){
- $val=htmlspecialchars($val);
- return "<input type=text name=${key} id=${id} value='${val}'>";
+ $val=htmlspecialchars($val);
+ return "<input type=text name=${key} id=${id} value='${val}'>";
}
function _edit_password($id,$key,$def_vals,$val=""){
- $val=preg_replace("{.}","*",$val);
- return "<input type=password name=${key} id=${id} value='${val}'>";
+ $val=preg_replace("{.}","*",$val);
+ return "<input type=password name=${key} id=${id} value='${val}'>";
}
function _edit_num($id,$key,$def_vals,$val=""){
- $val=(int)($val);
- return "<input type=text name=${key} id=${id} value='${val}'>";
+ $val=(int)($val);
+ return "<input type=text name=${key} id=${id} value='${val}'>";
}
function _edit_bool($id,$key,$def_vals,$val=""){
- $ret="<input type=checkbox name=${key} id=${id}";
- if ($val)
- $ret.=" checked";
- $ret.=">";
- return $ret;
+ $ret="<input type=checkbox name=${key} id=${id}";
+ if ($val)
+ $ret.=" checked";
+ $ret.=">";
+ return $ret;
}
function _edit_longtext($id,$key,$def_vals,$val=""){
- $val=htmlspecialchars($val);
- return "<textarea name=${key} id=${id} rows=2 style='width:20em;'>${val}</textarea>";
+ $val=htmlspecialchars($val);
+ return "<textarea name=${key} id=${id} rows=2 style='width:20em;'>${val}</textarea>";
}
function _edit_enum($id,$key,$def_vals,$val=""){
- $ret="<select name=${key} id=${id}>";
- foreach($def_vals as $opt_val){
- $ret.="<option";
- if ($opt_val==$val)
- $ret.=" selected";
- $ret.=">${opt_val}</option>\n";
- }
- $ret.="</select>\n";
- return $ret;
+ $ret="<select name=${key} id=${id}>";
+ foreach($def_vals as $opt_val){
+ $ret.="<option";
+ if ($opt_val==$val)
+ $ret.=" selected";
+ $ret.=">${opt_val}</option>\n";
+ }
+ $ret.="</select>\n";
+ return $ret;
}
function _listview_id($val){
- return "<a href='?edit=${val}'> ${val} </a>";
+ return "<a href='?edit=${val}'> ${val} </a>";
}
function _listview_bool($val){
- return $val?"+":"";
+ return $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){
- return sizeof($val)?$val:"--x--";
+ return sizeof($val)?$val:"--x--";
}
function _listview_password($val){
- return preg_replace("{.}","*",$val);
+ return preg_replace("{.}","*",$val);
}
/* vim: set ft=php expandtab softtabstop=3 tabstop=3 shiftwidth=3: */
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
