BOINC / boinc

html/inc/cache.inc

Braces +7 added lines, -7 removed lines

@@ -107,7 +107,7 @@ 
 
 // check cache size every once in a while, purge if too big
 //
-function cache_check_diskspace(){
+function cache_check_diskspace() {
     if ((rand() % CACHE_SIZE_CHECK_FREQ)) return;
     if (disk_usage("../cache") < MAX_CACHE_USAGE) return;
     $x = max(TEAM_PAGE_TTL, USER_PAGE_TTL, USER_HOST_TTL,
@@ -116,7 +116,7 @@ 
     clean_cache($x, "../cache");
 }
 
-function cache_need_to_regenerate($path, $max_age){
+function cache_need_to_regenerate($path, $max_age) {
     $regenerate = false;
     $request = apache_request_headers();
 
@@ -139,7 +139,7 @@ 
 }
 
 // Returns cached data or false if nothing was found
-function get_cached_data($max_age, $params=""){
+function get_cached_data($max_age, $params="") {
     global $no_cache;
 
     if ($no_cache) return;
@@ -165,7 +165,7 @@ 
 }
 
 // DEPRECATED
-function start_cache($max_age, $params=""){
+function start_cache($max_age, $params="") {
     global $no_cache, $caching, $memcache;
 
     if ($no_cache) return;
@@ -188,7 +188,7 @@ 
             $regenerate = cache_need_to_regenerate($path, $max_age);
         }
         //Is the stored version too old, do we need to regenerate it?
-        if ($regenerate){
+        if ($regenerate) {
             // If cached version is too old (or non-existent)
             // generate the page and write to cache
             //
@@ -228,7 +228,7 @@ 
 
 // write output buffer both to client and to cache
 // DEPRECATED
-function end_cache($max_age,$params=""){
+function end_cache($max_age,$params="") {
     global $no_cache;
     if ($no_cache) return;
 
@@ -253,7 +253,7 @@ 
     }
 }
 
-function set_cached_data($max_age, $data, $params=""){
+function set_cached_data($max_age, $data, $params="") {
     // for the benefit of hackers
     if (strstr($params, "..")) {
         return "bad params";

Indentation +1 added lines, -1 removed lines

@@ -99,7 +99,7 @@
                 }
             }
         }
-       @closedir($handle);
+        @closedir($handle);
     }
     chdir($start_dir);
 }

Spacing +29 added lines, -29 removed lines

@@ -32,8 +32,8 @@ 
         mkdir("../cache", 0770);
         chmod("../cache", 0770);
     }
-    for ($i=0;$i<256;$i++) {
-        $j=sprintf("%02x",$i);
+    for ($i = 0; $i < 256; $i++) {
+        $j = sprintf("%02x", $i);
         if (!@filemtime("../cache/$j")) {
             mkdir("../cache/$j", 0770);
             chmod("../cache/$j", 0770);
@@ -41,7 +41,7 @@ 
     }
 }
 
-function get_path($params, $phpfile=null) {
+function get_path($params, $phpfile = null) {
     if (!@filemtime("../cache/00")) make_cache_dirs();
     if ($phpfile) {
         $z = $phpfile;
@@ -51,7 +51,7 @@ 
     }
 
     // add a layer of subdirectories for reducing file lookup time
-    $sz = substr(md5($z."_".urlencode($params)),1,2);
+    $sz = substr(md5($z."_".urlencode($params)), 1, 2);
     $path = "../cache/".$sz."/".$z;
     if ($params) {
         $path = $path."_".urlencode($params);
@@ -60,14 +60,14 @@ 
 }
 
 function disk_usage($dir) {
-    $usage=0;
-    if ($handle=@opendir($dir)) {
-        while ($file=readdir($handle)) {
+    $usage = 0;
+    if ($handle = @opendir($dir)) {
+        while ($file = readdir($handle)) {
             if (($file != ".") && ($file != "..")) {
                 if (@is_dir($dir."/".$file)) {
-                    $usage+=disk_usage($dir."/".$file);
+                    $usage += disk_usage($dir."/".$file);
                 } else {
-                    $usage+=@filesize($dir."/".$file);
+                    $usage += @filesize($dir."/".$file);
                 }
             }
         }
@@ -81,8 +81,8 @@ 
     if (!chdir($dir)) {
         return;
     }
-    if ($handle=@opendir(".")) {
-        while ($file=readdir($handle)) {
+    if ($handle = @opendir(".")) {
+        while ($file = readdir($handle)) {
             if ($file == ".") continue;
             if ($file == "..") continue;
 
@@ -93,7 +93,7 @@ 
             if (@is_dir($file)) {
                 clean_cache($max_age, $file);
             } else {
-                if ((time()-@filemtime($file))>$max_age) {
+                if ((time() - @filemtime($file)) > $max_age) {
                     //echo "unlinking ".getcwd()."/$file\n";
                     @unlink($file);
                 }
@@ -107,8 +107,8 @@ 
 
 // check cache size every once in a while, purge if too big
 //
-function cache_check_diskspace(){
-    if ((rand() % CACHE_SIZE_CHECK_FREQ)) return;
+function cache_check_diskspace() {
+    if ((rand()%CACHE_SIZE_CHECK_FREQ)) return;
     if (disk_usage("../cache") < MAX_CACHE_USAGE) return;
     $x = max(TEAM_PAGE_TTL, USER_PAGE_TTL, USER_HOST_TTL,
         USER_PROFILE_TTL, TOP_PAGES_TTL, INDEX_PAGE_TTL
@@ -116,7 +116,7 @@ 
     clean_cache($x, "../cache");
 }
 
-function cache_need_to_regenerate($path, $max_age){
+function cache_need_to_regenerate($path, $max_age) {
     $regenerate = false;
     $request = apache_request_headers();
 
@@ -128,7 +128,7 @@ 
         // and touch the cached copy so other processes
         // don't regenerate at the same time
         //
-        if ($lastmodified<time()-$max_age) {
+        if ($lastmodified < time() - $max_age) {
             $regenerate = true;
             @touch($path);
         }
@@ -139,7 +139,7 @@ 
 }
 
 // Returns cached data or false if nothing was found
-function get_cached_data($max_age, $params=""){
+function get_cached_data($max_age, $params = "") {
     global $no_cache;
 
     if ($no_cache) return;
@@ -155,7 +155,7 @@ 
             }
         } else {
             cache_check_diskspace();
-            $regenerate=cache_need_to_regenerate($path, $max_age);
+            $regenerate = cache_need_to_regenerate($path, $max_age);
             if (!$regenerate) {
                 return file_get_contents($path);
             }
@@ -165,7 +165,7 @@ 
 }
 
 // DEPRECATED
-function start_cache($max_age, $params=""){
+function start_cache($max_age, $params = "") {
     global $no_cache, $caching, $memcache;
 
     if ($no_cache) return;
@@ -188,15 +188,15 @@ 
             $regenerate = cache_need_to_regenerate($path, $max_age);
         }
         //Is the stored version too old, do we need to regenerate it?
-        if ($regenerate){
+        if ($regenerate) {
             // If cached version is too old (or non-existent)
             // generate the page and write to cache
             //
             ob_start();
             ob_implicit_flush(0);
-            Header("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT");
-            Header("Expires: " . gmdate("D, d M Y H:i:s",time()+$max_age) . " GMT");
-            Header("Cache-Control: public, max-age=" . $max_age);
+            Header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
+            Header("Expires: ".gmdate("D, d M Y H:i:s", time() + $max_age)." GMT");
+            Header("Cache-Control: public, max-age=".$max_age);
 
             // allow the calling page to see cache period
             //
@@ -208,9 +208,9 @@ 
             if (strstr($params, "format=xml")) {
                 header('Content-type: text/xml');
             }
-            Header("Last-Modified: " . gmdate("D, d M Y H:i:s",$lastmodified) . " GMT");
-            Header("Expires: " . gmdate("D, d M Y H:i:s",$lastmodified+$max_age) . " GMT");
-            Header("Cache-Control: public, max-age=" . $max_age );
+            Header("Last-Modified: ".gmdate("D, d M Y H:i:s", $lastmodified)." GMT");
+            Header("Expires: ".gmdate("D, d M Y H:i:s", $lastmodified + $max_age)." GMT");
+            Header("Cache-Control: public, max-age=".$max_age);
             if ($cache && $cache->content) {
                 echo $cache->content;
                 exit;
@@ -228,7 +228,7 @@ 
 
 // write output buffer both to client and to cache
 // DEPRECATED
-function end_cache($max_age,$params=""){
+function end_cache($max_age, $params = "") {
     global $no_cache;
     if ($no_cache) return;
 
@@ -253,7 +253,7 @@ 
     }
 }
 
-function set_cached_data($max_age, $data, $params=""){
+function set_cached_data($max_age, $data, $params = "") {
     // for the benefit of hackers
     if (strstr($params, "..")) {
         return "bad params";
@@ -295,7 +295,7 @@ 
         }
         $server_arr = array();
         $servers = explode('|', MEMCACHE_SERVERS);
-        foreach($servers as &$server) {
+        foreach ($servers as &$server) {
             list($ip, $port, $weight) = explode(':', $server);
             if (!$port) { $port = 11211; }
             $server_arr[] = array($ip, $port, $weight);

html/inc/text_transform.inc

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

@@ -62,7 +62,7 @@
 // Do the actual transformation of the text.
 // TODO: Make this part of the above class.
 
-function output_transform($text, $options = NULL) {
+function output_transform($text, $options = null) {
     // Options is a output_options object, defined above
     if (!$options) {
         $options = new output_options; // Defaults in the class definition

Spacing +24 added lines, -24 removed lines

@@ -26,13 +26,13 @@ 
 require_once('../inc/sanitize_html.inc');
 
 class output_options {
-    var $bb2html;            // BBCode as HTML? (on)
-    var $images_as_links;    // Images as hyperlinks? (off)
-    var $link_popup;        // Links in new windows? (off)
-    var $nl2br;                // Convert newlines to <br>'s? (on)
-    var $htmlitems;            // Convert special chars to HTML entities? (on)
-    var $htmlscrub;            // Scrub "bad" HTML tags? (off)
-    var $highlight_terms;// Array of terms to be highlighted (off)
+    var $bb2html; // BBCode as HTML? (on)
+    var $images_as_links; // Images as hyperlinks? (off)
+    var $link_popup; // Links in new windows? (off)
+    var $nl2br; // Convert newlines to <br>'s? (on)
+    var $htmlitems; // Convert special chars to HTML entities? (on)
+    var $htmlscrub; // Scrub "bad" HTML tags? (off)
+    var $highlight_terms; // Array of terms to be highlighted (off)
 
     // Constructor - set the defaults.
 
@@ -68,7 +68,7 @@ 
         $options = new output_options; // Defaults in the class definition
     }
     if ($options->htmlitems) {
-        $text = htmlspecialchars($text, ENT_COMPAT | ENT_HTML401 | ENT_SUBSTITUTE);
+        $text = htmlspecialchars($text, ENT_COMPAT|ENT_HTML401|ENT_SUBSTITUTE);
     }
     if (is_array($options->highlight_terms)) {
         $text = highlight_terms($text, $options->highlight_terms);
@@ -104,7 +104,7 @@ 
 // If $export is true, don't use BOINC CSS
 
 function substr2($s, $n1, $n2) {
-    return substr($s, $n1, $n2-$n1);
+    return substr($s, $n1, $n2 - $n1);
 }
 
 // process non-nestable constructs: [pre] and [code]
@@ -177,7 +177,7 @@ 
 
     $httpsregex = "(?:\"?)https\:\/\/([^\[\"<\ ]+)(?:\"?)";
     // List of allowable tags
-    $bbtags = array (
+    $bbtags = array(
         "@\[b\](.*?)\[/b\]@is",
         "@\[i\](.*?)\[/i\]@is",
         "@\[u\](.*?)\[/u\]@is",
@@ -206,7 +206,7 @@ 
 
     // What the above tags are turned in to
     if ($export) {
-        $htmltags = array (
+        $htmltags = array(
             "<b>\\1</b>",
             "<i>\\1</i>",
             "<u>\\1</u>",
@@ -233,7 +233,7 @@ 
             "<a href=\"https://github.com/BOINC/boinc/wiki/\\1\">\\1</a>",
         );
     } else {
-        $htmltags = array (
+        $htmltags = array(
             "<b>\\1</b>",
             "<i>\\1</i>",
             "<u>\\1</u>",
@@ -265,7 +265,7 @@ 
     $lasttext = "";
     $i = 0;
     // $i<1000 to prevent DoS
-    while ($text != $lasttext && $i<1000) {
+    while ($text != $lasttext && $i < 1000) {
         $lasttext = $text;
         $text = preg_replace($bbtags, $htmltags, $text);
         $i = $i + 1;
@@ -275,7 +275,7 @@ 
     return $text;
 }
 
-function bb2html($text, $export=false) {
+function bb2html($text, $export = false) {
     $text = replace_pre_code($text, $export);
     return bb2html_aux($text, $export);
 }
@@ -284,7 +284,7 @@ 
 // for example inside <pre> containers
 // The original \n was retained after the br when it was added
 //
-function remove_br($text){
+function remove_br($text) {
     return str_replace("<br />", "", $text);
 }
 
@@ -292,19 +292,19 @@ 
 //
 function externalize_links($text) {
     // TODO:  Convert this to PCRE
-    $i=0;
-    $linkpos=true;
+    $i = 0;
+    $linkpos = true;
     $out = "";
-    while (true){
+    while (true) {
         // Find a link
         //
-        $linkpos=strpos($text, "<a ", $i);
-        if ($linkpos===false) break;
+        $linkpos = strpos($text, "<a ", $i);
+        if ($linkpos === false) break;
 
         // Replace with target='_new'
         //
-        $out .= substr($text, $i, $linkpos-$i)."<a target=\"_new\" ";
-        $i = $linkpos+3;
+        $out .= substr($text, $i, $linkpos - $i)."<a target=\"_new\" ";
+        $i = $linkpos + 3;
     }
     $out .= substr($text, $i);
     return $out;
@@ -312,7 +312,7 @@ 
 
 // Converts image tags to links to the images.
 //
-function image_as_link($text){
+function image_as_link($text) {
     $pattern = '@<img([\S\s]+?)src=([^>]+?)>@si';
     $replacement = '<a href=${2}>[Image link]</a>';
     return preg_replace($pattern, $replacement, $text);
@@ -330,5 +330,5 @@ 
     return str_ireplace($search, $replace, $text);
 }
 
-$cvs_version_tracker[]="\$Id$";  //Generated automatically - do not edit
+$cvs_version_tracker[] = "\$Id$"; //Generated automatically - do not edit
 ?>

Braces +3 added lines, -3 removed lines

@@ -284,7 +284,7 @@ 
 // for example inside <pre> containers
 // The original \n was retained after the br when it was added
 //
-function remove_br($text){
+function remove_br($text) {
     return str_replace("<br />", "", $text);
 }
 
@@ -295,7 +295,7 @@ 
     $i=0;
     $linkpos=true;
     $out = "";
-    while (true){
+    while (true) {
         // Find a link
         //
         $linkpos=strpos($text, "<a ", $i);
@@ -312,7 +312,7 @@ 
 
 // Converts image tags to links to the images.
 //
-function image_as_link($text){
+function image_as_link($text) {
     $pattern = '@<img([\S\s]+?)src=([^>]+?)>@si';
     $replacement = '<a href=${2}>[Image link]</a>';
     return preg_replace($pattern, $replacement, $text);

html/inc/ReCaptcha/ReCaptcha.php

Braces +3 added lines, -6 removed lines

@@ -29,8 +29,7 @@ 
 /**
  * reCAPTCHA client.
  */
-class ReCaptcha
-{
+class ReCaptcha {
     /**
      * Version of this client library.
      * @const string
@@ -55,8 +54,7 @@ 
      * @param string $secret shared secret between site and reCAPTCHA server.
      * @param RequestMethod $requestMethod method used to send the request. Defaults to POST.
      */
-    public function __construct($secret, RequestMethod $requestMethod = null)
-    {
+    public function __construct($secret, RequestMethod $requestMethod = null) {
         if (empty($secret)) {
             throw new \RuntimeException('No secret provided');
         }
@@ -82,8 +80,7 @@ 
      * @param string $remoteIp The end user's IP address.
      * @return Response Response from the service.
      */
-    public function verify($response, $remoteIp = null)
-    {
+    public function verify($response, $remoteIp = null) {
         // Discard empty solution submissions
         if (empty($response)) {
             $recaptchaResponse = new Response(false, array('missing-input-response'));

html/inc/ReCaptcha/RequestMethod.php

Braces +1 added lines, -2 removed lines

@@ -29,8 +29,7 @@
 /**
  * Method used to send the request to the service.
  */
-interface RequestMethod
-{
+interface RequestMethod {
 
     /**
      * Submit the request with the specified parameters.

html/inc/ReCaptcha/RequestMethod/CurlPost.php

Braces +3 added lines, -6 removed lines

@@ -34,8 +34,7 @@ 
  * Note: this requires the cURL extension to be enabled in PHP
  * @see http://php.net/manual/en/book.curl.php
  */
-class CurlPost implements RequestMethod
-{
+class CurlPost implements RequestMethod {
     /**
      * URL to which requests are sent via cURL.
      * @const string
@@ -48,8 +47,7 @@ 
      */
     private $curl;
 
-    public function __construct(Curl $curl = null)
-    {
+    public function __construct(Curl $curl = null) {
         if (!is_null($curl)) {
             $this->curl = $curl;
         } else {
@@ -63,8 +61,7 @@ 
      * @param RequestParameters $params Request parameters
      * @return string Body of the reCAPTCHA response
      */
-    public function submit(RequestParameters $params)
-    {
+    public function submit(RequestParameters $params) {
         $handle = $this->curl->init(self::SITE_VERIFY_URL);
 
         $options = array(

html/inc/ReCaptcha/RequestMethod/Post.php

Braces +2 added lines, -4 removed lines

@@ -32,8 +32,7 @@ 
 /**
  * Sends POST requests to the reCAPTCHA service.
  */
-class Post implements RequestMethod
-{
+class Post implements RequestMethod {
     /**
      * URL to which requests are POSTed.
      * @const string
@@ -46,8 +45,7 @@ 
      * @param RequestParameters $params Request parameters
      * @return string Body of the reCAPTCHA response
      */
-    public function submit(RequestParameters $params)
-    {
+    public function submit(RequestParameters $params) {
         /**
          * PHP 5.6.0 changed the way you specify the peer name for SSL context options.
          * Using "CN_name" will still work, but it will raise deprecated errors.

html/inc/ReCaptcha/RequestMethod/Socket.php

Braces +6 added lines, -12 removed lines

@@ -30,8 +30,7 @@ 
  * Convenience wrapper around native socket and file functions to allow for
  * mocking.
  */
-class Socket
-{
+class Socket {
     private $handle = null;
 
     /**
@@ -45,8 +44,7 @@ 
      * @param float $timeout
      * @return resource
      */
-    public function fsockopen($hostname, $port = -1, &$errno = 0, &$errstr = '', $timeout = null)
-    {
+    public function fsockopen($hostname, $port = -1, &$errno = 0, &$errstr = '', $timeout = null) {
         $this->handle = fsockopen($hostname, $port, $errno, $errstr, (is_null($timeout) ? ini_get("default_socket_timeout") : $timeout));
 
         if ($this->handle != false && $errno === 0 && $errstr === '') {
@@ -63,8 +61,7 @@ 
      * @param int $length
      * @return int | bool
      */
-    public function fwrite($string, $length = null)
-    {
+    public function fwrite($string, $length = null) {
         return fwrite($this->handle, $string, (is_null($length) ? strlen($string) : $length));
     }
 
@@ -75,8 +72,7 @@ 
      * @param int $length
      * @return string
      */
-    public function fgets($length = null)
-    {
+    public function fgets($length = null) {
         return fgets($this->handle, $length);
     }
 
@@ -86,8 +82,7 @@ 
      * @see http://php.net/feof
      * @return bool
      */
-    public function feof()
-    {
+    public function feof() {
         return feof($this->handle);
     }
 
@@ -97,8 +92,7 @@ 
      * @see http://php.net/fclose
      * @return bool
      */
-    public function fclose()
-    {
+    public function fclose() {
         return fclose($this->handle);
     }
 }

html/inc/ReCaptcha/RequestMethod/Curl.php

Braces +5 added lines, -10 removed lines

@@ -29,16 +29,14 @@ 
 /**
  * Convenience wrapper around the cURL functions to allow mocking.
  */
-class Curl
-{
+class Curl {
 
     /**
      * @see http://php.net/curl_init
      * @param string $url
      * @return resource cURL handle
      */
-    public function init($url = null)
-    {
+    public function init($url = null) {
         return curl_init($url);
     }
 
@@ -48,8 +46,7 @@ 
      * @param array $options
      * @return bool
      */
-    public function setoptArray($ch, array $options)
-    {
+    public function setoptArray($ch, array $options) {
         return curl_setopt_array($ch, $options);
     }
 
@@ -58,8 +55,7 @@ 
      * @param resource $ch
      * @return mixed
      */
-    public function exec($ch)
-    {
+    public function exec($ch) {
         return curl_exec($ch);
     }
 
@@ -67,8 +63,7 @@ 
      * @see http://php.net/curl_close
      * @param resource $ch
      */
-    public function close($ch)
-    {
+    public function close($ch) {
         curl_close($ch);
     }
 }

html/inc/ReCaptcha/Response.php

Braces +5 added lines, -10 removed lines

@@ -29,8 +29,7 @@ 
 /**
  * The response returned from the service.
  */
-class Response
-{
+class Response {
     /**
      * Succes or failure.
      * @var boolean
@@ -49,8 +48,7 @@ 
      * @param string $json
      * @return \ReCaptcha\Response
      */
-    public static function fromJson($json)
-    {
+    public static function fromJson($json) {
         $responseData = json_decode($json, true);
 
         if (!$responseData) {
@@ -74,8 +72,7 @@ 
      * @param boolean $success
      * @param array $errorCodes
      */
-    public function __construct($success, array $errorCodes = array())
-    {
+    public function __construct($success, array $errorCodes = array()) {
         $this->success = $success;
         $this->errorCodes = $errorCodes;
     }
@@ -85,8 +82,7 @@ 
      *
      * @return boolean
      */
-    public function isSuccess()
-    {
+    public function isSuccess() {
         return $this->success;
     }
 
@@ -95,8 +91,7 @@ 
      *
      * @return array
      */
-    public function getErrorCodes()
-    {
+    public function getErrorCodes() {
         return $this->errorCodes;
     }
 }