X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=admin%2Finst_lang.php;h=9c8ea4b555cbe1c565ae026864b1f2a3d0081968;hb=476226e78351273b99c9d38a6324b93400c460c0;hp=e5eae2e79f727338021d532a3bcf2dfd123f1c04;hpb=da8311619dd73feae101d246a1957b972e00cbd2;p=fa-stable.git

diff --git a/admin/inst_lang.php b/admin/inst_lang.php
index e5eae2e7..9c8ea4b5 100644
--- a/admin/inst_lang.php
+++ b/admin/inst_lang.php
@@ -1,6 +1,15 @@
 <?php
-
-$page_security = 15;
+/**********************************************************************
+    Copyright (C) FrontAccounting, LLC.
+	Released under the terms of the GNU General Public License, GPL, 
+	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/gpl-3.0.html>.
+***********************************************************************/
+$page_security = 'SA_CREATELANGUAGE';
 $path_to_root="..";
 include_once($path_to_root . "/includes/session.inc");
 
@@ -16,7 +25,7 @@ include_once($path_to_root . "/includes/ui.inc");
 if (isset($_GET['selected_id']))
 {
 	$selected_id = $_GET['selected_id'];
-} 
+}
 elseif (isset($_POST['selected_id']))
 {
 	$selected_id = $_POST['selected_id'];
@@ -28,63 +37,24 @@ else
 
 function check_data()
 {
+	if ($_POST['code'] == "" || $_POST['name'] == "" || $_POST['encoding'] == "") {
+		display_error(_("Language name, code nor encoding cannot be empty"));
+		return false;
+	}
 	return true;
 }
 
-/**
- * @return Returns the array sorted as required
- * @param $aryData Array containing data to sort
- * @param $strIndex name of column to use as an index
- * @param $strSortBy Column to sort the array by
- * @param $strSortType String containing either asc or desc [default to asc]
- * @desc Naturally sorts an array using by the column $strSortBy
- */
-function array_natsort($aryData, $strIndex, $strSortBy, $strSortType=false)
-{
-   //    if the parameters are invalid
-   if (!is_array($aryData) || !$strIndex || !$strSortBy)
-       //    return the array
-       return $aryData;
-       
-   //    create our temporary arrays
-   $arySort = $aryResult = array();
-   
-   //    loop through the array
-   foreach ($aryData as $aryRow)
-       //    set up the value in the array
-       $arySort[$aryRow[$strIndex]] = $aryRow[$strSortBy];
-       
-   //    apply the natural sort
-   natsort($arySort);
-
-   //    if the sort type is descending
-   if ($strSortType=="desc")
-       //    reverse the array
-       arsort($arySort);
-       
-   //    loop through the sorted and original data
-   foreach ($arySort as $arySortKey => $arySorted)
-       foreach ($aryData as $aryOriginal)
-           //    if the key matches
-           if ($aryOriginal[$strIndex]==$arySortKey)
-               //    add it to the output array
-               array_push($aryResult, $aryOriginal);
-
-   //    return the return
-   return $aryResult;
-} 
-
 function write_lang()
 {
-	global $path_to_root, $installed_languages;
+	global $path_to_root, $installed_languages, $dflt_lang;
 	include_once($path_to_root . "/lang/installed_languages.inc");
 
 	$conn = array_natsort($installed_languages, 'code', 'code');
 	$installed_languages = $conn;
 	//reset($installed_languages);
-	$n = count($installed_languages);	
+	$n = count($installed_languages);
 	$msg = "<?php\n\n";
-	
+
 	$msg .= "/* How to make new entries here\n\n";
 	$msg .= "-- if adding languages at the beginning of the list, make sure it's index is set to 0 (it has ' 0 => ')\n";
 	$msg .= "-- 'code' should match the name of the directory for the language under \\lang\n";
@@ -93,7 +63,8 @@ function write_lang()
 	$msg .= "*/\n\n\n";
 
 	$msg .= "\$installed_languages = array (\n";
-	$msg .= "\t0 => ";
+	if ($n > 0)
+	    $msg .= "\t0 => ";
 	for ($i = 0; $i < $n; $i++)
 	{
 		if ($i > 0)
@@ -108,20 +79,22 @@ function write_lang()
 		else
 			$msg .= "),\n";
 	}
-	$msg .= "\t);\n?>";
+
+	$msg .= "\t);\n";
+	$msg .= "\n\$dflt_lang = '$dflt_lang';\n?>\n";
 
 	$filename = $path_to_root . "/lang/installed_languages.inc";
 	// Check if the file exists and is writable first.
-	if (file_exists($filename) && is_writable($filename)) 
+	if (file_exists($filename) && is_writable($filename))
 	{
-		if (!$zp = fopen($filename, 'w')) 
+		if (!$zp = fopen($filename, 'w'))
 		{
 			display_error(_("Cannot open the languages file - ") . $filename);
 			return false;
-		} 
-		else 
+		}
+		else
 		{
-			if (!fwrite($zp, $msg)) 
+			if (!fwrite($zp, $msg))
 			{
 				display_error(_("Cannot write to the language file - ") . $filename);
 				fclose($zp);
@@ -130,8 +103,8 @@ function write_lang()
 			// Close file
 			fclose($zp);
 		}
-	} 
-	else 
+	}
+	else
 	{
 		display_error(_("The language file ") . $filename . _(" is not writable. Change its permissions so it is, then re-run the operation."));
 		return false;
@@ -143,28 +116,40 @@ function write_lang()
 
 function handle_submit()
 {
-	global $path_to_root, $installed_languages;
+	global $path_to_root, $installed_languages, $dflt_lang;
 
 	if (!check_data())
 		return false;
 
 	$id = $_GET['id'];
 
+	if ($_POST['dflt']) {
+			$dflt_lang = $_POST['code'];
+	}
+	
 	$installed_languages[$id]['code'] = $_POST['code'];
 	$installed_languages[$id]['name'] = $_POST['name'];
 	$installed_languages[$id]['encoding'] = $_POST['encoding'];
 	$installed_languages[$id]['rtl'] = (bool)$_POST['rtl'];
 	if (!write_lang())
 		return false;
-	$directory = $path_to_root . "/lang/" . $_POST['code'];	
+	$directory = $path_to_root . "/lang/" . $_POST['code'];
 	if (!file_exists($directory))
 	{
 		mkdir($directory);
 		mkdir($directory . "/LC_MESSAGES");
-	}	
+	}
 	if (is_uploaded_file($_FILES['uploadfile']['tmp_name']))
 	{
 		$file1 = $_FILES['uploadfile']['tmp_name'];
+		$file2 = $directory . "/LC_MESSAGES/".$_POST['code'].".po";
+		if (file_exists($file2))
+			unlink($file2);
+		move_uploaded_file($file1, $file2);
+	}
+	if (is_uploaded_file($_FILES['uploadfile2']['tmp_name']))
+	{
+		$file1 = $_FILES['uploadfile2']['tmp_name'];
 		$file2 = $directory . "/LC_MESSAGES/".$_POST['code'].".mo";
 		if (file_exists($file2))
 			unlink($file2);
@@ -177,42 +162,28 @@ function handle_submit()
 
 function handle_delete()
 {
-	global  $path_to_root, $installed_languages;
+	global  $path_to_root, $installed_languages, $dflt_lang;
 
-	$id = $_GET['id'];	
+	$id = $_GET['id'];
 
 	$lang = $installed_languages[$id]['code'];
-	$filename = "$path_to_root/lang/$lang/LC_MESSAGES";	
-	if ($h = opendir($filename)) 
-	{
-   		while (($file = readdir($h)) !== false) 
-   		{
-   			if (is_file("$filename/$file"))
-   		    	unlink("$filename/$file");
-   		}
-   		closedir($h);
-	}
-	rmdir($filename);
-	$filename = "$path_to_root/lang/$lang";	
-	if ($h = opendir($filename)) 
-	{
-   		while (($file = readdir($h)) !== false) 
-   		{
-   			if (is_file("$filename/$file"))
-   		    	unlink("$filename/$file");
-   		}
-   		closedir($h);
-	}
-	rmdir($filename);
+	$filename = "$path_to_root/lang/$lang/LC_MESSAGES";
 
+	if ($lang == $dflt_lang ) { 
+		// on delete set default to current.
+		$dflt_lang = $_SESSION['language']->code;
+	}
+	
 	unset($installed_languages[$id]);
-	$conn = array_values($installed_languages);
-	$installed_languages = $conn;
-
-	//$$db_connections = array_values($db_connections);
+	$installed_languages = array_values($installed_languages);
 
 	if (!write_lang())
 		return;
+
+	$filename = "$path_to_root/lang/$lang";
+	flush_dir($filename);
+	rmdir($filename);
+
 	meta_forward($_SERVER['PHP_SELF']);
 }
 
@@ -220,10 +191,10 @@ function handle_delete()
 
 function display_languages()
 {
-	global $table_style, $installed_languages;
+	global $table_style, $installed_languages, $dflt_lang;
 
 	$lang = $_SESSION["language"]->code;
-	
+
 	echo "
 		<script language='javascript'>
 		function deleteLanguage(id) {
@@ -233,7 +204,7 @@ function display_languages()
 		}
 		</script>";
 	start_table($table_style);
-	$th = array(_("Language"), _("Name"), _("Encoding"), _("Right To Left"), "", "");
+	$th = array(_("Language"), _("Name"), _("Encoding"), _("Right To Left"), _("Default"), "", "");
 	table_header($th);
 
 	$k = 0;
@@ -254,9 +225,17 @@ function display_languages()
 		else
 			$rtl = _("No");
 		label_cell($rtl);
-		edit_link_cell("selected_id=" . $i);
-		if ($conn[$i]['code'] != $lang)
-			label_cell("<a href='javascript:deleteLanguage(" . $i . ")'>" . _("Delete") . "</a>");
+		label_cell($dflt_lang == $conn[$i]['code'] ? _("Yes") :_("No"));
+		$edit = _("Edit");
+		$delete = _("Delete");
+		if (user_graphic_links())
+		{
+			$edit = set_icon(ICON_EDIT, $edit);
+			$delete = set_icon(ICON_DELETE, $delete);
+		}
+    	label_cell("<a href='" . $_SERVER['PHP_SELF']. "?selected_id=$i'>$edit</a>");
+		label_cell($conn[$i]['code'] == $lang ? '' :
+			"<a href='javascript:deleteLanguage(" . $i . ")'>$delete</a>");
 		end_row();
 	}
 
@@ -268,14 +247,14 @@ function display_languages()
 
 function display_language_edit($selected_id)
 {
-	global $installed_languages, $table_style2;
+	global $installed_languages, $table_style2, $dflt_lang;
 
 	if ($selected_id != -1)
 		$n = $selected_id;
 	else
 		$n = count($installed_languages);
-	
-	start_form(true, true);
+
+	start_form(true);
 
 	echo "
 		<script language='javascript'>
@@ -284,10 +263,10 @@ function display_language_edit($selected_id)
 			document.forms[0].submit()
 		}
 		</script>";
-	
+
 	start_table($table_style2);
 
-	if ($selected_id != -1) 
+	if ($selected_id != -1)
 	{
 		$conn = $installed_languages[$selected_id];
 		$_POST['code'] = $conn['code'];
@@ -297,19 +276,22 @@ function display_language_edit($selected_id)
 			$_POST['rtl']  = $conn['rtl'];
 		else
 			$_POST['rtl'] = false;
+		$_POST['dflt'] = $dflt_lang == $conn['code'];
 		hidden('selected_id', $selected_id);
-	} 
-	text_row_ex(_("Language"), 'code', 20);
-	text_row_ex(_("Name"), 'name', 20);
+	}
+	text_row_ex(_("Language Code"), 'code', 20);
+	text_row_ex(_("Language Name"), 'name', 20);
 	text_row_ex(_("Encoding"), 'encoding', 20);
 
 	yesno_list_row(_("Right To Left"), 'rtl', null, "", "", false);
+	yesno_list_row(_("Default Language"), 'dflt', null, "", "", false);
 
-	label_row(_("Language File"), "<input name='uploadfile' type='file'>");
+	label_row(_("Language File") . " (PO)", "<input name='uploadfile' type='file'>");
+	label_row(_("Language File") . " (MO)", "<input name='uploadfile2' type='file'>");
 
 	end_table(0);
-	display_note(_("Select your language MO file from your local harddisk."), 0, 1);
-	echo "<center><input onclick='javascript:updateLanguage()' type='button' style='width:150' value='". _("Save"). "'>";
+	display_note(_("Select your language files from your local harddisk."), 0, 1);
+	echo "<center><input onclick='javascript:updateLanguage()' type='button' style='width:150px' value='". _("Save"). "'></center>";
 
 
 	end_form();
@@ -320,18 +302,18 @@ function display_language_edit($selected_id)
 
 if (isset($_GET['c']))
 {
-	if ($_GET['c'] == 'df') 
+	if ($_GET['c'] == 'df')
 	{
 		handle_delete();
 	}
 
-	if ($_GET['c'] == 'u') 
+	if ($_GET['c'] == 'u')
 	{
-		if (handle_submit()) 
+		if (handle_submit())
 		{
 			//meta_forward($_SERVER['PHP_SELF']);
 		}
-	}	
+	}
 }
 
 //---------------------------------------------------------------------------------------------