cvs: gd /websites/wiki/conf .htaccess dokuwiki.php msg smileys.conf

pajoye		Sun May 11 15:02:07 2008 UTC

  Modified files:              
    /gd/websites/wiki/conf	.htaccess dokuwiki.php msg smileys.conf 
  Log:
  - update to latest release
  - update conf to use ACL
  
  
http://cvs.php.net/viewvc.cgi/gd/websites/wiki/conf/.htaccess?r1=1.1&r2=1.2&diff_format=u
Index: gd/websites/wiki/conf/.htaccess
diff -u gd/websites/wiki/conf/.htaccess:1.1 gd/websites/wiki/conf/.htaccess:1.2
--- gd/websites/wiki/conf/.htaccess:1.1	Tue May  6 21:23:24 2008
+++ gd/websites/wiki/conf/.htaccess	Sun May 11 15:02:07 2008
@@ -1,3 +1,3 @@
-## no access to the conf directory
-order allow,deny
-deny from all
+## no access to the conf directory
+order allow,deny
+deny from all
http://cvs.php.net/viewvc.cgi/gd/websites/wiki/conf/dokuwiki.php?r1=1.1&r2=1.2&diff_format=u
Index: gd/websites/wiki/conf/dokuwiki.php
diff -u gd/websites/wiki/conf/dokuwiki.php:1.1 gd/websites/wiki/conf/dokuwiki.php:1.2
--- gd/websites/wiki/conf/dokuwiki.php:1.1	Tue May  6 21:23:24 2008
+++ gd/websites/wiki/conf/dokuwiki.php	Sun May 11 15:02:07 2008
@@ -25,7 +25,7 @@
 
 $conf['start']       = 'start';           //name of start page
 $conf['title']       = 'DokuWiki';        //what to show in the title
-$conf['template']    = 'libgd';         //see tpl directory
+$conf['template']    = 'default';         //see tpl directory
 $conf['fullpath']    = 0;                 //show full path of the document or relative to datadir only? 0|1
 $conf['recent']      = 20;                //how many entries to show in recent
 $conf['breadcrumbs'] = 10;                //how many recent visited pages to show
@@ -58,12 +58,12 @@
 
 /* Authentication Options - read http://www.splitbrain.org/dokuwiki/wiki:acl */
 
-$conf['useacl']      = 0;                //Use Access Control Lists to restrict access?
+$conf['useacl']      = 1;                //Use Access Control Lists to restrict access?
 $conf['autopasswd']  = 1;                //autogenerate passwords and email them to user
 $conf['authtype']    = 'plain';          //which authentication backend should be used
 $conf['passcrypt']   = 'smd5';           //Used crypt method (smd5,md5,sha1,ssha,crypt,mysql,my411)
 $conf['defaultgroup']= 'user';           //Default groups new Users are added to
-$conf['superuser']   = '!!not set!!';    //The admin can be user or @group or comma separated list user1,@group1,user2
+$conf['superuser']   = '@admin';    //The admin can be user or @group or comma separated list user1,@group1,user2
 $conf['manager']     = '!!not set!!';    //The manager can be user or @group or comma separated list user1,@group1,user2
 $conf['profileconfirm'] = '1';           //Require current password to confirm changes to user profile
 $conf['disableactions'] = '';            //comma separated list of actions to disable
http://cvs.php.net/viewvc.cgi/gd/websites/wiki/conf/msg?r1=1.1&r2=1.2&diff_format=u
Index: gd/websites/wiki/conf/msg
diff -u gd/websites/wiki/conf/msg:1.1 gd/websites/wiki/conf/msg:1.2
--- gd/websites/wiki/conf/msg:1.1	Tue May  6 21:23:24 2008
+++ gd/websites/wiki/conf/msg	Sun May 11 15:02:07 2008
@@ -1,4 +1,4 @@
-12
+14
 The first line of this file contains a number, indicating
 which notification messages should not be displayed. This
 is the only information sent to dokuwiki.org when the
http://cvs.php.net/viewvc.cgi/gd/websites/wiki/conf/smileys.conf?r1=1.1&r2=1.2&diff_format=u
Index: gd/websites/wiki/conf/smileys.conf
diff -u gd/websites/wiki/conf/smileys.conf:1.1 gd/websites/wiki/conf/smileys.conf:1.2
--- gd/websites/wiki/conf/smileys.conf:1.1	Tue May  6 21:23:24 2008
+++ gd/websites/wiki/conf/smileys.conf	Sun May 11 15:02:07 2008
@@ -1,28 +1,28 @@
-# Smileys configured here will be replaced by the
-# configured images in the smiley directory
-
-8-)         icon_cool.gif
-8-O         icon_eek.gif
-8-o         icon_eek.gif
-:-(         icon_sad.gif
-:-)         icon_smile.gif
-=)          icon_smile2.gif
-:-/         icon_doubt.gif
-:-\         icon_doubt2.gif
-:-?         icon_confused.gif
-:-D         icon_biggrin.gif
-:-P         icon_razz.gif
-:-o         icon_surprised.gif
-:-O         icon_surprised.gif
-:-x         icon_silenced.gif
-:-X         icon_silenced.gif
-:-|         icon_neutral.gif
-;-)         icon_wink.gif
-^_^         icon_fun.gif
-:?:         icon_question.gif
-:!:         icon_exclaim.gif
-LOL         icon_lol.gif
-FIXME       fixme.gif
-DELETEME    delete.gif
-
-#;<P         icon_kaddi.gif
+# Smileys configured here will be replaced by the
+# configured images in the smiley directory
+
+8-)         icon_cool.gif
+8-O         icon_eek.gif
+8-o         icon_eek.gif
+:-(         icon_sad.gif
+:-)         icon_smile.gif
+=)          icon_smile2.gif
+:-/         icon_doubt.gif
+:-\         icon_doubt2.gif
+:-?         icon_confused.gif
+:-D         icon_biggrin.gif
+:-P         icon_razz.gif
+:-o         icon_surprised.gif
+:-O         icon_surprised.gif
+:-x         icon_silenced.gif
+:-X         icon_silenced.gif
+:-|         icon_neutral.gif
+;-)         icon_wink.gif
+^_^         icon_fun.gif
+:?:         icon_question.gif
+:!:         icon_exclaim.gif
+LOL         icon_lol.gif
+FIXME       fixme.gif
+DELETEME    delete.gif
+
+#;<P         icon_kaddi.gif