STYLE: refs #236. Fix style warnings

Author: zachmullen

core/controllers/DownloadController.php

@@ -108,9 +108,9 @@ public function indexAction()
       $bitstreams = $revision->getBitstreams();
 
       if($this->_getParam('testingmode') == '1')
-          {
-          $bitstreams = array($bitstreams[0]);
-          }
+        {
+        $bitstreams = array($bitstreams[0]);
+        }
 
       if(count($bitstreams) == 0)
         {

core/controllers/components/DownloadBitstreamComponent.php

@@ -58,10 +58,10 @@ function download($bitstream)
       if(!isset($contentType))
         {
         $contentType = 'application/octet-stream';
-        } 
+        }
 
       // Hack for .vsp files (for OSA)
-      if(!isset($contentType) && strlen($name) > 4 && substr($name,strlen($name) - 4, 4) == '.vsp')
+      if(!isset($contentType) && strlen($name) > 4 && substr($name, strlen($name) - 4, 4) == '.vsp')
         {
         $contentType = 'application/isp';
         }
@@ -98,7 +98,7 @@ function download($bitstream)
         header('Expires: 0');
         header('Content-Type: '.$contentType);
         header('Content-Length: '.$fileSize);
-        if(!isset($enableContentDisposition) || $enableContentDisposition == true) 
+        if(!isset($enableContentDisposition) || $enableContentDisposition == true)
           {
           header('Content-Disposition: attachment; filename="'.$name.'";');
           }
@@ -137,20 +137,6 @@ function download($bitstream)
     }
   } //end class
 
-  
-
-
-
-
-  
-
-  
-    
-  
-
-
-
-
 /**
  * Gets an environment variable from available sources, and provides emulation
  * for unsupported or inconsistent environment variables (i.e. DOCUMENT_ROOT on
@@ -161,68 +147,87 @@ function download($bitstream)
  * @return string Environment variable setting.
  * @link http://book.cakephp.org/view/1130/env
  */
-  function env($key) {
-    if ($key == 'HTTPS') {
-      if (isset($_SERVER['HTTPS'])) {
-        return (!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off');
+function env($key)
+  {
+  if($key == 'HTTPS')
+    {
+    if(isset($_SERVER['HTTPS']))
+      {
+      return (!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off');
       }
-      return (strpos(env('SCRIPT_URI'), 'https://') === 0);
+    return (strpos(env('SCRIPT_URI'), 'https://') === 0);
     }
 
-    if ($key == 'SCRIPT_NAME') {
-      if (env('CGI_MODE') && isset($_ENV['SCRIPT_URL'])) {
-        $key = 'SCRIPT_URL';
+  if($key == 'SCRIPT_NAME')
+    {
+    if(env('CGI_MODE') && isset($_ENV['SCRIPT_URL']))
+      {
+      $key = 'SCRIPT_URL';
       }
     }
 
-    $val = null;
-    if (isset($_SERVER[$key])) {
-      $val = $_SERVER[$key];
-    } elseif (isset($_ENV[$key])) {
-      $val = $_ENV[$key];
-    } elseif (getenv($key) !== false) {
-      $val = getenv($key);
+  $val = null;
+  if(isset($_SERVER[$key]))
+    {
+    $val = $_SERVER[$key];
+    }
+  elseif(isset($_ENV[$key]))
+    {
+    $val = $_ENV[$key];
+    }
+  elseif(getenv($key) !== false)
+    {
+    $val = getenv($key);
     }
 
-    if ($key === 'REMOTE_ADDR' && $val === env('SERVER_ADDR')) {
-      $addr = env('HTTP_PC_REMOTE_ADDR');
-      if ($addr !== null) {
-        $val = $addr;
+  if($key === 'REMOTE_ADDR' && $val === env('SERVER_ADDR'))
+    {
+    $addr = env('HTTP_PC_REMOTE_ADDR');
+    if($addr !== null)
+      {
+      $val = $addr;
       }
     }
 
-    if ($val !== null) {
-      return $val;
+  if($val !== null)
+    {
+    return $val;
     }
 
-    switch ($key) {
-      case 'SCRIPT_FILENAME':
-        if (defined('SERVER_IIS') && SERVER_IIS === true) {
-          return str_replace('\\\\', '\\', env('PATH_TRANSLATED'));
+  switch($key)
+    {
+    case 'SCRIPT_FILENAME':
+      if(defined('SERVER_IIS') && SERVER_IIS === true)
+        {
+        return str_replace('\\\\', '\\', env('PATH_TRANSLATED'));
         }
       break;
-      case 'DOCUMENT_ROOT':
-        $name = env('SCRIPT_NAME');
-        $filename = env('SCRIPT_FILENAME');
-        $offset = 0;
-        if (!strpos($name, '.php')) {
-          $offset = 4;
+    case 'DOCUMENT_ROOT':
+      $name = env('SCRIPT_NAME');
+      $filename = env('SCRIPT_FILENAME');
+      $offset = 0;
+      if(!strpos($name, '.php'))
+        {
+        $offset = 4;
         }
-        return substr($filename, 0, strlen($filename) - (strlen($name) + $offset));
+      return substr($filename, 0, strlen($filename) - (strlen($name) + $offset));
       break;
-      case 'PHP_SELF':
-        return str_replace(env('DOCUMENT_ROOT'), '', env('SCRIPT_FILENAME'));
+    case 'PHP_SELF':
+      return str_replace(env('DOCUMENT_ROOT'), '', env('SCRIPT_FILENAME'));
       break;
-      case 'CGI_MODE':
-        return (PHP_SAPI === 'cgi');
+    case 'CGI_MODE':
+      return (PHP_SAPI === 'cgi');
       break;
-      case 'HTTP_BASE':
-        $host = env('HTTP_HOST');
-        if (substr_count($host, '.') !== 1) {
-          return preg_replace('/^([^.])*/i', null, env('HTTP_HOST'));
+    case 'HTTP_BASE':
+      $host = env('HTTP_HOST');
+      if(substr_count($host, '.') !== 1)
+        {
+        return preg_replace('/^([^.])*/i', null, env('HTTP_HOST'));
         }
-      return '.' . $host;
+      return '.'.$host;
+      break;
+    default:
       break;
     }
-    return null;
-  }
+  return null;
+  }