Indefero Commit Details

Date:

2009-01-29 13:29:45 (16 years 9 months ago)

Author:

Loic d'Anterroches

Branch:

dev, develop, feature-issue_links, feature.better-home, feature.content-md5, feature.diff-whitespace, feature.download-md5, feature.issue-links, feature.issue-of-others, feature.issue-summary, feature.search-filter, feature.webrepos, feature.wiki-default-page, master, release-1.1, release-1.2, release-1.3

Commit:

6153cd0b133cd7713ebc124f7bf890d109926d37

Parents:

672423861647d5e27f46924bf83bdd0a0b27face

Message:

Fixed issue 119, no environment for the shell_exec and exec calls.

For each call exec or shell_exec, I have added the ability to prepend a
string. For example '/usr/bin/env -i '.

Changes:

File differences

-191
192 192
193 193
194 
194
195
195 196
196 197
197 198
+    public function initRepository($fullpath)␊
    {␊
        mkdir($fullpath, 0750, true);␊
        exec(sprintf('git --git-dir=%s init', escapeshellarg($fullpath)), ␊
        exec(sprintf(Pluf::f('idf_exec_cmd_prefix', '').␊
                     'git --git-dir=%s init', escapeshellarg($fullpath)), ␊
             $out, $res);␊
        if ($res != 0) {␊
            throw new Exception(sprintf('Init repository error, exit status %d.', $res));␊
     public function initRepository($fullpath)␊
     {␊
         mkdir($fullpath, 0750, true);␊
-        exec(sprintf('git --git-dir=%s init', escapeshellarg($fullpath)), ␊
+        exec(sprintf(Pluf::f('idf_exec_cmd_prefix', '').␊
+                     'git --git-dir=%s init', escapeshellarg($fullpath)), ␊
              $out, $res);␊
         if ($res != 0) {␊
             throw new Exception(sprintf('Init repository error, exit status %d.', $res));␊

-79
80 80
81 81
82
82 83
83 84
84 85
+        $output = array();␊
        $cmd = sprintf('hg init %s', ␊
                       escapeshellarg($mercurial_path.'/'.$shortname));␊
        $cmd = Pluf::f('idf_exec_cmd_prefix', '').$cmd;␊
        $ll = exec($cmd, $output, $return);␊
        return ($return == 0);␊
    }␊
         $output = array();␊
         $cmd = sprintf('hg init %s', ␊
                        escapeshellarg($mercurial_path.'/'.$shortname));␊
+        $cmd = Pluf::f('idf_exec_cmd_prefix', '').$cmd;␊
         $ll = exec($cmd, $output, $return);␊
         return ($return == 0);␊
     }␊

-79
80 80
81 81
82
82 83
83 84
84 85
+        $output = array();␊
        $cmd = sprintf('svnadmin create %s', ␊
                       escapeshellarg($svn_path.'/'.$shortname));␊
        $cmd = Pluf::f('idf_exec_cmd_prefix', '').$cmd;␊
        $ll = exec($cmd, $output, $return);␊
        return ($return == 0);␊
    }␊
         $output = array();␊
         $cmd = sprintf('svnadmin create %s', ␊
                        escapeshellarg($svn_path.'/'.$shortname));␊
+        $cmd = Pluf::f('idf_exec_cmd_prefix', '').$cmd;␊
         $ll = exec($cmd, $output, $return);␊
         return ($return == 0);␊
     }␊

-52
53 53
54 54
55
55 56
56 57
57 58
... ...
74 75
75 76
76 77
78
77 79
78 80
79 81
+     */␊
    public static function exec($command, &$output=array(), &$return=0)␊
    {␊
        $command = Pluf::f('idf_exec_cmd_prefix', '').$command;␊
        $key = md5($command);␊
        $cache = Pluf_Cache::factory();␊
        if (null === ($res=$cache->get($key))) {␊

     */␊
    public static function shell_exec($command)␊
    {␊
        $command = Pluf::f('idf_exec_cmd_prefix', '').$command;␊
        $key = md5($command);␊
        $cache = Pluf_Cache::factory();␊
        if (null === ($res=$cache->get($key))) {␊
 ...
      */␊
     public static function exec($command, &$output=array(), &$return=0)␊
     {␊
+        $command = Pluf::f('idf_exec_cmd_prefix', '').$command;␊
         $key = md5($command);␊
         $cache = Pluf_Cache::factory();␊
         if (null === ($res=$cache->get($key))) {␊
      */␊
     public static function shell_exec($command)␊
     {␊
+        $command = Pluf::f('idf_exec_cmd_prefix', '').$command;␊
         $key = md5($command);␊
         $cache = Pluf_Cache::factory();␊
         if (null === ($res=$cache->get($key))) {␊

-235
236 236
237 237
238 
238
239
239 240
240 241
241 242
... ...
410 411
411 412
412 413
413 
414
415
414 416
415 417
416 418
+     */␊
    public function getBlob($request_file_info, $dummy=null)␊
    {␊
        return shell_exec(sprintf('GIT_DIR=%s git cat-file blob %s',␊
        return shell_exec(sprintf(Pluf::f('idf_exec_cmd_prefix', '').␊
                                  'GIT_DIR=%s git cat-file blob %s',␊
                                  escapeshellarg($this->repo), ␊
                                  escapeshellarg($request_file_info->hash)));␊
    }␊

     */␊
    public function getArchiveCommand($commit, $prefix='git-repo-dump/')␊
    {␊
        return sprintf('GIT_DIR=%s git archive --format=zip --prefix=%s %s',␊
        return sprintf(Pluf::f('idf_exec_cmd_prefix', '').␊
                       'GIT_DIR=%s git archive --format=zip --prefix=%s %s',␊
                       escapeshellarg($this->repo),␊
                       escapeshellarg($prefix),␊
                       escapeshellarg($commit));␊
 ...
      */␊
     public function getBlob($request_file_info, $dummy=null)␊
     {␊
-        return shell_exec(sprintf('GIT_DIR=%s git cat-file blob %s',␊
+        return shell_exec(sprintf(Pluf::f('idf_exec_cmd_prefix', '').␊
+                                  'GIT_DIR=%s git cat-file blob %s',␊
                                   escapeshellarg($this->repo), ␊
                                   escapeshellarg($request_file_info->hash)));␊
     }␊
      */␊
     public function getArchiveCommand($commit, $prefix='git-repo-dump/')␊
     {␊
-        return sprintf('GIT_DIR=%s git archive --format=zip --prefix=%s %s',␊
+        return sprintf(Pluf::f('idf_exec_cmd_prefix', '').␊
+                       'GIT_DIR=%s git archive --format=zip --prefix=%s %s',␊
                        escapeshellarg($this->repo),␊
                        escapeshellarg($prefix),␊
                        escapeshellarg($commit));␊

-398
399 399
400 400
401 
401
402
402 403
403 404
404 405
+     */␊
    public function getArchiveCommand($commit, $prefix='')␊
    {␊
        return sprintf('hg archive --type=zip -R %s -r %s -',␊
        return sprintf(Pluf::f('idf_exec_cmd_prefix', '').␊
                       'hg archive --type=zip -R %s -r %s -',␊
                       escapeshellarg($this->repo),␊
                       escapeshellarg($commit));␊
    }␊
      */␊
     public function getArchiveCommand($commit, $prefix='')␊
     {␊
-        return sprintf('hg archive --type=zip -R %s -r %s -',␊
+        return sprintf(Pluf::f('idf_exec_cmd_prefix', '').␊
+                       'hg archive --type=zip -R %s -r %s -',␊
                        escapeshellarg($this->repo),␊
                        escapeshellarg($commit));␊
     }␊

-369
370 370
371 371
372 
372
373 373
374 374
375 375
+     */␊
    public function getArchiveCommand($commit, $prefix='git-repo-dump/')␊
    {␊
        throw new Exception(('Unsupported feature.'));␊
        throw new Exception('Unsupported feature.');␊
    }␊
␊
␊
      */␊
     public function getArchiveCommand($commit, $prefix='git-repo-dump/')␊
     {␊
-        throw new Exception(('Unsupported feature.'));␊
+        throw new Exception('Unsupported feature.');␊
     }␊
 ␊
 ␊

-201
202 202
203 203
204
205
206
207
208
209
210
204 211
+␊
# Extra text files when displaying source␊
# $cfg['idf_extra_text_ext'] = 'ext1 ext2 ext3';␊
␊
# If you can execute the shell commands executed to get info␊
# from the scm  with the user of your PHP process but it is ␊
# not working from within PHP, this can be due to the environment ␊
# variables not being set correctly. Note the trailing space.␊
# $cfg['idf_exec_cmd_prefix'] = '/usr/bin/env -i ';␊
␊
return $cfg;␊
 ␊
 # Extra text files when displaying source␊
 # $cfg['idf_extra_text_ext'] = 'ext1 ext2 ext3';␊
+␊
+# If you can execute the shell commands executed to get info␊
+# from the scm  with the user of your PHP process but it is ␊
+# not working from within PHP, this can be due to the environment ␊
+# variables not being set correctly. Note the trailing space.␊
+# $cfg['idf_exec_cmd_prefix'] = '/usr/bin/env -i ';␊
+␊
 return $cfg;␊

Download the corresponding diff file

Indefero

File differences

Branches

Tags