Completed
Push — 1.10.x ( 5d5324...cf3164 )
by Julito
60:26
created
main/inc/lib/pear/OLE/ChainedBlockStream.php 1 patch
Indentation   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -83,8 +83,8 @@  discard block
 block discarded – undo
83 83
         // 25 is length of "ole-chainedblockstream://"
84 84
         parse_str(substr($path, 25), $this->params);
85 85
         if (!isset($this->params['oleInstanceId'],
86
-                   $this->params['blockId'],
87
-                   $GLOBALS['_OLE_INSTANCES'][$this->params['oleInstanceId']])) {
86
+                    $this->params['blockId'],
87
+                    $GLOBALS['_OLE_INSTANCES'][$this->params['oleInstanceId']])) {
88 88
 
89 89
             if ($options & STREAM_REPORT_ERRORS) {
90 90
                 trigger_error('OLE stream not found', E_USER_WARNING);
@@ -163,7 +163,7 @@  discard block
 block discarded – undo
163 163
         if (version_compare(PHP_VERSION, '5.0', '>=') &&
164 164
             version_compare(PHP_VERSION, '5.1', '<')) {
165 165
 
166
-           $eof = !$eof;
166
+            $eof = !$eof;
167 167
         }
168 168
         return $eof;
169 169
     }
Please login to merge, or discard this patch.
main/inc/lib/pear/OLE/PPS.php 1 patch
Indentation   +86 added lines, -86 removed lines patch added patch discarded remove patch
@@ -33,98 +33,98 @@  discard block
 block discarded – undo
33 33
 class OLE_PPS extends PEAR
34 34
 {
35 35
     /**
36
-    * The PPS index
37
-    * @var integer
38
-    */
36
+     * The PPS index
37
+     * @var integer
38
+     */
39 39
     var $No;
40 40
 
41 41
     /**
42
-    * The PPS name (in Unicode)
43
-    * @var string
44
-    */
42
+     * The PPS name (in Unicode)
43
+     * @var string
44
+     */
45 45
     var $Name;
46 46
 
47 47
     /**
48
-    * The PPS type. Dir, Root or File
49
-    * @var integer
50
-    */
48
+     * The PPS type. Dir, Root or File
49
+     * @var integer
50
+     */
51 51
     var $Type;
52 52
 
53 53
     /**
54
-    * The index of the previous PPS
55
-    * @var integer
56
-    */
54
+     * The index of the previous PPS
55
+     * @var integer
56
+     */
57 57
     var $PrevPps;
58 58
 
59 59
     /**
60
-    * The index of the next PPS
61
-    * @var integer
62
-    */
60
+     * The index of the next PPS
61
+     * @var integer
62
+     */
63 63
     var $NextPps;
64 64
 
65 65
     /**
66
-    * The index of it's first child if this is a Dir or Root PPS
67
-    * @var integer
68
-    */
66
+     * The index of it's first child if this is a Dir or Root PPS
67
+     * @var integer
68
+     */
69 69
     var $DirPps;
70 70
 
71 71
     /**
72
-    * A timestamp
73
-    * @var integer
74
-    */
72
+     * A timestamp
73
+     * @var integer
74
+     */
75 75
     var $Time1st;
76 76
 
77 77
     /**
78
-    * A timestamp
79
-    * @var integer
80
-    */
78
+     * A timestamp
79
+     * @var integer
80
+     */
81 81
     var $Time2nd;
82 82
 
83 83
     /**
84
-    * Starting block (small or big) for this PPS's data  inside the container
85
-    * @var integer
86
-    */
84
+     * Starting block (small or big) for this PPS's data  inside the container
85
+     * @var integer
86
+     */
87 87
     var $_StartBlock;
88 88
 
89 89
     /**
90
-    * The size of the PPS's data (in bytes)
91
-    * @var integer
92
-    */
90
+     * The size of the PPS's data (in bytes)
91
+     * @var integer
92
+     */
93 93
     var $Size;
94 94
 
95 95
     /**
96
-    * The PPS's data (only used if it's not using a temporary file)
97
-    * @var string
98
-    */
96
+     * The PPS's data (only used if it's not using a temporary file)
97
+     * @var string
98
+     */
99 99
     var $_data;
100 100
 
101 101
     /**
102
-    * Array of child PPS's (only used by Root and Dir PPS's)
103
-    * @var array
104
-    */
102
+     * Array of child PPS's (only used by Root and Dir PPS's)
103
+     * @var array
104
+     */
105 105
     var $children = array();
106 106
 
107 107
     /**
108
-    * Pointer to OLE container
109
-    * @var OLE
110
-    */
108
+     * Pointer to OLE container
109
+     * @var OLE
110
+     */
111 111
     var $ole;
112 112
 
113 113
     /**
114
-    * The constructor
115
-    *
116
-    * @access public
117
-    * @param integer $No   The PPS index
118
-    * @param string  $name The PPS name
119
-    * @param integer $type The PPS type. Dir, Root or File
120
-    * @param integer $prev The index of the previous PPS
121
-    * @param integer $next The index of the next PPS
122
-    * @param integer $dir  The index of it's first child if this is a Dir or Root PPS
123
-    * @param integer $time_1st A timestamp
124
-    * @param integer $time_2nd A timestamp
125
-    * @param string  $data  The (usually binary) source data of the PPS
126
-    * @param array   $children Array containing children PPS for this PPS
127
-    */
114
+     * The constructor
115
+     *
116
+     * @access public
117
+     * @param integer $No   The PPS index
118
+     * @param string  $name The PPS name
119
+     * @param integer $type The PPS type. Dir, Root or File
120
+     * @param integer $prev The index of the previous PPS
121
+     * @param integer $next The index of the next PPS
122
+     * @param integer $dir  The index of it's first child if this is a Dir or Root PPS
123
+     * @param integer $time_1st A timestamp
124
+     * @param integer $time_2nd A timestamp
125
+     * @param string  $data  The (usually binary) source data of the PPS
126
+     * @param array   $children Array containing children PPS for this PPS
127
+     */
128 128
     function OLE_PPS($No, $name, $type, $prev, $next, $dir, $time_1st, $time_2nd, $data, $children)
129 129
     {
130 130
         $this->No      = $No;
@@ -145,11 +145,11 @@  discard block
 block discarded – undo
145 145
     }
146 146
 
147 147
     /**
148
-    * Returns the amount of data saved for this PPS
149
-    *
150
-    * @access private
151
-    * @return integer The amount of data (in bytes)
152
-    */
148
+     * Returns the amount of data saved for this PPS
149
+     *
150
+     * @access private
151
+     * @return integer The amount of data (in bytes)
152
+     */
153 153
     function _DataLen()
154 154
     {
155 155
         if (!isset($this->_data)) {
@@ -165,11 +165,11 @@  discard block
 block discarded – undo
165 165
     }
166 166
 
167 167
     /**
168
-    * Returns a string with the PPS's WK (What is a WK?)
169
-    *
170
-    * @access private
171
-    * @return string The binary string
172
-    */
168
+     * Returns a string with the PPS's WK (What is a WK?)
169
+     *
170
+     * @access private
171
+     * @return string The binary string
172
+     */
173 173
     function _getPpsWk()
174 174
     {
175 175
         $ret = $this->Name;
@@ -177,34 +177,34 @@  discard block
 block discarded – undo
177 177
             $ret .= "\x00";
178 178
         }
179 179
         $ret .= pack("v", strlen($this->Name) + 2)  // 66
180
-              . pack("c", $this->Type)              // 67
181
-              . pack("c", 0x00) //UK                // 68
182
-              . pack("V", $this->PrevPps) //Prev    // 72
183
-              . pack("V", $this->NextPps) //Next    // 76
184
-              . pack("V", $this->DirPps)  //Dir     // 80
185
-              . "\x00\x09\x02\x00"                  // 84
186
-              . "\x00\x00\x00\x00"                  // 88
187
-              . "\xc0\x00\x00\x00"                  // 92
188
-              . "\x00\x00\x00\x46"                  // 96 // Seems to be ok only for Root
189
-              . "\x00\x00\x00\x00"                  // 100
190
-              . OLE::LocalDate2OLE($this->Time1st)       // 108
191
-              . OLE::LocalDate2OLE($this->Time2nd)       // 116
192
-              . pack("V", isset($this->_StartBlock)?
180
+                . pack("c", $this->Type)              // 67
181
+                . pack("c", 0x00) //UK                // 68
182
+                . pack("V", $this->PrevPps) //Prev    // 72
183
+                . pack("V", $this->NextPps) //Next    // 76
184
+                . pack("V", $this->DirPps)  //Dir     // 80
185
+                . "\x00\x09\x02\x00"                  // 84
186
+                . "\x00\x00\x00\x00"                  // 88
187
+                . "\xc0\x00\x00\x00"                  // 92
188
+                . "\x00\x00\x00\x46"                  // 96 // Seems to be ok only for Root
189
+                . "\x00\x00\x00\x00"                  // 100
190
+                . OLE::LocalDate2OLE($this->Time1st)       // 108
191
+                . OLE::LocalDate2OLE($this->Time2nd)       // 116
192
+                . pack("V", isset($this->_StartBlock)?
193 193
                         $this->_StartBlock:0)        // 120
194
-              . pack("V", $this->Size)               // 124
195
-              . pack("V", 0);                        // 128
194
+                . pack("V", $this->Size)               // 124
195
+                . pack("V", 0);                        // 128
196 196
         return $ret;
197 197
     }
198 198
 
199 199
     /**
200
-    * Updates index and pointers to previous, next and children PPS's for this
201
-    * PPS. I don't think it'll work with Dir PPS's.
202
-    *
203
-    * @access private
204
-    * @param array &$pps_array Reference to the array of PPS's for the whole OLE
205
-    *                          container
206
-    * @return integer          The index for this PPS
207
-    */
200
+     * Updates index and pointers to previous, next and children PPS's for this
201
+     * PPS. I don't think it'll work with Dir PPS's.
202
+     *
203
+     * @access private
204
+     * @param array &$pps_array Reference to the array of PPS's for the whole OLE
205
+     *                          container
206
+     * @return integer          The index for this PPS
207
+     */
208 208
     function _savePpsSetPnt(&$pps_array)
209 209
     {
210 210
         $pps_array[count($pps_array)] = &$this;
Please login to merge, or discard this patch.
main/inc/lib/pear/Text/Password.php 1 patch
Indentation   +37 added lines, -37 removed lines patch added patch discarded remove patch
@@ -441,17 +441,17 @@  discard block
 block discarded – undo
441 441
          * List of vowels and vowel sounds
442 442
          */
443 443
         $v = array('a', 'e', 'i', 'o', 'u', 'ae', 'ou', 'io',
444
-                   'ea', 'ou', 'ia', 'ai'
445
-                   );
444
+                    'ea', 'ou', 'ia', 'ai'
445
+                    );
446 446
 
447 447
         /**
448 448
          * List of consonants and consonant sounds
449 449
          */
450 450
         $c = array('b', 'c', 'd', 'g', 'h', 'j', 'k', 'l', 'm',
451
-                   'n', 'p', 'r', 's', 't', 'u', 'v', 'w',
452
-                   'tr', 'cr', 'fr', 'dr', 'wr', 'pr', 'th',
453
-                   'ch', 'ph', 'st', 'sl', 'cl'
454
-                   );
451
+                    'n', 'p', 'r', 's', 't', 'u', 'v', 'w',
452
+                    'tr', 'cr', 'fr', 'dr', 'wr', 'pr', 'th',
453
+                    'ch', 'ph', 'st', 'sl', 'cl'
454
+                    );
455 455
 
456 456
         $v_count = 12;
457 457
         $c_count = 29;
@@ -484,50 +484,50 @@  discard block
 block discarded – undo
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
-         case 'alphanumeric':
489
+            case 'alphanumeric':
490 490
              $chars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
491
-             $GLOBALS['_Text_Password_NumberOfPossibleCharacters'] = 62;
492
-             break;
491
+                $GLOBALS['_Text_Password_NumberOfPossibleCharacters'] = 62;
492
+                break;
493 493
 
494
-         case 'alphabetical':
494
+            case 'alphabetical':
495 495
              $chars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz';
496
-             $GLOBALS['_Text_Password_NumberOfPossibleCharacters'] = 52;
497
-             break;
496
+                $GLOBALS['_Text_Password_NumberOfPossibleCharacters'] = 52;
497
+                break;
498 498
 
499
-         case 'numeric':
499
+            case 'numeric':
500 500
              $chars = '0123456789';
501
-             $GLOBALS['_Text_Password_NumberOfPossibleCharacters'] = 10;
502
-             break;
501
+                $GLOBALS['_Text_Password_NumberOfPossibleCharacters'] = 10;
502
+                break;
503 503
 
504
-         case '':
504
+            case '':
505 505
              $chars = '_#@%&ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
506
-             $GLOBALS['_Text_Password_NumberOfPossibleCharacters'] = 67;
507
-             break;
506
+                $GLOBALS['_Text_Password_NumberOfPossibleCharacters'] = 67;
507
+                break;
508 508
 
509
-         default:
509
+            default:
510 510
              /**
511 511
               * Some characters shouldn't be used
512 512
               */
513 513
              $chars = trim($chars);
514
-             $chars = str_replace(array('+', '|', '$', '^', '/', '\\', ','), '', $chars);
515
-
516
-             $GLOBALS['_Text_Password_NumberOfPossibleCharacters'] = strlen($chars);
517
-         }
518
-
519
-         /**
520
-          * Generate password
521
-          */
522
-         for ($i = 0; $i < $length; $i++) {
523
-             $num = mt_rand(0, $GLOBALS['_Text_Password_NumberOfPossibleCharacters'] - 1);
524
-             $password .= $chars{$num};
525
-         }
526
-
527
-         /**
528
-          * Return password
529
-          */
530
-         return $password;
514
+                $chars = str_replace(array('+', '|', '$', '^', '/', '\\', ','), '', $chars);
515
+
516
+                $GLOBALS['_Text_Password_NumberOfPossibleCharacters'] = strlen($chars);
517
+            }
518
+
519
+            /**
520
+             * Generate password
521
+             */
522
+            for ($i = 0; $i < $length; $i++) {
523
+                $num = mt_rand(0, $GLOBALS['_Text_Password_NumberOfPossibleCharacters'] - 1);
524
+                $password .= $chars{$num};
525
+            }
526
+
527
+            /**
528
+             * Return password
529
+             */
530
+            return $password;
531 531
     }
532 532
 }
533 533
 ?>
Please login to merge, or discard this patch.
main/inc/lib/pear/Text/Diff/ThreeWay.php 1 patch
Indentation   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -46,7 +46,7 @@  discard block
 block discarded – undo
46 46
         }
47 47
 
48 48
         $this->_edits = $this->_diff3($engine->diff($orig, $final1),
49
-                                      $engine->diff($orig, $final2));
49
+                                        $engine->diff($orig, $final2));
50 50
     }
51 51
 
52 52
     /**
@@ -58,11 +58,11 @@  discard block
 block discarded – undo
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 : '')),
62
-                                     $edit->final1,
63
-                                     array("======="),
64
-                                     $edit->final2,
65
-                                     array('>>>>>>>' . ($label2 ? ' ' . $label2 : '')));
61
+                                        array('<<<<<<<' . ($label1 ? ' ' . $label1 : '')),
62
+                                        $edit->final1,
63
+                                        array("======="),
64
+                                        $edit->final2,
65
+                                        array('>>>>>>>' . ($label2 ? ' ' . $label2 : '')));
66 66
                 $this->_conflictingBlocks++;
67 67
             } else {
68 68
                 $lines = array_merge($lines, $edit->merged());
Please login to merge, or discard this patch.
main/inc/lib/pear/Text/Diff/Renderer/inline.php 1 patch
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -129,13 +129,13 @@
 block discarded – undo
129 129
          * preserve whitespace as well. Therefore we split on words,
130 130
          * but include all blocks of whitespace in the wordlist. */
131 131
         $diff = new Text_Diff('native',
132
-                              array($this->_splitOnWords($text1, $nl),
132
+                                array($this->_splitOnWords($text1, $nl),
133 133
                                     $this->_splitOnWords($text2, $nl)));
134 134
 
135 135
         /* Get the diff in inline format. */
136 136
         $renderer = new Text_Diff_Renderer_inline
137 137
             (array_merge($this->getParams(),
138
-                         array('split_level' => 'words')));
138
+                            array('split_level' => 'words')));
139 139
 
140 140
         /* Run the diff and get the output. */
141 141
         return str_replace($nl, "\n", $renderer->render($diff)) . "\n";
Please login to merge, or discard this patch.
main/inc/lib/pear/Text/Diff/Renderer.php 1 patch
Indentation   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -104,8 +104,8 @@  discard block
 block discarded – undo
104 104
                         }
105 105
                         /* @todo */
106 106
                         $output .= $this->_block($x0, $ntrail + $xi - $x0,
107
-                                                 $y0, $ntrail + $yi - $y0,
108
-                                                 $block);
107
+                                                    $y0, $ntrail + $yi - $y0,
108
+                                                    $block);
109 109
                         $block = false;
110 110
                     }
111 111
                 }
@@ -136,8 +136,8 @@  discard block
 block discarded – undo
136 136
 
137 137
         if (is_array($block)) {
138 138
             $output .= $this->_block($x0, $xi - $x0,
139
-                                     $y0, $yi - $y0,
140
-                                     $block);
139
+                                        $y0, $yi - $y0,
140
+                                        $block);
141 141
         }
142 142
 
143 143
         return $output . $this->_endDiff();
Please login to merge, or discard this patch.
main/inc/lib/pear/Text/Diff/Mapped.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -29,7 +29,7 @@
 block discarded – undo
29 29
      *                                  of elements as $to_lines.
30 30
      */
31 31
     function Text_Diff_Mapped($from_lines, $to_lines,
32
-                              $mapped_from_lines, $mapped_to_lines)
32
+                                $mapped_from_lines, $mapped_to_lines)
33 33
     {
34 34
         assert(count($from_lines) == count($mapped_from_lines));
35 35
         assert(count($to_lines) == count($mapped_to_lines));
Please login to merge, or discard this patch.
main/inc/lib/pear/Text/Diff/Engine/shell.php 1 patch
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -124,9 +124,9 @@
 block discarded – undo
124 124
             array_push($edits,
125 125
                 new Text_Diff_Op_copy(
126 126
                     $this->_getLines($from_lines, $from_line_no,
127
-                                     $from_line_no + count($from_lines) - 1),
127
+                                        $from_line_no + count($from_lines) - 1),
128 128
                     $this->_getLines($to_lines, $to_line_no,
129
-                                     $to_line_no + count($to_lines) - 1)));
129
+                                        $to_line_no + count($to_lines) - 1)));
130 130
         }
131 131
 
132 132
         return $edits;
Please login to merge, or discard this patch.
main/inc/lib/pear/PEAR5.php 1 patch
Indentation   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -6,17 +6,17 @@
 block discarded – undo
6 6
 class PEAR5
7 7
 {
8 8
     /**
9
-    * If you have a class that's mostly/entirely static, and you need static
10
-    * properties, you can use this method to simulate them. Eg. in your method(s)
11
-    * do this: $myVar = &PEAR5::getStaticProperty('myclass', 'myVar');
12
-    * You MUST use a reference, or they will not persist!
13
-    *
14
-    * @access public
15
-    * @param  string $class  The calling classname, to prevent clashes
16
-    * @param  string $var    The variable to retrieve.
17
-    * @return mixed   A reference to the variable. If not set it will be
18
-    *                 auto initialised to NULL.
19
-    */
9
+     * If you have a class that's mostly/entirely static, and you need static
10
+     * properties, you can use this method to simulate them. Eg. in your method(s)
11
+     * do this: $myVar = &PEAR5::getStaticProperty('myclass', 'myVar');
12
+     * You MUST use a reference, or they will not persist!
13
+     *
14
+     * @access public
15
+     * @param  string $class  The calling classname, to prevent clashes
16
+     * @param  string $var    The variable to retrieve.
17
+     * @return mixed   A reference to the variable. If not set it will be
18
+     *                 auto initialised to NULL.
19
+     */
20 20
     static function &getStaticProperty($class, $var)
21 21
     {
22 22
         static $properties;
Please login to merge, or discard this patch.