Completed
Push — 1.11.x ( d4cbce...fbf9a8 )
by José
48:27
created
main/inc/lib/formvalidator/Element/receivers.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -41,9 +41,9 @@
 block discarded – undo
41 41
 	 */
42 42
 	function _createElements()
43 43
 	{
44
-		$this->_elements[] = new HTML_QuickForm_Radio('receivers', '', get_lang('Everybody'), '0', array ('onclick' => 'javascript:receivers_hide(\'receivers_to\')'));
44
+		$this->_elements[] = new HTML_QuickForm_Radio('receivers', '', get_lang('Everybody'), '0', array('onclick' => 'javascript:receivers_hide(\'receivers_to\')'));
45 45
 		$this->_elements[0]->setChecked(true);
46
-		$this->_elements[] = new HTML_QuickForm_Radio('receivers', '', get_lang('SelectGroupsUsers'), '1', array ('onclick' => 'javascript:receivers_show(\'receivers_to\')'));
46
+		$this->_elements[] = new HTML_QuickForm_Radio('receivers', '', get_lang('SelectGroupsUsers'), '1', array('onclick' => 'javascript:receivers_show(\'receivers_to\')'));
47 47
 		$this->_elements[] = new HTML_QuickForm_advmultiselect('to', '', $this->receivers);
48 48
 		$this->_elements[2]->setSelected($this->receivers_selected);
49 49
 	}
Please login to merge, or discard this patch.
main/inc/lib/formvalidator/Element/DateRangePicker.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -88,7 +88,7 @@
 block discarded – undo
88 88
         }
89 89
 
90 90
         $timePicker = 'true';
91
-        $timePickerValue =  $this->getAttribute('timePicker');
91
+        $timePickerValue = $this->getAttribute('timePicker');
92 92
         if (!empty($timePickerValue)) {
93 93
             $timePicker = $timePickerValue;
94 94
         }
Please login to merge, or discard this patch.
main/inc/lib/formvalidator/Element/DatePicker.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -44,12 +44,12 @@  discard block
 block discarded – undo
44 44
             $value = api_format_date($value, DATE_TIME_FORMAT_LONG_24H);
45 45
         }
46 46
 
47
-        return $this->getElementJS() . '
47
+        return $this->getElementJS().'
48 48
             <div class="input-group">
49 49
                 <span class="input-group-addon">
50
-                    <input ' . $this->_getAttrString($this->_attributes) . '>
50
+                    <input ' . $this->_getAttrString($this->_attributes).'>
51 51
                 </span>
52
-                <input class="form-control" type="text" readonly id="' . $id . '_alt" value="' . $value . '">
52
+                <input class="form-control" type="text" readonly id="' . $id.'_alt" value="'.$value.'">
53 53
             </div>
54 54
         ';
55 55
     }
@@ -79,14 +79,14 @@  discard block
 block discarded – undo
79 79
         $js .= "<script>
80 80
             $(function() {
81 81
                 $('#$id').hide().datepicker({
82
-                    defaultDate: '" . $this->getValue() . "',
82
+                    defaultDate: '".$this->getValue()."',
83 83
                     dateFormat: 'yy-mm-dd',
84 84
                     altField: '#{$id}_alt',
85
-                    altFormat: \"" . get_lang('DateFormatLongNoDayJS') . "\",
85
+                    altFormat: \"".get_lang('DateFormatLongNoDayJS')."\",
86 86
                     showOn: 'both',
87
-                    buttonImage: '" . Display::return_icon('attendance.png', null, [], ICON_SIZE_TINY, true, true) . "',
87
+                    buttonImage: '" . Display::return_icon('attendance.png', null, [], ICON_SIZE_TINY, true, true)."',
88 88
                     buttonImageOnly: true,
89
-                    buttonText: '" . get_lang('SelectDate') . "',
89
+                    buttonText: '" . get_lang('SelectDate')."',
90 90
                     changeMonth: true,
91 91
                     changeYear: true,
92 92
                     yearRange: 'c-60y:c+5y'
Please login to merge, or discard this patch.
main/inc/lib/formvalidator/Element/DateTimePicker.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -38,12 +38,12 @@  discard block
 block discarded – undo
38 38
             $value = api_format_date($value, DATE_TIME_FORMAT_LONG_24H);
39 39
         }
40 40
 
41
-        return $this->getElementJS() . '
41
+        return $this->getElementJS().'
42 42
             <div class="input-group">
43 43
                 <span class="input-group-addon">
44
-                    <input ' . $this->_getAttrString($this->_attributes) . '>
44
+                    <input ' . $this->_getAttrString($this->_attributes).'>
45 45
                 </span>
46
-                <input class="form-control" type="text" readonly id="' . $id . '_alt" value="' . $value . '">
46
+                <input class="form-control" type="text" readonly id="' . $id.'_alt" value="'.$value.'">
47 47
             </div>
48 48
         ';
49 49
     }
@@ -73,18 +73,18 @@  discard block
 block discarded – undo
73 73
         $js .= "<script>
74 74
             $(function() {
75 75
                 $('#$id').hide().datetimepicker({
76
-                    defaultDate: '" . $this->getValue() . "',
76
+                    defaultDate: '".$this->getValue()."',
77 77
                     dateFormat: 'yy-mm-dd',
78 78
                     timeFormat: 'HH:mm',
79 79
                     altField: '#{$id}_alt',
80
-                    altFormat: \"" . get_lang('DateFormatLongNoDayJS') . "\",
81
-                    altTimeFormat: \"" . get_lang('TimeFormatNoSecJS') . "\",
82
-                    altSeparator: \" " . get_lang('AtTime') . " \",
80
+                    altFormat: \"".get_lang('DateFormatLongNoDayJS')."\",
81
+                    altTimeFormat: \"" . get_lang('TimeFormatNoSecJS')."\",
82
+                    altSeparator: \" " . get_lang('AtTime')." \",
83 83
                     altFieldTimeOnly: false,
84 84
                     showOn: 'both',
85
-                    buttonImage: '" . Display::return_icon('attendance.png', null, [], ICON_SIZE_TINY, true, true) . "',
85
+                    buttonImage: '" . Display::return_icon('attendance.png', null, [], ICON_SIZE_TINY, true, true)."',
86 86
                     buttonImageOnly: true,
87
-                    buttonText: '" . get_lang('SelectDate') . "',
87
+                    buttonText: '" . get_lang('SelectDate')."',
88 88
                     changeMonth: true,
89 89
                     changeYear: true
90 90
                 });
Please login to merge, or discard this patch.
main/inc/lib/formvalidator/Rule/CompareDateTimeText.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -21,7 +21,7 @@
 block discarded – undo
21 21
                 return true;
22 22
             }
23 23
         }
24
-		$result =  parent::validate(array($datetime1, $datetime2), $operator);
24
+		$result = parent::validate(array($datetime1, $datetime2), $operator);
25 25
         return $result;
26 26
     }
27 27
 }
Please login to merge, or discard this patch.
main/inc/lib/formvalidator/Rule/HTML.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -16,7 +16,7 @@  discard block
 block discarded – undo
16 16
      */
17 17
     function validate($html, $mode = NO_HTML)
18 18
     {
19
-        $allowed_tags = self::get_allowed_tags ($mode, $fullpage);
19
+        $allowed_tags = self::get_allowed_tags($mode, $fullpage);
20 20
         $cleaned_html = kses($html, $allowed_tags);
21 21
         return $html == $cleaned_html;
22 22
     }
@@ -33,7 +33,7 @@  discard block
 block discarded – undo
33 33
         // Include the allowed tags.
34 34
         //include(dirname(__FILE__).'/allowed_tags.inc.php');
35 35
         global $allowed_tags_student, $allowed_tags_student_full_page, $allowed_tags_teacher, $allowed_tags_teacher_full_page;
36
-        switch($mode)
36
+        switch ($mode)
37 37
         {
38 38
             case NO_HTML:
39 39
                 return array();
Please login to merge, or discard this patch.
main/inc/lib/formvalidator/Rule/MultipleRequired.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -27,11 +27,11 @@
 block discarded – undo
27 27
      */
28 28
     function validate($value, $options = null)
29 29
     {
30
-    	if(is_array($value))
30
+    	if (is_array($value))
31 31
     	{
32
-    		$value = implode(null,$value);
32
+    		$value = implode(null, $value);
33 33
     	}
34
-        if ((string)$value == '') {
34
+        if ((string) $value == '') {
35 35
             return false;
36 36
         }
37 37
         return true;
Please login to merge, or discard this patch.
main/inc/lib/chamilo_session.class.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -109,7 +109,7 @@
 block discarded – undo
109 109
         }*/
110 110
         // If the session time has expired, refresh the starttime value,
111 111
         //  so we're starting to count down from a later time
112
-        if ( $session->has('starttime') && $session->is_expired()) {
112
+        if ($session->has('starttime') && $session->is_expired()) {
113 113
             $session->destroy();
114 114
         } else {
115 115
             //error_log('Time not expired, extend session for a bit more');
Please login to merge, or discard this patch.
main/inc/lib/system_announcements.lib.php 1 patch
Spacing   +39 added lines, -39 removed lines patch added patch discarded remove patch
@@ -22,14 +22,14 @@  discard block
 block discarded – undo
22 22
         $tbl_announcement_group = Database :: get_main_table(TABLE_MAIN_SYSTEM_ANNOUNCEMENTS_GROUPS);
23 23
 		$userGroup = new UserGroup();
24 24
 
25
-        $temp_user_groups = $userGroup->get_groups_by_user(api_get_user_id(),0);
25
+        $temp_user_groups = $userGroup->get_groups_by_user(api_get_user_id(), 0);
26 26
         $groups = array();
27 27
         foreach ($temp_user_groups as $user_group) {
28 28
             $groups = array_merge($groups, array($user_group['id']));
29 29
             $groups = array_merge($groups, $userGroup->get_parent_groups($user_group['id']));
30 30
         }
31 31
 
32
-        $groups_string = '('.implode($groups,',').')';
32
+        $groups_string = '('.implode($groups, ',').')';
33 33
         $now = api_get_utc_datetime();
34 34
         $sql = "SELECT *, DATE_FORMAT(date_start,'%d-%m-%Y %h:%i:%s') AS display_date
35 35
 				FROM  $db_table
@@ -104,13 +104,13 @@  discard block
 block discarded – undo
104 104
      * @param string $user_id
105 105
      * @return string
106 106
      */
107
-    public static function display_all_announcements($visible, $id = -1, $start = 0,$user_id='')
107
+    public static function display_all_announcements($visible, $id = -1, $start = 0, $user_id = '')
108 108
     {
109 109
 		$user_selected_language = api_get_interface_language();
110
-		$start	= intval($start);
110
+		$start = intval($start);
111 111
         $userGroup = new UserGroup();
112 112
 	    $tbl_announcement_group = Database :: get_main_table(TABLE_MAIN_SYSTEM_ANNOUNCEMENTS_GROUPS);
113
-	    $temp_user_groups = $userGroup->get_groups_by_user(api_get_user_id(),0);
113
+	    $temp_user_groups = $userGroup->get_groups_by_user(api_get_user_id(), 0);
114 114
         $groups = array();
115 115
 	    foreach ($temp_user_groups as $user_group) {
116 116
 	        $groups = array_merge($groups, array($user_group['id']));
@@ -118,10 +118,10 @@  discard block
 block discarded – undo
118 118
 	    }
119 119
 
120 120
 	    // Checks if tables exists to not break platform not updated
121
-	    $groups_string = '('.implode($groups,',').')';
121
+	    $groups_string = '('.implode($groups, ',').')';
122 122
 
123 123
 		$db_table = Database :: get_main_table(TABLE_MAIN_SYSTEM_ANNOUNCEMENTS);
124
-		$now  = api_get_utc_datetime();
124
+		$now = api_get_utc_datetime();
125 125
 
126 126
 		$sql = "SELECT * FROM ".$db_table."
127 127
 				WHERE
@@ -152,10 +152,10 @@  discard block
 block discarded – undo
152 152
             $sql .= " AND access_url_id IN ('1', '$current_access_url_id')";
153 153
 		}
154 154
 
155
-		if(!isset($_GET['start']) || $_GET['start'] == 0) {
155
+		if (!isset($_GET['start']) || $_GET['start'] == 0) {
156 156
 			$sql .= " ORDER BY date_start DESC LIMIT ".$start.",20";
157 157
 		} else {
158
-			$sql .= " ORDER BY date_start DESC LIMIT ".($start+1).",20";
158
+			$sql .= " ORDER BY date_start DESC LIMIT ".($start + 1).",20";
159 159
 		}
160 160
 		$announcements = Database::query($sql);
161 161
 		$content = '';
@@ -207,13 +207,13 @@  discard block
 block discarded – undo
207 207
      */
208 208
     public static function display_arrow($user_id)
209 209
     {
210
-		$start = (int)$_GET['start'];
211
-		$nb_announcement = SystemAnnouncementManager :: count_nb_announcement($start,$user_id);
212
-		$next = ((int)$_GET['start']+19);
213
-		$prev = ((int)$_GET['start']-19);
210
+		$start = (int) $_GET['start'];
211
+		$nb_announcement = SystemAnnouncementManager :: count_nb_announcement($start, $user_id);
212
+		$next = ((int) $_GET['start'] + 19);
213
+		$prev = ((int) $_GET['start'] - 19);
214 214
 		$content = '';
215
-		if(!isset($_GET['start']) || $_GET['start'] == 0) {
216
-			if($nb_announcement > 20) {
215
+		if (!isset($_GET['start']) || $_GET['start'] == 0) {
216
+			if ($nb_announcement > 20) {
217 217
 				$content .= '<a href="news_list.php?start='.$next.'">'.get_lang('NextBis').' >> </a>';
218 218
 			}
219 219
 		} else {
@@ -322,15 +322,15 @@  discard block
 block discarded – undo
322 322
         $sendEmailTest = false
323 323
     ) {
324 324
 		$original_content = $content;
325
-		$a_dateS = explode(' ',$date_start);
326
-		$a_arraySD = explode('-',$a_dateS[0]);
327
-		$a_arraySH = explode(':',$a_dateS[1]);
328
-		$date_start_to_compare = array_merge($a_arraySD,$a_arraySH);
325
+		$a_dateS = explode(' ', $date_start);
326
+		$a_arraySD = explode('-', $a_dateS[0]);
327
+		$a_arraySH = explode(':', $a_dateS[1]);
328
+		$date_start_to_compare = array_merge($a_arraySD, $a_arraySH);
329 329
 
330
-		$a_dateE = explode(' ',$date_end);
331
-		$a_arrayED = explode('-',$a_dateE[0]);
332
-		$a_arrayEH = explode(':',$a_dateE[1]);
333
-		$date_end_to_compare = array_merge($a_arrayED,$a_arrayEH);
330
+		$a_dateE = explode(' ', $date_end);
331
+		$a_arrayED = explode('-', $a_dateE[0]);
332
+		$a_arrayEH = explode(':', $a_dateE[1]);
333
+		$date_end_to_compare = array_merge($a_arrayED, $a_arrayEH);
334 334
 
335 335
 		$db_table = Database :: get_main_table(TABLE_MAIN_SYSTEM_ANNOUNCEMENTS);
336 336
 
@@ -504,15 +504,15 @@  discard block
 block discarded – undo
504 504
         $send_mail = 0,
505 505
         $sendEmailTest = false
506 506
     ) {
507
-		$a_dateS = explode(' ',$date_start);
508
-		$a_arraySD = explode('-',$a_dateS[0]);
509
-		$a_arraySH = explode(':',$a_dateS[1]);
510
-		$date_start_to_compare = array_merge($a_arraySD,$a_arraySH);
507
+		$a_dateS = explode(' ', $date_start);
508
+		$a_arraySD = explode('-', $a_dateS[0]);
509
+		$a_arraySH = explode(':', $a_dateS[1]);
510
+		$date_start_to_compare = array_merge($a_arraySD, $a_arraySH);
511 511
 
512
-		$a_dateE = explode(' ',$date_end);
513
-		$a_arrayED = explode('-',$a_dateE[0]);
514
-		$a_arrayEH = explode(':',$a_dateE[1]);
515
-		$date_end_to_compare = array_merge($a_arrayED,$a_arrayEH);
512
+		$a_dateE = explode(' ', $date_end);
513
+		$a_arrayED = explode('-', $a_dateE[0]);
514
+		$a_arrayEH = explode(':', $a_dateE[1]);
515
+		$date_end_to_compare = array_merge($a_arrayED, $a_arrayEH);
516 516
 
517 517
 		$langsql = is_null($lang) ? 'NULL' : "'".Database::escape_string($lang)."'";
518 518
 		$db_table = Database :: get_main_table(TABLE_MAIN_SYSTEM_ANNOUNCEMENTS);
@@ -536,8 +536,8 @@  discard block
 block discarded – undo
536 536
 			return false;
537 537
 		}
538 538
 
539
-	    $start    = api_get_utc_datetime($date_start);
540
-        $end      = api_get_utc_datetime($date_end);
539
+	    $start = api_get_utc_datetime($date_start);
540
+        $end = api_get_utc_datetime($date_end);
541 541
 
542 542
 		$title = Database::escape_string($title);
543 543
 		$content = Database::escape_string($content);
@@ -560,7 +560,7 @@  discard block
 block discarded – undo
560 560
                 $sendEmailTest
561 561
             );
562 562
         } else {
563
-            if ($send_mail==1) {
563
+            if ($send_mail == 1) {
564 564
                 SystemAnnouncementManager::send_system_announcement_by_email(
565 565
                     $title,
566 566
                     $content,
@@ -655,7 +655,7 @@  discard block
 block discarded – undo
655 655
 		global $charset;
656 656
 
657 657
         $title = api_html_entity_decode(stripslashes($title), ENT_QUOTES, $charset);
658
-        $content = api_html_entity_decode(stripslashes(str_replace(array('\r\n', '\n', '\r'),'', $content)), ENT_QUOTES, $charset);
658
+        $content = api_html_entity_decode(stripslashes(str_replace(array('\r\n', '\n', '\r'), '', $content)), ENT_QUOTES, $charset);
659 659
         $now = api_get_utc_datetime();
660 660
 
661 661
         if ($sendEmailTest) {
@@ -678,7 +678,7 @@  discard block
 block discarded – undo
678 678
 			$sql = "SELECT DISTINCT u.user_id FROM $user_table u $url_condition WHERE status = '5' ";
679 679
 		}
680 680
 
681
-		if ($teacher<> 0 AND $student <> 0) {
681
+		if ($teacher <> 0 AND $student <> 0) {
682 682
 			$sql = "SELECT DISTINCT u.user_id FROM $user_table u $url_condition WHERE 1 = 1 ";
683 683
 		}
684 684
 
@@ -696,7 +696,7 @@  discard block
 block discarded – undo
696 696
         // Expiration date
697 697
         $sql .= " AND (expiration_date = '' OR expiration_date IS NULL OR expiration_date > '$now') ";
698 698
 
699
-		if ((empty($teacher) or $teacher == '0') AND  (empty($student) or $student == '0')) {
699
+		if ((empty($teacher) or $teacher == '0') AND (empty($student) or $student == '0')) {
700 700
 			return true;
701 701
 		}
702 702
 
@@ -707,7 +707,7 @@  discard block
 block discarded – undo
707 707
 
708 708
         $message_sent = false;
709 709
 
710
-		while ($row = Database::fetch_array($result,'ASSOC')) {
710
+		while ($row = Database::fetch_array($result, 'ASSOC')) {
711 711
             MessageManager::send_message_simple($row['user_id'], $title, $content);
712 712
             $message_sent = true;
713 713
 		}
@@ -727,7 +727,7 @@  discard block
 block discarded – undo
727 727
         $cut_size = 500;
728 728
         $now = api_get_utc_datetime();
729 729
 
730
-        $sql = "SELECT * FROM " . $table . "
730
+        $sql = "SELECT * FROM ".$table."
731 731
 				WHERE
732 732
 				    (lang = '$user_selected_language' OR lang = '') AND
733 733
 				    ('$now' >= date_start AND '$now' <= date_end) ";
Please login to merge, or discard this patch.