X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=admin%2Finst_lang.php;h=b5d5c16a33f816a38766d5ae7e373eade7357ff5;hb=30c04f9f87e74bd4201f56ce25f02d4c5d01f99b;hp=98776618fb59dfbcdde68fdb920636a58188c3d0;hpb=45966656906337a4119f03df3d2cea55e22f1757;p=fa-stable.git
diff --git a/admin/inst_lang.php b/admin/inst_lang.php
index 98776618..b5d5c16a 100644
--- a/admin/inst_lang.php
+++ b/admin/inst_lang.php
@@ -1,5 +1,14 @@
.
+***********************************************************************/
$page_security = 20;
$path_to_root="..";
include_once($path_to_root . "/includes/session.inc");
@@ -28,8 +37,10 @@ else
function check_data()
{
- if ($_POST['code'] == "" || $_POST['name'] == "" || $_POST['encoding'] == "")
+ if ($_POST['code'] == "" || $_POST['name'] == "" || $_POST['encoding'] == "") {
+ display_error(_("Language name, code nor encoding cannot be empty"));
return false;
+ }
return true;
}
@@ -78,7 +89,7 @@ function array_natsort($aryData, $strIndex, $strSortBy, $strSortType=false)
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');
@@ -95,7 +106,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)
@@ -110,7 +122,9 @@ 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.
@@ -145,13 +159,17 @@ 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'];
@@ -187,42 +205,28 @@ function handle_submit()
function handle_delete()
{
- global $path_to_root, $installed_languages;
+ global $path_to_root, $installed_languages, $dflt_lang;
$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);
+ 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']);
}
@@ -230,7 +234,7 @@ function handle_delete()
function display_languages()
{
- global $table_style, $installed_languages;
+ global $table_style, $installed_languages, $dflt_lang;
$lang = $_SESSION["language"]->code;
@@ -243,7 +247,7 @@ function display_languages()
}
";
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;
@@ -264,10 +268,17 @@ function display_languages()
else
$rtl = _("No");
label_cell($rtl);
- edit_link_cell("selected_id=" . $i);
-
+ 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("$edit");
label_cell($conn[$i]['code'] == $lang ? '' :
- "" . _("Delete") . "");
+ "$delete");
end_row();
}
@@ -279,14 +290,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 "