Skip to content

Commit

Permalink
Fix rewrite
Browse files Browse the repository at this point in the history
  • Loading branch information
@hoaquynhtim99
hoaquynhtim99 committed Nov 10, 2015
1 parent 28e67bb commit b8367f9
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
8 changes: 4 additions & 4 deletions includes/rewrite.php
View file
Expand Up @@ -16,7 +16,7 @@
if( $global_config['rewrite_optional'] )
{
// Rewrite module page
$rewrite["#\"(" . NV_BASE_SITEURL . ")index.php\?" . NV_LANG_VARIABLE . "=([a-z-]+)\&[amp;]*" . NV_NAME_VARIABLE . "=page\&[amp;]*" . NV_OP_VARIABLE . "=([a-zA-Z0-9-]+)" . $global_config['rewrite_exturl'] . "\"#"] = "\"\\1\\3" . $global_config['rewrite_exturl'] . "\"";
$rewrite["#\"(" . NV_BASE_SITEURL . ")index.php\?" . NV_LANG_VARIABLE . "=([a-z-]+)\&[amp;]*" . NV_NAME_VARIABLE . "=page\&[amp;]*" . NV_OP_VARIABLE . "=([a-zA-Z0-9-]+)" . preg_quote( $global_config['rewrite_exturl'], '#' ) . "\"#"] = "\"\\1\\3" . $global_config['rewrite_exturl'] . "\"";

// Rewrite to remove module name on url
if( $global_config['rewrite_op_mod'] != '' )
Expand All @@ -29,7 +29,7 @@
$rewrite["#\"(" . NV_BASE_SITEURL . ")index.php\?" . NV_LANG_VARIABLE . "=([a-z-]+)\&[amp;]*" . NV_NAME_VARIABLE . "=" . $global_config['rewrite_op_mod'] . "\&[amp;]*" . NV_OP_VARIABLE . "=tag/([^\"]+)\"#"] = "\"\\1tag/\\3\"";

// Module
$rewrite["#\"(" . NV_BASE_SITEURL . ")index.php\?" . NV_LANG_VARIABLE . "=([a-z-]+)\&[amp;]*" . NV_NAME_VARIABLE . "=" . $global_config['rewrite_op_mod'] . "\&[amp;]*" . NV_OP_VARIABLE . "=([a-zA-Z0-9-/]+)" . $global_config['rewrite_exturl'] . "\"#"] = "\"\\1\\3" . $global_config['rewrite_exturl'] . "\"";
$rewrite["#\"(" . NV_BASE_SITEURL . ")index.php\?" . NV_LANG_VARIABLE . "=([a-z-]+)\&[amp;]*" . NV_NAME_VARIABLE . "=" . $global_config['rewrite_op_mod'] . "\&[amp;]*" . NV_OP_VARIABLE . "=([a-zA-Z0-9-/]+)" . preg_quote( $global_config['rewrite_exturl'], '#' ) . "\"#"] = "\"\\1\\3" . $global_config['rewrite_exturl'] . "\"";
$rewrite["#\"(" . NV_BASE_SITEURL . ")index.php\?" . NV_LANG_VARIABLE . "=([a-z-]+)\&[amp;]*" . NV_NAME_VARIABLE . "=" . $global_config['rewrite_op_mod'] . "\&[amp;]*" . NV_OP_VARIABLE . "=([a-zA-Z0-9-/]+)\"#"] = "\"\\1\\3" . $global_config['rewrite_endurl'] . "\"";
$rewrite["#\"(" . NV_BASE_SITEURL . ")index.php\?" . NV_LANG_VARIABLE . "=([a-z-]+)\&[amp;]*" . NV_NAME_VARIABLE . "=" . $global_config['rewrite_op_mod'] . "/([a-zA-Z0-9-/]+)\"#"] = "\"\\1\\3" . $global_config['rewrite_endurl'] . "\"";
if( $global_config['rewrite_op_mod'] == $global_config['site_home_module'] )
Expand All @@ -49,7 +49,7 @@
$rewrite["#\"(" . NV_BASE_SITEURL . ")index.php\?" . NV_LANG_VARIABLE . "=([a-z-]+)\&[amp;]*" . NV_NAME_VARIABLE . "=([a-zA-Z0-9-]+)\&[amp;]*" . NV_OP_VARIABLE . "=tag/([^\"]+)\"#"] = "\"\\1\\3/tag/\\4\"";

// Rewrite module has funcs url
$rewrite["#\"(" . NV_BASE_SITEURL . ")index.php\?" . NV_LANG_VARIABLE . "=([a-z-]+)\&[amp;]*" . NV_NAME_VARIABLE . "=([a-zA-Z0-9-]+)\&[amp;]*" . NV_OP_VARIABLE . "=([a-zA-Z0-9-/]+)" . $global_config['rewrite_exturl'] . "\"#"] = "\"\\1\\3/\\4" . $global_config['rewrite_exturl'] . "\"";
$rewrite["#\"(" . NV_BASE_SITEURL . ")index.php\?" . NV_LANG_VARIABLE . "=([a-z-]+)\&[amp;]*" . NV_NAME_VARIABLE . "=([a-zA-Z0-9-]+)\&[amp;]*" . NV_OP_VARIABLE . "=([a-zA-Z0-9-/]+)" . preg_quote( $global_config['rewrite_exturl'], '#' ) . "\"#"] = "\"\\1\\3/\\4" . $global_config['rewrite_exturl'] . "\"";
$rewrite["#\"(" . NV_BASE_SITEURL . ")index.php\?" . NV_LANG_VARIABLE . "=([a-z-]+)\&[amp;]*" . NV_NAME_VARIABLE . "=([a-zA-Z0-9-]+)\&[amp;]*" . NV_OP_VARIABLE . "=([a-zA-Z0-9-/]+)\"#"] = "\"\\1\\3/\\4" . $global_config['rewrite_endurl'] . "\"";

// Rewrite module url
Expand All @@ -69,7 +69,7 @@
$rewrite["#\"(" . NV_BASE_SITEURL . ")index.php\?" . NV_LANG_VARIABLE . "=([a-z-]+)\&[amp;]*" . NV_NAME_VARIABLE . "=([a-zA-Z0-9-]+)\&[amp;]*" . NV_OP_VARIABLE . "=tag/([^\"]+)\"#"] = "\"\\1\\2/\\3/tag/\\4\"";

// Rewrite module has funcs url
$rewrite["#\"(" . NV_BASE_SITEURL . ")index.php\?" . NV_LANG_VARIABLE . "=([a-z-]+)\&[amp;]*" . NV_NAME_VARIABLE . "=([a-zA-Z0-9-]+)\&[amp;]*" . NV_OP_VARIABLE . "=([a-zA-Z0-9-/]+)" . $global_config['rewrite_exturl'] . "\"#"] = "\"\\1\\2/\\3/\\4" . $global_config['rewrite_exturl'] . "\"";
$rewrite["#\"(" . NV_BASE_SITEURL . ")index.php\?" . NV_LANG_VARIABLE . "=([a-z-]+)\&[amp;]*" . NV_NAME_VARIABLE . "=([a-zA-Z0-9-]+)\&[amp;]*" . NV_OP_VARIABLE . "=([a-zA-Z0-9-/]+)" . preg_quote( $global_config['rewrite_exturl'], '#' ) . "\"#"] = "\"\\1\\2/\\3/\\4" . $global_config['rewrite_exturl'] . "\"";
$rewrite["#\"(" . NV_BASE_SITEURL . ")index.php\?" . NV_LANG_VARIABLE . "=([a-z-]+)\&[amp;]*" . NV_NAME_VARIABLE . "=([a-zA-Z0-9-]+)\&[amp;]*" . NV_OP_VARIABLE . "=([a-zA-Z0-9-/]+)\"#"] = "\"\\1\\2/\\3/\\4" . $global_config['rewrite_endurl'] . "\"";

// Rewrite module url
Expand Down
8 changes: 4 additions & 4 deletions includes/rewrite_index.php
View file
Expand Up @@ -16,7 +16,7 @@
if( $global_config['rewrite_optional'] )
{
// Rewrite module page
$rewrite["#\"(" . NV_BASE_SITEURL . ")index.php\?" . NV_LANG_VARIABLE . "=([a-z-]+)\&[amp;]*" . NV_NAME_VARIABLE . "=page\&[amp;]*" . NV_OP_VARIABLE . "=([a-zA-Z0-9-/]+)" . $global_config['rewrite_exturl'] . "\"#"] = "\"\\1index.php/\\3" . $global_config['rewrite_exturl'] . "\"";
$rewrite["#\"(" . NV_BASE_SITEURL . ")index.php\?" . NV_LANG_VARIABLE . "=([a-z-]+)\&[amp;]*" . NV_NAME_VARIABLE . "=page\&[amp;]*" . NV_OP_VARIABLE . "=([a-zA-Z0-9-/]+)" . preg_quote( $global_config['rewrite_exturl'], '#' ) . "\"#"] = "\"\\1index.php/\\3" . $global_config['rewrite_exturl'] . "\"";

// Rewrite to remove module name on url
if( $global_config['rewrite_op_mod'] != '' )
Expand All @@ -29,7 +29,7 @@
$rewrite["#\"(" . NV_BASE_SITEURL . ")index.php\?" . NV_LANG_VARIABLE . "=([a-z-]+)\&[amp;]*" . NV_NAME_VARIABLE . "=" . $global_config['rewrite_op_mod'] . "\&[amp;]*" . NV_OP_VARIABLE . "=tag/([^\"]+)\"#"] = "\"\\1index.php/tag/\\3\"";

// Module
$rewrite["#\"(" . NV_BASE_SITEURL . ")index.php\?" . NV_LANG_VARIABLE . "=([a-z-]+)\&[amp;]*" . NV_NAME_VARIABLE . "=" . $global_config['rewrite_op_mod'] . "\&[amp;]*" . NV_OP_VARIABLE . "=([a-zA-Z0-9-/]+)" . $global_config['rewrite_exturl'] . "\"#"] = "\"\\1index.php/\\3" . $global_config['rewrite_exturl'] . "\"";
$rewrite["#\"(" . NV_BASE_SITEURL . ")index.php\?" . NV_LANG_VARIABLE . "=([a-z-]+)\&[amp;]*" . NV_NAME_VARIABLE . "=" . $global_config['rewrite_op_mod'] . "\&[amp;]*" . NV_OP_VARIABLE . "=([a-zA-Z0-9-/]+)" . preg_quote( $global_config['rewrite_exturl'], '#' ) . "\"#"] = "\"\\1index.php/\\3" . $global_config['rewrite_exturl'] . "\"";
$rewrite["#\"(" . NV_BASE_SITEURL . ")index.php\?" . NV_LANG_VARIABLE . "=([a-z-]+)\&[amp;]*" . NV_NAME_VARIABLE . "=" . $global_config['rewrite_op_mod'] . "\&[amp;]*" . NV_OP_VARIABLE . "=([a-zA-Z0-9-/]+)\"#"] = "\"\\1index.php/\\3" . $global_config['rewrite_endurl'] . "\"";
$rewrite["#\"(" . NV_BASE_SITEURL . ")index.php\?" . NV_LANG_VARIABLE . "=([a-z-]+)\&[amp;]*" . NV_NAME_VARIABLE . "=" . $global_config['rewrite_op_mod'] . "/([a-zA-Z0-9-/]+)\"#"] = "\"\\1index.php/\\3" . $global_config['rewrite_endurl'] . "\"";
if( $global_config['rewrite_op_mod'] == $global_config['site_home_module'] )
Expand All @@ -49,7 +49,7 @@
$rewrite["#\"(" . NV_BASE_SITEURL . ")index.php\?" . NV_LANG_VARIABLE . "=([a-z-]+)\&[amp;]*" . NV_NAME_VARIABLE . "=([a-zA-Z0-9-]+)\&[amp;]*" . NV_OP_VARIABLE . "=tag/([^\"]+)\"#"] = "\"\\1index.php/\\3/tag/\\4\"";

// Rewrite module has funcs url
$rewrite["#\"(" . NV_BASE_SITEURL . ")index.php\?" . NV_LANG_VARIABLE . "=([a-z-]+)\&[amp;]*" . NV_NAME_VARIABLE . "=([a-zA-Z0-9-]+)\&[amp;]*" . NV_OP_VARIABLE . "=([a-zA-Z0-9-/]+)" . $global_config['rewrite_exturl'] . "\"#"] = "\"\\1index.php/\\3/\\4" . $global_config['rewrite_exturl'] . "\"";
$rewrite["#\"(" . NV_BASE_SITEURL . ")index.php\?" . NV_LANG_VARIABLE . "=([a-z-]+)\&[amp;]*" . NV_NAME_VARIABLE . "=([a-zA-Z0-9-]+)\&[amp;]*" . NV_OP_VARIABLE . "=([a-zA-Z0-9-/]+)" . preg_quote( $global_config['rewrite_exturl'], '#' ) . "\"#"] = "\"\\1index.php/\\3/\\4" . $global_config['rewrite_exturl'] . "\"";
$rewrite["#\"(" . NV_BASE_SITEURL . ")index.php\?" . NV_LANG_VARIABLE . "=([a-z-]+)\&[amp;]*" . NV_NAME_VARIABLE . "=([a-zA-Z0-9-]+)\&[amp;]*" . NV_OP_VARIABLE . "=([a-zA-Z0-9-/]+)\"#"] = "\"\\1index.php/\\3/\\4" . $global_config['rewrite_endurl'] . "\"";

// Rewrite module url
Expand All @@ -69,7 +69,7 @@
$rewrite["#\"(" . NV_BASE_SITEURL . ")index.php\?" . NV_LANG_VARIABLE . "=([a-z-]+)\&[amp;]*" . NV_NAME_VARIABLE . "=([a-zA-Z0-9-]+)\&[amp;]*" . NV_OP_VARIABLE . "=tag/([^\"]+)\"#"] = "\"\\1index.php/\\2/\\3/tag/\\4\"";

// Rewrite module has funcs url
$rewrite["#\"(" . NV_BASE_SITEURL . ")index.php\?" . NV_LANG_VARIABLE . "=([a-z-]+)\&[amp;]*" . NV_NAME_VARIABLE . "=([a-zA-Z0-9-]+)\&[amp;]*" . NV_OP_VARIABLE . "=([a-zA-Z0-9-/]+)" . $global_config['rewrite_exturl'] . "\"#"] = "\"\\1index.php/\\2/\\3/\\4" . $global_config['rewrite_exturl'] . "\"";
$rewrite["#\"(" . NV_BASE_SITEURL . ")index.php\?" . NV_LANG_VARIABLE . "=([a-z-]+)\&[amp;]*" . NV_NAME_VARIABLE . "=([a-zA-Z0-9-]+)\&[amp;]*" . NV_OP_VARIABLE . "=([a-zA-Z0-9-/]+)" . preg_quote( $global_config['rewrite_exturl'], '#' ) . "\"#"] = "\"\\1index.php/\\2/\\3/\\4" . $global_config['rewrite_exturl'] . "\"";
$rewrite["#\"(" . NV_BASE_SITEURL . ")index.php\?" . NV_LANG_VARIABLE . "=([a-z-]+)\&[amp;]*" . NV_NAME_VARIABLE . "=([a-zA-Z0-9-]+)\&[amp;]*" . NV_OP_VARIABLE . "=([a-zA-Z0-9-/]+)\"#"] = "\"\\1index.php/\\2/\\3/\\4" . $global_config['rewrite_endurl'] . "\"";

// Rewrite module url
Expand Down

0 comments on commit b8367f9

Please sign in to comment.