--- a/install/includes/stages/website.php Sat Mar 14 15:26:33 2009 -0400
+++ b/install/includes/stages/website.php Sat Mar 21 14:54:16 2009 -0400
@@ -56,6 +56,20 @@
}
else
{
+ ajaxGet(scriptPath + '/install/install.php?/tiny&do=modrewrite_test', __ajaxMrwTest_chain_tiny);
+ }
+ }
+ }
+ var __ajaxMrwTest_chain_tiny = function()
+ {
+ if ( ajax.readyState == 4 )
+ {
+ if ( ajax.responseText == 'good_tiny' )
+ {
+ ajaxMrwSet('tiny');
+ }
+ else
+ {
ajaxGet(scriptPath + '/install/install.php?do=modrewrite_test&str=standard', __ajaxMrwTest_chain_standard);
}
}
@@ -78,12 +92,13 @@
function ajaxMrwSet(level)
{
install_unset_ajax_loading();
- if ( !in_array(level, ['rewrite', 'shortened', 'standard']) )
+ if ( !in_array(level, ['rewrite', 'shortened', 'standard', 'tiny']) )
return false;
document.getElementById('url_radio_rewrite').checked = false;
document.getElementById('url_radio_shortened').checked = false;
document.getElementById('url_radio_standard').checked = false;
+ document.getElementById('url_radio_tiny').checked = false;
document.getElementById('url_radio_' + level).checked = true;
document.getElementById('url_radio_' + level).focus();
@@ -95,6 +110,9 @@
case 'shortened':
var str = $lang.get('website_msg_bestmethod_shortened');
break;
+ case 'tiny':
+ var str = $lang.get('website_msg_bestmethod_tiny');
+ break;
case 'standard':
var str = $lang.get('website_msg_bestmethod_standard');
break;
@@ -148,7 +166,7 @@
?>
<?php
- $patch_necessary = ( ( strtolower(PHP_OS) == 'win32' || strtolower(PHP_OS) == 'winnt' ) && substr(@$_SERVER['SERVER_SOFTWARE'], 'Apache/2.2') );
+ $patch_necessary = ( ( strtolower(PHP_OS) == 'win32' || strtolower(PHP_OS) == 'winnt' ) && strstr(@$_SERVER['SERVER_SOFTWARE'], 'Apache/2.2') );
if ( defined('WINDOWS_MOD_REWRITE_WORKAROUNDS') )
{
?>
@@ -264,6 +282,23 @@
</tr>
</table>
+ <table border="0" cellpadding="10" cellspacing="0">
+ <tr>
+ <td valign="top">
+ <input type="radio" name="url_scheme" value="tiny" id="url_radio_tiny" tabindex="5" />
+ </td>
+ <td>
+ <label for="url_radio_tiny">
+ <b><?php echo $lang->get('website_field_urlscheme_opt_tiny'); ?></b>
+ </label>
+ <span id="hint_url_scheme_tiny" class="fieldtip">
+ <p><?php echo $lang->get('website_field_urlscheme_opt_tiny_hint'); ?></p>
+ <p><small><b><?php echo $lang->get('website_field_urlscheme_lbl_example'); ?></b> <tt><?php echo $scriptpath_full . '?/Page'; ?></tt></small></p>
+ </span>
+ </td>
+ </tr>
+ </table>
+
<p>
<a href="#mrw_scan" onclick="ajaxMrwTest(); return false;" tabindex="4"><?php echo $lang->get('website_btn_urlscheme_detect'); ?></a>
</p>