Merged revisions 2095-2129 which contain bugfixes from stable branch.

tbrehm

2010-11-24 9f56bd96367f7f3cfa295f23b9129a7dfa1f21af

 interface/web/sites/web_domain_edit.php

@@ -426,6 +426,10 @@
         if($this->dataRecord['ssl_organisation_unit'] == '') $app->tform->errorMessage .= $app->tform->lng('error_ssl_organisation_unit_empty').'<br />';
         if($this->dataRecord['ssl_country'] == '') $app->tform->errorMessage .= $app->tform->lng('error_ssl_country_empty').'<br />';
      }
		
      if(isset($this->dataRecord['ssl_action']) && $this->dataRecord['ssl_action'] == 'save') {
         if(trim($this->dataRecord['ssl_cert']) == '') $app->tform->errorMessage .= $app->tform->lng('error_ssl_cert_empty').'<br />';
      }

   }