beta 3

add language support

onebuttoninstaller/ext/onebuttoninstaller-config.php

@@ -37,6 +37,7 @@ $dummy = gettext("The changes have been applied successfully.");
 $dummy = gettext("The configuration has been changed.<br />You must apply the changes in order for them to take effect.");
 $dummy = gettext("The following input errors were detected");
 
+bindtextdomain("nas4free", "/usr/local/share/locale-obi");
 $pgtitle = array(gettext("Extensions"), gettext("OneButtonInstaller")." ".$config['onebuttoninstaller']['version'], gettext("Configuration"));
 
 if (!isset($config['onebuttoninstaller']) || !is_array($config['onebuttoninstaller'])) $config['onebuttoninstaller'] = array();
@@ -92,7 +93,9 @@ $pconfig['enable'] = isset($config['onebuttoninstaller']['enable']) ? true : fal
 $pconfig['storage_path'] = !empty($config['onebuttoninstaller']['storage_path']) ? $config['onebuttoninstaller']['storage_path'] : $g['media_path'];
 $pconfig['auto_update'] = isset($config['onebuttoninstaller']['auto_update']) ? true : false;
 
-include("fbegin.inc");?>  
+bindtextdomain("nas4free", "/usr/local/share/locale");                  // to get the right main menu language
+include("fbegin.inc");
+bindtextdomain("nas4free", "/usr/local/share/locale-obi"); ?>
 <script type="text/javascript">
 <!--
 function enable_change(enable_change) {

onebuttoninstaller/ext/onebuttoninstaller-update_extension.php

@@ -32,6 +32,7 @@
 require("auth.inc");
 require("guiconfig.inc");
 
+bindtextdomain("nas4free", "/usr/local/share/locale-obi");
 $pgtitle = array(gettext("Extensions"), gettext("OneButtonInstaller")." ".$config['onebuttoninstaller']['version'], gettext("Maintenance"));
 
 if (is_file("{$config['onebuttoninstaller']['rootfolder']}log/oneload")) { require_once("{$config['onebuttoninstaller']['rootfolder']}log/oneload"); }
@@ -61,6 +62,8 @@ if (isset($_POST['ext_remove']) && $_POST['ext_remove']) {
 // remove extension pages
 	mwexec ("rm -rf /usr/local/www/ext/onebuttoninstaller");
 	mwexec ("rm -rf /usr/local/www/onebuttoninstaller*");
+// unlink created links
+    if (is_link("/usr/local/share/locale-obi")) unlink("/usr/local/share/locale-obi");
 // remove application section from config.xml
 	if ( is_array($config['onebuttoninstaller'] ) ) { unset( $config['onebuttoninstaller'] ); write_config();}
 	header("Location:index.php");
@@ -75,7 +78,10 @@ if (isset($_POST['ext_update']) && $_POST['ext_update']) {
     }
     else { $input_errors[] = sprintf(gettext("Download of installation file %s failed, installation aborted!"), "onebuttoninstaller-install.php"); }
 }
-include("fbegin.inc");?>
+
+bindtextdomain("nas4free", "/usr/local/share/locale");                  // to get the right main menu language
+include("fbegin.inc");
+bindtextdomain("nas4free", "/usr/local/share/locale-obi"); ?>
 <!-- The Spinner Elements -->
 <?php include("ext/onebuttoninstaller/spinner.inc");?>
 <script src="ext/onebuttoninstaller/spin.min.js"></script>

onebuttoninstaller/ext/onebuttoninstaller.php

@@ -33,6 +33,7 @@ require("auth.inc");
 require("guiconfig.inc");
 if (!isset($config['onebuttoninstaller']['enable'])) header("Location:onebuttoninstaller-config.php");
 
+bindtextdomain("nas4free", "/usr/local/share/locale-obi");
 $pgtitle = array(gettext("Extensions"), gettext("OneButtonInstaller")." ".$config['onebuttoninstaller']['version']);
 
 $log = 0;
@@ -167,7 +168,9 @@ if (isset($_POST['update']) || (isset($config['onebuttoninstaller']['auto_update
 
 if (!is_file("{$config['onebuttoninstaller']['rootfolder']}extensions.txt")) $errormsg .= sprintf(gettext("File %s not found!"), "{$config['onebuttoninstaller']['rootfolder']}extensions.txt")."<br />";
 
-include("fbegin.inc");?>
+bindtextdomain("nas4free", "/usr/local/share/locale");                  // to get the right main menu language
+include("fbegin.inc");
+bindtextdomain("nas4free", "/usr/local/share/locale-obi"); ?>
 <!-- The Spinner Elements -->
 <?php include("ext/onebuttoninstaller/spinner.inc");?>
 <script src="ext/onebuttoninstaller/spin.min.js"></script>

onebuttoninstaller/onebuttoninstaller-install.php

@@ -31,6 +31,7 @@
 */
 /* 
 Version Date        Description
+0.1-b3  2016.02.06  N: add language support
 0.1-b2  2016.02.02  N: check for supported architecture, plattform
                     N: auto update of extensions list
 0.1-b1  2016.01.28  real install/update from GitHub
@@ -40,7 +41,7 @@ Version Date        Description
 0.1-a1  2016.01.16  initial release
                     
 */
-$v = "v0.1-b2";      // extension version
+$v = "v0.1-b3";      // extension version
 $appname = "OneButtonInstaller";
 
 require_once("config.inc");

onebuttoninstaller/onebuttoninstaller-start.php

@@ -30,6 +30,8 @@
     either expressed or implied, of the FreeBSD Project.
 */
 $extension_dir = "/usr/local/www"; 
+
+if ( !is_link ( "/usr/local/share/locale-obi")) { mwexec("ln -s {$config['onebuttoninstaller']['rootfolder']}locale-obi /usr/local/share/", true); }     // create link to languages
 $return_val = mwexec("cp -R {$config['onebuttoninstaller']['rootfolder']}ext/* {$extension_dir}/", true);
 if ($return_val == 0) exec("logger onebuttoninstaller: started");
 else exec("logger onebuttoninstaller: error during startup, not started"); 

onebuttoninstaller/release_notes.txt

@@ -1,4 +1,5 @@
 Version Date        Description
+0.1-b3  2016.02.06  N: add language support
 0.1-b2  2016.02.01  N: check for supported architecture, plattform
                     N: auto update of extensions list
 0.1-b1  2016.01.29  beta release

onebuttoninstaller/version.txt

@@ -1 +1 @@
-0.1-b2
+0.1-b3

onebuttoninstaller_install.php

@@ -7,8 +7,6 @@ $release = explode("-", exec("uname -r"));
 if ($release[0] >= 9.3) $verify_hostname = "--no-verify-hostname";
 else $verify_hostname = "";
 
-$install_dir = dirname(__FILE__)."/";                           // get directory where the installer script resides
-if (!is_dir("{$install_dir}onebuttoninstaller/log")) { mkdir("{$install_dir}onebuttoninstaller/log", 0775, true); }
 $return_val = mwexec("fetch {$verify_hostname} -vo onebuttoninstaller/onebuttoninstaller-install.php 'https://raw.github.com/crestAT/nas4free-onebuttoninstaller/master/onebuttoninstaller/onebuttoninstaller-install.php'", true);
 if ($return_val == 0) { 
     chmod("onebuttoninstaller/onebuttoninstaller-install.php", 0775);