BOINC / boinc

drupal/sites/all/libraries/phpmailer/class.pop3.php

Doc Comments +1 added lines, -1 removed lines

@@ -200,7 +200,7 @@
      * Connect to a POP3 server.
      * @access public
      * @param string $host
-     * @param integer|boolean $port
+     * @param integer $port
      * @param integer $tval
      * @return boolean
      */

Spacing +2 added lines, -2 removed lines

@@ -276,11 +276,11 @@
         }
 
         // Send the Username
-        $this->sendString("USER $username" . self::CRLF);
+        $this->sendString("USER $username".self::CRLF);
         $pop3_response = $this->getResponse();
         if ($this->checkResponse($pop3_response)) {
             // Send the Password
-            $this->sendString("PASS $password" . self::CRLF);
+            $this->sendString("PASS $password".self::CRLF);
             $pop3_response = $this->getResponse();
             if ($this->checkResponse($pop3_response)) {
                 return true;

drupal/sites/all/libraries/phpmailer/extras/htmlfilter.php

Doc Comments +11 added lines, -2 removed lines

@@ -663,6 +663,12 @@ 
     }
 }
 
+/**
+ * @param string $body
+ * @param integer $pos
+ * @param string $trans_image_path
+ * @param boolean $block_external_images
+ */
 function tln_fixstyle($body, $pos, $trans_image_path, $block_external_images)
 {
     // workaround for </style> in between comments
@@ -788,6 +794,9 @@ 
     return array($content, $newpos);
 }
 
+/**
+ * @param string $trans_image_path
+ */
 function tln_body2div($attary, $trans_image_path)
 {
     $divattary = array('class' => "'bodyclass'");
@@ -828,8 +837,8 @@ 
  *
  * @param string $body                    The HTML you wish to filter
  * @param array $tag_list                see description above
- * @param array $rm_tags_with_content see description above
- * @param array $self_closing_tags    see description above
+ * @param string[] $rm_tags_with_content see description above
+ * @param string[] $self_closing_tags    see description above
  * @param boolean $force_tag_closing    see description above
  * @param array $rm_attnames            see description above
  * @param array $bad_attvals            see description above

Spacing +48 added lines, -48 removed lines

@@ -41,15 +41,15 @@ 
 function tln_tagprint($tagname, $attary, $tagtype)
 {
     if ($tagtype == 2) {
-        $fulltag = '</' . $tagname . '>';
+        $fulltag = '</'.$tagname.'>';
     } else {
-        $fulltag = '<' . $tagname;
+        $fulltag = '<'.$tagname;
         if (is_array($attary) && sizeof($attary)) {
             $atts = array();
             while (list($attname, $attvalue) = each($attary)) {
                 array_push($atts, "$attname=$attvalue");
             }
-            $fulltag .= ' ' . join(' ', $atts);
+            $fulltag .= ' '.join(' ', $atts);
         }
         if ($tagtype == 3) {
             $fulltag .= ' /';
@@ -128,7 +128,7 @@ 
 {
     $matches = array();
     $retarr = array();
-    $preg_rule = '%^(.*?)(' . $reg . ')%s';
+    $preg_rule = '%^(.*?)('.$reg.')%s';
     preg_match($preg_rule, substr($body, $offset), $matches);
     if (!isset($matches[0]) || !$matches[0]) {
         $retarr = false;
@@ -382,7 +382,7 @@ 
                     }
                     list($pos, $attval, $match) = $regary;
                     $pos++;
-                    $attary{$attname} = '\'' . $attval . '\'';
+                    $attary{$attname} = '\''.$attval.'\'';
                 } elseif ($quot == '"') {
                     $regary = tln_findnxreg($body, $pos + 1, '\"');
                     if ($regary == false) {
@@ -390,7 +390,7 @@ 
                     }
                     list($pos, $attval, $match) = $regary;
                     $pos++;
-                            $attary{$attname} = '"' . $attval . '"';
+                            $attary{$attname} = '"'.$attval.'"';
                 } else {
                     /**
                      * These are hateful. Look for \s, or >.
@@ -404,7 +404,7 @@ 
                      * If it's ">" it will be caught at the top.
                      */
                     $attval = preg_replace('/\"/s', '&quot;', $attval);
-                    $attary{$attname} = '"' . $attval . '"';
+                    $attary{$attname} = '"'.$attval.'"';
                 }
             } elseif (preg_match('|[\w/>]|', $char)) {
                 /**
@@ -576,7 +576,7 @@ 
             }
             preg_match_all("/url\s*\((.+)\)/si", $attvalue, $aMatch);
             if (count($aMatch)) {
-                foreach($aMatch[1] as $sMatch) {
+                foreach ($aMatch[1] as $sMatch) {
                     $urlvalue = $sMatch;
                     tln_fixurl($attname, $urlvalue, $trans_image_path, $block_external_images);
                     $attary{$attname} = str_replace($sMatch, $urlvalue, $attvalue);
@@ -599,10 +599,10 @@ 
 {
     $sQuote = '"';
     $attvalue = trim($attvalue);
-    if ($attvalue && ($attvalue[0] =='"'|| $attvalue[0] == "'")) {
+    if ($attvalue && ($attvalue[0] == '"' || $attvalue[0] == "'")) {
         // remove the double quotes
         $sQuote = $attvalue[0];
-        $attvalue = trim(substr($attvalue,1,-1));
+        $attvalue = trim(substr($attvalue, 1, -1));
     }
 
     /**
@@ -612,51 +612,51 @@ 
      * IE from being kicked off when src for img tags are not set
      */
     if ($attvalue == '') {
-        $attvalue = $sQuote . $trans_image_path . $sQuote;
+        $attvalue = $sQuote.$trans_image_path.$sQuote;
     } else {
         // first, disallow 8 bit characters and control characters
-        if (preg_match('/[\0-\37\200-\377]+/',$attvalue)) {
+        if (preg_match('/[\0-\37\200-\377]+/', $attvalue)) {
             switch ($attname) {
                 case 'href':
-                    $attvalue = $sQuote . 'http://invalid-stuff-detected.example.com' . $sQuote;
+                    $attvalue = $sQuote.'http://invalid-stuff-detected.example.com'.$sQuote;
                     break;
                 default:
-                    $attvalue = $sQuote . $trans_image_path . $sQuote;
+                    $attvalue = $sQuote.$trans_image_path.$sQuote;
                     break;
             }
         } else {
             $aUrl = parse_url($attvalue);
             if (isset($aUrl['scheme'])) {
-                switch(strtolower($aUrl['scheme'])) {
+                switch (strtolower($aUrl['scheme'])) {
                     case 'mailto':
                     case 'http':
                     case 'https':
                     case 'ftp':
                         if ($attname != 'href') {
                             if ($block_external_images == true) {
-                                $attvalue = $sQuote . $trans_image_path . $sQuote;
+                                $attvalue = $sQuote.$trans_image_path.$sQuote;
                             } else {
                                 if (!isset($aUrl['path'])) {
-                                    $attvalue = $sQuote . $trans_image_path . $sQuote;
+                                    $attvalue = $sQuote.$trans_image_path.$sQuote;
                                 }
                             }
                         } else {
-                            $attvalue = $sQuote . $attvalue . $sQuote;
+                            $attvalue = $sQuote.$attvalue.$sQuote;
                         }
                         break;
                     case 'outbind':
-                        $attvalue = $sQuote . $attvalue . $sQuote;
+                        $attvalue = $sQuote.$attvalue.$sQuote;
                         break;
                     case 'cid':
-                        $attvalue = $sQuote . $attvalue . $sQuote;
+                        $attvalue = $sQuote.$attvalue.$sQuote;
                         break;
                     default:
-                        $attvalue = $sQuote . $trans_image_path . $sQuote;
+                        $attvalue = $sQuote.$trans_image_path.$sQuote;
                         break;
                 }
             } else {
                 if (!isset($aUrl['path']) || $aUrl['path'] != $trans_image_path) {
-                    $$attvalue = $sQuote . $trans_image_path . $sQuote;
+                    $$attvalue = $sQuote.$trans_image_path.$sQuote;
                 }
             }
         }
@@ -670,7 +670,7 @@ 
     $sToken = '';
     $bSucces = false;
     $bEndTag = false;
-    for ($i=$pos,$iCount=strlen($body);$i<$iCount;++$i) {
+    for ($i = $pos, $iCount = strlen($body); $i < $iCount; ++$i) {
         $char = $body{$i};
         switch ($char) {
             case '<':
@@ -687,7 +687,7 @@ 
             case '>':
                  if ($bEndTag) {
                     $sToken .= $char;
-                    if (preg_match('/\<\/\s*style\s*\>/i',$sToken,$aMatch)) {
+                    if (preg_match('/\<\/\s*style\s*\>/i', $sToken, $aMatch)) {
                         $newpos = $i + 1;
                         $bSucces = true;
                         break 2;
@@ -702,8 +702,8 @@ 
             case '!':
                 if ($sToken == '<') {
                     // possible comment
-                    if (isset($body{$i+2}) && substr($body,$i,3) == '!--') {
-                        $i = strpos($body,'-->',$i+3);
+                    if (isset($body{$i + 2}) && substr($body, $i, 3) == '!--') {
+                        $i = strpos($body, '-->', $i + 3);
                         if ($i === false) { // no end comment
                             $i = strlen($body);
                         }
@@ -722,7 +722,7 @@ 
                 break;
         }
     }
-    if ($bSucces == FALSE){
+    if ($bSucces == FALSE) {
         return array(FALSE, strlen($body));
     }
 
@@ -743,26 +743,26 @@ 
     //                           "url(\\1$trans_image_path\\2)", $content);
 
     // first check for 8bit sequences and disallowed control characters
-    if (preg_match('/[\16-\37\200-\377]+/',$content)) {
+    if (preg_match('/[\16-\37\200-\377]+/', $content)) {
         $content = '<!-- style block removed by html filter due to presence of 8bit characters -->';
         return array($content, $newpos);
     }
 
     // remove @import line
-    $content = preg_replace("/^\s*(@import.*)$/mi","\n<!-- @import rules forbidden -->\n",$content);
+    $content = preg_replace("/^\s*(@import.*)$/mi", "\n<!-- @import rules forbidden -->\n", $content);
 
     $content = preg_replace("/(\\\\)?u(\\\\)?r(\\\\)?l(\\\\)?/i", 'url', $content);
-    preg_match_all("/url\s*\((.+)\)/si",$content,$aMatch);
+    preg_match_all("/url\s*\((.+)\)/si", $content, $aMatch);
     if (count($aMatch)) {
         $aValue = $aReplace = array();
-        foreach($aMatch[1] as $sMatch) {
+        foreach ($aMatch[1] as $sMatch) {
             // url value
             $urlvalue = $sMatch;
-            tln_fixurl('style',$urlvalue, $trans_image_path, $block_external_images);
+            tln_fixurl('style', $urlvalue, $trans_image_path, $block_external_images);
             $aValue[] = $sMatch;
             $aReplace[] = $urlvalue;
         }
-        $content = str_replace($aValue,$aReplace,$content);
+        $content = str_replace($aValue, $aReplace, $content);
     }
 
     /**
@@ -772,7 +772,7 @@ 
     tln_defang($contentTemp);
     tln_unspace($contentTemp);
 
-    $match   = Array('/\/\*.*\*\//',
+    $match = Array('/\/\*.*\*\//',
                     '/expression/i',
                     '/behaviou*r/i',
                     '/binding/i',
@@ -780,7 +780,7 @@ 
                     '/javascript/i',
                     '/script/i',
                     '/position/i');
-    $replace = Array('','idiocy', 'idiocy', 'idiocy', 'idiocy', 'idiocy', 'idiocy', '');
+    $replace = Array('', 'idiocy', 'idiocy', 'idiocy', 'idiocy', 'idiocy', 'idiocy', '');
     $contentNew = preg_replace($match, $replace, $contentTemp);
     if ($contentNew !== $contentTemp) {
         $content = $contentNew;
@@ -794,11 +794,11 @@ 
     $text = '#000000';
     $has_bgc_stl = $has_txt_stl = false;
     $styledef = '';
-    if (is_array($attary) && sizeof($attary) > 0){
-        foreach ($attary as $attname=>$attvalue){
+    if (is_array($attary) && sizeof($attary) > 0) {
+        foreach ($attary as $attname=>$attvalue) {
             $quotchar = substr($attvalue, 0, 1);
             $attvalue = str_replace($quotchar, "", $attvalue);
-            switch ($attname){
+            switch ($attname) {
                 case 'background':
                     $styledef .= "background-image: url('$trans_image_path'); ";
                     break;
@@ -817,7 +817,7 @@ 
         if ($has_bgc_stl && !$has_txt_stl) {
             $styledef .= "color: $text; ";
         }
-        if (strlen($styledef) > 0){
+        if (strlen($styledef) > 0) {
             $divattary{"style"} = "\"$styledef\"";
         }
     }
@@ -874,15 +874,15 @@ 
     $body = preg_replace('/&(\{.*?\};)/si', '&amp;\\1', $body);
     while (($curtag = tln_getnxtag($body, $curpos)) != false) {
         list($tagname, $attary, $tagtype, $lt, $gt) = $curtag;
-        $free_content = substr($body, $curpos, $lt-$curpos);
+        $free_content = substr($body, $curpos, $lt - $curpos);
         /**
          * Take care of <style>
          */
-        if ($tagname == "style" && $tagtype == 1){
+        if ($tagname == "style" && $tagtype == 1) {
             list($free_content, $curpos) =
-                tln_fixstyle($body, $gt+1, $trans_image_path, $block_external_images);
-            if ($free_content != FALSE){
-                if ( !empty($attary) ) {
+                tln_fixstyle($body, $gt + 1, $trans_image_path, $block_external_images);
+            if ($free_content != FALSE) {
+                if (!empty($attary)) {
                     $attary = tln_fixatts($tagname,
                                          $attary,
                                          $rm_attnames,
@@ -898,7 +898,7 @@ 
             }
             continue;
         }
-        if ($skip_content == false){
+        if ($skip_content == false) {
             $trusted .= $free_content;
         }
         if ($tagname != false) {
@@ -956,7 +956,7 @@ 
                             /**
                              * Convert body into div.
                              */
-                            if ($tagname == "body"){
+                            if ($tagname == "body") {
                                 $tagname = "div";
                                 $attary = tln_body2div($attary, $trans_image_path);
                             }
@@ -995,7 +995,7 @@ 
     if ($force_tag_closing == true) {
         foreach ($open_tags as $tagname => $opentimes) {
             while ($opentimes > 0) {
-                $trusted .= '</' . $tagname . '>';
+                $trusted .= '</'.$tagname.'>';
                 $opentimes--;
             }
         }
@@ -1037,7 +1037,7 @@ 
         "xml"
     );
 
-    $self_closing_tags =  array(
+    $self_closing_tags = array(
         "img",
         "br",
         "hr",

drupal/sites/all/libraries/phpmailer/extras/ntlm_sasl_client.php

Doc Comments +9 added lines

@@ -18,6 +18,9 @@ 
     public $credentials = array();
     public $state = SASL_NTLM_STATE_START;
 
+    /**
+     * @param stdClass $client
+     */
     public function initialize(&$client)
     {
         if (!function_exists($function = "mcrypt_encrypt")
@@ -63,6 +66,9 @@ 
         );
     }
 
+    /**
+     * @param string $challenge
+     */
     public function NTLMResponse($challenge, $password)
     {
         $unicode = $this->ASCIIToUnicode($password);
@@ -85,6 +91,9 @@ 
         return $response;
     }
 
+    /**
+     * @param string $ntlm_response
+     */
     public function typeMsg3($ntlm_response, $user, $domain, $workstation)
     {
         $domain_unicode = $this->ASCIIToUnicode($domain);

Spacing +39 added lines, -39 removed lines

@@ -27,7 +27,7 @@ 
                 "mcrypt_encrypt" => "mcrypt",
                 "mhash" => "mhash"
             );
-            $client->error = "the extension " . $extensions[$function] .
+            $client->error = "the extension ".$extensions[$function].
                 " required by the NTLM SASL client class is not available in this PHP configuration";
             return (0);
         }
@@ -37,7 +37,7 @@ 
     public function ASCIIToUnicode($ascii)
     {
         for ($unicode = "", $a = 0; $a < strlen($ascii); $a++) {
-            $unicode .= substr($ascii, $a, 1) . chr(0);
+            $unicode .= substr($ascii, $a, 1).chr(0);
         }
         return ($unicode);
     }
@@ -49,16 +49,16 @@ 
         $workstation_offset = 32;
         $domain_offset = $workstation_offset + $workstation_length;
         return (
-            "NTLMSSP\0" .
-            "\x01\x00\x00\x00" .
-            "\x07\x32\x00\x00" .
-            pack("v", $domain_length) .
-            pack("v", $domain_length) .
-            pack("V", $domain_offset) .
-            pack("v", $workstation_length) .
-            pack("v", $workstation_length) .
-            pack("V", $workstation_offset) .
-            $workstation .
+            "NTLMSSP\0".
+            "\x01\x00\x00\x00".
+            "\x07\x32\x00\x00".
+            pack("v", $domain_length).
+            pack("v", $domain_length).
+            pack("V", $domain_offset).
+            pack("v", $workstation_length).
+            pack("v", $workstation_length).
+            pack("V", $workstation_offset).
+            $workstation.
             $domain
         );
     }
@@ -67,7 +67,7 @@ 
     {
         $unicode = $this->ASCIIToUnicode($password);
         $md4 = mhash(MHASH_MD4, $unicode);
-        $padded = $md4 . str_repeat(chr(0), 21 - strlen($md4));
+        $padded = $md4.str_repeat(chr(0), 21 - strlen($md4));
         $iv_size = mcrypt_get_iv_size(MCRYPT_DES, MCRYPT_MODE_ECB);
         $iv = mcrypt_create_iv($iv_size, MCRYPT_RAND);
         for ($response = "", $third = 0; $third < 21; $third += 7) {
@@ -76,7 +76,7 @@ 
             }
             for ($key = "", $p = 0; $p < strlen($packed); $p += 7) {
                 $s = substr($packed, $p, 7);
-                $b = $s . ((substr_count($s, "1") % 2) ? "0" : "1");
+                $b = $s.((substr_count($s, "1")%2) ? "0" : "1");
                 $key .= chr(bindec($b));
             }
             $ciphertext = mcrypt_encrypt(MCRYPT_DES, $key, $challenge, MCRYPT_MODE_ECB, $iv);
@@ -106,31 +106,31 @@ 
         $session_length = strlen($session);
         $session_offset = $ntlm_offset + $ntlm_length;
         return (
-            "NTLMSSP\0" .
-            "\x03\x00\x00\x00" .
-            pack("v", $lm_length) .
-            pack("v", $lm_length) .
-            pack("V", $lm_offset) .
-            pack("v", $ntlm_length) .
-            pack("v", $ntlm_length) .
-            pack("V", $ntlm_offset) .
-            pack("v", $domain_length) .
-            pack("v", $domain_length) .
-            pack("V", $domain_offset) .
-            pack("v", $user_length) .
-            pack("v", $user_length) .
-            pack("V", $user_offset) .
-            pack("v", $workstation_length) .
-            pack("v", $workstation_length) .
-            pack("V", $workstation_offset) .
-            pack("v", $session_length) .
-            pack("v", $session_length) .
-            pack("V", $session_offset) .
-            "\x01\x02\x00\x00" .
-            $domain_unicode .
-            $user_unicode .
-            $workstation_unicode .
-            $lm .
+            "NTLMSSP\0".
+            "\x03\x00\x00\x00".
+            pack("v", $lm_length).
+            pack("v", $lm_length).
+            pack("V", $lm_offset).
+            pack("v", $ntlm_length).
+            pack("v", $ntlm_length).
+            pack("V", $ntlm_offset).
+            pack("v", $domain_length).
+            pack("v", $domain_length).
+            pack("V", $domain_offset).
+            pack("v", $user_length).
+            pack("v", $user_length).
+            pack("V", $user_offset).
+            pack("v", $workstation_length).
+            pack("v", $workstation_length).
+            pack("V", $workstation_offset).
+            pack("v", $session_length).
+            pack("v", $session_length).
+            pack("V", $session_offset).
+            "\x01\x02\x00\x00".
+            $domain_unicode.
+            $user_unicode.
+            $workstation_unicode.
+            $lm.
             $ntlm
         );
     }

drupal/sites/all/themes/zen/template.php

Doc Comments +5 added lines, -5 removed lines

@@ -32,7 +32,7 @@ 
  * @param $breadcrumb
  *   An array containing the breadcrumb links.
  * @return
- *   A string containing the breadcrumb output.
+ string   A string containing the breadcrumb output.
  */
 function zen_breadcrumb($breadcrumb) {
   // Determine if we are to display the breadcrumb.
@@ -87,7 +87,7 @@ 
  *   See http://juicystudio.com/article/screen-readers-display-none.php
  *   and http://www.w3.org/TR/WCAG-TECHS/H42.html for more information.
  * @return
- *   A string containing an unordered list of links.
+ string   A string containing an unordered list of links.
  */
 function zen_links($links, $attributes = array('class' => 'links'), $heading = '') {
   global $language;
@@ -600,10 +600,10 @@ 
    * Do not pass one string containing multiple classes as they will be
    * incorrectly concatenated with dashes, i.e. "one two" will become "one-two".
    *
-   * @param $class
+   * @param string $class
    *   The class name to clean.
    * @return
-   *   The cleaned class name.
+   string   The cleaned class name.
    */
   function drupal_html_class($class) {
     // By default, we filter using Drupal's coding standards.
@@ -633,7 +633,7 @@ 
    * @param $id
    *   The ID to clean.
    * @return
-   *   The cleaned ID.
+   string   The cleaned ID.
    */
   function drupal_html_id($id) {
     $id = strtr(drupal_strtolower($id), array(' ' => '-', '_' => '-', '[' => '-', ']' => ''));

Spacing +35 added lines, -35 removed lines

@@ -22,7 +22,7 @@ 
  */
 function zen_theme(&$existing, $type, $theme, $path) {
   // When #341140 is fixed, replace _zen_path() with drupal_get_path().
-  include_once './' . _zen_path() . '/zen-internals/template.theme-registry.inc';
+  include_once './'._zen_path().'/zen-internals/template.theme-registry.inc';
   return _zen_theme($existing, $type, $theme, $path);
 }
 
@@ -57,7 +57,7 @@ 
       elseif (theme_get_setting('zen_breadcrumb_trailing')) {
         $trailing_separator = $breadcrumb_separator;
       }
-      return '<div class="breadcrumb">' . implode($breadcrumb_separator, $breadcrumb) . "$trailing_separator$title</div>";
+      return '<div class="breadcrumb">'.implode($breadcrumb_separator, $breadcrumb)."$trailing_separator$title</div>";
     }
   }
   // Otherwise, return an empty string.
@@ -106,14 +106,14 @@ 
           'level' => 'h2',
         );
       }
-      $output .= '<' . $heading['level'];
+      $output .= '<'.$heading['level'];
       if (!empty($heading['class'])) {
         $output .= drupal_attributes(array('class' => $heading['class']));
       }
-      $output .= '>' . check_plain($heading['text']) . '</' . $heading['level'] . '>';
+      $output .= '>'.check_plain($heading['text']).'</'.$heading['level'].'>';
     }
 
-    $output .= '<ul'. drupal_attributes($attributes) .'>';
+    $output .= '<ul'.drupal_attributes($attributes).'>';
 
     $num_links = count($links);
     $i = 1;
@@ -132,7 +132,7 @@ 
           && (empty($link['language']) || $link['language']->language == $language->language)) {
         $class .= ' active';
       }
-      $output .= '<li'. drupal_attributes(array('class' => $class)) .'>';
+      $output .= '<li'.drupal_attributes(array('class' => $class)).'>';
 
       if (isset($link['href'])) {
         // Pass in $link as $options, they share the same keys.
@@ -147,7 +147,7 @@ 
         if (isset($link['attributes'])) {
           $span_attributes = drupal_attributes($link['attributes']);
         }
-        $output .= '<span'. $span_attributes .'>'. $link['title'] .'</span>';
+        $output .= '<span'.$span_attributes.'>'.$link['title'].'</span>';
       }
 
       $i++;
@@ -169,8 +169,8 @@ 
   }
 
   // If an item is a LOCAL TASK, render it as a tab
-  if ($link['type'] & MENU_IS_LOCAL_TASK) {
-    $link['title'] = '<span class="tab">' . check_plain($link['title']) . '</span>';
+  if ($link['type']&MENU_IS_LOCAL_TASK) {
+    $link['title'] = '<span class="tab">'.check_plain($link['title']).'</span>';
     $link['localized_options']['html'] = TRUE;
   }
 
@@ -195,10 +195,10 @@ 
   }
 
   if ($primary) {
-    $output .= '<ul class="tabs primary clearfix">' . $primary . '</ul>';
+    $output .= '<ul class="tabs primary clearfix">'.$primary.'</ul>';
   }
   if ($secondary) {
-    $output .= '<ul class="tabs secondary clearfix">' . $secondary . '</ul>';
+    $output .= '<ul class="tabs secondary clearfix">'.$secondary.'</ul>';
   }
 
   return $output;
@@ -253,7 +253,7 @@ 
     $elements['#region'] = $region;
 
     // Set the theme hook suggestions.
-    $hook = array('region_' . $region);
+    $hook = array('region_'.$region);
     if (strpos($region, 'sidebar_') === 0) {
       $hook[] = 'region_sidebar';
     }
@@ -295,7 +295,7 @@ 
     // Views (and possibly other modules) have templates with a $classes
     // variable that isn't a string, so we leave those variables alone.
     if (is_string($vars[$key])) {
-      $vars['classes_array'] = explode(' ', $hook . ' ' . $vars[$key]);
+      $vars['classes_array'] = explode(' ', $hook.' '.$vars[$key]);
       unset($vars[$key]);
     }
   }
@@ -319,37 +319,37 @@ 
 function zen_preprocess_page(&$vars, $hook) {
   // If the user is silly and enables Zen as the theme, add some styles.
   if ($GLOBALS['theme'] == 'zen') {
-    include_once './' . _zen_path() . '/zen-internals/template.zen.inc';
+    include_once './'._zen_path().'/zen-internals/template.zen.inc';
     _zen_preprocess_page($vars, $hook);
   }
   // Add conditional stylesheets.
   elseif (!module_exists('conditional_styles')) {
     $language = $GLOBALS['language']->direction == LANGUAGE_RTL ? '_rtl' : '';
-    $vars['conditional_styles'] = variable_get('conditional_styles_' . $GLOBALS['theme'] . $language, '');
+    $vars['conditional_styles'] = variable_get('conditional_styles_'.$GLOBALS['theme'].$language, '');
     $vars['styles'] .= $vars['conditional_styles'];
   }
 
   // Classes for body element. Allows advanced theming based on context
   // (home page, node of certain type, etc.)
   // Remove the mostly useless page-ARG0 class.
-  if ($index = array_search(preg_replace('![^abcdefghijklmnopqrstuvwxyz0-9-_]+!s', '', 'page-'. drupal_strtolower(arg(0))), $vars['classes_array'])) {
+  if ($index = array_search(preg_replace('![^abcdefghijklmnopqrstuvwxyz0-9-_]+!s', '', 'page-'.drupal_strtolower(arg(0))), $vars['classes_array'])) {
     unset($vars['classes_array'][$index]);
   }
   if (!$vars['is_front']) {
     // Add unique class for each page.
     $path = drupal_get_path_alias($_GET['q']);
-    $vars['classes_array'][] = drupal_html_class('page-' . $path);
+    $vars['classes_array'][] = drupal_html_class('page-'.$path);
     // Add unique class for each website section.
-    list($section, ) = explode('/', $path, 2);
+    list($section,) = explode('/', $path, 2);
     if (arg(0) == 'node') {
       if (arg(1) == 'add') {
         $section = 'node-add';
       }
       elseif (is_numeric(arg(1)) && (arg(2) == 'edit' || arg(2) == 'delete')) {
-        $section = 'node-' . arg(2);
+        $section = 'node-'.arg(2);
       }
     }
-    $vars['classes_array'][] = drupal_html_class('section-' . $section);
+    $vars['classes_array'][] = drupal_html_class('section-'.$section);
   }
   if (theme_get_setting('zen_wireframes')) {
     $vars['classes_array'][] = 'with-wireframes'; // Optionally add the wireframes style.
@@ -376,7 +376,7 @@ 
     }
     else {
       $vars['classes_array'][] = 'one-sidebar';
-      $vars['classes_array'][] = 'sidebar-' . $vars['layout'];
+      $vars['classes_array'][] = 'sidebar-'.$vars['layout'];
     }
   }
   // Store the menu item since it has some useful information.
@@ -406,13 +406,13 @@ 
 function zen_preprocess_maintenance_page(&$vars, $hook) {
   // If Zen is the maintenance theme, add some styles.
   if ($GLOBALS['theme'] == 'zen') {
-    include_once './' . _zen_path() . '/zen-internals/template.zen.inc';
+    include_once './'._zen_path().'/zen-internals/template.zen.inc';
     _zen_preprocess_page($vars, $hook);
   }
   // Add conditional stylesheets.
   elseif (!module_exists('conditional_styles')) {
     $language = $GLOBALS['language']->direction == LANGUAGE_RTL ? '_rtl' : '';
-    $vars['conditional_styles'] = variable_get('conditional_styles_' . $GLOBALS['theme'] . $language, '');
+    $vars['conditional_styles'] = variable_get('conditional_styles_'.$GLOBALS['theme'].$language, '');
     $vars['styles'] .= $vars['conditional_styles'];
   }
 }
@@ -459,11 +459,11 @@ 
   $vars['user_picture'] = $vars['picture'];
 
   // Create the Drupal 7 $display_submitted variable.
-  $vars['display_submitted'] = theme_get_setting('toggle_node_info_' . $vars['node']->type);
+  $vars['display_submitted'] = theme_get_setting('toggle_node_info_'.$vars['node']->type);
 
   // Special classes for nodes.
   // Class for node type: "node-type-page", "node-type-story", "node-type-my-custom-type", etc.
-  $vars['classes_array'][] = drupal_html_class('node-type-' . $vars['type']);
+  $vars['classes_array'][] = drupal_html_class('node-type-'.$vars['type']);
   if ($vars['promote']) {
     $vars['classes_array'][] = 'node-promoted';
   }
@@ -486,7 +486,7 @@ 
   if (isset($vars['preview'])) {
     $vars['classes_array'][] = 'node-preview';
   }
-  $vars['classes_array'][] = 'build-mode-' . $vars['build_mode'] ;
+  $vars['classes_array'][] = 'build-mode-'.$vars['build_mode'];
 }
 
 /**
@@ -498,7 +498,7 @@ 
  *   The name of the template being rendered ("comment" in this case.)
  */
 function zen_preprocess_comment(&$vars, $hook) {
-  include_once './' . _zen_path() . '/zen-internals/template.comment.inc';
+  include_once './'._zen_path().'/zen-internals/template.comment.inc';
   _zen_preprocess_comment($vars, $hook);
 }
 
@@ -516,7 +516,7 @@ 
   $vars['region'] = $vars['elements']['#region'];
 
   // Setup the default classes.
-  $vars['classes_array'] = array('region', 'region-' . str_replace('_', '-', $vars['region']));
+  $vars['classes_array'] = array('region', 'region-'.str_replace('_', '-', $vars['region']));
 
   // Sidebar regions get a couple extra classes.
   if (strpos($vars['region'], 'sidebar_') === 0) {
@@ -542,7 +542,7 @@ 
   $vars['title'] = $block->subject;
 
   // Special classes for blocks.
-  $vars['classes_array'][] = 'block-' . $block->module;
+  $vars['classes_array'][] = 'block-'.$block->module;
   // Classes describing the position of the block within the region.
   if ($vars['block_id'] == 1) {
     $vars['classes_array'][] = 'first';
@@ -550,17 +550,17 @@ 
   if (!function_exists('context_blocks') && count(block_list($vars['block']->region)) == $vars['block_id']) {
     $vars['classes_array'][] = 'last';
   }
-  $vars['classes_array'][] = 'region-' . $vars['block_zebra'];
+  $vars['classes_array'][] = 'region-'.$vars['block_zebra'];
   $vars['classes_array'][] = $vars['zebra'];
-  $vars['classes_array'][] = 'region-count-' . $vars['block_id'];
-  $vars['classes_array'][] = 'count-' . $vars['id'];
+  $vars['classes_array'][] = 'region-count-'.$vars['block_id'];
+  $vars['classes_array'][] = 'count-'.$vars['id'];
 
   // Create the block ID.
-  $vars['block_html_id'] = 'block-' . $block->module . '-' . $block->delta;
+  $vars['block_html_id'] = 'block-'.$block->module.'-'.$block->delta;
 
   $vars['edit_links_array'] = array();
   if (theme_get_setting('zen_block_editing') && user_access('administer blocks')) {
-    include_once './' . _zen_path() . '/zen-internals/template.block-editing.inc';
+    include_once './'._zen_path().'/zen-internals/template.block-editing.inc';
     zen_preprocess_block_editing($vars, $hook);
     $vars['classes_array'][] = 'with-block-editing';
   }
@@ -590,7 +590,7 @@ 
  *   The name of the template being rendered ("block" in this case.)
  */
 function zen_process_block(&$vars, $hook) {
-  $vars['edit_links'] = !empty($vars['edit_links_array']) ? '<div class="edit">' . implode(' ', $vars['edit_links_array']) . '</div>' : '';
+  $vars['edit_links'] = !empty($vars['edit_links_array']) ? '<div class="edit">'.implode(' ', $vars['edit_links_array']).'</div>' : '';
 }
 
 if (!function_exists('drupal_html_class')) {

drupal/sites/default/boinc/modules/boincimport/boincimport.module

Doc Comments +2 added lines, -1 removed lines

@@ -132,7 +132,7 @@ 
  * Set database connection for boincimport
  *
  * @return
- *   1 if can connect to BOINC database.
+ integer   1 if can connect to BOINC database.
  *
  * BEWARE: if you test using db_connect and the connection
  * fails, the process will die() which is a bit too much since we only
@@ -162,6 +162,7 @@ 
 /**
  * Check if the module is enabled.
  * 
+ * @param string $module
  * @return array
  *    $out['html'] = formatted html.
  *    $out['result'] = boolean.

Spacing +77 added lines, -77 removed lines

@@ -105,8 +105,8 @@ 
   $boinc_db_url = (is_array($db_url)) ? (isset($db_url['boinc']) ? $db_url['boinc'] : $db_url['default']) : $db_url;
   variable_set('boincimport_db_url', $boinc_db_url);
   variable_set('boincimport_ready', 0);
-  return '<p>'. t('The BOINC database URL has been reset. You may now <a href="@configlink">go back to the configuration page</a>.',
-      array('@configlink' => url('admin/boinc/import/settings'))) .'</p>';
+  return '<p>'.t('The BOINC database URL has been reset. You may now <a href="@configlink">go back to the configuration page</a>.',
+      array('@configlink' => url('admin/boinc/import/settings'))).'</p>';
 }
 
 /**
@@ -114,18 +114,18 @@ 
  */
 function boincimport_unlock() {
   variable_del('boincimport_process_locked');
-  return '<p>'. t('The BOINC data import process has been unlocked. You may
+  return '<p>'.t('The BOINC data import process has been unlocked. You may
     now !proceed_with_import.', array(
       '!proceed_with_import' => l(t('proceed with the import'),
         'admin/boinc/import/process')
-    )) .'</p>';
+    )).'</p>';
 }
 
 /**
  * Callback admin/boinc/import/cleanup
  */
 function boincimport_cleanup() {
-  return boincimport_process_cleanup() .'<p>'. t('Drupal database cleaned.') .'</p>';
+  return boincimport_process_cleanup().'<p>'.t('Drupal database cleaned.').'</p>';
 }
 
 /**
@@ -138,7 +138,7 @@ 
  * fails, the process will die() which is a bit too much since we only
  * want to test. Therefore, the test part of the code is not used, now.
  */
-function _boincimport_db_connect($test= 0) {
+function _boincimport_db_connect($test = 0) {
   global $db_url;
   $db_ready = variable_get('boincimport_db_configured', 1);
   if (!$db_ready) {
@@ -148,7 +148,7 @@ 
       $db_url2['default'] = $db_url;
     }
     $db_url2['boinc'] = variable_get('boincimport_db_url', $db_url);
-    $GLOBALS['db_url'] =& $db_url2;
+    $GLOBALS['db_url'] = & $db_url2;
     if ($test) {
       if (!db_connect($db_url2['boinc'])) {
         return 0;
@@ -171,10 +171,10 @@ 
   $result = module_exists($module);
   $out['result'] = $result;
   if ($result == 1) {
-    $out['html'] .= '<li>'. t('Module %module is enabled. OK!', array('%module' => $module)) .'</li>';
+    $out['html'] .= '<li>'.t('Module %module is enabled. OK!', array('%module' => $module)).'</li>';
   }
   else {
-    $out['html'] .= '<li><span class="marker">'. t('Module %module is disabled.', array('%module' => $module)) .'</span></li>';
+    $out['html'] .= '<li><span class="marker">'.t('Module %module is disabled.', array('%module' => $module)).'</span></li>';
   }
   $out['html'] .= '</ul>';
   return $out;
@@ -187,32 +187,32 @@ 
  *   $out['html'] = formatted html.
  *   $out['result'] = boolean.
  */
-function _boincimport_check_tables($tables = array(), $db = 'default' , $prefix = 1) {
+function _boincimport_check_tables($tables = array(), $db = 'default', $prefix = 1) {
   _boincimport_db_connect();
 
   $out['html'] = '<ul>';
-  $out['result']= 1;
+  $out['result'] = 1;
   foreach ($tables as $table) {
     if ($prefix) {
-      $table = db_prefix_tables('{'. $table .'}');
+      $table = db_prefix_tables('{'.$table.'}');
     }  
 
     db_set_active($db);
     if ($GLOBALS['db_type'] == 'pgsql') {
       // adapt from db_table_exists in database.pgsql.inc
-      $result = (bool) db_result(db_query("SELECT COUNT(*) FROM pg_class WHERE relname = '%s'", $table));
+      $result = (bool)db_result(db_query("SELECT COUNT(*) FROM pg_class WHERE relname = '%s'", $table));
     }
     else {
       // adapt from db_table_exists in database.mysql.inc
-      $result = (bool) db_fetch_object(db_query("SHOW TABLES LIKE '%s'", $table));
+      $result = (bool)db_fetch_object(db_query("SHOW TABLES LIKE '%s'", $table));
     }
     db_set_active('default');
     if ($result) {
-      $out['html'] .= '<li>'. t('Table %table: OK!', array('%table' => $table)) .'</li>';
+      $out['html'] .= '<li>'.t('Table %table: OK!', array('%table' => $table)).'</li>';
     }
     else {
-      $out['html'] .= '<li><span class="marker">'. t('Table <strong>%table</strong> does not exist!', array('%table' => $table)) .'</span></li>';
-      $out['result']= 0;
+      $out['html'] .= '<li><span class="marker">'.t('Table <strong>%table</strong> does not exist!', array('%table' => $table)).'</span></li>';
+      $out['result'] = 0;
     }
   }
   $out['html'] .= '</ul>';
@@ -226,7 +226,7 @@ 
   boinc_get_path();
   
   if (!variable_get('boincimport_ready', 0)) {
-    return '<p>'. t('You cannot import the data now. Please <a href="@settings">complete the setup first</a>', array('@settings' => url('admin/boinc/import/settings'))) .'</p>';
+    return '<p>'.t('You cannot import the data now. Please <a href="@settings">complete the setup first</a>', array('@settings' => url('admin/boinc/import/settings'))).'</p>';
   }
 
   $output = 'BOINC import process form';
@@ -236,7 +236,7 @@ 
 
 function boincimport_process_form() {
   $form = array();
-  _boincimport_db_connect() ;
+  _boincimport_db_connect();
   // Causes problems with form api redirect
   //ini_set('display_errors', TRUE);
 
@@ -411,7 +411,7 @@ 
       }
       else {
         drupal_set_message('Congratulations.  Import Finished');
-        drupal_set_message('Please visit the '. l('Post migration configuration', 'admin/boinc/import/post_configuration') .' page');
+        drupal_set_message('Please visit the '.l('Post migration configuration', 'admin/boinc/import/post_configuration').' page');
         watchdog('boincimport', 'Import process is complete', array(), WATCHDOG_INFO); 
         unset($_SESSION['boincimport_stage_selected']);
       }
@@ -632,7 +632,7 @@ 
     $context['finished'] = 1;
   }
   else {
-    $context['finished'] = $context['sandbox']['progress'] / $context['sandbox']['max'];
+    $context['finished'] = $context['sandbox']['progress']/$context['sandbox']['max'];
   }
 }
 
@@ -661,7 +661,7 @@ 
     // An error occurred.
     // $operations contains the operations that remained unprocessed.
     $error_operation = reset($operations);
-    $message = 'An error occurred while processing ' . $error_operation[0] . ' with arguments :' . print_r($error_operation[0], TRUE);
+    $message = 'An error occurred while processing '.$error_operation[0].' with arguments :'.print_r($error_operation[0], TRUE);
   }
   drupal_set_message($message);
   
@@ -845,7 +845,7 @@ 
     $context['finished'] = 1;
   }
   else {
-    $context['finished'] = $context['sandbox']['progress'] / $context['sandbox']['max'];
+    $context['finished'] = $context['sandbox']['progress']/$context['sandbox']['max'];
   }
 }
 
@@ -872,7 +872,7 @@ 
     // An error occurred.
     // $operations contains the operations that remained unprocessed.
     $error_operation = reset($operations);
-    $message = 'An error occurred while processing ' . $error_operation[0] . ' with arguments :' . print_r($error_operation[0], TRUE);
+    $message = 'An error occurred while processing '.$error_operation[0].' with arguments :'.print_r($error_operation[0], TRUE);
   }
   drupal_set_message($message);
   
@@ -1018,7 +1018,7 @@ 
     $context['finished'] = 1;
   }
   else {
-    $context['finished'] = $context['sandbox']['progress'] / $context['sandbox']['max'];
+    $context['finished'] = $context['sandbox']['progress']/$context['sandbox']['max'];
   }
 }
 
@@ -1046,7 +1046,7 @@ 
     // An error occurred.
     // $operations contains the operations that remained unprocessed.
     $error_operation = reset($operations);
-    $message = 'An error occurred while processing ' . $error_operation[0] . ' with arguments :' . print_r($error_operation[0], TRUE);
+    $message = 'An error occurred while processing '.$error_operation[0].' with arguments :'.print_r($error_operation[0], TRUE);
   }
   drupal_set_message($message);
   
@@ -1202,7 +1202,7 @@ 
     $context['finished'] = 1;
   }
   else {
-    $context['finished'] = $context['sandbox']['progress'] / $context['sandbox']['max'];
+    $context['finished'] = $context['sandbox']['progress']/$context['sandbox']['max'];
   }
 }
 
@@ -1231,7 +1231,7 @@ 
     // An error occurred.
     // $operations contains the operations that remained unprocessed.
     $error_operation = reset($operations);
-    $message = 'An error occurred while processing ' . $error_operation[0] . ' with arguments :' . print_r($error_operation[0], TRUE);
+    $message = 'An error occurred while processing '.$error_operation[0].' with arguments :'.print_r($error_operation[0], TRUE);
   }
   drupal_set_message($message);
   
@@ -1381,7 +1381,7 @@ 
     $context['finished'] = 1;
   }
   else {
-    $context['finished'] = $context['sandbox']['progress'] / $context['sandbox']['max'];
+    $context['finished'] = $context['sandbox']['progress']/$context['sandbox']['max'];
   }
 }
 
@@ -1408,7 +1408,7 @@ 
     // An error occurred.
     // $operations contains the operations that remained unprocessed.
     $error_operation = reset($operations);
-    $message = 'An error occurred while processing ' . $error_operation[0] . ' with arguments :' . print_r($error_operation[0], TRUE);
+    $message = 'An error occurred while processing '.$error_operation[0].' with arguments :'.print_r($error_operation[0], TRUE);
   }
   drupal_set_message($message);
   
@@ -1709,7 +1709,7 @@ 
     $context['finished'] = 1;
   }
   else {
-    $context['finished'] = $context['sandbox']['progress'] / $context['sandbox']['max'];
+    $context['finished'] = $context['sandbox']['progress']/$context['sandbox']['max'];
   }
 }
 
@@ -1787,7 +1787,7 @@ 
     $context['finished'] = 1;
   }
   else {
-    $context['finished'] = $context['sandbox']['progress'] / $context['sandbox']['max'];
+    $context['finished'] = $context['sandbox']['progress']/$context['sandbox']['max'];
   }
 }
 
@@ -1800,34 +1800,34 @@ 
   $forum_perms = array();
   $role_map = array_flip(user_roles());
   $forum_perms[$role_map['anonymous user']] = array(
-    'view' => (int) !$hidden,
+    'view' => (int)!$hidden,
     'update' => 0,
     'delete' => 0,
     'create' => 0,
   );
   $forum_perms[$role_map['authenticated user']] = array(
-    'view' => (int) !$hidden,
+    'view' => (int)!$hidden,
     'update' => 0,
     'delete' => 0,
     'create' => 0,
   );
   $forum_perms[$role_map['community member']] = array(
-    'view' => (int) !$hidden,
+    'view' => (int)!$hidden,
     'update' => 0,
     'delete' => 0,
-    'create' => (int) $open,
+    'create' => (int)$open,
   );
   $forum_perms[$role_map['verified contributor']] = array(
-    'view' => (int) !$hidden,
+    'view' => (int)!$hidden,
     'update' => 0,
     'delete' => 0,
-    'create' => (int) !$hidden,
+    'create' => (int)!$hidden,
   );
   $forum_perms[$role_map['moderator']] = array(
-    'view' => (int) !$hidden,
-    'update' => (int) !$hidden,
+    'view' => (int)!$hidden,
+    'update' => (int)!$hidden,
     'delete' => 0,
-    'create' => (int) !$hidden,
+    'create' => (int)!$hidden,
   );
   $forum_perms[$role_map['administrator']] = array(
     'view' => 1,
@@ -1892,7 +1892,7 @@ 
     // An error occurred.
     // $operations contains the operations that remained unprocessed.
     $error_operation = reset($operations);
-    $message = 'An error occurred while processing ' . $error_operation[0] . ' with arguments :' . print_r($error_operation[0], TRUE);
+    $message = 'An error occurred while processing '.$error_operation[0].' with arguments :'.print_r($error_operation[0], TRUE);
   }
   drupal_set_message($message);
   
@@ -1962,7 +1962,7 @@ 
   $batch_size = 100;
   
   // Create batches to process
-  for ($offset = 0; $offset < $topic_count; $offset+=$batch_size) {
+  for ($offset = 0; $offset < $topic_count; $offset += $batch_size) {
     $topics_per_batch = $batch_size;
     if ($offset + $batch_size > $topic_count) {
       $topics_per_batch = $topic_count - $offset;
@@ -2079,7 +2079,7 @@ 
         'type' => $node_type,
         'title' => $topic->title,
         'uid' => $uid,
-        'status' => ($topic->hidden) ? 0 : 1,  // published or not
+        'status' => ($topic->hidden) ? 0 : 1, // published or not
         'promote' => $promote,
         'created' => $topic->create_time,
         'changed' => $topic->timestamp,
@@ -2093,7 +2093,7 @@ 
       $node['tid'] = $tid;
       
       // Save the topic node
-      $node = (object) $node; // node_save requires an object form
+      $node = (object)$node; // node_save requires an object form
       node_save($node);
       taxonomy_node_save($node, array($tid));
       $success = ($node->nid) ? TRUE : FALSE;
@@ -2156,7 +2156,7 @@ 
       $context['finished'] = 1;
     }
     else {
-      $context['finished'] = $context['sandbox']['progress'] / $context['sandbox']['max'];
+      $context['finished'] = $context['sandbox']['progress']/$context['sandbox']['max'];
     }
   }
 }
@@ -2194,7 +2194,7 @@ 
     // An error occurred.
     // $operations contains the operations that remained unprocessed.
     $error_operation = reset($operations);
-    $message = 'An error occurred while processing ' . $error_operation[0] . ' with arguments :' . print_r($error_operation[0], TRUE);
+    $message = 'An error occurred while processing '.$error_operation[0].' with arguments :'.print_r($error_operation[0], TRUE);
   }
   drupal_set_message($message);
   
@@ -2270,7 +2270,7 @@ 
   $batch_size = 100;
   
   // Create batches to process
-  for ($offset = 0; $offset < $topic_count; $offset+=$batch_size) {
+  for ($offset = 0; $offset < $topic_count; $offset += $batch_size) {
     $topics_per_batch = $batch_size;
     if ($offset + $batch_size > $topic_count) {
       $topics_per_batch = $topic_count - $offset;
@@ -2484,7 +2484,7 @@ 
       $context['finished'] = 1;
     }
     else {
-      $context['finished'] = $context['sandbox']['progress'] / $context['sandbox']['max'];
+      $context['finished'] = $context['sandbox']['progress']/$context['sandbox']['max'];
     }
   }
 }
@@ -2502,10 +2502,10 @@ 
     $empty_posts = count($results['posts']['empty']);
     $failed_posts = count($results['posts']['failure']);
     $message = t(
-      'Successfully imported @post_count posts in @topic_count topics ' .
-      '(@skipped topics either had no replies or all replies were already imported, ' .
-      '@duplicates posts were skipped as already imported, ' .
-      '@empty_posts had no content, ' .
+      'Successfully imported @post_count posts in @topic_count topics '.
+      '(@skipped topics either had no replies or all replies were already imported, '.
+      '@duplicates posts were skipped as already imported, '.
+      '@empty_posts had no content, '.
       'and @error_posts encountered errors during import)',
       array(
         '@post_count' => $posts_imported,
@@ -2528,7 +2528,7 @@ 
     // An error occurred.
     // $operations contains the operations that remained unprocessed.
     $error_operation = reset($operations);
-    $message = 'An error occurred while processing ' . $error_operation[0] . ' with arguments :' . print_r($error_operation[0], TRUE);
+    $message = 'An error occurred while processing '.$error_operation[0].' with arguments :'.print_r($error_operation[0], TRUE);
   }
   drupal_set_message($message);
   
@@ -2698,7 +2698,7 @@ 
     $context['finished'] = 1;
   }
   else {
-    $context['finished'] = $context['sandbox']['progress'] / $context['sandbox']['max'];
+    $context['finished'] = $context['sandbox']['progress']/$context['sandbox']['max'];
   }
 }
 
@@ -2725,7 +2725,7 @@ 
     // An error occurred.
     // $operations contains the operations that remained unprocessed.
     $error_operation = reset($operations);
-    $message = 'An error occurred while processing ' . $error_operation[0] . ' with arguments :' . print_r($error_operation[0], TRUE);
+    $message = 'An error occurred while processing '.$error_operation[0].' with arguments :'.print_r($error_operation[0], TRUE);
   }
   drupal_set_message($message);
   
@@ -2907,7 +2907,7 @@ 
         'type' => $node_type,
         'title' => $topic->title,
         'uid' => $uid,
-        'status' => ($topic->hidden) ? 0 : 1,  // published or not
+        'status' => ($topic->hidden) ? 0 : 1, // published or not
         'promote' => $promote,
         'created' => $topic->create_time,
         'changed' => $topic->timestamp,
@@ -2921,7 +2921,7 @@ 
       );
       
       // Save the team topic node
-      $node = (object) $node; // node_save requires an object form
+      $node = (object)$node; // node_save requires an object form
       node_save($node);
 
       if ($node->nid) {
@@ -2967,7 +2967,7 @@ 
     $context['finished'] = 1;
   }
   else {
-    $context['finished'] = $context['sandbox']['progress'] / $context['sandbox']['max'];
+    $context['finished'] = $context['sandbox']['progress']/$context['sandbox']['max'];
   }
 }
 
@@ -2994,7 +2994,7 @@ 
     // An error occurred.
     // $operations contains the operations that remained unprocessed.
     $error_operation = reset($operations);
-    $message = 'An error occurred while processing ' . $error_operation[0] . ' with arguments :' . print_r($error_operation[0], TRUE);
+    $message = 'An error occurred while processing '.$error_operation[0].' with arguments :'.print_r($error_operation[0], TRUE);
   }
   drupal_set_message($message);
   
@@ -3249,7 +3249,7 @@ 
     $context['finished'] = 1;
   }
   else {
-    $context['finished'] = $context['sandbox']['progress'] / $context['sandbox']['max'];
+    $context['finished'] = $context['sandbox']['progress']/$context['sandbox']['max'];
   }
 }
 
@@ -3276,7 +3276,7 @@ 
     // An error occurred.
     // $operations contains the operations that remained unprocessed.
     $error_operation = reset($operations);
-    $message = 'An error occurred while processing ' . $error_operation[0] . ' with arguments :' . print_r($error_operation[0], TRUE);
+    $message = 'An error occurred while processing '.$error_operation[0].' with arguments :'.print_r($error_operation[0], TRUE);
   }
   drupal_set_message($message);
   
@@ -3398,7 +3398,7 @@ 
     $context['finished'] = 1;
   }
   else {
-    $context['finished'] = $context['sandbox']['progress'] / $context['sandbox']['max'];
+    $context['finished'] = $context['sandbox']['progress']/$context['sandbox']['max'];
   }
 }
 
@@ -3427,7 +3427,7 @@ 
     // An error occurred.
     // $operations contains the operations that remained unprocessed.
     $error_operation = reset($operations);
-    $message = 'An error occurred while processing ' . $error_operation[0] . ' with arguments :' . print_r($error_operation[0], TRUE);
+    $message = 'An error occurred while processing '.$error_operation[0].' with arguments :'.print_r($error_operation[0], TRUE);
   }
   drupal_set_message($message);
   
@@ -3503,7 +3503,7 @@ 
   $batch_size = 100;
   
   // Create node batches to process
-  for ($offset = 0; $offset < $node_count; $offset+=$batch_size) {
+  for ($offset = 0; $offset < $node_count; $offset += $batch_size) {
     $nodes_per_batch = $batch_size;
     if ($offset + $batch_size > $node_count) {
       $nodes_per_batch = $node_count - $offset;
@@ -3515,7 +3515,7 @@ 
     );
   }
   // Add comment batches
-  for ($offset = 0; $offset < $comment_count; $offset+=$batch_size) {
+  for ($offset = 0; $offset < $comment_count; $offset += $batch_size) {
     $comments_per_batch = $batch_size;
     if ($offset + $batch_size > $comment_count) {
       $comments_per_batch = $comment_count - $offset;
@@ -3527,7 +3527,7 @@ 
     );
   }
   // And don't forget to process private messages
-  for ($offset = 0; $offset < $pm_count; $offset+=$batch_size) {
+  for ($offset = 0; $offset < $pm_count; $offset += $batch_size) {
     $messages_per_batch = $batch_size;
     if ($offset + $batch_size > $pm_count) {
       $messages_per_batch = $pm_count - $offset;
@@ -3616,7 +3616,7 @@ 
       $context['finished'] = 1;
     }
     else {
-      $context['finished'] = $context['sandbox']['progress'] / $context['sandbox']['max'];
+      $context['finished'] = $context['sandbox']['progress']/$context['sandbox']['max'];
     }
   }
 }
@@ -3680,7 +3680,7 @@ 
       $context['finished'] = 1;
     }
     else {
-      $context['finished'] = $context['sandbox']['progress'] / $context['sandbox']['max'];
+      $context['finished'] = $context['sandbox']['progress']/$context['sandbox']['max'];
     }
   }
 }
@@ -3743,7 +3743,7 @@ 
       $context['finished'] = 1;
     }
     else {
-      $context['finished'] = $context['sandbox']['progress'] / $context['sandbox']['max'];
+      $context['finished'] = $context['sandbox']['progress']/$context['sandbox']['max'];
     }
   }
 }
@@ -3812,7 +3812,7 @@ 
     // An error occurred.
     // $operations contains the operations that remained unprocessed.
     $error_operation = reset($operations);
-    $message = 'An error occurred while processing ' . $error_operation[0] . ' with arguments :' . print_r($error_operation[0], TRUE);
+    $message = 'An error occurred while processing '.$error_operation[0].' with arguments :'.print_r($error_operation[0], TRUE);
   }
   drupal_set_message($message);
   
@@ -3881,18 +3881,18 @@ 
     $max = db_result(db_query('SELECT MAX(thread) FROM {comments} WHERE nid = %d', $edit['nid']));
     // Strip the "/" from the end of the thread.
     $max = rtrim($max, '/');
-    $thread = int2vancode(vancode2int($max)+1) .'/';
+    $thread = int2vancode(vancode2int($max) + 1).'/';
   } else {
     // This is comment with a parent comment: we increase the part of the thread
     // value at the proper depth.
     $parent = db_fetch_object(db_query('SELECT * FROM {comments} WHERE cid = %d', $edit['pid']));
     // Strip the "/" from the end of the parent thread.
-    $parent->thread = (string) rtrim((string) $parent->thread, '/');
+    $parent->thread = (string)rtrim((string)$parent->thread, '/');
     // Get the max value in _this_ thread.
     $max = db_result(db_query("SELECT MAX(thread) FROM {comments} WHERE thread LIKE '%s.%%' AND nid = %d", $parent->thread, $edit['nid']));
     if ($max == '') {
       // First child of this parent.
-      $thread = $parent->thread .'.'. int2vancode(1) .'/';
+      $thread = $parent->thread.'.'.int2vancode(1).'/';
     } else {
       // Strip the "/" at the end of the thread.
       $max = rtrim($max, '/');
@@ -3901,14 +3901,14 @@ 
       $parent_depth = count(explode('.', $parent->thread));
       $last = $parts[$parent_depth];
       // Finally, build the thread field for this new comment.
-      $thread = $parent->thread .'.'. int2vancode(vancode2int($last) + 1) .'/';
+      $thread = $parent->thread.'.'.int2vancode(vancode2int($last) + 1).'/';
     }
   }
 
   $status = 0; // 1 - not published, 0 - published
   $format = variable_get('boincimport_input_format', 0);
   $score = 0; // 0 default value, comments get higher score depending on the author's roles
-  $users = serialize(array(0 => 1));  // default value for everybody!!
+  $users = serialize(array(0 => 1)); // default value for everybody!!
   
   if ($edit['uid'] === $user->uid) { // '===' because we want to modify anonymous users too
     $edit['name'] = $user->name;
@@ -3942,7 +3942,7 @@ 
   // BBcode to normal html
   if (variable_get('boincimport_bbcode', 0)) {
     $input_format = variable_get('boincimport_input_format', 0);
-    $text = bbcode_filter('process', 0 , $input_format, $text);
+    $text = bbcode_filter('process', 0, $input_format, $text);
   }
   return $text;
 }

drupal/sites/default/boinc/modules/boincstats/boincstats.module

Doc Comments +3 added lines

@@ -422,6 +422,9 @@
 /*
  *
  */
+/**
+ * @param integer $credit
+ */
 function boincstats_credit_to_ghours($credit) {
   return $credit / (100 * 365);
 }

Spacing +29 added lines, -29 removed lines

@@ -86,7 +86,7 @@ 
   $backdrop_color_hex = theme_get_setting('boinc_stats_chart_bcolor');
   $backdrop_color = array_combine($color_keys, sscanf($backdrop_color_hex, "#%02x%02x%02x"));
   
-  switch($chart_size) {
+  switch ($chart_size) {
   case 'small':
     $cache_name .= "{$cpid}_small";
     $dataset_size = 30;
@@ -112,7 +112,7 @@ 
   }
   
   // Initialize the cache object and flush stale images
-  $myCache = new pCache(array('CacheFolder' => realpath('.') . '/' . conf_path() . '/files/cache'));
+  $myCache = new pCache(array('CacheFolder' => realpath('.').'/'.conf_path().'/files/cache'));
   $myCache->removeOlderThan(60*60*24);
   
   if ($myCache->isInCache($cache_name)) {
@@ -125,8 +125,8 @@ 
       'projectid' => $project_id
     );
     $args = array();
-    foreach ($get as $arg => $value) $args[] = "{$arg}=" . rawurlencode($value);
-    $query = '?' . implode('&', $args);
+    foreach ($get as $arg => $value) $args[] = "{$arg}=".rawurlencode($value);
+    $query = '?'.implode('&', $args);
     
     // Load XML from RPC
     $target_url = "http://{$stats_server}/{$stats_rpc}{$query}";
@@ -144,8 +144,8 @@ 
       $credit = null;
       for ($i = 0, $j = 31; $j <= 91; $i++, $j++) {
         $day = "day_{$j}";
-        $credit[$i] = isset($stats_xml->total_credit_history_last_91_days->$day) ? (int) $stats_xml->total_credit_history_last_91_days->$day : 0;
-        $dataset[$i] = ($i) ? ($credit[$i] - $credit[$i-1]) : 0;
+        $credit[$i] = isset($stats_xml->total_credit_history_last_91_days->$day) ? (int)$stats_xml->total_credit_history_last_91_days->$day : 0;
+        $dataset[$i] = ($i) ? ($credit[$i] - $credit[$i - 1]) : 0;
       }
     }
     else {
@@ -154,7 +154,7 @@ 
     
     $MyData->addPoints($dataset, 'series1');
     $MyData->setPalette('series1', $palette_color);
-    $MyData->setAxisPosition(0,AXIS_POSITION_RIGHT);
+    $MyData->setAxisPosition(0, AXIS_POSITION_RIGHT);
     
     // Create the pChart object
     $myPicture = new pImage($chart_width, $chart_height, $MyData);
@@ -199,7 +199,7 @@ 
     if ($label_x_axis) {
       for ($i = 5; $i >= 0; $i--) {
         $label = ($i) ? -10*$i : 'Today';
-        $myPicture->drawText(589-587*($i/6)-5, 2, $label, array('Align' => TEXT_ALIGN_TOPRIGHT));
+        $myPicture->drawText(589 - 587*($i/6) - 5, 2, $label, array('Align' => TEXT_ALIGN_TOPRIGHT));
       }
     }
 
@@ -248,7 +248,7 @@ 
   }
   
   // Initialize the cache object and flush stale images
-  $myCache = new pCache(array('CacheFolder' => realpath('.') . '/' . conf_path(). '/files/cache'));
+  $myCache = new pCache(array('CacheFolder' => realpath('.').'/'.conf_path().'/files/cache'));
   $myCache->removeOlderThan(60*60*24);
   
   if ($myCache->isInCache($cache_name)) {
@@ -261,8 +261,8 @@ 
       $credit = null;
       for ($i = 0, $j = 31; $j <= 91; $i++, $j++) {
         $day = "day_{$j}";
-        $credit[$i] = isset($stats_xml->$day) ? (int) $stats_xml->$day : 0;
-        $dataset[$i] = ($i) ? ($credit[$i] - $credit[$i-1]) : 0;
+        $credit[$i] = isset($stats_xml->$day) ? (int)$stats_xml->$day : 0;
+        $dataset[$i] = ($i) ? ($credit[$i] - $credit[$i - 1]) : 0;
       }
     }
     else {
@@ -271,10 +271,10 @@ 
     
     $MyData->addPoints($dataset, 'series1');
     $MyData->setPalette('series1', $palette_color);
-    $MyData->setAxisPosition(0,AXIS_POSITION_RIGHT);
+    $MyData->setAxisPosition(0, AXIS_POSITION_RIGHT);
 
     // Create the pChart object
-    $myPicture = new pImage(266,80,$MyData);
+    $myPicture = new pImage(266, 80, $MyData);
 
     // Turn on Antialiasing
     $myPicture->Antialias = true;
@@ -283,8 +283,8 @@ 
     //$myPicture->setFontProperties(array('FontName' => '../fonts/pf_arma_five.ttf','FontSize' => 6));
 
     // Define the chart area
-    $myPicture->setGraphArea(0,0,266,80);
-    $myPicture->drawFilledRectangle(0,0,266,80,$backdrop_color);
+    $myPicture->setGraphArea(0, 0, 266, 80);
+    $myPicture->drawFilledRectangle(0, 0, 266, 80, $backdrop_color);
 
     // Draw the scale
     $scaleSettings = array(
@@ -332,7 +332,7 @@ 
  *
  */
 function boincstats_check_cache_dir($cache_path = 'files/cache') {
-  $cache_dir = realpath('.') . '/' . conf_path() . '/' . $cache_path;
+  $cache_dir = realpath('.').'/'.conf_path().'/'.$cache_path;
   if (!is_writeable($cache_dir)) {
     if (!is_dir($cache_dir)) {
       if (!is_writeable(dirname($cache_dir))) {
@@ -378,8 +378,8 @@ 
     'projectid' => $project_id
   );
   $args = array();
-  foreach ($get as $arg => $value) $args[] = "{$arg}=" . rawurlencode($value);
-  $query = '?' . implode('&', $args);
+  foreach ($get as $arg => $value) $args[] = "{$arg}=".rawurlencode($value);
+  $query = '?'.implode('&', $args);
   
   // Load XML from RPC
   $stats_xml = NULL;
@@ -397,7 +397,7 @@ 
  */
 function boincstats_get_project_total_credit() {
   $stats_xml = boincstats_get_project_stats();
-  return isset($stats_xml->day_91) ? (int) $stats_xml->day_91 : 0;
+  return isset($stats_xml->day_91) ? (int)$stats_xml->day_91 : 0;
 }
 
 /*
@@ -411,19 +411,19 @@ 
     $dail_totals = null;
     for ($i = 61; $i <= 91; $i++) {
       $day = "day_{$i}";
-      $daily_totals[$i] = isset($stats_xml->$day) ? (int) $stats_xml->$day : 0;
+      $daily_totals[$i] = isset($stats_xml->$day) ? (int)$stats_xml->$day : 0;
       if ($i == 61) continue;
-      $daily_values[$i] = ($i) ? ($daily_totals[$i] - $daily_totals[$i-1]) : 0;
+      $daily_values[$i] = ($i) ? ($daily_totals[$i] - $daily_totals[$i - 1]) : 0;
     }
   }
-  return (count($daily_values)) ? array_sum($daily_values) / count($daily_values) : 0;
+  return (count($daily_values)) ? array_sum($daily_values)/count($daily_values) : 0;
 }
 
 /*
  *
  */
 function boincstats_credit_to_ghours($credit) {
-  return $credit / (100 * 365);
+  return $credit/(100*365);
 }
 
 /*
@@ -436,7 +436,7 @@ 
     't' => 6,
     'p' => 9
   );
-  return $credit / (pow(10, (int) $factor[$prefix]) / 10);
+  return $credit/(pow(10, (int)$factor[$prefix])/10);
 }
 
 
@@ -449,14 +449,14 @@ 
   $output = '';
   switch ($type) {
   case 'basic':
-    $output .= '<div class="overlay"><span>(' . bts('Credits per day') . ')</span></div>' . "\n";
-    $output .= '<div class="chart"><img src="' . $base_path . 'charts/project" /></div>' . "\n";
+    $output .= '<div class="overlay"><span>('.bts('Credits per day').')</span></div>'."\n";
+    $output .= '<div class="chart"><img src="'.$base_path.'charts/project" /></div>'."\n";
     break;
   case 'detailed':
-    $output .= '<div class="stats"><label>' . bts('Total G-hours') . ': </label><span>' . number_format(boincstats_credit_to_ghours(boincstats_get_project_total_credit())) . '</span></div>' . "\n";
-    $output .= '<div class="stats"><label>' . bts('Avg TFlops') . ': </label><span>' . number_format(boincstats_credit_to_flops(boincstats_get_project_avg_credit(), 't')) . '</span></div>' . "\n";
+    $output .= '<div class="stats"><label>'.bts('Total G-hours').': </label><span>'.number_format(boincstats_credit_to_ghours(boincstats_get_project_total_credit())).'</span></div>'."\n";
+    $output .= '<div class="stats"><label>'.bts('Avg TFlops').': </label><span>'.number_format(boincstats_credit_to_flops(boincstats_get_project_avg_credit(), 't')).'</span></div>'."\n";
     //$output .= '<div class="stats"><a href="#">' . bts('Pending credits') . '</a></div>' . "\n";
-    $output .= '<div class="chart"><img src="' . $base_path . 'charts/project" /></div>' . "\n";
+    $output .= '<div class="chart"><img src="'.$base_path.'charts/project" /></div>'."\n";
     break;
   default:
   }

drupal/sites/default/boinc/modules/boincstats/includes/pchart/class/pBarcode128.class.php

Doc Comments +4 added lines

@@ -179,6 +179,10 @@
 
    function left($value,$NbChar) { return substr($value,0,$NbChar); }  
    function right($value,$NbChar) { return substr($value,strlen($value)-$NbChar,$NbChar); }  
+
+   /**
+    * @param integer $NbChar
+    */
    function mid($value,$Depart,$NbChar) { return substr($value,$Depart-1,$NbChar); }  
   }
 ?>
\ No newline at end of file

Spacing +61 added lines, -61 removed lines

@@ -23,7 +23,7 @@ 
    var $CRC;
 
    /* Class creator */
-   function pBarcode128($BasePath="")
+   function pBarcode128($BasePath = "")
     {
      $this->Codes   = "";
      $this->Reverse = "";
@@ -34,10 +34,10 @@ 
 
      while (!feof($FileHandle))
       {
-       $Buffer = fgets($FileHandle,4096);
-       $Buffer = str_replace(chr(10),"",$Buffer);
-       $Buffer = str_replace(chr(13),"",$Buffer);
-       $Values = preg_split("/;/",$Buffer);
+       $Buffer = fgets($FileHandle, 4096);
+       $Buffer = str_replace(chr(10), "", $Buffer);
+       $Buffer = str_replace(chr(13), "", $Buffer);
+       $Values = preg_split("/;/", $Buffer);
 
        $this->Codes[$Values[1]]["ID"]     = $Values[0];
        $this->Codes[$Values[1]]["Code"]   = $Values[2];
@@ -48,44 +48,44 @@ 
     }
 
    /* Return the projected size of a barcode */
-   function getSize($TextString,$Format="")
+   function getSize($TextString, $Format = "")
     {
-     $Angle		= isset($Format["Angle"]) ? $Format["Angle"] : 0;
-     $ShowLegend	= isset($Format["ShowLegend"]) ? $Format["ShowLegend"] : FALSE;
-     $LegendOffset	= isset($Format["LegendOffset"]) ? $Format["LegendOffset"] : 5;
+     $Angle = isset($Format["Angle"]) ? $Format["Angle"] : 0;
+     $ShowLegend = isset($Format["ShowLegend"]) ? $Format["ShowLegend"] : FALSE;
+     $LegendOffset = isset($Format["LegendOffset"]) ? $Format["LegendOffset"] : 5;
      $DrawArea		= isset($Format["DrawArea"]) ? $Format["DrawArea"] : FALSE;
      $FontSize		= isset($Format["FontSize"]) ? $Format["FontSize"] : 12;
-     $Height		= isset($Format["Height"]) ? $Format["Height"] : 30;
+     $Height = isset($Format["Height"]) ? $Format["Height"] : 30;
 
      $TextString    = $this->encode128($TextString);
      $BarcodeLength = strlen($this->Result);
 
-     if ( $DrawArea )   { $WOffset = 20; } else { $WOffset = 0; }
-     if ( $ShowLegend ) { $HOffset = $FontSize+$LegendOffset+$WOffset; } else { $HOffset = 0; }
+     if ($DrawArea) { $WOffset = 20; } else { $WOffset = 0; }
+     if ($ShowLegend) { $HOffset = $FontSize + $LegendOffset + $WOffset; } else { $HOffset = 0; }
 
-     $X1 = cos($Angle * PI / 180) * ($WOffset+$BarcodeLength);
-     $Y1 = sin($Angle * PI / 180) * ($WOffset+$BarcodeLength);
+     $X1 = cos($Angle*PI/180)*($WOffset + $BarcodeLength);
+     $Y1 = sin($Angle*PI/180)*($WOffset + $BarcodeLength);
 
-     $X2 = $X1 + cos(($Angle+90) * PI / 180) * ($HOffset+$Height);
-     $Y2 = $Y1 + sin(($Angle+90) * PI / 180) * ($HOffset+$Height);
+     $X2 = $X1 + cos(($Angle + 90)*PI/180)*($HOffset + $Height);
+     $Y2 = $Y1 + sin(($Angle + 90)*PI/180)*($HOffset + $Height);
 
 
-     $AreaWidth  = max(abs($X1),abs($X2));
-     $AreaHeight = max(abs($Y1),abs($Y2));
+     $AreaWidth  = max(abs($X1), abs($X2));
+     $AreaHeight = max(abs($Y1), abs($Y2));
 
-     return(array("Width"=>$AreaWidth,"Height"=>$AreaHeight));
+     return(array("Width"=>$AreaWidth, "Height"=>$AreaHeight));
     }
 
-   function encode128($Value,$Format="")
+   function encode128($Value, $Format = "")
     {
      $this->Result  = "11010010000";
      $this->CRC     = 104;
      $TextString    = "";
 
-     for($i=1;$i<=strlen($Value);$i++)
+     for ($i = 1; $i <= strlen($Value); $i++)
       {
-       $CharCode = ord($this->mid($Value,$i,1));
-       if ( isset($this->Codes[$CharCode]) )
+       $CharCode = ord($this->mid($Value, $i, 1));
+       if (isset($this->Codes[$CharCode]))
         {
          $this->Result = $this->Result.$this->Codes[$CharCode]["Code"];
          $this->CRC = $this->CRC + $i*$this->Codes[$CharCode]["ID"];
@@ -101,7 +101,7 @@ 
     }
 
    /* Create the encoded string */
-   function draw($Object,$Value,$X,$Y,$Format="")
+   function draw($Object, $Value, $X, $Y, $Format = "")
     {
      $this->pChartObject = $Object;
 
@@ -109,11 +109,11 @@ 
      $G			= isset($Format["G"]) ? $Format["G"] : 0;
      $B			= isset($Format["B"]) ? $Format["B"] : 0;
      $Alpha		= isset($Format["Alpha"]) ? $Format["Alpha"] : 100;
-     $Height		= isset($Format["Height"]) ? $Format["Height"] : 30;
+     $Height = isset($Format["Height"]) ? $Format["Height"] : 30;
      $Angle		= isset($Format["Angle"]) ? $Format["Angle"] : 0;
-     $ShowLegend	= isset($Format["ShowLegend"]) ? $Format["ShowLegend"] : FALSE;
-     $LegendOffset	= isset($Format["LegendOffset"]) ? $Format["LegendOffset"] : 5;
-     $DrawArea		= isset($Format["DrawArea"]) ? $Format["DrawArea"] : FALSE;
+     $ShowLegend = isset($Format["ShowLegend"]) ? $Format["ShowLegend"] : FALSE;
+     $LegendOffset = isset($Format["LegendOffset"]) ? $Format["LegendOffset"] : 5;
+     $DrawArea = isset($Format["DrawArea"]) ? $Format["DrawArea"] : FALSE;
      $AreaR		= isset($Format["AreaR"]) ? $Format["AreaR"] : 255;
      $AreaG		= isset($Format["AreaG"]) ? $Format["AreaG"] : 255;
      $AreaB		= isset($Format["AreaB"]) ? $Format["AreaB"] : 255;
@@ -123,62 +123,62 @@ 
 
      $TextString = $this->encode128($Value);
 
-     if ( $DrawArea )
+     if ($DrawArea)
       {
-       $X1 = $X + cos(($Angle-135) * PI / 180) * 10;
-       $Y1 = $Y + sin(($Angle-135) * PI / 180) * 10;
+       $X1 = $X + cos(($Angle - 135)*PI/180)*10;
+       $Y1 = $Y + sin(($Angle - 135)*PI/180)*10;
 
-       $X2 = $X1 + cos($Angle * PI / 180) * (strlen($this->Result)+20);
-       $Y2 = $Y1 + sin($Angle * PI / 180) * (strlen($this->Result)+20);
+       $X2 = $X1 + cos($Angle*PI/180)*(strlen($this->Result) + 20);
+       $Y2 = $Y1 + sin($Angle*PI/180)*(strlen($this->Result) + 20);
 
-       if ( $ShowLegend )
+       if ($ShowLegend)
         {
-         $X3 = $X2 + cos(($Angle+90) * PI / 180) * ($Height+$LegendOffset+$this->pChartObject->FontSize+10);
-         $Y3 = $Y2 + sin(($Angle+90) * PI / 180) * ($Height+$LegendOffset+$this->pChartObject->FontSize+10);
+         $X3 = $X2 + cos(($Angle + 90)*PI/180)*($Height + $LegendOffset + $this->pChartObject->FontSize + 10);
+         $Y3 = $Y2 + sin(($Angle + 90)*PI/180)*($Height + $LegendOffset + $this->pChartObject->FontSize + 10);
         }
        else
         {
-         $X3 = $X2 + cos(($Angle+90) * PI / 180) * ($Height+20);
-         $Y3 = $Y2 + sin(($Angle+90) * PI / 180) * ($Height+20);
+         $X3 = $X2 + cos(($Angle + 90)*PI/180)*($Height + 20);
+         $Y3 = $Y2 + sin(($Angle + 90)*PI/180)*($Height + 20);
         }
 
-       $X4 = $X3 + cos(($Angle+180) * PI / 180) * (strlen($this->Result)+20);
-       $Y4 = $Y3 + sin(($Angle+180) * PI / 180) * (strlen($this->Result)+20);
+       $X4 = $X3 + cos(($Angle + 180)*PI/180)*(strlen($this->Result) + 20);
+       $Y4 = $Y3 + sin(($Angle + 180)*PI/180)*(strlen($this->Result) + 20);
 
-       $Polygon  = array($X1,$Y1,$X2,$Y2,$X3,$Y3,$X4,$Y4);
-       $Settings = array("R"=>$AreaR,"G"=>$AreaG,"B"=>$AreaB,"BorderR"=>$AreaBorderR,"BorderG"=>$AreaBorderG,"BorderB"=>$AreaBorderB);
-       $this->pChartObject->drawPolygon($Polygon,$Settings);
+       $Polygon  = array($X1, $Y1, $X2, $Y2, $X3, $Y3, $X4, $Y4);
+       $Settings = array("R"=>$AreaR, "G"=>$AreaG, "B"=>$AreaB, "BorderR"=>$AreaBorderR, "BorderG"=>$AreaBorderG, "BorderB"=>$AreaBorderB);
+       $this->pChartObject->drawPolygon($Polygon, $Settings);
       }
 
-     for($i=1;$i<=strlen($this->Result);$i++)
+     for ($i = 1; $i <= strlen($this->Result); $i++)
       {
-       if ( $this->mid($this->Result,$i,1) == 1 )
+       if ($this->mid($this->Result, $i, 1) == 1)
         {
-         $X1 = $X + cos($Angle * PI / 180) * $i;
-         $Y1 = $Y + sin($Angle * PI / 180) * $i;
-         $X2 = $X1 + cos(($Angle+90) * PI / 180) * $Height;
-         $Y2 = $Y1 + sin(($Angle+90) * PI / 180) * $Height;
+         $X1 = $X + cos($Angle*PI/180)*$i;
+         $Y1 = $Y + sin($Angle*PI/180)*$i;
+         $X2 = $X1 + cos(($Angle + 90)*PI/180)*$Height;
+         $Y2 = $Y1 + sin(($Angle + 90)*PI/180)*$Height;
 
-         $Settings = array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha);
-         $this->pChartObject->drawLine($X1,$Y1,$X2,$Y2,$Settings);
+         $Settings = array("R"=>$R, "G"=>$G, "B"=>$B, "Alpha"=>$Alpha);
+         $this->pChartObject->drawLine($X1, $Y1, $X2, $Y2, $Settings);
         }
       }
 
-     if ( $ShowLegend )
+     if ($ShowLegend)
       {
-       $X1 = $X + cos($Angle * PI / 180) * (strlen($this->Result)/2);
-       $Y1 = $Y + sin($Angle * PI / 180) * (strlen($this->Result)/2);
+       $X1 = $X + cos($Angle*PI/180)*(strlen($this->Result)/2);
+       $Y1 = $Y + sin($Angle*PI/180)*(strlen($this->Result)/2);
 
-       $LegendX = $X1 + cos(($Angle+90) * PI / 180) * ($Height+$LegendOffset);
-       $LegendY = $Y1 + sin(($Angle+90) * PI / 180) * ($Height+$LegendOffset);
+       $LegendX = $X1 + cos(($Angle + 90)*PI/180)*($Height + $LegendOffset);
+       $LegendY = $Y1 + sin(($Angle + 90)*PI/180)*($Height + $LegendOffset);
 
-       $Settings = array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Angle"=>-$Angle,"Align"=>TEXT_ALIGN_TOPMIDDLE);
-       $this->pChartObject->drawText($LegendX,$LegendY,$TextString,$Settings);
+       $Settings = array("R"=>$R, "G"=>$G, "B"=>$B, "Alpha"=>$Alpha, "Angle"=>-$Angle, "Align"=>TEXT_ALIGN_TOPMIDDLE);
+       $this->pChartObject->drawText($LegendX, $LegendY, $TextString, $Settings);
       }
     }
 
-   function left($value,$NbChar) { return substr($value,0,$NbChar); }  
-   function right($value,$NbChar) { return substr($value,strlen($value)-$NbChar,$NbChar); }  
-   function mid($value,$Depart,$NbChar) { return substr($value,$Depart-1,$NbChar); }  
+   function left($value, $NbChar) { return substr($value, 0, $NbChar); }  
+   function right($value, $NbChar) { return substr($value, strlen($value) - $NbChar, $NbChar); }  
+   function mid($value, $Depart, $NbChar) { return substr($value, $Depart - 1, $NbChar); }  
   }
 ?>
\ No newline at end of file

drupal/sites/default/boinc/modules/boincstats/includes/pchart/class/pBarcode39.class.php

Doc Comments +8 added lines

@@ -181,6 +181,9 @@ 
       }
     }
 
+   /**
+    * @param string $string
+    */
    function checksum( $string )
     {
      $checksum = 0;
@@ -195,6 +198,11 @@ 
 
    function left($value,$NbChar) { return substr($value,0,$NbChar); }  
    function right($value,$NbChar) { return substr($value,strlen($value)-$NbChar,$NbChar); }  
+
+   /**
+    * @param integer $Depart
+    * @param integer $NbChar
+    */
    function mid($value,$Depart,$NbChar) { return substr($value,$Depart-1,$NbChar); }  
   }
 ?>
\ No newline at end of file

Spacing +69 added lines, -69 removed lines

@@ -24,9 +24,9 @@ 
    var $MOD43;
 
    /* Class creator */
-   function pBarcode39($BasePath="",$EnableMOD43=FALSE)
+   function pBarcode39($BasePath = "", $EnableMOD43 = FALSE)
     {
-     $this->MOD43  = $EnableMOD43;
+     $this->MOD43 = $EnableMOD43;
      $this->Codes   = "";
      $this->Reverse = "";
 
@@ -36,10 +36,10 @@ 
 
      while (!feof($FileHandle))
       {
-       $Buffer = fgets($FileHandle,4096);
-       $Buffer = str_replace(chr(10),"",$Buffer);
-       $Buffer = str_replace(chr(13),"",$Buffer);
-       $Values = preg_split("/;/",$Buffer);
+       $Buffer = fgets($FileHandle, 4096);
+       $Buffer = str_replace(chr(10), "", $Buffer);
+       $Buffer = str_replace(chr(13), "", $Buffer);
+       $Values = preg_split("/;/", $Buffer);
 
        $this->Codes[$Values[0]] = $Values[1];
       }
@@ -47,32 +47,32 @@ 
     }
 
    /* Return the projected size of a barcode */
-   function getSize($TextString,$Format="")
+   function getSize($TextString, $Format = "")
     {
-     $Angle		= isset($Format["Angle"]) ? $Format["Angle"] : 0;
-     $ShowLegend	= isset($Format["ShowLegend"]) ? $Format["ShowLegend"] : FALSE;
-     $LegendOffset	= isset($Format["LegendOffset"]) ? $Format["LegendOffset"] : 5;
+     $Angle = isset($Format["Angle"]) ? $Format["Angle"] : 0;
+     $ShowLegend = isset($Format["ShowLegend"]) ? $Format["ShowLegend"] : FALSE;
+     $LegendOffset = isset($Format["LegendOffset"]) ? $Format["LegendOffset"] : 5;
      $DrawArea		= isset($Format["DrawArea"]) ? $Format["DrawArea"] : FALSE;
      $FontSize		= isset($Format["FontSize"]) ? $Format["FontSize"] : 12;
-     $Height		= isset($Format["Height"]) ? $Format["Height"] : 30;
+     $Height = isset($Format["Height"]) ? $Format["Height"] : 30;
 
      $TextString    = $this->encode39($TextString);
      $BarcodeLength = strlen($this->Result);
 
-     if ( $DrawArea )   { $WOffset = 20; } else { $WOffset = 0; }
-     if ( $ShowLegend ) { $HOffset = $FontSize+$LegendOffset+$WOffset; } else { $HOffset = 0; }
+     if ($DrawArea) { $WOffset = 20; } else { $WOffset = 0; }
+     if ($ShowLegend) { $HOffset = $FontSize + $LegendOffset + $WOffset; } else { $HOffset = 0; }
 
-     $X1 = cos($Angle * PI / 180) * ($WOffset+$BarcodeLength);
-     $Y1 = sin($Angle * PI / 180) * ($WOffset+$BarcodeLength);
+     $X1 = cos($Angle*PI/180)*($WOffset + $BarcodeLength);
+     $Y1 = sin($Angle*PI/180)*($WOffset + $BarcodeLength);
 
-     $X2 = $X1 + cos(($Angle+90) * PI / 180) * ($HOffset+$Height);
-     $Y2 = $Y1 + sin(($Angle+90) * PI / 180) * ($HOffset+$Height);
+     $X2 = $X1 + cos(($Angle + 90)*PI/180)*($HOffset + $Height);
+     $Y2 = $Y1 + sin(($Angle + 90)*PI/180)*($HOffset + $Height);
 
 
-     $AreaWidth  = max(abs($X1),abs($X2));
-     $AreaHeight = max(abs($Y1),abs($Y2));
+     $AreaWidth  = max(abs($X1), abs($X2));
+     $AreaHeight = max(abs($Y1), abs($Y2));
 
-     return(array("Width"=>$AreaWidth,"Height"=>$AreaHeight));
+     return(array("Width"=>$AreaWidth, "Height"=>$AreaHeight));
     }
 
    /* Create the encoded string */
@@ -80,19 +80,19 @@ 
     {
      $this->Result = "100101101101"."0";
      $TextString   = "";
-     for($i=1;$i<=strlen($Value);$i++)
+     for ($i = 1; $i <= strlen($Value); $i++)
       {
-       $CharCode = ord($this->mid($Value,$i,1));
-       if ( $CharCode >= 97 && $CharCode <= 122 ) { $CharCode = $CharCode - 32; }
+       $CharCode = ord($this->mid($Value, $i, 1));
+       if ($CharCode >= 97 && $CharCode <= 122) { $CharCode = $CharCode - 32; }
 
-       if ( isset($this->Codes[chr($CharCode)]) )
+       if (isset($this->Codes[chr($CharCode)]))
         {
          $this->Result = $this->Result.$this->Codes[chr($CharCode)]."0";
          $TextString = $TextString.chr($CharCode);
         }
       }
 
-     if ( $this->MOD43 )
+     if ($this->MOD43)
       {
        $Checksum = $this->checksum($TextString);
        $this->Result = $this->Result.$this->Codes[$Checksum]."0";
@@ -105,7 +105,7 @@ 
     }
 
    /* Create the encoded string */
-   function draw($Object,$Value,$X,$Y,$Format="")
+   function draw($Object, $Value, $X, $Y, $Format = "")
     {
      $this->pChartObject = $Object;
 
@@ -113,11 +113,11 @@ 
      $G			= isset($Format["G"]) ? $Format["G"] : 0;
      $B			= isset($Format["B"]) ? $Format["B"] : 0;
      $Alpha		= isset($Format["Alpha"]) ? $Format["Alpha"] : 100;
-     $Height		= isset($Format["Height"]) ? $Format["Height"] : 30;
+     $Height = isset($Format["Height"]) ? $Format["Height"] : 30;
      $Angle		= isset($Format["Angle"]) ? $Format["Angle"] : 0;
-     $ShowLegend	= isset($Format["ShowLegend"]) ? $Format["ShowLegend"] : FALSE;
-     $LegendOffset	= isset($Format["LegendOffset"]) ? $Format["LegendOffset"] : 5;
-     $DrawArea		= isset($Format["DrawArea"]) ? $Format["DrawArea"] : FALSE;
+     $ShowLegend = isset($Format["ShowLegend"]) ? $Format["ShowLegend"] : FALSE;
+     $LegendOffset = isset($Format["LegendOffset"]) ? $Format["LegendOffset"] : 5;
+     $DrawArea = isset($Format["DrawArea"]) ? $Format["DrawArea"] : FALSE;
      $AreaR		= isset($Format["AreaR"]) ? $Format["AreaR"] : 255;
      $AreaG		= isset($Format["AreaG"]) ? $Format["AreaG"] : 255;
      $AreaB		= isset($Format["AreaB"]) ? $Format["AreaB"] : 255;
@@ -125,76 +125,76 @@ 
      $AreaBorderG	= isset($Format["AreaBorderG"]) ? $Format["AreaBorderG"] : $AreaG;
      $AreaBorderB	= isset($Format["AreaBorderB"]) ? $Format["AreaBorderB"] : $AreaB;
 
-     $TextString   = $this->encode39($Value);
+     $TextString = $this->encode39($Value);
 
-     if ( $DrawArea )
+     if ($DrawArea)
       {
-       $X1 = $X + cos(($Angle-135) * PI / 180) * 10;
-       $Y1 = $Y + sin(($Angle-135) * PI / 180) * 10;
+       $X1 = $X + cos(($Angle - 135)*PI/180)*10;
+       $Y1 = $Y + sin(($Angle - 135)*PI/180)*10;
 
-       $X2 = $X1 + cos($Angle * PI / 180) * (strlen($this->Result)+20);
-       $Y2 = $Y1 + sin($Angle * PI / 180) * (strlen($this->Result)+20);
+       $X2 = $X1 + cos($Angle*PI/180)*(strlen($this->Result) + 20);
+       $Y2 = $Y1 + sin($Angle*PI/180)*(strlen($this->Result) + 20);
 
-       if ( $ShowLegend )
+       if ($ShowLegend)
         {
-         $X3 = $X2 + cos(($Angle+90) * PI / 180) * ($Height+$LegendOffset+$this->pChartObject->FontSize+10);
-         $Y3 = $Y2 + sin(($Angle+90) * PI / 180) * ($Height+$LegendOffset+$this->pChartObject->FontSize+10);
+         $X3 = $X2 + cos(($Angle + 90)*PI/180)*($Height + $LegendOffset + $this->pChartObject->FontSize + 10);
+         $Y3 = $Y2 + sin(($Angle + 90)*PI/180)*($Height + $LegendOffset + $this->pChartObject->FontSize + 10);
         }
        else
         {
-         $X3 = $X2 + cos(($Angle+90) * PI / 180) * ($Height+20);
-         $Y3 = $Y2 + sin(($Angle+90) * PI / 180) * ($Height+20);
+         $X3 = $X2 + cos(($Angle + 90)*PI/180)*($Height + 20);
+         $Y3 = $Y2 + sin(($Angle + 90)*PI/180)*($Height + 20);
         }
 
-       $X4 = $X3 + cos(($Angle+180) * PI / 180) * (strlen($this->Result)+20);
-       $Y4 = $Y3 + sin(($Angle+180) * PI / 180) * (strlen($this->Result)+20);
+       $X4 = $X3 + cos(($Angle + 180)*PI/180)*(strlen($this->Result) + 20);
+       $Y4 = $Y3 + sin(($Angle + 180)*PI/180)*(strlen($this->Result) + 20);
 
-       $Polygon  = array($X1,$Y1,$X2,$Y2,$X3,$Y3,$X4,$Y4);
-       $Settings = array("R"=>$AreaR,"G"=>$AreaG,"B"=>$AreaB,"BorderR"=>$AreaBorderR,"BorderG"=>$AreaBorderG,"BorderB"=>$AreaBorderB);
-       $this->pChartObject->drawPolygon($Polygon,$Settings);
+       $Polygon  = array($X1, $Y1, $X2, $Y2, $X3, $Y3, $X4, $Y4);
+       $Settings = array("R"=>$AreaR, "G"=>$AreaG, "B"=>$AreaB, "BorderR"=>$AreaBorderR, "BorderG"=>$AreaBorderG, "BorderB"=>$AreaBorderB);
+       $this->pChartObject->drawPolygon($Polygon, $Settings);
       }
 
-     for($i=1;$i<=strlen($this->Result);$i++)
+     for ($i = 1; $i <= strlen($this->Result); $i++)
       {
-       if ( $this->mid($this->Result,$i,1) == 1 )
+       if ($this->mid($this->Result, $i, 1) == 1)
         {
-         $X1 = $X + cos($Angle * PI / 180) * $i;
-         $Y1 = $Y + sin($Angle * PI / 180) * $i;
-         $X2 = $X1 + cos(($Angle+90) * PI / 180) * $Height;
-         $Y2 = $Y1 + sin(($Angle+90) * PI / 180) * $Height;
+         $X1 = $X + cos($Angle*PI/180)*$i;
+         $Y1 = $Y + sin($Angle*PI/180)*$i;
+         $X2 = $X1 + cos(($Angle + 90)*PI/180)*$Height;
+         $Y2 = $Y1 + sin(($Angle + 90)*PI/180)*$Height;
 
-         $Settings = array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha);
-         $this->pChartObject->drawLine($X1,$Y1,$X2,$Y2,$Settings);
+         $Settings = array("R"=>$R, "G"=>$G, "B"=>$B, "Alpha"=>$Alpha);
+         $this->pChartObject->drawLine($X1, $Y1, $X2, $Y2, $Settings);
         }
       }
 
-     if ( $ShowLegend )
+     if ($ShowLegend)
       {
-       $X1 = $X + cos($Angle * PI / 180) * (strlen($this->Result)/2);
-       $Y1 = $Y + sin($Angle * PI / 180) * (strlen($this->Result)/2);
+       $X1 = $X + cos($Angle*PI/180)*(strlen($this->Result)/2);
+       $Y1 = $Y + sin($Angle*PI/180)*(strlen($this->Result)/2);
 
-       $LegendX = $X1 + cos(($Angle+90) * PI / 180) * ($Height+$LegendOffset);
-       $LegendY = $Y1 + sin(($Angle+90) * PI / 180) * ($Height+$LegendOffset);
+       $LegendX = $X1 + cos(($Angle + 90)*PI/180)*($Height + $LegendOffset);
+       $LegendY = $Y1 + sin(($Angle + 90)*PI/180)*($Height + $LegendOffset);
 
-       $Settings = array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Angle"=>-$Angle,"Align"=>TEXT_ALIGN_TOPMIDDLE);
-       $this->pChartObject->drawText($LegendX,$LegendY,$TextString,$Settings);
+       $Settings = array("R"=>$R, "G"=>$G, "B"=>$B, "Alpha"=>$Alpha, "Angle"=>-$Angle, "Align"=>TEXT_ALIGN_TOPMIDDLE);
+       $this->pChartObject->drawText($LegendX, $LegendY, $TextString, $Settings);
       }
     }
 
-   function checksum( $string )
+   function checksum($string)
     {
      $checksum = 0;
-     $length   = strlen( $string );
+     $length   = strlen($string);
      $charset  = '0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ-. $/+%';
 
-     for( $i=0; $i < $length; ++$i )
-      $checksum += strpos( $charset, $string[$i] );
+     for ($i = 0; $i < $length; ++$i)
+      $checksum += strpos($charset, $string[$i]);
  
-     return substr( $charset, ($checksum % 43), 1 );
+     return substr($charset, ($checksum%43), 1);
     }
 
-   function left($value,$NbChar) { return substr($value,0,$NbChar); }  
-   function right($value,$NbChar) { return substr($value,strlen($value)-$NbChar,$NbChar); }  
-   function mid($value,$Depart,$NbChar) { return substr($value,$Depart-1,$NbChar); }  
+   function left($value, $NbChar) { return substr($value, 0, $NbChar); }  
+   function right($value, $NbChar) { return substr($value, strlen($value) - $NbChar, $NbChar); }  
+   function mid($value, $Depart, $NbChar) { return substr($value, $Depart - 1, $NbChar); }  
   }
 ?>
\ No newline at end of file

drupal/sites/default/boinc/modules/boincstats/includes/pchart/class/pCache.class.php

Doc Comments +11 added lines

@@ -47,6 +47,10 @@ 
     { return(md5($Marker.serialize($Data->Data))); }
 
    /* Write the generated picture to the cache */
+
+   /**
+    * @param pImage $pChartObject
+    */
    function writeToCache($ID,$pChartObject)
     {
      /* Compute the paths */
@@ -81,6 +85,10 @@ 
     }
 
    /* Remove object older than the specified TS */
+
+   /**
+    * @param integer $Expiry
+    */
    function removeOlderThan($Expiry)
     { $this->dbRemoval(array("Expiry"=>$Expiry)); }
 
@@ -235,6 +243,9 @@ 
      return(TRUE);
     }
 
+   /**
+    * @param string $Destination
+    */
    function saveFromCache($ID,$Destination)
     {
      /* Get the raw picture from the cache */

Spacing +51 added lines, -51 removed lines

@@ -21,58 +21,58 @@ 
    var $CacheDB;
 
    /* Class creator */
-   function pCache($Settings="")
+   function pCache($Settings = "")
     {
-     $CacheFolder	= isset($Settings["CacheFolder"]) ? $Settings["CacheFolder"] : "cache";
-     $CacheIndex	= isset($Settings["CacheIndex"]) ? $Settings["CacheIndex"] : "index.db";
-     $CacheDB		= isset($Settings["CacheDB"]) ? $Settings["CacheDB"] : "cache.db";
+     $CacheFolder = isset($Settings["CacheFolder"]) ? $Settings["CacheFolder"] : "cache";
+     $CacheIndex = isset($Settings["CacheIndex"]) ? $Settings["CacheIndex"] : "index.db";
+     $CacheDB = isset($Settings["CacheDB"]) ? $Settings["CacheDB"] : "cache.db";
 
-     $this->CacheFolder	= $CacheFolder;
-     $this->CacheIndex	= $CacheIndex;
-     $this->CacheDB	= $CacheDB;
+     $this->CacheFolder = $CacheFolder;
+     $this->CacheIndex = $CacheIndex;
+     $this->CacheDB = $CacheDB;
 
      if (!file_exists($this->CacheFolder."/".$this->CacheIndex)) { touch($this->CacheFolder."/".$this->CacheIndex); }
-     if (!file_exists($this->CacheFolder."/".$this->CacheDB))    { touch($this->CacheFolder."/".$this->CacheDB); }
+     if (!file_exists($this->CacheFolder."/".$this->CacheDB)) { touch($this->CacheFolder."/".$this->CacheDB); }
     }
 
    /* Flush the cache contents */
    function flush()
     {
      if (file_exists($this->CacheFolder."/".$this->CacheIndex)) { unlink($this->CacheFolder."/".$this->CacheIndex); touch($this->CacheFolder."/".$this->CacheIndex); }
-     if (file_exists($this->CacheFolder."/".$this->CacheDB))    { unlink($this->CacheFolder."/".$this->CacheDB); touch($this->CacheFolder."/".$this->CacheDB); }
+     if (file_exists($this->CacheFolder."/".$this->CacheDB)) { unlink($this->CacheFolder."/".$this->CacheDB); touch($this->CacheFolder."/".$this->CacheDB); }
     }
 
    /* Return the MD5 of the data array to clearly identify the chart */
-   function getHash($Data,$Marker="")
+   function getHash($Data, $Marker = "")
     { return(md5($Marker.serialize($Data->Data))); }
 
    /* Write the generated picture to the cache */
-   function writeToCache($ID,$pChartObject)
+   function writeToCache($ID, $pChartObject)
     {
      /* Compute the paths */
-     $TemporaryFile = $this->CacheFolder."/tmp_".rand(0,1000).".png";
+     $TemporaryFile = $this->CacheFolder."/tmp_".rand(0, 1000).".png";
      $Database      = $this->CacheFolder."/".$this->CacheDB;
      $Index         = $this->CacheFolder."/".$this->CacheIndex;
 
      /* Flush the picture to a temporary file */
-     imagepng($pChartObject->Picture ,$TemporaryFile);
+     imagepng($pChartObject->Picture, $TemporaryFile);
 
      /* Retrieve the files size */
      $PictureSize = filesize($TemporaryFile);
      $DBSize      = filesize($Database);
 
      /* Save the index */
-     $Handle = fopen($Index,"a");
+     $Handle = fopen($Index, "a");
      fwrite($Handle, $ID.",".$DBSize.",".$PictureSize.",".time().",0      \r\n");
      fclose($Handle);
 
      /* Get the picture raw contents */
-     $Handle = fopen($TemporaryFile,"r");
-     $Raw    = fread($Handle,$PictureSize);
+     $Handle = fopen($TemporaryFile, "r");
+     $Raw    = fread($Handle, $PictureSize);
      fclose($Handle);
 
      /* Save the picture in the solid database file */
-     $Handle = fopen($Database,"a");
+     $Handle = fopen($Database, "a");
      fwrite($Handle, $Raw);
      fclose($Handle);
 
@@ -93,7 +93,7 @@ 
     {
      $ID     = isset($Settings["Name"]) ? $Settings["Name"] : NULL;
      $Expiry = isset($Settings["Expiry"]) ? $Settings["Expiry"] : -(24*60*60);
-     $TS     = time()-$Expiry;
+     $TS     = time() - $Expiry;
 
      /* Compute the paths */
      $Database     = $this->CacheFolder."/".$this->CacheDB;
@@ -102,18 +102,18 @@ 
      $IndexTemp    = $this->CacheFolder."/".$this->CacheIndex.".tmp";
 
      /* Single file removal */
-     if ( $ID != NULL )
+     if ($ID != NULL)
       {
        /* Retrieve object informations */
-       $Object = $this->isInCache($ID,TRUE);
+       $Object = $this->isInCache($ID, TRUE);
 
        /* If it's not in the cache DB, go away */
-       if ( !$Object ) { return(0); }
+       if (!$Object) { return(0); }
       }
 
      /* Create the temporary files */
      if (!file_exists($DatabaseTemp)) { touch($DatabaseTemp); }
-     if (!file_exists($IndexTemp))    { touch($IndexTemp); }
+     if (!file_exists($IndexTemp)) { touch($IndexTemp); }
 
      /* Open the file handles */
      $IndexHandle     = @fopen($Index, "r");
@@ -125,11 +125,11 @@ 
      while (!feof($IndexHandle))
       {
        $Entry    = fgets($IndexHandle, 4096);
-       $Entry    = str_replace("\r","",$Entry);
-       $Entry    = str_replace("\n","",$Entry);
-       $Settings = preg_split("/,/",$Entry);
+       $Entry    = str_replace("\r", "", $Entry);
+       $Entry    = str_replace("\n", "", $Entry);
+       $Settings = preg_split("/,/", $Entry);
 
-       if ( $Entry != "" )
+       if ($Entry != "")
         {
          $PicID       = $Settings[0];
          $DBPos       = $Settings[1];
@@ -137,14 +137,14 @@ 
          $GeneratedTS = $Settings[3];
          $Hits        = $Settings[4];
 
-         if ( $Settings[0] != $ID && $GeneratedTS > $TS)
+         if ($Settings[0] != $ID && $GeneratedTS > $TS)
           {
-           $CurrentPos  = ftell($DBTempHandle);
+           $CurrentPos = ftell($DBTempHandle);
            fwrite($IndexTempHandle, $PicID.",".$CurrentPos.",".$PicSize.",".$GeneratedTS.",".$Hits."\r\n");
 
-           fseek($DBHandle,$DBPos);
-           $Picture = fread($DBHandle,$PicSize);
-           fwrite($DBTempHandle,$Picture);
+           fseek($DBHandle, $DBPos);
+           $Picture = fread($DBHandle, $PicSize);
+           fwrite($DBTempHandle, $Picture);
           }
         }
       }
@@ -160,11 +160,11 @@ 
      unlink($Index);
 
      /* Swap the temp & prod DB */
-     rename($DatabaseTemp,$Database);
-     rename($IndexTemp,$Index);
+     rename($DatabaseTemp, $Database);
+     rename($IndexTemp, $Index);
     }
 
-   function isInCache($ID,$Verbose=FALSE,$UpdateHitsCount=FALSE)
+   function isInCache($ID, $Verbose = FALSE, $UpdateHitsCount = FALSE)
     {
      /* Compute the paths */
      $Index = $this->CacheFolder."/".$this->CacheIndex;
@@ -175,11 +175,11 @@ 
       {
        $IndexPos = ftell($Handle);
        $Entry = fgets($Handle, 4096);
-       if ( $Entry != "" )
+       if ($Entry != "")
         {
-         $Settings = preg_split("/,/",$Entry);
+         $Settings = preg_split("/,/", $Entry);
          $PicID    = $Settings[0];
-         if ( $PicID == $ID )
+         if ($PicID == $ID)
           {
            fclose($Handle);
 
@@ -188,19 +188,19 @@ 
            $GeneratedTS = $Settings[3];
            $Hits        = intval($Settings[4]);
 
-           if ( $UpdateHitsCount )
+           if ($UpdateHitsCount)
             {
              $Hits++;
-             if ( strlen($Hits) < 7 ) { $Hits = $Hits.str_repeat(" ",7-strlen($Hits)); }
+             if (strlen($Hits) < 7) { $Hits = $Hits.str_repeat(" ", 7 - strlen($Hits)); }
 
              $Handle = @fopen($Index, "r+");
-             fseek($Handle,$IndexPos);
+             fseek($Handle, $IndexPos);
              fwrite($Handle, $PicID.",".$DBPos.",".$PicSize.",".$GeneratedTS.",".$Hits."\r\n");
              fclose($Handle);
             }
 
            if ($Verbose)
-            { return(array("DBPos"=>$DBPos,"PicSize"=>$PicSize,"GeneratedTS"=>$GeneratedTS,"Hits"=>$Hits)); }
+            { return(array("DBPos"=>$DBPos, "PicSize"=>$PicSize, "GeneratedTS"=>$GeneratedTS, "Hits"=>$Hits)); }
            else
             { return(TRUE); }
           }
@@ -213,10 +213,10 @@ 
     }
 
    /* Automatic output method based on the calling interface */
-   function autoOutput($ID,$Destination="output.png")
+   function autoOutput($ID, $Destination = "output.png")
     {
      if (php_sapi_name() == "cli")
-      $this->saveFromCache($ID,$Destination);
+      $this->saveFromCache($ID, $Destination);
      else
       $this->strokeFromCache($ID);
     }
@@ -227,7 +227,7 @@ 
      $Picture = $this->getFromCache($ID);
 
      /* Do we have a hit? */
-     if ( $Picture == NULL ) { return(FALSE); }
+     if ($Picture == NULL) { return(FALSE); }
 
      header('Content-type: image/png');
      echo $Picture;
@@ -235,17 +235,17 @@ 
      return(TRUE);
     }
 
-   function saveFromCache($ID,$Destination)
+   function saveFromCache($ID, $Destination)
     {
      /* Get the raw picture from the cache */
      $Picture = $this->getFromCache($ID);
 
      /* Do we have a hit? */
-     if ( $Picture == NULL ) { return(FALSE); }
+     if ($Picture == NULL) { return(FALSE); }
 
      /* Flush the picture to a file */
-     $Handle = fopen($Destination,"w");
-     fwrite($Handle,$Picture);
+     $Handle = fopen($Destination, "w");
+     fwrite($Handle, $Picture);
      fclose($Handle);
 
      /* All went fine */
@@ -258,7 +258,7 @@ 
      $Database = $this->CacheFolder."/".$this->CacheDB;
 
      /* Lookup for the picture in the cache */
-     $CacheInfo = $this->isInCache($ID,TRUE,TRUE);
+     $CacheInfo = $this->isInCache($ID, TRUE, TRUE);
 
      /* Not in the cache */
      if (!$CacheInfo) { return(NULL); }
@@ -269,8 +269,8 @@ 
 
      /* Extract the picture from the solid cache file */
      $Handle = @fopen($Database, "r");
-     fseek($Handle,$DBPos);
-     $Picture = fread($Handle,$PicSize);
+     fseek($Handle, $DBPos);
+     $Picture = fread($Handle, $PicSize);
      fclose($Handle);
 
      /* Return back the raw picture data */