diff options
| author |   Eudyptula <eitan@mosenkis.net> | 2009-06-18 11:35:03 -0400 |
|---|---|---|
| committer | Eudyptula <eitan@mosenkis.net> | 2009-06-18 11:35:03 -0400 |
| commit | d5ab0f1eab8bc4aff4e129a4903a3bfd8ff8ce89 (patch) | |
| tree | f4856e74f4927c0717f3e2d94023d281a91859d1 /frontend | |
| parent | Fixed JS error in frontend debugger (diff) | |
| download | ingenue-d5ab0f1eab8bc4aff4e129a4903a3bfd8ff8ce89.tar.gz ingenue-d5ab0f1eab8bc4aff4e129a4903a3bfd8ff8ce89.tar.bz2 ingenue-d5ab0f1eab8bc4aff4e129a4903a3bfd8ff8ce89.zip | |
Updates to sql_row_obj, index.php
Diffstat (limited to 'frontend')
| -rw-r--r-- | frontend/index.php | 15 | ||||
| -rw-r--r-- | frontend/pages/logview.php | 2 | ||||
| -rw-r--r-- | frontend/routing.csv | 1 |
3 files changed, 14 insertions, 4 deletions
diff --git a/frontend/index.php b/frontend/index.php index 7008294..d3bf0c8 100644 --- a/frontend/index.php +++ b/frontend/index.php @@ -47,10 +47,19 @@ for ($line=fgets($routing, 32768); !feof($routing); $line=fgets($routing, 32768) $initfunc='init_'.$dest; if (function_exists($initfunc)) { $value=$initfunc(); - if ($value !== null) { - $dest=$value; - } else { + if ($value === null) { break; + } elseif (is_array($value)) { + if (isset($value['dest'])) { + $dest=$value['dest']; + unset($value['dest']); + $S=array_merge($S, $value); + } else { + $S=array_merge($S, $value); + break; + } + } else { + $dest=$value; } } else { require_once('include/header.php'); diff --git a/frontend/pages/logview.php b/frontend/pages/logview.php index 23f1784..f721b60 100644 --- a/frontend/pages/logview.php +++ b/frontend/pages/logview.php @@ -5,7 +5,7 @@ function init_logview() { } function body_logview() { global $S, $request; - $q=$S['pdo']->query('SELECT DISTINCT `build` FROM `tasks`'); + $q=$S['pdo']->query('SELECT * FROM FROM `builds`'); while (true) { $build=$q->fetch(PDO::FETCH_ASSOC); if ($build === false) { diff --git a/frontend/routing.csv b/frontend/routing.csv index 066a5c1..96bfbdc 100644 --- a/frontend/routing.csv +++ b/frontend/routing.csv @@ -14,6 +14,7 @@ ^logs$ logview ^logs/task([0-9]+)$ logview task ^hardreset$ hardreset +^newclass$ newclass # Session ^login$ login ^logout$ logout |