Menu
▾
▴
[Webnotes-cvs] webnotes/core api.php,1.14,1.15 config_inc.php,1.6,1.7 note_api.php,1.3,1.4 php_api.php,1.3,1.4
|
From: <vb...@us...> - 2002-09-05 17:30:32
|
Update of /cvsroot/webnotes/webnotes/core In directory usw-pr-cvs1:/tmp/cvs-serv29848/core Modified Files: api.php config_inc.php note_api.php php_api.php Log Message: - Set the PHP minimum requirement to 4.0.6 - Removed the definition of DIRECTORY_SEPARATOR - Partial support for themes ... still need to support the add form. - All functions are now moved out of api.php. - Some to do work was moved out of the roadmap and into http://webnotes.sf.net/mantis (bug tracker). Index: api.php =================================================================== RCS file: /cvsroot/webnotes/webnotes/core/api.php,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- api.php 5 Sep 2002 06:25:19 -0000 1.14 +++ api.php 5 Sep 2002 17:30:29 -0000 1.15 @@ -1,4 +1,4 @@ -<? +<?php # phpWebNotes - a php based note addition system # Copyright (C) 2000 Kenzaburo Ito - ke...@30... # 2002 Webnotes Team - web...@so... @@ -13,14 +13,6 @@ ### INCLUDES ### ########################################################################### - if ( !defined( 'DIRECTORY_SEPARATOR' ) ) { - if (substr(php_uname(), 0, 7) == 'Windows') { - define('DIRECTORY_SEPARATOR', '\\'); - } else { - define('DIRECTORY_SEPARATOR', '/'); - } - } - $t_path_main = dirname( dirname( __FILE__ ) ) . DIRECTORY_SEPARATOR; $t_path_core = $t_path_main . 'core' . DIRECTORY_SEPARATOR; @@ -48,173 +40,10 @@ require_once( $t_path_core . 'access_api.php' ); require_once( $t_path_core . 'page_api.php' ); require_once( $t_path_core . 'html_api.php' ); - - ########################################################################### - ### FUNCTIONS ### - ########################################################################### - - ########################################################################### - # Print API - ########################################################################### - ### -------------------- - function print_web_notes( $p_file, $p_url ) { - global $g_hostname, $g_db_username, $g_db_password, $g_database_name, - $g_note_add_page, $g_admin_manage_notes, - $g_table_border_color, $g_primary_dark_color, $g_white_color, - $g_header_color, $g_admin_page, - $g_phpWN_note_table, $g_phpWN_page_table, - $s_user_notes, $s_add_note_link, - $s_manage, $s_admin; - - PRINT "<br />"; - PRINT "<div align=\"center\">"; - - $t_page_id = get_page_id( $p_file ); - if ( $t_page_id === '' ) { - PRINT "$s_not_indexed_part1 <a href=\"mailto:$g_administrator_email\">$s_administrator</a> $s_not_indexed_part2"; - } else { - $c_url = urlencode( $p_url ); - - PRINT "<table bgcolor=\"$g_table_border_color\" width=\"640\" cellspacing=\"1\" border=\"0\" cellpadding=\"3\">"; - PRINT "<tr bgcolor=\"$g_header_color\">"; - PRINT "<td align=\"center\">"; - PRINT "<strong>$s_user_notes</strong>"; - PRINT "</td>"; - PRINT "</tr>"; - PRINT "<tr bgcolor=\"$g_white_color\" height=\"2\">"; - PRINT "<td>"; - PRINT "</td>"; - PRINT "</tr>"; - note_print_all( $p_file ); - PRINT "<tr bgcolor=\"$g_primary_dark_color\">"; - PRINT "<td align=\"right\">"; - PRINT "<a href=\"$g_note_add_page?f_page_id=$t_page_id&f_url=$c_url\">$s_add_note_link</a>"; - if ( is_moderator() ) { - PRINT " | <a href=\"$g_admin_manage_notes?f_page_id=$t_page_id&f_url=$c_url\">$s_manage</a>"; - PRINT " | <a href=\"$g_admin_page\">$s_admin</a>"; - } - PRINT "</td>"; - PRINT "</tr>"; - PRINT "</table>"; - } - PRINT "</div>"; - } - ### -------------------- - ########################################################################### - # Date API - ########################################################################### - ### -------------------- - function sql_to_unix_time( $p_timeString ) { - return mktime( substr( $p_timeString, 8, 2 ), - substr( $p_timeString, 10, 2 ), - substr( $p_timeString, 12, 2 ), - substr( $p_timeString, 4, 2 ), - substr( $p_timeString, 6, 2 ), - substr( $p_timeString, 0, 4 ) ); - } - ### -------------------- - ########################################################################### - ### Function API ### - ########################################################################### - ### -------------------- - function get_user_info_arr( $p_string_cookie_val ) { - global $g_phpWN_user_table; - - $c_string_cookie_val = db_prepare_string( $p_string_cookie_val ); - - $query = "SELECT * - FROM $g_phpWN_user_table - WHERE cookie_string='$c_string_cookie_val'"; - $result = db_query( $query ); - return db_fetch_array( $result ); - } - ### -------------------- - function print_manage_notes($p_page_id, $p_url) { - global $g_primary_light_color, $g_primary_dark_color, - $g_white_color, $g_header_color, - $g_admin_manage_notes, - $g_phpWN_note_table, - $s_date, $s_email, $s_ip, $s_note, - $s_delete_button, $s_update_button; - - $c_page_id = db_prepare_int( $p_page_id ); - - $query = "SELECT * - FROM $g_phpWN_note_table - WHERE page_id='$c_page_id' - ORDER BY date_submitted"; - $result = db_query( $query ); - $num_notes = db_num_rows( $result ); - - for ( $i = 0; $i < $num_notes; $i++ ) { - $row = db_fetch_array( $result ); - extract( $row, EXTR_PREFIX_ALL, "v" ); - $v_note = string_edit( $v_note ); - - # @@@@ The HTML below has some problems... revise later - echo <<<EOT - <form method="post" action="$g_admin_manage_notes"> - <input type="hidden" name="f_action" value="update" /> - <input type="hidden" name="f_id" value="$v_id" /> - <input type="hidden" name="f_page_id" value="$p_page_id" /> - <input type="hidden" name="f_url" value="$p_url" /> - <tr bgcolor="$g_white_color" height="4"> - <td colspan="2"></td> - </tr> - <tr bgcolor="$g_primary_light_color"> - <td>$s_date</td> - <td>$v_date_submitted</td> - </tr> - <tr bgcolor="$g_primary_dark_color"> - <td>$s_email</td> - <td><input type="text" name="f_email" size="64" maxlength="64" value="$v_email" /></td> - </tr> - <tr bgcolor="$g_primary_light_color"> - <td>$s_ip</td> - <td>$v_ip</td> - </tr> - <tr bgcolor="$g_primary_dark_color"> - <td>$s_note</td> - <td><textarea name="f_note" cols="72" rows="16">$v_note</textarea></td> - </tr> - <tr bgcolor="$g_white_color"> - <td colspan="2"> - <table width="100%"> - <tr> - <td> - <td width="50%" align="center"> - <input type="submit" value="$s_update_button" /> - </td> - </form> - <td width="50%" align="center"> - <form method="post" action="$g_admin_manage_notes"> - <input type="hidden" name="f_action" value="delete" /> - <input type="hidden" name="f_id" value="$v_id" /> - <input type="hidden" name="f_page_id" value="$p_page_id" /> - <input type="hidden" name="f_url" value="$p_url" /> - <input type="submit" value="$s_delete_button" /> - </form> - </td> - </tr> - </table> - </td> - </tr> - - -EOT; - } - } - ### -------------------- - function select_queued_notes_arr() { - global $g_phpWN_note_table, $g_phpWN_page_table; - - $query = "SELECT n.*, p.page - FROM $g_phpWN_note_table n, $g_phpWN_page_table p - WHERE n.visible='0' AND n.page_id=p.id - LIMIT 1"; - $result = db_query( $query ); - return db_fetch_array( $result ); - } + require_once( $t_path_core . 'user_api.php' ); + require_once( $t_path_core . 'util_api.php' ); + require_once( $t_path_main . DIRECTORY_SEPARATOR . 'themes' . DIRECTORY_SEPARATOR . $g_theme . + DIRECTORY_SEPARATOR . 'theme_api.php' ); ########################################################################### ### END ### Index: config_inc.php =================================================================== RCS file: /cvsroot/webnotes/webnotes/core/config_inc.php,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- config_inc.php 5 Sep 2002 14:13:00 -0000 1.6 +++ config_inc.php 5 Sep 2002 17:30:29 -0000 1.7 @@ -60,6 +60,9 @@ ### change to language you want... choices are: ### english $g_language = 'english'; + + ### Theme to be used + $g_theme = 'classic'; ### Customize this file for the add message page $g_note_add_include = 'note_add_msg_inc.php'; Index: note_api.php =================================================================== RCS file: /cvsroot/webnotes/webnotes/core/note_api.php,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- note_api.php 4 Sep 2002 15:03:50 -0000 1.3 +++ note_api.php 5 Sep 2002 17:30:29 -0000 1.4 @@ -78,10 +78,7 @@ } ### -------------------- function note_print_all( $p_page_name ) { - global $g_hostname, $g_db_username, $g_db_password, $g_database_name, - $g_table_border_color, $g_primary_dark_color, - $g_primary_light_color, $g_white_color, - $g_phpWN_note_table, $g_phpWN_page_table, + global $g_phpWN_note_table, $g_phpWN_page_table, $g_note_order; $c_page_name = db_prepare_string( $p_page_name ); @@ -94,28 +91,115 @@ $result = db_query( $query ); $entry_count = db_num_rows( $result ); - if ( $entry_count>0 ) { - for ( $i = 0; $i < $entry_count; $i++ ) { - $row = db_fetch_array( $result ); - extract( $row, EXTR_PREFIX_ALL, "v" ); + for ( $i = 0; $i < $entry_count; $i++ ) { + $row = db_fetch_array( $result ); + extract( $row, EXTR_PREFIX_ALL, 'v' ); - $v_email = db_unprepare_string( $v_email ); - $v_note = nl2br( string_preserve_spaces ( db_unprepare_string( $v_note ) ) ); - $date = date( "M, d Y H:i", sql_to_unix_time( $v_date_submitted ) ); + $info['email'] = db_unprepare_string( $v_email ); + $info['note'] = nl2br( string_preserve_spaces ( db_unprepare_string( $v_note ) ) ); + $info['date'] = date( 'M, d Y H:i', sql_to_unix_time( $v_date_submitted ) ); + + theme_notes_echo( $p_page_name, $info ); + } + } + ### -------------------- + function select_queued_notes_arr() { + global $g_phpWN_note_table, $g_phpWN_page_table; + + $query = "SELECT n.*, p.page + FROM $g_phpWN_note_table n, $g_phpWN_page_table p + WHERE n.visible='0' AND n.page_id=p.id + LIMIT 1"; + $result = db_query( $query ); + return db_fetch_array( $result ); + } + ### -------------------- + function print_manage_notes( $p_page_id, $p_url ) { + global $g_primary_light_color, $g_primary_dark_color, + $g_white_color, $g_header_color, + $g_admin_manage_notes, + $g_phpWN_note_table, + $s_date, $s_email, $s_ip, $s_note, + $s_delete_button, $s_update_button; + + $c_page_id = db_prepare_int( $p_page_id ); + + $query = "SELECT * + FROM $g_phpWN_note_table + WHERE page_id='$c_page_id' + ORDER BY date_submitted"; + $result = db_query( $query ); + $num_notes = db_num_rows( $result ); + + for ( $i = 0; $i < $num_notes; $i++ ) { + $row = db_fetch_array( $result ); + extract( $row, EXTR_PREFIX_ALL, "v" ); + $v_note = string_edit( $v_note ); + + # @@@@ The HTML below has some problems... revise later + echo <<<EOT + <form method="post" action="$g_admin_manage_notes"> + <input type="hidden" name="f_action" value="update" /> + <input type="hidden" name="f_id" value="$v_id" /> + <input type="hidden" name="f_page_id" value="$p_page_id" /> + <input type="hidden" name="f_url" value="$p_url" /> + <tr bgcolor="$g_white_color" height="4"> + <td colspan="2"></td> + </tr> + <tr bgcolor="$g_primary_light_color"> + <td>$s_date</td> + <td>$v_date_submitted</td> + </tr> + <tr bgcolor="$g_primary_dark_color"> + <td>$s_email</td> + <td><input type="text" name="f_email" size="64" maxlength="64" value="$v_email" /></td> + </tr> + <tr bgcolor="$g_primary_light_color"> + <td>$s_ip</td> + <td>$v_ip</td> + </tr> + <tr bgcolor="$g_primary_dark_color"> + <td>$s_note</td> + <td><textarea name="f_note" cols="72" rows="16">$v_note</textarea></td> + </tr> + <tr bgcolor="$g_white_color"> + <td colspan="2"> + <table width="100%"> + <tr> + <td> + <td width="50%" align="center"> + <input type="submit" value="$s_update_button" /> + </td> + </form> + <td width="50%" align="center"> + <form method="post" action="$g_admin_manage_notes"> + <input type="hidden" name="f_action" value="delete" /> + <input type="hidden" name="f_id" value="$v_id" /> + <input type="hidden" name="f_page_id" value="$p_page_id" /> + <input type="hidden" name="f_url" value="$p_url" /> + <input type="submit" value="$s_delete_button" /> + </form> + </td> + </tr> + </table> + </td> + </tr> - echo <<<EOT - <tr bgcolor="$g_primary_dark_color"> - <td> <em><a href="mailto:$v_email">$v_email</a></em> - $v_date_submitted</td> - </tr> - <tr bgcolor="$g_primary_light_color"> - <td><pre>$v_note</pre></td> - </tr> - <tr bgcolor="$g_white_color" height="2"> - <td></td> - </tr> EOT; - } + } + } + ### -------------------- + function print_web_notes( $p_file, $p_url ) { + echo '<br />'; + + $t_page_id = get_page_id( $p_file ); + if ( $t_page_id === '' ) { + theme_not_indexed( $p_page ); + } else { + theme_notes_start( $p_file ); + note_print_all( $p_file ); + theme_notes_end( $p_file ); } } ### -------------------- Index: php_api.php =================================================================== RCS file: /cvsroot/webnotes/webnotes/core/php_api.php,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- php_api.php 3 Sep 2002 22:30:07 -0000 1.3 +++ php_api.php 5 Sep 2002 17:30:29 -0000 1.4 @@ -17,7 +17,7 @@ ########################################################################### # Constant for our minimum required PHP version - define( 'PHP_MIN_VERSION', '4.0.3' ); + define( 'PHP_MIN_VERSION', '4.0.6' ); # -------------------- # Returns true if the current PHP version is higher than the one @@ -42,7 +42,7 @@ # Enforce our minimum requirements if ( ! php_version_at_least( PHP_MIN_VERSION ) ) { ob_end_clean(); - echo '<b>Your version of PHP is too old. Webnotes requires PHP version ' . PHP_MIN_VERSION . ' or newer</b>'; + echo '<strong>Your version of PHP is too old. Webnotes requires PHP version ' . PHP_MIN_VERSION . ' or newer</strong><br />'; phpinfo(); die(); } @@ -75,18 +75,5 @@ if ( false == ini_get( 'register_globals' ) ) { extract( $_REQUEST ); extract( $_SERVER ); - } - - ######################## - # PHP Constants - ######################## - - # Directory separator was introduced in PHP 4.0.6 - if ( !defined( 'DIRECTORY_SEPARATOR' ) ) { - if (substr(php_uname(), 0, 7) == 'Windows') { - define('DIRECTORY_SEPARATOR', '\\'); - } else { - define('DIRECTORY_SEPARATOR', '/'); - } } ?> |
