Changeset 2584

Timestamp:

02/07/10 16:54:30 (2 years ago)

Author:

tomdooley

Message:

Enhancements and optimizations

Location:

branches/backup-restore/includes

Files:

• BackupPackage.php (modified) (1 diff)
• BackupPackage_ispCP.php (modified) (2 diffs)
• Base.php (modified) (1 diff)
• RestorePackage_ispCP.php (modified) (11 diffs)
• iBackupPackage.php (modified) (1 diff)

branches/backup-restore/includes/BackupPackage.php

@@ -175 +175 @@
                         $this->setConfigData('webuser',         $this->getWebUserConfig());
                         $this->setConfigData('webgroup',        $this->getWebGroupConfig());
+                        $this->setConfigData('webaccess',       $this->getWebAccessConfig());
                         $this->setConfigData('dns',                     $this->getDNSConfig());
                         $this->setConfigData('db',                      $this->getDBConfig());

branches/backup-restore/includes/BackupPackage_ispCP.php

@@ -257 +257 @@
 
                 $fields = "`htaccess_users`.`uname`".
+                                  "`htaccess_users`.`id`".
                                   ", `htaccess_users`.`upass`";
 
@@ -279 +280 @@
 
                 $fields = "`htaccess_groups`.`ugroup`".
+                                  "`htaccess_groups`.`id`".
                                   ", `htaccess_groups`.`members`";
 
                 $query = "SELECT ".$fields." FROM `htaccess_users`".
                                  " WHERE `htaccess_users`.`dmn_id` = :id";
+
+                $query = $this->db->Prepare($query);
+                $rs = $this->db->Execute($query, array(':id'=>$this->domain_id));
+                while ($rs && !$rs->EOF) {
+                        $result[] = $rs->FetchRow();
+                        $rs->MoveNext();
+                }
+
+                return $result;
+        }
+
+        public function getWebAccessConfig()
+        {
+                $result = array();
+
+                $fields = "`htaccess`.`user_id`".
+                                  ", `htaccess`.`group_id`".
+                                  ", `htaccess`.`auth_type`".
+                                  ", `htaccess`.`auth_name`".
+                                  ", `htaccess`.`path`".
+                                  ", `htaccess`.`status`";
+
+                $query = "SELECT ".$fields." FROM `htaccess`".
+                                 " WHERE `htaccess`.`dmn_id` = :id";
 
                 $query = $this->db->Prepare($query);

branches/backup-restore/includes/Base.php

@@ -54 +54 @@
                 return exec($cmd, $a);
         }
+
+        protected function paramDBArray(&$a)
+        {
+                $result = array();
+
+                foreach ($a as $key => $value) {
+                        if ($key{0} !== ':') {
+                                $result[':'.$key] = $value;
+                        } else {
+                                $result[$key] = $value;
+                        }
+                }
+
+                return $result;
+        }
 }
 

branches/backup-restore/includes/RestorePackage_ispCP.php

@@ -61 +61 @@
         protected $domain_user_id = 0;
         /**
+         * linux group id
+         */
+        protected $domain_group_id = 0;
+        /**
          * file name of gpg encrypted domain package
          */
@@ -77 +81 @@
         protected $database_ids = array();
         /**
-         * new subdomain IDs (key = database name)
+         * new subdomain IDs (key = old subdomain id)
          */
         protected $subdomain_ids = array();
+        /**
+         * new web user IDs
+         */
+        protected $webuser_ids = array();
+        /**
+         * new web group IDs
+         */
+        protected $webgroup_ids = array();
 
         /**
@@ -121 +133 @@
         protected function setDomainPermissions()
         {
-                // TODO: setDomainPermissions (chown)
+                $user = sprintf('vu%04d', $this->domain_user_id);
+                $group = sprintf('vu%04d', $this->domain_group_id);
+                $cmd = 'chown -R '.$user.':'.$group.' '.$this->target_path;
+                $a = array();
+                $this->shellExecute($cmd, $a);
         }
 
@@ -178 +194 @@
                            " ORDER BY `admin_id` LIMIT 0, 1";
                 $query = $this->db->Prepare($sql);
-                $rs = $this->db->Execute($query, array(':admin_type'=>'reseller', ':name'=>$reseller));
+                $rs = $this->db->Execute($query, array(
+                        ':admin_type'   => 'reseller',
+                        ':name'                 => $reseller
+                ));
                 if ($rs && !$rs->EOF) {
                         $result = $rs->fields['admin_id'];
@@ -199 +218 @@
                 $sql = "SELECT `ip_id` FROM `server_ips` WHERE `ip_number`=:ip LIMIT 0, 1";
                 $query = $this->db->Prepare($sql);
-                $rs = $this->db->Execute($query, array('ip'=>$ip));
+                $rs = $this->db->Execute($query, array(
+                        ':ip'   => $ip
+                ));
                 if ($rs && !$rs->EOF) {
                         $result = $rs->fields['ip_id'];
@@ -311 +332 @@
                                 " (`domain_id`, `sqld_name`)".
                                 " VALUES".
-                                " (?, ?)"
-                        );
-                        $this->db->Execute($query, array($this->domain_id, $db['sqld_name']));
+                                " (:domain_id, :name)"
+                        );
+                        $this->db->Execute($query, array(
+                                ':domain_id'    => $this->domain_id,
+                                ':name'                 => $db['sqld_name']
+                        ));
                         $this->database_ids[$db['sqld_name']] = $this->db->Insert_ID();
                 }
@@ -351 +375 @@
                                 " (`sqld_id`, `sqlu_name`, `sqlu_pass`)".
                                 " VALUES".
-                                " (:sqld_id, :sqlu_name, :sqlu_pass)"
+                                " (:sqld_id,  :name,       :password)"
                         );
                         $this->db->Execute($query, array(
-                                'sqld_id'=>$this->database_ids[$dbuser['database']],
-                                'sqlu_name'=>$dbuser['sqlu_name'],
-                                'sqlu_pass'=>encrypt_db_password($dbuser['sqlu_pass'])
+                                ':sqld_id'      => $this->database_ids[$dbuser['database']],
+                                ':name'         => $dbuser['sqlu_name'],
+                                ':password'     => encrypt_db_password($dbuser['sqlu_pass'])
                         ));
                 }
@@ -374 +398 @@
                 );
                 $this->db->Execute($query, array(
-                        'dbuser'=>$db_user.'@localhost',
-                        'dbpass'=>$user_pass
+                        ':dbuser'       => $db_user.'@localhost',
+                        ':dbpass'       => $user_pass
                 ));
                 $this->db->Execute($query, array(
-                        'dbuser'=>$db_user.'@%',
-                        'dbpass'=>$user_pass
+                        ':dbuser'       => $db_user.'@%',
+                        ':dbpass'       => $user_pass
                 ));
         }
 
         /**
-         * Create domain, sets $this->domain_user_id and $this->domain_id
+         * Create domain, sets domain_user_id, domain_group_id and domain_id
          * @return boolean true = creation successful
          */
@@ -391 +415 @@
                 $result = false;
 
-                // TODO: createDomain()
-                // TODO: set domain_id
+                // TODO: createDomain, set domain_id
                 $this->createDomainAliases();
                 $this->createSubDomains();
 
-                // TODO: wait until daemon is ready
-                // TODO: set domain_user_id
+                // TODO: wait until daemon is ready, set domain_user_id, set domain_group_id
 
                 return $result;
@@ -404 +426 @@
         protected function createDomainAliases()
         {
-                // TODO: createDomainAliases
+                foreach ($this->configurationData['alias'] as $alias) {
+                        $query = $this->db->Prepare(
+                                "INSERT INTO `domain_aliasses`".
+                                " (domain_id, alias_name, alias_status, alias_mount, alias_ip_id, url_forward)".
+                                " VALUES".
+                                " (:domain_id, :name, :status, :mount, :ip_id, :url_forward)"
+                        );
+                        $this->db->Execute($query, array(
+                                ':domain_id'    => $this->domain_id,
+                                ':name'                 => $alias['alias_name'],
+                                ':status'               => 'toadd',
+                                ':mount'                => $alias['alias_mount'],
+                                ':ip_id'                => $this->ip_id,
+                                ':url_forward'  =>$alias['url_forward']
+                        ));
+                        $alias_id = $this->db->Insert_ID();
+
+                        foreach ($alias['subdomain'] as $subdomain) {
+                                $query = $this->db->Prepare(
+                                        "INSERT INTO `subdomain_aliasses`".
+                                        " (alias_id, subdomain_alias_name, subdomain_alias_status, subdomain_alias_mount)".
+                                        " VALUES".
+                                        " (:alias_id, :name, :status, :mount)"
+                                );
+                                $this->db->Execute($query, array(
+                                        ':alias_id'     => $alias_id,
+                                        ':name'         => $alias['subdomain_alias_name'],
+                                        ':status'       => 'toadd',
+                                        ':mount'                => $alias['subdomain_alias_mount']
+                                ));
+                        }
+                }
         }
 
         protected function createSubDomains()
         {
-                // TODO: createSubDomains
-        }
-
+                foreach ($this->configurationData['subdomain'] as $subdomain) {
+                        $query = $this->db->Prepare(
+                                "INSERT INTO `subdomain`".
+                                " (domain_id, subdomain_name, subdomain_mount, subdomain_status)".
+                                " VALUES ".
+                                " (:domain_id, :name,        :mount,          :status)"
+                        );
+                        $this->db->Execute($query, array(
+                                ':domain_id'    => $this->domain_id,
+                                ':name'                 => $subdomain['subdomain_name'],
+                                ':status'               => 'toadd',
+                                ':mount'                => $subdomain['alias_mount']
+                        ));
+                        $this->subdomain_ids[$subdomain['subdomain_id']] = $this->db->Insert_ID();
+                }
+        }
+
+        /**
+         * Create all E-Mail accounts for domain
+         */
         protected function createEMailAccounts()
         {
-                // TODO: createEMailAccounts
+                foreach ($this->configurationData['email'] as $email) {
+                        $query = $this->db->Prepare(
+                                "INSERT INTO `mail_users`".
+                                " (domain_id, mail_acc, mail_pass, mail_forward, mail_type, sub_id, status".
+                                "  , mail_auto_respond, mail_auto_respond_text, quota, mail_adr)".
+                                " VALUES ".
+                                " (:domain_id, :mail_acc, :mail_pass, :mail_forward, :mail_type, :sub_id, :mail_status".
+                                "  , :mail_auto_respond, :mail_auto_respond_text, :quota, :mail_adr".
+                                ")"
+                        );
+                        $email['domain_id'] = $this->domain_id;
+                        $email['status'] = 'toadd';
+                        $email['mail_pass'] = encrypt_db_password($email['mail_pass']);
+                        $email['sub_id'] = $this->subdomain_ids[$email['sub_id']];
+                        $params = $this->paramDBArray($email);
+                        $this->db->Execute($query, $params);
+                }
         }
 
         protected function createFTPAccounts()
         {
-                // TODO: createFTPAccounts
-        }
-
+                $members = '';
+                foreach ($this->configurationData['ftp'] as $ftp) {
+                        $query = $this->db->Prepare(
+                                "INSERT INTO `ftp_users`".
+                                " (userid, passwd, uid, gid, shell, homedir)".
+                                " VALUES ".
+                                " (:userid, :passwd, :uid, :gid, :shell, :homedir)"
+                        );
+                        $ftp['uid'] = $this->domain_user_id;
+                        $ftp['gid'] = $this->domain_group_id;
+                        $params = $this->paramDBArray($ftp);
+                        $this->db->Execute($query, $params);
+
+                        if (!empty($members)) $members .= ',';
+                        $members .= $ftp['userid'];
+                }
+
+                if (!emtpy($members)) {
+                        $query = $this->db->Prepare(
+                                "INSERT INTO `ftp_group`".
+                                " (groupname, gid, members)".
+                                " VALUES ".
+                                " (:groupname, :gid, :members)"
+                        );
+                        $a = array(
+                                ':groupname'    => $this->domain_name,
+                                ':gid'                  => $this->domain_group_id,
+                                ':members'              => $members
+                        );
+                        $this->db->Execute($query, $a);
+                }
+        }
+
+        /**
+         * Create web users (htaccess_users)
+         */
         protected function createWebUsers()
         {
-                // TODO: createWebUsers
-        }
-
+                foreach ($this->configurationData['webuser'] as $webuser) {
+                        $query = $this->db->Prepare(
+                                "INSERT INTO `htaccess_users`".
+                                " (domain_id, uname, upass, status)".
+                                " VALUES ".
+                                " (:domain_id, :uname, :upass, :status)"
+                        );
+
+                        $webuser['status'] = 'toadd';
+                        $webuser['upass'] = encrypt_db_password($webuser['upass']);
+                        $webuser['domain_id'] = $this->domain_id;
+
+                        $params = $this->paramDBArray($webuser);
+                        $this->db->Execute($query, $params);
+
+                        $this->webuser_ids[$webuser['id']] = $this->db->Insert_ID();
+                }
+        }
+
+        /**
+         * Create web groups (htaccess_groups)
+         */
         protected function createWebGroups()
         {
-                // TODO: createWebGroups
+                foreach ($this->configurationData['webgroup'] as $webgroup) {
+                        $query = $this->db->Prepare(
+                                "INSERT INTO `htaccess_groups`".
+                                " (dmn_id, ugroup, members, status)".
+                                " VALUES ".
+                                " (:domain_id, :ugroup, :members, :status)"
+                        );
+
+                        $old_members = explode(',', $webgroup['members']);
+                        $new_members = array();
+                        foreach ($old_members as $member_id) {
+                                if (isset($this->webuser_ids[$member_id])) {
+                                        $new_members[] = $this->webuser_ids[$member_id];
+                                }
+                        }
+                        $webgroup['members'] = implode(',', $new_members);
+
+                        $webgroup['status'] = 'toadd';
+                        $webgroup['domain_id'] = $this->domain_id;
+
+                        $params = $this->paramDBArray($webgroup);
+                        $this->db->Execute($query, $params);
+
+                        $this->webgroup_ids[$webgroup['id']] = $this->db->Insert_ID();
+                }
+        }
+
+        protected function createWebAccess()
+        {
+                foreach ($this->configurationData['webaccess'] as $webaccess) {
+                        $query = $this->db->Prepare(
+                                "INSERT INTO `htaccess`".
+                                " (dmn_id, user_id, group_id, auth_type, auth_name, path, status)".
+                                " VALUES ".
+                                " (:domain_id, :user_id, :group_id, :auth_type, :auth_name, :path, :status)"
+                        );
+
+                        if (!empty($webaccess['user_id'])) {
+                                if (isset($this->webuser_ids[$webaccess['user_id']])) {
+                                        $webaccess['user_id'] = $this->webuser_ids[$webaccess['user_id']];
+                                } else {
+                                        // TODO: undefined state
+                                }
+                        }
+                        if (!empty($webaccess['group_id'])) {
+                                if (isset($this->webgroup_ids[$webaccess['group_id']])) {
+                                        $webaccess['group_id'] = $this->webgroup_ids[$webaccess['group_id']];
+                                } else {
+                                        // TODO: undefined state
+                                }
+                        }
+
+                        $webaccess['status'] = 'toadd';
+                        $webaccess['domain_id'] = $this->domain_id;
+
+                        $params = $this->paramDBArray($webaccess);
+                        $this->db->Execute($query, $params);
+                }
         }
 
         /**
          * Run the restore, main method
-         * TODO: don't forget sub_id in mail accounts!
          * @return boolean true = restore successful, false = see error messages
          */
@@ -452 +646 @@
                                                 $this->createWebUsers();
                                                 $this->createWebGroups();
+                                                $this->createWebAccess();
                                                 $this->setDomainPermissions();
 

branches/backup-restore/includes/iBackupPackage.php

@@ -29 +29 @@
         public function getWebUserConfig();
         public function getWebGroupConfig();
+        public function getWebAccessConfig();
         public function getDNSConfig();
         public function getDBConfig();