SF.net SVN: postfixadmin:[1765] trunk
Brought to you by:
christian_boltz,
gingerdog
Menu
▾
▴
SF.net SVN: postfixadmin:[1765] trunk
|
From: <chr...@us...> - 2015-04-04 14:23:54
|
Revision: 1765
http://sourceforge.net/p/postfixadmin/code/1765
Author: christian_boltz
Date: 2015-04-04 14:23:46 +0000 (Sat, 04 Apr 2015)
Log Message:
-----------
delete fetchmail.php and templates/fetchmail.tpl
(replaced by FetchmailHandler)
Removed Paths:
-------------
trunk/fetchmail.php
trunk/templates/fetchmail.tpl
Deleted: trunk/fetchmail.php
===================================================================
--- trunk/fetchmail.php 2015-04-04 14:22:28 UTC (rev 1764)
+++ trunk/fetchmail.php 2015-04-04 14:23:46 UTC (rev 1765)
@@ -1,409 +0,0 @@
-<?php
-/**
- * Postfix Admin
- *
- * LICENSE
- * This source file is subject to the GPL license that is bundled with
- * this package in the file LICENSE.TXT.
- *
- * Further details on the project are available at http://postfixadmin.sf.net
- *
- * @version $Id$
- * @license GNU GPL v2 or later.
- *
- * File: fetchmail.php
- * Responsible for setting up fetchmail
- * template : fetchmail.tpl
- *
- * @version $Id$
- * @license GNU GPL v2 or later.
- *
- * Template Variables:
- *
- * Form POST \ GET Variables:
- *
- * GET:
- * - edit
- * - delete
- * - new
- *
- * POST:
- * - save
- * - cancel
- * - all editable form values, see $fm_struct
- */
-
-require_once('common.php');
-
-authentication_require_role('admin');
-
-# workaround for https://sourceforge.net/p/postfixadmin/bugs/322/
-# TODO: convert fetchmail.php to FetchmailHandler
-$old_error_reporting = error_reporting();
-error_reporting($old_error_reporting ^ E_NOTICE);
-
-$extra_options = 0;
-if ($CONF['fetchmail_extra_options'] == 'YES') $extra_options = 1;
-
-# import control GET/POST variables. Form values are imported below.
-$new = (int) safeget ("new") == 1 ? 1:0;
-$edit = (int) safeget ("edit");
-$delete = (int) safeget ("delete");
-$save = safepost("save") != "" ? 1:0;
-$cancel = safepost("cancel") != "" ? 1:0;
-
-$display_status = 1;
-if ($new || $edit) $display_status = 0;
-
-$fm_struct=array( // list($editible,$view,$type)
- # field name allow editing? display field? type
- "id" => array(0, 0, 'id' ),
- "mailbox" => array(1, 1, 'enum' ),
- "src_server" => array(1, 1, 'text' ),
- "src_auth" => array(1, 1, 'enum' ),
- "src_user" => array(1, 1, 'text' ),
- "src_password" => array(1, 0, 'password' ),
- "src_folder" => array(1, 1, 'text' ),
- "poll_time" => array(1, 1, 'num' ),
- "fetchall" => array(1, 1, 'bool' ),
- "keep" => array(1, 1, 'bool' ),
- "protocol" => array(1, 1, 'enum' ),
- "usessl" => array(1, 1, 'bool' ),
- "sslcertck" => array(1, 1, 'bool' ),
- "sslcertpath" => array($extra_options, $extra_options, 'text' ), # TODO: input validation
- "sslfingerprint" => array($extra_options, $extra_options, 'text' ), # TODO: input validation
- "extra_options" => array($extra_options, $extra_options, 'longtext' ),
- "mda" => array($extra_options, $extra_options, 'longtext' ),
- "date" => array(0, $display_status, 'text' ),
- "returned_text" => array(0, $display_status, 'longtext' ),
-);
-# labels and descriptions are taken from $PALANG['pFetchmail_field_xxx'] and $PALANG['pFetchmail_desc_xxx']
-
-# TODO: After pressing save or cancel in edit form, date and returned text are not displayed in list view.
-# TODO: Reason: $display_status is set before $new and $edit are reset to 0.
-# TODO: Fix: split the "display field?" column into "display in list" and "display in edit mode".
-
-$SESSID_USERNAME = authentication_get_username();
-if (!$SESSID_USERNAME )
- exit;
-
-$fm_defaults=array(
- "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'),
-);
-
-$table_fetchmail = table_by_key('fetchmail');
-$table_mailbox = table_by_key('mailbox');
-
-if (authentication_has_role('global-admin')) {
- $list_domains = list_domains ();
-} else {
- $list_domains = list_domains_for_admin(authentication_get_username());
-}
-
-$user_domains=implode(", ",array_values($list_domains)); # for displaying
-$user_domains_sql=implode("','",escape_string(array_values($list_domains))); # for SQL
-$sql="SELECT username FROM $table_mailbox WHERE domain in ('".$user_domains_sql."')"; # TODO: replace with domain selection dropdown
-
-$res = db_query ($sql);
-if ($res['rows'] > 0){
- $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!"?
-}
-
-$row_id = 0;
-if ($delete) {
- $row_id = $delete;
-} elseif ($edit) {
- $row_id = $edit;
-}
-
-$user_mailboxes_sql= "'" . implode("','",escape_string(array_values($fm_defaults["mailbox"]))) . "'"; # mailboxes as SQL
-if ($row_id) {
- $result = db_query ("SELECT ".implode(",",escape_string(array_keys($fm_struct)))." FROM $table_fetchmail WHERE id=$row_id AND mailbox IN ($user_mailboxes_sql)");
- # TODO: the "AND mailbox IN ..." part should obsolete the check_owner call. Remove it after checking again.
- if ($result['rows'] > 0) {
- $edit_row = db_array ($result['result']);
- $account = $edit_row['src_user'] . " @ " . $edit_row['src_server'];
- }
-
- $edit_row_domain = explode('@', $edit_row['mailbox']);
- if ($result['rows'] <= 0 || !check_owner($SESSID_USERNAME, $edit_row_domain[1])) { # owner check for $edit and $delete
- flash_error(sprintf($PALANG['pFetchmail_error_invalid_id'], $row_id));
- $edit = 0; $delete = 0;
- }
-}
-
-
-if ($cancel) { # cancel $new or $edit
- $edit=0;
- $new=0;
-} elseif ($delete) { # delete an entry
- $result = db_query ("delete from $table_fetchmail WHERE id=".$delete);
- if ($result['rows'] != 1)
- {
- flash_error($PALANG['pDelete_delete_error']);
- } else {
- flash_info(sprintf($PALANG['pDelete_delete_success'],$account));
- }
- $delete=0;
-} elseif ( ($edit || $new) && $save) { # $edit or $new AND save button pressed
- $formvars=array();
- foreach($fm_struct as $key=>$row){
- list($editible,$view,$type)=$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(db_pgsql() && $new) {
- // skip - shouldn't need to specify this as it will default to the next available value anyway.
- unset($formvars['id']);
- }
-
- if (!in_array($formvars['mailbox'], $fm_defaults['mailbox'])) {
- flash_error($PALANG['pFetchmail_invalid_mailbox']);
- $save = 0;
- }
- if ($formvars['src_server'] == '') {
- flash_error($PALANG['pFetchmail_server_missing']);
- # TODO: validate domain name
- $save = 0;
- }
- if (empty($formvars['src_user']) ) {
- flash_error($PALANG['pFetchmail_user_missing']);
- $save = 0;
- }
- if ($new && empty($formvars['src_password']) ) {
- flash_error($PALANG['pFetchmail_password_missing']);
- $save = 0;
- }
-
- if ($save) {
- if ($new) {
- $sql="INSERT INTO $table_fetchmail (".implode(",",escape_string(array_keys($formvars))).") VALUES ('".implode("','",escape_string($formvars))."')";
- } else { # $edit
- foreach(array_keys($formvars) as $key) {
- $formvars[$key] = escape_string($key) . "='" . escape_string($formvars[$key]) . "'";
- }
- $sql="UPDATE $table_fetchmail SET ".implode(",",$formvars).",returned_text='', date=NOW() WHERE id=".$edit;
- }
- $result = db_query ($sql);
- if ($result['rows'] != 1)
- {
- flash_error($PALANG['pFetchmail_database_save_error']);
- } else {
- flash_info($PALANG['pFetchmail_database_save_success']);
- $edit = 0; $new = 0; # display list after saving
- }
- } else {
- $formvars['src_password'] = ''; # never display password
- }
-
-} elseif ($edit) { # edit entry form
- $formvars = $edit_row;
- $formvars['src_password'] = '';
- if (db_pgsql()) {
- $formvars['fetchall']=('t'==$formvars['fetchall']) ? 1 : 0;
- $formvars['keep']=('t'==$formvars['keep']) ? 1 : 0;
- $formvars['usessl']=('t'==$formvars['usessl']) ? 1 : 0;
- $formvars['sslcertck']=('t'==$formvars['sslcertck']) ? 1: 0;
- }
-} elseif ($new) { # create entry form
- foreach (array_keys($fm_struct) as $value) {
- if (isset($fm_defaults[$value])) {
- $formvars[$value] = $fm_defaults[$value];
- } else {
- $formvars[$value] = '';
- }
- }
-}
-
-$tFmail = array();
-if ($edit + $new == 0) { # display list
- # TODO: ORDER BY would even be better if it would order by the _domain_ of the target mailbox first
- $res = db_query ("SELECT ".implode(",",escape_string(array_keys($fm_struct)))." FROM $table_fetchmail WHERE mailbox IN ($user_mailboxes_sql) ORDER BY mailbox,src_server,src_user");
- if ($res['rows'] > 0) {
- while ($row = db_array ($res['result'])) {
- if (db_pgsql()) {
- //. at least in my database, $row['modified'] already looks like : 2009-04-11 21:38:10.75586+01,
- // while gmstrftime expects an integer value. strtotime seems happy though.
- //$row['date']=gmstrftime('%c %Z',$row['date']);
- $row['date'] = date('Y-m-d H:i:s', strtotime($row['date']));
- $row['fetchall']=('t'==$row['fetchall']) ? 1 : 0;
- $row['keep']=('t'==$row['keep']) ? 1 : 0;
- $row['usessl']=('t'==$row['usessl']) ? 1 : 0;
- $row['sslcertck']=('t'==$row['sslcertck']) ? 1: 0;
- }
- $tFmail[] = $row;
- }
- }
-}
-
-function _inp_num($val){
- return (int)($val);
-}
-
-function _inp_bool($val){
- return $val ? db_get_boolean(true): db_get_boolean(false);
-}
-
-function _inp_password($val){
- return base64_encode($val);
-}
-//*****
-$headers=array();
-foreach(array_keys($fm_struct) as $row){
- list($editible,$view,$type)=$fm_struct[$row];
- $title = $PALANG['pFetchmail_field_' . $row];
- $comment = $PALANG['pFetchmail_desc_' . $row];
- if ($view){
- $headers[]=$title;
-// $headers[]=array($editible, $view, $type, $title, $comment);
- }
-}
-function fetchmail_edit_row($data=array())
-{
- global $fm_struct,$fm_defaults,$PALANG;
- $id = $data["id"];
- $_id = $data["id"] * 100 + 1;
- $ret = "<table>";
- $ret .= '<tr><th colspan="3">'.$PALANG['pMenu_fetchmail'] . '</th></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)=$struct;
- $title = $PALANG['pFetchmail_field_' . $key];
- $comment = $PALANG['pFetchmail_desc_' . $key];
- if ($editible){
- $ret.="<tr><td class=\"label\"><label for='${_id}'>${title}:</label></td>";
- $ret.="<td>";
- $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><em>${comment}</em></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 class=\"label\">${title}:</label></td>";
- $ret.="<td >".$val;
- $ret.="</td><td><em>${comment}</em></td></tr>\n";
- }
- }
- $ret.="<tr><td> </td><td colspan=2>
- <input type=submit class=\"button\" name=save value='" . $PALANG['save'] . "' />
- <input type=submit class=\"button\" name=cancel value='" . $PALANG['cancel'] . "' />
- ";
- if ($id){
- $ret.="<input type=hidden name=edit value='${id}'>";
- }
- $ret.="</td></tr>\n";
- $ret.="</table>\n";
- $ret.="<br />\n";
- $ret.="</form>\n";
- $ret.="</div>\n";
- return $ret;
-}
-function _edit_text($id,$key,$def_vals,$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}' />";
-}
-
-function _edit_num($id,$key,$def_vals,$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="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>";
-}
-
-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;
-}
-
-function _listview_id($val){
- return "<a href='?edit=${val}'> ${val} </a>";
-}
-
-function _listview_bool($val){
- return $val?"+":"";
-}
-
-function _listview_longtext($val){
- return strlen($val)?"Text - ".strlen($val)." chars":"--x--";
-}
-
-function _listview_text($val){
- return sizeof($val)?$val:"--x--";
-}
-
-function _listview_password($val){
- return preg_replace("{.}","*",$val);
-}
-
-$smarty->assign ('edit', $edit);
-$smarty->assign ('new', $new);
-$smarty->assign ('fetchmail_edit_row', fetchmail_edit_row($formvars),false);
-$smarty->assign ('headers', $headers);
-$smarty->assign ('user_domains', $user_domains);
-$smarty->assign ('tFmail', $tFmail);
-$smarty->assign ('extra_options', $extra_options);
-
-$smarty->assign ('smarty_template', 'fetchmail');
-$smarty->display ('index.tpl');
-
-/* vim: set expandtab softtabstop=3 tabstop=3 shiftwidth=3: */
-?>
Deleted: trunk/templates/fetchmail.tpl
===================================================================
--- trunk/templates/fetchmail.tpl 2015-04-04 14:22:28 UTC (rev 1764)
+++ trunk/templates/fetchmail.tpl 2015-04-04 14:23:46 UTC (rev 1765)
@@ -1,51 +0,0 @@
-{if $edit || $new}
- <div id="edit_form">
- <form name="fetchmail" method="post" action="">
- {$fetchmail_edit_row}
-{else}
- {assign var="colspan" value=$headers|@count}
- <div id="overview">
- <form name="frmOverview" method="post" action="">
- <table id="log_table" border="0">
- <tr>
- <th colspan="{$colspan+2}">{$PALANG.pFetchmail_welcome}{$user_domains}</th>
- </tr>
- {#tr_header#}
- {foreach from=$headers item=header}
- <td>{$header}</td>
- {/foreach}
- <td colspan="2"> </td>
- </tr>
- {if $tFmail}
- {foreach from=$tFmail item=row}
- {#tr_hilightoff#}
- <td nowrap="nowrap">{$row.mailbox} </td>
- <td nowrap="nowrap">{$row.src_server} </td>
- <td nowrap="nowrap">{$row.src_auth} </td>
- <td nowrap="nowrap">{$row.src_user} </td>
- <td nowrap="nowrap">{$row.src_folder} </td>
- <td nowrap="nowrap">{$row.poll_time} </td>
- <td nowrap="nowrap">{$row.fetchall} </td>
- <td nowrap="nowrap">{$row.keep} </td>
- <td nowrap="nowrap">{$row.protocol} </td>
- <td nowrap="nowrap">{$row.usessl} </td>
- <td nowrap="nowrap">{$row.sslcertck} </td>
-{if $extra_options}
- <td nowrap="nowrap">{$row.sslcertpath} </td>
- <td nowrap="nowrap">{$row.sslfingerprint} </td>
- <td nowrap="nowrap">{$row.extra_options} </td>
- <td nowrap="nowrap">{$row.mda} </td>
-{/if}
- <td nowrap="nowrap">{$row.date} </td>
- <td nowrap="nowrap">{$row.returned_text}--x-- </td> <!-- Inhalt mit if auswerten! -->
- <td><a href="fetchmail.php?edit={$row.id|escape:"url"}">{$PALANG.edit}</a></td>
- <td><a href="fetchmail.php?delete={$row.id|escape:"url"}&token={$smarty.session.PFA_token|escape:"url"}"
- onclick="return confirm('{$PALANG.confirm}{$PALANG.pMenu_fetchmail}:{$row.src_user}@{$row.src_server}')">{$PALANG.del}</a></td>
- </tr>
- {/foreach}
- {/if}
- </table>
-</form>
-</div>
-<br /><a href='?new=1' class="button">{$PALANG.pFetchmail_new_entry}</a><br />
-{/if}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
