@@ -69,17 +69,22 @@ |
||
| 69 | 69 | $characterDeficit = 0; //Gets incremented when an uppercase letter is encountered before $targetCharsPerWord characters have been collected since the last UC char. |
| 70 | 70 | $wordIndex = $targetWordLength; //HACK: keeps track of how many characters have been carried into the abbreviation since the last UC char |
| 71 | 71 | while ($stringIndex < strlen($strString)) { //Process the whole input string... |
| 72 | - if ($abbrevLength >= $targetLength) //...unless the abbreviation has hit the target length cap |
|
| 72 | + if ($abbrevLength >= $targetLength) { |
|
| 73 | + //...unless the abbreviation has hit the target length cap |
|
| 73 | 74 | break; |
| 75 | + } |
|
| 74 | 76 | $currentChar = $strString[$stringIndex++]; //Grab a character from the string, advance the string cursor |
| 75 | 77 | if (in_array($currentChar, $ucLetters)) { //If handling a UC char, consider it a new word |
| 76 | 78 | $characterDeficit += $targetWordLength - $wordIndex; //If UC chars are closer together than targetWordLength, keeps track of how many extra characters are required to fit the target length of the abbreviation |
| 77 | 79 | $wordIndex = 0; //Set the wordIndex to reflect a new word |
| 78 | 80 | } else if ($wordIndex >= $targetWordLength) { |
| 79 | - if ($characterDeficit == 0) //If the word is full and we're not short any characters, ignore the character |
|
| 81 | + if ($characterDeficit == 0) { |
|
| 82 | + //If the word is full and we're not short any characters, ignore the character |
|
| 80 | 83 | continue; |
| 81 | - else |
|
| 82 | - $characterDefecit--; //If we are short some characters, decrement the defecit and carry on with adding the character to the abbreviation |
|
| 84 | + } else { |
|
| 85 | + $characterDefecit--; |
|
| 86 | + } |
|
| 87 | + //If we are short some characters, decrement the defecit and carry on with adding the character to the abbreviation |
|
| 83 | 88 | } |
| 84 | 89 | $abbreviation .= $currentChar; //Add the character to the abbreviation |
| 85 | 90 | $abbrevLength++; //Increment abbreviation length |
@@ -18,16 +18,18 @@ discard block |
||
| 18 | 18 | private $cwd; |
| 19 | 19 | |
| 20 | 20 | public function __construct(array $i_filename_arr) { |
| 21 | - if (!is_array($i_filename_arr)) |
|
| 22 | - $i_filename_arr = array($i_filename_arr); |
|
| 21 | + if (!is_array($i_filename_arr)) { |
|
| 22 | + $i_filename_arr = array($i_filename_arr); |
|
| 23 | + } |
|
| 23 | 24 | |
| 24 | 25 | $this->filenames = $i_filename_arr; |
| 25 | 26 | $this->cwd = getcwd() . DIRECTORY_SEPARATOR; |
| 26 | 27 | |
| 27 | - if ($this->style_changed()) |
|
| 28 | - $expire = -72000; |
|
| 29 | - else |
|
| 30 | - $expire = 3200; |
|
| 28 | + if ($this->style_changed()) { |
|
| 29 | + $expire = -72000; |
|
| 30 | + } else { |
|
| 31 | + $expire = 3200; |
|
| 32 | + } |
|
| 31 | 33 | |
| 32 | 34 | header('Content-Type: text/css; charset: UTF-8'); |
| 33 | 35 | header('Cache-Control: must-revalidate'); |
@@ -37,8 +39,9 @@ discard block |
||
| 37 | 39 | public function dump_style() { |
| 38 | 40 | ob_start('ob_gzhandler'); |
| 39 | 41 | |
| 40 | - foreach ($this->filenames as $filename) |
|
| 41 | - $this->dump_cache_contents($filename); |
|
| 42 | + foreach ($this->filenames as $filename) { |
|
| 43 | + $this->dump_cache_contents($filename); |
|
| 44 | + } |
|
| 42 | 45 | |
| 43 | 46 | ob_end_flush(); |
| 44 | 47 | } |
@@ -50,9 +53,10 @@ discard block |
||
| 50 | 53 | } |
| 51 | 54 | |
| 52 | 55 | private function style_changed() { |
| 53 | - foreach ($this->filenames as $filename) |
|
| 54 | - if (!is_file($this->get_cache_name($filename))) |
|
| 56 | + foreach ($this->filenames as $filename) { |
|
| 57 | + if (!is_file($this->get_cache_name($filename))) |
|
| 55 | 58 | return TRUE; |
| 59 | + } |
|
| 56 | 60 | return FALSE; |
| 57 | 61 | } |
| 58 | 62 | |
@@ -81,9 +85,10 @@ discard block |
||
| 81 | 85 | } |
| 82 | 86 | |
| 83 | 87 | // remove any old, lingering caches for this file |
| 84 | - if ($dead_files = glob($this->get_cache_name($filename, TRUE), GLOB_NOESCAPE)) |
|
| 85 | - foreach ($dead_files as $dead_file) |
|
| 88 | + if ($dead_files = glob($this->get_cache_name($filename, TRUE), GLOB_NOESCAPE)) { |
|
| 89 | + foreach ($dead_files as $dead_file) |
|
| 86 | 90 | unlink($dead_file); |
| 91 | + } |
|
| 87 | 92 | |
| 88 | 93 | $compressed = $this->compress(file_get_contents($filename)); |
| 89 | 94 | file_put_contents($current_cache, $compressed); |