Merge pull request #230 from ABCD-DEVCOM/branch-to-update

Branch to update
ABCD-DEVCOM · Nov 28, 2021 · b31567a · b31567a
2 parents 1215810 + f854cc8
commit b31567a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/www/htdocs/central/config.php b/www/htdocs/central/config.php
@@ -11,6 +11,7 @@
 2021-11-04 fho4abcd: Check that extension mbstring is loaded
 2021-11-11 fho4abcd: Remove ffi
 2021-11-23 fho4abcd: Allow trailing backslash for $db_path
+2021-11-28 fho4abcd: Ensure trailing slash in ABCD_path
 */
 
 ini_set('error_reporting', E_ALL);
@@ -41,6 +42,9 @@
  	$db_path="/var/opt/ABCD/bases/"; // path where the databases are to be located
  	$exe_ext="";                     // extension for executables
 }
+// Ensure ABCD_path has trailing / or \.
+if ( (substr($ABCD_path, strlen($ABCD_path)-1,1) <> "/") AND (substr($ABCD_path, strlen($ABCD_path)-1,1) <> "\\")) $ABCD_path.="/";
+
 $ABCD_scripts_path=$ABCD_path. "www/htdocs/";  //PATH
 
 //IF THERE ARE MULTIPLE BASES FOLDERS THE FOLDER SELECTED IS SET
@@ -68,7 +72,7 @@
 $ext_allowed=array("jpg","gif","png","pdf","doc","docx","xls","xlsx","odt");    //extensions allowed for uploading files (used in dataentry/)
 
 // *** NO CHANGES NEEDED BELOW HERE
-// Ensure db_path has has trailing / or \.
+// Ensure db_path has trailing / or \.
 if ( (substr($db_path, strlen($db_path)-1,1) <> "/") AND (substr($db_path, strlen($db_path)-1,1) <> "\\")) $db_path.="/";
 
 // Construction of executable path and URL                             

diff --git a/www/htdocs/central/lang/translate.php b/www/htdocs/central/lang/translate.php
@@ -2,6 +2,7 @@
 /* Modified
 20210521 fho4abcd Replaced helper code fragment by included file
 20210521 fho4abcd Rewritten: use correct encoding for translation
+20121128 fho4abcd Translations with quotes are now shown correct
 */
 /*
 ** The encoding of the translated messages must match with the entered text
@@ -216,7 +217,7 @@ function doReload(selectvalue){
         if ( isset($msgarr[$lang])) $value=$msgarr[$lang];
         $msgname="msg_".$msgarr["code"];
         ?>
-        <td width=75%><input type=text style='width:100%' name=<?php echo $msgname;?> value="<?php echo $value;?>"></td>
+        <td width=75%><input type=text style='width:100%' name=<?php echo $msgname;?> value="<?php echo str_replace("\"","&quot;",$value);?>"></td>
         </tr>
         <?php
      }