[Phpcms-plugins-cvs] admin4phpCMS/modules/config config.xml,1.3,1.4 class.module_config.php,1.5,1.6
Brought to you by:
mjahn
Menu
▾
▴
[Phpcms-plugins-cvs] admin4phpCMS/modules/config config.xml,1.3,1.4 class.module_config.php,1.5,1.6
|
From: Martin J. <mj...@us...> - 2004-07-24 08:58:34
|
Update of /cvsroot/phpcms-plugins/admin4phpCMS/modules/config In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24990/modules/config Modified Files: config.xml class.module_config.php Log Message: changed some things Index: config.xml =================================================================== RCS file: /cvsroot/phpcms-plugins/admin4phpCMS/modules/config/config.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- config.xml 18 Jun 2004 15:16:59 -0000 1.3 +++ config.xml 24 Jul 2004 08:58:25 -0000 1.4 @@ -1,30 +1,34 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE framework SYSTEM "config.dtd"> -<framework> - <module id="user" name="user-service" include="class.module_user.php" class="module_user"> +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE framework SYSTEM "config.dtd"> +<framework> + <module id="user" name="user-service" include="class.module_user.php" class="module_user"> <config name="userfile" value="Auth_XML.xml" /> - <config name="permfile" value="Perm_XML.xml" /> - </module> - <module id="layout" name="layout-service" include="class.module_layout.php" class="module_layout" /> - <module id="editor" name="editor-service" include="class.module_editor.php" class="module_editor" /> - <module id="debug" name="debug-service" include="class.module_debug.php" class="module_debug" /> - <module id="filemanager" name="filemanager" include="class.module_filemanager.php" class="module_filemanager"> - <config name="startupdir" value="/" /> - <config name="editor_image" value="jpg,jpeg,png,bmp,gif" /> - <config name="editor_xml" value="xml,dtd" /> - <config name="editor_phpcms_content" value="phpcms" /> - <config name="editor_phpcms_menu" value="mnu" /> - </module> - + <config name="permfile" value="Perm_XML.xml" /> + </module> + <module id="layout" name="layout-service" include="class.module_layout.php" class="module_layout" /> + <module id="editor" name="editor-service" include="class.module_editor.php" class="module_editor" /> + <module id="debug" name="debug-service" include="class.module_debug.php" class="module_debug" /> + <module id="filemanager" name="filemanager" include="class.module_filemanager.php" class="module_filemanager"> + <config name="startupdir" value="/" /> + <config name="editor_image" value="jpg,jpeg,png,bmp,gif" /> + <config name="editor_xml" value="xml,dtd" /> + <config name="editor_phpcms_content" value="phpcms" /> + <config name="editor_phpcms_menu" value="mnu" /> + </module> + <module id="phpcms" name="phpcms" include="class.module_phpcms.php" class="module_phpcms"> + <config name="configfile" value="/cms/phpcms2412/include/default.php" /> + <config name="projectdir" value="/cms/templates/" /> + <config name="projectfileext" value="ini" /> + </module> <module id="error" name="error-service" include="class.module_error.php" class="module_error" /> - <module id="mail" name="email-service" include="class.module_mail.php" class="module_mail"> - <config name="admin-email" value="ma...@mj..." /> - <config name="from-email" value="fra...@ma..." /> - </module> - <module id="log" name="log-service" include="class.module_log.php" class="module_log"> - <config name="logfile" value="log/framework.log" /> - <config name="logrotate" /> - <config name="logrotate-days" value="2" /> - <config name="chmod" value="0606" /> - </module> + <module id="mail" name="email-service" include="class.module_mail.php" class="module_mail"> + <config name="admin-email" value="ma...@mj..." /> + <config name="from-email" value="fra...@ma..." /> + </module> + <module id="log" name="log-service" include="class.module_log.php" class="module_log"> + <config name="logfile" value="log/framework.log" /> + <config name="logrotate" /> + <config name="logrotate-days" value="2" /> + <config name="chmod" value="0606" /> + </module> </framework> \ No newline at end of file Index: class.module_config.php =================================================================== RCS file: /cvsroot/phpcms-plugins/admin4phpCMS/modules/config/class.module_config.php,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- class.module_config.php 4 Jun 2004 11:32:08 -0000 1.5 +++ class.module_config.php 24 Jul 2004 08:58:25 -0000 1.6 @@ -30,6 +30,9 @@ /* * $Log$ +* Revision 1.6 2004/07/24 08:58:25 mjahn +* changed some things +* * Revision 1.5 2004/06/04 11:32:08 mjahn * several changes * @@ -138,7 +141,15 @@ if (!isset($actiondata['module']) || !isset ($this->_config[$actiondata['module']])) { $actiondata['config'] =& $this->_config; } else { - $actiondata['config'] =& $this->_config[$actiondata['module']]; + if (!isset ($actiondata ['format']) || $actiondata ['format']=='object') { + $actiondata['config'] =& $this->_config[$actiondata['module']]; + } + if (isset ($actiondata ['format']) && $actiondata ['format']=='array') { + $num = count ($this->_config[$actiondata['module']]->children); + for ($i = 0; $i < $num; $i++) { + $actiondata['config'][$this->_config[$actiondata['module']]->children[$i]->attributes['name']] = & $this->_config[$actiondata['module']]->children[$i]->attributes['value']; + } + } } return true; } |
