- Fixed: invalid regex in path checking

mcramer

2013-07-11 e9b67e8196204a5c1b0f5266bb0d0c9150b4a2be

 server/plugins-available/apache2_plugin.inc.php

@@ -247,6 +247,7 @@
         //* Write the key file, if field is empty then import the key into the db
         if(trim($data["new"]["ssl_key"]) != '') {
            $app->system->file_put_contents($key_file2,$data["new"]["ssl_key"]);
            $app->system->chmod($key_file2,0400);
         } else {
            $ssl_key2 = $app->db->quote($app->system->file_get_contents($key_file2));
            /* Update the DB of the (local) Server */
@@ -1032,7 +1033,7 @@
               
            // Rewriting
            if($alias['redirect_type'] != '' && $alias['redirect_path'] != '') {
               if(substr($alias['redirect_path'],-1) != '/' && !preg_match('/^(https?|\[scheme\]):\/\//', $data['new']['redirect_path'])) $alias['redirect_path'] .= '/';
               if(substr($alias['redirect_path'],-1) != '/' && !preg_match('/^(https?|\[scheme\]):\/\//', $alias['redirect_path'])) $alias['redirect_path'] .= '/';
               if(substr($alias['redirect_path'],0,8) == '[scheme]'){
                  $rewrite_target = 'http'.substr($alias['redirect_path'],8);
                  $rewrite_target_ssl = 'https'.substr($alias['redirect_path'],8);
@@ -2766,8 +2767,10 @@
            $app->log('Removed client directory: '.$client_dir,LOGLEVEL_DEBUG);
         }
         
         $this->_exec('groupdel client'.$client_id);
         $app->log('Removed group client'.$client_id,LOGLEVEL_DEBUG);
         if($app->system->is_group('client'.$client_id)){
            $this->_exec('groupdel client'.$client_id);
            $app->log('Removed group client'.$client_id,LOGLEVEL_DEBUG);
         }
      }
      
   }