From be20fac50abe2781ae3e8c344dde8bc40980ea8a Mon Sep 17 00:00:00 2001
From: Joe Hunt <joe.hunt.consulting@gmail.com>
Date: Wed, 14 Jan 2009 01:17:40 +0000
Subject: [PATCH] Page reload problem, progress bar in backup/restore,

---
 CHANGELOG.txt              |  6 ++++++
 admin/backups.php          |  3 +++
 admin/display_prefs.php    |  6 ++++--
 includes/lang/language.php | 18 ++++++++++++++----
 4 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index d1c610a8..7cab8ca8 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -19,6 +19,12 @@ Legend:
 ! -> Note
 $ -> Affected files
 
+14-Jan-2009 Joe Hunt
+! Page reload problem, progress bar in backup/restore, 
+$ /admin/backups.php
+  /admin/display_prefs.php
+  /includes/lang/language.php
+  
 12-Jan-2009 Joe Hunt
 ! Updating install and update helpers
 $ install.html
diff --git a/admin/backups.php b/admin/backups.php
index 8dfec9a1..155d9334 100644
--- a/admin/backups.php
+++ b/admin/backups.php
@@ -40,11 +40,13 @@ $compr = get_compr_combo();
 echo "
 	<script language='javascript'>
 	function createBackup() {
+		progbar();
 		ext = document.forms[0].cmb_comp.options[document.forms[0].cmb_comp.selectedIndex].value
 		comm = document.forms[0].comments.value
 		document.location.replace('backups.php?c=g&comp='+ext+'&comm='+comm)
 	}
 	function restoreBackup() {
+		progbar();
 		pFilename = document.forms[0].cmb_backups.options[document.forms[0].cmb_backups.selectedIndex].value
 		document.location.replace('backups.php?c=r&fn='+pFilename)
 	}
@@ -73,6 +75,7 @@ echo "
 			alert('" . _("Please select a file to upload.") . "')
 			return
 		}
+		progbar();
 		document.forms[0].action='backups.php?c=u&fn=' + document.forms[0].uploadfile.value
 		document.forms[0].submit()
 	}
diff --git a/admin/display_prefs.php b/admin/display_prefs.php
index b6031727..12f61369 100644
--- a/admin/display_prefs.php
+++ b/admin/display_prefs.php
@@ -40,12 +40,14 @@ if (isset($_POST['setprefs']))
 			$_POST['theme'], $_POST['page_size'], check_value('show_hints'),
 			$_POST['profile'], check_value('rep_popup'), (int)($_POST['query_size']), check_value('graphic_links'));
 
-		language::set_language($_POST['language']);
+		if ($_SESSION['language'] != $_POST['language'])
+			language::set_language($_POST['language']);
 
 		flush_dir($comp_path.'/'.user_company().'/js_cache');	
 
 		if (user_theme() != $theme)
-			reload_page("");
+			//reload_page("");
+			meta_forward($_SERVER['PHP_SELF']);
 
 		display_notification_centered(_("Display settings have been updated."));
 	}
diff --git a/includes/lang/language.php b/includes/lang/language.php
index a47df71d..819e83aa 100644
--- a/includes/lang/language.php
+++ b/includes/lang/language.php
@@ -1,5 +1,14 @@
 <?php
-
+/**********************************************************************
+    Copyright (C) 2008  FrontAccounting, LLC.
+	Released under the terms of the GNU Affero General Public License,
+	AGPL, as published by the Free Software Foundation, either version 
+	3 of the License, or (at your option) any later version.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+    See the License here <http://www.gnu.org/licenses/agpl-3.0.html>.
+***********************************************************************/
 if (!isset($path_to_root) || isset($_GET['path_to_root']) || isset($_POST['path_to_root']))
 	die("Restricted access");
 include_once($path_to_root . "/lang/installed_languages.inc");
@@ -47,7 +56,8 @@ class language
 			$locale = $path_to_root . "/lang/" . $_SESSION['language']->code . "/locale.inc";
 			// check id file exists only once for session
 			$_SESSION['language']->is_locale_file = file_exists($locale);
-		    reload_page("");
+		    //reload_page("");
+			meta_forward($_SERVER['PHP_SELF']);
 		}
 	}
 
@@ -130,7 +140,7 @@ function _set($key,$value)
 {
 	get_text::set_var($key,$value);
 }
-
+/*
 function reload_page($msg) 
 {
 //	header("Location: $_SERVER['PHP_SELF']."");
@@ -148,7 +158,7 @@ function reload_page($msg)
 	echo "</body>";
 	echo "</html>";
 }
-
+*/
 
 
 ?>
\ No newline at end of file
-- 
2.30.2