diff options
| author | Karl 'vollmerk' Vollmer <vollmer@ampache.org> | 2006-05-23 16:44:25 +0000 |
|---|---|---|
| committer | Karl 'vollmerk' Vollmer <vollmer@ampache.org> | 2006-05-23 16:44:25 +0000 |
| commit | c2a57645536f71cc206d658484359d477b454677 (patch) | |
| tree | 9f0cb5b992d4bfa74a76b9428a1d8feb47cfa66e | |
| parent | d4b700e2fe1eeb47fbea7b61c295eba16f30c41c (diff) | |
| download | ampache-c2a57645536f71cc206d658484359d477b454677.tar.gz ampache-c2a57645536f71cc206d658484359d477b454677.tar.bz2 ampache-c2a57645536f71cc206d658484359d477b454677.zip | |
updated test.php
| -rwxr-xr-x | docs/CHANGELOG | 2 | ||||
| -rw-r--r-- | lib/debug.php | 18 | ||||
| -rw-r--r-- | modules/vauth/session.lib.php | 2 | ||||
| -rw-r--r-- | templates/show_test.inc | 38 |
4 files changed, 51 insertions, 9 deletions
diff --git a/docs/CHANGELOG b/docs/CHANGELOG index e90977d7..243858d7 100755 --- a/docs/CHANGELOG +++ b/docs/CHANGELOG @@ -4,6 +4,8 @@ -------------------------------------------------------------------------- v.3.3.2-Beta3 + - Added PCRE check on /test.php and updated to use Ros's new + spiffy theme - Added pruning of empty playlists (Admin Only) - Fixed error on /login.php when theme isn't set which caused a fopen failure to show up in the logs diff --git a/lib/debug.php b/lib/debug.php index db8f08ea..b6564d8e 100644 --- a/lib/debug.php +++ b/lib/debug.php @@ -162,6 +162,24 @@ function check_php_iconv() { } // check_php_iconv +/** + * check_php_pcre + * This makes sure they have pcre (preg_???) support + * compiled into PHP this is required! + */ +function check_php_pcre() { + + if (!function_exists('preg_match')) { + $error['error_state'] = true; + $error['php_pcre'] = false; + } + + if ($error['error_state']) { return false; } + + return true; + +} // check_php_pcre + /*! @function check_config_values() @discussion checks to make sure that they have at diff --git a/modules/vauth/session.lib.php b/modules/vauth/session.lib.php index 9c30e1bc..9139c3b9 100644 --- a/modules/vauth/session.lib.php +++ b/modules/vauth/session.lib.php @@ -176,7 +176,7 @@ function vauth_session_cookie() { /* Set the Cookies Paramaters, this is very very important */ $cookie_life = vauth_conf('cookie_life'); $cookie_path = vauth_conf('cookie_path'); - $cookie_domain = vauth_conf('cookie_domain'); + $cookie_domain = false; $cookie_secure = vauth_conf('cookkie_secure'); session_set_cookie_params($cookie_life,$cookie_path,$cookie_domain,$cookie_secure); diff --git a/templates/show_test.inc b/templates/show_test.inc index fe0d3220..237f48cc 100644 --- a/templates/show_test.inc +++ b/templates/show_test.inc @@ -29,9 +29,11 @@ $row_classes = array('even','odd'); <title>Ampache -- Debug Page</title> </head> <body bgcolor="#f0f0f0"> -<h2><?php echo _('Ampache Debug'); ?></h2> +<?php require_once('templates/install.css'); ?> +<div id="header"> +<h1><?php echo _('Ampache Debug'); ?></h1> <p><?php echo _('You\'ve reached this page because a configuration error has occured. Debug Information below'); ?></p> - +</div> <table border="0" cellpadding="3" cellspacing="0"> <tr> <td><font size="+1"><?php echo _('CHECK'); ?></font></td> @@ -100,7 +102,7 @@ $row_classes = array('even','odd'); <tr> <td valign="top"><?php echo _('PHP ICONV Support'); ?></td> <td valign="top">[ - <? + <?php if (!check_php_iconv()) { $status['iconv_php'] = 'false'; echo " <font color=\"red\">ERROR</font> "; @@ -116,9 +118,26 @@ $row_classes = array('even','odd'); </td> </tr> <tr> + <td valign="top"><?php echo _('PHP PCRE Support'); ?></td> + <td valign="top">[ + <?php + if (!check_php_pcre()) { + $status['pcre_php'] = 'false'; + echo " <font color=\"red\">ERROR</font> "; + } + else { + echo "<font color=\"green\"> OK </font> "; + } + ?>] + </td> + <td> + <?php echo _('This test makes sure you have PCRE support compiled into your version of PHP, this is required for Ampache.'); ?> + </td> +</tr> +<tr> <td valign="top"><?php echo _('Ampache.cfg.php Exists'); ?></td> <td valign="top">[ - <? + <?php if (!read_config_file($configfile)) { $status['read_config'] = 'false'; echo " <font color=\"red\">ERROR</font> "; @@ -261,8 +280,11 @@ $row_classes = array('even','odd'); logo here then your web_path is not set correctly. </td> </tr> - </table> - - - +</div> +<div id="bottom"> +<p><b>Ampache Debug.</b><br /> +For the love of Music.</p> +</div> +</body> +</html> |