[geeklog-cvs] Geeklog-1.x/public_html lib-common.php,1.648,1.649

[Aaron Blankstein]

Update of /cvsroot/geeklog/Geeklog-1.x/public_html
In directory qs1489.pair.com:/tmp/cvs-serv525/Geeklog-1.x/public_html

Modified Files:
	lib-common.php 
Log Message:
Added config class and admin UI. Also added modified install script for 
the new configuration class. 



Index: lib-common.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/lib-common.php,v
retrieving revision 1.648
retrieving revision 1.649
diff -C2 -d -r1.648 -r1.649
*** lib-common.php	19 Aug 2007 15:56:02 -0000	1.648
--- lib-common.php	29 Aug 2007 02:11:34 -0000	1.649
***************
*** 91,95 ****
  * i.e. the path should end in .../config.php
  */
! require_once( '/path/to/geeklog/config.php' );
  
  // Before we do anything else, check to ensure site is enabled
--- 91,100 ----
  * i.e. the path should end in .../config.php
  */
! require_once('siteconfig.php');
! require_once( $_CONF['path_system'] . 'classes/config.class.php'); 
! $config = config::create();
! $config->set_configfile($_CONF['path'] . 'db-config.php');
! $config->load_baseconfig();
! $_CONF =& $config->initConfig();
  
  // Before we do anything else, check to ensure site is enabled
***************
*** 2367,2370 ****
--- 2372,2388 ----
              }
          }
+ 
+         if (SEC_inGroup( 'Root' )) {
+             $url = $_CONF['site_admin_url'] . '/configuration.php';
+             $adminmenu->set_var( 'option_url', $url);
+             $adminmenu->set_var( 'option_label', $LANG01[129] );
+             $adminmenu->set_var( 'option_count', 'N/A');
+             $menu_item = $adminmenu->parse( 'item',
+                                             ( $thisUrl == $url ) ? 'current' :
+                                             'option' );
+             $link_array[$LANG01[129]] = $menu_item;
+ 
+         }
+ 
  
          // now handle submissions for plugins