Update of /cvsroot/php-blog/serendipity/include/tpl
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12869/include/tpl
Modified Files:
config_local.inc.php config_personal.inc.php
Log Message:
* Re-Introduce wysiwyg and language settings per-user - flag 'config' (sigh ;)
* Added flag 'parseDescription' to replace [USERLEVEL_ADMIN] etc. in language strings
* When managing users, fetch their personal 'config'-flag settings from the DB and not from the session of another user
Index: config_local.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/tpl/config_local.inc.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- config_local.inc.php 2 Dec 2004 20:57:46 -0000 1.1
+++ config_local.inc.php 3 Dec 2004 10:55:23 -0000 1.2
@@ -1,5 +1,6 @@
<?php # $Id$
+// Here be dragons and NO application logic!
$res = array();
$res[] = array('title' => INSTALL_CAT_DB,
Index: config_personal.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/tpl/config_personal.inc.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- config_personal.inc.php 2 Dec 2004 20:57:46 -0000 1.1
+++ config_personal.inc.php 3 Dec 2004 10:55:23 -0000 1.2
@@ -1,5 +1,7 @@
<?php # $Id$
+// Here be dragons and NO application logic!
+
$res = array();
$res[] = array('title' => USERCONF_CAT_PERSONAL,
'description' => USERCONF_CAT_PERSONAL_DESC,
@@ -22,7 +24,8 @@
'description' => USERCONF_USERLEVEL_DESC,
'type' => 'int',
'default' => USERLEVEL_EDITOR,
- 'userlevel' => USERLEVEL_CHIEF),
+ 'userlevel' => USERLEVEL_CHIEF,
+ 'flags' => array('parseDescription')),
array('var' => 'email',
'title' => USERCONF_EMAIL,
@@ -31,6 +34,20 @@
'default' => 'jo...@ex...',
'userlevel' => USERLEVEL_EDITOR),
+ array('var' => 'lang',
+ 'title' => INSTALL_LANG,
+ 'description' => INSTALL_LANG_DESC,
+ 'type' => 'list',
+ 'default' => $serendipity['languages'],
+ 'flags' => array('config')),
+
+ array('var' => 'wysiwyg',
+ 'title' => INSTALL_WYSIWYG,
+ 'description' => INSTALL_WYSIWYG_DESC,
+ 'type' => 'bool',
+ 'default' => false,
+ 'flags' => array('config')),
+
array('var' => 'mail_comments',
'title' => USERCONF_SENDCOMMENTS,
'description' => USERCONF_SENDCOMMENTS_DESC,
|
