Changeset 633

Timestamp:

06/01/07 19:01:59 (2 years ago)

Author:

rats

Message:

Fixed #279: '-' and '_' not allowed in e-mail passwords

Fixed #337: uninitialized value in concatenation during setup warning
Fixed #338: welcome e-mail subject not parsed
Fixed #341: Serverports not deleteable - deleted delete text

Files:

• trunk/CHANGELOG (modified) (1 diff)
• trunk/engine/setup/ispcp-setup (modified) (2 diffs)
• trunk/gui/admin/server_status.php (modified) (3 diffs)
• trunk/gui/admin/settings_ports.php (modified) (2 diffs)
• trunk/gui/client/add_mail_acc.php (modified) (1 diff)
• trunk/gui/include/admin-functions.php (modified) (5 diffs)

trunk/CHANGELOG

@@ -20 +20 @@
-                * fixed serveral install bugs
-        - GUI
+                * Fixed #279: '-' and '_' not allowed in e-mail passwords
-                * Fixed #333: Variables "{1}" in the Admin Log
+                * Fixed #337: uninitialized value in concatenation during setup warning
+                * Fixed #338: welcome e-mail subject not parsed
-                * Fixed #340: Logo upload not possible
+                * Fixed #341: Serverports not deleteable - deleted delete text
-
-2007-05-31 Benedikt Heintel

trunk/engine/setup/ispcp-setup

@@ -2746 +2746 @@
-        push_el(\@main::el, 'setup_ispcpd()', 'Starting...');
-
-ispCPD'} $main::cfg{'CMD_ispCPN
-
-ispCPD'} $main::cfg{'CMD_ispCPN
+ISPCPD'} $main::cfg{'CMD_ISPCPD
+
+ISPCPD'} $main::cfg{'CMD_ISPCPD
-
-        if ( -e "/usr/sbin/update-rc.d" ) {
@@ -2756 +2756 @@
-        }
-
-isp
+ISP
-
-        sleep(3);
-
-isp
+ISP
-
-        $rs = del_file("/tmp/ispcp-setup-services.log");

trunk/gui/admin/server_status.php

@@ -1 +1 @@
-<?php
-/**
-- Virtual Hosting Control System | Omega Version
+a Virtual Hosting Control System
- *
- *  @copyright  2001-2006 by moleSoftware GmbH
@@ -17 +17 @@
- *  http://opensource.org | osi@opensource.org
- **/
-
+
-include '../include/ispcp-lib.php';
-
@@ -154 +154 @@
-        } //while
-
-        /*
-        $ispcp_status->AddService('localhost', 21, 'FTP', 'tcp');
-        $ispcp_status->AddService('localhost', 22, 'SSH', 'tcp');
-        $ispcp_status->AddService('localhost', 23, 'Telnet', 'tcp');
-        $ispcp_status->AddService('localhost', 25, 'SMTP', 'tcp');
-        $ispcp_status->AddService('localhost', 53, 'DNS', 'tcp');
-        $ispcp_status->AddService('localhost', 80, 'HTTP', 'tcp');
-        $ispcp_status->AddService('localhost', 443, 'HTTP-SSL', 'tcp');
-        $ispcp_status->AddService('localhost', 110, 'POP3', 'tcp');
-        $ispcp_status->AddService('localhost', 995, 'POP3-SSL', 'tcp');
-        $ispcp_status->AddService('localhost', 143, 'IMAP', 'tcp');
-        $ispcp_status->AddService('localhost', 993, 'IMAP-SSL', 'tcp');
-        */
-        $ispcp_status->CheckStatus(5);
-        $data = $ispcp_status->GetStatus();

trunk/gui/admin/settings_ports.php

@@ -1 +1 @@
-<?php
-/**
-- Virtual Hosting Control System | Omega Version
+a Virtual Hosting Control System
- *
- *  @copyright  2001-2006 by moleSoftware GmbH
@@ -214 +214 @@
-                                                                'PORT_READONLY' => 'readonly',
-                                                                'PROTOCOL_READONLY' => 'disabled',
-tr('Delete')
+'-'
-                                                                'PORT_DELETE_LINK' => ''
-                                                        )

trunk/gui/client/add_mail_acc.php

@@ -432 +432 @@
-        }
-        // Not permitted chars
-]{6,15
+-_]{6,50
-            set_page_message(tr('Password data includes not permitted signs!'));
-            return;

trunk/gui/include/admin-functions.php

@@ -22 +22 @@
- *
- * source: php.net/manual/en/function.mail.php
- 
+
- * input:
- *   string $in_str - string to be encoded [should be in the $charset charset]
@@ -35 +35 @@
-{
-    $out_str = $in_str;
- 
-  
+
+
-        // define start delimimter, end delimiter and spacer
-        $end = "?=";
-        $start = "=?" . $charset . "?B?";
-        $spacer = $end . "\r\n " . $start;
-
+
-        // determine length of encoded text within chunks
-        // and ensure length is even
-        $length = 75 - strlen($start) - strlen($end);
-        $length = floor($length/4) * 4;
-
+
-        // encode the string and split it into chunks
-        // with spacers after each chunk
-        $out_str = base64_encode($out_str);
-        $out_str = chunk_split($out_str, $length, $spacer);
-
+
-        // remove trailing spacer and
-        // add start and end delimiters
@@ -470 +470 @@
-                                        'TR_DELETE' => tr('Delete'),
-                                        'URL_DELETE_ADMIN' => "delete_user.php?delete_id=".$rs -> fields['admin_id']."&delete_username=".$rs -> fields['admin_name'],
- 
+
-                                        )
-                        );
@@ -1772 +1772 @@
-        $from_email = $data['sender_email'];
-
-        $subject = encode ($data['subject']);
-
-        $message = $data['message'];
-
@@ -1811 +1809 @@
-        $message = preg_replace("/\{PASSWORD\}/", $password, $message);
-        $message = preg_replace("/\{BASE_SERVER_VHOST\}/", $base_vhost, $message);
+
+        $subject = encode($data['subject']);
-
-        $headers = "From: $from\n";