Changeset 1350

Timestamp:

09/15/08 12:36:00 (3 months ago)

Author:

scitech

Message:

Fixed #1396: Wordwrap in ticket system (admin / client). Fixed #1506: Email edit link inconsistent with other pages. Fixed #1534: Setup script fails if the same username is always used

Files:

• trunk/CHANGELOG (modified) (1 diff)
• trunk/engine/setup/ispcp-setup (modified) (2 diffs)
• trunk/engine/setup/ispcp-setup-methods.pl (modified) (2 diffs)
• trunk/gui/admin/ticket_view.php (modified) (2 diffs)
• trunk/gui/client/mail_accounts.php (modified) (7 diffs)
• trunk/gui/client/ticket_view.php (modified) (1 diff)
• trunk/gui/themes/omega_original/client/mail_accounts.tpl (modified) (3 diffs)

trunk/CHANGELOG

@@ -1 +1 @@
-ispCP ω 1.0.0 Changelog
-~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-                * Fixed #1535: Wrong error text in user Email creation
-
+ (resseler)
-                * Fixed #1533 Hardcoded FTP sepparator
-

trunk/engine/setup/ispcp-setup

@@ -156 +156 @@
-        #
-
-
-
+
+
+
-
-        do {
@@ -167 +168 @@
-        #
-
-
-
+
+
+
-
-        do {

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

@@ -234 +234 @@
-                $main::ua{'db_ftp_user'} = $db_user;
-        }
-
+
+
+
+
+
-                $main::ua{'db_ftp_user'} = $rdata;
-        }
@@ -471 +475 @@
-        if (!defined($rdata) || $rdata eq '') {
-                $main::ua{'db_pma_user'} = $db_user;
+        } elsif( $rdata eq $main::ua{'db_user'}){
+                $qmsg = "\n\tphpMyAdmin Control user must not be identical to system SQL user!";
+                print STDOUT $qmsg;
+                return 1;
+        } elsif ($rdata eq $main::ua{'db_ftp_user'}) {
+                $qmsg = "\n\tphpMyAdmin Control user must not be identical to ftp SQL user!";
+                print STDOUT $qmsg;
+                return 1;
-        } else {
-                $main::ua{'db_pma_user'} = $rdata;

trunk/gui/admin/ticket_view.php

@@ -146 +146 @@
-                $ticket_subject = $rs->fields['ticket_subject'];
-                $ticket_date = clean_html($rs->fields['ticket_date']);
-clean_html(nl2br($rs->fields['ticket_message'])
+wordwrap(html_entity_decode($rs->fields['ticket_message']), round(($screenwidth-200) / 7), "\n"
-
-                $date_formt = Config::get('DATE_FORMAT');
@@ -152 +152 @@
-                        array(
-                                'DATE' => date($date_formt, $rs->fields['ticket_date']),
-
-
+
-                                )
-                        );

trunk/gui/client/mail_accounts.php

@@ -47 +47 @@
-function gen_user_mail_action($mail_id, $mail_status) {
-        if ($mail_status === Config::get('ITEM_OK_STATUS')) {
-
-
-
+tr('Edit'), 
+
+tr('N/A'), 
-        }
-}
@@ -122 +122 @@
-                        }
-
-action, $mail_action_scrip
+delete, $mail_delete_script, $mail_edi
-
-                        $mail_acc = decode_idna($rs->fields['mail_acc']);
@@ -139 +139 @@
-                                        'MAIL_TYPE'                     => $mail_type,
-                                        'MAIL_STATUS'           => translate_dmn_status($rs->fields['status']),
-
-
+
+
+
-                                        'MAIL_EDIT_SCRIPT'      => $mail_edit_script
-                                )
@@ -200 +201 @@
-                        }
-
-action, $mail_action_scrip
+delete, $mail_delete_script, $mail_edi
-
-                        $mail_acc = decode_idna($rs->fields['mail_acc']);
@@ -216 +217 @@
-
-                        $tpl->assign(
-
+
+
-                                        'MAIL_TYPE'                     => $mail_type,
-                                        'MAIL_STATUS'           => translate_dmn_status($rs->fields['status']),
-
-
+
+
+
-                                        'MAIL_EDIT_SCRIPT'      => $mail_edit_script
-                                )
@@ -279 +282 @@
-                                $tpl->assign('ITEM_CLASS', 'content2');
-                        }
-action, $mail_action_scrip
+delete, $mail_delete_script, $mail_edi
-
-                        $mail_acc = decode_idna($rs->fields['mail_acc']);
@@ -298 +301 @@
-                                        'MAIL_TYPE'                     => $mail_type,
-                                        'MAIL_STATUS'           => translate_dmn_status($rs->fields['status']),
-
-
+
+
+
-                                        'MAIL_EDIT_SCRIPT'      => $mail_edit_script
-                                        )

trunk/gui/client/ticket_view.php

@@ -124 +124 @@
-                $ticket_date = $rs->fields['ticket_date'];
-                $ticket_message = clean_input($rs->fields['ticket_message']);
+                $ticket_content = wordwrap(html_entity_decode($rs->fields['ticket_message']), round(($screenwidth-200) / 7), "\n");
-
-                $date_formt = Config::get('DATE_FORMAT');
-
-
-
-
+
+
+
+
+
+
-                get_ticket_from($tpl, $sql, $ticket_id);
-                $tpl->parse('TICKETS_ITEM', '.tickets_item');

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

@@ -64 +64 @@
-                    <!-- BDP: page_message -->
-                <tr>
-4
+5
-                </tr>
-                <tr>
@@ -71 +71 @@
-                   <td nowrap="nowrap" class="content3" width="150"><b>{TR_TYPE}</b></td>
-                   <td nowrap="nowrap" class="content3" align="center" width="180"><b>{TR_STATUS}</b></td>
-
+ colspan="5"
-                </tr>
-                    <!-- BDP: mail_message -->
-                <tr>
-4
+5
-                </tr>
-                    <!-- EDP: mail_message -->
-                    <!-- BDP: mail_item -->
-                <tr>
- <a href="{MAIL_EDIT_SCRIPT}" class="link">{MAIL_ACC}</a>
+&nbsp;{MAIL_ACC}
-                          <!-- BDP: auto_respond --><div style="display: {AUTO_RESPOND_VIS};">
-                                                  <br><span class="style1">
@@ -92 +92 @@
-                   <td nowrap="nowrap" class="{ITEM_CLASS}" width="150">{MAIL_TYPE}</td>
-                   <td nowrap="nowrap" class="{ITEM_CLASS}" align="center" width="180">{MAIL_STATUS}</td>
-
+
+
-                    </tr>
-                    <!-- EDP: mail_item -->
-                    <!-- BDP: mails_total -->
-                    <tr>
-4
+5
-                    </tr>
-                    <!-- EDP: mails_total -->