Development

Wiki Start
Wishlist
Timeline
Roadmap
Browse Source
New Ticket
View Tickets

Changeset 1245

Show
Ignore:
Timestamp:
06/29/08 00:11:22 (2 months ago)
Author:
rats
Message:

GUI Update 3/5: client

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/gui/client/add_mail_acc.php

    r1241 r1245  
    3737$tpl->define_dynamic('js_not_domain', 'page');                  //JavaScript has to be generated, too 
    3838 
    39  
    4039// page functions. 
    4140 
    …… 
    6160            } 
    6261 
    63             $tpl->assign(array('USERNAME' => clean_input($_POST['username']), 
    64                     'DOMAIN_NAME' => $dmn_name, 
    65                     'MAIL_DMN_CHECKED' => ($_POST['dmn_type'] === 'dmn') ? "checked=\"checked\"" : "", 
    66                     'MAIL_ALS_CHECKED' => ($_POST['dmn_type'] === 'als') ? "checked=\"checked\"" : "", 
    67                     'MAIL_SUB_CHECKED' => ($_POST['dmn_type'] === 'sub') ? "checked=\"checked\"" : "", 
    68                     'NORMAL_MAIL_CHECKED' => ($_POST['mail_type_normal']) ? "checked=\"checked\"" : "", 
    69                     'FORWARD_MAIL_CHECKED' => ($_POST['mail_type_forward']) ? "checked=\"checked\"" : "", 
    70                     'FORWARD_LIST' => $f_list)); 
     62            $tpl->assign( 
     63                                        array( 
     64                                                'USERNAME' => clean_input($_POST['username']), 
     65                            'DOMAIN_NAME' => $dmn_name, 
     66                            'MAIL_DMN_CHECKED' => ($_POST['dmn_type'] === 'dmn') ? "checked=\"checked\"" : "", 
     67                            'MAIL_ALS_CHECKED' => ($_POST['dmn_type'] === 'als') ? "checked=\"checked\"" : "", 
     68                            'MAIL_SUB_CHECKED' => ($_POST['dmn_type'] === 'sub') ? "checked=\"checked\"" : "", 
     69                            'NORMAL_MAIL_CHECKED' => (isset($_POST['mail_type_normal'])) ? "checked=\"checked\"" : "", 
     70                            'FORWARD_MAIL_CHECKED' => (isset($_POST['mail_type_forward'])) ? "checked=\"checked\"" : "", 
     71                            'FORWARD_LIST' => $f_list 
     72                                                ) 
     73                                        ); 
    7174    } 
    7275} 
    …… 
    9093    $rs = exec_query($sql, $query, array($dmn_id, $ok_status)); 
    9194    if ($rs->RecordCount() == 0) { 
    92         $tpl->assign(array('ALS_ID' => '0', 
    93                 'ALS_SELECTED' => 'selected', 
    94                 'ALS_NAME' => tr('Empty list'))); 
     95        $tpl->assign( 
     96                                array( 
     97                                        'ALS_ID' => '0', 
     98                        'ALS_SELECTED' => 'selected', 
     99                        'ALS_NAME' => tr('Empty list') 
     100                                        ) 
     101                                ); 
    95102        $tpl->parse('ALS_LIST', 'als_list'); 
    96103        $tpl->assign('TO_ALIAS_DOMAIN', ''); 
    97104        $_SESSION['alias_count'] = "no"; 
    98     } 
    99         else { 
     105    } else { 
    100106        $first_passed = false; 
    101107        while (!$rs->EOF) { 
    …… 
    103109                if (!isset($_POST['als_id'])) { 
    104110                    $als_id = ""; 
    105                 } 
    106                                 else { 
     111                } else { 
    107112                    $als_id = $_POST['als_id']; 
    108113                } 
    …… 
    110115                if ($als_id == $rs->fields['alias_id']) { 
    111116                    $als_selected = 'selected'; 
    112                 } 
    113                                 else { 
     117                } else { 
    114118                    $als_selected = ''; 
    115119                } 
    116             } 
    117                         else { 
     120            } else { 
    118121                if (!$first_passed) { 
    119122                    $als_selected = 'selected'; 
    120                 } 
    121                                 else { 
     123                } else { 
    122124                    $als_selected = ''; 
    123125                } 
    …… 
    161163        $tpl->assign('TO_SUBDOMAIN', ''); 
    162164        $_SESSION['subdomain_count'] = "no"; 
    163     } 
    164         else { 
     165    } else { 
    165166        $first_passed = false; 
    166167 
    …… 
    169170                if (!isset($_POST['sub_id'])) { 
    170171                    $sub_id = ""; 
    171                 } 
    172                                 else { 
     172                } else { 
    173173                    $sub_id = $_POST['sub_id']; 
    174174                } 
    …… 
    176176                if ($sub_id == $rs->fields['sub_id']) { 
    177177                    $sub_selected = 'selected'; 
     178                } else { 
     179                    $sub_selected = ''; 
    178180                } 
    179                                 else { 
     181            } else { 
     182                if (!$first_passed) { 
     183                    $sub_selected = 'selected'; 
     184                } else { 
    180185                    $sub_selected = ''; 
    181186                } 
    182187            } 
    183                         else { 
    184                 if (!$first_passed) { 
    185                     $sub_selected = 'selected'; 
    186                 } 
    187                                 else { 
    188                     $sub_selected = ''; 
    189                 } 
    190             } 
    191188 
    192189            $sub_name = decode_idna($rs->fields['sub_name']); 
    193190            $dmn_name = decode_idna($dmn_name); 
    194             $tpl->assign(array('SUB_ID' => $rs->fields['sub_id'], 
    195                     'SUB_SELECTED' => $sub_selected, 
    196                     'SUB_NAME' => $sub_name . '.' . $dmn_name)); 
     191            $tpl->assign( 
     192                                        array( 
     193                                                'SUB_ID' => $rs->fields['sub_id'], 
     194                        'SUB_SELECTED' => $sub_selected, 
     195                        'SUB_NAME' => $sub_name . '.' . $dmn_name 
     196                                                ) 
     197                                        ); 
    197198            $tpl->parse('SUB_LIST', '.sub_list'); 
    198199            $rs->MoveNext(); 
    199200 
    200             if (!$first_passed) $first_passed = true; 
     201            if (!$first_passed) 
     202                                $first_passed = true; 
    201203        } 
    202204    } 
    …… 
    286288 
    287289                        $mail_forward = $_POST['forward_list']; 
    288                         $faray = preg_split ("/[\n,]+/", $mail_forward); 
     290                        $farray = preg_split("/[\n,]+/", $mail_forward); 
    289291                        $mail_accs = array(); 
    290292 
    291                         foreach ($faray as $value) { 
     293                        foreach ($farray as $value) { 
    292294                                $value = trim($value); 
    293295                                if (!chk_email($value) && $value !== '') { 
    …… 
    305307 
    306308                $mail_type = implode(',', $mail_type); 
     309                list($dmn_type, $type) = split('_', $mail_type, 2); 
    307310 
    308311                $check_acc_query = <<<SQL_QUERY 
    …… 
    316319                                `domain_id` = ? 
    317320                                AND 
    318                                 `mail_type` = ? 
     321                                `sub_id` = ? 
    319322                                AND 
    320                                 `sub_id` = ? 
     323                                LEFT (`mail_type`, LOCATE('_', `mail_type`)-1) = ? 
    321324SQL_QUERY; 
    322325 
    323         $rs = exec_query($sql, $check_acc_query, array($mail_acc, $domain_id, $mail_type, $sub_id)); 
     326        $rs = exec_query($sql, $check_acc_query, array($mail_acc, $domain_id, $sub_id, $dmn_type)); 
    324327    } 
    325328 
    …… 
    358361            $mail_addr)); 
    359362 
    360     write_log($_SESSION['user_logged'] . ": add new mail account: " . $mail_addr); 
     363    write_log($_SESSION['user_logged'] . ": adds new mail account: " . (isset($mail_addr) ? $mail_addr : $mail_acc)); 
    361364    set_page_message(tr('Mail account scheduled for addition!')); 
    362365    send_request(); 
    …… 
    366369 
    367370function check_mail_acc_data(&$sql, $dmn_id, $dmn_name) { 
    368     if ($_POST['mail_type'] != 'forward') { 
     371         
     372        $mail_type_normal = isset($_POST['mail_type_normal']) ? $_POST['mail_type_normal'] : false; 
     373        $mail_type_forward = isset($_POST['mail_type_forward']) ? $_POST['mail_type_forward'] : false; 
     374 
     375        if (($mail_type_normal == false) && ($mail_type_forward == false)) { 
     376                set_page_message(tr('Please select at least one mail type!')); 
     377                return; 
     378        } 
     379 
     380    if ($mail_type_normal) { 
    369381        $pass = escapeshellcmd($_POST['pass']); 
    370382        $pass_rep = escapeshellcmd($_POST['pass_rep']); 
    …… 
    376388    } 
    377389 
    378     if ($_POST['mail_type'] === 'normal') { 
    379         if (!isset($pass) || $pass == null || !isset($pass_rep) || $pass_rep == null) { 
     390    if ($mail_type_normal) { 
     391        if (!isset($pass) || $pass == null || !isset($pass_rep) || $pass_rep == null || $pass_rep == '' || $pass == '') { 
    380392            set_page_message(tr('Password data is missing!')); 
    381393            return; 
    …… 
    388400        // Not permitted chars 
    389401        if (!chk_password($pass)) { 
    390             set_page_message(tr('Password data includes not permitted signs!')); 
     402            set_page_message(tr('Password data is shorter than %s signs or includes not permitted signs!'), $cfg['PASSWD_CHARS']); 
    391403            return; 
    392404        } 
    …… 
    394406 
    395407    if ($_POST['dmn_type'] === 'sub' && !isset($_POST['sub_id'])) { 
    396         set_page_message(tr('Subdomain list is empty! You can not add mail accounts!')); 
     408        set_page_message(tr('Subdomain list is empty! You cannot add mail accounts!')); 
    397409        return; 
    398410    } 
    399411 
    400412    if ($_POST['dmn_type'] === 'als' && !isset($_POST['als_id'])) { 
    401         set_page_message(tr('Alias list is empty! You can not add mail accounts!')); 
     413        set_page_message(tr('Alias list is empty! You cannot add mail accounts!')); 
    402414        return; 
    403415    } 
    404416 
    405     if ($_POST['mail_type'] === 'forward' && empty($_POST['forward_list'])) { 
     417    if ($mail_type_forward && empty($_POST['forward_list'])) { 
    406418        set_page_message(tr('Forward list is empty!')); 
    407419        return; 
    …… 
    442454        header("Location: email_accounts.php"); 
    443455        die(); 
    444     } 
    445         else { 
     456    } else { 
    446457        if (!isset($_POST['uaction'])) { 
    447458            gen_page_form_data($tpl, $dmn_name, 'no'); 
    …… 
    449460            gen_dmn_sub_list($tpl, $sql, $dmn_id, $dmn_name, 'no'); 
    450461            gen_page_js($tpl); 
    451         } 
    452                 else if (isset($_POST['uaction']) && $_POST['uaction'] === 'add_user') { 
     462        } else if (isset($_POST['uaction']) && $_POST['uaction'] === 'add_user') { 
    453463            gen_page_form_data($tpl, $dmn_name, 'yes'); 
    454464            gen_dmn_als_list($tpl, $sql, $dmn_id, 'yes'); 
    …… 
    466476        $tpl->assign('JS_TO_ALIAS_DOMAIN', ''); 
    467477        $tpl->assign('JS_TO_ALL_DOMAIN', ''); 
    468     } 
    469         else if (isset($_SESSION['subdomain_count']) && !isset($_SESSION['alias_count'])) { // no subdomains - alaias available 
     478    } else if (isset($_SESSION['subdomain_count']) && !isset($_SESSION['alias_count'])) { // no subdomains - alaias available 
    470479        $tpl->assign('JS_NOT_DOMAIN', ''); 
    471480        $tpl->assign('JS_TO_SUBDOMAIN', ''); 
    472481        $tpl->parse('JS_TO_ALIAS_DOMAIN', 'js_to_alias_domain'); 
    473482        $tpl->assign('JS_TO_ALL_DOMAIN', ''); 
    474     } 
    475         else if (!isset($_SESSION['subdomain_count']) && isset($_SESSION['alias_count'])) { // no alias - subdomain available 
     483    } else if (!isset($_SESSION['subdomain_count']) && isset($_SESSION['alias_count'])) { // no alias - subdomain available 
    476484        $tpl->assign('JS_NOT_DOMAIN', ''); 
    477485        $tpl->parse('JS_TO_SUBDOMAIN', 'js_to_subdomain'); 
    478486        $tpl->assign('JS_TO_ALIAS_DOMAIN', ''); 
    479487        $tpl->assign('JS_TO_ALL_DOMAIN', ''); 
    480     } 
    481         else { // there are subdomains and aliases 
     488    } else { // there are subdomains and aliases 
    482489        $tpl->assign('JS_NOT_DOMAIN', ''); 
    483490        $tpl->assign('JS_TO_SUBDOMAIN', ''); 
    …… 
    526533check_permissions($tpl); 
    527534 
    528 $tpl->assign(array('TR_ADD_MAIL_USER' => tr('Add mail users'), 
    529         'TR_USERNAME' => tr('Username'), 
    530         'TR_TO_MAIN_DOMAIN' => tr('To main domain'), 
    531         'TR_TO_DMN_ALIAS' => tr('To domain alias'), 
    532         'TR_TO_SUBDOMAIN' => tr('To subdomain'), 
    533         'TR_NORMAL_MAIL' => tr('Normal mail'), 
    534         'TR_PASSWORD' => tr('Password'), 
    535         'TR_PASSWORD_REPEAT' => tr('Repeat password'), 
    536         'TR_FORWARD_MAIL' => tr('Forward mail'), 
    537         'TR_FORWARD_TO' => tr('Forward to'), 
    538         'TR_FWD_HELP' => tr("Separate multiple email addresses with a line-break."), 
    539         'TR_ADD' => tr('Add'))); 
     535$tpl->assign( 
     536                array( 
     537                        'TR_ADD_MAIL_USER' => tr('Add mail users'), 
     538                'TR_USERNAME' => tr('Username'), 
     539                'TR_TO_MAIN_DOMAIN' => tr('To main domain'), 
     540                'TR_TO_DMN_ALIAS' => tr('To domain alias'), 
     541                'TR_TO_SUBDOMAIN' => tr('To subdomain'), 
     542                'TR_NORMAL_MAIL' => tr('Normal mail'), 
     543                'TR_PASSWORD' => tr('Password'), 
     544                'TR_PASSWORD_REPEAT' => tr('Repeat password'), 
     545                'TR_FORWARD_MAIL' => tr('Forward mail'), 
     546                'TR_FORWARD_TO' => tr('Forward to'), 
     547                'TR_FWD_HELP' => tr("Separate multiple email addresses with a line-break."), 
     548                'TR_ADD' => tr('Add') 
     549                        ) 
     550                ); 
    540551 
    541552gen_page_message($tpl); 

  • trunk/gui/client/add_sql_database.php

    r1241 r1245  
    138138        $rs = exec_query($sql, $query, array($dmn_id, $db_name)); 
    139139 
    140         write_log($_SESSION['user_logged'] . ": add new SQL database: " . $db_name); 
     140        write_log($_SESSION['user_logged'] . ": adds new SQL database: " . $db_name); 
    141141        set_page_message(tr('SQL database created successfully!')); 
    142142        user_goto('manage_sql.php'); 

  • trunk/gui/client/add_subdomain.php

    r1241 r1245  
    180180        // related to their domains. 
    181181 
    182         write_log($_SESSION['user_logged'] . ": add new subdomain: " . $sub_name); 
     182        write_log($_SESSION['user_logged'] . ": adds new subdomain: " . $sub_name); 
    183183        send_request(); 
    184184} 

  • trunk/gui/client/backup.php

    r1241 r1245  
    6464                ); 
    6565 
    66 function gen_page_awstats($tpl) { 
     66function gen_page_awstats(&$tpl) { 
    6767        $awstats_act = Config::get('AWSTATS_ACTIVE'); 
    6868        if ($awstats_act != 'yes') { 
    …… 
    107107                        'TR_SWITCH_TO_BACKUP' => tr('Switch to backups/ directory'), 
    108108                        'TR_DOWNLOAD_FILE' => tr('Download the files stored in this directory'), 
    109                         'TR_USUALY_NAMED' => tr('(usually named ' . $name . ')'), 
     109                        'TR_USUALY_NAMED' => tr('(usually named') . ' ' . $name . ')', 
    110110                        'TR_RESTORE_BACKUP' => tr('Restore backup'), 
    111111                        'TR_RESTORE_DIRECTIONS' => tr('Click the Restore button and the system will restore the last daily backup'), 

  • trunk/gui/client/change_user_interface.php

    r1241 r1245  
    11<?php 
    22/** 
    3  * ispCP (OMEGA) - Virtual Hosting Control System | Omega Version 
     3 * ispCP ω (OMEGA) a Virtual Hosting Control System 
    44 * 
    5  *  @copyright  2001-2006 by moleSoftware GmbH 
    6  *  @copyright  2006-2007 by ispCP | http://isp-control.net 
    7  *  @link               http://isp-control.net 
    8  *  @author             ispCP Team (2007) 
     5 * @copyright   2001-2006 by moleSoftware GmbH 
     6 * @copyright   2006-2008 by ispCP | http://isp-control.net 
     7 * @version     SVN: $ID$ 
     8 * @link                http://isp-control.net 
     9 * @author              ispCP Team 
    910 * 
    10  *  @license 
    11  *  This program is free software; you can redistribute it and/or modify it under 
    12  *  the terms of the MPL General Public License as published by the Free Software 
    13  *  Foundation; either version 1.1 of the License, or (at your option) any later 
    14  *  version. 
    15  *  You should have received a copy of the MPL Mozilla Public License along with 
    16  *  this program; if not, write to the Open Source Initiative (OSI) 
    17  *  http://opensource.org | osi@opensource.org 
    18  **/ 
    19  
     11 * @license 
     12 *   This program is free software; you can redistribute it and/or modify it under 
     13 *   the terms of the MPL General Public License as published by the Free Software 
     14 *   Foundation; either version 1.1 of the License, or (at your option) any later 
     15 *   version. 
     16 *   You should have received a copy of the MPL Mozilla Public License along with 
     17 *   this program; if not, write to the Open Source Initiative (OSI) 
     18 *   http://opensource.org | osi@opensource.org 
     19 */ 
    2020 
    2121require '../include/ispcp-lib.php'; 
    …… 
    2323check_login(__FILE__); 
    2424 
    25 if (isset($_SESSION['logged_from']) && isset($_SESSION['logged_from_id']) && isset($_GET['action']) && $_GET['action'] == "go_back") { 
     25if (isset($_SESSION['logged_from']) && isset($_SESSION['logged_from_id']) && 
     26        isset($_GET['action']) && $_GET['action'] == "go_back") { 
    2627 
    2728        $from_id = $_SESSION['user_id']; 
    28  
    2929        $to_id   = $_SESSION['logged_from_id']; 
    3030 

  • trunk/gui/client/create_catchall.php

    r1241 r1245  
    279279 
    280280                                send_request(); 
    281                                 write_log($_SESSION['user_logged'] . ": add new email catch all"); 
     281                                write_log($_SESSION['user_logged'] . ": adds new email catch all"); 
    282282                                set_page_message(tr('Catch all account scheduled for creation!')); 
    283283                                user_goto('catchall.php'); 
    …… 
    295295                                $sub_id = '0'; 
    296296                                $domain_id = $item_id; 
    297                                 $query = "SELECT `domain_name` FROM `domain`  
     297                                $query = "SELECT `domain_name` FROM `domain` 
    298298                                        WHERE `domain_id` = ?"; 
    299299                                $rs = exec_query($sql, $query, $domain_id); 
    …… 
    311311                                $mail_type = 'subdom_catchall'; 
    312312                                $sub_id = $item_id; 
    313                                 $query = "SELECT `subdomain`.`domain_id`, `subdomain_name`, `domain_name` FROM `subdomain`, `domain`  
     313                                $query = "SELECT `subdomain`.`domain_id`, `subdomain_name`, `domain_name` FROM `subdomain`, `domain` 
    314314                                        WHERE `subdomain_id` = ? AND `domain`.`domain_id` = `subdomain`.`domain_id`"; 
    315315                                $rs = exec_query($sql, $query, $item_id); 
    …… 
    356356 
    357357                        send_request(); 
    358                         write_log($_SESSION['user_logged'] . ": add new email catch all "); 
     358                        write_log($_SESSION['user_logged'] . ": adds new email catch all "); 
    359359                        set_page_message(tr('Catch all account scheduled for creation!')); 
    360360                        user_goto('catchall.php'); 

  • trunk/gui/client/cronjobs_add.php

    r1241 r1245  
    11<?php 
    22/** 
    3  * ispCP (OMEGA) - Virtual Hosting Control System | Omega Version 
     3 * ispCP ω (OMEGA) a Virtual Hosting Control System 
    44 * 
    5  * @copyright 2001-2006 by moleSoftware GmbH 
    6  * @copyright 2006-2007 by ispCP | http://isp-control.net 
    7  * @link http://isp-control.net 
    8  * @author ispCP Team (2007) 
    9  * @license This program is free software; you can redistribute it and/or modify it under 
     5 * @copyright   2001-2006 by moleSoftware GmbH 
     6 * @copyright   2006-2008 by ispCP | http://isp-control.net 
     7 * @version     SVN: $ID$ 
     8 * @link                http://isp-control.net 
     9 * @author              ispCP Team 
     10 * 
     11 * @license 
     12 *   This program is free software; you can redistribute it and/or modify it under 
    1013 *   the terms of the MPL General Public License as published by the Free Software 
    1114 *   Foundation; either version 1.1 of the License, or (at your option) any later 

  • trunk/gui/client/delete_als.php

    r1241 r1245  
    11<?php 
    22/** 
    3  * ispCP (OMEGA) - Virtual Hosting Control System | Omega Version 
     3 * ispCP ω (OMEGA) a Virtual Hosting Control System 
    44 * 
    5  *  @copyright  2001-2006 by moleSoftware GmbH 
    6  *  @copyright  2006-2007 by ispCP | http://isp-control.net 
    7  *  @link               http://isp-control.net 
    8  *  @author             ispCP Team (2007) 
     5 * @copyright   2001-2006 by moleSoftware GmbH 
     6 * @copyright   2006-2008 by ispCP | http://isp-control.net 
     7 * @version     SVN: $ID$ 
     8 * @link                http://isp-control.net 
     9 * @author              ispCP Team 
    910 * 
    10  * @license 
    11  *  This program is free software; you can redistribute it and/or modify it under 
    12  *  the terms of the MPL General Public License as published by the Free Software 
    13  *  Foundation; either version 1.1 of the License, or (at your option) any later 
    14  *  version. 
    15  *  You should have received a copy of the MPL Mozilla Public License along with 
    16  *  this program; if not, write to the Open Source Initiative (OSI) 
    17  *  http://opensource.org | osi@opensource.org 
    18  **/ 
     11 * @license 
     12 *  This program is free software; you can redistribute it and/or modify it under 
     13 *  the terms of the MPL General Public License as published by the Free Software 
     14 *  Foundation; either version 1.1 of the License, or (at your option) any later 
     15 *  version. 
     16 *  You should have received a copy of the MPL Mozilla Public License along with 
     17 *  this program; if not, write to the Open Source Initiative (OSI) 
     18 *  http://opensource.org | osi@opensource.org 
     19 */ 
    1920 
    2021require '../include/ispcp-lib.php'; 

  • trunk/gui/client/delete_als_order.php

    r1241 r1245  
    44 * 
    55 * @copyright   2001-2006 by moleSoftware GmbH 
    6  * @copyright   2006-2007 by ispCP | http://isp-control.net 
     6 * @copyright   2006-2008 by ispCP | http://isp-control.net 
    77 * @version     SVN: $ID$ 
    88 * @link                http://isp-control.net 

  • trunk/gui/client/delete_catchall.php

    r1241 r1245  
    11<?php 
    22/** 
    3  * ispCP (OMEGA) - Virtual Hosting Control System | Omega Version 
     3 * ispCP ω (OMEGA) a Virtual Hosting Control System 
    44 * 
    5  *  @copyright  2001-2006 by moleSoftware GmbH 
    6  *  @copyright  2006-2007 by ispCP | http://isp-control.net 
    7  *  @link               http://isp-control.net 
    8  *  @author             ispCP Team (2007) 
     5 * @copyright   2001-2006 by moleSoftware GmbH 
     6 * @copyright   2006-2008 by ispCP | http://isp-control.net 
     7 * @version     SVN: $ID$ 
     8 * @link                http://isp-control.net 
     9 * @author              ispCP Team 
    910 * 
    10  *  @license 
    11  *  This program is free software; you can redistribute it and/or modify it under 
    12  *  the terms of the MPL General Public License as published by the Free Software 
    13  *  Foundation; either version 1.1 of the License, or (at your option) any later 
    14  *  version. 
    15  *  You should have received a copy of the MPL Mozilla Public License along with 
    16  *  this program; if not, write to the Open Source Initiative (OSI) 
    17  *  http://opensource.org | osi@opensource.org 
    18  **/ 
    19  
    20  
     11 * @license 
     12 *   This program is free software; you can redistribute it and/or modify it under 
     13 *   the terms of the MPL General Public License as published by the Free Software 
     14 *   Foundation; either version 1.1 of the License, or (at your option) any later 
     15 *   version. 
     16 *   You should have received a copy of the MPL Mozilla Public License along with 
     17 *   this program; if not, write to the Open Source Initiative (OSI) 
     18 *   http://opensource.org | osi@opensource.org 
     19 */ 
    2120 
    2221require '../include/ispcp-lib.php'; 
    …… 
    6059 
    6160  send_request(); 
    62   write_log($_SESSION['user_logged'].": delete email catch all!"); 
     61  write_log($_SESSION['user_logged'].": deletes email catch all!"); 
    6362  set_page_message(tr('Catch all account scheduled for deletion!')); 
    6463  user_goto('catchall.php'); 

  • trunk/gui/client/delete_ftp_acc.php

    r1241 r1245  
    11<?php 
    22/** 
    3  * ispCP (OMEGA) - Virtual Hosting Control System | Omega Version 
     3 * ispCP ω (OMEGA) a Virtual Hosting Control System 
    44 * 
    5  *  @copyright  2001-2006 by moleSoftware GmbH 
    6  *  @copyright  2006-2007 by ispCP | http://isp-control.net 
    7  *  @link               http://isp-control.net 
    8  *  @author             ispCP Team (2007) 
     5 * @copyright   2001-2006 by moleSoftware GmbH 
     6 * @copyright   2006-2008 by ispCP | http://isp-control.net 
     7 * @version     SVN: $ID$ 
     8 * @link                http://isp-control.net 
     9 * @author              ispCP Team 
    910 * 
    10  *  @license 
    11  *  This program is free software; you can redistribute it and/or modify it under 
    12  *  the terms of the MPL General Public License as published by the Free Software 
    13  *  Foundation; either version 1.1 of the License, or (at your option) any later 
    14  *  version. 
    15  *  You should have received a copy of the MPL Mozilla Public License along with 
    16  *  this program; if not, write to the Open Source Initiative (OSI) 
    17  *  http://opensource.org | osi@opensource.org 
    18  **/ 
    19  
    20  
     11 * @license 
     12 *   This program is free software; you can redistribute it and/or modify it under 
     13 *   the terms of the MPL General Public License as published by the Free Software 
     14 *   Foundation; either version 1.1 of the License, or (at your option) any later 
     15 *   version. 
     16 *   You should have received a copy of the MPL Mozilla Public License along with 
     17 *   this program; if not, write to the Open Source Initiative (OSI) 
     18 *   http://opensource.org | osi@opensource.org 
     19 */ 
    2120 
    2221require '../include/ispcp-lib.php'; 
    …… 
    105104  $rs = exec_query($sql, $query, array($ftp_id)); 
    106105 
    107   write_log($_SESSION['user_logged'].": delete FTP account: ".$ftp_name); 
     106  write_log($_SESSION['user_logged'].": deletes FTP account: ".$ftp_name); 
    108107  set_page_message(tr('FTP account deleted successfully!')); 
    109108  user_goto('ftp_accounts.php'); 

  • trunk/gui/client/delete_mail_acc.php

    r1241 r1245  
    102102send_request(); 
    103103$admin_login = decode_idna($_SESSION['user_logged']); 
    104 write_log("$admin_login: delete mail account: " . $data['mail_acc'] . "@" . $dmn_name); 
     104write_log("$admin_login: deletes mail account: " . $data['mail_acc'] . "@" . $dmn_name); 
    105105$maildel = 1; 
    106106session_register("maildel"); 

  • trunk/gui/client/delete_sql_database.php

    r1241 r1245  
    11<?php 
    22/** 
    3  * ispCP (OMEGA) - Virtual Hosting Control System | Omega Version 
     3 * ispCP ω (OMEGA) a Virtual Hosting Control System 
    44 * 
    5  *  @copyright  2001-2006 by moleSoftware GmbH 
    6  *  @copyright  2006-2007 by ispCP | http://isp-control.net 
    7  *  @link               http://isp-control.net 
    8  *  @author             ispCP Team (2007) 
     5 * @copyright   2001-2006 by moleSoftware GmbH 
     6 * @copyright   2006-2008 by ispCP | http://isp-control.net 
     7 * @version     SVN: $ID$ 
     8 * @link                http://isp-control.net 
     9 * @author              ispCP Team 
    910 * 
    10  *  @license 
    11  *  This program is free software; you can redistribute it and/or modify it under 
    12  *  the terms of the MPL General Public License as published by the Free Software 
    13  *  Foundation; either version 1.1 of the License, or (at your option) any later 
    14  *  version. 
    15  *  You should have received a copy of the MPL Mozilla Public License along with 
    16  *  this program; if not, write to the Open Source Initiative (OSI) 
    17  *  http://opensource.org | osi@opensource.org 
    18  **/ 
    19  
     11 * @license 
     12 *   This program is free software; you can redistribute it and/or modify it under 
     13 *   the terms of the MPL General Public License as published by the Free Software 
     14 *   Foundation; either version 1.1 of the License, or (at your option) any later 
     15 *   version. 
     16 *   You should have received a copy of the MPL Mozilla Public License along with 
     17 *   this program; if not, write to the Open Source Initiative (OSI) 
     18 *   http://opensource.org | osi@opensource.org 
     19 */ 
    2020 
    2121require '../include/ispcp-lib.php'; 

  • trunk/gui/client/delete_sub.php

    r1241 r1245  
    11<?php 
    22/** 
    3  * ispCP (OMEGA) - Virtual Hosting Control System | Omega Version 
     3 * ispCP ω (OMEGA) a Virtual Hosting Control System 
    44 * 
    5  *  @copyright  2001-2006 by moleSoftware GmbH 
    6  *  @copyright  2006-2007 by ispCP | http://isp-control.net 
    7  *  @link               http://isp-control.net 
    8  *  @author             ispCP Team (2007) 
     5 * @copyright   2001-2006 by moleSoftware GmbH 
     6 * @copyright   2006-2008 by ispCP | http://isp-control.net 
     7 * @version     SVN: $ID$ 
     8 * @link                http://isp-control.net 
     9 * @author              ispCP Team 
    910 * 
    10  * @license 
    11  *  This program is free software; you can redistribute it and/or modify it under 
    12  *  the terms of the MPL General Public License as published by the Free Software 
    13  *  Foundation; either version 1.1 of the License, or (at your option) any later 
    14  *  version. 
    15  *  You should have received a copy of the MPL Mozilla Public License along with 
    16  *  this program; if not, write to the Open Source Initiative (OSI) 
    17  *  http://opensource.org | osi@opensource.org 
    18  **/ 
     11 * @license 
     12 *  This program is free software; you can redistribute it and/or modify it under 
     13 *  the terms of the MPL General Public License as published by the Free Software 
     14 *  Foundation; either version 1.1 of the License, or (at your option) any later 
     15 *  version. 
     16 *  You should have received a copy of the MPL Mozilla Public License along with 
     17 *  this program; if not, write to the Open Source Initiative (OSI) 
     18 *  http://opensource.org | osi@opensource.org 
     19 */ 
    1920 
    2021require '../include/ispcp-lib.php'; 
    …… 
    6869  $rs = exec_query($sql, $query, array($sub_id)); 
    6970  send_request(); 
    70   write_log($_SESSION['user_logged'].": delete subdomain: ".$sub_name); 
     71  write_log($_SESSION['user_logged'].": deletes subdomain: ".$sub_name); 
    7172  set_page_message(tr('Subdomain scheduled for deletion!')); 
    7273  header('Location: manage_domains.php'); 

  • trunk/gui/client/delete_ticket.php

    r1241 r1245  
    11<?php 
    22/** 
    3  * ispCP (OMEGA) - Virtual Hosting Control System | Omega Version 
     3 * ispCP ω (OMEGA) a Virtual Hosting Control System 
    44 * 
    5  *  @copyright  2001-2006 by moleSoftware GmbH 
    6  *  @copyright  2006-2007 by ispCP | http://isp-control.net 
    7  *  @link               http://isp-control.net 
    8  *  @author             ispCP Team (2007) 
     5 * @copyright   2001-2006 by moleSoftware GmbH 
     6 * @copyright   2006-2008 by ispCP | http://isp-control.net 
     7 * @version     SVN: $ID$ 
     8 * @link                http://isp-control.net 
     9 * @author              ispCP Team 
    910 * 
    10  *  @license 
    11  *  This program is free software; you can redistribute it and/or modify it under 
    12  *  the terms of the MPL General Public License as published by the Free Software 
    13  *  Foundation; either version 1.1 of the License, or (at your option) any later 
    14  *  version. 
    15  *  You should have received a copy of the MPL Mozilla Public License along with 
    16  *  this program; if not, write to the Open Source Initiative (OSI) 
    17  *  http://opensource.org | osi@opensource.org 
    18  **/ 
    19  
     11 * @license 
     12 *   This program is free software; you can redistribute it and/or modify it under 
     13 *   the terms of the MPL General Public License as published by the Free Software 
     14 *   Foundation; either version 1.1 of the License, or (at your option) any later 
     15 *   version. 
     16 *   You should have received a copy of the MPL Mozilla Public License along with 
     17 *   this program; if not, write to the Open Source Initiative (OSI) 
     18 *   http://opensource.org | osi@opensource.org 
     19 */ 
    2020 
    2121require '../include/ispcp-lib.php'; 
    …… 
    6868  } 
    6969 
    70   write_log($_SESSION['user_logged'].": delete support ticket"); 
     70  write_log($_SESSION['user_logged'].": deletes support ticket"); 
    7171  set_page_message(tr('Support ticket deleted successfully!')); 
    7272  user_goto($back_url); 

  • trunk/gui/client/edit_alias.php

    r1241 r1245  
    164164                        $ed_error = tr("Incorrect forward syntax"); 
    165165                } 
    166                 if (!preg_match("/\/$/", $forward)) { 
    167                 $forward .= "/"; 
     166                if (!preg_match("/\/$/", $forward_url)) { 
     167                $forward_url .= "/"; 
    168168            } 
    169169        } 

  • trunk/gui/client/edit_mail_acc.php

    r1241 r1245  
    3030$tpl->define_dynamic('forward_mail', 'page'); 
    3131 
    32 // page functions. 
     32// page functions 
    3333 
    3434function edit_mail_account(&$tpl, &$sql) { 
    …… 
    7373                        if ($mail_type == MT_NORMAL_MAIL) { 
    7474                                $mtype[] = 1; 
    75                                 $res1 = exec_query($sql, "select domain_name from domain where domain_id=?", array($domain_id)); 
     75                                $res1 = exec_query($sql, "SELECT domain_name FROM domain WHERE domain_id=?", array($domain_id)); 
    7676                                $tmp1 = $res1->FetchRow(0); 
    7777                                $maildomain = $tmp1['domain_name']; 
    7878                        } else if ($mail_type == MT_NORMAL_FORWARD) { 
    7979                                $mtype[] = 4; 
    80                                 $res1 = exec_query($sql, "select domain_name from domain where domain_id=?", array($domain_id)); 
     80                                $res1 = exec_query($sql, "SELECT domain_name FROM domain WHERE domain_id=?", array($domain_id)); 
    8181                                $tmp1 = $res1->FetchRow(0); 
    8282                &nb