Changeset 1270

Show
Ignore:
Timestamp:
04/01/05 18:46:21 (4 years ago)
Author:
benjamin
Message:

correctifs en tout genre pour que procmail-builder marche sur squirrelmail 1.4 alternc 0.9.3/4 et sarge

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/config.php

    r1268 r1270  
    11<?php 
     2 
     3global $pr,$db,$er; 
    24 
    35bindtextdomain("procmail_builder", "/var/alternc/bureau/locales"); 
    …… 
    911require_once($root."class/functions.php"); 
    1012require_once($root."class/procmail_builder/m_procmail.php"); 
     13require_once($root."class/db_mysql.php"); 
    1114require_once($root."class/m_err.php"); 
    1215 
    13 require_once($root."class/db_mysql.php"); 
    14  
    15 // Classe héritée de la classe db de la phplib. 
    16 class DB_system extends DB_Sql { 
    17   var $Host,$Database,$User,$Password; 
    18   function DB_system() { 
    19     global $L_MYSQL_HOST,$L_MYSQL_DATABASE,$L_MYSQL_LOGIN,$L_MYSQL_PWD; 
    20     $this->Host     = $L_MYSQL_HOST; 
    21     $this->Database = $L_MYSQL_DATABASE; 
    22     $this->User     = $L_MYSQL_LOGIN; 
    23     $this->Password = $L_MYSQL_PWD; 
    24   } 
     16if (!class_exists("DB_Sql")) { 
     17        // Classe héritée de la classe db de la phplib. 
     18        class DB_system extends DB_Sql { 
     19          var $Host,$Database,$User,$Password; 
     20          function DB_system() { 
     21            global $L_MYSQL_HOST,$L_MYSQL_DATABASE,$L_MYSQL_LOGIN,$L_MYSQL_PWD; 
     22            $this->Host     = $L_MYSQL_HOST; 
     23            $this->Database = $L_MYSQL_DATABASE; 
     24            $this->User     = $L_MYSQL_LOGIN; 
     25            $this->Password = $L_MYSQL_PWD; 
     26          } 
     27        } 
     28        $db= new DB_system(); 
    2529} 
    2630 
    27 $db= new DB_system(); 
     31if (!class_exists("m_err")) { 
     32        $er= new m_err(); 
     33} 
     34 
    2835$pr= new m_procmail($username); 
    29 $er= new m_err(); 
    3036 
    3137?> 

  • trunk/debian/changelog

    r1262 r1270  
     1alternc-procmail (1.3-1) testing; urgency=low 
     2 
     3  * Patch to work properly with alternc 0.9.3 and squirrelmail 1.4 
     4 
     5 -- Benjamin Sonntag <benjamin@octopuce.com>  Tue, 01 Apr 2005 18:39:00 +0200 
     6 
    17alternc-procmail (1.2-1) unstable; urgency=low 
    28 

  • trunk/debian/control

    r1262 r1270  
    44Maintainer: Benjamin Sonntag <benjamin@alternc.org> 
    55Build-Depends: debhelper (>> 3.0.0), gettext 
    6 Standards-Version: 3.5.2 
     6Standards-Version: 3.6.1 
    77 
    88Package: alternc-procmail 
    99Architecture: any 
    10 Depends: ${shlibs:Depends}, alternc (>= 0.9.2), procmail, squirrelmail (>= 1.4) 
     10Depends: ${shlibs:Depends}, alternc (>= 0.9.3), procmail, squirrelmail (>= 1.4) 
    1111Description: Procmail plugin for AlternC and Squirrelmail 1.4 
    1212 This AlternC & Squirrelmail plugin allows any user to build a procmailrc 

  • trunk/m_procmail.php

    r1266 r1270  
    6565*****************************************************************************/ 
    6666function get_status($user="") { 
     67        global $db; 
    6768        if (!$user) $user=$this->user; 
    6869 

  • trunk/procmail_add.php

    r1262 r1270  
    22<?php 
    33 
     4// the following has been commented out for squirrelmail 1.4 version :  
     5/* 
    46   chdir (".."); 
    57   session_start(); 
    …… 
    1618   include_once ("../src/load_prefs.php"); 
    1719   displayPageHeader($color, "None"); 
    18  
    19   textdomain("procmail_builder"); 
     20*/ 
     21 
     22define('SM_PATH','../../'); 
     23/* SquirrelMail required files. */ 
     24require_once(SM_PATH . 'include/validate.php'); 
     25require_once(SM_PATH . 'functions/page_header.php'); 
     26require_once(SM_PATH . 'functions/imap.php'); 
     27require_once(SM_PATH . 'include/load_prefs.php'); 
     28require_once (SM_PATH . "plugins/procmail_builder/config.php"); 
     29 
     30 
     31 
     32 
     33textdomain("procmail_builder"); 
    2034 
    2135$raction=intval($raction); 

  • trunk/procmail_opt.php

    r1262 r1270  
    1010 
    1111if (!$already) { 
     12 
     13 
     14// the following has been commented out for squirrelmail 1.4 version :  
     15/* 
    1216   chdir (".."); 
    1317   session_start(); 
    …… 
    1923   include_once ("../functions/imap.php"); 
    2024 
     25   if (isset($plugin_change_ldappass)) 
     26       $Messages = change_ldappass_check(); 
     27 
    2128   include_once ("../src/load_prefs.php"); 
     29   displayPageHeader($color, "None"); 
     30*/ 
     31 
     32define('SM_PATH','../../'); 
     33/* SquirrelMail required files. */ 
     34require_once(SM_PATH . 'include/validate.php'); 
     35require_once(SM_PATH . 'functions/page_header.php'); 
     36require_once(SM_PATH . 'functions/imap.php'); 
     37require_once(SM_PATH . 'include/load_prefs.php'); 
     38require_once (SM_PATH . "plugins/procmail_builder/config.php"); 
     39 
     40 
     41 
     42 
    2243   displayPageHeader($color, "None"); 
    2344} 
    2445 
    25   textdomain("procmail_builder"); 
     46textdomain("procmail_builder"); 
    2647 
    2748// submit :) let's DO something 

  • trunk/setup.php

    r1262 r1270  
    1414    textdomain("procmail_builder"); 
    1515    $optpage_blocks[] = array( 
    16         'name' => _("Filter messages"), 
     16        'name' => _("Filter Messages"), 
    1717        'url'  => '../plugins/procmail_builder/procmail_opt.php', 
    1818        'desc' => _("This allow you to filter your incoming messages, setup a vacation autoreply, or filter spam with SpamAssassin"),