Fixed relative link function in apache plugin.

tbrehm

2012-11-06 eaed19f266129ea1c7a09e1e384ba7de43671b9d

 server/plugins-available/apache2_plugin.inc.php

@@ -1098,6 +1098,7 @@
         $tpl->setVar('fastcgi_starter_path',$fastcgi_starter_path);
         $tpl->setVar('fastcgi_starter_script',$fastcgi_config['fastcgi_starter_script'].($data['new']['type'] == 'vhostsubdomain' ? '_web' . $data['new']['domain_id'] : ''));
         $tpl->setVar('fastcgi_config_syntax',$fastcgi_config['fastcgi_config_syntax']);
         $tpl->setVar('fastcgi_max_requests',$fastcgi_config['fastcgi_max_requests']);

      } else {
         //remove the php fastgi starter script if available
@@ -1342,19 +1343,19 @@
      //* Create .htaccess and .htpasswd file for website statistics
      if(!is_file($data['new']['document_root'].'/' . $web_folder . '/stats/.htaccess') or $data['old']['document_root'] != $data['new']['document_root']) {
         if(!is_dir($data['new']['document_root'].'/' . $web_folder . '/stats')) $app->system->mkdir($data['new']['document_root'].'/' . $web_folder . '/stats');
         $ht_file = "AuthType Basic\nAuthName \"Members Only\"\nAuthUserFile ".$data['new']['document_root']."/.htpasswd_stats\nrequire valid-user";
         $ht_file = "AuthType Basic\nAuthName \"Members Only\"\nAuthUserFile ".$data['new']['document_root']."/web/stats/.htpasswd_stats\nrequire valid-user";
         $app->system->file_put_contents($data['new']['document_root'].'/' . $web_folder . '/stats/.htaccess',$ht_file);
         $app->system->chmod($data['new']['document_root'].'/' . $web_folder . '/stats/.htaccess',0755);
         unset($ht_file);
      }

      if(!is_file($data['new']['document_root'].'/.htpasswd_stats') || $data['new']['stats_password'] != $data['old']['stats_password']) {
      if(!is_file($data['new']['document_root'].'/web/stats/.htpasswd_stats') || $data['new']['stats_password'] != $data['old']['stats_password']) {
         if(trim($data['new']['stats_password']) != '') {
            $htp_file = 'admin:'.trim($data['new']['stats_password']);
            $app->system->web_folder_protection($data['new']['document_root'],false);
            $app->system->file_put_contents($data['new']['document_root'].'/.htpasswd_stats',$htp_file);
            $app->system->file_put_contents($data['new']['document_root'].'/web/stats/.htpasswd_stats',$htp_file);
            $app->system->web_folder_protection($data['new']['document_root'],true);
            $app->system->chmod($data['new']['document_root'].'/.htpasswd_stats',0750);
            $app->system->chmod($data['new']['document_root'].'/web/stats/.htpasswd_stats',0750);
            unset($htp_file);
         }
      }
@@ -2198,7 +2199,7 @@
            $files = @scandir($webdavRoot);
            if(is_array($files)) {
            foreach($files as $file) {
               if (substr($file, strlen($file) - strlen('.htdigest')) == '.htdigest' && preg_match("[a-zA-Z0-9\-_\.]",$file)) {
               if (substr($file, strlen($file) - strlen('.htdigest')) == '.htdigest' && preg_match("/^[a-zA-Z0-9\-_\.]*$/",$file)) {
                  /*
                   * found a htdigest - file, so add it to webdav
                  */
@@ -2556,6 +2557,8 @@
   }

   public function create_relative_link($f, $t) {
      global $app;
		
      // $from already exists
      $from = realpath($f);