Development

Wiki Start
Wishlist
Timeline
Roadmap
Browse Source
New Ticket
View Tickets

Changeset 1100

Show
Ignore:
Timestamp:
04/04/08 12:26:08 (6 months ago)
Author:
rats
Message:

* Fixed #1159: ROOT_APACHE_CONF is not defined in toplevel Makefile
* Fixed #1162: /etc/ispcp/courier/userdb not present in ispcp-setup (revision 1098, Gentoo)
* Fixed #547: encoded email from reseller doesnt work

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/CHANGELOG

    r1099 r1100  
    22~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 
    33 
     42008-04-04 Benedikt Heintel 
     5        - CONFIGS: 
     6                * Fixed #1159: ROOT_APACHE_CONF is not defined in toplevel Makefile 
     7                * Fixed #1162: /etc/ispcp/courier/userdb not present in ispcp-setup (revision 1098, Gentoo) 
     8        - GUI: 
     9                * Fixed #547: encoded email from reseller doesnt work 
     10 
    4112008-04-03 Jochen Manz 
    512        - ENGINE: 
    613                * Fixed #1160: perl ispcp-setup fails in trunk 1098 
    7          
     14 
    8152008-04-02 Benedikt Heintel 
    916        - ENGINE: 

  • trunk/Makefile

    r1059 r1100  
    6868        $(SYSTEM_MAKE_DIRS) $(SYSTEM_MAIL_VIRTUAL) 
    6969        $(SYSTEM_MAKE_DIRS) $(SYSTEM_APACHE_BACK_LOG) 
    70         $(SYSTEM_MAKE_DIRS) $(ROOT_APACHE_CONF)/ispcp 
    7170 
    7271        cd ./configs && $(MAKE) install & 

  • trunk/configs/debian/apache/01_awstats.conf

    r1047 r1100  
    3131        RewriteEngine on 
    3232        RewriteRule ^/stats/(.+)/$ http://localhost/awstats/?config=$1 [P] 
    33         RewriteRule ^/stats/(.+)/awstats.pl(.*)$ http://localhost/awstats/$2 [P] 
     33        RewriteRule ^/stats/(.+)/awstats.pl(.*)$ http://localhost/awstats/$1 [P] 
     34        RewriteRule ^/stats/(.*)$ http://localhost/stats/$1/ [R] 
    3435    </IfModule> 
    3536 

  • trunk/configs/debian/apache/Makefile

    r969 r1100  
     1#!/usr/bin/make -f 
     2# 
     3# ispCP ω (OMEGA) a Virtual Hosting Control Panel 
     4# Copyright (c) 2001-2006 by moleSoftware GmbH 
     5# http://www.molesoftware.com 
     6# Copyright (c) 2006-2008 by isp Control Panel 
     7# http://isp-control.net 
     8# 
     9# 
     10# License: 
     11#    This program is free software; you can redistribute it and/or 
     12#    modify it under the terms of the MPL Mozilla Public License 
     13#    as published by the Free Software Foundation; either version 1.1 
     14#    of the License, or (at your option) any later version. 
     15# 
     16#    This program is distributed in the hope that it will be useful, 
     17#    but WITHOUT ANY WARRANTY; without even the implied warranty of 
     18#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
     19#    MPL Mozilla Public License for more details. 
     20# 
     21#    You may have received a copy of the MPL Mozilla Public License 
     22#    along with this program. 
     23# 
     24#    An on-line copy of the MPL Mozilla Public License can be found 
     25#    http://www.mozilla.org/MPL/MPL-1.1.html 
     26# 
     27# 
     28# The ispCP ω Home Page is at: 
     29# 
     30#    http://isp-control.net 
     31# 
    132ROOT_APACHE_CONF=$(ROOT_CONF)/apache2 
    233 

  • trunk/configs/gentoo/courier/Makefile

    r1059 r1100  
    11 
    2 ROOT_COURIER_CONF=$(ROOT_CONF)/courier/authlib 
     2ROOT_AUTHLIB_CONF=$(ROOT_CONF)/courier/authlib 
     3ROOT_COURIER_CONF=$(ROOT_CONF)/courier 
    34ROOT_COURIER_IMAP_CONF=$(ROOT_CONF)/courier-imap 
    45 
    …… 
    89 
    910        $(SYSTEM_MAKE_DIRS) $(SYSTEM_CONF)/courier 
    10         $(SYSTEM_MAKE_DIRS) $(ROOT_COURIER_CONF) 
     11        $(SYSTEM_MAKE_DIRS) $(ROOT_AUTHLIB_CONF) 
    1112        $(SYSTEM_MAKE_DIRS) $(ROOT_COURIER_IMAP_CONF) 
    1213        $(SYSTEM_MAKE_DIRS) $(INST_PREF)/var/run/courier 

  • trunk/gui/admin/circular.php

    r1075 r1100  
    202202        $subject = encode($subject); 
    203203 
    204         $headers = "MIME-Version: 1.0\nContent-Type: text/plain; charset=utf-8\nContent-Transfer-Encoding: 8bit\n"; 
     204        $headers = "MIME-Version: 1.0\nContent-Type: text/plain; charset=utf-8\nContent-Transfer-Encoding: 8bit\n"; 
    205205        $headers .= "From: " . $from . "\n"; 
    206206        $headers .= "X-Mailer: ispCP marketing mailer"; 

  • trunk/gui/reseller/circular.php

    r1075 r1100  
    147147 
    148148function send_circular_email ($to, $from, $subject, $message) { 
    149         $to = encode($to); 
    150         $from = encode($from); 
    151149        $subject = encode($subject); 
    152150 
    153         $headers = "MIME-Version: 1.0\nContent-Type: text/plain; charset=utf-8\nContent-Transfer-Encoding: 8bit\n"; 
     151        $headers = "MIME-Version: 1.0\nContent-Type: text/plain; charset=utf-8\nContent-Transfer-Encoding: 8bit\n"; 
    154152        $headers .= "From: " . $from . "\n"; 
    155153        $headers .= "X-Mailer: ispCP marketing mailer";