chamilo / chamilo-lms

plugin/buycourses/src/buy_course_plugin.class.php

Doc Comments +13 added lines, -13 removed lines

@@ -45,7 +45,7 @@ 
 

     /**

      *

-     * @return StaticPlugin

+     * @return BuyCoursesPlugin

      */

     static function create()

     {

@@ -268,7 +268,7 @@ 
     /**

      * Save a transfer account information

      * @param array $params The transfer account

-     * @return int Rows affected. Otherwise return false

+     * @return false|string Rows affected. Otherwise return false

      */

     public function saveTransferAccount($params)

     {

@@ -680,7 +680,7 @@ 
     /**

      * Get session info

      * @param array $sessionId The session ID

-     * @return array

+     * @return Session

      */

     public function getSessionInfo($sessionId)

     {

@@ -773,7 +773,7 @@ 
      * Register a sale

      * @param int $itemId The product ID

      * @param int $paymentType The payment type

-     * @return boolean

+     * @return false|string

      */

     public function registerSale($itemId, $paymentType)

     {

@@ -955,7 +955,7 @@ 
 

     /**

      * Get payment types

-     * @return array

+     * @return string[]

      */

     public function getPaymentTypes()

     {

@@ -994,7 +994,7 @@ 
 

     /**

      * Get the statuses for sales

-     * @return array

+     * @return string[]

      */

     public function getSaleStatuses()

     {

@@ -1007,7 +1007,7 @@ 
 

     /**

      * Get the statuses for Payouts

-     * @return array

+     * @return string[]

      */

     public function getPayoutStatuses()

     {

@@ -1020,7 +1020,7 @@ 
 

     /**

      * Get the list of product types

-     * @return array

+     * @return string[]

      */

     public function getProductTypes()

     {

@@ -1401,7 +1401,7 @@ 
     /**

      * Register a item

      * @param array $itemData The item data

-     * @return int The item ID. Otherwise return false

+     * @return false|string The item ID. Otherwise return false

      */

     public function registerItem(array $itemData)

     {

@@ -1559,7 +1559,7 @@ 
     /**

      * Verify if the beneficiary have a paypal account

      * @param int $userId

-     * @return true if the user have a paypal account, false if not

+     * @return boolean if the user have a paypal account, false if not

      */

     public function verifyPaypalAccountByBeneficiary($userId)

     {

@@ -1681,7 +1681,7 @@ 
     /**

      * Register addicional service

      * @param array params $service

-     * @return mixed response

+     * @return string|false response

      */

     public function storeService($service)

     {

@@ -1838,7 +1838,7 @@ 
 

     /**

      * Get the statuses for sales

-     * @return array

+     * @return string[]

      */

     public function getServiceSaleStatuses()

     {

@@ -2094,7 +2094,7 @@ 
      * @param int $paymentType The payment type

      * @param int $infoSelect The ID for Service Type

      * @param int $trial trial mode

-     * @return boolean

+     * @return false|string

      */

     public function registerServiceSale($serviceId, $paymentType, $infoSelect, $trial = null)

     {

plugin/buycourses/src/service_process.php

Spacing +6 added lines, -6 removed lines

@@ -13,7 +13,7 @@ 
 require_once '../config.php';

 

 if (!isset($_REQUEST['t'], $_REQUEST['i'])) {

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

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

 }

 

 $currentUserId = api_get_user_id();

@@ -37,7 +37,7 @@ 
 $typeUser = intval($_REQUEST['t']) === BuyCoursesPlugin::SERVICE_TYPE_USER;

 $typeCourse = intval($_REQUEST['t']) === BuyCoursesPlugin::SERVICE_TYPE_COURSE;

 $typeSession = intval($_REQUEST['t']) === BuyCoursesPlugin::SERVICE_TYPE_SESSION;

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

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

 

 $serviceInfo = $plugin->getServices(intval($_REQUEST['i']));

 $userInfo = api_get_user_info($currentUserId);

@@ -51,7 +51,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;

     }

 

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

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

         );

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

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

         exit;

     }

     

@@ -68,7 +68,7 @@ 
     if ($serviceSaleId !== false) {

         $_SESSION['bc_service_sale_id'] = $serviceSaleId;

 

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

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

     }

 

     exit;

@@ -85,7 +85,7 @@ 
 

 if ($typeUser) {

     $users = $em->getRepository('ChamiloUserBundle:User')->findAll();

-    $selectOptions[$userInfo['user_id']] = api_get_person_name($userInfo['firstname'], $userInfo['lastname']) . ' (' . get_lang('Myself') . ')';

+    $selectOptions[$userInfo['user_id']] = api_get_person_name($userInfo['firstname'], $userInfo['lastname']).' ('.get_lang('Myself').')';

     if (!empty($users)) {

         foreach ($users as $user) {

             if (intval($userInfo['user_id']) !== intval($user->getId())) {

plugin/buycourses/src/service_success.php

Spacing +3 added lines, -3 removed lines

@@ -51,7 +51,7 @@ 
             Display::return_message($plugin->get_lang('OrderCancelled'), 'error', false)

         );

 

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

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

         exit;

     }

 

@@ -66,7 +66,7 @@ 
             Display::return_message($erroMessage, 'error', false)

         );

         unset($_SESSION['wizard']);

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

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

         exit;

     }

 

@@ -150,7 +150,7 @@ 
 

     unset($_SESSION['bc_service_sale_id']);

 

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

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

 

     exit;

 }

plugin/buycourses/src/service_process_confirm.php

Spacing +5 added lines, -5 removed lines

@@ -39,8 +39,8 @@ 
         // purchase-specific fields are ignored. This little condition handle this fact.

         $itemPrice = $serviceSale['price'];

 

-        $returnUrl = api_get_path(WEB_PLUGIN_PATH) . 'buycourses/src/service_success.php';

-        $cancelUrl = api_get_path(WEB_PLUGIN_PATH) . 'buycourses/src/service_error.php';

+        $returnUrl = api_get_path(WEB_PLUGIN_PATH).'buycourses/src/service_success.php';

+        $cancelUrl = api_get_path(WEB_PLUGIN_PATH).'buycourses/src/service_error.php';

 

         // The extra params for handle the hard job, this var is VERY IMPORTANT !!

         $extra = '';

@@ -72,7 +72,7 @@ 
 

             $plugin->cancelServiceSale(intval($serviceSale['id']));

 

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

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

             exit;

         }

 

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

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

                 );

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

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

                 exit;

             }

 

@@ -149,7 +149,7 @@ 
             );

 

             unset($_SESSION['bc_service_sale_id']);

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

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

             exit;

         }

 

main/document/document_slideshow.inc.php

Spacing +1 added lines, -1 removed lines

@@ -71,7 +71,7 @@
 function sort_files($table)
 {
     $tablename_direction = isset($_GET['tablename_direction']) ? Security::remove_XSS($_GET['tablename_direction']) : 'ASC';
-    $accepted_extensions = array('.jpg', '.jpeg', '.gif', '.png', '.bmp','.svg');
+    $accepted_extensions = array('.jpg', '.jpeg', '.gif', '.png', '.bmp', '.svg');
     $temp = array();
 
     foreach ($table as & $file_array) {

main/document/create_document.php

Indentation +158 added lines, -158 removed lines

@@ -61,13 +61,13 @@ 
 $is_certificate_mode = false;
 
 if (isset($_REQUEST['certificate']) && $_REQUEST['certificate'] == 'true') {
-	$is_certificate_mode = true;
+    $is_certificate_mode = true;
 }
 
 if ($is_certificate_mode) {
-	$nameTools = get_lang('CreateCertificate');
+    $nameTools = get_lang('CreateCertificate');
 } else {
-	$nameTools = get_lang('CreateDocument');
+    $nameTools = get_lang('CreateDocument');
 }
 
 /*	Constants and variables */
@@ -124,26 +124,26 @@ 
 
 // Please, do not modify this dirname formatting
 if (strstr($dir, '..')) {
-	$dir = '/';
+    $dir = '/';
 }
 
 if ($dir[0] == '.') {
-	$dir = substr($dir, 1);
+    $dir = substr($dir, 1);
 }
 
 if ($dir[0] != '/') {
-	$dir = '/'.$dir;
+    $dir = '/'.$dir;
 }
 
 if ($dir[strlen($dir) - 1] != '/') {
-	$dir .= '/';
+    $dir .= '/';
 }
 
 if ($is_certificate_mode) {
-	$document_id = DocumentManager::get_document_id(api_get_course_info(), '/certificates');
-	$document_data = DocumentManager::get_document_data_by_id($document_id, api_get_course_id(), true);
-	$folder_id = $document_data['id'];
-	$dir = '/certificates/';
+    $document_id = DocumentManager::get_document_id(api_get_course_info(), '/certificates');
+    $document_data = DocumentManager::get_document_data_by_id($document_id, api_get_course_id(), true);
+    $folder_id = $document_data['id'];
+    $dir = '/certificates/';
 }
 
 $doc_tree  = explode('/', $dir);
@@ -154,16 +154,16 @@ 
 
     // Level correction for group documents.
     if (!empty($group_properties['directory'])) {
-    	$count_dir = $count_dir > 0 ? $count_dir - 1 : 0;
+        $count_dir = $count_dir > 0 ? $count_dir - 1 : 0;
     }
 }
 $relative_url = '';
 for ($i = 0; $i < ($count_dir); $i++) {
-	$relative_url .= '../';
+    $relative_url .= '../';
 }
 
 if ($relative_url== '') {
-	$relative_url = '/';
+    $relative_url = '/';
 }
 
 $is_allowed_to_edit = api_is_allowed_to_edit(null, true);
@@ -175,11 +175,11 @@ 
     'cols-size' => [2, 10, 0],
     'FullPage' => true,
     'InDocument' => true,
-	'CreateDocumentDir' => $relative_url,
-	'CreateDocumentWebDir' => (empty($group_properties['directory']))
-                        		? api_get_path(WEB_COURSE_PATH).$_course['path'].'/document/'
-                        		: api_get_path(WEB_COURSE_PATH).api_get_course_path().'/document'.$group_properties['directory'].'/',
-	'BaseHref' => api_get_path(WEB_COURSE_PATH).$_course['path'].'/document'.$dir
+    'CreateDocumentDir' => $relative_url,
+    'CreateDocumentWebDir' => (empty($group_properties['directory']))
+                                ? api_get_path(WEB_COURSE_PATH).$_course['path'].'/document/'
+                                : api_get_path(WEB_COURSE_PATH).api_get_course_path().'/document'.$group_properties['directory'].'/',
+    'BaseHref' => api_get_path(WEB_COURSE_PATH).$_course['path'].'/document'.$dir
 );
 
 if ($is_certificate_mode) {
@@ -191,41 +191,41 @@ 
 $filepath = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document';
 
 if (!is_dir($filepath)) {
-	$filepath = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document/';
-	$dir = '/';
+    $filepath = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document/';
+    $dir = '/';
 }
 
 $to_group_id = 0;
 if (!$is_certificate_mode) {
-	if (api_is_in_group()) {
+    if (api_is_in_group()) {
         $interbreadcrumb[] = array(
             "url" => "../group/group_space.php?".api_get_cidreq(),
             "name" => get_lang('GroupSpace'),
         );
-		$noPHP_SELF = true;
-		$to_group_id = $group_properties['iid'];
-		$path = explode('/', $dir);
-		if ('/'.$path[1] != $group_properties['directory']) {
-			api_not_allowed(true);
-		}
-	}
+        $noPHP_SELF = true;
+        $to_group_id = $group_properties['iid'];
+        $path = explode('/', $dir);
+        if ('/'.$path[1] != $group_properties['directory']) {
+            api_not_allowed(true);
+        }
+    }
     $interbreadcrumb[] = array(
         "url" => "./document.php?curdirpath=".urlencode($dir)."&".api_get_cidreq(),
         "name" => get_lang('Documents'),
     );
 } else {
-	$interbreadcrumb[]= array('url' => '../gradebook/'.$_SESSION['gradebook_dest'], 'name' => get_lang('Gradebook'));
+    $interbreadcrumb[]= array('url' => '../gradebook/'.$_SESSION['gradebook_dest'], 'name' => get_lang('Gradebook'));
 }
 
 if (!api_is_allowed_in_course()) {
-	api_not_allowed(true);
+    api_not_allowed(true);
 }
 
 if (!($is_allowed_to_edit ||
     $groupRights ||
     DocumentManager::is_my_shared_folder($userId, $dir, api_get_session_id()))
 ) {
-	api_not_allowed(true);
+    api_not_allowed(true);
 }
 
 /*	Header */
@@ -233,10 +233,10 @@ 
 
 $display_dir = $dir;
 if (isset($group_properties)) {
-	$display_dir = explode('/', $dir);
-	unset($display_dir[0]);
-	unset($display_dir[1]);
-	$display_dir = implode('/', $display_dir);
+    $display_dir = explode('/', $dir);
+    unset($display_dir[0]);
+    unset($display_dir[1]);
+    $display_dir = implode('/', $display_dir);
 }
 
 $select_cat = isset($_GET['selectcat']) ? intval($_GET['selectcat']) : null;
@@ -253,9 +253,9 @@ 
 $form->addElement('header', $nameTools);
 
 if ($is_certificate_mode) {//added condition for certicate in gradebook
-	$form->addElement('hidden','certificate','true',array('id'=>'certificate'));
-	if (isset($_GET['selectcat'])) {
-		$form->addElement('hidden','selectcat', $select_cat);
+    $form->addElement('hidden','certificate','true',array('id'=>'certificate'));
+    if (isset($_GET['selectcat'])) {
+        $form->addElement('hidden','selectcat', $select_cat);
     }
 }
 
@@ -314,7 +314,7 @@ 
 // new document created
 
 if (!$is_certificate_mode &&
-	!DocumentManager::is_my_shared_folder($userId, $dir, $current_session_id)
+    !DocumentManager::is_my_shared_folder($userId, $dir, $current_session_id)
 ) {
     $folders = DocumentManager::get_all_document_folders(
         $_course,
@@ -329,7 +329,7 @@ 
         array('cols-size' => [2, 10, 0])
     );
 
-	$folder_titles = array();
+    $folder_titles = array();
     if (is_array($folders)) {
         $escaped_folders = array();
         foreach ($folders as $key => & $val) {
@@ -366,22 +366,22 @@ 
         }
     }
 
-	if (empty($group_dir)) {
-		$parent_select -> addOption(get_lang('HomeDirectory'), '/');
-		if (is_array($folders)) {
-			foreach ($folders as & $folder) {
-				//Hide some folders
-				if ($folder=='/HotPotatoes_files' || $folder=='/certificates' || basename($folder)=='css') {
+    if (empty($group_dir)) {
+        $parent_select -> addOption(get_lang('HomeDirectory'), '/');
+        if (is_array($folders)) {
+            foreach ($folders as & $folder) {
+                //Hide some folders
+                if ($folder=='/HotPotatoes_files' || $folder=='/certificates' || basename($folder)=='css') {
                     continue;
-				}
-				//Admin setting for Hide/Show the folders of all users
-				if (api_get_setting('show_users_folders') == 'false' &&
+                }
+                //Admin setting for Hide/Show the folders of all users
+                if (api_get_setting('show_users_folders') == 'false' &&
                     (strstr($folder, '/shared_folder') || strstr($folder, 'shared_folder_session_'))
                 ){
-					continue;
-				}
-				//Admin setting for Hide/Show Default folders to all users
-				if (api_get_setting('show_default_folders') == 'false' &&
+                    continue;
+                }
+                //Admin setting for Hide/Show Default folders to all users
+                if (api_get_setting('show_default_folders') == 'false' &&
                     (
                         $folder == '/images' ||
                         $folder == '/flash' ||
@@ -391,82 +391,82 @@ 
                         $folder == '/video/flv'
                     )
                 ){
-					continue;
-				}
-				//Admin setting for Hide/Show chat history folder
-				if (api_get_setting('show_chat_folder') == 'false' &&
+                    continue;
+                }
+                //Admin setting for Hide/Show chat history folder
+                if (api_get_setting('show_chat_folder') == 'false' &&
                     $folder=='/chat_files'
                 ){
-					continue;
-				}
+                    continue;
+                }
 
-				$selected = (substr($dir,0,-1) == $folder) ? ' selected="selected"' : '';
-				$path_parts = explode('/', $folder);
-				$folder_titles[$folder] = cut($folder_titles[$folder], 80);
+                $selected = (substr($dir,0,-1) == $folder) ? ' selected="selected"' : '';
+                $path_parts = explode('/', $folder);
+                $folder_titles[$folder] = cut($folder_titles[$folder], 80);
                 $space_counter =count($path_parts) - 2;
                 if ($space_counter > 0) {
                     $label = str_repeat('&nbsp;&nbsp;&nbsp;', $space_counter).' &mdash; '.$folder_titles[$folder];
                 } else {
                     $label = ' &mdash; '.$folder_titles[$folder];
                 }
-				$parent_select -> addOption($label, $folder);
-				if ($selected != '') {
-					$parent_select->setSelected($folder);
-				}
-			}
-		}
-	} else {
-		if (is_array($folders) && !empty($folders)) {
-			foreach ($folders as & $folder) {
-				$selected = (substr($dir, 0, -1) == $folder) ? ' selected="selected"' : '';
-				$label = $folder_titles[$folder];
-				if ($folder == $group_dir) {
-					$label = '/ (' . get_lang('HomeDirectory') . ')';
-				} else {
-					$path_parts = explode('/', str_replace($group_dir, '', $folder));
-					$label = cut($label, 80);
-					$label = str_repeat('&nbsp;&nbsp;&nbsp;', count($path_parts) - 2) . ' &mdash; ' . $label;
-				}
-				$parent_select->addOption($label, $folder);
-				if ($selected != '') {
-					$parent_select->setSelected($folder);
-				}
-			}
-		}
-	}
+                $parent_select -> addOption($label, $folder);
+                if ($selected != '') {
+                    $parent_select->setSelected($folder);
+                }
+            }
+        }
+    } else {
+        if (is_array($folders) && !empty($folders)) {
+            foreach ($folders as & $folder) {
+                $selected = (substr($dir, 0, -1) == $folder) ? ' selected="selected"' : '';
+                $label = $folder_titles[$folder];
+                if ($folder == $group_dir) {
+                    $label = '/ (' . get_lang('HomeDirectory') . ')';
+                } else {
+                    $path_parts = explode('/', str_replace($group_dir, '', $folder));
+                    $label = cut($label, 80);
+                    $label = str_repeat('&nbsp;&nbsp;&nbsp;', count($path_parts) - 2) . ' &mdash; ' . $label;
+                }
+                $parent_select->addOption($label, $folder);
+                if ($selected != '') {
+                    $parent_select->setSelected($folder);
+                }
+            }
+        }
+    }
 }
 
 $form->addHidden('dirValue', '');
 
 if ($is_certificate_mode) {
-	$form->addButtonCreate(get_lang('CreateCertificate'));
+    $form->addButtonCreate(get_lang('CreateCertificate'));
 } else {
-	$form->addButtonCreate(get_lang('CreateDoc'));
+    $form->addButtonCreate(get_lang('CreateDoc'));
 }
 
 $form->setDefaults($defaults);
 
 // If form validates -> save the new document
 if ($form->validate()) {
-	$values = $form->exportValues();
-	$readonly = isset($values['readonly']) ? 1 : 0;
-	$values['title'] = trim($values['title']);
+    $values = $form->exportValues();
+    $readonly = isset($values['readonly']) ? 1 : 0;
+    $values['title'] = trim($values['title']);
 
     if (!empty($values['dirValue'])) {
         $dir = $values['dirValue'];
     }
 
     if ($dir[strlen($dir) - 1] != '/') {
-		$dir .= '/';
-	}
+        $dir .= '/';
+    }
     $filepath = $filepath.$dir;
 
     // Setting the filename
-	$filename = $values['title'];
-	$filename = addslashes(trim($filename));
-	$filename = Security::remove_XSS($filename);
-	$filename = api_replace_dangerous_char($filename);
-	$filename = disable_dangerous_file($filename);
+    $filename = $values['title'];
+    $filename = addslashes(trim($filename));
+    $filename = Security::remove_XSS($filename);
+    $filename = api_replace_dangerous_char($filename);
+    $filename = disable_dangerous_file($filename);
     $filename .= DocumentManager::getDocumentSuffix(
         $_course,
         api_get_session_id(),
@@ -474,14 +474,14 @@ 
     );
 
     // Setting the title
-	$title = $values['title'];
+    $title = $values['title'];
 
     // Setting the extension
-	$extension = 'html';
+    $extension = 'html';
 
-	$content = Security::remove_XSS($values['content'], COURSEMANAGERLOWSECURITY);
+    $content = Security::remove_XSS($values['content'], COURSEMANAGERLOWSECURITY);
 
-	/*if (strpos($content, '/css/frames.css') == false) {
+    /*if (strpos($content, '/css/frames.css') == false) {
 		$content = str_replace('</head>', '<link rel="stylesheet" href="./css/frames.css" type="text/css" /><style> body{margin:50px;}</style></head>', $content);
 	}*/
 
@@ -494,21 +494,21 @@ 
         exit;
     }
 
-	if ($fp = @fopen($filepath.$filename.'.'.$extension, 'w')) {
+    if ($fp = @fopen($filepath.$filename.'.'.$extension, 'w')) {
 
-		$content = str_replace(
-		    api_get_path(WEB_COURSE_PATH),
+        $content = str_replace(
+            api_get_path(WEB_COURSE_PATH),
             api_get_configuration_value('url_append').api_get_path(REL_COURSE_PATH),
             $content
         );
 
-		fputs($fp, $content);
-		fclose($fp);
-		chmod($filepath.$filename.'.'.$extension, api_get_permissions_for_new_files());
+        fputs($fp, $content);
+        fclose($fp);
+        chmod($filepath.$filename.'.'.$extension, api_get_permissions_for_new_files());
 
 
-		$file_size = filesize($filepath.$filename.'.'.$extension);
-		$save_file_path = $dir.$filename.'.'.$extension;
+        $file_size = filesize($filepath.$filename.'.'.$extension);
+        $save_file_path = $dir.$filename.'.'.$extension;
 
         $document_id = add_document(
             $_course,
@@ -520,8 +520,8 @@ 
             $readonly
         );
 
-		if ($document_id) {
-			api_item_property_update(
+        if ($document_id) {
+            api_item_property_update(
                 $_course,
                 TOOL_DOCUMENT,
                 $document_id,
@@ -533,13 +533,13 @@ 
                 null,
                 $current_session_id
             );
-			// Update parent folders
-			item_property_update_on_folder($_course, $dir, $userId);
-			$new_comment = isset($_POST['comment']) ? trim($_POST['comment']) : '';
-			$new_title = isset($_POST['title']) ? trim($_POST['title']) : '';
+            // Update parent folders
+            item_property_update_on_folder($_course, $dir, $userId);
+            $new_comment = isset($_POST['comment']) ? trim($_POST['comment']) : '';
+            $new_title = isset($_POST['title']) ? trim($_POST['title']) : '';
             $new_title = htmlspecialchars($new_title);
-			if ($new_comment || $new_title) {
-				$ct = '';
+            if ($new_comment || $new_title) {
+                $ct = '';
                 $params = [];
                 if ($new_comment) {
                     $params['comment'] = $new_comment;
@@ -554,39 +554,39 @@ 
                         ['c_id = ? AND id = ?' => [$course_id, $document_id]]
                     );
                 }
-			}
-			$dir= substr($dir,0,-1);
-			$selectcat = '';
+            }
+            $dir= substr($dir,0,-1);
+            $selectcat = '';
             if (isset($_REQUEST['selectcat'])) {
                 $selectcat = "&selectcat=".intval($_REQUEST['selectcat']);
             }
-			$certificate_condition = '';
-			if ($is_certificate_mode) {
-				$df = DocumentManager::get_default_certificate_id($_course['real_id']);
+            $certificate_condition = '';
+            if ($is_certificate_mode) {
+                $df = DocumentManager::get_default_certificate_id($_course['real_id']);
                 if (!isset($df)) {
                     DocumentManager::attach_gradebook_certificate($_course['real_id'], $document_id);
-				}
-				$certificate_condition = '&certificate=true&curdirpath=/certificates';
-			}
+                }
+                $certificate_condition = '&certificate=true&curdirpath=/certificates';
+            }
             Display::addFlash(Display::return_message(get_lang('ItemAdded')));
-			header('Location: document.php?'.api_get_cidreq().'&id='.$folder_id.$selectcat.$certificate_condition);
-			exit();
-		} else {
-			Display :: display_header($nameTools, 'Doc');
-			Display :: display_error_message(get_lang('Impossible'));
-			Display :: display_footer();
-		}
-	} else {
-		Display :: display_header($nameTools, 'Doc');
-		Display :: display_error_message(get_lang('Impossible'));
-		Display :: display_footer();
-	}
+            header('Location: document.php?'.api_get_cidreq().'&id='.$folder_id.$selectcat.$certificate_condition);
+            exit();
+        } else {
+            Display :: display_header($nameTools, 'Doc');
+            Display :: display_error_message(get_lang('Impossible'));
+            Display :: display_footer();
+        }
+    } else {
+        Display :: display_header($nameTools, 'Doc');
+        Display :: display_error_message(get_lang('Impossible'));
+        Display :: display_footer();
+    }
 } else {
-	// Copied from document.php
-	$dir_array = explode('/', $dir);
-	$array_len = count($dir_array);
+    // Copied from document.php
+    $dir_array = explode('/', $dir);
+    $array_len = count($dir_array);
 
-	// Breadcrumb for the current directory root path
+    // Breadcrumb for the current directory root path
     if (!empty($document_data)) {
         if (empty($document_data['parents'])) {
             $interbreadcrumb[] = array(
@@ -603,11 +603,11 @@ 
         }
     }
 
-	Display :: display_header($nameTools, "Doc");
-	// actions
+    Display :: display_header($nameTools, "Doc");
+    // actions
 
-	// link back to the documents overview
-	if ($is_certificate_mode) {
+    // link back to the documents overview
+    if ($is_certificate_mode) {
             $actionsLeft =  '<a href="document.php?certificate=true&id='.$folder_id.'&selectcat=' . Security::remove_XSS($_GET['selectcat']).'">'.
                 Display::return_icon('back.png',get_lang('Back').' '.get_lang('To').' '.get_lang('CertificateOverview'),'',ICON_SIZE_MEDIUM).'</a>';
             $actionsLeft .= '<a id="hide_bar_template" href="#" role="button">'.
@@ -622,19 +622,19 @@ 
 
     echo $toolbar = Display::toolbarAction('actions-documents', array($actionsLeft));
 
-	if ($is_certificate_mode) {
+    if ($is_certificate_mode) {
         $all_information_by_create_certificate = DocumentManager::get_all_info_to_certificate(
             api_get_user_id(),
             api_get_course_id()
         );
 
-		$str_info = '';
-		foreach ($all_information_by_create_certificate[0] as $info_value) {
-			$str_info.=$info_value.'<br/>';
-		}
-		$create_certificate = get_lang('CreateCertificateWithTags');
-		Display::display_normal_message($create_certificate.': <br /><br/>'.$str_info,false);
-	}
+        $str_info = '';
+        foreach ($all_information_by_create_certificate[0] as $info_value) {
+            $str_info.=$info_value.'<br/>';
+        }
+        $create_certificate = get_lang('CreateCertificateWithTags');
+        Display::display_normal_message($create_certificate.': <br /><br/>'.$str_info,false);
+    }
 
     // HTML-editor
     echo '<div class="page-create">
@@ -650,5 +650,5 @@ 
                 '.$form->returnForm().'
             </div>
           </div></div>';
-	Display :: display_footer();
+    Display :: display_footer();
 }

main/inc/lib/formvalidator/FormValidator.class.php

Spacing +4 added lines, -4 removed lines

@@ -99,7 +99,7 @@ 
         $renderer->setHeaderTemplate('<legend>{header}</legend>');
 
         //Set required field template
-        $this->setRequiredNote('<span class="form_required">*</span> <small>' . get_lang('ThisFieldIsRequired') . '</small>');
+        $this->setRequiredNote('<span class="form_required">*</span> <small>'.get_lang('ThisFieldIsRequired').'</small>');
         $noteTemplate = <<<EOT
 	<div class="form-group">
 		<div class="col-sm-offset-2 col-sm-10">{requiredNote}</div>
@@ -903,7 +903,7 @@ 
         $this->with_progress_bar = true;
         $id = $this->getAttribute('id');
 
-        $this->updateAttributes("onsubmit=\"javascript: addProgress('" . $id . "')\"");
+        $this->updateAttributes("onsubmit=\"javascript: addProgress('".$id."')\"");
         $this->addHtml(api_get_js('js/upload.js'));
     }
 
@@ -1403,7 +1403,7 @@ 
                             .prop('href', file.url);
                         $(data.context.children()[index]).parent().wrap(link);
                         
-                        var successMessage = $('<div class=\"col-sm-3\">').html($('<span class=\"alert alert-success\"/>').text('" . addslashes(get_lang('UplUploadSucceeded')) . "'));
+                        var successMessage = $('<div class=\"col-sm-3\">').html($('<span class=\"alert alert-success\"/>').text('" . addslashes(get_lang('UplUploadSucceeded'))."'));
                         $(data.context.children()[index]).parent().append(successMessage);
                     } else if (file.error) {
                         var error = $('<div class=\"col-sm-3\">').html($('<span class=\"alert alert-danger\"/>').text(file.error));
@@ -1412,7 +1412,7 @@ 
                 });
             }).on('fileuploadfail', function (e, data) {
                 $.each(data.files, function (index) {
-                    var failedMessage = '" . addslashes(get_lang('UplUploadFailed')) . "';
+                    var failedMessage = '" . addslashes(get_lang('UplUploadFailed'))."';
                     var error = $('<div class=\"col-sm-3\">').html($('<span class=\"alert alert-danger\"/>').text(failedMessage));
                     $(data.context.children()[index]).parent().append(error);
                 });