Refactoring Controller & Reducing NPath Score

TechTailor · Feb 1, 2018 · f4d64e2 · f4d64e2
1 parent ceda102
commit f4d64e2
Showing 1 changed file with 46 additions and 40 deletions.
diff --git a/src/RPGController.php b/src/RPGController.php
@@ -7,6 +7,40 @@
 
 class RPGController extends Controller
 {
+
+	public function Preset($preset)
+	{
+		if($preset == 1)
+		{
+			$size = 8;
+			$dashes = 0;
+			$characters = 'ld';
+		}
+
+		else if($preset == 2)
+		{
+			$size = 8;
+			$dashes = 0;
+			$characters = 'lud';
+		}
+
+		else if($preset == 3)
+		{
+			$size = 12;
+			$dashes = 0;
+			$characters = 'luds';
+		}
+
+		else if($preset == 4)
+		{
+			$size = 16;
+			$dashes = 1;
+			$characters = 'luds';
+		}
+
+		return $this->Generate($characters, $size, $dashes);
+	}
+
 	public function Generate($characters, $size, $dashes)
 	{
 		$sets = array();
@@ -39,55 +73,27 @@ public function Generate($characters, $size, $dashes)
 
 		$password = str_shuffle($password);
 
-		if(!$dashes)
+		if($dashes==0)
 			return $password;
-
+
+		else if($dashes==1)
+			return $this->addDashes($size,$password);
+	}
+
+	protected static function addDashes($size,$password)
+	{
 		$dash_len = floor(sqrt($size));
 
-		$dash_str = '';
+		$final_str = '';
 
 		while(strlen($password) > $dash_len)
 		{
-			$dash_str .= substr($password, 0, $dash_len) . '-';
+			$final_str .= substr($password, 0, $dash_len) . '-';
 			$password = substr($password, $dash_len);
 		}
 
-		$dash_str .= $password;
-
-		return $dash_str;
-
-	}
-
-	public function Preset($preset)
-	{
-		if($preset == 1)
-		{
-			$size = 8;
-			$dashes = 0;
-			$characters = 'ld';
-		}
-
-		else if($preset == 2)
-		{
-			$size = 8;
-			$dashes = 0;
-			$characters = 'lud';
-		}
-
-		else if($preset == 3)
-		{
-			$size = 12;
-			$dashes = 0;
-			$characters = 'luds';
-		}
+		$final_str .= $password;
 
-		else if($preset == 4)
-		{
-			$size = 16;
-			$dashes = 1;
-			$characters = 'luds';
-		}
-
-		return $this->Generate($characters, $size, $dashes);
+		return $final_str;
 	}
 }