From 78f1a998203150627c2a3a3fb978b704235e74eb Mon Sep 17 00:00:00 2001
From: boreq <boreq@sourcedrops.com>
Date: Wed, 24 Sep 2014 01:34:31 +0200
Subject: [PATCH] Updated banners.py Removed unnecessary import. Added a
 function to avoid duplicating code.

---
 banners.php | 40 ++++++++++++++++++++--------------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/banners.php b/banners.php
index c49f45ce..10604ea8 100644
--- a/banners.php
+++ b/banners.php
@@ -1,31 +1,31 @@
 <?php
 
-include 'inc/functions.php';
-
 header("Pragma-directive: no-cache");
 header("Cache-directive: no-cache");
 header("Cache-control: no-cache");
 header("Pragma: no-cache");
 header("Expires: 0");
-if (!isset($_GET['board'])) {
-	header("Location: static/8chan banner.png");
-	die();
-}
-$b = $_GET['board'];
-if (!preg_match('/^[a-z0-9]{1,10}$/', $b))
-	header("Location: static/8chan banner.png");
 
-$dir = 'static/banners/'.$b;
+function get_custom_banner(&$b) {
+    # Validate the board name
+    if (!(isset($b) && preg_match('/^[a-z0-9]{1,10}$/', $b)))
+        return null;
 
-if (is_dir($dir)) {
-	$banners = array_diff(scandir($dir), array('..', '.'));
-	$r = array_rand($banners);
-} else {
-	$banners = array();
+    # Check if directory exists
+    $dir = "static/banners/$b/";
+    if (!is_dir($dir))
+        return null;
+
+    # Return random file if directory is not empty
+    $banners = array_diff(scandir($dir), array('..', '.'));
+    if (!$banners)
+        return null;
+    $r = array_rand($banners);
+    return $dir.$banners[$r];
 }
 
-if (!empty($banners)) {
-	header("Location: $dir/{$banners[$r]}");
-} else {
-	header("Location: static/8chan banner.png");
-}
+$banner = get_custom_banner($_GET['board']);
+if ($banner)
+    header("Location: $banner");
+else
+    header("Location: static/8chan banner.png");