Menu
▾
▴
webnotes-cvs — CVS monitoring only
You can subscribe to this list here.
| 2002 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(240) |
Oct
(66) |
Nov
|
Dec
|
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2003 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(9) |
Sep
(7) |
Oct
|
Nov
|
Dec
|
|
From: <vb...@us...> - 2002-09-10 03:16:17
|
Update of /cvsroot/webnotes/webnotes/themes/phpnet
In directory usw-pr-cvs1:/tmp/cvs-serv31318/themes/phpnet
Modified Files:
theme_api.php
Added Files:
theme_note_add_page.php theme_note_preview_page.php
Log Message:
Added skeleton for submit/preview in phpnet theme
--- NEW FILE: theme_note_add_page.php ---
<?php
# phpWebNotes - a php based note addition system
# Copyright (C) 2000-2002 Webnotes Team - web...@so...
# This program is distributed under the terms and conditions of the GPL
# See the files README and LICENSE for details
# --------------------------------------------------------
# $Id: theme_note_add_page.php,v 1.1 2002/09/10 03:16:14 vboctor Exp $
# --------------------------------------------------------
#########################################################################
# Each theme needs to implement this page which provides the user with
# a form to submit notes. This action page for this one should be
# theme_note_preview_page.php. The post method should be used.
#
# The reason this page is per theme, is to allow a better integration into
# the hosting site's look'n'feel.
#########################################################################
# @@@@
# make a copy of /note_add_page.php and modify it to work here + change the
# look'n'feel to match the phpnet theme style.
?>
--- NEW FILE: theme_note_preview_page.php ---
<?php
# phpWebNotes - a php based note addition system
# Copyright (C) 2000-2002 Webnotes Team - web...@so...
# This program is distributed under the terms and conditions of the GPL
# See the files README and LICENSE for details
# --------------------------------------------------------
# $Id: theme_note_preview_page.php,v 1.1 2002/09/10 03:16:14 vboctor Exp $
# --------------------------------------------------------
#########################################################################
# Each theme needs to implement this page which allows the user to preview
# the note he just submitted. The user should be able to confirm the submission,
# where in this case the results are posted to /note_add.php or decide to
# edit it again. There are two approaches to provide a re-editing feature:
#
# - Submit the results to theme_note_add_page.php which should default itself
# to the supplied values (i.e. work as add/edit pages).
# - Instruct the user to click the back button and edit.
#
# It is highly recommended to use the first approach.
#
# Preview the post variables using the theme_api.php. Following are the needed
# variables:
# id - The id of the note (not yet assigned), use value 0.
# email - available in post variable
# note - available in post variable
# page - should be available in post variable (from a hidden field)
# url - should be available in post varaible (from hidden field)
#
# The reason this page is per theme, is to allow a better integration into
# the hosting site's look'n'feel.
#########################################################################
?>
Index: theme_api.php
===================================================================
RCS file: /cvsroot/webnotes/webnotes/themes/phpnet/theme_api.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- theme_api.php 9 Sep 2002 22:30:22 -0000 1.3
+++ theme_api.php 10 Sep 2002 03:16:14 -0000 1.4
@@ -1,7 +1,6 @@
<?
# phpWebNotes - a php based note addition system
- # Copyright (C) 2000 Kenzaburo Ito - ke...@30...
- # 2002 Webnotes Team - web...@so...
+ # Copyright (C) 2000-2002 Webnotes Team - web...@so...
# This program is distributed under the terms and conditions of the GPL
# See the files README and LICENSE for details
|
|
From: <vb...@us...> - 2002-09-10 01:14:38
|
Update of /cvsroot/webnotes/webnotes/core
In directory usw-pr-cvs1:/tmp/cvs-serv13002/core
Modified Files:
config_inc.php html_api.php
Added Files:
meta_inc.php
Log Message:
- Cleanup of core/config_inc.php
- Added core/meta_inc.php from Mantis (not used yet).
- Added print_header_redirect() from Mantis (not used yet).
--- NEW FILE: meta_inc.php ---
<?php
# phpWebNotes - a php based note addition system
# Copyright (C) 2000-2002 Webnotes Team - web...@so...
# This program is distributed under the terms and conditions of the GPL
# See the files README and LICENSE for details
# --------------------------------------------------------
# $Id: meta_inc.php,v 1.1 2002/09/10 01:14:35 vboctor Exp $
# --------------------------------------------------------
# prevent caching
global $g_content_expire;
if ( !isset( $g_content_expire ) ) {
$g_content_expire = 0;
}
?>
<META HTTP-EQUIV="Pragma" CONTENT="no-cache">
<META HTTP-EQUIV="Cache-Control" CONTENT="no-cache">
<META HTTP-EQUIV="Pragma-directive" CONTENT="no-cache">
<META HTTP-EQUIV="Cache-Directive" CONTENT="no-cache">
<META HTTP-EQUIV="Expires" CONTENT="<?php echo $g_content_expire ?>">
Index: config_inc.php
===================================================================
RCS file: /cvsroot/webnotes/webnotes/core/config_inc.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- config_inc.php 9 Sep 2002 22:30:21 -0000 1.9
+++ config_inc.php 10 Sep 2002 01:14:35 -0000 1.10
@@ -1,7 +1,6 @@
<?
# phpWebNotes - a php based note addition system
- # Copyright (C) 2000 Kenzaburo Ito - ke...@30...
- # 2002 Webnotes Team - web...@so...
+ # Copyright (C) 2000-2002 Webnotes Team - web...@so...
# This program is distributed under the terms and conditions of the GPL
# See the files README and LICENSE for details
@@ -9,104 +8,139 @@
# $Id$
# --------------------------------------------------------
- ###########################
- # CONFIGURATION SETTINGS
- ###########################
+ #####################
+ # VERSION SETTINGS
+ #####################
$g_phpWebNotes_version = '2.0.0-CVS';
- ### Database Configuration
- $g_hostname = 'localhost';
- $g_db_username = 'root';
- $g_db_password = '';
- $g_database_name = 'phpWebNotes';
+ ### Display phpWebNotes version on pages
+ $g_show_version = ON;
- ### Email Settings
- $g_webmaster_email = 'web...@my...';
- $g_administrator_email = 'ad...@my...';
+ ######################
+ # DATABASE SETTINGS
+ ######################
+
+ $g_hostname = 'localhost';
+ $g_db_username = 'root';
+ $g_db_password = '';
+ $g_database_name = 'phpWebNotes';
+
+ ### Database Table Names
+ $g_phpWN_note_table = 'phpWN_note_table';
+ $g_phpWN_page_table = 'phpWN_page_table';
+ $g_phpWN_user_table = 'phpWN_user_table';
+
+ ###################
+ # EMAIL SETTINGS
+ ###################
+
+ $g_webmaster_email = 'web...@my...';
+ $g_administrator_email = 'ad...@my...';
+
+ ####################
+ # SERVER SETTINGS
+ ####################
+
+ # Using Microsoft Internet Information Server (IIS)
+ $g_use_iis = OFF;
### File extension to use. Default is .php.
### Switch to .php3 if you ran convertToPHP3
- $g_ext = '.php';
+ $g_ext = '.php';
### url directory
- $g_web_directory = DIRECTORY_SEPARATOR . 'webnotes' . DIRECTORY_SEPARATOR;
+ $g_web_directory = DIRECTORY_SEPARATOR . 'webnotes' . DIRECTORY_SEPARATOR;
### absolute directory path
- $g_absolute_directory = dirname( dirname( __FILE__ ) ) . DIRECTORY_SEPARATOR;
+ $g_absolute_directory = dirname( dirname( __FILE__ ) ) . DIRECTORY_SEPARATOR;
- ### default ordering of the notes.
- ### ASC = newest on bottom
- $g_note_order = 'ASC';
+
+ ### Filenames
+ $g_login = $g_web_directory . 'login' . $g_ext;
+ $g_login_page = $g_web_directory . 'login_page' . $g_ext;
+ $g_login_success_page = $g_web_directory . 'index' . $g_ext;
+ $g_logout = $g_web_directory . 'logout' . $g_ext;
+ $g_logout_redirect_page = $g_web_directory;
+
+ $g_admin_page = $g_web_directory . 'admin' . $g_ext;
+ $g_admin_index_files = $g_web_directory . 'admin_index_files' . $g_ext;
+ $g_admin_manage_notes = $g_web_directory . 'admin_manage_notes' . $g_ext;
+ $g_admin_view_queue = $g_web_directory . 'admin_view_queue' . $g_ext;
+ $g_admin_pending = $g_web_directory . 'admin_pending' . $g_ext;
+ $g_admin_change_password = $g_web_directory . 'admin_change_password' . $g_ext;
+
+ $g_css_inc_file = $g_absolute_directory . 'core' . DIRECTORY_SEPARATOR . 'css_inc' . $g_ext;
+
+ $g_note_add_page = $g_web_directory . 'note_add_page' . $g_ext;
+ $g_note_add = $g_web_directory . 'note_add' . $g_ext;
+
+ ######################
+ # COOKIES' SETTINGS
+ ######################
+
+ ### Cookies
+ $g_string_cookie = 'PHPWEBNOTES_COOKIE_STRING';
+ $g_string_cookie_val = '';
+ if ( isset( $HTTP_COOKIE_VARS[$g_string_cookie] ) ) {
+ $g_string_cookie_val = $HTTP_COOKIE_VARS[$g_string_cookie];
+ }
+
+ ##################
+ # TIME SETTINGS
+ ##################
### Time to wait between redirects (except index.html)
- $g_time_wait = 2;
+ $g_time_wait = 2;
### This is how long the "save login" cookies live.
- $g_cookie_time_length = 30000000; # 1 year
+ $g_cookie_time_length = 30000000; # 1 year
- ### Display phpWebNotes version on pages
- $g_show_version = ON;
+ #####################
+ # DISPLAY SETTINGS
+ #####################
- $g_window_title = 'phpWebNotes';
- $g_page_title = 'phpWebNotes';
+ $g_window_title = 'phpWebNotes';
+ $g_page_title = 'phpWebNotes';
+
+ ### default ordering of the notes.
+ ### ASC = newest on bottom
+ $g_note_order = 'ASC';
### optional page includes (for appearance customization)
- $g_top_page_inc = '';
- $g_bottom_page_inc = '';
+ $g_top_page_inc = '';
+ $g_bottom_page_inc = '';
- $g_date_format = 'm-d-y H:i';
+ $g_date_format = 'm-d-y H:i';
### change to language you want... choices are:
### english
- $g_language = 'english';
-
+ $g_language = 'english';
+
### Theme to be used
- $g_theme = 'classic';
+ $g_theme = 'phpnet';
### Customize this file for the add message page
- $g_note_add_include = 'note_add_msg_inc.php';
-
- ### Database Table Names
- $g_phpWN_note_table = 'phpWN_note_table';
- $g_phpWN_page_table = 'phpWN_page_table';
- $g_phpWN_user_table = 'phpWN_user_table';
+ $g_note_add_include = 'note_add_msg_inc.php';
### Colors
- $g_table_border_color = '#aaaaaa';
- $g_table_title_color = '#cccccc'; # temporary color, should be changed
- $g_primary_dark_color = '#d8d8d8';
- $g_primary_light_color = '#e8e8e8';
- $g_white_color = '#ffffff';
- $g_header_color = '#bbddff';
-
- ### Cookies
- $g_string_cookie = 'PHPWEBNOTES_COOKIE_STRING';
- $g_string_cookie_val = '';
- if ( isset( $HTTP_COOKIE_VARS[$g_string_cookie] ) ) {
- $g_string_cookie_val = $HTTP_COOKIE_VARS[$g_string_cookie];
- }
+ $g_table_border_color = '#aaaaaa';
+ $g_table_title_color = '#cccccc'; # temporary color, should be changed
+ $g_primary_dark_color = '#d8d8d8';
+ $g_primary_light_color = '#e8e8e8';
+ $g_white_color = '#ffffff';
+ $g_header_color = '#bbddff';
- ### Filenames
- $g_login = $g_web_directory . 'login' . $g_ext;
- $g_login_page = $g_web_directory . 'login_page' . $g_ext;
- $g_login_success_page = $g_web_directory . 'index' . $g_ext;
- $g_logout = $g_web_directory . 'logout' . $g_ext;
- $g_logout_redirect_page = $g_web_directory;
+ ####################################
+ # CACHING / OPTIMISATION SETTINGS
+ ####################################
- $g_admin_page = $g_web_directory . 'admin' . $g_ext;
- $g_admin_index_files = $g_web_directory . 'admin_index_files' . $g_ext;
- $g_admin_manage_notes = $g_web_directory . 'admin_manage_notes' . $g_ext;
- $g_admin_view_queue = $g_web_directory . 'admin_view_queue' . $g_ext;
- $g_admin_pending = $g_web_directory . 'admin_pending' . $g_ext;
- $g_admin_change_password = $g_web_directory . 'admin_change_password' . $g_ext;
+ # minutes to wait before document is stale (in minutes)
+ $g_content_expire = 0;
- $g_css_inc_file = $g_absolute_directory . 'core' . DIRECTORY_SEPARATOR . 'css_inc' . $g_ext;
+ ########################
+ # MODERATION SETTINGS
+ ########################
- $g_note_add_page = $g_web_directory . 'note_add_page' . $g_ext;
- $g_note_add = $g_web_directory . 'note_add' . $g_ext;
-
- $g_use_iis = OFF;
-
$g_auto_accept_notes = OFF;
?>
Index: html_api.php
===================================================================
RCS file: /cvsroot/webnotes/webnotes/core/html_api.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- html_api.php 4 Sep 2002 13:36:58 -0000 1.2
+++ html_api.php 10 Sep 2002 01:14:35 -0000 1.3
@@ -1,7 +1,6 @@
<?php
# phpWebNotes - a php based note addition system
- # Copyright (C) 2000 Kenzaburo Ito - ke...@30...
- # 2002 Webnotes Team - web...@so...
+ # Copyright (C) 2000-2002 Webnotes Team - web...@so...
# This program is distributed under the terms and conditions of the GPL
# See the files README and LICENSE for details
@@ -26,6 +25,24 @@
if ( !empty( $p_css ) && file_exists( $p_css ) ) {
include( $p_css );
}
+ }
+ ### --------------------
+ function print_header_redirect( $p_url ) {
+ $t_use_iis = config_get( 'use_iis');
+
+ if ( OFF == $t_use_iis ) {
+ header( 'Status: 302' );
+ }
+ header( 'Content-Type: text/html' );
+ header( 'Pragma: no-cache' );
+ header( 'Expires: Fri, 01 Jan 1999 00:00:00 GMT' );
+ header( 'Cache-control: no-cache, no-cache="Set-Cookie", private' );
+ if ( ON == $t_use_iis ) {
+ header( "Refresh: 0;url=$p_url" );
+ } else {
+ header( "Location: $p_url" );
+ }
+ die; # additional output can cause problems so let's just stop output here
}
### --------------------
function print_meta_redirect( $p_url, $p_time ) {
|
|
From: <rm...@us...> - 2002-09-09 23:08:09
|
Update of /cvsroot/webnotes/webnotes/core In directory usw-pr-cvs1:/tmp/cvs-serv9275/core Modified Files: note_api.php Log Message: Fix the Submit time stamp problem Submitting a note on the 06-SEP-2002 shows up as Dec, 09 2001 06:00. Index: note_api.php =================================================================== RCS file: /cvsroot/webnotes/webnotes/core/note_api.php,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- note_api.php 9 Sep 2002 22:30:21 -0000 1.7 +++ note_api.php 9 Sep 2002 22:56:56 -0000 1.8 @@ -108,7 +108,10 @@ $info['id'] = db_unprepare_string( $v_id ); $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 ) ); + + #Removed by Remon tell we fix the problem in the sql_to_unix_time + #$info['date'] = date( 'M, d Y H:i', sql_to_unix_time( $v_date_submitted ) ); + $info['date'] = $v_date_submitted; theme_notes_echo( $p_page_name, $p_url, $info ); } |
|
From: <rm...@us...> - 2002-09-09 22:57:39
|
Update of /cvsroot/webnotes/webnotes
In directory usw-pr-cvs1:/tmp/cvs-serv9275
Modified Files:
note_add.php note_add_page.php
Log Message:
Fix the Submit time stamp problem
Submitting a note on the 06-SEP-2002 shows up as Dec, 09 2001 06:00.
Index: note_add.php
===================================================================
RCS file: /cvsroot/webnotes/webnotes/note_add.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- note_add.php 5 Sep 2002 06:25:19 -0000 1.11
+++ note_add.php 9 Sep 2002 22:56:55 -0000 1.12
@@ -12,7 +12,7 @@
require_once( 'core' . DIRECTORY_SEPARATOR . 'api.php' );
### insert note
- $result = note_add( $f_page_id, $f_email, $REMOTE_ADDR, $f_note );
+ $result = note_add( $f_page_id, $f_email, $REMOTE_ADDR, $f_note);
print_html_top();
print_head_top();
Index: note_add_page.php
===================================================================
RCS file: /cvsroot/webnotes/webnotes/note_add_page.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- note_add_page.php 5 Sep 2002 06:25:19 -0000 1.11
+++ note_add_page.php 9 Sep 2002 22:56:55 -0000 1.12
@@ -43,8 +43,10 @@
}
$t_base_page_name = basename( $t_page_name );
- $t_date = date( $g_date_format, time() );
-
+ #$t_date = date( $g_date_format, time() ); #Remon
+ #$t_date = date ('M-d-Y H:i');
+ $t_date = date ($g_date_format);
+
echo <<<EOT
<br />
<div align="center">
@@ -53,6 +55,7 @@
<input type="hidden" name="f_came_from" value="$HTTP_REFERER" />
<input type="hidden" name="f_page_id" value="$f_page_id" />
<input type="hidden" name="f_url" value="$f_url" />
+
<tr bgcolor="$g_header_color">
<td colspan="2"><strong><? echo $s_add_note ?></strong></td>
</tr>
|
|
From: <vb...@us...> - 2002-09-09 22:30:26
|
Update of /cvsroot/webnotes/webnotes/doc In directory usw-pr-cvs1:/tmp/cvs-serv31397/doc Modified Files: ChangeLog Log Message: - Fixed 0000026: Submitting notes does not go back to the document - Partially Fixed 0000019: Support auto-accepting of notes - Fixed a problem in add_file() in page_api where it was rejecting new pages rather than duplicate pages. Index: ChangeLog =================================================================== RCS file: /cvsroot/webnotes/webnotes/doc/ChangeLog,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- ChangeLog 9 Sep 2002 05:10:25 -0000 1.6 +++ ChangeLog 9 Sep 2002 22:30:21 -0000 1.7 @@ -19,6 +19,7 @@ * Added support for themes (#2). * Added the classic theme (#4). * Added admin_pending.php to allow moderating notes in any order (#10). + * Added $g_auto_accept_notes to allow auto-accepting of notes (useful for demos and Intranet installations) 03.12.2000 - 1.0.0 |
|
From: <vb...@us...> - 2002-09-09 22:30:26
|
Update of /cvsroot/webnotes/webnotes/themes/phpnet
In directory usw-pr-cvs1:/tmp/cvs-serv31397/themes/phpnet
Modified Files:
theme_api.php
Log Message:
- Fixed 0000026: Submitting notes does not go back to the document
- Partially Fixed 0000019: Support auto-accepting of notes
- Fixed a problem in add_file() in page_api where it was rejecting new pages rather than duplicate pages.
Index: theme_api.php
===================================================================
RCS file: /cvsroot/webnotes/webnotes/themes/phpnet/theme_api.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- theme_api.php 9 Sep 2002 11:24:31 -0000 1.2
+++ theme_api.php 9 Sep 2002 22:30:22 -0000 1.3
@@ -31,7 +31,7 @@
}
# This function is called before printing any notes to the page.
- function theme_notes_start( $p_page ) {
+ function theme_notes_start( $p_page, $p_url ) {
global $g_note_add_page, $s_add_note_link, $s_manage, $s_admin, $g_web_directory, $g_theme;
if ( isset( $p_page ) ) {
@@ -40,7 +40,7 @@
$t_page = "Test Page";
}
- $c_url = urlencode( $p_page );
+ $c_url = urlencode( $p_url );
$t_page_id = get_page_id( $p_page );
#$path = dirname ( __FILE__ ) . DIRECTORY_SEPARATOR . 'images' . DIRECTORY_SEPARATOR;
@@ -64,7 +64,7 @@
# are all included in the associative array that is passed to the
# function. The theme should check that a field is defined in
# the array before using it.
- function theme_notes_echo( $p_page, $p_note_info_array ) {
+ function theme_notes_echo( $p_page, $p_url, $p_note_info_array ) {
if ( isset( $p_note_info_array['id'] ) ) {
$t_id = (integer)$p_note_info_array['id'];
@@ -110,7 +110,7 @@
}
# This function is called after all notes are echo'ed.
- function theme_notes_end( $p_page ) {
+ function theme_notes_end( $p_page, $p_url ) {
global $g_note_add_page, $g_web_directory, $g_theme;
if ( isset( $p_page ) ) {
@@ -119,7 +119,7 @@
$t_page = "Test Page";
}
- $c_url = urlencode( $p_page );
+ $c_url = urlencode( $p_url );
$t_page_id = get_page_id( $p_page );
$url = $g_web_directory . '/themes/' . $g_theme . '/images/';
@@ -138,9 +138,9 @@
# This function is called if the current page has no notes associated
# with it. In this case theme_notes_start() and theme_notes_end()
# APIs are not called.
- function theme_notes_none( $p_page ) {
- theme_notes_start( $p_page );
- theme_notes_end( $p_page );
+ function theme_notes_none( $p_page, $p_url ) {
+ theme_notes_start( $p_page, $p_url );
+ theme_notes_end( $p_page, $p_url );
}
# This function is called if the current page was not indexed
|
|
From: <vb...@us...> - 2002-09-09 22:30:25
|
Update of /cvsroot/webnotes/webnotes/core
In directory usw-pr-cvs1:/tmp/cvs-serv31397/core
Modified Files:
config_inc.php note_api.php page_api.php
Log Message:
- Fixed 0000026: Submitting notes does not go back to the document
- Partially Fixed 0000019: Support auto-accepting of notes
- Fixed a problem in add_file() in page_api where it was rejecting new pages rather than duplicate pages.
Index: config_inc.php
===================================================================
RCS file: /cvsroot/webnotes/webnotes/core/config_inc.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- config_inc.php 6 Sep 2002 17:03:37 -0000 1.8
+++ config_inc.php 9 Sep 2002 22:30:21 -0000 1.9
@@ -107,4 +107,6 @@
$g_note_add = $g_web_directory . 'note_add' . $g_ext;
$g_use_iis = OFF;
+
+ $g_auto_accept_notes = OFF;
?>
Index: note_api.php
===================================================================
RCS file: /cvsroot/webnotes/webnotes/core/note_api.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- note_api.php 9 Sep 2002 11:24:30 -0000 1.6
+++ note_api.php 9 Sep 2002 22:30:21 -0000 1.7
@@ -21,17 +21,24 @@
}
### --------------------
function note_add( $p_page_id, $p_email, $p_remote_addr, $p_note ) {
- global $g_phpWN_note_table;
+ global $g_phpWN_note_table, $g_auto_accept_notes;
+
+ if ( ON == $g_auto_accept_notes ) {
+ $t_visible = 1;
+ } else {
+ $t_visible = 0;
+ }
$c_page_id = db_prepare_int( $p_page_id );
$c_email = db_prepare_string( $p_email );
$c_note = db_prepare_string( $p_note );
$c_remote_address = db_prepare_string( $p_remote_addr );
- $query = "INSERT
+
+ $query = "INSERT
INTO $g_phpWN_note_table
- ( id, page_id, email, ip, date_submitted, note )
+ ( id, page_id, email, ip, date_submitted, note, visible )
VALUES
- ( null, '$c_page_id', '$c_email', '$c_remote_address', NOW(), '$c_note' )";
+ ( null, '$c_page_id', '$c_email', '$c_remote_address', NOW(), '$c_note', $t_visible )";
return db_query( $query );
}
### --------------------
@@ -103,7 +110,7 @@
$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 );
+ theme_notes_echo( $p_page_name, $p_url, $info );
}
}
### --------------------
@@ -204,11 +211,11 @@
$t_page_id = get_page_id( $p_file );
if ( $t_page_id === '' ) {
- theme_not_indexed( $p_page );
+ theme_not_indexed( $p_page, $p_url );
} else {
- theme_notes_start( $p_file );
+ theme_notes_start( $p_file, $p_url );
note_print_all( $p_file );
- theme_notes_end( $p_file );
+ theme_notes_end( $p_file, $p_url );
}
}
### --------------------
Index: page_api.php
===================================================================
RCS file: /cvsroot/webnotes/webnotes/core/page_api.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- page_api.php 5 Sep 2002 14:13:00 -0000 1.3
+++ page_api.php 9 Sep 2002 22:30:21 -0000 1.4
@@ -66,7 +66,8 @@
}
### --------------------
function add_file( $p_page_name ) {
- if ( get_page_id( $p_page_name ) === false ) {
+ # if page already exists, return to avoid duplicates
+ if ( get_page_id( $p_page_name ) !== false ) {
return 0;
}
@@ -121,4 +122,4 @@
}
}
### --------------------
-?>
\ No newline at end of file
+?>
|
|
From: <vb...@us...> - 2002-09-09 22:30:25
|
Update of /cvsroot/webnotes/webnotes/themes/classic
In directory usw-pr-cvs1:/tmp/cvs-serv31397/themes/classic
Modified Files:
theme_api.php
Log Message:
- Fixed 0000026: Submitting notes does not go back to the document
- Partially Fixed 0000019: Support auto-accepting of notes
- Fixed a problem in add_file() in page_api where it was rejecting new pages rather than duplicate pages.
Index: theme_api.php
===================================================================
RCS file: /cvsroot/webnotes/webnotes/themes/classic/theme_api.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- theme_api.php 5 Sep 2002 17:30:30 -0000 1.1
+++ theme_api.php 9 Sep 2002 22:30:22 -0000 1.2
@@ -31,7 +31,7 @@
}
# This function is called before printing any notes to the page.
- function theme_notes_start( $p_page ) {
+ function theme_notes_start( $p_page, $p_url ) {
global $g_table_border_color, $g_header_color, $g_white_color,
$s_user_notes;
@@ -53,7 +53,7 @@
# are all included in the associative array that is passed to the
# function. The theme should check that a field is defined in
# the array before using it.
- function theme_notes_echo( $p_page, $p_note_info_array ) {
+ function theme_notes_echo( $p_page, $p_url, $p_note_info_array ) {
global $g_primary_dark_color, $g_primary_light_color, $g_white_color;
if ( isset( $p_note_info_array['email'] ) ) {
@@ -89,7 +89,7 @@
}
# This function is called after all notes are echo'ed.
- function theme_notes_end( $p_page ) {
+ function theme_notes_end( $p_page, $p_url ) {
global $g_primary_dark_color, $g_note_add_page, $g_admin_manage_notes, $g_admin_page,
$s_add_note_link, $s_manage, $s_admin;
@@ -120,9 +120,9 @@
# This function is called if the current page has no notes associated
# with it. In this case theme_notes_start() and theme_notes_end()
# APIs are not called.
- function theme_notes_none( $p_page ) {
- theme_notes_start( $p_page );
- theme_notes_end( $p_page );
+ function theme_notes_none( $p_page, $p_url ) {
+ theme_notes_start( $p_page, $p_url );
+ theme_notes_end( $p_page, $p_url );
}
# This function is called if the current page was not indexed
|
|
From: <vb...@us...> - 2002-09-09 14:25:46
|
Update of /cvsroot/webnotes/web
In directory usw-pr-cvs1:/tmp/cvs-serv3582
Modified Files:
cvs_api.php database.php header.php localization.php
Added Files:
common.php
Log Message:
Made changes to get the website to work without the cvs_api actually
connected to sf cvs. For some reason it works when running on my
webserver, but not when running from sf webserver.
--- NEW FILE: common.php ---
<?php
# phpWebNotes - a php based note addition system
# Copyright (C) 2000-2002 Webnotes Team - web...@so...
# This program is distributed under the terms and conditions of the GPL
# See the files README and LICENSE for details
# --------------------------------------------------------
# $Id: common.php,v 1.1 2002/09/09 14:25:41 vboctor Exp $
# --------------------------------------------------------
$g_webnotes_path = "webnotes/";
$g_webnotes_url = "webnotes/";
if ( file_exists( dirname(__FILE__) . "/webnotesweb_config_inc.php" ) ) {
require_once ( dirname(__FILE__) . "/webnotesweb_config_inc.php");
}
?>
Index: cvs_api.php
===================================================================
RCS file: /cvsroot/webnotes/web/cvs_api.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- cvs_api.php 9 Sep 2002 09:35:11 -0000 1.2
+++ cvs_api.php 9 Sep 2002 14:25:41 -0000 1.3
@@ -10,21 +10,34 @@
# --------------------------------------------------------
function cvs_get_link( $p_project, $p_module, $p_file, $p_rev='HEAD' ) {
- $t_url = "http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/$p_project/$p_module$p_file?rev=$p_rev&content-type=text/vnd.viewcvs-markup";
+ # $t_url = "http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/$p_project/$p_module$p_file?rev=$p_rev&content-type=text/vnd.viewcvs-markup";
+
+ # @@@@ Till CVS works
+ global $g_webnotes_path;
+ $t_url = $g_webnotes_path . substr( $p_file, 1 );
+ $t_url = str_replace( '/', DIRECTORY_SEPARATOR, $t_url );
+
return $t_url;
}
function cvs_get_file( $p_project, $p_module, $p_file , $p_rev='HEAD' ) {
$t_url = cvs_get_link( $p_project, $p_module, $p_file, $p_rev );
- $fp = @fopen( $t_url, 'r');
- if (!$fp) {
+ # $fp = fsockopen( $t_url, 80, $errno, $errstr, 30 );
+ $fp = fopen( $t_url, 'r');
+ if ( $fp === false ) {
+ # echo "$errno: $errstr<br />";
return false;
}
- $t_contents = fread( $fp, 1000000 );
+ $t_contents = '';
+ while (!feof($fp)) {
+ $t_contents .= fgets ($fp, 10240);
+ }
fclose($fp);
+
+ return $t_contents; # @@@@ Till CVS works
# Use <pre> and </pre> as separators, so replace </pre> with <pre>
# to have one separator to send to explode()
Index: database.php
===================================================================
RCS file: /cvsroot/webnotes/web/database.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- database.php 8 Sep 2002 22:06:43 -0000 1.4
+++ database.php 9 Sep 2002 14:25:41 -0000 1.5
@@ -1,8 +1,6 @@
-<?php include('header.php') ?>
-
<?php
- include('header.php');
- require_once('cvs_api.php');
+ include( 'header.php' );
+ require_once( 'cvs_api.php' );
?>
<span class="page_title">Database Schema</span>
@@ -10,7 +8,6 @@
<?php
cvs_echo_file( 'webnotes', 'webnotes', '/sql/db_generate.sql' );
- include('footer.php');
?>
<!--
Index: header.php
===================================================================
RCS file: /cvsroot/webnotes/web/header.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- header.php 9 Sep 2002 09:35:11 -0000 1.4
+++ header.php 9 Sep 2002 14:25:41 -0000 1.5
@@ -1,13 +1,4 @@
-<?php
- #countpage( $REQUEST_URI, $REQUEST_URI );
-
- $g_webnotes_path = "webnotes/";
- $g_webnotes_url = "webnotes/";
-
- if ( file_exists( dirname(__FILE__) . "/webnotesweb_config_inc.php" ) ) {
- require_once ( dirname(__FILE__) . "/webnotesweb_config_inc.php");
- }
-?>
+<?php require_once('common.php'); ?>
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<html>
<head>
Index: localization.php
===================================================================
RCS file: /cvsroot/webnotes/web/localization.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- localization.php 9 Sep 2002 09:35:11 -0000 1.4
+++ localization.php 9 Sep 2002 14:25:41 -0000 1.5
@@ -5,10 +5,11 @@
<?php
function print_lang( $p_language, $p_version, $p_state ) {
-
+ global $g_webnotes_url;
$t_filename = 'strings_' . strtolower( $p_language ) . '.php';
- $t_path = '/lang/' . $t_filename;
- $t_link = cvs_get_link( 'webnotes', 'webnotes', $t_path );
+ $t_path = $g_webnotes_url . 'lang/' . $t_filename;
+ # $t_link = cvs_get_link( 'webnotes', 'webnotes', $t_path );
+ $t_link = $t_path;
echo "<li>$p_language (<a href=\"$t_link\" target=\"_new\">$t_filename</a>)</li>";
|
|
From: <vb...@us...> - 2002-09-09 11:24:34
|
Update of /cvsroot/webnotes/webnotes/themes/phpnet/images In directory usw-pr-cvs1:/tmp/cvs-serv29798/themes/phpnet/images Added Files: notes_add.gif Log Message: Committed changes supplied by rmetira: - Added the note id to the variables sent to the theme. - Added the first version of phpnet theme. - Change the sample files/doc to require_once() rather than include the API. --- NEW FILE: notes_add.gif --- (This appears to be a binary file; contents omitted.) |
|
From: <vb...@us...> - 2002-09-09 11:24:33
|
Update of /cvsroot/webnotes/webnotes/themes/phpnet
In directory usw-pr-cvs1:/tmp/cvs-serv29798/themes/phpnet
Modified Files:
theme_api.php
Log Message:
Committed changes supplied by rmetira:
- Added the note id to the variables sent to the theme.
- Added the first version of phpnet theme.
- Change the sample files/doc to require_once() rather than include the API.
Index: theme_api.php
===================================================================
RCS file: /cvsroot/webnotes/webnotes/themes/phpnet/theme_api.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- theme_api.php 5 Sep 2002 03:19:35 -0000 1.1
+++ theme_api.php 9 Sep 2002 11:24:31 -0000 1.2
@@ -1,4 +1,4 @@
-<?php
+<?
# phpWebNotes - a php based note addition system
# Copyright (C) 2000 Kenzaburo Ito - ke...@30...
# 2002 Webnotes Team - web...@so...
@@ -9,39 +9,141 @@
# $Id$
# --------------------------------------------------------
+ #########################################################################
+ # This is an empty template to be used to create new themes.
+ # To create a new theme, please follow the following steps:
+ # - Create a directory under the themes directory with the theme name.
+ # - Make a copy of this file under the new theme directory
+ # - Assign $g_theme to the theme name (not the full path) in
+ # core/custom_config_inc.php
+ #########################################################################
+
+ # The path to the api.php is calculated assume this file resides in a sub-directory
+ # under themes. For example, themes/phpnet/.
+ require_once ( dirname( dirname( dirname( __FILE__ ) ) ) . DIRECTORY_SEPARATOR .
+ 'core' . DIRECTORY_SEPARATOR . 'api.php' );
+
+ # Identifies the version of the theme. This will allow the phpWebNotes
+ # engine in the future to support themes that are designed for older
+ # versions of phpWebNotes.
+ function theme_version() {
+ return (1);
+ }
+
# This function is called before printing any notes to the page.
function theme_notes_start( $p_page ) {
-?>
- <table border="0" cellpadding="4" cellspacing="0" width="100%">
- <tr bgcolor="#d0d0d0" valign="top">
- <td><small>User Contributed Notes</small><br /><b><?php echo $p_page; ?></b></td>
- </tr>
-<?
+ global $g_note_add_page, $s_add_note_link, $s_manage, $s_admin, $g_web_directory, $g_theme;
+
+ if ( isset( $p_page ) ) {
+ $t_page = basename( $p_page );
+ } else {
+ $t_page = "Test Page";
+ }
+
+ $c_url = urlencode( $p_page );
+ $t_page_id = get_page_id( $p_page );
+
+ #$path = dirname ( __FILE__ ) . DIRECTORY_SEPARATOR . 'images' . DIRECTORY_SEPARATOR;
+ #$image = $path .'notes_add.gif';
+
+ $url = $g_web_directory . '/themes/' . $g_theme . '/images/';
+ $add_picture = $url . 'notes_add.gif';
+
+ echo <<<EOT
+ <table border="0" cellpadding="4" cellspacing="0" width="100%">
+ <tr bgcolor="#d0d0d0" valign="top">
+ <td>User Contributed Notes<br /><b>$p_page</b></td>
+ <td align="right"><a href="$g_note_add_page?f_page_id=$t_page_id&f_url=$c_url">
+ <img src="$add_picture" border="0" width="13" height="13" ALT="add a note"/></a>
+ </td>
+ </tr>
+EOT;
}
+
# This function is called for every note. The note information
# are all included in the associative array that is passed to the
# function. The theme should check that a field is defined in
# the array before using it.
- function theme_notes_echo( $p_page, $p_note_info_array ) {
- echo '<hr />';
- #echo '<table border="0" cellpadding="2" cellspacing="0" width="100%">';
- echo '<tr align="top" bgcolor="#e0e0e0">';
- echo '<td><b>'.$p_note_info_array['email'].'</b><br />'.$p_note_info_array['submit_date'];
- echo '</td></tr>';
- echo '<tr bgcolor="#f0f0f0">';
- echo '<td colspan="2">'.nl2br($p_note_info_array['note']);
- echo '</td></tr>';
+ function theme_notes_echo( $p_page, $p_note_info_array ) {
+
+ if ( isset( $p_note_info_array['id'] ) ) {
+ $t_id = (integer)$p_note_info_array['id'];
+ } else {
+ $t_id = '';
+ }
+
+ if ( isset( $p_note_info_array['email'] ) ) {
+ $t_email = $p_note_info_array['email'];
+ } else {
+ $t_email = '';
+ }
+
+ if ( isset( $p_note_info_array['date'] ) ) {
+ $t_date = $p_note_info_array['date'];
+ } else {
+ $t_date = '';
+ }
+
+ if ( isset( $p_note_info_array['note'] ) ) {
+ $t_note = $p_note_info_array['note'];
+ } else {
+ $t_note = '';
+ }
+
+ echo <<<EOT
+ <tr valign="top">
+ <td bgcolor="#e0e0e0" colspan="2">
+ <a name="#$t_id"></a>
+
+ <table border="0" cellpadding="2" cellspacing="0" width="100%">
+ <tr align="top" bgcolor="#e0e0e0">
+ <td><b>$t_email</b><br/>$t_date</td>
+ <td align="right">#$t_id</td>
+ </tr>
+ <tr bgcolor="#f0f0f0">
+ <td colspan="2"><code class="note">$t_note</code></td>
+ </tr>
+ </table>
+ </td>
+ </tr>
+EOT;
}
# This function is called after all notes are echo'ed.
function theme_notes_end( $p_page ) {
- echo '</table>';
+ global $g_note_add_page, $g_web_directory, $g_theme;
+
+ if ( isset( $p_page ) ) {
+ $t_page = basename( $p_page );
+ } else {
+ $t_page = "Test Page";
+ }
+
+ $c_url = urlencode( $p_page );
+ $t_page_id = get_page_id( $p_page );
+
+ $url = $g_web_directory . '/themes/' . $g_theme . '/images/';
+ $add_picture = $url . 'notes_add.gif';
+
+ echo <<<EOT
+ <tr bgcolor="#d0d0d0" valign="top">
+ <td colspan="2" align="right"><a href="$g_note_add_page?f_page_id=$t_page_id&f_url=$c_url">
+ <img src="$add_picture" border="0" width="13" height="13" ALT="add a note"/>
+ </a></td>
+ </tr>
+ </table>
+EOT;
}
# This function is called if the current page has no notes associated
# with it. In this case theme_notes_start() and theme_notes_end()
# APIs are not called.
function theme_notes_none( $p_page ) {
- echo "Notes_none";
+ theme_notes_start( $p_page );
+ theme_notes_end( $p_page );
}
-?>
+
+ # This function is called if the current page was not indexed
+ function theme_not_indexed( $p_page ) {
+ }
+?>
\ No newline at end of file
|
|
From: <vb...@us...> - 2002-09-09 11:24:33
|
Update of /cvsroot/webnotes/webnotes/sample In directory usw-pr-cvs1:/tmp/cvs-serv29798/sample Modified Files: webservices.php xml.php Log Message: Committed changes supplied by rmetira: - Added the note id to the variables sent to the theme. - Added the first version of phpnet theme. - Change the sample files/doc to require_once() rather than include the API. Index: webservices.php =================================================================== RCS file: /cvsroot/webnotes/webnotes/sample/webservices.php,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- webservices.php 5 Sep 2002 06:25:20 -0000 1.2 +++ webservices.php 9 Sep 2002 11:24:31 -0000 1.3 @@ -17,7 +17,7 @@ <p>The above definition was copied from <a href="http://www.webopedia.com">Webopedia</a>.</p> <?php - include("../core/api.php"); # replace with actual path + require_once("../core/api.php"); # replace with actual path print_web_notes( __FILE__, $PHP_SELF ); ?> </body> Index: xml.php =================================================================== RCS file: /cvsroot/webnotes/webnotes/sample/xml.php,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- xml.php 5 Sep 2002 06:25:20 -0000 1.2 +++ xml.php 9 Sep 2002 11:24:31 -0000 1.3 @@ -10,7 +10,7 @@ <p>The above definition was copied from <a href="http://www.webopedia.com">Webopedia</a>.</p> <?php - include("../core/api.php"); # replace with actual path + require_once("../core/api.php"); # replace with actual path print_web_notes( __FILE__, $PHP_SELF ); ?> </body> |
|
From: <vb...@us...> - 2002-09-09 11:24:33
|
Update of /cvsroot/webnotes/webnotes/doc
In directory usw-pr-cvs1:/tmp/cvs-serv29798/doc
Modified Files:
INSTALL ROADMAP
Log Message:
Committed changes supplied by rmetira:
- Added the note id to the variables sent to the theme.
- Added the first version of phpnet theme.
- Change the sample files/doc to require_once() rather than include the API.
Index: INSTALL
===================================================================
RCS file: /cvsroot/webnotes/webnotes/doc/INSTALL,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- INSTALL 9 Sep 2002 05:10:25 -0000 1.3
+++ INSTALL 9 Sep 2002 11:24:30 -0000 1.4
@@ -44,10 +44,10 @@
their extension to one that is interpreted by PHP. Then insert these lines
into the bottom of the document (before the </body> tag):
-<?
- include("/mypath/api.php"); # replace with actual path
+<?
+ require_once("/mypath/api.php"); # replace with actual path
print_web_notes( __FILE__, $PHP_SELF );
-?>
+?>
The include argument should be the absolute path to your installation of
phpWebNotes. It should not be relative to what your browser would see.
Index: ROADMAP
===================================================================
RCS file: /cvsroot/webnotes/webnotes/doc/ROADMAP,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- ROADMAP 9 Sep 2002 05:10:25 -0000 1.9
+++ ROADMAP 9 Sep 2002 11:24:30 -0000 1.10
@@ -16,12 +16,14 @@
* Database schema modifications
* Update the demo installation that is used from the website.
* A new administrator interface
+ * Allow certain HTML tags
2.0.1
* Language Localisation (English, French, Italian, German).
* Any required bug fixes.
2.1.0
+ * Multiple authentication modes
* Multiple access levels (anonymous, verified, moderator, admin)
* Add IP/IP range blocking.
* LDAP Support
|
|
From: <vb...@us...> - 2002-09-09 11:24:33
|
Update of /cvsroot/webnotes/webnotes/core In directory usw-pr-cvs1:/tmp/cvs-serv29798/core Modified Files: note_api.php Log Message: Committed changes supplied by rmetira: - Added the note id to the variables sent to the theme. - Added the first version of phpnet theme. - Change the sample files/doc to require_once() rather than include the API. Index: note_api.php =================================================================== RCS file: /cvsroot/webnotes/webnotes/core/note_api.php,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- note_api.php 6 Sep 2002 17:03:37 -0000 1.5 +++ note_api.php 9 Sep 2002 11:24:30 -0000 1.6 @@ -98,6 +98,7 @@ $row = db_fetch_array( $result ); extract( $row, EXTR_PREFIX_ALL, 'v' ); + $info['id'] = db_unprepare_string( $v_id ); $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 ) ); |
|
From: <vb...@us...> - 2002-09-09 11:22:52
|
Update of /cvsroot/webnotes/webnotes/themes/phpnet/images In directory usw-pr-cvs1:/tmp/cvs-serv29224/images Log Message: Directory /cvsroot/webnotes/webnotes/themes/phpnet/images added to the repository |
Update of /cvsroot/webnotes/web/images In directory usw-pr-cvs1:/tmp/cvs-serv15394/images Added Files: banner.gif google.gif phpWebNotes_b8b8ff_icon.gif phpWebNotes_d8d8ff_icon.gif phpWebNotes_ffffff_icon.gif space.gif Log Message: - Added logos and required images. - Added cvs_get_link() API - Updated the guidelines based on Mantis. - Updated the Localisation page. --- NEW FILE: banner.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: google.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: phpWebNotes_b8b8ff_icon.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: phpWebNotes_d8d8ff_icon.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: phpWebNotes_ffffff_icon.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: space.gif --- (This appears to be a binary file; contents omitted.) |
|
From: <vb...@us...> - 2002-09-09 09:35:14
|
Update of /cvsroot/webnotes/web
In directory usw-pr-cvs1:/tmp/cvs-serv15394
Modified Files:
cvs_api.php guidelines.php header.php localization.php
side_menu.php
Log Message:
- Added logos and required images.
- Added cvs_get_link() API
- Updated the guidelines based on Mantis.
- Updated the Localisation page.
Index: cvs_api.php
===================================================================
RCS file: /cvsroot/webnotes/web/cvs_api.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- cvs_api.php 8 Sep 2002 12:31:44 -0000 1.1
+++ cvs_api.php 9 Sep 2002 09:35:11 -0000 1.2
@@ -9,8 +9,13 @@
# $Id$
# --------------------------------------------------------
- function cvs_get_file( $p_project, $p_module, $p_file , $p_rev='HEAD' ) {
+ function cvs_get_link( $p_project, $p_module, $p_file, $p_rev='HEAD' ) {
$t_url = "http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/$p_project/$p_module$p_file?rev=$p_rev&content-type=text/vnd.viewcvs-markup";
+ return $t_url;
+ }
+
+ function cvs_get_file( $p_project, $p_module, $p_file , $p_rev='HEAD' ) {
+ $t_url = cvs_get_link( $p_project, $p_module, $p_file, $p_rev );
$fp = @fopen( $t_url, 'r');
if (!$fp) {
Index: guidelines.php
===================================================================
RCS file: /cvsroot/webnotes/web/guidelines.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- guidelines.php 8 Sep 2002 06:12:53 -0000 1.3
+++ guidelines.php 9 Sep 2002 09:35:11 -0000 1.4
@@ -1,46 +1,131 @@
-<?php include('header.php') ?>
+<?php include( "header.php" ); ?>
-<span class="page_title">Coding Conventions</span>
-<hr size="1" noshade="noshade" width="100%">
+<span class="page_title">Coding Guidelines</span>
+<hr size=1 noshade width="100%" />
-<p>This is the phpWebNotes coding conventions document. It lists all the basic conventions that I have followed in order to make the code easy to read and maintain. ANyone working on the code, adding features, or wanting to send in a patch should take a quick look through this document. Currently the code is very flat and procedure based. A future version may switch to objects at which point some of these conventions may change or be added to.</p>
+<p>This is the phpWebNotes coding conventions document. This should assist anyone who wants to modify the code or work on active development. Anyone who wishes to contribute code must adhere to these guidelines. <b>Code not following these conventions will be modified or (in extreme cases) rejected.</b> If you have additional suggestions or a good argument for changing some of these guidelines then <a href="mailto:ke...@30...">send a message</a> or <a href="forums.php">post in the forums</a>.</p>
+<p>First, start off by reading the <a href="http://utvikler.start.no/code/php_coding_standard.html"><strong>PHP Coding Standards</strong></a> document. We have deviated in a few places but just about everything in the document applies here as well.</p>
+<p>Above all, write code that is easy to read and maintain. Comment blocks of code and functions at all times.</p>
-<h3>Naming</h3>
+<span class="section">Naming Variables</span>
<ul>
-<li>Use descriptive names (except loop variables)</li>
-<li>Use _ to separate words</li>
-<li>Always use lowercase</li>
-<li>Use .php for all file extensions. Do not use .inc</li>
-<li>Form variables are prefixed with f_</li>
-<li>User variables are prefixed with u_</li>
-<li>Temporary variables are prefixed with t_M</li>
-<li>Function parameters should be prefixed with p_</li>
-<li>Global varialbes should be prefixed with g_</li>
-<li>Use the v_ prefix for primary purpose variables in a page</li>
-<li>$query and $result should be used for SQL query text and results respectively.</li>
-<li>Included files should be suffixed by _inc.php</li>
-<li>Count variables should follow the format $<what>_count. eg $bug_count.</li>
-<li>functions that print should be prefixed with print_.</li>
+ <li>Use all lower case.</li>
+ <li>Use _ to separate words. eg. $green_color_value</li>
+ <li>Use descriptive names (except loop variables).</li>
+ <li>Loop variables can be of the usual variety: $i, $j, $k, etc.</li>
+ <li>Count variables should follow the format $*_count. eg $bug_count</li>
+ <li>Global variables should be prefixed with g_</li>
+ <li>Temporary variables should be prefixed with t_</li>
+ <li>Parameters and variables passed from forms that have been cleaned of any special SQL chars (i.e. slashes) should be prefixed with c_</li>
+ <li>Uncleaned function parameters should be prefixed with p_</li>
+ <li>Uncleaned variables passed from forms should be prefixed with f_</li>
+ <li>Other variables are prefixed with v_, v2_, etc</li>
+ <li>Never prefix with l_ or o_ or q_ (visually confusing)</li>
+ <li>$query and $result should be used for SQL query and results respectively</li>
</ul>
-<h3>Formatting</h3>
+<span class="section">Naming Functions</span>
<ul>
-<li>Use TABS with a size of 4 to make the code easily readable while not wasting too much space</li>
-<li>Follow the table formatting of existing pages</li>
-<li>Break up SQL queries to be easy to read</li>
+ <li>Use all lower case.</li>
+ <li>Use _ to separate words. eg. setup_page_breaks()</li>
+ <li>Keep functions to 5 words or less.</li>
+ <li>Functions that print should be prefixed with print_.</li>
+ <li>Try to use prefixes to group functions (i.e., email_, news_, etc)</li>
</ul>
-<h3>Page Guidelines</h3>
+<span class="section">Naming Classes</span>
<ul>
-<li>The first item should be the copyright notice.</li>
-<li>The next line should be a cookie check to see if the user is logged in.</li>
-<li>Next should be the majority of the SQL queries for a page.</li>
-<li>Next will be the various html print_ functions.</li>
-<li>The main body of the page will follow.</li>
-<li>At the bottom will be the footer information and closing print_ functions.</li>
+ <li>Use FirstLetterOfWordIsCaptilized style</li>
+ <li>Variables that are class objects should have the prefix coo_</li>
</ul>
-<p><a href="http://utvikler.start.no/code/php_coding_standard.html">PHP Coding Standard</a> has _excellent_ guidelines for php programming style. For the most part I seem to have followed it (except for TABS vs spaces). If something is ambiguous consult this link or email me.</p>
-<p>Above all, write code that is easy to read and maintain. Code that is not will be rewritten or deleted. Comment blocks of code and functions at all times. Get onto me if I fail to adhere to my own words.</p>
+<span class="section">Naming Files</span>
+<ul>
+ <li>Use all lower case.</li>
+ <li>Use _ to separate words. eg. view_new_bugs_page.php</li>
+ <li>Use .php file extensions (previously we used .php or .php3)</li>
+ <li>Filenames must be less than 32 characters in length. This plays nice with older file systems like MacOS.</li>
+ <li>Included files should be suffixed by _inc.php</li>
+</ul>
-<?php include('footer.php') ?>
+<span class="section">SQL formatting</span>
+<ul>
+ <li>UPPERCASE all SQL keywords:</li>
+<pre>
+$query = "SELECT *
+ FROM $g_my_table
+ WHERE id='1'";
+</pre>
+ <li>Always assign a query string to a variable. This makes code easier to debug when problems occur. Do not create the query in the call to the function.</li>
+ <li>Break up SQL queries over multiple lines to be easy to read.</li>
+</ul>
+
+<span class="section">General Formatting</span>
+<ul>
+ <li>Use TABS with a size of 4 to make the code easily readable while not wasting too much space.</li>
+ <li>Follow the table formatting of existing pages.</li>
+ <li>Use <?php ?> for php delimiters.</li>
+ <li>Try not to print/echo HTML unless it's short or in a function loop</li>
+ <li>Do not use the EOF construct.</li>
+</ul>
+
+<span class="section">Miscellaneous</span>
+<ul>
+ <li>Don't use the ?: construct. It is confusing and has too much bug potential.</li>
+ <li>Avoid magic numbers.</li>
+</ul>
+
+<span class="section">Page Guidelines</span>
+<ul>
+ <li>The first item should be the copyright notice</li>
+ <li>The next line should be a cookie check to see if the user is logged in</li>
+ <li>Next should be the majority of the SQL queries for a page</li>
+ <li>Next will be the various thymol print_ functions.</li>
+ <li>The main body of the page will follow</li>
+ <li>At the bottom will be the footer information and closing print_ functions.</li>
+</ul>
+
+<span class="section">Braces and Paranthesis</span>
+<ul>
+ <li>Paranthesis should be right after a function name. eg: function() not function ()</li>
+ <li>Paranthesis should have a space right after a keyword (if, while, for) eg: for (...)</li>
+ <li>Braces formatting is illustrating below. I don't mind the macthing vertical placement myself but in the interests of conserving some space I have adopted the unmatched placing.</li>
+<pre>
+for (...) {
+ blah
+}
+
+or
+
+if (...) {
+ blah
+}
+</pre>
+ <li>if ... else blocks should be in this format:</li>
+<pre>
+if (...) {
+ blah1
+} else {
+ blah2
+}
+</pre>
+</ul>
+
+<span class="section">Comments</span>
+<ul>
+ <li>Use the # symbol for line commenting</li>
+ <li>Use /* */ for block commenting unless you nest /* */ comments. Generally, only use this during development.</li>
+ <li>Use @@@ followed by a brief message (BROKEN, TEMPORARY, etc) as a "look at this" indicator. Leaving your name next to it might be a good idea as well. This way critical items can easily be found.</li>
+</ul>
+
+<span class="section">Editor Features</span>
+<ul>
+ <li>Search and replace in multiple files</li>
+ <li>Goto line number</li>
+ <li>Syntax highlighting</li>
+ <li>Adjustable TAB spacing</li>
+</ul>
+
+<span class="section">Credit</span>
+<p>These coding conventions were borrowed with minor modifications from <a href="http://mantisbt.sf.net">Mantis</a> project. It was put together mainly by <a href="mailto:ke...@30...">Kenzaburo Ito</a>.</p>
+<?php include( "footer.php" ); ?>
\ No newline at end of file
Index: header.php
===================================================================
RCS file: /cvsroot/webnotes/web/header.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- header.php 8 Sep 2002 01:06:41 -0000 1.3
+++ header.php 9 Sep 2002 09:35:11 -0000 1.4
@@ -18,12 +18,12 @@
<body>
<table class="outside" cellpadding="0" cellspacing="0">
-<tr class="top">
- <td class="top_left">
+<tr class="top" height="100">
+ <td class="top_left" valign="center">
</td>
- <td class="top_right">
- <a href="http://webnotes.sourceforge.net/"><img border="0" src="images/banner.gif" alt="" /></a>
+ <td class="top_right" valign="center">
+ <a href="http://webnotes.sourceforge.net/"><img border="0" src="images/banner.gif" alt="phpWebNotes Logo" /></a>
</td>
<td class="right">
<a href="http://www.google.com/"><img border="0" src="images/google.gif" alt="" /></a>
@@ -43,8 +43,8 @@
</td>
</tr>
<tr valign="top" bgcolor="#ffffff">
- <td class="menu_left">
+ <td class="menu_left" width="50">
<? include( "side_menu.php" ); ?>
</td>
- <td class="main" colspan=2>
+ <td class="main" colspan="2">
Index: localization.php
===================================================================
RCS file: /cvsroot/webnotes/web/localization.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- localization.php 8 Sep 2002 06:12:53 -0000 1.3
+++ localization.php 9 Sep 2002 09:35:11 -0000 1.4
@@ -1,62 +1,35 @@
-<?php include('header.php') ?>
<?php
+ include( 'header.php' );
+ require_once( 'cvs_api.php' );
+?>
+<?php
+
function print_lang( $p_language, $p_version, $p_state ) {
- $t_file_name = "webnotes/strings_".strtolower( $p_language ).".txt";
- PRINT "<tr bgcolor=#ffffff>";
- PRINT "<td>";
- echo $p_language;
- PRINT "</td>";
- PRINT "<td>";
- if ( file_exists( $t_file_name ) ) {
- echo date( "M d, Y", filemtime( $t_file_name ) );
- }
- PRINT "</td>";
- PRINT "<td>";
- if (( file_exists( $t_file_name ) )&&( $p_state=="active" )) {
- PRINT "<a href=\"$t_file_name\">download</a>";
- } else if ( $p_state=="active" ) {
- PRINT "in progress";
- } else {
- PRINT" ";
- }
- PRINT "</td>";
+ $t_filename = 'strings_' . strtolower( $p_language ) . '.php';
+ $t_path = '/lang/' . $t_filename;
+ $t_link = cvs_get_link( 'webnotes', 'webnotes', $t_path );
+
+ echo "<li>$p_language (<a href=\"$t_link\" target=\"_new\">$t_filename</a>)</li>";
- PRINT "</tr>";
}
?>
<span class="page_title">Localization</span>
<hr size="1" noshade="noshade" width="100%">
-<p>Here you can see the latest localization files. Currently we only have English.</p>
-<p>What to do if you see some errors? Just <a href="mailto:ke...@30...">send me an email</a> with the corrected strings.</p>
+<p>Here you can see the latest localization files.</p>
+<p>What to do if you see some errors? Just submit a <a href="bugtracker.php">bug report</a> with the corrected strings.</p>
-<div align="center">
-<table width="100%" cellpadding="5" cellspacing="1" bgcolor="#ffffff">
-<tr bgcolor="#ffffff">
- <td>
- <strong>Language</strong>
- </td>
- <td>
- <strong>Version</strong>
- </td>
- <td>
- <strong>Date Updated</strong>
- </td>
- <td>
-
- </td>
-</tr>
+<ul>
<?php
print_lang( "English", "latest", "active" );
print_lang( "French", "latest", "active" );
print_lang( "Italian", "latest", "active" );
?>
-</table>
+</ul>
+<br />
+<span class="section">Translating</span>
+<hr size="1" noshade="noshade" width="100%">
-</div>
+<p>Don't see your language? Translate one of the files! It's really quite simple. Just take the strings file and convert away. Then <a href="bugtracker.php">submit it</a> back to me. Also, you can update them when new strings make it in. The file won't change drastically so it shouldn't be too much work to keep the files updated.</p>
-<span class="page_title">Translating</span>
-<hr size="1" noshade="noshade" width="100%">
-<p>Don't see your language? Translate one of the files! It's really quite simple. Just take the strings file and convert away. Then <a href="mailto:ke...@30...">submit it</a> back to me. Also, you can update them when new strings make it in. The file won't change drastically so it shouldn't be too much work to keep the files updated.</p>
-<p>Currently some strings are hard-coded into the database tables or the code. This will be fixed soon.</p>
<?php include('footer.php') ?>
Index: side_menu.php
===================================================================
RCS file: /cvsroot/webnotes/web/side_menu.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- side_menu.php 9 Sep 2002 04:19:57 -0000 1.10
+++ side_menu.php 9 Sep 2002 09:35:11 -0000 1.11
@@ -55,6 +55,7 @@
<br />
<a href="http://sourceforge.net/projects/webnotes/"> <img src="http://sourceforge.net/sflogo.php?group_id=15381" width="88" height="31" border="0" alt="phpWebNotes @ SourceForge"></a><br />
<br />
+ <a href="http://sourceforge.net/projects/webnotes/"> <img src="images/phpWebNotes_d8d8ff_icon.gif" width="150" height="39" border="0" alt="phpWebNotes @ SourceForge"></a><br />
</td>
</tr>
</table>
|
|
From: <vb...@us...> - 2002-09-09 09:33:34
|
Update of /cvsroot/webnotes/web/images In directory usw-pr-cvs1:/tmp/cvs-serv14547/images Log Message: Directory /cvsroot/webnotes/web/images added to the repository |
|
From: <vb...@us...> - 2002-09-09 05:10:37
|
Update of /cvsroot/webnotes/webnotes/doc In directory usw-pr-cvs1:/tmp/cvs-serv5331 Modified Files: CREDITS ChangeLog INSTALL README ROADMAP Added Files: SCRATCHPAD Log Message: Updated documents since they are references from the website. --- NEW FILE: SCRATCHPAD --- # phpWebNotes - a php based note addition system # Copyright (C) 2000-2002 Webnotes Team - web...@so... # This program is distributed under the terms and conditions of the GPL # See the files README and LICENSE for details ----------------------------------------- SCRATCH PAD ----------------------------------------- To-Do list: * Index pages by url rather than path, this way hyperlinks to the pages goes through Web/PHP servers rather than directly. * Be able to require user logins (vb: currently login check is disabled) * Be able to reverse the display order (vb: them may already be supported) * Support for user supplied CSS. (vb: value to be confirmed) * Consider re-using some APIs like config_api.php / lang_api.php / database_api.php / php_api.php / gpc_api.php from mantisbt. * Add access_api.php - note_accept() / decline() / update() / delete() should check the access level. * Support displaying queued notes on the page in case of moderators. There should be an accept/reject links on the note and it should be in a different color. * Consider supporting html only pages. This can be done by a php loader page + some other tricks (output buffering?) * Indexing page * Add a link next to each file to open it for viewing. * Differentiate between newly submitted notes, and notes that are hidden by the admin. * API mode for plugability into existing systems. * Add note on how to parse HTML files through the PHP interpreter. Index: CREDITS =================================================================== RCS file: /cvsroot/webnotes/webnotes/doc/CREDITS,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- CREDITS 3 Sep 2002 22:30:08 -0000 1.2 +++ CREDITS 9 Sep 2002 05:10:24 -0000 1.3 @@ -1,6 +1,5 @@ # phpWebNotes - a php based note addition system -# Copyright (C) 2000 Kenzaburo Ito - ke...@30... -# 2002 Webnotes Team - web...@so... +# Copyright (C) 2000-2002 Webnotes Team - web...@so... # This program is distributed under the terms and conditions of the GPL # See the files README and LICENSE for details @@ -11,13 +10,13 @@ Administrators -------------- -Kenzaburo Ito -Victor Boctor +Kenzaburo Ito (prescience) +Victor Boctor (vboctor) Developers ---------- -Remon Metira +Remon Metira (rmetira) Mantis Team (mantisbt.sf.net - some code was re-used from Mantis Bugtracker) Translations Index: ChangeLog =================================================================== RCS file: /cvsroot/webnotes/webnotes/doc/ChangeLog,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- ChangeLog 3 Sep 2002 06:59:09 -0000 1.5 +++ ChangeLog 9 Sep 2002 05:10:25 -0000 1.6 @@ -1,6 +1,5 @@ # phpWebNotes - a php based note addition system -# Copyright (C) 2000 Kenzaburo Ito - ke...@30... -# 2002 Webnotes Team - web...@so... +# Copyright (C) 2000-2002 Webnotes Team - web...@so... # This program is distributed under the terms and conditions of the GPL # See the files README and LICENSE for details @@ -12,9 +11,14 @@ * Added directory themes/ to include different themes to be used to view the webnotes. * Added directory lang/ to contain the localisation files. * Added directory doc/ to contain documentation files. + * Added directory sample/ to contain sample files that can be used to test phpWebNotes. + * Cleanup of all files for better readability and complying with coding standards. * Change the extension of the language files to .php rather than .txt. * Moved to XHTML (not tested yet) - * Integrated the Italian/French strings into webnotes. + * Integrated the Italian/French strings into cvs. + * Added support for themes (#2). + * Added the classic theme (#4). + * Added admin_pending.php to allow moderating notes in any order (#10). 03.12.2000 - 1.0.0 Index: INSTALL =================================================================== RCS file: /cvsroot/webnotes/webnotes/doc/INSTALL,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- INSTALL 3 Sep 2002 06:59:09 -0000 1.2 +++ INSTALL 9 Sep 2002 05:10:25 -0000 1.3 @@ -1,6 +1,5 @@ # phpWebNotes - a php based note addition system -# Copyright (C) 2000 Kenzaburo Ito - ke...@30... -# 2002 Webnotes Team - web...@so... +# Copyright (C) 2000-2002 Webnotes Team - web...@so... # This program is distributed under the terms and conditions of the GPL # See the files README and LICENSE for details @@ -8,15 +7,15 @@ ### Installation steps ### ------------------------------------------------------------------------------- -*** REQUIREMENTS: mysql database, php 3.0.7+, a webserver (tested on Apache, -should work with IIS or anything else php will run with). +*** REQUIREMENTS: MySql database, php 4.0.6, a webserver (tested on Apache and IIS, +should work anything else PHP will run with). 1. First, transfer the file to your webserver. You will need to telnet/ssh into -the server for the next stpes. +the server for the next steps. -2. Next, untar/gzip it to the directory that you want. +2. Next, untar/gunzip it to the directory that you want. -3. After that you will need to cd into the lang/ folder under the webnotes +3. After that you will need to cd into the sql/ folder under the webnotes directory and locate the db_generate.sql file. Run the following command: mysql -u<username> -p<password> <databasename> < db_generate.sql @@ -29,7 +28,7 @@ config_inc.php. You can edit directly the config_inc.php but this will make it harder to upgrade to future releases of phpWebNotes. In particular you will want to set the database variables: hostname, username, password, and -database name must be set to match the configuration of your webserver and mysql +database name. These must be set to match the configuration of your webserver and mysql database. Also, don't forget to input the correct directory paths. 5. If you require .php3 extensions (instead of .php) run the convertToPHP3 @@ -42,11 +41,11 @@ config_inc.php file and change $g_php = ".php" to be ".php3" 6. For every page that you want notes to be available you will need to convert -their extension to one that is interpreted by php. Then insert these lines -into the bottom of the document: +their extension to one that is interpreted by PHP. Then insert these lines +into the bottom of the document (before the </body> tag): <? - include("/home/www/webnotes/api.php"); # replace with actual path + include("/mypath/api.php"); # replace with actual path print_web_notes( __FILE__, $PHP_SELF ); ?> @@ -75,20 +74,17 @@ * PROBLEM: Warning messages prevent you from viewing or adding notes. -SOLUTION: Your error_level is too high. Open up your php3.ini (or php.ini) +SOLUTION: Your error_level is too high. Open up your php.ini (or php3.ini) and lower it. There should be enough comments around the variable to help you out. -* PROBLEM: Adding notes does nothing. +* PROBLEM: Adding notes does nothing (obsolete since PHP 4.0.6 is the minimum requirement). SOLUTION 1: You may have track_vars set to Off (or 0). Set this to On in your -php3.ini or (php.ini) file. As of version 4.0.3 it is permanently set to On. +php.ini or (php3.ini) file. As of version 4.0.3 it is permanently set to On. ------------------------------------------------------------------------------- ### Useful links ### ------------------------------------------------------------------------------- -http://www.mysql.com/ - good documentation. -http://www.phpwizard.net/ - an excellent web front end to mysql. -http://www.php.net/ - excellent documentation. -http://www.apache.org/ - you should be able to find what you need, I hope. +See http://webnotes.sf.net/links.php for useful links. Index: README =================================================================== RCS file: /cvsroot/webnotes/webnotes/doc/README,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- README 3 Sep 2002 06:59:09 -0000 1.3 +++ README 9 Sep 2002 05:10:25 -0000 1.4 @@ -1,6 +1,5 @@ # phpWebNotes - a php based note addition system -# Copyright (C) 2000 Kenzaburo Ito - ke...@30... -# 2002 Webnotes Team - web...@so... +# Copyright (C) 2000-2002 Webnotes Team - web...@so... # This program is distributed under the terms and conditions of the GPL # See the files README and LICENSE for details @@ -22,22 +21,16 @@ ------------------------------------------------------------------------------- -INSTALL - installation instructions -LICENSE - GPL license -Changelog - List of fixes, additions, and todo items - -------------------------------------------------------------------------------- - phpWebNotes is a PHP based solution to letting users add their own comments to a document. It is heavily modelled after the example set by php.net. This project was originally conceived to help people who maintain technical -help docs and how-tos. It's more direct than searching through a forum and +help docs and how-tos. It is more direct than searching through a forum and less involving for the users than signing up for a mailing list. Of course, it adapts to other uses easily. Updating documents is tedious and documents often lack the real world -examples and experience to make them truly useful. The best help sites I've +examples and experience to make them truly useful. The best help sites we have ever found had not only detailed documentation but lots and lots of examples and problems and quirks that appear in real life. Unfortunately this rules out many man pages (unix help docs). Allowing user comments lets the doc Index: ROADMAP =================================================================== RCS file: /cvsroot/webnotes/webnotes/doc/ROADMAP,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- ROADMAP 6 Sep 2002 17:03:37 -0000 1.8 +++ ROADMAP 9 Sep 2002 05:10:25 -0000 1.9 @@ -1,6 +1,5 @@ # phpWebNotes - a php based note addition system -# Copyright (C) 2000 Kenzaburo Ito - ke...@30... -# 2002 Webnotes Team - web...@so... +# Copyright (C) 2000-2002 Webnotes Team - web...@so... # This program is distributed under the terms and conditions of the GPL # See the files README and LICENSE for details @@ -8,45 +7,27 @@ 2.0.0 * General cleanup of the code / rewrite. - * A new administrator interface - * Introduce moderation interface * XHTML compliance - * Support for themes with a php.net theme + * Support for themes + * Implement php.net theme + * Implement classic theme to provide the original look'n'feel of version 1.0.0. + * Email notifications to administrators on the submission of new notes. * Support MD5 password encryption (by default) - * LDAP Support - * Support direct links to specific notes * Database schema modifications - * Indexing page - * Add a link next to each file to open it for viewing. - * Differentiate between newly submitted notes, and notes that are hidden by the admin. - * Explorer look'n'feel. - * Infrastructure: - * A new website with demo for all available themes + admin demo - * API mode for plugability into existing systems. - * Add note on how to parse HTML files through the PHP interpreter. - * Add IP/IP range blocking. + * Update the demo installation that is used from the website. + * A new administrator interface 2.0.1 - * Language Localisation (English, French, Italian, German) + * Language Localisation (English, French, Italian, German). + * Any required bug fixes. 2.1.0 + * Multiple access levels (anonymous, verified, moderator, admin) + * Add IP/IP range blocking. + * LDAP Support * New Manual + * Support direct links to specific notes 3.0.0 * Database abstraction * Logo - ------------------------------------------ -SCRATCH PAD ------------------------------------------ - -To-Do list: - - * Index pages by url rather than path, this way hyperlinks to the pages goes through Web/PHP servers rather than directly. - * Be able to require user logins (vb: currently login check is disabled) - * Be able to reverse the display order (vb: them may already be supported) - * Support for user supplied CSS. (vb: value to be confirmed) - * Consider re-using some APIs like config_api.php / lang_api.php / database_api.php / php_api.php / gpc_api.php from mantisbt. - * Add access_api.php - note_accept() / decline() / update() / delete() should check the access level. - * Support displaying queued notes on the page in case of moderators. There should be an accept/reject links on the note and it should be in a different color. - * Consider supporting html only pages. This can be done by a php loader page + some other tricks (output buffering?) |
|
From: <vb...@us...> - 2002-09-09 04:20:00
|
Update of /cvsroot/webnotes/web In directory usw-pr-cvs1:/tmp/cvs-serv22386 Modified Files: download.php security.php side_menu.php Log Message: Added security note, updated download page, removed unavailable links in side_menu.php Index: download.php =================================================================== RCS file: /cvsroot/webnotes/web/download.php,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- download.php 8 Sep 2002 06:12:53 -0000 1.3 +++ download.php 9 Sep 2002 04:19:57 -0000 1.4 @@ -3,13 +3,15 @@ <span class="page_title">Download</span> <hr size="1" noshade="noshade" width="100%"> -<p>Use the link to get to the download site for phpWebNotes. The package is kept in .tar.gz which any reasonable (unix systems, WInzip, Stuffit) decompression program can handle.</p> +<p>Use the link below to visit the download site for phpWebNotes. The package is kept in .tar.gz which any reasonable (unix systems, UltimateZip, Winzip, StuffIt) decompression program can handle.</p> + <p align="center"><a href="http://sourceforge.net/project/showfiles.php?group_id=15381"><strong>Download phpWebNotes</strong></a></p> <p>Please check out the <a href="release.php">Release Notes</a> for important notices and information.</p> <span class="page_title">Mirroring</span> <hr size="1" noshade="noshade" width="100%"> -<p>I would prefer that you sign up on the announcements <a href="mailinglists.php">mailing list</a> if you wish to mirror the software. You should also have a link back to this page if you offer phpWebNotes for download.</p> -<?php include('footer.php') ?> +<p>It is recommended to sign up on the <a href="mailinglists.php">announcements</a> mailing list, if you wish to mirror the software. You should also have a link back to this page.</p> + +<?php include('footer.php') ?> \ No newline at end of file Index: security.php =================================================================== RCS file: /cvsroot/webnotes/web/security.php,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- security.php 8 Sep 2002 06:12:53 -0000 1.3 +++ security.php 9 Sep 2002 04:19:57 -0000 1.4 @@ -3,7 +3,10 @@ <span class="page_title">Security</span> <hr size="1" noshade="noshade" width="100%"> +<p><strong>Default Account</strong> - Information</p> +<p>It is very important to remove the default account or change its password before rolling phpWebNotes onto your webserver for general use. This is due to the fact that the default account name/password are known to anybody who is familiar with phpWebNotes, and are easy to guess by others!</p> + <p><strong>Passwords</strong> - Information</p> -<p>Currently the passwords are run through the crypt() function before being stored. crypt() is a one way function; this means that you cannot obtain the original password from the crypt()ed password. This ensures that the user passwords are not readable should the database be cracked into (Note: this doesn't mean they are uncrackable, enough time and processing power and brute force will reveal most passwords). However, your username and password are most likely being transmitted in clear text. You will have to use a ssl (https) connection to protect transmission.</p> +<p>Currently the passwords are run through the crypt() function before being stored. crypt() is a one way function; this means that you cannot obtain the original password from the crypt()ed password. This ensures that the user passwords are not readable should the database be cracked into (<em>Note: this doesn't mean they are uncrackable, enough time and processing power and brute force will reveal most passwords</em>). However, your username and password are most likely being transmitted in clear text. You will have to use a SSL (https) connection to protect transmission.</p> <?php include('footer.php') ?> Index: side_menu.php =================================================================== RCS file: /cvsroot/webnotes/web/side_menu.php,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- side_menu.php 9 Sep 2002 00:35:44 -0000 1.9 +++ side_menu.php 9 Sep 2002 04:19:57 -0000 1.10 @@ -8,16 +8,16 @@ <td class="menu_items"> <a class="big" href="index.php">Home</a><br /> <a class="big" href="demo.php">Demo</a><br /> - <a class="big" href="tour.php">Admin Tour</a><br /> - About<br /> + <!-- <a class="big" href="tour.php">Admin Tour</a><br /> --> + <!-- About<br /> --> <a class="big" href="download.php">Download</a><br /> - Screenshots<br /> - Author<br /> + <!-- Screenshots<br /> --> + <!-- Author<br /> --> <a class="big" href="credits.php">Credits</a><br /> - Requirements<br /> + <!-- Requirements<br /> --> <a class="big" href="release.php">Release Notes</a><br /> <a class="big" href="install.php">Installation</a><br /> - Upgrading<br /> + <!-- Upgrading<br /> --> <a class="big" href="changelog.php">ChangeLog</a><br /> <a class="big" href="links.php">Links</a><br /> </td> @@ -29,7 +29,7 @@ </tr> <tr> <td class="menu_items"> - IRC<br /> + <!-- IRC<br /> --> <a href="bugtracker.php">Bugtracker</a><br /> <a href="forums.php">Forums</a><br /> <a href="mailinglists.php">Mailing Lists</a><br /> |
|
From: <vb...@us...> - 2002-09-09 04:03:47
|
Update of /cvsroot/webnotes/web In directory usw-pr-cvs1:/tmp/cvs-serv14485 Modified Files: index.php links.php Log Message: Changed link to phpMyAdmin and added UltimateZip Index: index.php =================================================================== RCS file: /cvsroot/webnotes/web/index.php,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- index.php 9 Sep 2002 03:35:22 -0000 1.4 +++ index.php 9 Sep 2002 04:03:45 -0000 1.5 @@ -19,7 +19,7 @@ <li><a href="http://www.mysql.com/">MySQL database</a> (more support is planned).</li> <li>Web server (eg: <a href="http://www.apache.org/">apache</a>, IIS, etc.)</li> </ul> -<p>Additionally you will need to know basic administration of MySQL (login, create new database, run a SQL query). We strongly recommend using <a href="http://www.phpwizard.net">phpMyAdmin</a> to accomplish the database administration task. The webserver needs to be configured to handle php files at a minimum.</p> +<p>Additionally you will need to know basic administration of MySQL (login, create new database, run a SQL query). We strongly recommend using <a href="http://phpMyAdmin.sf.net">phpMyAdmin</a> to accomplish the database administration task. The webserver needs to be configured to handle php files at a minimum.</p> <p>It also helps a great deal to at least be able to tinker with php scripts (when there's a little bug or you want to tweak something). Of course, knowing HTML is essential to do any custom formatting. Along the lines of appearance, we attempt to use our best judgement in colors, layout, and feel. Eventually we aim to be able to customize the look and feel from a single CSS file.</p> <span class="page_title">Features and Benefits</span> Index: links.php =================================================================== RCS file: /cvsroot/webnotes/web/links.php,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- links.php 8 Sep 2002 22:28:18 -0000 1.1 +++ links.php 9 Sep 2002 04:03:45 -0000 1.2 @@ -6,8 +6,9 @@ <ul> <li><a href="http://www.php.net">http://www.php.net</a> - PHP website</li> <li><a href="http://www.mysql.com">http://www.mysql.com</a> - MySQL Server</li> -<li><a href="http://phpMyAdmin.sf.net">http://phpMyAdmin.sf.net</a> - Administration tool for MySQL.</li> +<li><a href="http://phpMyAdmin.sf.net">http://phpMyAdmin.sf.net</a> - phpMyAdmin administration tool for MySQL.</li> <li><a href="http://www.apache.org">http://www.apache.org</a> - Apache Webserver</li> +<li><a href="http://www.ultimatezip.com">http://www.ultimatezip.com</a> - UltimateZip for extracting phpWebNotes releases (needed for Windows users). Other tools like WinZip and StuffIt can also be used.</li> </ul> <span class="page_title">Developers' Links</span> |
|
From: <vb...@us...> - 2002-09-09 03:52:39
|
Update of /cvsroot/webnotes/web In directory usw-pr-cvs1:/tmp/cvs-serv9181 Modified Files: demo.php Log Message: Updated demo page. Index: demo.php =================================================================== RCS file: /cvsroot/webnotes/web/demo.php,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- demo.php 8 Sep 2002 06:12:53 -0000 1.3 +++ demo.php 9 Sep 2002 03:52:36 -0000 1.4 @@ -2,8 +2,11 @@ <span class="page_title">Demo</span> <hr size="1" noshade="noshade" width="100%"> -<p>Go to the demo to see how it is used. For the demo I've disabled the queueing mechanism. This will allow for instantaneous feedback. To see an example of what you could do with this, checkout <a href="http://www.php.net/manual/en/">php.net</a> (Note: php.net does not use phpWebNotes, they have their own system).</p> -<p align="center"><a href="http://webnotes.sourceforge.net/webnotes/demo/"><strong>Demo phpWebNotes</strong></a></p> -<p>If you have questions or feeback please discuss it in the <strong><a href="forums.php">Forums</a></strong>.</p> -<?php include('footer.php') ?> +<p>We have put together a <a href="http://webnotes.sourceforge.net/webnotes/demo/">demo</a> with a couple of documents enabling the viewers to contribute comments to. For this demo we have disabled the queueing / approval process in order for the comments to appear right away. In a real system, the administrator might like to have such comments moderated first before appearing on the website (which can be done using phpWebNotes).</p> + +<p>For a live example of what can be done using phpWebNotes, visit <a href="http://www.php.net/manual/en">PHP Manual</a>, where users are allowed to contribute notes to any of the manual's pages. Note that PHP site is not using phpWebNotes, however, phpWebNotes allows you to achieve exactly the same functionality.</p> + +<p>If you have questions or feeback please discuss it on the <a href="mailinglists.php">Mailing Lists</a>.</p> + +<?php include('footer.php') ?> \ No newline at end of file |
|
From: <vb...@us...> - 2002-09-09 03:35:25
|
Update of /cvsroot/webnotes/web In directory usw-pr-cvs1:/tmp/cvs-serv908 Modified Files: index.php Log Message: Updated the main page. Index: index.php =================================================================== RCS file: /cvsroot/webnotes/web/index.php,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- index.php 8 Sep 2002 06:12:53 -0000 1.3 +++ index.php 9 Sep 2002 03:35:22 -0000 1.4 @@ -3,31 +3,30 @@ <span class="page_title">What is it?</span> <hr size="1" noshade="noshade" width="100%"> -<p>phpWebNotes is a php based solution to letting users add their own comments to a document.</p> -<p>This project was originally conceived to help people who maintain technical help docs and how-tos. It's more direct than searching through a forum and less involving for the users than signing up for a mailing list. Of course, it adapts to other uses extremely easily.</p> -<p>Updating documents is tedious and documents all to example lack the real world examples and experience to make them truly useful. The best help sites I've ever found had not only detailed documentation but lots and lots of examples and problems and quirks that appear in real life. Unfortunately this rules out almost all man pages (unix help docs). Allowing user comments lets the doc maintainer do less work. Whenever the maintainer needs to update the doc they can just roll in a lot of the user feedback instead of recreating the info. This sort of automation cuts down on email and mailing list traffic as well.</p> -<p>The release numbering convention I'm using is major.minor.micro. Major indicates a large change in the core package, minor a significant amount of feature addition/modification, micro for mostly bug fixes. I am leaning towards releasing a new version for a significant bugfix as often as daily.</p> +<p>phpWebNotes is a php based solution to letting users contribute their own comments to a document.</p> +<p>This project was originally conceived to help people who maintain technical help documents and how-tos. It is more direct than searching through a forum and less involving for the users than signing up for a mailing list. Of course, it adapts to other uses extremely easily.</p> +<p>Updating documents is tedious and a lot of documents lack the real world examples and experience to make them truly useful. The best help sites we ever found had not only detailed documentation but lots and lots of examples and problems and quirks that appear in real life. Unfortunately this rules out almost all man pages (unix help docs). Allowing user comments lets the doc maintainer do less work. Whenever the maintainer needs to update the document they can just roll in user feedback instead of recreating the information. This sort of automation cuts down on email and mailing list traffic as well.</p> <span class="page_title">Goals</span> <hr size="1" noshade="noshade" width="100%"> -<p>A simple way to add user note/footnote capability to any document. I'd like to see this used in particular for HOW-TO, help files, and online documentation (see <a href="http://www.php.net/">php.net</a> for an excellent example).</p> +<p>A simple way to allow users to contribute their comments to any document. We would like to see this used in particular for HOW-TO, help files, and online documentation (see <a href="http://www.php.net/manual/en/">PHP manual</a> for an excellent example).</p> <span class="page_title">Requirements</span> <hr size="1" noshade="noshade" width="100%"> +<p>Following are the required software modules to be able to install phpWebNotes:</p> <ul> -<li><a href="http://www.php.net/">php</a> 4.0.6 and higher</li> -<li><a href="http://www.mysql.com/">MySQL database</a> (more support is planned)</li> -<li>Web server (<a href="http://www.apache.org/">apache</a>, IIS, etc.)</li> +<li><a href="http://www.php.net/">PHP</a> 4.0.6 and higher</li> +<li><a href="http://www.mysql.com/">MySQL database</a> (more support is planned).</li> +<li>Web server (eg: <a href="http://www.apache.org/">apache</a>, IIS, etc.)</li> </ul> -<p>Additionally you will need to know basic administration of MySQL (login, create new database, run a SQL query). The webserver needs to be configured to handle php files at a minimum.</p> -<p>It also helps a great deal to at least be able to tinker with php scripts (when there's a little bug or you want to tweak something). Of course, knowing HTML is essential to do any custom formatting. Along the lines of appearance, I have tried to use my best judgement in colors, layout, and feel. Eventually I hope to be able to customize the look and feel from a single CSS file.</p> -<p>I highly recommend using <a href="http://www.phpwizard.net">phpMyAdmin</a> to administer your mysql database.</p> +<p>Additionally you will need to know basic administration of MySQL (login, create new database, run a SQL query). We strongly recommend using <a href="http://www.phpwizard.net">phpMyAdmin</a> to accomplish the database administration task. The webserver needs to be configured to handle php files at a minimum.</p> +<p>It also helps a great deal to at least be able to tinker with php scripts (when there's a little bug or you want to tweak something). Of course, knowing HTML is essential to do any custom formatting. Along the lines of appearance, we attempt to use our best judgement in colors, layout, and feel. Eventually we aim to be able to customize the look and feel from a single CSS file.</p> <span class="page_title">Features and Benefits</span> <hr size="1" noshade="noshade" width="100%"> +<p>Following are some of the nice features of phpWebNotes:</p> <ul> <li>Web based and platform independent</li> -<li>Supports PHP3 and PHP4</li> <li>Configuration files allow for site-wide control</li> <li>Automatic indexing of files</li> <li>Takes two lines of php to add notes to a file</li> @@ -35,21 +34,20 @@ <span class="page_title">Upcoming Features</span> <hr size="1" noshade="noshade" width="100%"> -<p>Check the <a href="roadmap.php">Roadmap</a> for a more detailed and up to date list of items.</p> +<p>Check the <a href="roadmap.php">Roadmap</a> for a more detailed and up to date list of features.</p> <span class="page_title">Versioning</span> <hr size="1" noshade="noshade" width="100%"> -<p>The release numbering convention I'm using is major.minor.micro. Major indicates a very large change in the core package, minor a significant amount of feature addition/modification, micro for mostly bug fixes. I will release a new version for a significant bugfix as often as daily.</p> -<p>Version 1.0.0 will be used when I consider phpWebNotes to be production quality. This basically means that I would not hesitate to recommend it for most uses.</p> + +<p>The release numbering convention used for phpWebNotes is major.minor.micro. Major indicates a large change in the core package, minor a significant amount of feature addition/modification, micro for mostly bug fixes. A database change always requires a change in major release.</p> <span class="page_title">How to help?</span> <hr size="1" noshade="noshade" width="100%"> <ul> <li>Report any bugs at the <a href="bugtracker.php">Bugtracker</a></li> -<li>Suggest (reasonable) features</li> -<li>Contribute code or tell me where to look</li> -<li><strong>Let me know if you use it and find it useful</strong>.</li> +<li>Suggest (generic) features that would add value to the product.</li> +<li>Contribute code or pointers to code that can be re-used in this project.</li> +<li><strong>Let us know if you use it and find it useful</strong> (this information will not be published without your approval, but it keeps the team motivated knowing that their work has been of use).</li> </ul> -<p>I won't publish the information without permission, but I would appreciate the feedback. This, more than any one thing, keeps me motivated.</p> <?php include('footer.php') ?> |
|
From: <vb...@us...> - 2002-09-09 02:04:44
|
Update of /cvsroot/webnotes/web In directory usw-pr-cvs1:/tmp/cvs-serv20258 Modified Files: mailinglists.php Log Message: Updated the mailing lists page Index: mailinglists.php =================================================================== RCS file: /cvsroot/webnotes/web/mailinglists.php,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- mailinglists.php 8 Sep 2002 06:12:53 -0000 1.4 +++ mailinglists.php 9 Sep 2002 02:04:41 -0000 1.5 @@ -2,6 +2,17 @@ <span class="page_title">Mailing Lists</span> <hr size="1" noshade="noshade" width="100%"> -<p>There is a mailing list for announcements. Announcements will be posted to it after each release. Please use the <a href="forums.php">Discussion Forums</a> if you need help.</p> -<p align="center"><strong><a href="http://sourceforge.net/mail/?group_id=15381">SourceForge Mailing List</a></strong></p> +<p>phpWebNotes provides its users and developers with multiple mailing lists in order to target +their needs. Following is a list of these mailing lists:</p> + +<ul> +<li><strong>webnotes-announce</strong> - Used to announce new releases.</li> +<li><strong>webnotes-help</strong> - Users can post requests for help on this mailing list. The webnotes developers as well as other users are encouraged to reply to such requests.</li> +<li><strong>webnotes-devel</strong> - All development issues are discussed on this mailing lists. All developers are +encouraged to post to this list before starting on any major work.</li> +<li><strong>webnotes-cvs</strong> - All commits and their associated comments are automatically posted to this mailing list.</li> +</ul> + +<p>To subscribe to any of the above mailing lists, click <a href="http://sourceforge.net/mail/?group_id=15381">here</a>.</p> + <?php include('footer.php') ?> |
|
From: <vb...@us...> - 2002-09-09 00:35:47
|
Update of /cvsroot/webnotes/web
In directory usw-pr-cvs1:/tmp/cvs-serv3582
Modified Files:
bugtracker.php side_menu.php
Log Message:
Added Bugtracking page
Index: bugtracker.php
===================================================================
RCS file: /cvsroot/webnotes/web/bugtracker.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- bugtracker.php 8 Sep 2002 06:12:53 -0000 1.3
+++ bugtracker.php 9 Sep 2002 00:35:44 -0000 1.4
@@ -1,6 +1,7 @@
<?php include('header.php') ?>
<span class="page_title">Bugtracker</span>
<hr size="1" noshade="noshade" width="100%">
-phpWebNotes uses Mantis Bugtracker to track bugs and feature requests. Login to http://webnotes.sf.net/mantis to
-report bugs and feature requests.
+<p>phpWebNotes uses Mantis Bugtracker to track bugs and feature requests.
+Signup and <a href="http://webnotes.sf.net/mantis">login</a> now to submit bugs and feature requests.</p>
+<p>Thanks for <a href="http://mantisbt.sf.net">Mantis</a> team for developing such an excellent tool.</p>
<?php include('footer.php') ?>
Index: side_menu.php
===================================================================
RCS file: /cvsroot/webnotes/web/side_menu.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- side_menu.php 8 Sep 2002 22:28:18 -0000 1.8
+++ side_menu.php 9 Sep 2002 00:35:44 -0000 1.9
@@ -30,6 +30,7 @@
<tr>
<td class="menu_items">
IRC<br />
+ <a href="bugtracker.php">Bugtracker</a><br />
<a href="forums.php">Forums</a><br />
<a href="mailinglists.php">Mailing Lists</a><br />
</td>
|
