webinterface.git

@@ -28,9 +27,9 @@ $form .= '<tr><td>Berechtigungen</td><td>';

 foreach ($users as $user) {

   $r = $rw = $rwplus = '';

   if (isset($_GET['repo']) && isset($repos[$_GET['repo']])) {

-    $repo = $repos[$_GET['repo']];

-    if (isset($repo[$user])) {

-      switch ($repo[$user]) {

+    $permissions = $repos[$_GET['repo']]['users'];

+    if (isset($permissions[$user])) {

+      switch ($permissions[$user]) {

         case 'RW+': $rwplus = ' selected="selected"';

                     break;

         case 'RW': $rw = ' selected="selected"';

@@ -40,8 +39,12 @@ foreach ($users as $user) {

       }

     }

   }

-  $form .= $user.': <select name="'.$user.'"><option value="-">Zugriff verweigern</option><option value="r"'.$r.'>Lesezugriff erlauben</option><option value="rw"'.$rw.'>Lese- und Schreibzugriff</option><option value="rwplus"'.$rwplus.'>erweiterter Lese- und Schreibzugriff (inkl. &quot;rewind&quot;)</option></select><br />';

+  $form .= '<p>'.$user.': <select name="'.$user.'"><option value="-">Zugriff verweigern</option><option value="r"'.$r.'>Lesezugriff erlauben</option><option value="rw"'.$rw.'>Lese- und Schreibzugriff</option><option value="rwplus"'.$rwplus.'>erweiterter Lese- und Schreibzugriff (inkl. &quot;rewind&quot;)</option></select></p>';

 }

+$checked = (isset($_GET['repo']) && isset($repos[$_GET['repo']]) && isset($repos[$_GET['repo']]['users']['gitweb']) && $repos[$_GET['repo']]['users']['gitweb'] == 'R') ? ' checked="checked"' : '';

+$description = (isset($_GET['repo']) && isset($repos[$_GET['repo']])) ? $repos[$_GET['repo']]['description'] : '';

+$form .= '<p><input type="checkbox" name="gitweb" id="gitweb" value="r"'.$checked.' /> <label for="gitweb">Öffentlicher Lesezugriff via gitweb</label><br />

+<label for="description">Beschreibung des Repository:</label> <input type="text" name="description" id="description" value="'.$description.'" /></p>';

 $form .= '</td></tr></table>';

 $form .= '<p><input type="submit" value="Speichern" /></p>';

@@ -18,10 +18,11 @@ if (count($repos) == 0) {

   output("<h3>Ihre GIT-Repositories</h3>"); 

 }

-foreach ($repos as $repo => $access) {

+foreach ($repos as $repo => $settings) {

+  $description = $settings['description'] ? '<br /><em>"'.$settings['description'].'"</em>' : '';

   $url = get_git_url($repo);

-  output("<div><p><strong>{$repo}</strong> ".internal_link('edit', icon_edit('Zugriffsrechte bearbeiten'), 'repo='.$repo)." ".internal_link('delete', icon_delete('Repository löschen'), 'repo='.$repo)."<br />{$url}</p><ul>");

-  foreach ($access as $user => $rights) {

+  output("<div><p><strong>{$repo}</strong> ".internal_link('edit', icon_edit('Zugriffsrechte bearbeiten'), 'repo='.$repo)." ".internal_link('delete', icon_delete('Repository löschen'), 'repo='.$repo)."{$description}<br />{$url}</p><ul>");

+  foreach ($settings['users'] as $user => $rights) {

     $grant = '';

     switch ($rights) {

       case 'R': $grant = 'Lesezugriff';

@@ -88,9 +88,18 @@ function list_repos()

   foreach ($lines as $line) {

     DEBUG("LINE: ".$line);

     $m = array();

-    if (preg_match('_^\s*repo (\S+)\s*$_', $line, $m) != 0) {

+    if (preg_match('/^(\S+) "[^"]+" = "([^"]+)"$/', $line, $m) != 0) {

+      if (!array_key_exists($m[1], $repos)) {

+        $repos[$m[1]] = array('users' => NULL, 'description' => '');

+      }

+      DEBUG("found description: {$m[1]} = \"{$m[2]}\"");

+      $repos[$m[1]]['description'] = $m[2];

+    } elseif (preg_match('_^\s*repo (\S+)\s*$_', $line, $m) != 0) {

+      if (!array_key_exists($m[1], $repos)) {

+        $repos[$m[1]] = array('users' => NULL, 'description' => '');

+      }

       if ($current_repo) {

-        $repos[$current_repo] = $current_repo_users;

+        $repos[$current_repo]['users'] = $current_repo_users;

       }

       DEBUG("found repo ".$m[1]);

       $current_repo = chop($m[1]);

@@ -101,7 +110,7 @@ function list_repos()

     }

   }

   if ($current_repo) {

-    $repos[$current_repo] = $current_repo_users;

+    $repos[$current_repo]['users'] = $current_repo_users;

   }

   DEBUG($repos);

   return $repos;

@@ -241,12 +250,17 @@ function remove_repo_from_array($data, $repo) {

   DEBUG("Request to remove repo »{$repo}«...");

   $inside = false;

   $outdata = array();

+  $blank = true;

   foreach ($data as $line) {

+    if ($blank && chop($line) == '') {

+      continue;

+    }

+    $blank = (chop($line) == '');

     $m = array();

     if (preg_match('_^\s*repo (\S+)\s*$_', $line, $m) != 0) {

       $inside = ($m[1] == $repo);

     }

-    if (! $inside) {

+    if (! $inside && ! preg_match('/^'.$repo.'\s.*/', $line)) {

       $outdata[] = $line;

     }

   }

@@ -293,7 +307,7 @@ function delete_repo($repo)

   git_wrapper('push');

 }

-function save_repo($repo, $permissions) 

+function save_repo($repo, $permissions, $description) 

 {

   if (!validate_name($repo)) {

     system_failure("Der gewählte name entspricht nicht den Konventionen!");

@@ -318,6 +332,10 @@ function save_repo($repo, $permissions)

   }

   $data[] = "\n";

+  if ($description) {

+    $realname = $_SESSION['userinfo']['name'];

+    $data[] = "{$repo} \"{$realname}\" = \"{$description}\"\n";

+  }

   $data[] = 'repo '.$repo."\n";

   foreach ($permissions as $user => $perm) {

     $data[] = '  '.$perm.' = '.$user."\n";

@@ -43,7 +43,11 @@ if ($_GET['action'] == 'newuser') {

       }

     }

   }

-  save_repo($_POST['repo'], $permissions);

+  if ($_POST['gitweb'] == 'r') {

+    $permissions['gitweb'] = 'R';

+  }

+  $description = $_POST['description'];

+  save_repo($_POST['repo'], $permissions, $description);

   if (! $debugmode)

     header('Location: git');

   die();