]> git.entuzijast.net Git - freeradius-dialup-admin.git/commitdiff
projects / freeradius-dialup-admin.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: c90f5ad)
* Call lib/{ldap,sql}/user_info in user_info before displaying any information about...
authorkkalev <kkalev>
Sat, 1 Feb 2003 16:33:26 +0000 (16:33 +0000)
committerkkalev <kkalev>
Sat, 1 Feb 2003 16:33:26 +0000 (16:33 +0000)
* Add a configuration directive general_charset. Add a language meta tag in all pages

21 files changed:
Changelog patch | blob | blame | history
conf/admin.conf patch | blob | blame | history
htdocs/accounting.php3 patch | blob | blame | history
htdocs/badusers.php3 patch | blob | blame | history
htdocs/failed_logins.php3 patch | blob | blame | history
htdocs/find.php3 patch | blob | blame | history
htdocs/group_admin.php3 patch | blob | blame | history
htdocs/group_new.php3 patch | blob | blame | history
htdocs/login_time_create.php3 patch | blob | blame | history
htdocs/show_groups.php3 patch | blob | blame | history
htdocs/stats.php3 patch | blob | blame | history
htdocs/user_accounting.php3 patch | blob | blame | history
htdocs/user_admin.php3 patch | blob | blame | history
htdocs/user_delete.php3 patch | blob | blame | history
htdocs/user_edit.php3 patch | blob | blame | history
htdocs/user_finger.php3 patch | blob | blame | history
htdocs/user_info.php3 patch | blob | blame | history
htdocs/user_new.php3 patch | blob | blame | history
htdocs/user_stats.php3 patch | blob | blame | history
htdocs/user_test.php3 patch | blob | blame | history
html/user_admin.html.php3 patch | blob | blame | history

diff --git a/Changelog b/Changelog
index 1cb60ce9b4e8540d593d4f7a22325f7f48ec63c8..a831fe37b21fbb645963ce3d89d826daa497216e 100644 (file)
--- 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 c47ff0916c42e7cbbb7928688856533a28433ee9..d89a0085ac445feecac024aed671f824d86df029 100644 (file)
--- 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 4fc570939f589ef00702370a42a6421e1ba580b4..05ecc3911d28615501d83d7e278e1287655445ce 100644 (file)
--- a/htdocs/accounting.php3
+++ b/htdocs/accounting.php3
@@ -11,6 +11,7 @@ else{
 <html>
 <head>
 <title>Accounting Report Generator</title>
+<meta http-equiv="Content-Type" content="text/html; charset=$config[general_charset]">
 <link rel="stylesheet" href="style.css">
 </head>
 <body bgcolor="#80a040" background="images/greenlines1.gif" link="black" alink="black">
@@ -98,9 +99,8 @@ EOM;
 ?>
 <html>
 <head>
-<title>
-Accounting Report Generator
-</title>
+<title>Accounting Report Generator</title>
+<meta http-equiv="Content-Type" content="text/html; charset=<?php echo $config[general_charset]?>">
 <link rel="stylesheet" href="style.css">
 </head>
 <body bgcolor="#80a040" background="images/greenlines1.gif" link="black" alink="black">
diff --git a/htdocs/badusers.php3 b/htdocs/badusers.php3
index 1f9df167d5477532763a8ada9521e76ecc4bb67b..d9adef8fbec395bf40f7dabc058756b8d3393c18 100644 (file)
--- 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 <<<EOM
 <title>Unauthorized Service Usage History for $login</title>
+<meta http-equiv="Content-Type" content="text/html; charset=$config[general_charset]">
 <link rel="stylesheet" href="style.css">
 </head>
 <body bgcolor="#80a040" background="images/greenlines1.gif" link="black" alink="black">
@@ -34,6 +35,7 @@ $usercheck = ($login == 'anyone') ? "LIKE '%'" : "= '$login'";
 echo <<<EOM
 <head>
 <title>Unauthorized Service Usage History for $login</title>
+<meta http-equiv="Content-Type" content="text/html; charset=$config[general_charset]">
 <link rel="stylesheet" href="style.css">
 </head>
 <body bgcolor="#80a040" background="images/greenlines1.gif" link="black" alink="black">
diff --git a/htdocs/failed_logins.php3 b/htdocs/failed_logins.php3
index 7f8736e0c764915547401e13ff10a99d6af94e1c..028ca99b0bf9a6e8541cd187f309543935b0d918 100644 (file)
--- 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 <<<EOM
 <title>Failed logins</title>
+<meta http-equiv="Content-Type" content="text/html; charset=$config[general_charset]">
 <link rel="stylesheet" href="style.css">
 </head>
 <body bgcolor="#80a040" background="images/greenlines1.gif" link="black" alink="black">
@@ -42,6 +43,7 @@ if ($server != '' && $server != 'all')
 
 <head>
 <title>Failed Logins</title>
+<meta http-equiv="Content-Type" content="text/html; charset=<?php echo $config[general_charset]?>">
 <link rel="stylesheet" href="style.css">
 </head>
 <body bgcolor="#80a040" background="images/greenlines1.gif" link="black" alink="black">
diff --git a/htdocs/find.php3 b/htdocs/find.php3
index d33dcae67861b8c6edcef8e4f115a7e088179c0d..f3e90c889ef20feb557d9ee7806e4416e439d15e 100644 (file)
--- a/htdocs/find.php3
+++ b/htdocs/find.php3
@@ -7,6 +7,7 @@ $max = ($max_results) ? $max_results : 40;
 <html>
 <head>
 <title>Find User Page</title>
+<meta http-equiv="Content-Type" content="text/html; charset=<?php echo $config[general_charset]?>">
 <link rel="stylesheet" href="style.css">
 </head>
 <body bgcolor="#80a040" background="images/greenlines1.gif" link="black" alink="black">
diff --git a/htdocs/group_admin.php3 b/htdocs/group_admin.php3
index acf89dbfabb734ecc67487613ea37ce616831997..535536da719e3788f9533e8a7bb4c239bf5fdb1f 100644 (file)
--- 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 <<<EOM
 <title>Group Administration Page</title>
+<meta http-equiv="Content-Type" content="text/html; charset=$config[general_charset]">
 <link rel="stylesheet" href="style.css">
 </head>
 <body bgcolor="#80a040" background="images/greenlines1.gif" link="black" alink="black">
@@ -23,6 +24,7 @@ if (is_file("../lib/$config[general_lib_type]/group_info.php3")){
        if ($group_exists == 'no'){
                echo <<<EOM
 <title>Group Administration Page</title>
+<meta http-equiv="Content-Type" content="text/html; charset=$config[general_charset]">
 <link rel="stylesheet" href="style.css">
 </head>
 <body bgcolor="#80a040" background="images/greenlines1.gif" link="black" alink="black">
@@ -43,6 +45,7 @@ EOM;
 <html>
 <head>
 <title>Group Administration Page</title>
+<meta http-equiv="Content-Type" content="text/html; charset=<?php echo $config[general_charset]?>">
 <link rel="stylesheet" href="style.css">
 </head>
 <body bgcolor="#80a040" background="images/greenlines1.gif" link="black" alink="black">
diff --git a/htdocs/group_new.php3 b/htdocs/group_new.php3
index 2feb03a7b6511b560bfde183bb6fb51beeebed58..8a1faddb97661ead960110a21b9acbd98611e98b 100644 (file)
--- 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 <<<EOM
 <title>New group creation page</title>
+<meta http-equiv="Content-Type" content="text/html; charset=$config[general_charset]">
 <link rel="stylesheet" href="style.css">
 </head>
 <body bgcolor="#80a040" background="images/greenlines1.gif" link="black" alink="black">
@@ -35,6 +36,7 @@ if ($config[general_lib_type] == 'sql' && $config[sql_use_operators] == 'true'){
 <html>
 <head>
 <title>New group creation page</title>
+<meta http-equiv="Content-Type" content="text/html; charset=<?php echo $config[general_charset]?>">
 <link rel="stylesheet" href="style.css">
 </head>
 <body bgcolor="#80a040" background="images/greenlines1.gif" link="black" alink="black">
diff --git a/htdocs/login_time_create.php3 b/htdocs/login_time_create.php3
index cc28aa827f71326b22b87300a431b9972c6c20b0..ad0189baa7fe29b892569e35d228c832ac832dc5 100644 (file)
--- a/htdocs/login_time_create.php3
+++ b/htdocs/login_time_create.php3
@@ -1,6 +1,7 @@
 <html>
 <head>
 <title>Login-Time Creation Page</title>
+<meta http-equiv="Content-Type" content="text/html; charset=<?php echo $config[general_charset]?>">
 <link rel="stylesheet" href="style.css">
 </head>
 <body bgcolor="#80a040" background="images/greenlines1.gif" link="black" alink="black">
diff --git a/htdocs/show_groups.php3 b/htdocs/show_groups.php3
index 4e269425c0ec142318b94e59650108cc1447c6c3..ce02476a53cfca05b678df37e821b8447d6437f0 100644 (file)
--- 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 <<<EOM
 <title>User Groups</title>
+<meta http-equiv="Content-Type" content="text/html; charset=$config[general_charset]">
 <link rel="stylesheet" href="style.css">
 </head>
 <body bgcolor="#80a040" background="images/greenlines1.gif" link="black" alink="black">
@@ -22,6 +23,7 @@ EOM;
 ?>
 <head>
 <title>User Groups</title>
+<meta http-equiv="Content-Type" content="text/html; charset=<?php echo $config[general_charset]?>">
 <link rel="stylesheet" href="style.css">
 </head>
 <body bgcolor="#80a040" background="images/greenlines1.gif" link="black" alink="black">
diff --git a/htdocs/stats.php3 b/htdocs/stats.php3
index 5dd6d04170d3341ea4313cae67ff60d0bb4d1942..47e93a91f8ba01348f52a7020028f8d6a809fc28 100644 (file)
--- a/htdocs/stats.php3
+++ b/htdocs/stats.php3
@@ -4,6 +4,7 @@ require('../conf/config.php3');
 <html>
 <head>
 <title>account analysis</title>
+<meta http-equiv="Content-Type" content="text/html; charset=<?php echo $config[general_charset]?>">
 <link rel="stylesheet" href="style.css">
 </head>
 <body bgcolor="#80a040" background="images/greenlines1.gif" link="black" alink="black">
diff --git a/htdocs/user_accounting.php3 b/htdocs/user_accounting.php3
index 57c6689c1ec9e21cdcf1e6c255ddc2f0ce18a439..ca074326d4e3a9f618c467b7e4b931ff1ab3c9bc 100644 (file)
--- 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 <<<EOM
-<title>subscription analysis for $login ($cn)</title>
+<title>subscription analysis for $login</title>
+<meta http-equiv="Content-Type" content="text/html; charset=$config[general_charset]">
 <link rel="stylesheet" href="style.css">
 </head>
 <body bgcolor="#80a040" background="images/greenlines1.gif" link="black" alink="black">
@@ -36,7 +37,8 @@ $selected[$order] = 'selected';
 
 echo <<<EOM
 <head>
-<title>subscription analysis for $login ($cn)</title>
+<title>subscription analysis for $login</title>
+<meta http-equiv="Content-Type" content="text/html; charset=$config[general_charset]">
 <link rel="stylesheet" href="style.css">
 </head>
 <body bgcolor="#80a040" background="images/greenlines1.gif" link="black" alink="black">
diff --git a/htdocs/user_admin.php3 b/htdocs/user_admin.php3
index be0d475f7c2e6bd51323b0979cb130e228e7bb12..5a1ef99a11d675f4404bdccf6df7b4a8e7a71fa7 100644 (file)
--- 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 <<<EOM
 <title>user information page</title>
+<meta http-equiv="Content-Type" content="text/html; charset=$config[general_charset]">
 <link rel="stylesheet" href="style.css">
 </head>
 <body bgcolor="#80a040" background="images/greenlines1.gif" link="black" alink="black">
@@ -34,6 +35,7 @@ if (is_file("../lib/sql/drivers/$config[sql_type]/functions.php3"))
 else{
        echo <<<EOM
 <title>user information page</title>
+<meta http-equiv="Content-Type" content="text/html; charset=$config[general_charset]">
 <link rel="stylesheet" href="style.css">
 </head>
 <body bgcolor="#80a040" background="images/greenlines1.gif" link="black" alink="black">
diff --git a/htdocs/user_delete.php3 b/htdocs/user_delete.php3
index f0f2bc061a6e06adcd4a0e08fa0b600d32d8c4f3..bf63795c55d73a374b3fd24b1fd35893c7436267 100644 (file)
--- a/htdocs/user_delete.php3
+++ b/htdocs/user_delete.php3
@@ -21,6 +21,7 @@ else
        echo "<title>delete group $login</title>\n";
 
 echo <<<EOM
+<meta http-equiv="Content-Type" content="text/html; charset=$config[general_charset]">
 <link rel="stylesheet" href="style.css">
 </head>
 <body bgcolor="#80a040" background="images/greenlines1.gif" link="black" alink="black">
diff --git a/htdocs/user_edit.php3 b/htdocs/user_edit.php3
index f4cd8df44fc87eb9de0a577cc982f6e779d45662..7f0253d9e55a9117e2ce1d2e120748892987b287 100644 (file)
--- a/htdocs/user_edit.php3
+++ b/htdocs/user_edit.php3
@@ -36,6 +36,7 @@ else
        echo " <title>subscription configuration for $login</title>\n";
 ?>
 
+<meta http-equiv="Content-Type" content="text/html; charset=<?php echo $config[general_charset]?>">
 <link rel="stylesheet" href="style.css">
 </head>
 <body bgcolor="#80a040" background="images/greenlines1.gif" link="black" alink="black">
diff --git a/htdocs/user_finger.php3 b/htdocs/user_finger.php3
index 570885bb760727c308703e31369d3cb81db40571..f9308f052701f0d223ad939c8154ce8637479257 100644 (file)
--- a/htdocs/user_finger.php3
+++ b/htdocs/user_finger.php3
@@ -4,9 +4,8 @@ require('../conf/config.php3');
 <html>
 <head>
 <META HTTP-EQUIV="Refresh" CONTENT="50">
-<title>
-User Finger Facility
-</title>
+<meta http-equiv="Content-Type" content="text/html; charset=<?php echo $config[general_charset]?>">
+<title>User Finger Facility</title>
 <link rel="stylesheet" href="style.css">
 </head>
 
diff --git a/htdocs/user_info.php3 b/htdocs/user_info.php3
index 414bb6562f3991a006f15b361b7f29b19e2478e6..03d8266b985d29bb230320e6530c538affbe32b2 100644 (file)
--- a/htdocs/user_info.php3
+++ b/htdocs/user_info.php3
@@ -4,6 +4,7 @@ require('../conf/config.php3');
 
 <html>
 <head>
+<meta http-equiv="Content-Type" content="text/html; charset=<?php echo $config[general_charset]?>">
 <title>Personal information page</title>
 <link rel="stylesheet" href="style.css">
 </head>
@@ -22,6 +23,18 @@ include("../html/user_toolbar.html.php3");
 ?>
 </table>
 
+<?php
+if ($change == 1){
+       if (is_file("../lib/$config[general_lib_type]/user_info.php3"))
+               include("../lib/$config[general_lib_type]/user_info.php3");
+       if (is_file("../lib/$config[general_lib_type]/change_info.php3"))
+               include("../lib/$config[general_lib_type]/change_info.php3");
+}
+
+if (is_file("../lib/$config[general_lib_type]/user_info.php3"))
+       include("../lib/$config[general_lib_type]/user_info.php3");
+?>
+
 <br>
 <table border=0 width=540 cellpadding=1 cellspacing=1>
 <tr valign=top>
@@ -37,17 +50,6 @@ include("../html/user_toolbar.html.php3");
        <table border=0 width=100% cellpadding=12 cellspacing=0 bgcolor="#ffffd0" valign=top>
        <tr><td>
    
-<?php
-if ($change == 1){
-       if (is_file("../lib/$config[general_lib_type]/user_info.php3"))
-               include("../lib/$config[general_lib_type]/user_info.php3");
-       if (is_file("../lib/$config[general_lib_type]/change_info.php3"))
-               include("../lib/$config[general_lib_type]/change_info.php3");
-}
-
-if (is_file("../lib/$config[general_lib_type]/user_info.php3"))
-       include("../lib/$config[general_lib_type]/user_info.php3");
-?>
    <form method=post>
       <input type=hidden name=login value="<?php echo $login?>">
       <input type=hidden name=change value="0">
diff --git a/htdocs/user_new.php3 b/htdocs/user_new.php3
index c2eb99356e64b31377d9cb5aaf7a8ac13e408c68..8308fbd677959267f03a2f72412a4f626a6b9b86 100644 (file)
--- 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'){
 <html>
 <head>
 <title>New user creation page</title>
+<meta http-equiv="Content-Type" content="text/html; charset=<?php echo $config[general_charset]?>">
 <link rel="stylesheet" href="style.css">
 </head>
 <body bgcolor="#80a040" background="images/greenlines1.gif" link="black" alink="black">
diff --git a/htdocs/user_stats.php3 b/htdocs/user_stats.php3
index 1956b5e12207f26288f6ffb863c5c2435fbbc04e..620d13bcce9e5f580ca227775fcbb8bd06715d84 100644 (file)
--- 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 <<<EOM
 <title>User Statistics</title>
+<meta http-equiv="Content-Type" content="text/html; charset=$config[general_charset]">
 <link rel="stylesheet" href="style.css">
 </head>
 <body bgcolor="#80a040" background="images/greenlines1.gif" link="black" alink="black">
diff --git a/htdocs/user_test.php3 b/htdocs/user_test.php3
index 84cd8c59ecb07e2b144fc99586293002eabb600a..d14946319be5ca59a04ab8188cd49cebaa8b1c7e 100644 (file)
--- a/htdocs/user_test.php3
+++ b/htdocs/user_test.php3
@@ -10,6 +10,7 @@ echo <<<EOM
 <html>
 <head>
 <title>test user $login</title>
+<meta http-equiv="Content-Type" content="text/html; charset=$config[general_charset]">
 <link rel="stylesheet" href="style.css">
 </head>
 <body bgcolor="#80a040" background="images/greenlines1.gif" link="black" alink="black">
diff --git a/html/user_admin.html.php3 b/html/user_admin.html.php3
index 1dac17f6b650d698d4f4bb79b7e4a347928b0707..a3f9e5af5869c0077c7fe7b143a2df911f387b4c 100644 (file)
--- a/html/user_admin.html.php3
+++ b/html/user_admin.html.php3
@@ -2,6 +2,7 @@
 
 echo <<<EOM
 <title>user information for $cn</title>
+<meta http-equiv="Content-Type" content="text/html; charset=$config[general_charset]">
 </head>
 <body bgcolor="#80a040" background="images/greenlines1.gif" link="black" alink="black">
 <link rel="stylesheet" href="style.css">
FreeRADIUS dialup_admin