- Remove trailing slash from $master_php_ini_path. - Make sure $custom_fast...

ftimme

2013-02-07 800ac30ecefea5213aa9172de1f5388154b7690a

 server/plugins-available/apache2_plugin.inc.php

@@ -834,6 +834,13 @@
               $master_php_ini_path = $web_config['php_ini_path_cgi'];
            }
         }
			
         //* Add php.ini to the path in case that the master_php_ini_path is a directory
         if($master_php_ini_path != '' && is_dir($master_php_ini_path) && is_file($master_php_ini_path.'/php.ini')) {
            if(substr($master_php_ini_path,-1) == '/') $master_php_ini_path = substr($master_php_ini_path,0,-1);
            $master_php_ini_path .= '/php.ini';
         }
			
         if($master_php_ini_path != '' && substr($master_php_ini_path,-7) == 'php.ini' && is_file($master_php_ini_path)) {
            $php_ini_content .= $app->system->file_get_contents($master_php_ini_path)."\n";
         }
@@ -1120,6 +1127,7 @@
         if(trim($data['new']['fastcgi_php_version']) != ''){
            $default_fastcgi_php = false;
            list($custom_fastcgi_php_name, $custom_fastcgi_php_executable, $custom_fastcgi_php_ini_dir) = explode(':', trim($data['new']['fastcgi_php_version']));
            if(is_file($custom_fastcgi_php_ini_dir)) $custom_fastcgi_php_ini_dir = dirname($custom_fastcgi_php_ini_dir);
            if(substr($custom_fastcgi_php_ini_dir,-1) != '/') $custom_fastcgi_php_ini_dir .= '/';
         } else {
            $default_fastcgi_php = true;
@@ -2668,8 +2676,13 @@
         if(is_dir($client_dir) && !stristr($client_dir,'..')) {
            // remove symlinks from $client_dir
            $files = array_diff(scandir($client_dir), array('.','..'));
            foreach($files as $file){
               if(is_link($client_dir.'/'.$file)) unlink($client_dir.'/'.$file);
            if(is_array($files) && !empty($files)){
               foreach($files as $file){
                  if(is_link($client_dir.'/'.$file)){
                     unlink($client_dir.'/'.$file);
                     $app->log('Removed symlink: '.$client_dir.'/'.$file,LOGLEVEL_DEBUG);
                  }
               }
            }
            
            @rmdir($client_dir);