Merged revisions 3845-3876 and 3879-3918 from stable branch.

hellkat

2013-03-26 cc65688b3da3e16729a1f73dd50fd975bd1ff741

 server/lib/classes/aps_installer.inc.php

@@ -445,6 +445,11 @@
                $this->file_owner_user = $owner_res['system_user']; 
                $this->file_owner_group = $owner_res['system_group'];
                exec('chown -R '.$this->file_owner_user.':'.$this->file_owner_group.' '.escapeshellarg($this->local_installpath));

      //* Chown stats directory back
      if(is_dir($this->local_installpath.'stats')) {
         exec('chown -R root:root '.escapeshellarg($this->local_installpath.'stats'));
      }
            }
        }
        catch(Exception $e)
@@ -579,6 +584,11 @@
                // The install succeeded, chown newly created files too
                exec('chown -R '.$this->file_owner_user.':'.$this->file_owner_group.' '.escapeshellarg($this->local_installpath));
                
      //* Chown stats directory back
      if(is_dir($this->local_installpath.'stats')) {
         exec('chown -R root:root '.escapeshellarg($this->local_installpath.'stats'));
      }

                $app->dbmaster->query('UPDATE aps_instances SET instance_status = "'.INSTANCE_SUCCESS.'" 
                    WHERE id = "'.$app->db->quote($task['instance_id']).'";');
            }
@@ -707,4 +717,4 @@
        unset($sxe);
    }
}
?>
?>