chamilo / chamilo-lms

main/newscorm/learnpath_functions.inc.php

Doc Comments +1 added lines

@@ -60,6 +60,7 @@
 /**
  * This function deletes an entire directory
  * @param	string	The directory path
+ * @param string $dir
  * @return boolean	True on success, false on failure
  */
 function deldir($dir) {

main/newscorm/learnpathList.class.php

Doc Comments +1 added lines, -1 removed lines

@@ -34,7 +34,7 @@
      * @param   int     $categoryId
      * @param bool $ignoreCategoryFilter
      *
-     * @return	void
+     * @return	false|null
      */
     public function __construct(
         $user_id,

Spacing +2 added lines, -2 removed lines

@@ -105,7 +105,7 @@ 
                     ";
         $res = Database::query($sql);
         $names = array();
-        while ($row = Database::fetch_array($res,'ASSOC')) {
+        while ($row = Database::fetch_array($res, 'ASSOC')) {
             // Use domesticate here instead of Database::escape_string because
             // it prevents ' to be slashed and the input (done by learnpath.class.php::toggle_visibility())
             // is done using domesticate()
@@ -235,7 +235,7 @@ 
 
         $lessons = array();
         while ($row = Database::fetch_array($result)) {
-            if (api_get_item_visibility($course, 'learnpath', $row['id'],  $session_id)) {
+            if (api_get_item_visibility($course, 'learnpath', $row['id'], $session_id)) {
                 $lessons[$row['id']] = $row;
             }
         }

main/newscorm/lp_ajax_save_item.php

Doc Comments +3 added lines, -3 removed lines

@@ -20,9 +20,9 @@
  * @param   int $user_id User ID
  * @param   int $view_id View ID
  * @param   int $item_id Item ID
- * @param   float  $score Current score
- * @param   float  $max Maximum score
- * @param   float  $min Minimum score
+ * @param   integer  $score Current score
+ * @param   integer  $max Maximum score
+ * @param   integer  $min Minimum score
  * @param   string  $status Lesson status
  * @param   int  $time Session time
  * @param   string  $suspend Suspend data

Indentation +1 added lines, -1 removed lines

@@ -458,7 +458,7 @@
     }
 
     if ($myLP->get_type() == 2) {
-         $return .= "update_stats();";
+            $return .= "update_stats();";
     }
 
     // To be sure progress is updated.

Spacing +3 added lines, -3 removed lines

@@ -163,7 +163,7 @@ 
         // Set status to completed for hotpotatoes if score > 80%.
         if ($my_type == 'hotpotatoes') {
             if ((empty($status) || $status == 'undefined' || $status == 'not attempted') && $max > 0) {
-                if (($score/$max) > 0.8) {
+                if (($score / $max) > 0.8) {
                     $myStatus = 'completed';
                     if ($debug > 1) {
                         error_log('Calling set_status('.$myStatus.') for hotpotatoes', 0);
@@ -174,7 +174,7 @@ 
                         error_log('Done calling set_status for hotpotatoes - now '.$myLPI->get_status(false), 0);
                     }
                 }
-            } elseif ($status == 'completed' && $max > 0 && ($score/$max) < 0.8) {
+            } elseif ($status == 'completed' && $max > 0 && ($score / $max) < 0.8) {
                 $myStatus = 'failed';
                 if ($debug > 1) {
                     error_log('Calling set_status('.$myStatus.') for hotpotatoes', 0);
@@ -367,7 +367,7 @@ 
             $myLPI->current_data = $suspend;
         }
 
-        if (isset($location) && $location != '' && $location!='undefined') {
+        if (isset($location) && $location != '' && $location != 'undefined') {
             $myLPI->set_lesson_location($location);
         }
 

main/newscorm/openoffice_document.class.php

Doc Comments +2 added lines, -1 removed lines

@@ -171,7 +171,8 @@
     /**
      * Get images files from remote host (with webservices)
      * @param   array current ppt file
-     * @return  array images files
+     * @param string $file
+     * @return  string images files
      */
     private function _get_remote_ppt2lp_files($file)
     {

Indentation +1 added lines, -1 removed lines

@@ -49,7 +49,7 @@
         // Create the directory
         $result = $this->generate_lp_folder($_course, $this->file_name);
 
-         // Create the directory
+            // Create the directory
         $this->base_work_dir = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document';
         ///learning_path/ppt_dirname directory
         $this->created_dir = substr($result['dir'], 0, strlen($result['dir']) -1);

Spacing +28 added lines, -28 removed lines

@@ -52,7 +52,7 @@ 
          // Create the directory
         $this->base_work_dir = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document';
         ///learning_path/ppt_dirname directory
-        $this->created_dir = substr($result['dir'], 0, strlen($result['dir']) -1);
+        $this->created_dir = substr($result['dir'], 0, strlen($result['dir']) - 1);
         $this->file_path = $this->created_dir.'/'.api_replace_dangerous_char($file['name']);
 
         //var_dump($this->file_name, $this->file_path, $this->base_work_dir, $this->created_dir);
@@ -89,18 +89,18 @@ 
             $perm = api_get_setting('permissions_for_new_files');
 
             if (IS_WINDOWS_OS) { // IS_WINDOWS_OS has been defined in main_api.lib.php
-                $converter_path = str_replace('/', '\\', api_get_path(SYS_PATH) . 'main/inc/lib/ppt2png');
-                $class_path = $converter_path . ';' . $converter_path . '/jodconverter-2.2.2.jar;' . $converter_path . '/jodconverter-cli-2.2.2.jar';
+                $converter_path = str_replace('/', '\\', api_get_path(SYS_PATH).'main/inc/lib/ppt2png');
+                $class_path = $converter_path.';'.$converter_path.'/jodconverter-2.2.2.jar;'.$converter_path.'/jodconverter-cli-2.2.2.jar';
                 //$cmd = 'java -cp "'.$class_path.'" DokeosConverter';
-                $cmd = 'java -Dfile.encoding=UTF-8 -cp "' . $class_path . '" DokeosConverter';
+                $cmd = 'java -Dfile.encoding=UTF-8 -cp "'.$class_path.'" DokeosConverter';
             } else {
-                $converter_path = api_get_path(SYS_PATH) . 'main/inc/lib/ppt2png';
+                $converter_path = api_get_path(SYS_PATH).'main/inc/lib/ppt2png';
                 //$class_path = '-cp .:jodconverter-2.2.1.jar:jodconverter-cli-2.2.1.jar';
                 $class_path = ' -Dfile.encoding=UTF-8 -cp .:jodconverter-2.2.2.jar:jodconverter-cli-2.2.2.jar';
-                $cmd = 'cd ' . $converter_path . ' && java ' . $class_path . ' DokeosConverter';
+                $cmd = 'cd '.$converter_path.' && java '.$class_path.' DokeosConverter';
             }
 
-            $cmd .= ' -p ' . api_get_setting('service_ppt2lp', 'port');
+            $cmd .= ' -p '.api_get_setting('service_ppt2lp', 'port');
             // Call to the function implemented by child.
             $cmd .= $this->add_command_parameters();
             // To allow openoffice to manipulate docs.
@@ -109,7 +109,7 @@ 
             @chmod($this->base_work_dir.$this->file_path, 0777);
 
             $locale = $this->original_locale; // TODO: Improve it because we're not sure this locale is present everywhere.
-            putenv('LC_ALL=' . $locale);
+            putenv('LC_ALL='.$locale);
 
             $files = array();
             $return = 0;
@@ -139,8 +139,8 @@ 
             if (!empty($result['images'])) {
                 foreach ($result['images'] as $image => $img_data) {
                     $image_path = $this->base_work_dir.$this->created_dir;
-                    @file_put_contents($image_path . '/' . $image, base64_decode($img_data));
-                    @chmod($image_path . '/' . $image, 0777);
+                    @file_put_contents($image_path.'/'.$image, base64_decode($img_data));
+                    @chmod($image_path.'/'.$image, 0777);
                 }
             }
 
@@ -182,7 +182,7 @@ 
         $uri = '';
         $result = preg_match('/^([a-zA-Z0-9]*):\/\/([^\/]*)\//', $ppt2lp_host, $matches);
         if ($result) {
-            $uri = $matches[1] . '://' . $matches[2] . '/';
+            $uri = $matches[1].'://'.$matches[2].'/';
         } else {
             $uri = $ppt2lp_host;
         }
@@ -201,7 +201,7 @@ 
             'compression' => SOAP_COMPRESSION_ACCEPT | SOAP_COMPRESSION_GZIP | 9,
         );
         if (substr($ppt2lp_host, 0, 5) === 'https') {
-            $options['ssl_method'] =  SOAP_SSL_METHOD_TLS;
+            $options['ssl_method'] = SOAP_SSL_METHOD_TLS;
         }
         $client = new SoapClient(null, $options);
         $result = '';
@@ -221,7 +221,7 @@ 
             //error_log('['.time().'] Calling wsConvertPpt webservice on ' . $ppt2lp_host);
             $result = $client->__call('wsConvertPpt', array('pptData' => $params));
         } catch (Exception $e) {
-            error_log('['.time().'] Chamilo SOAP call error: ' . $e->getMessage());
+            error_log('['.time().'] Chamilo SOAP call error: '.$e->getMessage());
         }
         // Make sure we destroy the SOAP client as it may generate SSL connection
         // binding issue (if using SSL)
@@ -254,38 +254,38 @@ 
         $ppt2lpHost = api_get_setting('service_ppt2lp', 'host');
         $permissionFile = api_get_permissions_for_new_files();
         $permissionFolder = api_get_permissions_for_new_directories();
-        if (file_exists($this->base_work_dir . '/' . $this->created_dir)) {
+        if (file_exists($this->base_work_dir.'/'.$this->created_dir)) {
 
             return $ids;
         }
 
         if ($ppt2lpHost == 'localhost') {
             if (IS_WINDOWS_OS) { // IS_WINDOWS_OS has been defined in main_api.lib.php
-                $converterPath = str_replace('/', '\\', api_get_path(SYS_PATH) . 'main/inc/lib/ppt2png');
-                $classPath = $converterPath . ';' . $converterPath . '/jodconverter-2.2.2.jar;' . $converterPath . '/jodconverter-cli-2.2.2.jar';
-                $cmd = 'java -Dfile.encoding=UTF-8 -jar "' . $classPath . '/jodconverter-2.2.2.jar"';
+                $converterPath = str_replace('/', '\\', api_get_path(SYS_PATH).'main/inc/lib/ppt2png');
+                $classPath = $converterPath.';'.$converterPath.'/jodconverter-2.2.2.jar;'.$converterPath.'/jodconverter-cli-2.2.2.jar';
+                $cmd = 'java -Dfile.encoding=UTF-8 -jar "'.$classPath.'/jodconverter-2.2.2.jar"';
             } else {
-                $converterPath = api_get_path(SYS_PATH) . 'main/inc/lib/ppt2png';
+                $converterPath = api_get_path(SYS_PATH).'main/inc/lib/ppt2png';
                 $classPath = ' -Dfile.encoding=UTF-8 -jar jodconverter-cli-2.2.2.jar';
-                $cmd = 'cd ' . $converterPath . ' && java ' . $classPath . ' ';
+                $cmd = 'cd '.$converterPath.' && java '.$classPath.' ';
             }
 
-            $cmd .= ' -p ' . api_get_setting('service_ppt2lp', 'port');
+            $cmd .= ' -p '.api_get_setting('service_ppt2lp', 'port');
             // Call to the function implemented by child.
-            $cmd .= ' "' . $this->base_work_dir . '/' . $this->file_path . '"  "' . $this->base_work_dir . '/' . $this->created_dir . '"';
+            $cmd .= ' "'.$this->base_work_dir.'/'.$this->file_path.'"  "'.$this->base_work_dir.'/'.$this->created_dir.'"';
             // To allow openoffice to manipulate docs.
             @chmod($this->base_work_dir, $permissionFolder);
-            @chmod($this->base_work_dir . '/' . $this->file_path, $permissionFile);
+            @chmod($this->base_work_dir.'/'.$this->file_path, $permissionFile);
 
             $locale = $this->original_locale; // TODO: Improve it because we're not sure this locale is present everywhere.
-            putenv('LC_ALL=' . $locale);
+            putenv('LC_ALL='.$locale);
 
             $files = array();
             $return = 0;
             $shell = exec($cmd, $files, $return);
             // TODO: Chown is not working, root keep user privileges, should be www-data
-            @chown($this->base_work_dir . '/' . $this->created_dir, 'www-data');
-            @chmod($this->base_work_dir . '/' . $this->created_dir, $permissionFile);
+            @chown($this->base_work_dir.'/'.$this->created_dir, 'www-data');
+            @chmod($this->base_work_dir.'/'.$this->created_dir, $permissionFile);
 
             if ($return != 0) { // If the java application returns an error code.
                 switch ($return) {
@@ -324,14 +324,14 @@ 
             */
         }
 
-        if (file_exists($this->base_work_dir . '/' . $this->created_dir)) {
+        if (file_exists($this->base_work_dir.'/'.$this->created_dir)) {
 
             // Register Files to Document tool
             $ids[] = add_document(
                 $_course,
-                '/' . $this->created_dir,
+                '/'.$this->created_dir,
                 'file',
-                filesize($this->base_work_dir . '/' . $this->created_dir),
+                filesize($this->base_work_dir.'/'.$this->created_dir),
                 $convertedTitle,
                 sprintf(
                     get_lang('FileConvertedFromXToY'),

main/newscorm/openoffice_text.class.php

Doc Comments +3 added lines, -1 removed lines

@@ -42,7 +42,7 @@ 
     /**
      * Gets html pages and compose them into a learning path
      * @param	array	The files that will compose the generated learning path. Unused so far.
-     * @return	boolean	False if file does not exit. Nothing otherwise.
+     * @return	false|null	False if file does not exit. Nothing otherwise.
      */
     function make_lp($files = array())
     {
@@ -96,6 +96,7 @@ 
      * Manages chapter splitting
      * @param	string	Chapter header
      * @param	string	Content
+     * @param string $content
      * @return	void
      */
     function dealPerChapter($header, $content)
@@ -187,6 +188,7 @@ 
      * Manages page splitting
      * @param	string	Page header
      * @param	string	Page body
+     * @param string $body
      * @return	void
      */
     function dealPerPage($header, $body)

Spacing +9 added lines, -9 removed lines

@@ -126,7 +126,7 @@ 
             if (empty($matches[1][$i]))
                 continue;
 
-            $content = strstr($content,$matches[0][$i]);
+            $content = strstr($content, $matches[0][$i]);
             if ($i + 1 !== count($matches[0])) {
                 $chapter_content = substr($content, 0, strpos($content, $matches[0][$i + 1]));
             } else {
@@ -148,7 +148,7 @@ 
 
             $document_id = add_document($_course, $this->created_dir.'/'.$html_file, 'file', filesize($this->base_work_dir.$this->created_dir.'/'.$html_file), $html_file);
 
-            if ($document_id){
+            if ($document_id) {
 
                 // Put the document in item_property update.
                 api_item_property_update(
@@ -254,7 +254,7 @@ 
                         foreach ($specific_fields as $specific_field) {
                             if (isset($_REQUEST[$specific_field['code']])) {
                                 $sterms = trim($_REQUEST[$specific_field['code']]);
-                                $all_specific_terms .= ' '. $sterms;
+                                $all_specific_terms .= ' '.$sterms;
                                 if (!empty($sterms)) {
                                     $sterms = explode(',', $sterms);
                                     foreach ($sterms as $sterm) {
@@ -263,10 +263,10 @@ 
                                 }
                             }
                         }
-                        $page_content = $all_specific_terms .' '. $page_content;
+                        $page_content = $all_specific_terms.' '.$page_content;
                         $ic_slide->addValue('content', $page_content);
                         // Add a comment to say terms separated by commas.
-                        $courseid=api_get_course_id();
+                        $courseid = api_get_course_id();
                         $ic_slide->addCourseId($courseid);
                         $ic_slide->addToolId(TOOL_LEARNPATH);
                         $lp_id = $this->lp_id;
@@ -274,7 +274,7 @@ 
                             SE_COURSE_ID => $courseid,
                             SE_TOOL_ID => TOOL_LEARNPATH,
                             SE_DATA => array('lp_id' => $lp_id, 'lp_item'=> $previous, 'document_id' => $document_id),
-                            SE_USER => (int)api_get_user_id(),
+                            SE_USER => (int) api_get_user_id(),
                         );
                         $ic_slide->xapian_data = serialize($xapian_data);
                         $di->addChunk($ic_slide);
@@ -298,7 +298,7 @@ 
      * Returns additional Java command parameters
      * @return	string	The additional parameters to be used in the Java call
      */
-    function add_command_parameters(){
+    function add_command_parameters() {
         return ' -d woogie "'.$this->base_work_dir.'/'.$this->file_path.'"  "'.$this->base_work_dir.$this->created_dir.'/'.$this->file_name.'.html"';
     }
 
@@ -310,7 +310,7 @@ 
      */
     function format_page_content($header, $content) {
         // Limit the width of the doc.
-        list($max_width, $max_height) = explode('x',api_get_setting('service_ppt2lp','size'));
+        list($max_width, $max_height) = explode('x', api_get_setting('service_ppt2lp', 'size'));
 
         $content = preg_replace("|<body[^>]*>|i", "\\0\r\n<div style=\"width:".$max_width."\">", $content, -1, $count);
         if ($count < 1) {
@@ -343,7 +343,7 @@ 
                 }
 
             } elseif ($img_width > $max_width - 10) {
-                $picture_resized = str_ireplace('width='.$img_width, 'width="'.($max_width-10).'"', $images[0][$key]);
+                $picture_resized = str_ireplace('width='.$img_width, 'width="'.($max_width - 10).'"', $images[0][$key]);
                 $content = str_replace($images[0][$key], $picture_resized, $content);
             }
         }

Braces +3 added lines, -2 removed lines

@@ -123,8 +123,9 @@
 
         for ($i = 0; $i < count($matches[0]); $i++) {
 
-            if (empty($matches[1][$i]))
-                continue;
+            if (empty($matches[1][$i])) {
+                            continue;
+            }
 
             $content = strstr($content,$matches[0][$i]);
             if ($i + 1 !== count($matches[0])) {

main/newscorm/openoffice_text_document.class.php

Doc Comments +3 added lines, -1 removed lines

@@ -38,7 +38,7 @@ 
     /**
      * Gets html pages and compose them into a learning path
      * @param	array	The files that will compose the generated learning path. Unused so far.
-     * @return	boolean	False if file does not exit. Nothing otherwise.
+     * @return	false|null	False if file does not exit. Nothing otherwise.
      */
     public function make_lp($files = array())
     {
@@ -92,6 +92,7 @@ 
      * Manages chapter splitting
      * @param	string	Chapter header
      * @param	string	Content
+     * @param string $content
      * @return	void
      */
     function dealPerChapter($header, $content)
@@ -164,6 +165,7 @@ 
      * Manages page splitting
      * @param	string	Page header
      * @param	string	Page body
+     * @param string $body
      * @return	void
      */
     function dealPerPage($header, $body)

Spacing +7 added lines, -7 removed lines

@@ -117,7 +117,7 @@ 
         $intro_content = api_substr($content, 0, api_strpos($content, $matches[0][0]));
         $items_to_create[get_lang('Introduction')] = $intro_content;
 
-        for ($i = 0; $i<count($matches[0]); $i++) {
+        for ($i = 0; $i < count($matches[0]); $i++) {
 
             if (empty($matches[1][$i]))
                 continue;
@@ -174,7 +174,7 @@ 
 
         $first_item = 0;
 
-        foreach($pages as $key => $page_content) {
+        foreach ($pages as $key => $page_content) {
             // For every pages, we create a new file.
 
             $key += 1;
@@ -213,7 +213,7 @@ 
                     foreach ($specific_fields as $specific_field) {
                         if (isset($_REQUEST[$specific_field['code']])) {
                             $sterms = trim($_REQUEST[$specific_field['code']]);
-                            $all_specific_terms .= ' '. $sterms;
+                            $all_specific_terms .= ' '.$sterms;
                             if (!empty($sterms)) {
                                 $sterms = explode(',', $sterms);
                                 foreach ($sterms as $sterm) {
@@ -222,7 +222,7 @@ 
                             }
                         }
                     }
-                    $page_content = $all_specific_terms .' '. $page_content;
+                    $page_content = $all_specific_terms.' '.$page_content;
                     $ic_slide->addValue('content', $page_content);
                     // Add a comment to say terms separated by commas.
                     $courseid = api_get_course_id();
@@ -233,7 +233,7 @@ 
                         SE_COURSE_ID => $courseid,
                         SE_TOOL_ID => TOOL_LEARNPATH,
                         SE_DATA => array('lp_id' => $lp_id, 'lp_item' => $previous, 'document_id' => $document_id),
-                        SE_USER => (int)api_get_user_id(),
+                        SE_USER => (int) api_get_user_id(),
                     );
                     $ic_slide->xapian_data = serialize($xapian_data);
                     $di->addChunk($ic_slide);
@@ -276,7 +276,7 @@ 
             $content = '<body><div style="width:'.$max_width.'">'.$content;
         }
 
-        $content = preg_replace('|</body>|i','</div>\\0', $content, -1, $count);
+        $content = preg_replace('|</body>|i', '</div>\\0', $content, -1, $count);
         if ($count < 1) {
             $content = $content.'</div></body>';
         }
@@ -304,7 +304,7 @@ 
                 }
 
             } elseif ($img_width > $max_width - 10) {
-                $picture_resized = str_ireplace('width='.$img_width, 'width="'.($max_width-10).'"', $images[0][$key]);
+                $picture_resized = str_ireplace('width='.$img_width, 'width="'.($max_width - 10).'"', $images[0][$key]);
                 $content = str_replace($images[0][$key], $picture_resized, $content);
             }
         }

Braces +3 added lines, -2 removed lines

@@ -119,8 +119,9 @@
 
         for ($i = 0; $i<count($matches[0]); $i++) {
 
-            if (empty($matches[1][$i]))
-                continue;
+            if (empty($matches[1][$i])) {
+                            continue;
+            }
 
             $content = api_strstr($content, $matches[0][$i]);
             if ($i + 1 !== count($matches[0])) {

main/newscorm/resourcelinker.inc.php

Doc Comments +4 added lines

@@ -320,6 +320,10 @@
  * @param icon        - if ="icon" then the small icon will appear
  *                      if ="wrap" then wrapped settings are used (and no icon is displayed)
  *                      if ="nolink" then only the name is returned with no href and no icon (note:only in this case, the result is not displayed, but returned)
+ * @param string $completed
+ * @param string $id_in_path
+ * @param string $builder
+ * @param string $icon
  * @todo this function is too long, rewrite
  */
 function display_addedresource_link_in_learnpath($type, $id, $completed, $id_in_path, $builder, $icon, $level = 0) {

Indentation +16 added lines, -16 removed lines

@@ -286,14 +286,14 @@ 
             $ext = strtolower($ext[sizeof($ext)-1]);
             $myrow['path'] = rawurlencode($myrow['path']);
 
-			$array_ext=array('htm', 'html', 'gif', 'jpg', 'jpeg', 'png');
+            $array_ext=array('htm', 'html', 'gif', 'jpg', 'jpeg', 'png');
 
-			if (api_browser_support('svg')){
-				$array_ext[]='svg';
-			}
-			if (api_browser_support('ogg')){
-				$array_ext[]='ogg';
-			}
+            if (api_browser_support('svg')){
+                $array_ext[]='svg';
+            }
+            if (api_browser_support('ogg')){
+                $array_ext[]='ogg';
+            }
 
             $in_frames = in_array($ext, $array_ext);
 
@@ -392,7 +392,7 @@ 
             $result = Database::query($sql);
             $row = Database::fetch_array($result);
             if ($row['title'] != '') {
-                 $myrow['content'] = $row['title'];
+                    $myrow['content'] = $row['title'];
             }
             $desc = $row['description'];
             $ann_id = $row['item_id'];
@@ -469,7 +469,7 @@ 
             if ($icon == 'nolink') { return(shorten($myrow['title'], $length)); }
             if ($icon == 'icon') {
                 if ($linktype == 'Link _self') { echo "<img src='../img/links.gif' align=\"absmiddle\" alt='links'>"; }
-                   else { echo "<img src='../img/link_blank.gif' align=\"absmiddle\" alt='blank links'>"; }
+                    else { echo "<img src='../img/link_blank.gif' align=\"absmiddle\" alt='blank links'>"; }
             }
             $thelink = $myrow['url'];
             if ($builder != 'builder') {
@@ -494,7 +494,7 @@ 
             $myrow = Database::fetch_array($result);
 
             if ($builder == 'builder') { $origin = 'builder'; }
-              // This is needed for the exercise_submit.php can delete the session info about tests.
+                // This is needed for the exercise_submit.php can delete the session info about tests.
 
             $sql = "select * from $tbl_lp_item where id=$id_in_path";
             $result = Database::query($sql);
@@ -546,7 +546,7 @@ 
             $name = GetQuizName($path, $documentPath);
 
             if ($builder == 'builder') { $origin='builder'; }
-              // This is needed for the exercise_submit.php can delete the session info about tests.
+                // This is needed for the exercise_submit.php can delete the session info about tests.
 
             $sql = "select * from $tbl_lp_item where id=$id_in_path";
             $result = Database::query($sql);	$row = Database::fetch_array($result);
@@ -1106,7 +1106,7 @@ 
             $myrow = Database::fetch_array($result);
 
             if ($builder == 'builder') { $origin = 'builder'; }
-              // This is needed for the exercise_submit.php can delete the session info about tests.
+                // This is needed for the exercise_submit.php can delete the session info about tests.
 
             $sql = "select * from $tbl_lp_item where c_id = $course_id AND id=$id_in_path";
             $result = Database::query($sql);	$row = Database::fetch_array($result);
@@ -1330,10 +1330,10 @@ 
  */
 function delete_all_resources_type($type)
 {
-  $course_id = api_get_course_int_id();
-  $TABLERESOURCE = Database::get_course_table(TABLE_LINKED_RESOURCES);
-  $sql = "DELETE FROM $TABLERESOURCE WHERE c_id = $course_id AND source_type='$type'";
-  Database::query($sql);
+    $course_id = api_get_course_int_id();
+    $TABLERESOURCE = Database::get_course_table(TABLE_LINKED_RESOURCES);
+    $sql = "DELETE FROM $TABLERESOURCE WHERE c_id = $course_id AND source_type='$type'";
+    Database::query($sql);
 }
 
 /**

Braces +34 added lines, -34 removed lines

@@ -334,9 +334,14 @@ 
 
     $length = ((($builder == 'builder') && ($icon == 'nolink')) ? 65 : 32);
 
-    if ($builder != 'builder') $origin = 'learnpath';	//origin = learnpath in student view
+    if ($builder != 'builder') {
+        $origin = 'learnpath';
+    }
+    //origin = learnpath in student view
     $linktype = $type;
-    if (($type == 'Link _self') or ($type == 'Link _blank')) $type = 'Link';
+    if (($type == 'Link _self') or ($type == 'Link _blank')) {
+        $type = 'Link';
+    }
 
     // YW switched litteral tool names to use of constants declared in main_api.lib.php
     switch ($type) {
@@ -356,7 +361,7 @@ 
             if ($icon != 'nolink') {
                 if ($completed == 'completed') {
                     echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on'>";
-                }	else {
+                } else {
                     echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on' style='visibility: hidden'>";
                     //echo "&nbsp;";
                 }
@@ -407,7 +412,7 @@ 
             if ($icon != 'nolink') {
                 if ($completed == 'completed') {
                     echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on'>";
-                }	else {
+                } else {
                     echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on' style='visibility: hidden'>";
                     //echo "&nbsp;";
                 }
@@ -454,7 +459,7 @@ 
             if ($icon != 'nolink') {
                 if ($completed == 'completed') {
                     echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on'>";
-                }	else {
+                } else {
                     echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on' style='visibility: hidden'>";
                     //echo "&nbsp;";
                 }
@@ -468,8 +473,7 @@ 
 
             if ($icon == 'nolink') { return(shorten($myrow['title'], $length)); }
             if ($icon == 'icon') {
-                if ($linktype == 'Link _self') { echo "<img src='../img/links.gif' align=\"absmiddle\" alt='links'>"; }
-                   else { echo "<img src='../img/link_blank.gif' align=\"absmiddle\" alt='blank links'>"; }
+                if ($linktype == 'Link _self') { echo "<img src='../img/links.gif' align=\"absmiddle\" alt='links'>"; } else { echo "<img src='../img/link_blank.gif' align=\"absmiddle\" alt='blank links'>"; }
             }
             $thelink = $myrow['url'];
             if ($builder != 'builder') {
@@ -558,7 +562,7 @@ 
             if ($icon != 'nolink') {
                 if ($completed == 'completed') {
                     echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on'>";
-                }	else {
+                } else {
                     echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on' style='visibility: hidden'>";
                     //echo "&nbsp;";
                 }
@@ -603,7 +607,7 @@ 
             if ($icon != 'nolink') {
                 if ($completed == 'completed') {
                     echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on'>";
-                }	else {
+                } else {
                     echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on' style='visibility: hidden'>";
                     //echo "&nbsp;";
                 }
@@ -647,7 +651,7 @@ 
             if ($icon != 'nolink') {
                 if ($completed == 'completed') {
                     echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on'>";
-                }	else {
+                } else {
                     echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on' style='visibility: hidden'>";
                     //echo "&nbsp;";
                 }
@@ -698,7 +702,7 @@ 
             if ($icon != 'nolink') {
                 if ($completed == 'completed') {
                     echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on'>";
-                }	else {
+                } else {
                     echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on' style='visibility: hidden'>";
                     //echo "&nbsp;";
                 }
@@ -801,7 +805,7 @@ 
             if ($icon != 'nolink') {
                 if ($completed == 'completed') {
                     echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on'>";
-                }	else {
+                } else {
                     echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on' style='visibility: hidden'>";
                     //echo "&nbsp;";
                 }
@@ -842,7 +846,7 @@ 
             if ($icon != 'nolink') {
                 if ($completed == 'completed') {
                     echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on'>";
-                }	else {
+                } else {
                     echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on' style='visibility: hidden'>";
                     //echo "&nbsp;";
                 }
@@ -858,8 +862,7 @@ 
                 echo "<a href=\"".api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Dropbox&origin=$origin#$id_in_path\" class='$completed'>".shorten($name,($length-3*$level))."</a>"; $items[]=api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Dropbox&origin=$origin#$id_in_path";
                 if ($desc != '') {
                     if ($icon != 'wrap') {
-                        echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc, ($length-3*$level))."</div></td></tr>"; }
-                    else {
+                        echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc, ($length-3*$level))."</div></td></tr>"; } else {
                         echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc, ($length-3*$level))."</div>"; }
                 }
             } else {
@@ -897,8 +900,7 @@ 
                 $items[] = api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Introduction_text&origin=$origin#$id_in_path";
                 if ($desc != '') {
                     if ($icon != 'wrap') {
-                        echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc, ($length-3*$level))."</div></td></tr>"; }
-                    else {
+                        echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc, ($length-3*$level))."</div></td></tr>"; } else {
                         echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc, ($length-3*$level))."</div>"; }
                 }
             } else {
@@ -920,7 +922,7 @@ 
             if ($icon != 'nolink') {
                 if ($completed == 'completed') {
                     echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on'>";
-                }	else {
+                } else {
                     echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on' style='visibility: hidden'>";
                     //echo "&nbsp;";
                 }
@@ -936,8 +938,7 @@ 
                 echo "<a href=\"".api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Course_description&origin=$origin#$id_in_path\" class='$completed'>".shorten($name,($length-3*$level))."</a>"; $items[]=api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Course_description&origin=$origin#$id_in_path";
                 if ($desc != '') {
                     if ($icon != 'wrap') {
-                        echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc, ($length-3*$level))."</div></td></tr>"; }
-                    else {
+                        echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc, ($length-3*$level))."</div></td></tr>"; } else {
                         echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc, ($length-3*$level))."</div>"; }
                 }
             } else {
@@ -976,8 +977,7 @@ 
                 echo "<a href=\"".api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Groups&origin=$origin#$id_in_path\" class='$completed'>".shorten($name,($length-3*$level))."</a>"; $items[]=api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Groups&origin=$origin#$id_in_path";
                 if ($desc != '') {
                     if ($icon != 'wrap') {
-                        echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc, ($length-3*$level))."</div></td></tr>"; }
-                    else {
+                        echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc, ($length-3*$level))."</div></td></tr>"; } else {
                         echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc, ($length-3*$level))."</div>"; }
                 }
             } else {
@@ -1015,8 +1015,7 @@ 
                 echo "<a href=\"".api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Users&origin=$origin#$id_in_path\" class='$completed'>".shorten($name,($length-3*$level))."</a>"; $items[]=api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Users&origin=$origin#$id_in_path";
                 if ($desc != '') {
                     if ($icon != 'wrap') {
-                        echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc, ($length-3*$level))."</div></td></tr>"; }
-                    else {
+                        echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc, ($length-3*$level))."</div></td></tr>"; } else {
                         echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc, ($length-3*$level))."</div>"; }
                 }
             } else {
@@ -1346,11 +1345,12 @@ 
             WHERE c_id = $course_id AND source_type='$type' and source_id='$id'";
     $result = Database::query($sql);
     $number_added = Database::num_rows($result);
-    if ($number_added != 0)
-        return true;
-    else
-        return false;
-}
+    if ($number_added != 0) {
+            return true;
+    } else {
+            return false;
+    }
+    }
 
 /**
  * this function is to load the resources that were added to a specific item
@@ -1459,8 +1459,7 @@ 
             next($addedresource);
         }
         echo '</table>';
-    }
-    else { // it is a string
+    } else { // it is a string
         echo '';
     }
 } // end of the display_resources function
@@ -1492,8 +1491,7 @@ 
                 echo "<a href='".api_get_self()."?content=".$type."&source_forum=".$_GET['source_forum']."&add=".$id."&source_id=$source_id&action=$action&lp_id=$learnpath_id&parent_item_id=$chapter_id&originalresource=no&target=$target'>".$lang_add_it_or_resource."</a>";
             }
         }
-    }
-    else { // if it is not an array, it is a string
+    } else { // if it is not an array, it is a string
         if ($_SESSION['addedresource'] !== $type || $_SESSION['addedresourceid'] !== $id) {
             if ($from_learnpath) { $lang_add_it_or_resource = get_lang('AddIt'); } else { $lang_add_it_or_resource = get_lang('AddResource'); }
             echo "<a href='".api_get_self()."?content=".$type."&folder=".$folder."&source_forum=".$_GET['source_forum']."&add=".$id."&source_id=$source_id&action=$action&lp_id=$learnpath_id&parent_item_id=$chapter_id&originalresource=no&target=$target'>".$lang_add_it_or_resource."</a>";
@@ -1519,7 +1517,9 @@ 
     $course_id = api_get_course_int_id();
 
     // Styling the link of the added resource
-    if ($style != '') $styling = ' class="'.$style.'"';
+    if ($style != '') {
+        $styling = ' class="'.$style.'"';
+    }
     if ($new_window) { $target = ' target = "_blank" '; } else { $target = ' target = "_self" '; }
 
     $output = '';

Spacing +169 added lines, -169 removed lines

@@ -17,8 +17,8 @@ 
 $use_anonymous = true;
 
 require_once '../inc/global.inc.php';
-if (!empty($_course['language'])){
-    $resource_linker_file =  api_get_path(SYS_CODE_PATH).'lang/'.$_course['language'].'/resourcelinker.inc.php';
+if (!empty($_course['language'])) {
+    $resource_linker_file = api_get_path(SYS_CODE_PATH).'lang/'.$_course['language'].'/resourcelinker.inc.php';
     if (file_exists($resource_linker_file)) {
         require_once $resource_linker_file;
     }
@@ -47,11 +47,11 @@ 
         echo "<a href='".api_get_self()."?content=Document&amp;source_forum=".$_GET['source_forum']."&amp;source_id=$source_id&amp;action=$action&amp;learnpath_id=$learnpath_id&amp;chapter_id=$chapter_id&amp;originalresource=no'><img src='../img/folder_up.gif' border='0' />".get_lang('LevelUp')."</a>";
     }
     if ($level && $level != 0 && $level != 1) {
-        $folder_up=$folder;
-        $folder_temp=explode('/',$folder);
-        $last=count($folder_temp)-1;
+        $folder_up = $folder;
+        $folder_temp = explode('/', $folder);
+        $last = count($folder_temp) - 1;
         unset($folder_temp[$last]);
-        $folder_up=implode('/',$folder_temp);
+        $folder_up = implode('/', $folder_temp);
         echo "<a href='".api_get_self()."?content=Document&amp;source_forum=".$_GET['source_forum']."&amp;folder=$folder_up&amp;source_id=$source_id&amp;action=$action&amp;learnpath_id=$learnpath_id&amp;chapter_id=$chapter_id&amp;originalresource=no'><img src='../img/folder_up.gif' border='0' />".get_lang('LevelUp')."</a>";
     }
 }
@@ -88,7 +88,7 @@ 
     $result = Database::query($sql);
     while ($row = Database::fetch_array($result)) {
         if (!$folder) {
-            if (get_levels($row['path'])-1 == 1) {
+            if (get_levels($row['path']) - 1 == 1) {
                 // showing the right icon.
                 if (file_or_folder($row['path'])) {
                         echo '<img src="../img/file.gif" align="middle" />';
@@ -103,7 +103,7 @@ 
                     echo "&folder=".substr($row['path'], 1)."&source_id=$source_id&source_forum=".$_GET['source_forum']."&action=$action&lp_id=$learnpath_id&parent_item_id=$chapter_id&originalresource=no'>".substr($row['path'], 1).'</a><br />';
                 } else {
                     echo substr($row['path'], 1).' ';
-                    echo showorhide_addresourcelink('Document',$row['id']);
+                    echo showorhide_addresourcelink('Document', $row['id']);
                     echo '<br />';
                 }
             }
@@ -113,7 +113,7 @@ 
             $level = get_levels($folder) + 1;
 
             // We calculate each level of the database entry.
-            $file_level=get_levels($row['path'])-1;
+            $file_level = get_levels($row['path']) - 1;
             // If the level of the database entry is equal to the level we ar in, we put it into an array
             // as this is a potential good entry.
             if ($file_level == $level) {
@@ -191,14 +191,14 @@ 
     $addedresourceid = $_SESSION['addedresourceid'];
     if ($_SESSION['addedresource']) {
         foreach ($addedresource as $resource_type) {
-            $sql="INSERT INTO $resource_table (c_id, source_type, source_id, resource_type, resource_id) VALUES
+            $sql = "INSERT INTO $resource_table (c_id, source_type, source_id, resource_type, resource_id) VALUES
             ($course_id, '$source_type', '$source_id', '$resource_type', '".$addedresourceid[key($addedresource)]."')";
             Database::query($sql);
-            $i=key($addedresource);
+            $i = key($addedresource);
             next($addedresource);
         }
-        $_SESSION['addedresource']='';
-        $_SESSION['addedresourceid']='';
+        $_SESSION['addedresource'] = '';
+        $_SESSION['addedresourceid'] = '';
     }
 }
 
@@ -278,21 +278,21 @@ 
             $dbTable = Database::get_course_table(TABLE_DOCUMENT);
             $result = Database::query("SELECT * FROM $dbTable WHERE c_id = $course_id AND id=$id");
             $myrow = Database::fetch_array($result);
-            $pathname = explode('/',$myrow['path']); // Making a correct name for the link.
-            $last = count($pathname) - 1;  // Making a correct name for the link.
-            $filename = $pathname[$last];  // Making a correct name for the link.
+            $pathname = explode('/', $myrow['path']); // Making a correct name for the link.
+            $last = count($pathname) - 1; // Making a correct name for the link.
+            $filename = $pathname[$last]; // Making a correct name for the link.
             $image = choose_image($filename);
             $ext = explode('.', $filename);
-            $ext = strtolower($ext[sizeof($ext)-1]);
+            $ext = strtolower($ext[sizeof($ext) - 1]);
             $myrow['path'] = rawurlencode($myrow['path']);
 
-			$array_ext=array('htm', 'html', 'gif', 'jpg', 'jpeg', 'png');
+			$array_ext = array('htm', 'html', 'gif', 'jpg', 'jpeg', 'png');
 
-			if (api_browser_support('svg')){
-				$array_ext[]='svg';
+			if (api_browser_support('svg')) {
+				$array_ext[] = 'svg';
 			}
-			if (api_browser_support('ogg')){
-				$array_ext[]='ogg';
+			if (api_browser_support('ogg')) {
+				$array_ext[] = 'ogg';
 			}
 
             $in_frames = in_array($ext, $array_ext);
@@ -334,7 +334,7 @@ 
 
     $length = ((($builder == 'builder') && ($icon == 'nolink')) ? 65 : 32);
 
-    if ($builder != 'builder') $origin = 'learnpath';	//origin = learnpath in student view
+    if ($builder != 'builder') $origin = 'learnpath'; //origin = learnpath in student view
     $linktype = $type;
     if (($type == 'Link _self') or ($type == 'Link _blank')) $type = 'Link';
 
@@ -342,12 +342,12 @@ 
     switch ($type) {
         case TOOL_CALENDAR_EVENT:
         case 'Agenda':
-            $TABLEAGENDA 		= Database::get_course_table(TABLE_AGENDA);
+            $TABLEAGENDA = Database::get_course_table(TABLE_AGENDA);
             $result = Database::query("SELECT * FROM $TABLEAGENDA WHERE c_id = $course_id AND id=$id");
             $myrow = Database::fetch_array($result);
 
             $sql = "select * from $tbl_lp_item where c_id = $course_id AND id=$id_in_path";
-            $result = Database::query($sql);	$row = Database::fetch_array($result);
+            $result = Database::query($sql); $row = Database::fetch_array($result);
             if ($row['title'] != '') { $myrow['title'] = $row['title']; }
             $desc = $row['description'];
             $agenda_id = $row['item_id'];
@@ -356,7 +356,7 @@ 
             if ($icon != 'nolink') {
                 if ($completed == 'completed') {
                     echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on'>";
-                }	else {
+                } else {
                     echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on' style='visibility: hidden'>";
                     //echo "&nbsp;";
                 }
@@ -368,17 +368,17 @@ 
             if ($icon == 'nolink') { return(shorten($myrow['title'], $length)); }
             if ($icon == 'icon') { echo "<img src='../img/agenda.gif' align=\"absmiddle\" alt='agenda'>"; }
             if ($builder != 'builder') {
-                echo "<a href=\"".api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Agenda&origin=$origin&agenda_id=$agenda_id#$id_in_path\" class='$completed'>".shorten($myrow['title'], ($length-3*$level))."</a>";
+                echo "<a href=\"".api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Agenda&origin=$origin&agenda_id=$agenda_id#$id_in_path\" class='$completed'>".shorten($myrow['title'], ($length - 3 * $level))."</a>";
                 $items[] = api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Agenda&origin=$origin&agenda_id=$agenda_id#$id_in_path";
                 if ($desc != '') {
                     if ($icon != 'wrap') {
-                        echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc, ($length-3*$level))."</div></td></tr>";
+                        echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc, ($length - 3 * $level))."</div></td></tr>";
                     } else {
-                        echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc, ($length-3*$level))."</div>";
+                        echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc, ($length - 3 * $level))."</div>";
                     }
                 }
             } else {
-                echo "<a href=\"../calendar/agenda.php?origin=$origin&agenda_id=$agenda_id\" class='$completed' target='_blank'>".shorten($myrow['title'], ($length-3*$level))."</a>";
+                echo "<a href=\"../calendar/agenda.php?origin=$origin&agenda_id=$agenda_id\" class='$completed' target='_blank'>".shorten($myrow['title'], ($length - 3 * $level))."</a>";
             }
             break;
 
@@ -407,7 +407,7 @@ 
             if ($icon != 'nolink') {
                 if ($completed == 'completed') {
                     echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on'>";
-                }	else {
+                } else {
                     echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on' style='visibility: hidden'>";
                     //echo "&nbsp;";
                 }
@@ -420,26 +420,26 @@ 
                 return(true);
             }
 
-            if ($icon == 'nolink') { return(shorten($title,$length)); }
+            if ($icon == 'nolink') { return(shorten($title, $length)); }
             if ($icon == 'icon') { echo "<img src='../img/valves.gif' align=\"absmiddle\" alt='ad valvas'>"; }
             if ($builder != 'builder') {
-                echo "<a href=\"".api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Ad_Valvas&origin=$origin&ann_id=$ann_id#$id_in_path\" class='$completed'>".shorten($title, ($length-3*$level))."</a>";
+                echo "<a href=\"".api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Ad_Valvas&origin=$origin&ann_id=$ann_id#$id_in_path\" class='$completed'>".shorten($title, ($length - 3 * $level))."</a>";
                 $items[] = api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Ad_Valvas&origin=$origin&ann_id=$ann_id#$id_in_path";
                 if ($desc != '') {
                     if ($icon != 'wrap') {
-                        echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc, ($length-3*$level))."</div></td></tr>";
+                        echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc, ($length - 3 * $level))."</div></td></tr>";
                     } else {
-                        echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc, ($length-3*$level))."</div>";
+                        echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc, ($length - 3 * $level))."</div>";
                     }
                 }
             } else {
-                echo "<a href=\"../announcements/announcements.php?origin=$origin&ann_id=$ann_id\" class='$completed' target='_blank'>".shorten($title, ($length-3*$level))."</a>";
+                echo "<a href=\"../announcements/announcements.php?origin=$origin&ann_id=$ann_id\" class='$completed' target='_blank'>".shorten($title, ($length - 3 * $level))."</a>";
             }
             break;
 
         case TOOL_LINK:
         case 'Link':
-            $TABLETOOLLINK	= Database::get_course_table(TABLE_LINK);
+            $TABLETOOLLINK = Database::get_course_table(TABLE_LINK);
             $result = Database::query("SELECT * FROM $TABLETOOLLINK WHERE c_id = $course_id AND id=$id");
             $myrow = Database::fetch_array($result);
 
@@ -447,14 +447,14 @@ 
             $result = Database::query($sql);
             $row = Database::fetch_array($result);
             if ($row['title'] != '') { $myrow['title'] = $row['title']; }
-            $desc=$row['description'];
+            $desc = $row['description'];
             echo str_repeat("&nbsp;&gt;", $level);
 
             if (($builder != 'builder') && ($icon != 'wrap')) { echo "<td>"; }
             if ($icon != 'nolink') {
                 if ($completed == 'completed') {
                     echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on'>";
-                }	else {
+                } else {
                     echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on' style='visibility: hidden'>";
                     //echo "&nbsp;";
                 }
@@ -473,23 +473,23 @@ 
             }
             $thelink = $myrow['url'];
             if ($builder != 'builder') {
-                echo "<a href=\"".api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=$linktype&origin=$origin&thelink=$thelink#$id_in_path\" class='$completed'>".shorten($myrow['title'], ($length-3*$level))."</a>";
-                $items[]=api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=$linktype&origin=$origin&thelink=$thelink#$id_in_path";
+                echo "<a href=\"".api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=$linktype&origin=$origin&thelink=$thelink#$id_in_path\" class='$completed'>".shorten($myrow['title'], ($length - 3 * $level))."</a>";
+                $items[] = api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=$linktype&origin=$origin&thelink=$thelink#$id_in_path";
                 if ($desc != '') {
                     if ($icon != 'wrap') {
-                        echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc, ($length-3*$level))."</div></td></tr>";
+                        echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc, ($length - 3 * $level))."</div></td></tr>";
                     } else {
-                        echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc, ($length-3*$level))."</div>";
+                        echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc, ($length - 3 * $level))."</div>";
                     }
                 }
             } else {
-                echo "<a href=\"$thelink\" class='$completed' target='_blank'>".shorten($myrow['title'], ($length-3*$level))."</a>";
+                echo "<a href=\"$thelink\" class='$completed' target='_blank'>".shorten($myrow['title'], ($length - 3 * $level))."</a>";
             }
             break;
 
         case TOOL_QUIZ:
         case 'Exercise':
-            $TBL_EXERCICES  = Database::get_course_table(TABLE_QUIZ_TEST);
+            $TBL_EXERCICES = Database::get_course_table(TABLE_QUIZ_TEST);
             $result = Database::query("SELECT * FROM $TBL_EXERCICES WHERE c_id = $course_id AND id=$id");
             $myrow = Database::fetch_array($result);
 
@@ -522,35 +522,35 @@ 
             if ($icon == 'nolink') { return(shorten($myrow['title'], $length)); }
             if ($icon == 'icon') { echo "<img src='../img/quiz.gif' align=\"absmiddle\" alt='quizz'>"; }
             if ($builder != 'builder') {
-                echo "<a href=\"".api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Exercise&origin=$origin&exerciseId=".$myrow["id"]."#$id_in_path\" class='$completed'>".shorten($myrow['title'], ($length-3*$level))."</a>";
+                echo "<a href=\"".api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Exercise&origin=$origin&exerciseId=".$myrow["id"]."#$id_in_path\" class='$completed'>".shorten($myrow['title'], ($length - 3 * $level))."</a>";
                 $items[] = api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Exercise&origin=$origin&exerciseId=".$myrow["id"]."#$id_in_path";
                 if ($desc != '') {
                     if ($icon != 'wrap') {
-                        echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc, ($length-3*$level))."</div></td></tr>";
+                        echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc, ($length - 3 * $level))."</div></td></tr>";
                     } else {
-                        echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc, ($length-3*$level))."</div>";
+                        echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc, ($length - 3 * $level))."</div>";
                     }
                 }
             } else {
-                echo "<a href=\"../exercice/exercise_submit.php?origin=$origin&exerciseId=".$myrow['id']."\" class='$completed' target='_blank'>".shorten($myrow['title'], ($length-3*$level))."</a>";
+                echo "<a href=\"../exercice/exercise_submit.php?origin=$origin&exerciseId=".$myrow['id']."\" class='$completed' target='_blank'>".shorten($myrow['title'], ($length - 3 * $level))."</a>";
             }
             break;
 
         case 'hotpotatoes':
         case 'HotPotatoes':
-            $TBL_DOCUMENT  = Database::get_course_table(TABLE_DOCUMENT);
+            $TBL_DOCUMENT = Database::get_course_table(TABLE_DOCUMENT);
             $documentPath = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document';
             $result = Database::query("SELECT * FROM ".$TBL_DOCUMENT." WHERE c_id = $course_id AND id=$id");
             $myrow = Database::fetch_array($result);
             $path = $myrow['path'];
             $name = GetQuizName($path, $documentPath);
 
-            if ($builder == 'builder') { $origin='builder'; }
+            if ($builder == 'builder') { $origin = 'builder'; }
               // This is needed for the exercise_submit.php can delete the session info about tests.
 
             $sql = "select * from $tbl_lp_item where id=$id_in_path";
-            $result = Database::query($sql);	$row = Database::fetch_array($result);
-            if ($row['title'] != '') { $name=$row['title']; }
+            $result = Database::query($sql); $row = Database::fetch_array($result);
+            if ($row['title'] != '') { $name = $row['title']; }
             $desc = $row['description'];
             echo str_repeat("&nbsp;&gt;", $level);
 
@@ -558,32 +558,32 @@ 
             if ($icon != 'nolink') {
                 if ($completed == 'completed') {
                     echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on'>";
-                }	else {
+                } else {
                     echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on' style='visibility: hidden'>";
                     //echo "&nbsp;";
                 }
             }
             if (($builder != 'builder') && ($icon != 'wrap')) { echo "</td><td>"; }
 
-            if ($name=='') { echo "<span class='messagesmall'>".get_lang('StepDeleted1')." $type ".get_lang('StepDeleted2')."</span>"; return(true); }
+            if ($name == '') { echo "<span class='messagesmall'>".get_lang('StepDeleted1')." $type ".get_lang('StepDeleted2')."</span>"; return(true); }
 
-            if ($icon == 'nolink') { return(shorten($name,$length)); }
+            if ($icon == 'nolink') { return(shorten($name, $length)); }
             if ($icon == 'icon') { echo "<img src='../img/jqz.jpg' align=\"absmiddle\" alt='hot potatoes'>"; }
 
             $cid = $_course['official_code'];
 
             if ($builder != 'builder') {
-                echo "<a href=\"".api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=HotPotatoes&origin=$origin&id=$id#$id_in_path\" class='$completed'>".shorten($name,($length-3*$level))."</a>";
+                echo "<a href=\"".api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=HotPotatoes&origin=$origin&id=$id#$id_in_path\" class='$completed'>".shorten($name, ($length - 3 * $level))."</a>";
                 $items[] = api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=HotPotatoes&origin=$origin&id=$id#$id_in_path";
                 if ($desc != '') {
                     if ($icon != 'wrap') {
-                        echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc, ($length-3*$level))."</div></td></tr>";
+                        echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc, ($length - 3 * $level))."</div></td></tr>";
                     } else {
-                        echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc, ($length-3*$level))."</div>";
+                        echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc, ($length - 3 * $level))."</div>";
                     }
                 }
             } else {
-                echo "&nbsp;<a href=\"../exercice/showinframes.php?file=$path&cid=$cid&uid=".$_user['user_id']."\" class='$completed' target='_blank'>".shorten($name,($length-3*$level))."</a>";
+                echo "&nbsp;<a href=\"../exercice/showinframes.php?file=$path&cid=$cid&uid=".$_user['user_id']."\" class='$completed' target='_blank'>".shorten($name, ($length - 3 * $level))."</a>";
             }
             break;
 
@@ -594,7 +594,7 @@ 
             $myrow = Database::fetch_array($result);
 
             $sql = "select * from $tbl_lp_item where c_id = $course_id AND id=$id_in_path";
-            $result = Database::query($sql);	$row = Database::fetch_array($result);
+            $result = Database::query($sql); $row = Database::fetch_array($result);
             if ($row['title'] != '') { $myrow["forum_name"] = $row['title']; }
             $desc = $row['description'];
             echo str_repeat("&nbsp;&gt;", $level);
@@ -603,30 +603,30 @@ 
             if ($icon != 'nolink') {
                 if ($completed == 'completed') {
                     echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on'>";
-                }	else {
+                } else {
                     echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on' style='visibility: hidden'>";
                     //echo "&nbsp;";
                 }
             }
             if (($builder != 'builder') && ($icon != 'wrap')) { echo "</td><td>"; }
 
-            if ($myrow["forum_name"]=='') { $type="Forum"; echo "<span class='messagesmall'>".get_lang('StepDeleted1')." $type ".get_lang('StepDeleted2')."</span>"; return(true); }
+            if ($myrow["forum_name"] == '') { $type = "Forum"; echo "<span class='messagesmall'>".get_lang('StepDeleted1')." $type ".get_lang('StepDeleted2')."</span>"; return(true); }
 
             if ($icon == 'nolink') { return(shorten($myrow['forum_name'], $length)); }
             if ($icon == 'icon') { echo "<img src='../img/forum.gif' align=\"absmiddle\" alt='forum'>"; }
             $forumparameters = "forum=".$myrow["forum_id"]."&md5=".$myrow["md5"];
             if ($builder != 'builder') {
-                echo "<a href=\"".api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Forum&origin=$origin&forumparameters=$forumparameters#$id_in_path\" class='$completed'>".shorten($myrow["forum_name"],($length-3*$level))."</a>";
+                echo "<a href=\"".api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Forum&origin=$origin&forumparameters=$forumparameters#$id_in_path\" class='$completed'>".shorten($myrow["forum_name"], ($length - 3 * $level))."</a>";
                 $items[] = api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Forum&origin=$origin&forumparameters=$forumparameters#$id_in_path";
                 if ($desc != '') {
                     if ($icon != 'wrap') {
-                        echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div></td></tr>";
+                        echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc, ($length - 3 * $level))."</div></td></tr>";
                     } else {
-                        echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div>";
+                        echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc, ($length - 3 * $level))."</div>";
                     }
                 }
             } else {
-                echo "<a href=\"../phpbb/viewforum.php?$forumparameters\" class='$completed' target='_blank'>".shorten($myrow["forum_name"],($length-3*$level))."</a>";
+                echo "<a href=\"../phpbb/viewforum.php?$forumparameters\" class='$completed' target='_blank'>".shorten($myrow["forum_name"], ($length - 3 * $level))."</a>";
             }
             break;
 
@@ -638,7 +638,7 @@ 
             $myrow = Database::fetch_array($result);
 
             $sql = "select * from $tbl_lp_item where id=$id_in_path";
-            $result = Database::query($sql);	$row = Database::fetch_array($result);
+            $result = Database::query($sql); $row = Database::fetch_array($result);
             if ($row['title'] != '') { $myrow['topic_title'] = $row['title']; }
             $desc = $row['description'];
             echo str_repeat("&nbsp;&gt;", $level);
@@ -647,7 +647,7 @@ 
             if ($icon != 'nolink') {
                 if ($completed == 'completed') {
                     echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on'>";
-                }	else {
+                } else {
                     echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on' style='visibility: hidden'>";
                     //echo "&nbsp;";
                 }
@@ -659,17 +659,17 @@ 
             if ($icon == 'nolink') { return(shorten($myrow['topic_title'], $length)); }
             if ($icon == 'icon') { echo "<img src='../img/forum.gif' align=\"absmiddle\" alt='forum'>"; }
             if ($builder != 'builder') {
-                echo "<a href=\"".api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Thread&origin=$origin&topic=".$myrow["topic_id"]."&forum=".$myrow["forum_id"]."&md5=".$myrow["md5"]."#$id_in_path\" class='$completed'>".shorten($myrow["topic_title"], ($length-3*$level))."</a>";
+                echo "<a href=\"".api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Thread&origin=$origin&topic=".$myrow["topic_id"]."&forum=".$myrow["forum_id"]."&md5=".$myrow["md5"]."#$id_in_path\" class='$completed'>".shorten($myrow["topic_title"], ($length - 3 * $level))."</a>";
                 $items[] = api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Thread&origin=$origin&topic=".$myrow["topic_id"]."&forum=".$myrow["forum_id"]."&md5=".$myrow["md5"]."#$id_in_path";
                 if ($desc != '') {
                     if ($icon != 'wrap') {
-                        echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div></td></tr>";
+                        echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc, ($length - 3 * $level))."</div></td></tr>";
                     } else {
-                        echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div>";
+                        echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc, ($length - 3 * $level))."</div>";
                     }
                 }
             } else {
-                echo "<a href=\"../phpbb/viewtopic.php?topic=".$myrow["topic_id"]."&forum=".$myrow["forum_id"]."&md5=".$myrow["md5"]."\" class='$completed' target='_blank'>".shorten($myrow["topic_title"],($length-3*$level))."</a>";
+                echo "<a href=\"../phpbb/viewtopic.php?topic=".$myrow["topic_id"]."&forum=".$myrow["forum_id"]."&md5=".$myrow["md5"]."\" class='$completed' target='_blank'>".shorten($myrow["topic_title"], ($length - 3 * $level))."</a>";
             }
             break;
 
@@ -684,13 +684,13 @@ 
 
             $sql = "select * from $tbl_lp_item where c_id = $course_id AND id=$id_in_path";
             $result = Database::query($sql);
-            $row=Database::fetch_array($result);
+            $row = Database::fetch_array($result);
             if ($row['title'] != '') { $myrow['post_title'] = $row['title']; }
             $desc = $row['description'];
             echo str_repeat("&nbsp;&gt;", $level);
 
-            $posternom = $myrow['nom'];				$posterprenom = $myrow['prenom'];
-            $posttime = $myrow['post_time'];			$posttext = $myrow['post_text'];
+            $posternom = $myrow['nom']; $posterprenom = $myrow['prenom'];
+            $posttime = $myrow['post_time']; $posttext = $myrow['post_text'];
             $posttitle = $myrow['post_title'];
             $posttext = str_replace('"', "'", $posttext);
 
@@ -698,7 +698,7 @@ 
             if ($icon != 'nolink') {
                 if ($completed == 'completed') {
                     echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on'>";
-                }	else {
+                } else {
                     echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on' style='visibility: hidden'>";
                     //echo "&nbsp;";
                 }
@@ -710,19 +710,19 @@ 
                 echo "<span class='messagesmall'>".get_lang('StepDeleted1')." $type ".get_lang('StepDeleted2')."</span>"; return(true);
             }
 
-            if ($icon == 'nolink') { return(shorten($myrow["post_title"],$length)); }
+            if ($icon == 'nolink') { return(shorten($myrow["post_title"], $length)); }
             if ($icon == 'icon') { echo "<img src='../img/forum.gif' align=\"absmiddle\" alt='forum'>"; }
             if ($builder != 'builder') {
-                echo "<a href=\"".api_get_self()."?action=closelesson&source_forum=".intval($_GET['source_forum'])."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Post&origin=$origin&posternom=$posternom&posterprenom=$posterprenom&posttime=$posttime&posttext=$posttext&posttitle=$posttitle#$id_in_path\" class='$completed'>".shorten($myrow["post_title"],($length-3*$level))."</a>"; $items[]=api_get_self()."?action=closelesson&source_forum=".intval($_GET['source_forum'])."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Post&origin=$origin&posternom=$posternom&posterprenom=$posterprenom&posttime=$posttime&posttext=$posttext&posttitle=$posttitle#$id_in_path";
+                echo "<a href=\"".api_get_self()."?action=closelesson&source_forum=".intval($_GET['source_forum'])."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Post&origin=$origin&posternom=$posternom&posterprenom=$posterprenom&posttime=$posttime&posttext=$posttext&posttitle=$posttitle#$id_in_path\" class='$completed'>".shorten($myrow["post_title"], ($length - 3 * $level))."</a>"; $items[] = api_get_self()."?action=closelesson&source_forum=".intval($_GET['source_forum'])."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Post&origin=$origin&posternom=$posternom&posterprenom=$posterprenom&posttime=$posttime&posttext=$posttext&posttitle=$posttitle#$id_in_path";
                 if ($desc != '') {
                     if ($icon != 'wrap') {
-                        echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div></td></tr>";
+                        echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc, ($length - 3 * $level))."</div></td></tr>";
                     } else {
-                        echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div>";
+                        echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc, ($length - 3 * $level))."</div>";
                     }
                 }
             } else {
-                echo "<a href=\"../phpbb/viewtopic.php?topic=".$myrow["topic_id"]."&forum=".$myrow["forum_id"]."&md5=".$myrow["md5"]."\" class='$completed' target='_blank'>".shorten($myrow["post_title"],($length-3*$level))."</a>";
+                echo "<a href=\"../phpbb/viewtopic.php?topic=".$myrow["topic_id"]."&forum=".$myrow["forum_id"]."&md5=".$myrow["md5"]."\" class='$completed' target='_blank'>".shorten($myrow["post_title"], ($length - 3 * $level))."</a>";
             }
             break;
 
@@ -735,14 +735,14 @@ 
             $myrow = Database::fetch_array($result);
 
             $pathname = explode('/', $myrow['path']); // Making a correct name for the link.
-            $last = count($pathname) - 1;  // Making a correct name for the link.
-            $filename=$pathname[$last];  // Making a correct name for the link.
+            $last = count($pathname) - 1; // Making a correct name for the link.
+            $filename = $pathname[$last]; // Making a correct name for the link.
             if (($builder != 'builder') && ($icon != 'wrap')) { echo "<td>"; }
 
             echo str_repeat("&nbsp;&gt;", $level);
 
             if ($icon != 'nolink') {
-                if ($completed=='completed') {
+                if ($completed == 'completed') {
                     echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on'>";
                 } else {
                     echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on' style='visibility: hidden'>";
@@ -754,9 +754,9 @@ 
 
             $sql = "select * from $tbl_lp_item where id=$id_in_path";
             //error_log('New LP - Querying lp_item table: '.$sql, 0);
-            $result = Database::query($sql);	$row = Database::fetch_array($result);
+            $result = Database::query($sql); $row = Database::fetch_array($result);
             if ($row['title'] != '') { $filename = $row['title']; }
-            $desc=$row['description'];
+            $desc = $row['description'];
 
             if (($myrow['path'] == '') && ($filename == '')) {
                 echo "<span class='messagesmall'>".get_lang('StepDeleted1')." $type ".get_lang('StepDeleted2')."</span>";
@@ -767,22 +767,22 @@ 
             if ($icon == 'icon') { echo "<img src='../img/$image' align=\"absmiddle\" alt='$image'>"; }
             if ($builder != 'builder')
             {
-                echo "<a href=\"".api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Document&origin=$origin&docurl=".$myrow["path"]."#$id_in_path\" class='$completed'>".shorten($filename,($length-3*$level))."</a>";
+                echo "<a href=\"".api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Document&origin=$origin&docurl=".$myrow["path"]."#$id_in_path\" class='$completed'>".shorten($filename, ($length - 3 * $level))."</a>";
                 if ($desc != '') {
                     if ($icon != 'wrap') {
-                        echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div></td></tr>";
+                        echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc, ($length - 3 * $level))."</div></td></tr>";
                     } else {
-                        echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div>";
+                        echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc, ($length - 3 * $level))."</div>";
                     }
                 } $items[] = api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Document&origin=$origin&docurl=".$myrow["path"]."#$id_in_path";
             } else {
-                $enableDocumentParsing=yes;
+                $enableDocumentParsing = yes;
                 if (!$enableDocumentParsing) {
                     // This is the solution for the non-parsing version in the builder.
                     $file = urlencode($myrow['path']);
-                    echo "<a href='../document/showinframes.php?file=$file' class='$completed' $hyperlink_target_parameter>".shorten($filename,($length-3*$level))."</a>";
+                    echo "<a href='../document/showinframes.php?file=$file' class='$completed' $hyperlink_target_parameter>".shorten($filename, ($length - 3 * $level))."</a>";
                 } else {
-                    echo "<a href=\"../document/download.php?doc_url=".$myrow['path']."\" class='$completed' $hyperlink_target_parameter>".shorten($filename,($length-3*$level))."</a>";
+                    echo "<a href=\"../document/download.php?doc_url=".$myrow['path']."\" class='$completed' $hyperlink_target_parameter>".shorten($filename, ($length - 3 * $level))."</a>";
                 }
             }
             break;
@@ -793,7 +793,7 @@ 
             $sql = "select * from $tbl_lp_item where c_id = $course_id AND id=$id_in_path";
             $result = Database::query($sql);
             $row = Database::fetch_array($result);
-            if ($row['title'] != '') { $name=$row['title']; }
+            if ($row['title'] != '') { $name = $row['title']; }
             $desc = $row['description'];
             echo str_repeat("&nbsp;&gt;", $level);
 
@@ -801,30 +801,30 @@ 
             if ($icon != 'nolink') {
                 if ($completed == 'completed') {
                     echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on'>";
-                }	else {
+                } else {
                     echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on' style='visibility: hidden'>";
                     //echo "&nbsp;";
                 }
             }
             if (($builder != 'builder') && ($icon != 'wrap')) { echo "</td><td>"; }
 
-            if ($name=='') {
+            if ($name == '') {
                 echo "<span class='messagesmall'>".get_lang('StepDeleted1')." $type ".get_lang('StepDeleted2')."</span>"; return(true);
             }
 
             if ($icon == 'nolink') { return(shorten($name, $length)); }
             if ($icon == 'icon') { echo "<img src='../img/works.gif' align=\"absmiddle\">"; }
             if ($builder != 'builder') {
-                echo "<a href=\"".api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Assignments&origin=$origin#$id_in_path\" class='$completed'>".shorten($name,($length-3*$level))."</a>"; $items[]=api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Assignments&origin=$origin#$id_in_path";
+                echo "<a href=\"".api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Assignments&origin=$origin#$id_in_path\" class='$completed'>".shorten($name, ($length - 3 * $level))."</a>"; $items[] = api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Assignments&origin=$origin#$id_in_path";
                 if ($desc != '') {
                     if ($icon != 'wrap') {
-                        echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc, ($length-3*$level))."</div></td></tr>";
+                        echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc, ($length - 3 * $level))."</div></td></tr>";
                     } else {
-                        echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc, ($length-3*$level))."</div>";
+                        echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc, ($length - 3 * $level))."</div>";
                     }
                 }
             } else {
-                echo "<a href=\"../work/work.php\" class='$completed' target='_blank'>".shorten($name, ($length-3*$level))."</a>";
+                echo "<a href=\"../work/work.php\" class='$completed' target='_blank'>".shorten($name, ($length - 3 * $level))."</a>";
             }
             break;
 
@@ -842,7 +842,7 @@ 
             if ($icon != 'nolink') {
                 if ($completed == 'completed') {
                     echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on'>";
-                }	else {
+                } else {
                     echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on' style='visibility: hidden'>";
                     //echo "&nbsp;";
                 }
@@ -855,15 +855,15 @@ 
             if ($icon == 'icon') { echo "<img src='../img/dropbox.gif' align=\"absmiddle\">"; }
 
             if ($builder != 'builder') {
-                echo "<a href=\"".api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Dropbox&origin=$origin#$id_in_path\" class='$completed'>".shorten($name,($length-3*$level))."</a>"; $items[]=api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Dropbox&origin=$origin#$id_in_path";
+                echo "<a href=\"".api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Dropbox&origin=$origin#$id_in_path\" class='$completed'>".shorten($name, ($length - 3 * $level))."</a>"; $items[] = api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Dropbox&origin=$origin#$id_in_path";
                 if ($desc != '') {
                     if ($icon != 'wrap') {
-                        echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc, ($length-3*$level))."</div></td></tr>"; }
+                        echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc, ($length - 3 * $level))."</div></td></tr>"; }
                     else {
-                        echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc, ($length-3*$level))."</div>"; }
+                        echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc, ($length - 3 * $level))."</div>"; }
                 }
             } else {
-                echo "<a href=\"../dropbox/index.php\" class='$completed' target='_blank'>".shorten($name, ($length-3*$level))."</a>";
+                echo "<a href=\"../dropbox/index.php\" class='$completed' target='_blank'>".shorten($name, ($length - 3 * $level))."</a>";
             }
             break;
 
@@ -871,7 +871,7 @@ 
         case 'Introduction_text':
             $name = get_lang('IntroductionText');
             $sql = "select * from $tbl_lp_item where c_id = $course_id AND id=$id_in_path";
-            $result = Database::query($sql);	$row = Database::fetch_array($result);
+            $result = Database::query($sql); $row = Database::fetch_array($result);
             if ($row['title'] != '') { $name = $row['title']; }
             $desc = $row['description'];
             echo str_repeat("&nbsp;&gt;", $level);
@@ -893,17 +893,17 @@ 
             if ($icon == 'icon') { echo "<img src='../img/introduction.gif' align=\"absmiddle\" alt='introduction'>"; }
 
             if ($builder != 'builder') {
-                echo "<a href=\"".api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Introduction_text&origin=$origin#$id_in_path\" class='$completed'>".shorten($name,($length-3*$level))."</a>";
+                echo "<a href=\"".api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Introduction_text&origin=$origin#$id_in_path\" class='$completed'>".shorten($name, ($length - 3 * $level))."</a>";
                 $items[] = api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Introduction_text&origin=$origin#$id_in_path";
                 if ($desc != '') {
                     if ($icon != 'wrap') {
-                        echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc, ($length-3*$level))."</div></td></tr>"; }
+                        echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc, ($length - 3 * $level))."</div></td></tr>"; }
                     else {
-                        echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc, ($length-3*$level))."</div>"; }
+                        echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc, ($length - 3 * $level))."</div>"; }
                 }
             } else {
                 $s = api_get_path(WEB_COURSE_PATH)."$_cid/index.php?intro_cmdEdit=1";
-                echo "<a href=\"$s\" class='$completed' target='_blank'>".shorten($name, ($length-3*$level))."</a>";
+                echo "<a href=\"$s\" class='$completed' target='_blank'>".shorten($name, ($length - 3 * $level))."</a>";
             }
             break;
 
@@ -911,7 +911,7 @@ 
         case 'Course_description':
             $name = get_lang('CourseDescription');
             $sql = "select * from $tbl_lp_item where c_id = $course_id AND id=$id_in_path";
-            $result = Database::query($sql);	$row = Database::fetch_array($result);
+            $result = Database::query($sql); $row = Database::fetch_array($result);
             if ($row['title'] != '') { $name = $row['title']; }
             $desc = $row['description'];
             echo str_repeat("&nbsp;&gt;", $level);
@@ -920,7 +920,7 @@ 
             if ($icon != 'nolink') {
                 if ($completed == 'completed') {
                     echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on'>";
-                }	else {
+                } else {
                     echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on' style='visibility: hidden'>";
                     //echo "&nbsp;";
                 }
@@ -929,20 +929,20 @@ 
 
             if ($name == '') { echo "<span class='messagesmall'>".get_lang('StepDeleted1')." $type ".get_lang('StepDeleted2')."</span>"; return(true); }
 
-            if ($icon == 'nolink') { return(shorten($name,$length)); }
+            if ($icon == 'nolink') { return(shorten($name, $length)); }
             if ($icon == 'icon') { echo "<img src='../img/info.gif' align=\"absmiddle\" alt='info'>"; }
 
             if ($builder != 'builder') {
-                echo "<a href=\"".api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Course_description&origin=$origin#$id_in_path\" class='$completed'>".shorten($name,($length-3*$level))."</a>"; $items[]=api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Course_description&origin=$origin#$id_in_path";
+                echo "<a href=\"".api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Course_description&origin=$origin#$id_in_path\" class='$completed'>".shorten($name, ($length - 3 * $level))."</a>"; $items[] = api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Course_description&origin=$origin#$id_in_path";
                 if ($desc != '') {
                     if ($icon != 'wrap') {
-                        echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc, ($length-3*$level))."</div></td></tr>"; }
+                        echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc, ($length - 3 * $level))."</div></td></tr>"; }
                     else {
-                        echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc, ($length-3*$level))."</div>"; }
+                        echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc, ($length - 3 * $level))."</div>"; }
                 }
             } else {
-                $s=api_get_path(WEB_CODE_PATH)."course_description";
-                echo "<a href=\"$s\" class='$completed' target='_blank'>".shorten($name, ($length-3*$level))."</a>";
+                $s = api_get_path(WEB_CODE_PATH)."course_description";
+                echo "<a href=\"$s\" class='$completed' target='_blank'>".shorten($name, ($length - 3 * $level))."</a>";
             }
             break;
 
@@ -952,7 +952,7 @@ 
             $sql = "select * from $tbl_lp_item where c_id = $course_id AND id=$id_in_path";
             $result = Database::query($sql);
             $row = Database::fetch_array($result);
-            if ($row['title'] != '') { $name=$row['title']; }
+            if ($row['title'] != '') { $name = $row['title']; }
             $desc = $row['description'];
             echo str_repeat("&nbsp;&gt;", $level);
 
@@ -967,21 +967,21 @@ 
             }
             if (($builder != 'builder') && ($icon != 'wrap')) { echo "</td><td>"; }
 
-            if ($name=='') { echo "<span class='messagesmall'>".get_lang('StepDeleted1')." $type ".get_lang('StepDeleted2')."</span>"; return(true); }
+            if ($name == '') { echo "<span class='messagesmall'>".get_lang('StepDeleted1')." $type ".get_lang('StepDeleted2')."</span>"; return(true); }
 
             if ($icon == 'nolink') { return(shorten($name, $length)); }
             if ($icon == 'icon') { echo "<img src='../img/group.gif' align=\"absmiddle\" alt='group'>"; }
 
             if ($builder != 'builder') {
-                echo "<a href=\"".api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Groups&origin=$origin#$id_in_path\" class='$completed'>".shorten($name,($length-3*$level))."</a>"; $items[]=api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Groups&origin=$origin#$id_in_path";
+                echo "<a href=\"".api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Groups&origin=$origin#$id_in_path\" class='$completed'>".shorten($name, ($length - 3 * $level))."</a>"; $items[] = api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Groups&origin=$origin#$id_in_path";
                 if ($desc != '') {
                     if ($icon != 'wrap') {
-                        echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc, ($length-3*$level))."</div></td></tr>"; }
+                        echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc, ($length - 3 * $level))."</div></td></tr>"; }
                     else {
-                        echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc, ($length-3*$level))."</div>"; }
+                        echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc, ($length - 3 * $level))."</div>"; }
                 }
             } else {
-                echo "<a href=\"../group/group.php?origin=$origin\" class='$completed' target='_blank'>".shorten($name, ($length-3*$level))."</a>";
+                echo "<a href=\"../group/group.php?origin=$origin\" class='$completed' target='_blank'>".shorten($name, ($length - 3 * $level))."</a>";
             }
             break;
 
@@ -1006,21 +1006,21 @@ 
             }
             if (($builder != 'builder') && ($icon != 'wrap')) { echo "</td><td>"; }
 
-            if ($name=='') { echo "<span class='messagesmall'>".get_lang('StepDeleted1')." $type ".get_lang('StepDeleted2')."</span>"; return(true); }
+            if ($name == '') { echo "<span class='messagesmall'>".get_lang('StepDeleted1')." $type ".get_lang('StepDeleted2')."</span>"; return(true); }
 
-            if ($icon == 'nolink') { return(shorten($name,$length)); }
+            if ($icon == 'nolink') { return(shorten($name, $length)); }
             if ($icon == 'icon') { echo "<img src='../img/members.gif' align=\"absmiddle\" alt='members'>"; }
 
             if ($builder != 'builder') {
-                echo "<a href=\"".api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Users&origin=$origin#$id_in_path\" class='$completed'>".shorten($name,($length-3*$level))."</a>"; $items[]=api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Users&origin=$origin#$id_in_path";
+                echo "<a href=\"".api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Users&origin=$origin#$id_in_path\" class='$completed'>".shorten($name, ($length - 3 * $level))."</a>"; $items[] = api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Users&origin=$origin#$id_in_path";
                 if ($desc != '') {
                     if ($icon != 'wrap') {
-                        echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc, ($length-3*$level))."</div></td></tr>"; }
+                        echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc, ($length - 3 * $level))."</div></td></tr>"; }
                     else {
-                        echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc, ($length-3*$level))."</div>"; }
+                        echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc, ($length - 3 * $level))."</div>"; }
                 }
             } else {
-                echo "<a href=\"../user/user.php?origin=$origin\" class='$completed' target='_blank'>".shorten($name, ($length-3*$level))."</a>";
+                echo "<a href=\"../user/user.php?origin=$origin\" class='$completed' target='_blank'>".shorten($name, ($length - 3 * $level))."</a>";
             }
             break;
     }//end huge switch-statement
@@ -1059,7 +1059,7 @@ 
             $myrow = Database::fetch_array($result);
 
             $sql = "select * from $tbl_lp_item where c_id = $course_id AND id=$id_in_path";
-            $result = Database::query($sql);	$row = Database::fetch_array($result);
+            $result = Database::query($sql); $row = Database::fetch_array($result);
             if ($row['title'] != '') { $myrow['title'] = $row['title']; }
             $desc = $row['description'];
             $agenda_id = $row['item_id'];
@@ -1084,7 +1084,7 @@ 
             break;
 
         case 'Link':
-            $TABLETOOLLINK	= Database::get_course_table(TABLE_LINK);
+            $TABLETOOLLINK = Database::get_course_table(TABLE_LINK);
             $result = Database::query("SELECT * FROM $TABLETOOLLINK WHERE c_id = $course_id AND id=$id");
             $myrow = Database::fetch_array($result);
 
@@ -1101,7 +1101,7 @@ 
             break;
 
         case 'Exercise':
-            $TBL_EXERCICES  = Database::get_course_table(TABLE_QUIZ_TEST);
+            $TBL_EXERCICES = Database::get_course_table(TABLE_QUIZ_TEST);
             $result = Database::query("SELECT * FROM $TBL_EXERCICES WHERE c_id = $course_id AND id=$id");
             $myrow = Database::fetch_array($result);
 
@@ -1109,7 +1109,7 @@ 
               // This is needed for the exercise_submit.php can delete the session info about tests.
 
             $sql = "select * from $tbl_lp_item where c_id = $course_id AND id=$id_in_path";
-            $result = Database::query($sql);	$row = Database::fetch_array($result);
+            $result = Database::query($sql); $row = Database::fetch_array($result);
             if ($row['title'] != '') { $myrow['title'] = $row['title']; }
 
             if ($builder != 'builder') {
@@ -1119,7 +1119,7 @@ 
             }
             break;
         case 'HotPotatoes':
-            $TBL_DOCUMENT  = Database::get_course_table(TABLE_DOCUMENT);
+            $TBL_DOCUMENT = Database::get_course_table(TABLE_DOCUMENT);
             $documentPath = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document';
             $result = Database::query("SELECT * FROM ".$TBL_DOCUMENT." WHERE c_id = $course_id AND id=$id");
             $myrow = Database::fetch_array($result);
@@ -1137,14 +1137,14 @@ 
             break;
         case 'Forum':
             //deprecated
-            $TBL_FORUMS = Database::get_course_table(TABLE_FORUM);  // TODO: This is the old table name, it should be corrected.
+            $TBL_FORUMS = Database::get_course_table(TABLE_FORUM); // TODO: This is the old table name, it should be corrected.
             $result = Database::query("SELECT * FROM $TBL_FORUMS WHERE c_id = $course_id AND forum_id=$id");
             $myrow = Database::fetch_array($result);
 
             if ($builder == 'builder') { $origin = 'builder'; }
 
             $sql = "select * from $tbl_lp_item where c_id = $course_id AND id=$id_in_path";
-            $result = Database::query($sql);	$row = Database::fetch_array($result);
+            $result = Database::query($sql); $row = Database::fetch_array($result);
             if ($row['title'] != '') { $myrow['forum_name'] = $row['title']; }
 
             if ($myrow['forum_name'] == '') { $type = 'Forum'; }
@@ -1167,7 +1167,7 @@ 
             $myrow = Database::fetch_array($result);
 
             $sql = "select * from $tbl_lp_item where c_id = $course_id AND id=$id_in_path";
-            $result = Database::query($sql);	$row = Database::fetch_array($result);
+            $result = Database::query($sql); $row = Database::fetch_array($result);
 
             if ($builder != 'builder') {
                 $link .= api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Thread&origin=$origin&topic=".$myrow["topic_id"]."&forum=".$myrow["forum_id"]."&md5=".$myrow["md5"]."#$id_in_path";
@@ -1191,8 +1191,8 @@ 
             $desc = $row['description'];
             //$link .= str_repeat("&nbsp;&gt;", $level);
 
-            $posternom = $myrow['nom'];				$posterprenom = $myrow['prenom'];
-            $posttime = $myrow['post_time'];		$posttext = $myrow['post_text'];
+            $posternom = $myrow['nom']; $posterprenom = $myrow['prenom'];
+            $posttime = $myrow['post_time']; $posttext = $myrow['post_text'];
             $posttitle = $myrow['post_title'];
             $posttext = str_replace('"', "'", $posttext);
 
@@ -1209,8 +1209,8 @@ 
             $myrow = Database::fetch_array($result);
 
             $pathname = explode('/', $myrow['path']); // Making a correct name for the link.
-            $last = count($pathname) - 1;  // Making a correct name for the link.
-            $filename = $pathname[$last];  // Making a correct name for the link.
+            $last = count($pathname) - 1; // Making a correct name for the link.
+            $filename = $pathname[$last]; // Making a correct name for the link.
 
             $sql = "select * from $tbl_lp_item where c_id = $course_id AND id=$id_in_path";
             $result = Database::query($sql);
@@ -1288,7 +1288,7 @@ 
     unset($addedresource[$resource_key]);
     unset($addedresourceid[$resource_key]);
     $_SESSION['addedresource'] = $addedresource;
-    $_SESSION['addedresourceid'] = $addedresourceid ;
+    $_SESSION['addedresourceid'] = $addedresourceid;
 }
 
 /**
@@ -1363,11 +1363,11 @@ 
 
     $sql = "SELECT * FROM $TABLERESOURCE
             WHERE c_id = $course_id AND source_type='$type' and source_id=$id";
-    $result=Database::query($sql);
-    while ($row=Database::fetch_array($result))
+    $result = Database::query($sql);
+    while ($row = Database::fetch_array($result))
     {
-        $addedresource[]=$row["resource_type"];
-        $addedresourceid[]=$row["resource_id"];
+        $addedresource[] = $row["resource_type"];
+        $addedresourceid[] = $row["resource_id"];
     }
     $_SESSION['addedresource'] = $addedresource;
     $_SESSION['addedresourceid'] = $addedresourceid;
@@ -1413,11 +1413,11 @@ 
 
     $sql = "SELECT * FROM $TABLERESOURCE WHERE c_id = $course_id AND source_type='$type' and source_id='$id'";
     $result = Database::query($sql);
-    while ($row=Database::fetch_array($result)) {
+    while ($row = Database::fetch_array($result)) {
         if ($origin != 'learnpath') {
-            display_addedresource_link($row['resource_type'], $row['resource_id'], $style) ;
+            display_addedresource_link($row['resource_type'], $row['resource_id'], $style);
         } else {
-            display_addedresource_link_in_learnpath($row['resource_type'], $row['resource_id'],'agendaitems','','builder','icon') ; echo "<br>";
+            display_addedresource_link_in_learnpath($row['resource_type'], $row['resource_id'], 'agendaitems', '', 'builder', 'icon'); echo "<br>";
         }
     }
 }
@@ -1479,7 +1479,7 @@ 
 
     if (is_array($_SESSION['addedresource'])) {
         foreach ($addedresource as $toolcompare) {
-            if ($toolcompare==$type && $addedresourceid[key($addedresource)] == $id) {
+            if ($toolcompare == $type && $addedresourceid[key($addedresource)] == $id) {
                 $show = 0;
             }
             next($addedresource);
@@ -1513,7 +1513,7 @@ 
  * @param boolean	Open in a new window (true) or in the current frame/window (false)?
  * @todo use the constants for the type definitions.
  */
-function rl_get_html_resource_link($course_code, $type, $id, $style='', $new_window = true) {
+function rl_get_html_resource_link($course_code, $type, $id, $style = '', $new_window = true) {
     $_course = api_get_course_info($course_code);
 
     $course_id = api_get_course_int_id();
@@ -1559,7 +1559,7 @@ 
         case TOOL_THREAD:  //=topics
             //$tbl_forum 		= Database::get_course_table(TABLE_FORUM);
             //$tbl_thread 	= Database::get_course_table(TABLE_FORUM_THREAD);
-            $tbl_post 		= Database::get_course_table(TABLE_FORUM_POST);
+            $tbl_post = Database::get_course_table(TABLE_FORUM_POST);
             // grabbing the title of the post
             $sql_title = "SELECT * FROM $tbl_post WHERE c_id = $course_id AND post_id=".$id;
             $result_title = Database::query($sql_title);
@@ -1579,8 +1579,8 @@ 
             $result = Database::query("SELECT * FROM $tbl_doc WHERE c_id = $course_id AND id=$id");
             $myrow = Database::fetch_array($result);
             $pathname = explode('/', $myrow['path']); // Making a correct name for the link.
-            $last = count($pathname) - 1;  // Making a correct name for the link.
-            $filename = $pathname[$last];  // Making a correct name for the link.
+            $last = count($pathname) - 1; // Making a correct name for the link.
+            $filename = $pathname[$last]; // Making a correct name for the link.
             $image = choose_image($filename);
             $ext = explode('.', $filename);
             $ext = strtolower($ext[sizeof($ext) - 1]);
@@ -1656,8 +1656,8 @@ 
             if (!empty($id)) {
                 $TBL_EXERCICES = Database::get_course_table(TABLE_QUIZ_TEST);
                 $sql = "SELECT * FROM $TBL_EXERCICES WHERE c_id = $course_id AND id=$id";
-                $result= Database::query($sql);
-                $myrow=Database::fetch_array($result);
+                $result = Database::query($sql);
+                $myrow = Database::fetch_array($result);
                 if ($row_item['title'] != '') {
                     $myrow['title'] = $row_item['title'];
                 }
@@ -1669,8 +1669,8 @@ 
             $result = Database::query("SELECT * FROM ".$TBL_DOCUMENT." WHERE c_id = $course_id AND id=$id");
             $myrow = Database::fetch_array($result);
             $path = $myrow['path'];
-            $link .= $main_dir_path.'exercice/showinframes.php?file='.$path.'' .
-                    '&origin='.$origin.'&cid='.$course_code.'&uid='.api_get_user_id().'' .
+            $link .= $main_dir_path.'exercice/showinframes.php?file='.$path.''.
+                    '&origin='.$origin.'&cid='.$course_code.'&uid='.api_get_user_id().''.
                     '&learnpath_id='.$learnpath_id.'&learnpath_item_id='.$id_in_path.'&lp_view_id='.$lpViewId;
             break;
         case TOOL_FORUM:
@@ -1682,7 +1682,7 @@ 
                 $sql = "SELECT * FROM $tbl_topics WHERE c_id = $course_id AND thread_id=$id";
                 $result = Database::query($sql);
                 $myrow = Database::fetch_array($result);
-                $link .= $main_dir_path.'forum/viewthread.php?origin=learnpath&thread='.$id.'' .
+                $link .= $main_dir_path.'forum/viewthread.php?origin=learnpath&thread='.$id.''.
                         '&forum='.$myrow['forum_id'].'&lp=true';
             }
             break;
@@ -1698,14 +1698,14 @@ 
             $posttitle = $title;
             $posttext = str_replace('"', "'", $posttext);
 
-            $link .= $main_dir_path.'forum/viewthread.php?post='.$id.'' .
-                    '&thread='.$myrow['thread_id'].'&forum='.$myrow['forum_id'].'' .
+            $link .= $main_dir_path.'forum/viewthread.php?post='.$id.''.
+                    '&thread='.$myrow['thread_id'].'&forum='.$myrow['forum_id'].''.
                     '&lp=true';
             break;
         case TOOL_DOCUMENT:
             $document = $em
                 ->getRepository('ChamiloCourseBundle:CDocument')
-                ->findOneBy(['cId' => $course_id,  'id' => $id]);
+                ->findOneBy(['cId' => $course_id, 'id' => $id]);
 
             if (!$document) {
                 break;
@@ -1717,9 +1717,9 @@ 
             $showDirectUrl = !in_array($extension, $jplayer_supported_files);
 
             if ($showDirectUrl) {
-                $link = $main_course_path . 'document' . $document->getPath() . '?' . api_get_cidreq();
+                $link = $main_course_path.'document'.$document->getPath().'?'.api_get_cidreq();
             } else {
-                $link = api_get_path(WEB_CODE_PATH) . 'document/showinframes.php?' . http_build_query([
+                $link = api_get_path(WEB_CODE_PATH).'document/showinframes.php?'.http_build_query([
                     'cidReq' => $course_code,
                     'id' => $id,
                     'origin' => 'learnpathitem'
@@ -1728,8 +1728,8 @@ 
 
             $openmethod = 2;
             $officedoc = false;
-            Session::write('openmethod',$openmethod);
-            Session::write('officedoc',$officedoc);
+            Session::write('openmethod', $openmethod);
+            Session::write('officedoc', $officedoc);
             break;
         case TOOL_LP_FINAL_ITEM:
             $link .= api_get_path(WEB_CODE_PATH).'newscorm/lp_final_item.php?'.api_get_cidreq().'&id='.$id.'&lp_id='.$learnpath_id;
@@ -1856,8 +1856,8 @@ 
             $result = Database::query("SELECT * FROM $tbl_doc WHERE c_id = $course_id AND id=$id");
             $myrow = Database::fetch_array($result);
             $pathname = explode('/', $myrow['path']); // Making a correct name for the link.
-            $last = count($pathname) - 1;  // Making a correct name for the link.
-            $filename = $pathname[$last];  // Making a correct name for the link.
+            $last = count($pathname) - 1; // Making a correct name for the link.
+            $filename = $pathname[$last]; // Making a correct name for the link.
             $image = choose_image($filename);
             $ext = explode('.', $filename);
             $ext = strtolower($ext[sizeof($ext) - 1]);

main/newscorm/scorm.class.php

Doc Comments +2 added lines, -2 removed lines

@@ -271,7 +271,7 @@ 
      * @param int $userMaxScore
      * @param int $sessionId
      *
-     * @return bool	Returns -1 on error
+     * @return boolean|null	Returns -1 on error
      */
     public function import_manifest($courseCode, $userMaxScore = 1, $sessionId = 0, $userId = 0)
     {
@@ -925,7 +925,7 @@ 
      * @param	string	course Code
      * @param string	LP ID (in database)
      * @param string	Manifest file path (optional if lp_id defined)
-     * @return	integer	New LP ID or false on failure
+     * @return	boolean	New LP ID or false on failure
      * TODO @TODO Implement imsmanifest_path parameter
      */
     public function reimport_manifest($courseCode, $lp_id = null, $imsmanifest_path = '')

Spacing +19 added lines, -19 removed lines

@@ -393,7 +393,7 @@ 
                 $path = '';
                 $type = 'dir';
                 if (isset($this->resources[$item['identifierref']])) {
-                    $oRes =& $this->resources[$item['identifierref']];
+                    $oRes = & $this->resources[$item['identifierref']];
                     $path = @$oRes->get_path();
                     if (!empty($path)) {
                         $temptype = $oRes->get_scorm_type();
@@ -444,7 +444,7 @@ 
                 $item['parameters'] = Database::escape_string($item['parameters']);
 
                 $sql = "INSERT INTO $new_lp_item (c_id, lp_id,item_type,ref,title, path,min_score,max_score, $field_add parent_item_id,previous_item_id,next_item_id, prerequisite,display_order,launch_data, parameters)
-                        VALUES ($courseId, $lp_id, '$type', '$identifier', '$title', '$path' , 0, $max_score, $value_add $parent, $previous, 0, '$prereq', ".$item['rel_order'] .", '".$item['datafromlms']."', '".$item['parameters']."' )";
+                        VALUES ($courseId, $lp_id, '$type', '$identifier', '$title', '$path' , 0, $max_score, $value_add $parent, $previous, 0, '$prereq', ".$item['rel_order'].", '".$item['datafromlms']."', '".$item['parameters']."' )";
 
                 Database::query($sql);
                 if ($this->debug > 1) { error_log('New LP - In import_manifest(), inserting item : '.$sql, 0); }
@@ -478,7 +478,7 @@ 
                     foreach ($specific_fields as $specific_field) {
                         if (isset($_REQUEST[$specific_field['code']])) {
                             $sterms = trim($_REQUEST[$specific_field['code']]);
-                            $all_specific_terms .= ' '. $sterms;
+                            $all_specific_terms .= ' '.$sterms;
                             if (!empty($sterms)) {
                                 $sterms = explode(',', $sterms);
                                 foreach ($sterms as $sterm) {
@@ -487,7 +487,7 @@ 
                             }
                         }
                     }
-                    $body_to_index = $all_specific_terms .' '. $title;
+                    $body_to_index = $all_specific_terms.' '.$title;
                     $ic_slide->addValue("content", $body_to_index);
                     // TODO: Add a comment to say terms separated by commas.
                     $courseid = api_get_course_id();
@@ -497,7 +497,7 @@ 
                         SE_COURSE_ID => $courseid,
                         SE_TOOL_ID => TOOL_LEARNPATH,
                         SE_DATA => array('lp_id' => $lp_id, 'lp_item'=> $previous, 'document_id' => ''), // TODO: Unify with other lp types.
-                        SE_USER => (int)api_get_user_id(),
+                        SE_USER => (int) api_get_user_id(),
                     );
                     $ic_slide->xapian_data = serialize($xapian_data);
                     $di->addChunk($ic_slide);
@@ -543,7 +543,7 @@ 
     public function import_package($zip_file_info, $current_dir = '', $courseInfo = array())
     {
         if ($this->debug > 0) {
-            error_log('In scorm::import_package('.print_r($zip_file_info,true).',"'.$current_dir.'") method', 0);
+            error_log('In scorm::import_package('.print_r($zip_file_info, true).',"'.$current_dir.'") method', 0);
         }
 
         $courseInfo = empty($courseInfo) ? api_get_course_info() : $courseInfo;
@@ -554,7 +554,7 @@ 
         $zip_file_name = $zip_file_info['name'];
 
         if ($this->debug > 1) {
-            error_log('New LP - import_package() - zip file path = ' . $zip_file_path . ', zip file name = ' . $zip_file_name, 0);
+            error_log('New LP - import_package() - zip file path = '.$zip_file_path.', zip file name = '.$zip_file_name, 0);
         }
 
         $course_rel_dir = api_get_course_path($courseInfo['code']).'/scorm'; // scorm dir web path starting from /courses
@@ -562,7 +562,7 @@ 
         $current_dir = api_replace_dangerous_char(trim($current_dir)); // Current dir we are in, inside scorm/
 
         if ($this->debug > 1) {
-            error_log( 'New LP - import_package() - current_dir = ' . $current_dir, 0);
+            error_log('New LP - import_package() - current_dir = '.$current_dir, 0);
         }
 
         // Get name of the zip file without the extension.
@@ -570,7 +570,7 @@ 
         $file_info = pathinfo($zip_file_name);
         $filename = $file_info['basename'];
         $extension = $file_info['extension'];
-        $file_base_name = str_replace('.'.$extension,'',$filename); // Filename without its extension.
+        $file_base_name = str_replace('.'.$extension, '', $filename); // Filename without its extension.
         $this->zipname = $file_base_name; // Save for later in case we don't have a title.
 
         if ($this->debug > 1) { error_log("New LP - base file name is : ".$file_base_name, 0); }
@@ -616,7 +616,7 @@ 
         $slash_count = substr_count($shortest_path, '/');
         foreach ($manifest_list as $manifest_path) {
             $tmp_slash_count = substr_count($manifest_path, '/');
-            if ($tmp_slash_count<$slash_count) {
+            if ($tmp_slash_count < $slash_count) {
                 $shortest_path = $manifest_path;
                 $slash_count = $tmp_slash_count;
             }
@@ -625,7 +625,7 @@ 
         $this->subdir .= '/'.dirname($shortest_path); // Do not concatenate because already done above.
         $manifest = $shortest_path;
         if ($this->debug > 1) { error_log('New LP - Package type is now '.$package_type, 0); }
-        if ($package_type== '') {
+        if ($package_type == '') {
             // && defined('CHECK_FOR_SCORM') && CHECK_FOR_SCORM)
             if ($this->debug > 1) { error_log('New LP - Package type is empty', 0); }
             return api_failure::set_failure('not_scorm_content');
@@ -641,8 +641,8 @@ 
             $new_dir = '/'.$new_dir;
         }
 
-        if ($new_dir[strlen($new_dir)-1] == '/') {
-            $new_dir = substr($new_dir,0,-1);
+        if ($new_dir[strlen($new_dir) - 1] == '/') {
+            $new_dir = substr($new_dir, 0, -1);
         }
 
         /* Uncompressing phase */
@@ -683,7 +683,7 @@ 
                     if ($file != '.' && $file != '..') {
                         $filetype = 'file';
 
-                        if (is_dir($course_sys_dir . $new_dir . $file)) {
+                        if (is_dir($course_sys_dir.$new_dir.$file)) {
                             $filetype = 'folder';
                         }
 
@@ -712,7 +712,7 @@ 
                                     }
                                 }
                             }
-                            @rename($course_sys_dir.$new_dir.$file,$course_sys_dir.$new_dir.$safe_file);
+                            @rename($course_sys_dir.$new_dir.$file, $course_sys_dir.$new_dir.$safe_file);
                             if ($this->debug >= 1) { error_log('New LP - Renaming '.$course_sys_dir.$new_dir.$file.' to '.$course_sys_dir.$new_dir.$safe_file, 0); }
                         }
                     }
@@ -901,7 +901,7 @@ 
         if ($this->debug > 0) { error_log('In scorm::get_res_path('.$id.') method', 0); }
         $path = '';
         if (isset($this->resources[$id])) {
-            $oRes =& $this->resources[$id];
+            $oRes = & $this->resources[$id];
             $path = @$oRes->get_path();
         }
         return $path;
@@ -917,7 +917,7 @@ 
         if ($this->debug > 0) { error_log('In scorm::get_res_type('.$id.') method', 0); }
         $type = '';
         if (isset($this->resources[$id])) {
-            $oRes =& $this->resources[$id];
+            $oRes = & $this->resources[$id];
             $temptype = $oRes->get_scorm_type();
             if (!empty($temptype)) {
                 $type = $temptype;
@@ -936,9 +936,9 @@ 
         $title = '';
         if (isset($this->manifest['organizations']['default'])) {
             $title = $this->organizations[$this->manifest['organizations']['default']]->get_name();
-        } elseif (count($this->organizations)==1) {
+        } elseif (count($this->organizations) == 1) {
             // This will only get one title but so we don't need to know the index.
-            foreach($this->organizations as $id => $value) {
+            foreach ($this->organizations as $id => $value) {
                 $title = $this->organizations[$id]->get_name();
                 break;
             }

main/permissions/permissions_functions.inc.php

Doc Comments +2 added lines, -2 removed lines

@@ -118,7 +118,7 @@ 
 
 /**
 * This function retrieves the existing permissions of a user, group or role.
-* @param $content are we retrieving the rights of a user, a group or a role (the database depends on it)
+* @param string $content are we retrieving the rights of a user, a group or a role (the database depends on it)
 * @param $id the id of the user, group or role
 * @author Patrick Cool <patrick.cool@ugent.be>, Ghent University
 * @version 1.0
@@ -526,7 +526,7 @@ 
 
 /**
 * This function gets all the roles that are defined
-* @param $content are we finding the roles for a user or a group (the database depends on it)
+* @param string $content are we finding the roles for a user or a group (the database depends on it)
 * @param $id the id of the user or group
 * @param string	Deprecated parameter allowing use of 'platform' scope - the corresponding tables don't exist anymore so the scope is always set to 'course'
 * @return array that contains the name of the roles the user has

Braces +10 added lines, -16 removed lines

@@ -132,24 +132,20 @@ 
 	{
 		$table=Database::get_course_table(TABLE_PERMISSION_USER);
 		$id_field = 'user_id';
-	}
-	elseif ($content == 'group')
+	} elseif ($content == 'group')
 	{
 		$table=Database::get_course_table(TABLE_PERMISSION_GROUP);
 		$id_field = 'group_id';
-	}
-	elseif ($content == 'role')
+	} elseif ($content == 'role')
 	{
 		$table=Database::get_course_table(TABLE_ROLE_PERMISSION);
 		$id_field = 'role_id';
-	}
-	elseif ($content == 'platform_role')
+	} elseif ($content == 'platform_role')
 	{
 		$table=Database::get_main_table(TABLE_ROLE_PERMISSION);
 		$id_field = 'role_id';
         $course_id_condition = '';
-	}
-	elseif ($content == 'task')
+	} elseif ($content == 'task')
 	{
 		$table=Database::get_course_table(TABLE_BLOGS_TASKS_PERMISSIONS);
 		$id_field = 'task_id';
@@ -162,8 +158,9 @@ 
 		WHERE $course_id_condition " . $id_field . "='" . Database::escape_string($id) . "'";
 	$result = Database::query($sql);
 
-	while($row = Database::fetch_array($result))
-		$currentpermissions[$row['tool']][] = $row['action'];
+	while($row = Database::fetch_array($result)) {
+			$currentpermissions[$row['tool']][] = $row['action'];
+	}
 
 	return $currentpermissions;
 }
@@ -321,14 +318,12 @@ 
 	if ($course_admin)
 	{
 		echo "\t\t\t<img src=\"../img/checkbox_on3.gif\" border=\"0\"/ title=\"".get_lang('PermissionGrantedByGroupOrRole')."\">";
-	}
-	else
+	} else
 	{
 		if (!empty($inherited_permissions) and in_array($permission,$inherited_permissions[$tool]))
 		{
 			echo "\t\t\t<img src=\"../img/checkbox_on3.gif\" border=\"0\"/ title=\"".get_lang('PermissionGrantedByGroupOrRole')."\">";
-		}
-		else
+		} else
 		{
 			if (is_array($permission_array[$tool]) AND in_array($permission,$permission_array[$tool]))
 			{
@@ -439,8 +434,7 @@ 
 			$checked='checked';
 			$image='checkbox_on2.gif';
 			$action='revoke';
-		}
-		else
+		} else
 		{
 			$checked='';
 			$image='wrong.gif';

Indentation +401 added lines, -401 removed lines

@@ -25,38 +25,38 @@ 
 function store_permissions($content, $id) {
     $course_id = api_get_course_int_id();
     
-	// Which database are we using (depending on the $content parameter)
-	if ($content=='user')
-	{
-		$table=Database::get_course_table(TABLE_PERMISSION_USER);
-		$id_field = user_id;
-	}
-	if ($content=='group')
-	{
-		$table=Database::get_course_table(TABLE_PERMISSION_GROUP);
-		$id_field = group_id;
-	}
-	if ($content=='role')
-	{
-		$table=Database::get_course_table(TABLE_ROLE_PERMISSION);
-		$id_field = role_id;
-	}
-
-	// We first delete all the existing permissions for that user/group/role
-	$sql="DELETE FROM $table  WHERE c_id = $course_id AND $id_field = '".Database::escape_string($id)."'";
-	$result=Database::query($sql);
-
-	// looping through the post values to find the permission (containing the string permission* )
-	foreach ($_POST as $key => $value)
-	{
-		if (strstr($key,"permission*"))
-		{
-			list($brol,$tool,$action)=explode("*",$key);
-			$sql="INSERT INTO $table (c_id, $id_field,tool,action) VALUES ($course_id, '".Database::escape_string($id)."','".Database::escape_string($tool)."','".Database::escape_string($action)."')";
-			$result=Database::query($sql);
-		}
-	}
-	return get_lang('PermissionsStored');
+    // Which database are we using (depending on the $content parameter)
+    if ($content=='user')
+    {
+        $table=Database::get_course_table(TABLE_PERMISSION_USER);
+        $id_field = user_id;
+    }
+    if ($content=='group')
+    {
+        $table=Database::get_course_table(TABLE_PERMISSION_GROUP);
+        $id_field = group_id;
+    }
+    if ($content=='role')
+    {
+        $table=Database::get_course_table(TABLE_ROLE_PERMISSION);
+        $id_field = role_id;
+    }
+
+    // We first delete all the existing permissions for that user/group/role
+    $sql="DELETE FROM $table  WHERE c_id = $course_id AND $id_field = '".Database::escape_string($id)."'";
+    $result=Database::query($sql);
+
+    // looping through the post values to find the permission (containing the string permission* )
+    foreach ($_POST as $key => $value)
+    {
+        if (strstr($key,"permission*"))
+        {
+            list($brol,$tool,$action)=explode("*",$key);
+            $sql="INSERT INTO $table (c_id, $id_field,tool,action) VALUES ($course_id, '".Database::escape_string($id)."','".Database::escape_string($tool)."','".Database::escape_string($action)."')";
+            $result=Database::query($sql);
+        }
+    }
+    return get_lang('PermissionsStored');
 }
 
 /**
@@ -70,50 +70,50 @@ 
 * @version 1.0
 */
 function store_one_permission($content, $action, $id, $tool,$permission) {
-	global $rights_full;
+    global $rights_full;
     $course_id = api_get_course_int_id();
-	// for some reason I don't know, he can't get to the $rights_full array, so commented the following lines out.
+    // for some reason I don't know, he can't get to the $rights_full array, so commented the following lines out.
 
-	// check
-	//if(!in_array($permission, $rights_full))
-	//{
-	//	return get_lang('Error');
-	//}
+    // check
+    //if(!in_array($permission, $rights_full))
+    //{
+    //	return get_lang('Error');
+    //}
 
-	// Which database are we using (depending on the $content parameter)
+    // Which database are we using (depending on the $content parameter)
     
-	if ($content=='user') {
-		$table=Database::get_course_table(TABLE_PERMISSION_USER);
-		$id_field = user_id;
-	}
-	if ($content=='group')
-	{
-		$table=Database::get_course_table(TABLE_PERMISSION_GROUP);
-		$id_field = group_id;
-	}
-	if ($content=='role')
-	{
-		$table=Database::get_course_table(TABLE_ROLE_PERMISSION);
-		$id_field = role_id;
-	}
-
-	// grating a right
-	if ($action=='grant') {
-		$sql="INSERT INTO $table (c_id, $id_field,tool,action) VALUES ($course_id, '".Database::escape_string($id)."','".Database::escape_string($tool)."','".Database::escape_string($permission)."')";
-		$result=Database::query($sql);
-		if($result) {
-			$result_message=get_lang('PermissionGranted');
-		}
-	}
-	if ($action=='revoke')
-	{
-		$sql="DELETE FROM $table WHERE c_id = $course_id AND $id_field = '".Database::escape_string($id)."' AND tool='".Database::escape_string($tool)."' AND action='".Database::escape_string($permission)."'";
-		$result=Database::query($sql);
-		if($result) {
-			$result_message=get_lang('PermissionRevoked');
-		}
-	}
-	return $result_message;
+    if ($content=='user') {
+        $table=Database::get_course_table(TABLE_PERMISSION_USER);
+        $id_field = user_id;
+    }
+    if ($content=='group')
+    {
+        $table=Database::get_course_table(TABLE_PERMISSION_GROUP);
+        $id_field = group_id;
+    }
+    if ($content=='role')
+    {
+        $table=Database::get_course_table(TABLE_ROLE_PERMISSION);
+        $id_field = role_id;
+    }
+
+    // grating a right
+    if ($action=='grant') {
+        $sql="INSERT INTO $table (c_id, $id_field,tool,action) VALUES ($course_id, '".Database::escape_string($id)."','".Database::escape_string($tool)."','".Database::escape_string($permission)."')";
+        $result=Database::query($sql);
+        if($result) {
+            $result_message=get_lang('PermissionGranted');
+        }
+    }
+    if ($action=='revoke')
+    {
+        $sql="DELETE FROM $table WHERE c_id = $course_id AND $id_field = '".Database::escape_string($id)."' AND tool='".Database::escape_string($tool)."' AND action='".Database::escape_string($permission)."'";
+        $result=Database::query($sql);
+        if($result) {
+            $result_message=get_lang('PermissionRevoked');
+        }
+    }
+    return $result_message;
 }
 
 /**
@@ -125,47 +125,47 @@ 
 */
 function get_permissions($content, $id) {
     $course_id = api_get_course_int_id();
-	$currentpermissions=array();
-	// Which database are we using (depending on the $content parameter)
+    $currentpermissions=array();
+    // Which database are we using (depending on the $content parameter)
     $course_id_condition = " c_id = $course_id AND ";
-	if ($content == 'user')
-	{
-		$table=Database::get_course_table(TABLE_PERMISSION_USER);
-		$id_field = 'user_id';
-	}
-	elseif ($content == 'group')
-	{
-		$table=Database::get_course_table(TABLE_PERMISSION_GROUP);
-		$id_field = 'group_id';
-	}
-	elseif ($content == 'role')
-	{
-		$table=Database::get_course_table(TABLE_ROLE_PERMISSION);
-		$id_field = 'role_id';
-	}
-	elseif ($content == 'platform_role')
-	{
-		$table=Database::get_main_table(TABLE_ROLE_PERMISSION);
-		$id_field = 'role_id';
+    if ($content == 'user')
+    {
+        $table=Database::get_course_table(TABLE_PERMISSION_USER);
+        $id_field = 'user_id';
+    }
+    elseif ($content == 'group')
+    {
+        $table=Database::get_course_table(TABLE_PERMISSION_GROUP);
+        $id_field = 'group_id';
+    }
+    elseif ($content == 'role')
+    {
+        $table=Database::get_course_table(TABLE_ROLE_PERMISSION);
+        $id_field = 'role_id';
+    }
+    elseif ($content == 'platform_role')
+    {
+        $table=Database::get_main_table(TABLE_ROLE_PERMISSION);
+        $id_field = 'role_id';
         $course_id_condition = '';
-	}
-	elseif ($content == 'task')
-	{
-		$table=Database::get_course_table(TABLE_BLOGS_TASKS_PERMISSIONS);
-		$id_field = 'task_id';
-	}
-
-	// finding all the permissions. We store this in a multidimensional array
-	// where the first dimension is the tool.
-	$sql="
+    }
+    elseif ($content == 'task')
+    {
+        $table=Database::get_course_table(TABLE_BLOGS_TASKS_PERMISSIONS);
+        $id_field = 'task_id';
+    }
+
+    // finding all the permissions. We store this in a multidimensional array
+    // where the first dimension is the tool.
+    $sql="
 		SELECT * FROM " . $table . "
 		WHERE $course_id_condition " . $id_field . "='" . Database::escape_string($id) . "'";
-	$result = Database::query($sql);
+    $result = Database::query($sql);
 
-	while($row = Database::fetch_array($result))
-		$currentpermissions[$row['tool']][] = $row['action'];
+    while($row = Database::fetch_array($result))
+        $currentpermissions[$row['tool']][] = $row['action'];
 
-	return $currentpermissions;
+    return $currentpermissions;
 }
 
 /**
@@ -179,38 +179,38 @@ 
 */
 function limited_or_full($current_permissions)
 {
-	if (api_get_setting('permissions')=='limited')
-	{
-		foreach ($current_permissions as $tool=>$tool_rights)
-		{
-			// we loop through the possible permissions of a tool and unset the entry if it is view
-			// if it is visibility or move we have to grant the edit right
-			foreach ($tool_rights as $key=>$value)
-			{
-				if ($value=='View')
-				{
-					unset($current_permissions[$tool][$key]);
-				}
-				if ($value=='Visibility' OR $value=='Move')
-				{
-					if (!in_array('Edit',$current_permissions[$tool]))
-					{
-						$current_permissions[$tool][]='Edit';
-					}
-					unset($current_permissions[$tool][$key]);
-				}
-				//else
-				//{
-				//	$current_permissions[$tool][]=$value;
-				//}
-			}
-		}
-		return $current_permissions;
-	}
-	if (api_get_setting('permissions')=='full')
-	{
-		return $current_permissions;
-	}
+    if (api_get_setting('permissions')=='limited')
+    {
+        foreach ($current_permissions as $tool=>$tool_rights)
+        {
+            // we loop through the possible permissions of a tool and unset the entry if it is view
+            // if it is visibility or move we have to grant the edit right
+            foreach ($tool_rights as $key=>$value)
+            {
+                if ($value=='View')
+                {
+                    unset($current_permissions[$tool][$key]);
+                }
+                if ($value=='Visibility' OR $value=='Move')
+                {
+                    if (!in_array('Edit',$current_permissions[$tool]))
+                    {
+                        $current_permissions[$tool][]='Edit';
+                    }
+                    unset($current_permissions[$tool][$key]);
+                }
+                //else
+                //{
+                //	$current_permissions[$tool][]=$value;
+                //}
+            }
+        }
+        return $current_permissions;
+    }
+    if (api_get_setting('permissions')=='full')
+    {
+        return $current_permissions;
+    }
 }
 /**
 * This function displays a checked or unchecked checkbox. The checkbox will be checked if the
@@ -224,12 +224,12 @@ 
 */
 function display_checkbox_matrix($permission_array, $tool, $permission, $inherited_permissions=array())
 {
-	$checked="";
-	if (is_array($permission_array[$tool]) AND in_array($permission,$permission_array[$tool]))
-	{
-		$checked="checked";
-	}
-	echo "\t\t\t<input type=\"checkbox\" name=\"permission*$tool*$permission\" $checked>\n";
+    $checked="";
+    if (is_array($permission_array[$tool]) AND in_array($permission,$permission_array[$tool]))
+    {
+        $checked="checked";
+    }
+    echo "\t\t\t<input type=\"checkbox\" name=\"permission*$tool*$permission\" $checked>\n";
 
 }
 
@@ -245,62 +245,62 @@ 
 */
 function display_image_matrix($permission_array, $tool, $permission,$inherited_permissions=array(), $course_admin=false, $editable=true)
 {
-	if ($course_admin) {
-		echo "\t\t\t<img src=\"../img/checkbox_on3.gif\" border=\"0\"/ title=\"".get_lang('PermissionGrantedByGroupOrRole')."\">";
-	} else {
-		if (in_array($permission,$inherited_permissions[$tool])) {
-			echo "\t\t\t<img src=\"../img/checkbox_on3.gif\" border=\"0\"/ title=\"".get_lang('PermissionGrantedByGroupOrRole')."\">";
-		} else {
-			if (is_array($permission_array[$tool]) AND in_array($permission,$permission_array[$tool])) {
-				if ($editable) {
-					$url=api_get_self();
-					$urlparameters = '';
-					foreach($_GET as $key=>$value) {
-						$parameter[$key]=$value;
-					}
-					$parameter['action']='revoke';
-					$parameter['permission']=$permission;
-					$parameter['tool']=$tool;
-					foreach ($parameter as $key=>$value) {
-						$urlparameters.=$key.'='.$value.'&amp;';
-					}
-					$url=$url.'?'.$urlparameters;
-
-					echo "\t\t\t <a href=\"".$url."\">";
-				}
-				echo "<img src=\"../img/checkbox_on2.gif\" border=\"0\"/>";
-				if ($editable) {
-					echo "</a>";
-				}
-			} else {
-				if ($editable)
-				{
-					$url=api_get_self();
-					$urlparameters = '';
-					foreach ($_GET as $key=>$value)
-					{
-						$parameter[$key]=$value;
-					}
-					$parameter['action']='grant';
-					$parameter['permission']=$permission;
-					$parameter['tool']=$tool;
-					foreach ($parameter as $key=>$value)
-					{
-						$urlparameters.=$key.'='.$value.'&amp;';
-					}
-					$url=$url.'?'.$urlparameters;
-
-					//echo "\t\t\t <a href=\"".str_replace('&', '&amp;', $_SERVER['REQUEST_URI'])."&amp;action=grant&amp;permission=$permission&amp;tool=$tool\">";
-					echo "\t\t\t <a href=\"".$url."\">";
-				}
-				echo "<img src=\"../img/wrong.gif\" border=\"0\"/>";
-				if ($editable)
-				{
-					echo "</a>";
-				}
-			}
-		}
-	}
+    if ($course_admin) {
+        echo "\t\t\t<img src=\"../img/checkbox_on3.gif\" border=\"0\"/ title=\"".get_lang('PermissionGrantedByGroupOrRole')."\">";
+    } else {
+        if (in_array($permission,$inherited_permissions[$tool])) {
+            echo "\t\t\t<img src=\"../img/checkbox_on3.gif\" border=\"0\"/ title=\"".get_lang('PermissionGrantedByGroupOrRole')."\">";
+        } else {
+            if (is_array($permission_array[$tool]) AND in_array($permission,$permission_array[$tool])) {
+                if ($editable) {
+                    $url=api_get_self();
+                    $urlparameters = '';
+                    foreach($_GET as $key=>$value) {
+                        $parameter[$key]=$value;
+                    }
+                    $parameter['action']='revoke';
+                    $parameter['permission']=$permission;
+                    $parameter['tool']=$tool;
+                    foreach ($parameter as $key=>$value) {
+                        $urlparameters.=$key.'='.$value.'&amp;';
+                    }
+                    $url=$url.'?'.$urlparameters;
+
+                    echo "\t\t\t <a href=\"".$url."\">";
+                }
+                echo "<img src=\"../img/checkbox_on2.gif\" border=\"0\"/>";
+                if ($editable) {
+                    echo "</a>";
+                }
+            } else {
+                if ($editable)
+                {
+                    $url=api_get_self();
+                    $urlparameters = '';
+                    foreach ($_GET as $key=>$value)
+                    {
+                        $parameter[$key]=$value;
+                    }
+                    $parameter['action']='grant';
+                    $parameter['permission']=$permission;
+                    $parameter['tool']=$tool;
+                    foreach ($parameter as $key=>$value)
+                    {
+                        $urlparameters.=$key.'='.$value.'&amp;';
+                    }
+                    $url=$url.'?'.$urlparameters;
+
+                    //echo "\t\t\t <a href=\"".str_replace('&', '&amp;', $_SERVER['REQUEST_URI'])."&amp;action=grant&amp;permission=$permission&amp;tool=$tool\">";
+                    echo "\t\t\t <a href=\"".$url."\">";
+                }
+                echo "<img src=\"../img/wrong.gif\" border=\"0\"/>";
+                if ($editable)
+                {
+                    echo "</a>";
+                }
+            }
+        }
+    }
 }
 
 
@@ -318,72 +318,72 @@ 
 function display_image_matrix_for_blogs($permission_array, $user_id, $tool, $permission,$inherited_permissions=array(), $course_admin=false, $editable=true)
 {
 
-	if ($course_admin)
-	{
-		echo "\t\t\t<img src=\"../img/checkbox_on3.gif\" border=\"0\"/ title=\"".get_lang('PermissionGrantedByGroupOrRole')."\">";
-	}
-	else
-	{
-		if (!empty($inherited_permissions) and in_array($permission,$inherited_permissions[$tool]))
-		{
-			echo "\t\t\t<img src=\"../img/checkbox_on3.gif\" border=\"0\"/ title=\"".get_lang('PermissionGrantedByGroupOrRole')."\">";
-		}
-		else
-		{
-			if (is_array($permission_array[$tool]) AND in_array($permission,$permission_array[$tool]))
-			{
-				if ($editable)
-				{
-					$url = api_get_self();
-					$urlparameters = '';
-					foreach($_GET as $key => $value)
-					{
-						$parameter[$key] = $value;
-					}
-					$parameter['action']='manage_rights';
-					$parameter['do']='revoke';
-					$parameter['permission']=$permission;
-					$parameter['tool']=$tool;
-					$parameter['user_id']=$user_id;
-					foreach ($parameter as $key=>$value)
-					{
-						$urlparameters .= $key . '=' . $value . '&amp;';
-					}
-					$url = $url . '?' . $urlparameters;
-
-					echo "\t\t\t <a href=\"".$url."\">";
-				}
-				echo "<img src=\"../img/checkbox_on2.gif\" border=\"0\"/ title=\"".get_lang('UserHasPermission')."\">";
-				if ($editable) {
-					echo "</a>";
-				}
-			} else {
-				if ($editable) {
-					$url = api_get_self();
-					$urlparameters = '';
-					foreach ($_GET as $key=>$value) {
-						$parameter[$key]=$value;
-					}
-					$parameter['action']='manage_rights';
-					$parameter['do']='grant';
-					$parameter['permission']=$permission;
-					$parameter['tool']=$tool;
-					$parameter['user_id']=$user_id;
-					foreach ($parameter as $key=>$value) {
-						$urlparameters .= $key . '=' . $value . '&amp;';
-					}
-					$url=$url.'?'.$urlparameters;
-
-					//echo "\t\t\t <a href=\"".str_replace('&', '&amp;', $_SERVER['REQUEST_URI'])."&amp;action=grant&amp;permission=$permission&amp;tool=$tool\">";
-					echo "\t\t\t <a href=\"".$url."\">";
-				}
-				echo "<img src=\"../img/wrong.gif\" border=\"0\"/ title=\"".get_lang('UserHasPermissionNot')."\">";
-				if ($editable) {
-					echo "</a>";
-				}
-			}
-		}
-	}
+    if ($course_admin)
+    {
+        echo "\t\t\t<img src=\"../img/checkbox_on3.gif\" border=\"0\"/ title=\"".get_lang('PermissionGrantedByGroupOrRole')."\">";
+    }
+    else
+    {
+        if (!empty($inherited_permissions) and in_array($permission,$inherited_permissions[$tool]))
+        {
+            echo "\t\t\t<img src=\"../img/checkbox_on3.gif\" border=\"0\"/ title=\"".get_lang('PermissionGrantedByGroupOrRole')."\">";
+        }
+        else
+        {
+            if (is_array($permission_array[$tool]) AND in_array($permission,$permission_array[$tool]))
+            {
+                if ($editable)
+                {
+                    $url = api_get_self();
+                    $urlparameters = '';
+                    foreach($_GET as $key => $value)
+                    {
+                        $parameter[$key] = $value;
+                    }
+                    $parameter['action']='manage_rights';
+                    $parameter['do']='revoke';
+                    $parameter['permission']=$permission;
+                    $parameter['tool']=$tool;
+                    $parameter['user_id']=$user_id;
+                    foreach ($parameter as $key=>$value)
+                    {
+                        $urlparameters .= $key . '=' . $value . '&amp;';
+                    }
+                    $url = $url . '?' . $urlparameters;
+
+                    echo "\t\t\t <a href=\"".$url."\">";
+                }
+                echo "<img src=\"../img/checkbox_on2.gif\" border=\"0\"/ title=\"".get_lang('UserHasPermission')."\">";
+                if ($editable) {
+                    echo "</a>";
+                }
+            } else {
+                if ($editable) {
+                    $url = api_get_self();
+                    $urlparameters = '';
+                    foreach ($_GET as $key=>$value) {
+                        $parameter[$key]=$value;
+                    }
+                    $parameter['action']='manage_rights';
+                    $parameter['do']='grant';
+                    $parameter['permission']=$permission;
+                    $parameter['tool']=$tool;
+                    $parameter['user_id']=$user_id;
+                    foreach ($parameter as $key=>$value) {
+                        $urlparameters .= $key . '=' . $value . '&amp;';
+                    }
+                    $url=$url.'?'.$urlparameters;
+
+                    //echo "\t\t\t <a href=\"".str_replace('&', '&amp;', $_SERVER['REQUEST_URI'])."&amp;action=grant&amp;permission=$permission&amp;tool=$tool\">";
+                    echo "\t\t\t <a href=\"".$url."\">";
+                }
+                echo "<img src=\"../img/wrong.gif\" border=\"0\"/ title=\"".get_lang('UserHasPermissionNot')."\">";
+                if ($editable) {
+                    echo "</a>";
+                }
+            }
+        }
+    }
 }
 
 
@@ -394,41 +394,41 @@ 
 */
 function display_role_list($current_course_roles, $current_platform_roles)
 {
-	global $setting_visualisation;
+    global $setting_visualisation;
     $course_id = api_get_course_int_id();
 
-	$coures_roles_table=Database::get_course_table(TABLE_ROLE);
-
-	// course roles
-	$sql="SELECT * FROM $coures_roles_table WHERE c_id = $course_id ";
-	$result=Database::query($sql);
-	while ($row=Database::fetch_array($result))
-	{
-		if (in_array($row['role_id'], $current_course_roles))
-		{
-			$checked='checked';
-			$image='checkbox_on2.gif';
-			$action='revoke';
-		}
-		else
-		{
-			$checked='';
-			$image='wrong.gif';
-			$action='grant';
-		}
-		if ($setting_visualisation=='checkbox')
-		{
-			echo "<input type=\"checkbox\" name=\"role*course*".$row['role_id']."\" $checked>";
-		}
-		if ($setting_visualisation=='image')
-		{
-			echo "<a href=\"".str_replace('&', '&amp;', $_SERVER['REQUEST_URI'])."&amp;action=$action&amp;role=".$row['role_id']."&amp;scope=course\"><img src=\"../img/".$image."\" border=\"0\"/></a>";
-		}
-
-
-		echo $row['role_name']." <a href=\"../permissions/roles.php?role_id=".$row['role_id']."&amp;scope=course\"><img src=\"../img/edit.gif\" /></a><br />\n";
-		echo $row['role_comment']."<br />\n";
-	}
+    $coures_roles_table=Database::get_course_table(TABLE_ROLE);
+
+    // course roles
+    $sql="SELECT * FROM $coures_roles_table WHERE c_id = $course_id ";
+    $result=Database::query($sql);
+    while ($row=Database::fetch_array($result))
+    {
+        if (in_array($row['role_id'], $current_course_roles))
+        {
+            $checked='checked';
+            $image='checkbox_on2.gif';
+            $action='revoke';
+        }
+        else
+        {
+            $checked='';
+            $image='wrong.gif';
+            $action='grant';
+        }
+        if ($setting_visualisation=='checkbox')
+        {
+            echo "<input type=\"checkbox\" name=\"role*course*".$row['role_id']."\" $checked>";
+        }
+        if ($setting_visualisation=='image')
+        {
+            echo "<a href=\"".str_replace('&', '&amp;', $_SERVER['REQUEST_URI'])."&amp;action=$action&amp;role=".$row['role_id']."&amp;scope=course\"><img src=\"../img/".$image."\" border=\"0\"/></a>";
+        }
+
+
+        echo $row['role_name']." <a href=\"../permissions/roles.php?role_id=".$row['role_id']."&amp;scope=course\"><img src=\"../img/edit.gif\" /></a><br />\n";
+        echo $row['role_comment']."<br />\n";
+    }
 }
 
 /**
@@ -442,24 +442,24 @@ 
 */
 function get_roles($content,$id, $scope='course') {
     $course_id  = api_get_course_int_id();    
-	if ($content=='user') {
-		$table=Database::get_course_table(TABLE_ROLE_USER);
-		$id_field = user_id;
-	}
-	if ($content=='group') {
-		$table=Database::get_course_table(TABLE_ROLE_GROUP);
-		$id_field = 'group_id';
-	}
-	$table_role=Database::get_course_table(TABLE_ROLE);
-
-	$current_roles=array();
-	//$sql="SELECT role.role_id FROM $table role_group_user, $table_role role WHERE role_group_user.$id_field = '$id' AND role_group_user.role_id=role.role_id AND role_group_user.scope='".$scope."'";$sql="SELECT role.role_id FROM $table role_group_user, $table_role role WHERE role_group_user.$id_field = '$id' AND role_group_user.role_id=role.role_id AND role_group_user.scope='".$scope."'";
-	$sql="SELECT role_id FROM $table WHERE c_id = $course_id AND $id_field = '$id' AND scope='".$scope."'";
-	$result=Database::query($sql);
-	while ($row=Database::fetch_array($result)) {
-		$current_roles[]=$row['role_id'];
-	}
-	return $current_roles;
+    if ($content=='user') {
+        $table=Database::get_course_table(TABLE_ROLE_USER);
+        $id_field = user_id;
+    }
+    if ($content=='group') {
+        $table=Database::get_course_table(TABLE_ROLE_GROUP);
+        $id_field = 'group_id';
+    }
+    $table_role=Database::get_course_table(TABLE_ROLE);
+
+    $current_roles=array();
+    //$sql="SELECT role.role_id FROM $table role_group_user, $table_role role WHERE role_group_user.$id_field = '$id' AND role_group_user.role_id=role.role_id AND role_group_user.scope='".$scope."'";$sql="SELECT role.role_id FROM $table role_group_user, $table_role role WHERE role_group_user.$id_field = '$id' AND role_group_user.role_id=role.role_id AND role_group_user.scope='".$scope."'";
+    $sql="SELECT role_id FROM $table WHERE c_id = $course_id AND $id_field = '$id' AND scope='".$scope."'";
+    $result=Database::query($sql);
+    while ($row=Database::fetch_array($result)) {
+        $current_roles[]=$row['role_id'];
+    }
+    return $current_roles;
 }
 
 /**
@@ -472,25 +472,25 @@ 
     $course_id = api_get_course_int_id();
     $course_id_condition = " WHERE c_id = $course_id ";
     
-	if ($content=='course')
-	{
-		$table_role=Database::get_course_table(TABLE_ROLE);
-	}
-	if ($content=='platform')
-	{
-		$table_role=Database::get_main_table(TABLE_ROLE);
-		$course_id_condition = '';
-	}
-
-	$current_roles=array();
-	$sql="SELECT * FROM $table_role $course_id_condition ";
-	$result=Database::query($sql);
-	while ($row=Database::fetch_array($result))
-	{
-		$roles[]=$row;
-	}
-
-	return $roles;
+    if ($content=='course')
+    {
+        $table_role=Database::get_course_table(TABLE_ROLE);
+    }
+    if ($content=='platform')
+    {
+        $table_role=Database::get_main_table(TABLE_ROLE);
+        $course_id_condition = '';
+    }
+
+    $current_roles=array();
+    $sql="SELECT * FROM $table_role $course_id_condition ";
+    $result=Database::query($sql);
+    while ($row=Database::fetch_array($result))
+    {
+        $roles[]=$row;
+    }
+
+    return $roles;
 }
 
 
@@ -506,34 +506,34 @@ 
 */
 function get_roles_permissions($content,$id, $scope='course') {
     $course_id = api_get_course_int_id();
-	if ($content == 'user') {
-		$table=Database::get_course_table(TABLE_ROLE_USER);
-		$id_field = 'user_id';
-	}
-
-	if ($content == 'group') {
-		$table = Database::get_course_table(TABLE_ROLE_GROUP);
-		$id_field = 'group_id';
-	}
-
-	// course roles or platform roles
-	$scope = 'course';
-	if ($scope == 'course') {
-		$table_role = Database::get_course_table(TABLE_ROLE);
-		$table_role_permissions = Database::get_course_table(TABLE_ROLE_PERMISSION);
+    if ($content == 'user') {
+        $table=Database::get_course_table(TABLE_ROLE_USER);
+        $id_field = 'user_id';
+    }
+
+    if ($content == 'group') {
+        $table = Database::get_course_table(TABLE_ROLE_GROUP);
+        $id_field = 'group_id';
+    }
+
+    // course roles or platform roles
+    $scope = 'course';
+    if ($scope == 'course') {
+        $table_role = Database::get_course_table(TABLE_ROLE);
+        $table_role_permissions = Database::get_course_table(TABLE_ROLE_PERMISSION);
         
         $role_condition = " role.c_id = $course_id AND role_permissions.c_id = $course_id AND ";
-	}
+    }
 
-	if ($scope == 'platform') {
-		$table_role = Database::get_main_table(TABLE_ROLE);
-		$table_role_permissions = Database::get_main_table(TABLE_ROLE_PERMISSION);
+    if ($scope == 'platform') {
+        $table_role = Database::get_main_table(TABLE_ROLE);
+        $table_role_permissions = Database::get_main_table(TABLE_ROLE_PERMISSION);
         $role_condition = '';
-	}
+    }
 
-	$current_roles = array();
+    $current_roles = array();
 
-	$sql = "
+    $sql = "
 		SELECT *
 		FROM
 			" . $table . " role_group_user,
@@ -547,12 +547,12 @@ 
 			role_group_user.role_id = role.role_id AND
 			role.role_id = role_permissions.role_id";
 
-	$result = Database::query($sql);
+    $result = Database::query($sql);
     $current_role_permissions = array();
-	while ($row=Database::fetch_array($result)) {
-		$current_role_permissions[$row['tool']][]=$row['action'];
+    while ($row=Database::fetch_array($result)) {
+        $current_role_permissions[$row['tool']][]=$row['action'];
     }
-	return $current_role_permissions;
+    return $current_role_permissions;
 }
 
 /**
@@ -566,34 +566,34 @@ 
 
 function assign_role($content, $action, $id, $role_id, $scope='course') {
     $course_id = api_get_course_int_id();
-	// Which database are we using (depending on the $content parameter)
-	if ($content=='user') {
-		$table=Database::get_course_table(TABLE_ROLE_USER);
-		$id_field = 'user_id';
-	} elseif($content=='group') {
-		$table=Database::get_course_table(TABLE_ROLE_GROUP);
-		$id_field = 'group_id';
-	} else {
-		return  get_lang('Error');
-	}
-
-	// grating a right
-	if ($action=='grant') {
-		$sql="INSERT INTO $table (c_id, role_id, scope, $id_field) VALUES ($course_id, '".Database::escape_string($role_id)."','".Database::escape_string($scope)."','".Database::escape_string($id)."')";
-		$result=Database::query($sql);
-		if ($result) {
-			$result_message=get_lang('RoleGranted');
-		}
-	}
+    // Which database are we using (depending on the $content parameter)
+    if ($content=='user') {
+        $table=Database::get_course_table(TABLE_ROLE_USER);
+        $id_field = 'user_id';
+    } elseif($content=='group') {
+        $table=Database::get_course_table(TABLE_ROLE_GROUP);
+        $id_field = 'group_id';
+    } else {
+        return  get_lang('Error');
+    }
+
+    // grating a right
+    if ($action=='grant') {
+        $sql="INSERT INTO $table (c_id, role_id, scope, $id_field) VALUES ($course_id, '".Database::escape_string($role_id)."','".Database::escape_string($scope)."','".Database::escape_string($id)."')";
+        $result=Database::query($sql);
+        if ($result) {
+            $result_message=get_lang('RoleGranted');
+        }
+    }
     
-	if ($action=='revoke') {
-		$sql="DELETE FROM $table WHERE c_id = $course_id AND $id_field = '".Database::escape_string($id)."' AND role_id='".Database::escape_string($role_id)."'";
-		$result=Database::query($sql);
-		if ($result) {
-			$result_message=get_lang('RoleRevoked');
-		}
-	}
-	return $result_message;
+    if ($action=='revoke') {
+        $sql="DELETE FROM $table WHERE c_id = $course_id AND $id_field = '".Database::escape_string($id)."' AND role_id='".Database::escape_string($role_id)."'";
+        $result=Database::query($sql);
+        if ($result) {
+            $result_message=get_lang('RoleRevoked');
+        }
+    }
+    return $result_message;
 }
 
 
@@ -603,21 +603,21 @@ 
 */
 function permission_array_merge($array1, $array2)
 {
-	foreach ($array2 as $tool=>$permissions)
-	{
-		foreach ($permissions as $permissionkey=>$permissionvalue)
-		{
-			$array1[$tool][]=$permissionvalue;
-		}
-	}
-	return $array1;
+    foreach ($array2 as $tool=>$permissions)
+    {
+        foreach ($permissions as $permissionkey=>$permissionvalue)
+        {
+            $array1[$tool][]=$permissionvalue;
+        }
+    }
+    return $array1;
 }
 
 
 function my_print_r($array)
 {
-	echo '<pre>';
-	print_r($array);
-	echo '</pre>';
+    echo '<pre>';
+    print_r($array);
+    echo '</pre>';
 }
 ?>

Spacing +143 added lines, -143 removed lines

@@ -26,34 +26,34 @@ 
     $course_id = api_get_course_int_id();
     
 	// Which database are we using (depending on the $content parameter)
-	if ($content=='user')
+	if ($content == 'user')
 	{
-		$table=Database::get_course_table(TABLE_PERMISSION_USER);
+		$table = Database::get_course_table(TABLE_PERMISSION_USER);
 		$id_field = user_id;
 	}
-	if ($content=='group')
+	if ($content == 'group')
 	{
-		$table=Database::get_course_table(TABLE_PERMISSION_GROUP);
+		$table = Database::get_course_table(TABLE_PERMISSION_GROUP);
 		$id_field = group_id;
 	}
-	if ($content=='role')
+	if ($content == 'role')
 	{
-		$table=Database::get_course_table(TABLE_ROLE_PERMISSION);
+		$table = Database::get_course_table(TABLE_ROLE_PERMISSION);
 		$id_field = role_id;
 	}
 
 	// We first delete all the existing permissions for that user/group/role
-	$sql="DELETE FROM $table  WHERE c_id = $course_id AND $id_field = '".Database::escape_string($id)."'";
-	$result=Database::query($sql);
+	$sql = "DELETE FROM $table  WHERE c_id = $course_id AND $id_field = '".Database::escape_string($id)."'";
+	$result = Database::query($sql);
 
 	// looping through the post values to find the permission (containing the string permission* )
 	foreach ($_POST as $key => $value)
 	{
-		if (strstr($key,"permission*"))
+		if (strstr($key, "permission*"))
 		{
-			list($brol,$tool,$action)=explode("*",$key);
-			$sql="INSERT INTO $table (c_id, $id_field,tool,action) VALUES ($course_id, '".Database::escape_string($id)."','".Database::escape_string($tool)."','".Database::escape_string($action)."')";
-			$result=Database::query($sql);
+			list($brol, $tool, $action) = explode("*", $key);
+			$sql = "INSERT INTO $table (c_id, $id_field,tool,action) VALUES ($course_id, '".Database::escape_string($id)."','".Database::escape_string($tool)."','".Database::escape_string($action)."')";
+			$result = Database::query($sql);
 		}
 	}
 	return get_lang('PermissionsStored');
@@ -69,7 +69,7 @@ 
 * @author Patrick Cool <patrick.cool@ugent.be>, Ghent University
 * @version 1.0
 */
-function store_one_permission($content, $action, $id, $tool,$permission) {
+function store_one_permission($content, $action, $id, $tool, $permission) {
 	global $rights_full;
     $course_id = api_get_course_int_id();
 	// for some reason I don't know, he can't get to the $rights_full array, so commented the following lines out.
@@ -82,35 +82,35 @@ 
 
 	// Which database are we using (depending on the $content parameter)
     
-	if ($content=='user') {
-		$table=Database::get_course_table(TABLE_PERMISSION_USER);
+	if ($content == 'user') {
+		$table = Database::get_course_table(TABLE_PERMISSION_USER);
 		$id_field = user_id;
 	}
-	if ($content=='group')
+	if ($content == 'group')
 	{
-		$table=Database::get_course_table(TABLE_PERMISSION_GROUP);
+		$table = Database::get_course_table(TABLE_PERMISSION_GROUP);
 		$id_field = group_id;
 	}
-	if ($content=='role')
+	if ($content == 'role')
 	{
-		$table=Database::get_course_table(TABLE_ROLE_PERMISSION);
+		$table = Database::get_course_table(TABLE_ROLE_PERMISSION);
 		$id_field = role_id;
 	}
 
 	// grating a right
-	if ($action=='grant') {
-		$sql="INSERT INTO $table (c_id, $id_field,tool,action) VALUES ($course_id, '".Database::escape_string($id)."','".Database::escape_string($tool)."','".Database::escape_string($permission)."')";
-		$result=Database::query($sql);
-		if($result) {
-			$result_message=get_lang('PermissionGranted');
+	if ($action == 'grant') {
+		$sql = "INSERT INTO $table (c_id, $id_field,tool,action) VALUES ($course_id, '".Database::escape_string($id)."','".Database::escape_string($tool)."','".Database::escape_string($permission)."')";
+		$result = Database::query($sql);
+		if ($result) {
+			$result_message = get_lang('PermissionGranted');
 		}
 	}
-	if ($action=='revoke')
+	if ($action == 'revoke')
 	{
-		$sql="DELETE FROM $table WHERE c_id = $course_id AND $id_field = '".Database::escape_string($id)."' AND tool='".Database::escape_string($tool)."' AND action='".Database::escape_string($permission)."'";
-		$result=Database::query($sql);
-		if($result) {
-			$result_message=get_lang('PermissionRevoked');
+		$sql = "DELETE FROM $table WHERE c_id = $course_id AND $id_field = '".Database::escape_string($id)."' AND tool='".Database::escape_string($tool)."' AND action='".Database::escape_string($permission)."'";
+		$result = Database::query($sql);
+		if ($result) {
+			$result_message = get_lang('PermissionRevoked');
 		}
 	}
 	return $result_message;
@@ -125,44 +125,44 @@ 
 */
 function get_permissions($content, $id) {
     $course_id = api_get_course_int_id();
-	$currentpermissions=array();
+	$currentpermissions = array();
 	// Which database are we using (depending on the $content parameter)
     $course_id_condition = " c_id = $course_id AND ";
 	if ($content == 'user')
 	{
-		$table=Database::get_course_table(TABLE_PERMISSION_USER);
+		$table = Database::get_course_table(TABLE_PERMISSION_USER);
 		$id_field = 'user_id';
 	}
 	elseif ($content == 'group')
 	{
-		$table=Database::get_course_table(TABLE_PERMISSION_GROUP);
+		$table = Database::get_course_table(TABLE_PERMISSION_GROUP);
 		$id_field = 'group_id';
 	}
 	elseif ($content == 'role')
 	{
-		$table=Database::get_course_table(TABLE_ROLE_PERMISSION);
+		$table = Database::get_course_table(TABLE_ROLE_PERMISSION);
 		$id_field = 'role_id';
 	}
 	elseif ($content == 'platform_role')
 	{
-		$table=Database::get_main_table(TABLE_ROLE_PERMISSION);
+		$table = Database::get_main_table(TABLE_ROLE_PERMISSION);
 		$id_field = 'role_id';
         $course_id_condition = '';
 	}
 	elseif ($content == 'task')
 	{
-		$table=Database::get_course_table(TABLE_BLOGS_TASKS_PERMISSIONS);
+		$table = Database::get_course_table(TABLE_BLOGS_TASKS_PERMISSIONS);
 		$id_field = 'task_id';
 	}
 
 	// finding all the permissions. We store this in a multidimensional array
 	// where the first dimension is the tool.
-	$sql="
-		SELECT * FROM " . $table . "
-		WHERE $course_id_condition " . $id_field . "='" . Database::escape_string($id) . "'";
+	$sql = "
+		SELECT * FROM " . $table."
+		WHERE $course_id_condition ".$id_field."='".Database::escape_string($id)."'";
 	$result = Database::query($sql);
 
-	while($row = Database::fetch_array($result))
+	while ($row = Database::fetch_array($result))
 		$currentpermissions[$row['tool']][] = $row['action'];
 
 	return $currentpermissions;
@@ -179,7 +179,7 @@ 
 */
 function limited_or_full($current_permissions)
 {
-	if (api_get_setting('permissions')=='limited')
+	if (api_get_setting('permissions') == 'limited')
 	{
 		foreach ($current_permissions as $tool=>$tool_rights)
 		{
@@ -187,15 +187,15 @@ 
 			// if it is visibility or move we have to grant the edit right
 			foreach ($tool_rights as $key=>$value)
 			{
-				if ($value=='View')
+				if ($value == 'View')
 				{
 					unset($current_permissions[$tool][$key]);
 				}
-				if ($value=='Visibility' OR $value=='Move')
+				if ($value == 'Visibility' OR $value == 'Move')
 				{
-					if (!in_array('Edit',$current_permissions[$tool]))
+					if (!in_array('Edit', $current_permissions[$tool]))
 					{
-						$current_permissions[$tool][]='Edit';
+						$current_permissions[$tool][] = 'Edit';
 					}
 					unset($current_permissions[$tool][$key]);
 				}
@@ -207,7 +207,7 @@ 
 		}
 		return $current_permissions;
 	}
-	if (api_get_setting('permissions')=='full')
+	if (api_get_setting('permissions') == 'full')
 	{
 		return $current_permissions;
 	}
@@ -222,12 +222,12 @@ 
 * @author Patrick Cool <patrick.cool@ugent.be>, Ghent University
 * @version 1.0
 */
-function display_checkbox_matrix($permission_array, $tool, $permission, $inherited_permissions=array())
+function display_checkbox_matrix($permission_array, $tool, $permission, $inherited_permissions = array())
 {
-	$checked="";
-	if (is_array($permission_array[$tool]) AND in_array($permission,$permission_array[$tool]))
+	$checked = "";
+	if (is_array($permission_array[$tool]) AND in_array($permission, $permission_array[$tool]))
 	{
-		$checked="checked";
+		$checked = "checked";
 	}
 	echo "\t\t\t<input type=\"checkbox\" name=\"permission*$tool*$permission\" $checked>\n";
 
@@ -243,28 +243,28 @@ 
 * @author Patrick Cool <patrick.cool@ugent.be>, Ghent University
 * @version 1.0
 */
-function display_image_matrix($permission_array, $tool, $permission,$inherited_permissions=array(), $course_admin=false, $editable=true)
+function display_image_matrix($permission_array, $tool, $permission, $inherited_permissions = array(), $course_admin = false, $editable = true)
 {
 	if ($course_admin) {
 		echo "\t\t\t<img src=\"../img/checkbox_on3.gif\" border=\"0\"/ title=\"".get_lang('PermissionGrantedByGroupOrRole')."\">";
 	} else {
-		if (in_array($permission,$inherited_permissions[$tool])) {
+		if (in_array($permission, $inherited_permissions[$tool])) {
 			echo "\t\t\t<img src=\"../img/checkbox_on3.gif\" border=\"0\"/ title=\"".get_lang('PermissionGrantedByGroupOrRole')."\">";
 		} else {
-			if (is_array($permission_array[$tool]) AND in_array($permission,$permission_array[$tool])) {
+			if (is_array($permission_array[$tool]) AND in_array($permission, $permission_array[$tool])) {
 				if ($editable) {
-					$url=api_get_self();
+					$url = api_get_self();
 					$urlparameters = '';
-					foreach($_GET as $key=>$value) {
-						$parameter[$key]=$value;
+					foreach ($_GET as $key=>$value) {
+						$parameter[$key] = $value;
 					}
-					$parameter['action']='revoke';
-					$parameter['permission']=$permission;
-					$parameter['tool']=$tool;
+					$parameter['action'] = 'revoke';
+					$parameter['permission'] = $permission;
+					$parameter['tool'] = $tool;
 					foreach ($parameter as $key=>$value) {
-						$urlparameters.=$key.'='.$value.'&amp;';
+						$urlparameters .= $key.'='.$value.'&amp;';
 					}
-					$url=$url.'?'.$urlparameters;
+					$url = $url.'?'.$urlparameters;
 
 					echo "\t\t\t <a href=\"".$url."\">";
 				}
@@ -275,20 +275,20 @@ 
 			} else {
 				if ($editable)
 				{
-					$url=api_get_self();
+					$url = api_get_self();
 					$urlparameters = '';
 					foreach ($_GET as $key=>$value)
 					{
-						$parameter[$key]=$value;
+						$parameter[$key] = $value;
 					}
-					$parameter['action']='grant';
-					$parameter['permission']=$permission;
-					$parameter['tool']=$tool;
+					$parameter['action'] = 'grant';
+					$parameter['permission'] = $permission;
+					$parameter['tool'] = $tool;
 					foreach ($parameter as $key=>$value)
 					{
-						$urlparameters.=$key.'='.$value.'&amp;';
+						$urlparameters .= $key.'='.$value.'&amp;';
 					}
-					$url=$url.'?'.$urlparameters;
+					$url = $url.'?'.$urlparameters;
 
 					//echo "\t\t\t <a href=\"".str_replace('&', '&amp;', $_SERVER['REQUEST_URI'])."&amp;action=grant&amp;permission=$permission&amp;tool=$tool\">";
 					echo "\t\t\t <a href=\"".$url."\">";
@@ -315,7 +315,7 @@ 
 * @author Patrick Cool <patrick.cool@ugent.be>, Ghent University
 * @version 1.0
 */
-function display_image_matrix_for_blogs($permission_array, $user_id, $tool, $permission,$inherited_permissions=array(), $course_admin=false, $editable=true)
+function display_image_matrix_for_blogs($permission_array, $user_id, $tool, $permission, $inherited_permissions = array(), $course_admin = false, $editable = true)
 {
 
 	if ($course_admin)
@@ -324,32 +324,32 @@ 
 	}
 	else
 	{
-		if (!empty($inherited_permissions) and in_array($permission,$inherited_permissions[$tool]))
+		if (!empty($inherited_permissions) and in_array($permission, $inherited_permissions[$tool]))
 		{
 			echo "\t\t\t<img src=\"../img/checkbox_on3.gif\" border=\"0\"/ title=\"".get_lang('PermissionGrantedByGroupOrRole')."\">";
 		}
 		else
 		{
-			if (is_array($permission_array[$tool]) AND in_array($permission,$permission_array[$tool]))
+			if (is_array($permission_array[$tool]) AND in_array($permission, $permission_array[$tool]))
 			{
 				if ($editable)
 				{
 					$url = api_get_self();
 					$urlparameters = '';
-					foreach($_GET as $key => $value)
+					foreach ($_GET as $key => $value)
 					{
 						$parameter[$key] = $value;
 					}
-					$parameter['action']='manage_rights';
-					$parameter['do']='revoke';
-					$parameter['permission']=$permission;
-					$parameter['tool']=$tool;
-					$parameter['user_id']=$user_id;
+					$parameter['action'] = 'manage_rights';
+					$parameter['do'] = 'revoke';
+					$parameter['permission'] = $permission;
+					$parameter['tool'] = $tool;
+					$parameter['user_id'] = $user_id;
 					foreach ($parameter as $key=>$value)
 					{
-						$urlparameters .= $key . '=' . $value . '&amp;';
+						$urlparameters .= $key.'='.$value.'&amp;';
 					}
-					$url = $url . '?' . $urlparameters;
+					$url = $url.'?'.$urlparameters;
 
 					echo "\t\t\t <a href=\"".$url."\">";
 				}
@@ -362,17 +362,17 @@ 
 					$url = api_get_self();
 					$urlparameters = '';
 					foreach ($_GET as $key=>$value) {
-						$parameter[$key]=$value;
+						$parameter[$key] = $value;
 					}
-					$parameter['action']='manage_rights';
-					$parameter['do']='grant';
-					$parameter['permission']=$permission;
-					$parameter['tool']=$tool;
-					$parameter['user_id']=$user_id;
+					$parameter['action'] = 'manage_rights';
+					$parameter['do'] = 'grant';
+					$parameter['permission'] = $permission;
+					$parameter['tool'] = $tool;
+					$parameter['user_id'] = $user_id;
 					foreach ($parameter as $key=>$value) {
-						$urlparameters .= $key . '=' . $value . '&amp;';
+						$urlparameters .= $key.'='.$value.'&amp;';
 					}
-					$url=$url.'?'.$urlparameters;
+					$url = $url.'?'.$urlparameters;
 
 					//echo "\t\t\t <a href=\"".str_replace('&', '&amp;', $_SERVER['REQUEST_URI'])."&amp;action=grant&amp;permission=$permission&amp;tool=$tool\">";
 					echo "\t\t\t <a href=\"".$url."\">";
@@ -397,30 +397,30 @@ 
 	global $setting_visualisation;
     $course_id = api_get_course_int_id();
 
-	$coures_roles_table=Database::get_course_table(TABLE_ROLE);
+	$coures_roles_table = Database::get_course_table(TABLE_ROLE);
 
 	// course roles
-	$sql="SELECT * FROM $coures_roles_table WHERE c_id = $course_id ";
-	$result=Database::query($sql);
-	while ($row=Database::fetch_array($result))
+	$sql = "SELECT * FROM $coures_roles_table WHERE c_id = $course_id ";
+	$result = Database::query($sql);
+	while ($row = Database::fetch_array($result))
 	{
 		if (in_array($row['role_id'], $current_course_roles))
 		{
-			$checked='checked';
-			$image='checkbox_on2.gif';
-			$action='revoke';
+			$checked = 'checked';
+			$image = 'checkbox_on2.gif';
+			$action = 'revoke';
 		}
 		else
 		{
-			$checked='';
-			$image='wrong.gif';
-			$action='grant';
+			$checked = '';
+			$image = 'wrong.gif';
+			$action = 'grant';
 		}
-		if ($setting_visualisation=='checkbox')
+		if ($setting_visualisation == 'checkbox')
 		{
 			echo "<input type=\"checkbox\" name=\"role*course*".$row['role_id']."\" $checked>";
 		}
-		if ($setting_visualisation=='image')
+		if ($setting_visualisation == 'image')
 		{
 			echo "<a href=\"".str_replace('&', '&amp;', $_SERVER['REQUEST_URI'])."&amp;action=$action&amp;role=".$row['role_id']."&amp;scope=course\"><img src=\"../img/".$image."\" border=\"0\"/></a>";
 		}
@@ -440,24 +440,24 @@ 
 * @author Patrick Cool <patrick.cool@ugent.be>, Ghent University
 * @version 1.0
 */
-function get_roles($content,$id, $scope='course') {
-    $course_id  = api_get_course_int_id();    
-	if ($content=='user') {
-		$table=Database::get_course_table(TABLE_ROLE_USER);
+function get_roles($content, $id, $scope = 'course') {
+    $course_id = api_get_course_int_id();    
+	if ($content == 'user') {
+		$table = Database::get_course_table(TABLE_ROLE_USER);
 		$id_field = user_id;
 	}
-	if ($content=='group') {
-		$table=Database::get_course_table(TABLE_ROLE_GROUP);
+	if ($content == 'group') {
+		$table = Database::get_course_table(TABLE_ROLE_GROUP);
 		$id_field = 'group_id';
 	}
-	$table_role=Database::get_course_table(TABLE_ROLE);
+	$table_role = Database::get_course_table(TABLE_ROLE);
 
-	$current_roles=array();
+	$current_roles = array();
 	//$sql="SELECT role.role_id FROM $table role_group_user, $table_role role WHERE role_group_user.$id_field = '$id' AND role_group_user.role_id=role.role_id AND role_group_user.scope='".$scope."'";$sql="SELECT role.role_id FROM $table role_group_user, $table_role role WHERE role_group_user.$id_field = '$id' AND role_group_user.role_id=role.role_id AND role_group_user.scope='".$scope."'";
-	$sql="SELECT role_id FROM $table WHERE c_id = $course_id AND $id_field = '$id' AND scope='".$scope."'";
-	$result=Database::query($sql);
-	while ($row=Database::fetch_array($result)) {
-		$current_roles[]=$row['role_id'];
+	$sql = "SELECT role_id FROM $table WHERE c_id = $course_id AND $id_field = '$id' AND scope='".$scope."'";
+	$result = Database::query($sql);
+	while ($row = Database::fetch_array($result)) {
+		$current_roles[] = $row['role_id'];
 	}
 	return $current_roles;
 }
@@ -468,26 +468,26 @@ 
 * @author Patrick Cool <patrick.cool@ugent.be>, Ghent University
 * @version 1.0
 */
-function get_all_roles($content='course') {
+function get_all_roles($content = 'course') {
     $course_id = api_get_course_int_id();
     $course_id_condition = " WHERE c_id = $course_id ";
     
-	if ($content=='course')
+	if ($content == 'course')
 	{
-		$table_role=Database::get_course_table(TABLE_ROLE);
+		$table_role = Database::get_course_table(TABLE_ROLE);
 	}
-	if ($content=='platform')
+	if ($content == 'platform')
 	{
-		$table_role=Database::get_main_table(TABLE_ROLE);
+		$table_role = Database::get_main_table(TABLE_ROLE);
 		$course_id_condition = '';
 	}
 
-	$current_roles=array();
-	$sql="SELECT * FROM $table_role $course_id_condition ";
-	$result=Database::query($sql);
-	while ($row=Database::fetch_array($result))
+	$current_roles = array();
+	$sql = "SELECT * FROM $table_role $course_id_condition ";
+	$result = Database::query($sql);
+	while ($row = Database::fetch_array($result))
 	{
-		$roles[]=$row;
+		$roles[] = $row;
 	}
 
 	return $roles;
@@ -504,10 +504,10 @@ 
 * @author Patrick Cool <patrick.cool@ugent.be>, Ghent University
 * @version 1.0
 */
-function get_roles_permissions($content,$id, $scope='course') {
+function get_roles_permissions($content, $id, $scope = 'course') {
     $course_id = api_get_course_int_id();
 	if ($content == 'user') {
-		$table=Database::get_course_table(TABLE_ROLE_USER);
+		$table = Database::get_course_table(TABLE_ROLE_USER);
 		$id_field = 'user_id';
 	}
 
@@ -536,21 +536,21 @@ 
 	$sql = "
 		SELECT *
 		FROM
-			" . $table . " role_group_user,
-			" . $table_role . " role,
-			" . $table_role_permissions . " role_permissions
+			" . $table." role_group_user,
+			" . $table_role." role,
+			" . $table_role_permissions." role_permissions
 		WHERE
 		    role_group_user.c_id = $course_id AND
 		    $role_condition
-			role_group_user.scope = '" . $scope . "' AND
-			role_group_user." . $id_field . " = '" . $id . "' AND
+			role_group_user.scope = '".$scope."' AND
+			role_group_user." . $id_field." = '".$id."' AND
 			role_group_user.role_id = role.role_id AND
 			role.role_id = role_permissions.role_id";
 
 	$result = Database::query($sql);
     $current_role_permissions = array();
-	while ($row=Database::fetch_array($result)) {
-		$current_role_permissions[$row['tool']][]=$row['action'];
+	while ($row = Database::fetch_array($result)) {
+		$current_role_permissions[$row['tool']][] = $row['action'];
     }
 	return $current_role_permissions;
 }
@@ -564,33 +564,33 @@ 
 * @author Patrick Cool <patrick.cool@ugent.be>, Ghent University
 */
 
-function assign_role($content, $action, $id, $role_id, $scope='course') {
+function assign_role($content, $action, $id, $role_id, $scope = 'course') {
     $course_id = api_get_course_int_id();
 	// Which database are we using (depending on the $content parameter)
-	if ($content=='user') {
-		$table=Database::get_course_table(TABLE_ROLE_USER);
+	if ($content == 'user') {
+		$table = Database::get_course_table(TABLE_ROLE_USER);
 		$id_field = 'user_id';
-	} elseif($content=='group') {
-		$table=Database::get_course_table(TABLE_ROLE_GROUP);
+	} elseif ($content == 'group') {
+		$table = Database::get_course_table(TABLE_ROLE_GROUP);
 		$id_field = 'group_id';
 	} else {
 		return  get_lang('Error');
 	}
 
 	// grating a right
-	if ($action=='grant') {
-		$sql="INSERT INTO $table (c_id, role_id, scope, $id_field) VALUES ($course_id, '".Database::escape_string($role_id)."','".Database::escape_string($scope)."','".Database::escape_string($id)."')";
-		$result=Database::query($sql);
+	if ($action == 'grant') {
+		$sql = "INSERT INTO $table (c_id, role_id, scope, $id_field) VALUES ($course_id, '".Database::escape_string($role_id)."','".Database::escape_string($scope)."','".Database::escape_string($id)."')";
+		$result = Database::query($sql);
 		if ($result) {
-			$result_message=get_lang('RoleGranted');
+			$result_message = get_lang('RoleGranted');
 		}
 	}
     
-	if ($action=='revoke') {
-		$sql="DELETE FROM $table WHERE c_id = $course_id AND $id_field = '".Database::escape_string($id)."' AND role_id='".Database::escape_string($role_id)."'";
-		$result=Database::query($sql);
+	if ($action == 'revoke') {
+		$sql = "DELETE FROM $table WHERE c_id = $course_id AND $id_field = '".Database::escape_string($id)."' AND role_id='".Database::escape_string($role_id)."'";
+		$result = Database::query($sql);
 		if ($result) {
-			$result_message=get_lang('RoleRevoked');
+			$result_message = get_lang('RoleRevoked');
 		}
 	}
 	return $result_message;
@@ -607,7 +607,7 @@ 
 	{
 		foreach ($permissions as $permissionkey=>$permissionvalue)
 		{
-			$array1[$tool][]=$permissionvalue;
+			$array1[$tool][] = $permissionvalue;
 		}
 	}
 	return $array1;