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-10-03 00:23:23
|
Update of /cvsroot/webnotes/webnotes
In directory usw-pr-cvs1:/tmp/cvs-serv30158
Modified Files:
action.php index.php logout.php
Log Message:
- Removed extra code from logout that was never executed.
- Remove print_header_redirect() since it wasn't used - util_header_redirect() should be used instead.
- Added @ infront of header() calls.
- Used util_header_redirect() rather than using header() directly.
Index: action.php
===================================================================
RCS file: /cvsroot/webnotes/webnotes/action.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- action.php 26 Sep 2002 03:41:46 -0000 1.9
+++ action.php 3 Oct 2002 00:23:19 -0000 1.10
@@ -48,8 +48,7 @@
} else if ( 'queue' === $f_action ) {
note_pending( $f_note_id );
} else if ( 'edit' === $f_action ) {
- header( "Location: $g_note_add_page?f_note_id=$f_note_id" );
- exit;
+ util_header_redirect( "$g_note_add_page?f_note_id=$f_note_id" );
}
}
Index: index.php
===================================================================
RCS file: /cvsroot/webnotes/webnotes/index.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- index.php 21 Sep 2002 02:44:32 -0000 1.3
+++ index.php 3 Oct 2002 00:23:19 -0000 1.4
@@ -8,5 +8,6 @@
# $Id$
# --------------------------------------------------------
- header("Location: user_home_page.php");
+ require_once( 'core' . DIRECTORY_SEPARATOR . 'api.php' );
+ util_header_redirect( 'user_home_page.php' );
?>
Index: logout.php
===================================================================
RCS file: /cvsroot/webnotes/webnotes/logout.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- logout.php 21 Sep 2002 02:44:32 -0000 1.14
+++ logout.php 3 Oct 2002 00:23:19 -0000 1.15
@@ -13,35 +13,4 @@
### remove cookie
setcookie( $g_string_cookie, '', 0, $g_cookie_url );
util_header_redirect( $g_logout_redirect_page );
-
- print_html_top();
- print_head_top();
- print_title( $g_window_title );
- print_css( $g_css_inc_file );
- print_meta_redirect( $g_logout_redirect_page, 2 );
- print_head_bottom();
- print_body_top();
- print_header( $g_page_title );
-
- # @@@@ The word "Here" needs to be localised.
- echo <<<EOT
- <br />
- <div align="center">
- <table width="40%" bgcolor="$g_table_border_color" cellspacing="1" border="0">
- <tr bgcolor="$g_white_color">
- <td bgcolor="$g_table_title_color"><strong>$s_logged_out_msg</strong></td>
- </tr>
- <tr bgcolor="$g_white_color">
- <td align="right" bgcolor="$g_primary_dark_color">
- <strong>$s_logout_redirect_msg <a href="$g_logout_redirect_page">Here</a></strong>
- </td>
- </tr>
- </table>
- </div>
-
-EOT;
-
- print_footer( __FILE__ );
- print_body_bottom();
- print_html_bottom();
?>
|
|
From: <vb...@us...> - 2002-10-03 00:23:23
|
Update of /cvsroot/webnotes/webnotes/core
In directory usw-pr-cvs1:/tmp/cvs-serv30158/core
Modified Files:
html_api.php util_api.php
Log Message:
- Removed extra code from logout that was never executed.
- Remove print_header_redirect() since it wasn't used - util_header_redirect() should be used instead.
- Added @ infront of header() calls.
- Used util_header_redirect() rather than using header() directly.
Index: html_api.php
===================================================================
RCS file: /cvsroot/webnotes/webnotes/core/html_api.php,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- html_api.php 2 Oct 2002 06:03:58 -0000 1.17
+++ html_api.php 3 Oct 2002 00:23:19 -0000 1.18
@@ -38,24 +38,6 @@
}
}
### --------------------
- 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 ) {
echo "<meta http-equiv=\"Refresh\" content=\"$p_time;URL=$p_url\">";
}
Index: util_api.php
===================================================================
RCS file: /cvsroot/webnotes/webnotes/core/util_api.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- util_api.php 1 Oct 2002 03:06:22 -0000 1.4
+++ util_api.php 3 Oct 2002 00:23:19 -0000 1.5
@@ -41,17 +41,17 @@
function util_header_redirect( $p_url ) {
$t_use_iis = config_get( 'use_iis');
if ( OFF == $t_use_iis ) {
- header( 'Status: 302' );
+ @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' );
+ @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" );
+ @header( "Refresh: 0;url=$p_url" );
} else {
- header( "Location: $p_url" );
+ @header( "Location: $p_url" );
}
die; # additional output can cause problems so let's just stop output here
}
|
|
From: <ro...@us...> - 2002-10-02 06:11:36
|
Update of /cvsroot/webnotes/web In directory usw-pr-cvs1:/tmp/cvs-serv16249 Modified Files: download.php Log Message: Change CVS SNAP URL Index: download.php =================================================================== RCS file: /cvsroot/webnotes/web/download.php,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- download.php 30 Sep 2002 04:40:30 -0000 1.7 +++ download.php 2 Oct 2002 06:11:33 -0000 1.8 @@ -7,12 +7,8 @@ <span class="center_link"> <p align="center"><a href="http://sourceforge.net/project/showfiles.php?group_id=15381">Download phpWebNotes</a></p> -<p align="center"><a -href="http://www.extremeserv-linux.com/downloads/misc/phpwebnotescvs/phpWebNotes-LatestSNAP.tar.gz">Download Latest phpWebNotes CVS SNAP</a></p> </span> +<p align="center"><a href="http://www.smarttux.com/phpwebnotescvs/phpWebNotes-LatestSNAP.tar.gz">Download Latest phpWebNotes CVS SNAP</a></p> </span> <p>Please check out the <a href="release.php">Release Notes</a> for important notices and information.</p> - -<span class="section">Mirroring</span> -<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') ?> |
|
From: <ro...@us...> - 2002-10-02 06:08:25
|
Update of /cvsroot/webnotes/web In directory usw-pr-cvs1:/tmp/cvs-serv14800 Modified Files: cvs.php Log Message: CVS SNAPs have moved to a new URL Index: cvs.php =================================================================== RCS file: /cvsroot/webnotes/web/cvs.php,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- cvs.php 30 Sep 2002 04:30:46 -0000 1.5 +++ cvs.php 2 Oct 2002 06:08:22 -0000 1.6 @@ -8,7 +8,6 @@ <p align="center"><a href="http://sourceforge.net/cvs/?group_id=15381">phpWebNotes CVS</a></p> </span> <span class="center_link"> -<p align="center"><a href="http://www.extremeserv-linux.com/downloads/misc/phpwebnotescvs/">phpWebNotes CVS SNAPs</a></p> -</span> +<p align="center"><a href="http://www.smarttux.com/phpwebnotescvs/">phpWebNotes CVS SNAPs</a></p> </span> <?php include('footer.php') ?> |
|
From: <ro...@us...> - 2002-10-02 06:04:01
|
Update of /cvsroot/webnotes/webnotes/core
In directory usw-pr-cvs1:/tmp/cvs-serv11346
Modified Files:
html_api.php
Log Message:
Didn't add @ before all the header lines. Fixed
Index: html_api.php
===================================================================
RCS file: /cvsroot/webnotes/webnotes/core/html_api.php,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- html_api.php 1 Oct 2002 12:30:09 -0000 1.16
+++ html_api.php 2 Oct 2002 06:03:58 -0000 1.17
@@ -49,9 +49,9 @@
@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" );
+ @header( "Refresh: 0;url=$p_url" );
} else {
- header( "Location: $p_url" );
+ @header( "Location: $p_url" );
}
die; # additional output can cause problems so let's just stop output here
}
@@ -178,4 +178,4 @@
}
}
### --------------------
-?>
\ No newline at end of file
+?>
|
|
From: <ro...@us...> - 2002-10-02 05:56:22
|
Update of /cvsroot/webnotes/webnotes In directory usw-pr-cvs1:/tmp/cvs-serv8973 Removed Files: convertToPHP3 Log Message: removed convertToPHP3 script --- convertToPHP3 DELETED --- |
|
From: <ro...@us...> - 2002-10-02 02:43:24
|
Update of /cvsroot/webnotes/webnotes/doc
In directory usw-pr-cvs1:/tmp/cvs-serv32387
Modified Files:
INSTALL
Log Message:
Fix error, its core/api.php, not api.php
Index: INSTALL
===================================================================
RCS file: /cvsroot/webnotes/webnotes/doc/INSTALL,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- INSTALL 2 Oct 2002 02:19:26 -0000 1.9
+++ INSTALL 2 Oct 2002 02:43:21 -0000 1.10
@@ -42,7 +42,7 @@
into the bottom of the document (before the </body> tag):
<?
- require_once("/mypath/api.php"); # replace with actual path
+ require_once("/mypath/core/api.php"); # replace with actual path
print_web_notes( 'my-page-logical-name', $PHP_SELF );
?>
|
|
From: <ro...@us...> - 2002-10-02 02:21:51
|
Update of /cvsroot/webnotes/webnotes/doc In directory usw-pr-cvs1:/tmp/cvs-serv27261 Modified Files: README Log Message: Stop saying that it needs phpMyAdmin Index: README =================================================================== RCS file: /cvsroot/webnotes/webnotes/doc/README,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- README 9 Sep 2002 05:10:25 -0000 1.4 +++ README 2 Oct 2002 02:21:48 -0000 1.5 @@ -38,7 +38,7 @@ can just roll in the user feedback instead of recreating the information. This sort of automation cuts down on email and mailing list traffic as well. -You will need to have PHP, MySql, phpMyAdmin, and a web server. You don't need +You will need to have PHP, MySql, and a web server. You don't need to know too much about any of them other than how to set them up and some basic administration commands. |
|
From: <ro...@us...> - 2002-10-02 02:20:36
|
Update of /cvsroot/webnotes/webnotes/doc In directory usw-pr-cvs1:/tmp/cvs-serv27001 Modified Files: CREDITS Log Message: Add my name Index: CREDITS =================================================================== RCS file: /cvsroot/webnotes/webnotes/doc/CREDITS,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- CREDITS 9 Sep 2002 05:10:24 -0000 1.3 +++ CREDITS 2 Oct 2002 02:20:33 -0000 1.4 @@ -18,6 +18,7 @@ Remon Metira (rmetira) Mantis Team (mantisbt.sf.net - some code was re-used from Mantis Bugtracker) +Roland Verlander (roly) Translations ------------ |
|
From: <ro...@us...> - 2002-10-02 02:19:28
|
Update of /cvsroot/webnotes/webnotes/doc In directory usw-pr-cvs1:/tmp/cvs-serv26706 Modified Files: INSTALL Log Message: A few misc changes Index: INSTALL =================================================================== RCS file: /cvsroot/webnotes/webnotes/doc/INSTALL,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- INSTALL 29 Sep 2002 13:46:14 -0000 1.8 +++ INSTALL 2 Oct 2002 02:19:26 -0000 1.9 @@ -7,13 +7,12 @@ ### Installation steps ### ------------------------------------------------------------------------------- -*** REQUIREMENTS: MySql database, php 4.0.6, a webserver (tested on Apache and IIS, -should work anything else PHP will run with). +*** REQUIREMENTS: MySql database, php 4.0.6 and higer (4.1.2+ recommended), 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 steps. -2. Next, untar/gunzip it to the directory that you want. +2. Next, untar/gunzip it to the directory that you want. (On Linux type tar zxf filename.tar.gz to decompress) 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: @@ -24,6 +23,8 @@ downloaded a CVS version). mysql -u<username> -p<password> <databasename> < db_upgrade.sql + +If you installed MySQL from source code you may have to add /usr/local/mysql/bin/ infront of those commands You could also cut and paste the sql statements from db_generate.sql into a package like phpMyAdmin. You will need to have created the database ahead of |
|
From: <ro...@us...> - 2002-10-02 02:07:19
|
Update of /cvsroot/webnotes/webnotes In directory usw-pr-cvs1:/tmp/cvs-serv24199 Modified Files: convertToPHP3 Log Message: Change to say that phpWebNotes no longer supports PHP3 Index: convertToPHP3 =================================================================== RCS file: /cvsroot/webnotes/webnotes/convertToPHP3,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- convertToPHP3 16 Mar 2001 07:31:16 -0000 1.1 +++ convertToPHP3 2 Oct 2002 02:07:16 -0000 1.2 @@ -1,7 +1,2 @@ #!/bin/sh - -echo "Converting all php files to php3 files" -for filename in $(ls *.php); do - echo "renaming $filename --> $(echo $filename | sed -e "s/.php/.php3/")" - mv "$filename" "$(echo $filename | sed -e "s/.php/.php3/")" -done \ No newline at end of file +echo "PHP3 is no longer supported by phpWebNotes." |
|
From: <vb...@us...> - 2002-10-01 13:45:55
|
Update of /cvsroot/webnotes/web In directory usw-pr-cvs1:/tmp/cvs-serv11169 Modified Files: index.php irc.php links.php Log Message: Some minor fixes. Index: index.php =================================================================== RCS file: /cvsroot/webnotes/web/index.php,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- index.php 12 Sep 2002 22:10:09 -0000 1.6 +++ index.php 1 Oct 2002 13:45:51 -0000 1.7 @@ -16,10 +16,10 @@ <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 (eg: <a href="http://www.apache.org/">apache</a>, IIS, etc.)</li> +<li><a href="http://www.mysql.com/">MySQL 3.22 and higher</a> (more databases support is planned).</li> +<li>Web server (eg: <a href="http://httpd.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://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>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.phpmyadmin.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="section">Features and Benefits</span> Index: irc.php =================================================================== RCS file: /cvsroot/webnotes/web/irc.php,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- irc.php 26 Sep 2002 22:03:48 -0000 1.1 +++ irc.php 1 Oct 2002 13:45:51 -0000 1.2 @@ -2,7 +2,7 @@ <span class="page_title">IRC</span> <hr size=1 noshade width="100%"> -<p>You can find us on IRC in #webnoteshelp on the <a href="http://www.openprojects.net/irc_servers.shtml">Open Projects Network (OPN)</a>. Click on the links to find a list of servers.</p> -<p>Keep in mind that we are probably not going to be around all the time. You can chat in #webnotes to just talk, ask about phpWebNotes, discuss development, etc.</p> +<p>You can find us on IRC in <strong>#webnoteshelp</strong> on the <a href="http://www.openprojects.net/irc_servers.shtml">Open Projects Network (OPN)</a>. Click on the links to find a list of servers.</p> +<p>Keep in mind that we are probably not going to be around all the time. You can chat in <strong>#webnoteshelp</strong> to just talk, ask about phpWebNotes, discuss development, etc.</p> <?php include('footer.php') ?> Index: links.php =================================================================== RCS file: /cvsroot/webnotes/web/links.php,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- links.php 26 Sep 2002 04:13:00 -0000 1.4 +++ links.php 1 Oct 2002 13:45:51 -0000 1.5 @@ -7,8 +7,8 @@ <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> - 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.phpmyadmin.net">http://www.phpmyadmin.net</a> - phpMyAdmin administration tool for MySQL.</li> +<li><a href="http://httpd.apache.org">http://httpd.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> |
|
From: <vb...@us...> - 2002-10-01 13:19:48
|
Update of /cvsroot/webnotes/webnotes/core
In directory usw-pr-cvs1:/tmp/cvs-serv1269/core
Modified Files:
string_api.php
Log Message:
- Fixed a problem where http://xxx/yyy.html was not correctly hyperlinked. Only the http://xxx portion was done.
Index: string_api.php
===================================================================
RCS file: /cvsroot/webnotes/webnotes/core/string_api.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- string_api.php 30 Sep 2002 02:40:51 -0000 1.12
+++ string_api.php 1 Oct 2002 13:19:45 -0000 1.13
@@ -98,7 +98,7 @@
}
### --------------------
function string_hyperlink( $p_note_string ) {
- $p_note_string = preg_replace("/(http:\/\/[0-9a-zA-Z\-\._]+)/", "<a href=\"\\1\">\\1</a>", $p_note_string);
+ $p_note_string = preg_replace("/(http:\/\/[0-9a-zA-Z\-\._\/]+)/", "<a href=\"\\1\">\\1</a>", $p_note_string);
$p_note_string = preg_replace("/(mailto:[0-9a-zA-Z\-\._@]+)/", "<a href=\"\\1\">\\1</a>", $p_note_string);
return ($p_note_string);
}
|
|
From: <vb...@us...> - 2002-10-01 12:51:45
|
Update of /cvsroot/webnotes/webnotes/sample
In directory usw-pr-cvs1:/tmp/cvs-serv22647/sample
Modified Files:
sample_header.php
Log Message:
- Fixed a problem in including the sample.css
- Fixed a problem in referring to the new images from the sample manual.
Index: sample_header.php
===================================================================
RCS file: /cvsroot/webnotes/webnotes/sample/sample_header.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- sample_header.php 1 Oct 2002 12:30:09 -0000 1.2
+++ sample_header.php 1 Oct 2002 12:51:42 -0000 1.3
@@ -4,7 +4,9 @@
<?php
require_once("../core/api.php"); # replace with actual path
pwn_head();
- print_css_link( dirname( __FILE__ ) . DIRECTORY_SEPARATOR . 'sample.css' );
+ echo '<style type="text/css">';
+ print_css( dirname( __FILE__ ) . DIRECTORY_SEPARATOR . 'sample.css' );
+ echo '</style>';
?>
</head>
<body>
|
|
From: <vb...@us...> - 2002-10-01 12:51:45
|
Update of /cvsroot/webnotes/webnotes/core
In directory usw-pr-cvs1:/tmp/cvs-serv22647/core
Modified Files:
pwn_api.php
Log Message:
- Fixed a problem in including the sample.css
- Fixed a problem in referring to the new images from the sample manual.
Index: pwn_api.php
===================================================================
RCS file: /cvsroot/webnotes/webnotes/core/pwn_api.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- pwn_api.php 1 Oct 2002 12:30:09 -0000 1.6
+++ pwn_api.php 1 Oct 2002 12:51:42 -0000 1.7
@@ -66,9 +66,7 @@
}
### --------------------
function pwn_index( $p_page, $p_page_top, $p_page_parent ) {
- $images = dirname( dirname( __FILE__ ) ) . DIRECTORY_SEPARATOR . 'themes' .
- DIRECTORY_SEPARATOR . config_get( 'theme' ) . DIRECTORY_SEPARATOR .
- 'images' . DIRECTORY_SEPARATOR;
+ $images = config_get( 'web_directory' ) . 'themes/' . config_get( 'theme' ) . '/images/';
$image_top = $images . 'caret_top.gif';
$image_up = $images . 'caret_up.gif';
|
|
From: <vb...@us...> - 2002-10-01 12:30:13
|
Update of /cvsroot/webnotes/webnotes/themes/phpnet/images In directory usw-pr-cvs1:/tmp/cvs-serv14356/themes/phpnet/images Added Files: bullet_current.gif bullet_sibling.gif caret_top.gif caret_up.gif Log Message: - Added an extra level in the samples to demonstrate the parent page link. Now the manual has Webopedia > Markup Languages > XML / XHTML - Added a style sheet in the sample to enhance the look. - Moved some code from the sample_header.php to pwn_api.php. - Added some extra images that are used as part of phpnet in the manual look. --- NEW FILE: bullet_current.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: bullet_sibling.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: caret_top.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: caret_up.gif --- (This appears to be a binary file; contents omitted.) |
Update of /cvsroot/webnotes/webnotes/sample
In directory usw-pr-cvs1:/tmp/cvs-serv14356/sample
Modified Files:
sample_footer.php sample_header.php webopedia.php xhtml.php
xml.php
Added Files:
markup.php sample.css
Log Message:
- Added an extra level in the samples to demonstrate the parent page link. Now the manual has Webopedia > Markup Languages > XML / XHTML
- Added a style sheet in the sample to enhance the look.
- Moved some code from the sample_header.php to pwn_api.php.
- Added some extra images that are used as part of phpnet in the manual look.
--- NEW FILE: markup.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: markup.php,v 1.1 2002/10/01 12:30:09 vboctor Exp $
# --------------------------------------------------------
$page_title = 'Markup Languages';
$page = 'Markup Languages';
$page_parent = 'Webopedia';
$page_prev = 'Webopedia';
$page_next = 'XHTML';
include( dirname( __FILE__ ) . DIRECTORY_SEPARATOR . 'sample_header.php' );
?>
<h1>Markup Languages</h1>
<p>This section explains different markup languages including: XHTML and XML.</p>
<?php
include( dirname( __FILE__ ) . DIRECTORY_SEPARATOR . 'sample_footer.php' );
?>
--- NEW FILE: sample.css ---
/*
# 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: sample.css,v 1.1 2002/10/01 12:30:09 vboctor Exp $
# --------------------------------------------------------
*/
table.layout { border: 0px; width: 100%; }
td.title, .dark { background-color: #d0d0d0; }
td.search, .light { background-color: #e0e0e0; }
td.side, .lighter { background-color: #f0f0f0; }
td.title, td.search, td.side { font-family:Verdana, Arial; font-size: 10pt; }
td.title { padding: 10px; }
td.search { text-align: right; }
td.side { border-right: 1px dotted #a0a0a0; vertical-align: top; padding: 10px; }
td.body { padding: 5px; }
img.bullet { border: 0px; height: 7px; width: 11px; }
Index: sample_footer.php
===================================================================
RCS file: /cvsroot/webnotes/webnotes/sample/sample_footer.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- sample_footer.php 1 Oct 2002 06:51:45 -0000 1.1
+++ sample_footer.php 1 Oct 2002 12:30:09 -0000 1.2
@@ -1,6 +1,8 @@
<?php pwn_body( $page, $PHP_SELF, $page_prev, $page_next, $page_parent ); ?>
-
-</td></tr></table>
+</td></tr>
+<tr><td class="light" colspan="2">xxx</td></tr>
+<tr><td class="dark">xxx</td><td align="right" class="dark">xxx</td></tr>
+</table>
<p><a href="http://sourceforge.net/projects/webnotes/"><img src="http://sourceforge.net/sflogo.php?group_id=15381&type=5" width="140" height="42" border="0" alt="phpWebNotes @ SourceForge" /></a></p>
</body>
</html>
Index: sample_header.php
===================================================================
RCS file: /cvsroot/webnotes/webnotes/sample/sample_header.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- sample_header.php 1 Oct 2002 06:51:45 -0000 1.1
+++ sample_header.php 1 Oct 2002 12:30:09 -0000 1.2
@@ -4,42 +4,21 @@
<?php
require_once("../core/api.php"); # replace with actual path
pwn_head();
+ print_css_link( dirname( __FILE__ ) . DIRECTORY_SEPARATOR . 'sample.css' );
?>
</head>
<body>
-<table summary="" cellspacing="0" cellpadding="10">
+<table class="layout" summary="" cellspacing="0">
<tr>
-<td colspan="2" bgcolor="#d0d0d0"><h1>Webopedia Manual</h1></td>
+<td class="title" colspan="2"><h1>Webopedia Manual</h1></td>
</tr>
<tr>
-<td colspan="2" bgcolor="#e0e0e0" align="right">search functionality should go here.</td>
+<td class="search" colspan="2">search functionality should go here.</td>
</tr>
<tr valign="top">
-<td width="200" bgcolor="#f0f0f0">
-<br /><br />
+<td class="side" width="200">
<?php
- $page_top = 'Webopedia';
-
- if ( $page != $page_top ) {
- $link = pwn_page_get_link( $page_top );
- echo "<p><a href=\"$link\">$page_top</a></p>\n";
- }
-
- if ( ( $page_parent != null ) && ( $page_parent != $page_top ) ) {
- echo "<hr />\n";
- $link = pwn_page_get_link( $page_parent );
- echo "<p><a href=\"$link\">$page_parent</a></p>";
- }
-
- $siblings = pwn_page_get_siblings_array( $page );
- if ( count( $siblings ) > 0 ) {
- echo "<hr />\n";
-
- foreach( $siblings as $sibling ) {
- $link = pwn_page_get_link( $sibling );
- echo "<a href=\"$link\">$sibling</a><br />";
- }
- }
+ pwn_index( $page, 'Webopedia', $page_parent );
?>
</td>
-<td>
\ No newline at end of file
+<td class="body">
\ No newline at end of file
Index: webopedia.php
===================================================================
RCS file: /cvsroot/webnotes/webnotes/sample/webopedia.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- webopedia.php 1 Oct 2002 06:51:45 -0000 1.1
+++ webopedia.php 1 Oct 2002 12:30:09 -0000 1.2
@@ -12,7 +12,7 @@
$page = 'Webopedia';
$page_parent = null;
$page_prev = null;
- $page_next = 'XML';
+ $page_next = 'Markup Languages';
include( dirname( __FILE__ ) . DIRECTORY_SEPARATOR . 'sample_header.php' );
?>
Index: xhtml.php
===================================================================
RCS file: /cvsroot/webnotes/webnotes/sample/xhtml.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- xhtml.php 1 Oct 2002 06:51:45 -0000 1.5
+++ xhtml.php 1 Oct 2002 12:30:09 -0000 1.6
@@ -10,9 +10,9 @@
$page_title = 'XHTML';
$page = 'XHTML';
- $page_parent = 'Webopedia';
- $page_prev = 'XML';
- $page_next = 'Web Services';
+ $page_parent = 'Markup Languages';
+ $page_prev = 'Markup Languages';
+ $page_next = 'XML';
include( dirname( __FILE__ ) . DIRECTORY_SEPARATOR . 'sample_header.php' );
?>
Index: xml.php
===================================================================
RCS file: /cvsroot/webnotes/webnotes/sample/xml.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- xml.php 1 Oct 2002 06:51:45 -0000 1.9
+++ xml.php 1 Oct 2002 12:30:09 -0000 1.10
@@ -10,9 +10,9 @@
$page_title = 'XML';
$page = 'XML';
- $page_parent = 'Webopedia';
- $page_prev = 'Webopedia';
- $page_next = 'XHTML';
+ $page_parent = 'Markup Languages';
+ $page_prev = 'XHTML';
+ $page_next = 'Web Services';
include( dirname( __FILE__ ) . DIRECTORY_SEPARATOR . 'sample_header.php' );
?>
|
|
From: <vb...@us...> - 2002-10-01 12:30:12
|
Update of /cvsroot/webnotes/webnotes/core
In directory usw-pr-cvs1:/tmp/cvs-serv14356/core
Modified Files:
html_api.php pwn_api.php
Log Message:
- Added an extra level in the samples to demonstrate the parent page link. Now the manual has Webopedia > Markup Languages > XML / XHTML
- Added a style sheet in the sample to enhance the look.
- Moved some code from the sample_header.php to pwn_api.php.
- Added some extra images that are used as part of phpnet in the manual look.
Index: html_api.php
===================================================================
RCS file: /cvsroot/webnotes/webnotes/core/html_api.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- html_api.php 1 Oct 2002 03:38:28 -0000 1.15
+++ html_api.php 1 Oct 2002 12:30:09 -0000 1.16
@@ -125,7 +125,7 @@
echo '<div class="spacer"></div>';
}
### --------------------
- function print_admin_menu() {
+ function print_admin_menu( $p_add_space = true ) {
global $g_logout, $g_admin_index_files, $g_admin_change_password,
$g_admin_manage_notes, $g_admin_manage_users,
$s_logout_link, $s_index_files, $s_change_password,
Index: pwn_api.php
===================================================================
RCS file: /cvsroot/webnotes/webnotes/core/pwn_api.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- pwn_api.php 1 Oct 2002 06:51:45 -0000 1.5
+++ pwn_api.php 1 Oct 2002 12:30:09 -0000 1.6
@@ -53,7 +53,8 @@
$query = "SELECT page
FROM " . config_get( 'phpWN_page_table' ) . "
- WHERE ( parent_id = $t_parent_id ) AND ( id <> $t_id )";
+ WHERE ( parent_id = $t_parent_id )
+ ORDER BY page ASC";
$result = db_query( $query );
$t_pages_array = array();
@@ -64,4 +65,42 @@
return $t_pages_array;
}
### --------------------
+ function pwn_index( $p_page, $p_page_top, $p_page_parent ) {
+ $images = dirname( dirname( __FILE__ ) ) . DIRECTORY_SEPARATOR . 'themes' .
+ DIRECTORY_SEPARATOR . config_get( 'theme' ) . DIRECTORY_SEPARATOR .
+ 'images' . DIRECTORY_SEPARATOR;
+
+ $image_top = $images . 'caret_top.gif';
+ $image_up = $images . 'caret_up.gif';
+ $image_sibling = $images . 'bullet_sibling.gif';
+ $image_current = $images . 'bullet_current.gif';
+
+ if ( $p_page != $p_page_top ) {
+ $link = pwn_page_get_link( $p_page_top );
+ echo "<a href=\"$link\"><img class=\"bullet\" src=\"$image_top\" alt=\"$p_page_top\" />$p_page_top</a><br />\n";
+ }
+
+ if ( ( $p_page_parent != null ) && ( $p_page_parent != $p_page_top ) ) {
+ echo "<hr noshade=\"noshade\" />\n";
+ $link = pwn_page_get_link( $p_page_parent );
+ echo "<a href=\"$link\"><img class=\"bullet\" src=\"$image_up\" alt=\"$p_page_parent\" />$p_page_parent</a><br />";
+ }
+
+ $siblings = pwn_page_get_siblings_array( $p_page );
+ if ( count( $siblings ) > 0 ) {
+ echo "<small>";
+
+ foreach( $siblings as $sibling ) {
+ if ( $sibling == $p_page ) {
+ $bullet = $image_current;
+ } else {
+ $bullet = $image_sibling;
+ }
+ $link = pwn_page_get_link( $sibling );
+ echo "<a href=\"$link\"><img class=\"bullet\" src=\"$bullet\" alt=\"$sibling\" />$sibling</a><br />";
+ }
+
+ echo "</small>";
+ }
+ }
?>
|
|
From: <vb...@us...> - 2002-10-01 06:51:49
|
Update of /cvsroot/webnotes/webnotes/themes/phpnet
In directory usw-pr-cvs1:/tmp/cvs-serv14883/themes/phpnet
Modified Files:
theme_api.php
Log Message:
- Fixed a problem with page_update_neighbours, where neighbours were only
updated if both prev/next are changed, rather than if only one changed.
- Added parent_id field to the page table in the database.
- Update neighbours currently defaults the prev/next/parent to the database
value if null is passed, rather than replacing it with 0. Any empty string
should be used to highlight the fact that there is no prev/next/parent. Or if
it was never set, then null would work.
- Dropped a redundant index (id) in the pages table.
- Dropped a redundant index (id) in the notes table.
- Removed an extra </table> in case of pages without notes (phpnet theme).
- Implemented the first version of the php-like manual and added the necessary.
Index: theme_api.php
===================================================================
RCS file: /cvsroot/webnotes/webnotes/themes/phpnet/theme_api.php,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- theme_api.php 26 Sep 2002 06:55:05 -0000 1.27
+++ theme_api.php 1 Oct 2002 06:51:46 -0000 1.28
@@ -81,7 +81,6 @@
<tr class="light">
<td colspan="2">There are no user contributed notes for this page.</td>
</tr>
- </table>
EOT;
} else {
for ( $i = 0; $i < count( $t_notes ); $i++ ) {
|
|
From: <vb...@us...> - 2002-10-01 06:51:49
|
Update of /cvsroot/webnotes/webnotes/sql In directory usw-pr-cvs1:/tmp/cvs-serv14883/sql Modified Files: db_upgrade.sql Log Message: - Fixed a problem with page_update_neighbours, where neighbours were only updated if both prev/next are changed, rather than if only one changed. - Added parent_id field to the page table in the database. - Update neighbours currently defaults the prev/next/parent to the database value if null is passed, rather than replacing it with 0. Any empty string should be used to highlight the fact that there is no prev/next/parent. Or if it was never set, then null would work. - Dropped a redundant index (id) in the pages table. - Dropped a redundant index (id) in the notes table. - Removed an extra </table> in case of pages without notes (phpnet theme). - Implemented the first version of the php-like manual and added the necessary. Index: db_upgrade.sql =================================================================== RCS file: /cvsroot/webnotes/webnotes/sql/db_upgrade.sql,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- db_upgrade.sql 22 Sep 2002 02:47:16 -0000 1.6 +++ db_upgrade.sql 1 Oct 2002 06:51:45 -0000 1.7 @@ -3,4 +3,8 @@ ALTER TABLE `phpWN_page_table` ADD `url` VARCHAR( 255 ) NOT NULL ; ALTER TABLE `phpWN_page_table` ADD `prev_id` INT( 10 ) UNSIGNED ZEROFILL NOT NULL ; ALTER TABLE `phpWN_page_table` ADD `next_id` INT( 10 ) UNSIGNED ZEROFILL NOT NULL ; -ALTER TABLE `phpWN_page_table` ADD `last_updated` DATETIME NOT NULL AFTER `date_indexed` ; \ No newline at end of file +ALTER TABLE `phpWN_page_table` ADD `last_updated` DATETIME NOT NULL AFTER `date_indexed` ; +ALTER TABLE `phpWN_page_table` ADD `parent_id` INT( 10 ) UNSIGNED ZEROFILL NOT NULL AFTER `url` ; +ALTER TABLE `phpWN_page_table` ADD INDEX ( `parent_id` ) ; +ALTER TABLE `phpWN_page_table` DROP INDEX `id` ; +ALTER TABLE `phpWN_note_table` DROP INDEX `id` ; |
|
From: <vb...@us...> - 2002-10-01 06:51:49
|
Update of /cvsroot/webnotes/webnotes/sample In directory usw-pr-cvs1:/tmp/cvs-serv14883/sample Modified Files: webservices.php xhtml.php xml.php Added Files: sample_footer.php sample_header.php webopedia.php Log Message: - Fixed a problem with page_update_neighbours, where neighbours were only updated if both prev/next are changed, rather than if only one changed. - Added parent_id field to the page table in the database. - Update neighbours currently defaults the prev/next/parent to the database value if null is passed, rather than replacing it with 0. Any empty string should be used to highlight the fact that there is no prev/next/parent. Or if it was never set, then null would work. - Dropped a redundant index (id) in the pages table. - Dropped a redundant index (id) in the notes table. - Removed an extra </table> in case of pages without notes (phpnet theme). - Implemented the first version of the php-like manual and added the necessary. --- NEW FILE: sample_footer.php --- <?php pwn_body( $page, $PHP_SELF, $page_prev, $page_next, $page_parent ); ?> </td></tr></table> <p><a href="http://sourceforge.net/projects/webnotes/"><img src="http://sourceforge.net/sflogo.php?group_id=15381&type=5" width="140" height="42" border="0" alt="phpWebNotes @ SourceForge" /></a></p> </body> </html> --- NEW FILE: sample_header.php --- <html> <head> <title><?php echo $page_title ?></title> <?php require_once("../core/api.php"); # replace with actual path pwn_head(); ?> </head> <body> <table summary="" cellspacing="0" cellpadding="10"> <tr> <td colspan="2" bgcolor="#d0d0d0"><h1>Webopedia Manual</h1></td> </tr> <tr> <td colspan="2" bgcolor="#e0e0e0" align="right">search functionality should go here.</td> </tr> <tr valign="top"> <td width="200" bgcolor="#f0f0f0"> <br /><br /> <?php $page_top = 'Webopedia'; if ( $page != $page_top ) { $link = pwn_page_get_link( $page_top ); echo "<p><a href=\"$link\">$page_top</a></p>\n"; } if ( ( $page_parent != null ) && ( $page_parent != $page_top ) ) { echo "<hr />\n"; $link = pwn_page_get_link( $page_parent ); echo "<p><a href=\"$link\">$page_parent</a></p>"; } $siblings = pwn_page_get_siblings_array( $page ); if ( count( $siblings ) > 0 ) { echo "<hr />\n"; foreach( $siblings as $sibling ) { $link = pwn_page_get_link( $sibling ); echo "<a href=\"$link\">$sibling</a><br />"; } } ?> </td> <td> --- NEW FILE: webopedia.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: webopedia.php,v 1.1 2002/10/01 06:51:45 vboctor Exp $ # -------------------------------------------------------- $page_title = 'Webopedia'; $page = 'Webopedia'; $page_parent = null; $page_prev = null; $page_next = 'XML'; include( dirname( __FILE__ ) . DIRECTORY_SEPARATOR . 'sample_header.php' ); ?> <h1>Webopedia</h1> <p>This is a sample document that contains multiple pages. Each page can have its own notes. Pages are linked together through previous/next nagivation, as well as the top, parent, and siblings on the left side.</p> <p>The contents of the pages lists in this document is copied from <a href="http://www.webopedia.com">Webopedia</a> to serve as a sample.</p> <?php include( dirname( __FILE__ ) . DIRECTORY_SEPARATOR . 'sample_footer.php' ); ?> Index: webservices.php =================================================================== RCS file: /cvsroot/webnotes/webnotes/sample/webservices.php,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- webservices.php 26 Sep 2002 06:55:05 -0000 1.8 +++ webservices.php 1 Oct 2002 06:51:45 -0000 1.9 @@ -7,16 +7,15 @@ # -------------------------------------------------------- # $Id$ # -------------------------------------------------------- + + $page_title = 'Web Services'; + $page = 'Web Services'; + $page_parent = 'Webopedia'; + $page_prev = 'XHTML'; + $page_next = null; + + include( dirname( __FILE__ ) . DIRECTORY_SEPARATOR . 'sample_header.php' ); ?> -<html> - <head> - <title>Web services (from Webopedia)</title> - <?php - require_once("../core/api.php"); # replace with actual path - pwn_head(); - ?> - </head> - <body> <h1>Web services</h1> <p>The term Web services describes a standardized way of integrating Web-based applications using the XML, SOAP, WSDL and UDDI open standards over an Internet protocol backbone. XML is used to tag the data, SOAP is used to transfer the data, WSDL is used for describing the services available and UDDI is used for listing what services are available. Used primarily as a means for businesses to communicate with each other and with clients, Web services allow organizations to communicate data without intimate knowledge of each other's IT systems behind the firewall.</p> @@ -29,10 +28,6 @@ <p>Web services are sometimes called application services.</p> <p>The above definition was copied from <a href="http://www.webopedia.com">Webopedia</a>.</p> - - <?php pwn_body( 'Web Services', $PHP_SELF, 'XHTML', null ); ?> - - <p> - <a href="http://sourceforge.net/projects/webnotes/"><img src="http://sourceforge.net/sflogo.php?group_id=15381&type=5" width="140" height="42" border="0" alt="phpWebNotes @ SourceForge" /></a></p> - </body> -</html> +<?php + include( dirname( __FILE__ ) . DIRECTORY_SEPARATOR . 'sample_footer.php' ); +?> Index: xhtml.php =================================================================== RCS file: /cvsroot/webnotes/webnotes/sample/xhtml.php,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- xhtml.php 26 Sep 2002 06:55:05 -0000 1.4 +++ xhtml.php 1 Oct 2002 06:51:45 -0000 1.5 @@ -1,12 +1,21 @@ -<html> -<head> -<title>XHTML</title> - <?php - require_once("../core/api.php"); # replace with actual path - pwn_head(); - ?> -</head> -<body> +<?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$ + # -------------------------------------------------------- + + $page_title = 'XHTML'; + $page = 'XHTML'; + $page_parent = 'Webopedia'; + $page_prev = 'XML'; + $page_next = 'Web Services'; + + include( dirname( __FILE__ ) . DIRECTORY_SEPARATOR . 'sample_header.php' ); +?> <h1>XHTML</h1> <p>Short for Extensible Hypertext Markup Language, a hybrid between HTML and XML specifically designed for Net device displays.</p> <p>XHTML is a markup language written in XML; therefore, it is an XML application.</p> @@ -15,8 +24,6 @@ <p>When applied to Net devices, XHTML must go through a modularization process. This enables XHTML pages to be read by many different platforms.</p> <p>A device designer, using standard building blocks, will specify which elements are supported. Content creators will then target these building blocks--or modules.</p> <p>Because these modules conform to certain standards, XHTML's extensibility ensures that layout and presentation stay true-to-form over any platform.</p> - <?php pwn_body( 'XHTML', $PHP_SELF, 'XML', 'Web Services' ); ?> - <p> - <a href="http://sourceforge.net/projects/webnotes/"><img src="http://sourceforge.net/sflogo.php?group_id=15381&type=5" width="140" height="42" border="0" alt="phpWebNotes @ SourceForge" /></a></p> -</body> -</html> +<?php + include( dirname( __FILE__ ) . DIRECTORY_SEPARATOR . 'sample_footer.php' ); +?> Index: xml.php =================================================================== RCS file: /cvsroot/webnotes/webnotes/sample/xml.php,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- xml.php 26 Sep 2002 06:55:05 -0000 1.8 +++ xml.php 1 Oct 2002 06:51:45 -0000 1.9 @@ -7,24 +7,21 @@ # -------------------------------------------------------- # $Id$ # -------------------------------------------------------- + + $page_title = 'XML'; + $page = 'XML'; + $page_parent = 'Webopedia'; + $page_prev = 'Webopedia'; + $page_next = 'XHTML'; + + include( dirname( __FILE__ ) . DIRECTORY_SEPARATOR . 'sample_header.php' ); ?> -<html> - <head> - <title>XML (from Webopedia)</title> - <?php - require_once("../core/api.php"); # replace with actual path - pwn_head(); - ?> - </head> - <body> <h1>XML</h1> <p>Short for Extensible Markup Language, a specification developed by the W3C. XML is a pared-down version of SGML, designed especially for Web documents. It allows designers to create their own customized tags, enabling the definition, transmission, validation, and interpretation of data between applications and between organizations.</p> <p>The above definition was copied from <a href="http://www.webopedia.com">Webopedia</a>.</p> - <?php pwn_body( 'XML', $PHP_SELF, null, 'XHTML' ); ?> - <p> - <a href="http://sourceforge.net/projects/webnotes/"><img src="http://sourceforge.net/sflogo.php?group_id=15381&type=5" width="140" height="42" border="0" alt="phpWebNotes @ SourceForge" /></a></p> - </body> -</html> +<?php + include( dirname( __FILE__ ) . DIRECTORY_SEPARATOR . 'sample_footer.php' ); +?> |
|
From: <vb...@us...> - 2002-10-01 06:51:49
|
Update of /cvsroot/webnotes/webnotes/core
In directory usw-pr-cvs1:/tmp/cvs-serv14883/core
Modified Files:
page_api.php pwn_api.php
Log Message:
- Fixed a problem with page_update_neighbours, where neighbours were only
updated if both prev/next are changed, rather than if only one changed.
- Added parent_id field to the page table in the database.
- Update neighbours currently defaults the prev/next/parent to the database
value if null is passed, rather than replacing it with 0. Any empty string
should be used to highlight the fact that there is no prev/next/parent. Or if
it was never set, then null would work.
- Dropped a redundant index (id) in the pages table.
- Dropped a redundant index (id) in the notes table.
- Removed an extra </table> in case of pages without notes (phpnet theme).
- Implemented the first version of the php-like manual and added the necessary.
Index: page_api.php
===================================================================
RCS file: /cvsroot/webnotes/webnotes/core/page_api.php,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- page_api.php 26 Sep 2002 03:41:46 -0000 1.18
+++ page_api.php 1 Oct 2002 06:51:45 -0000 1.19
@@ -137,8 +137,8 @@
page_touch( $p_page_id );
}
### --------------------
- function page_update_neighbours( $p_page_id, $p_prev, $p_next ) {
- if ( ( null === $p_prev ) && ( null === $p_next ) ) {
+ function page_update_neighbours( $p_page_id, $p_prev, $p_next, $p_parent ) {
+ if ( ( null === $p_prev ) && ( null === $p_next ) && ( null === $p_parent ) ) {
return;
}
@@ -147,8 +147,17 @@
return;
}
+ if ( null === $p_parent ) {
+ $t_parent_id = $t_page_info['parent_id'];
+ } else {
+ $t_parent_id = page_get_id( $p_parent );
+ if ( false === page_valid_id( $t_parent_id ) ) {
+ $t_parent_id = 0;
+ }
+ }
+
if ( null === $p_prev ) {
- $t_prev_id = 0;
+ $t_prev_id = $t_page_info['prev_id'];
} else {
$t_prev_id = page_get_id( $p_prev );
if ( false === page_valid_id( $t_prev_id ) ) {
@@ -157,7 +166,7 @@
}
if ( null === $p_next ) {
- $t_next_id = 0;
+ $t_next_id = $t_page_info['next_id'];
} else {
$t_next_id = page_get_id( $p_next );
if ( false === page_valid_id( $t_next_id ) ) {
@@ -166,14 +175,16 @@
}
# If the information is the same, then don't update/touch.
- if ( ( $t_prev_id == $t_page_info['prev_id'] ) || ( $t_next_id == $t_page_info['next_id'] ) ) {
+ if ( ( $t_parent_id == $t_page_info['parent_id'] ) &&
+ ( $t_prev_id == $t_page_info['prev_id'] ) &&
+ ( $t_next_id == $t_page_info['next_id'] ) ) {
return;
}
$c_page_id = db_prepare_int( $p_page_id );
-
+
$query = "UPDATE " . config_get( 'phpWN_page_table' ) . "
- SET prev_id=$t_prev_id, next_id=$t_next_id
+ SET parent_id=$t_parent_id, prev_id=$t_prev_id, next_id=$t_next_id
WHERE id=$c_page_id LIMIT 1";
$result = db_query( $query );
page_touch( $p_page_id );
Index: pwn_api.php
===================================================================
RCS file: /cvsroot/webnotes/webnotes/core/pwn_api.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- pwn_api.php 22 Sep 2002 02:47:16 -0000 1.4
+++ pwn_api.php 1 Oct 2002 06:51:45 -0000 1.5
@@ -10,18 +10,17 @@
### --------------------
function pwn_head() {
- global $g_meta_inc_file, $g_css_inc_file;
- print_meta_inc( $g_meta_inc_file );
- print_css( $g_css_inc_file );
+ print_meta_inc( config_get( 'meta_inc_file' ) );
+ print_css( config_get( 'css_inc_file' ) );
theme_head();
}
### --------------------
- function pwn_body( $p_page, $p_url, $p_prev_page = null, $p_next_page = null ) {
+ function pwn_body( $p_page, $p_url, $p_prev_page = null, $p_next_page = null, $p_parent_page = null ) {
$t_page_id = page_get_id( $p_page );
if ( !page_valid_id( $t_page_id ) ) {
if ( ON === config_get( 'auto_index_pages' ) ) {
if ( page_add( $p_page ) ) {
- pwn_body( $p_page, $p_url, $p_prev_page, $p_next_page );
+ pwn_body( $p_page, $p_url, $p_prev_page, $p_next_page, $p_parent_page );
return;
}
}
@@ -29,10 +28,40 @@
theme_body ( false );
} else {
page_update_url( $t_page_id, $p_url );
- page_update_neighbours( $t_page_id, $p_prev_page, $p_next_page );
+ page_update_neighbours( $t_page_id, $p_prev_page, $p_next_page, $p_parent_page );
$page_data = page_prepare_theme_data( $t_page_id );
theme_body ( $page_data );
}
+ }
+ ### --------------------
+ function pwn_page_get_link( $p_page ) {
+ return ( page_get_info( page_where_page_equals( $p_page ), 'url' ) );
+ }
+ ### --------------------
+ function pwn_page_get_siblings_array( $p_page ) {
+ $t_page_info = page_get_info( page_where_page_equals( $p_page ) );
+ if ( false === $t_page_info ) {
+ return array();
+ }
+
+ $t_parent_id = $t_page_info['parent_id'];
+ if ( 0 == $t_parent_id ) {
+ return array();
+ }
+
+ $t_id = $t_page_info['id'];
+
+ $query = "SELECT page
+ FROM " . config_get( 'phpWN_page_table' ) . "
+ WHERE ( parent_id = $t_parent_id ) AND ( id <> $t_id )";
+ $result = db_query( $query );
+
+ $t_pages_array = array();
+ while ( $row = db_fetch_array( $result ) ) {
+ $t_pages_array[] = $row['page'];
+ }
+
+ return $t_pages_array;
}
### --------------------
?>
|
|
From: <vb...@us...> - 2002-10-01 03:38:31
|
Update of /cvsroot/webnotes/webnotes/core
In directory usw-pr-cvs1:/tmp/cvs-serv6897/core
Modified Files:
enum_api.php html_api.php
Log Message:
- Fixed the access level option list in order not to disable ANYBODY /
EVERYBODY.
- Change the implementation of the access levels option list in order to make it
depend on the enumeration, rather than hard coding it.
- Changed the title of the add user to "Add User" rather than "Update User"
Index: enum_api.php
===================================================================
RCS file: /cvsroot/webnotes/webnotes/core/enum_api.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- enum_api.php 18 Sep 2002 12:33:31 -0000 1.1
+++ enum_api.php 1 Oct 2002 03:38:28 -0000 1.2
@@ -50,4 +50,19 @@
}
return '@null@';
}
+ # --------------------
+ # Get enum ids (returns an array of all ids in an enumeration)
+ function enum_get_ids_array( $p_enum_name ) {
+ $config_var = config_get( $p_enum_name . '_enum_string' );
+
+ # use the global enum string to search
+ $ids = array();
+ $t_arr = enum_explode_string( $config_var );
+ for ( $i = 0; $i < count($t_arr); $i++ ) {
+ $elem_arr = enum_explode_array( $t_arr[$i] );
+ $ids[] = $elem_arr[0];
+ }
+
+ return $ids;
+ }
?>
Index: html_api.php
===================================================================
RCS file: /cvsroot/webnotes/webnotes/core/html_api.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- html_api.php 1 Oct 2002 03:06:22 -0000 1.14
+++ html_api.php 1 Oct 2002 03:38:28 -0000 1.15
@@ -165,24 +165,17 @@
}
### --------------------
function html_option_list_access_level( $p_access_level = '' ) {
- echo '<option value="'.EVERYBODY.'" ';
- check_selected( $p_access_level, EVERYBODY );
- echo '>everybody</option>';
- echo '<option value="'.ANONYMOUS.'" ';
- check_selected( $p_access_level, ANONYMOUS );
- echo '>anonymous</option>';
- echo '<option value="'.REGISTERED.'" ';
- check_selected( $p_access_level, REGISTERED );
- echo '>registered</option>';
- echo '<option value="'.MODERATOR.'" ';
- check_selected( $p_access_level, MODERATOR );
- echo '>moderator</option>';
- echo '<option value="'.ADMINISTRATOR.'" ';
- check_selected( $p_access_level, ADMINISTRATOR );
- echo '>administrator</option>';
- echo '<option value="'.NOBODY.'" ';
- check_selected( $p_access_level, NOBODY );
- echo '>nobody</option>';
+ $ids = enum_get_ids_array( 'access_levels' );
+
+ foreach ( $ids as $id ) {
+ if ( ( NOBODY == $id ) || ( EVERYBODY == $id ) ) {
+ continue;
+ }
+
+ echo '<option value="' . $id . '" ';
+ check_selected( $p_access_level, $id );
+ echo '>' . enum_get_element( 'access_levels', $id ) . '</option>';
+ }
}
### --------------------
?>
|
|
From: <vb...@us...> - 2002-10-01 03:38:31
|
Update of /cvsroot/webnotes/webnotes In directory usw-pr-cvs1:/tmp/cvs-serv6897 Modified Files: admin_manage_users_add_page.php Log Message: - Fixed the access level option list in order not to disable ANYBODY / EVERYBODY. - Change the implementation of the access levels option list in order to make it depend on the enumeration, rather than hard coding it. - Changed the title of the add user to "Add User" rather than "Update User" Index: admin_manage_users_add_page.php =================================================================== RCS file: /cvsroot/webnotes/webnotes/admin_manage_users_add_page.php,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- admin_manage_users_add_page.php 1 Oct 2002 03:06:22 -0000 1.3 +++ admin_manage_users_add_page.php 1 Oct 2002 03:38:28 -0000 1.4 @@ -32,7 +32,7 @@ <table> <tr> <th colspan="2"> - Update User + Add User </th> </tr> <tr> |
|
From: <pre...@us...> - 2002-10-01 03:06:25
|
Update of /cvsroot/webnotes/webnotes/core
In directory usw-pr-cvs1:/tmp/cvs-serv32174/core
Modified Files:
html_api.php util_api.php
Log Message:
added an option list method for the access levels.
Index: html_api.php
===================================================================
RCS file: /cvsroot/webnotes/webnotes/core/html_api.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- html_api.php 29 Sep 2002 13:41:00 -0000 1.13
+++ html_api.php 1 Oct 2002 03:06:22 -0000 1.14
@@ -126,9 +126,9 @@
}
### --------------------
function print_admin_menu() {
- global $g_logout, $g_admin_index_files, $g_admin_change_password,
+ global $g_logout, $g_admin_index_files, $g_admin_change_password,
$g_admin_manage_notes, $g_admin_manage_users,
- $s_logout_link, $s_index_files, $s_change_password,
+ $s_logout_link, $s_index_files, $s_change_password,
$s_manage_notes, $s_manage_users, $g_user_home_page;
$queue_count = note_queue_count();
@@ -163,4 +163,26 @@
echo "[ <a href=\"$p_link\">$p_url_text</a> ]";
}
}
-?>
+ ### --------------------
+ function html_option_list_access_level( $p_access_level = '' ) {
+ echo '<option value="'.EVERYBODY.'" ';
+ check_selected( $p_access_level, EVERYBODY );
+ echo '>everybody</option>';
+ echo '<option value="'.ANONYMOUS.'" ';
+ check_selected( $p_access_level, ANONYMOUS );
+ echo '>anonymous</option>';
+ echo '<option value="'.REGISTERED.'" ';
+ check_selected( $p_access_level, REGISTERED );
+ echo '>registered</option>';
+ echo '<option value="'.MODERATOR.'" ';
+ check_selected( $p_access_level, MODERATOR );
+ echo '>moderator</option>';
+ echo '<option value="'.ADMINISTRATOR.'" ';
+ check_selected( $p_access_level, ADMINISTRATOR );
+ echo '>administrator</option>';
+ echo '<option value="'.NOBODY.'" ';
+ check_selected( $p_access_level, NOBODY );
+ echo '>nobody</option>';
+ }
+ ### --------------------
+?>
\ No newline at end of file
Index: util_api.php
===================================================================
RCS file: /cvsroot/webnotes/webnotes/core/util_api.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- util_api.php 11 Sep 2002 09:49:54 -0000 1.3
+++ util_api.php 1 Oct 2002 03:06:22 -0000 1.4
@@ -56,4 +56,13 @@
die; # additional output can cause problems so let's just stop output here
}
### --------------------
+ # If $p_var and $p_val are euqal to each other then we echo SELECTED
+ # This is used when we want to know if a variable indicated a certain
+ # option element is selected
+ function check_selected( $p_var, $p_val ) {
+ if ( $p_var == $p_val ) {
+ echo ' selected="selected" ';
+ }
+ }
+ ### --------------------
?>
|
