Changeset 1020

Timestamp:

02/25/08 02:39:40 (9 months ago)

Author:

joximu

Message:

fixed several bugs, #747, #1047, #1068 a.o.

Files:

• trunk/CHANGELOG (modified) (1 diff)
• trunk/gui/client/add_alias.php (modified) (2 diffs)
• trunk/gui/client/add_ftp_acc.php (modified) (1 diff)
• trunk/gui/client/add_mail_acc.php (modified) (8 diffs)
• trunk/gui/include/admin-functions.php (modified) (1 diff)
• trunk/gui/include/ispcp-lib.php (modified) (1 diff)
• trunk/gui/include/reseller-functions.php (modified) (1 diff)
• trunk/gui/reseller/add_alias.php (modified) (2 diffs)
• trunk/gui/reseller/domainaliasorder.php (modified) (2 diffs)
• trunk/gui/reseller/rau3.php (modified) (2 diffs)
• trunk/gui/tools/filemanager/skins/omega/css/main.css.php (modified) (1 diff)

trunk/CHANGELOG

@@ -2 +2 @@
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-        - GUI:
-                * Some small fixes: domain_statistics & some "remove this" messages
-
-2008-02-25 Jochen Manz
-        - GUI:
-                * Corrected some small issues and increased the speed of the db update
-
-2008-02-24 Benedikt Heintel

trunk/gui/client/add_alias.php

@@ -227 +227 @@
-        $status = $cfg['ITEM_ORDERED_STATUS'];
-
-  
+       
-        exec_query($sql, $query, array($cr_user_id, $alias_name, $mount_point, $status, $domain_ip, $forward));
-
-        $als_id = $sql->Insert_ID();
-
-
+/*
-
-            $reseller_id = who_owns_this(who_owns_this($cr_user_id, 'dmn_id'), 'user');
@@ -284 +284 @@
-                '_no_'));
-        }
-
+
-        $admin_login = $_SESSION['user_logged'];
-

trunk/gui/client/add_ftp_acc.php

@@ -412 +412 @@
-    if ($ftp_uid == -1) return;
-
-FTP
+CMD
-    $ftp_passwd = crypt_user_ftp_pass($_POST['pass']);
-

trunk/gui/client/add_mail_acc.php

@@ -3 +3 @@
- * ispCP ω (OMEGA) a Virtual Hosting Control System
- *
- 
- 
- 
-       
-     
+
+
+
+
+
- *
- * @license
@@ -208 +208 @@
-    global $cfg;
-
+    // 20080218: added support for the mail_addr field: complete mail address in the db
+
-    // standard whithout encoding
-    // $mail_acc = $_POST['username'];
@@ -219 +221 @@
-    }
-    $mail_auto_respond = '_no_';
+    $mail_addr = '';
-
-    if ($_POST['mail_type'] === 'normal') {
@@ -226 +229 @@
-            $mail_type = 'normal_mail';
-            $sub_id = '0';
+            $mail_addr = $mail_acc.'@'.$dmn_name; // the complete address
-        }
-        else if ($_POST['dmn_type'] === 'sub') {
@@ -232 +236 @@
-            $mail_type = 'subdom_mail';
-            $sub_id = $_POST['sub_id'];
+            // search the complete address
+            $query = <<<SQL_QUERY
+                SELECT
+                    `subdomain_name`
+                FROM
+                    `subdomain`
+                WHERE
+                    `subdomain_id` = ?
+SQL_QUERY;
+            $rs = exec_query($sql, $query, array($sub_id));
+            $mail_addr = $mail_acc.'@'.decode_idna($rs->fields['subdomain_name']).'.'.$dmn_name; // the complete address
-        }
-        else if ($_POST['dmn_type'] === 'als') {
@@ -238 +253 @@
-            $mail_type = 'alias_mail';
-            $sub_id = $_POST['als_id'];
+            // search the complete address
+            $query = <<<SQL_QUERY
+                SELECT
+                    `alias_name`
+                FROM
+                    `domain_aliasses`
+                WHERE
+                    `alias_id` = ?
+SQL_QUERY;
+            $rs = exec_query($sql, $query, array($sub_id));
+            $mail_addr = $mail_acc.'@'.decode_idna($rs->fields['alias_name']); // the complete address
-        } else {
-            set_page_message(tr('Unknown domain type'));
@@ -330 +356 @@
-             sub_id,
-             status,
-
+
+
-        VALUES
-
+, ?
-SQL_QUERY;
-
@@ -342 +369 @@
-            $sub_id,
-            $cfg['ITEM_ADD_STATUS'],
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-    set_page_message(tr('Mail account scheduled for addition!'));
-    send_request();

trunk/gui/include/admin-functions.php

@@ -105 +105 @@
-                        'TR_MENU_SERVER_STATUS' => tr('Server status'),
-                        'TR_MENU_ISPCP_UPDATE' => tr('ispCP updates'),
+                        'TR_MENU_ISPCP_DATABASE_UPDATE' => tr('ispCP database updates'),
-                        'TR_MENU_ISPCP_DEBUGGER' => tr('ispCP debugger'),
-                        'TR_CUSTOM_MENUS' => tr('Custom menus'),

trunk/gui/include/ispcp-lib.php

@@ -39 +39 @@
-require_once(INCLUDEPATH.'/sql.php');
-
-tn
+nt
-// false = disable, true = enable
-$cfg['DUMP_GUI_DEBUG'] = false;

trunk/gui/include/reseller-functions.php

@@ -1661 +1661 @@
-}
-
+// add the 3 mail accounts/forwardings to a new domain...
+function client_mail_add_default_accounts($dmn_id, $user_email, $dmn_part, $dmn_type = 'domain', $sub_id = 0)
+{
+        global $cfg, $sql;
+
+        if ($cfg['CREATE_DEFAULT_EMAIL_ADDRESSES']) {
+
+                $forward_type = ($dmn_type == 'alias') ? 'alias_forward': 'normal_forward';
+
+                // prepare SQL
+                $query = <<<SQL_QUERY
+        INSERT INTO mail_users
+                (mail_acc,
+                 mail_pass,
+                 mail_forward,
+                 domain_id,
+                 mail_type,
+                 sub_id,
+                 status,
+                 mail_auto_respond,
+                 quota,
+                 mail_addr)
+        VALUES
+                (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+SQL_QUERY;
+
+                // create default forwarder for webmaster@domain.tld to the account's owner
+                $rs = exec_query($sql, $query, 
+                        array('webmaster',
+                                '_no_',
+                                $user_email,
+                                $dmn_id,
+                                $forward_type,
+                                $sub_id,
+                                $cfg['ITEM_ADD_STATUS'],
+                                '_no_',
+                                10485760,
+                                'webmaster@'.$dmn_part
+                        )
+                );
+
+                // create default forwarder for postmaster@domain.tld to the account's reseller
+                $rs = exec_query($sql, $query, 
+                        array('postmaster',
+                                '_no_',
+                                $_SESSION['user_email'],
+                                $dmn_id,
+                                $forward_type,
+                                $sub_id,
+                                $cfg['ITEM_ADD_STATUS'],
+                                '_no_',
+                                10485760,
+                                'postmaster@'.$dmn_part
+                        )
+                );
+
+                // create default forwarder for abuse@domain.tld to the account's reseller
+                $rs = exec_query($sql, $query, 
+                        array('abuse',
+                                '_no_',
+                                $_SESSION['user_email'],
+                                $dmn_id,
+                                $forward_type,
+                                $sub_id,
+                                $cfg['ITEM_ADD_STATUS'],
+                                '_no_',
+                                10485760,
+                                'abuse@'.$dmn_part
+                        )
+                );
+
+        }
+
+} // end client_mail_add_default_accounts
+
+
-?>

trunk/gui/reseller/add_alias.php

@@ -193 +193 @@
-                $user_email = $rs->fields['email'];
-
+        // Create the 3 default addresses if wanted
+        if ($cfg['CREATE_DEFAULT_EMAIL_ADDRESSES']) client_mail_add_default_accounts($cr_user_id, $user_email, $alias_name, 'alias', $als_id);
+/*
-    if ($cfg['CREATE_DEFAULT_EMAIL_ADDRESSES']) {
-        $query = <<<SQL_QUERY
@@ -238 +241 @@
-                '_no_'));
-    }
-
+
-        send_request();
-        $admin_login = $_SESSION['user_logged'];

trunk/gui/reseller/domainaliasorder.php

@@ -57 +57 @@
-        $query = "SELECT alias_name FROM domain_aliasses WHERE alias_id=?";
-        $rs = exec_query($sql, $query, $act_id);
-       
-       
-       
-       
+
+
+
+
-        $alias_name = $rs -> fields['alias_name'];
-
@@ -66 +66 @@
-        $rs = exec_query($sql, $query, $act_id);
-
+        $domain_id = who_owns_this($act_id, 'als_id', true);
+        $query = 'SELECT `email` FROM `admin`, `domain` WHERE `admin`.`admin_id` = `domain`.`domain_admin_id` AND `domain`.`domain_id`= ?';
+        $rs = exec_query($sql, $query, $domain_id);
+        if ($rs -> RecordCount() == 0) {
+                header('Location: domain_alias.php');
+                die();
+        }
+        $user_email = $rs -> fields['email'];
+        // Create the 3 default addresses if wanted
+        if ($cfg['CREATE_DEFAULT_EMAIL_ADDRESSES']) client_mail_add_default_accounts($domain_id, $user_email, $alias_name, 'alias', $act_id);
+
-        // enable "ordered"/pending email accounts
-
+
-        $query = "UPDATE mail_users SET status=? WHERE sub_id=? AND domain_id = ? AND status=? AND mail_type LIKE 'alias%'";
-        $rs = exec_query($sql, $query, array($cfg['ITEM_ADD_STATUS'], $act_id, $domain_id, $cfg['ITEM_ORDERED_STATUS']));

trunk/gui/reseller/rau3.php

@@ -327 +327 @@
-        $dmn_id = $sql->Insert_ID();
-
+        // Create the 3 default addresses if wanted
+        if ($cfg['CREATE_DEFAULT_EMAIL_ADDRESSES']) client_mail_add_default_accounts($dmn_id, $user_email, $dmn_name); // 'domain', 0
+
+/*
-        if ($cfg['CREATE_DEFAULT_EMAIL_ADDRESSES']) {
-                $query = <<<SQL_QUERY
@@ -372 +376 @@
-                                '_no_'));
-        }
-
+
-        // add_domain_extras($dmn_id, $record_id, $sql);
-        // lets send mail to user

trunk/gui/tools/filemanager/skins/omega/css/main.css.php

@@ -363 +363 @@
-
-#buttonsright {
-margin-top: 88px;
-
+position: relative; 
+top: 68px; 
-}
-.login {