Menu
▾
▴
[Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[43130] trunk
|
From: <am...@us...> - 2012-09-25 18:07:52
|
Revision: 43130
http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=43130&view=rev
Author: amette
Date: 2012-09-25 18:07:46 +0000 (Tue, 25 Sep 2012)
Log Message:
-----------
[ENH] Check for availability of Apache modules (rewrite/deflate/expires)
Modified Paths:
--------------
trunk/templates/tiki-check.tpl
trunk/tiki-check.php
Modified: trunk/templates/tiki-check.tpl
===================================================================
--- trunk/templates/tiki-check.tpl 2012-09-25 17:22:02 UTC (rev 43129)
+++ trunk/templates/tiki-check.tpl 2012-09-25 18:07:46 UTC (rev 43130)
@@ -132,6 +132,42 @@
{/foreach}
</table>
+<h2>{tr}Apache properties{/tr}</h2>
+{if $apache_properties}
+ <table class="normal">
+ <tr>
+ <th>{tr}Property{/tr}</th>
+ <th>{tr}Value{/tr}</th>
+ <th>{tr}Tiki Fitness{/tr}</th>
+ <th>{tr}Explanation{/tr}</th>
+ </tr>
+ {cycle values="even,odd" print=false}
+ {foreach from=$apache_properties key=key item=item}
+ <tr class="{cycle}">
+ <td class="text">{$key}</td>
+ <td class="text">{$item.setting}</td>
+ <td class="text">
+ {if $item.fitness eq 'good'}
+ {icon _id=accept alt="$item.fitness" style="vertical-align:middle"}
+ {elseif $item.fitness eq 'bad'}
+ {icon _id=exclamation alt="$item.fitness" style="vertical-align:middle"}
+ {elseif $item.fitness eq 'ugly'}
+ {icon _id=error alt="$item.fitness" style="vertical-align:middle"}
+ {elseif $item.fitness eq 'unknown'}
+ {icon _id=error alt="$item.fitness" style="vertical-align:middle"}
+ {/if}
+ {$item.fitness}
+ </td>
+ <td class="text">{$item.message}</td>
+ </tr>
+ {foreachelse}
+ {norecords _colspan=4}
+ {/foreach}
+ </table>
+{else}
+ {$no_apache_properties}
+{/if}
+
<h2>{tr}PHP security properties{/tr}</h2>
<table class="normal">
<tr>
Modified: trunk/tiki-check.php
===================================================================
--- trunk/tiki-check.php 2012-09-25 17:22:02 UTC (rev 43129)
+++ trunk/tiki-check.php 2012-09-25 18:07:46 UTC (rev 43130)
@@ -906,6 +906,66 @@
}
}
+// Apache properties
+
+if ( function_exists(apache_get_version)) {
+ $apache_properties = array();
+
+ // Apache Modules
+ $apache_modules = apache_get_modules();
+
+ // mod_rewrite
+ $s = false;
+ $s = array_search('mod_rewrite', $apache_modules);
+ if ($s) {
+ $apache_properties['mod_rewrite'] = array(
+ 'setting' => 'Loaded',
+ 'fitness' => tra('good') ,
+ 'message' => tra('Tiki needs this module for Search Engine Friendly URLs via .htaccess. We can\'t check though, if your web server respects configurations made in .htaccess. For further information go to Admin->SefURL in your Tiki.')
+ );
+ } else {
+ $apache_properties['mod_rewrite'] = array(
+ 'setting' => 'Not available',
+ 'fitness' => tra('ugly') ,
+ 'message' => tra('Tiki needs this module for Search Engine Friendly URLs. For further information go to Admin->SefURL in your Tiki.')
+ );
+ }
+
+ // mod_expires
+ $s = false;
+ $s = array_search('mod_expires', $apache_modules);
+ if ($s) {
+ $apache_properties['mod_expires'] = array(
+ 'setting' => 'Loaded',
+ 'fitness' => tra('good') ,
+ 'message' => tra('With this module you can set the HTTP Expires header and therefore increase performance. We can\'t check though, if mod_expires is configured correctly.')
+ );
+ } else {
+ $apache_properties['mod_expires'] = array(
+ 'setting' => 'Not available',
+ 'fitness' => tra('ugly') ,
+ 'message' => tra('With this module you can set the HTTP Expires header and therefore increase performance. Once you install it, you still need to configure it correctly.')
+ );
+ }
+
+ // mod_deflate
+ $s = false;
+ $s = array_search('mod_deflate', $apache_modules);
+ if ($s) {
+ $apache_properties['mod_deflate'] = array(
+ 'setting' => 'Loaded',
+ 'fitness' => tra('good') ,
+ 'message' => tra('With this module you can compress the data your webserver sends out and therefore decrease used bandwidth and increase performance. We can\'t check though, if mod_deflate is configured correctly.')
+ );
+ } else {
+ $apache_properties['mod_deflate'] = array(
+ 'setting' => 'Not available',
+ 'fitness' => tra('ugly') ,
+ 'message' => tra('With this module you can compress the data your webserver sends out and therefore decrease used bandwidth and increase performance. Once you install it, you still need to configure it correctly.')
+ );
+ }
+}
+
// Security Checks
// get all dangerous php settings and check them
$security = array();
@@ -1046,6 +1106,12 @@
render_table($server_properties);
echo '<h2>PHP scripting language properties</h2>';
render_table($php_properties);
+ echo '<h2>Apache properties</h2>';
+ if ($apache_properties) {
+ render_table($apache_properties);
+ } else {
+ echo 'You are either not running the preferred Apache web server or you are running PHP with a SAPI that does not allow checking Apache properties (e.g. CGI or FPM).';
+ }
echo '<h2>PHP security properties</h2>';
render_table($security);
echo '<h2>MySQL Variables</h2>';
@@ -1062,10 +1128,15 @@
echo '<a href="'.$_SERVER['REQUEST_URI'].'?phpinfo=y">Append phpinfo();</a>';
}
} else {
- $smarty-> assign_by_ref('server_information', $server_information);
+ $smarty->assign_by_ref('server_information', $server_information);
$smarty->assign_by_ref('server_properties', $server_properties);
$smarty->assign_by_ref('mysql_properties', $mysql_properties);
$smarty->assign_by_ref('php_properties', $php_properties);
+ if ($apache_properties) {
+ $smarty->assign_by_ref('apache_properties', $apache_properties);
+ } else {
+ $smarty->assign('no_apache_properties', 'You are either not running the preferred Apache web server or you are running PHP with a SAPI that does not allow checking Apache properties (e.g. CGI or FPM).');
+ }
$smarty->assign_by_ref('security', $security);
$smarty->assign_by_ref('mysql_variables', $mysql_variables);
$smarty->assign_by_ref('mysql_crashed_tables', $mysql_crashed_tables);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|