- Changed regex for redirect path (Web sites, subdomains, vhost subdomains,...

ftimme

2013-01-16 08cc7f673c377bf88897743e340097e93f1e95f4

 server/plugins-available/apache2_plugin.inc.php

@@ -121,8 +121,14 @@
         $this->ssl_certificate_changed = true;
         
         //* Rename files if they exist
         if(file_exists($key_file)) $app->system->rename($key_file,$key_file.'.bak');
         if(file_exists($key_file2)) $app->system->rename($key_file2,$key_file2.'.bak');
         if(file_exists($key_file)){
            $app->system->rename($key_file,$key_file.'.bak');
            $app->system->chmod($key_file.'.bak',0400);
         }
         if(file_exists($key_file2)){
            $app->system->rename($key_file2,$key_file2.'.bak');
            $app->system->chmod($key_file2.'.bak',0400);
         }
         if(file_exists($csr_file)) $app->system->rename($csr_file,$csr_file.'.bak');
         if(file_exists($crt_file)) $app->system->rename($crt_file,$crt_file.'.bak');
         
@@ -165,11 +171,15 @@

         $rand_file = escapeshellcmd($rand_file);
         $key_file = escapeshellcmd($key_file);
         if(substr($domain, 0, 2) == '*.' && strpos($key_file, '/ssl/\*.') != false) $key_file = str_replace('/ssl/\*.', '/ssl/*.', $key_file); // wildcard certificate
         $key_file2 = escapeshellcmd($key_file2);
         if(substr($domain, 0, 2) == '*.' && strpos($key_file2, '/ssl/\*.') != false) $key_file2 = str_replace('/ssl/\*.', '/ssl/*.', $key_file2); // wildcard certificate
         $ssl_days = 3650;
         $csr_file = escapeshellcmd($csr_file);
         if(substr($domain, 0, 2) == '*.' && strpos($csr_file, '/ssl/\*.') != false) $csr_file = str_replace('/ssl/\*.', '/ssl/*.', $csr_file); // wildcard certificate
         $config_file = escapeshellcmd($ssl_cnf_file);
         $crt_file = escapeshellcmd($crt_file);
         if(substr($domain, 0, 2) == '*.' && strpos($crt_file, '/ssl/\*.') != false) $crt_file = str_replace('/ssl/\*.', '/ssl/*.', $crt_file); // wildcard certificate

         if(is_file($ssl_cnf_file) && !is_link($ssl_cnf_file)) {
            
@@ -190,6 +200,7 @@
         
         }

         $app->system->chmod($key_file,0400);
         $app->system->chmod($key_file2,0400);
         @$app->system->unlink($config_file);
         @$app->system->unlink($rand_file);
@@ -216,8 +227,14 @@
         $bundle_file = $ssl_dir.'/'.$domain.".bundle";
         
         //* Backup files
         if(file_exists($key_file)) $app->system->copy($key_file,$key_file.'~');
         if(file_exists($key_file2)) $app->system->copy($key_file2,$key_file2.'~');
         if(file_exists($key_file)){
            $app->system->copy($key_file,$key_file.'~');
            $app->system->chmod($key_file.'~',0400);
         }
         if(file_exists($key_file2)){
            $app->system->copy($key_file2,$key_file2.'~');
            $app->system->chmod($key_file2.'~',0400);
         }
         if(file_exists($csr_file)) $app->system->copy($csr_file,$csr_file.'~');
         if(file_exists($crt_file)) $app->system->copy($crt_file,$crt_file.'~');
         if(file_exists($bundle_file)) $app->system->copy($bundle_file,$bundle_file.'~');
@@ -421,8 +438,8 @@
         
         //* Create new base directory, if it does not exist yet
         if(!is_dir($new_dir)) $app->system->mkdirpath($new_dir);
         //exec('mv '.$data['old']['document_root'].' '.$new_dir);
         $app->system->rename($data['old']['document_root'],$new_dir);
         exec('mv '.escapeshellarg($data['old']['document_root']).' '.escapeshellarg($new_dir));
         //$app->system->rename($data['old']['document_root'],$new_dir);
         $app->log('Moving site to new document root: mv '.$data['old']['document_root'].' '.$new_dir,LOGLEVEL_DEBUG);

         // Handle the change in php_open_basedir
@@ -1450,8 +1467,14 @@
               $bundle_file = $ssl_dir.'/'.$domain.'.bundle';
               
               //* Backup the files that might have caused the error
               if(is_file($key_file)) $app->system->copy($key_file,$key_file.'.err');
               if(is_file($key_file2)) $app->system->copy($key_file2,$key_file2.'.err');
               if(is_file($key_file)){
                  $app->system->copy($key_file,$key_file.'.err');
                  $app->system->chmod($key_file.'.err',0400);
               }
               if(is_file($key_file2)){
                  $app->system->copy($key_file2,$key_file2.'.err');
                  $app->system->chmod($key_file2.'.err',0400);
               }
               if(is_file($csr_file)) $app->system->copy($csr_file,$csr_file.'.err');
               if(is_file($crt_file)) $app->system->copy($crt_file,$crt_file.'.err');
               if(is_file($bundle_file)) $app->system->copy($bundle_file,$bundle_file.'.err');