Added support for shell users in the interface and fixed several strict syn...

tbrehm

2007-10-17 af8f1ba169081990bfbe62fe295d8124f6aadc5c

 server/plugins-enabled/apache2_plugin.inc.php

@@ -31,8 +31,7 @@
class apache2_plugin {
   
   var $plugin_name = 'apache2_plugin';
   var $class_name = $this->plugin_name;
	
   var $class_name = 'apache2_plugin';
   
      
   /*
@@ -50,12 +49,17 @@
      $app->plugins->registerEvent('web_domain_update',$this->plugin_name,'update');
      $app->plugins->registerEvent('web_domain_delete',$this->plugin_name,'delete');
      
      $app->plugins->registerEvent('server_ip_insert',$this->plugin_name,'server_ip');
      $app->plugins->registerEvent('server_ip_update',$this->plugin_name,'server_ip');
      $app->plugins->registerEvent('server_ip_delete',$this->plugin_name,'server_ip');
		
   }
   
   function insert($event_name,$data) {
      global $app, $conf;
      
		
      // just run the update function
      $this->update($event_name,$data);
      
      
   }
@@ -64,16 +68,174 @@
   function update($event_name,$data) {
      global $app, $conf;
      
		
      if($data["new"]["type"] != "vhost" && $data["new"]["parent_domain_id"] > 0) {
         // This is not a vhost, so we need to update the parent record instead.
         $parent_domain_id = intval($data["new"]["parent_domain_id"]);
         $tmp = $app->db->queryOneRecord("SELECT * FROM web_domain WHERE domain_id = ".$parent_domain_id." AND active = 'y'");
         $data["new"] = $tmp;
         $data["old"] = $tmp;
      }
		
		
      // load the server configuration options
      $app->uses("getconf");
      $web_config = $app->getconf->get_server_config($conf["server_id"], 'web');
      
      if($data["new"]["document_root"] == '') {
         $app->log("document_root not set",LOGLEVEL_WARN);
         return 0;
      }
      if($data["new"]["system_user"] == 'root' or $data["new"]["system_group"] == 'root') {
         $app->log("Websites can not be owned by the root user or group.",LOGLEVEL_WARN);
         return 0;
      }
		
      //print_r($data);
		
      // Check if the directories are there and create them if nescessary.
      if(!is_dir($data["new"]["document_root"]."/web")) exec("mkdir -p ".$data["new"]["document_root"]."/web");
      if(!is_dir($data["new"]["document_root"]."/web/error")) exec("mkdir -p ".$data["new"]["document_root"]."/web/error");
      //if(!is_dir($data["new"]["document_root"]."/log")) exec("mkdir -p ".$data["new"]["document_root"]."/log");
      if(!is_dir($data["new"]["document_root"]."/ssl")) exec("mkdir -p ".$data["new"]["document_root"]."/ssl");
      if(!is_dir($data["new"]["document_root"]."/cgi-bin")) exec("mkdir -p ".$data["new"]["document_root"]."/cgi-bin");
		
      // Create the symlink for the logfiles
      if(!is_dir('/var/log/ispconfig/httpd/'.$data["new"]["domain"])) exec('mkdir -p /var/log/ispconfig/httpd/'.$data["new"]["domain"]);
      if(!is_link($data["new"]["document_root"]."/log")) exec("ln -s /var/log/ispconfig/httpd/".$data["new"]["domain"]." ".$data["new"]["document_root"]."/log");
		
      // TODO: Create the symlinks
		
      // Copy the error pages
      $error_page_path = escapeshellcmd($data["new"]["web_document_root"])."/web/error/";
      exec("cp /usr/local/ispconfig/server/conf/error/".substr(escapeshellcmd($conf["language"]),0,2)."/* ".$error_page_path);
		
      // Create group and user, if not exist
      $app->uses("system");
		
      $groupname = escapeshellcmd($data["new"]["system_group"]);
      if($data["new"]["system_group"] != '' && !$app->system->is_group($data["new"]["system_group"])) {
         exec("groupadd $groupname");
         $app->log("Adding the group: $groupname",LOGLEVEL_DEBUG);
      }
		
      $username = escapeshellcmd($data["new"]["system_user"]);
      if($data["new"]["system_user"] != '' && !$app->system->is_user($data["new"]["system_user"])) {
         exec("useradd -d ".escapeshellcmd($data["new"]["document_root"])." -g $groupname $username");
         $app->log("Adding the user: $username",LOGLEVEL_DEBUG);
      }
		
      // Set the quota for the user
      if($username != '' && $app->system->is_user($username)) {
         if($data["new"]["hd_quota"] > 0){
             $blocks_soft = $data["new"]["hd_quota"] * 1024;
             $blocks_hard = $blocks_soft + 1024;
           } else {
             $blocks_soft = $blocks_hard = 0;
           }
         exec("setquota -u $username $blocks_soft $blocks_hard 0 0 -a &> /dev/null");
         exec("setquota -T -u $username 604800 604800 -a &> /dev/null");
      }
		
		
		
      // Chown and chmod the directories
      exec("chown -R $username:$groupname ".escapeshellcmd($data["new"]["document_root"]));
		
      // Create the vhost config file
      $app->load('tpl');
		
      $tpl = new tpl();
      $tpl->newTemplate("vhost.conf.master");
		
      $vhost_data = $data["new"];
      $vhost_data["web_document_root"] = $data["new"]["document_root"]."/web";
      //$vhost_data["document_root"] = $data["new"]["document_root"]."/web";
      $tpl->setVar($vhost_data);
		
      // Rewrite rules
      $rewrite_rules = array();
      if($data["new"]["redirect_type"] != '') {
         $rewrite_rules[] = array(   'rewrite_domain'    => $data["new"]["domain"],
                              'rewrite_type'       => $data["new"]["redirect_type"],
                              'rewrite_target'    => $data["new"]["redirect_path"]);
      }
		
      // get alias domains (co-domains and subdomains)
      $aliases = $app->db->queryAllRecords("SELECT * FROM web_domain WHERE parent_domain_id = ".$data["new"]["domain_id"]." AND active = 'y'");
      $server_alias = '';
      if(is_array($aliases)) {
         foreach($aliases as $alias) {
            $server_alias .= $alias["domain"].' ';
            $app->log("Add server alias: $alias[domain]",LOGLEVEL_DEBUG);
            // Rewriting
            if($alias["redirect_type"] != '') {
               $rewrite_rules[] = array(   'rewrite_domain'    => $alias["domain"],
                                    'rewrite_type'       => $alias["redirect_type"],
                                    'rewrite_target'    => $alias["redirect_path"]);
            }
         }
      }
      $tpl->setVar('alias',trim($server_alias));
      if(count($rewrite_rules) > 0) {
         $tpl->setVar('rewrite_enabled',1);
      } else {
         $tpl->setVar('rewrite_enabled',0);
      }
      $tpl->setLoop('redirects',$rewrite_rules);
		
      $vhost_file = escapeshellcmd($web_config["vhost_conf_dir"].'/'.$data["new"]["domain"].'.vhost');
      file_put_contents($vhost_file,$tpl->grab());
      $app->log("Writing the vhost file: $vhost_file",LOGLEVEL_DEBUG);
      unset($tpl);
		
      // Set the symlink to enable the vhost
      $vhost_symlink = escapeshellcmd($web_config["vhost_conf_enabled_dir"].'/'.$data["new"]["domain"].'.vhost');
      if($data["new"]["active"] == 'y' && !is_link($vhost_symlink)) {
         symlink($vhost_file,$vhost_symlink);
         $app->log("Creating the symlink: $vhost_symlink => $vhost_file",LOGLEVEL_DEBUG);
      }
		
      // Remove the symlink, if site is inactive
      if($data["new"]["active"] == 'n' && is_link($vhost_symlink)) {
         unlink($vhost_symlink);
         $app->log("Removing symlink: $vhost_symlink => $vhost_file",LOGLEVEL_DEBUG);
      }
		
      // request a httpd reload when all records have been processed
      $app->services->restartServiceDelayed('httpd','reload');
      
   }
   
   function delete($event_name,$data) {
      global $app, $conf;
      
      // load the server configuration options
      $app->uses("getconf");
      $web_config = $app->getconf->get_server_config($conf["server_id"], 'web');
		
      // Deleting the vhost file, symlink and the data directory
      $vhost_symlink = escapeshellcmd($web_config["vhost_conf_enabled_dir"].'/'.$data["old"]["domain"].'.vhost');
      unlink($vhost_symlink);
      $app->log("Removing symlink: $vhost_symlink => $vhost_file",LOGLEVEL_DEBUG);
		
      $vhost_file = escapeshellcmd($web_config["vhost_conf_dir"].'/'.$data["old"]["domain"].'.vhost');
      unlink($vhost_file);
      $app->log("Removing vhost file: $vhost_file",LOGLEVEL_DEBUG);
		
      $docroot = escapeshellcmd($data["old"]["document_root"]);
      if($docroot != '' && !stristr($docroot,'..')) exec("rm -rf $docroot");
      $app->log("Removing website: $docroot",LOGLEVEL_DEBUG);
		
   }
	
   //* This function is called when a IP on the server is inserted, updated or deleted
   function server_ip($event_name,$data) {
      global $app, $conf;
		
      // Here we write the name virtualhost directives
      // NameVirtualHost IP:80
      // NameVirtualHost IP:443
      
   }