From: Peter Popovec Date: Tue, 16 Jan 2007 09:26:00 +0000 (+0100) Subject: recompiled for etch X-Git-Tag: 0.4^0 X-Git-Url: http://zub.fei.tuke.sk/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b09192232ad265e79f84a6fc21cc9e1b974d8e9a;p=ldapvmail recompiled for etch some minor changes in web --- diff --git a/debian/README b/debian/README deleted file mode 100644 index 93228b4..0000000 --- a/debian/README +++ /dev/null @@ -1,7 +0,0 @@ -The Debian Package ldapvmail ----------------------------- - -NEWT based TUI and web interface for virtual mail system based on -postfix, courier and ldap - -Peter Popovec , Sun, 30 Jan 2005 12:15:51 +0100 diff --git a/debian/changelog b/debian/changelog index afe7dec..300b898 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +ldapvmail (0.4) unstable; urgency=low + + * recompiled for etch + * some minor changes in web + + -- Peter Popovec Tue, 16 Jan 2007 09:26:41 +0100 + ldapvmail (0.3.1) unstable; urgency=low * better error check in php ldap calls @@ -10,7 +17,7 @@ ldapvmail (0.3) unstable; urgency=low * web interface first wersion - -- Peter Popovec Fri, 23 Sep 2005 08:01:26 +0200 + -- Peter Popovec Fri, 23 Sep 2005 08:01:26 +0200 ldapvmail (0.2.1) unstable; urgency=low @@ -18,7 +25,7 @@ ldapvmail (0.2.1) unstable; urgency=low * compilation warning clean * fix initialization for Balias and Bforward buttons - -- Peter Popovec Thu, 7 Apr 2005 13:55:05 +0200 + -- Peter Popovec Thu, 7 Apr 2005 13:55:05 +0200 ldapvmail (0.2) unstable; urgency=low diff --git a/debian/compat b/debian/compat new file mode 100644 index 0000000..7ed6ff8 --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +5 diff --git a/debian/conffiles b/debian/conffiles new file mode 100644 index 0000000..b27dd7d --- /dev/null +++ b/debian/conffiles @@ -0,0 +1,2 @@ +/etc/ldapVmail/config.php +/etc/ldapVmail/apache.conf diff --git a/debian/configs b/debian/configs deleted file mode 100644 index caa81c0..0000000 --- a/debian/configs +++ /dev/null @@ -1 +0,0 @@ -/etc/ldapVmail/config.php diff --git a/debian/control b/debian/control index 5fe2e4a..92dedff 100644 --- a/debian/control +++ b/debian/control @@ -2,12 +2,12 @@ Source: ldapvmail Section: unknown Priority: optional Maintainer: Peter Popovec -Build-Depends: debhelper (>> 3.0.0) -Standards-Version: 3.5.8 +Build-Depends: debhelper (>= 5) +Standards-Version: 3.7.2 Package: ldapvmail Architecture: any -Depends: ${shlibs:Depends} +Depends: ${shlibs:Depends}, ${misc:Depends} Description: TUI for virtual mail system based on postfix, courier and ldap NEWT based TUI for virtual mail system based on postfix, courier and ldap - Warning, this is alpha release ! \ No newline at end of file + Warning, this is alpha release ! diff --git a/debian/dirs b/debian/dirs index 7c764db..74c5069 100644 --- a/debian/dirs +++ b/debian/dirs @@ -1,2 +1,2 @@ usr/bin -usr/share/ldapVmail + diff --git a/debian/postinst.ex b/debian/postinst.ex deleted file mode 100644 index fccddfa..0000000 --- a/debian/postinst.ex +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/sh - -set -e - -#export DEBCONF_DEBUG=developer - -. /usr/share/debconf/confmodule - -db_version 2.0 - -# Following lend from phpmyadmin's postinst -db_get ldapVmail/httpd -webservers="$RET" - -for webserver in $webservers; do - webserver=${webserver%,} - if [ -e /etc/$webserver/httpd.conf ] && [ ! -e /etc/$webserver/ldapVmail.conf ]; then - mkdir -p /etc/$webserver/conf.d - ln -sf /etc/ldapVmail/apache.conf /etc/$webserver/conf.d/ldapVmail.conf - if [ -h /etc/$webserver/conf.d/ldapVmail ]; then - rm -f /etc/$webserver/conf.d/ldapVmail - fi - fi -done - diff --git a/debian/rules b/debian/rules index 04e72dc..850bb35 100755 --- a/debian/rules +++ b/debian/rules @@ -1,20 +1,23 @@ #!/usr/bin/make -f +# -*- makefile -*- # Sample debian/rules that uses debhelper. -# GNU copyright 1997 to 1999 by Joey Hess. +# This file was originally written by Joey Hess and Craig Small. +# As a special exception, when this file is copied by dh-make into a +# dh-make output file, you may use that output file without restriction. +# This special exception was added by Craig Small in version 0.37 of dh-make. # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -# This is the debhelper compatibility version to use. -export DH_COMPAT=3 -ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS))) - CFLAGS += -g -endif -ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) - INSTALL_PROGRAM += -s +CFLAGS = -Wall -g + +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + CFLAGS += -O0 +else + CFLAGS += -O2 endif configure: configure-stamp @@ -32,9 +35,9 @@ build-stamp: configure-stamp # Add here commands to compile the package. $(MAKE) - #/usr/bin/docbook-to-man debian/ldapvmail.sgml > ldapvmail.1 + #docbook-to-man debian/ldapvmail.sgml > ldapvmail.1 - touch build-stamp + touch $@ clean: dh_testdir @@ -44,18 +47,19 @@ clean: # Add here commands to clean up after the build process. -$(MAKE) clean - dh_clean + dh_clean install: build dh_testdir dh_testroot - dh_clean -k + dh_clean -k dh_installdirs # Add here commands to install the package into debian/ldapvmail. - $(MAKE) install DESTDIR=$(CURDIR)/debian/ldapvmail + $(MAKE) DESTDIR=$(CURDIR)/debian/ldapvmail install (cd web ; cp -a . $(CURDIR)/debian/ldapvmail) + # Build architecture-independent files here. binary-indep: build install # We have nothing to do by default. @@ -64,27 +68,28 @@ binary-indep: build install binary-arch: build install dh_testdir dh_testroot -# dh_installdebconf + dh_installchangelogs dh_installdocs dh_installexamples - dh_installmenu +# dh_install +# dh_installmenu +# dh_installdebconf # dh_installlogrotate # dh_installemacsen # dh_installpam # dh_installmime +# dh_python # dh_installinit - dh_installcron +# dh_installcron +# dh_installinfo dh_installman - dh_installinfo -# dh_undocumented - dh_installchangelogs dh_link dh_strip dh_compress dh_fixperms +# dh_perl # dh_makeshlibs dh_installdeb -# dh_perl dh_shlibdeps dh_gencontrol dh_md5sums diff --git a/doc/examples/courier/ReleaseNote-H-08-69-59906003-0605.pdf b/doc/examples/courier/ReleaseNote-H-08-69-59906003-0605.pdf deleted file mode 100644 index 38f3622..0000000 Binary files a/doc/examples/courier/ReleaseNote-H-08-69-59906003-0605.pdf and /dev/null differ diff --git a/web/usr/share/ldapVmail/k.php b/web/usr/share/ldapVmail/k.php index 307aadc..2a1f80d 100644 --- a/web/usr/share/ldapVmail/k.php +++ b/web/usr/share/ldapVmail/k.php @@ -4,8 +4,8 @@ function putHiddenVariables ($runtype) { global $dn,$uid,$mail,$alias,$forward; -printf("",base64_encode($dn)); -printf("",$runtype); +printf("\n",base64_encode($dn)); +printf("\n",$runtype); printf("\n",base64_encode($uid)); printf("\n",base64_encode($mail)); for($j=0;strlen($alias[$j])>0;$j++){ @@ -88,20 +88,21 @@ printf(""); $fcount=0; } $forward=$forward1; - if($selfForward==0) { + if($fcount>0) + if($selfForward==0) { printf("
",base64_encode($forward[$i])); printf("\n"); printf("\n"); putHiddenVariables("EDITform"); printf("Aktualny stav: mail neostava v lokalnom mailboxe
"); - } - else { + } + else { printf("",base64_encode($forward[$i])); printf("\n"); printf("\n"); putHiddenVariables("EDITform"); printf("Aktualny stav: mail ostava v lokalnom mailboxe
"); - } + } foreach($forward as $i => $value1) { if($forward[$i]!=$mail){ printf("",base64_encode($forward[$i])); @@ -208,8 +209,9 @@ switch($_POST["running"]) { case "ADDnew" : $uid=$_POST["uid"]; if(strlen($uid)>0) { - printf("Novy uzivatel %s:
",strip_tags($uid)); - printf("\n"); + printf("Novy uzivatel %s
",strip_tags($uid)); + printf("\n"); + printf("Mail address:
\n"); putHiddenVariables ("ADDgo"); putAdminPassInput($LdapAdmin,"SAVE"); printf(""); @@ -221,6 +223,7 @@ case "ADDnew" : case "ADDgo": getAllValuesFromForm (); + $mail=$_POST["xmail"]; @ldap_close($ds); //rebind $ds=@ldap_connect($LdapHost); if($ds==FALSE){ @@ -232,14 +235,13 @@ case "ADDgo": continueForm1("Bad admin password\n"); break; } - unset ($entree); $entree["objectClass"][0]="top"; $entree["objectClass"][1]="person"; $entree["objectClass"][2]="organizationalPerson"; $entree["objectClass"][3]="inetOrgPerson"; $entree["objectClass"][4]="qmailUser"; - $entree["mail"]=$uid; + $entree["mail"]=$mail; $entree["uid"]=$uid; $entree["cn"]=$uid; $entree["sn"]=$uid; @@ -249,7 +251,6 @@ case "ADDgo": $entree["mailmessagestore"]="/home/vmail/".$uid."/Maildir/"; $dn="uid=".$uid.",".$netBase ; $r=@ldap_add($ds, $dn, $entree); - $mail=$uid; if ($r==FALSE) continueForm1(sprintf("Nie je mozne upravit data uzivatela %s",strip_tags($uid))); else