[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: wiki/lib init.php,1.3,1.4 main.php,1.3,1.4 db.p
|
From: |
Ralf Becker <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] CVS: wiki/lib init.php,1.3,1.4 main.php,1.3,1.4 db.php,1.3,NONE page.php,1.3,NONE pagestore.php,1.3,NONE rate.php,1.3,NONE |
|
Date: |
Tue, 04 Mar 2003 15:55:18 -0500 |
Update of /cvsroot/phpgroupware/wiki/lib
In directory subversions:/tmp/cvs-serv14680/lib
Modified Files:
init.php main.php
Removed Files:
db.php page.php pagestore.php rate.php
Log Message:
moved to new sowiki class which relies completly on our db-abstraction
Index: init.php
===================================================================
RCS file: /cvsroot/phpgroupware/wiki/lib/init.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** init.php 3 Mar 2003 14:16:24 -0000 1.3
--- init.php 4 Mar 2003 20:55:15 -0000 1.4
***************
*** 8,11 ****
--- 8,12 ----
require('lib/url.php');
require('lib/messages.php');
+ /*
require('lib/pagestore.php');
require('lib/rate.php');
***************
*** 18,25 ****
$RemTbl = $DBTablePrefix . 'remote_pages';
- $FlgChr = chr(255); // Flag character for parse engine.
-
$pagestore = new PageStore();
$db = $pagestore->dbh;
$Entity = array(); // Global parser entity list.
--- 19,28 ----
$RemTbl = $DBTablePrefix . 'remote_pages';
$pagestore = new PageStore();
$db = $pagestore->dbh;
+ */
+ $pagestore = CreateObject('wiki.sowiki');
+
+ $FlgChr = chr(255); // Flag character for parse engine.
$Entity = array(); // Global parser entity list.
Index: main.php
===================================================================
RCS file: /cvsroot/phpgroupware/wiki/lib/main.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** main.php 3 Mar 2003 14:16:24 -0000 1.3
--- main.php 4 Mar 2003 20:55:15 -0000 1.4
***************
*** 1,115 ****
! <?php
! // $Id$
!
! // Harvest script parameters and other variables. We do this even if
! // register_globals=on; this way, we force the variables to be defined.
! // (Which is better form in case the admin has warnings cranked all the
! // way up).
!
! $HTTP_REFERER = isset($HTTP_SERVER_VARS['HTTP_REFERER'])
! ? $HTTP_SERVER_VARS['HTTP_REFERER'] : '';
! $QUERY_STRING = isset($HTTP_SERVER_VARS['QUERY_STRING'])
! ? $HTTP_SERVER_VARS['QUERY_STRING'] : '';
! $REMOTE_ADDR = isset($HTTP_SERVER_VARS['REMOTE_ADDR'])
! ? $HTTP_SERVER_VARS['REMOTE_ADDR'] : '';
!
! $action = isset($HTTP_GET_VARS['action'])
! ? $HTTP_GET_VARS['action'] : '';
! $page = isset($HTTP_GET_VARS['page'])
! ? $HTTP_GET_VARS['page'] : '';
! $ver1 = isset($HTTP_GET_VARS['ver1'])
! ? $HTTP_GET_VARS['ver1'] : '';
! $ver2 = isset($HTTP_GET_VARS['ver2'])
! ? $HTTP_GET_VARS['ver2'] : '';
! $find = isset($HTTP_GET_VARS['find'])
! ? $HTTP_GET_VARS['find'] : '';
! $version = isset($HTTP_GET_VARS['version'])
! ? $HTTP_GET_VARS['version'] : '';
! $full = isset($HTTP_GET_VARS['full'])
! ? $HTTP_GET_VARS['full'] : '';
! $min = isset($HTTP_GET_VARS['min'])
! ? $HTTP_GET_VARS['min'] : '';
! $days = isset($HTTP_GET_VARS['days'])
! ? $HTTP_GET_VARS['days'] : '';
!
! $Preview = isset($HTTP_POST_VARS['Preview'])
! ? $HTTP_POST_VARS['Preview'] : '';
! $Save = isset($HTTP_POST_VARS['Save'])
! ? $HTTP_POST_VARS['Save'] : '';
! $archive = isset($HTTP_POST_VARS['archive'])
! ? $HTTP_POST_VARS['archive'] : '';
! $auth = isset($HTTP_POST_VARS['auth'])
! ? $HTTP_POST_VARS['auth'] : '';
! $categories = isset($HTTP_POST_VARS['categories'])
! ? $HTTP_POST_VARS['categories'] : '';
! $cols = isset($HTTP_POST_VARS['cols'])
! ? $HTTP_POST_VARS['cols'] : '';
! $comment = isset($HTTP_POST_VARS['comment'])
! ? $HTTP_POST_VARS['comment'] : '';
! $days = isset($HTTP_POST_VARS['days'])
! ? $HTTP_POST_VARS['days'] : $days;
! $discard = isset($HTTP_POST_VARS['discard'])
! ? $HTTP_POST_VARS['discard'] : '';
! $document = isset($HTTP_POST_VARS['document'])
! ? $HTTP_POST_VARS['document'] : '';
! $hist = isset($HTTP_POST_VARS['hist'])
! ? $HTTP_POST_VARS['hist'] : '';
! $min = isset($HTTP_POST_VARS['min'])
! ? $HTTP_POST_VARS['min'] : $min;
! $nextver = isset($HTTP_POST_VARS['nextver'])
! ? $HTTP_POST_VARS['nextver'] : '';
! $rows = isset($HTTP_POST_VARS['rows'])
! ? $HTTP_POST_VARS['rows'] : '';
! $tzoff = isset($HTTP_POST_VARS['tzoff'])
! ? $HTTP_POST_VARS['tzoff'] : '';
! $user = isset($HTTP_POST_VARS['user'])
! ? $HTTP_POST_VARS['user'] : '';
! $referrer = isset($HTTP_POST_VARS['referrer'])
! ? $HTTP_POST_VARS['referrer'] : '';
!
! require('lib/init.php');
! require('parse/transforms.php');
!
! // To add an action=x behavior, add an entry to this array. First column
! // is the file to load, second is the function to call, and third is how
! // to treat it for rate-checking purposes ('view', 'edit', or 'search').
! $ActionList = array(
! 'view' => array('action/view.php', 'action_view', 'view'),
! 'edit' => array('action/edit.php', 'action_edit', 'view'),
! 'save' => array('action/save.php', 'action_save', 'edit'),
! 'diff' => array('action/diff.php', 'action_diff', 'search'),
! 'find' => array('action/find.php', 'action_find', 'search'),
! 'history' => array('action/history.php', 'action_history',
! 'search'),
! 'prefs' => array('action/prefs.php', 'action_prefs',
'view'),
! 'macro' => array('action/macro.php', 'action_macro',
'search'),
! 'rss' => array('action/rss.php', 'action_rss', 'view'),
! 'style' => array('action/style.php', 'action_style', '')
! );
!
! // Default action and page names.
! if(empty($page) && empty($action))
! { $page = $QUERY_STRING; }
! if(empty($action))
! { $action = 'view'; }
! if(empty($page))
! { $page = $HomePage; }
!
! // Confirm we have a valid page name.
! if(!validate_page($page))
! { die($ErrorInvalidPage); }
!
! // Don't let people do too many things too quickly.
! if($ActionList[$action][2] != '')
! { rateCheck($pagestore->dbh, $ActionList[$action][2]); }
!
! // Dispatch the appropriate action.
! if(!empty($ActionList[$action]))
! {
! include($ActionList[$action][0]);
! $ActionList[$action][1]();
! }
!
! // Expire old versions, etc.
! $pagestore->maintain();
! ?>
--- 1,115 ----
! <?php
! // $Id$
!
! // Harvest script parameters and other variables. We do this even if
! // register_globals=on; this way, we force the variables to be defined.
! // (Which is better form in case the admin has warnings cranked all the
! // way up).
!
! $HTTP_REFERER = isset($HTTP_SERVER_VARS['HTTP_REFERER'])
! ? $HTTP_SERVER_VARS['HTTP_REFERER'] : '';
! $QUERY_STRING = isset($HTTP_SERVER_VARS['QUERY_STRING'])
! ? $HTTP_SERVER_VARS['QUERY_STRING'] : '';
! $REMOTE_ADDR = isset($HTTP_SERVER_VARS['REMOTE_ADDR'])
! ? $HTTP_SERVER_VARS['REMOTE_ADDR'] : '';
!
! $action = isset($HTTP_GET_VARS['action'])
! ? $HTTP_GET_VARS['action'] : '';
! $page = isset($HTTP_GET_VARS['page'])
! ? $HTTP_GET_VARS['page'] : '';
! $ver1 = isset($HTTP_GET_VARS['ver1'])
! ? $HTTP_GET_VARS['ver1'] : '';
! $ver2 = isset($HTTP_GET_VARS['ver2'])
! ? $HTTP_GET_VARS['ver2'] : '';
! $find = isset($HTTP_GET_VARS['find'])
! ? $HTTP_GET_VARS['find'] : '';
! $version = isset($HTTP_GET_VARS['version'])
! ? $HTTP_GET_VARS['version'] : '';
! $full = isset($HTTP_GET_VARS['full'])
! ? $HTTP_GET_VARS['full'] : '';
! $min = isset($HTTP_GET_VARS['min'])
! ? $HTTP_GET_VARS['min'] : '';
! $days = isset($HTTP_GET_VARS['days'])
! ? $HTTP_GET_VARS['days'] : '';
!
! $Preview = isset($HTTP_POST_VARS['Preview'])
! ? $HTTP_POST_VARS['Preview'] : '';
! $Save = isset($HTTP_POST_VARS['Save'])
! ? $HTTP_POST_VARS['Save'] : '';
! $archive = isset($HTTP_POST_VARS['archive'])
! ? $HTTP_POST_VARS['archive'] : '';
! $auth = isset($HTTP_POST_VARS['auth'])
! ? $HTTP_POST_VARS['auth'] : '';
! $categories = isset($HTTP_POST_VARS['categories'])
! ? $HTTP_POST_VARS['categories'] : '';
! $cols = isset($HTTP_POST_VARS['cols'])
! ? $HTTP_POST_VARS['cols'] : '';
! $comment = isset($HTTP_POST_VARS['comment'])
! ? $HTTP_POST_VARS['comment'] : '';
! $days = isset($HTTP_POST_VARS['days'])
! ? $HTTP_POST_VARS['days'] : $days;
! $discard = isset($HTTP_POST_VARS['discard'])
! ? $HTTP_POST_VARS['discard'] : '';
! $document = isset($HTTP_POST_VARS['document'])
! ? $HTTP_POST_VARS['document'] : '';
! $hist = isset($HTTP_POST_VARS['hist'])
! ? $HTTP_POST_VARS['hist'] : '';
! $min = isset($HTTP_POST_VARS['min'])
! ? $HTTP_POST_VARS['min'] : $min;
! $nextver = isset($HTTP_POST_VARS['nextver'])
! ? $HTTP_POST_VARS['nextver'] : '';
! $rows = isset($HTTP_POST_VARS['rows'])
! ? $HTTP_POST_VARS['rows'] : '';
! $tzoff = isset($HTTP_POST_VARS['tzoff'])
! ? $HTTP_POST_VARS['tzoff'] : '';
! $user = isset($HTTP_POST_VARS['user'])
! ? $HTTP_POST_VARS['user'] : '';
! $referrer = isset($HTTP_POST_VARS['referrer'])
! ? $HTTP_POST_VARS['referrer'] : '';
!
! require('lib/init.php');
! require('parse/transforms.php');
!
! // To add an action=x behavior, add an entry to this array. First column
! // is the file to load, second is the function to call, and third is how
! // to treat it for rate-checking purposes ('view', 'edit', or 'search').
! $ActionList = array(
! 'view' => array('action/view.php', 'action_view', 'view'),
! 'edit' => array('action/edit.php', 'action_edit', 'view'),
! 'save' => array('action/save.php', 'action_save', 'edit'),
! 'diff' => array('action/diff.php', 'action_diff', 'search'),
! 'find' => array('action/find.php', 'action_find', 'search'),
! 'history' => array('action/history.php', 'action_history',
! 'search'),
! 'prefs' => array('action/prefs.php', 'action_prefs',
'view'),
! 'macro' => array('action/macro.php', 'action_macro',
'search'),
! 'rss' => array('action/rss.php', 'action_rss', 'view'),
! 'style' => array('action/style.php', 'action_style', '')
! );
!
! // Default action and page names.
! if(empty($page) && empty($action))
! { $page = $QUERY_STRING; }
! if(empty($action))
! { $action = 'view'; }
! if(empty($page))
! { $page = $HomePage; }
!
! // Confirm we have a valid page name.
! if(!validate_page($page))
! { die($ErrorInvalidPage); }
!
! // Don't let people do too many things too quickly.
! if($ActionList[$action][2] != '')
! { $pagestore->rateCheck($ActionList[$action][2],$REMOTE_ADDR); }
!
! // Dispatch the appropriate action.
! if(!empty($ActionList[$action]))
! {
! include($ActionList[$action][0]);
! $ActionList[$action][1]();
! }
!
! // Expire old versions, etc.
! $pagestore->maintain();
! ?>
--- db.php DELETED ---
--- page.php DELETED ---
--- pagestore.php DELETED ---
--- rate.php DELETED ---
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: wiki/lib init.php,1.3,1.4 main.php,1.3,1.4 db.php,1.3,NONE page.php,1.3,NONE pagestore.php,1.3,NONE rate.php,1.3,NONE,
Ralf Becker <address@hidden> <=
- Prev by Date:
[Phpgroupware-cvs] CVS: wiki/action admin.php,1.3,1.4 history.php,1.3,1.4
- Next by Date:
[Phpgroupware-cvs] CVS: wiki/parse html.php,1.3,1.4
- Previous by thread:
[Phpgroupware-cvs] CVS: wiki/action admin.php,1.3,1.4 history.php,1.3,1.4
- Next by thread:
[Phpgroupware-cvs] CVS: wiki/parse html.php,1.3,1.4
- Index(es):