@@ -70,7 +70,7 @@ discard block |
||
70 | 70 | $this->_length = 4; |
71 | 71 | } |
72 | 72 | if (isset($options['phrase']) && !empty($options['phrase'])) { |
73 | - $this->setPhrase((string)$options['phrase']); |
|
73 | + $this->setPhrase((string) $options['phrase']); |
|
74 | 74 | } else { |
75 | 75 | $this->createPhrase(); |
76 | 76 | } |
@@ -116,7 +116,7 @@ discard block |
||
116 | 116 | if ($this->_mode == 'single') { |
117 | 117 | $phraseArr = str_split($phrase); |
118 | 118 | for ($i = 0; $i < strlen($phrase); $i++) { |
119 | - $res .= ' ' . $numberWords->toWords($phraseArr[$i], $this->_locale); |
|
119 | + $res .= ' '.$numberWords->toWords($phraseArr[$i], $this->_locale); |
|
120 | 120 | } |
121 | 121 | } else { |
122 | 122 | $res = $numberWords->toWords($phrase, $this->_locale); |
@@ -80,13 +80,13 @@ discard block |
||
80 | 80 | public function initDriver($options = array()) |
81 | 81 | { |
82 | 82 | if (!empty($options['output'])) { |
83 | - $this->_output = (string)$options['output']; |
|
83 | + $this->_output = (string) $options['output']; |
|
84 | 84 | } else { |
85 | 85 | $this->_output = 'html'; |
86 | 86 | } |
87 | 87 | |
88 | 88 | if (isset($options['width']) && $options['width']) { |
89 | - $this->_width = (int)$options['width']; |
|
89 | + $this->_width = (int) $options['width']; |
|
90 | 90 | } else { |
91 | 91 | $this->_width = 200; |
92 | 92 | } |
@@ -201,11 +201,11 @@ discard block |
||
201 | 201 | } |
202 | 202 | |
203 | 203 | $htmlOutput = '<div style="font-family: courier; |
204 | - font-size: ' . $textSize . 'px; |
|
205 | - width:' . $this->_width . 'px; |
|
204 | + font-size: ' . $textSize.'px; |
|
205 | + width:' . $this->_width.'px; |
|
206 | 206 | text-align:center;">'; |
207 | - $htmlOutput .= '<div style="' . $cssOutput . 'margin:0px;"> |
|
208 | - <pre style="padding: 0px; margin: 0px;">' . $data . '</pre></div></div>'; |
|
207 | + $htmlOutput .= '<div style="'.$cssOutput.'margin:0px;"> |
|
208 | + <pre style="padding: 0px; margin: 0px;">' . $data.'</pre></div></div>'; |
|
209 | 209 | |
210 | 210 | return $htmlOutput; |
211 | 211 | } |
@@ -97,27 +97,27 @@ discard block |
||
97 | 97 | public function initDriver($options = array()) |
98 | 98 | { |
99 | 99 | if (isset($options['min'])) { |
100 | - $this->_min = (int)$options['min']; |
|
100 | + $this->_min = (int) $options['min']; |
|
101 | 101 | } else { |
102 | 102 | $this->_min = 1; |
103 | 103 | } |
104 | 104 | if (isset($options['max'])) { |
105 | - $this->_max = (int)$options['max']; |
|
105 | + $this->_max = (int) $options['max']; |
|
106 | 106 | } else { |
107 | 107 | $this->_max = 10; |
108 | 108 | } |
109 | 109 | if (isset($options['numbersToText'])) { |
110 | - $this->_numbersToText = (bool)$options['numbersToText']; |
|
110 | + $this->_numbersToText = (bool) $options['numbersToText']; |
|
111 | 111 | } else { |
112 | 112 | $this->_numbersToText = false; |
113 | 113 | } |
114 | 114 | if (isset($options['locale'])) { |
115 | - $this->_locale = (string)$options['locale']; |
|
115 | + $this->_locale = (string) $options['locale']; |
|
116 | 116 | } else { |
117 | 117 | $this->_locale = ''; |
118 | 118 | } |
119 | 119 | if (isset($options['severity'])) { |
120 | - $this->_severity = (int)$options['severity']; |
|
120 | + $this->_severity = (int) $options['severity']; |
|
121 | 121 | } else { |
122 | 122 | $this->_severity = 1; |
123 | 123 | } |
@@ -148,11 +148,11 @@ discard block |
||
148 | 148 | list($eq2, $sol2) = $this->_createSimpleEquation(); |
149 | 149 | $op3 = $this->_operators[mt_rand(0, count($this->_operators) - 1)]; |
150 | 150 | list(, $phrase) = $this->_solveSimpleEquation($sol1, $sol2, $op3); |
151 | - $equation = sprintf($op3, '(' . $eq1 . ')', '(' . $eq2 . ')'); |
|
151 | + $equation = sprintf($op3, '('.$eq1.')', '('.$eq2.')'); |
|
152 | 152 | break; |
153 | 153 | default: |
154 | 154 | throw new Text_CAPTCHA_Exception( |
155 | - 'Equation complexity of ' . $this->_severity . ' not supported' |
|
155 | + 'Equation complexity of '.$this->_severity.' not supported' |
|
156 | 156 | ); |
157 | 157 | } |
158 | 158 | $this->setCaptcha($equation); |
@@ -188,7 +188,7 @@ discard block |
||
188 | 188 | { |
189 | 189 | $equation = sprintf($operator, $one, $two); |
190 | 190 | |
191 | - $function = create_function('', 'return ' . $equation . ';'); |
|
191 | + $function = create_function('', 'return '.$equation.';'); |
|
192 | 192 | |
193 | 193 | if ($this->_numbersToText) { |
194 | 194 | $numberWords = new Numbers_Words(); |
@@ -88,12 +88,12 @@ discard block |
||
88 | 88 | public function initDriver($options = array()) |
89 | 89 | { |
90 | 90 | if (isset($options['minValue'])) { |
91 | - $this->_minValue = (int)$options['minValue']; |
|
91 | + $this->_minValue = (int) $options['minValue']; |
|
92 | 92 | } else { |
93 | 93 | $this->_minValue = 1; |
94 | 94 | } |
95 | 95 | if (isset($options['maxValue'])) { |
96 | - $this->_maxValue = (int)$options['maxValue']; |
|
96 | + $this->_maxValue = (int) $options['maxValue']; |
|
97 | 97 | } else { |
98 | 98 | $this->_maxValue = 50; |
99 | 99 | } |
@@ -103,12 +103,12 @@ discard block |
||
103 | 103 | $this->_operator = ''; |
104 | 104 | } |
105 | 105 | if (isset($options['firstValue'])) { |
106 | - $this->_firstNumber = (int)$options['firstValue']; |
|
106 | + $this->_firstNumber = (int) $options['firstValue']; |
|
107 | 107 | } else { |
108 | 108 | $this->_firstNumber = 0; |
109 | 109 | } |
110 | 110 | if (isset($options['secondValue'])) { |
111 | - $this->_secondNumber = (int)$options['secondValue']; |
|
111 | + $this->_secondNumber = (int) $options['secondValue']; |
|
112 | 112 | } else { |
113 | 113 | $this->_secondNumber = 0; |
114 | 114 | } |
@@ -155,7 +155,7 @@ discard block |
||
155 | 155 | private function _setOperation() |
156 | 156 | { |
157 | 157 | $this->setCaptcha( |
158 | - $this->_firstNumber . ' ' . $this->_operator . ' ' . $this->_secondNumber |
|
158 | + $this->_firstNumber.' '.$this->_operator.' '.$this->_secondNumber |
|
159 | 159 | ); |
160 | 160 | } |
161 | 161 |
@@ -459,7 +459,7 @@ discard block |
||
459 | 459 | $GLOBALS['_Text_Password_NumberOfPossibleCharacters'] = $v_count + $c_count; |
460 | 460 | |
461 | 461 | for ($i = 0; $i < $length; $i++) { |
462 | - $retVal .= $c[mt_rand(0, $c_count-1)] . $v[mt_rand(0, $v_count-1)]; |
|
462 | + $retVal .= $c[mt_rand(0, $c_count - 1)].$v[mt_rand(0, $v_count - 1)]; |
|
463 | 463 | } |
464 | 464 | |
465 | 465 | return substr($retVal, 0, $length); |
@@ -484,7 +484,7 @@ discard block |
||
484 | 484 | /** |
485 | 485 | * List of character which could be use in the password |
486 | 486 | */ |
487 | - switch($chars) { |
|
487 | + switch ($chars) { |
|
488 | 488 | |
489 | 489 | case 'alphanumeric': |
490 | 490 | $chars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789'; |
@@ -51,7 +51,7 @@ |
||
51 | 51 | } |
52 | 52 | |
53 | 53 | //require_once 'Text/Diff/Engine/' . $engine . '.php'; |
54 | - $class = 'Text_Diff_Engine_' . $engine; |
|
54 | + $class = 'Text_Diff_Engine_'.$engine; |
|
55 | 55 | $diff_engine = new $class(); |
56 | 56 | |
57 | 57 | $this->_edits = call_user_func_array(array($diff_engine, 'diff'), $params); |
@@ -58,11 +58,11 @@ discard block |
||
58 | 58 | if ($edit->isConflict()) { |
59 | 59 | /* FIXME: this should probably be moved somewhere else. */ |
60 | 60 | $lines = array_merge($lines, |
61 | - array('<<<<<<<' . ($label1 ? ' ' . $label1 : '')), |
|
61 | + array('<<<<<<<'.($label1 ? ' '.$label1 : '')), |
|
62 | 62 | $edit->final1, |
63 | 63 | array("======="), |
64 | 64 | $edit->final2, |
65 | - array('>>>>>>>' . ($label2 ? ' ' . $label2 : ''))); |
|
65 | + array('>>>>>>>'.($label2 ? ' '.$label2 : ''))); |
|
66 | 66 | $this->_conflictingBlocks++; |
67 | 67 | } else { |
68 | 68 | $lines = array_merge($lines, $edit->merged()); |
@@ -126,11 +126,11 @@ discard block |
||
126 | 126 | } |
127 | 127 | } |
128 | 128 | |
129 | - if ($e1 && ! $e1->orig) { |
|
129 | + if ($e1 && !$e1->orig) { |
|
130 | 130 | $bb->out1($e1->final); |
131 | 131 | $e1 = next($edits1); |
132 | 132 | } |
133 | - if ($e2 && ! $e2->orig) { |
|
133 | + if ($e2 && !$e2->orig) { |
|
134 | 134 | $bb->out2($e2->final); |
135 | 135 | $e2 = next($edits2); |
136 | 136 | } |
@@ -35,10 +35,10 @@ |
||
35 | 35 | function _blockHeader($xbeg, $xlen, $ybeg, $ylen) |
36 | 36 | { |
37 | 37 | if ($xlen != 1) { |
38 | - $xbeg .= ',' . $xlen; |
|
38 | + $xbeg .= ','.$xlen; |
|
39 | 39 | } |
40 | 40 | if ($ylen != 1) { |
41 | - $ybeg .= ',' . $ylen; |
|
41 | + $ybeg .= ','.$ylen; |
|
42 | 42 | } |
43 | 43 | $this->_second_block = "--- $ybeg ----\n"; |
44 | 44 | return "***************\n*** $xbeg ****"; |
@@ -83,14 +83,14 @@ discard block |
||
83 | 83 | if ($this->_split_level == 'words') { |
84 | 84 | return implode('', $lines); |
85 | 85 | } else { |
86 | - return implode("\n", $lines) . "\n"; |
|
86 | + return implode("\n", $lines)."\n"; |
|
87 | 87 | } |
88 | 88 | } |
89 | 89 | |
90 | 90 | function _added($lines) |
91 | 91 | { |
92 | 92 | array_walk($lines, array(&$this, '_encode')); |
93 | - $lines[0] = $this->_ins_prefix . $lines[0]; |
|
93 | + $lines[0] = $this->_ins_prefix.$lines[0]; |
|
94 | 94 | $lines[count($lines) - 1] .= $this->_ins_suffix; |
95 | 95 | return $this->_lines($lines, ' ', false); |
96 | 96 | } |
@@ -98,7 +98,7 @@ discard block |
||
98 | 98 | function _deleted($lines, $words = false) |
99 | 99 | { |
100 | 100 | array_walk($lines, array(&$this, '_encode')); |
101 | - $lines[0] = $this->_del_prefix . $lines[0]; |
|
101 | + $lines[0] = $this->_del_prefix.$lines[0]; |
|
102 | 102 | $lines[count($lines) - 1] .= $this->_del_suffix; |
103 | 103 | return $this->_lines($lines, ' ', false); |
104 | 104 | } |
@@ -116,7 +116,7 @@ discard block |
||
116 | 116 | $orig[0] = substr($orig[0], 1); |
117 | 117 | $final[0] = substr($final[0], 1); |
118 | 118 | } |
119 | - return $prefix . $this->_deleted($orig) . $this->_added($final); |
|
119 | + return $prefix.$this->_deleted($orig).$this->_added($final); |
|
120 | 120 | } |
121 | 121 | |
122 | 122 | $text1 = implode("\n", $orig); |
@@ -133,12 +133,11 @@ discard block |
||
133 | 133 | $this->_splitOnWords($text2, $nl))); |
134 | 134 | |
135 | 135 | /* Get the diff in inline format. */ |
136 | - $renderer = new Text_Diff_Renderer_inline |
|
137 | - (array_merge($this->getParams(), |
|
136 | + $renderer = new Text_Diff_Renderer_inline(array_merge($this->getParams(), |
|
138 | 137 | array('split_level' => 'words'))); |
139 | 138 | |
140 | 139 | /* Run the diff and get the output. */ |
141 | - return str_replace($nl, "\n", $renderer->render($diff)) . "\n"; |
|
140 | + return str_replace($nl, "\n", $renderer->render($diff))."\n"; |
|
142 | 141 | } |
143 | 142 | |
144 | 143 | function _splitOnWords($string, $newlineEscape = "\n") |