Development

Wiki Start
Wishlist
Timeline
Roadmap
Browse Source
New Ticket
View Tickets

Changeset 1234

Show
Ignore:
Timestamp:
06/21/08 13:06:31 (3 months ago)
Author:
rats
Message:

* Fixed #1359: two errors prevent installation on Ubuntu Hardy Heron and solution to both
* Fixed #1247: png icon is ugly scaled
* Updated phpMyAdmin to 2.11.7 RC2

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/CHANGELOG

    r1233 r1234  
    11ispCP ω 1.0.0 Changelog 
    22~~~~~~~~~~~~~~~~~~~~~~~~~~~ 
     3 
     42008-06-21 Benedikt Heintel 
     5        - DOCS: 
     6                * Fixed #1359: two errors prevent installation on Ubuntu Hardy Heron and solution to both 
     7        - GUI: 
     8                * Fixed #1247: png icon is ugly scaled 
     9        - TOOLS: 
     10                * Updated phpMyAdmin to 2.11.7 RC2 
    311 
    4122008-06-17 Benedikt Heintel 

  • trunk/docs/Ubuntu/INSTALL

    r1216 r1234  
    7676        # apt-get install $(cat ./docs/Ubuntu/ubuntu-packages-hardy) 
    7777 
     78   If using Hardy, make sure you have added multiverse into your /etc/apt/sources.list 
     79 
    7880        (when you get to the courier screen select 'no' to web directories) 
    7981        (when you get to the postfix screen select 'internet site' and then type 'root' 

  • trunk/docs/Ubuntu/ubuntu-packages-hardy

    r1176 r1234  
    3737libnet-netmask-perl 
    3838libnet-smtp-server-perl 
    39 libperl5.10 
     39libperl5.8 
    4040libsasl2-2 
    4141libsasl2-modules 

  • trunk/gui/client/add_mail_acc.php

    r1233 r1234  
    292292 
    293293                        $mail_forward = $_POST['forward_list']; 
    294                         $farray = preg_split ("/[\n,]+/", $mail_forward); 
     294                        $farray = preg_split("/[\n,]+/", $mail_forward); 
    295295                        $mail_accs = array(); 
    296296 
    …… 
    311311 
    312312                $mail_type = implode(',', $mail_type); 
     313                list($dmn_type, $type) = split('_', $mail_type, 2); 
    313314 
    314315                $check_acc_query = <<<SQL_QUERY 
    …… 
    323324                                AND 
    324325                                `sub_id` = ? 
     326                                AND 
     327                                LEFT (`mail_type`, LOCATE('_', `mail_type`)-1) = ? 
    325328SQL_QUERY; 
    326329 
    327         $rs = exec_query($sql, $check_acc_query, array($mail_acc, $domain_id, $sub_id)); 
     330        $rs = exec_query($sql, $check_acc_query, array($mail_acc, $domain_id, $sub_id, $dmn_type)); 
    328331    } 
    329332 

  • trunk/gui/include/reseller-functions.php

    r1173 r1234  
    15961596} 
    15971597 
    1598 function send_alias_order_email($alias_name) 
    1599 { 
     1598function send_alias_order_email($alias_name) { 
    16001599        global $cfg, $sql; 
    16011600 
    …… 
    16641663 
    16651664// add the 3 mail accounts/forwardings to a new domain... 
    1666 function client_mail_add_default_accounts($dmn_id, $user_email, $dmn_part, $dmn_type = 'domain', $sub_id = 0) 
    1667 { 
     1665function client_mail_add_default_accounts($dmn_id, $user_email, $dmn_part, $dmn_type = 'domain', $sub_id = 0) { 
    16681666        global $cfg, $sql; 
    16691667 
    16701668        if ($cfg['CREATE_DEFAULT_EMAIL_ADDRESSES']) { 
    16711669 
    1672                 $forward_type = ($dmn_type == 'alias') ? 'alias_forward': 'normal_forward'; 
     1670                $forward_type = ($dmn_type == 'alias') ? 'alias_forward' : 'normal_forward'; 
    16731671 
    16741672                // prepare SQL 
    …… 
    16901688 
    16911689                // create default forwarder for webmaster@domain.tld to the account's owner 
    1692                 $rs = exec_query($sql, $query,  
     1690                $rs = exec_query($sql, $query, 
    16931691                        array('webmaster', 
    16941692                                '_no_', 
    …… 
    17051703 
    17061704                // create default forwarder for postmaster@domain.tld to the account's reseller 
    1707                 $rs = exec_query($sql, $query,  
     1705                $rs = exec_query($sql, $query, 
    17081706                        array('postmaster', 
    17091707                                '_no_', 
    …… 
    17201718 
    17211719                // create default forwarder for abuse@domain.tld to the account's reseller 
    1722                 $rs = exec_query($sql, $query,  
     1720                $rs = exec_query($sql, $query, 
    17231721                        array('abuse', 
    17241722                                '_no_', 
    …… 
    17381736} // end client_mail_add_default_accounts 
    17391737 
    1740  
    17411738?> 

  • trunk/gui/reseller/rau3.php

    r1157 r1234  
    3232 
    3333$tpl->assign( 
    34         array('TR_ADD_USER_PAGE_TITLE' => tr('ispCP - User/Add user'), 
     34        array( 
     35                'TR_ADD_USER_PAGE_TITLE' => tr('ispCP - User/Add user'), 
    3536                'THEME_COLOR_PATH' => "../themes/$theme_color", 
    3637                'THEME_CHARSET' => tr('encoding'), 
    …… 
    334335 
    335336        // Create the 3 default addresses if wanted 
    336         if ($cfg['CREATE_DEFAULT_EMAIL_ADDRESSES']) client_mail_add_default_accounts($dmn_id, $user_email, $dmn_name); // 'domain', 0 
    337  
    338 /* 
    339         if ($cfg['CREATE_DEFAULT_EMAIL_ADDRESSES']) { 
    340                 $query = <<<SQL_QUERY 
    341             INSERT INTO mail_users 
    342                 (mail_acc, 
    343                  mail_pass, 
    344                  mail_forward, 
    345                  domain_id, 
    346                  mail_type, 
    347                  sub_id, 
    348                  status, 
    349                  mail_auto_respond) 
    350             VALUES 
    351                 (?, ?, ?, ?, ?, ?, ?, ?) 
    352 SQL_QUERY; 
    353  
    354                 // create default forwarder for webmaster@domain.tld to the account's owner 
    355                 $rs = exec_query($sql, $query, array('webmaster', 
    356                                 '_no_', 
    357                                 $user_email, 
    358                                 $dmn_id, 
    359                                 'normal_forward', 
    360                                 0, 
    361                                 $cfg['ITEM_ADD_STATUS'], 
    362                                 '_no_')); 
    363  
    364                 // create default forwarder for postmaster@domain.tld to the account's reseller 
    365                 $rs = exec_query($sql, $query, array('postmaster', 
    366                                 '_no_', 
    367                                 $_SESSION['user_email'], 
    368                                 $dmn_id, 
    369                                 'normal_forward', 
    370                                 0, 
    371                                 $cfg['ITEM_ADD_STATUS'], 
    372                                 '_no_')); 
    373  
    374                 // create default forwarder for abuse@domain.tld to the account's reseller 
    375                 $rs = exec_query($sql, $query, array('abuse', 
    376                                 '_no_', 
    377                                 $_SESSION['user_email'], 
    378                                 $dmn_id, 
    379                                 'normal_forward', 
    380                                 0, 
    381                                 $cfg['ITEM_ADD_STATUS'], 
    382                                 '_no_')); 
    383         } 
    384 */ 
     337        if ($cfg['CREATE_DEFAULT_EMAIL_ADDRESSES']) 
     338                client_mail_add_default_accounts($dmn_id, $user_email, $dmn_name); // 'domain', 0 
     339 
    385340        // add_domain_extras($dmn_id, $record_id, $sql); 
    386341        // lets send mail to user 

  • trunk/gui/themes/omega_original/admin/language.tpl

    r1172 r1234  
    1313  <table width="100%" border="0" cellspacing="0" cellpadding="0"> 
    1414      <tr> 
    15         <td height="20" nowrap="nowrap" class="backButton">&nbsp;&nbsp;&nbsp;<a href="change_user_interface.php?action=go_back"><img src="{THEME_COLOR_PATH}/images/icons/close_interface.png" width="18" height="18" border="0" align="absmiddle"></a> {YOU_ARE_LOGGED_AS}</td> 
     15        <td height="24" nowrap="nowrap" class="backButton">&nbsp;&nbsp;&nbsp;<a href="change_user_interface.php?action=go_back"><img src="{THEME_COLOR_PATH}/images/icons/" width="22" height="22" border="0" align="absmiddle"></a> {YOU_ARE_LOGGED_AS}</td> 
    1616      </tr> 
    1717    </table> 

  • trunk/gui/themes/omega_original/admin/lostpassword.tpl

    r1179 r1234  
    1212        <!-- BDP: logged_from --><table width="100%" border="0" cellspacing="0" cellpadding="0"> 
    1313      <tr> 
    14         <td height="20" nowrap="nowrap" class="backButton">&nbsp;&nbsp;&nbsp;<a href="change_user_interface.php?action=go_back"><img src="{THEME_COLOR_PATH}/images/icons/close_interface.png" width="18" height="18" border="0" align="absmiddle"></a> {YOU_ARE_LOGGED_AS}</td> 
     14        <td height="24" nowrap="nowrap" class="backButton">&nbsp;&nbsp;&nbsp;<a href="change_user_interface.php?action=go_back"><img src="{THEME_COLOR_PATH}/images/icons/" width="22" height="22" border="0" align="absmiddle"></a> {YOU_ARE_LOGGED_AS}</td> 
    1515      </tr> 
    1616    </table> 

  • trunk/gui/themes/omega_original/admin/menu_general_information.tpl

    r1168 r1234  
    5959    </tr> 
    6060    <tr> 
    61      <td class="logoutbutton"><a href="../index.php?logout"><img src="{THEME_COLOR_PATH}/images/icons/logout_interface.png" border="0" height="18" width="18" /></a><a href="../index.php?logout" class="logout">{TR_MENU_LOGOUT}</a></td> 
     61     <td class="logoutbutton"><a href="../index.php?logout"><img src="{THEME_COLOR_PATH}/images/icons/logout_interface.png" border="0" height="24" width="24" />{TR_MENU_LOGOUT}</a></td> 
    6262    </tr> 
    6363    <tr> 

  • trunk/gui/themes/omega_original/admin/menu_hp.tpl

    r1168 r1234  
    3535    </tr> 
    3636    <tr> 
    37       <td class="logoutbutton"><a href="../index.php?logout"><img src="{THEME_COLOR_PATH}/images/icons/logout_interface.png" border="0" height="18" width="18" /></a><a href="../index.php?logout" class="logout">{TR_MENU_LOGOUT}</a></td> 
     37      <td class="logoutbutton"><a href="../index.php?logout"><img src="{THEME_COLOR_PATH}/images/icons/logout_interface.png" border="0" height="24" width="24" />{TR_MENU_LOGOUT}</a></td> 
    3838    </tr> 
    3939    <tr> 

  • trunk/gui/themes/omega_original/admin/menu_manage_users.tpl

    r1168 r1234  
    6565    </tr> 
    6666    <tr> 
    67       <td class="logoutbutton"><a href="../index.php?logout"><img src="{THEME_COLOR_PATH}/images/icons/logout_interface.png" border="0" height="18" width="18" /></a><a href="../index.php?logout" class="logout">{TR_MENU_LOGOUT}</a></td> 
     67      <td class="logoutbutton"><a href="../index.php?logout"><img src="{THEME_COLOR_PATH}/images/icons/logout_interface.png" border="0" height="24" width="24" />{TR_MENU_LOGOUT}</a></td> 
    6868    </tr> 
    6969    <tr> 

  • trunk/gui/themes/omega_original/admin/menu_settings.tpl

    r1168 r1234  
    7777    </tr> 
    7878    <tr> 
    79      <td class="logoutbutton"><a href="../index.php?logout"><img src="{THEME_COLOR_PATH}/images/icons/logout_interface.png" border="0" height="18" width="18" /></a><a href="../index.php?logout" class="logout">{TR_MENU_LOGOUT}</a></td> 
     79     <td class="logoutbutton"><a href="../index.php?logout"><img src="{THEME_COLOR_PATH}/images/icons/logout_interface.png" border="0" height="24" width="24" />{TR_MENU_LOGOUT}</a></td> 
    8080    </tr> 
    8181    <tr> 

  • trunk/gui/themes/omega_original/admin/menu_statistics.tpl

    r1168 r1234  
    3535    </tr> 
    3636    <tr> 
    37      <td class="logoutbutton"><a href="../index.php?logout"><img src="{THEME_COLOR_PATH}/images/icons/logout_interface.png" border="0" height="18" width="18" /></a><a href="../index.php?logout" class="logout">{TR_MENU_LOGOUT}</a></td> 
     37     <td class="logoutbutton"><a href="../index.php?logout"><img src="{THEME_COLOR_PATH}/images/icons/logout_interface.png" border="0" height="24" width="24" />{TR_MENU_LOGOUT}</a></td> 
    3838    </tr> 
    3939    <tr> 

  • trunk/gui/themes/omega_original/admin/menu_support_system.tpl

    r1168 r1234  
    3535    </tr> 
    3636    <tr> 
    37      <td class="logoutbutton"><a href="../index.php?logout"><img src="{THEME_COLOR_PATH}/images/icons/logout_interface.png" border="0" height="18" width="18" /></a><a href="../index.php?logout" class="logout">{TR_MENU_LOGOUT}</a></td> 
     37     <td class="logoutbutton"><a href="../index.php?logout"><img src="{THEME_COLOR_PATH}/images/icons/logout_interface.png" border="0" height="24" width="24" />{TR_MENU_LOGOUT}</a></td> 
    3838    </tr> 
    3939    <tr> 

  • trunk/gui/themes/omega_original/admin/menu_system_tools.tpl

    r1168 r1234  
    5959    </tr> 
    6060    <tr> 
    61      <td class="logoutbutton"><a href="../index.php?logout"><img src="{THEME_COLOR_PATH}/images/icons/logout_interface.png" border="0" height="18" width="18" /></a><a href="../index.php?logout" class="logout">{TR_MENU_LOGOUT}</a></td> 
     61     <td class="logoutbutton"><a href="../index.php?logout"><img src="{THEME_COLOR_PATH}/images/icons/logout_interface.png" border="0" height="24" width="24" />{TR_MENU_LOGOUT}</a></td> 
    6262    </tr> 
    6363    <tr> 

  • trunk/gui/themes/omega_original/client/add_alias.tpl

    r1191 r1234  
    4242<!-- BDP: logged_from --><table width="100%" border="0" cellspacing="0" cellpadding="0"> 
    4343      <tr> 
    44         <td height="20" nowrap="nowrap" class="backButton">&nbsp;&nbsp;&nbsp;<a href="change_user_interface.php?action=go_back"><img src="{THEME_COLOR_PATH}/images/icons/close_interface.png" width="18" height="18" border="0" align="absmiddle"></a> {YOU_ARE_LOGGED_AS}</td> 
     44        <td height="24" nowrap="nowrap" class="backButton">&nbsp;&nbsp;&nbsp;<a href="change_user_interface.php?action=go_back"><img src="{THEME_COLOR_PATH}/images/icons/" width="22" height="22" border="0" align="absmiddle"></a> {YOU_ARE_LOGGED_AS}</td> 
    4545      </tr> 
    4646    </table> 

  • trunk/gui/themes/omega_original/client/add_ftp_acc.tpl

    r1172 r1234  
    124124<!-- BDP: logged_from --><table width="100%" border="0" cellspacing="0" cellpadding="0"> 
    125125      <tr> 
    126         <td height="20" nowrap="nowrap" class="backButton">&nbsp;&nbsp;&nbsp;<a href="change_user_interface.php?action=go_back"><img src="{THEME_COLOR_PATH}/images/icons/close_interface.png" width="18" height="18" border="0" align="absmiddle"></a> {YOU_ARE_LOGGED_AS}</td> 
     126        <td height="24" nowrap="nowrap" class="backButton">&nbsp;&nbsp;&nbsp;<a href="change_user_interface.php?action=go_back"><img src="{THEME_COLOR_PATH}/images/icons/" width="22" height="22" border="0" align="absmiddle"></a> {YOU_ARE_LOGGED_AS}</td> 
    127127      </tr> 
    128128    </table> 

  • trunk/gui/themes/omega_original/client/add_mail_acc.tpl

    r1207 r1234  
    136136     <table width="100%" border="0" cellspacing="0" cellpadding="0"> 
    137137      <tr> 
    138         <td height="20" nowrap="nowrap" class="backButton">&nbsp;&nbsp;&nbsp;<a href="change_user_interface.php?action=go_back"><img src="{THEME_COLOR_PATH}/images/icons/close_interface.png" width="18" height="18" border="0" align="absmiddle"></a> {YOU_ARE_LOGGED_AS}</td> 
     138        <td height="24" nowrap="nowrap" class="backButton">&nbsp;&nbsp;&nbsp;<a href="change_user_interface.php?action=go_back"><img src="{THEME_COLOR_PATH}/images/icons/" width="22" height="22" border="0" align="absmiddle"></a> {YOU_ARE_LOGGED_AS}</td> 
    139139      </tr> 
    140140    </table> 

  • trunk/gui/themes/omega_original/client/add_sql_database.tpl

    r1172 r1234  
    2121<!-- BDP: logged_from --><table width="100%" border="0" cellspacing="0" cellpadding="0"> 
    2222      <tr> 
    23         <td height="20" nowrap="nowrap" class="backButton">&nbsp;&nbsp;&nbsp;<a href="change_user_interface.php?action=go_back"><img src="{THEME_COLOR_PATH}/images/icons/close_interface.png" width="18" height="18" border="0" align="absmiddle"></a> {YOU_ARE_LOGGED_AS}</td> 
     23        <td height="24" nowrap="nowrap" class="backButton">&nbsp;&nbsp;&nbsp;<a href="change_user_interface.php?action=go_back"><img src="{THE