Changeset 169

Timestamp:

09/01/07 18:21:29 (16 months ago)

Author:

jonas

Message:

vacation X-Header feature

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• includes/check_access.php (modified) (1 diff)
• includes/func.inc.php (modified) (1 diff)
• includes/sites/domain_view.php (modified) (1 diff)
• includes/sites/email_view.php (modified) (7 diffs)
• includes/sites/login.php (modified) (2 diffs)
• includes/sites/user_autores.php (modified) (2 diffs)
• sql_upgrades (modified) (1 diff)
• system_scripts/autoresponder.pl (modified) (3 diffs)
• templates/domain_add.tpl (modified) (1 diff)
• templates/domain_view.tpl (modified) (1 diff)
• templates/email_view.tpl (modified) (2 diffs)
• templates/error_messages.tpl (modified) (1 diff)
• templates/user_autores.tpl (modified) (2 diffs)
• templates/user_spam.tpl (modified) (1 diff)
• web/index.php (modified) (1 diff)

trunk/ChangeLog

@@ +1 @@
+CpVES 0.06 YYYY-MM-DD - Jonas Genannt - <jonas.genannt@brachium-system.net>
+        o Added: autoresponder.pl: special X-Header vacation disable
+        o Added: special X-Header vacation to email user/admin frontend
 CpVES 0.05 2007-08-31 - Jonas Genannt - <jonas.genannt@brachium-system.net>
         o Fixed: repaired listmailer.pl for access tinyint(1) column (T. Genannt)

trunk/includes/check_access.php

@@ -29 +29 @@
 if (isset($_SESSION['p_sa_learn']))    $smarty->assign('p_sa_learn', $_SESSION['p_sa_learn']);
 if (isset($_SESSION['p_fetchmail']))   $smarty->assign('p_fetchmail',$_SESSION['p_fetchmail']);
+if (isset($_SESSION['p_autores_xheader']))   $smarty->assign('p_autores_xheader',$_SESSION['p_autores_xheader']);
+
 
 $no_login=0;

trunk/includes/func.inc.php

@@ -180 +180 @@
                         $do="p_fetchmail";
                         break;
+                case 'autores_xheader':
+                        $do="p_autores_xheader";
+                        break;
                 default:
                         return false;

trunk/includes/sites/domain_view.php

@@ -207 +207 @@
         $smarty->assign('p_fetchmail', $data['p_fetchmail']);
         $smarty->assign('p_webinterface', $data['p_webinterface']);
+        $smarty->assign('p_autores_xheader', $data['p_autores_xheader']);
 
         $smarty->assign('max_emails', $data['max_email']);

trunk/includes/sites/email_view.php

@@ -46 +46 @@
         $smarty->assign('if_fetchmail', $data['p_fetchmail']);
         $smarty->assign('if_webinterface', $data['p_webinterface']);
+        $smarty->assign('if_autores_xheader', $data['p_autores_xheader']);
         $sql=sprintf("SELECT passwd,cpasswd,email FROM users WHERE id='%s'",
                 $db->escapeSimple($_GET['id']));
@@ -134 +135 @@
         }
         /* save spamassassin end */
-        
+
+        //xheader disable feature
+        if (isset($_GET['xheader']) && is_numeric($_GET['xheader']) && isset($_GET['do']) && $_GET['do']=='del') {
+                $sql=sprintf("DELETE FROM autoresponder_xheader WHERE email='%d' AND id='%d'",
+                        $db->escapeSimple($_GET['id']),
+                        $db->escapeSimple($_GET['xheader']));
+                $db->query($sql);
+        }
+        if (isset($_POST['xheader_submit'])) {
+                if (!empty($_POST['xheader_name']) && !empty($_POST['xheader_value'])) {
+                        $sql=sprintf("INSERT INTO autoresponder_xheader SET email='%d',xheader='%s',value='%s'",
+                                $db->escapeSimple($_GET['id']),
+                                $db->escapeSimple($_POST['xheader_name']),
+                                $db->escapeSimple($_POST['xheader_value']));
+                        $db->query($sql);
+                }
+                else {
+                        $smarty->assign('error_msg','y');
+                        $smarty->assign('if_xheader_empty', 'y');
+                }
+        }
+
         /* Save autoresponder begin */
         if (isset($_POST['autores_submit'])) {
@@ -462 +484 @@
                         else {
                                 $webinterface=0;
+                        }
+                        if (isset($_POST['autores_xheader']) && $_POST['autores_xheader'] == "enable" && check_domain_feature($_GET['did'], 'p_autores_xheader')) {
+                                $autores_xheader=1;
+                        }
+                        else {
+                                $autores_xheader=0;
                         }
                         if (isset($_POST['forwarding']) && $_POST['forwarding'] == "enable" ) {
@@ -500 +528 @@
                         if (!$error)
                         {
-                                $sql=sprintf("UPDATE users SET passwd='%s', full_name='%s',p_imap='%d', p_pop3='%d',p_webmail='%d',     cpasswd='%s', p_forwarding='%s',p_spamassassin='%s',p_mailarchive='%d',p_bogofilter='%d',p_spam_del='%d',p_sa_learn='%d',p_fetchmail='%d',p_webinterface='%d' WHERE id='%d' ",
+                                $sql=sprintf("UPDATE users SET passwd='%s', full_name='%s',p_imap='%d', p_pop3='%d',p_webmail='%d',     cpasswd='%s', p_forwarding='%s',p_spamassassin='%s',p_mailarchive='%d',p_bogofilter='%d',p_spam_del='%d',p_sa_learn='%d',p_fetchmail='%d',p_webinterface='%d',p_autores_xheader='%d' WHERE id='%d' ",
                                         $db->escapeSimple($cleartext),
                                         $db->escapeSimple($_POST['full_name']),
@@ -515 +543 @@
                                         $db->escapeSimple($fetchmail),
                                         $db->escapeSimple($webinterface),
+                                        $db->escapeSimple($autores_xheader),
                                         $db->escapeSimple($_GET['id'])) ;
                                 $result=&$db->query($sql);
@@ -543 +572 @@
         $smarty->assign('if_sa_learn_value', $edata['p_sa_learn']);
         $smarty->assign('if_fetchmail_value',$edata['p_fetchmail']);
+        $smarty->assign('if_autores_xheader_value',$edata['p_autores_xheader']);
         if ( !empty($edata['move_spam']) && $edata['move_spam']!=NULL) {
                 $smarty->assign('sa_move_spam',$edata['move_spam'] );
@@ -589 +619 @@
         $smarty->assign('threshold', $sa_threshold);
         
+        //output xheader feature
+        if ($edata['p_autores_xheader'] == 1) {
+        $sql=sprintf("SELECT * FROM autoresponder_xheader WHERE email='%d' ORDER BY xheader",
+                $db->escapeSimple($_GET['id']));
+        $result=&$db->query($sql);
+        $table_xheader=array();
+        while($data=$result->fetchrow(DB_FETCHMODE_ASSOC)) {
+                array_push($table_xheader,array(
+                        'id' => $data['id'],
+                        'xheader' => $data['xheader'],
+                        'value' => $data['value']));
+        }
+        $smarty->assign('table_xheader',$table_xheader);
+        }
 
 

trunk/includes/sites/login.php

@@ -30 +30 @@
 $_SESSION['p_sa_learn']='0';
 $_SESSION['p_fetchmail']='0';
+$_SESSION['p_autores_xheader']='0';
 
 if (isset($_POST['email']) && isset($_POST['password']) && isset($_POST['login']) )
@@ -77 +78 @@
                         $_SESSION['p_sa_learn']=check_du_fetaure($_SESSION['uid'],$daten['domainid'],'p_sa_learn');
                         $_SESSION['p_fetchmail']=check_du_fetaure($_SESSION['uid'],$daten['domainid'],'p_fetchmail');
+                        $_SESSION['p_autores_xheader']=check_du_fetaure($_SESSION['uid'],$daten['domainid'],'p_autores_xheader');
                         $_SESSION['forwarding']=$daten['p_forwarding'];
                         $_SESSION['p_mailfilter']=$data_domain['p_mailfilter'];

trunk/includes/sites/user_autores.php

@@ -74 +74 @@
 }
 
+//xheader disable feature
+if ($_SESSION['p_autores_xheader'] == 1) {
+        if (isset($_GET['xheader']) && is_numeric($_GET['xheader']) && isset($_GET['do']) && $_GET['do']=='del') {
+                $sql=sprintf("DELETE FROM autoresponder_xheader WHERE email='%d' AND id='%d'",
+                        $db->escapeSimple($_SESSION['uid']),
+                        $db->escapeSimple($_GET['xheader']));
+                $db->query($sql);
+        }
+        if (isset($_POST['xheader_submit'])) {
+                if (!empty($_POST['xheader_name']) && !empty($_POST['xheader_value'])) {
+                        $sql=sprintf("INSERT INTO autoresponder_xheader SET email='%d',xheader='%s',value='%s'",
+                                $db->escapeSimple($_SESSION['uid']),
+                                $db->escapeSimple($_POST['xheader_name']),
+                                $db->escapeSimple($_POST['xheader_value']));
+                        $db->query($sql);
+                }
+                else {
+                        $smarty->assign('error_msg','y');
+                        $smarty->assign('if_xheader_empty', 'y');
+                }
+        }
+}
+
 //save automatic autoresponder disable feaure
 if (isset($_POST['autores_datedisable_submit'])) {
@@ -157 +180 @@
 $autores_disable=get_autores_disable($_SESSION['uid']);
 
+//output xheader feature
+if ($_SESSION['p_autores_xheader'] == 1) {
+        $sql=sprintf("SELECT * FROM autoresponder_xheader WHERE email='%d' ORDER BY xheader",
+                $db->escapeSimple($_SESSION['uid']));
+        $result=&$db->query($sql);
+        $table_xheader=array();
+        while($data=$result->fetchrow(DB_FETCHMODE_ASSOC)) {
+                array_push($table_xheader,array(
+                        'id' => $data['id'],
+                        'xheader' => $data['xheader'],
+                        'value' => $data['value']));
+        }
+        $smarty->assign('table_xheader',$table_xheader);
+}
+
+
 $smarty->assign('autores_disable', $autores_disable);
 $smarty->assign('table_val_tos', $table_val_tos);

trunk/sql_upgrades

@@ -123 +123 @@
 Version 0.04 to 0.05
 ALTER TABLE `lists` modify column `access` TINYINT( 1 ) DEFAULT '1' NOT NULL;
+
+Version 0.05 to 0.06
+CREATE TABLE `autoresponder_xheader` (
+  `id` int(11) NOT NULL auto_increment,
+  `email` int(11) NOT NULL,
+  `xheader` varchar(255) NOT NULL,
+  `value` varchar(255) NOT NULL,
+  PRIMARY KEY  (`id`),
+  KEY `email` (`email`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+ALTER TABLE `domains` ADD `p_autores_xheader` TINYINT( 1 ) NOT NULL DEFAULT '0';
+ALTER TABLE `users` ADD `p_autores_xheader` TINYINT( 1 ) NOT NULL DEFAULT '0';
+

trunk/system_scripts/autoresponder.pl

@@ -100 +100 @@
 #Now check if autoresponder is enabled
 my $dbh = DBI->connect($dsn, $config{'db_username'}, $config{'db_password'});
+
+sub check_du_feature($$) {
+        my $uid = $_[0];
+        my $type = $_[1];
+        my $sql = sprintf("SELECT 1 FROM users AS a LEFT JOIN domains AS b ON b.id=a.domainid WHERE a.id=%s AND a.%s=1 AND a.%s=1",
+                $dbh->quote($uid),
+                $type,
+                $type);
+        my $access = $dbh->prepare($sql);
+        undef $sql;
+        $access->execute();
+        if ($access->rows == 1) {
+                $access->finish;
+                return 1;
+        }
+        $access->finish;
+        undef $access;
+        return 0;
+
+}
+
 my $sql=sprintf("SELECT email,times FROM autoresponder WHERE email=%s AND active='y'",
         $dbh->quote($ARGV[0]));
@@ -115 +136 @@
 my $autores_times = $row_autores->{'times'};
 $sth->finish();
+
+#xheader check:
+if (check_du_feature($ARGV[0], 'p_autores_xheader')== 1) {
+$sth = $dbh->prepare("SELECT id,xheader,value FROM autoresponder_xheader WHERE email=?");
+$sth->execute($ARGV[0]);
+my $xheader_row;
+while ($xheader_row=$sth->fetchrow_hashref) {
+        if ( $mail->header($xheader_row->{'xheader'}) eq  $xheader_row->{'value'}) {
+                #exits because of user defined xheader
+                $sth->finish();
+                $dbh->disconnect();
+                exit(0);
+        }
+}
+$sth->finish();
+}
 
 #Now check if allready send an autoresponder to the email address:
@@ -123 +160 @@
 undef($sql);
 $sth->execute;
-print "->> $autores_times  - ROws: ",$sth->rows, "\n";
+#print "->> $autores_times  - ROws: ",$sth->rows, "\n";
 if ($sth->rows < $autores_times || $autores_times eq "n")
 {

trunk/templates/domain_add.tpl

@@ -33 +33 @@
         <br />
         {/if} {if $points eq 'n' } 
-        <div style="color:red;">{t}no MX entry points to our server.<br>You will not receive mail for this domain!{/t}
+        <div style="color:red;">{t escape='off'}no MX entry points to our server.<br>You will not receive mail for this domain!{/t}
         </div>
         <br />

trunk/templates/domain_view.tpl

@@ -180 +180 @@
 </tr>
 <tr>
+ <td>{t}vacation X-Header disable feature:{/t}</td>
+ <td></td>
+ <td style="text-align:right;">
+ {if $p_autores_xheader == 0  }
+ <a href="?module=domain_view&#038;did={$did}&#038;fstate=1&#038;f=autores_xheader">
+ <img src="img/icons/button_cancel.png" style="border:0px;" title="{t}activate vacation X-Header feature.{/t}" /></a>
+ {else}
+ <a href="?module=domain_view&#038;did={$did}&#038;fstate=0&#038;f=autores_xheader">
+ <img src="img/icons/button_ok.png" style="border:0px;" title="{t}deactivate vacation X-Header feature.{/t}" /></a>
+ {/if}</td>
+</tr>
+<tr>
  <td>{t}fetchmail:{/t}</td>
  <td></td>

trunk/templates/email_view.tpl

@@ -59 +59 @@
      <option value="enable">{t}yes{/t}</option>
      {if $if_webinterface_value == 0 }
+     <option value="disable" selected="selected" >{t}no{/t}</option>
+     {else}
+     <option value="disable" >{t}no{/t}</option>
+     {/if}
+     </select></td>
+</tr>
+{/if}
+{if $if_autores_xheader == 1 }
+<tr>
+ <td>{t}vacation X-Header disable feature:{/t}</td>
+ <td><select name="autores_xheader">
+     <option value="enable">{t}yes{/t}</option>
+     {if $if_autores_xheader_value == 0 }
      <option value="disable" selected="selected" >{t}no{/t}</option>
      {else}
@@ -284 +297 @@
                 <td><input type="text" id="autores_valtos_add_data" name="val_tos_da" /><input type="submit" id="autores_valtos_add_submit" name="val_tos_add" value="{t}add{/t}" /></td>
         </tr>
+{if $if_autores_xheader_value == 1}
+        <tr style="height:25px;">
+                <td></td>
+        </tr>
+        <tr>
+                <td valign="top">{t}vacation X-Header disable feature:{/t}</td>
+        </tr>
+        <tr>
+                <td></td>
+                <td>
+                        <table border="0">
+                        <tr>
+                                <td style="font-weight:bold;padding-right:30px;">{t}X-Header{/t}</td>
+                                <td style="font-weight:bold;padding-right:20px;">{t}Value{/t}</td>
+                                <td></td>
+                        </tr>
+                        {foreach item=row from=$table_xheader}
+                                <td>{$row.xheader}</td>
+                                <td>{$row.value}</td>
+                                <td><a href="?module=email_view&#038;id={$id}&#038;did={$did}&#038;xheader={$row.id}&#038;do=del"><img src="img/icons/delete.png" style="border:0px;"/></a></td>
+                        {/foreach}
+                        </table>
+                </td>
+
+        </tr>
+        <tr style="height:25px;">
+                <td></td>
+        </tr>
+        <tr>
+                <td valign="top">{t}add new X-Header:{/t}</td>
+                <td></td>
+        </tr>
+        <tr>
+                <td></td>
+                <td>
+                        <form action="?module=email_view&#038;id={$id}&#038;did={$did}" method="post">
+                        <table border="0">
+                        <tr>
+                                <td style="padding-right:10px;">{t}X-Header:{/t}</td>
+                                <td><input type="text" name="xheader_name" /></td>
+                        </tr>
+                        <tr>
+                                <td style="padding-right:10px;">{t}Value:{/t}</td>
+                                <td><input type="text" name="xheader_value" /></td>
+                        </tr>
+                        </table>
+                        <input name="xheader_submit" type="submit" value="{t}save{/t}"/>
+                        </form>
+                </td>
+        </tr>
+{/if}
 </form>
 {if $autores_active eq 'n' }

trunk/templates/error_messages.tpl

@@ -83 +83 @@
 {t}Please check all input fields!{/t}
 Bitte alle Felder ausfüllen!
+{elseif $if_xheader_empty == 'y' }
+{t}Both X-Header fields are required!{/t}
 {/if}

trunk/templates/user_autores.tpl

@@ -16 +16 @@
                 <td>{t}send vacation back to sender:{/t}</td>
                 <td>
-                        {html_options name="autores_sendback_times" options="$autores_sendback_times_selects" selected=$autores_sendback_times_value  style="width:200px;"}
+                        {html_options name="autores_sendback_times" id="autores_sendback_times" options="$autores_sendback_times_selects" selected=$autores_sendback_times_value  style="width:200px;"}
                 </td>
         </tr>
@@ -98 +98 @@
                 <td><input type="text" id="autores_valtos_add_data" name="val_tos_da" /><input type="submit" id="autores_valtos_add_submit" name="val_tos_add" value="{t}add{/t}" /></td>
         </tr></form>
+{if $p_autores_xheader == 1}
+        <tr style="height:25px;">
+                <td></td>
+        </tr>
+        <tr>
+                <td valign="top">{t}vacation X-Header disable feature:{/t}</td>
+        </tr>
+        <tr>
+                <td></td>
+                <td>
+                        <table border="0">
+                        <tr>
+                                <td style="font-weight:bold;padding-right:30px;">{t}X-Header{/t}</td>
+                                <td style="font-weight:bold;padding-right:20px;">{t}Value{/t}</td>
+                                <td></td>
+                        </tr>
+                        {foreach item=row from=$table_xheader}
+                                <td>{$row.xheader}</td>
+                                <td>{$row.value}</td>
+                                <td><a href="?module=user_autores&#038;xheader={$row.id}&#038;do=del"><img src="img/icons/delete.png" style="border:0px;"/></a></td>
+                        {/foreach}
+                        </table>
+                </td>
+
+        </tr>
+        <tr style="height:25px;">
+                <td></td>
+        </tr>
+        <tr>
+                <td valign="top">{t}add new X-Header:{/t}</td>
+                <td></td>
+        </tr>
+        <tr>
+                <td></td>
+                <td>
+                        <form action="?module=user_autores" method="post">
+                        <table border="0">
+                        <tr>
+                                <td style="padding-right:10px;">{t}X-Header:{/t}</td>
+                                <td><input type="text" name="xheader_name" /></td>
+                        </tr>
+                        <tr>
+                                <td style="padding-right:10px;">{t}Value:{/t}</td>
+                                <td><input type="text" name="xheader_value" /></td>
+                        </tr>
+                        </table>
+                        <input name="xheader_submit" type="submit" value="{t}save{/t}"/>
+                        </form>
+                </td>
+        </tr>
+{/if}
 </table>
 {if $autores_active eq 'n' }

trunk/templates/user_spam.tpl

@@ -70 +70 @@
                 {/foreach}</select>
                 
-                {else}<p>{t}no IMAP folder exists.<br/>please create an folder first, to use this option.{/t}</p>
+                {else}<p>{t escape='off'}no IMAP folder exists.<br/>please create an folder first, to use this option.{/t}</p>
                 {/if}
                 </td>

trunk/web/index.php

@@ -19 +19 @@
 session_start();
 require_once("../root.php");
+if (!is_file(ROOT . "/includes/config.inc.php")) {
+        die("<h3>missing ". ROOT . "/includes/config.inc.php!</h3>");
+}
 require_once( ROOT . "/includes/config.inc.php");
 if (!isset($_POST['login']) && $_GET['module'] != "login"  ) {