dimaslanjaka / universal-framework

etc/superuser/npm/registry.php

Spacing +4 added lines, -4 removed lines

@@ -22,7 +22,7 @@ 
 if (isset($package['devDependencies'])) {
   $packages = array_merge($package['devDependencies'], $packages);
 }
-$packages = array_map(function ($pkg) {
+$packages = array_map(function($pkg) {
   //var_dump($pkg);
   if (false === strpos($pkg, '@types/')) {
     return $pkg;
@@ -31,19 +31,19 @@ 
   }
 }, array_keys($packages));
 $packages = array_values(array_filter($packages));
-$packages = array_map(function ($pkg) {
+$packages = array_map(function($pkg) {
   return "@types/$pkg";
 }, $packages);
 
 if (isset($package['devDependencies'])) {
-  array_map(function ($types) {
+  array_map(function($types) {
     $package['devDependencies'][$types] = '*';
   }, $packages);
 }
 
 \Filemanager\file::file($location, $package, true);
 
-$cmd = function ($pkg) {
+$cmd = function($pkg) {
   return 'cd ' . ROOT . ' && echo "Installing ' . $pkg . ' On %cd%" && ';
 };
 

etc/superuser/coupon/list.php

Spacing +1 added lines, -1 removed lines

@@ -35,7 +35,7 @@
 $data = $p->fetchAll();
 $result['recordsTotal'] = count($data);
 $result['recordsFiltered'] = (int) count($data);
-$data_filter = array_map(function ($map_data) {
+$data_filter = array_map(function($map_data) {
   $i = 0;
   foreach ($map_data as $key => $value) {
     if (is_numeric($value)) {

src/DB/pdo.php

Spacing +2 added lines, -2 removed lines

@@ -139,7 +139,7 @@ 
    *
    * @return $this
    */
-  public function switch(string $dbname)
+  public function switch (string $dbname)
   {
     $this->query('USE ' . $dbname)->exec();
 
@@ -724,7 +724,7 @@ 
     $this->query = '';
     if ($filter) {
       if (!empty($exec) && is_array($exec)) {
-        $filtered = array_map(function ($data) use ($filter) {
+        $filtered = array_map(function($data) use ($filter) {
           if (isset($data[$filter])) {
             return $data[$filter];
           }

etc/server/websocket/websockets.php

Indentation +5 added lines, -5 removed lines

@@ -263,8 +263,8 @@ 
   protected function checkHost($hostName)
   {
     return true; // Override and return false if the host is not one that you would expect.
-     // Ex: You only want to accept hosts from the my-domain.com domain,
-     // but you receive a host from malicious-site.com instead.
+      // Ex: You only want to accept hosts from the my-domain.com domain,
+      // but you receive a host from malicious-site.com instead.
   }
 
   protected function checkOrigin($origin)
@@ -285,9 +285,9 @@ 
   protected function processProtocol($protocol)
   {
     return ''; // return either "Sec-WebSocket-Protocol: SelectedProtocolFromClientList\r\n" or return an empty string.
-     // The carriage return/newline combo must appear at the end of a non-empty string, and must not
-     // appear at the beginning of the string nor in an otherwise empty string, or it will be considered part of
-     // the response body, which will trigger an error in the client as it will not be formatted correctly.
+      // The carriage return/newline combo must appear at the end of a non-empty string, and must not
+      // appear at the beginning of the string nor in an otherwise empty string, or it will be considered part of
+      // the response body, which will trigger an error in the client as it will not be formatted correctly.
   }
 
   protected function processExtensions($extensions)

etc/server/msisdn.php

Spacing +1 added lines, -1 removed lines

@@ -5,7 +5,7 @@
   $pdo->where(['simcard' => strtolower($_REQUEST['simcard'])]);
 }
 $row = $pdo->row_array();
-$row = array_map(function ($db) {
+$row = array_map(function($db) {
   if (isset($db['msisdn'])) {
     if (strlen($db['msisdn']) <= 7) return;
     return $db['msisdn'];

Braces +3 added lines, -1 removed lines

@@ -7,7 +7,9 @@
 $row = $pdo->row_array();
 $row = array_map(function ($db) {
   if (isset($db['msisdn'])) {
-    if (strlen($db['msisdn']) <= 7) return;
+    if (strlen($db['msisdn']) <= 7) {
+      return;
+    }
     return $db['msisdn'];
   }
 }, $row);

etc/server/comments/func.php

Braces +3 added lines, -2 removed lines

@@ -19,8 +19,9 @@
     $url .= "?s=$s&d=$d&r=$r";
     if ($img) {
         $url = '<img src="' . $url . '"';
-        foreach ($atts as $key => $val)
-            $url .= ' ' . $key . '="' . $val . '"';
+        foreach ($atts as $key => $val) {
+                    $url .= ' ' . $key . '="' . $val . '"';
+        }
         $url .= ' />';
     }
     return $url;

etc/server/comments/class.php

Spacing +2 added lines, -2 removed lines

@@ -345,7 +345,7 @@ 
     return $html;
   }
 
-  function generateForm($location =  '', $type = 0, $comment = false)
+  function generateForm($location = '', $type = 0, $comment = false)
   {
     $this->setToken();
     if ($location == '')
@@ -735,7 +735,7 @@ 
     $sql = "SELECT `id` FROM `" . $this->settings['comments_table'] . "` WHERE `parent` = 0 ";
 
     if ($pageid)
-      $sql .=  " AND `pageid`='" . (int) $pageid . "'";
+      $sql .= " AND `pageid`='" . (int) $pageid . "'";
 
 
     $total = mysqli_num_rows(mysqli_query($this->link, $sql));

Braces +143 added lines, -97 removed lines

@@ -47,13 +47,16 @@ 
    */
   function __construct($db_details, $settings = array())
   {
-    if (session_id() == '')
-      session_start();
+    if (session_id() == '') {
+          session_start();
+    }
 
     // we first manage the mysql connection
     $this->link = @mysqli_connect($db_details['db_host'], $db_details['db_user'], $db_details['db_pass']);
 
-    if (!$this->link) die('Connect Error (' . mysqli_connect_errno() . ') ' . mysqli_connect_error());
+    if (!$this->link) {
+      die('Connect Error (' . mysqli_connect_errno() . ') ' . mysqli_connect_error());
+    }
 
     mysqli_select_db($this->link, $db_details['db_name']) or die(mysqli_error($this->link));
 
@@ -63,8 +66,9 @@ 
     $this->settings['comments_table'] = str_replace("`", "``", $this->settings['comments_table']);
 
     // auto install
-    if ($this->settings['auto_install'] && !@mysqli_num_rows(mysqli_query($this->link, "SELECT `id` FROM `" . $this->settings['comments_table'] . "`")))
-      $this->install();
+    if ($this->settings['auto_install'] && !@mysqli_num_rows(mysqli_query($this->link, "SELECT `id` FROM `" . $this->settings['comments_table'] . "`"))) {
+          $this->install();
+    }
 
 
     // edit comment
@@ -79,17 +83,21 @@ 
 
 
     // delete comment
-    if (isset($_POST['comm_del']))
-      if ($this->delComm($_POST['comm_del']))
+    if (isset($_POST['comm_del'])) {
+          if ($this->delComm($_POST['comm_del']))
         $this->success = "Comment deleted !";
+    }
 
     // bann ip
-    if (isset($_GET['comm_ban']) && $this->banIP($_GET['comm_ban'])) // we banned the ip
+    if (isset($_GET['comm_ban']) && $this->banIP($_GET['comm_ban'])) {
+      // we banned the ip
       $this->success = "IP banned !";
+    }
 
     // UnBann ip
-    if (isset($_GET['comm_unban']) && $this->unBanIP($_GET['comm_unban']))
-      $this->success = "IP UnBanned !";
+    if (isset($_GET['comm_unban']) && $this->unBanIP($_GET['comm_unban'])) {
+          $this->success = "IP UnBanned !";
+    }
 
     return true;
   }
@@ -98,8 +106,9 @@ 
 
   function grabComment($pageid, $update_id = false)
   {
-    if (session_id() == '')
-      session_start();
+    if (session_id() == '') {
+          session_start();
+    }
 
     $_SESSION['comm_pageid'] = $pageid;
 
@@ -144,20 +153,22 @@ 
 
 
       // we check in case the email is not valid
-      if (!$this->settings['optional_email'])
-        if (!$this->isValidMail($email)) {
+      if (!$this->settings['optional_email']) {
+              if (!$this->isValidMail($email)) {
           $this->error = "Invalid email !";
+      }
           return false;
         }
 
 
       // we check if it's an update or a new message 
       if ($update_id) {
-        if ($this->settings['public'])
-          $upd_fields = ",`name` = '" . mysqli_real_escape_string($this->link, $name) . "',
+        if ($this->settings['public']) {
+                  $upd_fields = ",`name` = '" . mysqli_real_escape_string($this->link, $name) . "',
 									`email` = '" . mysqli_real_escape_string($this->link, $email) . "'";
-        else
-          $upd_fields = '';
+        } else {
+                  $upd_fields = '';
+        }
 
 
         if (mysqli_query($this->link, "UPDATE `" . $this->settings['comments_table'] . "` SET 
@@ -176,10 +187,11 @@ 
         isset($_POST['comm_reply']) &&
         mysqli_num_rows(mysqli_query($this->link, "SELECT `id` FROM `" . $this->settings['comments_table'] . "` 
 					WHERE `id`= '" . (int) $_POST['comm_reply'] . "' AND `parent`  = '0'"))
-      )
-        $reply = ",`parent` = '" . (int) $_POST['comm_reply'] . "'";
-      else
-        $reply = '';
+      ) {
+              $reply = ",`parent` = '" . (int) $_POST['comm_reply'] . "'";
+      } else {
+              $reply = '';
+      }
 
 
 
@@ -216,8 +228,9 @@ 
   function generateComments($pageid = 0, $perpage = 10)
   {
 
-    if (session_id() == '')
-      session_start();
+    if (session_id() == '') {
+          session_start();
+    }
 
     $_SESSION['comm_pageid'] = $pageid;
 
@@ -230,8 +243,9 @@ 
     // we generate the output of the comments
     if ($comments) {
       foreach ($comments as $comment) {
-        if (!($name = $this->getUsername($comment->name)))
-          $name = $comment->name;
+        if (!($name = $this->getUsername($comment->name))) {
+                  $name = $comment->name;
+        }
 
         // show reply link or form
         if (isset($_GET['comm_reply']) && ($comment->id == $_GET['comm_reply'])) {
@@ -295,18 +309,20 @@ 
     $html = "";
     $comments = $this->getReplies($comm_id, $limit);
     // we generate the output of the comments
-    if ($comments)
-      foreach ($comments as $comment) {
+    if ($comments) {
+          foreach ($comments as $comment) {
         if (!($name = $this->getUsername($comment->name)))
           $name = $comment->name;
+    }
 
         // show normal username or with adminStyles
         $style = "";
         if ($comment->isadmin) {
           $show_name = "<span style='" . $this->settings['adminStyle']['username'] . "'>" . $this->html($name) . "</span>";
           $style = $this->settings['adminStyle']['box'];
-        } else
-          $show_name = $this->html($name);
+        } else {
+                  $show_name = $this->html($name);
+        }
 
         // show extra info only to admin
         $show_extra = "";
@@ -325,19 +341,21 @@ 
 				<div class='media-body'>";
 
 
-        if (isset($_GET['comm_edit']) && ($_GET['comm_edit'] === $comment->id) && $this->hasRights($comment))
-          // we generate the form in edit mode with precompleted data
+        if (isset($_GET['comm_edit']) && ($_GET['comm_edit'] === $comment->id) && $this->hasRights($comment)) {
+                  // we generate the form in edit mode with precompleted data
           $html .= $this->generateForm('', 2, $comment);
-        else
-          $html .= "<h4 class='media-heading'>
+        } else {
+                  $html .= "<h4 class='media-heading'>
 						$show_name $show_extra
 						<small class='muted'>" . $this->tsince($comment->time) . " replied </small>
 						" . $this->admin_options($comment) . "
 					</h4>
 					<p>" . nl2br($this->html($comment->message)) . "</p>";
+        }
 
-        if ($is_del)
-          $html .= $this->gennerateConfirm('', 'comm_del', $comment->id);
+        if ($is_del) {
+                  $html .= $this->gennerateConfirm('', 'comm_del', $comment->id);
+        }
 
         $html .= "</div></div>";
       }
@@ -348,19 +366,22 @@ 
   function generateForm($location =  '', $type = 0, $comment = false)
   {
     $this->setToken();
-    if ($location == '')
-      $location = "?" . $this->queryString('', $this->ignore);
+    if ($location == '') {
+          $location = "?" . $this->queryString('', $this->ignore);
+    }
 
 
-    if (!$comment)
-      $comment = (object) array("name" => "", "email" => "", "message" => "");
+    if (!$comment) {
+          $comment = (object) array("name" => "", "email" => "", "message" => "");
+    }
 
-    if ($type == 1)
-      $title = "<input type='hidden' name='comm_reply' value='" . (int) $_GET['comm_reply'] . "'>Post a reply";
-    else if ($type == 2)
-      $title = "<input type='hidden' name='comm_edit' value='" . (int) $_GET['comm_edit'] . "'>Edit comment";
-    else
-      $title = "Post a comment";
+    if ($type == 1) {
+          $title = "<input type='hidden' name='comm_reply' value='" . (int) $_GET['comm_reply'] . "'>Post a reply";
+    } else if ($type == 2) {
+          $title = "<input type='hidden' name='comm_edit' value='" . (int) $_GET['comm_edit'] . "'>Edit comment";
+    } else {
+          $title = "Post a comment";
+    }
 
     $show_name_email = '';
 
@@ -440,8 +461,9 @@ 
 		  UNIQUE KEY `ip` (`ip`)
 		);";
 
-    if (mysqli_query($this->link, $sql) && mysqli_query($this->link, $sql2))
-      return true;
+    if (mysqli_query($this->link, $sql) && mysqli_query($this->link, $sql2)) {
+          return true;
+    }
 
     return false;
   }
@@ -457,8 +479,9 @@ 
 
     $sql = "SELECT * FROM `" . $this->settings['comments_table'] . "` WHERE `parent` = 0 ";
 
-    if ($pageid)
-      $sql .= "AND `pageid` = '" . mysqli_real_escape_string($this->link, $pageid) . "'";
+    if ($pageid) {
+          $sql .= "AND `pageid` = '" . mysqli_real_escape_string($this->link, $pageid) . "'";
+    }
 
     // some sorting options
     $sql .= " " . $this->settings['sort'] . " "; // this is pasted as is
@@ -469,18 +492,20 @@ 
 
     $total_results = mysqli_num_rows(mysqli_query($this->link, $sql));
 
-    if ($page_number > ceil($total_results / $perpage))
-      $page_number = ceil($total_results / $perpage);
+    if ($page_number > ceil($total_results / $perpage)) {
+          $page_number = ceil($total_results / $perpage);
+    }
 
     $start = ($page_number - 1) * $perpage;
 
     $sql .= "LIMIT $start, $perpage";
 
-    if ($result = mysqli_query($this->link, $sql))
-      while ($row = mysqli_fetch_object($result))
+    if ($result = mysqli_query($this->link, $sql)) {
+          while ($row = mysqli_fetch_object($result))
         $comments[] = $row;
-    else
-      return false;
+    } else {
+          return false;
+    }
 
     return $comments;
   }
@@ -500,11 +525,12 @@ 
     // limitation
     $sql .= "LIMIT 0, $limit";
 
-    if ($result = mysqli_query($this->link, $sql))
-      while ($row = mysqli_fetch_object($result))
+    if ($result = mysqli_query($this->link, $sql)) {
+          while ($row = mysqli_fetch_object($result))
         $comments[] = $row;
-    else
-      return false;
+    } else {
+          return false;
+    }
 
     return $comments;
   }
@@ -547,8 +573,9 @@ 
 
     $time = abs(time() - $time); // to get the time since that moment
 
-    if ($time == 0)
-      return "Just now";
+    if ($time == 0) {
+          return "Just now";
+    }
 
     $tokens = array(
       31536000 => 'year',
@@ -561,7 +588,9 @@ 
     );
 
     foreach ($tokens as $unit => $text) {
-      if ($time < $unit) continue;
+      if ($time < $unit) {
+        continue;
+      }
       $numberOfUnits = floor($time / $unit);
       return $numberOfUnits . ' ' . $text . (($numberOfUnits > 1) ? 's' : '') . ' ' . $end_msg;
     }
@@ -570,13 +599,15 @@ 
   function isValidMail($mail)
   {
 
-    if (!filter_var($mail, FILTER_VALIDATE_EMAIL))
-      return FALSE;
+    if (!filter_var($mail, FILTER_VALIDATE_EMAIL)) {
+          return FALSE;
+    }
 
 
     list($username, $maildomain) = explode("@", $mail);
-    if (checkdnsrr($maildomain, "MX"))
-      return TRUE;
+    if (checkdnsrr($maildomain, "MX")) {
+          return TRUE;
+    }
 
     return FALSE;
   }
@@ -633,8 +664,9 @@ 
    */
   function setToken()
   {
-    if (session_id() == '')
-      session_start();
+    if (session_id() == '') {
+          session_start();
+    }
 
     $_SESSION['comm_token'] = md5(time() . rand());
   }
@@ -652,8 +684,9 @@ 
     foreach ($_GET as $k => $v) {
       if ((is_array($ignore) && in_array($k, $ignore))
         || (is_string($ignore) && preg_match($ignore, $k))
-      )
-        continue;
+      ) {
+              continue;
+      }
 
       if ($type == 'hidden') {
         $result .= "<input type='hidden' name='" . urlencode($k) . "' value='" . urlencode($v) . "'>";
@@ -662,8 +695,9 @@ 
       }
     }
 
-    if (is_array($result))
-      return implode("&", $result);
+    if (is_array($result)) {
+          return implode("&", $result);
+    }
 
     return $result;
   }
@@ -676,8 +710,9 @@ 
   function gennerateConfirm($location = '', $info_name = 'comm_del', $info_value = 0, $submit = "I&#39;m sure, Delete")
   {
 
-    if ($location == '')
-      $location = "?" . $this->queryString('', $this->ignore);
+    if ($location == '') {
+          $location = "?" . $this->queryString('', $this->ignore);
+    }
 
     return "<form class='form-horizontal' action='$location' method='post'>
 		<div class='control-group'>
@@ -696,11 +731,13 @@ 
    */
   function hasRights($comment)
   {
-    if (session_id() == '')
-      session_start();
+    if (session_id() == '') {
+          session_start();
+    }
 
-    if ($this->settings['isAdmin'] || (isset($_SESSION['comm_last_id']) && $_SESSION['comm_last_id'] == $comment->id))
-      return true;
+    if ($this->settings['isAdmin'] || (isset($_SESSION['comm_last_id']) && $_SESSION['comm_last_id'] == $comment->id)) {
+          return true;
+    }
     return false;
   }
   /**
@@ -711,13 +748,14 @@ 
   function admin_options($comment)
   {
     // if is admin or the person who posted the message
-    if ($this->hasRights($comment))
-      return "<a href='?" . $this->queryString('', $this->ignore) . "&comm_edit=$comment->id#$comment->id'>Edit</a> 
+    if ($this->hasRights($comment)) {
+          return "<a href='?" . $this->queryString('', $this->ignore) . "&comm_edit=$comment->id#$comment->id'>Edit</a> 
 				| <a href='?" . $this->queryString('', $this->ignore) . "&comm_del=$comment->id#$comment->id'>Delete</a>" .
         ($this->settings['isAdmin'] ? //if is admin 
           " | <a href='?" . $this->queryString('', $this->ignore) . "&comm_" .
           ($this->isBanned($comment->ip) ? "un" : "") . "ban=" . urlencode($comment->ip) . "'>" .
           ($this->isBanned($comment->ip) ? "Un" : "") . "Ban</a>" : "");
+    }
   }
 
 
@@ -734,8 +772,9 @@ 
 
     $sql = "SELECT `id` FROM `" . $this->settings['comments_table'] . "` WHERE `parent` = 0 ";
 
-    if ($pageid)
-      $sql .=  " AND `pageid`='" . (int) $pageid . "'";
+    if ($pageid) {
+          $sql .=  " AND `pageid`='" . (int) $pageid . "'";
+    }
 
 
     $total = mysqli_num_rows(mysqli_query($this->link, $sql));
@@ -748,20 +787,25 @@ 
 
     $html = "<div class='pagination'><ul>";
 
-    if ($page > 4)
-      $html .= "<li><a href='?$query'>First</a></li>";
+    if ($page > 4) {
+          $html .= "<li><a href='?$query'>First</a></li>";
+    }
 
-    if ($page > 1)
-      $html .= "<li><a href='?comm_page=" . ($page - 1) . "$query'>Prev</a> </li>";
+    if ($page > 1) {
+          $html .= "<li><a href='?comm_page=" . ($page - 1) . "$query'>Prev</a> </li>";
+    }
 
-    for ($i = max(1, $page - 3); $i <= min($page + 3, $total_pages); $i++)
-      $html .= ($i == $page ? "<li class='active'><a>" . $i . "</a></li>" : " <li><a href='?comm_page=$i$query'>$i</a></li> ");
+    for ($i = max(1, $page - 3); $i <= min($page + 3, $total_pages); $i++) {
+          $html .= ($i == $page ? "<li class='active'><a>" . $i . "</a></li>" : " <li><a href='?comm_page=$i$query'>$i</a></li> ");
+    }
 
-    if ($page < $total_pages)
-      $html .= "<li><a href='?comm_page=" . ($page + 1) . "$query'>Next</a></li>";
+    if ($page < $total_pages) {
+          $html .= "<li><a href='?comm_page=" . ($page + 1) . "$query'>Next</a></li>";
+    }
 
-    if ($page < $total_pages - 3)
-      $html .= "<li><a href='?comm_page=$total_pages$query'> Last </a></li>";
+    if ($page < $total_pages - 3) {
+          $html .= "<li><a href='?comm_page=$total_pages$query'> Last </a></li>";
+    }
 
     $html .= "</ul></div>";
 
@@ -791,10 +835,11 @@ 
    */
   function banIP($ip)
   {
-    if ($this->settings['isAdmin'])
-      if (mysqli_query($this->link, "INSERT INTO `" . $this->settings['banned_table'] . "` 
+    if ($this->settings['isAdmin']) {
+          if (mysqli_query($this->link, "INSERT INTO `" . $this->settings['banned_table'] . "` 
 				SET `ip` = '" . mysqli_real_escape_string($this->link, $ip) . "'"))
         return true;
+    }
     return false;
   }
 
@@ -820,8 +865,9 @@ 
   function isBanned($ip)
   {
     // no need to check the same ip 2 times in a row
-    if (count($this->checked_ips) && in_array($ip, array_keys($this->checked_ips)))
-      return $this->checked_ips[$ip];
+    if (count($this->checked_ips) && in_array($ip, array_keys($this->checked_ips))) {
+          return $this->checked_ips[$ip];
+    }
 
     $this->checked_ips[$ip] = $ip;
 

etc/server/dummyimage/index.php

Indentation +85 added lines, -85 removed lines

@@ -24,9 +24,9 @@ 
 */
 
 if (isset($_SERVER['HTTP_IF_MODIFIED_SINCE'])) {
-	// If the browser has a cached version of this image, send 304
-	header('Last-Modified: ' . $_SERVER['HTTP_IF_MODIFIED_SINCE'], true, 304);
-	exit;
+  // If the browser has a cached version of this image, send 304
+  header('Last-Modified: ' . $_SERVER['HTTP_IF_MODIFIED_SINCE'], true, 304);
+  exit;
 }
 
 // if not exist query GET x
@@ -35,7 +35,7 @@ 
 $x = strtolower(isset($_GET['x']) ? $_GET['x'] : $queryurl);
 // If the first character of $x is a / then get rid of it
 if ($x[0] == '/') {
-	$x = ltrim($x, '/');
+  $x = ltrim($x, '/');
 }
 $x_pieces = explode('/', $x);
 
@@ -45,10 +45,10 @@ 
 // Find the background color which is always after the 2nd slash in the url
 $bg_color = 'ccc';
 if (isset($x_pieces[1])) {
-	$bg_color_parts = explode('.', $x_pieces[1]);
-	if (isset($bg_color_parts[0]) && !empty($bg_color_parts[0])) {
-		$bg_color = $bg_color_parts[0];
-	}
+  $bg_color_parts = explode('.', $x_pieces[1]);
+  if (isset($bg_color_parts[0]) && !empty($bg_color_parts[0])) {
+    $bg_color = $bg_color_parts[0];
+  }
 }
 $background = new color();
 $background->set_hex($bg_color);
@@ -56,10 +56,10 @@ 
 // Find the foreground color which is always after the 3rd slash in the url
 $fg_color = '000';
 if (isset($x_pieces[2])) {
-	$fg_color_parts = explode('.', $x_pieces[2]);
-	if (isset($fg_color_parts[0]) && !empty($fg_color_parts[0])) {
-		$fg_color = $fg_color_parts[0];
-	}
+  $fg_color_parts = explode('.', $x_pieces[2]);
+  if (isset($fg_color_parts[0]) && !empty($fg_color_parts[0])) {
+    $fg_color = $fg_color_parts[0];
+  }
 }
 $foreground = new color();
 $foreground->set_hex($fg_color);
@@ -68,16 +68,16 @@ 
 $file_format = 'png';
 preg_match_all('/(gif|jpg|jpeg)/', $x, $result);
 if (isset($result[0]) && isset($result[0][0]) && $result[0][0]) {
-	$file_format = $result[0][0];
+  $file_format = $result[0][0];
 }
 
 // Find the image dimensions
 if (substr_count($x_pieces[0], ':') > 1) {
-	die('Too many colons in the dimension paramter! There should be 1 at most.');
+  die('Too many colons in the dimension paramter! There should be 1 at most.');
 }
 
 if (strstr($x_pieces[0], ':') && !strstr($x_pieces[0], 'x')) {
-	die('To calculate a ratio you need to provide a height!');
+  die('To calculate a ratio you need to provide a height!');
 }
 // Dimensions are always the first paramter in the URL
 $dimensions = explode('x', $x_pieces[0]);
@@ -86,46 +86,46 @@ 
 $width = preg_replace('/[^\d:\.]/i', '', $dimensions[0]);
 $height = $width;
 if ($dimensions[1]) {
-	$height = preg_replace('/[^\d:\.]/i', '', $dimensions[1]);
+  $height = preg_replace('/[^\d:\.]/i', '', $dimensions[1]);
 }
 
 // If the dimensions are too small then kill the script
 if ($width < 1 || $height < 1) {
-	die("Too small of an image!");
+  die("Too small of an image!");
 }
 
 // If one of the dimensions has a colon in it, we can calculate the aspect ratio. Chances are the height will contain a ratio, so we'll check that first.
 if (preg_match('/:/', $height)) {
-	$ratio = explode(':', $height);
+  $ratio = explode(':', $height);
 
-	// If we only have one ratio value, set the other value to the same value of the first making it a ratio of 1
-	if (!$ratio[1]) {
-		$ratio[1] = $ratio[0];
-	}
+  // If we only have one ratio value, set the other value to the same value of the first making it a ratio of 1
+  if (!$ratio[1]) {
+    $ratio[1] = $ratio[0];
+  }
 
-	if (!$ratio[0]) {
-		$ratio[0] = $ratio[1];
-	}
+  if (!$ratio[0]) {
+    $ratio[0] = $ratio[1];
+  }
 
-	$height = ($width * $ratio[1]) / $ratio[0];
+  $height = ($width * $ratio[1]) / $ratio[0];
 } else if (preg_match('/:/', $width)) {
-	$ratio = explode(':', $width);
-	//If we only have one ratio value, set the other value to the same value of the first making it a ratio of 1
-	if (!$ratio[1]) {
-		$ratio[1] = $ratio[0];
-	}
+  $ratio = explode(':', $width);
+  //If we only have one ratio value, set the other value to the same value of the first making it a ratio of 1
+  if (!$ratio[1]) {
+    $ratio[1] = $ratio[0];
+  }
 
-	if (!$ratio[0]) {
-		$ratio[0] = $ratio[1];
-	}
+  if (!$ratio[0]) {
+    $ratio[0] = $ratio[1];
+  }
 
-	$width = ($height * $ratio[0]) / $ratio[1];
+  $width = ($height * $ratio[0]) / $ratio[1];
 }
 
 //Limit the size of the image to no more than an area of 16,000,000
 $area = $width * $height;
 if ($area >= 16000000 || $width > 9999 || $height > 9999) {
-	die("Too big of an image!");
+  die("Too big of an image!");
 }
 
 //Let's round the dimensions to 3 decimal places for aesthetics
@@ -144,27 +144,27 @@ 
 $fg_color = imageColorAllocate($img, $foreground->get_rgb('r'), $foreground->get_rgb('g'), $foreground->get_rgb('b'));
 
 if (empty($_GET['text']) || !isset($_GET['text'])) {
-	preg_match('/&text=(.+)/i', $_GET['x'], $matches);
-	if (isset($matches[1])) {
-		$_GET['text'] = urldecode($matches[1]);
-	}
+  preg_match('/&text=(.+)/i', $_GET['x'], $matches);
+  if (isset($matches[1])) {
+    $_GET['text'] = urldecode($matches[1]);
+  }
 }
 
 if (isset($_GET['text']) && $_GET['text']) {
-	$_GET['text'] = preg_replace_callback(
-		"/(0x[0-9A-F]{,3})/ui",
-		function ($matches) {
-			return chr(hexdec($matches[0]));
-		},
-		$_GET['text']
-	);
-	$lines = substr_count($_GET['text'], '|');
-	$text = preg_replace('/\|/i', "\n", $_GET['text']);
+  $_GET['text'] = preg_replace_callback(
+    "/(0x[0-9A-F]{,3})/ui",
+    function ($matches) {
+      return chr(hexdec($matches[0]));
+    },
+    $_GET['text']
+  );
+  $lines = substr_count($_GET['text'], '|');
+  $text = preg_replace('/\|/i', "\n", $_GET['text']);
 } else {
-	$lines = 1;
-	// This is the default text string that will go right in the middle of the rectangle
-	// &#215; is the multiplication sign, it is not an 'x'
-	$text = $width . " &#215; " . $height;
+  $lines = 1;
+  // This is the default text string that will go right in the middle of the rectangle
+  // &#215; is the multiplication sign, it is not an 'x'
+  $text = $width . " &#215; " . $height;
 }
 
 // Ric Ewing: I modified this to behave better with long or narrow images and condensed the resize code to a single line
@@ -189,27 +189,27 @@ 
 
 function process_output_buffer($buffer = '')
 {
-	$buffer = trim($buffer);
-	if (strlen($buffer) == 0) {
-		return '';
-	}
-	return $buffer;
+  $buffer = trim($buffer);
+  if (strlen($buffer) == 0) {
+    return '';
+  }
+  return $buffer;
 }
 // Start output buffering so we can determine the Content-Length of the file
 ob_start('process_output_buffer');
 
 // Create the final image based on the provided file format.
 switch ($file_format) {
-	case 'gif':
-		imagegif($img);
-		break;
-	case 'png':
-		imagepng($img);
-		break;
-	case 'jpg':
-	case 'jpeg':
-		imagejpeg($img);
-		break;
+  case 'gif':
+    imagegif($img);
+    break;
+  case 'png':
+    imagepng($img);
+    break;
+  case 'jpg':
+  case 'jpeg':
+    imagejpeg($img);
+    break;
 }
 $output = ob_get_contents();
 
@@ -230,21 +230,21 @@ 
 //Ruquay K Calloway http://ruquay.com/sandbox/imagettf/ made a better function to find the coordinates of the text bounding box so I used it.
 function imagettfbbox_t($size, $text_angle, $fontfile, $text)
 {
-	// Compute size with a zero angle
-	$coords = imagettfbbox($size, 0, $fontfile, $text);
-
-	// Convert angle to radians
-	$a = deg2rad($text_angle);
-
-	// Compute some usefull values
-	$ca = cos($a);
-	$sa = sin($a);
-	$ret = array();
-
-	// Perform transformations
-	for ($i = 0; $i < 7; $i += 2) {
-		$ret[$i] = round($coords[$i] * $ca + $coords[$i + 1] * $sa);
-		$ret[$i + 1] = round($coords[$i + 1] * $ca - $coords[$i] * $sa);
-	}
-	return $ret;
+  // Compute size with a zero angle
+  $coords = imagettfbbox($size, 0, $fontfile, $text);
+
+  // Convert angle to radians
+  $a = deg2rad($text_angle);
+
+  // Compute some usefull values
+  $ca = cos($a);
+  $sa = sin($a);
+  $ret = array();
+
+  // Perform transformations
+  for ($i = 0; $i < 7; $i += 2) {
+    $ret[$i] = round($coords[$i] * $ca + $coords[$i + 1] * $sa);
+    $ret[$i + 1] = round($coords[$i + 1] * $ca - $coords[$i] * $sa);
+  }
+  return $ret;
 }

Spacing +1 added lines, -1 removed lines

@@ -153,7 +153,7 @@
 if (isset($_GET['text']) && $_GET['text']) {
 	$_GET['text'] = preg_replace_callback(
 		"/(0x[0-9A-F]{,3})/ui",
-		function ($matches) {
+		function($matches) {
 			return chr(hexdec($matches[0]));
 		},
 		$_GET['text']

etc/server/dummyimage/color.class.php

Indentation +236 added lines, -236 removed lines

@@ -17,275 +17,275 @@
 class color {
 	
     /**
-    * @var	array $rgb
-    * @access private
-    * @desc	array for RGB colors
-    */	
-	var $rgb=array('r'=>0,'g'=>0,'b'=>0);
+     * @var	array $rgb
+     * @access private
+     * @desc	array for RGB colors
+     */	
+  var $rgb=array('r'=>0,'g'=>0,'b'=>0);
 
     /**
-    * @var	string $hex
-    * @access private
-    * @desc	variable for HTML HEX color
-    */	
-	var $hex='';
+     * @var	string $hex
+     * @access private
+     * @desc	variable for HTML HEX color
+     */	
+  var $hex='';
 
     /**
-    * @var	array $cmyk
-    * @access private
-    * @desc	array for cmyk colors
-    */	
-	var $cmyk=array('c'=>0,'m'=>0,'y'=>0,'b'=>0);
+     * @var	array $cmyk
+     * @access private
+     * @desc	array for cmyk colors
+     */	
+  var $cmyk=array('c'=>0,'m'=>0,'y'=>0,'b'=>0);
 
-	/**
-	* Sets the RGB values	
-	* @param int $red number from 0-255 for blue color value
-	* @param int $green number from 0-255 for green color value
-	* @param int $blue number from 0-255 for blue color value
-    * @access public	
-	* @desc Sets the RGB values
-	*/
-	function set_rgb($red,$green,$blue){
+  /**
+   * Sets the RGB values	
+   * @param int $red number from 0-255 for blue color value
+   * @param int $green number from 0-255 for green color value
+   * @param int $blue number from 0-255 for blue color value
+   * @access public	
+   * @desc Sets the RGB values
+   */
+  function set_rgb($red,$green,$blue){
 		
-		$this->rgb['r']=$red;
-		$this->rgb['g']=$green;
-		$this->rgb['b']=$blue;
+    $this->rgb['r']=$red;
+    $this->rgb['g']=$green;
+    $this->rgb['b']=$blue;
 		
-		$this->convert_rgb_to_cmyk();
-		$this->convert_rgb_to_hex();
-	}
+    $this->convert_rgb_to_cmyk();
+    $this->convert_rgb_to_hex();
+  }
 
-	/**
-	* Sets the HEX HTML color value
-	* @param string $hex 6,3,2, or 1 characters long.
-    * @access public	
-	* @desc Sets the HEX HTML color value like ffff00. It will convert shorthand to a 6 digit hex.
-	*/
-	function set_hex($hex){
-		//$hex = settype($hex, 'string');
-		$hex = strtolower($hex);
-		$hex = preg_replace('/#/', '', $hex); //Strips out the # character
-		$hexlength = strlen($hex);
-		$input = $hex;
-		switch($hexlength) {
-			case 1:
-				$hex = $input.$input.$input.$input.$input.$input;
-			break;
-			case 2:
-				$hex = $input[0].$input[1].$input[0].$input[1].$input[0].$input[1];
-			break;
-			case 3:
-				$hex = $input[0].$input[0].$input[1].$input[1].$input[2].$input[2];
-			break;
-		}
-		$this->hex=$hex;
+  /**
+   * Sets the HEX HTML color value
+   * @param string $hex 6,3,2, or 1 characters long.
+   * @access public	
+   * @desc Sets the HEX HTML color value like ffff00. It will convert shorthand to a 6 digit hex.
+   */
+  function set_hex($hex){
+    //$hex = settype($hex, 'string');
+    $hex = strtolower($hex);
+    $hex = preg_replace('/#/', '', $hex); //Strips out the # character
+    $hexlength = strlen($hex);
+    $input = $hex;
+    switch($hexlength) {
+      case 1:
+        $hex = $input.$input.$input.$input.$input.$input;
+      break;
+      case 2:
+        $hex = $input[0].$input[1].$input[0].$input[1].$input[0].$input[1];
+      break;
+      case 3:
+        $hex = $input[0].$input[0].$input[1].$input[1].$input[2].$input[2];
+      break;
+    }
+    $this->hex=$hex;
 		
-		$this->convert_hex_to_rgb();
-		$this->convert_rgb_to_cmyk();
-	}
+    $this->convert_hex_to_rgb();
+    $this->convert_rgb_to_cmyk();
+  }
 	
-	/**
-	* Sets the HTML color name, converting it to a 6 digit hex code.
-	* @param string $name The name of the color.
-    * @access public	
-	* @desc Sets the HTML color name, converting it to a 6 digit hex code.
-	*/
-	function set_name($name){
-		$this->hex = $this->convert_name_to_hex($name);
+  /**
+   * Sets the HTML color name, converting it to a 6 digit hex code.
+   * @param string $name The name of the color.
+   * @access public	
+   * @desc Sets the HTML color name, converting it to a 6 digit hex code.
+   */
+  function set_name($name){
+    $this->hex = $this->convert_name_to_hex($name);
 		
-		$this->convert_hex_to_rgb();
-		$this->convert_rgb_to_cmyk();
-	}
+    $this->convert_hex_to_rgb();
+    $this->convert_rgb_to_cmyk();
+  }
 	
-	/**
-	* Sets the CMYK color values
-	* @param int $c number from 0-100 for c color value
-	* @param int $m number from 0-100 for m color value
-	* @param int $y number from 0-100 for y color value
-	* @param int $b number from 0-100 for b color value
-    * @access public
-	* @desc Sets the CMYK color values
-	*/	
-	function set_cmyk($c,$m,$y,$b){
-		$this->cmyk['c']=$c;
-		$this->cmyk['m']=$m;
-		$this->cmyk['y']=$y;
-		$this->cmyk['b']=$b;
+  /**
+   * Sets the CMYK color values
+   * @param int $c number from 0-100 for c color value
+   * @param int $m number from 0-100 for m color value
+   * @param int $y number from 0-100 for y color value
+   * @param int $b number from 0-100 for b color value
+   * @access public
+   * @desc Sets the CMYK color values
+   */	
+  function set_cmyk($c,$m,$y,$b){
+    $this->cmyk['c']=$c;
+    $this->cmyk['m']=$m;
+    $this->cmyk['y']=$y;
+    $this->cmyk['b']=$b;
 		
-		$this->convert_cmyk_to_rgb();
-		$this->convert_rgb_to_hex();
-	}
+    $this->convert_cmyk_to_rgb();
+    $this->convert_rgb_to_hex();
+  }
 
-	/**
-	* Sets the pantone color value
-	* @param string $pantone_name name of the pantone color
-    * @access public	
-	* @desc Sets the pantone color value
-	*/	
-	function set_pantone($pantone_name){
-		$this->pantone=$pantone_name;
-		$this->cmyk['c']=$this->pantone_pallete[$pantone_name]['c'];
-		$this->cmyk['m']=$this->pantone_pallete[$pantone_name]['m'];
-		$this->cmyk['y']=$this->pantone_pallete[$pantone_name]['y'];
-		$this->cmyk['b']=$this->pantone_pallete[$pantone_name]['b'];
+  /**
+   * Sets the pantone color value
+   * @param string $pantone_name name of the pantone color
+   * @access public	
+   * @desc Sets the pantone color value
+   */	
+  function set_pantone($pantone_name){
+    $this->pantone=$pantone_name;
+    $this->cmyk['c']=$this->pantone_pallete[$pantone_name]['c'];
+    $this->cmyk['m']=$this->pantone_pallete[$pantone_name]['m'];
+    $this->cmyk['y']=$this->pantone_pallete[$pantone_name]['y'];
+    $this->cmyk['b']=$this->pantone_pallete[$pantone_name]['b'];
 		
-		$this->convert_cmyk_to_rgb();
-		$this->convert_rgb_to_hex();		
-	}
+    $this->convert_cmyk_to_rgb();
+    $this->convert_rgb_to_hex();		
+  }
 	
-	/**
-	* Sets the pantone pc color value
-	* @param string $pantone_name_pc name of the pantone pc color
-    * @access public	
-	* @desc Sets the pantone pc color value
-	*/		
-	function set_pantone_pc($pantone_name){
-		$this->pantone_pc=$pantone_name;
-		$this->cmyk['c']=$this->pantone_pallete_pc[$pantone_name]['c'];
-		$this->cmyk['m']=$this->pantone_pallete_pc[$pantone_name]['m'];
-		$this->cmyk['y']=$this->pantone_pallete_pc[$pantone_name]['y'];
-		$this->cmyk['b']=$this->pantone_pallete_pc[$pantone_name]['b'];
+  /**
+   * Sets the pantone pc color value
+   * @param string $pantone_name_pc name of the pantone pc color
+   * @access public	
+   * @desc Sets the pantone pc color value
+   */		
+  function set_pantone_pc($pantone_name){
+    $this->pantone_pc=$pantone_name;
+    $this->cmyk['c']=$this->pantone_pallete_pc[$pantone_name]['c'];
+    $this->cmyk['m']=$this->pantone_pallete_pc[$pantone_name]['m'];
+    $this->cmyk['y']=$this->pantone_pallete_pc[$pantone_name]['y'];
+    $this->cmyk['b']=$this->pantone_pallete_pc[$pantone_name]['b'];
 		
-		$this->convert_cmyk_to_rgb();
-		$this->convert_rgb_to_hex();			
-	}
+    $this->convert_cmyk_to_rgb();
+    $this->convert_rgb_to_hex();			
+  }
 	
-	//include("pantone.color.class.php");
+  //include("pantone.color.class.php");
 
-	/**
-	* Returns the RGB values of a set color
-	* @return array $rgb color values of red ($rgb['r']), green ($rgb['green') and blue ($rgb['b'])
-    * @access public
-	* @desc Returns the RGB values of a set color
-	*/	
-	function get_rgb($val){
-		if($val) {
-			return $this->rgb[$val];
-		} else {
-			return $this->rgb;	
-		}
-	}
+  /**
+   * Returns the RGB values of a set color
+   * @return array $rgb color values of red ($rgb['r']), green ($rgb['green') and blue ($rgb['b'])
+   * @access public
+   * @desc Returns the RGB values of a set color
+   */	
+  function get_rgb($val){
+    if($val) {
+      return $this->rgb[$val];
+    } else {
+      return $this->rgb;	
+    }
+  }
 
-	/**
-	* Returns the HEX HTML color value of a set color
-	* @return string $hex HEX HTML color value
-    * @access public
-	* @desc Returns the HEX HTML color value of a set color
-	*/	
-	function get_hex(){
-		return $this->hex;
-	}
+  /**
+   * Returns the HEX HTML color value of a set color
+   * @return string $hex HEX HTML color value
+   * @access public
+   * @desc Returns the HEX HTML color value of a set color
+   */	
+  function get_hex(){
+    return $this->hex;
+  }
 	
-	/**
-	* Returns the CMYK values of a set color
-	* @return array $cmyk color values of c ($cmyk['c']), m ($cmyk['m'), y ($cmyk['blue']) and b ($cmyk['b'])
-    * @access public	
-	* @desc Returns the CMYK values of a set color
-	*/	
-	function get_cmyk(){
-		return $this->cmyk;
-	}
+  /**
+   * Returns the CMYK values of a set color
+   * @return array $cmyk color values of c ($cmyk['c']), m ($cmyk['m'), y ($cmyk['blue']) and b ($cmyk['b'])
+   * @access public	
+   * @desc Returns the CMYK values of a set color
+   */	
+  function get_cmyk(){
+    return $this->cmyk;
+  }
 
-	/**
-	* Converts the RGB colors to HEX HTML colors
-    * @access private
-	* @desc Converts the RGB colors to HEX HTML colors
-	*/	
-	function convert_rgb_to_hex(){
-		$this->hex=$this->hex_trip[$this->rgb['r']].$this->hex_trip[$this->rgb['g']].$this->hex_trip[$this->rgb['b']];
-	}
+  /**
+   * Converts the RGB colors to HEX HTML colors
+   * @access private
+   * @desc Converts the RGB colors to HEX HTML colors
+   */	
+  function convert_rgb_to_hex(){
+    $this->hex=$this->hex_trip[$this->rgb['r']].$this->hex_trip[$this->rgb['g']].$this->hex_trip[$this->rgb['b']];
+  }
 	
-	/**
-	* Converts the RGB colors to CMYK colors
-    * @access private
-	* @desc Converts the RGB colors to CMYK colors
-	*/		
-	function convert_rgb_to_cmyk(){
-		$c = (255-$this->rgb['r'] )/255.0*100;
-		$m = (255-$this->rgb['g'] )/255.0*100;
-		$y = (255-$this->rgb['b'] )/255.0*100;
+  /**
+   * Converts the RGB colors to CMYK colors
+   * @access private
+   * @desc Converts the RGB colors to CMYK colors
+   */		
+  function convert_rgb_to_cmyk(){
+    $c = (255-$this->rgb['r'] )/255.0*100;
+    $m = (255-$this->rgb['g'] )/255.0*100;
+    $y = (255-$this->rgb['b'] )/255.0*100;
 		
-		$b = min(array($c,$m,$y));
-		$c=$c-$b;
-		$m=$m-$b;
-		$y=$y-$b;
+    $b = min(array($c,$m,$y));
+    $c=$c-$b;
+    $m=$m-$b;
+    $y=$y-$b;
 		
-		$this->cmyk = array( 'c' => $c, 'm' => $m, 'y' => $y, 'b' => $b);
-	}
+    $this->cmyk = array( 'c' => $c, 'm' => $m, 'y' => $y, 'b' => $b);
+  }
 	
-	/**
-	* Converts the CMYK colors to RGB colors
-    * @access private
-	* @desc Converts the CMYK colors to RGB colors
-	*/		
-	function convert_cmyk_to_rgb(){
-		$red=$this->cmyk['c']+$this->cmyk['b'];
-		$green=$this->cmyk['m']+$this->cmyk['b'];
-		$blue=$this->cmyk['y']+$this->cmyk['b'];
+  /**
+   * Converts the CMYK colors to RGB colors
+   * @access private
+   * @desc Converts the CMYK colors to RGB colors
+   */		
+  function convert_cmyk_to_rgb(){
+    $red=$this->cmyk['c']+$this->cmyk['b'];
+    $green=$this->cmyk['m']+$this->cmyk['b'];
+    $blue=$this->cmyk['y']+$this->cmyk['b'];
 		
-		$red=($red-100)*(-1);
-		$green=($green-100)*(-1);
-		$blue=($blue-100)*(-1);
+    $red=($red-100)*(-1);
+    $green=($green-100)*(-1);
+    $blue=($blue-100)*(-1);
 		
-		$red=round($red/100*255,0);
-		$green=round($green/100*255,0);
-		$blue=round($blue/100*255,0);
+    $red=round($red/100*255,0);
+    $green=round($green/100*255,0);
+    $blue=round($blue/100*255,0);
 		
-		$this->rgb['r']=$red;
-		$this->rgb['g']=$green;
-		$this->rgb['b']=$blue;
-	}
+    $this->rgb['r']=$red;
+    $this->rgb['g']=$green;
+    $this->rgb['b']=$blue;
+  }
 	
-	/**
-	* Converts the HTML HEX colors to RGB colors
-    * @access private
-	* @desc Converts the HTML HEX colors to RGB colors
-	* @url http://css-tricks.com/snippets/php/convert-hex-to-rgb/
-	*/		
-	function convert_hex_to_rgb(){
-		$red = substr($this->hex,0,2);
-		$green = substr($this->hex,2,2);
-		$blue = substr($this->hex,4,2);
+  /**
+   * Converts the HTML HEX colors to RGB colors
+   * @access private
+   * @desc Converts the HTML HEX colors to RGB colors
+   * @url http://css-tricks.com/snippets/php/convert-hex-to-rgb/
+   */		
+  function convert_hex_to_rgb(){
+    $red = substr($this->hex,0,2);
+    $green = substr($this->hex,2,2);
+    $blue = substr($this->hex,4,2);
         $this->rgb['r'] = hexdec( $red );
         $this->rgb['g']  = hexdec( $green );
         $this->rgb['b'] = hexdec( $blue );
-	}
+  }
 	
-	/**
-	* Converts HTML color name to 6 digit HEX value.
-    * @access private
-	* @param string $name One of the offical HTML color names.
-	* @desc Converts HTML color name to 6 digit HEX value.
-	* @url http://en.wikipedia.org/wiki/HTML_color_names
-	*/		
-	function convert_name_to_hex($name){
-		$color_names = array(
-			'aqua' => '00ffff',
-			'cyan' => '00ffff',
-			'gray' => '808080',
-			'grey' => '808080',
-			'navy' => '000080',
-			'silver' => 'C0C0C0',
-			'black' => '000000',
-			'green' => '008000',
-			'olive' => '808000',
-			'teal' => '008080',
-			'blue' => '0000FF',
-			'lime' => '00FF00',
-			'purple' => '800080',
-			'white' => 'ffffff',
-			'fuchsia' => 'FF00FF',
-			'magenta' => 'FF00FF',
-			'maroon' => '800000',
-			'red' => 'FF0000',
-			'yellow' => 'FFFF00'
-		);
-		if (array_key_exists($name, $color_names)) {
-			return $color_names[$name];
-		}
-		else {
-			//error
-		}
-	}
+  /**
+   * Converts HTML color name to 6 digit HEX value.
+   * @access private
+   * @param string $name One of the offical HTML color names.
+   * @desc Converts HTML color name to 6 digit HEX value.
+   * @url http://en.wikipedia.org/wiki/HTML_color_names
+   */		
+  function convert_name_to_hex($name){
+    $color_names = array(
+      'aqua' => '00ffff',
+      'cyan' => '00ffff',
+      'gray' => '808080',
+      'grey' => '808080',
+      'navy' => '000080',
+      'silver' => 'C0C0C0',
+      'black' => '000000',
+      'green' => '008000',
+      'olive' => '808000',
+      'teal' => '008080',
+      'blue' => '0000FF',
+      'lime' => '00FF00',
+      'purple' => '800080',
+      'white' => 'ffffff',
+      'fuchsia' => 'FF00FF',
+      'magenta' => 'FF00FF',
+      'maroon' => '800000',
+      'red' => 'FF0000',
+      'yellow' => 'FFFF00'
+    );
+    if (array_key_exists($name, $color_names)) {
+      return $color_names[$name];
+    }
+    else {
+      //error
+    }
+  }
 }
 ?>
\ No newline at end of file

Spacing +67 added lines, -67 removed lines

@@ -21,21 +21,21 @@ 
     * @access private
     * @desc	array for RGB colors
     */	
-	var $rgb=array('r'=>0,'g'=>0,'b'=>0);
+	var $rgb = array('r'=>0, 'g'=>0, 'b'=>0);
 
     /**
     * @var	string $hex
     * @access private
     * @desc	variable for HTML HEX color
     */	
-	var $hex='';
+	var $hex = '';
 
     /**
     * @var	array $cmyk
     * @access private
     * @desc	array for cmyk colors
     */	
-	var $cmyk=array('c'=>0,'m'=>0,'y'=>0,'b'=>0);
+	var $cmyk = array('c'=>0, 'm'=>0, 'y'=>0, 'b'=>0);
 
 	/**
 	* Sets the RGB values	
@@ -45,11 +45,11 @@ 
     * @access public	
 	* @desc Sets the RGB values
 	*/
-	function set_rgb($red,$green,$blue){
+	function set_rgb($red, $green, $blue) {
 		
-		$this->rgb['r']=$red;
-		$this->rgb['g']=$green;
-		$this->rgb['b']=$blue;
+		$this->rgb['r'] = $red;
+		$this->rgb['g'] = $green;
+		$this->rgb['b'] = $blue;
 		
 		$this->convert_rgb_to_cmyk();
 		$this->convert_rgb_to_hex();
@@ -61,24 +61,24 @@ 
     * @access public	
 	* @desc Sets the HEX HTML color value like ffff00. It will convert shorthand to a 6 digit hex.
 	*/
-	function set_hex($hex){
+	function set_hex($hex) {
 		//$hex = settype($hex, 'string');
 		$hex = strtolower($hex);
 		$hex = preg_replace('/#/', '', $hex); //Strips out the # character
 		$hexlength = strlen($hex);
 		$input = $hex;
-		switch($hexlength) {
+		switch ($hexlength) {
 			case 1:
-				$hex = $input.$input.$input.$input.$input.$input;
+				$hex = $input . $input . $input . $input . $input . $input;
 			break;
 			case 2:
-				$hex = $input[0].$input[1].$input[0].$input[1].$input[0].$input[1];
+				$hex = $input[0] . $input[1] . $input[0] . $input[1] . $input[0] . $input[1];
 			break;
 			case 3:
-				$hex = $input[0].$input[0].$input[1].$input[1].$input[2].$input[2];
+				$hex = $input[0] . $input[0] . $input[1] . $input[1] . $input[2] . $input[2];
 			break;
 		}
-		$this->hex=$hex;
+		$this->hex = $hex;
 		
 		$this->convert_hex_to_rgb();
 		$this->convert_rgb_to_cmyk();
@@ -90,7 +90,7 @@ 
     * @access public	
 	* @desc Sets the HTML color name, converting it to a 6 digit hex code.
 	*/
-	function set_name($name){
+	function set_name($name) {
 		$this->hex = $this->convert_name_to_hex($name);
 		
 		$this->convert_hex_to_rgb();
@@ -106,11 +106,11 @@ 
     * @access public
 	* @desc Sets the CMYK color values
 	*/	
-	function set_cmyk($c,$m,$y,$b){
-		$this->cmyk['c']=$c;
-		$this->cmyk['m']=$m;
-		$this->cmyk['y']=$y;
-		$this->cmyk['b']=$b;
+	function set_cmyk($c, $m, $y, $b) {
+		$this->cmyk['c'] = $c;
+		$this->cmyk['m'] = $m;
+		$this->cmyk['y'] = $y;
+		$this->cmyk['b'] = $b;
 		
 		$this->convert_cmyk_to_rgb();
 		$this->convert_rgb_to_hex();
@@ -122,12 +122,12 @@ 
     * @access public	
 	* @desc Sets the pantone color value
 	*/	
-	function set_pantone($pantone_name){
-		$this->pantone=$pantone_name;
-		$this->cmyk['c']=$this->pantone_pallete[$pantone_name]['c'];
-		$this->cmyk['m']=$this->pantone_pallete[$pantone_name]['m'];
-		$this->cmyk['y']=$this->pantone_pallete[$pantone_name]['y'];
-		$this->cmyk['b']=$this->pantone_pallete[$pantone_name]['b'];
+	function set_pantone($pantone_name) {
+		$this->pantone = $pantone_name;
+		$this->cmyk['c'] = $this->pantone_pallete[$pantone_name]['c'];
+		$this->cmyk['m'] = $this->pantone_pallete[$pantone_name]['m'];
+		$this->cmyk['y'] = $this->pantone_pallete[$pantone_name]['y'];
+		$this->cmyk['b'] = $this->pantone_pallete[$pantone_name]['b'];
 		
 		$this->convert_cmyk_to_rgb();
 		$this->convert_rgb_to_hex();		
@@ -139,12 +139,12 @@ 
     * @access public	
 	* @desc Sets the pantone pc color value
 	*/		
-	function set_pantone_pc($pantone_name){
-		$this->pantone_pc=$pantone_name;
-		$this->cmyk['c']=$this->pantone_pallete_pc[$pantone_name]['c'];
-		$this->cmyk['m']=$this->pantone_pallete_pc[$pantone_name]['m'];
-		$this->cmyk['y']=$this->pantone_pallete_pc[$pantone_name]['y'];
-		$this->cmyk['b']=$this->pantone_pallete_pc[$pantone_name]['b'];
+	function set_pantone_pc($pantone_name) {
+		$this->pantone_pc = $pantone_name;
+		$this->cmyk['c'] = $this->pantone_pallete_pc[$pantone_name]['c'];
+		$this->cmyk['m'] = $this->pantone_pallete_pc[$pantone_name]['m'];
+		$this->cmyk['y'] = $this->pantone_pallete_pc[$pantone_name]['y'];
+		$this->cmyk['b'] = $this->pantone_pallete_pc[$pantone_name]['b'];
 		
 		$this->convert_cmyk_to_rgb();
 		$this->convert_rgb_to_hex();			
@@ -158,8 +158,8 @@ 
     * @access public
 	* @desc Returns the RGB values of a set color
 	*/	
-	function get_rgb($val){
-		if($val) {
+	function get_rgb($val) {
+		if ($val) {
 			return $this->rgb[$val];
 		} else {
 			return $this->rgb;	
@@ -172,7 +172,7 @@ 
     * @access public
 	* @desc Returns the HEX HTML color value of a set color
 	*/	
-	function get_hex(){
+	function get_hex() {
 		return $this->hex;
 	}
 	
@@ -182,7 +182,7 @@ 
     * @access public	
 	* @desc Returns the CMYK values of a set color
 	*/	
-	function get_cmyk(){
+	function get_cmyk() {
 		return $this->cmyk;
 	}
 
@@ -191,8 +191,8 @@ 
     * @access private
 	* @desc Converts the RGB colors to HEX HTML colors
 	*/	
-	function convert_rgb_to_hex(){
-		$this->hex=$this->hex_trip[$this->rgb['r']].$this->hex_trip[$this->rgb['g']].$this->hex_trip[$this->rgb['b']];
+	function convert_rgb_to_hex() {
+		$this->hex = $this->hex_trip[$this->rgb['r']] . $this->hex_trip[$this->rgb['g']] . $this->hex_trip[$this->rgb['b']];
 	}
 	
 	/**
@@ -200,17 +200,17 @@ 
     * @access private
 	* @desc Converts the RGB colors to CMYK colors
 	*/		
-	function convert_rgb_to_cmyk(){
-		$c = (255-$this->rgb['r'] )/255.0*100;
-		$m = (255-$this->rgb['g'] )/255.0*100;
-		$y = (255-$this->rgb['b'] )/255.0*100;
+	function convert_rgb_to_cmyk() {
+		$c = (255 - $this->rgb['r']) / 255.0 * 100;
+		$m = (255 - $this->rgb['g']) / 255.0 * 100;
+		$y = (255 - $this->rgb['b']) / 255.0 * 100;
 		
-		$b = min(array($c,$m,$y));
-		$c=$c-$b;
-		$m=$m-$b;
-		$y=$y-$b;
+		$b = min(array($c, $m, $y));
+		$c = $c - $b;
+		$m = $m - $b;
+		$y = $y - $b;
 		
-		$this->cmyk = array( 'c' => $c, 'm' => $m, 'y' => $y, 'b' => $b);
+		$this->cmyk = array('c' => $c, 'm' => $m, 'y' => $y, 'b' => $b);
 	}
 	
 	/**
@@ -218,22 +218,22 @@ 
     * @access private
 	* @desc Converts the CMYK colors to RGB colors
 	*/		
-	function convert_cmyk_to_rgb(){
-		$red=$this->cmyk['c']+$this->cmyk['b'];
-		$green=$this->cmyk['m']+$this->cmyk['b'];
-		$blue=$this->cmyk['y']+$this->cmyk['b'];
+	function convert_cmyk_to_rgb() {
+		$red = $this->cmyk['c'] + $this->cmyk['b'];
+		$green = $this->cmyk['m'] + $this->cmyk['b'];
+		$blue = $this->cmyk['y'] + $this->cmyk['b'];
 		
-		$red=($red-100)*(-1);
-		$green=($green-100)*(-1);
-		$blue=($blue-100)*(-1);
+		$red = ($red - 100) * (-1);
+		$green = ($green - 100) * (-1);
+		$blue = ($blue - 100) * (-1);
 		
-		$red=round($red/100*255,0);
-		$green=round($green/100*255,0);
-		$blue=round($blue/100*255,0);
+		$red = round($red / 100 * 255, 0);
+		$green = round($green / 100 * 255, 0);
+		$blue = round($blue / 100 * 255, 0);
 		
-		$this->rgb['r']=$red;
-		$this->rgb['g']=$green;
-		$this->rgb['b']=$blue;
+		$this->rgb['r'] = $red;
+		$this->rgb['g'] = $green;
+		$this->rgb['b'] = $blue;
 	}
 	
 	/**
@@ -242,13 +242,13 @@ 
 	* @desc Converts the HTML HEX colors to RGB colors
 	* @url http://css-tricks.com/snippets/php/convert-hex-to-rgb/
 	*/		
-	function convert_hex_to_rgb(){
-		$red = substr($this->hex,0,2);
-		$green = substr($this->hex,2,2);
-		$blue = substr($this->hex,4,2);
-        $this->rgb['r'] = hexdec( $red );
-        $this->rgb['g']  = hexdec( $green );
-        $this->rgb['b'] = hexdec( $blue );
+	function convert_hex_to_rgb() {
+		$red = substr($this->hex, 0, 2);
+		$green = substr($this->hex, 2, 2);
+		$blue = substr($this->hex, 4, 2);
+        $this->rgb['r'] = hexdec($red);
+        $this->rgb['g'] = hexdec($green);
+        $this->rgb['b'] = hexdec($blue);
 	}
 	
 	/**
@@ -258,7 +258,7 @@ 
 	* @desc Converts HTML color name to 6 digit HEX value.
 	* @url http://en.wikipedia.org/wiki/HTML_color_names
 	*/		
-	function convert_name_to_hex($name){
+	function convert_name_to_hex($name) {
 		$color_names = array(
 			'aqua' => '00ffff',
 			'cyan' => '00ffff',

Braces +1 added lines, -2 removed lines

@@ -282,8 +282,7 @@
 		);
 		if (array_key_exists($name, $color_names)) {
 			return $color_names[$name];
-		}
-		else {
+		} else {
 			//error
 		}
 	}