File inc/git.inc.php changed (mode: 100644) (index 008151d..abaa6aa) |
... |
... |
function rg_git_stats($log) |
594 |
594 |
* Nice diff per file |
* Nice diff per file |
595 |
595 |
* Outputs the result of replacing variables in a template with real variables |
* Outputs the result of replacing variables in a template with real variables |
596 |
596 |
* @a - output of rg_git_diff2array[index] |
* @a - output of rg_git_diff2array[index] |
|
597 |
|
* TODO: Switch to r66_template_table? |
597 |
598 |
*/ |
*/ |
598 |
599 |
function rg_git_diff($a, $template_file) |
function rg_git_diff($a, $template_file) |
599 |
600 |
{ |
{ |
600 |
601 |
rg_log("git_diff: a: " . print_r($a, TRUE)); |
rg_log("git_diff: a: " . print_r($a, TRUE)); |
601 |
602 |
|
|
602 |
|
$ret = ""; |
|
|
603 |
|
$ret = "<div class=\"diff\">\n"; |
603 |
604 |
|
|
604 |
|
$template = @file_get_contents($template_file); |
|
605 |
|
if ($template === FALSE) |
|
606 |
|
return "Error: cannot load template ($template_file)!"; |
|
|
605 |
|
$template = rg_template($template_file, array()); |
607 |
606 |
|
|
|
607 |
|
// for each file changed |
608 |
608 |
foreach ($a as $fileindex => $finfo) { |
foreach ($a as $fileindex => $finfo) { |
609 |
609 |
if (!isset($finfo['file'])) |
if (!isset($finfo['file'])) |
610 |
610 |
rg_log("BAD finfo:" . print_r($finfo, TRUE)); |
rg_log("BAD finfo:" . print_r($finfo, TRUE)); |
611 |
|
$f = $finfo['file']; |
|
|
611 |
|
|
612 |
612 |
$ret .= "<br />\n"; |
$ret .= "<br />\n"; |
613 |
|
$ret .= "<b>"; |
|
|
613 |
|
|
|
614 |
|
$f = htmlspecialchars($finfo['file']); |
|
615 |
|
$ret .= "<a name=\"$f\">\n"; |
|
616 |
|
|
|
617 |
|
$ret .= "<table class=\"chunk\" width=\"100%\">\n"; |
|
618 |
|
$ret .= "<tr style=\"border: 1px; background: #dddddd\"><td colspan=\"4\">"; |
614 |
619 |
if (strstr($finfo['flags'], "N")) |
if (strstr($finfo['flags'], "N")) |
615 |
|
$ret .= "file [$f] added\n"; |
|
|
620 |
|
$ret .= "File <b>$f</b> added"; |
616 |
621 |
else if (strstr($finfo['flags'], "D")) |
else if (strstr($finfo['flags'], "D")) |
617 |
|
$ret .= "file [$f] deleted:\n"; |
|
|
622 |
|
$ret .= "File <b>$f</b> deleted:"; |
618 |
623 |
else |
else |
619 |
|
$ret .= "file [$f] changed:\n"; |
|
620 |
|
$ret .= "</b>"; |
|
|
624 |
|
$ret .= "File <b>$f</b> changed:"; |
|
625 |
|
$ret .= "</td></tr>\n"; |
621 |
626 |
|
|
|
627 |
|
$empty_line = ""; |
622 |
628 |
foreach ($finfo['chunks'] as $chunk => $ci) { |
foreach ($finfo['chunks'] as $chunk => $ci) { |
623 |
|
$ret .= "<br />\n"; |
|
624 |
|
$ret .= "Section [" . $ci['section'] . "] ($chunk):<br />\n"; |
|
625 |
|
$ret .= "<table class=\"diff\">\n"; |
|
|
629 |
|
$ret .= $empty_line; |
|
630 |
|
$empty_line = "<tr style=\"border: 1px\"><td colspan=\"4\"> </td></tr>\n"; |
|
631 |
|
if (!empty($ci['section'])) { |
|
632 |
|
$ret .= "<tr>\n"; |
|
633 |
|
$ret .= " <td class=\"numbers\">...</td>\n"; |
|
634 |
|
$ret .= " <td class=\"numbers\">...</td>\n"; |
|
635 |
|
$ret .= " <td style=\"background: #dddddd\" colspan=\"2\"><i>" . $ci['section'] . "</i></td>\n"; |
|
636 |
|
$ret .= "</tr>\n"; |
|
637 |
|
} |
626 |
638 |
|
|
627 |
639 |
$line_no_left = $ci['from']; |
$line_no_left = $ci['from']; |
628 |
640 |
$line_no_right = $ci['to']; |
$line_no_right = $ci['to']; |
|
... |
... |
function rg_git_diff($a, $template_file) |
666 |
678 |
$v = preg_replace("/@@right_color@@/", $right_color, $v); |
$v = preg_replace("/@@right_color@@/", $right_color, $v); |
667 |
679 |
$ret .= $v; |
$ret .= $v; |
668 |
680 |
} |
} |
669 |
|
$ret .= "</table>\n"; |
|
670 |
681 |
} |
} |
|
682 |
|
$ret .= "</table>\n"; |
671 |
683 |
} |
} |
|
684 |
|
$ret .= "</div>\n"; |
672 |
685 |
|
|
673 |
686 |
return $ret; |
return $ret; |
674 |
687 |
} |
} |
File inc/user/repo-page.php changed (mode: 100644) (index 9f8c886..9ea8923) |
... |
... |
$can_admin = (rg_repo_allow($db, $ri, $rg_ui, "A") === TRUE) ? 1 : 0; |
34 |
34 |
|
|
35 |
35 |
$_more = array( |
$_more = array( |
36 |
36 |
"owner" => $rr['user'], |
"owner" => $rr['user'], |
37 |
|
"url_user" => rg_re_userpage($rg_ui), |
|
38 |
|
"url_repo" => rg_re_repopage($rg_ui, $rr['repo']), |
|
|
37 |
|
"url_user" => rg_re_userpage($ui), |
|
38 |
|
"url_repo" => rg_re_repopage($ui, $rr['repo']), |
39 |
39 |
"ssh" => rg_re_repo_ssh($rr), |
"ssh" => rg_re_repo_ssh($rr), |
40 |
40 |
"git" => rg_re_repo_git($rr), |
"git" => rg_re_repo_git($rr), |
41 |
41 |
"can_admin" => $can_admin |
"can_admin" => $can_admin |
File inc/util.inc.php changed (mode: 100644) (index 9b0d567..292f3e2) |
... |
... |
function rg_re_post($op) |
111 |
111 |
|
|
112 |
112 |
function rg_re_userpage($ui) |
function rg_re_userpage($ui) |
113 |
113 |
{ |
{ |
|
114 |
|
if (!isset($ui['organization'])) { |
|
115 |
|
rg_internal_error("rg_re_userpage called with wrong ui!"); |
|
116 |
|
exit(1); |
|
117 |
|
} |
|
118 |
|
|
114 |
119 |
$prefix = ""; |
$prefix = ""; |
115 |
120 |
if ($ui['organization'] == 0) |
if ($ui['organization'] == 0) |
116 |
121 |
$prefix = "/user"; |
$prefix = "/user"; |
|
... |
... |
function rg_re_userpage($ui) |
125 |
130 |
|
|
126 |
131 |
function rg_re_repopage($ui, $repo) |
function rg_re_repopage($ui, $repo) |
127 |
132 |
{ |
{ |
|
133 |
|
if (!isset($ui['organization'])) { |
|
134 |
|
rg_internal_error("rg_re_repopage called with wrong ui!"); |
|
135 |
|
exit(1); |
|
136 |
|
} |
|
137 |
|
|
128 |
138 |
$s = rg_re_userpage($ui) . "/" . $repo; |
$s = rg_re_userpage($ui) . "/" . $repo; |
129 |
139 |
|
|
130 |
140 |
if (isset($_REQUEST['rwe'])) |
if (isset($_REQUEST['rwe'])) |