From e9f54c8d72bdd6944c87805c87548ff7947b864c Mon Sep 17 00:00:00 2001 From: Karl 'vollmerk' Vollmer Date: Wed, 7 May 2008 06:23:39 +0000 Subject: initial debug work --- admin/index.php | 4 +-- admin/system.php | 16 +++++++++-- lib/class/config.class.php | 59 +++++++++++++++++------------------------ templates/show_debug.inc.php | 57 +++++++++++++++++++++++++++++++++++++++ templates/show_test.inc.php | 6 ++--- templates/sidebar_admin.inc.php | 3 ++- 6 files changed, 102 insertions(+), 43 deletions(-) create mode 100644 templates/show_debug.inc.php diff --git a/admin/index.php b/admin/index.php index ea2d7e14..ee66a291 100644 --- a/admin/index.php +++ b/admin/index.php @@ -1,7 +1,7 @@ has_access(100)) { +if (!Access::check('interface',100)) { access_denied(); exit(); } diff --git a/admin/system.php b/admin/system.php index a2ca3012..3b338346 100644 --- a/admin/system.php +++ b/admin/system.php @@ -1,7 +1,7 @@ has_access(100)) { +if (!Access::check('interface',100)) { access_denied(); exit(); } @@ -42,6 +42,18 @@ switch ($_REQUEST['action']) { echo $final; break; + case 'show_debug': + show_header(); + $configuration = Config::get_all(); + require_once Config::get('prefix') . '/templates/show_debug.inc.php'; + show_footer(); + break; + case 'check_php_settings': + + break; + case 'check_iconv': + + break; /* Check this version against ampache.org's record */ case 'check_version': diff --git a/lib/class/config.class.php b/lib/class/config.class.php index dbb75f41..d846f225 100644 --- a/lib/class/config.class.php +++ b/lib/class/config.class.php @@ -1,7 +1,7 @@ _local[$name]; - } - else { - return self::$_global[$name]; - } + return self::$_global[$name]; } // get + + /** + * get_all + * This returns all of the current config variables as an array + */ + public static function get_all() { + + return self::$_global; + + } // get_all /** + * set * This checks to see if this is an instance or procedure calls * and then sets the correct variable based on that */ public static function set($name, $value, $clobber = 0) { - if (isset($this)) { - if (isset($this->_local[$name]) && !$clobber) { - Error::add('Config Instance',"Trying to clobber '$name' without setting clobber"); - return; - } - else { - $this->_local[$name] = $value; - } - } // if object + if (isset(self::$_global[$name]) && !$clobber) { + Error::add('Config Global',"Trying to clobber'$name' without setting clobber"); + return; + } else { - if (isset(self::$_global[$name]) && !$clobber) { - Error::add('Config Global',"Trying to clobber'$name' without setting clobber"); - return; - } - else { - self::$_global[$name] = $value; - } - } // else not object, procedure call + self::$_global[$name] = $value; + } } // set /** + * set_by_array * This is the same as the set function except it takes an array as input */ - public static function set_by_array($array, $clobber = 0) { - if (isset($this)) { - foreach ($array as $name => $value) { - $this->set($name, $value, $clobber); - } // end foreach - } // if this is an object - else { - foreach ($array as $name => $value) { - self::set($name,$value,$clobber); - } - } // end if procedural call + foreach ($array as $name => $value) { + self::set($name,$value,$clobber); + } } // set_by_array diff --git a/templates/show_debug.inc.php b/templates/show_debug.inc.php new file mode 100644 index 00000000..f6dbf7c3 --- /dev/null +++ b/templates/show_debug.inc.php @@ -0,0 +1,57 @@ + + + + + + + ++ + + + + + + +$value) { + if ($key == 'database_password' || $key == 'mysql_password') { $value = '*********'; } + if (is_array($value)) { + $string = ''; + foreach ($value as $setting) { + $string .= $setting . '
'; + } + $value = $string; + } +?> + + + + + +
+ diff --git a/templates/show_test.inc.php b/templates/show_test.inc.php index 6fbfc45e..4fa81cf3 100644 --- a/templates/show_test.inc.php +++ b/templates/show_test.inc.php @@ -1,7 +1,7 @@ - DB Inserted + [ - Web Path + [