Development

Wiki Start
Wishlist
Timeline
Roadmap
Browse Source
New Ticket
View Tickets

Changeset 1260

Show
Ignore:
Timestamp:
07/04/08 10:51:21 (2 months ago)
Author:
rats
Message:

* Fixed #1380: setup is broken
* Fixed #1381: Admin/reseller can not delete user that does not have a database
* Fixed #1382: PASSWD_STRONG enabled or disabled is not corect generated for the template

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/CHANGELOG

    r1259 r1260  
    11ispCP ω 1.0.0 Changelog 
    22~~~~~~~~~~~~~~~~~~~~~~~~~~~ 
     3 
     42008-07-04 Benedikt Heintel 
     5        - GUI: 
     6                * Fixed #1381: Admin/reseller can not delete user that does not have a database 
     7                * Fixed #1382: PASSWD_STRONG enabled or disabled is not corect generated for the template 
     8        - ENGINE: 
     9                * Fixed #1380: setup is broken 
    310 
    4112008-07-04 Marc Pujol 

  • trunk/engine/ispcp-dmn-mngr

    r1257 r1260  
    15731573                return $rs if ($rs != 0); 
    15741574 
    1575                 $rs = setfmode("$www_dir/$dmn_name/htdocs/images/*", $sys_user, $sys_group, 0755); 
    1576                 return $rs if ($rs != 0); 
     1575                opendir(DIR, "$www_dir/$dmn_name/htdocs/images/"); 
     1576                my @files = readdir(DIR); 
     1577                closedir(DIR); 
     1578 
     1579                foreach (@files) { 
     1580                        # ignore . and .. : 
     1581            next if ($_ eq "." || $_ eq ".."); 
     1582                        $rs = setfmode("$www_dir/$dmn_name/htdocs/images/$_", $sys_user, $sys_group, 0755); 
     1583                        return $rs if ($rs != 0); 
     1584                } 
    15771585        } 
    15781586 

  • trunk/engine/ispcp_common_methods.pl

    r1173 r1260  
    376376# 
    377377# @access       public 
    378 # @param        String  $fname  File Name 
     378# @param        String  $fname  File or Folder Name 
    379379# @param        Mixed   $fuser  Linux User or UserID 
    380380# @param        Mixed   $fgroup Linux Group, GroupID or 'null' 
    …… 
    436436        } 
    437437 
    438     my $res = chmod ($fperms, $fname); 
     438    my $res = chmod($fperms, $fname); 
    439439 
    440440    if ($res != 1) { 
    …… 
    443443    } 
    444444 
    445     $res = chown ($uid, $gid, $fname); 
     445    $res = chown($uid, $gid, $fname); 
    446446 
    447447    if ($res != 1) { 

  • trunk/engine/setup/ispcp-setup

    r1257 r1260  
    245245        push_el(\@main::el, 'user_dialog()', "mysql_prefix: $main::ua{'mysql_prefix'}"); 
    246246        push_el(\@main::el, 'user_dialog()', "mysql_prefix_type: $main::ua{'mysql_prefix_type'}"); 
    247         push_el(\@main::el, 'user_dialog()', "php_version: $main::ua{'php_version'}"); 
    248247        push_el(\@main::el, 'user_dialog()', 'Ending...'); 
    249248 
    …… 
    605604 
    606605        $rs = set_conf_val('AWSTATS_MODE', $main::ua{'awstats_dyn'}); 
    607         return $rs if ($rs != 0); 
    608  
    609         $rs = set_conf_val('PHP_VERSION', $main::ua{'php_version'}); 
    610606        return $rs if ($rs != 0); 
    611607 

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

    r1257 r1260  
    10731073        return $rs if ($rs != 0); 
    10741074 
     1075        my $other_rk_log = $main::cfg{'OTHER_ROOTKIT_LOG'}; 
     1076 
     1077        if ( $other_rk_log ne '' ) { 
     1078           $other_rk_log = ':' .  $other_rk_log; 
     1079        } 
     1080 
    10751081        ## php4.ini 
    10761082        #($rs, $cfg_tpl) = get_tpl($tpl_dir, '/php4/php.ini'); 
    10771083        #return $rs if ($rs != 0); 
    1078         # 
    1079         #my $other_rk_log = $main::cfg{'OTHER_ROOTKIT_LOG'}; 
    1080         # 
    1081         #if ( $other_rk_log ne '' ) { 
    1082         #   $other_rk_log = ':' .  $other_rk_log; 
    1083         #} 
    10841084        # 
    10851085        #%tag_hash = ( 

  • trunk/engine/setup/ispcp-update

    r1257 r1260  
    815815        $rs = set_conf_val('AWSTATS_ACTIVE', $main::ua{'awstats_on'}); 
    816816        $rs = set_conf_val('AWSTATS_MODE', $main::ua{'awstats_dyn'}); 
    817         $rs = set_conf_val('PHP_VERSION', $main::ua{'php_version'}); 
    818817 
    819818        # save into /etc/ispcp/ispcp.conf 

  • trunk/gui/admin/settings.php

    r1252 r1260  
    122122        $tpl->assign('LOSTPASSWORD_SELECTED_OFF', 'selected="selected"'); 
    123123} 
     124 
    124125if (Config::get('PASSWD_STRONG')) { 
    125         $tpl->assign('{PASSWD_STRONG_ON}', 'selected="selected"'); 
    126         $tpl->assign('{PASSWD_STRONG_OFF}', ''); 
    127 } else { 
    128         $tpl->assign('{PASSWD_STRONG_ON}', ''); 
    129         $tpl->assign('{PASSWD_STRONG_OFF}', 'selected="selected"'); 
     126        $tpl->assign('PASSWD_STRONG_ON', 'selected="selected"'); 
     127        $tpl->assign('PASSWD_STRONG_OFF', ''); 
     128} else { 
     129        $tpl->assign('PASSWD_STRONG_ON', ''); 
     130        $tpl->assign('PASSWD_STRONG_OFF', 'selected="selected"'); 
    130131} 
    131132 

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

    r1252 r1260  
    805805 
    806806        if ($rs->RecordCount() == 0) { 
     807                if($_SESSION['user_type'] === 'admin' || $_SESSION['user_type'] === 'reseller') { 
     808                        return; 
     809                } 
    807810                user_goto('manage_sql.php'); 
    808811        }