tools/webtools
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

timeline: imported uncommitted changes for timeline.php and tlcacher.php

Browse Source
This commit is contained in:
Jose V Beneyto 2010-12-20 09:00:05 +01:00
parent 4be05e5d7c
commit 9501cfe406
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
timeline/timeline.php
View File

@ -4,10 +4,9 @@ require_once('DB.php');
Markup("timeline", "directives", "/\\(:timeline(\\s+.*)?\\s*:\\)/e", Markup("timeline", "directives", "/\\(:timeline(\\s+.*)?\\s*:\\)/e",
"'<:block>'.GetEvents()"); "'<:block>'.GetEvents()");
function GetEvents() { function GetEvents() {
$days = 30; $days = 14;
if (isset($_POST['days'])) { if (isset($_POST['days'])) {
$days = intval($_POST['days']); $days = intval($_POST['days']);
} }
@ -17,11 +16,10 @@ $db =& DB::connect($dsn);
if (DB::isError($db)) die("Cannot connect to database"); if (DB::isError($db)) die("Cannot connect to database");
$db->setFetchMode(DB_FETCHMODE_ASSOC); $db->setFetchMode(DB_FETCHMODE_ASSOC);
$from = time() - ($days * 24 * 60 * 60); $from = time() - ($days * 24 * 60 * 60);
$sql = "select * from events where event_tstamp >= $from order by event_tstamp desc"; $sql = "select distinct event_date, event_description, event_notes, event_type, event_time from events where event_tstamp >= $from order by event_tstamp desc";
$res =& $db->Query($sql); $res =& $db->Query($sql);
if (DB::isError($res)) die("Query error"); if (DB::isError($res)) die("Query error");
$timeline .= '<table cellspacing="0" border="0" cellpadding="0">'."\n"; $timeline .= '<table cellspacing="0" border="0" cellpadding="0">'."\n";
$currdate = "noway"; $currdate = "noway";
while ($evt =& $res->fetchRow()) { while ($evt =& $res->fetchRow()) {

12
timeline/tlcacher.php
View File

@ -14,17 +14,17 @@ require_once('DB.php');
require_once("tlcacher_config.php"); require_once("tlcacher_config.php");
// Url of the detailed task // Url of the detailed task
$task_url="https://crux.nu/bugs/?do=details&id=%s"; $task_url="http://crux.nu/bugs/?do=details&amp;task_id=%s";
// Gitweb url for commits // Gitweb url for commits
$git_url = "http://crux.nu/gitweb/?p=%s.git;a=commitdiff;h=%s"; $git_url = "http://crux.nu/gitweb/?p=%s.git;a=commitdiff;h=%s";
// append ":branch" to the repo name to restrict logs to 'branch' // append ":branch" to the repo name to restrict logs to 'branch'
$git_repos = array("ports/core:2.2","ports/opt:2.2","tools/pkgutils", "tools/prt-get"); $git_repos = array("ports/core:2.7","ports/opt:2.7","ports/xorg:2.7","ports/xfce:2.7","tools/pkgutils","tools/prt-get","system/iso:2.7");
$git_root = "/home/crux/scm"; $git_root = "/home/crux/scm";
// Map git authors to wiki profiles // Map git authors to wiki profiles
$git_username_map = array( $git_username_map = array(
"Per Lidén" => "PerLiden", "Per Lidén" => "PerLiden",
"Matt Housh" => "jaeger", "Matt Housh" => "jaeger",
"Juergen Daubert" => "JuergenDaubert", "Juergen Daubert" => "JuergenDaubert",
"Johannes Winkelmann" => "JohannesWinkelmann", "Johannes Winkelmann" => "JohannesWinkelmann",
@ -35,6 +35,12 @@ $git_username_map = array(
"Simon Gloßner" => "SimonGloßner", "Simon Gloßner" => "SimonGloßner",
"Nick Steeves" => "NickSteeves", "Nick Steeves" => "NickSteeves",
"Antti Nykänen" => "AnttiNykänen", "Antti Nykänen" => "AnttiNykänen",
"Antti Nykanen" => "AnttiNykänen",
"Jose V Beneyto" => "JoseVBeneyto",
"JoseVBeneyto" => "JoseVBeneyto",
"Lucas Hazel" => "LucasHazel",
"Thomas Penteker" => "ThomasPenteker",
"Fredrik Rinnestam" => "FredrikRinnestam",
); );
// Path of the recent changes pmwiki file // Path of the recent changes pmwiki file