Menu
▾
▴
[Webnotes-cvs] webnotes admin_index_files.php,1.12,1.13 admin_view_queue.php,1.11,1.12 logout.php,1.10,1.11
|
From: <vb...@us...> - 2002-09-05 14:13:03
|
Update of /cvsroot/webnotes/webnotes
In directory usw-pr-cvs1:/tmp/cvs-serv19006
Modified Files:
admin_index_files.php admin_view_queue.php logout.php
Log Message:
- Added $g_table_title_color which was missing from config_inc.php
- Cleanup of page_api.php
- Additions to roadmap.
- Cleanup of admin_view_queue.php
- Fixed two undefined variables in logout.php.
Index: admin_index_files.php
===================================================================
RCS file: /cvsroot/webnotes/webnotes/admin_index_files.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- admin_index_files.php 4 Sep 2002 13:36:57 -0000 1.12
+++ admin_index_files.php 5 Sep 2002 14:12:57 -0000 1.13
@@ -46,13 +46,24 @@
</td>
</tr>
<?
- if ( isset( $f_action ) && ( $f_action == "index" ) ) {
+ if ( isset( $f_action_index ) ) {
?>
<tr bgcolor="<? echo $g_white_color ?>">
<td>
<? echo $s_indexed_following_files ?>:
<br />
- <? index_files( $f_dir ) ?>
+ <? index_files( $f_dir, false ) ?>
+ </td>
+</tr>
+<? } ?>
+<?
+ if ( isset( $f_action_index_tree ) ) {
+?>
+<tr bgcolor="<? echo $g_white_color ?>">
+ <td>
+ <? echo $s_indexed_following_files ?>:
+ <br />
+ <? index_files( $f_dir, true ) ?>
</td>
</tr>
<? } ?>
@@ -65,12 +76,12 @@
</tr>
<tr bgcolor="<? echo $g_white_color ?>" align="center">
<form method="post" action="<? echo $g_admin_index_files ?>">
- <input type="hidden" name="f_action" value="index" />
<input type="hidden" name="f_dir" value="<? echo $f_dir?>" />
<td>
<? echo $s_index_msg ?>
<br />
- <input type="submit" value="<? echo $s_index_files_link ?>" />
+ <input type="submit" name="f_action_index" value="Index Current Dir" />
+ <input type="submit" name="f_action_index_tree" value="<? echo $s_index_files_link ?>" />
</td>
</form>
</tr>
Index: admin_view_queue.php
===================================================================
RCS file: /cvsroot/webnotes/webnotes/admin_view_queue.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- admin_view_queue.php 4 Sep 2002 15:03:49 -0000 1.11
+++ admin_view_queue.php 5 Sep 2002 14:12:58 -0000 1.12
@@ -1,4 +1,4 @@
-<?
+<?php
# phpWebNotes - a php based note addition system
# Copyright (C) 2000 Kenzaburo Ito - ke...@30...
# 2002 Webnotes Team - web...@so...
@@ -8,19 +8,20 @@
# --------------------------------------------------------
# $Id$
# --------------------------------------------------------
-?>
-<? include( "core" . DIRECTORY_SEPARATOR . "api.php" ) ?>
-<? login_cookie_check() ?>
-<?
+
+ require_once( 'core' . DIRECTORY_SEPARATOR . 'api.php' );
+
+ login_cookie_check();
+
if ( !isset ( $f_action ) ) {
- $f_action = "none";
+ $f_action = 'none';
}
- if ( $f_action=="accept" ) {
+ if ( $f_action == 'accept' ) {
note_accept( $f_id );
}
- if ( $f_action=="decline" ) {
+ if ( $f_action == 'decline' ) {
note_decline( $f_id );
}
@@ -31,91 +32,94 @@
}
$queue_count = note_queue_count();
-?>
-<? print_html_top() ?>
-<? print_head_top() ?>
-<? print_title( $g_window_title ) ?>
-<? print_css( $g_css_inc_file ) ?>
-<? print_head_bottom() ?>
-<? print_body_top() ?>
-<? print_header( $g_page_title ) ?>
-<? print_top_page( $g_top_page_inc ) ?>
-<? print_admin_menu() ?>
+ print_html_top();
+ print_head_top();
+ print_title( $g_window_title );
+ print_css( $g_css_inc_file );
+ print_head_bottom();
+ print_body_top();
+ print_header( $g_page_title );
+ print_top_page( $g_top_page_inc );
-<table bgcolor="<? echo $g_table_border_color ?>" width="75%" cellspacing="1" border="0">
-<tr bgcolor="<? echo $g_header_color ?>">
- <td colspan="2">
- <strong><? echo $s_view_queue_title ?></strong>
- </td>
-</tr>
-<tr bgcolor="<? echo $g_white_color ?>">
- <td colspan="2" align="right">
- [<strong><? echo $queue_count ?></strong>] <? echo $s_items_in_queue ?>
- </td>
-</tr>
-<? if ( $queue_count > 0 ) { ?>
-<tr bgcolor="<? echo $g_primary_dark_color ?>">
- <td width="15%" align="center">
- <? $s_page ?>
- </td>
- <td width="85%">
- <a href="<? echo string_get_url( $v_page ) ?>"><? echo basename( $v_page ) ?></a>
- </td>
-</tr>
-<tr bgcolor="<? echo $g_primary_light_color ?>">
- <td align="center">
- <? echo $s_date ?>
- </td>
- <td>
- <? echo $v_date_submitted ?>
- </td>
-</tr>
-<tr bgcolor="<? echo $g_primary_dark_color ?>">
- <td align=center>
- <? echo $s_email ?>
- </td>
- <td>
- <? echo $v_email ?>
- </td>
-</tr>
-<tr bgcolor="<? echo $g_primary_light_color ?>">
- <td align=center>
- <? echo $s_ip ?>
- </td>
- <td>
- <? echo $v_ip ?>
- </td>
-</tr>
-<tr bgcolor="<? echo $g_primary_dark_color ?>">
- <td align="center">
- <? echo $s_note ?>
- </td>
- <form method="post" action="<? echo $g_admin_view_queue ?>">
- <input type="hidden" name="f_action" value="accept" />
- <input type="hidden" name="f_id" value="<? echo $v_id ?>" />
- <td>
- <textarea type="text" name="f_note" rows="16" cols="72"><? echo $v_note ?></textarea>
- </td>
-</tr>
-<tr bgcolor="<? echo $g_white_color ?>">
- <td>
- </td>
- <td>
- <table width="100%">
- <tr>
- <td width="50%" align="center">
- <input type="submit" value="<? echo $s_accept_link ?>" />
- </td>
- </form>
- <form method="post" action="<? echo $g_admin_view_queue ?>" />
- <input type="hidden" name="f_action" value="decline" />
- <input type="hidden" name="f_id" value="<? echo $v_id ?>" />
- <td width="50%" align="center">
- <input type="submit" value="<? echo $s_decline_link ?>" />
- </td>
- </form>
- </tr>
+ print_admin_menu();
+
+ # @@@@ The HTML below needs cleanup
+?>
+ <br />
+ <table bgcolor="<? echo $g_table_border_color ?>" width="75%" cellspacing="1" border="0">
+ <tr bgcolor="<? echo $g_header_color ?>">
+ <td colspan="2">
+ <strong><? echo $s_view_queue_title ?></strong>
+ </td>
+ </tr>
+ <tr bgcolor="<? echo $g_white_color ?>">
+ <td colspan="2" align="right">
+ [<strong><? echo $queue_count ?></strong>] <? echo $s_items_in_queue ?>
+ </td>
+ </tr>
+ <? if ( $queue_count > 0 ) { ?>
+ <tr bgcolor="<? echo $g_primary_dark_color ?>">
+ <td width="15%" align="center">
+ <? $s_page ?>
+ </td>
+ <td width="85%">
+ <a href="<? echo string_get_url( $v_page ) ?>"><? echo basename( $v_page ) ?></a>
+ </td>
+ </tr>
+ <tr bgcolor="<? echo $g_primary_light_color ?>">
+ <td align="center">
+ <? echo $s_date ?>
+ </td>
+ <td>
+ <? echo $v_date_submitted ?>
+ </td>
+ </tr>
+ <tr bgcolor="<? echo $g_primary_dark_color ?>">
+ <td align="center">
+ <? echo $s_email ?>
+ </td>
+ <td>
+ <? echo $v_email ?>
+ </td>
+ </tr>
+ <tr bgcolor="<? echo $g_primary_light_color ?>">
+ <td align=center>
+ <? echo $s_ip ?>
+ </td>
+ <td>
+ <? echo $v_ip ?>
+ </td>
+ </tr>
+ <tr bgcolor="<? echo $g_primary_dark_color ?>">
+ <td align="center">
+ <? echo $s_note ?>
+ </td>
+ <form method="post" action="<? echo $g_admin_view_queue ?>">
+ <input type="hidden" name="f_action" value="accept" />
+ <input type="hidden" name="f_id" value="<? echo $v_id ?>" />
+ <td>
+ <textarea type="text" name="f_note" rows="16" cols="72"><? echo $v_note ?></textarea>
+ </td>
+ </tr>
+ <tr bgcolor="<? echo $g_white_color ?>">
+ <td>
+ </td>
+ <td>
+ <table width="100%">
+ <tr>
+ <td width="50%" align="center">
+ <input type="submit" value="<? echo $s_accept_link ?>" />
+ </td>
+ </form>
+ <form method="post" action="<? echo $g_admin_view_queue ?>" />
+ <input type="hidden" name="f_action" value="decline" />
+ <input type="hidden" name="f_id" value="<? echo $v_id ?>" />
+ <td width="50%" align="center">
+ <input type="submit" value="<? echo $s_decline_link ?>" />
+ </td>
+ </form>
+ </tr>
</table>
</td>
</tr>
@@ -123,7 +127,9 @@
</table>
</div>
-<? print_footer( __FILE__ ) ?>
-<? print_bottom_page( $g_bottom_page_inc ) ?>
-<? print_body_bottom() ?>
-<? print_html_bottom() ?>
\ No newline at end of file
+<?php
+ print_footer( __FILE__ );
+ print_bottom_page( $g_bottom_page_inc );
+ print_body_bottom();
+ print_html_bottom();
+?>
\ No newline at end of file
Index: logout.php
===================================================================
RCS file: /cvsroot/webnotes/webnotes/logout.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- logout.php 5 Sep 2002 06:25:19 -0000 1.10
+++ logout.php 5 Sep 2002 14:12:58 -0000 1.11
@@ -32,7 +32,7 @@
<td bgcolor="$g_table_title_color"><strong>$s_logged_out_msg</strong></td>
</tr>
<tr bgcolor="$g_white_color">
- <td align="right" bgcolor="$g_primary_color_dark">
+ <td align="right" bgcolor="$g_primary_dark_color">
<strong>$s_logout_redirect_msg <a href="$g_logout_redirect_page">Here</a></strong>
</td>
</tr>
|
