diff options
| author |   Eudyptula <eitan@mosenkis.net> | 2009-07-27 12:00:35 -0400 |
|---|---|---|
| committer | Eudyptula <eitan@mosenkis.net> | 2009-07-27 12:00:35 -0400 |
| commit | 809b4020f160fb89449256b631581ddd84d3b031 (patch) | |
| tree | 3854ccc540aeac39733ed4f818322b7f084704db /frontend | |
| parent | Reorganized log URLs; little update to routing.csv format (diff) | |
| download | ingenue-809b4020f160fb89449256b631581ddd84d3b031.tar.gz ingenue-809b4020f160fb89449256b631581ddd84d3b031.tar.bz2 ingenue-809b4020f160fb89449256b631581ddd84d3b031.zip | |
Remove pointless links from tasks, builds; Log env fed to tasks; Add masked indicator back to package selection
Diffstat (limited to 'frontend')
| -rw-r--r-- | frontend/classes/wizard_api.php | 6 | ||||
| -rw-r--r-- | frontend/modules/gentoo/step4.php | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/frontend/classes/wizard_api.php b/frontend/classes/wizard_api.php index f4c672e..46814b5 100644 --- a/frontend/classes/wizard_api.php +++ b/frontend/classes/wizard_api.php @@ -413,14 +413,14 @@ class wizard_layered_checkbox_array extends wizard_checkbox_array { } private function format_label(&$array, $label='%p', $path, $name) { $arg=$array; - $label=str_replace(array('%p', '%n'), array($path, $name), $label); + $out=str_replace(array('%p', '%n'), array($path, $name), $label); if (strpos($label, '$')) { while (is_array(current($arg))) { $arg=current($arg); } - $label=eval("extract(\$arg, EXTR_PREFIX_INVALID, 'var_');\nreturn <<<_XQ1\n$label\n_XQ1;\n"); + $out=eval("extract(\$arg, EXTR_PREFIX_INVALID, 'var_');\n".(strpos($label, 'return')===0?$out:"return <<<_XQ1\n$out\n_XQ1").";\n"); } - return htmlentities($label); + return strpos($label, 'return')===0?$out:htmlentities($out); } private static function b36($n) { return base_convert($n, 10, 36); diff --git a/frontend/modules/gentoo/step4.php b/frontend/modules/gentoo/step4.php index b5b95df..3e2e73a 100644 --- a/frontend/modules/gentoo/step4.php +++ b/frontend/modules/gentoo/step4.php @@ -5,8 +5,8 @@ $meta=array( array('id' => 'plist', 'autosize'=> true), array('delim' => '', 'tag' => 'div', 'label' => '%n', 'collapsed' => true), array('delim' => '/', 'tag' => 'div', 'label' => '%p', 'collapsed' => true), - array('delim' => '-', 'tag' => 'div', 'label' => '%p: $desc', 'checkbox' => '%p', 'collapsed' => true, 'search' => true), - array('tag' => 'div', 'label' => '=%p', 'checkbox' => '=%p', 'search' => true) + array('delim' => '-', 'tag' => 'div', 'label' => 'return "%p: $desc".($masked?" <span style=\"color: red\">[MASKED]</span>":"")', 'checkbox' => '%p', 'collapsed' => true, 'search' => true), + array('tag' => 'div', 'label' => 'return "=%p".($masked?" <span style=\"color: red\">[MASKED]</span>":"")', 'checkbox' => '=%p', 'search' => true) ); $this->layered_checkbox_array('install_packages', 'p', null, $pkgs, ' ', $meta); ?> |