flatnuke functions.php,1.351,1.352

[Marco Segato]

Update of /cvsroot/flatnuke/flatnuke
In directory vz-cvs-3.sog:/tmp/cvs-serv28595

Modified Files:
functions.php
Log Message:
Fixed PHP Notice error on fn_constants usage

Index: functions.php
===================================================================
RCS file: /cvsroot/flatnuke/flatnuke/functions.php,v
retrieving revision 1.351
retrieving revision 1.352
diff -C2 -d -r1.351 -r1.352
*** functions.php 23 Feb 2012 20:57:36 -0000 1.351
--- functions.php 26 Feb 2012 10:41:15 -0000 1.352
***************
*** 21,26 ****

//nel caso in cui non vengano definite le costanti standard di Flatnuke
! if (!defined("_FN_VAR_DIR"))
! create_fn_constants();

/**
--- 21,25 ----

//nel caso in cui non vengano definite le costanti standard di Flatnuke
! if (!"_FN_VAR_DIR") create_fn_constants();

/**
***************
*** 31,63 ****
*/
function create_fn_constants(){
! define("_FN_MOD",get_mod());
! define("_FN_USERNAME",get_username());
! define("_FN_FILE",get_file_var());
!
! define("_FN_VAR_DIR",get_fn_dir("var"));
! define("_FN_USERS_DIR",get_fn_dir("users"));
! define("_FN_BLOCKS_DIR",get_fn_dir("blocks"));
! define("_FN_THEME_DIR",get_fn_dir("theme"));
! define("_FN_SECTIONS_DIR",get_fn_dir("sections"));
!
$userprofile = load_user_profile(_FN_USERNAME);
! define("_FN_USERPASSWORD",$userprofile['password']);
! define("_FN_USERAVATAR",$userprofile['avatar']);
!
! define("_FN_IS_ADMIN",is_admin());
! define("_FN_IS_USER",is_user());
if (_FN_IS_ADMIN or _FN_IS_USER){
! define("_FN_IS_GUEST",FALSE);
! define("_FN_USERLEVEL",$userprofile['level']);
}
else {
! define("_FN_IS_GUEST",TRUE);
! define("_FN_USERLEVEL","-1");
}
!
! define("_FN_SECT_LEVEL",getsectlevel(_FN_MOD));
! define("_FN_USER_CAN_VIEW_SECTION",user_can_view_section(_FN_MOD));
!
! define("_FN_IS_NEWS_MODERATOR",is_news_moderator(_FN_USERNAME));
}

--- 30,63 ----
*/
function create_fn_constants(){
! // flatnuke main engine
! define("_FN_MOD", get_mod());
! define("_FN_USERNAME", get_username());
! define("_FN_FILE", get_file_var());
! // flatnuke directories
! define("_FN_VAR_DIR", get_fn_dir("var"));
! define("_FN_USERS_DIR", get_fn_dir("users"));
! define("_FN_BLOCKS_DIR", get_fn_dir("blocks"));
! define("_FN_THEME_DIR", get_fn_dir("theme"));
! define("_FN_SECTIONS_DIR", get_fn_dir("sections"));
! // user profile informations
$userprofile = load_user_profile(_FN_USERNAME);
! define("_FN_USERPASSWORD", $userprofile['password']);
! define("_FN_USERAVATAR", $userprofile['avatar']);
! // user profile grants
! define("_FN_IS_ADMIN", is_admin());
! define("_FN_IS_USER", is_user());
if (_FN_IS_ADMIN or _FN_IS_USER){
! define("_FN_IS_GUEST", FALSE);
! define("_FN_USERLEVEL", $userprofile['level']);
}
else {
! define("_FN_IS_GUEST", TRUE);
! define("_FN_USERLEVEL", "-1");
}
! // sections management
! define("_FN_SECT_LEVEL", getsectlevel(_FN_MOD));
! define("_FN_USER_CAN_VIEW_SECTION", user_can_view_section(_FN_MOD));
! // news management
! define("_FN_IS_NEWS_MODERATOR", is_news_moderator(_FN_USERNAME));
}