Changeset 1095

Timestamp:

04/02/08 01:31:07 (5 months ago)

Author:

rats

Message:

* Fixed #1152: Hardcoded postfix configuration path in ispcp-mbox-mngr
* Fixed #1153: Hardcoded postfix configuration path in ispcp-dmn-mgr
* Fixed #1154: Hardcoded postfix configuration path in ispcp-sub-mgr & ispcp-als-mgr
* Fixed #1149: A warning if a domain is given instead of a fq host name (setup)

Files:

• trunk/CHANGELOG (modified) (2 diffs)
• trunk/docs/CentOS/INSTALL (modified) (3 diffs)
• trunk/docs/Debian/INSTALL (modified) (3 diffs)
• trunk/docs/Fedora/INSTALL (modified) (3 diffs)
• trunk/docs/FreeBSD/INSTALL (modified) (3 diffs)
• trunk/docs/Gentoo/INSTALL (modified) (3 diffs)
• trunk/docs/OpenBSD/INSTALL (modified) (3 diffs)
• trunk/docs/OpenSuse/INSTALL (modified) (3 diffs)
• trunk/docs/RedHat/INSTALL (modified) (2 diffs)
• trunk/docs/Slackware/INSTALL (modified) (1 diff)
• trunk/docs/Ubuntu/INSTALL (modified) (2 diffs)
• trunk/engine/ispcp-als-mngr (modified) (2 diffs)
• trunk/engine/ispcp-dmn-mngr (modified) (3 diffs)
• trunk/engine/ispcp-mbox-mngr (modified) (8 diffs)
• trunk/engine/ispcp-sub-mngr (modified) (2 diffs)
• trunk/engine/messager/ispcp-arpl-msgr (modified) (2 diffs)
• trunk/engine/setup/ispcp-setup-methods.pl (modified) (2 diffs)
• trunk/engine/tools/ispcpphptemp.sh (modified) (1 diff)
• trunk/gui/tools/filemanager/plugins/tinymce/plugins/directionality/langs/pt_br.js (modified) (1 diff)
• trunk/gui/tools/pma/Documentation.html (modified) (18 diffs)

trunk/CHANGELOG

@@ -2 +2 @@
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
+2008-04-02 Benedikt Heintel
+        - ENGINE:
+                * Fixed #1152: Hardcoded postfix configuration path in ispcp-mbox-mngr
+                * Fixed #1153: Hardcoded postfix configuration path in ispcp-dmn-mgr
+                * Fixed #1154: Hardcoded postfix configuration path in ispcp-sub-mgr & ispcp-als-mgr
+        - SETUP:
+                * Fixed #1149: A warning if a domain is given instead of a fq host name (setup)
+        - DISTS:
+                * Fixed #1155: Fix major freebsd dist setup
+
-2008-03-31 Jochen Manz
-        - GUI:
-IXED
+ixed
-
-2008-03-31 Benedikt Heintel
@@ -162 +172 @@
-                * Updated: Update script; Update to RC3
-                * Updated: Update script; Update to RC4
-rc
-rc
+RC
+RC
-                * Changed: make directory to /tmp/ispcp
-

trunk/docs/CentOS/INSTALL

@@ -17 +17 @@
-1) Version Info
----------------
-4
+5
-INSTALL Script:         1.0
-Maintainer:
@@ -56 +56 @@
-1.      Untar or unzip the distribution files to a secure directory:
-        # cd /root
-4
+5
-
-2. Change to the newly created directory:
@@ -154 +154 @@
-1. Untar or unzip the distribution files to a secure directory:
-        # cd /root
-4
+5
-
-2. Change to the newly created directory:

trunk/docs/Debian/INSTALL

@@ -17 +17 @@
-1) Version Info
----------------
-4
+5
-INSTALL Script:         2.0
-Maintainer:                     Benedikt Heintel
@@ -57 +57 @@
-1. Untar or unzip the distribution files to a secure directory:
-        # cd /root
-4
+5
-
-2. Change to the newly created directory:
@@ -133 +133 @@
-1. Untar or unzip the distribution files to a secure directory:
-        # cd /root
-4
+5
-
-2. Change to the newly created directory:

trunk/docs/Fedora/INSTALL

@@ -17 +17 @@
-1) Version Info
----------------
-4
+5
-INSTALL Script:         1.0
-Maintainer:
@@ -55 +55 @@
-1. Untar or unzip the distribution files to a secure directory:
-        # cd /root
-4
+5
-
-2. Change to the newly created directory:
@@ -153 +153 @@
-1. Untar or unzip the distribution files to a secure directory:
-        # cd /root
-4
+5
-
-2. Change to the newly created directory:

trunk/docs/FreeBSD/INSTALL

@@ -17 +17 @@
-1) Version Info
----------------
-4
+5
-INSTALL Script  : 2.0
-Maintainer      : 
@@ -57 +57 @@
-1. Untar or unzip the distribution files to a secure directory:
-        # cd /root
-4
+5
-
-2. Change to the newly created directory:
@@ -100 +100 @@
-1. Untar or unzip the distribution files to a secure directory:
-        # cd /root
-4
+5
-
-2. Change to the newly created directory:

trunk/docs/Gentoo/INSTALL

@@ -17 +17 @@
-1) Version Info
----------------
-4
+5
-INSTALL Script:         0.9
-Maintainer:             ispcp@pasichnyk.net
@@ -55 +55 @@
-1. Untar or unzip the distribution files to a secure directory:
-        # cd /root
-4
+5
-
-2. Change to the newly created directory:
@@ -106 +106 @@
-1. Untar or unzip the distribution files to a secure directory:
-        # cd /root
-4
+5
-
-2. Change to the newly created directory:

trunk/docs/OpenBSD/INSTALL

@@ -17 +17 @@
-1) Version Info
----------------
-4
+5
-INSTALL Script:         2.0
-Maintainer:
@@ -56 +56 @@
-1. Untar or unzip the distribution files to a secure directory:
-        # cd /root
-4
+5
-
-2. Change to the newly created directory:
@@ -178 +178 @@
-1. Untar or unzip the distribution files to a secure directory:
-        # cd /root
-4
+5
-
-2. Change to the newly created directory:

trunk/docs/OpenSuse/INSTALL

@@ -17 +17 @@
-1) Version Info
----------------
-4
+5
-INSTALL Script:         1.1
-Maintainer:
@@ -76 +76 @@
-1. Untar or unzip the distribution files to a secure directory:
-        # cd /root
-4
+5
-
-2. Change to the newly created directory:
@@ -147 +147 @@
-1. Untar or unzip the distribution files to a secure directory:
-        # cd /root
-4
+5
-
-2. Change to the newly created directory:

trunk/docs/RedHat/INSTALL

@@ -58 +58 @@
-1. Untar or unzip the distribution files to a secure directory:
-        # cd /root
-4
+5
-
-2. Change to the newly created directory:
@@ -107 +107 @@
-1. Untar or unzip the distribution files to a secure directory:
-        # cd /root
-4
+5
-
-2. Change to the newly created directory:

trunk/docs/Slackware/INSTALL

@@ -17 +17 @@
-1) Version Info
----------------
-4
+5
-INSTALL Script:         1.0
-Maintainer:

trunk/docs/Ubuntu/INSTALL

@@ -57 +57 @@
-1. Untar or unzip the distribution files to a secure directory:
-        # cd /root
-4
+5
-
-2. Change to the newly created directory:
@@ -122 +122 @@
-1. Untar or unzip the distribution files to a secure directory:
-        # cd /root
-4
+5
-
-2. Change to the newly created directory:

trunk/engine/ispcp-als-mngr

@@ -2180 +2180 @@
-
-
-"/etc/postfix/ispcp/domains"
+$main::cfg{'MTA_VIRTUAL_DMN_HASH'}
-
-    my $working_cfg = "$working_dir/domains";
@@ -2274 +2274 @@
-
-
-"/etc/postfix/ispcp/domains"
+$main::cfg{'MTA_VIRTUAL_DMN_HASH'}
-
-    my $working_cfg = "$working_dir/domains";

trunk/engine/ispcp-dmn-mngr

@@ -2405 +2405 @@
-                return $rs if ($rs != 0);
-        }
+
-        if (! (-e "$starter_dir/$dmn_name/php5/php.ini")) {
-$ini_tpl = ''
-
+my $ini_tpl = undef
+my 
-
-                ($rs, $ini_tpl) = get_tpl($ini_cfg_dir, 'php.ini');
-                return $rs if ($rs != 0);
-
-
+my 
-                                                '{PEAR_DIR}' => $pear_dir,
-                                                '{WWW_DIR}' => $www_dir,
@@ -2729 +2730 @@
-
-
-"/etc/postfix/ispcp/domains"
+$main::cfg{'MTA_VIRTUAL_DMN_HASH'}
-
-    my $working_cfg = "$working_dir/domains";
@@ -2826 +2827 @@
-
-
-"/etc/postfix/ispcp/domains"
+$main::cfg{'MTA_VIRTUAL_DMN_HASH'}
-
-    my $working_cfg = "$working_dir/domains";

trunk/engine/ispcp-mbox-mngr

@@ -288 +288 @@
-    my ($sys, $working) = (undef, undef);
-
-"/etc/postfix/ispcp/aliases"
+$main::cgf{'MTA_VIRTUAL_ALIAS_HASH'}
-
-    my $aliases_working_cfg = "$working_dir/aliases";
@@ -294 +294 @@
-    my $aliases_backup_cfg = "$backup_dir/aliases.$timestamp";
-
-"/etc/postfix/ispcp/transport"
+$main::cfg{'MTA_TRANSPORT_HASH'}
-
-    my $transport_working_cfg = "$working_dir/transport";
@@ -796 +796 @@
-    my ($sys, $working) = (undef, undef);
-
-"/etc/postfix/ispcp/aliases"
+$main::cfg{'MTA_VIRTUAL_ALIAS_HASH'}
-
-    my $aliases_working_cfg = "$working_dir/aliases";
@@ -802 +802 @@
-    my $aliases_backup_cfg = "$backup_dir/aliases.$timestamp";
-
-"/etc/postfix/ispcp/transport"
+$main::cfg{'MTA_TRANSPORT_HASH'}
-
-    my $transport_working_cfg = "$working_dir/transport";
@@ -1199 +1199 @@
-    my ($sys, $working) = (undef, undef);
-
-"/etc/postfix/ispcp/mailboxes"
+$main::cfg{'MTA_VIRTUAL_MAILBOX_HASH'}
-
-    my $mailboxes_working_cfg = "$working_dir/mailboxes";
@@ -1205 +1205 @@
-    my $mailboxes_backup_cfg = "$backup_dir/mailboxes.$timestamp";
-
-"/etc/postfix/ispcp/aliases"
+$main::cfg{'MTA_VIRTUAL_ALIAS_HASH'}
-
-    my $aliases_working_cfg = "$working_dir/aliases";
@@ -1797 +1797 @@
-    my ($sys, $working) = (undef, undef);
-
-"/etc/postfix/ispcp/mailboxes"
+$main::cgf{'MTA_VIRTUAL_MAILBOX_HASH'}
-
-    my $mailboxes_working_cfg = "$working_dir/mailboxes";
@@ -1803 +1803 @@
-    my $mailboxes_backup_cfg = "$backup_dir/mailboxes.$timestamp";
-
-"/etc/postfix/ispcp/aliases"
+$main::cfg{'MTA_VIRTUAL_ALIAS_HASH'}
-
-    my $aliases_working_cfg = "$working_dir/aliases";

trunk/engine/ispcp-sub-mngr

@@ -1790 +1790 @@
-
-
-"/etc/postfix/ispcp/domains"
+$main::cfg{'MTA_VIRTUAL_DMN_HASH'}
-
-    my $working_cfg = "$working_dir/domains";
@@ -1886 +1886 @@
-
-
-"/etc/postfix/ispcp/domains"
+$main::cfg{'MTA_VIRTUAL_DMN_HASH'}
-
-    my $working_cfg = "$working_dir/domains";

trunk/engine/messager/ispcp-arpl-msgr

@@ -380 +380 @@
-%main::cfg = ();
-
-
+
+
+
-
-$main::cfg_re = '^([\_A-Za-z0-9]+) *= *([^\n\r]*)[\n\r]';
@@ -533 +535 @@
-
-if ($rs != 0) {
-/var/log/ispcp
-/var/log/ispcp/
-/var/log/ispcp
-/var/log/ispcp
+$main::cfg{'LOG_DIR'}
+$main::cfg{'LOG_DIR'}
+$main::cfg{'LOG_DIR'}
+$main::cfg{'LOG_DIR'}
-                open(STDOUT, ">", $main::ispcp_arpl_msgr_stdout) || die "Can't redirect stdout";
-                open(STDERR, ">", $main::ispcp_arpl_msgr_stderr) || die "Can't redirect stderr";

trunk/engine/setup/ispcp-setup-methods.pl

@@ -44 +44 @@
-        return $rs if ($rs != 0);
-
-
+
+
+
-        print STDOUT $qmsg;
-
@@ -53 +55 @@
-        }
-
-
+
+
+
+
+
-                $main::ua{'hostname'} = $rdata;
-                $main::ua{'hostname_local'} = ( ($1) ? $1 : $4);

trunk/engine/tools/ispcpphptemp.sh

@@ -1 +1 @@
-#!/bin/bash
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-WEBDIRS=`ls -d ${APACHE_WWW_DIR}/* `

trunk/gui/tools/filemanager/plugins/tinymce/plugins/directionality/langs/pt_br.js

@@ -8 +8 @@
- * First Release : November 26, 2005 - TinyMCE Version : 2.0RC4
- * Last Updated : November 20, 2006 - TinyMCE Version : 2.0.8
- 
+
-tinyMCE.addToLang('',{
-directionality_ltr_desc : 'Direcionamento da esquerda para direita',

trunk/gui/tools/pma/Documentation.html

@@ -175 +175 @@
-<h3 id="quick_install">Quick Install</h3>
-<ol><li>Choose an appropriate distribution kit from the phpmyadmin.net
- 
+
-        others contain all languages in UTF-8 format (this should be fine
-        in most situations), others contain all
-        languages and all character sets. We'll assume you chose a kit whose
-        
+
-        </li>
-    <li>Untar or unzip the distribution (be sure to unzip the subdirectories):
@@ -195 +195 @@
-    <li>Now you must configure your installation. There are two methods that
-        can be used. Traditionally, users have hand-edited a copy of
- 
- 
+
+
-        <tt>config.inc.php</tt> file is
-        still a quick way to get started and needed for some advanced features.
@@ -490 +490 @@
-<ul><li>This mode is a convenient way of using credentials from another
-        application to authenticate to phpMyAdmin.</li>
- 
+
-        session data.</li>
-    <li>More details in the <a href="#cfg_Servers_auth_type">auth_type</a>
@@ -581 +581 @@
-    <dt id="cfg_SuhosinDisableWarning">$cfg['SuhosinDisableWarning'] boolean</dt>
-    <dd>A warning is displayed on the main page if Suhosin is detected.
- 
+
-    from appearing.</dd>
-
@@ -703 +703 @@
-                (<tt>$auth_type&nbsp;=&nbsp;'<abbr title="HyperText Transfer Protocol">HTTP</abbr>'</tt>) as introduced in 1.3.0
-                allows you to log in as any valid MySQL user via HTTP-Auth.</li>
- 
+
-                (<tt>$auth_type&nbsp;=&nbsp;'signon'</tt>)
-                as introduced in 2.10.0 allows you to log in from prepared PHP
@@ -787 +787 @@
-        this string will be displayed instead of the hostname in the pull-down
-        menu on the main page. This can be useful if you want to show only
- 
+
-        non-US-ASCII characters will be stripped.</dd>
-
@@ -984 +984 @@
-    </dt>
-    <dd>Since release 2.10.0 a Designer interface is available; it permits
- 
+
-        <br /><br />
-
@@ -1098 +1098 @@
-    <dd>The maximum number of database names to be displayed in the
-        navigation frame and the database list.</dd>
-
+
-    <dt id="cfg_MaxTableList">$cfg['MaxTableList'] integer</dt>
-    <dd>The maximum number of table names to be displayed in the
- 
+
-    when in Light mode.</dd>
-
-    <dt id="cfg_MaxCharactersInDisplayedSQL">$cfg['MaxCharactersInDisplayedSQL'] integer</dt>
- 
+
-    default limit of 1000 should be correct to avoid the display of tons
-    of hexadecimal codes that represent BLOBs, but some users have real
@@ -1257 +1257 @@
-        Defaults to <tt>TRUE</tt>.</dd>
-    <dt id="cfg_LeftLogoLink">$cfg['LeftLogoLink'] string</dt>
- 
+
-    For use especially with self made theme which changes this.
-    The default value for this is <tt>main.php</tt>.</dd>
@@ -1273 +1273 @@
-        Defaults to FALSE (drop-down).</dd>
-    <dt id="cfg_DisplayDatabasesList">$cfg['DisplayDatabasesList'] boolean or text</dt>
- 
+
-        instead of in a drop-down. Defaults to 'auto' - on main page list is
-        shown, when database is selected, only drop down is displayed.</dd>
@@ -1284 +1284 @@
-    <dt><span id="cfg_ShowServerInfo">$cfg['ShowServerInfo'] </span>boolean</dt>
-    <dd>Defines whether to display detailed server information on main page.
- 
+
-        <tt><a href="#cfg_Servers_verbose">$cfg['Servers'][$i]['verbose']</a></tt>.
-        </dd>
@@ -1345 +1345 @@
-
-    <dt id="cfg_ShowFunctionFields">$cfg['ShowFunctionFields'] boolean</dt>
- 
+
-        displayed in edit/insert mode. Since version 2.10, the user can
-        toggle this setting from the interface.
@@ -1511 +1511 @@
-        want to use rules for IP addresses behind proxy.<br /><br />
-
- 
+
-        HTTP_X_FORWARDED_FOR (<tt>X-Forwarded-For</tt>) header coming from the proxy 1.2.3.4:
-<pre>
@@ -1517 +1517 @@
-     array('1.2.3.4' =&gt; 'HTTP_X_FORWARDED_FOR');
-</pre>
- 
+
-        client's IP address as usual.
-    </dd>
@@ -1729 +1729 @@
-        with username.<br /><br />
-
- 
+
-        for the user running the webserver.<br /><br />
-
@@ -1836 +1836 @@
-    <dd>For VIEWs, since obtaining the exact count could have an
-    impact on performance, this value is the maximum to be displayed, using
- 
+
-    any row counting.
-    </dd>
@@ -2802 +2802 @@
-    <a href="#faq1_38">1.38 Can I use phpMyAdmin on a server on which Suhosin is enabled?</a></h4>
-
- 
+
-    problems with some operations, for example editing a table with many
- 
+
-    <a href="http://www.hardened-php.net/hphp/troubleshooting.html">
-            http://www.hardened-php.net/hphp/troubleshooting.html</a>,
@@ -2981 +2981 @@
-        of &quot;;&quot; will cause this error. Replace it with &quot;&amp;;&quot;.
-    </li>
- 
- 
+
+
-       <a href="http://www.hardened-php.net/hphp/troubleshooting.html">request limits</a>.
-    </li>