Changeset 2248 for alternc-procmail

Show
Ignore:
Timestamp:
06/10/08 10:43:36 (6 months ago)
Author:
benjamin
Message:

procmail_builder now working on sqw-1.4.9 and alternc-0.9.8 with register_globals=off

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • alternc-procmail/trunk/debian/changelog

    r1279 r2248  
     1alternc-procmail (1.5) testing; urgency=low 
     2 
     3  * Patch to work properly with squirrelmail 1.4.9 on alternc 0.9.9 with php with register_globals = off 
     4 
     5 -- Benjamin Sonntag <benjamin@alternc.org>  Tue, 10 Jun 2007 10:34:00 +0200 
     6 
    17alternc-procmail (1.4) testing; urgency=low 
    28 

  • alternc-procmail/trunk/debian/control

    r1654 r2248  
    33Priority: optional 
    44Maintainer: Benjamin Sonntag <benjamin@alternc.org> 
    5 Build-Depends-Indep: debhelper, gettext 
    6 Standards-Version: 3.7.2.0 
     5Build-Depends-Indep: gettext 
     6Build-Depends: debhelper 
     7Standards-Version: 3.7.2.2 
    78 
    89Package: alternc-procmail 
    910Architecture: all 
    10 Pre-Depends: alternc 
    11 Depends: ${shlibs:Depends}, procmail, squirrelmail (>= 1.4) 
    12 Description: Procmail plugin for AlternC and Squirrelmail 1.4 
     11Pre-Depends: alternc (>= 0.9.8) 
     12Depends: ${shlibs:Depends}, procmail, squirrelmail (>= 1.4.9) 
     13Description: Procmail plugin for AlternC and Squirrelmail 1.4.9 
    1314 This AlternC & Squirrelmail plugin allows any user to build a procmailrc 
    1415 file thanks to a user-friendly internationalized web interface integrated 

  • alternc-procmail/trunk/debian/rules

    r1612 r2248  
    5050        cp m_procmail.php procmailrc.default debian/alternc-procmail/var/alternc/bureau/class/procmail_builder/ 
    5151        cp -R locales debian/alternc-procmail/var/alternc/bureau/  
    52         find debian/alternc-procmail/var/alternc/bureau/ -name CVS -depth -exec rm {} -rf \; 
     52        find debian/alternc-procmail/ -name CVS -depth -exec rm {} -rf \; 
     53        find debian/alternc-procmail/ -name .svn -depth -exec rm {} -rf \; 
    5354        chown -R 33.33 debian/alternc-procmail/var/alternc/bureau/  debian/alternc-procmail/usr/share/squirrelmail/plugins/ 
    5455 

  • alternc-procmail/trunk/procmail_add.php

    r1270 r2248  
    1 <?php /* Modified at 2 places by ri_once */ ?> 
    2 <?php 
    3  
    4 // the following has been commented out for squirrelmail 1.4 version :  
    5 /* 
    6    chdir (".."); 
    7    session_start(); 
    8  
    9    include_once ("procmail_builder/config.php"); 
    10    include_once ("../config/config.php"); 
    11    include_once ("../functions/strings.php"); 
    12    include_once ("../functions/page_header.php"); 
    13    include_once ("../functions/imap.php"); 
    14  
    15    if (isset($plugin_change_ldappass)) 
    16        $Messages = change_ldappass_check(); 
    17  
    18    include_once ("../src/load_prefs.php"); 
    19    displayPageHeader($color, "None"); 
    20 */ 
     1<?php 
     2 
     3global $username, $key, $imapServerAddress, $imapPort; 
    214 
    225define('SM_PATH','../../'); 
    236/* SquirrelMail required files. */ 
    247require_once(SM_PATH . 'include/validate.php'); 
     8require_once(SM_PATH . 'functions/global.php'); 
    259require_once(SM_PATH . 'functions/page_header.php'); 
    2610require_once(SM_PATH . 'functions/imap.php'); 
    2711require_once(SM_PATH . 'include/load_prefs.php'); 
    28 require_once (SM_PATH . "plugins/procmail_builder/config.php"); 
    29  
    30  
     12require_once(SM_PATH . "plugins/procmail_builder/config.php"); 
     13 
     14 
     15/** COOKIE VARS */ 
     16sqgetGlobalVar('key',       $key,           SQ_COOKIE); 
     17 
     18/** SESSION VARS */ 
     19sqgetGlobalVar('username',  $username,      SQ_SESSION); 
     20sqgetGlobalVar('onetimepad',$onetimepad,    SQ_SESSION); 
     21sqgetGlobalVar('base_uri',  $base_uri,      SQ_SESSION); 
     22sqgetGlobalVar('delimiter', $delimiter,     SQ_SESSION); 
    3123 
    3224 
    3325textdomain("procmail_builder"); 
    3426 
    35 $raction=intval($raction); 
     27$raction=intval($_REQUEST["raction"]); 
    3628if (!$raction) { 
    3729        $raction=1; 
    3830} 
     31 
     32$accook=$_REQUEST["accook"]; 
     33$crit=$_REQUEST["crit"]; 
     34$crittext=$_REQUEST["crittext"]; 
     35$del=$_REQUEST["del"]; 
     36$createit=$_REQUEST["createit"]; 
     37$rcreateit=$_REQUEST["rcreateit"]; 
     38$dropit=$_REQUEST["dropit"]; 
     39$rdropit=$_REQUEST["rdropit"]; 
     40$newcrittxt=$_REQUEST["newcrittxt"]; 
     41$newcrit=$_REQUEST["newcrit"]; 
    3942 
    4043$crittypecount=7; 
    …… 
    4548        $crittext=array(); 
    4649} 
    47 if ($createit && $accook=2) { 
     50if ($createit && $accook==2) { 
    4851        $newcrit=intval($newcrit); 
    4952        $crit[]=$newcrit; 
    …… 
    6871 
    6972if ($rcreateit && $accook==2) { 
    70         if (!$r=$pr->buildrule($rulename,$crit,$crittext,$raction,$foldertogo,$emailto,$autoreplytxt)) { 
     73        if (!$r=$pr->buildrule($_REQUEST["rulename"],$crit,$crittext,$raction,$_REQUEST["foldertogo"],$_REQUEST["emailto"],$_REQUEST["autoreplytxt"])) { 
    7174                $error=$er->errstr(); 
    7275        } else { 

  • alternc-procmail/trunk/procmail_opt.php

    r1270 r2248  
    44    * 
    55    */ 
    6 if ($accook==1 && $addnew) { 
     6if ($_REQUEST["accook"]==1 && $_REQUEST["addnew"]) { 
    77        include_once("procmail_add.php"); 
    88        exit(); 
    …… 
    1111if (!$already) { 
    1212 
    13  
    14 // the following has been commented out for squirrelmail 1.4 version :  
    15 /* 
    16    chdir (".."); 
    17    session_start(); 
    18  
    19    include_once ("procmail_builder/config.php"); 
    20    include_once ("../config/config.php"); 
    21    include_once ("../functions/strings.php"); 
    22    include_once ("../functions/page_header.php"); 
    23    include_once ("../functions/imap.php"); 
    24  
    25    if (isset($plugin_change_ldappass)) 
    26        $Messages = change_ldappass_check(); 
    27  
    28    include_once ("../src/load_prefs.php"); 
    29    displayPageHeader($color, "None"); 
    30 */ 
    31  
    32 define('SM_PATH','../../'); 
    33 /* SquirrelMail required files. */ 
    34 require_once(SM_PATH . 'include/validate.php'); 
    35 require_once(SM_PATH . 'functions/page_header.php'); 
    36 require_once(SM_PATH . 'functions/imap.php'); 
    37 require_once(SM_PATH . 'include/load_prefs.php'); 
    38 require_once (SM_PATH . "plugins/procmail_builder/config.php"); 
    39  
    40  
    41  
    42  
    43    displayPageHeader($color, "None"); 
     13  define('SM_PATH','../../'); 
     14  /* SquirrelMail required files. */ 
     15  require_once(SM_PATH . 'include/validate.php'); 
     16  require_once(SM_PATH . 'functions/page_header.php'); 
     17  require_once(SM_PATH . 'functions/imap.php'); 
     18  require_once(SM_PATH . 'include/load_prefs.php'); 
     19  require_once (SM_PATH . "plugins/procmail_builder/config.php"); 
     20   
     21  displayPageHeader($color, "None"); 
    4422} 
    4523 
    …… 
    4725 
    4826// submit :) let's DO something 
    49 if ($accook==1) { 
     27if ($_REQUEST["accook"]==1) { 
    5028        $error=""; 
    51         if ($disable) { 
     29        if ($_REQUEST["disable"]) { 
    5230                if ($pr->disable())  
    5331                        $error=_("Your mail filters has been disabled"); 
    …… 
    5533                        $error=$er->errstr(); 
    5634        } 
    57         if ($enable) { 
     35        if ($_REQUEST["enable"]) { 
    5836                if ($pr->enable()) 
    5937                        $error=_("Your mail filters has been enabled"); 
    …… 
    6139                        $error=$er->errstr(); 
    6240        } 
    63         if ($delete && is_array($del)) { 
     41        if ($_REQUEST["delete"] && is_array($_REQUEST["del"])) { 
    6442        $rules=$pr->readrules(); 
    6543        $r=array(); 
    6644        for($i=0;$i<count($rules);$i++) { 
    67                 if (!in_array($i+1,$del)) { 
     45                if (!in_array($i+1,$_REQUEST["del"])) { 
    6846                        $r[]=$rules[$i]; 
    6947                } 
    …… 
    9068$rules=$pr->readrules(); 
    9169 
    92 if ($act=="up") { 
    93         $t=$pr->uprule($rules,$rid); 
     70if ($_REQUEST["act"]=="up") { 
     71        $t=$pr->uprule($rules,$_REQUEST["rid"]); 
    9472        if ($t!==false) { 
    9573                $pr->writerules($t); 
    …… 
    9977        } 
    10078} 
    101 if ($act=="down") { 
    102         $t=$pr->downrule($rules,$rid); 
     79if ($_REQUEST["act"]=="down") { 
     80        $t=$pr->downrule($rules,$_REQUEST["rid"]); 
    10381        if ($t!==false) { 
    10482                $pr->writerules($t);