Completed
Push — 1.10.x ( 67073c...77bf11 )
by Angel Fernando Quiroz
81:48 queued 37:47
created
main/tracking/logins_details.php 1 patch
Indentation   -1 removed lines patch added patch discarded remove patch
@@ -16,7 +16,6 @@
 block discarded – undo
16 16
  * @author Patrick Cool
17 17
  * @author René Haentjens, added CSV file import (October 2004)
18 18
  * @package chamilo.link
19
-
20 19
  */
21 20
 
22 21
 // Including libraries
Please login to merge, or discard this patch.
main/exercice/export/exercise_import.php 1 patch
Indentation   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -93,10 +93,10 @@
 block discarded – undo
93 93
 // Tool introduction
94 94
 // TODO: These settings to be checked when it is possible.
95 95
 Display::display_introduction_section(TOOL_QUIZ, array(
96
-		'CreateDocumentWebDir' => api_get_path(WEB_COURSE_PATH).api_get_course_path().'/document/',
97
-		'CreateDocumentDir' => '../../../courses/'.api_get_course_path().'/document/',
98
-		'BaseHref' => api_get_path(WEB_COURSE_PATH).api_get_course_path().'/'
99
-	)
96
+        'CreateDocumentWebDir' => api_get_path(WEB_COURSE_PATH).api_get_course_path().'/document/',
97
+        'CreateDocumentDir' => '../../../courses/'.api_get_course_path().'/document/',
98
+        'BaseHref' => api_get_path(WEB_COURSE_PATH).api_get_course_path().'/'
99
+    )
100 100
 );
101 101
 
102 102
 
Please login to merge, or discard this patch.
main/inc/lib/magpierss/rss_fetch.inc 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -164,7 +164,7 @@
 block discarded – undo
164 164
         $resp = _fetch_remote_file( $url, $request_headers );
165 165
         
166 166
         if (isset($resp) and $resp) {
167
-          if ($resp->status == '304' ) {
167
+            if ($resp->status == '304' ) {
168 168
                 // we have the most current copy
169 169
                 if ( MAGPIE_DEBUG > 1) {
170 170
                     debug("Got 304 for $url");
Please login to merge, or discard this patch.
main/inc/lib/phpdocx/lib/log4php/renderers/LoggerRendererObject.php 1 patch
Indentation   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -37,10 +37,10 @@
 block discarded – undo
37 37
  * @since 0.3
38 38
  */
39 39
 interface LoggerRendererObject {
40
-	/**
41
-	 * Render the entity passed as parameter as a String.
42
-	 * @param mixed $o entity to render
43
-	 * @return string
44
-	 */
45
-	public function render($o);
40
+    /**
41
+     * Render the entity passed as parameter as a String.
42
+     * @param mixed $o entity to render
43
+     * @return string
44
+     */
45
+    public function render($o);
46 46
 }
Please login to merge, or discard this patch.
main/inc/lib/phpdocx/pdf/include/text_frame_reflower.cls.php 1 patch
Indentation   +89 added lines, -90 removed lines patch added patch discarded remove patch
@@ -34,7 +34,6 @@  discard block
 block discarded – undo
34 34
  * @copyright 2004 Benj Carson
35 35
  * @author Benj Carson <[email protected]>
36 36
  * @package dompdf
37
-
38 37
  */
39 38
 
40 39
 /* $Id: text_frame_reflower.cls.php 216 2010-03-11 22:49:18Z ryan.masten $ */
@@ -47,9 +46,9 @@  discard block
 block discarded – undo
47 46
  */
48 47
 class Text_Frame_Reflower extends Frame_Reflower {
49 48
 
50
-  protected $_block_parent; // Nearest block-level ancestor
49
+    protected $_block_parent; // Nearest block-level ancestor
51 50
 
52
-  function __construct(Text_Frame_Decorator $frame) {
51
+    function __construct(Text_Frame_Decorator $frame) {
53 52
     parent::__construct($frame);
54 53
     $this->_block_parent = null;
55 54
 
@@ -58,34 +57,34 @@  discard block
 block discarded – undo
58 57
     switch ( strtolower($transform) ) {
59 58
     case "capitalize":
60 59
       $this->_frame->set_text( ucwords($this->_frame->get_text()) );
61
-      break;
60
+        break;
62 61
 
63 62
     case "uppercase":
64 63
       $this->_frame->set_text( strtoupper($this->_frame->get_text()) );
65
-      break;
64
+        break;
66 65
 
67 66
     case "lowercase":
68 67
       $this->_frame->set_text( strtolower($this->_frame->get_text()) );
69
-      break;
68
+        break;
70 69
 
71 70
     default:
72 71
       // Do nothing
73 72
       break;
74 73
     }
75
-  }
74
+    }
76 75
 
77
-  //........................................................................
76
+    //........................................................................
78 77
 
79
-  protected function _collapse_white_space($text) {
78
+    protected function _collapse_white_space($text) {
80 79
     //$text = $this->_frame->get_text();
81 80
 //     if ( $this->_block_parent->get_current_line("w") == 0 )
82 81
 //       $text = ltrim($text, " \n\r\t");
83 82
     return preg_replace("/[\s\n]+/u", " ", $text);
84
-  }
83
+    }
85 84
 
86
-  //........................................................................
85
+    //........................................................................
87 86
 
88
-  protected function _line_break($text) {
87
+    protected function _line_break($text) {
89 88
     $style = $this->_frame->get_style();
90 89
     $size = $style->font_size;
91 90
     $font = $style->font_family;
@@ -106,12 +105,12 @@  discard block
 block discarded – undo
106 105
     // Determine the frame width including margin, padding & border
107 106
     $text_width = Font_Metrics::get_text_width($text, $font, $size, $word_spacing);
108 107
     $mbp_width =
109
-      $style->length_in_pt( array( $style->margin_left,
110
-                                   $style->border_left_width,
111
-                                   $style->padding_left,
112
-                                   $style->padding_right,
113
-                                   $style->border_right_width,
114
-                                   $style->margin_right), $line_width );
108
+        $style->length_in_pt( array( $style->margin_left,
109
+                                    $style->border_left_width,
110
+                                    $style->padding_left,
111
+                                    $style->padding_right,
112
+                                    $style->border_right_width,
113
+                                    $style->margin_right), $line_width );
115 114
     $frame_width = $text_width + $mbp_width;
116 115
 
117 116
 // Debugging:
@@ -126,7 +125,7 @@  discard block
 block discarded – undo
126 125
 //     pre_r($words);
127 126
 
128 127
     if ( $frame_width <= $available_width )
129
-      return false;
128
+        return false;
130 129
 
131 130
     // Determine the split point
132 131
     $width = 0;
@@ -134,20 +133,20 @@  discard block
 block discarded – undo
134 133
     reset($words);
135 134
 
136 135
     for ($i = 0; $i < count($words); $i += 2) {
137
-      $word = $words[$i] . (isset($words[$i+1]) ? $words[$i+1] : "");
138
-      $word_width = Font_Metrics::get_text_width($word, $font, $size, $word_spacing);
139
-      if ( $width + $word_width + $mbp_width > $available_width )
136
+        $word = $words[$i] . (isset($words[$i+1]) ? $words[$i+1] : "");
137
+        $word_width = Font_Metrics::get_text_width($word, $font, $size, $word_spacing);
138
+        if ( $width + $word_width + $mbp_width > $available_width )
140 139
         break;
141 140
 
142
-      $width += $word_width;
143
-      $str .= $word;
141
+        $width += $word_width;
142
+        $str .= $word;
144 143
 
145 144
     }
146 145
 
147 146
     // The first word has overflowed.   Force it onto the line
148 147
     if ( $current_line_width == 0 && $width == 0 ) {
149
-      $width += $word_width;
150
-      $str .= $word;
148
+        $width += $word_width;
149
+        $str .= $word;
151 150
     }
152 151
 
153 152
     $offset = mb_strlen($str);
@@ -159,22 +158,22 @@  discard block
 block discarded – undo
159 158
 
160 159
     return $offset;
161 160
 
162
-  }
161
+    }
163 162
 
164
-  //........................................................................
163
+    //........................................................................
165 164
 
166
-  protected function _newline_break($text) {
165
+    protected function _newline_break($text) {
167 166
 
168 167
     if ( ($i = mb_strpos($text, "\n")) === false)
169
-      return false;
168
+        return false;
170 169
 
171 170
     return $i+1;
172 171
 
173
-  }
172
+    }
174 173
 
175
-  //........................................................................
174
+    //........................................................................
176 175
 
177
-  protected function _layout_line() {
176
+    protected function _layout_line() {
178 177
     $style = $this->_frame->get_style();
179 178
     $text = $this->_frame->get_text();
180 179
     $size = $style->font_size;
@@ -197,15 +196,15 @@  discard block
 block discarded – undo
197 196
 
198 197
     case "capitalize":
199 198
       $text = mb_convert_case($text, MB_CASE_TITLE, 'UTF-8');
200
-      break;
199
+        break;
201 200
 
202 201
     case "uppercase":
203 202
       $text = mb_convert_case($text, MB_CASE_UPPER, 'UTF-8');
204
-      break;
203
+        break;
205 204
 
206 205
     case "lowercase":
207 206
       $text = mb_convert_case($text, MB_CASE_LOWER, 'UTF-8');
208
-      break;
207
+        break;
209 208
 
210 209
     }
211 210
     
@@ -217,64 +216,64 @@  discard block
 block discarded – undo
217 216
     default:
218 217
     case "normal":
219 218
       $this->_frame->set_text( $text = $this->_collapse_white_space($text) );
220
-      if ( $text == "" )
219
+        if ( $text == "" )
221 220
         break;
222 221
 
223
-      $split = $this->_line_break($text);
224
-      break;
222
+        $split = $this->_line_break($text);
223
+        break;
225 224
 
226 225
     case "pre":
227 226
       $split = $this->_newline_break($text);
228
-      $add_line = $split !== false;
229
-      break;
227
+        $add_line = $split !== false;
228
+        break;
230 229
 
231 230
     case "nowrap":
232 231
       $this->_frame->set_text( $text = $this->_collapse_white_space($text) );
233
-      break;
232
+        break;
234 233
 
235 234
     case "pre-wrap":
236 235
       $split = $this->_newline_break($text);
237 236
 
238
-      if ( ($tmp = $this->_line_break($text)) !== false ) {
237
+        if ( ($tmp = $this->_line_break($text)) !== false ) {
239 238
         $add_line = $split < $tmp;
240 239
         $split = min($tmp, $split);
241
-      } else
240
+        } else
242 241
         $add_line = true;
243 242
 
244
-      break;
243
+        break;
245 244
 
246 245
     case "pre-line":
247 246
       // Collapse white-space except for \n
248 247
       $this->_frame->set_text( $text = preg_replace( "/[ \t]+/u", " ", $text ) );
249 248
 
250
-      if ( $text == "" )
249
+        if ( $text == "" )
251 250
         break;
252 251
 
253
-      $split = $this->_newline_break($text);
252
+        $split = $this->_newline_break($text);
254 253
 
255
-      if ( ($tmp = $this->_line_break($text)) !== false ) {
254
+        if ( ($tmp = $this->_line_break($text)) !== false ) {
256 255
         $add_line = $split < $tmp;
257 256
         $split = min($tmp, $split);
258
-      } else
257
+        } else
259 258
         $add_line = true;
260 259
 
261
-      break;
260
+        break;
262 261
 
263 262
     }
264 263
 
265 264
     // Handle degenerate case
266 265
     if ( $text === "" )
267
-      return;
266
+        return;
268 267
 
269 268
     if ( $split !== false) {
270 269
 
271
-      // Handle edge cases
272
-      if ( $split == 0 && $text === " " ) {
270
+        // Handle edge cases
271
+        if ( $split == 0 && $text === " " ) {
273 272
         $this->_frame->set_text("");
274 273
         return;
275
-      }
274
+        }
276 275
 
277
-      if ( $split == 0 ) {
276
+        if ( $split == 0 ) {
278 277
 
279 278
         // Trim newlines from the beginning of the line
280 279
         //$this->_frame->set_text(ltrim($text, "\n\r"));
@@ -285,7 +284,7 @@  discard block
 block discarded – undo
285 284
         // Layout the new line
286 285
         $this->_layout_line();
287 286
 
288
-      } else if ( $split < mb_strlen($this->_frame->get_text()) ) {
287
+        } else if ( $split < mb_strlen($this->_frame->get_text()) ) {
289 288
 
290 289
         // split the line if required
291 290
         $this->_frame->split_text($split);
@@ -294,28 +293,28 @@  discard block
 block discarded – undo
294 293
         $t = $this->_frame->get_text();
295 294
 
296 295
         if ( $split > 1 && $t[$split-1] === "\n" )
297
-          $this->_frame->set_text( mb_substr($t, 0, -1) );
296
+            $this->_frame->set_text( mb_substr($t, 0, -1) );
298 297
 
299
-      }
298
+        }
300 299
 
301
-      if ( $add_line ) {
300
+        if ( $add_line ) {
302 301
         $this->_block_parent->add_line();
303 302
         $this->_frame->position();
304
-      }
303
+        }
305 304
 
306
-      // Set our new width
307
-      $this->_frame->recalculate_width();
305
+        // Set our new width
306
+        $this->_frame->recalculate_width();
308 307
 
309 308
     } else {
310 309
 
311
-      $this->_frame->recalculate_width();
310
+        $this->_frame->recalculate_width();
312 311
 
313 312
     }
314
-  }
313
+    }
315 314
 
316
-  //........................................................................
315
+    //........................................................................
317 316
 
318
-  function reflow() {
317
+    function reflow() {
319 318
 
320 319
     $this->_block_parent = $this->_frame->find_block_parent();
321 320
 
@@ -331,13 +330,13 @@  discard block
 block discarded – undo
331 330
 
332 331
     $this->_layout_line();
333 332
 
334
-  }
333
+    }
335 334
 
336
-  //........................................................................
335
+    //........................................................................
337 336
 
338
-  // Returns an array(0 => min, 1 => max, "min" => min, "max" => max) of the
339
-  // minimum and maximum widths of this frame
340
-  function get_min_max_width() {
337
+    // Returns an array(0 => min, 1 => max, "min" => min, "max" => max) of the
338
+    // minimum and maximum widths of this frame
339
+    function get_min_max_width() {
341 340
 
342 341
     $style = $this->_frame->get_style();
343 342
     $this->_block_parent = $this->_frame->find_block_parent();
@@ -363,24 +362,24 @@  discard block
 block discarded – undo
363 362
       // faster than doing a single-pass character by character scan.  Heh,
364 363
       // yes I took the time to bench it ;)
365 364
       $words = array_flip(preg_split("/[\s-]+/u",$str, -1, PREG_SPLIT_DELIM_CAPTURE));
366
-      array_walk($words, create_function('&$val,$str',
367
-                                         '$val = Font_Metrics::get_text_width($str, "'.$font.'", '.$size.', '.$spacing.');'));
368
-      arsort($words);
369
-      $min = reset($words);
370
-      break;
365
+        array_walk($words, create_function('&$val,$str',
366
+                                            '$val = Font_Metrics::get_text_width($str, "'.$font.'", '.$size.', '.$spacing.');'));
367
+        arsort($words);
368
+        $min = reset($words);
369
+        break;
371 370
 
372 371
     case "pre":
373 372
       $lines = array_flip(preg_split("/\n/u", $str));
374
-      array_walk($lines, create_function('&$val,$str',
375
-                                         '$val = Font_Metrics::get_text_width($str, "'.$font.'", '.$size.', '.$spacing.');'));
373
+        array_walk($lines, create_function('&$val,$str',
374
+                                            '$val = Font_Metrics::get_text_width($str, "'.$font.'", '.$size.', '.$spacing.');'));
376 375
 
377
-      arsort($lines);
378
-      $min = reset($lines);
379
-      break;
376
+        arsort($lines);
377
+        $min = reset($lines);
378
+        break;
380 379
 
381 380
     case "nowrap":
382 381
       $min = Font_Metrics::get_text_width($this->_collapse_white_space($str), $font, $size, $spacing);
383
-      break;
382
+        break;
384 383
 
385 384
     }
386 385
 
@@ -390,7 +389,7 @@  discard block
 block discarded – undo
390 389
     case "normal":
391 390
     case "nowrap":
392 391
       $str = preg_replace("/[\s\n]+/u"," ", $text);
393
-      break;
392
+        break;
394 393
 
395 394
     case "pre-line":
396 395
       $str = preg_replace( "/[ \t]+/u", " ", $text);
@@ -398,12 +397,12 @@  discard block
 block discarded – undo
398 397
     case "pre-wrap":
399 398
       // Find the longest word (i.e. minimum length)
400 399
       $lines = array_flip(preg_split("/\n/", $text));
401
-      array_walk($lines, create_function('&$val,$str',
402
-                                         '$val = Font_Metrics::get_text_width($str, "'.$font.'", '.$size.', '.$spacing.');'));
403
-      arsort($lines);
404
-      reset($lines);
405
-      $str = key($lines);
406
-      break;
400
+        array_walk($lines, create_function('&$val,$str',
401
+                                            '$val = Font_Metrics::get_text_width($str, "'.$font.'", '.$size.', '.$spacing.');'));
402
+        arsort($lines);
403
+        reset($lines);
404
+        $str = key($lines);
405
+        break;
407 406
 
408 407
     }
409 408
 
@@ -420,6 +419,6 @@  discard block
 block discarded – undo
420 419
 
421 420
     return array($min, $max, "min" => $min, "max" => $max);
422 421
 
423
-  }
422
+    }
424 423
 
425 424
 }
Please login to merge, or discard this patch.
main/inc/lib/phpdocx/pdf/include/canvas_factory.cls.php 1 patch
Indentation   +12 added lines, -13 removed lines patch added patch discarded remove patch
@@ -34,7 +34,6 @@  discard block
 block discarded – undo
34 34
  * @copyright 2004 Benj Carson
35 35
  * @author Benj Carson <[email protected]>
36 36
  * @package dompdf
37
-
38 37
  */
39 38
 
40 39
 /* $Id: canvas_factory.cls.php 216 2010-03-11 22:49:18Z ryan.masten $ */
@@ -49,35 +48,35 @@  discard block
 block discarded – undo
49 48
  */
50 49
 class Canvas_Factory {
51 50
 
52
-  /**
53
-   * Constructor is private: this is a static class
54
-   */
55
-  private function __construct() { }
51
+    /**
52
+     * Constructor is private: this is a static class
53
+     */
54
+    private function __construct() { }
56 55
 
57
-  static function get_instance($paper = null, $orientation = null,  $class = null) {
56
+    static function get_instance($paper = null, $orientation = null,  $class = null) {
58 57
 
59 58
     $backend = strtolower(DOMPDF_PDF_BACKEND);
60 59
     
61 60
     if ( isset($class) && class_exists($class, false) )
62
-      $class .= "_Adapter";
61
+        $class .= "_Adapter";
63 62
     
64 63
     else if ( (DOMPDF_PDF_BACKEND === "auto" || $backend === "pdflib" ) &&
65 64
               class_exists("PDFLib", false) )
66
-      $class = "PDFLib_Adapter";
65
+        $class = "PDFLib_Adapter";
67 66
 
68 67
     else if ( (DOMPDF_PDF_BACKEND === "auto" || $backend === "cpdf") )
69
-      $class = "CPDF_Adapter";
68
+        $class = "CPDF_Adapter";
70 69
 
71 70
     else if ( ( $backend === "tcpdf") )
72
-      $class = "TCPDF_Adapter";
71
+        $class = "TCPDF_Adapter";
73 72
       
74 73
     else if ( $backend === "gd" )
75
-      $class = "GD_Adapter";
74
+        $class = "GD_Adapter";
76 75
     
77 76
     else
78
-      $class = "CPDF_Adapter";
77
+        $class = "CPDF_Adapter";
79 78
 
80 79
     return new $class($paper, $orientation);
81 80
         
82
-  }
81
+    }
83 82
 }
Please login to merge, or discard this patch.
main/inc/lib/phpdocx/pdf/include/inline_positioner.cls.php 1 patch
Indentation   +5 added lines, -6 removed lines patch added patch discarded remove patch
@@ -34,7 +34,6 @@  discard block
 block discarded – undo
34 34
  * @copyright 2004 Benj Carson
35 35
  * @author Benj Carson <[email protected]>
36 36
  * @package dompdf
37
-
38 37
  */
39 38
 
40 39
 /* $Id: inline_positioner.cls.php 216 2010-03-11 22:49:18Z ryan.masten $ */
@@ -46,11 +45,11 @@  discard block
 block discarded – undo
46 45
  */
47 46
 class Inline_Positioner extends Positioner {
48 47
 
49
-  function __construct(Frame_Decorator $frame) { parent::__construct($frame); }
48
+    function __construct(Frame_Decorator $frame) { parent::__construct($frame); }
50 49
 
51
-  //........................................................................
50
+    //........................................................................
52 51
 
53
-  function position() {
52
+    function position() {
54 53
     $cb = $this->_frame->get_containing_block();
55 54
 
56 55
     // Find our nearest block level parent and access its lines property.
@@ -65,11 +64,11 @@  discard block
 block discarded – undo
65 64
     // End debugging
66 65
 
67 66
     if ( !$p )
68
-      throw new DOMPDF_Exception("No block-level parent found.  Not good.");
67
+        throw new DOMPDF_Exception("No block-level parent found.  Not good.");
69 68
 
70 69
     $line = $p->get_current_line();
71 70
     
72 71
     $this->_frame->set_position($cb["x"] + $line["w"], $line["y"]);
73 72
 
74
-  }
73
+    }
75 74
 }
Please login to merge, or discard this patch.
main/inc/ajax/skill.ajax.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -55,7 +55,7 @@
 block discarded – undo
55 55
                     //$gradebook['name'] = $gradebook['name'];
56 56
                     //$gradebook_list[]  = $gradebook;
57 57
                 } else {
58
-                  //  $gradebook['name'] = $gradebook_list[$gradebook['parent_id']]['name'].' > '.$gradebook['name'];
58
+                    //  $gradebook['name'] = $gradebook_list[$gradebook['parent_id']]['name'].' > '.$gradebook['name'];
59 59
                     //$gradebook_list[]  = $gradebook;
60 60
                 }
61 61
             }
Please login to merge, or discard this patch.
main/session/add_students_to_session.php 1 patch
Indentation   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -70,13 +70,13 @@
 block discarded – undo
70 70
         <tr>
71 71
             <td align="center">
72 72
                 <?php
73
-                 echo Display::select(
74
-                     'sessions[]',
75
-                     $sessionList,
76
-                     '',
77
-                     array('style'=>'width:100%', 'multiple'=>'multiple', 'id'=>'sessions', 'size'=>'15px'),
78
-                     false
79
-                 );
73
+                    echo Display::select(
74
+                        'sessions[]',
75
+                        $sessionList,
76
+                        '',
77
+                        array('style'=>'width:100%', 'multiple'=>'multiple', 'id'=>'sessions', 'size'=>'15px'),
78
+                        false
79
+                    );
80 80
                 ?>
81 81
             </td>
82 82
             <td align="center">
Please login to merge, or discard this patch.