| 1 | |
| 2 | |
| 3 | @@ -52,7 +52,7 @@
|
| 4 |
|
| 5 | if (is_null($drive)) {
|
| 6 | $this->output = DeviceError::MSG_ERROR_DEVICE_AUTOCHANGER_DRIVE_DOES_NOT_EXIST;
|
| 7 | - $this->error = DeviceError::ERROR_DEVICE_AUTOCHANGER_DRIVE_DOES_NOT_EXIST
|
| 8 | + $this->error = DeviceError::ERROR_DEVICE_AUTOCHANGER_DRIVE_DOES_NOT_EXIST;
|
| 9 | return;
|
| 10 | }
|
| 11 |
|
| 12 | |
| 13 | |
| 14 | @@ -38,8 +38,8 @@
|
| 15 | $drive = $this->Request->contains('drive') && $misc->isValidName($this->Request['drive']) ? $this->Request['drive'] : null;
|
| 16 |
|
| 17 | if (is_null($drive)) {
|
| 18 | - $this->output = DeviceError::MSG_ERROR_DEVICE_AUTOCHANGER_DRIVE_DOES_NOT_EXIST
|
| 19 | - $this->error = DeviceError::ERROR_DEVICE_AUTOCHANGER_DRIVE_DOES_NOT_EXIST
|
| 20 | + $this->output = DeviceError::MSG_ERROR_DEVICE_AUTOCHANGER_DRIVE_DOES_NOT_EXIST;
|
| 21 | + $this->error = DeviceError::ERROR_DEVICE_AUTOCHANGER_DRIVE_DOES_NOT_EXIST;
|
| 22 | return;
|
| 23 | }
|
| 24 |
|
| 25 | |
| 26 | |
| 27 | @@ -199,7 +199,7 @@
|
| 28 | if (is_int($groupSize[0])) {
|
| 29 | //now for the integer groupings
|
| 30 | for ($i = 0; $i < $len; $i++) {
|
| 31 | - $char = $string{$len - $i - 1};
|
| 32 | + $char = $string[$len - $i - 1];
|
| 33 |
|
| 34 | if ($multiGroup && $count == 0) {
|
| 35 | if ($i != 0 && $i % $groupSize[0] == 0) {
|
| 36 | |
| 37 | |
| 38 | @@ -295,7 +295,7 @@
|
| 39 | //no decimal point, so traverse from the back
|
| 40 | //to find the groupsize 1.
|
| 41 | for ($i = strlen($pattern) - 1; $i >= 0; $i--) {
|
| 42 | - if ($pattern{$i} == $digit || $pattern{$i} == $hash) {
|
| 43 | + if ($pattern[$i] == $digit || $pattern[$i] == $hash) {
|
| 44 | $groupSize1 = $i - $groupPos1;
|
| 45 | break;
|
| 46 | }
|
| 47 | @@ -310,10 +310,10 @@
|
| 48 |
|
| 49 | if (is_int($decimalPos)) {
|
| 50 | for ($i = strlen($pattern) - 1; $i >= 0; $i--) {
|
| 51 | - if ($pattern{$i} == $dot) {
|
| 52 | + if ($pattern[$i] == $dot) {
|
| 53 | break;
|
| 54 | }
|
| 55 | - if ($pattern{$i} == $digit) {
|
| 56 | + if ($pattern[$i] == $digit) {
|
| 57 | $decimalPoints = $i - $decimalPos;
|
| 58 | break;
|
| 59 | }
|
| 60 | |
| 61 | |
| 62 | @@ -135,8 +135,8 @@
|
| 63 |
|
| 64 | for ($i = 0, $k = count($tokens); $i < $k; ++$i) {
|
| 65 | $pattern = $tokens[$i];
|
| 66 | - if ($pattern{0} == "'"
|
| 67 | - && $pattern{strlen($pattern) - 1} == "'") {
|
| 68 | + if ($pattern[0] == "'"
|
| 69 | + && $pattern[strlen($pattern) - 1] == "'") {
|
| 70 | $sub = preg_replace('/(^\')|(\'$)/', '', $pattern);
|
| 71 | $tokens[$i] = str_replace('``````', '\'', $sub);
|
| 72 | } elseif ($pattern == '``````') {
|
| 73 | @@ -166,8 +166,8 @@
|
| 74 | */
|
| 75 | protected function getFunctionName($token)
|
| 76 | {
|
| 77 | - if (isset($this->tokens[$token{0}])) {
|
| 78 | - return $this->tokens[$token{0}];
|
| 79 | + if (isset($this->tokens[$token[0]])) {
|
| 80 | + return $this->tokens[$token[0]];
|
| 81 | }
|
| 82 | }
|
| 83 |
|
| 84 | @@ -284,22 +284,22 @@
|
| 85 | $pattern = preg_replace("/''/", '``````', $pattern);
|
| 86 |
|
| 87 | for ($i = 0; $i < strlen($pattern); $i++) {
|
| 88 | - if ($char == null || $pattern{$i} == $char || $text) {
|
| 89 | - $token .= $pattern{$i};
|
| 90 | + if ($char == null || $pattern[$i] == $char || $text) {
|
| 91 | + $token .= $pattern[$i];
|
| 92 | } else {
|
| 93 | $tokens[] = str_replace("", "'", $token);
|
| 94 | - $token = $pattern{$i};
|
| 95 | + $token = $pattern[$i];
|
| 96 | }
|
| 97 |
|
| 98 | - if ($pattern{$i} == "'" && $text == false) {
|
| 99 | + if ($pattern[$i] == "'" && $text == false) {
|
| 100 | $text = true;
|
| 101 | - } elseif ($text && $pattern{$i} == "'" && $char == "'") {
|
| 102 | + } elseif ($text && $pattern[$i] == "'" && $char == "'") {
|
| 103 | $text = true;
|
| 104 | - } elseif ($text && $char != "'" && $pattern{$i} == "'") {
|
| 105 | + } elseif ($text && $char != "'" && $pattern[$i] == "'") {
|
| 106 | $text = false;
|
| 107 | }
|
| 108 |
|
| 109 | - $char = $pattern{$i};
|
| 110 | + $char = $pattern[$i];
|
| 111 | }
|
| 112 | $tokens[] = $token;
|
| 113 | return $tokens;
|