Merge branch 'bug-1023' into release
[cacert-devel.git] / includes / account.php
index 24c61d8..554713e 100644 (file)
@@ -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");
 
                exit;
        }
 
+       if ($process == _("Cancel"))
+       {
+               // General reset CANCEL process requests
+               $process = "";
+       }
+
 
        if($id == 45 || $id == 46 || $oldid == 45 || $oldid == 46)
        {
                $orgid = 0;
        }
 
-       if($oldid == 31 && $process != _("Cancel"))
+       if($oldid == 31 && $process != "")
        {
                $query = "select * from `orgdomains` where `orgid`='".intval($_SESSION['_config']['orgid'])."'";
                $dres = mysql_query($query);
        {
                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)
                        {