Fixed: FS#2836 - Upgrade from 3.0.4.x to 3.0.5 will break ispconfig setup i...

tbrehm

2013-03-27 6b3bfc2fbf53e079e64614cdca608d84326be868

Fixed: FS#2836 - Upgrade from 3.0.4.x to 3.0.5 will break ispconfig setup if php-process module is missing.

 server/lib/classes/system.inc.php

@@ -575,6 +575,29 @@
    }
    
    /**
     * Get the group id from an group
     *
     */
    function getgid($group){
        global $app;
          if($this->is_group($group)){
            $group_datei = $this->server_conf['group_datei'];
            $groups = $app->file->no_comments($group_datei);
            $lines = explode("\n", $groups);
            if(is_array($lines)){
            foreach($lines as $line){
                    if(trim($line) != ""){
                        list($f1, $f2, $f3, $f4) = explode(':', $line);
                        if($f1 == $group) return $f3;
                    }
                }
            }
          } else {
            return false;
          }
    }
	
    /**
     * Get all information from a user
     *
     */

 server/plugins-available/shelluser_base_plugin.inc.php

@@ -162,8 +162,8 @@
                    exec($command);
                    $app->log("Executed command: $command ",LOGLEVEL_DEBUG);
                    */
                    $groupinfo = posix_getgrnam($data['new']['pgroup']);
                    $app->system->usermod($data['old']['username'],0, $groupinfo[gid], $data['new']['dir'], $data['new']['shell'], $data['new']['password'], $data['new']['username']);
                    //$groupinfo = posix_getgrnam($data['new']['pgroup']);
                    $app->system->usermod($data['old']['username'],0, $app->system->getgid($data['new']['pgroup']), $data['new']['dir'], $data['new']['shell'], $data['new']['password'], $data['new']['username']);
                    $app->log("Updated shelluser: ".$data['old']['username'],LOGLEVEL_DEBUG);
                                    
                    // call the ssh-rsa update function