Apply ugly but consistent PHP formatting rules

ajax.php

@@ -1 +1,2 @@
-<? require('classes/script_start.php'); ?>
+<?php
+require('classes/script_start.php');

artist.php

@@ -1,3 +1,3 @@
-<?
+<?php
 define('ERROR_EXCEPTION', true);
-require ('classes/script_start.php');
+require('classes/script_start.php');

better.php

@@ -1,3 +1,3 @@
-<?
+<?php
 define('ERROR_EXCEPTION', true);
 require('classes/script_start.php');

blog.php

@@ -1 +1,2 @@
-<? require('classes/script_start.php');
+<?php
+require('classes/script_start.php');

bookmarks.php

@@ -1,3 +1,3 @@
-<?
+<?php
 define('ERROR_EXCEPTION', true);
 require('classes/script_start.php');

browse.php

@@ -1 +1,2 @@
-<? header('Location: torrents.php');
+<?php
+header('Location: torrents.php');

chat.php

@@ -1,2 +1,2 @@
-<? require("classes/script_start.php");
-
+<?php
+require('classes/script_start.php');

collage.php

@@ -1,4 +1,4 @@
-<?
-$_SERVER['SCRIPT_FILENAME'] = 'collages.php'; // PHP CLI fix
+<?php
+$_SERVER['SCRIPT_FILENAME'] = 'collages.php'; // CLI fix
 define('ERROR_EXCEPTION', true);
 require('classes/script_start.php');

collages.php

@@ -1,3 +1,3 @@
-<?
+<?php
 define('ERROR_EXCEPTION', true);
 require('classes/script_start.php');

comments.php

@@ -1,3 +1,3 @@
-<?
+<?php
 define('ERROR_EXCEPTION', true);
 require('classes/script_start.php');

contest.php

@@ -1,3 +1,3 @@
-<?
+<?php
 define('ERROR_EXCEPTION', true);
 require('classes/script_start.php');

delete.php

@@ -1 +1,2 @@
-<? require('classes/script_start.php');
+<?php
+require('classes/script_start.php');

donate.php

@@ -1 +1,2 @@
-<? require('classes/script_start.php');
+<?php
+require('classes/script_start.php');

enable.php

@@ -1 +1,2 @@
-<? require('classes/script_start.php');
+<?php
+require('classes/script_start.php');

error.php

@@ -1 +1,2 @@
-<? require("classes/script_start.php");
+<?php
+require('classes/script_start.php');

feeds.php

@@ -1,4 +1,4 @@
-<?
+<?php
 /*-- Feed Start Class ----------------------------------*/
 /*------------------------------------------------------*/
 /* Simplified version of script_start, used for the     */
@@ -8,7 +8,7 @@
 
 // Let's prevent people from clearing feeds
 if (isset($_GET['clearcache'])) {
-  unset($_GET['clearcache']);
+    unset($_GET['clearcache']);
 }
 
 require_once('classes/config.php'); // The config contains all site-wide configuration information as well as memcached rules
@@ -19,33 +19,36 @@ require_once(SERVER_ROOT.'/classes/feed.class.php'); // Require the feeds class
 $Cache = new Cache(MEMCACHED_SERVERS); // Load the caching class
 $Feed = new FEED; // Load the time class
 
-function check_perms() {
-  return false;
+function check_perms()
+{
+    return false;
 }
 
-function is_number($Str) {
-  if ($Str < 0) {
-    return false;
-  }
-  // We're converting input to an int, then string, and comparing to the original
-  return ($Str == strval(intval($Str)));
+function is_number($Str)
+{
+    if ($Str < 0) {
+        return false;
+    }
+    // We're converting input to an int, then string, and comparing to the original
+    return ($Str === strval(intval($Str)));
 }
 
-function display_str($Str) {
-  if ($Str != '') {
-    $Str = make_utf8($Str);
-    $Str = mb_convert_encoding($Str, 'HTML-ENTITIES', 'UTF-8');
-    $Str = preg_replace("/&(?![A-Za-z]{0,4}\w{2,3};|#[0-9]{2,5};)/m", '&amp;', $Str);
+function display_str($Str)
+{
+    if ($Str !== '') {
+        $Str = make_utf8($Str);
+        $Str = mb_convert_encoding($Str, 'HTML-ENTITIES', 'UTF-8');
+        $Str = preg_replace('/&(?![A-Za-z]{0,4}\w{2,3};|#[0-9]{2,5};)/m', '&amp;', $Str);
 
-    $Replace = array(
-      "'",'"',"<",">",
+        $Replace = array(
+      "'",'"','<','>',
       '&#128;','&#130;','&#131;','&#132;','&#133;','&#134;','&#135;','&#136;',
       '&#137;','&#138;','&#139;','&#140;','&#142;','&#145;','&#146;','&#147;',
       '&#148;','&#149;','&#150;','&#151;','&#152;','&#153;','&#154;','&#155;',
       '&#156;','&#158;','&#159;'
     );
 
-    $With = array(
+        $With = array(
       '&#39;','&quot;','&lt;','&gt;',
       '&#8364;','&#8218;','&#402;','&#8222;','&#8230;','&#8224;','&#8225;','&#710;',
       '&#8240;','&#352;','&#8249;','&#338;','&#381;','&#8216;','&#8217;','&#8220;',
@@ -53,32 +56,35 @@ function display_str($Str) {
       '&#339;','&#382;','&#376;'
     );
 
-    $Str = str_replace($Replace, $With, $Str);
-  }
-  return $Str;
+        $Str = str_replace($Replace, $With, $Str);
+    }
+    return $Str;
 }
 
-function make_utf8($Str) {
-  if ($Str != '') {
-    if (is_utf8($Str)) {
-      $Encoding = 'UTF-8';
+function make_utf8($Str)
+{
+    if ($Str !== '') {
+        if (is_utf8($Str)) {
+            $Encoding = 'UTF-8';
+        }
+        if (empty($Encoding)) {
+            $Encoding = mb_detect_encoding($Str, 'UTF-8, ISO-8859-1');
+        }
+        if (empty($Encoding)) {
+            $Encoding = 'ISO-8859-1';
+        }
+        if ($Encoding === 'UTF-8') {
+            return $Str;
+        } else {
+            return @mb_convert_encoding($Str, 'UTF-8', $Encoding);
+        }
     }
-    if (empty($Encoding)) {
-      $Encoding = mb_detect_encoding($Str, 'UTF-8, ISO-8859-1');
-    }
-    if (empty($Encoding)) {
-      $Encoding = 'ISO-8859-1';
-    }
-    if ($Encoding == 'UTF-8') {
-      return $Str;
-    } else {
-      return @mb_convert_encoding($Str, 'UTF-8', $Encoding);
-    }
-  }
 }
 
-function is_utf8($Str) {
-  return preg_match('%^(?:
+function is_utf8($Str)
+{
+    return preg_match(
+        '%^(?:
     [\x09\x0A\x0D\x20-\x7E]             // ASCII
     | [\xC2-\xDF][\x80-\xBF]            // non-overlong 2-byte
     | \xE0[\xA0-\xBF][\x80-\xBF]        // excluding overlongs
@@ -87,24 +93,27 @@ function is_utf8($Str) {
     | \xF0[\x90-\xBF][\x80-\xBF]{2}     // planes 1-3
     | [\xF1-\xF3][\x80-\xBF]{3}         // planes 4-15
     | \xF4[\x80-\x8F][\x80-\xBF]{2}     // plane 16
-    )*$%xs', $Str
-  );
+    )*$%xs',
+        $Str
+    );
 }
 
-function display_array($Array, $Escape = []) {
-  foreach ($Array as $Key => $Val) {
-    if ((!is_array($Escape) && $Escape == true) || !in_array($Key, $Escape)) {
-      $Array[$Key] = display_str($Val);
+function display_array($Array, $Escape = [])
+{
+    foreach ($Array as $Key => $Val) {
+        if ((!is_array($Escape) && $Escape === true) || !in_array($Key, $Escape)) {
+            $Array[$Key] = display_str($Val);
+        }
     }
-  }
-  return $Array;
+    return $Array;
 }
 
 /**
  * Print the site's URL including the appropriate URI scheme, including the trailing slash
  */
-function site_url() {
-  return 'https://' . SITE_DOMAIN . '/';
+function site_url()
+{
+    return 'https://' . SITE_DOMAIN . '/';
 }
 
 header('Cache-Control: no-cache, must-revalidate, post-check=0, pre-check=0');

flush.php

@@ -1,4 +1,4 @@
-<?
+<?php
 ob_start();
 
 echo '0';
@@ -15,4 +15,3 @@ sleep(20);
 
 echo '60';
 ob_end_flush();
-

forums.php

@@ -1,3 +1,3 @@
-<?
+<?php
 define('ERROR_EXCEPTION', true);
 require('classes/script_start.php');

friends.php

@@ -1,3 +1,3 @@
-<?
+<?php
 define('ERROR_EXCEPTION', true);
 require('classes/script_start.php');

image.php

@@ -1,67 +1,71 @@
-<?
+<?php
 // Functions and headers needed by the image proxy
 error_reporting(E_COMPILE_ERROR|E_RECOVERABLE_ERROR|E_ERROR|E_CORE_ERROR);
 
 if (isset($_SERVER['HTTP_IF_MODIFIED_SINCE'])) {
-  header("HTTP/1.1 304 Not Modified");
-  die();
+    header('HTTP/1.1 304 Not Modified');
+    die();
 }
 
 header('Expires: '.date('D, d-M-Y H:i:s \U\T\C', time() + 3600 * 24 * 120)); // 120 days
 header('Last-Modified: '.date('D, d-M-Y H:i:s \U\T\C', time()));
 
 if (!extension_loaded('gd')) {
-  error('nogd');
+    error('nogd');
 }
 
-function img_error($Type) {
-  header('Content-type: image/gif');
-  die(file_get_contents(SERVER_ROOT.'/sections/image/err_imgs/'.$Type.'.png'));
+function img_error($Type)
+{
+    header('Content-type: image/gif');
+    die(file_get_contents(SERVER_ROOT.'/sections/image/err_imgs/'.$Type.'.png'));
 }
 
-function invisible($Image) {
-  $Count = imagecolorstotal($Image);
-  if ($Count == 0) {
-    return false;
-  }
-  $TotalAlpha = 0;
-  for ($i = 0; $i < $Count; ++$i) {
-    $Color = imagecolorsforindex($Image, $i);
-    $TotalAlpha += $Color['alpha'];
-  }
-  return (($TotalAlpha / $Count) == 127);
-
+function invisible($Image)
+{
+    $Count = imagecolorstotal($Image);
+    if ($Count === 0) {
+        return false;
+    }
+    $TotalAlpha = 0;
+    for ($i = 0; $i < $Count; ++$i) {
+        $Color = imagecolorsforindex($Image, $i);
+        $TotalAlpha += $Color['alpha'];
+    }
+    return (($TotalAlpha / $Count) === 127);
 }
 
-function verysmall($Image) {
-  return ((imagesx($Image) * imagesy($Image)) < 25);
+function verysmall($Image)
+{
+    return ((imagesx($Image) * imagesy($Image)) < 25);
 }
 
-function image_type($Data) {
-  if (!strncmp($Data, 'GIF', 3)) {
-    return 'gif';
-  }
-  if (!strncmp($Data, pack('H*', '89504E47'), 4)) {
-    return 'png';
-  }
-  if (!strncmp($Data, pack('H*', 'FFD8'), 2)) {
-    return 'jpeg';
-  }
-  if (!strncmp($Data, 'BM', 2)) {
-    return 'bmp';
-  }
-  if (!strncmp($Data, 'II', 2) || !strncmp($Data, 'MM', 2)) {
-    return 'tiff';
-  }
-  if (!substr_compare($Data, 'webm', 31, 4)) {
-    return 'webm';
-  }
+function image_type($Data)
+{
+    if (!strncmp($Data, 'GIF', 3)) {
+        return 'gif';
+    }
+    if (!strncmp($Data, pack('H*', '89504E47'), 4)) {
+        return 'png';
+    }
+    if (!strncmp($Data, pack('H*', 'FFD8'), 2)) {
+        return 'jpeg';
+    }
+    if (!strncmp($Data, 'BM', 2)) {
+        return 'bmp';
+    }
+    if (!strncmp($Data, 'II', 2) || !strncmp($Data, 'MM', 2)) {
+        return 'tiff';
+    }
+    if (!substr_compare($Data, 'webm', 31, 4)) {
+        return 'webm';
+    }
 }
 
-function image_height($Type, $Data) {
-  $Length = strlen($Data);
-  global $URL, $_GET;
-  switch ($Type) {
+function image_height($Type, $Data)
+{
+    $Length = strlen($Data);
+    global $URL, $_GET;
+    switch ($Type) {
     case 'jpeg':
       // See http://www.obrador.com/essentialjpeg/headerinfo.htm
       $i = 4;
@@ -69,22 +73,22 @@ function image_height($Type, $Data) {
       $Block = unpack('nLength', $Data);
       $Data = substr($Data, $Block['Length']);
       $i += $Block['Length'];
-      $Str []= "Started 4, + ".$Block['Length'];
-      while ($Data != '') { // iterate through the blocks until we find the start of frame marker (FFC0)
+      $Str []= 'Started 4, + '.$Block['Length'];
+      while ($Data !== '') { // Iterate through the blocks until we find the start of frame marker (FFC0)
         $Block = unpack('CBlock/CType/nLength', $Data); // Get info about the block
-        if ($Block['Block'] != '255') { // We should be at the start of a new block
+        if ($Block['Block'] !== '255') { // We should be at the start of a new block
           break;
         }
-        if ($Block['Type'] != '192') { // C0
+          if ($Block['Type'] !== '192') { // C0
           $Data = substr($Data, $Block['Length'] + 2); // Next block
-          $Str []= "Started $i, + ".($Block['Length'] + 2);
-          $i += ($Block['Length'] + 2);
-        } else { // We're at the FFC0 block
+          $Str []= 'Started $i, + '.($Block['Length'] + 2);
+              $i += ($Block['Length'] + 2);
+          } else { // We're at the FFC0 block
           $Data = substr($Data, 5); // Skip FF C0 Length(2) precision(1)
           $i += 5;
-          $Height = unpack('nHeight', $Data);
-          return $Height['Height'];
-        }
+              $Height = unpack('nHeight', $Data);
+              return $Height['Height'];
+          }
       }
       break;
     case 'gif':
@@ -102,4 +106,3 @@ function image_height($Type, $Data) {
 
 define('SKIP_NO_CACHE_HEADERS', 1);
 require('classes/script_start.php'); // script_start contains all we need and includes sections/image/index.php
-?>

inbox.php

@@ -1 +1,2 @@
-<? require('classes/script_start.php');
+<?php
+require('classes/script_start.php');

index.php

@@ -1 +1,2 @@
-<? require('classes/script_start.php');
+<?php
+require('classes/script_start.php');

irc.php

@@ -1,3 +1,3 @@
-<?
-$_SERVER['SCRIPT_FILENAME'] = 'irc.php'; // PHP CLI fix
+<?php
+$_SERVER['SCRIPT_FILENAME'] = 'irc.php'; // CLI fix
 require('classes/script_start.php');

locked.php

@@ -1 +1,2 @@
-<? require('classes/script_start.php');
+<?php
+require('classes/script_start.php');

log.php

@@ -1,3 +1,2 @@
-<?
+<?php
 require 'classes/script_start.php';
-?>

login.php

@@ -1 +1,2 @@
-<? require('classes/script_start.php');
+<?php
+require('classes/script_start.php');

logout.php

@@ -1,3 +1,2 @@
-<? require("classes/script_start.php");
-
-?>
+<?php
+require('classes/script_start.php');

manifest.php

@@ -1,7 +1,9 @@
-<? require 'classes/config.php'; ?>
+<?php
+require 'classes/config.php'; ?>
+
 {
-  "name": "<?=SITE_NAME?>",
-  "short_name": "<?=SITE_NAME?>",
+  "name": "<?= SITE_NAME ?>",
+  "short_name": "<?= SITE_NAME ?>",
   "start_url": "index.php",
   "display": "standalone",
   "background_color": "#FCC2E6",

questions.php

@@ -1 +1,2 @@
-<? require('classes/script_start.php'); ?>
+<?php
+require('classes/script_start.php');

register.php

@@ -1 +1,2 @@
-<? require('classes/script_start.php');
+<?php
+require('classes/script_start.php');

reports.php

@@ -1 +1,2 @@
-<? require('classes/script_start.php');
+<?php
+require('classes/script_start.php');

reportsv2.php

@@ -1 +1,2 @@
-<? require 'classes/script_start.php';
+<?php
+require 'classes/script_start.php';

requests.php

@@ -1 +1,2 @@
-<? require('classes/script_start.php'); ?>
+<?php
+require('classes/script_start.php');

rules.php

@@ -1 +1,2 @@
-<? require("classes/script_start.php");
+<?php
+require('classes/script_start.php');

schedule.php

@@ -1,6 +1,6 @@
-<?
+<?php
 define('MEMORY_EXCEPTION', true);
 define('TIME_EXCEPTION', true);
 define('ERROR_EXCEPTION', true);
 $_SERVER['SCRIPT_FILENAME'] = 'schedule.php'; // CLI fix
-require("classes/script_start.php");
+require('classes/script_start.php');

signup.php

@@ -1 +1,2 @@
-<? header('Location: register.php');
+<?php
+header('Location: register.php');

sitehistory.php

@@ -1,2 +1,2 @@
-<?
+<?php
 require('classes/script_start.php');

slaves.php

@@ -1,3 +1,3 @@
-<?
+<?php
 define('ERROR_EXCEPTION', true);
 require('classes/script_start.php');

snatchlist.php

@@ -1,3 +1,3 @@
-<?
+<?php
 define('ERROR_EXCEPTION', true);
 require('classes/script_start.php');

staff.php

@@ -1,2 +1,2 @@
-<? require('classes/script_start.php');
-
+<?php
+require('classes/script_start.php');

staffblog.php

@@ -1,3 +1,3 @@
-<?
+<?php
 define('ERROR_EXCEPTION', true);
 require('classes/script_start.php');

staffpm.php

@@ -1,2 +1,2 @@
-<? require('classes/script_start.php');
-
+<?php
+require('classes/script_start.php');

stats.php

@@ -1 +1,2 @@
-<? require('classes/script_start.php');
+<?php
+require('classes/script_start.php');

store.php

@@ -1,3 +1,3 @@
-<?
+<?php
 define('ERROR_EXCEPTION', true);
 require('classes/script_start.php');

testing.php

@@ -1,2 +1,2 @@
-<?
+<?php
 require('classes/script_start.php');

top10.php

@@ -1 +1,2 @@
-<? require('classes/script_start.php');
+<?php
+require('classes/script_start.php');

torrents.php

@@ -1,3 +1,3 @@
-<?
+<?php
 define('ERROR_EXCEPTION', true);
 require('classes/script_start.php');

upload.php

@@ -1,3 +1,3 @@
-<?
+<?php
 define('ERROR_EXCEPTION', true);
 require('classes/script_start.php');

user.php

@@ -1,3 +1,3 @@
-<?
+<?php
 define('ERROR_EXCEPTION', true);
 require('classes/script_start.php');

userhistory.php

@@ -1,3 +1,3 @@
-<?
+<?php
 define('ERROR_EXCEPTION', true);
 require('classes/script_start.php');

whitelist.php

@@ -1,2 +1,2 @@
-<? header('Location: rules.php?p=clients');
-
+<?php
+header('Location: rules.php?p=clients');

wiki.php

@@ -1,3 +1,3 @@
-<?
+<?php
 define('ERROR_EXCEPTION', true);
 require('classes/script_start.php');