BOINC / boinc

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

Spacing +1 added lines, -1 removed lines

@@ -24,7 +24,7 @@
 function privatemsg_views_handlers() {
   return array(
     'info' => array(
-      'path' => drupal_get_path('module', 'privatemsg') . '/views',
+      'path' => drupal_get_path('module', 'privatemsg').'/views',
     ),
     'handlers' => array(
       // field handlers

drupal/sites/default/boinc/modules/contrib/privatemsg/privatemsg.api.php

Spacing +3 added lines, -3 removed lines

@@ -342,7 +342,7 @@ 
  */
 function hook_privatemsg_message_view_alter(&$var) {
   // add a link to each message
-  $vars['message_links'][] = array('title' => t('My link'), 'href' => '/path/to/my/action/'. $vars['message']['mid']);
+  $vars['message_links'][] = array('title' => t('My link'), 'href' => '/path/to/my/action/'.$vars['message']['mid']);
 }
 
 /**
@@ -406,7 +406,7 @@ 
   }
 
   $args = array_merge(array($author->uid), array_keys($recipients));
-  $result = db_query('SELECT recipient FROM {pm_block_user} WHERE author = %d AND recipient IN ('. db_placeholders($recipients) .') GROUP BY recipient', $args);
+  $result = db_query('SELECT recipient FROM {pm_block_user} WHERE author = %d AND recipient IN ('.db_placeholders($recipients).') GROUP BY recipient', $args);
   while ($row = db_fetch_array($result)) {
     $recipient = $recipients[$row['recipient']];
     // If there's a rule disallowing blocking of this message, send it anyway.
@@ -458,7 +458,7 @@ 
                   should be displayed automatically in the action form',
       'callback' => 'privatemsg_thread_change_status', // Function callback that will be executed.
       'callback arguments' => array('status' => PRIVATEMSG_READ), // Additional arguments to above function
-      'undo callback' => 'privatemsg_thread_change_status',  // Provide a function which can "undo" the operation. Optional.
+      'undo callback' => 'privatemsg_thread_change_status', // Provide a function which can "undo" the operation. Optional.
       'undo callback arguments' => array('status' => PRIVATEMSG_UNREAD), // Additional arguments to above function.
     ),
   );

drupal/sites/default/boinc/modules/contrib/privatemsg/privatemsg_filter/privatemsg_filter.admin.inc

Spacing +4 added lines, -4 removed lines

@@ -38,7 +38,7 @@ 
     ),
   );
   $query = _privatemsg_assemble_query(array('tags', 'privatemsg_filter'));
-  $result = pager_query($query['query'] . tablesort_sql($header), 100);
+  $result = pager_query($query['query'].tablesort_sql($header), 100);
 
   $rows = array();
   while ($tag = db_fetch_array($result)) {
@@ -46,8 +46,8 @@ 
     $row['tag'] = check_plain($tag['tag']);
     $row['count'] = $tag['count'];
     $row['public'] = $tag['public'] ? t('Yes') : '-';
-    $row['operations'] = l(t('edit'), 'admin/settings/messages/tags/edit/' . $tag['tag_id']);
-    $row['operations'] .= ' ' . l(t('delete'), 'admin/settings/messages/tags/delete/' . $tag['tag_id']);
+    $row['operations'] = l(t('edit'), 'admin/settings/messages/tags/edit/'.$tag['tag_id']);
+    $row['operations'] .= ' '.l(t('delete'), 'admin/settings/messages/tags/delete/'.$tag['tag_id']);
 
     $rows[] = $row;
   }
@@ -57,7 +57,7 @@ 
     $rows[] = array(array('data' => t('No tags available.'), 'colspan' => count($header)));
   }
 
-  return theme('table', $header, $rows) . theme('pager');
+  return theme('table', $header, $rows).theme('pager');
 }
 
 /**

drupal/sites/default/boinc/modules/contrib/privatemsg/privatemsg_filter/privatemsg_filter.module

Spacing +23 added lines, -23 removed lines

@@ -313,7 +313,7 @@ 
 
 function privatemsg_filter_dropdown(&$form_state, $account) {
 
-  drupal_add_css(drupal_get_path('module', 'privatemsg_filter') .'/privatemsg_filter.css');
+  drupal_add_css(drupal_get_path('module', 'privatemsg_filter').'/privatemsg_filter.css');
 
   $form['filter'] = array(
     '#type' => 'fieldset',
@@ -377,7 +377,7 @@ 
   if (isset($filter['author'])) {
     $string = '';
     foreach ($filter['author'] as $author) {
-      $string .= $author->name . ', ';
+      $string .= $author->name.', ';
     }
     $form['filter']['author']['#default_value'] = $string;
   }
@@ -441,7 +441,7 @@ 
         $query['tags'][] = $tag;
       }
     }
-    $sql = 'SELECT pmt.tag FROM {pm_tags} pmt WHERE pmt.tag_id IN ('. implode(', ', $filter['tags']) .')';
+    $sql = 'SELECT pmt.tag FROM {pm_tags} pmt WHERE pmt.tag_id IN ('.implode(', ', $filter['tags']).')';
     $result = db_query($sql);
     while ($row = db_fetch_object($result)) {
       $query['tags'][] = $row->tag;
@@ -535,7 +535,7 @@ 
     );
 
     // JS for hiding the submit buttons.
-    drupal_add_js(drupal_get_path('module', 'privatemsg_filter') .'/privatemsg-filter-list.js');
+    drupal_add_js(drupal_get_path('module', 'privatemsg_filter').'/privatemsg-filter-list.js');
   }
 }
 
@@ -564,7 +564,7 @@ 
     $tags = array();
 
     foreach ($thread['tags'] as $tag_id => $tag) {
-      $tags[] = l(strlen($tag) > 15 ? substr($tag, 0, 13) . '...' : $tag, 'messages', array(
+      $tags[] = l(strlen($tag) > 15 ? substr($tag, 0, 13).'...' : $tag, 'messages', array(
         'attributes' => array('title' => $tag),
         'query' => array('tags' => $tag)
       ));
@@ -611,11 +611,11 @@ 
 
   // Check if its a filtered view.
   if ($argument == 'sent') {
-    $fragments['where'][]       = "pm.author = %d";
-    $fragments['query_args']['where'][]   = $account->uid;
+    $fragments['where'][] = "pm.author = %d";
+    $fragments['query_args']['where'][] = $account->uid;
   }
   if ($argument == 'inbox') {
-    $fragments['having'][]       = '((SELECT pmf.author FROM {pm_message} pmf WHERE pmf.mid = pmi.thread_id) = %d AND COUNT(pmi.thread_id) > 1) OR (SELECT COUNT(*) FROM {pm_message} pmf INNER JOIN {pm_index} pmif ON (pmf.mid = pmif.mid) WHERE pmif.thread_id = pmi.thread_id AND pmf.author <> %d) > 0';
+    $fragments['having'][] = '((SELECT pmf.author FROM {pm_message} pmf WHERE pmf.mid = pmi.thread_id) = %d AND COUNT(pmi.thread_id) > 1) OR (SELECT COUNT(*) FROM {pm_message} pmf INNER JOIN {pm_index} pmif ON (pmf.mid = pmif.mid) WHERE pmif.thread_id = pmi.thread_id AND pmf.author <> %d) > 0';
     $fragments['query_args']['having'][]   = $account->uid;
     $fragments['query_args']['having'][]   = $account->uid;
   }
@@ -627,7 +627,7 @@ 
       foreach ($filter['tags'] as $tag) {
         $fragments['inner_join'][]  = "INNER JOIN {pm_tags_index} pmti$count ON (pmti$count.thread_id = pmi.thread_id AND pmti$count.uid = pmi.uid)";
         $fragments['where'][]       = "pmti$count.tag_id = %d";
-        $fragments['query_args']['where'][]   = $tag;
+        $fragments['query_args']['where'][] = $tag;
         $count++;
       }
     }
@@ -636,20 +636,20 @@ 
       foreach ($filter['author'] as $author) {
         $fragments['inner_join'][]  = "INNER JOIN {pm_index} pmi$count ON (pmi$count.mid = pm.mid)";
         $fragments['where'][]       = "pmi$count.uid = %d";
-        $fragments['query_args']['where'][]   = $author->uid;
+        $fragments['query_args']['where'][] = $author->uid;
         $count++;
       }
     }
 
     if (isset($filter['search']) && !empty($filter['search'])) {
       if (variable_get('privatemsg_filter_searchbody', FALSE)) {
-        $fragments['where'][]       = "pm.subject LIKE '%s' OR pm.body LIKE '%s'";
-        $fragments['query_args']['where'][]    = '%%'. $filter['search'] .'%%';
-        $fragments['query_args']['where'][]    = '%%'. $filter['search'] .'%%';
+        $fragments['where'][] = "pm.subject LIKE '%s' OR pm.body LIKE '%s'";
+        $fragments['query_args']['where'][]    = '%%'.$filter['search'].'%%';
+        $fragments['query_args']['where'][]    = '%%'.$filter['search'].'%%';
       }
       else {
-        $fragments['where'][]       = "pm.subject LIKE '%s'";
-        $fragments['query_args']['where'][]    = '%%'. $filter['search'] .'%%';
+        $fragments['where'][] = "pm.subject LIKE '%s'";
+        $fragments['query_args']['where'][] = '%%'.$filter['search'].'%%';
       }
     }
   }
@@ -678,7 +678,7 @@ 
   $count = db_result(db_query($query['count']));
   $tags = '';
   while ($tag = db_fetch_array($results)) {
-    $tags .= $tag['tag'] . ', ';
+    $tags .= $tag['tag'].', ';
   }
 
   $form['tags'] = array(
@@ -755,10 +755,10 @@ 
   if (!empty($fragment)) {
     $query = _privatemsg_assemble_query(array('tags_autocomplete', 'privatemsg_filter'), $fragment, $tags);
     $result = db_query_range($query['query'], $fragment, 0, 10);
-    $prefix = count($tags) ? implode(", ", $tags) .", " : '';
+    $prefix = count($tags) ? implode(", ", $tags).", " : '';
     // 3: Build proper suggestions and print.
     while ($tag = db_fetch_object($result)) {
-      $matches[$prefix . $tag->tag .", "] = $tag->tag;
+      $matches[$prefix.$tag->tag.", "] = $tag->tag;
     }
   }
   // convert to object to prevent drupal bug, see http://drupal.org/node/175361
@@ -817,8 +817,8 @@ 
   if (!empty($threads)) {
     // If the tag list needs to be for specific threads.
     $fragments['select'][] = 'ti.thread_id';
-    $fragments['inner_join'][]  = 'INNER JOIN {pm_tags_index} ti on ti.tag_id = t.tag_id';
-    $fragments['where'][] = 'ti.thread_id IN (' . db_placeholders($threads) . ')';
+    $fragments['inner_join'][] = 'INNER JOIN {pm_tags_index} ti on ti.tag_id = t.tag_id';
+    $fragments['where'][] = 'ti.thread_id IN ('.db_placeholders($threads).')';
     $fragments['query_args']['where'] += $threads;
   }
   else {
@@ -875,14 +875,14 @@ 
   $fragments['select'][] = 'pmt.tag';
   $fragments['where'][] = "pmt.tag LIKE '%s'";
   // Escape % to get through the placeholder replacement.
-  $fragments['query_args']['where'][] = $search .'%%';
+  $fragments['query_args']['where'][] = $search.'%%';
   if (!empty($tags)) {
     // Exclude tags.
-    $fragments['where'][] = "pmt.tag NOT IN (". db_placeholders($tags, 'text') .")";
+    $fragments['where'][] = "pmt.tag NOT IN (".db_placeholders($tags, 'text').")";
     $fragments['query_args']['where'] += $tags;
   }
   // LEFT JOIN to be able to load public, unused tags.
-  $fragments['inner_join'][]  = 'LEFT JOIN {pm_tags_index} pmti ON pmt.tag_id = pmti.tag_id AND pmti.uid = %d';
+  $fragments['inner_join'][] = 'LEFT JOIN {pm_tags_index} pmti ON pmt.tag_id = pmti.tag_id AND pmti.uid = %d';
   $fragments['query_args']['join'][] = $user->uid;
   // Autocomplete should only display Tags used by that user or public tags.
   // This is done to avoid information disclosure as part of tag names.

drupal/sites/default/boinc/modules/contrib/privatemsg/privatemsg.theme.inc

Spacing +3 added lines, -3 removed lines

@@ -95,7 +95,7 @@ 
     $is_new = theme_mark(MARK_NEW);
     $options['fragment'] = 'new';
   }
-  $field['data'] = l($thread['subject'], 'messages/view/' . $thread['thread_id'], $options) . $is_new;
+  $field['data'] = l($thread['subject'], 'messages/view/'.$thread['thread_id'], $options).$is_new;
   $field['class'] = 'privatemsg-list-subject';
   return $field;
 }
@@ -111,7 +111,7 @@ 
   $options = array();
   if (!empty($thread['is_new']) && $thread['is_new'] < $thread['count']) {
     $options['fragment'] = 'new';
-    $field['data'] .= '<br />' . l((format_plural($thread['is_new'], '(1 new)', '(@count new)')), 'messages/view/' . $thread['thread_id'], $options);
+    $field['data'] .= '<br />'.l((format_plural($thread['is_new'], '(1 new)', '(@count new)')), 'messages/view/'.$thread['thread_id'], $options);
   }
   $field['class'] = 'privatemsg-list-count';
   return $field;
@@ -239,7 +239,7 @@ 
 function theme_privatemsg_list($form) {
   $has_posts = !empty($form['#data']);
 
-  drupal_add_css(drupal_get_path('module', 'privatemsg') .'/styles/privatemsg-list.css');
+  drupal_add_css(drupal_get_path('module', 'privatemsg').'/styles/privatemsg-list.css');
 
   // Load the table columns.
   $columns = array_merge(array('subject', 'last_updated'), array_filter(variable_get('privatemsg_display_fields', array('participants'))));

drupal/sites/default/boinc/modules/boinc_solr_search/boinc_solr_comments/boinc_solr_comments.admin.inc

Spacing +1 added lines, -1 removed lines

@@ -33,7 +33,7 @@
     'boinc_solr_comments_nodetypes' => variable_get('boinc_solr_comments_nodetypes', ''),
   );
   if (empty($default['boinc_solr_comments_nodetypes'])) {
-    $default['boinc_solr_comments_nodetypes'] = array('forum','team_forum','news','page','story');
+    $default['boinc_solr_comments_nodetypes'] = array('forum', 'team_forum', 'news', 'page', 'story');
   }
   
   // Define the form

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

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/pIndicator.class.php

Spacing +84 added lines, -84 removed lines

@@ -13,14 +13,14 @@ 
      You can find the whole class documentation on the pChart web site.
  */
 
- define("INDICATOR_CAPTION_DEFAULT"	, 700001);
- define("INDICATOR_CAPTION_EXTENDED"	, 700002);
+ define("INDICATOR_CAPTION_DEFAULT", 700001);
+ define("INDICATOR_CAPTION_EXTENDED", 700002);
 
- define("INDICATOR_CAPTION_INSIDE"	, 700011);
- define("INDICATOR_CAPTION_BOTTOM"	, 700012);
+ define("INDICATOR_CAPTION_INSIDE", 700011);
+ define("INDICATOR_CAPTION_BOTTOM", 700012);
 
- define("INDICATOR_VALUE_BUBBLE"	, 700021);
- define("INDICATOR_VALUE_LABEL"		, 700022);
+ define("INDICATOR_VALUE_BUBBLE", 700021);
+ define("INDICATOR_VALUE_LABEL", 700022);
 
  /* pIndicator class definition */
  class pIndicator
@@ -34,24 +34,24 @@ 
     }
 
    /* Draw an indicator */
-   function draw($X,$Y,$Width,$Height,$Format="")
+   function draw($X, $Y, $Width, $Height, $Format = "")
     {
-     $Values			= isset($Format["Values"]) ? $Format["Values"] : VOID;
-     $IndicatorSections		= isset($Format["IndicatorSections"]) ? $Format["IndicatorSections"] : NULL;
+     $Values = isset($Format["Values"]) ? $Format["Values"] : VOID;
+     $IndicatorSections = isset($Format["IndicatorSections"]) ? $Format["IndicatorSections"] : NULL;
      $ValueDisplay		= isset($Format["ValueDisplay"]) ? $Format["ValueDisplay"] : INDICATOR_VALUE_BUBBLE;
-     $SectionsMargin		= isset($Format["SectionsMargin"]) ? $Format["SectionsMargin"] : 4;
+     $SectionsMargin = isset($Format["SectionsMargin"]) ? $Format["SectionsMargin"] : 4;
      $DrawLeftHead		= isset($Format["DrawLeftHead"]) ? $Format["DrawLeftHead"] : TRUE;
      $DrawRightHead		= isset($Format["DrawRightHead"]) ? $Format["DrawRightHead"] : TRUE;
-     $HeadSize			= isset($Format["HeadSize"]) ? $Format["HeadSize"] : floor($Height/4);
-     $TextPadding		= isset($Format["TextPadding"]) ? $Format["TextPadding"] : 4;
+     $HeadSize = isset($Format["HeadSize"]) ? $Format["HeadSize"] : floor($Height/4);
+     $TextPadding = isset($Format["TextPadding"]) ? $Format["TextPadding"] : 4;
      $CaptionLayout		= isset($Format["CaptionLayout"]) ? $Format["CaptionLayout"] : INDICATOR_CAPTION_EXTENDED;
-     $CaptionPosition		= isset($Format["CaptionPosition"]) ? $Format["CaptionPosition"] : INDICATOR_CAPTION_INSIDE;
-     $CaptionColorFactor	= isset($Format["CaptionColorFactor"]) ? $Format["CaptionColorFactor"] : NULL;
+     $CaptionPosition = isset($Format["CaptionPosition"]) ? $Format["CaptionPosition"] : INDICATOR_CAPTION_INSIDE;
+     $CaptionColorFactor = isset($Format["CaptionColorFactor"]) ? $Format["CaptionColorFactor"] : NULL;
      $CaptionR			= isset($Format["CaptionR"]) ? $Format["CaptionR"] : 255;
      $CaptionG			= isset($Format["CaptionG"]) ? $Format["CaptionG"] : 255;
      $CaptionB			= isset($Format["CaptionB"]) ? $Format["CaptionB"] : 255;
-     $CaptionAlpha		= isset($Format["CaptionAlpha"]) ? $Format["CaptionAlpha"] : 100;
-     $SubCaptionColorFactor	= isset($Format["SubCaptionColorFactor"]) ? $Format["SubCaptionColorFactor"] : NULL;
+     $CaptionAlpha = isset($Format["CaptionAlpha"]) ? $Format["CaptionAlpha"] : 100;
+     $SubCaptionColorFactor = isset($Format["SubCaptionColorFactor"]) ? $Format["SubCaptionColorFactor"] : NULL;
      $SubCaptionR		= isset($Format["SubCaptionR"]) ? $Format["SubCaptionR"] : 50;
      $SubCaptionG		= isset($Format["SubCaptionG"]) ? $Format["SubCaptionG"] : 50;
      $SubCaptionB		= isset($Format["SubCaptionB"]) ? $Format["SubCaptionB"] : 50;
@@ -60,109 +60,109 @@ 
      $ValueFontSize		= isset($Format["ValueFontSize"]) ? $Format["ValueFontSize"] : $this->pChartObject->FontSize;
      $CaptionFontName		= isset($Format["CaptionFontName"]) ? $Format["CaptionFontName"] : $this->pChartObject->FontName;
      $CaptionFontSize		= isset($Format["CaptionFontSize"]) ? $Format["CaptionFontSize"] : $this->pChartObject->FontSize;
-     $Unit			= isset($Format["Unit"]) ? $Format["Unit"] : "";
+     $Unit = isset($Format["Unit"]) ? $Format["Unit"] : "";
 
      /* Convert the Values to display to an array if needed */
-     if ( !is_array($Values) ) { $Value = $Values; $Values = ""; $Values[] = $Value; }
+     if (!is_array($Values)) { $Value = $Values; $Values = ""; $Values[] = $Value; }
 
      /* No section, let's die */
-     if ( $IndicatorSections == NULL ) { return(0); }
+     if ($IndicatorSections == NULL) { return(0); }
 
      /* Determine indicator visual configuration */
      $OverallMin = $IndicatorSections[0]["End"]; $OverallMax = $IndicatorSections[0]["Start"];
      foreach ($IndicatorSections as $Key => $Settings)
       {
-       if ( $Settings["End"] > $OverallMax )   { $OverallMax = $Settings["End"]; }
-       if ( $Settings["Start"] < $OverallMin ) { $OverallMin = $Settings["Start"]; }
+       if ($Settings["End"] > $OverallMax) { $OverallMax = $Settings["End"]; }
+       if ($Settings["Start"] < $OverallMin) { $OverallMin = $Settings["Start"]; }
       }
-     $RealWidth = $Width - (count($IndicatorSections)-1)*$SectionsMargin;
-     $XScale    = $RealWidth / ($OverallMax-$OverallMin);
+     $RealWidth = $Width - (count($IndicatorSections) - 1)*$SectionsMargin;
+     $XScale    = $RealWidth/($OverallMax - $OverallMin);
 
      $X1 = $X; $ValuesPos = "";
      foreach ($IndicatorSections as $Key => $Settings)
       {
-       $Color      = array("R"=>$Settings["R"],"G"=>$Settings["G"],"B"=>$Settings["B"]);
+       $Color      = array("R"=>$Settings["R"], "G"=>$Settings["G"], "B"=>$Settings["B"]);
        $Caption    = $Settings["Caption"];
        $SubCaption = $Settings["Start"]." - ".$Settings["End"];
 
-       $X2 = $X1 + ($Settings["End"] - $Settings["Start"]) * $XScale;
+       $X2 = $X1 + ($Settings["End"] - $Settings["Start"])*$XScale;
 
-       if ( $Key == 0 && $DrawLeftHead )
+       if ($Key == 0 && $DrawLeftHead)
         {
-         $Poly = ""; $Poly[] = $X1-1; $Poly[] = $Y; $Poly[] = $X1-1; $Poly[] = $Y+$Height; $Poly[] = $X1-1-$HeadSize; $Poly[] = $Y+($Height/2);
-         $this->pChartObject->drawPolygon($Poly,$Color);
-         $this->pChartObject->drawLine($X1-2,$Y,$X1-2-$HeadSize,$Y+($Height/2),$Color);
-         $this->pChartObject->drawLine($X1-2,$Y+$Height,$X1-2-$HeadSize,$Y+($Height/2),$Color);
+         $Poly = ""; $Poly[] = $X1 - 1; $Poly[] = $Y; $Poly[] = $X1 - 1; $Poly[] = $Y + $Height; $Poly[] = $X1 - 1 - $HeadSize; $Poly[] = $Y + ($Height/2);
+         $this->pChartObject->drawPolygon($Poly, $Color);
+         $this->pChartObject->drawLine($X1 - 2, $Y, $X1 - 2 - $HeadSize, $Y + ($Height/2), $Color);
+         $this->pChartObject->drawLine($X1 - 2, $Y + $Height, $X1 - 2 - $HeadSize, $Y + ($Height/2), $Color);
         }
 
        /* Determine the position of the breaks */
        $Break = "";
-       foreach($Values as $iKey => $Value)
+       foreach ($Values as $iKey => $Value)
         {
-         if ( $Value >= $Settings["Start"] && $Value <= $Settings["End"] )
+         if ($Value >= $Settings["Start"] && $Value <= $Settings["End"])
           {
-           $XBreak  = $X1 + ($Value - $Settings["Start"]) * $XScale;
+           $XBreak  = $X1 + ($Value - $Settings["Start"])*$XScale;
            $ValuesPos[$Value] = $XBreak;
            $Break[] = floor($XBreak);
           }
         }
 
-       if ( $ValueDisplay == INDICATOR_VALUE_LABEL )
+       if ($ValueDisplay == INDICATOR_VALUE_LABEL)
         {
-         if ( $Break == "" )
-          $this->pChartObject->drawFilledRectangle($X1,$Y,$X2,$Y+$Height,$Color);
+         if ($Break == "")
+          $this->pChartObject->drawFilledRectangle($X1, $Y, $X2, $Y + $Height, $Color);
          else
           {
            sort($Break);
            $Poly = ""; $Poly[] = $X1; $Poly[] = $Y; $LastPointWritten = FALSE;
-           foreach($Break as $iKey => $Value)
+           foreach ($Break as $iKey => $Value)
             {
-             if ( $Value-5 >= $X1 )
-              { $Poly[] = $Value-5; $Poly[] = $Y; }
-             elseif ($X1 - ($Value-5) > 0 )
+             if ($Value - 5 >= $X1)
+              { $Poly[] = $Value - 5; $Poly[] = $Y; }
+             elseif ($X1 - ($Value - 5) > 0)
               {
-               $Offset = $X1 - ($Value-5);
+               $Offset = $X1 - ($Value - 5);
                $Poly = ""; $Poly[] = $X1; $Poly[] = $Y + $Offset;
               }
 
-             $Poly[] = $Value;   $Poly[] = $Y+5;
+             $Poly[] = $Value; $Poly[] = $Y + 5;
 
-             if ( $Value+5 <= $X2 )
-              { $Poly[] = $Value+5; $Poly[] = $Y; }
-             elseif (($Value+5) > $X2 )
+             if ($Value + 5 <= $X2)
+              { $Poly[] = $Value + 5; $Poly[] = $Y; }
+             elseif (($Value + 5) > $X2)
               {
-               $Offset = ($Value+5) - $X2;
+               $Offset = ($Value + 5) - $X2;
                $Poly[] = $X2; $Poly[] = $Y + $Offset;
                $LastPointWritten = TRUE;
               }
 
             }
-           if ( !$LastPointWritten ) { $Poly[] = $X2; $Poly[] = $Y; }
-           $Poly[] = $X2; $Poly[] = $Y+$Height;
-           $Poly[] = $X1; $Poly[] = $Y+$Height;
+           if (!$LastPointWritten) { $Poly[] = $X2; $Poly[] = $Y; }
+           $Poly[] = $X2; $Poly[] = $Y + $Height;
+           $Poly[] = $X1; $Poly[] = $Y + $Height;
 
-           $this->pChartObject->drawPolygon($Poly,$Color);
+           $this->pChartObject->drawPolygon($Poly, $Color);
           }
         }
        else
-        $this->pChartObject->drawFilledRectangle($X1,$Y,$X2,$Y+$Height,$Color);
+        $this->pChartObject->drawFilledRectangle($X1, $Y, $X2, $Y + $Height, $Color);
 
-       if ( $Key == count($IndicatorSections)-1 && $DrawRightHead )
+       if ($Key == count($IndicatorSections) - 1 && $DrawRightHead)
         {
-         $Poly = ""; $Poly[] = $X2+1; $Poly[] = $Y; $Poly[] = $X2+1; $Poly[] = $Y+$Height; $Poly[] = $X2+1+$HeadSize; $Poly[] = $Y+($Height/2);
-         $this->pChartObject->drawPolygon($Poly,$Color);
-         $this->pChartObject->drawLine($X2+1,$Y,$X2+1+$HeadSize,$Y+($Height/2),$Color);
-         $this->pChartObject->drawLine($X2+1,$Y+$Height,$X2+1+$HeadSize,$Y+($Height/2),$Color);
+         $Poly = ""; $Poly[] = $X2 + 1; $Poly[] = $Y; $Poly[] = $X2 + 1; $Poly[] = $Y + $Height; $Poly[] = $X2 + 1 + $HeadSize; $Poly[] = $Y + ($Height/2);
+         $this->pChartObject->drawPolygon($Poly, $Color);
+         $this->pChartObject->drawLine($X2 + 1, $Y, $X2 + 1 + $HeadSize, $Y + ($Height/2), $Color);
+         $this->pChartObject->drawLine($X2 + 1, $Y + $Height, $X2 + 1 + $HeadSize, $Y + ($Height/2), $Color);
         }
 
-       if ( $CaptionPosition == INDICATOR_CAPTION_INSIDE )
+       if ($CaptionPosition == INDICATOR_CAPTION_INSIDE)
         {
-         $TxtPos  = $this->pChartObject->getTextBox($X1,$Y+$Height+$TextPadding,$CaptionFontName,$CaptionFontSize,0,$Caption);
+         $TxtPos  = $this->pChartObject->getTextBox($X1, $Y + $Height + $TextPadding, $CaptionFontName, $CaptionFontSize, 0, $Caption);
          $YOffset = ($TxtPos[0]["Y"] - $TxtPos[2]["Y"]) + $TextPadding;
 
-         if ( $CaptionLayout == INDICATOR_CAPTION_EXTENDED )
+         if ($CaptionLayout == INDICATOR_CAPTION_EXTENDED)
           {
-           $TxtPos  = $this->pChartObject->getTextBox($X1,$Y+$Height+$TextPadding,$CaptionFontName,$CaptionFontSize,0,$SubCaption);
+           $TxtPos  = $this->pChartObject->getTextBox($X1, $Y + $Height + $TextPadding, $CaptionFontName, $CaptionFontSize, 0, $SubCaption);
            $YOffset = $YOffset + ($TxtPos[0]["Y"] - $TxtPos[2]["Y"]) + $TextPadding*2;
           }
 
@@ -171,28 +171,28 @@ 
        else
         { $YOffset = 0; $XOffset = 0; }
 
-       if ( $CaptionColorFactor == NULL )
-        { $CaptionColor    = array("Align"=>TEXT_ALIGN_TOPLEFT,"FontName"=>$CaptionFontName,"FontSize"=>$CaptionFontSize,"R"=>$CaptionR,"G"=>$CaptionG,"B"=>$CaptionB,"Alpha"=>$CaptionAlpha); }
+       if ($CaptionColorFactor == NULL)
+        { $CaptionColor    = array("Align"=>TEXT_ALIGN_TOPLEFT, "FontName"=>$CaptionFontName, "FontSize"=>$CaptionFontSize, "R"=>$CaptionR, "G"=>$CaptionG, "B"=>$CaptionB, "Alpha"=>$CaptionAlpha); }
        else
-        { $CaptionColor    = array("Align"=>TEXT_ALIGN_TOPLEFT,"FontName"=>$CaptionFontName,"FontSize"=>$CaptionFontSize,"R"=>$Settings["R"]+$CaptionColorFactor,"G"=>$Settings["G"]+$CaptionColorFactor,"B"=>$Settings["B"]+$CaptionColorFactor); }
+        { $CaptionColor    = array("Align"=>TEXT_ALIGN_TOPLEFT, "FontName"=>$CaptionFontName, "FontSize"=>$CaptionFontSize, "R"=>$Settings["R"] + $CaptionColorFactor, "G"=>$Settings["G"] + $CaptionColorFactor, "B"=>$Settings["B"] + $CaptionColorFactor); }
 
-       if ( $SubCaptionColorFactor == NULL )
-        $SubCaptionColor = array("Align"=>TEXT_ALIGN_TOPLEFT,"FontName"=>$CaptionFontName,"FontSize"=>$CaptionFontSize,"R"=>$SubCaptionR,"G"=>$SubCaptionG,"B"=>$SubCaptionB,"Alpha"=>$SubCaptionAlpha);
+       if ($SubCaptionColorFactor == NULL)
+        $SubCaptionColor = array("Align"=>TEXT_ALIGN_TOPLEFT, "FontName"=>$CaptionFontName, "FontSize"=>$CaptionFontSize, "R"=>$SubCaptionR, "G"=>$SubCaptionG, "B"=>$SubCaptionB, "Alpha"=>$SubCaptionAlpha);
        else
-        $SubCaptionColor = array("Align"=>TEXT_ALIGN_TOPLEFT,"FontName"=>$CaptionFontName,"FontSize"=>$CaptionFontSize,"R"=>$Settings["R"]+$SubCaptionColorFactor,"G"=>$Settings["G"]+$SubCaptionColorFactor,"B"=>$Settings["B"]+$SubCaptionColorFactor);
+        $SubCaptionColor = array("Align"=>TEXT_ALIGN_TOPLEFT, "FontName"=>$CaptionFontName, "FontSize"=>$CaptionFontSize, "R"=>$Settings["R"] + $SubCaptionColorFactor, "G"=>$Settings["G"] + $SubCaptionColorFactor, "B"=>$Settings["B"] + $SubCaptionColorFactor);
 
        $RestoreShadow = $this->pChartObject->Shadow;
        $this->pChartObject->Shadow = FALSE;
 
-       if ( $CaptionLayout == INDICATOR_CAPTION_DEFAULT )
-        $this->pChartObject->drawText($X1,$Y+$Height+$TextPadding,$Caption,$CaptionColor);
-       elseif ( $CaptionLayout == INDICATOR_CAPTION_EXTENDED )
+       if ($CaptionLayout == INDICATOR_CAPTION_DEFAULT)
+        $this->pChartObject->drawText($X1, $Y + $Height + $TextPadding, $Caption, $CaptionColor);
+       elseif ($CaptionLayout == INDICATOR_CAPTION_EXTENDED)
         {
-         $TxtPos        = $this->pChartObject->getTextBox($X1,$Y+$Height+$TextPadding,$CaptionFontName,$CaptionFontSize,0,$Caption);
+         $TxtPos        = $this->pChartObject->getTextBox($X1, $Y + $Height + $TextPadding, $CaptionFontName, $CaptionFontSize, 0, $Caption);
          $CaptionHeight = $TxtPos[0]["Y"] - $TxtPos[2]["Y"];
 
-         $this->pChartObject->drawText($X1+$XOffset,$Y+$Height-$YOffset+$TextPadding,$Caption,$CaptionColor);
-         $this->pChartObject->drawText($X1+$XOffset,$Y+$Height-$YOffset+$CaptionHeight+$TextPadding*2,$SubCaption,$SubCaptionColor);
+         $this->pChartObject->drawText($X1 + $XOffset, $Y + $Height - $YOffset + $TextPadding, $Caption, $CaptionColor);
+         $this->pChartObject->drawText($X1 + $XOffset, $Y + $Height - $YOffset + $CaptionHeight + $TextPadding*2, $SubCaption, $SubCaptionColor);
         }
 
        $this->pChartObject->Shadow = $RestoreShadow;
@@ -203,32 +203,32 @@ 
      $RestoreShadow = $this->pChartObject->Shadow;
      $this->pChartObject->Shadow = FALSE;
 
-     foreach($Values as $Key => $Value)
+     foreach ($Values as $Key => $Value)
       {
-       if ( $Value >= $OverallMin && $Value <= $OverallMax )
+       if ($Value >= $OverallMin && $Value <= $OverallMax)
         {
          foreach ($IndicatorSections as $Key => $Settings)
           {
-           if ( $Value >= $Settings["Start"] && $Value <= $Settings["End"] )
+           if ($Value >= $Settings["Start"] && $Value <= $Settings["End"])
             {
              $X1 = $ValuesPos[$Value]; //$X + $Key*$SectionsMargin + ($Value - $OverallMin) * $XScale;
 
-             if ( $ValueDisplay == INDICATOR_VALUE_BUBBLE )
+             if ($ValueDisplay == INDICATOR_VALUE_BUBBLE)
               {
-               $TxtPos = $this->pChartObject->getTextBox($X1,$Y,$ValueFontName,$ValueFontSize,0,$Value.$Unit);
+               $TxtPos = $this->pChartObject->getTextBox($X1, $Y, $ValueFontName, $ValueFontSize, 0, $Value.$Unit);
                $Radius = floor(($TxtPos[1]["X"] - $TxtPos[0]["X"] + $TextPadding*4)/2);
 
-               $this->pChartObject->drawFilledCircle($X1,$Y,$Radius+4,array("R"=>$Settings["R"]+20,"G"=>$Settings["G"]+20,"B"=>$Settings["B"]+20));
-               $this->pChartObject->drawFilledCircle($X1,$Y,$Radius,array("R"=>255,"G"=>255,"B"=>255));
+               $this->pChartObject->drawFilledCircle($X1, $Y, $Radius + 4, array("R"=>$Settings["R"] + 20, "G"=>$Settings["G"] + 20, "B"=>$Settings["B"] + 20));
+               $this->pChartObject->drawFilledCircle($X1, $Y, $Radius, array("R"=>255, "G"=>255, "B"=>255));
 
-               $TextSettings = array("Align"=>TEXT_ALIGN_MIDDLEMIDDLE,"FontName"=>$ValueFontName,"FontSize"=>$ValueFontSize);
-               $this->pChartObject->drawText($X1-1,$Y-1,$Value.$Unit,$TextSettings);
+               $TextSettings = array("Align"=>TEXT_ALIGN_MIDDLEMIDDLE, "FontName"=>$ValueFontName, "FontSize"=>$ValueFontSize);
+               $this->pChartObject->drawText($X1 - 1, $Y - 1, $Value.$Unit, $TextSettings);
               }
-             elseif( $ValueDisplay == INDICATOR_VALUE_LABEL )
+             elseif ($ValueDisplay == INDICATOR_VALUE_LABEL)
               {
                $Caption = "";
-               $Caption[] = array("Format"=>array("R"=>$Settings["R"],"G"=>$Settings["G"],"B"=>$Settings["B"],"Alpha"=>100),"Caption"=>$Value.$Unit);
-               $this->pChartObject->drawLabelBox(floor($X1),floor($Y)+2,"Value - ".$Settings["Caption"],$Caption);
+               $Caption[] = array("Format"=>array("R"=>$Settings["R"], "G"=>$Settings["G"], "B"=>$Settings["B"], "Alpha"=>100), "Caption"=>$Value.$Unit);
+               $this->pChartObject->drawLabelBox(floor($X1), floor($Y) + 2, "Value - ".$Settings["Caption"], $Caption);
               }
             }
            $X1 = $X2 + $SectionsMargin;

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

Spacing +276 added lines, -276 removed lines

@@ -13,20 +13,20 @@ 
      You can find the whole class documentation on the pChart web site.
  */
 
- define("NODE_TYPE_FREE"	, 690001);
- define("NODE_TYPE_CENTRAL"	, 690002);
+ define("NODE_TYPE_FREE", 690001);
+ define("NODE_TYPE_CENTRAL", 690002);
 
- define("NODE_SHAPE_CIRCLE"	, 690011);
- define("NODE_SHAPE_TRIANGLE"	, 690012);
- define("NODE_SHAPE_SQUARE"	, 690013);
+ define("NODE_SHAPE_CIRCLE", 690011);
+ define("NODE_SHAPE_TRIANGLE", 690012);
+ define("NODE_SHAPE_SQUARE", 690013);
 
- define("ALGORITHM_RANDOM"	, 690021);
- define("ALGORITHM_WEIGHTED"	, 690022);
- define("ALGORITHM_CIRCULAR"	, 690023);
- define("ALGORITHM_CENTRAL"	, 690024);
+ define("ALGORITHM_RANDOM", 690021);
+ define("ALGORITHM_WEIGHTED", 690022);
+ define("ALGORITHM_CIRCULAR", 690023);
+ define("ALGORITHM_CENTRAL", 690024);
 
- define("LABEL_CLASSIC"		, 690031);
- define("LABEL_LIGHT"		, 690032);
+ define("LABEL_CLASSIC", 690031);
+ define("LABEL_LIGHT", 690032);
 
  /* pSpring class definition */
  class pSpring
@@ -53,7 +53,7 @@ 
      $this->Default["R"]		= 255;
      $this->Default["G"]		= 255;
      $this->Default["B"]		= 255;
-     $this->Default["Alpha"]		= 100;
+     $this->Default["Alpha"] = 100;
      $this->Default["BorderR"]		= 0;
      $this->Default["BorderG"]		= 0;
      $this->Default["BorderB"]		= 0;
@@ -62,52 +62,52 @@ 
      $this->Default["BackgroundR"]	= 255;
      $this->Default["BackgroundG"]	= 255;
      $this->Default["BackgroundB"]	= 255;
-     $this->Default["BackgroundAlpha"]	= 0;
+     $this->Default["BackgroundAlpha"] = 0;
      $this->Default["Force"]		= 1;
      $this->Default["NodeType"]		= NODE_TYPE_FREE;
-     $this->Default["Size"]		= 5;
+     $this->Default["Size"] = 5;
      $this->Default["Shape"]		= NODE_SHAPE_CIRCLE;
      $this->Default["FreeZone"]		= 40;
      $this->Default["LinkR"]		= 0;
      $this->Default["LinkG"]		= 0;
      $this->Default["LinkB"]		= 0;
-     $this->Default["LinkAlpha"]	= 0;
+     $this->Default["LinkAlpha"] = 0;
 
-     $this->Labels["Type"]		= LABEL_CLASSIC;
+     $this->Labels["Type"] = LABEL_CLASSIC;
      $this->Labels["R"]			= 0;
      $this->Labels["G"]			= 0;
      $this->Labels["B"]			= 0;
-     $this->Labels["Alpha"]		= 100;
+     $this->Labels["Alpha"] = 100;
 
-     $this->AutoComputeFreeZone         = FALSE;
+     $this->AutoComputeFreeZone = FALSE;
     }
 
    /* Set default links options */
-   function setLinkDefaults($Settings="")
+   function setLinkDefaults($Settings = "")
     {
-     if ( isset($Settings["R"]) )     { $this->Default["LinkR"] = $Settings["R"]; }
-     if ( isset($Settings["G"]) )     { $this->Default["LinkG"] = $Settings["G"]; }
-     if ( isset($Settings["B"]) )     { $this->Default["LinkB"] = $Settings["B"]; }
-     if ( isset($Settings["Alpha"]) ) { $this->Default["LinkAlpha"] = $Settings["Alpha"]; }
+     if (isset($Settings["R"])) { $this->Default["LinkR"] = $Settings["R"]; }
+     if (isset($Settings["G"])) { $this->Default["LinkG"] = $Settings["G"]; }
+     if (isset($Settings["B"])) { $this->Default["LinkB"] = $Settings["B"]; }
+     if (isset($Settings["Alpha"])) { $this->Default["LinkAlpha"] = $Settings["Alpha"]; }
     }
 
    /* Set default links options */
-   function setLabelsSettings($Settings="")
+   function setLabelsSettings($Settings = "")
     {
-     if ( isset($Settings["Type"]) )  { $this->Labels["Type"] = $Settings["Type"]; }
-     if ( isset($Settings["R"]) )     { $this->Labels["R"] = $Settings["R"]; }
-     if ( isset($Settings["G"]) )     { $this->Labels["G"] = $Settings["G"]; }
-     if ( isset($Settings["B"]) )     { $this->Labels["B"] = $Settings["B"]; }
-     if ( isset($Settings["Alpha"]) ) { $this->Labels["Alpha"] = $Settings["Alpha"]; }
+     if (isset($Settings["Type"])) { $this->Labels["Type"] = $Settings["Type"]; }
+     if (isset($Settings["R"])) { $this->Labels["R"] = $Settings["R"]; }
+     if (isset($Settings["G"])) { $this->Labels["G"] = $Settings["G"]; }
+     if (isset($Settings["B"])) { $this->Labels["B"] = $Settings["B"]; }
+     if (isset($Settings["Alpha"])) { $this->Labels["Alpha"] = $Settings["Alpha"]; }
     }
 
    /* Auto compute the FreeZone size based on the number of connections */
    function autoFreeZone()
     {
      /* Check connections reciprocity */
-     foreach($this->Data as $Key => $Settings)
+     foreach ($this->Data as $Key => $Settings)
       {
-       if ( isset($Settings["Connections"]) )
+       if (isset($Settings["Connections"]))
         { $this->Data[$Key]["FreeZone"] = count($Settings["Connections"])*10 + 20; }
        else
         { $this->Data[$Key]["FreeZone"] = 20; }
@@ -116,60 +116,60 @@ 
     }
 
    /* Set link properties */
-   function linkProperties($FromNode,$ToNode,$Settings)
+   function linkProperties($FromNode, $ToNode, $Settings)
     {
-     if ( !isset($this->Data[$FromNode]) ) { return(0); }
-     if ( !isset($this->Data[$ToNode]) )   { return(0); }
+     if (!isset($this->Data[$FromNode])) { return(0); }
+     if (!isset($this->Data[$ToNode])) { return(0); }
 
      $R			= isset($Settings["R"]) ? $Settings["R"] : 0;
      $G			= isset($Settings["G"]) ? $Settings["G"] : 0;
      $B			= isset($Settings["B"]) ? $Settings["B"] : 0;
      $Alpha		= isset($Settings["Alpha"]) ? $Settings["Alpha"] : 100;
-     $Name		= isset($Settings["Name"]) ? $Settings["Name"] : NULL;
+     $Name = isset($Settings["Name"]) ? $Settings["Name"] : NULL;
      $Ticks		= isset($Settings["Ticks"]) ? $Settings["Ticks"] : NULL;
 
-     $this->Links[$FromNode][$ToNode]["R"] = $R;         $this->Links[$ToNode][$FromNode]["R"] = $R;
-     $this->Links[$FromNode][$ToNode]["G"] = $G;         $this->Links[$ToNode][$FromNode]["G"] = $G;
-     $this->Links[$FromNode][$ToNode]["B"] = $B;         $this->Links[$ToNode][$FromNode]["B"] = $B;
+     $this->Links[$FromNode][$ToNode]["R"] = $R; $this->Links[$ToNode][$FromNode]["R"] = $R;
+     $this->Links[$FromNode][$ToNode]["G"] = $G; $this->Links[$ToNode][$FromNode]["G"] = $G;
+     $this->Links[$FromNode][$ToNode]["B"] = $B; $this->Links[$ToNode][$FromNode]["B"] = $B;
      $this->Links[$FromNode][$ToNode]["Alpha"] = $Alpha; $this->Links[$ToNode][$FromNode]["Alpha"] = $Alpha;
-     $this->Links[$FromNode][$ToNode]["Name"] = $Name;   $this->Links[$ToNode][$FromNode]["Name"] = $Name;
+     $this->Links[$FromNode][$ToNode]["Name"] = $Name; $this->Links[$ToNode][$FromNode]["Name"] = $Name;
      $this->Links[$FromNode][$ToNode]["Ticks"] = $Ticks; $this->Links[$ToNode][$FromNode]["Ticks"] = $Ticks;
     }
 
-   function setNodeDefaults($Settings="")
+   function setNodeDefaults($Settings = "")
     {
-     if ( isset($Settings["R"]) ) { $this->Default["R"]					= $Settings["R"]; }
-     if ( isset($Settings["G"]) ) { $this->Default["G"]					= $Settings["G"]; }
-     if ( isset($Settings["B"]) ) { $this->Default["B"]					= $Settings["B"]; }
-     if ( isset($Settings["Alpha"]) ) { $this->Default["Alpha"]				= $Settings["Alpha"]; }
-     if ( isset($Settings["BorderR"]) ) { $this->Default["BorderR"]			= $Settings["BorderR"]; }
-     if ( isset($Settings["BorderG"]) ) { $this->Default["BorderG"]			= $Settings["BorderG"]; }
-     if ( isset($Settings["BorderB"]) ) { $this->Default["BorderB"]			= $Settings["BorderB"]; }
-     if ( isset($Settings["BorderAlpha"]) ) { $this->Default["BorderAlpha"]		= $Settings["BorderAlpha"]; }
-     if ( isset($Settings["Surrounding"]) ) { $this->Default["Surrounding"]		= $Settings["Surrounding"]; }
-     if ( isset($Settings["BackgroundR"]) ) { $this->Default["BackgroundR"]		= $Settings["BackgroundR"]; }
-     if ( isset($Settings["BackgroundG"]) ) { $this->Default["BackgroundG"]		= $Settings["BackgroundG"]; }
-     if ( isset($Settings["BackgroundB"]) ) { $this->Default["BackgroundB"]		= $Settings["BackgroundB"]; }
-     if ( isset($Settings["BackgroundAlpha"]) ) { $this->Default["BackgroundAlpha"]	= $Settings["BackgroundAlpha"]; }
-     if ( isset($Settings["NodeType"]) ) { $this->Default["NodeType"]			= $Settings["NodeType"]; }
-     if ( isset($Settings["Size"]) ) { $this->Default["Size"]				= $Settings["Size"]; }
-     if ( isset($Settings["Shape"]) ) { $this->Default["Shape"]				= $Settings["Shape"]; }
-     if ( isset($Settings["FreeZone"]) ) { $this->Default["FreeZone"]			= $Settings["FreeZone"]; }
+     if (isset($Settings["R"])) { $this->Default["R"]					= $Settings["R"]; }
+     if (isset($Settings["G"])) { $this->Default["G"]					= $Settings["G"]; }
+     if (isset($Settings["B"])) { $this->Default["B"]					= $Settings["B"]; }
+     if (isset($Settings["Alpha"])) { $this->Default["Alpha"] = $Settings["Alpha"]; }
+     if (isset($Settings["BorderR"])) { $this->Default["BorderR"]			= $Settings["BorderR"]; }
+     if (isset($Settings["BorderG"])) { $this->Default["BorderG"]			= $Settings["BorderG"]; }
+     if (isset($Settings["BorderB"])) { $this->Default["BorderB"]			= $Settings["BorderB"]; }
+     if (isset($Settings["BorderAlpha"])) { $this->Default["BorderAlpha"]		= $Settings["BorderAlpha"]; }
+     if (isset($Settings["Surrounding"])) { $this->Default["Surrounding"]		= $Settings["Surrounding"]; }
+     if (isset($Settings["BackgroundR"])) { $this->Default["BackgroundR"]		= $Settings["BackgroundR"]; }
+     if (isset($Settings["BackgroundG"])) { $this->Default["BackgroundG"]		= $Settings["BackgroundG"]; }
+     if (isset($Settings["BackgroundB"])) { $this->Default["BackgroundB"]		= $Settings["BackgroundB"]; }
+     if (isset($Settings["BackgroundAlpha"])) { $this->Default["BackgroundAlpha"] = $Settings["BackgroundAlpha"]; }
+     if (isset($Settings["NodeType"])) { $this->Default["NodeType"]			= $Settings["NodeType"]; }
+     if (isset($Settings["Size"])) { $this->Default["Size"] = $Settings["Size"]; }
+     if (isset($Settings["Shape"])) { $this->Default["Shape"] = $Settings["Shape"]; }
+     if (isset($Settings["FreeZone"])) { $this->Default["FreeZone"]			= $Settings["FreeZone"]; }
     }
 
    /* Add a node */
-   function addNode($NodeID,$Settings="")
+   function addNode($NodeID, $Settings = "")
     {
      /* if the node already exists, ignore */
      if (isset($this->Data[$NodeID])) { return(0); }
 
-     $Name		= isset($Settings["Name"]) ? $Settings["Name"] : "Node ".$NodeID;
-     $Connections	= isset($Settings["Connections"]) ? $Settings["Connections"] : NULL;
+     $Name = isset($Settings["Name"]) ? $Settings["Name"] : "Node ".$NodeID;
+     $Connections = isset($Settings["Connections"]) ? $Settings["Connections"] : NULL;
 
      $R			= isset($Settings["R"]) ? $Settings["R"] : $this->Default["R"];
      $G			= isset($Settings["G"]) ? $Settings["G"] : $this->Default["G"];
      $B			= isset($Settings["B"]) ? $Settings["B"] : $this->Default["B"];
-     $Alpha		= isset($Settings["Alpha"]) ? $Settings["Alpha"] : $this->Default["Alpha"];
+     $Alpha = isset($Settings["Alpha"]) ? $Settings["Alpha"] : $this->Default["Alpha"];
      $BorderR		= isset($Settings["BorderR"]) ? $Settings["BorderR"] : $this->Default["BorderR"];
      $BorderG		= isset($Settings["BorderG"]) ? $Settings["BorderG"] : $this->Default["BorderG"];
      $BorderB		= isset($Settings["BorderB"]) ? $Settings["BorderB"] : $this->Default["BorderB"];
@@ -178,29 +178,29 @@ 
      $BackgroundR	= isset($Settings["BackgroundR"]) ? $Settings["BackgroundR"] : $this->Default["BackgroundR"];
      $BackgroundG	= isset($Settings["BackgroundG"]) ? $Settings["BackgroundG"] : $this->Default["BackgroundG"];
      $BackgroundB	= isset($Settings["BackgroundB"]) ? $Settings["BackgroundB"] : $this->Default["BackgroundB"];
-     $BackgroundAlpha	= isset($Settings["BackgroundAlpha"]) ? $Settings["BackgroundAlpha"] : $this->Default["BackgroundAlpha"];
-     $Force		= isset($Settings["Force"]) ? $Settings["Force"] :  $this->Default["Force"];
+     $BackgroundAlpha = isset($Settings["BackgroundAlpha"]) ? $Settings["BackgroundAlpha"] : $this->Default["BackgroundAlpha"];
+     $Force		= isset($Settings["Force"]) ? $Settings["Force"] : $this->Default["Force"];
      $NodeType		= isset($Settings["NodeType"]) ? $Settings["NodeType"] : $this->Default["NodeType"];
-     $Size		= isset($Settings["Size"]) ? $Settings["Size"] : $this->Default["Size"];
+     $Size = isset($Settings["Size"]) ? $Settings["Size"] : $this->Default["Size"];
      $Shape		= isset($Settings["Shape"]) ? $Settings["Shape"] : $this->Default["Shape"];
      $FreeZone		= isset($Settings["FreeZone"]) ? $Settings["FreeZone"] : $this->Default["FreeZone"];
 
-     if ( $Surrounding != NULL ) { $BorderR = $R + $Surrounding; $BorderG = $G + $Surrounding; $BorderB = $B + $Surrounding; }
+     if ($Surrounding != NULL) { $BorderR = $R + $Surrounding; $BorderG = $G + $Surrounding; $BorderB = $B + $Surrounding; }
 
      $this->Data[$NodeID]["R"] = $R; $this->Data[$NodeID]["G"] = $G; $this->Data[$NodeID]["B"] = $B; $this->Data[$NodeID]["Alpha"] = $Alpha;
      $this->Data[$NodeID]["BorderR"] = $BorderR; $this->Data[$NodeID]["BorderG"] = $BorderG; $this->Data[$NodeID]["BorderB"] = $BorderB; $this->Data[$NodeID]["BorderAlpha"] = $BorderAlpha;
-     $this->Data[$NodeID]["BackgroundR"]	= $BackgroundR; $this->Data[$NodeID]["BackgroundG"] = $BackgroundG; $this->Data[$NodeID]["BackgroundB"] = $BackgroundB; $this->Data[$NodeID]["BackgroundAlpha"] = $BackgroundAlpha;
+     $this->Data[$NodeID]["BackgroundR"] = $BackgroundR; $this->Data[$NodeID]["BackgroundG"] = $BackgroundG; $this->Data[$NodeID]["BackgroundB"] = $BackgroundB; $this->Data[$NodeID]["BackgroundAlpha"] = $BackgroundAlpha;
      $this->Data[$NodeID]["Name"]		= $Name;
      $this->Data[$NodeID]["Force"]		= $Force;
      $this->Data[$NodeID]["Type"]		= $NodeType;
      $this->Data[$NodeID]["Size"]		= $Size;
      $this->Data[$NodeID]["Shape"]		= $Shape;
-     $this->Data[$NodeID]["FreeZone"]		= $FreeZone;
-     if ( $Connections != NULL )
+     $this->Data[$NodeID]["FreeZone"] = $FreeZone;
+     if ($Connections != NULL)
       {
-       if ( is_array($Connections ) )
+       if (is_array($Connections))
         {
-         foreach($Connections as $Key => $Value)
+         foreach ($Connections as $Key => $Value)
           $this->Data[$NodeID]["Connections"][] = $Value;
         }
        else
@@ -209,37 +209,37 @@ 
     }
 
    /* Set color attribute for a list of nodes */
-   function setNodesColor($Nodes,$Settings="")
+   function setNodesColor($Nodes, $Settings = "")
     {
-     if ( is_array($Nodes) )
+     if (is_array($Nodes))
       {
        foreach ($Nodes as $Key => $NodeID)
         {
-         if (isset($this->Data[$NodeID]) )
+         if (isset($this->Data[$NodeID]))
           {
-           if ( isset($Settings["R"]) ) { $this->Data[$NodeID]["R"] = $Settings["R"]; }
-           if ( isset($Settings["G"]) ) { $this->Data[$NodeID]["G"] = $Settings["G"]; }
-           if ( isset($Settings["B"]) ) { $this->Data[$NodeID]["B"] = $Settings["B"]; }
-           if ( isset($Settings["Alpha"]) ) { $this->Data[$NodeID]["Alpha"] = $Settings["Alpha"]; }
-           if ( isset($Settings["BorderR"]) ) { $this->Data[$NodeID]["BorderR"] = $Settings["BorderR"]; }
-           if ( isset($Settings["BorderG"]) ) { $this->Data[$NodeID]["BorderG"] = $Settings["BorderG"]; }
-           if ( isset($Settings["BorderB"]) ) { $this->Data[$NodeID]["BorderB"] = $Settings["BorderB"]; }
-           if ( isset($Settings["BorderAlpha"]) ) { $this->Data[$NodeID]["BorderAlpha"] = $Settings["BorderAlpha"]; }
-           if ( isset($Settings["Surrounding"]) ) { $this->Data[$NodeID]["BorderR"] = $this->Data[$NodeID]["R"] + $Settings["Surrounding"]; $this->Data[$NodeID]["BorderG"] = $this->Data[$NodeID]["G"] + $Settings["Surrounding"]; $this->Data[$NodeID]["BorderB"] = $this->Data[$NodeID]["B"] + $Settings["Surrounding"]; }
+           if (isset($Settings["R"])) { $this->Data[$NodeID]["R"] = $Settings["R"]; }
+           if (isset($Settings["G"])) { $this->Data[$NodeID]["G"] = $Settings["G"]; }
+           if (isset($Settings["B"])) { $this->Data[$NodeID]["B"] = $Settings["B"]; }
+           if (isset($Settings["Alpha"])) { $this->Data[$NodeID]["Alpha"] = $Settings["Alpha"]; }
+           if (isset($Settings["BorderR"])) { $this->Data[$NodeID]["BorderR"] = $Settings["BorderR"]; }
+           if (isset($Settings["BorderG"])) { $this->Data[$NodeID]["BorderG"] = $Settings["BorderG"]; }
+           if (isset($Settings["BorderB"])) { $this->Data[$NodeID]["BorderB"] = $Settings["BorderB"]; }
+           if (isset($Settings["BorderAlpha"])) { $this->Data[$NodeID]["BorderAlpha"] = $Settings["BorderAlpha"]; }
+           if (isset($Settings["Surrounding"])) { $this->Data[$NodeID]["BorderR"] = $this->Data[$NodeID]["R"] + $Settings["Surrounding"]; $this->Data[$NodeID]["BorderG"] = $this->Data[$NodeID]["G"] + $Settings["Surrounding"]; $this->Data[$NodeID]["BorderB"] = $this->Data[$NodeID]["B"] + $Settings["Surrounding"]; }
           }
         }
       }
      else
       {
-       if ( isset($Settings["R"]) ) { $this->Data[$Nodes]["R"] = $Settings["R"]; }
-       if ( isset($Settings["G"]) ) { $this->Data[$Nodes]["G"] = $Settings["G"]; }
-       if ( isset($Settings["B"]) ) { $this->Data[$Nodes]["B"] = $Settings["B"]; }
-       if ( isset($Settings["Alpha"]) ) { $this->Data[$Nodes]["Alpha"] = $Settings["Alpha"]; }
-       if ( isset($Settings["BorderR"]) ) { $this->Data[$Nodes]["BorderR"] = $Settings["BorderR"]; }
-       if ( isset($Settings["BorderG"]) ) { $this->Data[$Nodes]["BorderG"] = $Settings["BorderG"]; }
-       if ( isset($Settings["BorderB"]) ) { $this->Data[$Nodes]["BorderB"] = $Settings["BorderB"]; }
-       if ( isset($Settings["BorderAlpha"]) ) { $this->Data[$Nodes]["BorderAlpha"] = $Settings["BorderAlpha"]; }
-       if ( isset($Settings["Surrounding"]) ) { $this->Data[$Nodes]["BorderR"] = $this->Data[$NodeID]["R"] + $Settings["Surrounding"]; $this->Data[$NodeID]["BorderG"] = $this->Data[$NodeID]["G"] + $Settings["Surrounding"]; $this->Data[$NodeID]["BorderB"] = $this->Data[$NodeID]["B"] + $Settings["Surrounding"]; }
+       if (isset($Settings["R"])) { $this->Data[$Nodes]["R"] = $Settings["R"]; }
+       if (isset($Settings["G"])) { $this->Data[$Nodes]["G"] = $Settings["G"]; }
+       if (isset($Settings["B"])) { $this->Data[$Nodes]["B"] = $Settings["B"]; }
+       if (isset($Settings["Alpha"])) { $this->Data[$Nodes]["Alpha"] = $Settings["Alpha"]; }
+       if (isset($Settings["BorderR"])) { $this->Data[$Nodes]["BorderR"] = $Settings["BorderR"]; }
+       if (isset($Settings["BorderG"])) { $this->Data[$Nodes]["BorderG"] = $Settings["BorderG"]; }
+       if (isset($Settings["BorderB"])) { $this->Data[$Nodes]["BorderB"] = $Settings["BorderB"]; }
+       if (isset($Settings["BorderAlpha"])) { $this->Data[$Nodes]["BorderAlpha"] = $Settings["BorderAlpha"]; }
+       if (isset($Settings["Surrounding"])) { $this->Data[$Nodes]["BorderR"] = $this->Data[$NodeID]["R"] + $Settings["Surrounding"]; $this->Data[$NodeID]["BorderG"] = $this->Data[$NodeID]["G"] + $Settings["Surrounding"]; $this->Data[$NodeID]["BorderB"] = $this->Data[$NodeID]["B"] + $Settings["Surrounding"]; }
       }
     }
 
@@ -250,22 +250,22 @@ 
    /* Check if a connection exists and create it if required */
    function checkConnection($SourceID, $TargetID)
     {
-     if ( isset($this->Data[$SourceID]["Connections"]) )
+     if (isset($this->Data[$SourceID]["Connections"]))
       {
        foreach ($this->Data[$SourceID]["Connections"] as $Key => $ConnectionID)
-        { if ( $TargetID == $ConnectionID ) { return(TRUE); } }
+        { if ($TargetID == $ConnectionID) { return(TRUE); } }
       }
      $this->Data[$SourceID]["Connections"][] = $TargetID;
     }
    /* Get the median linked nodes position */
-   function getMedianOffset($Key,$X,$Y)
+   function getMedianOffset($Key, $X, $Y)
     {
      $Cpt = 1;
-     if ( isset($this->Data[$Key]["Connections"]) )
+     if (isset($this->Data[$Key]["Connections"]))
       {
-       foreach($this->Data[$Key]["Connections"] as $ID => $NodeID)
+       foreach ($this->Data[$Key]["Connections"] as $ID => $NodeID)
         {
-         if ( isset($this->Data[$NodeID]["X"]) && isset($this->Data[$NodeID]["Y"]) )
+         if (isset($this->Data[$NodeID]["X"]) && isset($this->Data[$NodeID]["Y"]))
           {
            $X = $X + $this->Data[$NodeID]["X"];
            $Y = $Y + $this->Data[$NodeID]["Y"];
@@ -273,18 +273,18 @@ 
           }
         }
       }
-     return(array("X"=>$X/$Cpt,"Y"=>$Y/$Cpt));
+     return(array("X"=>$X/$Cpt, "Y"=>$Y/$Cpt));
     }
 
    /* Return the ID of the attached partner with the biggest weight */
    function getBiggestPartner($Key)
     {
-     if ( !isset($this->Data[$Key]["Connections"]) ) { return(""); }
+     if (!isset($this->Data[$Key]["Connections"])) { return(""); }
 
      $MaxWeight = 0; $Result = "";
-     foreach($this->Data[$Key]["Connections"] as $Key => $PeerID)
+     foreach ($this->Data[$Key]["Connections"] as $Key => $PeerID)
       {
-       if ( $this->Data[$PeerID]["Weight"] > $MaxWeight )
+       if ($this->Data[$PeerID]["Weight"] > $MaxWeight)
         { $MaxWeight = $this->Data[$PeerID]["Weight"]; $Result = $PeerID; }
       }
      return($Result);
@@ -293,94 +293,94 @@ 
    /* Do the initial node positions computing pass */
    function firstPass($Algorithm)
     {
-     $CenterX = ($this->X2 - $this->X1) / 2 + $this->X1;
-     $CenterY = ($this->Y2 - $this->Y1) / 2 + $this->Y1;
+     $CenterX = ($this->X2 - $this->X1)/2 + $this->X1;
+     $CenterY = ($this->Y2 - $this->Y1)/2 + $this->Y1;
 
      /* Check connections reciprocity */
-     foreach($this->Data as $Key => $Settings)
+     foreach ($this->Data as $Key => $Settings)
       {
-       if ( isset($Settings["Connections"]) )
+       if (isset($Settings["Connections"]))
         {
-         foreach($Settings["Connections"] as $ID => $ConnectionID)
-          $this->checkConnection($ConnectionID,$Key);
+         foreach ($Settings["Connections"] as $ID => $ConnectionID)
+          $this->checkConnection($ConnectionID, $Key);
         }
       }
 
-     if ( $this->AutoComputeFreeZone ) { $this->autoFreeZone(); }
+     if ($this->AutoComputeFreeZone) { $this->autoFreeZone(); }
 
      /* Get the max number of connections */
      $MaxConnections = 0;
-     foreach($this->Data as $Key => $Settings)
-      { if ( isset($Settings["Connections"]) ) { if ( $MaxConnections < count($Settings["Connections"] ) ) { $MaxConnections = count($Settings["Connections"]); } } }
+     foreach ($this->Data as $Key => $Settings)
+      { if (isset($Settings["Connections"])) { if ($MaxConnections < count($Settings["Connections"])) { $MaxConnections = count($Settings["Connections"]); } } }
 
-     if ( $Algorithm == ALGORITHM_WEIGHTED )
+     if ($Algorithm == ALGORITHM_WEIGHTED)
       {
-       foreach($this->Data as $Key => $Settings)
+       foreach ($this->Data as $Key => $Settings)
         {
-         if ( $Settings["Type"] == NODE_TYPE_CENTRAL ) { $this->Data[$Key]["X"] = $CenterX; $this->Data[$Key]["Y"] = $CenterY; }
-         if ( $Settings["Type"] == NODE_TYPE_FREE )
+         if ($Settings["Type"] == NODE_TYPE_CENTRAL) { $this->Data[$Key]["X"] = $CenterX; $this->Data[$Key]["Y"] = $CenterY; }
+         if ($Settings["Type"] == NODE_TYPE_FREE)
           {
-           if ( isset($Settings["Connections"]) )
+           if (isset($Settings["Connections"]))
             { $Connections = count($Settings["Connections"]); }
            else
             { $Connections = 0; }
 
            $Ring  = $MaxConnections - $Connections;
-           $Angle = rand(0,360);
+           $Angle = rand(0, 360);
            
-           $this->Data[$Key]["X"] = cos(deg2rad($Angle)) * ($Ring*$this->RingSize) + $CenterX;
-           $this->Data[$Key]["Y"] = sin(deg2rad($Angle)) * ($Ring*$this->RingSize) + $CenterY;
+           $this->Data[$Key]["X"] = cos(deg2rad($Angle))*($Ring*$this->RingSize) + $CenterX;
+           $this->Data[$Key]["Y"] = sin(deg2rad($Angle))*($Ring*$this->RingSize) + $CenterY;
           }
         }
       }
-     elseif ( $Algorithm == ALGORITHM_CENTRAL )
+     elseif ($Algorithm == ALGORITHM_CENTRAL)
       {
        /* Put a weight on each nodes */
-       foreach($this->Data as $Key => $Settings)
+       foreach ($this->Data as $Key => $Settings)
         {
-         if ( isset($Settings["Connections"]) )
+         if (isset($Settings["Connections"]))
           $this->Data[$Key]["Weight"] = count($Settings["Connections"]);
          else
           $this->Data[$Key]["Weight"] = 0;
         }
 
        $MaxConnections = $MaxConnections + 1;
-       for($i=$MaxConnections;$i>=0;$i--)
+       for ($i = $MaxConnections; $i >= 0; $i--)
         {
-         foreach($this->Data as $Key => $Settings)
+         foreach ($this->Data as $Key => $Settings)
           {
-           if ( $Settings["Type"] == NODE_TYPE_CENTRAL ) { $this->Data[$Key]["X"] = $CenterX; $this->Data[$Key]["Y"] = $CenterY; }
-           if ( $Settings["Type"] == NODE_TYPE_FREE )
+           if ($Settings["Type"] == NODE_TYPE_CENTRAL) { $this->Data[$Key]["X"] = $CenterX; $this->Data[$Key]["Y"] = $CenterY; }
+           if ($Settings["Type"] == NODE_TYPE_FREE)
             {
-             if ( isset($Settings["Connections"]) )
+             if (isset($Settings["Connections"]))
               { $Connections = count($Settings["Connections"]); }
              else
               { $Connections = 0; }
 
-             if ( $Connections == $i )
+             if ($Connections == $i)
               {
                $BiggestPartner = $this->getBiggestPartner($Key);
-               if ( $BiggestPartner != "" )
+               if ($BiggestPartner != "")
                 {
                  $Ring          = $this->Data[$BiggestPartner]["FreeZone"];
                  $Weight        = $this->Data[$BiggestPartner]["Weight"];
-                 $AngleDivision = 360 / $this->Data[$BiggestPartner]["Weight"];
+                 $AngleDivision = 360/$this->Data[$BiggestPartner]["Weight"];
                  $Done          = FALSE; $Tries = 0;
                  while (!$Done && $Tries <= $Weight*2)
                   {
                    $Tries++;
-                   $Angle = floor(rand(0,$Weight)*$AngleDivision);
-                   if ( !isset($this->Data[$BiggestPartner]["Angular"][$Angle]) || !isset($this->Data[$BiggestPartner]["Angular"]) )
+                   $Angle = floor(rand(0, $Weight)*$AngleDivision);
+                   if (!isset($this->Data[$BiggestPartner]["Angular"][$Angle]) || !isset($this->Data[$BiggestPartner]["Angular"]))
                     {
                      $this->Data[$BiggestPartner]["Angular"][$Angle] = $Angle;
                      $Done = TRUE; 
                     }
                   }
-                 if ( !$Done )
-                  { $Angle = rand(0,360); $this->Data[$BiggestPartner]["Angular"][$Angle] = $Angle; }
+                 if (!$Done)
+                  { $Angle = rand(0, 360); $this->Data[$BiggestPartner]["Angular"][$Angle] = $Angle; }
 
-                 $X = cos(deg2rad($Angle)) * ($Ring) + $this->Data[$BiggestPartner]["X"];
-                 $Y = sin(deg2rad($Angle)) * ($Ring) + $this->Data[$BiggestPartner]["Y"];
+                 $X = cos(deg2rad($Angle))*($Ring) + $this->Data[$BiggestPartner]["X"];
+                 $Y = sin(deg2rad($Angle))*($Ring) + $this->Data[$BiggestPartner]["Y"];
 
                  $this->Data[$Key]["X"] = $X;
                  $this->Data[$Key]["Y"] = $Y;
@@ -390,30 +390,30 @@ 
           }
         }
       }
-     elseif ( $Algorithm == ALGORITHM_CIRCULAR )
+     elseif ($Algorithm == ALGORITHM_CIRCULAR)
       {
        $MaxConnections = $MaxConnections + 1;
-       for($i=$MaxConnections;$i>=0;$i--)
+       for ($i = $MaxConnections; $i >= 0; $i--)
         {
-         foreach($this->Data as $Key => $Settings)
+         foreach ($this->Data as $Key => $Settings)
           {
-           if ( $Settings["Type"] == NODE_TYPE_CENTRAL ) { $this->Data[$Key]["X"] = $CenterX; $this->Data[$Key]["Y"] = $CenterY; }
-           if ( $Settings["Type"] == NODE_TYPE_FREE )
+           if ($Settings["Type"] == NODE_TYPE_CENTRAL) { $this->Data[$Key]["X"] = $CenterX; $this->Data[$Key]["Y"] = $CenterY; }
+           if ($Settings["Type"] == NODE_TYPE_FREE)
             {
-             if ( isset($Settings["Connections"]) )
+             if (isset($Settings["Connections"]))
               { $Connections = count($Settings["Connections"]); }
              else
               { $Connections = 0; }
 
-             if ( $Connections == $i )
+             if ($Connections == $i)
               {
                $Ring  = $MaxConnections - $Connections;
-               $Angle = rand(0,360);
+               $Angle = rand(0, 360);
 
-               $X = cos(deg2rad($Angle)) * ($Ring*$this->RingSize) + $CenterX;
-               $Y = sin(deg2rad($Angle)) * ($Ring*$this->RingSize) + $CenterY;
+               $X = cos(deg2rad($Angle))*($Ring*$this->RingSize) + $CenterX;
+               $Y = sin(deg2rad($Angle))*($Ring*$this->RingSize) + $CenterY;
 
-               $MedianOffset = $this->getMedianOffset($Key,$X,$Y);
+               $MedianOffset = $this->getMedianOffset($Key, $X, $Y);
 
                $this->Data[$Key]["X"] = $MedianOffset["X"];
                $this->Data[$Key]["Y"] = $MedianOffset["Y"];
@@ -422,16 +422,16 @@ 
           }
         }
       }
-     elseif ( $Algorithm == ALGORITHM_RANDOM )
+     elseif ($Algorithm == ALGORITHM_RANDOM)
       {
-       foreach($this->Data as $Key => $Settings)
+       foreach ($this->Data as $Key => $Settings)
         {
-         if ( $Settings["Type"] == NODE_TYPE_FREE )
+         if ($Settings["Type"] == NODE_TYPE_FREE)
           {
-           $this->Data[$Key]["X"] = $CenterX + rand(-20,20);
-           $this->Data[$Key]["Y"] = $CenterY + rand(-20,20);
+           $this->Data[$Key]["X"] = $CenterX + rand(-20, 20);
+           $this->Data[$Key]["Y"] = $CenterY + rand(-20, 20);
           }
-         if ( $Settings["Type"] == NODE_TYPE_CENTRAL ) { $this->Data[$Key]["X"] = $CenterX; $this->Data[$Key]["Y"] = $CenterY; }
+         if ($Settings["Type"] == NODE_TYPE_CENTRAL) { $this->Data[$Key]["X"] = $CenterX; $this->Data[$Key]["Y"] = $CenterY; }
         }
       }
     }
@@ -440,9 +440,9 @@ 
    function doPass()
     {
      /* Compute vectors */
-     foreach($this->Data as $Key => $Settings)
+     foreach ($this->Data as $Key => $Settings)
       {
-       if ( $Settings["Type"] != NODE_TYPE_CENTRAL )
+       if ($Settings["Type"] != NODE_TYPE_CENTRAL)
         {
          unset($this->Data[$Key]["Vectors"]);
 
@@ -450,48 +450,48 @@ 
          $Y1 = $Settings["Y"];
 
          /* Repulsion vectors */
-         foreach($this->Data as $Key2 => $Settings2)
+         foreach ($this->Data as $Key2 => $Settings2)
           {
-           if ( $Key != $Key2 )
+           if ($Key != $Key2)
             {
              $X2 = $this->Data[$Key2]["X"];
              $Y2 = $this->Data[$Key2]["Y"];
              $FreeZone = $this->Data[$Key2]["FreeZone"];
 
-             $Distance = $this->getDistance($X1,$Y1,$X2,$Y2);
-             $Angle    = $this->getAngle($X1,$Y1,$X2,$Y2) + 180;
+             $Distance = $this->getDistance($X1, $Y1, $X2, $Y2);
+             $Angle    = $this->getAngle($X1, $Y1, $X2, $Y2) + 180;
 
              /* Nodes too close, repulsion occurs */
-             if ( $Distance < $FreeZone )
+             if ($Distance < $FreeZone)
               {
-               $Force = log(pow(2,$FreeZone-$Distance));
-               if ( $Force > 1 )
-                { $this->Data[$Key]["Vectors"][] = array("Type"=>"R","Angle"=>$Angle % 360,"Force"=>$Force); }
+               $Force = log(pow(2, $FreeZone - $Distance));
+               if ($Force > 1)
+                { $this->Data[$Key]["Vectors"][] = array("Type"=>"R", "Angle"=>$Angle%360, "Force"=>$Force); }
               }
             }
           }
 
          /* Attraction vectors */
-         if ( isset($Settings["Connections"]) )
+         if (isset($Settings["Connections"]))
           {
-           foreach($Settings["Connections"] as $ID => $NodeID)
+           foreach ($Settings["Connections"] as $ID => $NodeID)
             {
-             if ( isset($this->Data[$NodeID]) )
+             if (isset($this->Data[$NodeID]))
               {
                $X2 = $this->Data[$NodeID]["X"];
                $Y2 = $this->Data[$NodeID]["Y"];
                $FreeZone = $this->Data[$Key2]["FreeZone"];
 
-               $Distance = $this->getDistance($X1,$Y1,$X2,$Y2);
-               $Angle    = $this->getAngle($X1,$Y1,$X2,$Y2);
+               $Distance = $this->getDistance($X1, $Y1, $X2, $Y2);
+               $Angle    = $this->getAngle($X1, $Y1, $X2, $Y2);
 
-               if ( $Distance > $FreeZone )
-                $Force = log(($Distance-$FreeZone)+1);
+               if ($Distance > $FreeZone)
+                $Force = log(($Distance - $FreeZone) + 1);
                else
-                { $Force = log(($FreeZone-$Distance)+1); ($Angle = $Angle + 180); }
+                { $Force = log(($FreeZone - $Distance) + 1); ($Angle = $Angle + 180); }
 
-               if ( $Force > 1 )
-                $this->Data[$Key]["Vectors"][] = array("Type"=>"A","Angle"=>$Angle % 360,"Force"=>$Force);
+               if ($Force > 1)
+                $this->Data[$Key]["Vectors"][] = array("Type"=>"A", "Angle"=>$Angle%360, "Force"=>$Force);
               }
             }
           }
@@ -499,22 +499,22 @@ 
       }
 
      /* Move the nodes accoding to the vectors */
-     foreach($this->Data as $Key => $Settings)
+     foreach ($this->Data as $Key => $Settings)
       {
        $X = $Settings["X"];
        $Y = $Settings["Y"];
 
-       if ( isset($Settings["Vectors"]) && $Settings["Type"] != NODE_TYPE_CENTRAL )
+       if (isset($Settings["Vectors"]) && $Settings["Type"] != NODE_TYPE_CENTRAL)
         {
-         foreach($Settings["Vectors"] as $ID => $Vector)
+         foreach ($Settings["Vectors"] as $ID => $Vector)
           {
            $Type  = $Vector["Type"];
            $Force = $Vector["Force"];
            $Angle = $Vector["Angle"];
            $Factor = $Type == "A" ? $this->MagneticForceA : $this->MagneticForceR;
 
-           $X = cos(deg2rad($Angle)) * $Force * $Factor + $X;
-           $Y = sin(deg2rad($Angle)) * $Force * $Factor + $Y;
+           $X = cos(deg2rad($Angle))*$Force*$Factor + $X;
+           $Y = sin(deg2rad($Angle))*$Force*$Factor + $Y;
           }
         }
 
@@ -526,15 +526,15 @@ 
    function lastPass()
     {
      /* Put everything inside the graph area */
-     foreach($this->Data as $Key => $Settings)
+     foreach ($this->Data as $Key => $Settings)
       {
        $X = $Settings["X"];
        $Y = $Settings["Y"];
 
-       if ( $X < $this->X1 ) { $X = $this->X1; }
-       if ( $X > $this->X2 ) { $X = $this->X2; }
-       if ( $Y < $this->Y1 ) { $Y = $this->Y1; }
-       if ( $Y > $this->Y2 ) { $Y = $this->Y2; }
+       if ($X < $this->X1) { $X = $this->X1; }
+       if ($X > $this->X2) { $X = $this->X2; }
+       if ($Y < $this->Y1) { $Y = $this->Y1; }
+       if ($Y > $this->Y2) { $Y = $this->Y2; }
 
        $this->Data[$Key]["X"] = $X;
        $this->Data[$Key]["Y"] = $Y;
@@ -542,21 +542,21 @@ 
 
      /* Dump all links */
      $Links = "";
-     foreach($this->Data as $Key => $Settings)
+     foreach ($this->Data as $Key => $Settings)
       {
        $X1 = $Settings["X"];
        $Y1 = $Settings["Y"];
 
-       if ( isset($Settings["Connections"]) )
+       if (isset($Settings["Connections"]))
         {
          foreach ($Settings["Connections"] as $ID => $NodeID)
           {
-           if ( isset($this->Data[$NodeID]) )
+           if (isset($this->Data[$NodeID]))
             {
              $X2 = $this->Data[$NodeID]["X"];
              $Y2 = $this->Data[$NodeID]["Y"];
 
-             $Links[] = array("X1"=>$X1,"Y1"=>$Y1,"X2"=>$X2,"Y2"=>$Y2,"Source"=>$Settings["Name"],"Destination"=>$this->Data[$NodeID]["Name"]);
+             $Links[] = array("X1"=>$X1, "Y1"=>$Y1, "X2"=>$X2, "Y2"=>$Y2, "Source"=>$Settings["Name"], "Destination"=>$this->Data[$NodeID]["Name"]);
             }
           }
         }
@@ -564,29 +564,29 @@ 
 
      /* Check collisions */
      $Conflicts = 0;
-     foreach($this->Data as $Key => $Settings)
+     foreach ($this->Data as $Key => $Settings)
       {
        $X1 = $Settings["X"];
        $Y1 = $Settings["Y"];
 
-       if ( isset($Settings["Connections"]) )
+       if (isset($Settings["Connections"]))
         {
          foreach ($Settings["Connections"] as $ID => $NodeID)
           {
-           if ( isset($this->Data[$NodeID]) )
+           if (isset($this->Data[$NodeID]))
             {
              $X2 = $this->Data[$NodeID]["X"];
              $Y2 = $this->Data[$NodeID]["Y"];
 
-             foreach($Links as $IDLinks => $Link)
+             foreach ($Links as $IDLinks => $Link)
               {
                $X3 = $Link["X1"]; $Y3 = $Link["Y1"]; $X4 = $Link["X2"]; $Y4 = $Link["Y2"];
 
-               if ( !($X1 == $X3 && $X2 == $X4 && $Y1 == $Y3 && $Y2 == $Y4 ) )
+               if (!($X1 == $X3 && $X2 == $X4 && $Y1 == $Y3 && $Y2 == $Y4))
                 {
-                 if ( $this->intersect($X1,$Y1,$X2,$Y2,$X3,$Y3,$X4,$Y4) )
+                 if ($this->intersect($X1, $Y1, $X2, $Y2, $X3, $Y3, $X4, $Y4))
                   {
-                   if ( $Link["Source"] != $Settings["Name"] && $Link["Source"] != $this->Data[$NodeID]["Name"] && $Link["Destination"] != $Settings["Name"] && $Link["Destination"] != $this->Data[$NodeID]["Name"] )
+                   if ($Link["Source"] != $Settings["Name"] && $Link["Source"] != $this->Data[$NodeID]["Name"] && $Link["Destination"] != $Settings["Name"] && $Link["Destination"] != $this->Data[$NodeID]["Name"])
                     { $Conflicts++; }
                   }
                 }
@@ -602,31 +602,31 @@ 
    function center()
     {
      /* Determine the real center */
-     $TargetCenterX = ($this->X2 - $this->X1) / 2 + $this->X1;
-     $TargetCenterY = ($this->Y2 - $this->Y1) / 2 + $this->Y1;
+     $TargetCenterX = ($this->X2 - $this->X1)/2 + $this->X1;
+     $TargetCenterY = ($this->Y2 - $this->Y1)/2 + $this->Y1;
 
      /* Get current boundaries */
      $XMin = $this->X2; $XMax = $this->X1;
      $YMin = $this->Y2; $YMax = $this->Y1;
-     foreach($this->Data as $Key => $Settings)
+     foreach ($this->Data as $Key => $Settings)
       {
        $X = $Settings["X"];
        $Y = $Settings["Y"];
 
-       if ( $X < $XMin) { $XMin = $X; }
-       if ( $X > $XMax) { $XMax = $X; }
-       if ( $Y < $YMin) { $YMin = $Y; }
-       if ( $Y > $YMax) { $YMax = $Y; }
+       if ($X < $XMin) { $XMin = $X; }
+       if ($X > $XMax) { $XMax = $X; }
+       if ($Y < $YMin) { $YMin = $Y; }
+       if ($Y > $YMax) { $YMax = $Y; }
       }
-     $CurrentCenterX = ($XMax - $XMin) / 2 + $XMin;
-     $CurrentCenterY = ($YMax - $YMin) / 2 + $YMin;
+     $CurrentCenterX = ($XMax - $XMin)/2 + $XMin;
+     $CurrentCenterY = ($YMax - $YMin)/2 + $YMin;
 
      /* Compute the offset to apply */
      $XOffset = $TargetCenterX - $CurrentCenterX;
      $YOffset = $TargetCenterY - $CurrentCenterY;
 
      /* Correct the points position */
-     foreach($this->Data as $Key => $Settings)
+     foreach ($this->Data as $Key => $Settings)
       {
        $this->Data[$Key]["X"] = $Settings["X"] + $XOffset;
        $this->Data[$Key]["Y"] = $Settings["Y"] + $YOffset;
@@ -634,20 +634,20 @@ 
     }
 
    /* Create the encoded string */
-   function drawSpring($Object,$Settings="")
+   function drawSpring($Object, $Settings = "")
     {
      $this->pChartObject = $Object;
 
-     $Pass			= isset($Settings["Pass"]) ? $Settings["Pass"] : 50;
-     $Retries			= isset($Settings["Retry"]) ? $Settings["Retry"] : 10;
+     $Pass = isset($Settings["Pass"]) ? $Settings["Pass"] : 50;
+     $Retries = isset($Settings["Retry"]) ? $Settings["Retry"] : 10;
      $this->MagneticForceA	= isset($Settings["MagneticForceA"]) ? $Settings["MagneticForceA"] : 1.5;
      $this->MagneticForceR	= isset($Settings["MagneticForceR"]) ? $Settings["MagneticForceR"] : 2;
-     $this->RingSize		= isset($Settings["RingSize"]) ? $Settings["RingSize"] : 40;
+     $this->RingSize = isset($Settings["RingSize"]) ? $Settings["RingSize"] : 40;
      $DrawVectors		= isset($Settings["DrawVectors"]) ? $Settings["DrawVectors"] : FALSE;
-     $DrawQuietZone		= isset($Settings["DrawQuietZone"]) ? $Settings["DrawQuietZone"] : FALSE;
+     $DrawQuietZone = isset($Settings["DrawQuietZone"]) ? $Settings["DrawQuietZone"] : FALSE;
      $CenterGraph		= isset($Settings["CenterGraph"]) ? $Settings["CenterGraph"] : TRUE;
      $TextPadding		= isset($Settings["TextPadding"]) ? $Settings["TextPadding"] : 4;
-     $Algorithm			= isset($Settings["Algorithm"]) ? $Settings["Algorithm"] : ALGORITHM_WEIGHTED;
+     $Algorithm = isset($Settings["Algorithm"]) ? $Settings["Algorithm"] : ALGORITHM_WEIGHTED;
 
      $FontSize		= $Object->FontSize;
      $this->X1		= $Object->GraphAreaX1;
@@ -656,7 +656,7 @@ 
      $this->Y2		= $Object->GraphAreaY2;
 
      $Conflicts = 1; $Jobs = 0; $this->History["MinimumConflicts"] = -1;
-     while ($Conflicts != 0 && $Jobs < $Retries )
+     while ($Conflicts != 0 && $Jobs < $Retries)
       {
        $Jobs++;
 
@@ -664,70 +664,70 @@ 
        $this->firstPass($Algorithm);
 
        /* Apply the vectors */
-       if ( $Pass > 0 ) 
+       if ($Pass > 0) 
         {
-         for ($i=0; $i<=$Pass; $i++) { $this->doPass(); }
+         for ($i = 0; $i <= $Pass; $i++) { $this->doPass(); }
         }
 
        $Conflicts = $this->lastPass();
-       if ( $this->History["MinimumConflicts"] == -1 || $Conflicts < $this->History["MinimumConflicts"] )
+       if ($this->History["MinimumConflicts"] == -1 || $Conflicts < $this->History["MinimumConflicts"])
         { $this->History["MinimumConflicts"] = $Conflicts; $this->History["Result"] = $this->Data; }
       }
 
      $Conflicts  = $this->History["MinimumConflicts"];
      $this->Data = $this->History["Result"];
 
-     if ( $CenterGraph ) { $this->center(); }
+     if ($CenterGraph) { $this->center(); }
 
      /* Draw the connections */
      $Drawn = "";
-     foreach($this->Data as $Key => $Settings)
+     foreach ($this->Data as $Key => $Settings)
       {
        $X	= $Settings["X"];
        $Y	= $Settings["Y"];
 
-       if ( isset($Settings["Connections"]) )
+       if (isset($Settings["Connections"]))
         {
          foreach ($Settings["Connections"] as $ID => $NodeID)
           {
-           if ( !isset($Drawn[$Key]) )    { $Drawn[$Key] = ""; }
-           if ( !isset($Drawn[$NodeID]) ) { $Drawn[$NodeID] = ""; }
+           if (!isset($Drawn[$Key])) { $Drawn[$Key] = ""; }
+           if (!isset($Drawn[$NodeID])) { $Drawn[$NodeID] = ""; }
 
-           if ( isset($this->Data[$NodeID]) && !isset($Drawn[$Key][$NodeID]) && !isset($Drawn[$NodeID][$Key]) )
+           if (isset($this->Data[$NodeID]) && !isset($Drawn[$Key][$NodeID]) && !isset($Drawn[$NodeID][$Key]))
             {
-             $Color = array("R"=>$this->Default["LinkR"],"G"=>$this->Default["LinkG"],"B"=>$this->Default["LinkB"],"Alpha"=>$this->Default["Alpha"]);
+             $Color = array("R"=>$this->Default["LinkR"], "G"=>$this->Default["LinkG"], "B"=>$this->Default["LinkB"], "Alpha"=>$this->Default["Alpha"]);
 
-             if ( $this->Links != "" )
+             if ($this->Links != "")
               {
-               if ( isset($this->Links[$Key][$NodeID]["R"]) )
-                { $Color = array("R"=>$this->Links[$Key][$NodeID]["R"],"G"=>$this->Links[$Key][$NodeID]["G"],"B"=>$this->Links[$Key][$NodeID]["B"],"Alpha"=>$this->Links[$Key][$NodeID]["Alpha"]); }
+               if (isset($this->Links[$Key][$NodeID]["R"]))
+                { $Color = array("R"=>$this->Links[$Key][$NodeID]["R"], "G"=>$this->Links[$Key][$NodeID]["G"], "B"=>$this->Links[$Key][$NodeID]["B"], "Alpha"=>$this->Links[$Key][$NodeID]["Alpha"]); }
 
-               if ( isset($this->Links[$Key][$NodeID]["Ticks"]) )
+               if (isset($this->Links[$Key][$NodeID]["Ticks"]))
                  { $Color["Ticks"] = $this->Links[$Key][$NodeID]["Ticks"]; }
               }
 
              $X2 = $this->Data[$NodeID]["X"];
              $Y2 = $this->Data[$NodeID]["Y"];
-             $this->pChartObject->drawLine($X,$Y,$X2,$Y2,$Color);
+             $this->pChartObject->drawLine($X, $Y, $X2, $Y2, $Color);
              $Drawn[$Key][$NodeID] = TRUE;
 
-             if ( isset($this->Links) && $this->Links != "" )
+             if (isset($this->Links) && $this->Links != "")
               {
-               if ( isset($this->Links[$Key][$NodeID]["Name"]) || isset($this->Links[$NodeID][$Key]["Name"]) )
+               if (isset($this->Links[$Key][$NodeID]["Name"]) || isset($this->Links[$NodeID][$Key]["Name"]))
                 {
                  $Name  = isset($this->Links[$Key][$NodeID]["Name"]) ? $this->Links[$Key][$NodeID]["Name"] : $this->Links[$NodeID][$Key]["Name"];
                  $TxtX  = ($X2 - $X)/2 + $X;
                  $TxtY  = ($Y2 - $Y)/2 + $Y;
 
-                 if ( $X <= $X2 )
-                  $Angle = (360-$this->getAngle($X,$Y,$X2,$Y2)) % 360;
+                 if ($X <= $X2)
+                  $Angle = (360 - $this->getAngle($X, $Y, $X2, $Y2))%360;
                  else
-                  $Angle = (360-$this->getAngle($X2,$Y2,$X,$Y)) % 360;
+                  $Angle = (360 - $this->getAngle($X2, $Y2, $X, $Y))%360;
 
                  $Settings          = $Color;
                  $Settings["Angle"] = $Angle;
                  $Settings["Align"] = TEXT_ALIGN_BOTTOMMIDDLE;
-                 $this->pChartObject->drawText($TxtX,$TxtY,$Name,$Settings);
+                 $this->pChartObject->drawText($TxtX, $TxtY, $Name, $Settings);
                 }
               }
             }
@@ -736,59 +736,59 @@ 
       }
 
      /* Draw the quiet zones */
-     if ( $DrawQuietZone )
+     if ($DrawQuietZone)
       {
-       foreach($this->Data as $Key => $Settings)
+       foreach ($this->Data as $Key => $Settings)
         {
          $X	 = $Settings["X"];
          $Y	 = $Settings["Y"];
          $FreeZone = $Settings["FreeZone"];
 
-         $this->pChartObject->drawFilledCircle($X,$Y,$FreeZone,array("R"=>0,"G"=>0,"B"=>0,"Alpha"=>2));
+         $this->pChartObject->drawFilledCircle($X, $Y, $FreeZone, array("R"=>0, "G"=>0, "B"=>0, "Alpha"=>2));
         }
       }
 
 
      /* Draw the nodes */
-     foreach($this->Data as $Key => $Settings)
+     foreach ($this->Data as $Key => $Settings)
       {
        $X	 = $Settings["X"];
        $Y	 = $Settings["Y"];
-       $Name	 = $Settings["Name"];
+       $Name = $Settings["Name"];
        $FreeZone = $Settings["FreeZone"];
        $Shape    = $Settings["Shape"];
        $Size     = $Settings["Size"];
 
-       $Color	 = array("R"=>$Settings["R"],"G"=>$Settings["G"],"B"=>$Settings["B"],"Alpha"=>$Settings["Alpha"],"BorderR"=>$Settings["BorderR"],"BorderG"=>$Settings["BorderG"],"BorderB"=>$Settings["BorderB"],"BorderApha"=>$Settings["BorderAlpha"]);
+       $Color = array("R"=>$Settings["R"], "G"=>$Settings["G"], "B"=>$Settings["B"], "Alpha"=>$Settings["Alpha"], "BorderR"=>$Settings["BorderR"], "BorderG"=>$Settings["BorderG"], "BorderB"=>$Settings["BorderB"], "BorderApha"=>$Settings["BorderAlpha"]);
 
-       if ( $Shape == NODE_SHAPE_CIRCLE )
+       if ($Shape == NODE_SHAPE_CIRCLE)
         {
-         $this->pChartObject->drawFilledCircle($X,$Y,$Size,$Color);
+         $this->pChartObject->drawFilledCircle($X, $Y, $Size, $Color);
         }
-       elseif ( $Shape == NODE_SHAPE_TRIANGLE )
+       elseif ($Shape == NODE_SHAPE_TRIANGLE)
         {
          $Points = "";
-         $Points[] = cos(deg2rad(270)) * $Size + $X; $Points[] = sin(deg2rad(270)) * $Size + $Y;
-         $Points[] = cos(deg2rad(45)) * $Size + $X;  $Points[] = sin(deg2rad(45)) * $Size + $Y;
-         $Points[] = cos(deg2rad(135)) * $Size + $X; $Points[] = sin(deg2rad(135)) * $Size + $Y;
-         $this->pChartObject->drawPolygon($Points,$Color);
+         $Points[] = cos(deg2rad(270))*$Size + $X; $Points[] = sin(deg2rad(270))*$Size + $Y;
+         $Points[] = cos(deg2rad(45))*$Size + $X; $Points[] = sin(deg2rad(45))*$Size + $Y;
+         $Points[] = cos(deg2rad(135))*$Size + $X; $Points[] = sin(deg2rad(135))*$Size + $Y;
+         $this->pChartObject->drawPolygon($Points, $Color);
         }
-       elseif ( $Shape == NODE_SHAPE_SQUARE )
+       elseif ($Shape == NODE_SHAPE_SQUARE)
         {
-         $Offset = $Size/2; $Size = $Size / 2;
-         $this->pChartObject->drawFilledRectangle($X-$Offset,$Y-$Offset,$X+$Offset,$Y+$Offset,$Color);
+         $Offset = $Size/2; $Size = $Size/2;
+         $this->pChartObject->drawFilledRectangle($X - $Offset, $Y - $Offset, $X + $Offset, $Y + $Offset, $Color);
         }
 
-       if ( $Name != "" )
+       if ($Name != "")
         {
-         $LabelOptions = array("R"=>$this->Labels["R"],"G"=>$this->Labels["G"],"B"=>$this->Labels["B"],"Alpha"=>$this->Labels["Alpha"]);
+         $LabelOptions = array("R"=>$this->Labels["R"], "G"=>$this->Labels["G"], "B"=>$this->Labels["B"], "Alpha"=>$this->Labels["Alpha"]);
 
-         if ( $this->Labels["Type"] == LABEL_LIGHT )
+         if ($this->Labels["Type"] == LABEL_LIGHT)
           {
            $LabelOptions["Align"] = TEXT_ALIGN_BOTTOMLEFT;
-           $this->pChartObject->drawText($X,$Y,$Name,$LabelOptions);
+           $this->pChartObject->drawText($X, $Y, $Name, $LabelOptions);
           }
-         elseif ( $this->Labels["Type"] == LABEL_CLASSIC )
+         elseif ($this->Labels["Type"] == LABEL_CLASSIC)
           {
            $LabelOptions["Align"]         = TEXT_ALIGN_TOPMIDDLE;
            $LabelOptions["DrawBox"]       = TRUE;
@@ -798,67 +798,67 @@ 
            $LabelOptions["BoxRounded"]    = TRUE;
            $LabelOptions["NoShadow"]      = TRUE;
 
-           $this->pChartObject->drawText($X,$Y+$Size+$TextPadding,$Name,$LabelOptions);
+           $this->pChartObject->drawText($X, $Y + $Size + $TextPadding, $Name, $LabelOptions);
           }
         }
       }
 
      /* Draw the vectors */
-     if ( $DrawVectors )
+     if ($DrawVectors)
       {
-       foreach($this->Data as $Key => $Settings)
+       foreach ($this->Data as $Key => $Settings)
         {
          $X1 = $Settings["X"];
          $Y1 = $Settings["Y"];
 
-         if ( isset($Settings["Vectors"]) && $Settings["Type"] != NODE_TYPE_CENTRAL )
+         if (isset($Settings["Vectors"]) && $Settings["Type"] != NODE_TYPE_CENTRAL)
           {
-           foreach($Settings["Vectors"] as $ID => $Vector)
+           foreach ($Settings["Vectors"] as $ID => $Vector)
             {
              $Type  = $Vector["Type"];
              $Force = $Vector["Force"];
              $Angle = $Vector["Angle"];
              $Factor = $Type == "A" ? $this->MagneticForceA : $this->MagneticForceR;
-             $Color  = $Type == "A" ? array("FillR"=>255,"FillG"=>0,"FillB"=>0) : array("FillR"=>0,"FillG"=>255,"FillB"=>0);
+             $Color  = $Type == "A" ? array("FillR"=>255, "FillG"=>0, "FillB"=>0) : array("FillR"=>0, "FillG"=>255, "FillB"=>0);
 
-             $X2 = cos(deg2rad($Angle)) * $Force * $Factor + $X1;
-             $Y2 = sin(deg2rad($Angle)) * $Force * $Factor + $Y1;
+             $X2 = cos(deg2rad($Angle))*$Force*$Factor + $X1;
+             $Y2 = sin(deg2rad($Angle))*$Force*$Factor + $Y1;
 
-             $this->pChartObject->drawArrow($X1,$Y1,$X2,$Y2,$Color);
+             $this->pChartObject->drawArrow($X1, $Y1, $X2, $Y2, $Color);
             }
           }
         }
       }
 
-     return(array("Pass"=>$Jobs,"Conflicts"=>$Conflicts));
+     return(array("Pass"=>$Jobs, "Conflicts"=>$Conflicts));
     }
 
    /* Return the distance between two points */
-   function getDistance($X1,$Y1,$X2,$Y2)
-    { return (sqrt(($X2-$X1)*($X2-$X1)+($Y2-$Y1)*($Y2-$Y1))); }
+   function getDistance($X1, $Y1, $X2, $Y2)
+    { return (sqrt(($X2 - $X1)*($X2 - $X1) + ($Y2 - $Y1)*($Y2 - $Y1))); }
 
    /* Return the angle made by a line and the X axis */
-   function getAngle($X1,$Y1,$X2,$Y2)
+   function getAngle($X1, $Y1, $X2, $Y2)
     {
-     $Opposite = $Y2 - $Y1; $Adjacent = $X2 - $X1;$Angle = rad2deg(atan2($Opposite,$Adjacent));
-     if ($Angle > 0) { return($Angle); } else { return(360-abs($Angle)); }
+     $Opposite = $Y2 - $Y1; $Adjacent = $X2 - $X1; $Angle = rad2deg(atan2($Opposite, $Adjacent));
+     if ($Angle > 0) { return($Angle); } else { return(360 - abs($Angle)); }
     }
 
-   function intersect($X1,$Y1,$X2,$Y2,$X3,$Y3,$X4,$Y4)
+   function intersect($X1, $Y1, $X2, $Y2, $X3, $Y3, $X4, $Y4)
     {
-     $A = (($X3 * $Y4 - $X4 * $Y3) * ($X1 - $X2) - ($X1 * $Y2 - $X2 * $Y1) * ($X3 - $X4));
-     $B = (($Y1 - $Y2) * ($X3 - $X4) - ($Y3 - $Y4) * ($X1 - $X2));
+     $A = (($X3*$Y4 - $X4*$Y3)*($X1 - $X2) - ($X1*$Y2 - $X2*$Y1)*($X3 - $X4));
+     $B = (($Y1 - $Y2)*($X3 - $X4) - ($Y3 - $Y4)*($X1 - $X2));
 
-     if ( $B == 0 ) { return(FALSE); }
-     $Xi = $A / $B;
+     if ($B == 0) { return(FALSE); }
+     $Xi = $A/$B;
 
      $C = ($X1 - $X2);
-     if ( $C == 0 ) { return(FALSE); }
-     $Yi = $Xi * (($Y1 - $Y2)/$C) + (($X1 * $Y2 - $X2 * $Y1)/$C);
+     if ($C == 0) { return(FALSE); }
+     $Yi = $Xi*(($Y1 - $Y2)/$C) + (($X1*$Y2 - $X2*$Y1)/$C);
 
-     if ( $Xi >= min($X1,$X2) && $Xi >= min($X3,$X4) && $Xi <= max($X1,$X2) && $Xi <= max($X3,$X4))
+     if ($Xi >= min($X1, $X2) && $Xi >= min($X3, $X4) && $Xi <= max($X1, $X2) && $Xi <= max($X3, $X4))
       {
-       if ( $Yi >= min($Y1,$Y2) && $Yi >= min($Y3,$Y4) && $Yi <= max($Y1,$Y2) && $Yi <= max($Y3,$Y4))
+       if ($Yi >= min($Y1, $Y2) && $Yi >= min($Y3, $Y4) && $Yi <= max($Y1, $Y2) && $Yi <= max($Y3, $Y4))
         { return(TRUE); }
       }