From 8278e52a8921dfe12ac38859b660e44a59ff226b Mon Sep 17 00:00:00 2001 From: "o.pinke" Date: Tue, 8 Jun 2021 13:02:52 +0200 Subject: [PATCH] fixed and close #22 --- conlite/includes/include.lang_edit.php | 72 ++++++++++----------- conlite/includes/include.lang_overview.php | 73 +++++++++++----------- 2 files changed, 72 insertions(+), 73 deletions(-) diff --git a/conlite/includes/include.lang_edit.php b/conlite/includes/include.lang_edit.php index 266b5db..9602d3b 100644 --- a/conlite/includes/include.lang_edit.php +++ b/conlite/includes/include.lang_edit.php @@ -59,15 +59,15 @@ if ($action == "lang_newlanguage" || $action == "lang_deletelanguage") { if ($action == "lang_deletelanguage") { // finally delete from dropdown in header $newOption = ''; + var langList = top.header.document.getElementById("cLanguageSelect"); + var thepos=""; + for(var i=0;i'; } if ($action == "lang_newlanguage") { @@ -79,10 +79,10 @@ if ($action == "lang_newlanguage" || $action == "lang_deletelanguage") { } $newOption = ''; + var newLang = new Option("' . i18n("New language") . ' (' . $new_idlang . ')", "' . $new_idlang . '", false, false); + var langList = top.header.document.getElementById("cLanguageSelect"); + langList.options[langList.options.length] = newLang; + '; $idlang = $new_idlang; } @@ -106,16 +106,16 @@ if ($action == "lang_newlanguage" || $action == "lang_deletelanguage") { // update dropdown in header $newOption = ''; + var langList = top.header.document.getElementById("cLanguageSelect"); + var thepos=""; + for(var i=0;i'; } if (!$perm->have_perm_area_action($area, $action)) { @@ -135,14 +135,14 @@ if ($action == "lang_newlanguage" || $action == "lang_deletelanguage") { $tpl->reset(); $sql = "SELECT - A.idlang AS idlang, A.name AS name, A.active as active, A.encoding as encoding, A.direction as direction, - B.idclient AS idclient - FROM - " . $cfg["tab"]["lang"] . " AS A, - " . $cfg["tab"]["clients_lang"] . " AS B - WHERE - A.idlang = '" . Contenido_Security::toInteger($idlang) . "' AND - B.idlang = '" . Contenido_Security::toInteger($idlang) . "'"; + A.idlang AS idlang, A.name AS name, A.active as active, A.encoding as encoding, A.direction as direction, + B.idclient AS idclient + FROM + " . $cfg["tab"]["lang"] . " AS A, + " . $cfg["tab"]["clients_lang"] . " AS B + WHERE + A.idlang = '" . Contenido_Security::toInteger($idlang) . "' AND + B.idlang = '" . Contenido_Security::toInteger($idlang) . "'"; $db->query($sql); $db->next_record(); @@ -201,7 +201,11 @@ if ($action == "lang_newlanguage" || $action == "lang_deletelanguage") { $eselect = new cHTMLSelectElement("sencoding"); $eselect->setStyle('width:255px'); $eselect->autoFill($charsets); - $eselect->setDefault($db->f("encoding")); + if($db->f("encoding")) { + $eselect->setDefault($db->f("encoding")); + } else { + $eselect->setDefault('utf-8'); + } $languagecode = new cHTMLSelectElement("languagecode"); $languagecode->setStyle('width:255px'); @@ -256,9 +260,7 @@ if ($action == "lang_newlanguage" || $action == "lang_deletelanguage") { if ($_REQUEST['action'] != '') { $page->addScript('reload', $sReload); } - $page->render(); } } -} -?> \ No newline at end of file +} \ No newline at end of file diff --git a/conlite/includes/include.lang_overview.php b/conlite/includes/include.lang_overview.php index 8948133..a40a96d 100644 --- a/conlite/includes/include.lang_overview.php +++ b/conlite/includes/include.lang_overview.php @@ -1,4 +1,5 @@ query($sql); -$tpl->set('s','TARGETCLIENT',$targetclient); +$tpl->set('s', 'TARGETCLIENT', $targetclient); $iLangCount = 0; while ($db->next_record()) { $iLangCount++; - + $idlang = $db->f("idlang"); if ($db->f("active") == 0) { - //activate + //activate $message = i18n("Activate language"); - $active = "url("main.php?area=$area&action=lang_activatelanguage&frame=$frame&targetclient=$targetclient&idlang=".$db->f("idlang"))."#clickedhere\">\"$message\""; + $active = "url("main.php?area=$area&action=lang_activatelanguage&frame=$frame&targetclient=$targetclient&idlang=" . $db->f("idlang")) . "#clickedhere\">\"$message\""; } else { //deactivate - $message = i18n("Deactivate language"); - $active = "url("main.php?area=$area&action=lang_deactivatelanguage&frame=$frame&targetclient=$targetclient&idlang=".$db->f("idlang"))."#clickedhere\">\"$message\""; + $message = i18n("Deactivate language"); + $active = "url("main.php?area=$area&action=lang_deactivatelanguage&frame=$frame&targetclient=$targetclient&idlang=" . $db->f("idlang")) . "#clickedhere\">\"$message\""; } // Delete Button - $deleteMsg = sprintf(i18n("Do you really want to delete the language %s?"),clHtmlSpecialChars($db->f("name"))); + $deleteMsg = sprintf(i18n("Do you really want to delete the language %s?"), clHtmlSpecialChars($db->f("name"))); $deleteAct = i18n("Delete language"); - $deletebutton = ''.$deleteAct.''; + $deletebutton = '' . $deleteAct . ''; $bgcolor = ( is_int($tpl->dyn_cnt / 2) ) ? $cfg["color"]["table_light"] : $cfg["color"]["table_dark"]; - - $tpl->set('d', 'BGCOLOR', $bgcolor); - $tpl->set('d', 'LANGUAGE', ''.$db->f("name").' ('.$idlang.')'); - $tpl->set('d', 'ACTIVATEBUTTON', $active); - $tpl->set('d', 'DELETEBUTTON', $deletebutton); + + $tpl->set('d', 'BGCOLOR', $bgcolor); + $tpl->set('d', 'LANGUAGE', '' . $db->f("name") . ' (' . $idlang . ')'); + $tpl->set('d', 'ACTIVATEBUTTON', $active); + $tpl->set('d', 'DELETEBUTTON', $deletebutton); //$tpl->set('d', 'ICON', ''); $tpl->set('d', 'ICON', ''); - + if ($iGetIdlang == $idlang) { $tpl->set('d', 'MARKED', ' id="marked" '); } else { $tpl->set('d', 'MARKED', ''); } - + $tpl->next(); } -$newlanguageform = '
- '.$sess->hidden_session(true).' +$newlanguageform = ' + ' . $sess->hidden_session(true) . ' -
'.i18n("New language").': +
' . i18n("New language") . ':     - +
'; $tpl->set('s', 'NEWLANGUAGEFORM', $newlanguageform); $tpl->set('s', 'SID', $sess->id); -if ( $tmp_notification ) { +if ($tmp_notification) { - $noti_html = ''.$tmp_notification.''; + $noti_html = '' . $tmp_notification . ''; $tpl->set('s', 'NOTIFICATION', $noti_html); - } else { $tmp_notification = $notification->returnNotification("info", i18n("Language deleted")); - - $noti_html = ''.$tmp_notification.''; + + $noti_html = '' . $tmp_notification . ''; $tpl->set('s', 'NOTIFICATION', ''); - } $tpl->set('s', 'LANG_COUNT', $iLangCount); # Generate template $tpl->generate($cfg['path']['templates'] . $cfg['templates']['lang_overview']); - ?> \ No newline at end of file