summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorINOPIAE <inopiae@cacert.org>2012-12-16 16:07:41 +0100
committerBenny Baumann <BenBE@geshi.org>2013-05-01 15:50:25 +0200
commit6ff07a756e49a114ad44bb129a5c64f4dbbb4536 (patch)
tree3ec695fd5bfea077bdd4be6528a8c1894a1c7531
parent44ef98610497de881a8a6207f2c6ef82c41f0a4f (diff)
downloadcacert-devel-6ff07a756e49a114ad44bb129a5c64f4dbbb4536.tar.gz
cacert-devel-6ff07a756e49a114ad44bb129a5c64f4dbbb4536.tar.xz
cacert-devel-6ff07a756e49a114ad44bb129a5c64f4dbbb4536.zip
bug 28: Moved function from temp_function1.php to includes/lib/l10n.php and changed the reference
-rw-r--r--includes/account.php1
-rw-r--r--includes/lib/l10n.php8
-rw-r--r--includes/temp_function1.php14
-rw-r--r--www/disputes.php2
-rw-r--r--www/wot.php1
5 files changed, 9 insertions, 17 deletions
diff --git a/includes/account.php b/includes/account.php
index a89d620..f9df120 100644
--- a/includes/account.php
+++ b/includes/account.php
@@ -18,7 +18,6 @@
require_once("../includes/loggedin.php");
require_once("../includes/lib/l10n.php");
require_once('lib/check_weak_key.php');
- require_once("../includes/temp-function1.php");
loadem("account");
diff --git a/includes/lib/l10n.php b/includes/lib/l10n.php
index 85b7aff..f834fd0 100644
--- a/includes/lib/l10n.php
+++ b/includes/lib/l10n.php
@@ -340,4 +340,12 @@ class L10n {
bindtextdomain($domain, $_SESSION['_config']['filepath'].'/locale');
textdomain($domain);
}
+
+ function get_recipient_language($accoundid){
+//returns the language of a recipient to make sure that the language is correct
+//use together with
+ $query = "select * from `users` where `id`='".$id:"'";
+ $res = mysql_query($query);
+ $row = mysql_fetch_assoc($res);
+ return $row['language'];
} \ No newline at end of file
diff --git a/includes/temp_function1.php b/includes/temp_function1.php
deleted file mode 100644
index ce6854e..0000000
--- a/includes/temp_function1.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-function get_recipient_language($accoundid){
-//returns the language of a recipient to make sure that the language is correct
-//use together with
-// $my_translation = L10n::get_translation();
-// L10n::set_translation($_SESSION['_config']['notarise']['language']);
-// L10n::set_translation($my_translation);
- $query = "select * from `users` where `id`='".$id:"'";
- $res = mysql_query($query);
- $row = mysql_fetch_assoc($res);
- return $row['language'];
-
-}
-?>
diff --git a/www/disputes.php b/www/disputes.php
index 2fa015d..f203b62 100644
--- a/www/disputes.php
+++ b/www/disputes.php
@@ -17,7 +17,7 @@
*/ ?>
<?
require_once("../includes/loggedin.php");
- require_once("../includes/temp-function1.php");
+ require_once("../includes/lib/l10n.php");
loadem("account");
diff --git a/www/wot.php b/www/wot.php
index c5a442c..3747a67 100644
--- a/www/wot.php
+++ b/www/wot.php
@@ -18,7 +18,6 @@
<?
require_once("../includes/loggedin.php");
require_once("../includes/lib/l10n.php");
- require_once("../includes/temp-function1.php");
function show_page($target,$message,$error)
{