Changeset 1015

Show
Ignore:
Timestamp:
06/26/07 00:26:11 (2 years ago)
Author:
shibuya
Message:

Fixed duplicate include issue.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • 5200R/trunk/ui/base-email.mod/Makefile

    r994 r1015  
    88 
    99VERSION=1.3.0 
    10 RELEASE=0BQ23 
     10RELEASE=0BQ25 
    1111 
    1212# add a buildarch if desired 

  • 5200R/trunk/ui/base-email.mod/constructor/syncEmailService.pl

    r825 r1015  
    4242 
    4343# make certs file 
    44 system("cat /etc/admserv/certs/key /etc/admserv/certs/certificate > /usr/share/ssl/certs/sendmail.pem"); 
    45 chmod 0600, "/usr/share/ssl/certs/sendmail.pem"; 
     44system("cat /etc/admserv/certs/key /etc/admserv/certs/certificate > /etc/pki/tls/certs/sendmail.pem"); 
     45chmod 0600, "/etc/pki/tls/certs/sendmail.pem"; 
    4646 
    4747system("/bin/cp /etc/admserv/certs/key /etc/pki/dovecot/private/dovecot.pem"); 
    4848system("/bin/cp /etc/admserv/certs/certificate /etc/pki/dovecot/certs/dovecot.pem"); 
    49  
     49  
    5050 
    5151# dovecot settings first 

  • 5200R/trunk/ui/base-email.mod/templates/rpmdefs.tmpl

    r994 r1015  
    122122 
    123123<begin $CHANGELOG> 
     124* Mon Jun 25 2007 Hisao SHIBUYA <shibuya@bluequartz.org> 1.3.0-0BQ25 
     125- Fixed duplicate include issue. 
     126 
     127* Sat May 05 2007 Hisao SHIBUYA <shibuya@bluequartz.org> 1.3.0-0BQ24 
     128- modify constructor/syncEmailService.pl for certs file and remove dovecot feature. 
     129 
    124130* Sat May 05 2007 Hisao SHIBUYA <shibuya@bluequartz.org> 1.3.0-0BQ23 
    125131- use /etc/aliases instead of /etc/mail/aliases. 

  • 5200R/trunk/ui/base-email.mod/ui/web/email.php

    r768 r1015  
    44// $Id$ 
    55 
    6 include("ServerScriptHelper.php"); 
    7 include("Product.php"); 
     6include_once("ServerScriptHelper.php"); 
     7include_once("Product.php"); 
    88 
    99$serverScriptHelper = new ServerScriptHelper(); 

  • 5200R/trunk/ui/base-email.mod/ui/web/emailHandler.php

    r768 r1015  
    44// $Id$ 
    55 
    6 include("ServerScriptHelper.php"); 
     6include_once("ServerScriptHelper.php"); 
    77 
    88$serverScriptHelper = new ServerScriptHelper(); 

  • 5200R/trunk/ui/base-email.mod/ui/web/email_amdetails.php

    r269 r1015  
    33// Copyright 2000, Cobalt Networks.  All rights reserved. 
    44 
    5 include("ServerScriptHelper.php"); 
    6 include("base/am/am_detail.inc"); 
     5include_once("ServerScriptHelper.php"); 
     6include_once("base/am/am_detail.inc"); 
    77 
    88$serverScriptHelper = new ServerScriptHelper();