From c034b141cb6f8e6a03095de04c96aa4d9f7e4cfc Mon Sep 17 00:00:00 2001
From: lolalalol <4880713-lolalalol@users.noreply.gitlab.com>
Date: Mon, 23 Dec 2019 22:25:00 +0100
Subject: [PATCH] Added R=302 No "?" added if no query string fix "public
 const"

---
 index.php                         |  7 +++----
 src/ApacheModRewriteGenerator.php | 10 ++++++----
 src/Engine.php                    |  2 +-
 src/RewriteTypes.php              |  7 +++++--
 4 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/index.php b/index.php
index 7d9c931..6c3014d 100644
--- a/index.php
+++ b/index.php
@@ -45,10 +45,9 @@
 <form method="post">
 	<textarea id="tsv-input" cols="100" rows="20" name="tabbed_rewrites" style="width: 100%; height: 265px;" title="TSV Input"><?php echo htmlentities($paramRewrites) ?></textarea><br />
 	<select name="type" title="Rewrite Type">
-		<option value="<?= RewriteTypes::PERMANENT_REDIRECT ?>">301</option>
-		<option value="<?= RewriteTypes::SERVER_REWRITE ?>" <?php echo $paramType === RewriteTypes::SERVER_REWRITE ? ' selected' : '' ?>>
-			Rewrite
-		</option>
+            <option value="<?= RewriteTypes::TEMPORARY_REDIRECT ?>" <?php echo $paramType === RewriteTypes::TEMPORARY_REDIRECT ? ' selected' : '' ?>>302</option>
+            <option value="<?= RewriteTypes::PERMANENT_REDIRECT ?>" <?php echo $paramType === RewriteTypes::PERMANENT_REDIRECT ? ' selected' : '' ?>>301</option>
+            <option value="<?= RewriteTypes::SERVER_REWRITE ?>" <?php echo $paramType === RewriteTypes::SERVER_REWRITE ? ' selected' : '' ?>>Rewrite</option>
 	</select>
 	<label>
 		<input type="checkbox" name="desc_comments" value="1"<?php echo $paramComments ? ' checked' : '' ?>>Comments
diff --git a/src/ApacheModRewriteGenerator.php b/src/ApacheModRewriteGenerator.php
index 45f3f1b..2eab230 100644
--- a/src/ApacheModRewriteGenerator.php
+++ b/src/ApacheModRewriteGenerator.php
@@ -35,7 +35,7 @@ public function generateRewrite( string $from, string $to, int $type ) : string
 		$toHost   = $parsedTo['host'] ?? '';
 
 		$fromQuery = $parsedFrom['query'] ?? '';
-		$toQuery   = $parsedTo['query'] ?? '';
+		$toQuery   = (isset($parsedTo['query']) && $parsedTo['query']!='') ? '?'.$parsedTo['query'] : '';
 
 		$fromPath = urldecode($parsedFrom['path'] ?? '');
 		$toPath   = urldecode($parsedTo['path'] ?? '');
@@ -63,20 +63,22 @@ public function generateRewrite( string $from, string $to, int $type ) : string
 			}
 		}
 
-		$output .= 'RewriteRule ^' . preg_quote(ltrim($fromPath, '/'), ' ') . '$ ' . $this->escapeSubstitution($prefix . ltrim($toPath, '/')) . '?' . $toQuery;
+		$output .= 'RewriteRule ^' . preg_quote(ltrim($fromPath, '/'), ' ') . '$ ' . $this->escapeSubstitution($prefix . ltrim($toPath, '/')) . $toQuery;
 
 		switch( $type ) {
 			case RewriteTypes::SERVER_REWRITE:
 				return "{$output}&%{QUERY_STRING}";
 			case RewriteTypes::PERMANENT_REDIRECT:
-				return "{$output} [L,R=301]";
+                        case RewriteTypes::TEMPORARY_REDIRECT:
+				return "{$output} [L,R=".RewriteTypes::name($type)."]";
 		}
 
 		throw new InvalidArgumentException("Unhandled RewriteType: {$type}", $type);
 	}
 
 	private function escapeSubstitution( string $input ) : string {
-		return preg_replace('/[-\s%$\\\\]/', '\\\\$0', $input);
+		//return preg_replace('/[-\s%$\\\\]/', '\\\\$0', $input);
+            return $input;
 	}
 
 }
diff --git a/src/Engine.php b/src/Engine.php
index 5778d09..310d57a 100644
--- a/src/Engine.php
+++ b/src/Engine.php
@@ -48,7 +48,7 @@ public function generate( string $input, int $type, bool $comments ) : string {
 					}
 
 					$output .= $this->generator->generateRewrite($explodedLine[0], $explodedLine[1], $type);
-					$output .= "\n\n";
+					$output .= "\n";
 				} catch( GenerationException $e ) {
 					$output .= $this->generator->comment('ERROR: ' . $e->getMessage() . ': ' . $line);
 					$output .= "\n";
diff --git a/src/RewriteTypes.php b/src/RewriteTypes.php
index 4602f5e..6439c98 100644
--- a/src/RewriteTypes.php
+++ b/src/RewriteTypes.php
@@ -4,8 +4,9 @@
 
 abstract class RewriteTypes {
 
-	public const SERVER_REWRITE     = 1;
-	public const PERMANENT_REDIRECT = 2;
+	const SERVER_REWRITE     = 1;
+	const PERMANENT_REDIRECT = 2;
+        const TEMPORARY_REDIRECT = 3;
 
 	public static function name( int $type ) : string {
 		switch( $type ) {
@@ -13,6 +14,8 @@ public static function name( int $type ) : string {
 				return 'Rewrite';
 			case self::PERMANENT_REDIRECT:
 				return '301';
+			case self::TEMPORARY_REDIRECT:
+				return '302';
 		}
 
 		throw new \InvalidArgumentException('invalid type', $type);