BOINC / boinc

html/user/openid.php

Doc Comments +11 added lines, -1 removed lines

@@ -315,6 +315,11 @@ 
     /**
      * Helper function used to scan for <meta>/<link> tags and extract information
      * from them
+     * @param string $tag
+     * @param string $attrName
+     * @param string $attrValue
+     * @param string $valueName
+     * @return string
      */
     protected function htmlTag($content, $tag, $attrName, $attrValue, $valueName)
     {
@@ -531,6 +536,9 @@ 
         return $params;
     }
 
+    /**
+     * @param boolean $immediate
+     */
     protected function authUrl_v1($immediate)
     {
 	$returnUrl = $this->returnUrl;
@@ -552,6 +560,9 @@ 
                                , array('query' => http_build_query($params, '', '&')));
     }
 
+    /**
+     * @param boolean $immediate
+     */
     protected function authUrl_v2($immediate)
     {
         $params = array(
@@ -587,7 +598,6 @@ 
     /**
      * Returns authentication url. Usually, you want to redirect your user to it.
      * @return String The authentication url.
-     * @param String $select_identifier Whether to request OP to select identity for an user in OpenID 2. Does not affect OpenID 1.
      * @throws ErrorException
      */
     function authUrl($immediate = false)

Indentation +19 added lines, -19 removed lines

@@ -47,11 +47,11 @@ 
 class LightOpenID
 {
     public $returnUrl
-         , $required = array()
-         , $optional = array()
-         , $verify_peer = null
-         , $capath = null
-         , $cainfo = null;
+            , $required = array()
+            , $optional = array()
+            , $verify_peer = null
+            , $capath = null
+            , $cainfo = null;
     private $identity, $claimed_id;
     protected $server, $version, $trustRoot, $aliases, $identifier_select = false
             , $ax = false, $sreg = false, $data, $setup_url = null;
@@ -261,8 +261,8 @@ 
                         $parsed_url = parse_url($this->claimed_id);
                         $this->identity =
                         $this->claimed_id = $parsed_url['scheme'] . '://'
-                                          . $parsed_url['host']
-                                          . $headers[$name];
+                                            . $parsed_url['host']
+                                            . $headers[$name];
                     }
                 }
             }
@@ -301,14 +301,14 @@ 
 
         $url = $parts + $url;
         $url = $url['scheme'] . '://'
-             . (empty($url['username'])?''
+                . (empty($url['username'])?''
                  :(empty($url['password'])? "{$url['username']}@"
                  :"{$url['username']}:{$url['password']}@"))
-             . $url['host']
-             . (empty($url['port'])?'':":{$url['port']}")
-             . (empty($url['path'])?'':$url['path'])
-             . (empty($url['query'])?'':"?{$url['query']}")
-             . (empty($url['fragment'])?'':"#{$url['fragment']}");
+                . $url['host']
+                . (empty($url['port'])?'':":{$url['port']}")
+                . (empty($url['path'])?'':$url['path'])
+                . (empty($url['query'])?'':"?{$url['query']}")
+                . (empty($url['fragment'])?'':"#{$url['fragment']}");
         return $url;
     }
 
@@ -533,7 +533,7 @@ 
 
     protected function authUrl_v1($immediate)
     {
-	$returnUrl = $this->returnUrl;
+    $returnUrl = $this->returnUrl;
         # If we have an openid.delegate that is different from our claimed id,
         # we need to somehow preserve the claimed id between requests.
         # The simplest way is to just send it along with the return_to url.
@@ -549,7 +549,7 @@ 
             ) + $this->sregParams();
 
         return $this->build_url(parse_url($this->server)
-                               , array('query' => http_build_query($params, '', '&')));
+                                , array('query' => http_build_query($params, '', '&')));
     }
 
     protected function authUrl_v2($immediate)
@@ -574,14 +574,14 @@ 
 
         if ($this->identifier_select) {
             $params['openid.identity'] = $params['openid.claimed_id']
-                 = 'http://specs.openid.net/auth/2.0/identifier_select';
+                    = 'http://specs.openid.net/auth/2.0/identifier_select';
         } else {
             $params['openid.identity'] = $this->identity;
             $params['openid.claimed_id'] = $this->claimed_id;
         }
 
         return $this->build_url(parse_url($this->server)
-                               , array('query' => http_build_query($params, '', '&')));
+                                , array('query' => http_build_query($params, '', '&')));
     }
 
     /**
@@ -638,7 +638,7 @@ 
             # If it's an OpenID 1 provider, and we've got claimed_id,
             # we have to append it to the returnUrl, like authUrl_v1 does.
             $this->returnUrl .= (strpos($this->returnUrl, '?') ? '&' : '?')
-                             .  'openid.claimed_id=' . $this->claimed_id;
+                                .  'openid.claimed_id=' . $this->claimed_id;
         }
 
         if ($this->data['openid_return_to'] != $this->returnUrl) {
@@ -707,7 +707,7 @@ 
                 continue;
             }
             $key = substr($this->data['openid_' . $alias . '_type_' . $key],
-                          strlen('http://axschema.org/'));
+                            strlen('http://axschema.org/'));
             $attributes[$key] = $value;
         }
         return $attributes;

Braces +24 added lines, -42 removed lines

@@ -44,8 +44,7 @@ 
  * @copyright Copyright (c) 2010, Mewp
  * @license http://www.opensource.org/licenses/mit-license.php MIT
  */
-class LightOpenID
-{
+class LightOpenID {
     public $returnUrl
          , $required = array()
          , $optional = array()
@@ -67,8 +66,7 @@ 
         'pref/timezone'           => 'timezone',
         );
 
-    function __construct()
-    {
+    function __construct() {
         $this->trustRoot = (!empty($_SERVER['HTTPS']) ? 'https' : 'http') . '://' . $_SERVER['HTTP_HOST'];
         $uri = rtrim(preg_replace('#((?<=\?)|&)openid\.[^&]+#', '', $_SERVER['REQUEST_URI']), '?');
         $this->returnUrl = $this->trustRoot . $uri;
@@ -80,8 +78,7 @@ 
         }
     }
 
-    function __set($name, $value)
-    {
+    function __set($name, $value) {
         switch ($name) {
         case 'identity':
             if (strlen($value = trim((String) $value))) {
@@ -102,8 +99,7 @@ 
         }
     }
 
-    function __get($name)
-    {
+    function __get($name) {
         switch ($name) {
         case 'identity':
             # We return claimed_id instead of identity,
@@ -124,8 +120,7 @@ 
      * @param $url url to check
      * @return true, if the server exists; false otherwise
      */
-    function hostExists($url)
-    {
+    function hostExists($url) {
         if (strpos($url, '/') === false) {
             $server = $url;
         } else {
@@ -139,8 +134,7 @@ 
         return !!gethostbynamel($server);
     }
 
-    protected function request_curl($url, $method='GET', $params=array())
-    {
+    protected function request_curl($url, $method='GET', $params=array()) {
         $params = http_build_query($params, '', '&');
         $curl = curl_init($url . ($method == 'GET' && $params ? '?' . $params : ''));
         curl_setopt($curl, CURLOPT_FOLLOWLOCATION, true);
@@ -195,8 +189,7 @@ 
         return $response;
     }
 
-    protected function request_streams($url, $method='GET', $params=array())
-    {
+    protected function request_streams($url, $method='GET', $params=array()) {
         if(!$this->hostExists($url)) {
             throw new ErrorException('Invalid request.');
         }
@@ -285,16 +278,14 @@ 
         return file_get_contents($url, false, $context);
     }
 
-    protected function request($url, $method='GET', $params=array())
-    {
+    protected function request($url, $method='GET', $params=array()) {
         if(function_exists('curl_init') && !ini_get('safe_mode') && !ini_get('open_basedir')) {
             return $this->request_curl($url, $method, $params);
         }
         return $this->request_streams($url, $method, $params);
     }
 
-    protected function build_url($url, $parts)
-    {
+    protected function build_url($url, $parts) {
         if (isset($url['query'], $parts['query'])) {
             $parts['query'] = $url['query'] . '&' . $parts['query'];
         }
@@ -316,8 +307,7 @@ 
      * Helper function used to scan for <meta>/<link> tags and extract information
      * from them
      */
-    protected function htmlTag($content, $tag, $attrName, $attrValue, $valueName)
-    {
+    protected function htmlTag($content, $tag, $attrName, $attrValue, $valueName) {
         preg_match_all("#<{$tag}[^>]*$attrName=['\"].*?$attrValue.*?['\"][^>]*$valueName=['\"](.+?)['\"][^>]*/?>#i", $content, $matches1);
         preg_match_all("#<{$tag}[^>]*$valueName=['\"](.+?)['\"][^>]*$attrName=['\"].*?$attrValue.*?['\"][^>]*/?>#i", $content, $matches2);
 
@@ -331,8 +321,7 @@ 
      * @return String OP Endpoint (i.e. OpenID provider address).
      * @throws ErrorException
      */
-    function discover($url)
-    {
+    function discover($url) {
         if (!$url) throw new ErrorException('No identity supplied.');
         # Use xri.net proxy to resolve i-name identities
         if (!preg_match('#^https?:#', $url)) {
@@ -465,8 +454,7 @@ 
         throw new ErrorException('Endless redirection!');
     }
 
-    protected function sregParams()
-    {
+    protected function sregParams() {
         $params = array();
         # We always use SREG 1.1, even if the server is advertising only support for 1.0.
         # That's because it's fully backwards compatibile with 1.0, and some providers
@@ -492,8 +480,7 @@ 
         return $params;
     }
 
-    protected function axParams()
-    {
+    protected function axParams() {
         $params = array();
         if ($this->required || $this->optional) {
             $params['openid.ns.ax'] = 'http://openid.net/srv/ax/1.0';
@@ -531,8 +518,7 @@ 
         return $params;
     }
 
-    protected function authUrl_v1($immediate)
-    {
+    protected function authUrl_v1($immediate) {
 	$returnUrl = $this->returnUrl;
         # If we have an openid.delegate that is different from our claimed id,
         # we need to somehow preserve the claimed id between requests.
@@ -552,8 +538,7 @@ 
                                , array('query' => http_build_query($params, '', '&')));
     }
 
-    protected function authUrl_v2($immediate)
-    {
+    protected function authUrl_v2($immediate) {
         $params = array(
             'openid.ns'          => 'http://specs.openid.net/auth/2.0',
             'openid.mode'        => $immediate ? 'checkid_immediate' : 'checkid_setup',
@@ -590,8 +575,7 @@ 
      * @param String $select_identifier Whether to request OP to select identity for an user in OpenID 2. Does not affect OpenID 1.
      * @throws ErrorException
      */
-    function authUrl($immediate = false)
-    {
+    function authUrl($immediate = false) {
         if ($this->setup_url && !$immediate) return $this->setup_url;
         if (!$this->server) $this->discover($this->identity);
 
@@ -606,8 +590,7 @@ 
      * @return Bool Whether the verification was successful.
      * @throws ErrorException
      */
-    function validate()
-    {
+    function validate() {
         # If the request was using immediate mode, a failure may be reported
         # by presenting user_setup_url (for 1.1) or reporting
         # mode 'setup_needed' (for 2.0). Also catching all modes other than
@@ -668,12 +651,12 @@ 
         return preg_match('/is_valid\s*:\s*true/i', $response);
     }
 
-    protected function getAxAttributes()
-    {
+    protected function getAxAttributes() {
         $alias = null;
         if (isset($this->data['openid_ns_ax'])
             && $this->data['openid_ns_ax'] != 'http://openid.net/srv/ax/1.0'
-        ) { # It's the most likely case, so we'll check it before
+        ) {
+# It's the most likely case, so we'll check it before
             $alias = 'ax';
         } else {
             # 'ax' prefix is either undefined, or points to another extension,
@@ -713,8 +696,7 @@ 
         return $attributes;
     }
 
-    protected function getSregAttributes()
-    {
+    protected function getSregAttributes() {
         $attributes = array();
         $sreg_to_ax = array_flip(self::$ax_to_sreg);
         foreach ($this->data as $key => $value) {
@@ -741,11 +723,11 @@ 
      *     * @return Array Array of attributes with keys being the AX schema names, e.g. 'contact/email'
      * @see http://www.axschema.org/types/
      */
-    function getAttributes()
-    {
+    function getAttributes() {
         if (isset($this->data['openid_ns'])
             && $this->data['openid_ns'] == 'http://specs.openid.net/auth/2.0'
-        ) { # OpenID 2.0
+        ) {
+# OpenID 2.0
             # We search for both AX and SREG attributes, with AX taking precedence.
             return $this->getAxAttributes() + $this->getSregAttributes();
         }

Spacing +64 added lines, -64 removed lines

@@ -69,13 +69,13 @@ 
 
     function __construct()
     {
-        $this->trustRoot = (!empty($_SERVER['HTTPS']) ? 'https' : 'http') . '://' . $_SERVER['HTTP_HOST'];
+        $this->trustRoot = (!empty($_SERVER['HTTPS']) ? 'https' : 'http').'://'.$_SERVER['HTTP_HOST'];
         $uri = rtrim(preg_replace('#((?<=\?)|&)openid\.[^&]+#', '', $_SERVER['REQUEST_URI']), '?');
-        $this->returnUrl = $this->trustRoot . $uri;
+        $this->returnUrl = $this->trustRoot.$uri;
 
         $this->data = $_POST + $_GET; # OPs may send data as POST or GET.
 
-        if(!function_exists('curl_init') && !in_array('https', stream_get_wrappers())) {
+        if (!function_exists('curl_init') && !in_array('https', stream_get_wrappers())) {
             throw new ErrorException('You must have either https wrappers or curl enabled.');
         }
     }
@@ -84,7 +84,7 @@ 
     {
         switch ($name) {
         case 'identity':
-            if (strlen($value = trim((String) $value))) {
+            if (strlen($value = trim((String)$value))) {
                 if (preg_match('#^xri:/*#i', $value, $m)) {
                     $value = substr($value, strlen($m[0]));
                 } elseif (!preg_match('/^(?:[=@+\$!\(]|https?:)/i', $value)) {
@@ -139,23 +139,23 @@ 
         return !!gethostbynamel($server);
     }
 
-    protected function request_curl($url, $method='GET', $params=array())
+    protected function request_curl($url, $method = 'GET', $params = array())
     {
         $params = http_build_query($params, '', '&');
-        $curl = curl_init($url . ($method == 'GET' && $params ? '?' . $params : ''));
+        $curl = curl_init($url.($method == 'GET' && $params ? '?'.$params : ''));
         curl_setopt($curl, CURLOPT_FOLLOWLOCATION, true);
         curl_setopt($curl, CURLOPT_HEADER, false);
         curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, false);
         curl_setopt($curl, CURLOPT_RETURNTRANSFER, true);
         curl_setopt($curl, CURLOPT_HTTPHEADER, array('Accept: application/xrds+xml, */*'));
 
-        if($this->verify_peer !== null) {
+        if ($this->verify_peer !== null) {
             curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, $this->verify_peer);
-            if($this->capath) {
+            if ($this->capath) {
                 curl_setopt($curl, CURLOPT_CAPATH, $this->capath);
             }
 
-            if($this->cainfo) {
+            if ($this->cainfo) {
                 curl_setopt($curl, CURLOPT_CAINFO, $this->cainfo);
             }
         }
@@ -171,17 +171,17 @@ 
         }
         $response = curl_exec($curl);
 
-        if($method == 'HEAD') {
+        if ($method == 'HEAD') {
             $headers = array();
-            foreach(explode("\n", $response) as $header) {
-                $pos = strpos($header,':');
+            foreach (explode("\n", $response) as $header) {
+                $pos = strpos($header, ':');
                 $name = strtolower(trim(substr($header, 0, $pos)));
-                $headers[$name] = trim(substr($header, $pos+1));
+                $headers[$name] = trim(substr($header, $pos + 1));
             }
 
             # Updating claimed_id in case of redirections.
             $effective_url = curl_getinfo($curl, CURLINFO_EFFECTIVE_URL);
-            if($effective_url != $url) {
+            if ($effective_url != $url) {
                 $this->identity = $this->claimed_id = $effective_url;
             }
 
@@ -195,14 +195,14 @@ 
         return $response;
     }
 
-    protected function request_streams($url, $method='GET', $params=array())
+    protected function request_streams($url, $method = 'GET', $params = array())
     {
-        if(!$this->hostExists($url)) {
+        if (!$this->hostExists($url)) {
             throw new ErrorException('Invalid request.');
         }
 
         $params = http_build_query($params, '', '&');
-        switch($method) {
+        switch ($method) {
         case 'GET':
             $opts = array(
                 'http' => array(
@@ -211,7 +211,7 @@ 
                     'ignore_errors' => true,
                 )
             );
-            $url = $url . ($params ? '?' . $params : '');
+            $url = $url.($params ? '?'.$params : '');
             break;
         case 'POST':
             $opts = array(
@@ -236,31 +236,31 @@ 
                 ))
             );
 
-            $url = $url . ($params ? '?' . $params : '');
-            $headers_tmp = get_headers ($url);
-            if(!$headers_tmp) {
+            $url = $url.($params ? '?'.$params : '');
+            $headers_tmp = get_headers($url);
+            if (!$headers_tmp) {
                 return array();
             }
 
             # Parsing headers.
             $headers = array();
-            foreach($headers_tmp as $header) {
-                $pos = strpos($header,':');
+            foreach ($headers_tmp as $header) {
+                $pos = strpos($header, ':');
                 $name = strtolower(trim(substr($header, 0, $pos)));
-                $headers[$name] = trim(substr($header, $pos+1));
+                $headers[$name] = trim(substr($header, $pos + 1));
 
                 # Following possible redirections. The point is just to have
                 # claimed_id change with them, because get_headers() will
                 # follow redirections automatically.
                 # We ignore redirections with relative paths.
                 # If any known provider uses them, file a bug report.
-                if($name == 'location') {
-                    if(strpos($headers[$name], 'http') === 0) {
+                if ($name == 'location') {
+                    if (strpos($headers[$name], 'http') === 0) {
                         $this->identity = $this->claimed_id = $headers[$name];
-                    } elseif($headers[$name][0] == '/') {
+                    } elseif ($headers[$name][0] == '/') {
                         $parsed_url = parse_url($this->claimed_id);
                         $this->identity =
-                        $this->claimed_id = $parsed_url['scheme'] . '://'
+                        $this->claimed_id = $parsed_url['scheme'].'://'
                                           . $parsed_url['host']
                                           . $headers[$name];
                     }
@@ -272,7 +272,7 @@ 
             return $headers;
         }
 
-        if($this->verify_peer) {
+        if ($this->verify_peer) {
             $opts += array('ssl' => array(
                 'verify_peer' => true,
                 'capath'      => $this->capath,
@@ -280,14 +280,14 @@ 
             ));
         }
 
-        $context = stream_context_create ($opts);
+        $context = stream_context_create($opts);
 
         return file_get_contents($url, false, $context);
     }
 
-    protected function request($url, $method='GET', $params=array())
+    protected function request($url, $method = 'GET', $params = array())
     {
-        if(function_exists('curl_init') && !ini_get('safe_mode') && !ini_get('open_basedir')) {
+        if (function_exists('curl_init') && !ini_get('safe_mode') && !ini_get('open_basedir')) {
             return $this->request_curl($url, $method, $params);
         }
         return $this->request_streams($url, $method, $params);
@@ -296,19 +296,19 @@ 
     protected function build_url($url, $parts)
     {
         if (isset($url['query'], $parts['query'])) {
-            $parts['query'] = $url['query'] . '&' . $parts['query'];
+            $parts['query'] = $url['query'].'&'.$parts['query'];
         }
 
         $url = $parts + $url;
-        $url = $url['scheme'] . '://'
-             . (empty($url['username'])?''
-                 :(empty($url['password'])? "{$url['username']}@"
+        $url = $url['scheme'].'://'
+             . (empty($url['username']) ? ''
+                 :(empty($url['password']) ? "{$url['username']}@"
                  :"{$url['username']}:{$url['password']}@"))
              . $url['host']
-             . (empty($url['port'])?'':":{$url['port']}")
-             . (empty($url['path'])?'':$url['path'])
-             . (empty($url['query'])?'':"?{$url['query']}")
-             . (empty($url['fragment'])?'':"#{$url['fragment']}");
+             . (empty($url['port']) ? '' : ":{$url['port']}")
+             . (empty($url['path']) ? '' : $url['path'])
+             . (empty($url['query']) ? '' : "?{$url['query']}")
+             . (empty($url['fragment']) ? '' : "#{$url['fragment']}");
         return $url;
     }
 
@@ -322,7 +322,7 @@ 
         preg_match_all("#<{$tag}[^>]*$valueName=['\"](.+?)['\"][^>]*$attrName=['\"].*?$attrValue.*?['\"][^>]*/?>#i", $content, $matches2);
 
         $result = array_merge($matches1[1], $matches2[1]);
-        return empty($result)?false:$result[0];
+        return empty($result) ?false:$result[0];
     }
 
     /**
@@ -348,7 +348,7 @@ 
         $yadis = true;
 
         # We'll jump a maximum of 5 times, to avoid endless redirections.
-        for ($i = 0; $i < 5; $i ++) {
+        for ($i = 0; $i < 5; $i++) {
             if ($yadis) {
                 $headers = $this->request($url, 'HEAD');
 
@@ -370,12 +370,12 @@ 
                     $content = $this->request($url, 'GET');
 
                     preg_match_all('#<Service.*?>(.*?)</Service>#s', $content, $m);
-                    foreach($m[1] as $content) {
-                        $content = ' ' . $content; # The space is added, so that strpos doesn't return 0.
+                    foreach ($m[1] as $content) {
+                        $content = ' '.$content; # The space is added, so that strpos doesn't return 0.
 
                         # OpenID 2
                         $ns = preg_quote('http://specs.openid.net/auth/2.0/');
-                        if(preg_match('#<Type>\s*'.$ns.'(server|signon)\s*</Type>#s', $content, $type)) {
+                        if (preg_match('#<Type>\s*'.$ns.'(server|signon)\s*</Type>#s', $content, $type)) {
                             if ($type[1] == 'server') $this->identifier_select = true;
 
                             preg_match('#<URI.*?>(.*)</URI>#', $content, $server);
@@ -384,7 +384,7 @@ 
                                 return false;
                             }
                             # Does the server advertise support for either AX or SREG?
-                            $this->ax   = (bool) strpos($content, '<Type>http://openid.net/srv/ax/1.0</Type>');
+                            $this->ax   = (bool)strpos($content, '<Type>http://openid.net/srv/ax/1.0</Type>');
                             $this->sreg = strpos($content, '<Type>http://openid.net/sreg/1.0</Type>')
                                        || strpos($content, '<Type>http://openid.net/extensions/sreg/1.1</Type>');
 
@@ -498,33 +498,33 @@ 
         if ($this->required || $this->optional) {
             $params['openid.ns.ax'] = 'http://openid.net/srv/ax/1.0';
             $params['openid.ax.mode'] = 'fetch_request';
-            $this->aliases  = array();
+            $this->aliases = array();
             $counts   = array();
             $required = array();
             $optional = array();
-            foreach (array('required','optional') as $type) {
+            foreach (array('required', 'optional') as $type) {
                 foreach ($this->$type as $alias => $field) {
                     if (is_int($alias)) $alias = strtr($field, '/', '_');
-                    $this->aliases[$alias] = 'http://axschema.org/' . $field;
+                    $this->aliases[$alias] = 'http://axschema.org/'.$field;
                     if (empty($counts[$alias])) $counts[$alias] = 0;
                     $counts[$alias] += 1;
                     ${$type}[] = $alias;
                 }
             }
             foreach ($this->aliases as $alias => $ns) {
-                $params['openid.ax.type.' . $alias] = $ns;
+                $params['openid.ax.type.'.$alias] = $ns;
             }
             foreach ($counts as $alias => $count) {
                 if ($count == 1) continue;
-                $params['openid.ax.count.' . $alias] = $count;
+                $params['openid.ax.count.'.$alias] = $count;
             }
 
             # Don't send empty ax.requied and ax.if_available.
             # Google and possibly other providers refuse to support ax when one of these is empty.
-            if($required) {
+            if ($required) {
                 $params['openid.ax.required'] = implode(',', $required);
             }
-            if($optional) {
+            if ($optional) {
                 $params['openid.ax.if_available'] = implode(',', $optional);
             }
         }
@@ -537,8 +537,8 @@ 
         # If we have an openid.delegate that is different from our claimed id,
         # we need to somehow preserve the claimed id between requests.
         # The simplest way is to just send it along with the return_to url.
-        if($this->identity != $this->claimed_id) {
-            $returnUrl .= (strpos($returnUrl, '?') ? '&' : '?') . 'openid.claimed_id=' . $this->claimed_id;
+        if ($this->identity != $this->claimed_id) {
+            $returnUrl .= (strpos($returnUrl, '?') ? '&' : '?').'openid.claimed_id='.$this->claimed_id;
         }
 
         $params = array(
@@ -612,15 +612,15 @@ 
         # by presenting user_setup_url (for 1.1) or reporting
         # mode 'setup_needed' (for 2.0). Also catching all modes other than
         # id_res, in order to avoid throwing errors.
-        if(isset($this->data['openid_user_setup_url'])) {
+        if (isset($this->data['openid_user_setup_url'])) {
             $this->setup_url = $this->data['openid_user_setup_url'];
             return false;
         }
-        if($this->mode != 'id_res') {
+        if ($this->mode != 'id_res') {
             return false;
         }
 
-        $this->claimed_id = isset($this->data['openid_claimed_id'])?$this->data['openid_claimed_id']:$this->data['openid_identity'];
+        $this->claimed_id = isset($this->data['openid_claimed_id']) ? $this->data['openid_claimed_id'] : $this->data['openid_identity'];
         $params = array(
             'openid.assoc_handle' => $this->data['openid_assoc_handle'],
             'openid.signed'       => $this->data['openid_signed'],
@@ -638,7 +638,7 @@ 
             # If it's an OpenID 1 provider, and we've got claimed_id,
             # we have to append it to the returnUrl, like authUrl_v1 does.
             $this->returnUrl .= (strpos($this->returnUrl, '?') ? '&' : '?')
-                             .  'openid.claimed_id=' . $this->claimed_id;
+                             .  'openid.claimed_id='.$this->claimed_id;
         }
 
         if ($this->data['openid_return_to'] != $this->returnUrl) {
@@ -656,8 +656,8 @@ 
             # In such case, validation would fail, since we'd send different data than OP
             # wants to verify. stripslashes() should solve that problem, but we can't
             # use it when magic_quotes is off.
-            $value = $this->data['openid_' . str_replace('.','_',$item)];
-            $params['openid.' . $item] = get_magic_quotes_gpc() ? stripslashes($value) : $value;
+            $value = $this->data['openid_'.str_replace('.', '_', $item)];
+            $params['openid.'.$item] = get_magic_quotes_gpc() ? stripslashes($value) : $value;
 
         }
 
@@ -695,18 +695,18 @@ 
 
         $attributes = array();
         foreach ($this->data as $key => $value) {
-            $keyMatch = 'openid_' . $alias . '_value_';
+            $keyMatch = 'openid_'.$alias.'_value_';
             if (substr($key, 0, strlen($keyMatch)) != $keyMatch) {
                 continue;
             }
             $key = substr($key, strlen($keyMatch));
-            if (!isset($this->data['openid_' . $alias . '_type_' . $key])) {
+            if (!isset($this->data['openid_'.$alias.'_type_'.$key])) {
                 # OP is breaking the spec by returning a field without
                 # associated ns. This shouldn't happen, but it's better
                 # to check, than cause an E_NOTICE.
                 continue;
             }
-            $key = substr($this->data['openid_' . $alias . '_type_' . $key],
+            $key = substr($this->data['openid_'.$alias.'_type_'.$key],
                           strlen('http://axschema.org/'));
             $attributes[$key] = $value;
         }

html/user/server_status.php

Doc Comments +17 added lines

@@ -88,17 +88,26 @@ 
 ";
 }
 
+/**
+ * @param string $name
+ */
 function item_xml($name, $val) {
     if (!$val) $val = 0;
     echo "   <$name>$val</$name>\n";
 }
 
+/**
+ * @param string $name
+ */
 function item_html($name, $val) {
     $name = tra($name);
     echo "<tr><td>$name</td><td>$val</td></tr>\n";
     //echo "<tr><td align=right>$name</td><td align=right>$val</td></tr>\n";
 }
 
+/**
+ * @param stdClass $x
+ */
 function show_status_html($x) {
     page_head(tra("Project status"));
     $j = $x->jobs;
@@ -190,6 +199,9 @@ 
     page_tail();
 }
 
+/**
+ * @param stdClass $x
+ */
 function show_status_xml($x) {
     xml_header();
     echo "<server_status>\n<daemon_status>\n";
@@ -239,6 +251,11 @@ 
 ";
 }
 
+/**
+ * @param string $cmd
+ * @param string $pidname
+ * @param string $host
+ */
 function local_daemon_running($cmd, $pidname, $host) {
     if (!$pidname) {
         $cmd = trim($cmd);

Spacing +9 added lines, -9 removed lines

@@ -171,7 +171,7 @@ 
         $avg = round($app->info->avg, 2);
         $min = round($app->info->min, 2);
         $max = round($app->info->max, 2);
-        $x = $max?"$avg ($min - $max)":"---";
+        $x = $max ? "$avg ($min - $max)" : "---";
         $u = $app->info->users;
         echo "<tr>
             <td>$app->user_friendly_name</td>
@@ -244,7 +244,7 @@ 
         $cmd = trim($cmd);
         $x = explode(" ", $cmd);
         $prog = $x[0];
-        $pidname = $prog . '.pid';
+        $pidname = $prog.'.pid';
     }
     $path = "../../pid_$host/$pidname";
     if (is_file($path)) {
@@ -285,12 +285,12 @@ 
     }
     $master_host = $u["host"];
     if ($config->www_host) {
-        $web_host = trim((string) $config->www_host);
+        $web_host = trim((string)$config->www_host);
     } else {
         $web_host = $main_host;
     }
     if ($config->sched_host) {
-        $sched_host = trim((string) $config->sched_host);
+        $sched_host = trim((string)$config->sched_host);
     } else {
         $sched_host = $main_host;
     }
@@ -300,7 +300,7 @@ 
 
     // the upload and download servers are sort of daemons too
     //
-    $url = trim((string) $config->download_url);
+    $url = trim((string)$config->download_url);
     $u = parse_url($url);
     $h = $u["host"];
     if ($h == $master_host) {
@@ -312,14 +312,14 @@ 
     } else {
         $have_remote = true;
     }
-    $url = trim((string) $config->upload_url);
+    $url = trim((string)$config->upload_url);
     $u = parse_url($url);
     $h = $u["host"];
     if ($h == $master_host) {
         $y = new StdClass;
         $y->cmd = "Upload server";
         $y->host = $h;
-        $y->status = !file_exists("../../stop_upload");;
+        $y->status = !file_exists("../../stop_upload"); ;
         $local_daemons[] = $y;
     } else {
         $have_remote = true;
@@ -331,7 +331,7 @@ 
         $y = new StdClass;
         $y->cmd = "Scheduler";
         $y->host = $sched_host;
-        $y->status = !file_exists("../../stop_sched");;
+        $y->status = !file_exists("../../stop_sched"); ;
         $local_daemons[] = $y;
     } else {
         $have_remote = true;
@@ -347,7 +347,7 @@ 
             $disabled_daemons[] = $x;
             continue;
         }
-        $host = $d->host?(string)$d->host:$main_host;
+        $host = $d->host ? (string)$d->host : $main_host;
         if ($host != $web_host) {
             $have_remote = true;
             continue;

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

@@ -251,7 +251,7 @@
         $pid = file_get_contents($path);
         if ($pid) {
             $pid = trim($pid);
-            $out = Array();
+            $out = array();
             exec("ps -ww $pid", $out);
             foreach ($out as $y) {
                 if (strstr($y, (string)$pid)) return 1;

html/user/show_coproc.php

Doc Comments +3 added lines

@@ -25,6 +25,9 @@
 
 check_get_args(array("mode"));
 
+/**
+ * @param string $mode
+ */
 function filename($mode) {
     switch ($mode) {
     case 'host': return "cuda_hosts.dat";

Spacing +1 added lines, -1 removed lines

@@ -92,7 +92,7 @@
         echo $x;
         break;
     }
-    echo "</td><td align=right>".format_credit_large($y->credit),"</td><td align=right>$y->nresults</td></tr>\n";
+    echo "</td><td align=right>".format_credit_large($y->credit), "</td><td align=right>$y->nresults</td></tr>\n";
 }
 
 $mode = get_str('mode', true);

html/user/submit.php

Doc Comments +9 added lines

@@ -37,6 +37,9 @@ 
     return $n;
 }
 
+/**
+ * @param integer $state
+ */
 function show_all_link($batches, $state, $limit, $user, $app) {
     $n = state_count($batches, $state);
     if ($n > $limit) {
@@ -269,6 +272,9 @@ 
     page_tail();
 }
 
+/**
+ * @param null|integer $app_id
+ */
 function check_admin_access($user, $app_id) {
     $user_submit = BoincUserSubmit::lookup_userid($user->id);
     if (!$user_submit) error_page("no access");
@@ -523,6 +529,9 @@ 
     page_tail();
 }
 
+/**
+ * @param null|integer $state
+ */
 function show_batches_in_state($batches, $state) {
     switch ($state) {
     case BATCH_STATE_IN_PROGRESS:

Spacing +5 added lines, -5 removed lines

@@ -323,7 +323,7 @@ 
     }
     row2("GFLOP/hours, estimated", number_format(credit_to_gflop_hours($batch->credit_estimate), 2));
     row2("GFLOP/hours, actual", number_format(credit_to_gflop_hours($batch->credit_canonical), 2));
-    row2("Output File Size (MB)", number_format(batch_output_file_size($batch->id)/1e6,2));
+    row2("Output File Size (MB)", number_format(batch_output_file_size($batch->id)/1e6, 2));
     end_table();
     if (batch_output_file_size($batch->id) <= 1e8) {
         $url = boinc_get_output_files_url($user, $batch_id);
@@ -357,9 +357,9 @@ 
         "Canonical instance<br><p class=\"text-muted\">click to see result page on BOINC server</p>",
         "Download Results"
     );
-    foreach($wus as $wu) {
+    foreach ($wus as $wu) {
         $resultid = $wu->canonical_resultid;
-        $durl = boinc_get_wu_output_files_url($user,$wu->id);
+        $durl = boinc_get_wu_output_files_url($user, $wu->id);
         if ($resultid) {
             $x = "<a href=result.php?resultid=$resultid>$resultid</a>";
             $y = '<font color="green">completed</font>';
@@ -369,7 +369,7 @@ 
             $text = "---";
             if ($batch->state == BATCH_STATE_COMPLETE) {
                 $y = '<font color="red">failed</font>';
-            }   else {
+            } else {
                 $y = "in progress";
             }
         }
@@ -434,7 +434,7 @@ 
     $results = BoincResult::enum("workunitid=$wuid");
     $upload_dir = parse_config(get_config(), "<upload_dir>");
     $fanout = parse_config(get_config(), "<uldl_dir_fanout>");
-    foreach($results as $result) {
+    foreach ($results as $result) {
         echo "<tr>
             <td><a href=result.php?resultid=$result->id>$result->id &middot; $result->name </a></td>
             <td>".state_string($result)."</td>

Braces +1 added lines, -1 removed lines

@@ -369,7 +369,7 @@
             $text = "---";
             if ($batch->state == BATCH_STATE_COMPLETE) {
                 $y = '<font color="red">failed</font>';
-            }   else {
+            } else {
                 $y = "in progress";
             }
         }

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

@@ -308,7 +308,7 @@ 
     $wus = BoincWorkunit::enum("batch = $batch->id");
     $batch = get_batch_params($batch, $wus);
 
-    page_head("Batch $batch_id");
+    page_head("batch $batch_id");
     start_table();
     row2("name", $batch->name);
     row2("application", $app->name);
@@ -393,7 +393,7 @@ 
     $wu = BoincWorkunit::lookup_id($wuid);
     if (!$wu) error_page("no such job");
 
-    page_head("Job $wuid");
+    page_head("job $wuid");
 
     echo "
         <a href=workunit.php?wuid=$wuid>Workunit details</a> &middot;

html/user/team_forum.php

Doc Comments +3 added lines

@@ -57,6 +57,9 @@
     edit_form($user, $team, $forum, true);
 }
 
+/**
+ * @param boolean $first
+ */
 function edit_form($user, $team, $forum, $first) {
     page_head(tra("Team Message Board"));
     echo "

html/user/team_search.php

Doc Comments +3 added lines

@@ -30,6 +30,9 @@
 // list entries are of the form id => team,
 // where team includes a field "refcnt".
 // 
+/**
+ * @param integer $weight
+ */
 function merge_lists($list1, &$list2, $weight) {
     foreach($list1 as $team) {
         $id = $team->id;

Spacing +5 added lines, -5 removed lines

@@ -31,7 +31,7 @@ 
 // where team includes a field "refcnt".
 // 
 function merge_lists($list1, &$list2, $weight) {
-    foreach($list1 as $team) {
+    foreach ($list1 as $team) {
         $id = $team->id;
         if (array_key_exists($id, $list2)) {
             $list2[$id]->refcnt += $weight;
@@ -97,7 +97,7 @@ 
         if (defined("SHOW_NONVALIDATED_TEAMS")) {
             $user = BoincUser::lookup_id($team->userid);
             echo "<td>";
-            echo $user->email_validated?"Yes":"No";
+            echo $user->email_validated ? "Yes" : "No";
             echo "</td>\n";
         }
         echo "
@@ -137,7 +137,7 @@ 
     xml_header();
     echo "<teams>\n";
     sort_list($list);
-    foreach($list as $team) {
+    foreach ($list as $team) {
         show_team_xml($team);
     }
     echo "</teams>\n";
@@ -164,14 +164,14 @@ 
         merge_lists($list2, $list, 3);
         $tried = true;
     }
-    if (strlen($params->country) && $params->country!='None') {
+    if (strlen($params->country) && $params->country != 'None') {
         $country = BoincDb::escape_string($params->country);
         $list2 = get_teams("country = '$country'", $params->active);
         //echo "<br>country matches: ",sizeof($list2);
         merge_lists($list2, $list, 1);
         $tried = true;
     }
-    if ($params->type and $params->type>1) {
+    if ($params->type and $params->type > 1) {
         $list2 = get_teams("type=$params->type", $params->active);
         //echo "<br>type matches: ",sizeof($list2);
         merge_lists($list2, $list, 2);

drupal/sites/default/settings.php

Indentation +5 added lines, -5 removed lines

@@ -92,10 +92,10 @@ 
  */
 require_once('dbconfig.php');
 if (!isset($dbserver) || empty($dbserver))
-  $dbserver='localhost';
+    $dbserver='localhost';
 $db_url = array(
-  'default' => "{$dbtype}://{$dbuser}:".urlencode($dbpass)."@{$dbserver}/{$dbname}",
-  'boinc' => "{$boinc_dbtype}://{$boinc_dbuser}:".urlencode($boinc_dbpass)."@{$boinc_dbserver}/{$boinc_dbname}"
+    'default' => "{$dbtype}://{$dbuser}:".urlencode($dbpass)."@{$dbserver}/{$dbname}",
+    'boinc' => "{$boinc_dbtype}://{$boinc_dbuser}:".urlencode($boinc_dbpass)."@{$boinc_dbserver}/{$boinc_dbname}"
 );
 $db_prefix = '';
 
@@ -120,7 +120,7 @@ 
  */
 # $base_url = 'http://www.example.com';  // NO trailing slash!
 if (stream_resolve_include_path('baseurl.php')) {
-  include_once('baseurl.php');
+    include_once('baseurl.php');
 }
 
 /**
@@ -175,5 +175,5 @@ 
 #   'anonymous' => 'Visitor',
 # );
 $conf = array(
-  'maintenance_theme' => 'einstein',
+    'maintenance_theme' => 'einstein',
 );

Spacing +11 added lines, -11 removed lines

@@ -92,7 +92,7 @@ 
  */
 require_once('dbconfig.php');
 if (!isset($dbserver) || empty($dbserver))
-  $dbserver='localhost';
+  $dbserver = 'localhost';
 $db_url = array(
   'default' => "{$dbtype}://{$dbuser}:".urlencode($dbpass)."@{$dbserver}/{$dbname}",
   'boinc' => "{$boinc_dbtype}://{$boinc_dbuser}:".urlencode($boinc_dbpass)."@{$boinc_dbserver}/{$boinc_dbname}"
@@ -133,17 +133,17 @@ 
  * settings are used there. Settings defined here should not be
  * duplicated there so as to avoid conflict issues.
  */
-ini_set('arg_separator.output',     '&');
-ini_set('magic_quotes_runtime',     0);
-ini_set('magic_quotes_sybase',      0);
-ini_set('session.cache_expire',     200000);
-ini_set('session.cache_limiter',    'none');
-ini_set('session.cookie_lifetime',  2000000);
-ini_set('session.gc_maxlifetime',   200000);
-ini_set('session.save_handler',     'user');
+ini_set('arg_separator.output', '&');
+ini_set('magic_quotes_runtime', 0);
+ini_set('magic_quotes_sybase', 0);
+ini_set('session.cache_expire', 200000);
+ini_set('session.cache_limiter', 'none');
+ini_set('session.cookie_lifetime', 2000000);
+ini_set('session.gc_maxlifetime', 200000);
+ini_set('session.save_handler', 'user');
 ini_set('session.use_only_cookies', 1);
-ini_set('session.use_trans_sid',    0);
-ini_set('url_rewriter.tags',        '');
+ini_set('session.use_trans_sid', 0);
+ini_set('url_rewriter.tags', '');
 ini_set('memory_limit', '128M');
 ini_set('post_max_size', '8MB');
 ini_set('upload_max_filesize', '8MB');

drupal/sites/default/boinc/modules/contrib/jump/jump.views.inc

Indentation +4 added lines, -4 removed lines

@@ -9,9 +9,9 @@ 
  * Implementation of hook_views_plugins().
  */
 function jump_views_plugins() {
-  return array(
+    return array(
     'style' => array(
-      'jump_views' => array(
+        'jump_views' => array(
         'title' => t('Jump menu'),
         'theme' => 'jump_views_plugin_style',
         'help' => t('Displays items as a select list jump menu.'),
@@ -20,7 +20,7 @@ 
         'uses fields' => TRUE,
         'uses options' => TRUE,
         'type' => 'normal',
-      ),
+        ),
     ),
-  );
+    );
 }

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

@@ -16,9 +16,9 @@
         'theme' => 'jump_views_plugin_style',
         'help' => t('Displays items as a select list jump menu.'),
         'handler' => 'jump_views_plugin_style',
-        'uses row plugin' => TRUE,
-        'uses fields' => TRUE,
-        'uses options' => TRUE,
+        'uses row plugin' => true,
+        'uses fields' => true,
+        'uses options' => true,
         'type' => 'normal',
       ),
     ),

drupal/sites/default/boinc/modules/contrib/jump/jump.views_default.inc

Indentation +64 added lines, -64 removed lines

@@ -9,20 +9,20 @@ 
  * Implementation of hook_views_default_views().
  */
 function jump_views_default_views() {
-  $view = new view;
-  $view->name = 'recent_nodes_jump_menu';
-  $view->description = 'Recent nodes in a jump menu.';
-  $view->tag = '';
-  $view->view_php = '';
-  $view->base_table = 'node';
-  $view->is_cacheable = FALSE;
-  $view->api_version = 2;
-  $view->disabled = TRUE;
-  $handler = $view->new_display('default', 'Defaults', 'default');
-  $handler->override_option('fields', array(
+    $view = new view;
+    $view->name = 'recent_nodes_jump_menu';
+    $view->description = 'Recent nodes in a jump menu.';
+    $view->tag = '';
+    $view->view_php = '';
+    $view->base_table = 'node';
+    $view->is_cacheable = FALSE;
+    $view->api_version = 2;
+    $view->disabled = TRUE;
+    $handler = $view->new_display('default', 'Defaults', 'default');
+    $handler->override_option('fields', array(
     'nid' => array(
-      'label' => 'Nid',
-      'alter' => array(
+        'label' => 'Nid',
+        'alter' => array(
         'alter_text' => 1,
         'text' => 'node/[nid]',
         'make_link' => 0,
@@ -38,17 +38,17 @@ 
         'ellipsis' => 1,
         'strip_tags' => 0,
         'html' => 0,
-      ),
-      'link_to_node' => 0,
-      'exclude' => 1,
-      'id' => 'nid',
-      'table' => 'node',
-      'field' => 'nid',
-      'relationship' => 'none',
+        ),
+        'link_to_node' => 0,
+        'exclude' => 1,
+        'id' => 'nid',
+        'table' => 'node',
+        'field' => 'nid',
+        'relationship' => 'none',
     ),
     'title' => array(
-      'label' => '',
-      'alter' => array(
+        'label' => '',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -64,60 +64,60 @@ 
         'ellipsis' => 1,
         'strip_tags' => 0,
         'html' => 0,
-      ),
-      'link_to_node' => 0,
-      'exclude' => 0,
-      'id' => 'title',
-      'table' => 'node',
-      'field' => 'title',
-      'relationship' => 'none',
+        ),
+        'link_to_node' => 0,
+        'exclude' => 0,
+        'id' => 'title',
+        'table' => 'node',
+        'field' => 'title',
+        'relationship' => 'none',
     ),
-  ));
-  $handler->override_option('sorts', array(
+    ));
+    $handler->override_option('sorts', array(
     'changed' => array(
-      'order' => 'DESC',
-      'granularity' => 'second',
-      'id' => 'changed',
-      'table' => 'node',
-      'field' => 'changed',
-      'relationship' => 'none',
+        'order' => 'DESC',
+        'granularity' => 'second',
+        'id' => 'changed',
+        'table' => 'node',
+        'field' => 'changed',
+        'relationship' => 'none',
     ),
-  ));
-  $handler->override_option('filters', array(
+    ));
+    $handler->override_option('filters', array(
     'status_extra' => array(
-      'operator' => '=',
-      'value' => '',
-      'group' => '0',
-      'exposed' => FALSE,
-      'expose' => array(
+        'operator' => '=',
+        'value' => '',
+        'group' => '0',
+        'exposed' => FALSE,
+        'expose' => array(
         'operator' => FALSE,
         'label' => '',
-      ),
-      'id' => 'status_extra',
-      'table' => 'node',
-      'field' => 'status_extra',
-      'relationship' => 'none',
+        ),
+        'id' => 'status_extra',
+        'table' => 'node',
+        'field' => 'status_extra',
+        'relationship' => 'none',
     ),
-  ));
-  $handler->override_option('access', array(
+    ));
+    $handler->override_option('access', array(
     'type' => 'none',
-  ));
-  $handler->override_option('cache', array(
+    ));
+    $handler->override_option('cache', array(
     'type' => 'none',
-  ));
-  $handler->override_option('style_plugin', 'jump_views');
-  $handler->override_option('style_options', array(
+    ));
+    $handler->override_option('style_plugin', 'jump_views');
+    $handler->override_option('style_options', array(
     'grouping' => '',
     'keys' => array(
-      'nid' => 'nid',
-      'title' => 0,
+        'nid' => 'nid',
+        'title' => 0,
     ),
     'first_item' => 'Recent nodes',
-  ));
-  $handler = $view->new_display('block', 'Block', 'block_1');
-  $handler->override_option('block_description', '');
-  $handler->override_option('block_caching', -1);
+    ));
+    $handler = $view->new_display('block', 'Block', 'block_1');
+    $handler->override_option('block_description', '');
+    $handler->override_option('block_caching', -1);
 
-  $views[$view->name] = $view;
-  return $views;
+    $views[$view->name] = $view;
+    return $views;
 }

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

@@ -15,9 +15,9 @@ 
   $view->tag = '';
   $view->view_php = '';
   $view->base_table = 'node';
-  $view->is_cacheable = FALSE;
+  $view->is_cacheable = false;
   $view->api_version = 2;
-  $view->disabled = TRUE;
+  $view->disabled = true;
   $handler = $view->new_display('default', 'Defaults', 'default');
   $handler->override_option('fields', array(
     'nid' => array(
@@ -88,9 +88,9 @@ 
       'operator' => '=',
       'value' => '',
       'group' => '0',
-      'exposed' => FALSE,
+      'exposed' => false,
       'expose' => array(
-        'operator' => FALSE,
+        'operator' => false,
         'label' => '',
       ),
       'id' => 'status_extra',