summaryrefslogtreecommitdiff
path: root/includes
diff options
context:
space:
mode:
authorMichael Tänzer <neo@nhng.de>2011-10-16 06:09:25 +0200
committerMichael Tänzer <neo@nhng.de>2011-10-16 06:09:25 +0200
commit147cce7acd3ce673c494dc9b30f36b3d5554abea (patch)
tree28ef84874a81cd92558200c2a9c7a522cb94d906 /includes
parent6e0ae5b60fdb53fccfa90519522fb9b1cbd44e45 (diff)
downloadcacert-devel-147cce7acd3ce673c494dc9b30f36b3d5554abea.tar.gz
cacert-devel-147cce7acd3ce673c494dc9b30f36b3d5554abea.tar.xz
cacert-devel-147cce7acd3ce673c494dc9b30f36b3d5554abea.zip
bug 985: replace occurences of $_SESSION['_config']['translations']
this includes a little rewrite of reminder handling Signed-off-by: Michael Tänzer <neo@nhng.de>
Diffstat (limited to 'includes')
-rw-r--r--includes/account.php3
-rw-r--r--includes/general_stuff.php4
2 files changed, 5 insertions, 2 deletions
diff --git a/includes/account.php b/includes/account.php
index 24c61d8..ebae1f6 100644
--- a/includes/account.php
+++ b/includes/account.php
@@ -16,6 +16,7 @@
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
require_once("../includes/loggedin.php");
+ require_once("../includes/lib/l10n.php");
loadem("account");
@@ -2345,7 +2346,7 @@
{
csrf_check("mainlang");
$lang = mysql_real_escape_string($_REQUEST['lang']);
- foreach($_SESSION['_config']['translations'] as $key => $val)
+ foreach(L10n::$translations as $key => $val)
{
if($key == $lang)
{
diff --git a/includes/general_stuff.php b/includes/general_stuff.php
index 088c39e..b4795e0 100644
--- a/includes/general_stuff.php
+++ b/includes/general_stuff.php
@@ -16,6 +16,8 @@
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+require_once($_SESSION['_config']['filepath'].'/includes/lib/l10n.php');
+
if(!function_exists("showheader"))
{
function showbodycontent($title = "CAcert.org", $title2 = "")
@@ -60,7 +62,7 @@ google_color_border = "FFFFFF";
<? include("about_menu.php"); ?>
<div class="relatedLinks">
<h3 class="pointer" onclick="explode('trans')">+ <?=_("Translations")?></h3>
- <ul class="menu" id="trans"><? foreach($_SESSION['_config']['translations'] as $key => $val) { ?><li><a href="<?=$_SERVER['SCRIPT_NAME']?>?id=<?=intval(array_key_exists('id',$_REQUEST)?$_REQUEST['id']:0)?>&amp;lang=<?=$key?>"><?=$val?></a></li><? } ?></ul>
+ <ul class="menu" id="trans"><? foreach(L10n::$translations as $key => $val) { ?><li><a href="<?=$_SERVER['SCRIPT_NAME']?>?id=<?=intval(array_key_exists('id',$_REQUEST)?$_REQUEST['id']:0)?>&amp;lang=<?=$key?>"><?=$val?></a></li><? } ?></ul>
</div>
<? if(array_key_exists('mconn',$_SESSION) && $_SESSION['mconn']) { ?>
<div class="relatedLinks">