Changeset 1290

Show
Ignore:
Timestamp:
08/02/08 20:56:42 (4 months ago)
Author:
rats
Message:

* Fixed #846: Wrong german text format of "Are you sure you want to delete" and other remarks to manage_domains.php
* Fixed #1445: Mysql username/password exposed if database is down!
* Updated Chinese
* Updated Dutch
* Updated Spanish
* Added Swedish
* Fixed #1441: lost password link leads to an incorrect page
* Fixed #1440: (CentOS) lsb_release not installed on CentOS
* Fixed #1435: Update FreeBSD Doc
* Fixed #1426: webmail: bookmarks doesn't work

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/CHANGELOG

    r1289 r1290  
    11ispCP ω 1.0.0 Changelog 
    22~~~~~~~~~~~~~~~~~~~~~~~~~~~ 
     3 
     42008-08-02 Benedikt Heintel 
     5        - GUI: 
     6                * Fixed #846: Wrong german text format of "Are you sure you want to delete" and other remarks to manage_domains.php 
     7                * Fixed #1445: Mysql username/password exposed if database is down! 
     8        - LANGUAGES: 
     9                * Updated Chinese 
     10                * Updated Dutch 
     11                * Updated Spanish 
     12                * Added Swedish 
     13 
     142008-07-29 Benedikt Heintel 
     15        - GUI: 
     16                * Fixed #1441: lost password link leads to an incorrect page 
     17        - DISTS: 
     18                * Fixed #1440: (CentOS) lsb_release not installed on CentOS 
    319 
    4202008-07-25 Benedikt Heintel 
  • trunk/docs/CentOS/centos-packages

    r1269 r1290  
    2626libmcrypt 
    2727libtool-ltdl 
     28lsb-readhat 
    2829mod_perl 
    2930mod_ssl 
  • trunk/gui/admin/custom_menus.php

    r1241 r1290  
    5959                                        'LINK' => $menu_link, 
    6060                                        'CONTENT' => ($i % 2 == 0) ? 'content' : 'content2', 
    61                                         'TR_MESSAGE_DELETE' => tr('Are you sure you want to delete'), 
     61                                        'TR_MESSAGE_DELETE' => tr('Are you sure you want to delete %s?', '%s', true), 
    6262 
    6363                                        ) 
  • trunk/gui/admin/hosting_plan.php

    r1265 r1290  
    6767                        'TR_BACK' => tr('Back'), 
    6868                        'TR_TITLE_BACK' => tr('Return to previous menu'), 
    69                         'TR_MESSAGE_DELETE' => tr('Are you sure you want to delete'
     69                        'TR_MESSAGE_DELETE' => tr('Are you sure you want to delete %s?', '%s', true
    7070                        ) 
    7171                ); 
  • trunk/gui/admin/ip_manage.php

    r1243 r1290  
    241241                        'TR_ADD' => tr('Add'), 
    242242                        'TR_ADD_NEW_IP' => tr('Add new IP'), 
    243                         'TR_MESSAGE_DELETE' => tr('Are you sure you want to delete this IP: '
     243                        'TR_MESSAGE_DELETE' => tr('Are you sure you want to delete this IP: %s?', '%s', true
    244244                        ) 
    245245        ); 
  • trunk/gui/admin/multilanguage.php

    r1264 r1290  
    323323                        'TR_INSTALL' => tr('Install'), 
    324324                        'TR_EXPORT' => tr('Export'), 
    325                         'TR_MESSAGE_DELETE' => tr('Are you sure you want to delete', true), 
     325                        'TR_MESSAGE_DELETE' => tr('Are you sure you want to delete %s?', '%s', true), 
    326326                        ) 
    327327        ); 
  • trunk/gui/admin/settings_ports.php

    r1252 r1290  
    277277                'TR_DELETE' => tr('Delete'), 
    278278                'TR_ADD' => tr('Add'), 
    279                 'TR_MESSAGE_DELETE' => tr('Are you sure you want to delete', true) 
     279                'TR_MESSAGE_DELETE' => tr('Are you sure you want to delete %s?', '%s', true) 
    280280                ) 
    281281        ); 
  • trunk/gui/admin/ticket_closed.php

    r1265 r1290  
    305305                'TR_CLOSED_TICKETS' => tr('Closed tickets'), 
    306306                'TR_DELETE'             => tr('Delete'), 
    307                 'TR_MESSAGE_DELETE' => tr('Are you sure you want to delete', true) , 
     307                'TR_MESSAGE_DELETE' => tr('Are you sure you want to delete %s?', '%s', true) , 
    308308                ) 
    309309        ); 
  • trunk/gui/admin/ticket_system.php

    r1265 r1290  
    297297                'TR_CLOSED_TICKETS' => tr('Closed tickets'), 
    298298                'TR_DELETE'             => tr('Delete'), 
    299                 'TR_MESSAGE_DELETE' => tr('Are you sure you want to delete', true) , 
     299                'TR_MESSAGE_DELETE' => tr('Are you sure you want to delete %s?', '%s', true) , 
    300300                ) 
    301301        ); 
  • trunk/gui/client/cronjobs_overview.php

    r1241 r1290  
    6565$tpl->assign( 
    6666        array('TR_CRON_MANAGER' => tr('Cronjob Manager'), 
    67                 'TR_MESSAGE_DELETE' => tr('Are you sure you want to delete', true), 
     67                'TR_MESSAGE_DELETE' => tr('Are you sure you want to delete %s?', '%s', true), 
    6868                'TR_CRONJOBS' => tr('Cronjobs'), 
    6969                'TR_ACTIVE' => tr('Active'), 
  • trunk/gui/client/domains_manage.php

    r1266 r1290  
    215215                        'TR_SUB_STATUS' => tr('Status'), 
    216216                        'TR_SUB_ACTION' => tr('Actions'), 
    217                         'TR_MESSAGE_DELETE' => tr('Are you sure you want to delete', true) 
     217                        'TR_MESSAGE_DELETE' => tr('Are you sure you want to delete %s?', '%s', true) 
    218218                ) 
    219219        ); 
  • trunk/gui/client/ftp_accounts.php

    r1241 r1290  
    157157                'TR_EDIT' => tr('Edit'), 
    158158                'TR_DELETE' => tr('Delete'), 
    159                 'TR_MESSAGE_DELETE' => tr('Are you sure you want to delete', true), 
     159                'TR_MESSAGE_DELETE' => tr('Are you sure you want to delete %s?', '%s', true) 
    160160                ) 
    161161        ); 
  • trunk/gui/client/mail_accounts.php

    r1287 r1290  
    402402                'TR_TOTAL_MAIL_ACCOUNTS' => tr('Mails total'), 
    403403                'TR_DELETE'             => tr('Delete'), 
    404                 'TR_MESSAGE_DELETE' => tr('Are you sure you want to delete', true), 
     404                'TR_MESSAGE_DELETE' => tr('Are you sure you want to delete %s?', '%s', true) 
    405405                ) 
    406406        ); 
  • trunk/gui/client/mail_catchall.php

    r1266 r1290  
    346346        'TR_EDIT' => tr('Edit'), 
    347347        'TR_DELETE' => tr('Delete'), 
    348         'TR_MESSAGE_DELETE' => tr('Are you sure you want to delete', true), 
     348        'TR_MESSAGE_DELETE' => tr('Are you sure you want to delete %s?', '%s', true) 
    349349        ) 
    350350    ); 
  • trunk/gui/client/sql_manage.php

    r1266 r1290  
    167167                        'TR_CHANGE_PASSWORD' => tr('Change password'), 
    168168                        'TR_LOGIN_PMA' => tr('Login phpMyAdmin'), 
    169                         'TR_MESSAGE_DELETE' => tr('Are you sure you want to delete', true) 
     169                        'TR_MESSAGE_DELETE' => tr('Are you sure you want to delete %s?', '%s', true) 
    170170                        ) 
    171171                ); 
  • trunk/gui/client/ticket_closed.php

    r1265 r1290  
    189189                        'TR_CLOSED_TICKETS' => tr('Closed tickets'), 
    190190                        'TR_DELETE' => tr('Delete'), 
    191                         'TR_MESSAGE_DELETE' => tr('Are you sure you want to delete', true) 
     191                        'TR_MESSAGE_DELETE' => tr('Are you sure you want to delete %s?', '%s', true) 
    192192                        ) 
    193193            ); 
  • trunk/gui/client/ticket_system.php

    r1265 r1290  
    178178$tpl->assign(array( 
    179179        'TR_SUPPORT_SYSTEM'     => tr('Support system'), 
    180         'TR_SUPPORT_TICKETS'   => tr('Support tickets'), 
    181         'TR_STATUS'             => tr('Status'), 
    182         'TR_NEW'                => ' ', 
    183         'TR_ACTION'             => tr('Action'), 
     180        'TR_SUPPORT_TICKETS'=> tr('Support tickets'), 
     181        'TR_STATUS'                    => tr('Status'), 
     182        'TR_NEW'                       => ' ', 
     183        'TR_ACTION'                    => tr('Action'), 
    184184        'TR_URGENCY'            => tr('Priority'), 
    185185        'TR_SUBJECT'            => tr('Subject'), 
     
    188188        'TR_OPEN_TICKETS'       => tr('Open tickets'), 
    189189        'TR_CLOSED_TICKETS'     => tr('Closed tickets'), 
    190         'TR_DELETE'             => tr('Delete'), 
    191         'TR_MESSAGE_DELETE'     => tr('Are you sure you want to delete', true) 
     190        'TR_DELETE'                    => tr('Delete'), 
     191        'TR_MESSAGE_DELETE'     => tr('Are you sure you want to delete %s?', '%s', true) 
    192192)); 
    193193 
  • trunk/gui/include/admin-functions.php

    r1287 r1290  
    764764                                        'URL_EDIT_USR' => "admin_edit.php?edit_id=" . $rs->fields['domain_admin_id'], 
    765765                                        'TR_MESSAGE_CHANGE_STATUS' => tr('Are you sure you want to change the status of domain account?'), 
    766                                         'TR_MESSAGE_DELETE' => tr('Are you sure you want to delete this account?'), 
     766                                        'TR_MESSAGE_DELETE' => tr('Are you sure you want to delete this account?', null, true), 
    767767                                        ) 
    768768                                ); 
     
    790790                        'TR_SEARCH' => tr('Search'), 
    791791                        'TR_CREATED_ON' => tr('Creation date'), 
    792                         'TR_MESSAGE_DELETE' => tr('Are you sure you want to delete'), 
     792                        'TR_MESSAGE_DELETE' => tr('Are you sure you want to delete %s?', '%s', true), 
    793793                        'TR_EDIT' => tr("Edit") 
    794794                        ) 
     
    19931993function rm_rf_user_account($id_user) { 
    19941994        $sql = Database::getInstance(); 
    1995          
     1995 
    19961996        // get domain user data 
    19971997        $query = " 
     
    20232023        $query = "DELETE FROM `ftp_group` WHERE `gid` = ?"; 
    20242024        $rs = exec_query($sql, $query, array($domain_gid)); 
    2025          
     2025 
    20262026        // let's delete all Subdomains for this user 
    20272027        $delete_status = Config::get('ITEM_DELETE_STATUS'); 
    20282028        $query = "UPDATE `subdomain` SET `subdomain_status` = ? WHERE `domain_id` = ?"; 
    20292029        $rs = exec_query($sql, $query, array($delete_status, $domain_id)); 
    2030          
     2030 
    20312031        // let's delete all domain aliases for this user 
    20322032        $query = "UPDATE `domain_aliasses` SET `alias_status` = ? WHERE `domain_id` = ?"; 
     
    20362036        $query = "UPDATE `mail_users` SET `status` = ? WHERE `domain_id` = ?"; 
    20372037        $rs = exec_query($sql, $query, array($delete_status, $domain_id)); 
    2038          
     2038 
    20392039        // delete all htaccess entries for this user 
    20402040        $query = "DELETE FROM `htaccess` WHERE `dmn_id` = ?"; 
     
    20512051        $query = "DELETE FROM `domain_traffic` WHERE `domain_id` = ?"; 
    20522052        $rs = exec_query($sql, $query, array($domain_id)); 
    2053          
     2053 
    20542054        //delete error pages 
    20552055        $query = "DELETE FROM `error_pages` WHERE `user_id` = ?"; 
    20562056        $rs = exec_query($sql, $query, array($id_user)); 
    2057          
     2057 
    20582058        //delete quotalimits 
    20592059        $query = "DELETE FROM `quotalimits` WHERE `name` = ?"; 
    20602060        $rs = exec_query($sql, $query, array($domain_name)); 
    2061          
     2061 
    20622062        //delete quotatallies 
    20632063        $query = "DELETE FROM `quotatallies` WHERE `name` = ?"; 
    20642064        $rs = exec_query($sql, $query, array($domain_name)); 
    2065          
     2065 
    20662066        // Lets Delete SQL DBs and Users 
    20672067        $query = "SELECT `sqld_id` FROM `sql_database` WHERE `domain_id` = ?"; 
    20682068        $rs = exec_query($sql, $query, array($domain_id)); 
    2069          
     2069 
    20702070        while (!$rs->EOF) { 
    20712071                $db_id = $rs->fields['sqld_id']; 
     
    20772077        // BEGIN - DELETE ALL GUI ENTRIES FOR THIS USER 
    20782078        // delete the layout settings 
    2079          
     2079 
    20802080        // delete all tickets for this user 
    20812081        $query = "DELETE FROM `tickets` WHERE `ticket_from` = ? OR `ticket_to` = ?"; 
    20822082        $rs = exec_query($sql, $query, array($id_user, $id_user)); 
    2083          
     2083 
    20842084        // let's delete the main domain for this user 
    20852085        $query = "UPDATE `domain` SET `domain_status` = ? WHERE `domain_admin_id` = ?"; 
    20862086        $rs = exec_query($sql, $query, array($delete_status, $id_user)); 
    2087          
     2087 
    20882088        remove_users_common_properties($id_user); 
    20892089} 
     
    20912091function remove_users_common_properties($id_user) { 
    20922092        $sql = Database::getInstance(); 
    2093          
     2093 
    20942094        $query = "DELETE FROM `admin` WHERE `admin_id` = ?"; 
    20952095        $rs = exec_query($sql, $query, array($id_user)); 
  • trunk/gui/include/class.database.php

    r1263 r1290  
    88 
    99    private function __construct($user, $pass, $type, $host, $name) { 
    10         $this->_db = new PDO($type . ':host=' . $host . ';dbname=' . $name, $user, $pass); 
     10        // Avoid stacktrace and revelation of DB Password with try-catch block 
     11        try { 
     12                $this->_db = new PDO($type . ':host=' . $host . ';dbname=' . $name, $user, $pass); 
     13        } catch (PDOException $e) { 
     14                echo 'Connection failed: ' . $e->getMessage(); 
     15                } 
    1116        $this->_db->setAttribute(PDO::MYSQL_ATTR_USE_BUFFERED_QUERY, true); 
    1217    } 
  • trunk/gui/lostpassword.php

    r1264 r1290  
    112112                                                array( 
    113113                                                        'TR_MESSAGE' => tr('ERROR: Unknown user'), 
    114                                                         'TR_LINK' => "<a class=\"link\" href=\"settings_lostpassword.php\">" . tr('Retry') . "</a>" 
     114                                                        'TR_LINK' => "<a class=\"link\" href=\"lostpassword.php\">" . tr('Retry') . "</a>" 
    115115                                                        ) 
    116116                                                ); 
     
    120120                                        array( 
    121121                                                'TR_MESSAGE' => tr('ERROR: Security code was not correct!') . ' ' . $_SESSION['image'], 
    122                                                 'TR_LINK' => "<a class=\"link\" href=\"settings_lostpassword.php\">" . tr('Retry') . "</a>" 
     122                                                'TR_LINK' => "<a class=\"link\" href=\"lostpassword.php\">" . tr('Retry') . "</a>" 
    123123                                                ) 
    124124                                        ); 
  • trunk/gui/reseller/alias.php

    r1265 r1290  
    7171                        'TR_ACTION' => tr('Action'), 
    7272                        'TR_ADD_ALIAS' => tr('Add alias'), 
    73                         'TR_MESSAGE_DELETE' => tr('Are you sure you want to delete'), 
     73                        'TR_MESSAGE_DELETE' => tr('Are you sure you want to delete %s?', '%s', true) 
    7474                ) 
    7575        ); 
  • trunk/gui/reseller/hosting_plan.php

    r1265 r1290  
    6767                        'TR_BACK' => tr('Back'), 
    6868                        'TR_TITLE_BACK' => tr('Return to previous menu'), 
    69                         'TR_MESSAGE_DELETE' => tr('Are you sure you want to delete'
     69                        'TR_MESSAGE_DELETE' => tr('Are you sure you want to delete %s?', '%s', true
    7070                        ) 
    7171                ); 
  • trunk/gui/reseller/orders.php

    r1241 r1290  
    200200                'TR_DETAILS' => tr('Details'), 
    201201                'TR_HP' => tr('Hosting plan'), 
    202                 'TR_MESSAGE_DELETE_ACCOUNT' => tr('Are you sure you want to delete this order?'), 
     202                'TR_MESSAGE_DELETE_ACCOUNT' => tr('Are you sure you want to delete this order?', null, true), 
    203203                'TR_ADD' => tr('Add/Details'))); 
    204204 
  • trunk/gui/reseller/orders_detailst.php

    r1241 r1290  
    223223                'TR_DMN_IP' => tr('Domain IP'), 
    224224                'TR_CUSTOMER_ID' => tr('Customer ID'), 
    225                 'TR_MESSAGE_DELETE_ACCOUNT' => tr('Are you sure you want to delete this order?'), 
     225                'TR_MESSAGE_DELETE_ACCOUNT' => tr('Are you sure you want to delete this order?', null, true), 
    226226                'TR_ADD' => tr('Add to the system'))); 
    227227 
  • trunk/gui/reseller/ticket_closed.php

    r1265 r1290  
    194194                        'TR_CLOSED_TICKETS' => tr('Closed tickets'), 
    195195                        'TR_DELETE' => tr('Delete'), 
    196                         'TR_MESSAGE_DELETE' => tr('Are you sure you want to delete', true) , 
     196                        'TR_MESSAGE_DELETE' => tr('Are you sure you want to delete %s?', '%s', true) , 
    197197                ) 
    198198        ); 
  • trunk/gui/reseller/ticket_system.php

    r1265 r1290  
    246246                'TR_CLOSED_TICKETS' => tr('Closed tickets'), 
    247247                'TR_DELETE' => tr('Delete'), 
    248                 'TR_MESSAGE_DELETE' => tr('Are you sure you want to delete', true) , 
     248                'TR_MESSAGE_DELETE' => tr('Are you sure you want to delete %s?', '%s', true) 
    249249                ) 
    250250        ); 
  • trunk/gui/reseller/users.php

    r1265 r1290  
    111111                        'TR_TITLE_BACK' => tr('Return to previous menu'), 
    112112                        'TR_TABLE_NAME' => tr('Users list'), 
    113                         'TR_MESSAGE_CHANGE_STATUS' => tr('Are you sure you want to change the status of domain account?', true), 
    114                         'TR_MESSAGE_DELETE_ACCOUNT' => tr('Are you sure you want to delete this account?', true), 
     113                        'TR_MESSAGE_CHANGE_STATUS' => tr('Are you sure you want to change the status of %s?', '%s', true), 
     114                        'TR_MESSAGE_DELETE_ACCOUNT' => tr('Are you sure you want to delete %s?', '%s', true), 
    115115                        'TR_STAT' => tr('Stats'), 
    116116                        'VL_MONTH' => $crnt_month, 
  • trunk/gui/themes/omega_original/admin/custom_menus.tpl

    r1248 r1290  
    99<script type="text/javascript"> 
    1010<!-- 
    11 function action_delete(url) { 
    12         if (!confirm("{TR_MESSAGE_DELETE}")) 
     11function action_delete(url, link_name) { 
     12        if (!confirm(sprintf("{TR_MESSAGE_DELETE}", link_name))) 
    1313                return false; 
    1414        location = url; 
     
    6969                            <td class="{CONTENT}" align="center">{LEVEL}</td> 
    7070                            <td width="100" class="{CONTENT}" align="center"><img src="{THEME_COLOR_PATH}/images/icons/edit.png" width="16" height="16" border="0" align="absmiddle"> <a href="custom_menus.php?edit_id={BUTONN_ID}" class="link">{TR_EDIT}</a></td> 
    71                             <td width="100" class="{CONTENT}" align="center"><img src="{THEME_COLOR_PATH}/images/icons/delete.png" width="16" height="16" border="0" align="absmiddle"> <a href="#"  onclick="action_delete('custom_menus.php?delete_id={BUTONN_ID}')" class="link">{TR_DELETE}</a></td> 
     71                            <td width="100" class="{CONTENT}" align="center"><img src="{THEME_COLOR_PATH}/images/icons/delete.png" width="16" height="16" border="0" align="absmiddle"> <a href="#"  onclick="action_delete('custom_menus.php?delete_id={BUTONN_ID}', '{MENU_NAME}')" class="link">{TR_DELETE}</a></td> 
    7272                          </tr> 
    7373                          <!-- EDP: button_list --> 
  • trunk/gui/themes/omega_original/admin/domain_details.tpl

    r1248 r1290  
    77<link href="{THEME_COLOR_PATH}/css/ispcp.css" rel="stylesheet" type="text/css"> 
    88<script type="text/javascript" src="{THEME_COLOR_PATH}/css/ispcp.js"></script> 
    9 <script type="text/javascript"> 
    10 <!-- 
    11 function action_status(url) { 
    12         if (!confirm("{TR_MESSAGE_CHANGE_STATUS}")) 
    13                 return false; 
    14         location = url; 
    15 } 
    16  
    17 function action_delete(url) { 
    18         if (!confirm("{TR_MESSAGE_DELETE}")) 
    19                 return false; 
    20         location = url; 
    21 } 
    22 //--> 
    23 </script> 
    249</head> 
    2510 
  • trunk/gui/themes/omega_original/admin/domain_edit.tpl

    r1265 r1290  
    77<link href="{THEME_COLOR_PATH}/css/ispcp.css" rel="stylesheet" type="text/css"> 
    88<script type="text/javascript" src="{THEME_COLOR_PATH}/css/ispcp.js"></script> 
    9 <script type="text/javascript"> 
    10 <!-- 
    11 function change_status(dom_id) { 
    12         if (!confirm("{TR_MESSAGE_CHANGE_STATUS}")) 
    13                 return false; 
    14         location = ('domain_status_change.php?domain_id=' + dom_id); 
    15 } 
    16  
    17 function delete_account(url) { 
    18         if (!confirm("{TR_MESSAGE_DELETE_ACCOUNT}")) 
    19                 return false; 
    20         location = url; 
    21 } 
    22 //--> 
    23 </script> 
    249</head> 
    2510 
     
    7358                          <!-- 
    7459                                <select name="domain_ip"> 
    75                        
     60 
    7661                      <option value="{IP_VALUE}" {IP_SELECTED}>{IP_NUM}&nbsp;({IP_NAME})</option> 
    77                        
     62 
    7863                    </select> 
    7964                                --> 
  • trunk/gui/themes/omega_original/admin/hosting_plan.tpl

    r1265 r1290  
    99<script type="text/javascript"> 
    1010<!-- 
    11 function delete_account(url) { 
    12         if (!confirm("{TR_MESSAGE_DELETE}")) 
     11function delete_account(url, plan) { 
     12        if (!confirm(sprintf("{TR_MESSAGE_DELETE}", plan))) 
    1313                return false; 
    1414        location = url; 
     
    6767                            <td class="{CLASS_TYPE_ROW}" align="center"><img src="{THEME_COLOR_PATH}/images/icons/edit.png" width="16" height="16" border="0" align="absmiddle"> <a href="hosting_plan_edit.php?hpid={HP_ID}" class="link">{TR_EDIT}</a></td> 
    6868                                <!-- BDP: hp_delete --> 
    69                             <td class="{CLASS_TYPE_ROW}" align="center"><img src="{THEME_COLOR_PATH}/images/icons/delete.png" width="16" height="16" border="0" align="absmiddle"> <a href="#" onclick="delete_account('hosting_plan_delete.php?hpid={HP_ID}')" class="link">{PLAN_ACTION}</a></td> 
     69                            <td class="{CLASS_TYPE_ROW}" align="center"><img src="{THEME_COLOR_PATH}/images/icons/delete.png" width="16" height="16" border="0" align="absmiddle"> <a href="#" onclick="delete_account('hosting_plan_delete.php?hpid={HP_ID}', '{PLAN_NAME}')" class="link">{PLAN_ACTION}</a></td> 
    7070                                <!-- EDP: hp_delete --> 
    7171                          </tr> 
  • trunk/gui/themes/omega_original/admin/hosting_plan_add.tpl

    r1265 r1290  
    77<link href="{THEME_COLOR_PATH}/css/ispcp.css" rel="stylesheet" type="text/css"> 
    88<script type="text/javascript" src="{THEME_COLOR_PATH}/css/ispcp.js"></script> 
    9 <script type="text/javascript"> 
    10 <!-- 
    11 function change_status(dom_id) { 
    12         if (!confirm("{TR_MESSAGE_CHANGE_STATUS}")) 
    13                 return false; 
    14         location = ('domain_status_change.php?domain_id=' + dom_id); 
    15 
     9</head> 
    1610 
    17 function delete_account(url) { 
    18         if (!confirm("{TR_MESSAGE_DELETE_ACCOUNT}")) 
    19                 return false; 
    20         location = url; 
    21 } 
    22 //--> 
    23 </script> 
    24  
    25 </head> 
    2611<body onload="MM_preloadImages('{THEME_COLOR_PATH}/images/icons/database_a.gif','{THEME_COLOR_PATH}/images/icons/hosting_plans_a.gif','{THEME_COLOR_PATH}/images/icons/domains_a.gif','{THEME_COLOR_PATH}/images/icons/general_a.gif' ,'{THEME_COLOR_PATH}/images/icons/manage_users_a.gif','{THEME_COLOR_PATH}/images/icons/webtools_a.gif','{THEME_COLOR_PATH}/images/icons/statistics_a.gif','{THEME_COLOR_PATH}/images/icons/support_a.gif')"> 
    2712<table width="100%" border="0" cellspacing="0" cellpadding="0" height="100%" style="border-collapse: collapse;padding:0;margin:0;"> 
  • trunk/gui/themes/omega_original/admin/hosting_plan_edit.tpl

    r1265 r1290  
    77<link href="{THEME_COLOR_PATH}/css/ispcp.css" rel="stylesheet" type="text/css"> 
    88<script type="text/javascript" src="{THEME_COLOR_PATH}/css/ispcp.js"></script> 
    9 <script type="text/javascript"> 
    10 <!-- 
    11 function delete_account(url) { 
    12         if (!confirm("{TR_MESSAGE_DELETE}")) 
    13                 return false; 
    14         location = url; 
    15 
    16 //--> 
    17 </script> 
     9</head> 
    1810 
    19 </head> 
    2011<body onload="MM_preloadImages('{THEME_COLOR_PATH}/images/icons/database_a.gif','{THEME_COLOR_PATH}/images/icons/hosting_plans_a.gif','{THEME_COLOR_PATH}/images/icons/domains_a.gif','{THEME_COLOR_PATH}/images/icons/general_a.gif' ,'{THEME_COLOR_PATH}/images/icons/manage_users_a.gif','{THEME_COLOR_PATH}/images/icons/webtools_a.gif','{THEME_COLOR_PATH}/images/icons/statistics_a.gif','{THEME_COLOR_PATH}/images/icons/support_a.gif')"> 
    2112<table width="100%" border="0" cellspacing="0" cellpadding="0" height="100%" style="border-collapse: collapse;padding:0;margin:0;"> 
  • trunk/gui/themes/omega_original/admin/ip_manage.tpl

    </
    r1263 r1290  
    1010<!-- 
    1111function action_delete(url, ip) { 
    12         if (!confirm("{TR_MESSAGE_DELETE} " + ip)) 
     12        if (!confirm(sprintf("{TR_MESSAGE_DELETE} ", ip))) 
    1313                return false; 
    1414        location = url;