Completed
Push — 1.11.x ( 7ffd51...902ebd )
by José
50:21 queued 21:28
created
main/inc/lib/system_announcements.lib.php 1 patch
Indentation   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -457,10 +457,10 @@
 block discarded – undo
457 457
     }
458 458
 
459 459
     /**
460
-    * Gets the groups of this announce
461
-    * @param int announcement id
462
-    * @return array array of group id
463
-    **/
460
+     * Gets the groups of this announce
461
+     * @param int announcement id
462
+     * @return array array of group id
463
+     **/
464 464
     public static function get_announcement_groups($announcement_id)
465 465
     {
466 466
         $tbl_announcement_group = Database::get_main_table(TABLE_MAIN_SYSTEM_ANNOUNCEMENTS_GROUPS);
Please login to merge, or discard this patch.
main/inc/lib/access_url_edit_courses_to_url_functions.lib.php 1 patch
Indentation   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -38,17 +38,17 @@
 block discarded – undo
38 38
             $needle = Database::escape_string($needle);
39 39
             // search courses where username or firstname or lastname begins likes $needle
40 40
             $sql = 'SELECT code, title FROM '.$tbl_course.' u '.
41
-                   ' WHERE (title LIKE "'.$needle.'%" '.
42
-                   ' OR code LIKE "'.$needle.'%" '.
43
-                   ' ) '.
44
-                   ' ORDER BY title, code '.
45
-                   ' LIMIT 11';
41
+                    ' WHERE (title LIKE "'.$needle.'%" '.
42
+                    ' OR code LIKE "'.$needle.'%" '.
43
+                    ' ) '.
44
+                    ' ORDER BY title, code '.
45
+                    ' LIMIT 11';
46 46
             $rs = Database::query($sql);
47 47
             $i = 0;
48 48
             while ($course = Database::fetch_array($rs)) {
49 49
                 $i++;
50 50
                 if ($i <= 10) {
51
-                     $return .= '<a href="javascript: void(0);" onclick="javascript: add_user_to_url(\''.addslashes($course['code']).'\',\''.addslashes($course['title']).' ('.addslashes($course['code']).')'.'\')">'.$course['title'].' ('.$course['code'].')</a><br />';
51
+                        $return .= '<a href="javascript: void(0);" onclick="javascript: add_user_to_url(\''.addslashes($course['code']).'\',\''.addslashes($course['title']).' ('.addslashes($course['code']).')'.'\')">'.$course['title'].' ('.$course['code'].')</a><br />';
52 52
                 } else {
53 53
                     $return .= '...<br />';
54 54
                 }
Please login to merge, or discard this patch.
main/install/install.lib.php 1 patch
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -1756,7 +1756,7 @@  discard block
 block discarded – undo
1756 1756
         $html .= '<label class="checkbox-inline">
1757 1757
                         <input type="radio" name="allowSelfReg" value="false" id="allowSelfReg0" '. ($allowSelfReg == 'false' ? '' : 'checked="checked" ').' /> '.get_lang('No').'
1758 1758
                     </label>';
1759
-         $html .= '<label class="checkbox-inline">
1759
+            $html .= '<label class="checkbox-inline">
1760 1760
                     <input type="radio" name="allowSelfReg" value="approval" id="allowSelfReg2" '. ($allowSelfReg == 'approval' ? '' : 'checked="checked" ').' /> '.get_lang('AfterApproval').'
1761 1761
                 </label>';
1762 1762
         $html .= '</div>';
@@ -1790,7 +1790,7 @@  discard block
 block discarded – undo
1790 1790
     </div>';
1791 1791
 
1792 1792
     echo panel($html, get_lang('Platform'), 'platform');
1793
- ?>
1793
+    ?>
1794 1794
     <div class='form-group'>
1795 1795
         <div class="col-sm-6">
1796 1796
             <button type="submit" class="btn btn-default pull-right" name="step3" value="&lt; <?php echo get_lang('Previous'); ?>" ><em class="fa fa-backward"> </em> <?php echo get_lang('Previous'); ?></button>
Please login to merge, or discard this patch.
main/exercise/hotpotatoes_exercise_result.class.php 1 patch
Indentation   +4 added lines, -5 removed lines patch added patch discarded remove patch
@@ -102,7 +102,6 @@  discard block
 block discarded – undo
102 102
      * Exports the complete report as a CSV file
103 103
      * @param string $document_path Document path inside the document tool
104 104
      * @param string $hotpotato_name
105
-
106 105
      * @return	boolean		False on error
107 106
      */
108 107
     public function exportCompleteReportCSV($document_path = '', $hotpotato_name = '')
@@ -140,11 +139,11 @@  discard block
 block discarded – undo
140 139
         // Results
141 140
         foreach ($this->results as $row) {
142 141
             if (api_is_western_name_order()) {
143
-              $data .= str_replace("\r\n", '  ', api_html_entity_decode(strip_tags($row['first_name']), ENT_QUOTES, $charset)).';';
144
-              $data .= str_replace("\r\n", '  ', api_html_entity_decode(strip_tags($row['last_name']), ENT_QUOTES, $charset)).';';
142
+                $data .= str_replace("\r\n", '  ', api_html_entity_decode(strip_tags($row['first_name']), ENT_QUOTES, $charset)).';';
143
+                $data .= str_replace("\r\n", '  ', api_html_entity_decode(strip_tags($row['last_name']), ENT_QUOTES, $charset)).';';
145 144
             } else {
146
-              $data .= str_replace("\r\n", '  ', api_html_entity_decode(strip_tags($row['last_name']), ENT_QUOTES, $charset)).';';
147
-              $data .= str_replace("\r\n", '  ', api_html_entity_decode(strip_tags($row['first_name']), ENT_QUOTES, $charset)).';';
145
+                $data .= str_replace("\r\n", '  ', api_html_entity_decode(strip_tags($row['last_name']), ENT_QUOTES, $charset)).';';
146
+                $data .= str_replace("\r\n", '  ', api_html_entity_decode(strip_tags($row['first_name']), ENT_QUOTES, $charset)).';';
148 147
             }
149 148
 
150 149
             $data .= str_replace("\r\n", '  ', api_html_entity_decode(strip_tags($row['email']), ENT_QUOTES, $charset)).';';
Please login to merge, or discard this patch.
main/admin/add_sessions_to_promotion.php 1 patch
Indentation   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -178,7 +178,7 @@  discard block
 block discarded – undo
178 178
       <option value = "%">--</option>
179 179
       <?php
180 180
         echo Display :: get_alphabet_options();
181
-      ?>
181
+        ?>
182 182
      </select>
183 183
 </td>
184 184
 <td align="center">&nbsp;</td>
@@ -188,31 +188,31 @@  discard block
 block discarded – undo
188 188
   <td align="center">
189 189
   <div id="content_source">
190 190
       <?php
191
-      if (!($add_type == 'multiple')) {
191
+        if (!($add_type == 'multiple')) {
192 192
         ?>
193 193
         <input type="text" id="user_to_add" onkeyup="xajax_search_users(this.value,'single')" />
194 194
         <div id="ajax_list_users_single"></div>
195 195
         <?php
196
-      } else {
197
-      ?>
196
+        } else {
197
+        ?>
198 198
       <div id="ajax_list_multiple">
199 199
         <?php echo Display::select('session_not_in_promotion_name', $session_not_in_promotion, '', array('style'=>'width:360px', 'multiple'=>'multiple', 'id'=>'session_not_in_promotion', 'size'=>'15px'), false); ?>
200 200
       </div>
201 201
     <?php
202
-      }
203
-     ?>
202
+        }
203
+        ?>
204 204
   </div>
205 205
   </td>
206 206
   <td width="10%" valign="middle" align="center">
207 207
   <?php
208
-  if ($ajax_search) {
209
-  ?>
208
+    if ($ajax_search) {
209
+    ?>
210 210
     <button class="btn btn-default" type="button" onclick="remove_item(document.getElementById('session_in_promotion'))" >
211 211
         <em class="fa fa-arrow-left"></em>
212 212
     </button>
213 213
   <?php
214
-  } else {
215
-  ?>
214
+    } else {
215
+    ?>
216 216
     <button class="btn btn-default" type="button" onclick="moveItem(document.getElementById('session_not_in_promotion'), document.getElementById('session_in_promotion'))" onclick="moveItem(document.getElementById('session_not_in_promotion'), document.getElementById('session_in_promotion'))">
217 217
         <em class="fa fa-arrow-right"></em>
218 218
     </button>
@@ -221,8 +221,8 @@  discard block
 block discarded – undo
221 221
         <em class="fa fa-arrow-left"></em>
222 222
     </button>
223 223
     <?php
224
-  }
225
-  ?>
224
+    }
225
+    ?>
226 226
     <br /><br /><br /><br /><br /><br />
227 227
   </td>
228 228
   <td align="center">
Please login to merge, or discard this patch.
main/inc/lib/access_url_edit_users_to_url_functions.lib.php 1 patch
Indentation   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -40,11 +40,11 @@
 block discarded – undo
40 40
             // search users where username or firstname or lastname begins likes $needle
41 41
             $order_clause = api_sort_by_first_name() ? ' ORDER BY firstname, lastname, username' : ' ORDER BY lastname, firstname, username';
42 42
             $sql = 'SELECT u.user_id, username, lastname, firstname FROM '.$tbl_user.' u '.
43
-                   ' WHERE (username LIKE "'.$needle.'%" '.
44
-                   ' OR firstname LIKE "'.$needle.'%" '.
45
-                   ' OR lastname LIKE "'.$needle.'%") '.
43
+                    ' WHERE (username LIKE "'.$needle.'%" '.
44
+                    ' OR firstname LIKE "'.$needle.'%" '.
45
+                    ' OR lastname LIKE "'.$needle.'%") '.
46 46
                     $order_clause.
47
-                   ' LIMIT 11';
47
+                    ' LIMIT 11';
48 48
 
49 49
             $rs = Database::query($sql);
50 50
             $i = 0;
Please login to merge, or discard this patch.
plugin/jcapture/applet.php 1 patch
Indentation   +20 added lines, -20 removed lines patch added patch discarded remove patch
@@ -1,31 +1,31 @@
 block discarded – undo
1 1
 <?php 
2 2
 
3
-	//fix for Opera XMLHttpRequests
4
-	if (!count($_POST) && $HTTP_RAW_POST_DATA) {
5
-	  parse_str($HTTP_RAW_POST_DATA, $_POST);
6
-	}
3
+    //fix for Opera XMLHttpRequests
4
+    if (!count($_POST) && $HTTP_RAW_POST_DATA) {
5
+        parse_str($HTTP_RAW_POST_DATA, $_POST);
6
+    }
7 7
 	
8
-	if (!defined('DOKU_INC')) define('DOKU_INC', __DIR__.'/../../../');
9
-	require_once(DOKU_INC.'inc/init.php');
10
-	require_once(DOKU_INC.'inc/common.php');
11
-	require_once(DOKU_INC.'inc/pageutils.php');
12
-	require_once(DOKU_INC.'inc/auth.php');
13
-	//close sesseion
14
-	session_write_close();
8
+    if (!defined('DOKU_INC')) define('DOKU_INC', __DIR__.'/../../../');
9
+    require_once(DOKU_INC.'inc/init.php');
10
+    require_once(DOKU_INC.'inc/common.php');
11
+    require_once(DOKU_INC.'inc/pageutils.php');
12
+    require_once(DOKU_INC.'inc/auth.php');
13
+    //close sesseion
14
+    session_write_close();
15 15
 	
16
-	header('Content-Type: text/html; charset=utf-8');
16
+    header('Content-Type: text/html; charset=utf-8');
17 17
 	
18
-	$hostName = "http".($_SERVER['HTTPS'] ? 's' : null).'://'.$_SERVER['HTTP_HOST']; 
18
+    $hostName = "http".($_SERVER['HTTPS'] ? 's' : null).'://'.$_SERVER['HTTP_HOST']; 
19 19
 	
20
-	$imageFormat = "PNG";
20
+    $imageFormat = "PNG";
21 21
 
22
-	$cookies;
23
-	foreach (array_keys($_COOKIE) as $cookieName) {
24
-		$cookies .= bin2hex($cookieName)."=".bin2hex($_COOKIE[$cookieName]).";";
25
-	} 
22
+    $cookies;
23
+    foreach (array_keys($_COOKIE) as $cookieName) {
24
+        $cookies .= bin2hex($cookieName)."=".bin2hex($_COOKIE[$cookieName]).";";
25
+    } 
26 26
 	
27
-	$pageName = $_GET["pageName"];
28
-	$edid = $_GET["edid"];
27
+    $pageName = $_GET["pageName"];
28
+    $edid = $_GET["edid"];
29 29
 ?>
30 30
 
31 31
 <script language="JavaScript" type="text/javascript"><!--
Please login to merge, or discard this patch.
plugin/olpc_peru_filter/lib/olpc_peru_filter_plugin.class.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -31,7 +31,7 @@
 block discarded – undo
31 31
         $list = $this->get_blacklist_options();
32 32
         foreach ($list as $k => $v) {
33 33
             $this->course_settings[] =
34
-              array('group'=> 'olpc_peru_filter_filter', 'name' => $k, 'type' => 'checkbox', 'init_value' => $v);
34
+                array('group'=> 'olpc_peru_filter_filter', 'name' => $k, 'type' => 'checkbox', 'init_value' => $v);
35 35
         }
36 36
         require_once __DIR__.'/../config.php';
37 37
         if (!empty($blacklist_enabled_file)) {
Please login to merge, or discard this patch.
main/course_home/course_home.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -240,7 +240,7 @@
 block discarded – undo
240 240
         //if (!isset($_SESSION[$forumKey])) {
241 241
             //redirecting to the LP
242 242
             $url = api_get_path(WEB_CODE_PATH).'forum/index.php?'.api_get_cidreq().'&id_session='.$session_id;
243
-          //  $_SESSION[$forumKey] = true;
243
+            //  $_SESSION[$forumKey] = true;
244 244
             header("Location: $url");
245 245
             exit;
246 246
         //}
Please login to merge, or discard this patch.