updated translations, new russian translation, generate config tool to update config and new putenv test on /test.php

2 files changed, 28 insertions, 3 deletions

diff --git a/lib/debug.php b/lib/debug.lib.php
index 637ca178..5320e019 100644
--- a/lib/debug.php
+++ b/lib/debug.lib.php
@@ -266,8 +266,6 @@ function debug_read_config($config_file,$debug) {
         
         $value = trim($value);
        
-       	if (substr($value,0,1) == '#') { continue; } 
-
         if (preg_match("/^#?([\w\d]+)\s+=\s+[\"]{1}(.*?)[\"]{1}$/",$value,$matches)
                         || preg_match("/^#?([\w\d]+)\s+=\s+[\']{1}(.*?)[\']{1}$/", $value, $matches)
                         || preg_match("/^#?([\w\d]+)\s+=\s+[\'\"]{0}(.*)[\'\"]{0}$/",$value,$matches)) {
@@ -340,4 +338,31 @@ function debug_compare_configs($config,$dist_config) {
 } // debug_compare_configs
 
 
+/**
+ * check_putenv
+ * This checks to see if we can manually set the
+ * memory limit, and other putenvs we need for 
+ * ampache to work correctly 
+ */
+function check_putenv() { 
+
+	/* Check memory */
+	$current = ini_get('memory_limit');
+	$current = substr($current_memory,0,strlen($current_memory)-1);
+	$new_limit = ($current+1) . "M";
+	
+	/* Bump it by one meg */
+	if (!ini_set(memory_limit,$new_limit)) { 
+		return false; 
+	}
+
+	/* Check if safe mode is on */
+	if (ini_get('safe_mode')) { 
+		return false; 
+	}
+
+	return true;
+
+} // check_putenv
+
 ?>
diff --git a/lib/init.php b/lib/init.php
index 530e37e1..a3beaf4b 100644
--- a/lib/init.php
+++ b/lib/init.php
@@ -80,7 +80,7 @@ if (!$results['allow_stream_playback']) {
 
 
 /** This is the version.... fluf nothing more... **/
-$results['version']		= '3.3.3-Alpha1 (Build 003)';
+$results['version']		= '3.3.3-Alpha1 (Build 004)';
 
 $results['raw_web_path']	= $results['web_path'];
 $results['web_path']		= $http_type . $_SERVER['HTTP_HOST'] . $results['web_path'];