Changeset 1334

Timestamp:

08/26/08 22:01:11 (3 months ago)

Author:

scitech

Message:

Fixed #1508: Don't show the Member of group line on protected_user_assign.php if no group memberships Fixed #1468: Are you sure you want to delete %s? | custumers domain management Fixed #1503: Debian Etch postfix-tls is a virtual package of postfix Fixed #1485: master.cf in gentoo shouldn't have default of chroot for smtp (thanks pgentoo)

Files:

• trunk/CHANGELOG (modified) (1 diff)
• trunk/configs/gentoo/postfix/master.cf (modified) (2 diffs)
• trunk/docs/Debian/debian-packages-etch (modified) (1 diff)
• trunk/gui/client/protected_user_assign.php (modified) (11 diffs)
• trunk/gui/themes/omega_original/client/domains_manage.tpl (modified) (1 diff)
• trunk/gui/themes/omega_original/client/puser_assign.tpl (modified) (3 diffs)

trunk/CHANGELOG

@@ -1 +1 @@
-ispCP ω 1.0.0 Changelog
-~~~~~~~~~~~~~~~~~~~~~~~~~~~
+2008-08-26 Daniel Andreca
+        - GUI:
+                * Fixed #1508: Don't show the "Member of group" line on protected_user_assign.php if no group memberships
+                * Fixed #1468: Are you sure you want to delete %s? | custumers domain management
+        - CONFIGS:
+                * Fixed #1503: Debian Etch postfix-tls is a virtual package of postfix
+                * Fixed #1485: master.cf in gentoo shouldn't have default of chroot for smtp (thanks pgentoo)
+
-2008-08-20 Daniel Andreca
-        - ENGINE:

trunk/configs/gentoo/postfix/master.cf

@@ -7 +7 @@
-#               (yes)   (yes)   (yes)   (never) (100)
-# ==========================================================================
--
+n
-#submission inet n       -       -       -       -       smtpd
-#  -o smtpd_enforce_tls=yes
@@ -32 +32 @@
-flush     unix  n       -       -       1000?   0       flush
-proxymap  unix  -       -       n       -       -       proxymap
--
+n
-# When relaying mail as backup MX, disable fallback_relay to avoid MX loops
-relay     unix  -       -       -       -       -       smtp

trunk/docs/Debian/debian-packages-etch

@@ -69 +69 @@
-policyd-weight
-postfix
-postfix-tls
-postgrey
-procmail

trunk/gui/client/protected_user_assign.php

@@ -31 +31 @@
-$tpl->define_dynamic('add_button', 'page');
-$tpl->define_dynamic('remove_button', 'page');
+$tpl->define_dynamic('in_group', 'page');
+$tpl->define_dynamic('not_in_group', 'page');
-
-$theme_color = Config::get('USER_INITIAL_THEME');
@@ -43 +45 @@
-// ** Functions
-function get_htuser_name(&$sql, &$uuser_id, &$dmn_id) {
-<<<SQL_QUERY
-
-
-
-
-
-             dmn_id
-
-id
-SQL_QUERY
+"
+
+
+
+
+
+                       `dmn_id`
+
+`id`
+       "
-
-        $rs = exec_query($sql, $query, array($dmn_id, $uuser_id));
@@ -80 +82 @@
-        }
-        // get groups
-<<<SQL_QUERY
-
-            
-
-
-
-             dmn_id
-SQL_QUERY
+"
+
+                       
+
+
+
+                       `dmn_id`
+       "
-
-        $rs = exec_query($sql, $query, array($dmn_id));
@@ -110 +112 @@
-                                if ($uuser_id == $members[$i]) {
-                                        $tpl->assign(
-
+
+
-                                                        'GRP_IN_ID' => $group_id,
-       
-       
+
+
-
-                                        $tpl->parse('ALREADY_IN', '.already_in');
@@ -122 +125 @@
-                        if ($grp_in !== $group_id) {
-                                $tpl->assign(
-
+
+
-                                                'GRP_ID' => $group_id,
-       
-       
+
+
-                                $tpl->parse('GRP_AVLB', '.grp_avlb');
-                                $not_added_in ++;
@@ -134 +138 @@
-                // generate add/remove buttons
-                if ($added_in < 1) {
-
-
+
-                }
-                if ($not_added_in < 1) {
-
-
+
-                }
-        }
@@ -149 +151 @@
-                $group_id = $_POST['groups'];
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-                $rs = exec_query($sql, $query, array($dmn_id, $group_id));
-
@@ -172 +175 @@
-                $change_status = Config::get('ITEM_CHANGE_STATUS');
-
-<<<SQL_QUERY
-       update
-       htaccess_groups
-       set
-       members
-       status
-       where
-       id
-               and
-       dmn_id
-SQL_QUERY
+"
+UPDATE
+`htaccess_groups`
+SET
+`members`
+`status`
+WHERE
+`id`
+AND
+`dmn_id`
+               "
-
-                $rs_update = exec_query($sql, $update_query, array($members, $change_status, $group_id, $dmn_id));
@@ -188 +191 @@
-                $change_status = Config::get('ITEM_CHANGE_STATUS');
-
-<<<SQL_QUERY
-       update
-       htaccess
-       set
-       status
-       where
-       dmn_id
-SQL_QUERY
+"
+UPDATE
+`htaccess`
+SET
+`status`
+WHERE
+`dmn_id`
+               "
-
-                $rs_update_htaccess = exec_query($sql, $query, array($change_status, $dmn_id));
@@ -212 +215 @@
-                $uuser_id = clean_input($_POST['nadmin_name']);
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-                $rs = exec_query($sql, $query, array($dmn_id, $group_id));
-
@@ -233 +237 @@
-                $members = preg_replace("/,$/", "", "$members");
-
-<<<SQL_QUERY
-       update
-       htaccess_groups
-       set
-       members
-       where
-       id
-       and
-       dmn_id
-SQL_QUERY
+"
+UPDATE
+`htaccess_groups`
+SET
+`members`
+WHERE
+`id`
+AND
+`dmn_id`
+               "
-
-                $rs_update = exec_query($sql, $update_query, array($members, $group_id, $dmn_id));
-
-                $change_status = Config::get('ITEM_CHANGE_STATUS');
-<<<SQL_QUERY
-update
-htaccess
-set
-status
-where
-dmn_id
-SQL_QUERY
+"
+UPDATE
+`htaccess`
+SET
+`status`
+WHERE
+`dmn_id`
+               "
-                $rs_update_htaccess = exec_query($sql, $query, array($change_status, $dmn_id));
-

trunk/gui/themes/omega_original/client/domains_manage.tpl

@@ -9 +9 @@
-<script type="text/javascript">
-<!--
-
-"{TR_MESSAGE_DELETE}"
+,alias_or_subdomain
+sprintf("{TR_MESSAGE_DELETE}", alias_or_subdomain)
-                return false;
-        location = url;

trunk/gui/themes/omega_original/client/puser_assign.tpl

@@ -53 +53 @@
-                      <td colspan="3" class="content3"><strong>{UNAME}</strong></td>
-                    </tr>
+                    <!-- BDP: in_group -->
-                    <tr>
-                      <td width="25">&nbsp;</td>
@@ -66 +67 @@
-                      </td>
-                    </tr>
+                    <!-- EDP: in_group -->
+                    <!-- BDP: not_in_group -->
-                    <tr>
-
-
+ width="25"
+width="200" 
-                      <td class="content"><select name="groups">
-                          <!-- BDP: grp_avlb -->
@@ -80 +83 @@
-                      </td>
-                    </tr>
+                    <!-- EDP: not_in_group -->
-                    <tr>
-                      <td>&nbsp;</td>