- Changed previous commit to check for read permissions only on download ac...

mcramer

2013-09-02 e0dc711c2b2dc4e2ec397d7f53910f11e1ca4ade

 server/plugins-available/apache2_plugin.inc.php

@@ -1493,34 +1493,44 @@
            $app->log('Apache did not restart after the configuration change for website '.$data['new']['domain'].'. Reverting the configuration. Saved non-working config as '.$vhost_file.'.err',LOGLEVEL_WARN);
            if(is_array($retval['output']) && !empty($retval['output'])){
               $app->log('Reason for Apache restart failure: '.implode("\n", $retval['output']),LOGLEVEL_WARN);
               $app->dbmaster->datalogError(implode("\n", $retval['output']));
            } else {
               // if no output is given, check again
               $webserver_binary = '';
               exec('which apache2', $webserver_check_output, $webserver_check_retval);
               exec('which apache2ctl', $webserver_check_output, $webserver_check_retval);
               if($webserver_check_retval == 0){
                  $webserver_binary = 'apache2';
                  $webserver_binary = 'apache2ctl';
               } else {
                  unset($webserver_check_output, $webserver_check_retval);
                  exec('which httpd2', $webserver_check_output, $webserver_check_retval);
                  exec('which apache2', $webserver_check_output, $webserver_check_retval);
                  if($webserver_check_retval == 0){
                     $webserver_binary = 'httpd2';
                     $webserver_binary = 'apache2';
                  } else {
                     unset($webserver_check_output, $webserver_check_retval);
                     exec('which httpd', $webserver_check_output, $webserver_check_retval);
                     exec('which httpd2', $webserver_check_output, $webserver_check_retval);
                     if($webserver_check_retval == 0){
                        $webserver_binary = 'httpd';
                        $webserver_binary = 'httpd2';
                     } else {
                        unset($webserver_check_output, $webserver_check_retval);
                        exec('which apache', $webserver_check_output, $webserver_check_retval);
                        exec('which httpd', $webserver_check_output, $webserver_check_retval);
                        if($webserver_check_retval == 0){
                           $webserver_binary = 'apache';
                           $webserver_binary = 'httpd';
                        } else {
                           unset($webserver_check_output, $webserver_check_retval);
                           exec('which apache', $webserver_check_output, $webserver_check_retval);
                           if($webserver_check_retval == 0){
                              $webserver_binary = 'apache';
                           }
                        }
                     }
                  }
               }
               if($webserver_binary != ''){
                  exec($webserver_binary.' -t 2>&1', $tmp_output, $tmp_retval);
                  if($tmp_retval > 0 && is_array($tmp_output) && !empty($tmp_output)) $app->log('Reason for Apache restart failure: '.implode("\n", $tmp_output),LOGLEVEL_WARN);
                  if($tmp_retval > 0 && is_array($tmp_output) && !empty($tmp_output)){
                     $app->log('Reason for Apache restart failure: '.implode("\n", $tmp_output),LOGLEVEL_WARN);
                     $app->dbmaster->datalogError(implode("\n", $tmp_output));
                  }
                  unset($tmp_output, $tmp_retval);
               }
            }