From 6a8d0d8ece062b80628f7a4400c70d6942ab59ad Mon Sep 17 00:00:00 2001 From: tbrehm Date: Thu, 12 Mar 2009 17:29:52 +0000 Subject: [PATCH] improved opensuse install instructions and fixed template problems. --- docs/INSTALL_OPENSUSE_11_1.txt | 15 +++--- interface/web/mail/mail_domain_edit.php | 5 +- .../web/mail/templates/mail_domain_edit.htm | 16 +++++-- interface/web/sites/database_edit.php | 6 ++- .../web/sites/templates/database_edit.htm | 47 ++++++++++++++----- .../web/sites/templates/web_domain_edit.htm | 34 +++++--------- interface/web/sites/web_domain_edit.php | 5 +- 7 files changed, 74 insertions(+), 54 deletions(-) diff --git a/docs/INSTALL_OPENSUSE_11_1.txt b/docs/INSTALL_OPENSUSE_11_1.txt index b755dae62..3d2c6231c 100644 --- a/docs/INSTALL_OPENSUSE_11_1.txt +++ b/docs/INSTALL_OPENSUSE_11_1.txt @@ -43,8 +43,9 @@ chkconfig --add courier-imap-ssl cd /tmp -wget http://download.opensuse.org/repositories/server:/php:/applications/openSUSE_11.1/src/phpMyAdmin-3.1.2-1.1.src.rpm -rpm -i phpMyAdmin-3.1.2-1.1.src.rpm +yast2 -i pwgen +rpm -i http://download.opensuse.org/repositories/server:/php:/applications/openSUSE_11.1/noarch/phpMyAdmin-3.1.2-1.1.noarch.rpm +ln -s /srv/www/htdocs/phpMyAdmin /usr/local/ispconfig/interface/web/phpmyadmin // Warnings like "warning: phpMyAdmin-3.1.2-1.1.src.rpm: Header V3 DSA signature: NOKEY, key ID 367fe7fc" can be ignored. @@ -67,15 +68,10 @@ make install rm -rf pam_mysql-0.7RC1 rm pam_mysql-0.7RC1.tar.gz + // Set the mysql database password: mysqladmin -u root password yourrootsqlpassword -mysqladmin -h ispconfig.local -u root password yourrootsqlpassword - - -// Install phpmyadmin -yast2 -i pwgen -rpm -i http://download.opensuse.org/repositories/server:/php:/applications/openSUSE_11.1/noarch/phpMyAdmin-3.1.2-1.1.noarch.rpm 2) Install Amavisd-new, Spamassassin and Clamav (1 line!): @@ -185,6 +181,9 @@ Now start the installation process by executing: php -q install.php +// Cleanup +rm -rf /tmp/trunk + The installer will configure all services like postfix, sasl, courier, etc. for you. A manual setup as required for ISPConfig 2 (perfect setup guides) is not nescessary. To login to the ISPConfig controlpanel, open the following URL in your browser (replace the IP to match your settings!): http://192.168.0.100:8080/ diff --git a/interface/web/mail/mail_domain_edit.php b/interface/web/mail/mail_domain_edit.php index 477e0b7b6..a7b2da136 100644 --- a/interface/web/mail/mail_domain_edit.php +++ b/interface/web/mail/mail_domain_edit.php @@ -113,9 +113,10 @@ class page_action extends tform_actions { if($this->id > 0) { //* we are editing a existing record - $app->tpl->setVar("edit_disabled", 'disabled="disabled"'); + $app->tpl->setVar("edit_disabled", 1); + $app->tpl->setVar("server_id_value", $this->dataRecord["server_id"]); } else { - $app->tpl->setVar("edit_disabled", ''); + $app->tpl->setVar("edit_disabled", 0); } parent::onShowEnd(); diff --git a/interface/web/mail/templates/mail_domain_edit.htm b/interface/web/mail/templates/mail_domain_edit.htm index 29a8c83d4..a104827f8 100644 --- a/interface/web/mail/templates/mail_domain_edit.htm +++ b/interface/web/mail/templates/mail_domain_edit.htm @@ -7,10 +7,18 @@
- - + + + + + + + +
diff --git a/interface/web/sites/database_edit.php b/interface/web/sites/database_edit.php index 377f321e5..28f62f6ec 100644 --- a/interface/web/sites/database_edit.php +++ b/interface/web/sites/database_edit.php @@ -176,9 +176,11 @@ class page_action extends tform_actions { if($this->id > 0) { //* we are editing a existing record - $app->tpl->setVar("edit_disabled", 'disabled="disabled"'); + $app->tpl->setVar("edit_disabled", 1); + $app->tpl->setVar("server_id_value", $this->dataRecord["server_id"]); + $app->tpl->setVar("database_charset_value", $this->dataRecord["database_charset"]); } else { - $app->tpl->setVar("edit_disabled", ''); + $app->tpl->setVar("edit_disabled", 0); } parent::onShowEnd(); diff --git a/interface/web/sites/templates/database_edit.htm b/interface/web/sites/templates/database_edit.htm index 463c1b130..65df96c32 100644 --- a/interface/web/sites/templates/database_edit.htm +++ b/interface/web/sites/templates/database_edit.htm @@ -7,16 +7,24 @@
- - + + + + + + + +
+
@@ -24,20 +32,25 @@ +
+
{tmpl_var name='database_name_prefix'}
- -
+ + + + + + +
{tmpl_var name='database_user_prefix'}
@@ -53,10 +66,18 @@

 

- - + + + + + + + +

{tmpl_var name='remote_access_txt'}

diff --git a/interface/web/sites/templates/web_domain_edit.htm b/interface/web/sites/templates/web_domain_edit.htm index fe7a38bda..d377b0421 100644 --- a/interface/web/sites/templates/web_domain_edit.htm +++ b/interface/web/sites/templates/web_domain_edit.htm @@ -7,10 +7,18 @@
- + + + + + + + {tmpl_var name='server_id'} + +
@@ -37,26 +45,6 @@
-
diff --git a/interface/web/sites/web_domain_edit.php b/interface/web/sites/web_domain_edit.php index 15c8fa81b..d9d210f9d 100644 --- a/interface/web/sites/web_domain_edit.php +++ b/interface/web/sites/web_domain_edit.php @@ -187,9 +187,10 @@ class page_action extends tform_actions { if($this->id > 0) { //* we are editing a existing record - $app->tpl->setVar("edit_disabled", 'disabled="disabled"'); + $app->tpl->setVar("edit_disabled", 1); + $app->tpl->setVar("server_id_value", $this->dataRecord["server_id"]); } else { - $app->tpl->setVar("edit_disabled", ''); + $app->tpl->setVar("edit_disabled", 0); } parent::onShowEnd(); -- GitLab