From 7812574a4831ac97cbaab4a6704ea92d7fea1aa5 Mon Sep 17 00:00:00 2001 From: Daniel Berteaud Date: Wed, 23 Dec 2015 11:22:44 +0100 Subject: [PATCH] Make sure hooks are declared just one time --- .../application/config/config.php/25ProfileHook | 70 ++++++++++++---------- 1 file changed, 37 insertions(+), 33 deletions(-) diff --git a/root/etc/e-smith/templates/usr/share/limesurvey/application/config/config.php/25ProfileHook b/root/etc/e-smith/templates/usr/share/limesurvey/application/config/config.php/25ProfileHook index a0370aa..3f9153a 100644 --- a/root/etc/e-smith/templates/usr/share/limesurvey/application/config/config.php/25ProfileHook +++ b/root/etc/e-smith/templates/usr/share/limesurvey/application/config/config.php/25ProfileHook @@ -5,46 +5,50 @@ $lang = substr $lang, 0, 2; $OUT .=<<"EOF"; -function hook_get_auth_webserver_profile(\$user_name) { - if (!isset(\$_SERVER['REMOTE_USER'])){ - return false; - } - \$login = \$_SERVER['REMOTE_USER']; - if (isset(\$_SERVER['HTTP_USER_NAME'])){ - \$name = \$_SERVER['HTTP_USER_NAME']; - } - else{ - \$name = \$login; - } - if (isset(\$_SERVER['HTTP_USER_EMAIL'])){ - \$email = \$_SERVER['HTTP_USER_EMAIL']; - } - else{ - \$email = \$login . '\@$DomainName'; - } - return Array( +if (!function_exists('hook_get_auth_webserver_profile')){ + function hook_get_auth_webserver_profile(\$user_name) { + if (!isset(\$_SERVER['REMOTE_USER'])){ + return false; + } + \$login = \$_SERVER['REMOTE_USER']; + if (isset(\$_SERVER['HTTP_USER_NAME'])){ + \$name = \$_SERVER['HTTP_USER_NAME']; + } + else{ + \$name = \$login; + } + if (isset(\$_SERVER['HTTP_USER_EMAIL'])){ + \$email = \$_SERVER['HTTP_USER_EMAIL']; + } + else{ + \$email = \$login . '\@$DomainName'; + } + return Array( 'full_name' => \$name, 'email' => \$email, 'lang' => '$lang', 'htmleditormode' => 'inline', 'templatelist' => 'default,basic,MyOrgTemplate', - ); + ); + } } -function hook_get_auth_webserver_permissions(\$user_name) { - if ((isset(\$_SERVER['HTTP_USER_GROUPS']) && ( - in_array('admins', preg_split("/;\\s?/", \$_SERVER['HTTP_USER_GROUPS'])) || - in_array('surveyadmins', preg_split("/;\\s?/", \$_SERVER['HTTP_USER_GROUPS'])) - )) || (\$user_name == "admin")){ - return Array('superadmin' => Array('read'=>true)); - } - else{ - return Array('surveys' => Array( - 'create'=>true, - 'read'=>true, - 'update'=>true, - 'delete'=>true - )); +if (!function_exists('hook_get_auth_webserver_permissions')){ + function hook_get_auth_webserver_permissions(\$user_name) { + if ((isset(\$_SERVER['HTTP_USER_GROUPS']) && ( + in_array('admins', preg_split("/;\\s?/", \$_SERVER['HTTP_USER_GROUPS'])) || + in_array('surveyadmins', preg_split("/;\\s?/", \$_SERVER['HTTP_USER_GROUPS'])) + )) || (\$user_name == "admin")){ + return Array('superadmin' => Array('read'=>true)); + } + else{ + return Array('surveys' => Array( + 'create'=>true, + 'read'=>true, + 'update'=>true, + 'delete'=>true + )); + } } }