[php-blog-cvs] serendipity/include/admin personal.inc.php,1.9,1.10 users.inc.php,1.5,1.6

[Tom S. <tom...@us...>]

Update of /cvsroot/php-blog/serendipity/include/admin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18829/include/admin

Modified Files:
	personal.inc.php users.inc.php 
Log Message:
- Use a function to check for $item flags


Index: users.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/admin/users.inc.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- users.inc.php	3 Dec 2004 10:55:23 -0000	1.5
+++ users.inc.php	3 Dec 2004 16:13:36 -0000	1.6
@@ -56,8 +56,10 @@
         $config = serendipity_parseTemplate(S9Y_CONFIG_USERTEMPLATE);
         foreach($config as $category) {
             foreach ($category['items'] as $item) {
-                serendipity_set_user_var($item['var'], $_POST[$item['var']], $serendipity['POST']['user'], ($serendipity['authorid'] == $serendipity['POST']['authorid'] ? true : false));
-                if (in_array('config', $item['flags'])) {
+                if ( serendipity_checkConfigItemFlags($item, 'local') ) {
+                    serendipity_set_user_var($item['var'], $_POST[$item['var']], $serendipity['POST']['user'], ($serendipity['authorid'] == $serendipity['POST']['authorid'] ? true : false));
+                }
+                if ( serendipity_checkConfigItemFlags($item, 'configuration') ) {
                     serendipity_set_config_var($item['var'], $_POST[$item['var']], $serendipity['POST']['user']);
                 }
             }

Index: personal.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/admin/personal.inc.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- personal.inc.php	3 Dec 2004 10:55:23 -0000	1.9
+++ personal.inc.php	3 Dec 2004 16:13:36 -0000	1.10
@@ -13,8 +13,11 @@
     } else {
         foreach($config as $category) {
             foreach ($category['items'] as $item) {
-                serendipity_set_user_var($item['var'], $_POST[$item['var']], $serendipity['authorid'], true);
-                if (in_array('config', $item['flags'])) {
+                if ( serendipity_checkConfigItemFlags($item, 'local') ) {
+                    serendipity_set_user_var($item['var'], $_POST[$item['var']], $serendipity['authorid'], true);
+                }
+
+                if ( serendipity_checkConfigItemFlags($item, 'configuration') ) {
                     serendipity_set_config_var($item['var'], $_POST[$item['var']], $serendipity['authorid']);
                 }
             }