Completed
Push — master ( 8be9e6...40c911 )
by Angel Fernando Quiroz
76:02 queued 40:43
created
plugin/buycourses/src/paypalfunctions.php 1 patch
Spacing   +44 added lines, -44 removed lines patch added patch discarded remove patch
@@ -67,12 +67,12 @@  discard block
 block discarded – undo
67 67
 function CallShortcutExpressCheckout($paymentAmount, $currencyCodeType, $paymentType, $returnURL, $cancelURL, $extra)
68 68
 {
69 69
     // Construct the parameter string that describes the SetExpressCheckout API call in the shortcut implementation
70
-    $nvpstr = "&PAYMENTREQUEST_0_AMT=" . $paymentAmount;
71
-    $nvpstr .= "&PAYMENTREQUEST_0_ITEMAMT=" . $paymentAmount;
72
-    $nvpstr .= "&PAYMENTREQUEST_0_PAYMENTACTION=" . $paymentType;
73
-    $nvpstr .= "&RETURNURL=" . $returnURL;
74
-    $nvpstr .= "&CANCELURL=" . $cancelURL;
75
-    $nvpstr .= "&PAYMENTREQUEST_0_CURRENCYCODE=" . $currencyCodeType;
70
+    $nvpstr = "&PAYMENTREQUEST_0_AMT=".$paymentAmount;
71
+    $nvpstr .= "&PAYMENTREQUEST_0_ITEMAMT=".$paymentAmount;
72
+    $nvpstr .= "&PAYMENTREQUEST_0_PAYMENTACTION=".$paymentType;
73
+    $nvpstr .= "&RETURNURL=".$returnURL;
74
+    $nvpstr .= "&CANCELURL=".$cancelURL;
75
+    $nvpstr .= "&PAYMENTREQUEST_0_CURRENCYCODE=".$currencyCodeType;
76 76
     $nvpstr .= $extra;
77 77
 
78 78
     $_SESSION["currencyCodeType"] = $currencyCodeType;
@@ -116,20 +116,20 @@  discard block
 block discarded – undo
116 116
 )
117 117
 {
118 118
     // Construct the parameter string that describes the SetExpressCheckout API call in the shortcut implementation
119
-    $nvpstr = "&PAYMENTREQUEST_0_AMT=" . $paymentAmount;
120
-    $nvpstr = $nvpstr . "&PAYMENTREQUEST_0_PAYMENTACTION=" . $paymentType;
121
-    $nvpstr = $nvpstr . "&RETURNURL=" . $returnURL;
122
-    $nvpstr = $nvpstr . "&CANCELURL=" . $cancelURL;
123
-    $nvpstr = $nvpstr . "&PAYMENTREQUEST_0_CURRENCYCODE=" . $currencyCodeType;
124
-    $nvpstr = $nvpstr . "&ADDROVERRIDE=1";
125
-    $nvpstr = $nvpstr . "&PAYMENTREQUEST_0_SHIPTONAME=" . $shipToName;
126
-    $nvpstr = $nvpstr . "&PAYMENTREQUEST_0_SHIPTOSTREET=" . $shipToStreet;
127
-    $nvpstr = $nvpstr . "&PAYMENTREQUEST_0_SHIPTOSTREET2=" . $shipToStreet2;
128
-    $nvpstr = $nvpstr . "&PAYMENTREQUEST_0_SHIPTOCITY=" . $shipToCity;
129
-    $nvpstr = $nvpstr . "&PAYMENTREQUEST_0_SHIPTOSTATE=" . $shipToState;
130
-    $nvpstr = $nvpstr . "&PAYMENTREQUEST_0_SHIPTOCOUNTRYCODE=" . $shipToCountryCode;
131
-    $nvpstr = $nvpstr . "&PAYMENTREQUEST_0_SHIPTOZIP=" . $shipToZip;
132
-    $nvpstr = $nvpstr . "&PAYMENTREQUEST_0_SHIPTOPHONENUM=" . $phoneNum;
119
+    $nvpstr = "&PAYMENTREQUEST_0_AMT=".$paymentAmount;
120
+    $nvpstr = $nvpstr."&PAYMENTREQUEST_0_PAYMENTACTION=".$paymentType;
121
+    $nvpstr = $nvpstr."&RETURNURL=".$returnURL;
122
+    $nvpstr = $nvpstr."&CANCELURL=".$cancelURL;
123
+    $nvpstr = $nvpstr."&PAYMENTREQUEST_0_CURRENCYCODE=".$currencyCodeType;
124
+    $nvpstr = $nvpstr."&ADDROVERRIDE=1";
125
+    $nvpstr = $nvpstr."&PAYMENTREQUEST_0_SHIPTONAME=".$shipToName;
126
+    $nvpstr = $nvpstr."&PAYMENTREQUEST_0_SHIPTOSTREET=".$shipToStreet;
127
+    $nvpstr = $nvpstr."&PAYMENTREQUEST_0_SHIPTOSTREET2=".$shipToStreet2;
128
+    $nvpstr = $nvpstr."&PAYMENTREQUEST_0_SHIPTOCITY=".$shipToCity;
129
+    $nvpstr = $nvpstr."&PAYMENTREQUEST_0_SHIPTOSTATE=".$shipToState;
130
+    $nvpstr = $nvpstr."&PAYMENTREQUEST_0_SHIPTOCOUNTRYCODE=".$shipToCountryCode;
131
+    $nvpstr = $nvpstr."&PAYMENTREQUEST_0_SHIPTOZIP=".$shipToZip;
132
+    $nvpstr = $nvpstr."&PAYMENTREQUEST_0_SHIPTOPHONENUM=".$phoneNum;
133 133
 
134 134
     $_SESSION["currencyCodeType"] = $currencyCodeType;
135 135
     $_SESSION["PaymentType"] = $paymentType;
@@ -172,7 +172,7 @@  discard block
 block discarded – undo
172 172
      * Build a second API request to PayPal, using the token as the
173 173
      * ID to get the details on the payment authorization
174 174
      */
175
-    $nvpstr = "&TOKEN=" . $token;
175
+    $nvpstr = "&TOKEN=".$token;
176 176
 
177 177
     /**
178 178
      * Make the API call and store the results in an array.
@@ -213,9 +213,9 @@  discard block
 block discarded – undo
213 213
     $payerID = urlencode($_SESSION['payer_id']);
214 214
     $serverName = urlencode($_SERVER['SERVER_NAME']);
215 215
 
216
-    $nvpstr = '&TOKEN=' . $token . '&PAYERID=' . $payerID . '&PAYMENTREQUEST_0_PAYMENTACTION=' . $paymentType . '&PAYMENTREQUEST_0_AMT=' . $FinalPaymentAmt;
217
-    $nvpstr .= '&PAYMENTREQUEST_0_CURRENCYCODE=' . $currencyCodeType . '&IPADDRESS=' . $serverName;
218
-    $nvpstr = '&' . http_build_query([
216
+    $nvpstr = '&TOKEN='.$token.'&PAYERID='.$payerID.'&PAYMENTREQUEST_0_PAYMENTACTION='.$paymentType.'&PAYMENTREQUEST_0_AMT='.$FinalPaymentAmt;
217
+    $nvpstr .= '&PAYMENTREQUEST_0_CURRENCYCODE='.$currencyCodeType.'&IPADDRESS='.$serverName;
218
+    $nvpstr = '&'.http_build_query([
219 219
         'TOKEN' => $token,
220 220
         'PAYERID' => $payerID,
221 221
         'PAYMENTACTION' => $paymentType,
@@ -269,20 +269,20 @@  discard block
 block discarded – undo
269 269
                        $countryCode, $currencyCode)
270 270
 {
271 271
     //Construct the parameter string that describes DoDirectPayment
272
-    $nvpstr = "&AMT=" . $paymentAmount;
273
-    $nvpstr = $nvpstr . "&CURRENCYCODE=" . $currencyCode;
274
-    $nvpstr = $nvpstr . "&PAYMENTACTION=" . $paymentType;
275
-    $nvpstr = $nvpstr . "&CREDITCARDTYPE=" . $creditCardType;
276
-    $nvpstr = $nvpstr . "&ACCT=" . $creditCardNumber;
277
-    $nvpstr = $nvpstr . "&EXPDATE=" . $expDate;
278
-    $nvpstr = $nvpstr . "&CVV2=" . $cvv2;
279
-    $nvpstr = $nvpstr . "&FIRSTNAME=" . $firstName;
280
-    $nvpstr = $nvpstr . "&LASTNAME=" . $lastName;
281
-    $nvpstr = $nvpstr . "&STREET=" . $street;
282
-    $nvpstr = $nvpstr . "&CITY=" . $city;
283
-    $nvpstr = $nvpstr . "&STATE=" . $state;
284
-    $nvpstr = $nvpstr . "&COUNTRYCODE=" . $countryCode;
285
-    $nvpstr = $nvpstr . "&IPADDRESS=" . $_SERVER['REMOTE_ADDR'];
272
+    $nvpstr = "&AMT=".$paymentAmount;
273
+    $nvpstr = $nvpstr."&CURRENCYCODE=".$currencyCode;
274
+    $nvpstr = $nvpstr."&PAYMENTACTION=".$paymentType;
275
+    $nvpstr = $nvpstr."&CREDITCARDTYPE=".$creditCardType;
276
+    $nvpstr = $nvpstr."&ACCT=".$creditCardNumber;
277
+    $nvpstr = $nvpstr."&EXPDATE=".$expDate;
278
+    $nvpstr = $nvpstr."&CVV2=".$cvv2;
279
+    $nvpstr = $nvpstr."&FIRSTNAME=".$firstName;
280
+    $nvpstr = $nvpstr."&LASTNAME=".$lastName;
281
+    $nvpstr = $nvpstr."&STREET=".$street;
282
+    $nvpstr = $nvpstr."&CITY=".$city;
283
+    $nvpstr = $nvpstr."&STATE=".$state;
284
+    $nvpstr = $nvpstr."&COUNTRYCODE=".$countryCode;
285
+    $nvpstr = $nvpstr."&IPADDRESS=".$_SERVER['REMOTE_ADDR'];
286 286
 
287 287
     $resArray = hash_call("DoDirectPayment", $nvpstr);
288 288
 
@@ -345,13 +345,13 @@  discard block
 block discarded – undo
345 345
     //if USE_PROXY constant set to TRUE in Constants.php, then only proxy will be enabled.
346 346
     //Set proxy name to PROXY_HOST and port number to PROXY_PORT in constants.php
347 347
     if ($USE_PROXY) {
348
-        curl_setopt($ch, CURLOPT_PROXY, $PROXY_HOST . ":" . $PROXY_PORT);
348
+        curl_setopt($ch, CURLOPT_PROXY, $PROXY_HOST.":".$PROXY_PORT);
349 349
     }
350 350
 
351 351
     //NVPRequest for submitting to server
352
-    $nvpreq = "METHOD=" . urlencode($methodName) . "&VERSION=" . urlencode($version) .
353
-        "&PWD=" . urlencode($API_Password) . "&USER=" . urlencode($API_UserName) .
354
-        "&SIGNATURE=" . urlencode($API_Signature) . $nvpStr . "&BUTTONSOURCE=" . urlencode($sBNCode);
352
+    $nvpreq = "METHOD=".urlencode($methodName)."&VERSION=".urlencode($version).
353
+        "&PWD=".urlencode($API_Password)."&USER=".urlencode($API_UserName).
354
+        "&SIGNATURE=".urlencode($API_Signature).$nvpStr."&BUTTONSOURCE=".urlencode($sBNCode);
355 355
 
356 356
     //setting the nvpreq as POST FIELD to curl
357 357
     curl_setopt($ch, CURLOPT_POSTFIELDS, $nvpreq);
@@ -385,8 +385,8 @@  discard block
 block discarded – undo
385 385
 {
386 386
     global $PAYPAL_URL;
387 387
     // Redirect to paypal.com here
388
-    $payPalURL = $PAYPAL_URL . $token;
389
-    header("Location: " . $payPalURL);
388
+    $payPalURL = $PAYPAL_URL.$token;
389
+    header("Location: ".$payPalURL);
390 390
     exit;
391 391
 }
392 392
 
Please login to merge, or discard this patch.
plugin/buycourses/plugin.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -8,5 +8,5 @@
 block discarded – undo
8 8
 /**
9 9
  * Plugin details (must be present)
10 10
  */
11
-require_once dirname(__FILE__) . '/config.php';
11
+require_once dirname(__FILE__).'/config.php';
12 12
 $plugin_info = BuyCoursesPlugin::create()->get_info();
Please login to merge, or discard this patch.
plugin/buycourses/config.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,4 +1,4 @@
 block discarded – undo
1 1
 <?php
2 2
 /* For licensing terms, see /license.txt */
3 3
 
4
-require_once __DIR__ . '/../../main/inc/global.inc.php';
4
+require_once __DIR__.'/../../main/inc/global.inc.php';
Please login to merge, or discard this patch.
plugin/bbb/cron.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -1,16 +1,16 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 
3
-require __DIR__ . '/../../vendor/autoload.php';
4
-if (file_exists(__DIR__ . '/config.vm.php')) {
3
+require __DIR__.'/../../vendor/autoload.php';
4
+if (file_exists(__DIR__.'/config.vm.php')) {
5 5
 
6
-    require_once dirname(__FILE__) . '/config.php';
6
+    require_once dirname(__FILE__).'/config.php';
7 7
 
8
-    require __DIR__ . '/lib/vm/AbstractVM.php';
9
-    require __DIR__ . '/lib/vm/VMInterface.php';
10
-    require __DIR__ . '/lib/vm/DigitalOceanVM.php';
11
-    require __DIR__ . '/lib/VM.php';
8
+    require __DIR__.'/lib/vm/AbstractVM.php';
9
+    require __DIR__.'/lib/vm/VMInterface.php';
10
+    require __DIR__.'/lib/vm/DigitalOceanVM.php';
11
+    require __DIR__.'/lib/VM.php';
12 12
 
13
-    $config = require __DIR__ . '/config.vm.php';
13
+    $config = require __DIR__.'/config.vm.php';
14 14
 
15 15
     $vm = new VM($config);
16 16
 
@@ -21,7 +21,7 @@  discard block
 block discarded – undo
21 21
             if (empty($activeSessions)) {
22 22
                 $vm->runCron();
23 23
             } else {
24
-                echo "Can't run cron active sessions found: " . $activeSessions;
24
+                echo "Can't run cron active sessions found: ".$activeSessions;
25 25
             }
26 26
         }
27 27
     }
Please login to merge, or discard this patch.
plugin/bbb/lib/VM.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -70,7 +70,7 @@
 block discarded – undo
70 70
 
71 71
         foreach ($vmList as $vm) {
72 72
             if (isset($vm['enabled']) && $vm['enabled'] == true) {
73
-                $className = $vm['name'] . 'VM';
73
+                $className = $vm['name'].'VM';
74 74
 
75 75
                 return new $className($vm);
76 76
                 break;
Please login to merge, or discard this patch.
plugin/bbb/lib/vm/DigitalOceanVM.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -100,7 +100,7 @@  discard block
 block discarded – undo
100 100
                         break;
101 101
                 }
102 102
             } else {
103
-                throw new \Exception(" Id " . $this->vmId . " doesn't exists.");
103
+                throw new \Exception(" Id ".$this->vmId." doesn't exists.");
104 104
             }
105 105
         } catch (Exception $e) {
106 106
             die($e->getMessage());
@@ -118,22 +118,22 @@  discard block
 block discarded – undo
118 118
 
119 119
         $powerOff = $droplets->powerOff($this->vmId);
120 120
 
121
-        $this->addMessage('Power off droplet #' . $this->vmId);
121
+        $this->addMessage('Power off droplet #'.$this->vmId);
122 122
 
123 123
         $this->waitForEvent($powerOff->event_id);
124 124
 
125
-        $this->addMessage('Current status: ' . $dropletInfo->droplet->status);
125
+        $this->addMessage('Current status: '.$dropletInfo->droplet->status);
126 126
 
127 127
         $resizeDroplet = $droplets->resize(
128 128
             $this->vmId,
129 129
             array('size_id' => intval($sizeId))
130 130
         );
131
-        $this->addMessage('Resize droplet to size id: ' . $sizeId);
131
+        $this->addMessage('Resize droplet to size id: '.$sizeId);
132 132
         $this->waitForEvent($resizeDroplet->event_id);
133 133
 
134 134
         $powerOn = $droplets->powerOn($this->vmId);
135 135
         $this->waitForEvent($powerOn->event_id);
136
-        $this->addMessage('Power on droplet #' . $this->vmId);
136
+        $this->addMessage('Power on droplet #'.$this->vmId);
137 137
 
138 138
     }
139 139
 
Please login to merge, or discard this patch.
plugin/dashboard/block_course/block_course.class.php 1 patch
Spacing   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -63,19 +63,19 @@  discard block
 block discarded – undo
63 63
         $content = $this->get_content_html();
64 64
         $html = '
65 65
 		            <div class="panel panel-default" id="intro">
66
-		                <div class="panel-heading">' . get_lang('CoursesInformation') . '
66
+		                <div class="panel-heading">' . get_lang('CoursesInformation').'
67 67
 		                    <div class="pull-right"><a class="btn btn-danger btn-xs" onclick="javascript:if(!confirm(\'' . addslashes(
68 68
                 api_htmlentities(
69 69
                     get_lang('ConfirmYourChoice'),
70 70
                     ENT_QUOTES,
71 71
                     $charset
72 72
                 )
73
-            ) . '\')) return false;" href="index.php?action=disable_block&path=' . $this->path . '">
73
+            ).'\')) return false;" href="index.php?action=disable_block&path='.$this->path.'">
74 74
                 <em class="fa fa-times"></em>
75 75
                 </a></div>
76 76
 		                </div>
77 77
 		                <div class="panel-body">
78
-		                   ' . $content . '
78
+		                   ' . $content.'
79 79
 		                </div>
80 80
 		            </div>
81 81
 				';
@@ -93,17 +93,17 @@  discard block
 block discarded – undo
93 93
     {
94 94
         $course_data = $this->get_course_information_data();
95 95
         //$content = '<div style="margin:10px;">';
96
-        $content = '<h4>' . get_lang(
96
+        $content = '<h4>'.get_lang(
97 97
                 'YourCourseList'
98
-            ) . '</h4>';
98
+            ).'</h4>';
99 99
         $data_table = null;
100 100
         if (!empty($course_data)) {
101 101
             $data_table .= '<table class="data_table" width:"95%">';
102 102
             $data_table .= '<tr>
103
-	    						<th>' . get_lang('CourseTitle') . '</th>
104
-	    						<th width="20%">' . get_lang('NbStudents') . '</th>
105
-	    						<th width="20%">' . get_lang('AvgTimeSpentInTheCourse') . '</th>
106
-	    						<th width="20%">' . get_lang('ThematicAdvance') . '</th>
103
+	    						<th>' . get_lang('CourseTitle').'</th>
104
+	    						<th width="20%">' . get_lang('NbStudents').'</th>
105
+	    						<th width="20%">' . get_lang('AvgTimeSpentInTheCourse').'</th>
106
+	    						<th width="20%">' . get_lang('ThematicAdvance').'</th>
107 107
 	    					</tr>';
108 108
             $i = 1;
109 109
             foreach ($course_data as $course) {
@@ -112,12 +112,12 @@  discard block
 block discarded – undo
112 112
                 } else {
113 113
                     $class_tr = 'row_even';
114 114
                 }
115
-                $data_table .= '<tr class="' . $class_tr . '">';
115
+                $data_table .= '<tr class="'.$class_tr.'">';
116 116
                 if (!isset($course[2])) {
117 117
                     $course[2] = '0:00:00';
118 118
                 }
119 119
                 foreach ($course as $cell) {
120
-                    $data_table .= '<td align="right">' . $cell . '</td>';
120
+                    $data_table .= '<td align="right">'.$cell.'</td>';
121 121
                 }
122 122
                 $data_table .= '</tr>';
123 123
                 $i++;
@@ -128,7 +128,7 @@  discard block
 block discarded – undo
128 128
         }
129 129
         $content .= $data_table;
130 130
         if (!empty($course_data)) {
131
-            $content .= '<div style="text-align:right;margin-top:10px;"><a href="' . api_get_path(WEB_CODE_PATH) . 'mySpace/course.php?follow">' . get_lang('SeeMore') . '</a></div>';
131
+            $content .= '<div style="text-align:right;margin-top:10px;"><a href="'.api_get_path(WEB_CODE_PATH).'mySpace/course.php?follow">'.get_lang('SeeMore').'</a></div>';
132 132
         }
133 133
         //$content .= '</div>';
134 134
 
@@ -163,7 +163,7 @@  discard block
 block discarded – undo
163 163
 
164 164
             // students directly subscribed to the course
165 165
             $sql = "SELECT user_id FROM $tbl_course_user as course_rel_user
166
-                    WHERE course_rel_user.status=" . STUDENT . " AND course_rel_user.c_id='$courseId'";
166
+                    WHERE course_rel_user.status=".STUDENT." AND course_rel_user.c_id='$courseId'";
167 167
             $rs = Database::query($sql);
168 168
             $users = array();
169 169
             while ($row = Database::fetch_array($rs)) {
@@ -182,7 +182,7 @@  discard block
 block discarded – undo
182 182
             );
183 183
 
184 184
             if (!empty($tematic_advance)) {
185
-                $tematic_advance_progress = '<a title="' . get_lang('GoToThematicAdvance') . '" href="' . api_get_path(WEB_CODE_PATH) . 'course_progress/index.php?cidReq=' . $course_code . '&action=thematic_details">' . $tematic_advance . '%</a>';
185
+                $tematic_advance_progress = '<a title="'.get_lang('GoToThematicAdvance').'" href="'.api_get_path(WEB_CODE_PATH).'course_progress/index.php?cidReq='.$course_code.'&action=thematic_details">'.$tematic_advance.'%</a>';
186 186
             } else {
187 187
                 $tematic_advance_progress = '0%';
188 188
             }
Please login to merge, or discard this patch.
plugin/dashboard/block_student_graph/block_student_graph.class.php 1 patch
Spacing   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -29,15 +29,15 @@  discard block
 block discarded – undo
29 29
 	/**
30 30
 	 * Constructor
31 31
 	 */
32
-    public function __construct ($user_id)
32
+    public function __construct($user_id)
33 33
     {
34
-    	$this->user_id  = $user_id;
35
-    	$this->path 	= 'block_student_graph';
34
+    	$this->user_id = $user_id;
35
+    	$this->path = 'block_student_graph';
36 36
     	if ($this->is_block_visible_for_user($user_id)) {
37 37
     		/*if (api_is_platform_admin()) {
38 38
 	    		$this->students = UserManager::get_user_list(array('status' => STUDENT));
39 39
 	    	} else if (api_is_drh()) {*/
40
-	    		$this->students =  UserManager::get_users_followed_by_drh($user_id, STUDENT);
40
+	    		$this->students = UserManager::get_users_followed_by_drh($user_id, STUDENT);
41 41
 	    	//}
42 42
     	}
43 43
     }
@@ -75,7 +75,7 @@  discard block
 block discarded – undo
75 75
 		$html = '<div class="panel panel-default" id="intro">
76 76
 	                <div class="panel-heading">
77 77
 	                    '.get_lang('StudentsInformationsGraph').'
78
-	                    <div class="pull-right"><a class="btn btn-danger btn-xs" onclick="javascript:if(!confirm(\''.addslashes(api_htmlentities(get_lang('ConfirmYourChoice'),ENT_QUOTES,$charset)).'\')) return false;" href="index.php?action=disable_block&path='.$this->path.'">
78
+	                    <div class="pull-right"><a class="btn btn-danger btn-xs" onclick="javascript:if(!confirm(\''.addslashes(api_htmlentities(get_lang('ConfirmYourChoice'), ENT_QUOTES, $charset)).'\')) return false;" href="index.php?action=disable_block&path='.$this->path.'">
79 79
 	                    <em class="fa fa-times"></em>
80 80
 	                    </a></div>
81 81
 	                </div>
@@ -155,9 +155,9 @@  discard block
 block discarded – undo
155 155
             $myCache = new pCache(array('CacheFolder' => substr($cachePath, 0, strlen($cachePath) - 1)));
156 156
             $chartHash = $myCache->getHash($dataSet);
157 157
             if ($myCache->isInCache($chartHash)) {
158
-                $imgPath = api_get_path(SYS_ARCHIVE_PATH) . $chartHash;
158
+                $imgPath = api_get_path(SYS_ARCHIVE_PATH).$chartHash;
159 159
                 $myCache->saveFromCache($chartHash, $imgPath);
160
-                $imgPath = api_get_path(WEB_ARCHIVE_PATH) . $chartHash;
160
+                $imgPath = api_get_path(WEB_ARCHIVE_PATH).$chartHash;
161 161
             } else {
162 162
 
163 163
                 $maxCounts = max(count($usernames), count($faults));
@@ -182,7 +182,7 @@  discard block
 block discarded – undo
182 182
                 /* Set the default font */
183 183
                 $myPicture->setFontProperties(
184 184
                     array(
185
-                        'FontName' => api_get_path(SYS_FONTS_PATH) . 'opensans/OpenSans-Regular.ttf',
185
+                        'FontName' => api_get_path(SYS_FONTS_PATH).'opensans/OpenSans-Regular.ttf',
186 186
                         'FontSize' => 10
187 187
                     )
188 188
                 );
@@ -228,13 +228,13 @@  discard block
 block discarded – undo
228 228
 
229 229
                 /* Write and save into cache */
230 230
                 $myCache->writeToCache($chartHash, $myPicture);
231
-                $imgPath = api_get_path(SYS_ARCHIVE_PATH) . $chartHash;
231
+                $imgPath = api_get_path(SYS_ARCHIVE_PATH).$chartHash;
232 232
                 $myCache->saveFromCache($chartHash, $imgPath);
233
-                $imgPath = api_get_path(WEB_ARCHIVE_PATH) . $chartHash;
233
+                $imgPath = api_get_path(WEB_ARCHIVE_PATH).$chartHash;
234 234
             }
235
-            $graph = '<img src="' . $imgPath . '" >';
235
+            $graph = '<img src="'.$imgPath.'" >';
236 236
 		} else {
237
-			$graph = '<p>'.api_convert_encoding(get_lang('GraphicNotAvailable'),'UTF-8').'</p>';
237
+			$graph = '<p>'.api_convert_encoding(get_lang('GraphicNotAvailable'), 'UTF-8').'</p>';
238 238
 		}
239 239
 
240 240
  		return $graph;
Please login to merge, or discard this patch.
plugin/dashboard/block_teacher/block_teacher.class.php 1 patch
Spacing   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -27,10 +27,10 @@  discard block
 block discarded – undo
27 27
 	/**
28 28
 	 * Controller
29 29
 	 */
30
-    public function __construct ($user_id)
30
+    public function __construct($user_id)
31 31
     {
32
-    	$this->user_id  = $user_id;
33
-    	$this->path 	= 'block_teacher';
32
+    	$this->user_id = $user_id;
33
+    	$this->path = 'block_teacher';
34 34
     	if ($this->is_block_visible_for_user($user_id)) {
35 35
 	        $this->teachers = UserManager::get_users_followed_by_drh($user_id, COURSEMANAGER);
36 36
     	}
@@ -69,7 +69,7 @@  discard block
 block discarded – undo
69 69
                 <div class="panel panel-default" id="intro">
70 70
                     <div class="panel-heading">
71 71
                         '.get_lang('TeachersInformationsList').'
72
-                        <div class="pull-right"><a class="btn btn-danger btn-xs" onclick="javascript:if(!confirm(\''.addslashes(api_htmlentities(get_lang('ConfirmYourChoice'),ENT_QUOTES,$charset)).'\')) return false;" href="index.php?action=disable_block&path='.$this->path.'">
72
+                        <div class="pull-right"><a class="btn btn-danger btn-xs" onclick="javascript:if(!confirm(\''.addslashes(api_htmlentities(get_lang('ConfirmYourChoice'), ENT_QUOTES, $charset)).'\')) return false;" href="index.php?action=disable_block&path='.$this->path.'">
73 73
                         <em class="fa fa-times"></em>
74 74
                         </a></div>
75 75
                     </div>
@@ -112,18 +112,18 @@  discard block
 block discarded – undo
112 112
 
113 113
 	 			$teacher_id = $teacher['user_id'];
114 114
 	 			$firstname 	= $teacher['firstname'];
115
-	 			$lastname 	= $teacher['lastname'];
116
-	 			$username	= $teacher['username'];
115
+	 			$lastname = $teacher['lastname'];
116
+	 			$username = $teacher['username'];
117 117
 
118 118
 	 			$time_on_platform = api_time_to_hms(Tracking :: get_time_spent_on_the_platform($teacher_id));
119 119
 	 			$last_connection = Tracking :: get_last_connection_date($teacher_id);
120 120
 
121
-				if ($i%2 == 0) $class_tr = 'row_odd';
121
+				if ($i % 2 == 0) $class_tr = 'row_odd';
122 122
 			    else $class_tr = 'row_even';
123 123
 
124 124
 				$teachers_table .= '
125 125
 									<tr class="'.$class_tr.'">
126
-										<td>'.api_get_person_name($firstname,$lastname).' ('.$username.')</td>
126
+										<td>'.api_get_person_name($firstname, $lastname).' ('.$username.')</td>
127 127
 										<td align="right">'.$time_on_platform.'</td>
128 128
 										<td align="right">'.$last_connection.'</td>
129 129
 									</tr>
@@ -155,7 +155,7 @@  discard block
 block discarded – undo
155 155
         $teachers_table = null;
156 156
  		if (count($teachers) > 0) {
157 157
  			$a_last_week = get_last_week();
158
- 			$last_week 	 = date('Y-m-d',$a_last_week[0]).' '.get_lang('To').' '.date('Y-m-d', $a_last_week[6]);
158
+ 			$last_week 	 = date('Y-m-d', $a_last_week[0]).' '.get_lang('To').' '.date('Y-m-d', $a_last_week[6]);
159 159
 
160 160
 	 		$teachers_table .= '<table class="data_table" width:"95%">';
161 161
 	 		$teachers_table .= '
@@ -171,13 +171,13 @@  discard block
 block discarded – undo
171 171
 	 			$teacher_id = $teacher['user_id'];
172 172
 	 			$firstname  = $teacher['firstname'];
173 173
 	 			$lastname   = $teacher['lastname'];
174
-				$username	= $teacher['username'];
175
-	 			$time_on_platform = api_time_to_hms(Tracking :: get_time_spent_on_the_platform($teacher_id,true));
174
+				$username = $teacher['username'];
175
+	 			$time_on_platform = api_time_to_hms(Tracking :: get_time_spent_on_the_platform($teacher_id, true));
176 176
 
177
-	 			if ($i%2 == 0) $class_tr = 'row_odd';
177
+	 			if ($i % 2 == 0) $class_tr = 'row_odd';
178 178
 	    		else $class_tr = 'row_even';
179 179
 	    		$teachers_table .= '<tr class="'.$class_tr.'">
180
-										<td>'.api_get_person_name($firstname,$lastname).' ('.$username.')</td>
180
+										<td>'.api_get_person_name($firstname, $lastname).' ('.$username.')</td>
181 181
 										<td align="right">'.$time_on_platform.'</td>
182 182
 									</tr>';
183 183
 
Please login to merge, or discard this patch.