fixed branch view

[GITManagedWebpage.git] / GITManagedWebpage.class.php

diff --git a/GITManagedWebpage.class.php b/GITManagedWebpage.class.php
index 481bf143ecafcfea7fe91ae9ec2bc06cece07a0e..6b6d903b57f095fdda048aa9b4fc9e6e52ce3e7b 100644 (file)
--- a/GITManagedWebpage.class.php
+++ b/GITManagedWebpage.class.php
@@ -90,7 +90,7 @@ class GITManagedWebpage {
             } else
                 $argstr .= " ".escapeshellarg($arg);
         }
-        $gitcmd = 'git '.escapeshellarg('--git-dir='.$this->workdir.'repository/.git').' '.escapeshellarg('--work-tree='.$this->workdir.'repository/.git').$argstr;
+        $gitcmd = 'git '.escapeshellarg('--git-dir='.$this->workdir.'repository/.git').' '.escapeshellarg('--work-tree='.$this->workdir.'repository').$argstr;
         $output = shell_exec($gitcmd);
         return $output;
     }
@@ -103,6 +103,16 @@ class GITManagedWebpage {
         $this->config_changed = true;
     }
     
+    private function checkConfigIntegrity() {
+        foreach($this->config as $key => $value) {
+            if(substr($key, 0, strlen('branch_')) == 'branch_') {
+                if(!file_exists($this->workdir.$key)) {
+                    unset($this->config['key']);
+                }
+            }
+        }
+    }
+    
     /* private function getConfig($name)
     * get an option from the configuration
     */
@@ -113,6 +123,7 @@ class GITManagedWebpage {
             if(file_exists($this->workdir."config.txt")) {
                 $config_txt = @file_get_contents($this->workdir."config.txt");
                 $this->config = unserialize($config_txt);
+                $this->checkConfigIntegrity();
             } else {
                 $this->config = array();
                 return null;
@@ -218,7 +229,7 @@ class GITManagedWebpage {
         if($branch == $default_branch)
             $dir = $this->localdir;
         else
-            $dir = $this->workdir.'branch_'.$branch.'/';
+            $dir = $this->workdir.'branch_'.str_replace(array('/'), array('_'), $branch).'/';
         if(file_exists($dir))
             return $dir;
         else if($create) {
@@ -228,7 +239,7 @@ class GITManagedWebpage {
             return false;
     }
     
-    private function updateBranch($branch, $path) {
+    private function updateBranch($branch, $path, $force = false) {
         if(substr($path, -1) != '/')
             $path .= '/';
         $current_branch = str_replace(array("\r", "\n"), array("", ""), $this->gitcmd("rev-parse", "--abbrev-ref", "HEAD"));
@@ -241,7 +252,7 @@ class GITManagedWebpage {
         
         $deleted_files = array();
         if(($current_version = $this->getConfig('version_'.$branch))) {
-            if($current_version == $newest_version)
+            if($current_version == $newest_version && !$force)
                 return;
             else {
                 $override_all = true;
@@ -290,13 +301,15 @@ class GITManagedWebpage {
         if($this->loopedcall)
             return;
         
-        if(!$this->branchExists($branch))
-            return false;
+        if(!$this->branchExists($branch)) {
+            if(!$this->branchExists('origin/'.$branch))
+                return false;
+        }
         $this->setActiveBranch($branch, $remember);
         
         if(!$this->localBranchPath($branch)) {
             $dir = $this->localBranchPath($branch, true);
-            $this->updateBranch($branch, $dir);
+            $this->updateBranch($branch, $dir, true);
         }
     }
     
@@ -315,11 +328,14 @@ class GITManagedWebpage {
         if($active_branch != $default_branch) {
             if(!($dir = $this->localBranchPath($branch))) {
                 $dir = $this->localBranchPath($active_branch, true);
-                $this->updateBranch($active_branch, $dir);
+                $this->updateBranch($active_branch, $dir, true);
             }
+            chdir($dir);
             include_once($dir.$file);
-            die();
+        } else {
+            include($file); //possible loop!
         }
+        die();
     }
     
 }