chamilo / chamilo-lms

plugin/courselegal/CourseLegalPlugin.php

Indentation +6 added lines, -6 removed lines

@@ -108,12 +108,12 @@
     }
 
     /**
-    * @param int $userId
-    * @param int $courseCode
-    * @param int $sessionId
-    * @param boolean $sendEmail Optional. Indicate whether the mail must be sent. Default is true
-    * @return mixed
-    */
+     * @param int $userId
+     * @param int $courseCode
+     * @param int $sessionId
+     * @param boolean $sendEmail Optional. Indicate whether the mail must be sent. Default is true
+     * @return mixed
+     */
     public function saveUserLegal($userId, $courseCode, $sessionId, $sendEmail = true)
     {
         $courseInfo = api_get_course_info($courseCode);

Spacing +1 added lines, -1 removed lines

@@ -421,7 +421,7 @@
                 array('id = ? ' => $id)
             );
             if (!empty($legalData['filename'])) {
-                $fileToDelete = $coursePath . '/' . $legalData['filename'];
+                $fileToDelete = $coursePath.'/'.$legalData['filename'];
                 if (file_exists($fileToDelete)) {
                     unlink($fileToDelete);
                 }

plugin/courselegal/install.php

Spacing +1 added lines, -1 removed lines

@@ -1,7 +1,7 @@
 <?php
 /* For license terms, see /license.txt */
 
-require_once dirname(__FILE__) . '/config.php';
+require_once dirname(__FILE__).'/config.php';
 
 if (!api_is_platform_admin()) {
     die ('You must have admin permissions to install plugins');

plugin/buycourses/src/configure_course.php

Spacing +6 added lines, -6 removed lines

@@ -23,7 +23,7 @@ 
 
 if ($commissionsEnable == "true") {
     
-    $htmlHeadXtra[] = '<script type="text/javascript" src="' . api_get_path(WEB_PLUGIN_PATH) . 'buycourses/resources/js/commissions.js"></script>';
+    $htmlHeadXtra[] = '<script type="text/javascript" src="'.api_get_path(WEB_PLUGIN_PATH).'buycourses/resources/js/commissions.js"></script>';
     $defaultCommissions = [];
     $commissions = "";
     
@@ -170,9 +170,9 @@ 
     . '<script>'
         . '$(function(){'
             . 'if ($("[name=\'commissions\']").val() === "") {'
-                . '$("#panelSliders").html("<button id=\"setCommissionsButton\" class=\"btn btn-warning\">' . get_plugin_lang("SetCommissions", "BuyCoursesPlugin") . '</button>");'
+                . '$("#panelSliders").html("<button id=\"setCommissionsButton\" class=\"btn btn-warning\">'.get_plugin_lang("SetCommissions", "BuyCoursesPlugin").'</button>");'
             . '} else {'
-                . 'showSliders(100, "default", "' . $commissions . '");'
+                . 'showSliders(100, "default", "'.$commissions.'");'
             . '}'
         . '});'
 
@@ -226,14 +226,14 @@ 
     
     $platformCommission = $plugin->getPlatformCommission();
     
-    $form->addHtml( ''
+    $form->addHtml(''
             . '<div class="form-group">'
                 . '<label for="sliders" class="col-sm-2 control-label">'
                     . get_plugin_lang('Commissions', 'BuyCoursesPlugin')
                 . '</label>'
                 . '<div class="col-sm-8">'
                     . Display::return_message(
-                        sprintf($plugin->get_lang('TheActualPlatformCommissionIsX'), $platformCommission['commission']. '%'),
+                        sprintf($plugin->get_lang('TheActualPlatformCommissionIsX'), $platformCommission['commission'].'%'),
                         'info',
                         false
                     )
@@ -292,7 +292,7 @@ 
         $plugin->deleteItem($productItem['id']);
     }
 
-    header('Location: ' . api_get_path(WEB_PLUGIN_PATH) . 'buycourses/src/configuration.php');
+    header('Location: '.api_get_path(WEB_PLUGIN_PATH).'buycourses/src/configuration.php');
     exit;
 }
 

plugin/buycourses/src/buy_course_plugin.class.php

Spacing +9 added lines, -9 removed lines

@@ -87,7 +87,7 @@ 
             return false;

         }

 

-        require_once api_get_path(SYS_PLUGIN_PATH) . 'buycourses/database.php';

+        require_once api_get_path(SYS_PLUGIN_PATH).'buycourses/database.php';

     }

 

     /**

@@ -652,7 +652,7 @@ 
         );

 

         if (!empty($sessionImage)) {

-            $sessionInfo['image'] = api_get_path(WEB_UPLOAD_PATH) . $sessionImage['value'];

+            $sessionInfo['image'] = api_get_path(WEB_UPLOAD_PATH).$sessionImage['value'];

         }

 

         $sessionCourses = $session->getCourses();

@@ -1094,7 +1094,7 @@ 
 

         $str = '';

 

-        srand((double)microtime() * 1000000);

+        srand((double) microtime() * 1000000);

 

         for ($i = 0; $i < $length; $i++) {

             $numbers = rand(0, strlen($salt) - 1);

@@ -1441,8 +1441,8 @@ 
      */

     public function getPayouts($status = self::PAYOUT_STATUS_PENDING, $payoutId = false, $userId = false)

     {

-        $condition = ($payoutId) ? 'AND p.id = '. intval($payoutId) : '';

-        $condition2 = ($userId) ? ' AND p.user_id = ' . intval($userId) : '';

+        $condition = ($payoutId) ? 'AND p.id = '.intval($payoutId) : '';

+        $condition2 = ($userId) ? ' AND p.user_id = '.intval($userId) : '';

         $typeResult = ($condition) ? 'first' : 'all';

         $payoutsTable = Database::get_main_table(BuyCoursesPlugin::TABLE_PAYPAL_PAYOUTS);

         $saleTable = Database::get_main_table(BuyCoursesPlugin::TABLE_SALE);

@@ -1469,14 +1469,14 @@ 
             INNER JOIN $saleTable s ON s.id = p.sale_id

             INNER JOIN $currencyTable c ON s.currency_id = c.id

             LEFT JOIN  $extraFieldValues efv ON p.user_id = efv.item_id 

-            AND field_id = " . intval($paypalExtraField['id']) . "

+            AND field_id = ".intval($paypalExtraField['id'])."

         ";

         

         $payouts = Database::select(

             "p.* , u.firstname, u.lastname, efv.value as paypal_account, s.reference as sale_reference, s.price as item_price, c.iso_code",

             "$payoutsTable p $innerJoins",

             [

-                'where' => ['p.status = ? '.$condition . ' ' .$condition2 => $status]

+                'where' => ['p.status = ? '.$condition.' '.$condition2 => $status]

             ],

             $typeResult

         );

@@ -1540,7 +1540,7 @@ 
         $platformCommission = $this->getPlatformCommission();

 

         $sale = $this->getSale($saleId);

-        $teachersCommission = number_format((floatval($sale['price']) * intval($platformCommission['commission']))/100, 2);

+        $teachersCommission = number_format((floatval($sale['price']) * intval($platformCommission['commission'])) / 100, 2);

         

         

         $beneficiaries = $this->getBeneficiariesBySale($saleId);

@@ -1552,7 +1552,7 @@ 
                     'payout_date' => getdate(),

                     'sale_id' => intval($saleId),

                     'user_id' => $beneficiary['user_id'],

-                    'commission' => number_format((floatval($teachersCommission) * intval($beneficiary['commissions']))/100, 2),

+                    'commission' => number_format((floatval($teachersCommission) * intval($beneficiary['commissions'])) / 100, 2),

                     'status' => self::PAYOUT_STATUS_PENDING

                 ]

             );

plugin/buycourses/src/paymentsetup.php

Spacing +5 added lines, -5 removed lines

@@ -27,7 +27,7 @@ 
             Display::return_message(get_lang('ItemRemoved'), 'success')

         );

 

-        header('Location: ' . api_get_self());

+        header('Location: '.api_get_self());

         exit;

     }

 }

@@ -43,7 +43,7 @@ 
         Display::return_message(get_lang('Saved'), 'success')

     );

 

-    header('Location:' . api_get_self());

+    header('Location:'.api_get_self());

     exit;

 }

 

@@ -88,7 +88,7 @@ 
         Display::return_message(get_lang('Saved'), 'success')

     );

 

-    header('Location:' . api_get_self());

+    header('Location:'.api_get_self());

     exit;

 }

 

@@ -127,7 +127,7 @@ 
         Display::return_message(get_lang('Saved'), 'success')

     );

 

-    header('Location:' . api_get_self());

+    header('Location:'.api_get_self());

     exit;

 }

 

@@ -153,7 +153,7 @@ 
         Display::return_message(get_lang('Saved'), 'success')

     );

 

-    header('Location:' . api_get_self());

+    header('Location:'.api_get_self());

     exit;

 }

 

plugin/buycourses/src/expresscheckout.php

Spacing +4 added lines, -4 removed lines

@@ -40,8 +40,8 @@
     $ErrorSeverityCode = urldecode($resArray["L_SEVERITYCODE0"]);

 

     echo "SetExpressCheckout API call failed. ";

-    echo "Detailed Error Message: " . $ErrorLongMsg;

-    echo "Short Error Message: " . $ErrorShortMsg;

-    echo "Error Code: " . $ErrorCode;

-    echo "Error Severity Code: " . $ErrorSeverityCode;

+    echo "Detailed Error Message: ".$ErrorLongMsg;

+    echo "Short Error Message: ".$ErrorShortMsg;

+    echo "Error Code: ".$ErrorCode;

+    echo "Error Severity Code: ".$ErrorSeverityCode;

 }

plugin/buycourses/src/success.php

Spacing +2 added lines, -2 removed lines

@@ -57,7 +57,7 @@ 
 

         unset($_SESSION['bc_sale_id']);

 

-        header('Location: ' . api_get_path(WEB_PLUGIN_PATH) . 'buycourses/index.php');

+        header('Location: '.api_get_path(WEB_PLUGIN_PATH).'buycourses/index.php');

         exit;

     }

 

@@ -166,7 +166,7 @@ 
     }

 

     unset($_SESSION['bc_sale_id']);

-    header('Location: ' . api_get_path(WEB_PLUGIN_PATH) . 'buycourses/src/course_catalog.php');

+    header('Location: '.api_get_path(WEB_PLUGIN_PATH).'buycourses/src/course_catalog.php');

     exit;

 }

 

plugin/buycourses/src/process.php

Spacing +4 added lines, -4 removed lines

@@ -12,7 +12,7 @@ 
 $currentUserId = api_get_user_id();

 

 if (empty($currentUserId)) {

-    header('Location: ' . api_get_path(WEB_CODE_PATH) . 'auth/inscription.php');

+    header('Location: '.api_get_path(WEB_CODE_PATH).'auth/inscription.php');

     exit;

 }

 

@@ -27,7 +27,7 @@ 
 

 $buyingCourse = intval($_REQUEST['t']) === BuyCoursesPlugin::PRODUCT_TYPE_COURSE;

 $buyingSession = intval($_REQUEST['t']) === BuyCoursesPlugin::PRODUCT_TYPE_SESSION;

-$queryString = 'i=' . intval($_REQUEST['i']) . '&t=' . intval($_REQUEST['t']);

+$queryString = 'i='.intval($_REQUEST['i']).'&t='.intval($_REQUEST['t']);

 

 if ($buyingCourse) {

     $courseInfo = $plugin->getCourseInfo($_REQUEST['i']);

@@ -48,7 +48,7 @@ 
         Display::addFlash(

             Display::return_message($plugin->get_lang('NeedToSelectPaymentType'), 'error', false)

         );

-        header('Location:' . api_get_self() . '?' . $queryString);

+        header('Location:'.api_get_self().'?'.$queryString);

         exit;

     }

     

@@ -56,7 +56,7 @@ 
 

     if ($saleId !== false) {

         $_SESSION['bc_sale_id'] = $saleId;

-        header('Location: ' . api_get_path(WEB_PLUGIN_PATH) . 'buycourses/src/process_confirm.php');  

+        header('Location: '.api_get_path(WEB_PLUGIN_PATH).'buycourses/src/process_confirm.php');  

     }

 

     exit;

plugin/buycourses/src/paypalfunctions.php

Indentation +4 added lines, -4 removed lines

@@ -111,8 +111,8 @@ 
  *		phoneNum:			the phoneNum  entered on the merchant's site

  */

 function CallMarkExpressCheckout($paymentAmount, $currencyCodeType, $paymentType, $returnURL,

-                                 $cancelURL, $shipToName, $shipToStreet, $shipToCity, $shipToState,

-                                 $shipToCountryCode, $shipToZip, $shipToStreet2, $phoneNum

+                                    $cancelURL, $shipToName, $shipToStreet, $shipToCity, $shipToState,

+                                    $shipToCountryCode, $shipToZip, $shipToStreet2, $phoneNum

 )

 {

     // Construct the parameter string that describes the SetExpressCheckout API call in the shortcut implementation

@@ -265,8 +265,8 @@ 
  */

 

 function DirectPayment($paymentType, $paymentAmount, $creditCardType, $creditCardNumber,

-                       $expDate, $cvv2, $firstName, $lastName, $street, $city, $state, $zip,

-                       $countryCode, $currencyCode)

+                        $expDate, $cvv2, $firstName, $lastName, $street, $city, $state, $zip,

+                        $countryCode, $currencyCode)

 {

     //Construct the parameter string that describes DoDirectPayment

     $nvpstr = "&AMT=" . $paymentAmount;

Spacing +44 added lines, -44 removed lines

@@ -67,12 +67,12 @@ 
 function CallShortcutExpressCheckout($paymentAmount, $currencyCodeType, $paymentType, $returnURL, $cancelURL, $extra)

 {

     // Construct the parameter string that describes the SetExpressCheckout API call in the shortcut implementation

-    $nvpstr = "&PAYMENTREQUEST_0_AMT=" . $paymentAmount;

-    $nvpstr .= "&PAYMENTREQUEST_0_ITEMAMT=" . $paymentAmount;

-    $nvpstr .= "&PAYMENTREQUEST_0_PAYMENTACTION=" . $paymentType;

-    $nvpstr .= "&RETURNURL=" . $returnURL;

-    $nvpstr .= "&CANCELURL=" . $cancelURL;

-    $nvpstr .= "&PAYMENTREQUEST_0_CURRENCYCODE=" . $currencyCodeType;

+    $nvpstr = "&PAYMENTREQUEST_0_AMT=".$paymentAmount;

+    $nvpstr .= "&PAYMENTREQUEST_0_ITEMAMT=".$paymentAmount;

+    $nvpstr .= "&PAYMENTREQUEST_0_PAYMENTACTION=".$paymentType;

+    $nvpstr .= "&RETURNURL=".$returnURL;

+    $nvpstr .= "&CANCELURL=".$cancelURL;

+    $nvpstr .= "&PAYMENTREQUEST_0_CURRENCYCODE=".$currencyCodeType;

     $nvpstr .= $extra;

 

     $_SESSION["currencyCodeType"] = $currencyCodeType;

@@ -116,20 +116,20 @@ 
 )

 {

     // Construct the parameter string that describes the SetExpressCheckout API call in the shortcut implementation

-    $nvpstr = "&PAYMENTREQUEST_0_AMT=" . $paymentAmount;

-    $nvpstr = $nvpstr . "&PAYMENTREQUEST_0_PAYMENTACTION=" . $paymentType;

-    $nvpstr = $nvpstr . "&RETURNURL=" . $returnURL;

-    $nvpstr = $nvpstr . "&CANCELURL=" . $cancelURL;

-    $nvpstr = $nvpstr . "&PAYMENTREQUEST_0_CURRENCYCODE=" . $currencyCodeType;

-    $nvpstr = $nvpstr . "&ADDROVERRIDE=1";

-    $nvpstr = $nvpstr . "&PAYMENTREQUEST_0_SHIPTONAME=" . $shipToName;

-    $nvpstr = $nvpstr . "&PAYMENTREQUEST_0_SHIPTOSTREET=" . $shipToStreet;

-    $nvpstr = $nvpstr . "&PAYMENTREQUEST_0_SHIPTOSTREET2=" . $shipToStreet2;

-    $nvpstr = $nvpstr . "&PAYMENTREQUEST_0_SHIPTOCITY=" . $shipToCity;

-    $nvpstr = $nvpstr . "&PAYMENTREQUEST_0_SHIPTOSTATE=" . $shipToState;

-    $nvpstr = $nvpstr . "&PAYMENTREQUEST_0_SHIPTOCOUNTRYCODE=" . $shipToCountryCode;

-    $nvpstr = $nvpstr . "&PAYMENTREQUEST_0_SHIPTOZIP=" . $shipToZip;

-    $nvpstr = $nvpstr . "&PAYMENTREQUEST_0_SHIPTOPHONENUM=" . $phoneNum;

+    $nvpstr = "&PAYMENTREQUEST_0_AMT=".$paymentAmount;

+    $nvpstr = $nvpstr."&PAYMENTREQUEST_0_PAYMENTACTION=".$paymentType;

+    $nvpstr = $nvpstr."&RETURNURL=".$returnURL;

+    $nvpstr = $nvpstr."&CANCELURL=".$cancelURL;

+    $nvpstr = $nvpstr."&PAYMENTREQUEST_0_CURRENCYCODE=".$currencyCodeType;

+    $nvpstr = $nvpstr."&ADDROVERRIDE=1";

+    $nvpstr = $nvpstr."&PAYMENTREQUEST_0_SHIPTONAME=".$shipToName;

+    $nvpstr = $nvpstr."&PAYMENTREQUEST_0_SHIPTOSTREET=".$shipToStreet;

+    $nvpstr = $nvpstr."&PAYMENTREQUEST_0_SHIPTOSTREET2=".$shipToStreet2;

+    $nvpstr = $nvpstr."&PAYMENTREQUEST_0_SHIPTOCITY=".$shipToCity;

+    $nvpstr = $nvpstr."&PAYMENTREQUEST_0_SHIPTOSTATE=".$shipToState;

+    $nvpstr = $nvpstr."&PAYMENTREQUEST_0_SHIPTOCOUNTRYCODE=".$shipToCountryCode;

+    $nvpstr = $nvpstr."&PAYMENTREQUEST_0_SHIPTOZIP=".$shipToZip;

+    $nvpstr = $nvpstr."&PAYMENTREQUEST_0_SHIPTOPHONENUM=".$phoneNum;

 

     $_SESSION["currencyCodeType"] = $currencyCodeType;

     $_SESSION["PaymentType"] = $paymentType;

@@ -172,7 +172,7 @@ 
      * Build a second API request to PayPal, using the token as the

      * ID to get the details on the payment authorization

      */

-    $nvpstr = "&TOKEN=" . $token;

+    $nvpstr = "&TOKEN=".$token;

 

     /**

      * Make the API call and store the results in an array.

@@ -213,9 +213,9 @@ 
     $payerID = urlencode($_SESSION['payer_id']);

     $serverName = urlencode($_SERVER['SERVER_NAME']);

 

-    $nvpstr = '&TOKEN=' . $token . '&PAYERID=' . $payerID . '&PAYMENTREQUEST_0_PAYMENTACTION=' . $paymentType . '&PAYMENTREQUEST_0_AMT=' . $FinalPaymentAmt;

-    $nvpstr .= '&PAYMENTREQUEST_0_CURRENCYCODE=' . $currencyCodeType . '&IPADDRESS=' . $serverName;

-    $nvpstr = '&' . http_build_query([

+    $nvpstr = '&TOKEN='.$token.'&PAYERID='.$payerID.'&PAYMENTREQUEST_0_PAYMENTACTION='.$paymentType.'&PAYMENTREQUEST_0_AMT='.$FinalPaymentAmt;

+    $nvpstr .= '&PAYMENTREQUEST_0_CURRENCYCODE='.$currencyCodeType.'&IPADDRESS='.$serverName;

+    $nvpstr = '&'.http_build_query([

         'TOKEN' => $token,

         'PAYERID' => $payerID,

         'PAYMENTACTION' => $paymentType,

@@ -269,20 +269,20 @@ 
                        $countryCode, $currencyCode)

 {

     //Construct the parameter string that describes DoDirectPayment

-    $nvpstr = "&AMT=" . $paymentAmount;

-    $nvpstr = $nvpstr . "&CURRENCYCODE=" . $currencyCode;

-    $nvpstr = $nvpstr . "&PAYMENTACTION=" . $paymentType;

-    $nvpstr = $nvpstr . "&CREDITCARDTYPE=" . $creditCardType;

-    $nvpstr = $nvpstr . "&ACCT=" . $creditCardNumber;

-    $nvpstr = $nvpstr . "&EXPDATE=" . $expDate;

-    $nvpstr = $nvpstr . "&CVV2=" . $cvv2;

-    $nvpstr = $nvpstr . "&FIRSTNAME=" . $firstName;

-    $nvpstr = $nvpstr . "&LASTNAME=" . $lastName;

-    $nvpstr = $nvpstr . "&STREET=" . $street;

-    $nvpstr = $nvpstr . "&CITY=" . $city;

-    $nvpstr = $nvpstr . "&STATE=" . $state;

-    $nvpstr = $nvpstr . "&COUNTRYCODE=" . $countryCode;

-    $nvpstr = $nvpstr . "&IPADDRESS=" . $_SERVER['REMOTE_ADDR'];

+    $nvpstr = "&AMT=".$paymentAmount;

+    $nvpstr = $nvpstr."&CURRENCYCODE=".$currencyCode;

+    $nvpstr = $nvpstr."&PAYMENTACTION=".$paymentType;

+    $nvpstr = $nvpstr."&CREDITCARDTYPE=".$creditCardType;

+    $nvpstr = $nvpstr."&ACCT=".$creditCardNumber;

+    $nvpstr = $nvpstr."&EXPDATE=".$expDate;

+    $nvpstr = $nvpstr."&CVV2=".$cvv2;

+    $nvpstr = $nvpstr."&FIRSTNAME=".$firstName;

+    $nvpstr = $nvpstr."&LASTNAME=".$lastName;

+    $nvpstr = $nvpstr."&STREET=".$street;

+    $nvpstr = $nvpstr."&CITY=".$city;

+    $nvpstr = $nvpstr."&STATE=".$state;

+    $nvpstr = $nvpstr."&COUNTRYCODE=".$countryCode;

+    $nvpstr = $nvpstr."&IPADDRESS=".$_SERVER['REMOTE_ADDR'];

 

     $resArray = hash_call("DoDirectPayment", $nvpstr);

 

@@ -345,13 +345,13 @@ 
     //if USE_PROXY constant set to TRUE in Constants.php, then only proxy will be enabled.

     //Set proxy name to PROXY_HOST and port number to PROXY_PORT in constants.php

     if ($USE_PROXY) {

-        curl_setopt($ch, CURLOPT_PROXY, $PROXY_HOST . ":" . $PROXY_PORT);

+        curl_setopt($ch, CURLOPT_PROXY, $PROXY_HOST.":".$PROXY_PORT);

     }

 

     //NVPRequest for submitting to server

-    $nvpreq = "METHOD=" . urlencode($methodName) . "&VERSION=" . urlencode($version) .

-        "&PWD=" . urlencode($API_Password) . "&USER=" . urlencode($API_UserName) .

-        "&SIGNATURE=" . urlencode($API_Signature) . $nvpStr . "&BUTTONSOURCE=" . urlencode($sBNCode);

+    $nvpreq = "METHOD=".urlencode($methodName)."&VERSION=".urlencode($version).

+        "&PWD=".urlencode($API_Password)."&USER=".urlencode($API_UserName).

+        "&SIGNATURE=".urlencode($API_Signature).$nvpStr."&BUTTONSOURCE=".urlencode($sBNCode);

 

     //setting the nvpreq as POST FIELD to curl

     curl_setopt($ch, CURLOPT_POSTFIELDS, $nvpreq);

@@ -385,8 +385,8 @@ 
 {

     global $PAYPAL_URL;

     // Redirect to paypal.com here

-    $payPalURL = $PAYPAL_URL . $token;

-    header("Location: " . $payPalURL);

+    $payPalURL = $PAYPAL_URL.$token;

+    header("Location: ".$payPalURL);

     exit;

 }