NNTmux / newznab-tmux

www/pages/terms-and-conditions.php

Spacing +2 added lines, -2 removed lines

@@ -1,9 +1,9 @@
 <?php
 
 $page->title = "Terms and Conditions";
-$page->meta_title = $page->settings->getSetting('title')." - Terms and conditions";
+$page->meta_title = $page->settings->getSetting('title') . " - Terms and conditions";
 $page->meta_keywords = "terms,conditions";
-$page->meta_description = "Terms and Conditions for ".$page->settings->getSetting('title');
+$page->meta_description = "Terms and Conditions for " . $page->settings->getSetting('title');
 
 $page->content = $page->smarty->fetch('terms.tpl');
 

www/pages/AdminPage.php

Spacing +2 added lines, -2 removed lines

@@ -34,10 +34,10 @@
 	 */
 	public function render()
 	{
-		$this->smarty->assign('page',$this);
+		$this->smarty->assign('page', $this);
 
 		$admin_menu = $this->smarty->fetch('adminmenu.tpl');
-		$this->smarty->assign('admin_menu',$admin_menu);
+		$this->smarty->assign('admin_menu', $admin_menu);
 
 		$this->page_template = "baseadminpage.tpl";
 

Braces +3 added lines, -2 removed lines

@@ -24,8 +24,9 @@
 			]
 		);
 
-		if (!$this->users->isLoggedIn() || !isset($this->userdata["role"]) || $this->userdata["role"] != Users::ROLE_ADMIN)
-			$this->show403(true);
+		if (!$this->users->isLoggedIn() || !isset($this->userdata["role"]) || $this->userdata["role"] != Users::ROLE_ADMIN) {
+					$this->show403(true);
+		}
 
 	}
 

www/pages/profileedit.php

Braces +10 added lines, -6 removed lines

@@ -11,15 +11,17 @@ 
 $nzbGet = new NZBGet($page);
 $page->users = new Users();
 
-if (!$page->users->isLoggedIn())
+if (!$page->users->isLoggedIn()) {
 	$page->show403();
+}
 
 $action = isset($_REQUEST['action']) ? $_REQUEST['action'] : 'view';
 
 $userid = $page->users->currentUserId();
 $data = $page->users->getById($userid);
-if (!$data)
+if (!$data) {
 	$page->show404();
+}
 
 $errorStr = '';
 
@@ -35,8 +37,9 @@ 
 	case 'submit':
 
 		$data["email"] = $_POST['email'];
-		if (isset($_POST['saburl']) && strlen(trim($_POST['saburl'])) > 0 && !Utility::endsWith($_POST['saburl'], "/"))
-			$_POST['saburl'] = $_POST['saburl'] . "/";
+		if (isset($_POST['saburl']) && strlen(trim($_POST['saburl'])) > 0 && !Utility::endsWith($_POST['saburl'], "/")) {
+					$_POST['saburl'] = $_POST['saburl'] . "/";
+		}
 
 		if ($_POST['password'] != "" && $_POST['password'] != $_POST['confirmpassword']) {
 			$errorStr = "Password Mismatch";
@@ -90,8 +93,9 @@ 
 				$_POST['exccat'] = (!isset($_POST['exccat']) || !is_array($_POST['exccat'])) ? [] : $_POST['exccat'];
 				$page->users->addCategoryExclusions($userid, $_POST['exccat']);
 
-				if ($_POST['password'] != "")
-					$page->users->updatePassword($userid, $_POST['password']);
+				if ($_POST['password'] != "") {
+									$page->users->updatePassword($userid, $_POST['password']);
+				}
 
 				header("Location:" . WWW_TOP . "/profile");
 				die();

www/pages/queue.php

Spacing +3 added lines, -3 removed lines

@@ -15,7 +15,7 @@ 
 
 $queueType = $error = '';
 $queue = null;
-switch($page->settings->getSetting('sabintegrationtype')) {
+switch ($page->settings->getSetting('sabintegrationtype')) {
 	case SABnzbd::INTEGRATION_TYPE_NONE:
 		if ($userData['queuetype'] == 2) {
 			$queueType = 'NZBGet';
@@ -27,7 +27,7 @@ 
 		$queue = new SABnzbd($page);
 		break;
 	case SABnzbd::INTEGRATION_TYPE_USER:
-		switch((int)$userData['queuetype']) {
+		switch ((int)$userData['queuetype']) {
 			case 1:
 				$queueType = 'Sabnzbd';
 				$queue = new SABnzbd($page);
@@ -84,7 +84,7 @@ 
 $page->smarty->assign(array('queueType' => $queueType, 'error' => $error, 'user', $page->users));
 $page->title = "Your $queueType Download Queue";
 $page->meta_title = "View $queueType Queue";
-$page->meta_keywords = "view," . strtolower($queueType) .",queue";
+$page->meta_keywords = "view," . strtolower($queueType) . ",queue";
 $page->meta_description = "View $queueType Queue";
 
 $page->content = $page->smarty->fetch('viewqueue.tpl');

Upper-Lower-Casing +3 added lines, -3 removed lines

@@ -82,10 +82,10 @@
 }
 
 $page->smarty->assign(array('queueType' => $queueType, 'error' => $error, 'user', $page->users));
-$page->title = "Your $queueType Download Queue";
-$page->meta_title = "View $queueType Queue";
+$page->title = "your $queueType Download Queue";
+$page->meta_title = "view $queueType Queue";
 $page->meta_keywords = "view," . strtolower($queueType) .",queue";
-$page->meta_description = "View $queueType Queue";
+$page->meta_description = "view $queueType Queue";
 
 $page->content = $page->smarty->fetch('viewqueue.tpl');
 $page->render();

www/pages/myshows.php

Switch Indentation +149 added lines, -149 removed lines

@@ -22,173 +22,173 @@
 }
 
 switch ($action) {
-	case 'delete':
-		$show = $us->getShow($page->users->currentUserId(), $videoId);
-		if (isset($_REQUEST['from'])) {
-			header("Location:" . WWW_TOP . $_REQUEST['from']);
-		} else {
-			header("Location:" . WWW_TOP . "/myshows");
-		}
-		if (!$show) {
-			$page->show404('Not subscribed');
-		} else {
-			$us->delShow($page->users->currentUserId(), $videoId);
-		}
-
-		break;
-	case 'add':
-	case 'doadd':
-		$show = $us->getShow($page->users->currentUserId(), $videoId);
-		if ($show) {
-			$page->show404('Already subscribed');
-		} else {
-			$show = $tv->getByVideoID($videoId);
-			if (!$show) {
-				$page->show404('No matching show.');
-			}
-		}
-
-		if ($action == 'doadd') {
-			$category = (isset($_REQUEST['category']) && is_array($_REQUEST['category']) && !empty($_REQUEST['category'])) ? $_REQUEST['category'] : [];
-			$us->addShow($page->users->currentUserId(), $videoId, $category);
+		case 'delete':
+			$show = $us->getShow($page->users->currentUserId(), $videoId);
 			if (isset($_REQUEST['from'])) {
 				header("Location:" . WWW_TOP . $_REQUEST['from']);
 			} else {
 				header("Location:" . WWW_TOP . "/myshows");
 			}
-		} else {
-			$cat = new Category(['Settings' => $page->settings]);
-			$tmpcats = $cat->getChildren(Category::TV_ROOT);
-			$categories = [];
-			foreach ($tmpcats as $c) {
-				// If TV WEB-DL categorization is disabled, don't include it as an option
-				if ($page->settings->getSetting('catwebdl') == 0 && $c['id'] == Category::TV_WEBDL) {
-					continue;
+			if (!$show) {
+				$page->show404('Not subscribed');
+			} else {
+				$us->delShow($page->users->currentUserId(), $videoId);
+			}
+
+			break;
+		case 'add':
+		case 'doadd':
+			$show = $us->getShow($page->users->currentUserId(), $videoId);
+			if ($show) {
+				$page->show404('Already subscribed');
+			} else {
+				$show = $tv->getByVideoID($videoId);
+				if (!$show) {
+					$page->show404('No matching show.');
 				}
-				$categories[$c['id']] = $c['title'];
 			}
-			$page->smarty->assign('type', 'add');
-			$page->smarty->assign('cat_ids', array_keys($categories));
-			$page->smarty->assign('cat_names', $categories);
-			$page->smarty->assign('cat_selected', array());
-			$page->smarty->assign('video', $videoId);
-			$page->smarty->assign('show', $show);
-			$page->content = $page->smarty->fetch('myshows-add.tpl');
-			$page->render();
-		}
-		break;
-	case 'edit':
-	case 'doedit':
-		$show = $us->getShow($page->users->currentUserId(), $videoId);
-
-		if (!$show) {
-			$page->show404();
-		}
-
-		if ($action == 'doedit') {
-			$category = (isset($_REQUEST['category']) && is_array($_REQUEST['category']) && !empty($_REQUEST['category'])) ? $_REQUEST['category'] : [];
-			$us->updateShow($page->users->currentUserId(), $videoId, $category);
-			if (isset($_REQUEST['from'])) {
-				header("Location:" . WWW_TOP . $_REQUEST['from']);
+
+			if ($action == 'doadd') {
+				$category = (isset($_REQUEST['category']) && is_array($_REQUEST['category']) && !empty($_REQUEST['category'])) ? $_REQUEST['category'] : [];
+				$us->addShow($page->users->currentUserId(), $videoId, $category);
+				if (isset($_REQUEST['from'])) {
+					header("Location:" . WWW_TOP . $_REQUEST['from']);
+				} else {
+					header("Location:" . WWW_TOP . "/myshows");
+				}
 			} else {
-				header("Location:" . WWW_TOP . "/myshows");
+				$cat = new Category(['Settings' => $page->settings]);
+				$tmpcats = $cat->getChildren(Category::TV_ROOT);
+				$categories = [];
+				foreach ($tmpcats as $c) {
+					// If TV WEB-DL categorization is disabled, don't include it as an option
+					if ($page->settings->getSetting('catwebdl') == 0 && $c['id'] == Category::TV_WEBDL) {
+						continue;
+					}
+					$categories[$c['id']] = $c['title'];
+				}
+				$page->smarty->assign('type', 'add');
+				$page->smarty->assign('cat_ids', array_keys($categories));
+				$page->smarty->assign('cat_names', $categories);
+				$page->smarty->assign('cat_selected', array());
+				$page->smarty->assign('video', $videoId);
+				$page->smarty->assign('show', $show);
+				$page->content = $page->smarty->fetch('myshows-add.tpl');
+				$page->render();
+			}
+			break;
+		case 'edit':
+		case 'doedit':
+			$show = $us->getShow($page->users->currentUserId(), $videoId);
+
+			if (!$show) {
+				$page->show404();
 			}
-		} else {
-			$cat = new Category(['Settings' => $page->settings]);
 
+			if ($action == 'doedit') {
+				$category = (isset($_REQUEST['category']) && is_array($_REQUEST['category']) && !empty($_REQUEST['category'])) ? $_REQUEST['category'] : [];
+				$us->updateShow($page->users->currentUserId(), $videoId, $category);
+				if (isset($_REQUEST['from'])) {
+					header("Location:" . WWW_TOP . $_REQUEST['from']);
+				} else {
+					header("Location:" . WWW_TOP . "/myshows");
+				}
+			} else {
+				$cat = new Category(['Settings' => $page->settings]);
+
+				$tmpcats = $cat->getChildren(Category::TV_ROOT);
+				$categories = [];
+				foreach ($tmpcats as $c) {
+					$categories[$c['id']] = $c['title'];
+				}
+
+				$page->smarty->assign('type', 'edit');
+				$page->smarty->assign('cat_ids', array_keys($categories));
+				$page->smarty->assign('cat_names', $categories);
+				$page->smarty->assign('cat_selected', explode('|', $show['categories']));
+				$page->smarty->assign('video', $videoId);
+				$page->smarty->assign('show', $show);
+				$page->content = $page->smarty->fetch('myshows-add.tpl');
+				$page->render();
+			}
+			break;
+		case 'browse':
+
+			$page->title = "Browse My Shows";
+			$page->meta_title = "My Shows";
+			$page->meta_keywords = "search,add,to,cart,nzb,description,details";
+			$page->meta_description = "Browse Your Shows";
+
+			$shows = $us->getShows($page->users->currentUserId());
+
+			$releases = new Releases(['Settings' => $page->settings]);
+			$browsecount = $releases->getShowsCount($shows, -1, $page->userdata["categoryexclusions"]);
+
+			$offset = (isset($_REQUEST["offset"]) && ctype_digit($_REQUEST['offset'])) ? $_REQUEST["offset"] : 0;
+			$ordering = $releases->getBrowseOrdering();
+			$orderby = isset($_REQUEST["ob"]) && in_array($_REQUEST['ob'], $ordering) ? $_REQUEST["ob"] : '';
+
+			$results = [];
+			$results = $releases->getShowsRange($shows, $offset, ITEMS_PER_PAGE, $orderby, -1, $page->userdata["categoryexclusions"]);
+
+			$page->smarty->assign('pagertotalitems', $browsecount);
+			$page->smarty->assign('pageroffset', $offset);
+			$page->smarty->assign('pageritemsperpage', ITEMS_PER_PAGE);
+			$page->smarty->assign('pagerquerybase', WWW_TOP . "/myshows/browse?ob=" . $orderby . "&offset=");
+			$page->smarty->assign('pagerquerysuffix', "#results");
+			$page->smarty->assign('covgroup', '');
+
+			$pager = $page->smarty->fetch("pager.tpl");
+			$page->smarty->assign('pager', $pager);
+
+			foreach ($ordering as $ordertype) {
+				$page->smarty->assign('orderby' . $ordertype, WWW_TOP . "/myshows/browse?ob=" . $ordertype . "&offset=0");
+			}
+
+			$page->smarty->assign('lastvisit', $page->userdata['lastlogin']);
+
+			$page->smarty->assign('results', $results);
+
+			$page->smarty->assign('shows', true);
+
+			$page->content = $page->smarty->fetch('browse.tpl');
+			$page->render();
+			break;
+		default:
+
+			$page->title = "My Shows";
+			$page->meta_title = "My Shows";
+			$page->meta_keywords = "search,add,to,cart,nzb,description,details";
+			$page->meta_description = "Manage Your Shows";
+
+			$cat = new Category(['Settings' => $page->settings]);
 			$tmpcats = $cat->getChildren(Category::TV_ROOT);
 			$categories = [];
 			foreach ($tmpcats as $c) {
 				$categories[$c['id']] = $c['title'];
 			}
 
-			$page->smarty->assign('type', 'edit');
-			$page->smarty->assign('cat_ids', array_keys($categories));
-			$page->smarty->assign('cat_names', $categories);
-			$page->smarty->assign('cat_selected', explode('|', $show['categories']));
-			$page->smarty->assign('video', $videoId);
-			$page->smarty->assign('show', $show);
-			$page->content = $page->smarty->fetch('myshows-add.tpl');
-			$page->render();
-		}
-		break;
-	case 'browse':
-
-		$page->title = "Browse My Shows";
-		$page->meta_title = "My Shows";
-		$page->meta_keywords = "search,add,to,cart,nzb,description,details";
-		$page->meta_description = "Browse Your Shows";
-
-		$shows = $us->getShows($page->users->currentUserId());
-
-		$releases = new Releases(['Settings' => $page->settings]);
-		$browsecount = $releases->getShowsCount($shows, -1, $page->userdata["categoryexclusions"]);
-
-		$offset = (isset($_REQUEST["offset"]) && ctype_digit($_REQUEST['offset'])) ? $_REQUEST["offset"] : 0;
-		$ordering = $releases->getBrowseOrdering();
-		$orderby = isset($_REQUEST["ob"]) && in_array($_REQUEST['ob'], $ordering) ? $_REQUEST["ob"] : '';
-
-		$results = [];
-		$results = $releases->getShowsRange($shows, $offset, ITEMS_PER_PAGE, $orderby, -1, $page->userdata["categoryexclusions"]);
-
-		$page->smarty->assign('pagertotalitems', $browsecount);
-		$page->smarty->assign('pageroffset', $offset);
-		$page->smarty->assign('pageritemsperpage', ITEMS_PER_PAGE);
-		$page->smarty->assign('pagerquerybase', WWW_TOP . "/myshows/browse?ob=" . $orderby . "&offset=");
-		$page->smarty->assign('pagerquerysuffix', "#results");
-		$page->smarty->assign('covgroup', '');
-
-		$pager = $page->smarty->fetch("pager.tpl");
-		$page->smarty->assign('pager', $pager);
-
-		foreach ($ordering as $ordertype) {
-			$page->smarty->assign('orderby' . $ordertype, WWW_TOP . "/myshows/browse?ob=" . $ordertype . "&offset=0");
-		}
-
-		$page->smarty->assign('lastvisit', $page->userdata['lastlogin']);
-
-		$page->smarty->assign('results', $results);
-
-		$page->smarty->assign('shows', true);
-
-		$page->content = $page->smarty->fetch('browse.tpl');
-		$page->render();
-		break;
-	default:
-
-		$page->title = "My Shows";
-		$page->meta_title = "My Shows";
-		$page->meta_keywords = "search,add,to,cart,nzb,description,details";
-		$page->meta_description = "Manage Your Shows";
-
-		$cat = new Category(['Settings' => $page->settings]);
-		$tmpcats = $cat->getChildren(Category::TV_ROOT);
-		$categories = [];
-		foreach ($tmpcats as $c) {
-			$categories[$c['id']] = $c['title'];
-		}
-
-		$shows = $us->getShows($page->users->currentUserId());
-		$results = [];
-		foreach ($shows as $showk => $show) {
-			$showcats = explode('|', $show['categories']);
-			if (is_array($showcats) && sizeof($showcats) > 0) {
-				$catarr = [];
-				foreach ($showcats as $scat) {
-					if (!empty($scat)) {
-						$catarr[] = $categories[$scat];
+			$shows = $us->getShows($page->users->currentUserId());
+			$results = [];
+			foreach ($shows as $showk => $show) {
+				$showcats = explode('|', $show['categories']);
+				if (is_array($showcats) && sizeof($showcats) > 0) {
+					$catarr = [];
+					foreach ($showcats as $scat) {
+						if (!empty($scat)) {
+							$catarr[] = $categories[$scat];
+						}
 					}
+					$show['categoryNames'] = implode(', ', $catarr);
+				} else {
+					$show['categoryNames'] = '';
 				}
-				$show['categoryNames'] = implode(', ', $catarr);
-			} else {
-				$show['categoryNames'] = '';
-			}
 
-			$results[$showk] = $show;
-		}
-		$page->smarty->assign('shows', $results);
+				$results[$showk] = $show;
+			}
+			$page->smarty->assign('shows', $results);
 
-		$page->content = $page->smarty->fetch('myshows.tpl');
-		$page->render();
-		break;
+			$page->content = $page->smarty->fetch('myshows.tpl');
+			$page->render();
+			break;
 }

www/pages/bookmodal.php

Spacing +1 added lines, -1 removed lines

@@ -15,7 +15,7 @@
 
 	$page->smarty->assign('book', $book);
 
-	$page->title = "Info for ".$book['title'];
+	$page->title = "Info for " . $book['title'];
 	$page->meta_title = "";
 	$page->meta_keywords = "";
 	$page->meta_description = "";

Braces +13 added lines, -12 removed lines

@@ -4,14 +4,15 @@ 
 
 $b = new Books;
 
-if (!$page->users->isLoggedIn())
+if (!$page->users->isLoggedIn()) {
 	$page->show403();
+}
 
-if (isset($_GET["id"]) && ctype_digit($_GET["id"]))
-{
+if (isset($_GET["id"]) && ctype_digit($_GET["id"])) {
 	$book = $b->getBookInfo($_GET['id']);
-	if (!$book)
-		$page->show404();
+	if (!$book) {
+			$page->show404();
+	}
 
 	$page->smarty->assign('book', $book);
 
@@ -22,17 +23,17 @@ 
 	$page->smarty->registerPlugin('modifier', 'ss', 'stripslashes');
 
 	$modal = false;
-	if (isset($_GET['modal']))
-	{
+	if (isset($_GET['modal'])) {
 		$modal = true;
 		$page->smarty->assign('modal', true);
 	}
 
 	$page->content = $page->smarty->fetch('viewbook.tpl');
 
-	if ($modal)
-		echo $page->content;
-	else
-		$page->render();
-}
+	if ($modal) {
+			echo $page->content;
+	} else {
+			$page->render();
+	}
+	}
 

www/pages/queuedata.php

Indentation +108 added lines, -108 removed lines

@@ -17,25 +17,25 @@ 
 
 switch ($reqtype)
 {
-    case "queue":
-    {
-        $json = $sab->getQueue();
-        if ($json !== false)
-        {
-            $obj = json_decode($json);
-            $queue = $obj->{'jobs'};
-            $count = 1;
+	case "queue":
+	{
+		$json = $sab->getQueue();
+		if ($json !== false)
+		{
+			$obj = json_decode($json);
+			$queue = $obj->{'jobs'};
+			$count = 1;
 
-            $speed = $obj->{'speed'};
-            $queued = round($obj->{'mbleft'}, 2)."MB / ".round($obj->{'mb'}, 2)."MB";
-            $status = ucwords(strtolower($obj->{'state'}));
+			$speed = $obj->{'speed'};
+			$queued = round($obj->{'mbleft'}, 2)."MB / ".round($obj->{'mb'}, 2)."MB";
+			$status = ucwords(strtolower($obj->{'state'}));
 
-            $output .= "<p><b>Download speed:</b> ".$speed."B/s - <b>Queued:</b> ".$queued." - <b>Status:</b> ".$status."</p>";
+			$output .= "<p><b>Download speed:</b> ".$speed."B/s - <b>Queued:</b> ".$queued." - <b>Status:</b> ".$status."</p>";
 
-            if (count($queue) > 0)
-            {
-                $output.="<table class=\"data highlight\">";
-                $output.="<tr>
+			if (count($queue) > 0)
+			{
+				$output.="<table class=\"data highlight\">";
+				$output.="<tr>
                             <th></th>
                             <th>Name</th>
                             <th style='width:80px;'>size</th>
@@ -44,53 +44,53 @@ 
                             <th>time left</th>
                             <th></th>
                             </tr>";
-                foreach ($queue as $item)
-                {
-                    if (strpos($item->{'filename'}, "fetch NZB") > 0)
-                    {
-                    }
-                    else
-                    {
-                        $output.="<tr>";
-                        $output.="<td style='text-align:right;'>".$count."</td>";
-                        $output.="<td>".htmlspecialchars($item->{'filename'}, ENT_QUOTES)."</td>";
-                        $output.="<td style='text-align:right;'>".round($item->{'mb'}, 2)." MB</td>";
-                        $output.="<td class='right'>".round($item->{'mbleft'}, 2)." MB</td>";
-                        $output.="<td class='right'>".($item->{'mb'}==0?0:round($item->{'mbleft'}/$item->{'mb'}*100))."%</td>";
-                        $output.="<td style='text-align:right;'>".$item->{'timeleft'}."</td>";
-                        $output.="<td style='text-align:right;'><a  onclick=\"return confirm('Are you sure?');\" href='?del=".$item->{'id'}."'>delete</a></td>";
-                        $output.="</tr>";
-                        $count++;
-                    }
-                }
-                $output.="</table>";
-            }
-            else
-            {
-                $output.="<p>The queue is currently empty.</p>";
-            }
-        }
-        else
-        {
-            $output.="<p>Error retreiving queue.</p>";
-        }
+				foreach ($queue as $item)
+				{
+					if (strpos($item->{'filename'}, "fetch NZB") > 0)
+					{
+					}
+					else
+					{
+						$output.="<tr>";
+						$output.="<td style='text-align:right;'>".$count."</td>";
+						$output.="<td>".htmlspecialchars($item->{'filename'}, ENT_QUOTES)."</td>";
+						$output.="<td style='text-align:right;'>".round($item->{'mb'}, 2)." MB</td>";
+						$output.="<td class='right'>".round($item->{'mbleft'}, 2)." MB</td>";
+						$output.="<td class='right'>".($item->{'mb'}==0?0:round($item->{'mbleft'}/$item->{'mb'}*100))."%</td>";
+						$output.="<td style='text-align:right;'>".$item->{'timeleft'}."</td>";
+						$output.="<td style='text-align:right;'><a  onclick=\"return confirm('Are you sure?');\" href='?del=".$item->{'id'}."'>delete</a></td>";
+						$output.="</tr>";
+						$count++;
+					}
+				}
+				$output.="</table>";
+			}
+			else
+			{
+				$output.="<p>The queue is currently empty.</p>";
+			}
+		}
+		else
+		{
+			$output.="<p>Error retreiving queue.</p>";
+		}
 
-        break;
-    }
-    case "history":
-    {
-        $json = $sab->getHistory();
-        if ($json !== false)
-        {
-            $obj = json_decode($json);
-            $history = $obj->history->slots;
-            $count = 1;
+		break;
+	}
+	case "history":
+	{
+		$json = $sab->getHistory();
+		if ($json !== false)
+		{
+			$obj = json_decode($json);
+			$history = $obj->history->slots;
+			$count = 1;
 
-            if (count($history) > 0)
-            {
-                $output.="<h2>Download History</h2>";
-                $output.="<table class=\"data highlight\">";
-                $output.="<tr>
+			if (count($history) > 0)
+			{
+				$output.="<h2>Download History</h2>";
+				$output.="<table class=\"data highlight\">";
+				$output.="<tr>
                             <th style='width:20px;'></th>
                             <th>Name</th>
                             <th>Category</th>
@@ -99,33 +99,33 @@ 
                             <th style='text-align:center;'>dl time</th>
                             <th style='text-align:center;'>date</th>
                             </tr>";
-                foreach ($history as $item)
-                {
-                    $output.="<tr>";
-                    $output.="<td class='".($item->{'fail_message'} != "" ? "sabhistoryfail" : "sabhistorysuccess")."'></td>";
-                    $output.="<td>".htmlspecialchars($item->{'name'}, ENT_QUOTES)."</td>";
-                    $output.="<td style='text-align:center;'>".htmlspecialchars($item->{'category'}, ENT_QUOTES)."</td>";
-                    $output.="<td title='".htmlspecialchars($item->{'fail_message'}, ENT_QUOTES)."' style='text-align:center;'>".$item->{'status'}."</td>";
-                    $output.="<td style='text-align:right;'>".$item->{'size'}."</td>";
-                    $output.="<td style='text-align:right;'>".gmdate("H:i:s", $item->{'download_time'})."</td>";
-                    $output.="<td style='text-align:right;'>".gmdate("Y-m-d H:i", $item->{'completed'})."</td>";
-                    $output.="</tr>\n";
-                    $count++;
-                }
-                $output.="</table>";
-            }
-        }
+				foreach ($history as $item)
+				{
+					$output.="<tr>";
+					$output.="<td class='".($item->{'fail_message'} != "" ? "sabhistoryfail" : "sabhistorysuccess")."'></td>";
+					$output.="<td>".htmlspecialchars($item->{'name'}, ENT_QUOTES)."</td>";
+					$output.="<td style='text-align:center;'>".htmlspecialchars($item->{'category'}, ENT_QUOTES)."</td>";
+					$output.="<td title='".htmlspecialchars($item->{'fail_message'}, ENT_QUOTES)."' style='text-align:center;'>".$item->{'status'}."</td>";
+					$output.="<td style='text-align:right;'>".$item->{'size'}."</td>";
+					$output.="<td style='text-align:right;'>".gmdate("H:i:s", $item->{'download_time'})."</td>";
+					$output.="<td style='text-align:right;'>".gmdate("Y-m-d H:i", $item->{'completed'})."</td>";
+					$output.="</tr>\n";
+					$count++;
+				}
+				$output.="</table>";
+			}
+		}
 
-        break;
-    }
-    case "nzbget":
-    {
-        $queue = $nzbget->getQueue();
-        if (is_array($queue) && count($queue) > 0)
-        {
-            $count = 1;
-            $output.="<table class=\"data highlight\">";
-            $output.="<tr>
+		break;
+	}
+	case "nzbget":
+	{
+		$queue = $nzbget->getQueue();
+		if (is_array($queue) && count($queue) > 0)
+		{
+			$count = 1;
+			$output.="<table class=\"data highlight\">";
+			$output.="<tr>
                             <th></th>
                             <th>Name</th>
                             <th style='width:80px;'>size</th>
@@ -134,28 +134,28 @@ 
                             <th>left</th>
                             <th></th>
                             </tr>";
-            foreach ($queue as $item)
-            {
-                $output.="<tr>";
-                $output.="<td style='text-align:right;'>".$count."</td>";
-                $output.="<td>".htmlspecialchars($item['NZBNicename'], ENT_QUOTES)."</td>";
-                $output.="<td style='text-align:right;'>".round($item['FileSizeMB'], 2)." MB</td>";
-                $output.="<td class='right'>".round($item['RemainingSizeMB'], 2)." MB</td>";
-                $output.="<td class='right'>".($item['FileSizeMB']==0?0:round($item['RemainingSizeMB']/$item['FileSizeMB']*100))."%</td>";
-                $output.="<td style='text-align:right;'>".$item['RemainingFileCount']."</td>";
-                $output.="<td style='text-align:right;'><a  onclick=\"return confirm('Are you sure?');\" href='?nzbgetdel=".$item['NZBID']."'>delete</a></td>";
-                $output.="</tr>";
-                $count++;
-            }
-            $output.="</table>";
-        }
-        else
-        {
-            $output.="<p>The queue is currently empty.</p>";
-        }
+			foreach ($queue as $item)
+			{
+				$output.="<tr>";
+				$output.="<td style='text-align:right;'>".$count."</td>";
+				$output.="<td>".htmlspecialchars($item['NZBNicename'], ENT_QUOTES)."</td>";
+				$output.="<td style='text-align:right;'>".round($item['FileSizeMB'], 2)." MB</td>";
+				$output.="<td class='right'>".round($item['RemainingSizeMB'], 2)." MB</td>";
+				$output.="<td class='right'>".($item['FileSizeMB']==0?0:round($item['RemainingSizeMB']/$item['FileSizeMB']*100))."%</td>";
+				$output.="<td style='text-align:right;'>".$item['RemainingFileCount']."</td>";
+				$output.="<td style='text-align:right;'><a  onclick=\"return confirm('Are you sure?');\" href='?nzbgetdel=".$item['NZBID']."'>delete</a></td>";
+				$output.="</tr>";
+				$count++;
+			}
+			$output.="</table>";
+		}
+		else
+		{
+			$output.="<p>The queue is currently empty.</p>";
+		}
 
-        break;
-    }
+		break;
+	}
 }
 
 print $output;

Spacing +42 added lines, -42 removed lines

@@ -27,15 +27,15 @@ 
             $count = 1;
 
             $speed = $obj->{'speed'};
-            $queued = round($obj->{'mbleft'}, 2)."MB / ".round($obj->{'mb'}, 2)."MB";
+            $queued = round($obj->{'mbleft'}, 2) . "MB / " . round($obj->{'mb'}, 2) . "MB";
             $status = ucwords(strtolower($obj->{'state'}));
 
-            $output .= "<p><b>Download speed:</b> ".$speed."B/s - <b>Queued:</b> ".$queued." - <b>Status:</b> ".$status."</p>";
+            $output .= "<p><b>Download speed:</b> " . $speed . "B/s - <b>Queued:</b> " . $queued . " - <b>Status:</b> " . $status . "</p>";
 
             if (count($queue) > 0)
             {
-                $output.="<table class=\"data highlight\">";
-                $output.="<tr>
+                $output .= "<table class=\"data highlight\">";
+                $output .= "<tr>
                             <th></th>
                             <th>Name</th>
                             <th style='width:80px;'>size</th>
@@ -51,28 +51,28 @@ 
                     }
                     else
                     {
-                        $output.="<tr>";
-                        $output.="<td style='text-align:right;'>".$count."</td>";
-                        $output.="<td>".htmlspecialchars($item->{'filename'}, ENT_QUOTES)."</td>";
-                        $output.="<td style='text-align:right;'>".round($item->{'mb'}, 2)." MB</td>";
-                        $output.="<td class='right'>".round($item->{'mbleft'}, 2)." MB</td>";
-                        $output.="<td class='right'>".($item->{'mb'}==0?0:round($item->{'mbleft'}/$item->{'mb'}*100))."%</td>";
-                        $output.="<td style='text-align:right;'>".$item->{'timeleft'}."</td>";
-                        $output.="<td style='text-align:right;'><a  onclick=\"return confirm('Are you sure?');\" href='?del=".$item->{'id'}."'>delete</a></td>";
-                        $output.="</tr>";
+                        $output .= "<tr>";
+                        $output .= "<td style='text-align:right;'>" . $count . "</td>";
+                        $output .= "<td>" . htmlspecialchars($item->{'filename'}, ENT_QUOTES) . "</td>";
+                        $output .= "<td style='text-align:right;'>" . round($item->{'mb'}, 2) . " MB</td>";
+                        $output .= "<td class='right'>" . round($item->{'mbleft'}, 2) . " MB</td>";
+                        $output .= "<td class='right'>" . ($item->{'mb'} == 0 ? 0 : round($item->{'mbleft'} / $item->{'mb'} * 100)) . "%</td>";
+                        $output .= "<td style='text-align:right;'>" . $item->{'timeleft'} . "</td>";
+                        $output .= "<td style='text-align:right;'><a  onclick=\"return confirm('Are you sure?');\" href='?del=" . $item->{'id'} . "'>delete</a></td>";
+                        $output .= "</tr>";
                         $count++;
                     }
                 }
-                $output.="</table>";
+                $output .= "</table>";
             }
             else
             {
-                $output.="<p>The queue is currently empty.</p>";
+                $output .= "<p>The queue is currently empty.</p>";
             }
         }
         else
         {
-            $output.="<p>Error retreiving queue.</p>";
+            $output .= "<p>Error retreiving queue.</p>";
         }
 
         break;
@@ -88,9 +88,9 @@ 
 
             if (count($history) > 0)
             {
-                $output.="<h2>Download History</h2>";
-                $output.="<table class=\"data highlight\">";
-                $output.="<tr>
+                $output .= "<h2>Download History</h2>";
+                $output .= "<table class=\"data highlight\">";
+                $output .= "<tr>
                             <th style='width:20px;'></th>
                             <th>Name</th>
                             <th>Category</th>
@@ -101,18 +101,18 @@ 
                             </tr>";
                 foreach ($history as $item)
                 {
-                    $output.="<tr>";
-                    $output.="<td class='".($item->{'fail_message'} != "" ? "sabhistoryfail" : "sabhistorysuccess")."'></td>";
-                    $output.="<td>".htmlspecialchars($item->{'name'}, ENT_QUOTES)."</td>";
-                    $output.="<td style='text-align:center;'>".htmlspecialchars($item->{'category'}, ENT_QUOTES)."</td>";
-                    $output.="<td title='".htmlspecialchars($item->{'fail_message'}, ENT_QUOTES)."' style='text-align:center;'>".$item->{'status'}."</td>";
-                    $output.="<td style='text-align:right;'>".$item->{'size'}."</td>";
-                    $output.="<td style='text-align:right;'>".gmdate("H:i:s", $item->{'download_time'})."</td>";
-                    $output.="<td style='text-align:right;'>".gmdate("Y-m-d H:i", $item->{'completed'})."</td>";
-                    $output.="</tr>\n";
+                    $output .= "<tr>";
+                    $output .= "<td class='" . ($item->{'fail_message'} != "" ? "sabhistoryfail" : "sabhistorysuccess") . "'></td>";
+                    $output .= "<td>" . htmlspecialchars($item->{'name'}, ENT_QUOTES) . "</td>";
+                    $output .= "<td style='text-align:center;'>" . htmlspecialchars($item->{'category'}, ENT_QUOTES) . "</td>";
+                    $output .= "<td title='" . htmlspecialchars($item->{'fail_message'}, ENT_QUOTES) . "' style='text-align:center;'>" . $item->{'status'} . "</td>";
+                    $output .= "<td style='text-align:right;'>" . $item->{'size'} . "</td>";
+                    $output .= "<td style='text-align:right;'>" . gmdate("H:i:s", $item->{'download_time'}) . "</td>";
+                    $output .= "<td style='text-align:right;'>" . gmdate("Y-m-d H:i", $item->{'completed'}) . "</td>";
+                    $output .= "</tr>\n";
                     $count++;
                 }
-                $output.="</table>";
+                $output .= "</table>";
             }
         }
 
@@ -124,8 +124,8 @@ 
         if (is_array($queue) && count($queue) > 0)
         {
             $count = 1;
-            $output.="<table class=\"data highlight\">";
-            $output.="<tr>
+            $output .= "<table class=\"data highlight\">";
+            $output .= "<tr>
                             <th></th>
                             <th>Name</th>
                             <th style='width:80px;'>size</th>
@@ -136,22 +136,22 @@ 
                             </tr>";
             foreach ($queue as $item)
             {
-                $output.="<tr>";
-                $output.="<td style='text-align:right;'>".$count."</td>";
-                $output.="<td>".htmlspecialchars($item['NZBNicename'], ENT_QUOTES)."</td>";
-                $output.="<td style='text-align:right;'>".round($item['FileSizeMB'], 2)." MB</td>";
-                $output.="<td class='right'>".round($item['RemainingSizeMB'], 2)." MB</td>";
-                $output.="<td class='right'>".($item['FileSizeMB']==0?0:round($item['RemainingSizeMB']/$item['FileSizeMB']*100))."%</td>";
-                $output.="<td style='text-align:right;'>".$item['RemainingFileCount']."</td>";
-                $output.="<td style='text-align:right;'><a  onclick=\"return confirm('Are you sure?');\" href='?nzbgetdel=".$item['NZBID']."'>delete</a></td>";
-                $output.="</tr>";
+                $output .= "<tr>";
+                $output .= "<td style='text-align:right;'>" . $count . "</td>";
+                $output .= "<td>" . htmlspecialchars($item['NZBNicename'], ENT_QUOTES) . "</td>";
+                $output .= "<td style='text-align:right;'>" . round($item['FileSizeMB'], 2) . " MB</td>";
+                $output .= "<td class='right'>" . round($item['RemainingSizeMB'], 2) . " MB</td>";
+                $output .= "<td class='right'>" . ($item['FileSizeMB'] == 0 ? 0 : round($item['RemainingSizeMB'] / $item['FileSizeMB'] * 100)) . "%</td>";
+                $output .= "<td style='text-align:right;'>" . $item['RemainingFileCount'] . "</td>";
+                $output .= "<td style='text-align:right;'><a  onclick=\"return confirm('Are you sure?');\" href='?nzbgetdel=" . $item['NZBID'] . "'>delete</a></td>";
+                $output .= "</tr>";
                 $count++;
             }
-            $output.="</table>";
+            $output .= "</table>";
         }
         else
         {
-            $output.="<p>The queue is currently empty.</p>";
+            $output .= "<p>The queue is currently empty.</p>";
         }
 
         break;

Braces +18 added lines, -34 removed lines

@@ -3,25 +3,25 @@ 
 use nntmux\SABnzbd;
 use nntmux\NZBGet;
 
-if (!$page->users->isLoggedIn())
+if (!$page->users->isLoggedIn()) {
 	$page->show403();
+}
 
 $sab = new SABnzbd($page);
 $nzbget = new NZBGet($page);
 
-if (empty($sab->url) && empty($sab->apikey) && empty($nzbget->url) && empty($nzbget->username))
+if (empty($sab->url) && empty($sab->apikey) && empty($nzbget->url) && empty($nzbget->username)) {
 	$page->show404();
+}
 
 $output = "";
 $reqtype = isset($_REQUEST["type"]) ? $_REQUEST["type"] : "queue";
 
-switch ($reqtype)
-{
+switch ($reqtype) {
     case "queue":
     {
         $json = $sab->getQueue();
-        if ($json !== false)
-        {
+        if ($json !== false) {
             $obj = json_decode($json);
             $queue = $obj->{'jobs'};
             $count = 1;
@@ -32,8 +32,7 @@ 
 
             $output .= "<p><b>Download speed:</b> ".$speed."B/s - <b>Queued:</b> ".$queued." - <b>Status:</b> ".$status."</p>";
 
-            if (count($queue) > 0)
-            {
+            if (count($queue) > 0) {
                 $output.="<table class=\"data highlight\">";
                 $output.="<tr>
                             <th></th>
@@ -44,13 +43,9 @@ 
                             <th>time left</th>
                             <th></th>
                             </tr>";
-                foreach ($queue as $item)
-                {
-                    if (strpos($item->{'filename'}, "fetch NZB") > 0)
-                    {
-                    }
-                    else
-                    {
+                foreach ($queue as $item) {
+                    if (strpos($item->{'filename'}, "fetch NZB") > 0) {
+                    } else {
                         $output.="<tr>";
                         $output.="<td style='text-align:right;'>".$count."</td>";
                         $output.="<td>".htmlspecialchars($item->{'filename'}, ENT_QUOTES)."</td>";
@@ -64,14 +59,10 @@ 
                     }
                 }
                 $output.="</table>";
-            }
-            else
-            {
+            } else {
                 $output.="<p>The queue is currently empty.</p>";
             }
-        }
-        else
-        {
+        } else {
             $output.="<p>Error retreiving queue.</p>";
         }
 
@@ -80,14 +71,12 @@ 
     case "history":
     {
         $json = $sab->getHistory();
-        if ($json !== false)
-        {
+        if ($json !== false) {
             $obj = json_decode($json);
             $history = $obj->history->slots;
             $count = 1;
 
-            if (count($history) > 0)
-            {
+            if (count($history) > 0) {
                 $output.="<h2>Download History</h2>";
                 $output.="<table class=\"data highlight\">";
                 $output.="<tr>
@@ -99,8 +88,7 @@ 
                             <th style='text-align:center;'>dl time</th>
                             <th style='text-align:center;'>date</th>
                             </tr>";
-                foreach ($history as $item)
-                {
+                foreach ($history as $item) {
                     $output.="<tr>";
                     $output.="<td class='".($item->{'fail_message'} != "" ? "sabhistoryfail" : "sabhistorysuccess")."'></td>";
                     $output.="<td>".htmlspecialchars($item->{'name'}, ENT_QUOTES)."</td>";
@@ -121,8 +109,7 @@ 
     case "nzbget":
     {
         $queue = $nzbget->getQueue();
-        if (is_array($queue) && count($queue) > 0)
-        {
+        if (is_array($queue) && count($queue) > 0) {
             $count = 1;
             $output.="<table class=\"data highlight\">";
             $output.="<tr>
@@ -134,8 +121,7 @@ 
                             <th>left</th>
                             <th></th>
                             </tr>";
-            foreach ($queue as $item)
-            {
+            foreach ($queue as $item) {
                 $output.="<tr>";
                 $output.="<td style='text-align:right;'>".$count."</td>";
                 $output.="<td>".htmlspecialchars($item['NZBNicename'], ENT_QUOTES)."</td>";
@@ -148,9 +134,7 @@ 
                 $count++;
             }
             $output.="</table>";
-        }
-        else
-        {
+        } else {
             $output.="<p>The queue is currently empty.</p>";
         }
 

www/pages/ajax_release-admin.php

Spacing +1 added lines, -1 removed lines

@@ -15,7 +15,7 @@
 	$id = $_REQUEST['id'];
 	//Get info for first guid to populate form
 	$rel = $releases->getByGuid($_REQUEST['id'][0]);
-} else	{
+} else {
 	$id = $rel = '';
 }
 

Braces +1 added lines, -1 removed lines

@@ -15,7 +15,7 @@
 	$id = $_REQUEST['id'];
 	//Get info for first guid to populate form
 	$rel = $releases->getByGuid($_REQUEST['id'][0]);
-} else	{
+} else {
 	$id = $rel = '';
 }
 

www/pages/musicmodal.php

Spacing +1 added lines, -1 removed lines

@@ -16,7 +16,7 @@
 
 	$page->smarty->assign('music', $mus);
 
-	$page->title = "Info for ".$mus['title'];
+	$page->title = "Info for " . $mus['title'];
 	$page->meta_title = "";
 	$page->meta_keywords = "";
 	$page->meta_description = "";

Braces +13 added lines, -12 removed lines

@@ -4,15 +4,16 @@ 
 
 $music = new Music;
 
-if (!$page->users->isLoggedIn())
+if (!$page->users->isLoggedIn()) {
 	$page->show403();
+}
 
-if (isset($_GET["id"]) && ctype_digit($_GET["id"]))
-{
+if (isset($_GET["id"]) && ctype_digit($_GET["id"])) {
 	$mus = $music->getMusicInfo($_GET['id']);
 
-	if (!$mus)
-		$page->show404();
+	if (!$mus) {
+			$page->show404();
+	}
 
 	$page->smarty->assign('music', $mus);
 
@@ -23,17 +24,17 @@ 
 	$page->smarty->registerPlugin('modifier', 'ss', 'stripslashes');
 
 	$modal = false;
-	if (isset($_GET['modal']))
-	{
+	if (isset($_GET['modal'])) {
 		$modal = true;
 		$page->smarty->assign('modal', true);
 	}
 
 	$page->content = $page->smarty->fetch('viewmusic.tpl');
 
-	if ($modal)
-		echo $page->content;
-	else
-		$page->render();
-}
+	if ($modal) {
+			echo $page->content;
+	} else {
+			$page->render();
+	}
+	}