Fixed problems that prevented ISPConfig to run on PHP 7, Issue #3716

Till Brehm

2016-02-09 f1926a01df8871cdacb29c97ffbfd7ff18d1610a

 server/plugins-available/shelluser_base_plugin.inc.php

@@ -96,6 +96,8 @@
         return false;
      }

      if($data['new']['active'] != 'y') $data['new']['shell'] = '/bin/false';
		
      if($app->system->is_user($data['new']['puser'])) {

         // Get the UID of the parent user
@@ -134,6 +136,10 @@
            exec($command);
            $app->log("Executed command: ".$command, LOGLEVEL_DEBUG);
            $app->log("Added shelluser: ".$data['new']['username'], LOGLEVEL_DEBUG);
				
            $app->system->chown(escapeshellcmd($data['new']['dir']),escapeshellcmd($data['new']['username']));
            $app->system->chgrp(escapeshellcmd($data['new']['dir']),escapeshellcmd($data['new']['pgroup']));
				

            // call the ssh-rsa update function
            $app->uses("getconf");
@@ -146,6 +152,12 @@
            $app->system->chmod(escapeshellcmd($homedir).'/.bash_history', 0755);
            $app->system->chown(escapeshellcmd($homedir).'/.bash_history', $data['new']['username']);
            $app->system->chgrp(escapeshellcmd($homedir).'/.bash_history', $data['new']['pgroup']);

            //* Create .profile file
            $app->system->touch(escapeshellcmd($homedir).'/.profile');
            $app->system->chmod(escapeshellcmd($homedir).'/.profile', 0644);
            $app->system->chown(escapeshellcmd($homedir).'/.profile', $data['new']['username']);
            $app->system->chgrp(escapeshellcmd($homedir).'/.profile', $data['new']['pgroup']);

            //* Disable shell user temporarily if we use jailkit
            if($data['new']['chroot'] == 'jailkit') {
@@ -194,6 +206,8 @@
         return false;
      }
      
      if($data['new']['active'] != 'y') $data['new']['shell'] = '/bin/false';
		
      if($app->system->is_user($data['new']['puser'])) {
         // Get the UID of the parent user
         $uid = intval($app->system->getuid($data['new']['puser']));
@@ -210,6 +224,9 @@
            
            // Check if the user that we want to update exists, if not, we insert it
            if($app->system->is_user($data['old']['username'])) {
               //* Remove webfolder protection
               $app->system->web_folder_protection($web['document_root'], false);
					
               /*
               $command = 'usermod';
               $command .= ' --home '.escapeshellcmd($data['new']['dir']);
@@ -233,7 +250,7 @@
                     $app->system->chgrp(escapeshellcmd($data['new']['dir'].'/home'),escapeshellcmd($data['new']['pgroup']));
                  }
                  $app->file->mkdirs(escapeshellcmd($homedir), '0750');
                  $app->system->chown(escapeshellcmd($homedir),escapeshellcmd($data['new']['username']));
                  $app->system->chown(escapeshellcmd($homedir),escapeshellcmd($data['new']['puser']));
                  $app->system->chgrp(escapeshellcmd($homedir),escapeshellcmd($data['new']['pgroup']));
                  $app->system->web_folder_protection($web['document_root'], true);
               } else {
@@ -266,7 +283,17 @@
                  $app->system->chown(escapeshellcmd($homedir).'/.bash_history', escapeshellcmd($data['new']['username']));
                  $app->system->chgrp(escapeshellcmd($homedir).'/.bash_history', escapeshellcmd($data['new']['pgroup']));
               }
					
               //* Create .profile file
               if(!is_file($data['new']['dir']).'/.profile') {
                  $app->system->touch(escapeshellcmd($homedir).'/.profile');
                  $app->system->chmod(escapeshellcmd($homedir).'/.profile', 0644);
                  $app->system->chown(escapeshellcmd($homedir).'/.profile', escapeshellcmd($data['new']['username']));
                  $app->system->chgrp(escapeshellcmd($homedir).'/.profile', escapeshellcmd($data['new']['pgroup']));
               }

               //* Add webfolder protection again
               $app->system->web_folder_protection($web['document_root'], true);
            } else {
               // The user does not exist, so we insert it now
               $this->insert($event_name, $data);
@@ -403,6 +430,12 @@
      }
      $sshrsa = trim($sshrsa);
      $usrdir = escapeshellcmd($this->data['new']['dir']);
      //* Home directory of the new shell user
      if($this->data['new']['chroot'] == 'jailkit') {
         $usrdir = escapeshellcmd($this->data['new']['dir']);
      } else {
         $usrdir = escapeshellcmd($this->data['new']['dir'].'/home/'.$this->data['new']['username']);
      }
      $sshdir = $usrdir.'/.ssh';
      $sshkeys= $usrdir.'/.ssh/authorized_keys';