chamilo / chamilo-lms

main/badge/issued_all.php

Spacing +10 added lines, -10 removed lines

@@ -13,7 +13,7 @@ 
 $skillId = isset($_GET['skill']) ? intval($_GET['skill']) : 0;
 
 if (!$userId || !$skillId) {
-    header('Location: ' . api_get_path(WEB_PATH));
+    header('Location: '.api_get_path(WEB_PATH));
     exit;
 }
 
@@ -31,7 +31,7 @@ 
         Display::return_message(get_lang('NoResults'), 'error')
     );
 
-    header('Location: ' . api_get_path(WEB_PATH));
+    header('Location: '.api_get_path(WEB_PATH));
     exit;
 }
 
@@ -167,7 +167,7 @@ 
         $entityManager->persist($skillIssue);
         $entityManager->flush();
 
-        header("Location: " . $skillIssue->getIssueUrlAll());
+        header("Location: ".$skillIssue->getIssueUrlAll());
         exit;
     }
 
@@ -198,7 +198,7 @@ 
         $entityManager->persist($skillUserComment);
         $entityManager->flush();
 
-        header("Location: " . $skillIssue->getIssueUrlAll());
+        header("Location: ".$skillIssue->getIssueUrlAll());
         exit;
     }
 
@@ -214,11 +214,11 @@ 
             $backpack = $configBackpack;
         }
 
-        $htmlHeadXtra[] = '<script src="' . $backpack . 'issuer.js"></script>';
+        $htmlHeadXtra[] = '<script src="'.$backpack.'issuer.js"></script>';
         $objSkill = new Skill();
         $assertionUrl = $skillIssueInfo['badge_assertion'];
         $skills = $objSkill->get($skillId);
-        $unbakedBadge = api_get_path(SYS_UPLOAD_PATH) . "badges/".$skills['icon'];
+        $unbakedBadge = api_get_path(SYS_UPLOAD_PATH)."badges/".$skills['icon'];
         if (!is_file($unbakedBadge)) {
             $unbakedBadge = api_get_path(WEB_CODE_PATH).'img/icons/128/badges-default.png';
         }
@@ -236,12 +236,12 @@ 
                 mkdir($bakedBadge, api_get_permissions_for_new_directories(), true);
             }
             $skillRelUserId = $skillIssueInfo['id'];
-            if (!file_exists($bakedBadge . "/badge_" . $skillRelUserId)) {
-                file_put_contents($bakedBadge . "/badge_" . $skillRelUserId . ".png", $bakedInfo);
+            if (!file_exists($bakedBadge."/badge_".$skillRelUserId)) {
+                file_put_contents($bakedBadge."/badge_".$skillRelUserId.".png", $bakedInfo);
             }
 
             //Process to validate a baked badge
-            $badgeContent = file_get_contents($bakedBadge . "/badge_" . $skillRelUserId . ".png");
+            $badgeContent = file_get_contents($bakedBadge."/badge_".$skillRelUserId.".png");
             $verifyBakedBadge = $png->extractBadgeInfo($badgeContent);
             if (!is_array($verifyBakedBadge)) {
                 $badgeInfoError = true;
@@ -249,7 +249,7 @@ 
 
             if (!$badgeInfoError) {
                 $personalBadge = UserManager::getUserPathById($userId, "web");
-                $personalBadge = $personalBadge."badges/badge_" . $skillRelUserId . ".png";
+                $personalBadge = $personalBadge."badges/badge_".$skillRelUserId.".png";
             }
         }
     }

src/Chamilo/CoreBundle/Entity/SkillRelUser.php

Spacing +3 added lines, -3 removed lines

@@ -455,7 +455,7 @@ 
      */
     public function getIssueUrl()
     {
-        return api_get_path(WEB_PATH) . "badge/{$this->id}";
+        return api_get_path(WEB_PATH)."badge/{$this->id}";
     }
 
     /**
@@ -464,7 +464,7 @@ 
      */
     public function getIssueUrlAll()
     {
-        return api_get_path(WEB_PATH) . "skill/{$this->skill->getId()}/user/{$this->user->getId()}";
+        return api_get_path(WEB_PATH)."skill/{$this->skill->getId()}/user/{$this->user->getId()}";
     }
 
     /**
@@ -473,7 +473,7 @@ 
      */
     public function getAssertionUrl()
     {
-        $url = api_get_path(WEB_CODE_PATH) . "badge/assertion.php?";
+        $url = api_get_path(WEB_CODE_PATH)."badge/assertion.php?";
 
         $url .= http_build_query(array(
             'user' => $this->user->getId(),

Doc Comments +2 added lines, -2 removed lines

@@ -197,7 +197,7 @@ 
 
     /**
      * Get user
-     * @return \User
+     * @return User
      */
     public function getUser()
     {
@@ -512,7 +512,7 @@ 
 
     /**
      * Calculate the average value from the feedback comments
-     * @return int
+     * @return string
      */
     public function getAverage()
     {

main/document/edit_draw.php

Spacing +6 added lines, -6 removed lines

@@ -37,7 +37,7 @@ 
 $dir = str_replace('\\', '/', $dir);
 
 /* Constants & Variables */
-$current_session_id=api_get_session_id();
+$current_session_id = api_get_session_id();
 $group_id = api_get_group_id();
 
 //path for svg-edit save
@@ -50,8 +50,8 @@ 
 $file = basename($get_file);
 $temp_file = explode(".", $file);
 $filename = $temp_file[0];
-$nameTools = get_lang('EditDocument') . ': ' . $filename;
-$courseDir = $_course['path'] . '/document';
+$nameTools = get_lang('EditDocument').': '.$filename;
+$courseDir = $_course['path'].'/document';
 $is_allowed_to_edit = api_is_allowed_to_edit(null, true);
 
 /*	Other initialization code */
@@ -125,15 +125,15 @@ 
 Display :: display_header($nameTools, 'Doc');
 echo '<div class="actions">';
 echo '<a href="document.php?id='.$parent_id.'">'.
-    Display::return_icon('back.png',get_lang('BackTo').' '.get_lang('DocumentsOverview'),'',ICON_SIZE_MEDIUM).'</a>';
+    Display::return_icon('back.png', get_lang('BackTo').' '.get_lang('DocumentsOverview'), '', ICON_SIZE_MEDIUM).'</a>';
 echo '<a href="edit_document.php?'.api_get_cidreq().'&id='.$document_id.'&origin=editdraw">'.
-    Display::return_icon('edit.png',get_lang('Rename').'/'.get_lang('Comments'),'',ICON_SIZE_MEDIUM).'</a>';
+    Display::return_icon('edit.png', get_lang('Rename').'/'.get_lang('Comments'), '', ICON_SIZE_MEDIUM).'</a>';
 echo '</div>';
 
 if (api_browser_support('svg')) {
 	//automatic loading the course language
 	$svgedit_code_translation_table = array('' => 'en', 'pt' => 'pt-Pt', 'sr' => 'sr_latn');
-	$langsvgedit  = api_get_language_isocode();
+	$langsvgedit = api_get_language_isocode();
 	$langsvgedit = isset($svgedit_code_translation_table[$langsvgedit]) ? $svgedit_code_translation_table[$langsvgedit] : $langsvgedit;
 	$langsvgedit = file_exists(api_get_path(LIBRARY_PATH).'javascript/svgedit/locale/lang.'.$langsvgedit.'.js') ? $langsvgedit : 'en';
 	$svg_url = api_get_path(WEB_LIBRARY_PATH).'javascript/svgedit/svg-editor.php?url=../../../../../courses/'.$courseDir.$dir.$file.'&lang='.$langsvgedit;

Indentation +21 added lines, -21 removed lines

@@ -46,7 +46,7 @@ 
 //path for svg-edit save
 $_SESSION['draw_dir'] = Security::remove_XSS($dir);
 if ($_SESSION['draw_dir'] == '/') {
-	$_SESSION['draw_dir'] = '';
+    $_SESSION['draw_dir'] = '';
 }
 $_SESSION['draw_file'] = basename(Security::remove_XSS($file_path));
 $get_file = Security::remove_XSS($file_path);
@@ -62,26 +62,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 .= '/';
 }
 
 $filepath = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document'.$dir;
 
 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 = '/';
 }
 
 //groups //TODO:clean
@@ -90,8 +90,8 @@ 
         'url' => api_get_path(WEB_CODE_PATH).'group/group_space.php?'.api_get_cidreq(),
         'name' => get_lang('GroupSpace'),
     );
-	$group_document = true;
-	$noPHP_SELF = true;
+    $group_document = true;
+    $noPHP_SELF = true;
 }
 
 $is_certificate_mode = DocumentManager::is_certificate_mode($dir);
@@ -117,10 +117,10 @@ 
 }
 
 $is_allowedToEdit = api_is_allowed_to_edit(null, true) || $groupRights ||
-	DocumentManager::is_my_shared_folder(api_get_user_id(), $dir, $current_session_id);
+    DocumentManager::is_my_shared_folder(api_get_user_id(), $dir, $current_session_id);
 
 if (!$is_allowedToEdit) {
-	api_not_allowed(true);
+    api_not_allowed(true);
 }
 
 Event::event_access_tool(TOOL_DOCUMENT);
@@ -134,13 +134,13 @@ 
 echo '</div>';
 
 if (api_browser_support('svg')) {
-	//automatic loading the course language
-	$svgedit_code_translation_table = array('' => 'en', 'pt' => 'pt-Pt', 'sr' => 'sr_latn');
-	$langsvgedit  = api_get_language_isocode();
-	$langsvgedit = isset($svgedit_code_translation_table[$langsvgedit]) ? $svgedit_code_translation_table[$langsvgedit] : $langsvgedit;
-	$langsvgedit = file_exists(api_get_path(LIBRARY_PATH).'javascript/svgedit/locale/lang.'.$langsvgedit.'.js') ? $langsvgedit : 'en';
-	$svg_url = api_get_path(WEB_LIBRARY_PATH).'javascript/svgedit/svg-editor.php?url=../../../../../courses/'.$courseDir.$dir.$file.'&lang='.$langsvgedit;
-	?>
+    //automatic loading the course language
+    $svgedit_code_translation_table = array('' => 'en', 'pt' => 'pt-Pt', 'sr' => 'sr_latn');
+    $langsvgedit  = api_get_language_isocode();
+    $langsvgedit = isset($svgedit_code_translation_table[$langsvgedit]) ? $svgedit_code_translation_table[$langsvgedit] : $langsvgedit;
+    $langsvgedit = file_exists(api_get_path(LIBRARY_PATH).'javascript/svgedit/locale/lang.'.$langsvgedit.'.js') ? $langsvgedit : 'en';
+    $svg_url = api_get_path(WEB_LIBRARY_PATH).'javascript/svgedit/svg-editor.php?url=../../../../../courses/'.$courseDir.$dir.$file.'&lang='.$langsvgedit;
+    ?>
 	<script>
 	document.write ('<iframe id="frame" frameborder="0" scrolling="no" src="<?php echo  $svg_url; ?>" width="100%" height="100%"><noframes><p>Sorry, your browser does not handle frames</p></noframes></iframe>');
 	function resizeIframe() {
@@ -158,9 +158,9 @@ 
 
     <?php
     echo '<noscript>';
-	echo '<iframe style="height: 550px; width: 100%;" scrolling="no" frameborder="0\' src="'.$svg_url.'"<noframes><p>Sorry, your browser does not handle frames</p></noframes></iframe>';
-	echo '</noscript>';
+    echo '<iframe style="height: 550px; width: 100%;" scrolling="no" frameborder="0\' src="'.$svg_url.'"<noframes><p>Sorry, your browser does not handle frames</p></noframes></iframe>';
+    echo '</noscript>';
 } else {
-	Display::display_error_message(get_lang('BrowserDontSupportsSVG'));
+    Display::display_error_message(get_lang('BrowserDontSupportsSVG'));
 }
 Display::display_footer();

Braces +3 added lines, -2 removed lines

@@ -96,13 +96,14 @@
 
 $is_certificate_mode = DocumentManager::is_certificate_mode($dir);
 
-if (!$is_certificate_mode)
+if (!$is_certificate_mode) {
     $interbreadcrumb[] = array(
         "url" => "./document.php?curdirpath=".urlencode($my_cur_dir_path).'&'.api_get_cidreq(),
         "name" => get_lang('Documents'),
     );
-else
+} else {
     $interbreadcrumb[] = array('url' => '../gradebook/'.$_SESSION['gradebook_dest'], 'name' => get_lang('Gradebook'));
+}
 
 // Interbreadcrumb for the current directory root path
 if (empty($document_data['parents'])) {

main/inc/lib/api.lib.php

Braces +19 added lines, -16 removed lines

@@ -1701,7 +1701,9 @@ 
     }
 
     global $_course;
-    if ($_course == '-1') $_course = array();
+    if ($_course == '-1') {
+        $_course = array();
+    }
     return $_course;
 }
 
@@ -4154,18 +4156,21 @@ 
     switch ($lang_type) {
         case 'platform_lang':
             $temp_lang = api_get_setting('platformLanguage');
-            if (!empty($temp_lang))
-                $return = $temp_lang;
+            if (!empty($temp_lang)) {
+                            $return = $temp_lang;
+            }
             break;
         case 'user_profil_lang':
             $_user = api_get_user_info();
 
-            if (isset($_user['language']) && !empty($_user['language']))
-                $return = $_user['language'];
+            if (isset($_user['language']) && !empty($_user['language'])) {
+                            $return = $_user['language'];
+            }
             break;
         case 'user_selected_lang':
-            if (isset($_SESSION['user_language_choice']) && !empty($_SESSION['user_language_choice']))
-                $return = $_SESSION['user_language_choice'];
+            if (isset($_SESSION['user_language_choice']) && !empty($_SESSION['user_language_choice'])) {
+                            $return = $_SESSION['user_language_choice'];
+            }
             break;
         case 'course_lang':
             global $_course;
@@ -5434,8 +5439,7 @@ 
             $is_courseAdmin = false;
             $is_courseCoach = true;
             $is_sessionAdmin = false;
-        }
-        elseif ($row[0]['session_admin_id'] == $userid) {
+        } elseif ($row[0]['session_admin_id'] == $userid) {
             $is_courseMember = false;
             $is_courseTutor = false;
             $is_courseAdmin = false;
@@ -5778,8 +5782,7 @@ 
     elseif (isset($_ENV['OS'])) {
         // Sometimes $_ENV['OS'] may not be present (bugs?)
         $os = $_ENV['OS'];
-    }
-    elseif (defined('PHP_OS')) {
+    } elseif (defined('PHP_OS')) {
         // PHP_OS means on which OS PHP was compiled, this is why
         // using PHP_OS is the last choice for detection.
         $os = PHP_OS;
@@ -5843,12 +5846,10 @@ 
     if ($delta_width > $delta_height) {
         $result['width'] = ceil($image_width * $resize_factor_height);
         $result['height'] = ceil($image_height * $resize_factor_height);
-    }
-    elseif ($delta_width < $delta_height) {
+    } elseif ($delta_width < $delta_height) {
         $result['width'] = ceil($image_width * $resize_factor_width);
         $result['height'] = ceil($image_height * $resize_factor_width);
-    }
-    else {
+    } else {
         $result['width'] = ceil($target_width);
         $result['height'] = ceil($target_height);
     }
@@ -6629,7 +6630,9 @@ 
         }
         $ip = trim($ip1);
     }
-    if (!empty($debug)) error_log('Real IP: '.$ip);
+    if (!empty($debug)) {
+        error_log('Real IP: '.$ip);
+    }
     return $ip;
 }
 

Indentation +1 added lines, -3 removed lines

@@ -626,7 +626,6 @@ 
  * Also, this function provides conversion between path types, in this case the input path points inside the Chamilo area too.
  *
  * See $_configuration['course_folder'] in the configuration.php to alter the WEB_COURSE_PATH and SYS_COURSE_PATH parameters.
-
  * @param string $path (optional)   A path which type is to be converted. Also, it may be a defined constant for a path.
  * This parameter has meaning when $type parameter has one of the following values: TO_WEB, TO_SYS, TO_REL. Otherwise it is ignored.
  * @return string                   The requested path or the converted path.
@@ -1733,7 +1732,6 @@ 
 
 /**
  * Returns the current course info array.
-
  * Now if the course_code is given, the returned array gives info about that
  * particular course, not specially the current one.
  * @param int $id Numeric ID of the course
@@ -6210,7 +6208,7 @@ 
 function api_get_jquery_ui_js($include_jqgrid = false) {
     $libraries = array();
     if ($include_jqgrid) {
-       $libraries[]='jqgrid';
+        $libraries[]='jqgrid';
     }
     return api_get_jquery_libraries_js($libraries);
 }

Doc Comments +6 added lines, -2 removed lines

@@ -1271,6 +1271,7 @@ 
  * Gets the list of courses a specific user is subscribed to
  * @param int       User ID
  * @param boolean   $fetch_session Whether to get session courses or not - NOT YET IMPLEMENTED
+ * @param integer $userid
  * @return array    Array of courses in the form [0]=>('code'=>xxx,'db'=>xxx,'dir'=>xxx,'status'=>d)
  */
 function api_get_user_courses($userid, $fetch_session = true)
@@ -3016,7 +3017,7 @@ 
 * on the session visibility
 * @param bool $tutor  Whether to check if the user has the tutor role
 * @param bool  $coach Whether to check if the user has the coach role
-* @return boolean true: the user has the rights to edit, false: he does not
+* @return boolean|null true: the user has the rights to edit, false: he does not
 */
 function api_is_allowed_to_session_edit($tutor = false, $coach = false)
 {
@@ -5197,6 +5198,7 @@ 
  * @param string    Whether we want a simple list (display a category) or
  * a grouped list (group by variable as in settings.php default). Values: 'list' or 'group'
  * @param int       Access URL's ID. Optional. Uses 1 by default, which is the unique URL
+ * @param string $cat
  * @return array    Array of database results for the current settings of the current access URL
  */
 function &api_get_settings($cat = null, $ordering = 'list', $access_url = 1, $url_changeable = 0)
@@ -6590,7 +6592,7 @@ 
 /**
  * Returns an array of global configuration settings which should be ignored
  * when printing the configuration settings screens
- * @return array Array of strings, each identifying one of the excluded settings
+ * @return string[] Array of strings, each identifying one of the excluded settings
  */
 function api_get_locked_settings() {
     return array(
@@ -6631,6 +6633,7 @@ 
  * false if he isn't. If the user ID is given and is an integer, then the same
  * ID is simply returned
  * @param  integer User ID
+ * @param integer $user_id
  * @return boolean Integer User ID is logged in, or false otherwise
  */
 function api_user_is_login($user_id = null) {
@@ -7051,6 +7054,7 @@ 
 /**
  * Gets memory limit in bytes
  * @param string The memory size (128M, 1G, 1000K, etc)
+ * @param string $mem
  * @return int
  * @assert (null) === false
  * @assert ('1t')  === 1099511627776

Spacing +136 added lines, -136 removed lines

@@ -41,19 +41,19 @@ 
 define('PLATFORM_ADMIN', 11);
 define('SESSION_COURSE_COACH', 12);
 define('SESSION_GENERAL_COACH', 13);
-define('COURSE_STUDENT', 14);   //student subscribed in a course
-define('SESSION_STUDENT', 15);  //student subscribed in a session course
+define('COURSE_STUDENT', 14); //student subscribed in a course
+define('SESSION_STUDENT', 15); //student subscribed in a session course
 define('COURSE_TUTOR', 16); // student is tutor of a course (NOT in session)
 define('STUDENT_BOSS', 17); // student is boss
 define('INVITEE', 20);
 
 // Table of status
-$_status_list[COURSEMANAGER] = 'teacher';        // 1
-$_status_list[SESSIONADMIN] = 'session_admin';  // 3
-$_status_list[DRH] = 'drh';            // 4
-$_status_list[STUDENT] = 'user';           // 5
-$_status_list[ANONYMOUS] = 'anonymous';      // 6
-$_status_list[INVITEE] = 'invited';        // 20
+$_status_list[COURSEMANAGER] = 'teacher'; // 1
+$_status_list[SESSIONADMIN] = 'session_admin'; // 3
+$_status_list[DRH] = 'drh'; // 4
+$_status_list[STUDENT] = 'user'; // 5
+$_status_list[ANONYMOUS] = 'anonymous'; // 6
+$_status_list[INVITEE] = 'invited'; // 20
 
 // COURSE VISIBILITY CONSTANTS
 /** only visible for course admin */
@@ -267,14 +267,14 @@ 
 define('IS_WINDOWS_OS', api_is_windows_os());
 
 // Checks for installed optional php-extensions.
-define('INTL_INSTALLED', function_exists('intl_get_error_code'));   // intl extension (from PECL), it is installed by default as of PHP 5.3.0
-define('ICONV_INSTALLED', function_exists('iconv'));                // iconv extension, for PHP5 on Windows it is installed by default.
-define('MBSTRING_INSTALLED', function_exists('mb_strlen'));         // mbstring extension.
+define('INTL_INSTALLED', function_exists('intl_get_error_code')); // intl extension (from PECL), it is installed by default as of PHP 5.3.0
+define('ICONV_INSTALLED', function_exists('iconv')); // iconv extension, for PHP5 on Windows it is installed by default.
+define('MBSTRING_INSTALLED', function_exists('mb_strlen')); // mbstring extension.
 
 // Patterns for processing paths.                                   // Examples:
-define('REPEATED_SLASHES_PURIFIER', '/\/{2,}/');                    // $path = preg_replace(REPEATED_SLASHES_PURIFIER, '/', $path);
-define('VALID_WEB_PATH', '/https?:\/\/[^\/]*(\/.*)?/i');            // $is_valid_path = preg_match(VALID_WEB_PATH, $path);
-define('VALID_WEB_SERVER_BASE', '/https?:\/\/[^\/]*/i');            // $new_path = preg_replace(VALID_WEB_SERVER_BASE, $new_base, $path);
+define('REPEATED_SLASHES_PURIFIER', '/\/{2,}/'); // $path = preg_replace(REPEATED_SLASHES_PURIFIER, '/', $path);
+define('VALID_WEB_PATH', '/https?:\/\/[^\/]*(\/.*)?/i'); // $is_valid_path = preg_match(VALID_WEB_PATH, $path);
+define('VALID_WEB_SERVER_BASE', '/https?:\/\/[^\/]*/i'); // $new_path = preg_replace(VALID_WEB_SERVER_BASE, $new_base, $path);
 
 // Constants for api_get_path() and api_get_path_type(), etc. - registered path types.
 // basic (leaf elements)
@@ -363,19 +363,19 @@ 
 define('LINK_HOTPOTATOES', 9);
 
 // Score display types constants
-define('SCORE_DIV', 1);    // X / Y
-define('SCORE_PERCENT', 2);    // XX %
-define('SCORE_DIV_PERCENT', 3);    // X / Y (XX %)
-define('SCORE_AVERAGE', 4);    // XX %
-define('SCORE_DECIMAL', 5);    // 0.50  (X/Y)
-define('SCORE_BAR', 6);    // Uses the Display::bar_progress function
-define('SCORE_SIMPLE', 7);    // X
-define('SCORE_IGNORE_SPLIT', 8);    //  ??
-define('SCORE_DIV_PERCENT_WITH_CUSTOM', 9);    // X / Y (XX %) - Good!
-define('SCORE_CUSTOM', 10);    // Good!
-define('SCORE_DIV_SIMPLE_WITH_CUSTOM', 11);    // X - Good!
-define('SCORE_DIV_SIMPLE_WITH_CUSTOM_LETTERS', 12);    // X - Good!
-define('SCORE_ONLY_SCORE', 13);    // X - Good!
+define('SCORE_DIV', 1); // X / Y
+define('SCORE_PERCENT', 2); // XX %
+define('SCORE_DIV_PERCENT', 3); // X / Y (XX %)
+define('SCORE_AVERAGE', 4); // XX %
+define('SCORE_DECIMAL', 5); // 0.50  (X/Y)
+define('SCORE_BAR', 6); // Uses the Display::bar_progress function
+define('SCORE_SIMPLE', 7); // X
+define('SCORE_IGNORE_SPLIT', 8); //  ??
+define('SCORE_DIV_PERCENT_WITH_CUSTOM', 9); // X / Y (XX %) - Good!
+define('SCORE_CUSTOM', 10); // Good!
+define('SCORE_DIV_SIMPLE_WITH_CUSTOM', 11); // X - Good!
+define('SCORE_DIV_SIMPLE_WITH_CUSTOM_LETTERS', 12); // X - Good!
+define('SCORE_ONLY_SCORE', 13); // X - Good!
 
 define('SCORE_BOTH', 1);
 define('SCORE_ONLY_DEFAULT', 2);
@@ -558,7 +558,7 @@ 
 define('TIMELINE_STATUS_INACTIVE', '2');
 
 // Event email template class
-define('EVENT_EMAIL_TEMPLATE_ACTIVE',  1);
+define('EVENT_EMAIL_TEMPLATE_ACTIVE', 1);
 define('EVENT_EMAIL_TEMPLATE_INACTIVE', 0);
 
 // Course home
@@ -574,8 +574,8 @@ 
 define('FILE_OVERWRITE', 3);
 define('UTF8_CONVERT', false); //false by default
 
-define('DOCUMENT','file');
-define('FOLDER','folder');
+define('DOCUMENT', 'file');
+define('FOLDER', 'folder');
 
 define('RESOURCE_ASSET', 'asset');
 define('RESOURCE_DOCUMENT', 'document');
@@ -670,7 +670,7 @@ 
 
     $emptyConfigurationParam = false;
     if (empty($configuration)) {
-        $configuration = (array)$_configuration;
+        $configuration = (array) $_configuration;
         $emptyConfigurationParam = true;
     }
 
@@ -702,10 +702,10 @@ 
                         && (($server_protocol == 'http'
                                 && $_SERVER['SERVER_PORT'] != 80) || ($server_protocol == 'https' && $_SERVER['SERVER_PORT'] != 443))
                     ) {
-                        $server_name .= ":" . $_SERVER['SERVER_PORT'];
+                        $server_name .= ":".$_SERVER['SERVER_PORT'];
                     }
-                    $root_web = $server_protocol . '://' . $server_name . $root_rel;
-                    $root_sys = str_replace('\\', '/', realpath(__DIR__ . '/../../../')) . '/';
+                    $root_web = $server_protocol.'://'.$server_name.$root_rel;
+                    $root_sys = str_replace('\\', '/', realpath(__DIR__.'/../../../')).'/';
                 }
                 // Here we give up, so we don't touch anything.
             }
@@ -892,7 +892,7 @@ 
                 $sys_course_code =
                     isset($_SESSION['_course']['sysCode'])  // User is inside a course?
                         ? $_SESSION['_course']['sysCode']   // Yes, then use course's directory name.
-                        : '{SYS_COURSE_CODE}';              // No, then use a fake code, it may be processed later.
+                        : '{SYS_COURSE_CODE}'; // No, then use a fake code, it may be processed later.
                 $path = $matches[1].'courses/'.$sys_course_code.'/document/'.str_replace('//', '/', $matches[3].'/'.$matches[2]);
             }
         }
@@ -917,15 +917,15 @@ 
 {
     global $_configuration;
     $web_root = api_get_path(WEB_PATH);
-    $ext = substr($web_path,strrpos($web_path,'.'));
+    $ext = substr($web_path, strrpos($web_path, '.'));
     if (isset($ext[2])) { // faster version of strlen to check if len>2
         // Check for CDN definitions
         if (!empty($_configuration['cdn_enable']) && !empty($ext)) {
             foreach ($_configuration['cdn'] as $host => $exts) {
-                if (in_array($ext,$exts)) {
+                if (in_array($ext, $exts)) {
                     //Use host as defined in $_configuration['cdn'], without
                     // trailing slash
-                    return str_replace($web_root,$host.'/',$web_path);
+                    return str_replace($web_root, $host.'/', $web_path);
                 }
             }
         }
@@ -1372,10 +1372,10 @@ 
 
     if (isset($user['email'])) {
         $result['mail'] = isset($user['email']) ? $user['email'] : null;
-        $result['email'] = isset($user['email'])? $user['email'] : null;
+        $result['email'] = isset($user['email']) ? $user['email'] : null;
     } else {
         $result['mail'] = isset($user['mail']) ? $user['mail'] : null;
-        $result['email'] = isset($user['mail'])? $user['mail'] : null;
+        $result['email'] = isset($user['mail']) ? $user['mail'] : null;
     }
     $user_id = intval($user['user_id']);
     // Maintain the user_id index for backwards compatibility
@@ -1927,7 +1927,7 @@ 
         foreach ($param_list1 as $key => $enreg) {
             list ($param_list1_keys[$key], $param_list1_vals[$key]) = explode('=', $enreg);
         }
-        $param_list1 = array ('keys' => $param_list1_keys, 'vals' => $param_list1_vals);
+        $param_list1 = array('keys' => $param_list1_keys, 'vals' => $param_list1_vals);
         foreach ($param_list2 as $enreg) {
             $enreg = explode('=', $enreg);
             $key = array_search($enreg[0], $param_list1['keys']);
@@ -1960,12 +1960,12 @@ 
         $length = 2;
     }
     $password = '';
-    for ($i = 0; $i < $length; $i ++) {
+    for ($i = 0; $i < $length; $i++) {
         $password .= $characters[rand() % strlen($characters)];
     }
 
     // At least 2 digits
-    for ($i = 0; $i < 2; $i ++) {
+    for ($i = 0; $i < 2; $i++) {
         $password .= $numbers[rand() % strlen($numbers)];
     }
 
@@ -1993,10 +1993,10 @@ 
     $digits = 0;
     $consequent_characters = 0;
     $previous_character_code = 0;
-    for ($i = 0; $i < $password_length; $i ++) {
+    for ($i = 0; $i < $password_length; $i++) {
         $current_character_code = api_ord(api_substr($password, $i, 1));
         if ($i && abs($current_character_code - $previous_character_code) <= 1) {
-            $consequent_characters ++;
+            $consequent_characters++;
             if ($consequent_characters == 3) {
                 return false;
             }
@@ -2004,9 +2004,9 @@ 
             $consequent_characters = 1;
         }
         if ($current_character_code >= 97 && $current_character_code <= 122) {
-            $letters ++;
+            $letters++;
         } elseif ($current_character_code >= 48 && $current_character_code <= 57) {
-            $digits ++;
+            $digits++;
         } else {
             return false;
         }
@@ -2111,7 +2111,7 @@ 
         if (empty($session_id)) { return null; }
     }
     $t = Database::get_main_table(TABLE_MAIN_SESSION);
-    $s = "SELECT name FROM $t WHERE id = ".(int)$session_id;
+    $s = "SELECT name FROM $t WHERE id = ".(int) $session_id;
     $r = Database::query($s);
     $c = Database::num_rows($r);
     if ($c > 0) {
@@ -2281,9 +2281,9 @@ 
  */
 function api_get_session_image($session_id, $status_id)
 {
-    $session_id = (int)$session_id;
+    $session_id = (int) $session_id;
     $session_img = '';
-    if ((int)$status_id != 5) { //check whether is not a student
+    if ((int) $status_id != 5) { //check whether is not a student
         if ($session_id > 0) {
             $session_img = "&nbsp;&nbsp;".Display::return_icon(
                 'star.png',
@@ -2560,7 +2560,7 @@ 
 function api_is_course_session_coach($user_id, $courseId, $session_id)
 {
     $session_table = Database::get_main_table(TABLE_MAIN_SESSION);
-    $session_rel_course_rel_user_table  = Database::get_main_table(TABLE_MAIN_SESSION_COURSE_USER);
+    $session_rel_course_rel_user_table = Database::get_main_table(TABLE_MAIN_SESSION_COURSE_USER);
 
     $user_id = intval($user_id);
     $session_id = intval($session_id);
@@ -2634,7 +2634,7 @@ 
                 ORDER BY access_start_date, access_end_date, name";
         $result = Database::query($sql);
         if (!empty($sessionIsCoach)) {
-            $sessionIsCoach = array_merge($sessionIsCoach , Database::store_result($result));
+            $sessionIsCoach = array_merge($sessionIsCoach, Database::store_result($result));
         } else {
             $sessionIsCoach = Database::store_result($result);
         }
@@ -2808,7 +2808,7 @@ 
             return '';
         }
         $sourceurl = substr($_SERVER['REQUEST_URI'], 0, strpos($_SERVER['REQUEST_URI'], '?'));
-        $sourceurl = str_replace('lp/lp_header.php', 'lp/lp_controller.php?'.api_get_cidreq().'&action=view&lp_id='.intval($_GET['lp_id']).'&isStudentView='.($_SESSION['studentview']=='studentview' ? 'false' : 'true'), $sourceurl);
+        $sourceurl = str_replace('lp/lp_header.php', 'lp/lp_controller.php?'.api_get_cidreq().'&action=view&lp_id='.intval($_GET['lp_id']).'&isStudentView='.($_SESSION['studentview'] == 'studentview' ? 'false' : 'true'), $sourceurl);
         //showinframes doesn't handle student view anyway...
         //return '';
         $is_framed = true;
@@ -3292,7 +3292,7 @@ 
         }
         $content .= '<div class="well">';
         $content .= $form->returnForm();
-        $content .='</div>';
+        $content .= '</div>';
         if (api_is_cas_activated()) {
             $content .= "</div>";
         }
@@ -3344,7 +3344,7 @@ 
         }
         $msg .= '<div class="well">';
         $msg .= $form->returnForm();
-        $msg .='</div>';
+        $msg .= '</div>';
         if ($casEnabled) {
             $msg .= "</div>";
         }
@@ -3374,7 +3374,7 @@ 
     list ($last_post_date, $last_post_time) = explode(' ', $last_post_datetime);
     list ($year, $month, $day) = explode('-', $last_post_date);
     list ($hour, $min, $sec) = explode(':', $last_post_time);
-    return mktime((int)$hour, (int)$min, (int)$sec, (int)$month, (int)$day, (int)$year);
+    return mktime((int) $hour, (int) $min, (int) $sec, (int) $month, (int) $day, (int) $year);
 }
 
 /**
@@ -3846,7 +3846,7 @@ 
                 c_id = $course_id AND
                 tool = '$tool'
                 $session_condition ";
-    $rs  = Database::query($sql);
+    $rs = Database::query($sql);
     $list = array();
     if (Database::num_rows($rs) > 0) {
         while ($row = Database::fetch_array($rs, 'ASSOC')) {
@@ -3927,7 +3927,7 @@ 
                 tool = '$tool' AND
                 ref = $ref
                 $sessionCondition";
-    $rs  = Database::query($sql);
+    $rs = Database::query($sql);
     $item_property_id = '';
     if (Database::num_rows($rs) > 0) {
         $row = Database::fetch_array($rs);
@@ -3988,7 +3988,7 @@ 
     if ($result == false) {
         $result = array();
     } else {
-        $result = Database::store_result($result,'ASSOC');
+        $result = Database::store_result($result, 'ASSOC');
     }
 
     return $result;
@@ -4040,7 +4040,7 @@ 
     $rs  = Database::query($sql);
     $row = array();
     if (Database::num_rows($rs) > 0) {
-        $row = Database::fetch_array($rs,'ASSOC');
+        $row = Database::fetch_array($rs, 'ASSOC');
     }
 
     return $row;
@@ -4075,7 +4075,7 @@ 
     $languages  = $language_list['name'];
     $folder     = $language_list['folder'];
 
-    $ret .= '<select name="' . $name . '" id="language_chosen" class="selectpicker show-tick form-control">';
+    $ret .= '<select name="'.$name.'" id="language_chosen" class="selectpicker show-tick form-control">';
     foreach ($languages as $key => $value) {
         if ($folder[$key] == $default) {
             $selected = ' selected="selected"';
@@ -4125,8 +4125,8 @@ 
     }
     </script>';
     $html .= '<form id="lang_form" name="lang_form" method="post" action="'.api_get_self().'">';
-    $html .= '<label style="display: none;" for="language_list">' . get_lang('Language') . '</label>';
-    $html .=  '<select id="language_list" class="selectpicker show-tick form-control" name="language_list" >';
+    $html .= '<label style="display: none;" for="language_list">'.get_lang('Language').'</label>';
+    $html .= '<select id="language_list" class="selectpicker show-tick form-control" name="language_list" >';
 
     foreach ($original_languages as $key => $value) {
         if ($folder[$key] == $user_selected_language) {
@@ -4134,13 +4134,13 @@ 
         } else {
             $option_end = '>';
         }
-        $html .=  '<option value="'.api_get_self().'?language='.$folder[$key].'"'.$option_end;
+        $html .= '<option value="'.api_get_self().'?language='.$folder[$key].'"'.$option_end;
         //echo substr($value, 0, 16); // Cut string to keep 800x600 aspect.
-        $html .=  $value.'</option>';
+        $html .= $value.'</option>';
     }
-    $html .=  '</select>';
-    $html .=  '<noscript><input type="submit" name="user_select_language" value="'.get_lang('Ok').'" /></noscript>';
-    $html .=  '</form>';
+    $html .= '</select>';
+    $html .= '<noscript><input type="submit" name="user_select_language" value="'.get_lang('Ok').'" /></noscript>';
+    $html .= '</form>';
     return $html;
 }
 
@@ -4358,7 +4358,7 @@ 
  * Note: Directory names (names of themes) in the file system should contain ASCII-characters only.
  */
 function api_get_themes() {
-    $cssdir = api_get_path(SYS_CSS_PATH) . 'themes/';
+    $cssdir = api_get_path(SYS_CSS_PATH).'themes/';
     $list_dir = array();
     $list_name = array();
 
@@ -4519,7 +4519,7 @@ 
     if (is_file($dirname) || is_link($dirname)) {
         $res = unlink($dirname);
         if ($res === false) {
-            error_log(__FILE__.' line '.__LINE__.': '.((bool)ini_get('track_errors') ? $php_errormsg : 'Error not recorded because track_errors is off in your php.ini'), 0);
+            error_log(__FILE__.' line '.__LINE__.': '.((bool) ini_get('track_errors') ? $php_errormsg : 'Error not recorded because track_errors is off in your php.ini'), 0);
         }
         return $res;
     }
@@ -4556,7 +4556,7 @@ 
     if ($delete_only_content_in_folder == false) {
         $res = rmdir($dirname);
         if ($res === false) {
-            error_log(__FILE__.' line '.__LINE__.': '.((bool)ini_get('track_errors') ? $php_errormsg : 'error not recorded because track_errors is off in your php.ini'), 0);
+            error_log(__FILE__.' line '.__LINE__.': '.((bool) ini_get('track_errors') ? $php_errormsg : 'error not recorded because track_errors is off in your php.ini'), 0);
         }
     }
     return $res;
@@ -4641,7 +4641,7 @@ 
 
     $course_id = $course_info['real_id'];
 
-    $folders = explode(DIRECTORY_SEPARATOR,str_replace($base_path_document.DIRECTORY_SEPARATOR,'',$pathname));
+    $folders = explode(DIRECTORY_SEPARATOR, str_replace($base_path_document.DIRECTORY_SEPARATOR, '', $pathname));
 
     $new_pathname = $base_path_document;
     $path = '';
@@ -4659,7 +4659,7 @@ 
                         path = '$path' AND
                         filetype = 'folder' AND
                         session_id = '$session_id'";
-            $rs1  = Database::query($sql);
+            $rs1 = Database::query($sql);
             $num_rows = Database::num_rows($rs1);
 
             if ($num_rows == 0) {
@@ -4819,7 +4819,7 @@ 
             foreach (array('key', 'value1', 'value2', 'value3') as $var) {
                 $$var = isset($match[++$i]) ? $match[$i] : '';
             }
-            $value = stripslashes(substr($value1, 1, -1)) . stripslashes(substr($value2, 1, -1)) . $value3;
+            $value = stripslashes(substr($value1, 1, -1)).stripslashes(substr($value2, 1, -1)).$value3;
 
             // Parse array syntax.
             $keys = preg_split('/\]?\[/', rtrim($key, ']'));
@@ -4985,7 +4985,7 @@ 
     $t_settings = Database::get_main_table(TABLE_MAIN_SETTINGS_CURRENT);
     $var = Database::escape_string($var);
     $value = Database::escape_string($value);
-    $access_url = (int)$access_url;
+    $access_url = (int) $access_url;
     if (empty($access_url)) { $access_url = 1; }
     $select = "SELECT id FROM $t_settings WHERE variable = '$var' ";
     if (!empty($subvar)) {
@@ -5026,11 +5026,11 @@ 
                 $row = Database::fetch_array($res);
                 $insert = "INSERT INTO $t_settings (variable, subkey, type,category, selected_value, title, comment, scope, subkeytext, access_url)
                         VALUES
-                        ('".$row['variable']."',".(!empty($row['subkey']) ? "'".$row['subkey']."'" : "NULL")."," .
-                        "'".$row['type']."','".$row['category']."'," .
-                        "'$value','".$row['title']."'," .
-                        "".(!empty($row['comment']) ? "'".$row['comment']."'" : "NULL").",".(!empty($row['scope']) ? "'".$row['scope']."'" : "NULL")."," .
-                        "".(!empty($row['subkeytext'])?"'".$row['subkeytext']."'":"NULL").",$access_url)";
+                        ('".$row['variable']."',".(!empty($row['subkey']) ? "'".$row['subkey']."'" : "NULL").",".
+                        "'".$row['type']."','".$row['category']."',".
+                        "'$value','".$row['title']."',".
+                        "".(!empty($row['comment']) ? "'".$row['comment']."'" : "NULL").",".(!empty($row['scope']) ? "'".$row['scope']."'" : "NULL").",".
+                        "".(!empty($row['subkeytext']) ? "'".$row['subkeytext']."'" : "NULL").",$access_url)";
                 Database::query($insert);
             } else {
                 // Such a setting does not exist.
@@ -5052,11 +5052,11 @@ 
                 if ($row['access_url_changeable'] == 1) {
                     $insert = "INSERT INTO $t_settings (variable,subkey, type,category, selected_value,title, comment,scope, subkeytext,access_url, access_url_changeable) VALUES
                             ('".$row['variable']."',".
-                            (!empty($row['subkey']) ? "'".$row['subkey']."'" : "NULL")."," .
-                            "'".$row['type']."','".$row['category']."'," .
-                            "'$value','".$row['title']."'," .
+                            (!empty($row['subkey']) ? "'".$row['subkey']."'" : "NULL").",".
+                            "'".$row['type']."','".$row['category']."',".
+                            "'$value','".$row['title']."',".
                             "".(!empty($row['comment']) ? "'".$row['comment']."'" : "NULL").",".
-                            (!empty($row['scope']) ? "'".$row['scope']."'" : "NULL")."," .
+                            (!empty($row['scope']) ? "'".$row['scope']."'" : "NULL").",".
                             "".(!empty($row['subkeytext']) ? "'".$row['subkeytext']."'" : "NULL").",$access_url,".$row['access_url_changeable'].")";
                     Database::query($insert);
                 }
@@ -5089,10 +5089,10 @@ 
         $value = Database::escape_string($value);
         $sql = "UPDATE $t_s SET selected_value = '$value'
                 WHERE category = '$category' AND access_url = $access_url";
-        if (is_array($fieldtype) && count($fieldtype)>0) {
+        if (is_array($fieldtype) && count($fieldtype) > 0) {
             $sql .= " AND ( ";
             $i = 0;
-            foreach ($fieldtype as $type){
+            foreach ($fieldtype as $type) {
                 if ($i > 0) {
                     $sql .= ' OR ';
                 }
@@ -5107,10 +5107,10 @@ 
     } else {
         $sql = "UPDATE $t_s SET selected_value = NULL
                 WHERE category = '$category' AND access_url = $access_url";
-        if (is_array($fieldtype) && count($fieldtype)>0) {
+        if (is_array($fieldtype) && count($fieldtype) > 0) {
             $sql .= " AND ( ";
             $i = 0;
-            foreach ($fieldtype as $type){
+            foreach ($fieldtype as $type) {
                 if ($i > 0) {
                     $sql .= ' OR ';
                 }
@@ -5223,7 +5223,7 @@ 
         $sql .= " ORDER BY 1,2 ASC";
     }
     $result = Database::query($sql);
-    $result = Database::store_result($result,'ASSOC');
+    $result = Database::store_result($result, 'ASSOC');
 
     return $result;
 }
@@ -5290,12 +5290,12 @@ 
 
     // Item not found for this access_url, we have to check if the whole thing is missing
     // (in which case we ignore the insert) or if there *is* a record but just for access_url = 1
-    $insert = "INSERT INTO $t_settings " .
-                "(variable,selected_value," .
-                "type,category," .
-                "subkey,title," .
-                "comment,scope," .
-                "subkeytext,access_url,access_url_changeable)" .
+    $insert = "INSERT INTO $t_settings ".
+                "(variable,selected_value,".
+                "type,category,".
+                "subkey,title,".
+                "comment,scope,".
+                "subkeytext,access_url,access_url_changeable)".
                 " VALUES ('$var','$val',";
     if (isset($type)) {
         $type = Database::escape_string($type);
@@ -5461,7 +5461,7 @@ 
             $result = Database::query($sql);
 
             //if ($row = Database::fetch_array($result)) {
-            if (Database::num_rows($result) > 0 ) {
+            if (Database::num_rows($result) > 0) {
                 $is_courseMember = true;
                 $is_courseTutor = true;
                 $is_courseCoach = true;
@@ -5751,7 +5751,7 @@ 
     } else {
         return false;
     }
-    return strtolower(substr((string)$os, 0, 3 )) == 'win';
+    return strtolower(substr((string) $os, 0, 3)) == 'win';
 }
 
 /**
@@ -6342,7 +6342,7 @@ 
 function api_get_jquery_ui_js($include_jqgrid = false) {
     $libraries = array();
     if ($include_jqgrid) {
-       $libraries[]='jqgrid';
+       $libraries[] = 'jqgrid';
     }
     return api_get_jquery_libraries_js($libraries);
 }
@@ -6365,12 +6365,12 @@ 
 
     //jqgrid js and css
     if (in_array('jqgrid', $libraries)) {
-        $languaje   = 'en';
+        $languaje = 'en';
         $platform_isocode = strtolower(api_get_language_isocode());
 
         //languages supported by jqgrid see files in main/inc/lib/javascript/jqgrid/js/i18n
         $jqgrid_langs = array(
-            'bg', 'bg1251', 'cat','cn','cs','da','de','el','en','es','fa','fi','fr','gl','he','hu','is','it','ja','nl','no','pl','pt-br','pt','ro','ru','sk','sr','sv','tr','ua'
+            'bg', 'bg1251', 'cat', 'cn', 'cs', 'da', 'de', 'el', 'en', 'es', 'fa', 'fi', 'fr', 'gl', 'he', 'hu', 'is', 'it', 'ja', 'nl', 'no', 'pl', 'pt-br', 'pt', 'ro', 'ru', 'sk', 'sr', 'sv', 'tr', 'ua'
         );
 
         if (in_array($platform_isocode, $jqgrid_langs)) {
@@ -6401,7 +6401,7 @@ 
 
     // jquery datepicker
     if (in_array('datepicker', $libraries)) {
-        $languaje   = 'en-GB';
+        $languaje = 'en-GB';
         $platform_isocode = strtolower(api_get_language_isocode());
 
         // languages supported by jqgrid see files in main/inc/lib/javascript/jqgrid/js/i18n
@@ -6567,7 +6567,7 @@ 
  * @return void
  */
 function api_check_php_version($my_inc_path = null) {
-    if (!function_exists('version_compare') || version_compare( phpversion(), REQUIRED_PHP_VERSION, '<')) {
+    if (!function_exists('version_compare') || version_compare(phpversion(), REQUIRED_PHP_VERSION, '<')) {
         $global_error_code = 1;
         // Incorrect PHP version
         $global_page = $my_inc_path.'global_error_message.inc.php';
@@ -6583,7 +6583,7 @@ 
  */
 function api_check_archive_dir() {
     if (is_dir(api_get_path(SYS_ARCHIVE_PATH)) && !is_writable(api_get_path(SYS_ARCHIVE_PATH))) {
-        $message = Display::return_message(get_lang('ArchivesDirectoryNotWriteableContactAdmin'),'warning');
+        $message = Display::return_message(get_lang('ArchivesDirectoryNotWriteableContactAdmin'), 'warning');
         api_not_allowed(true, $message);
     }
 }
@@ -6646,7 +6646,7 @@ 
  * @author Jorge Frisancho Jibaja <jrfdeft@gmail.com>, USIL - Some changes to allow the use of real IP using reverse proxy
  * @version CEV CHANGE 24APR2012
  */
-function api_get_real_ip(){
+function api_get_real_ip() {
     // Guess the IP if behind a reverse proxy
     global $debug;
     $ip = trim($_SERVER['REMOTE_ADDR']);
@@ -6672,23 +6672,23 @@ 
  * @author Yannick Warnier for improvements and managment of multiple ranges
  * @todo check for IPv6 support
  */
-function api_check_ip_in_range($ip,$range)
+function api_check_ip_in_range($ip, $range)
 {
     if (empty($ip) or empty($range)) {
         return false;
     }
-    $ip_ip = ip2long ($ip);
+    $ip_ip = ip2long($ip);
     // divide range param into array of elements
-    if (strpos($range,',')!==false) {
-        $ranges = explode(',',$range);
+    if (strpos($range, ',') !== false) {
+        $ranges = explode(',', $range);
     } else {
         $ranges = array($range);
     }
     foreach ($ranges as $range) {
         $range = trim($range);
         if (empty($range)) { continue; }
-        if (strpos($range,'/')===false) {
-            if (strcmp($ip,$range)===0) {
+        if (strpos($range, '/') === false) {
+            if (strcmp($ip, $range) === 0) {
                 return true; // there is a direct IP match, return OK
             }
             continue; //otherwise, get to the next range
@@ -6696,7 +6696,7 @@ 
         // the range contains a "/", so analyse completely
         list ($net, $mask) = explode("/", $range);
 
-        $ip_net = ip2long ($net);
+        $ip_net = ip2long($net);
         // mask binary magic
         $ip_mask = ~((1 << (32 - $mask)) - 1);
 
@@ -7034,14 +7034,14 @@ 
  * @assert (0) === true
  * @assert ('1G') === true
  */
-function api_set_memory_limit($mem){
+function api_set_memory_limit($mem) {
     //if ini_set() not available, this function is useless
     if (!function_exists('ini_set') || is_null($mem) || $mem == -1) {
         return false;
     }
 
     $memory_limit = ini_get('memory_limit');
-    if (api_get_bytes_memory_limit($mem) > api_get_bytes_memory_limit($memory_limit)){
+    if (api_get_bytes_memory_limit($mem) > api_get_bytes_memory_limit($memory_limit)) {
         ini_set('memory_limit', $mem);
         return true;
     }
@@ -7058,21 +7058,21 @@ 
  * @assert ('1m')  === 1048576
  * @assert ('100k') === 102400
  */
-function api_get_bytes_memory_limit($mem){
-    $size = strtolower(substr($mem,-1));
+function api_get_bytes_memory_limit($mem) {
+    $size = strtolower(substr($mem, -1));
 
     switch ($size) {
         case 't':
-            $mem = intval(substr($mem,-1))*1024*1024*1024*1024;
+            $mem = intval(substr($mem, -1)) * 1024 * 1024 * 1024 * 1024;
             break;
         case 'g':
-            $mem = intval(substr($mem,0,-1))*1024*1024*1024;
+            $mem = intval(substr($mem, 0, -1)) * 1024 * 1024 * 1024;
             break;
         case 'm':
-            $mem = intval(substr($mem,0,-1))*1024*1024;
+            $mem = intval(substr($mem, 0, -1)) * 1024 * 1024;
             break;
         case 'k':
-            $mem = intval(substr($mem,0,-1))*1024;
+            $mem = intval(substr($mem, 0, -1)) * 1024;
             break;
         default:
             // we assume it's integer only
@@ -7135,7 +7135,7 @@ 
     ];
 
     $js = api_get_asset('pwstrength-bootstrap/dist/pwstrength-bootstrap.min.js');
-    $js .=  "<script>    
+    $js .= "<script>    
     var errorMessages = {
         password_to_short : \"" . get_lang('PasswordIsTooShort')."\",
         same_as_username : \"".get_lang('YourPasswordCannotBeTheSameAsYourUsername')."\"
@@ -7182,7 +7182,7 @@ 
         return false;
     }
     $minutesToBlock = api_get_setting('captcha_time_to_block');
-    $time = time() + $minutesToBlock*60;
+    $time = time() + $minutesToBlock * 60;
     UserManager::update_extra_field_value(
         $userInfo['user_id'],
         'captcha_blocked_until_date',
@@ -7256,7 +7256,7 @@ 
         $out_res = str_replace('"', "''", $out_res);
     }
     // avoid text stuck together when tags are removed, adding a space after >
-    $out_res = str_replace (">", "> ", $out_res);
+    $out_res = str_replace(">", "> ", $out_res);
     $out_res = strip_tags($out_res);
 
     return $out_res;
@@ -7465,7 +7465,7 @@ 
         $body = get_lang('PortalName').': '.api_get_path(WEB_PATH)." \n ";
         $body .= get_lang('PortalLimitType').': '.$limitName." \n ";
         if (isset($hostingParams[$limitName])) {
-            $body .= get_lang('Value') . ': ' . $hostingParams[$limitName];
+            $body .= get_lang('Value').': '.$hostingParams[$limitName];
         }
         api_mail_html(null, $email, $subject, $body);
     }
@@ -7597,7 +7597,7 @@ 
  */
 function api_set_site_use_cookie_warning_cookie()
 {
-    setcookie('ChamiloUsesCookies', 'ok', time()+31556926);
+    setcookie('ChamiloUsesCookies', 'ok', time() + 31556926);
 }
 
 /**
@@ -7651,10 +7651,10 @@ 
         return false;
     }
 
-    $fullPath = $parentDirectory . api_replace_dangerous_char($name);
+    $fullPath = $parentDirectory.api_replace_dangerous_char($name);
 
     if (mkdir($fullPath, api_get_permissions_for_new_directories(), true)) {
-        $fp = fopen($fullPath . '/index.html', 'w');
+        $fp = fopen($fullPath.'/index.html', 'w');
 
         if ($fp) {
             if (fwrite($fp, '<html><head></head><body></body></html>')) {
@@ -7719,7 +7719,7 @@ 
             $mail->SMTPSecure = $platform_email['SMTP_SECURE'];
         }
     }
-    $mail->SMTPDebug = isset($platform_email['SMTP_DEBUG'])?$platform_email['SMTP_DEBUG']:0;
+    $mail->SMTPDebug = isset($platform_email['SMTP_DEBUG']) ? $platform_email['SMTP_DEBUG'] : 0;
 
     // 5 = low, 1 = high
     $mail->Priority = 3;
@@ -7869,11 +7869,11 @@ 
         error_log('ERROR: mail not sent to '.$recipient_name.' ('.$recipient_email.') because of '.$mail->ErrorInfo.'<br />');
         if ($mail->SMTPDebug) {
             error_log(
-                "Connection details :: " .
-                "Protocol: " . $mail->Mailer . ' :: ' .
-                "Host/Port: " . $mail->Host . ':' . $mail->Port . ' :: ' .
-                "Authent/Open: " . ($mail->SMTPAuth?'Authent':'Open') . ' :: ' .
-                ($mail->SMTPAuth?"  User/Pass: " . $mail->Username . ':' . $mail->Password:'')
+                "Connection details :: ".
+                "Protocol: ".$mail->Mailer.' :: '.
+                "Host/Port: ".$mail->Host.':'.$mail->Port.' :: '.
+                "Authent/Open: ".($mail->SMTPAuth ? 'Authent' : 'Open').' :: '.
+                ($mail->SMTPAuth ? "  User/Pass: ".$mail->Username.':'.$mail->Password : '')
             );
         }
         return 0;
@@ -7949,13 +7949,13 @@ 
  * @return array
  *
  */
-function api_unique_multidim_array($array, $key){
+function api_unique_multidim_array($array, $key) {
     $temp_array = [];
     $i = 0;
     $key_array = [];
 
-    foreach($array as $val){
-        if(!in_array($val[$key],$key_array)){
+    foreach ($array as $val) {
+        if (!in_array($val[$key], $key_array)) {
             $key_array[$i] = $val[$key];
             $temp_array[$i] = $val;
         }
@@ -7999,7 +7999,7 @@ 
         // No "dangerous" files
         $name = disable_dangerous_file($name);
 
-        $pathId = '/'.substr((string)$itemId, 0, 1).'/'.$itemId.'/';
+        $pathId = '/'.substr((string) $itemId, 0, 1).'/'.$itemId.'/';
         $path = api_get_path(SYS_UPLOAD_PATH).$type.$pathId;
 
         if (!is_dir($path)) {

main/dropbox/dropbox_class.inc.php

Doc Comments +1 added lines, -1 removed lines

@@ -267,7 +267,7 @@
 	 * @param string $author
 	 * @param string $filename
 	 * @param int $filesize
-	 * @param array $recipient_ids
+	 * @param unknown_type|null $recipient_ids
 	 */
 	public function _createNewSentWork($uploader_id, $title, $description, $author, $filename, $filesize, $recipient_ids)
     {

Indentation +324 added lines, -324 removed lines

@@ -76,20 +76,20 @@ 
         }
     }
 
-	/**
-	 * private function creating a new work object
-	 *
-	 * @param int $uploader_id
-	 * @param string $title
-	 * @param string $description
-	 * @param string $author
-	 * @param string $filename
-	 * @param int $filesize
-	 *
-	 * @todo 	$author was originally a field but this has now been replaced by the first and lastname of the uploader (to prevent anonymous uploads)
-	 * 			As a consequence this parameter can be removed
-	 */
-	public function _createNewWork($uploader_id, $title, $description, $author, $filename, $filesize)
+    /**
+     * private function creating a new work object
+     *
+     * @param int $uploader_id
+     * @param string $title
+     * @param string $description
+     * @param string $author
+     * @param string $filename
+     * @param int $filesize
+     *
+     * @todo 	$author was originally a field but this has now been replaced by the first and lastname of the uploader (to prevent anonymous uploads)
+     * 			As a consequence this parameter can be removed
+     */
+    public function _createNewWork($uploader_id, $title, $description, $author, $filename, $filesize)
     {
         // Fill in the properties
         $this->uploader_id = intval($uploader_id);
@@ -104,17 +104,17 @@ 
         // Check if object exists already. If it does, the old object is used
         // with updated information (authors, description, upload_date)
         $this->isOldWork = false;
-		$sql = "SELECT id, upload_date FROM ". Database::get_course_table(TABLE_DROPBOX_FILE) ."
+        $sql = "SELECT id, upload_date FROM ". Database::get_course_table(TABLE_DROPBOX_FILE) ."
 				WHERE c_id = $course_id AND filename = '".Database::escape_string($this->filename)."'";
         $result = Database::query($sql);
-		$res = Database::fetch_array($result);
-		if ($res) {
-			$this->isOldWork = true;
-		}
-		// Insert or update the dropbox_file table and set the id property
-		if ($this->isOldWork) {
-			$this->id = $res['id'];
-			$this->upload_date = $res['upload_date'];
+        $res = Database::fetch_array($result);
+        if ($res) {
+            $this->isOldWork = true;
+        }
+        // Insert or update the dropbox_file table and set the id property
+        if ($this->isOldWork) {
+            $this->id = $res['id'];
+            $this->upload_date = $res['upload_date'];
 
             $params = [
                 'filesize' => $this->filesize,
@@ -130,9 +130,9 @@ 
                 $params,
                 ['c_id = ? AND id = ?' => [$course_id, $this->id]]
             );
-		} else {
-			$this->upload_date = $this->last_upload_date;
-			$params = [
+        } else {
+            $this->upload_date = $this->last_upload_date;
+            $params = [
                 'c_id' => $course_id,
                 'uploader_id' => $this->uploader_id,
                 'filename' => $this->filename,
@@ -144,14 +144,14 @@ 
                 'last_upload_date' => $this->last_upload_date,
                 'session_id' => api_get_session_id(),
                 'cat_id' => 0
-			];
+            ];
 
-			$this->id = Database::insert(Database::get_course_table(TABLE_DROPBOX_FILE), $params);
-			if ($this->id) {
-				$sql = "UPDATE ". Database::get_course_table(TABLE_DROPBOX_FILE) ." SET id = iid WHERE iid = {$this->id}";
-				Database::query($sql);
-			}
-		}
+            $this->id = Database::insert(Database::get_course_table(TABLE_DROPBOX_FILE), $params);
+            if ($this->id) {
+                $sql = "UPDATE ". Database::get_course_table(TABLE_DROPBOX_FILE) ." SET id = iid WHERE iid = {$this->id}";
+                Database::query($sql);
+            }
+        }
 
         $sql = "SELECT count(file_id) as count
         		FROM ". Database::get_course_table(TABLE_DROPBOX_PERSON) ."
@@ -165,16 +165,16 @@ 
                     VALUES ($course_id, ".intval($this->id)." , ".intval($this->uploader_id).")";
             Database::query($sql);
         }
-	}
-
-	/**
-	 * private function creating existing object by retreiving info from db
-	 *
-	 * @param int $id
-	 */
-	public function _createExistingWork($id)
+    }
+
+    /**
+     * private function creating existing object by retreiving info from db
+     *
+     * @param int $id
+     */
+    public function _createExistingWork($id)
     {
-	    $course_id = api_get_course_int_id();
+        $course_id = api_get_course_int_id();
 
         $action = isset($_GET['action']) ? $_GET['action'] : null;
 
@@ -222,52 +222,52 @@ 
             }
             $this->feedback2= $feedback2;
         }
-	}
+    }
 }
 
 class Dropbox_SentWork extends Dropbox_Work
 {
-	public $recipients;	//array of ['id']['name'] arrays
-
-	/**
-	 * Constructor calls private functions to create a new work or retreive an existing work from DB
-	 * depending on the number of parameters
-	 *
-	 * @param unknown_type $arg1
-	 * @param unknown_type $arg2
-	 * @param unknown_type $arg3
-	 * @param unknown_type $arg4
-	 * @param unknown_type $arg5
-	 * @param unknown_type $arg6
-	 * @param unknown_type $arg7
-	 * @return Dropbox_SentWork
-	 */
-	public function __construct($arg1, $arg2 = null, $arg3 = null, $arg4 = null, $arg5 = null, $arg6 = null, $arg7 = null)
+    public $recipients;	//array of ['id']['name'] arrays
+
+    /**
+     * Constructor calls private functions to create a new work or retreive an existing work from DB
+     * depending on the number of parameters
+     *
+     * @param unknown_type $arg1
+     * @param unknown_type $arg2
+     * @param unknown_type $arg3
+     * @param unknown_type $arg4
+     * @param unknown_type $arg5
+     * @param unknown_type $arg6
+     * @param unknown_type $arg7
+     * @return Dropbox_SentWork
+     */
+    public function __construct($arg1, $arg2 = null, $arg3 = null, $arg4 = null, $arg5 = null, $arg6 = null, $arg7 = null)
     {
-		if (func_num_args() > 1) {
-		    $this->_createNewSentWork($arg1, $arg2, $arg3, $arg4, $arg5, $arg6, $arg7);
-		} else {
-			$this->_createExistingSentWork($arg1);
-		}
-	}
-
-	/**
-	 * private function creating a new SentWork object
-	 *
-	 * @param int $uploader_id
-	 * @param string $title
-	 * @param string $description
-	 * @param string $author
-	 * @param string $filename
-	 * @param int $filesize
-	 * @param array $recipient_ids
-	 */
-	public function _createNewSentWork($uploader_id, $title, $description, $author, $filename, $filesize, $recipient_ids)
+        if (func_num_args() > 1) {
+            $this->_createNewSentWork($arg1, $arg2, $arg3, $arg4, $arg5, $arg6, $arg7);
+        } else {
+            $this->_createExistingSentWork($arg1);
+        }
+    }
+
+    /**
+     * private function creating a new SentWork object
+     *
+     * @param int $uploader_id
+     * @param string $title
+     * @param string $description
+     * @param string $author
+     * @param string $filename
+     * @param int $filesize
+     * @param array $recipient_ids
+     */
+    public function _createNewSentWork($uploader_id, $title, $description, $author, $filename, $filesize, $recipient_ids)
     {
         $dropbox_cnf = getDropboxConf();
         $_course = api_get_course_info();
 
-		// Call constructor of Dropbox_Work object
+        // Call constructor of Dropbox_Work object
         parent::__construct(
             $uploader_id,
             $title,
@@ -277,33 +277,33 @@ 
             $filesize
         );
 
-		$course_id = api_get_course_int_id();
-
-		// Do sanity checks on recipient_ids array & property fillin
-		// The sanity check for ex-coursemembers is already done in base constructor
-		$uploader_id = (int) $uploader_id;
+        $course_id = api_get_course_int_id();
 
-		$justSubmit = false;
-		if (is_int($recipient_ids)) {
-			$justSubmit = true;
-			$recipient_ids = array($recipient_ids + $this->id);
-		} elseif (count($recipient_ids) == 0) {
-			$justSubmit = true;
-			$recipient_ids = array($uploader_id);
-		}
+        // Do sanity checks on recipient_ids array & property fillin
+        // The sanity check for ex-coursemembers is already done in base constructor
+        $uploader_id = (int) $uploader_id;
+
+        $justSubmit = false;
+        if (is_int($recipient_ids)) {
+            $justSubmit = true;
+            $recipient_ids = array($recipient_ids + $this->id);
+        } elseif (count($recipient_ids) == 0) {
+            $justSubmit = true;
+            $recipient_ids = array($uploader_id);
+        }
 
-		if (! is_array($recipient_ids) || count($recipient_ids) == 0) {
-			die(get_lang('GeneralError').' (code 209)');
-		}
+        if (! is_array($recipient_ids) || count($recipient_ids) == 0) {
+            die(get_lang('GeneralError').' (code 209)');
+        }
 
-		foreach ($recipient_ids as $rec) {
-			if (empty($rec)) {
-			    continue;
+        foreach ($recipient_ids as $rec) {
+            if (empty($rec)) {
+                continue;
             }
 
             //this check is done when validating submitted data
-			$this->recipients[] = array('id' => $rec);
-		}
+            $this->recipients[] = array('id' => $rec);
+        }
 
         $table_post = Database::get_course_table(TABLE_DROPBOX_POST);
         $table_person = Database::get_course_table(TABLE_DROPBOX_PERSON);
@@ -313,12 +313,12 @@ 
         $mailId = get_mail_id_base();
 
         // Insert data in dropbox_post and dropbox_person table for each recipient
-		foreach ($this->recipients as $rec) {
+        foreach ($this->recipients as $rec) {
             $file_id = (int)$this->id;
             $user_id = (int)$rec['id'];
-			$sql = "INSERT INTO $table_post (c_id, file_id, dest_user_id, session_id, feedback_date, cat_id)
+            $sql = "INSERT INTO $table_post (c_id, file_id, dest_user_id, session_id, feedback_date, cat_id)
                     VALUES ($course_id, $file_id, $user_id, $session_id, '$now', 0)";
-	        Database::query($sql);
+            Database::query($sql);
             // If work already exists no error is generated
 
             /**
@@ -335,13 +335,13 @@ 
                 }
             }
 
-			// Update item_property table for each recipient
-			if (($ownerid = $this->uploader_id) > $mailId) {
-			    $ownerid = getUserOwningThisMailing($ownerid);
-			}
-			if (($recipid = $rec["id"]) > $mailId) {
-			    $recipid = $ownerid;  // mailing file recipient = mailing id, not a person
-			}
+            // Update item_property table for each recipient
+            if (($ownerid = $this->uploader_id) > $mailId) {
+                $ownerid = getUserOwningThisMailing($ownerid);
+            }
+            if (($recipid = $rec["id"]) > $mailId) {
+                $recipid = $ownerid;  // mailing file recipient = mailing id, not a person
+            }
             api_item_property_update(
                 $_course,
                 TOOL_DROPBOX,
@@ -351,90 +351,90 @@ 
                 null,
                 $recipid
             );
-		}
-	}
-
-	/**
-	 * private function creating existing object by retreiving info from db
-	 *
-	 * @param unknown_type $id
-	 */
-	public function _createExistingSentWork($id)
+        }
+    }
+
+    /**
+     * private function creating existing object by retreiving info from db
+     *
+     * @param unknown_type $id
+     */
+    public function _createExistingSentWork($id)
     {
         $id = intval($id);
 
-		$course_id = api_get_course_int_id();
+        $course_id = api_get_course_int_id();
 
-		// Call constructor of Dropbox_Work object
-		parent::__construct($id);
+        // Call constructor of Dropbox_Work object
+        parent::__construct($id);
 
-		// Fill in recipients array
-		$this->recipients = array();
-		$sql = "SELECT dest_user_id, feedback_date, feedback
+        // Fill in recipients array
+        $this->recipients = array();
+        $sql = "SELECT dest_user_id, feedback_date, feedback
 				FROM ".Database::get_course_table(TABLE_DROPBOX_POST)."
 				WHERE c_id = $course_id AND file_id = ".intval($id)."";
         $result = Database::query($sql);
-		while ($res = Database::fetch_array($result, 'ASSOC')) {
-			// Check for deleted users
-			$dest_user_id = $res['dest_user_id'];
-			$user_info = api_get_user_info($dest_user_id);
-			//$this->category = $res['cat_id'];
-			if (!$user_info) {
-				$this->recipients[] = array('id' => -1, 'name' => get_lang('Unknown', ''));
-			} else {
-				$this->recipients[] = array(
+        while ($res = Database::fetch_array($result, 'ASSOC')) {
+            // Check for deleted users
+            $dest_user_id = $res['dest_user_id'];
+            $user_info = api_get_user_info($dest_user_id);
+            //$this->category = $res['cat_id'];
+            if (!$user_info) {
+                $this->recipients[] = array('id' => -1, 'name' => get_lang('Unknown', ''));
+            } else {
+                $this->recipients[] = array(
                     'id' => $dest_user_id,
                     'name' => $user_info['complete_name'],
                     'user_id' => $dest_user_id,
-				    'feedback_date' => $res['feedback_date'],
+                    'feedback_date' => $res['feedback_date'],
                     'feedback' => $res['feedback']
                 );
-			}
-		}
-	}
+            }
+        }
+    }
 }
 
 class Dropbox_Person
 {
-	// The receivedWork and the sentWork arrays are sorted.
-	public $receivedWork;	// an array of Dropbox_Work objects
-	public $sentWork;		// an array of Dropbox_SentWork objects
-
-	public $userId = 0;
-	public $isCourseAdmin = false;
-	public $isCourseTutor = false;
-	public $_orderBy = '';	// private property that determines by which field
-
-	/**
-	 * Constructor for recreating the Dropbox_Person object
-	 *
-	 * @param int $userId
-	 * @param bool $isCourseAdmin
-	 * @param bool $isCourseTutor
-	 * @return Dropbox_Person
-	 */
-	public function __construct($userId, $isCourseAdmin, $isCourseTutor)
+    // The receivedWork and the sentWork arrays are sorted.
+    public $receivedWork;	// an array of Dropbox_Work objects
+    public $sentWork;		// an array of Dropbox_SentWork objects
+
+    public $userId = 0;
+    public $isCourseAdmin = false;
+    public $isCourseTutor = false;
+    public $_orderBy = '';	// private property that determines by which field
+
+    /**
+     * Constructor for recreating the Dropbox_Person object
+     *
+     * @param int $userId
+     * @param bool $isCourseAdmin
+     * @param bool $isCourseTutor
+     * @return Dropbox_Person
+     */
+    public function __construct($userId, $isCourseAdmin, $isCourseTutor)
     {
-	    $course_id = api_get_course_int_id();
+        $course_id = api_get_course_int_id();
 
-		// Fill in properties
+        // Fill in properties
         $this->userId = $userId;
         $this->isCourseAdmin = $isCourseAdmin;
         $this->isCourseTutor = $isCourseTutor;
         $this->receivedWork = array();
         $this->sentWork = array();
 
-		// Note: perhaps include an ex coursemember check to delete old files
+        // Note: perhaps include an ex coursemember check to delete old files
 
-		$session_id = api_get_session_id();
-		$condition_session = api_get_session_condition($session_id);
+        $session_id = api_get_session_id();
+        $condition_session = api_get_session_condition($session_id);
 
-		$post_tbl = Database::get_course_table(TABLE_DROPBOX_POST);
-		$person_tbl = Database::get_course_table(TABLE_DROPBOX_PERSON);
-		$file_tbl = Database::get_course_table(TABLE_DROPBOX_FILE);
+        $post_tbl = Database::get_course_table(TABLE_DROPBOX_POST);
+        $person_tbl = Database::get_course_table(TABLE_DROPBOX_PERSON);
+        $file_tbl = Database::get_course_table(TABLE_DROPBOX_FILE);
 
         // Find all entries where this person is the recipient
-		$sql = "SELECT DISTINCT r.file_id, r.cat_id
+        $sql = "SELECT DISTINCT r.file_id, r.cat_id
                 FROM $post_tbl r
                 INNER JOIN $person_tbl p
                     ON (r.file_id = p.file_id AND r.c_id = $course_id AND p.c_id = $course_id )
@@ -443,12 +443,12 @@ 
                      r.dest_user_id = ".intval($this->userId)." $condition_session ";
 
         $result = Database::query($sql);
-		while ($res = Database::fetch_array($result)) {
-			$temp = new Dropbox_Work($res['file_id']);
-			$temp->category = $res['cat_id'];
-			$this->receivedWork[] = $temp;
-		}
-		// Find all entries where this person is the sender/uploader
+        while ($res = Database::fetch_array($result)) {
+            $temp = new Dropbox_Work($res['file_id']);
+            $temp->category = $res['cat_id'];
+            $this->receivedWork[] = $temp;
+        }
+        // Find all entries where this person is the sender/uploader
         $sql = "SELECT DISTINCT f.id
 				FROM $file_tbl f
 				INNER JOIN $person_tbl p
@@ -459,160 +459,160 @@ 
                     $condition_session
                 ";
         $result = Database::query($sql);
-		while ($res = Database::fetch_array($result)) {
-			$this->sentWork[] = new Dropbox_SentWork($res['id']);
-		}
-	}
-
-	/**
-	 * Deletes all the received work of this person
-	 */
-	public function deleteAllReceivedWork()
+        while ($res = Database::fetch_array($result)) {
+            $this->sentWork[] = new Dropbox_SentWork($res['id']);
+        }
+    }
+
+    /**
+     * Deletes all the received work of this person
+     */
+    public function deleteAllReceivedWork()
     {
-	    $course_id = api_get_course_int_id();
-		// Delete entries in person table concerning received works
-		foreach ($this->receivedWork as $w) {
+        $course_id = api_get_course_int_id();
+        // Delete entries in person table concerning received works
+        foreach ($this->receivedWork as $w) {
             $sql = "DELETE FROM ". Database::get_course_table(TABLE_DROPBOX_PERSON) ."
 			        WHERE c_id = $course_id AND user_id='".$this->userId."' AND file_id='".$w->id."'";
-			Database::query($sql);
-		}
+            Database::query($sql);
+        }
         // Check for unused files
-		removeUnusedFiles();
-	}
-
-	/**
-	 * Deletes all the received categories and work of this person
-	 * @param integer $id
-	 */
-	public function deleteReceivedWorkFolder($id)
+        removeUnusedFiles();
+    }
+
+    /**
+     * Deletes all the received categories and work of this person
+     * @param integer $id
+     */
+    public function deleteReceivedWorkFolder($id)
     {
         $course_id = api_get_course_int_id();
 
-		$id = intval($id);
-		$sql = "DELETE FROM ". Database::get_course_table(TABLE_DROPBOX_FILE) ."
+        $id = intval($id);
+        $sql = "DELETE FROM ". Database::get_course_table(TABLE_DROPBOX_FILE) ."
 		        WHERE c_id = $course_id AND cat_id = '".$id."' ";
-		if (!Database::query($sql)) return false;
-		$sql = "DELETE FROM ". Database::get_course_table(TABLE_DROPBOX_CATEGORY) ."
+        if (!Database::query($sql)) return false;
+        $sql = "DELETE FROM ". Database::get_course_table(TABLE_DROPBOX_CATEGORY) ."
 		        WHERE c_id = $course_id AND cat_id = '".$id."' ";
-		if (!Database::query($sql)) return false;
-		$sql = "DELETE FROM ".Database::get_course_table(TABLE_DROPBOX_POST)."
+        if (!Database::query($sql)) return false;
+        $sql = "DELETE FROM ".Database::get_course_table(TABLE_DROPBOX_POST)."
 		        WHERE c_id = $course_id AND cat_id = '".$id."' ";
-		if (!Database::query($sql)) return false;
-		return true;
-	}
-
-	/**
-	 * Deletes a received dropbox file of this person with id=$id
-	 *
-	 * @param integer $id
-	 */
-	public function deleteReceivedWork($id)
+        if (!Database::query($sql)) return false;
+        return true;
+    }
+
+    /**
+     * Deletes a received dropbox file of this person with id=$id
+     *
+     * @param integer $id
+     */
+    public function deleteReceivedWork($id)
     {
-	    $course_id = api_get_course_int_id();
-		$id = intval($id);
-
-		// index check
-		$found = false;
-		foreach ($this->receivedWork as $w) {
-			if ($w->id == $id) {
-			   $found = true;
-			   break;
-			}
-		}
-
-		if (!$found) {
-			if (!$this->deleteReceivedWorkFolder($id)) {
-				die(get_lang('GeneralError').' (code 216)');
-			}
-		}
-		// Delete entries in person table concerning received works
+        $course_id = api_get_course_int_id();
+        $id = intval($id);
+
+        // index check
+        $found = false;
+        foreach ($this->receivedWork as $w) {
+            if ($w->id == $id) {
+                $found = true;
+                break;
+            }
+        }
+
+        if (!$found) {
+            if (!$this->deleteReceivedWorkFolder($id)) {
+                die(get_lang('GeneralError').' (code 216)');
+            }
+        }
+        // Delete entries in person table concerning received works
         $sql = "DELETE FROM ". Database::get_course_table(TABLE_DROPBOX_PERSON) ."
                 WHERE c_id = $course_id AND user_id = '".$this->userId."' AND file_id ='".$id."'";
-		Database::query($sql);
-		removeUnusedFiles();	// Check for unused files
-	}
-
-	/**
-	 * Deletes all the sent dropbox files of this person
-	 */
-	public function deleteAllSentWork()
+        Database::query($sql);
+        removeUnusedFiles();	// Check for unused files
+    }
+
+    /**
+     * Deletes all the sent dropbox files of this person
+     */
+    public function deleteAllSentWork()
     {
-	    $course_id = api_get_course_int_id();
-		//delete entries in person table concerning sent works
-		foreach ($this->sentWork as $w) {
+        $course_id = api_get_course_int_id();
+        //delete entries in person table concerning sent works
+        foreach ($this->sentWork as $w) {
             $sql = "DELETE FROM ". Database::get_course_table(TABLE_DROPBOX_PERSON) ."
                     WHERE c_id = $course_id AND user_id='".$this->userId."' AND file_id='".$w->id."'";
-			Database::query($sql);
-			removeMoreIfMailing($w->id);
-		}
-		removeUnusedFiles();	// Check for unused files
-	}
-
-	/**
-	 * Deletes a sent dropbox file of this person with id=$id
-	 *
-	 * @param unknown_type $id
-	 */
-	public function deleteSentWork($id)
+            Database::query($sql);
+            removeMoreIfMailing($w->id);
+        }
+        removeUnusedFiles();	// Check for unused files
+    }
+
+    /**
+     * Deletes a sent dropbox file of this person with id=$id
+     *
+     * @param unknown_type $id
+     */
+    public function deleteSentWork($id)
     {
-	    $course_id = api_get_course_int_id();
-
-		$id = intval($id);
-
-		// index check
-		$found = false;
-		foreach ($this->sentWork as $w) {
-			if ($w->id == $id) {
-			   $found = true;
-			   break;
-			}
-		}
-		if (!$found) {
-			if (!$this->deleteReceivedWorkFolder($id)) {
-				die(get_lang('GeneralError').' (code 219)');
-			}
-		}
-		//$file_id = $this->sentWork[$index]->id;
-		// Delete entries in person table concerning sent works
+        $course_id = api_get_course_int_id();
+
+        $id = intval($id);
+
+        // index check
+        $found = false;
+        foreach ($this->sentWork as $w) {
+            if ($w->id == $id) {
+                $found = true;
+                break;
+            }
+        }
+        if (!$found) {
+            if (!$this->deleteReceivedWorkFolder($id)) {
+                die(get_lang('GeneralError').' (code 219)');
+            }
+        }
+        //$file_id = $this->sentWork[$index]->id;
+        // Delete entries in person table concerning sent works
         $sql = "DELETE FROM ". Database::get_course_table(TABLE_DROPBOX_PERSON) ."
                 WHERE c_id = $course_id AND user_id='".$this->userId."' AND file_id='".$id."'";
-		Database::query($sql);
-		removeMoreIfMailing($id);
-		removeUnusedFiles();	// Check for unused files
-	}
-
-	/**
-	 * Updates feedback for received work of this person with id=$id
-	 *
-	 * @param string $id
-	 * @param string $text
-	 */
-	public function updateFeedback($id, $text)
+        Database::query($sql);
+        removeMoreIfMailing($id);
+        removeUnusedFiles();	// Check for unused files
+    }
+
+    /**
+     * Updates feedback for received work of this person with id=$id
+     *
+     * @param string $id
+     * @param string $text
+     */
+    public function updateFeedback($id, $text)
     {
-	    $course_id = api_get_course_int_id();
+        $course_id = api_get_course_int_id();
         $_course = api_get_course_info();
         $dropbox_cnf = getDropboxConf();
 
-		$id = intval($id);
+        $id = intval($id);
 
-		// index check
-		$found = false;
-		$wi = -1;
-		foreach ($this->receivedWork as $w) {
-			$wi++;
-			if ($w->id == $id){
-			   $found = true;
-			   break;
-			}  // foreach (... as $wi -> $w) gives error 221! (no idea why...)
-		}
+        // index check
+        $found = false;
+        $wi = -1;
+        foreach ($this->receivedWork as $w) {
+            $wi++;
+            if ($w->id == $id){
+                $found = true;
+                break;
+            }  // foreach (... as $wi -> $w) gives error 221! (no idea why...)
+        }
 
-		if (!$found) {
-			return false;
-		}
+        if (!$found) {
+            return false;
+        }
 
-		$feedback_date = api_get_utc_datetime();
-		$this->receivedWork[$wi]->feedback_date = $feedback_date;
-		$this->receivedWork[$wi]->feedback = $text;
+        $feedback_date = api_get_utc_datetime();
+        $this->receivedWork[$wi]->feedback_date = $feedback_date;
+        $this->receivedWork[$wi]->feedback = $text;
 
         $params = [
             'feedback_date' => $feedback_date,
@@ -630,11 +630,11 @@ 
             ]
         );
 
-		// Update item_property table
+        // Update item_property table
         $mailId = get_mail_id_base();
-		if (($ownerid = $this->receivedWork[$wi]->uploader_id) > $mailId) {
-		    $ownerid = getUserOwningThisMailing($ownerid);
-		}
+        if (($ownerid = $this->receivedWork[$wi]->uploader_id) > $mailId) {
+            $ownerid = getUserOwningThisMailing($ownerid);
+        }
 
         api_item_property_update(
             $_course,
@@ -646,33 +646,33 @@ 
             $ownerid
         );
 
-	}
+    }
 
-	/**
-	 * Filter the received work
-	 * @param string $type
-	 * @param string $value
-	 */
-	public function filter_received_work($type, $value)
+    /**
+     * Filter the received work
+     * @param string $type
+     * @param string $value
+     */
+    public function filter_received_work($type, $value)
     {
         $dropbox_cnf = getDropboxConf();
-    	$new_received_work = array();
+        $new_received_work = array();
         $mailId = get_mail_id_base();
         foreach ($this->receivedWork as $work) {
-			switch ($type) {
-				case 'uploader_id':
-					if ($work->uploader_id == $value ||
-						($work->uploader_id > $mailId &&
+            switch ($type) {
+                case 'uploader_id':
+                    if ($work->uploader_id == $value ||
+                        ($work->uploader_id > $mailId &&
                         getUserOwningThisMailing($work->uploader_id) == $value)
                     ) {
-						$new_received_work[] = $work;
-					}
-					break;
-				default:
-					$new_received_work[] = $work;
+                        $new_received_work[] = $work;
+                    }
+                    break;
+                default:
+                    $new_received_work[] = $work;
                     break;
-			}
-		}
-		$this->receivedWork = $new_received_work;
-	}
+            }
+        }
+        $this->receivedWork = $new_received_work;
+    }
 }

Spacing +28 added lines, -28 removed lines

@@ -104,7 +104,7 @@ 
         // Check if object exists already. If it does, the old object is used
         // with updated information (authors, description, upload_date)
         $this->isOldWork = false;
-		$sql = "SELECT id, upload_date FROM ". Database::get_course_table(TABLE_DROPBOX_FILE) ."
+		$sql = "SELECT id, upload_date FROM ".Database::get_course_table(TABLE_DROPBOX_FILE)."
 				WHERE c_id = $course_id AND filename = '".Database::escape_string($this->filename)."'";
         $result = Database::query($sql);
 		$res = Database::fetch_array($result);
@@ -148,20 +148,20 @@ 
 
 			$this->id = Database::insert(Database::get_course_table(TABLE_DROPBOX_FILE), $params);
 			if ($this->id) {
-				$sql = "UPDATE ". Database::get_course_table(TABLE_DROPBOX_FILE) ." SET id = iid WHERE iid = {$this->id}";
+				$sql = "UPDATE ".Database::get_course_table(TABLE_DROPBOX_FILE)." SET id = iid WHERE iid = {$this->id}";
 				Database::query($sql);
 			}
 		}
 
         $sql = "SELECT count(file_id) as count
-        		FROM ". Database::get_course_table(TABLE_DROPBOX_PERSON) ."
+        		FROM ". Database::get_course_table(TABLE_DROPBOX_PERSON)."
 				WHERE c_id = $course_id AND file_id = ".intval($this->id)." AND user_id = ".$this->uploader_id;
         $result = Database::query($sql);
         $row = Database::fetch_array($result);
         if ($row['count'] == 0) {
 
             // Insert entries into person table
-            $sql = "INSERT INTO ". Database::get_course_table(TABLE_DROPBOX_PERSON) ." (c_id, file_id, user_id)
+            $sql = "INSERT INTO ".Database::get_course_table(TABLE_DROPBOX_PERSON)." (c_id, file_id, user_id)
                     VALUES ($course_id, ".intval($this->id)." , ".intval($this->uploader_id).")";
             Database::query($sql);
         }
@@ -179,11 +179,11 @@ 
         $action = isset($_GET['action']) ? $_GET['action'] : null;
 
         // Do some sanity checks
-        $id	= intval($id);
+        $id = intval($id);
 
         // Get the data from DB
         $sql = "SELECT uploader_id, filename, filesize, title, description, author, upload_date, last_upload_date, cat_id
-                FROM ". Database::get_course_table(TABLE_DROPBOX_FILE) ."
+                FROM ". Database::get_course_table(TABLE_DROPBOX_FILE)."
                 WHERE c_id = $course_id AND id = ".$id."";
         $result = Database::query($sql);
         $res = Database::fetch_array($result, 'ASSOC');
@@ -212,7 +212,7 @@ 
         // Getting the feedback on the work.
         if ($action == 'viewfeedback' AND $this->id == $_GET['id']) {
             $feedback2 = array();
-            $sql = "SELECT * FROM ". Database::get_course_table(TABLE_DROPBOX_FEEDBACK) ."
+            $sql = "SELECT * FROM ".Database::get_course_table(TABLE_DROPBOX_FEEDBACK)."
                     WHERE c_id = $course_id AND file_id='".$id."' 
                     ORDER BY feedback_id ASC";
             $result = Database::query($sql);
@@ -220,14 +220,14 @@ 
                 $row_feedback['feedback'] = Security::remove_XSS($row_feedback['feedback']);
                 $feedback2[] = $row_feedback;
             }
-            $this->feedback2= $feedback2;
+            $this->feedback2 = $feedback2;
         }
 	}
 }
 
 class Dropbox_SentWork extends Dropbox_Work
 {
-	public $recipients;	//array of ['id']['name'] arrays
+	public $recipients; //array of ['id']['name'] arrays
 
 	/**
 	 * Constructor calls private functions to create a new work or retreive an existing work from DB
@@ -292,7 +292,7 @@ 
 			$recipient_ids = array($uploader_id);
 		}
 
-		if (! is_array($recipient_ids) || count($recipient_ids) == 0) {
+		if (!is_array($recipient_ids) || count($recipient_ids) == 0) {
 			die(get_lang('GeneralError').' (code 209)');
 		}
 
@@ -308,14 +308,14 @@ 
         $table_post = Database::get_course_table(TABLE_DROPBOX_POST);
         $table_person = Database::get_course_table(TABLE_DROPBOX_PERSON);
         $session_id = api_get_session_id();
-        $user  = api_get_user_id();
+        $user = api_get_user_id();
         $now = api_get_utc_datetime();
         $mailId = get_mail_id_base();
 
         // Insert data in dropbox_post and dropbox_person table for each recipient
 		foreach ($this->recipients as $rec) {
-            $file_id = (int)$this->id;
-            $user_id = (int)$rec['id'];
+            $file_id = (int) $this->id;
+            $user_id = (int) $rec['id'];
 			$sql = "INSERT INTO $table_post (c_id, file_id, dest_user_id, session_id, feedback_date, cat_id)
                     VALUES ($course_id, $file_id, $user_id, $session_id, '$now', 0)";
 	        Database::query($sql);
@@ -331,7 +331,7 @@ 
 
                 // Do not add recipient in person table if mailing zip or just upload.
                 if (!$justSubmit) {
-                    Database::query($sql);	// If work already exists no error is generated
+                    Database::query($sql); // If work already exists no error is generated
                 }
             }
 
@@ -340,7 +340,7 @@ 
 			    $ownerid = getUserOwningThisMailing($ownerid);
 			}
 			if (($recipid = $rec["id"]) > $mailId) {
-			    $recipid = $ownerid;  // mailing file recipient = mailing id, not a person
+			    $recipid = $ownerid; // mailing file recipient = mailing id, not a person
 			}
             api_item_property_update(
                 $_course,
@@ -397,13 +397,13 @@ 
 class Dropbox_Person
 {
 	// The receivedWork and the sentWork arrays are sorted.
-	public $receivedWork;	// an array of Dropbox_Work objects
-	public $sentWork;		// an array of Dropbox_SentWork objects
+	public $receivedWork; // an array of Dropbox_Work objects
+	public $sentWork; // an array of Dropbox_SentWork objects
 
 	public $userId = 0;
 	public $isCourseAdmin = false;
 	public $isCourseTutor = false;
-	public $_orderBy = '';	// private property that determines by which field
+	public $_orderBy = ''; // private property that determines by which field
 
 	/**
 	 * Constructor for recreating the Dropbox_Person object
@@ -472,7 +472,7 @@ 
 	    $course_id = api_get_course_int_id();
 		// Delete entries in person table concerning received works
 		foreach ($this->receivedWork as $w) {
-            $sql = "DELETE FROM ". Database::get_course_table(TABLE_DROPBOX_PERSON) ."
+            $sql = "DELETE FROM ".Database::get_course_table(TABLE_DROPBOX_PERSON)."
 			        WHERE c_id = $course_id AND user_id='".$this->userId."' AND file_id='".$w->id."'";
 			Database::query($sql);
 		}
@@ -489,10 +489,10 @@ 
         $course_id = api_get_course_int_id();
 
 		$id = intval($id);
-		$sql = "DELETE FROM ". Database::get_course_table(TABLE_DROPBOX_FILE) ."
+		$sql = "DELETE FROM ".Database::get_course_table(TABLE_DROPBOX_FILE)."
 		        WHERE c_id = $course_id AND cat_id = '".$id."' ";
 		if (!Database::query($sql)) return false;
-		$sql = "DELETE FROM ". Database::get_course_table(TABLE_DROPBOX_CATEGORY) ."
+		$sql = "DELETE FROM ".Database::get_course_table(TABLE_DROPBOX_CATEGORY)."
 		        WHERE c_id = $course_id AND cat_id = '".$id."' ";
 		if (!Database::query($sql)) return false;
 		$sql = "DELETE FROM ".Database::get_course_table(TABLE_DROPBOX_POST)."
@@ -526,10 +526,10 @@ 
 			}
 		}
 		// Delete entries in person table concerning received works
-        $sql = "DELETE FROM ". Database::get_course_table(TABLE_DROPBOX_PERSON) ."
+        $sql = "DELETE FROM ".Database::get_course_table(TABLE_DROPBOX_PERSON)."
                 WHERE c_id = $course_id AND user_id = '".$this->userId."' AND file_id ='".$id."'";
 		Database::query($sql);
-		removeUnusedFiles();	// Check for unused files
+		removeUnusedFiles(); // Check for unused files
 	}
 
 	/**
@@ -540,12 +540,12 @@ 
 	    $course_id = api_get_course_int_id();
 		//delete entries in person table concerning sent works
 		foreach ($this->sentWork as $w) {
-            $sql = "DELETE FROM ". Database::get_course_table(TABLE_DROPBOX_PERSON) ."
+            $sql = "DELETE FROM ".Database::get_course_table(TABLE_DROPBOX_PERSON)."
                     WHERE c_id = $course_id AND user_id='".$this->userId."' AND file_id='".$w->id."'";
 			Database::query($sql);
 			removeMoreIfMailing($w->id);
 		}
-		removeUnusedFiles();	// Check for unused files
+		removeUnusedFiles(); // Check for unused files
 	}
 
 	/**
@@ -574,11 +574,11 @@ 
 		}
 		//$file_id = $this->sentWork[$index]->id;
 		// Delete entries in person table concerning sent works
-        $sql = "DELETE FROM ". Database::get_course_table(TABLE_DROPBOX_PERSON) ."
+        $sql = "DELETE FROM ".Database::get_course_table(TABLE_DROPBOX_PERSON)."
                 WHERE c_id = $course_id AND user_id='".$this->userId."' AND file_id='".$id."'";
 		Database::query($sql);
 		removeMoreIfMailing($id);
-		removeUnusedFiles();	// Check for unused files
+		removeUnusedFiles(); // Check for unused files
 	}
 
 	/**
@@ -600,7 +600,7 @@ 
 		$wi = -1;
 		foreach ($this->receivedWork as $w) {
 			$wi++;
-			if ($w->id == $id){
+			if ($w->id == $id) {
 			   $found = true;
 			   break;
 			}  // foreach (... as $wi -> $w) gives error 221! (no idea why...)

Braces +9 added lines, -3 removed lines

@@ -491,13 +491,19 @@
 		$id = intval($id);
 		$sql = "DELETE FROM ". Database::get_course_table(TABLE_DROPBOX_FILE) ."
 		        WHERE c_id = $course_id AND cat_id = '".$id."' ";
-		if (!Database::query($sql)) return false;
+		if (!Database::query($sql)) {
+		    return false;
+		}
 		$sql = "DELETE FROM ". Database::get_course_table(TABLE_DROPBOX_CATEGORY) ."
 		        WHERE c_id = $course_id AND cat_id = '".$id."' ";
-		if (!Database::query($sql)) return false;
+		if (!Database::query($sql)) {
+		    return false;
+		}
 		$sql = "DELETE FROM ".Database::get_course_table(TABLE_DROPBOX_POST)."
 		        WHERE c_id = $course_id AND cat_id = '".$id."' ";
-		if (!Database::query($sql)) return false;
+		if (!Database::query($sql)) {
+		    return false;
+		}
 		return true;
 	}
 

plugin/courseblock/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');

src/Chamilo/CoreBundle/Entity/Message.php

Doc Comments +1 added lines, -1 removed lines

@@ -314,7 +314,7 @@
      * Set votes
      *
      * @param integer $votes
-     * @return integer
+     * @return Message
      */
     public function setVotes($votes)
     {

src/Chamilo/CoreBundle/Entity/SkillRelUserComment.php

Doc Comments +1 added lines, -1 removed lines

@@ -114,7 +114,7 @@
 
     /**
      * Get feedbackDateTime
-     * @return type
+     * @return \DateTime
      */
     public function getFeedbackDateTime()
     {

main/inc/lib/surveymanager.lib.php

Spacing +9 added lines, -9 removed lines

@@ -47,20 +47,20 @@ 
         $res = Database::query($sql);
         $refs = array();
         $list = array();
-        $plain_array=array();
+        $plain_array = array();
 
         while ($survey = Database::fetch_array($res, 'ASSOC')) {
-            $plain_array[$survey['survey_id']]=$survey;
-            $surveys_parents[]=$survey['survey_version'];
-            $thisref = &$refs[ $survey['survey_id'] ];
+            $plain_array[$survey['survey_id']] = $survey;
+            $surveys_parents[] = $survey['survey_version'];
+            $thisref = &$refs[$survey['survey_id']];
             $thisref['parent_id'] = $survey['parent_id'];
             $thisref['name'] = $survey['name'];
             $thisref['id'] = $survey['survey_id'];
             $thisref['survey_version'] = $survey['survey_version'];
             if ($survey['parent_id'] == 0) {
-                $list[ $survey['survey_id'] ] = &$thisref;
+                $list[$survey['survey_id']] = &$thisref;
             } else {
-                $refs[ $survey['parent_id'] ]['children'][ $survey['survey_id'] ] = &$thisref;
+                $refs[$survey['parent_id']]['children'][$survey['survey_id']] = &$thisref;
             }
         }
         $this->surveylist = $list;
@@ -79,7 +79,7 @@ 
     public function getParentId($id)
     {
         $node = $this->plainsurveylist[$id];
-        if (is_array($node)&& !empty($node['parent_id'])) {
+        if (is_array($node) && !empty($node['parent_id'])) {
             return $node['parent_id'];
         } else {
             return -1;
@@ -99,12 +99,12 @@ 
         if (is_array($list)) {
             foreach ($list as $key => $node) {
                 if (isset($node['children']) && is_array($node['children'])) {
-                    $result[$key]= $node['name'];
+                    $result[$key] = $node['name'];
                     $re = self::createList($node['children']);
                     if (!empty($re)) {
                         if (is_array($re)) {
                             foreach ($re as $key => $r) {
-                                $result[$key] = '' . $r;
+                                $result[$key] = ''.$r;
                             }
                         } else {
                             $result[] = $re;