From: kkalev Date: Sat, 1 Feb 2003 16:33:26 +0000 (+0000) Subject: * Call lib/{ldap,sql}/user_info in user_info before displaying any information about... X-Git-Url: https://git.entuzijast.net/?a=commitdiff_plain;h=ff5313991fc75394cce45dafe310b0e020e82ddd;p=freeradius-dialup-admin.git * Call lib/{ldap,sql}/user_info in user_info before displaying any information about the user * Add a configuration directive general_charset. Add a language meta tag in all pages --- diff --git a/Changelog b/Changelog index 1cb60ce..a831fe3 100644 --- a/Changelog +++ b/Changelog @@ -3,6 +3,8 @@ Ver 1.63: page to work properly. * Add a login-time creation page which will allow the administrator to create the login-time string through a gui instead of writing it directly in UUCP format. +* Call lib/{ldap,sql}/user_info in user_info before displaying any information about the user +* Add a configuration directive general_charset. Add a language meta tag in all pages Ver 1.62: * Remove one sql query from user_admin which was not needed. * Instead of a query like "LIKE 'YYYY-MM-DD%'" use "AcctStopTime >= 'YYYY-MM-DD 00:00:00 AND AcctStopTime diff --git a/conf/admin.conf b/conf/admin.conf index c47ff09..d89a008 100644 --- a/conf/admin.conf +++ b/conf/admin.conf @@ -8,6 +8,10 @@ general_prefered_lang: el general_prefered_lang_name: Greek # +# The charset which will be added as a meta tag in all pages +# +general_charset: iso-8859-1 +# # Uncomment this if normal attributes (not the ;lang-xx ones) in ldap # are utf8 encoded. # diff --git a/htdocs/accounting.php3 b/htdocs/accounting.php3 index 4fc5709..05ecc39 100644 --- a/htdocs/accounting.php3 +++ b/htdocs/accounting.php3 @@ -11,6 +11,7 @@ else{ Accounting Report Generator + @@ -98,9 +99,8 @@ EOM; ?> - -Accounting Report Generator - +Accounting Report Generator + diff --git a/htdocs/badusers.php3 b/htdocs/badusers.php3 index 1f9df16..d9adef8 100644 --- a/htdocs/badusers.php3 +++ b/htdocs/badusers.php3 @@ -10,6 +10,7 @@ if (is_file("../lib/sql/drivers/$config[sql_type]/functions.php3")) else{ echo <<Unauthorized Service Usage History for $login + @@ -34,6 +35,7 @@ $usercheck = ($login == 'anyone') ? "LIKE '%'" : "= '$login'"; echo << Unauthorized Service Usage History for $login + diff --git a/htdocs/failed_logins.php3 b/htdocs/failed_logins.php3 index 7f8736e..028ca99 100644 --- a/htdocs/failed_logins.php3 +++ b/htdocs/failed_logins.php3 @@ -9,6 +9,7 @@ if (is_file("../lib/sql/drivers/$config[sql_type]/functions.php3")) else{ echo <<Failed logins + @@ -42,6 +43,7 @@ if ($server != '' && $server != 'all') Failed Logins + diff --git a/htdocs/find.php3 b/htdocs/find.php3 index d33dcae..f3e90c8 100644 --- a/htdocs/find.php3 +++ b/htdocs/find.php3 @@ -7,6 +7,7 @@ $max = ($max_results) ? $max_results : 40; Find User Page + diff --git a/htdocs/group_admin.php3 b/htdocs/group_admin.php3 index acf89db..535536d 100644 --- a/htdocs/group_admin.php3 +++ b/htdocs/group_admin.php3 @@ -7,6 +7,7 @@ require('../conf/config.php3'); if ($config[general_lib_type] != 'sql'){ echo <<Group Administration Page + @@ -23,6 +24,7 @@ if (is_file("../lib/$config[general_lib_type]/group_info.php3")){ if ($group_exists == 'no'){ echo <<Group Administration Page + @@ -43,6 +45,7 @@ EOM; Group Administration Page + diff --git a/htdocs/group_new.php3 b/htdocs/group_new.php3 index 2feb03a..8a1fadd 100644 --- a/htdocs/group_new.php3 +++ b/htdocs/group_new.php3 @@ -8,6 +8,7 @@ require('../conf/config.php3'); if ($config[general_lib_type] != 'sql'){ echo <<New group creation page + @@ -35,6 +36,7 @@ if ($config[general_lib_type] == 'sql' && $config[sql_use_operators] == 'true'){ New group creation page + diff --git a/htdocs/login_time_create.php3 b/htdocs/login_time_create.php3 index cc28aa8..ad0189b 100644 --- a/htdocs/login_time_create.php3 +++ b/htdocs/login_time_create.php3 @@ -1,6 +1,7 @@ Login-Time Creation Page + diff --git a/htdocs/show_groups.php3 b/htdocs/show_groups.php3 index 4e26942..ce02476 100644 --- a/htdocs/show_groups.php3 +++ b/htdocs/show_groups.php3 @@ -9,6 +9,7 @@ if (is_file("../lib/sql/drivers/$config[sql_type]/functions.php3")) else{ echo <<User Groups + @@ -22,6 +23,7 @@ EOM; ?> User Groups + diff --git a/htdocs/stats.php3 b/htdocs/stats.php3 index 5dd6d04..47e93a9 100644 --- a/htdocs/stats.php3 +++ b/htdocs/stats.php3 @@ -4,6 +4,7 @@ require('../conf/config.php3'); account analysis + diff --git a/htdocs/user_accounting.php3 b/htdocs/user_accounting.php3 index 57c6689..ca07432 100644 --- a/htdocs/user_accounting.php3 +++ b/htdocs/user_accounting.php3 @@ -9,7 +9,8 @@ if (is_file("../lib/sql/drivers/$config[sql_type]/functions.php3")) include_once("../lib/sql/drivers/$config[sql_type]/functions.php3"); else{ echo <<subscription analysis for $login ($cn) +subscription analysis for $login + @@ -36,7 +37,8 @@ $selected[$order] = 'selected'; echo << -subscription analysis for $login ($cn) +subscription analysis for $login + diff --git a/htdocs/user_admin.php3 b/htdocs/user_admin.php3 index be0d475..5a1ef99 100644 --- a/htdocs/user_admin.php3 +++ b/htdocs/user_admin.php3 @@ -13,6 +13,7 @@ if (is_file("../lib/$config[general_lib_type]/user_info.php3")){ if ($user_exists == 'no'){ echo <<user information page + @@ -34,6 +35,7 @@ if (is_file("../lib/sql/drivers/$config[sql_type]/functions.php3")) else{ echo <<user information page + diff --git a/htdocs/user_delete.php3 b/htdocs/user_delete.php3 index f0f2bc0..bf63795 100644 --- a/htdocs/user_delete.php3 +++ b/htdocs/user_delete.php3 @@ -21,6 +21,7 @@ else echo "delete group $login\n"; echo << diff --git a/htdocs/user_edit.php3 b/htdocs/user_edit.php3 index f4cd8df..7f0253d 100644 --- a/htdocs/user_edit.php3 +++ b/htdocs/user_edit.php3 @@ -36,6 +36,7 @@ else echo " subscription configuration for $login\n"; ?> + diff --git a/htdocs/user_finger.php3 b/htdocs/user_finger.php3 index 570885b..f9308f0 100644 --- a/htdocs/user_finger.php3 +++ b/htdocs/user_finger.php3 @@ -4,9 +4,8 @@ require('../conf/config.php3'); - -User Finger Facility - + +User Finger Facility diff --git a/htdocs/user_info.php3 b/htdocs/user_info.php3 index 414bb65..03d8266 100644 --- a/htdocs/user_info.php3 +++ b/htdocs/user_info.php3 @@ -4,6 +4,7 @@ require('../conf/config.php3'); + Personal information page @@ -22,6 +23,18 @@ include("../html/user_toolbar.html.php3"); ?> + +
@@ -37,17 +50,6 @@ include("../html/user_toolbar.html.php3");
-
diff --git a/htdocs/user_new.php3 b/htdocs/user_new.php3 index c2eb993..8308fbd 100644 --- a/htdocs/user_new.php3 +++ b/htdocs/user_new.php3 @@ -20,6 +20,7 @@ if ($config[general_lib_type] == 'sql' && $config[sql_use_operators] == 'true'){ New user creation page + diff --git a/htdocs/user_stats.php3 b/htdocs/user_stats.php3 index 1956b5e..620d13b 100644 --- a/htdocs/user_stats.php3 +++ b/htdocs/user_stats.php3 @@ -10,6 +10,7 @@ if (is_file("../lib/sql/drivers/$config[sql_type]/functions.php3")) else{ echo <<User Statistics + diff --git a/htdocs/user_test.php3 b/htdocs/user_test.php3 index 84cd8c5..d149463 100644 --- a/htdocs/user_test.php3 +++ b/htdocs/user_test.php3 @@ -10,6 +10,7 @@ echo << test user $login + diff --git a/html/user_admin.html.php3 b/html/user_admin.html.php3 index 1dac17f..a3f9e5a 100644 --- a/html/user_admin.html.php3 +++ b/html/user_admin.html.php3 @@ -2,6 +2,7 @@ echo <<user information for $cn +