- Force user deletion for jailkit users - Fixed bug in updater that made is...

tbrehm

2012-01-11 e61ed86fe51c5a0300d867a33f50711dbf6b4fe0

- Force user deletion for jailkit users
- Fixed bug in updater that made ispconfig invoices directory unreadable.
- Removed passing of variables by reference in ispconfig monitor.
- Changed monitor of opensuse updates so that the command does not install them automatically.

 install/dist/lib/fedora.lib.php

@@ -1031,7 +1031,7 @@
        // Edit the file Edit the file /etc/sudoers and comment out the requiregetty line, otherwise the backup function will fail
        replaceLine('/etc/sudoers','Defaults    requiretty','#Defaults    requiretty',0,0);
        
        if(is_file($install_dir.'/interface/invoices')) {
        if(is_dir($install_dir.'/interface/invoices')) {
            chmod($install_dir.'/interface/invoices', 0770);
            chown($install_dir.'/interface/invoices', 'ispconfig');
            chgrp($install_dir.'/interface/invoices', 'ispconfig');

 install/dist/lib/gentoo.lib.php

@@ -867,7 +867,7 @@
            chgrp($install_dir.'/server/lib/mysql_clientdb.conf', 'root');
        }
        
        if(is_file($install_dir.'/interface/invoices')) {
        if(is_dir($install_dir.'/interface/invoices')) {
            chmod($install_dir.'/interface/invoices', 0770);
            chown($install_dir.'/interface/invoices', 'ispconfig');
            chgrp($install_dir.'/interface/invoices', 'ispconfig');

 install/dist/lib/opensuse.lib.php

@@ -1062,7 +1062,7 @@
            exec('chmod 744 /usr/local/bin/run-getmail.sh');
        }
        
        if(is_file($install_dir.'/interface/invoices')) {
        if(is_dir($install_dir.'/interface/invoices')) {
            chmod($install_dir.'/interface/invoices', 0770);
            chown($install_dir.'/interface/invoices', 'ispconfig');
            chgrp($install_dir.'/interface/invoices', 'ispconfig');

 install/lib/installer_base.lib.php

@@ -1750,7 +1750,7 @@
            chgrp($install_dir.'/server/lib/mysql_clientdb.conf', 'root');
        }
        
        if(is_file($install_dir.'/interface/invoices')) {
        if(is_dir($install_dir.'/interface/invoices')) {
            chmod($install_dir.'/interface/invoices', 0770);
            chown($install_dir.'/interface/invoices', 'ispconfig');
            chgrp($install_dir.'/interface/invoices', 'ispconfig');

 interface/web/monitor/show_sys_state.php

@@ -196,7 +196,7 @@
    $ispcData = null;
    foreach($records as $record) {
        /* get the state from the db-data */
        _processDbState($record['type'], $serverId, &$serverState, &$messages);
        _processDbState($record['type'], $serverId, $serverState, $messages);
        /* if we have the os-info, get it */
        if ($record['type'] == 'os_info') {
            $osData = unserialize($record['data']);

 server/lib/classes/monitor_tools.inc.php

@@ -879,7 +879,7 @@
            /*
             * Fetch the output
             */
            $data['output'] = shell_exec('zypper --non-interactive up');
            $data['output'] = shell_exec('zypper lu');
        } else {
            /*
             * It is not Debian/Ubuntu, so there is no data and no state

 server/plugins-available/shelluser_jailkit_plugin.inc.php

@@ -166,7 +166,7 @@
            //exec('rm -rf '.$data['old']['dir'].$jailkit_chroot_userhome);
            
            if(@is_dir($data['old']['dir'].$jailkit_chroot_userhome)) {
                $command = 'userdel';
                $command = 'userdel -f';
                $command .= ' '.escapeshellcmd($data['old']['username']);
                exec($command);
                $app->log("Jailkit Plugin -> delete chroot home:".$data['old']['dir'].$jailkit_chroot_userhome,LOGLEVEL_DEBUG);