yetangitu/ampache
1
0
Fork 0
mirror of https://github.com/Yetangitu/ampache synced 2025-10-06 03:49:56 +02:00
Code Issues Releases Wiki Activity

Issue #559, corrected the variables as suggested by quack23.

Browse source
This commit is contained in:
dipsol 2009-11-05 14:06:58 +00:00
parent 70e99db5b6
commit 074c00c304
1 changed files with 101 additions and 101 deletions
Download patch file Download diff file Expand all files Collapse all files

202
lib/debug.lib.php
View file

@ -32,36 +32,36 @@
* checks the local mysql db and make sure life is good * checks the local mysql db and make sure life is good
*/ */
function check_database($host,$username,$pass) { function check_database($host,$username,$pass) {
$dbh = @mysql_connect($host, $username, $pass); $dbh = @mysql_connect($host, $username, $pass);
if (!is_resource($dbh)) { if (!is_resource($dbh)) {
return false; return false;
} }
if (!$host || !$username) { if (!$host || !$username) {
return false; return false;
} }
return $dbh; return $dbh;
} // check_database } // check_database
/** /**
* check_database_inserted * check_database_inserted
* checks to make sure that you have inserted the database * checks to make sure that you have inserted the database
* and that the user you are using has access to it * and that the user you are using has access to it
*/ */
function check_database_inserted($dbh,$db_name) { function check_database_inserted($dbh,$db_name) {
$sql = "DESCRIBE session"; $sql = "DESCRIBE session";
$db_results = Dba::query($sql); $db_results = Dba::query($sql);
if (!$db_results) { if (!$db_results) {
return false; return false;
} }
// Make sure the whole table is there // Make sure the whole table is there
if (Dba::num_rows($db_results) != '7') { if (Dba::num_rows($db_results) != '7') {
return false; return false;
} }
@ -79,19 +79,19 @@ function check_php_ver($level=0) {
if (floatval(phpversion()) < 5.1) { if (floatval(phpversion()) < 5.1) {
return false; return false;
} }
// Poor windows users if only their OS wasn't behind the times // Poor windows users if only their OS wasn't behind the times
if (strtoupper(substr(PHP_OS,0,3)) == 'WIN' AND floatval(phpversion()) < 5.3) { if (strtoupper(substr(PHP_OS,0,3)) == 'WIN' AND floatval(phpversion()) < 5.3) {
return false; return false;
} }
// Make sure that they have the sha256() algo installed // Make sure that they have the sha256() algo installed
if (!function_exists('hash_algos')) { return false; } if (!function_exists('hash_algos')) { return false; }
$algos = hash_algos(); $algos = hash_algos();
if (!in_array('sha256',$algos)) { if (!in_array('sha256',$algos)) {
return false; return false;
} }
return true; return true;
@ -101,9 +101,9 @@ function check_php_ver($level=0) {
* check_php_mysql * check_php_mysql
* checks for mysql support by looking for the mysql_query function * checks for mysql support by looking for the mysql_query function
*/ */
function check_php_mysql() { function check_php_mysql() {
if (!function_exists('mysql_query')) { if (!function_exists('mysql_query')) {
return false; return false;
} }
@ -113,12 +113,12 @@ function check_php_mysql() {
/** /**
* check_php_session * check_php_session
* checks to make sure the needed functions * checks to make sure the needed functions
* for sessions exist * for sessions exist
*/ */
function check_php_session() { function check_php_session() {
if (!function_exists('session_set_save_handler')) { if (!function_exists('session_set_save_handler')) {
return false; return false;
} }
@ -130,9 +130,9 @@ function check_php_session() {
* check_php_iconv * check_php_iconv
* checks to see if you have iconv installed * checks to see if you have iconv installed
*/ */
function check_php_iconv() { function check_php_iconv() {
if (!function_exists('iconv')) { if (!function_exists('iconv')) {
return false; return false;
} }
@ -145,13 +145,13 @@ function check_php_iconv() {
* This makes sure they have pcre (preg_???) support * This makes sure they have pcre (preg_???) support
* compiled into PHP this is required! * compiled into PHP this is required!
*/ */
function check_php_pcre() { function check_php_pcre() {
if (!function_exists('preg_match')) { if (!function_exists('preg_match')) {
return false; return false;
} }
return true; return true;
} // check_php_pcre } // check_php_pcre
@ -159,30 +159,30 @@ function check_php_pcre() {
* check_config_values * check_config_values
* checks to make sure that they have at least set the needed variables * checks to make sure that they have at least set the needed variables
*/ */
function check_config_values($conf) { function check_config_values($conf) {
if (!$conf['database_hostname']) { if (!$conf['database_hostname']) {
return false; return false;
} }
if (!$conf['database_name']) { if (!$conf['database_name']) {
return false;
}
if (!$conf['database_username']) {
return false;
}
if (!$conf['database_password']) {
return false; return false;
} }
if (!$conf['session_length']) { if (!$conf['database_username']) {
return false; return false;
} }
if (!$conf['session_name']) { if (!$conf['database_password']) {
return false;
}
if (!$conf['session_length']) {
return false;
}
if (!$conf['session_name']) {
return false; return false;
} }
if (!isset($conf['session_cookielife'])) { if (!isset($conf['session_cookielife'])) {
return false; return false;
} }
if (!isset($conf['session_cookiesecure'])) { if (!isset($conf['session_cookiesecure'])) {
return false; return false;
} }
if (isset($conf['debug'])) { if (isset($conf['debug'])) {
@ -190,7 +190,7 @@ function check_config_values($conf) {
return false; return false;
} }
} }
return true; return true;
} // check_config_values } // check_config_values
@ -201,16 +201,16 @@ function check_config_values($conf) {
* recommended range, this doesn't take into account the size of your * recommended range, this doesn't take into account the size of your
* catalog. * catalog.
*/ */
function check_php_memory() { function check_php_memory() {
$current = ini_get('memory_limit'); $current_memory = ini_get('memory_limit');
$current = substr($current_memory,0,strlen($current_memory)-1); $current_memory = substr($current_memory,0,strlen($current_memory)-1);
if (intval($current) < 48) { if (intval($current_memory) < 48) {
return false; return false;
} }
return true; return true;
} // check_php_memory } // check_php_memory
@ -219,54 +219,54 @@ function check_php_memory() {
* This checks to make sure that the php timelimit is set to some * This checks to make sure that the php timelimit is set to some
* semi-sane limit, IE greater then 30 seconds * semi-sane limit, IE greater then 30 seconds
*/ */
function check_php_timelimit() { function check_php_timelimit() {
$current = ini_get('max_execution_time'); $current = ini_get('max_execution_time');
if (intval($current) < 60) { if (intval($current) < 60) {
return false; return false;
} }
return true; return true;
} // check_php_timelimit } // check_php_timelimit
/** /**
* check_putenv * check_putenv
* This checks to see if we can manually set the * This checks to see if we can manually set the
* memory limit, and other putenvs we need for * memory limit, and other putenvs we need for
* ampache to work correctly * ampache to work correctly
*/ */
function check_putenv() { function check_putenv() {
/* Check memory */ /* Check memory */
$current = ini_get('memory_limit'); $current_memory = ini_get('memory_limit');
$current = substr($current_memory,0,strlen($current_memory)-1); $current_memory = substr($current_memory,0,strlen($current_memory)-1);
$new_limit = ($current+16) . "M"; $new_limit = ($current_memory+16) . "M";
/* Bump it by 16 megs (for getid3)*/ /* Bump it by 16 megs (for getid3)*/
if (!ini_set(memory_limit,$new_limit)) { if (!ini_set(memory_limit,$new_limit)) {
return false; return false;
} }
// Make sure it actually worked // Make sure it actually worked
$current = ini_get('memory_limit'); $new_memory = ini_get('memory_limit');
if ($new_limit != $current) { if ($new_limit != $new_memory) {
return false; return false;
}
/* Check if safe mode is on */
if (ini_get('safe_mode')) {
return false;
} }
// See if we can override the set_time_limit(); /* Check if safe mode is on */
$current = ini_get('max_execution_time'); if (ini_get('safe_mode')) {
set_time_limit($current+60); return false;
}
if ($current == ini_get('max_execution_time')) { // See if we can override the set_time_limit();
return false; $current = ini_get('max_execution_time');
} set_time_limit($current+60);
if ($current == ini_get('max_execution_time')) {
return false;
}
return true; return true;
@ -277,13 +277,13 @@ function check_putenv() {
* check_gettext * check_gettext
* This checks to see if you've got gettext installed * This checks to see if you've got gettext installed
*/ */
function check_gettext() { function check_gettext() {
if (!function_exists('gettext')) { if (!function_exists('gettext')) {
return false; return false;
} }
return true; return true;
} // check_gettext } // check_gettext
@ -291,22 +291,22 @@ function check_gettext() {
* check_mbstring * check_mbstring
* This checks for mbstring support * This checks for mbstring support
*/ */
function check_mbstring() { function check_mbstring() {
if (!function_exists('mb_check_encoding')) { if (!function_exists('mb_check_encoding')) {
return false; return false;
} }
return true; return true;
} // check_mbstring } // check_mbstring
/** /**
* generate_config * generate_config
* This takes an array of results and re-generates the config file * This takes an array of results and re-generates the config file
* this is used by the installer and by the admin/system page * this is used by the installer and by the admin/system page
*/ */
function generate_config($current) { function generate_config($current) {
/* Start building the new config file */ /* Start building the new config file */
$distfile = Config::get('prefix') . '/config/ampache.cfg.php.dist'; $distfile = Config::get('prefix') . '/config/ampache.cfg.php.dist';
@ -328,21 +328,21 @@ function generate_config($current) {
$value = $matches[2]; $value = $matches[2];
/* Put in the current value */ /* Put in the current value */
if ($key == 'config_version') { if ($key == 'config_version') {
$line = $key . ' = ' . $value; $line = $key . ' = ' . $value;
} }
elseif (isset($current[$key])) { elseif (isset($current[$key])) {
$line = $key . ' = "' . $current[$key] . '"'; $line = $key . ' = "' . $current[$key] . '"';
unset($current[$key]); unset($current[$key]);
} // if set } // if set
} // if key } // if key
$final .= $line . "\n"; $final .= $line . "\n";
} // end foreach line } // end foreach line
return $final; return $final;
} // generate_config } // generate_config
@ -350,14 +350,14 @@ function generate_config($current) {
* debug_ok * debug_ok
* Return an "OK" with the specified string * Return an "OK" with the specified string
*/ */
function debug_result($comment,$status=false,$value=false) { function debug_result($comment,$status=false,$value=false) {
$class = $status ? 'ok' : 'notok'; $class = $status ? 'ok' : 'notok';
if (!$value) { if (!$value) {
$value = $status ? 'OK' : 'ERROR'; $value = $status ? 'OK' : 'ERROR';
} }
$final = '<span class="' . $class . '">' . scrub_out($value) . '</span> <em>' . $comment . '</em>'; $final = '<span class="' . $class . '">' . scrub_out($value) . '</span> <em>' . $comment . '</em>';
return $final; return $final;