[mxbb-commits] mx_calsnails/admin admin_calendar.php,1.13,1.14

[Jon O. <jon...@us...>]

Update of /cvsroot/mxbb/mx_calsnails/admin
In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv27752/modules/mx_calsnails/admin

Modified Files:
	admin_calendar.php 
Log Message:
Installation bug
adminCP lang keys
initialization checks

Index: admin_calendar.php
===================================================================
RCS file: /cvsroot/mxbb/mx_calsnails/admin/admin_calendar.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** admin_calendar.php	29 Jun 2006 13:39:02 -0000	1.13
--- admin_calendar.php	29 Jun 2006 22:03:21 -0000	1.14
***************
*** 18,30 ****
  }
  
! $mx_root_path = '../../../';
! $module_root_path = "../";
  $phpEx = substr(strrchr(__FILE__, '.'), 1);
  require( $mx_root_path . '/admin/pagestart.' . $phpEx );
- require( $module_root_path . 'includes/mx_common.' . $phpEx );
- 
- $caltable = CALLITE_CONFIG_TABLE;
  
  include_once( $mx_root_path . 'admin/page_header_admin.' . $phpEx );
  
  $sql = "SELECT * FROM " . $caltable;
--- 18,42 ----
  }
  
! $mx_root_path = './../../../';
! $module_root_path = "./../";
  $phpEx = substr(strrchr(__FILE__, '.'), 1);
  require( $mx_root_path . '/admin/pagestart.' . $phpEx );
  
  include_once( $mx_root_path . 'admin/page_header_admin.' . $phpEx );
+ include_once( $module_root_path . 'includes/mx_common.' . $phpEx );
+ 
+ // **********************************************************************
+ // Read language definition
+ // **********************************************************************
+ if ( !file_exists( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_admin.' . $phpEx ) )
+ {
+ 	include( $module_root_path . 'language/lang_english/lang_admin.' . $phpEx );
+ }
+ else
+ {
+ 	include( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_admin.' . $phpEx );
+ }
+ 
+ $caltable = CALLITE_CONFIG_TABLE;
  
  $sql = "SELECT * FROM " . $caltable;
***************
*** 128,132 ****
  	"L_ALLOW_ANON" => $lang['allow_anon'],
  	"L_ALLOW_USER_POST" => $lang['allow_user_post'],
! 	"L_ALLOW_ANON_DEFAULT" => $lang['allow_anon_post_default'], // MX005: added
  	"L_ALLOW_USER_DEFAULT" => $lang['allow_user_post_default'],
  	"L_ALLOW_OLD" => $lang['allow_old'],
--- 140,144 ----
  	"L_ALLOW_ANON" => $lang['allow_anon'],
  	"L_ALLOW_USER_POST" => $lang['allow_user_post'],
! 	"L_ALLOW_ANON_DEFAULT" => $lang['allow_anon_post_default'],
  	"L_ALLOW_USER_DEFAULT" => $lang['allow_user_post_default'],
  	"L_ALLOW_OLD" => $lang['allow_old'],