[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: wiki config.php,1.6,1.7 index.php,1.4,1.5
From: |
Ralf Becker <address@hidden> |
Subject: |
[Phpgroupware-cvs] CVS: wiki config.php,1.6,1.7 index.php,1.4,1.5 |
Date: |
Thu, 06 Mar 2003 19:19:18 -0500 |
Update of /cvsroot/phpgroupware/wiki
In directory subversions:/tmp/cvs-serv22386
Modified Files:
config.php index.php
Log Message:
some new features and some fixes
- wiki is now configurable to run anonymous, access can be restricted to ro
- admin's are always able to edit a page
- fixed blocking of hosts
Index: config.php
===================================================================
RCS file: /cvsroot/phpgroupware/wiki/config.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** config.php 6 Mar 2003 17:38:13 -0000 1.6
--- config.php 7 Mar 2003 00:19:11 -0000 1.7
***************
*** 7,10 ****
--- 7,22 ----
// over-ride those in lib/defaults.php.
+ /*
+ to allow anonymous access to the wiki, you have to ancomment one of the
next lines
+ AND create a user/passwd with access to the wiki-app.
+ */
+ //define('AnonymousSession','readonly'); // anonymouns access is always
readonly
+ //define('AnonymousSession','editable'); // full anonymous access (still
no admin)
+ /*
+ If the username and passwd is not 'anonymouse' you have to change to
following lines:
+ */
+ define('AnonymousUser','anonymous');
+ define('AnonymousPasswd','anonymous');
+
// $Admin specifies the administrator e-mail address used in error messages.
$Admin = 'address@hidden';
***************
*** 12,16 ****
// $WikiName determines the name of your wiki. This name is used in the
// browser title bar. Often, it will be the same as $HomePage.
! $WikiName = 'PhpGroupWare';
// $HomePage determines the "main" page of your wiki. If browsers do not ask
--- 24,29 ----
// $WikiName determines the name of your wiki. This name is used in the
// browser title bar. Often, it will be the same as $HomePage.
! //$WikiName = 'PhpGroupWare';
! # not used under phpGroupWare
// $HomePage determines the "main" page of your wiki. If browsers do not ask
***************
*** 45,49 ****
// $WikiLogo determines the location of your wiki logo.
! $WikiLogo = $GLOBALS['phpgw']->common->find_image('wiki','navbar.gif');
// $MetaKeywords indicates what keywords to report on the meta-keywords tag.
--- 58,63 ----
// $WikiLogo determines the location of your wiki logo.
! //$WikiLogo = $GLOBALS['phpgw']->common->find_image('wiki','navbar.gif');
! # this is not configurable for phpgw
// $MetaKeywords indicates what keywords to report on the meta-keywords tag.
***************
*** 68,71 ****
// If $AdminEnabled is set to 0, administrator control will be disallowed.
# this is not used in phpGW, only phpGW admins have admin-rights
-
?>
--- 82,84 ----
Index: index.php
===================================================================
RCS file: /cvsroot/phpgroupware/wiki/index.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** index.php 4 Mar 2003 18:06:10 -0000 1.4
--- index.php 7 Mar 2003 00:19:11 -0000 1.5
***************
*** 1,42 ****
<?php
// $Id$
$action = $HTTP_GET_VARS['action'];
switch ($action) {
case 'edit':
- $phpgw_info["flags"] = array ("currentapp" => "wiki",
-
"enable_nextmatchs_class" => True );
$GLOBALS['phpgw_info']['cursor_focus'] =
"document.editform.document.focus();";
break;
case 'save':
! if ($HTTP_POST_VARS['Preview'] == 'Preview') {
! $phpgw_info["flags"] = array ("currentapp" =>
"wiki",
!
"enable_nextmatchs_class" => True );
! $GLOBALS['phpgw_info']['cursor_focus'] =
"document.editform.document.focus();";
! } else {
! $phpgw_info["flags"] = array ("currentapp" =>
"wiki",
!
"enable_nextmatchs_class" => True,
! "noheader" => True );
! $GLOBALS['phpgw_info']['cursor_focus'] =
"document.thesearch.find.focus();";
! }
! break;
! case 'prefs':
! if (empty($Save)) {
! $phpgw_info["flags"] = array ("currentapp" =>
"wiki",
!
"enable_nextmatchs_class" => True );
! } else {
! $phpgw_info["flags"] = array ("currentapp" =>
"wiki",
!
"enable_nextmatchs_class" => True,
! "noheader" => True );
! }
! $GLOBALS['phpgw_info']['cursor_focus'] =
"document.thesearch.find.focus();";
break;
default:
- $phpgw_info["flags"] = array ("currentapp" => "wiki",
-
"enable_nextmatchs_class" => True );
$GLOBALS['phpgw_info']['cursor_focus'] =
"document.thesearch.find.focus();";
}
-
- include ("../header.inc.php"); #PHP Groupware header
require('lib/main.php');
--- 1,28 ----
<?php
// $Id$
+
+ $GLOBALS['phpgw_info']['flags'] = array(
+ 'currentapp' => 'wiki',
+ 'noheader' => True
+ );
+
+ // the phpGW header.inc.php got included later by lib/init.php
+
$action = $HTTP_GET_VARS['action'];
switch ($action) {
case 'edit':
$GLOBALS['phpgw_info']['cursor_focus'] =
"document.editform.document.focus();";
break;
case 'save':
! if ($HTTP_POST_VARS['Preview'] == 'Preview') {
! $GLOBALS['phpgw_info']['cursor_focus'] =
"document.editform.document.focus();";
! } else {
! $GLOBALS['phpgw_info']['cursor_focus'] =
"document.thesearch.find.focus();";
! }
break;
default:
$GLOBALS['phpgw_info']['cursor_focus'] =
"document.thesearch.find.focus();";
}
require('lib/main.php');
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: wiki config.php,1.6,1.7 index.php,1.4,1.5,
Ralf Becker <address@hidden> <=