From 8fa1a46a2f41f6012a2833df5bc7442125ce8cc0 Mon Sep 17 00:00:00 2001 From: Christian Boltz Date: Thu, 25 Oct 2007 23:12:51 +0000 Subject: [PATCH] - replaced tabs with spaces in fetchmail.php and fetchmail.tpl - whitespace changes only, no other difference git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@164 a1433add-5e2c-0410-b055-b7f2511e0802 --- fetchmail.php | 89 ++++++++++--------- templates/fetchmail.tpl | 192 ++++++++++++++++++++-------------------- 2 files changed, 141 insertions(+), 140 deletions(-) diff --git a/fetchmail.php b/fetchmail.php index 552bcfe9..17a1ceb5 100644 --- a/fetchmail.php +++ b/fetchmail.php @@ -73,38 +73,39 @@ $cancel = safepost("cancel") != "" ? 1:0; $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 @@ $sql="SELECT username FROM mailbox WHERE domain in ('".$user_domains_sql."')"; # $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 ($row_id) { 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 @@ if ($cancel) { $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 @@ if ($edit + $new == 0) { # display list } 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: */ ?> diff --git a/templates/fetchmail.tpl b/templates/fetchmail.tpl index eb1b2d57..43b4073d 100644 --- a/templates/fetchmail.tpl +++ b/templates/fetchmail.tpl @@ -1,12 +1,12 @@ '; @@ -17,36 +17,36 @@ if ($edit || $new) { # edit mode print '
'; print '
'; print "\n"; - print " \n"; - print " \n"; - print " \n"; - print " \n"; - foreach($headers as $row){ - list($editible,$view,$type,$title,$comment)=$row; - print " \n"; - } + print " \n"; + print " \n"; + print " \n"; + print " \n"; + foreach($headers as $row){ + list($editible,$view,$type,$title,$comment)=$row; + print " \n"; + } print ""; print ""; - print " \n"; - + print " \n"; + if (sizeof ($tFmail) > 0){ foreach($tFmail as $row){ - print " \n"; - foreach($row as $key=>$val){ + print " \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 " \n"; - } + if ($view){ + $func="_listview_".$type; + print " \n"; + } - } + } print ""; print " \n"; - print " \n"; + print " \n"; } } print "

".$PALANG['pFetchmail_welcome'].$user_domains."

" . $title . "

".$PALANG['pFetchmail_welcome'].$user_domains."

" . $title . "  
" . (function_exists($func)?$func($val):$val) . "" . (function_exists($func)?$func($val):$val) . "" . $PALANG['edit'] . "" . $PALANG['del'] . "
"; @@ -54,121 +54,121 @@ if ($edit || $new) { # edit mode print "
\n"; print "
\n"; - print "

".$PALANG['pFetchmail_new_entry']."

\n"; + print "

".$PALANG['pFetchmail_new_entry']."

\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=""; + global $fm_struct,$fm_defaults,$PALANG; + $id=$data["id"]; + $_id=$data["id"]*100+1; + $ret="
"; $ret .= ''; # 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.=""; - $ret.="\n"; - } - elseif($view){ - $func="_view_".$type; - $val=isset($data[$key]) - ?(function_exists($func) - ?$func($data[$key]) - :nl2br($data[$key]) - ) - :"--x--"; - $ret.=""; - $ret.="\n"; - } - } + foreach($fm_struct as $key=>$struct){ + list($editible,$view,$type,$title,$comment)=$struct; + if ($editible){ + $ret.=""; + $ret.="\n"; + } + elseif($view){ + $func="_view_".$type; + $val=isset($data[$key]) + ?(function_exists($func) + ?$func($data[$key]) + :nl2br($data[$key]) + ) + :"--x--"; + $ret.=""; + $ret.="\n"; + } + } # TODO: pressing enter in the form "clicks" cancel button instead of submit button - $ret.="\n"; - $ret.="

' . $PALANG['pMenu_fetchmail'] . '

"; - $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.=" ${comment}
${title}: ".$val; - $ret.=" ${comment}
"; + $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.=" ${comment}
${title}: ".$val; + $ret.=" ${comment}
"; - if ($id){ - $ret.=""; - } - $ret.="
\n"; + $ret.=""; + if ($id){ + $ret.=""; + } + $ret.="\n"; + $ret.="\n"; $ret.="

\n"; $ret.="\n"; $ret.="\n"; - return $ret; + return $ret; } function _edit_text($id,$key,$def_vals,$val=""){ - $val=htmlspecialchars($val); - return ""; + $val=htmlspecialchars($val); + return ""; } function _edit_password($id,$key,$def_vals,$val=""){ - $val=preg_replace("{.}","*",$val); - return ""; + $val=preg_replace("{.}","*",$val); + return ""; } function _edit_num($id,$key,$def_vals,$val=""){ - $val=(int)($val); - return ""; + $val=(int)($val); + return ""; } function _edit_bool($id,$key,$def_vals,$val=""){ - $ret="${val}"; + $val=htmlspecialchars($val); + return ""; } function _edit_enum($id,$key,$def_vals,$val=""){ - $ret="