chamilo / chamilo-lms

main/inc/lib/sub_language.class.php

Doc Comments +4 added lines, -1 removed lines

@@ -18,6 +18,7 @@ 
      * Get all files of lang folder (forum.inc.php,gradebook.inc.php,notebook.inc.php)
      * @param String The lang path folder  (/var/www/my_lms/main/lang/spanish)
      * @param bool true if we only want the "subname" trad4all instead of  trad4all.inc.php
+     * @param string $path
      *
      * @return Array All file of lang folder
      */
@@ -68,6 +69,7 @@ 
     /**
      * Get all information of language
      * @param Integer The parent id(Language father id)
+     * @param integer $parent_id
      * @return Array All information about language
      */
     public static function get_all_information_of_language($parent_id)
@@ -86,6 +88,7 @@ 
     /**
      * Get all information of chamilo file
      * @param String The chamilo path file (/var/www/chamilo/main/lang/spanish/gradebook.inc.php)
+     * @param string $system_path_file
      * @patam Bool Whether we want to remove the '$' prefix in the results or not
      * @return Array Contains all information of chamilo file
      */
@@ -345,7 +348,7 @@ 
     /**
      * Make available the language
      * @param Integer The language id
-     * @return void
+     * @return boolean
      */
     public static function make_available_language($language_id)
     {

Braces +3 added lines, -2 removed lines

@@ -29,8 +29,9 @@
                 while (($file = readdir($dh)) !== false) {
                     if ($file[0] <> '.' && substr($file, -4, strlen($file)) == '.php') {
                         if ($only_main_name) {
-                            if ($file != '' && strpos($file, '.inc.php'))
-                                $content_dir[] = substr($file, 0, strpos($file, '.inc.php'));
+                            if ($file != '' && strpos($file, '.inc.php')) {
+                                                            $content_dir[] = substr($file, 0, strpos($file, '.inc.php'));
+                            }
                         } else {
                             $content_dir[] = $file;
                         }

Spacing +32 added lines, -32 removed lines

@@ -21,7 +21,7 @@ 
     public static function getAllLanguages()
     {
         $table = Database :: get_main_table(TABLE_MAIN_LANGUAGE);
-        $sql = 'SELECT * FROM ' . $table;
+        $sql = 'SELECT * FROM '.$table;
         $rs = Database::query($sql);
         $all_languages = [];
         while ($row = Database::fetch_array($rs, 'ASSOC')) {
@@ -70,10 +70,10 @@ 
     public static function get_all_information_of_sub_language($parent_id, $sub_language_id)
     {
         $table = Database :: get_main_table(TABLE_MAIN_LANGUAGE);
-        $sql = 'SELECT * FROM ' . $table . '
+        $sql = 'SELECT * FROM '.$table.'
                 WHERE
                     parent_id= ' . intval($parent_id).' AND
-                    id= ' . intval($sub_language_id) . '';
+                    id= ' . intval($sub_language_id).'';
         $rs = Database::query($sql);
         $all_information = array();
         while ($row = Database::fetch_array($rs, 'ASSOC')) {
@@ -91,7 +91,7 @@ 
     public static function get_all_information_of_language($parent_id)
     {
         $table = Database :: get_main_table(TABLE_MAIN_LANGUAGE);
-        $sql = 'SELECT * FROM ' . $table . ' WHERE id = "' . intval($parent_id) . '"';
+        $sql = 'SELECT * FROM '.$table.' WHERE id = "'.intval($parent_id).'"';
         $rs = Database::query($sql);
         $all_information = array();
         while ($row = Database::fetch_array($rs, 'ASSOC')) {
@@ -137,7 +137,7 @@ 
      */
     public static function add_file_in_language_directory($system_path_file)
     {
-        $return_value = @file_put_contents($system_path_file, '<?php' . PHP_EOL);
+        $return_value = @file_put_contents($system_path_file, '<?php'.PHP_EOL);
 
         return $return_value;
     }
@@ -152,10 +152,10 @@ 
     public static function write_data_in_file($path_file, $new_term, $new_variable)
     {
         $return_value = false;
-        $new_data = $new_variable . '=' . $new_term;
+        $new_data = $new_variable.'='.$new_term;
         $resource = @fopen($path_file, "a");
         if (file_exists($path_file) && $resource) {
-            if (fwrite($resource, $new_data . PHP_EOL) === false) {
+            if (fwrite($resource, $new_data.PHP_EOL) === false) {
                 //not allow to write
                 $return_value = false;
             } else {
@@ -177,7 +177,7 @@ 
         if (empty($sub_language_dir)) {
             return false;
         }
-        $dir = api_get_path(SYS_LANG_PATH) . $sub_language_dir;
+        $dir = api_get_path(SYS_LANG_PATH).$sub_language_dir;
         if (is_dir($dir)) {
             return true;
         } //even if the dir already exists, we reach the objective of having the directory there
@@ -201,8 +201,8 @@ 
             return false;
         }
         $table = Database :: get_main_table(TABLE_MAIN_LANGUAGE);
-        $sql = 'SELECT dokeos_folder FROM ' . $table . '
-                WHERE parent_id = ' . $parent_id . ' and id = ' . $sub_language_id;
+        $sql = 'SELECT dokeos_folder FROM '.$table.'
+                WHERE parent_id = ' . $parent_id.' and id = '.$sub_language_id;
         $res = Database::query($sql);
         if ($res === false or Database::num_rows($res) < 1) {
             return false;
@@ -212,7 +212,7 @@ 
         if ($res === false) {
             return false;
         } //can't delete dir, so do not delete language record
-        $sql = 'DELETE FROM ' . $table . '
+        $sql = 'DELETE FROM '.$table.'
                 WHERE id= ' . intval($sub_language_id);
         $res = Database::query($sql);
 
@@ -229,7 +229,7 @@ 
         if (empty($sub_language_dir)) {
             return false;
         }
-        $dir = api_get_path(SYS_LANG_PATH) . $sub_language_dir;
+        $dir = api_get_path(SYS_LANG_PATH).$sub_language_dir;
         if (!is_dir($dir)) {
             return true;
         } //even if the dir does not exist, we reach the objective of not having the directory there
@@ -237,7 +237,7 @@ 
 
         if (count($content) > 0) {
             foreach ($content as $value_content) {
-                $path_file = $dir . '/' . $value_content;
+                $path_file = $dir.'/'.$value_content;
                 unlink($path_file);
             }
             return @rmdir($dir);
@@ -255,8 +255,8 @@ 
     {
         $table = Database :: get_main_table(TABLE_MAIN_LANGUAGE);
         $sql = 'SELECT count(*) as count
-                FROM ' . $table . '
-                WHERE id="' . intval($language_id) . '"';
+                FROM ' . $table.'
+                WHERE id="' . intval($language_id).'"';
         $rs = Database::query($sql);
         if (Database::num_rows($rs) > 0) {
             if (Database::result($rs, 0, 'count') == 1) {
@@ -278,8 +278,8 @@ 
     {
         $table = Database :: get_main_table(TABLE_MAIN_LANGUAGE);
         $sql = 'SELECT original_name
-                FROM ' . $table . '
-                WHERE id= ' . intval($language_id) . '';
+                FROM ' . $table.'
+                WHERE id= ' . intval($language_id).'';
         $rs = Database::query($sql);
         if (Database::num_rows($rs) > 0) {
             return Database::result($rs, 0, 'original_name');
@@ -297,8 +297,8 @@ 
     public static function check_if_language_is_sub_language($language_id)
     {
         $table = Database :: get_main_table(TABLE_MAIN_LANGUAGE);
-        $sql = 'SELECT count(*) AS count FROM ' . $table . '
-                WHERE id = ' . intval($language_id) . ' AND NOT ISNULL(parent_id)';
+        $sql = 'SELECT count(*) AS count FROM '.$table.'
+                WHERE id = ' . intval($language_id).' AND NOT ISNULL(parent_id)';
         $rs = Database::query($sql);
 
         if (Database::num_rows($rs) > 0 && Database::result($rs, '0', 'count') == 1) {
@@ -316,7 +316,7 @@ 
     {
         $language_info = self::get_all_information_of_language($language_id);
         $table = Database :: get_main_table(TABLE_MAIN_USER);
-        $sql = 'SELECT count(*) AS count FROM ' . $table . '
+        $sql = 'SELECT count(*) AS count FROM '.$table.'
                 WHERE language ="' . Database::escape_string($language_info['english_name']).'"';
         $rs = Database::query($sql);
         if (Database::num_rows($rs) > 0 && Database::result($rs, '0', 'count') >= 1) {
@@ -334,8 +334,8 @@ 
     public static function check_if_language_is_father($language_id)
     {
         $table = Database :: get_main_table(TABLE_MAIN_LANGUAGE);
-        $sql = 'SELECT count(*) AS count FROM ' . $table . '
-                WHERE parent_id= ' . intval($language_id) . ' AND NOT ISNULL(parent_id);';
+        $sql = 'SELECT count(*) AS count FROM '.$table.'
+                WHERE parent_id= ' . intval($language_id).' AND NOT ISNULL(parent_id);';
         $rs = Database::query($sql);
 
         if (Database::num_rows($rs) > 0 && Database::result($rs, '0', 'count') == 1) {
@@ -354,7 +354,7 @@ 
     {
         $tbl_admin_languages = Database :: get_main_table(TABLE_MAIN_LANGUAGE);
         $sql = "UPDATE $tbl_admin_languages SET available='0'
-                WHERE id = " . intval($language_id) . "";
+                WHERE id = ".intval($language_id)."";
         $result = Database::query($sql);
 
         return $result !== false; //only return false on sql error
@@ -369,7 +369,7 @@ 
     {
         $tbl_admin_languages = Database :: get_main_table(TABLE_MAIN_LANGUAGE);
         $sql = "UPDATE $tbl_admin_languages SET available='1'
-                WHERE id = " . intval($language_id) . "";
+                WHERE id = ".intval($language_id)."";
         $result = Database::query($sql);
 
         return $result !== false; //only return false on sql error
@@ -387,11 +387,11 @@ 
         }
         $tbl_admin_languages = Database :: get_main_table(TABLE_MAIN_LANGUAGE);
         $tbl_settings_current = Database :: get_main_table(TABLE_MAIN_SETTINGS_CURRENT);
-        $sql = "SELECT english_name FROM " . $tbl_admin_languages . "
-                WHERE id= " . intval($language_id) . "";
+        $sql = "SELECT english_name FROM ".$tbl_admin_languages."
+                WHERE id= " . intval($language_id)."";
         $result = Database::query($sql);
         $lang = Database::fetch_array($result);
-        $sql_update_2 = "UPDATE " . $tbl_settings_current . " SET selected_value='" . $lang['english_name'] . "'
+        $sql_update_2 = "UPDATE ".$tbl_settings_current." SET selected_value='".$lang['english_name']."'
                          WHERE variable='platformLanguage'";
         $result_2 = Database::query($sql_update_2);
         Event::addEvent(
@@ -411,7 +411,7 @@ 
     {
         $name = api_get_setting('platformLanguage');
         $tbl_admin_languages = Database :: get_main_table(TABLE_MAIN_LANGUAGE);
-        $sql = "SELECT id FROM " . $tbl_admin_languages . " WHERE english_name ='$name'";
+        $sql = "SELECT id FROM ".$tbl_admin_languages." WHERE english_name ='$name'";
         $res = Database::query($sql);
         if (Database::num_rows($res) < 1) {
             return false;
@@ -430,10 +430,10 @@ 
     {
         $tbl_admin_languages = Database :: get_main_table(TABLE_MAIN_LANGUAGE);
         $sql = "SELECT dokeos_folder
-                FROM " . $tbl_admin_languages . "
+                FROM " . $tbl_admin_languages."
                 WHERE id = (
-                    SELECT parent_id FROM " . $tbl_admin_languages . "
-                    WHERE dokeos_folder = '" . Database::escape_string($language_path) . "'
+                    SELECT parent_id FROM " . $tbl_admin_languages."
+                    WHERE dokeos_folder = '" . Database::escape_string($language_path)."'
                 )
                 ";
         $result = Database::query($sql);
@@ -455,7 +455,7 @@ 
         $adminLanguagesTable = Database :: get_main_table(TABLE_MAIN_LANGUAGE);
         // select language - if case several languages match, get the last (more recent) one
         $sql = "SELECT english_name
-                FROM " . $adminLanguagesTable . "
+                FROM " . $adminLanguagesTable."
                 WHERE
                     isocode ='$isocode' AND
                     available = 1

main/inc/lib/table_sort.class.php

Doc Comments +1 added lines, -1 removed lines

@@ -80,7 +80,7 @@
 	 * @param string $direction The direction to sort (SORT_ASC (default) orSORT_DESC)
 	 * @param array $column_show The columns that we will show in the table i.e: $column_show = array('1','0','1') we will show the 1st and the 3th column.
 	 * @param array $column_order Changes how the columns will be sorted ie. $column_order = array('0','3','2','3') The column [1] will be sorted like the column [3]
-	 * @param constant $type How should data be sorted (SORT_REGULAR, SORT_NUMERIC, SORT_STRING, SORT_DATE, SORT_IMAGE)
+	 * @param integer $type How should data be sorted (SORT_REGULAR, SORT_NUMERIC, SORT_STRING, SORT_DATE, SORT_IMAGE)
 	 * @return array The sorted dataset
 	 * @author bart.mollet@hogent.be
 	 */

Spacing +2 added lines, -2 removed lines

@@ -157,7 +157,7 @@ 
 
                 $new_data_order = array();
                 if (!empty($docs_to_sort)) {
-                    foreach($docs_to_sort as $id => $document) {
+                    foreach ($docs_to_sort as $id => $document) {
                         if (isset($new_data[$id])) {
                             $new_data_order[] = $new_data[$id];
                         }
@@ -165,7 +165,7 @@ 
                 }
 
                 if (!empty($folder_to_sort)) {
-                    foreach($folder_to_sort as $id => $document) {
+                    foreach ($folder_to_sort as $id => $document) {
                         if (isset($new_data[$id])) {
                             $new_data_order[] = $new_data[$id];
                         }

Indentation +104 added lines, -104 removed lines

@@ -15,16 +15,16 @@ 
 class TableSort
 {
     /**
-    * Sorts 2-dimensional table.
-    * @param array $data The data to be sorted.
-    * @param int $column The column on which the data should be sorted (default = 0)
-    * @param int $direction The direction to sort (SORT_ASC (default) or SORT_DESC)
-    * @param int $type How should data be sorted (SORT_REGULAR, SORT_NUMERIC,
-    * SORT_STRING,SORT_DATE,SORT_IMAGE)
-    * @return array The sorted dataset
-    * @author bart.mollet@hogent.be
-    */
-	public static function sort_table($data, $column = 0, $direction = SORT_ASC, $type = SORT_REGULAR)
+     * Sorts 2-dimensional table.
+     * @param array $data The data to be sorted.
+     * @param int $column The column on which the data should be sorted (default = 0)
+     * @param int $direction The direction to sort (SORT_ASC (default) or SORT_DESC)
+     * @param int $type How should data be sorted (SORT_REGULAR, SORT_NUMERIC,
+     * SORT_STRING,SORT_DATE,SORT_IMAGE)
+     * @return array The sorted dataset
+     * @author bart.mollet@hogent.be
+     */
+    public static function sort_table($data, $column = 0, $direction = SORT_ASC, $type = SORT_REGULAR)
     {
         if (!is_array($data) || empty($data)) {
             return array();
@@ -71,20 +71,20 @@ 
         usort($data, create_function('$a, $b', $compare_function));
 
         return $data;
-	}
+    }
 
-	/**
-	 * Sorts 2-dimensional table. It is possile changing the columns that will be shown and the way that the columns are to be sorted.
-	 * @param array $data The data to be sorted.
-	 * @param int $column The column on which the data should be sorted (default = 0)
-	 * @param string $direction The direction to sort (SORT_ASC (default) orSORT_DESC)
-	 * @param array $column_show The columns that we will show in the table i.e: $column_show = array('1','0','1') we will show the 1st and the 3th column.
-	 * @param array $column_order Changes how the columns will be sorted ie. $column_order = array('0','3','2','3') The column [1] will be sorted like the column [3]
-	 * @param constant $type How should data be sorted (SORT_REGULAR, SORT_NUMERIC, SORT_STRING, SORT_DATE, SORT_IMAGE)
-	 * @return array The sorted dataset
-	 * @author bart.mollet@hogent.be
-	 */
-	public static function sort_table_config(
+    /**
+     * Sorts 2-dimensional table. It is possile changing the columns that will be shown and the way that the columns are to be sorted.
+     * @param array $data The data to be sorted.
+     * @param int $column The column on which the data should be sorted (default = 0)
+     * @param string $direction The direction to sort (SORT_ASC (default) orSORT_DESC)
+     * @param array $column_show The columns that we will show in the table i.e: $column_show = array('1','0','1') we will show the 1st and the 3th column.
+     * @param array $column_order Changes how the columns will be sorted ie. $column_order = array('0','3','2','3') The column [1] will be sorted like the column [3]
+     * @param constant $type How should data be sorted (SORT_REGULAR, SORT_NUMERIC, SORT_STRING, SORT_DATE, SORT_IMAGE)
+     * @return array The sorted dataset
+     * @author bart.mollet@hogent.be
+     */
+    public static function sort_table_config(
         $data,
         $column = 0,
         $direction = SORT_ASC,
@@ -132,9 +132,9 @@ 
             if (!empty($data)) {
                 foreach ($data as $document) {
                     if ($document['type'] == 'folder') {
-                      $docs_to_sort[$document['id']]   = api_strtolower($document['name']);
+                        $docs_to_sort[$document['id']]   = api_strtolower($document['name']);
                     } else {
-                      $folder_to_sort[$document['id']] = api_strtolower($document['name']);
+                        $folder_to_sort[$document['id']] = api_strtolower($document['name']);
                     }
                     $new_data[$document['id']] = $document;
                 }
@@ -196,91 +196,91 @@ 
             usort($data, create_function('$a, $b', $compare_function));
         }
 
-		if (is_array($column_show) && !empty($column_show)) {
+        if (is_array($column_show) && !empty($column_show)) {
 
-			// We show only the columns data that were set up on the $column_show array
-			$new_order_data = array();
-			$count_data = count($data);
-			$count_column_show = count($column_show);
-			for ($j = 0; $j < $count_data; $j++) {
-				$k = 0;
-				for ($i = 0; $i < $count_column_show; $i++) {
-					if ($column_show[$i]) {
-						$new_order_data[$j][$k] = $data[$j][$i];
-					}
-					$k++;
-				}
-			}
-			// Replace the multi-arrays
-			$data = $new_order_data;
-		}
+            // We show only the columns data that were set up on the $column_show array
+            $new_order_data = array();
+            $count_data = count($data);
+            $count_column_show = count($column_show);
+            for ($j = 0; $j < $count_data; $j++) {
+                $k = 0;
+                for ($i = 0; $i < $count_column_show; $i++) {
+                    if ($column_show[$i]) {
+                        $new_order_data[$j][$k] = $data[$j][$i];
+                    }
+                    $k++;
+                }
+            }
+            // Replace the multi-arrays
+            $data = $new_order_data;
+        }
 
-		return $data;
-	}
+        return $data;
+    }
 
-	/**
-	 * Checks whether a column of a 2D-array contains only numeric values
-	 * @param array $data		The data-array
-	 * @param int $column		The index of the column to check
-	 * @return bool				TRUE if column contains only dates, FALSE otherwise
-	 * @todo Take locale into account (eg decimal point or comma ?)
-	 * @author bart.mollet@hogent.be
-	 */
-	private static function is_numeric_column(& $data, $column)
+    /**
+     * Checks whether a column of a 2D-array contains only numeric values
+     * @param array $data		The data-array
+     * @param int $column		The index of the column to check
+     * @return bool				TRUE if column contains only dates, FALSE otherwise
+     * @todo Take locale into account (eg decimal point or comma ?)
+     * @author bart.mollet@hogent.be
+     */
+    private static function is_numeric_column(& $data, $column)
     {
-		$is_numeric = true;
-		foreach ($data as $index => & $row) {
-			$is_numeric &= is_numeric(strip_tags($row[$column]));
-			if (!$is_numeric) {
-				break;
-			}
-		}
-		return $is_numeric;
-	}
+        $is_numeric = true;
+        foreach ($data as $index => & $row) {
+            $is_numeric &= is_numeric(strip_tags($row[$column]));
+            if (!$is_numeric) {
+                break;
+            }
+        }
+        return $is_numeric;
+    }
 
-	/**
-	 * Checks whether a column of a 2D-array contains only dates (GNU date syntax)
-	 * @param array $data		The data-array
-	 * @param int $column		The index of the column to check
-	 * @return bool				TRUE if column contains only dates, FALSE otherwise
-	 * @author bart.mollet@hogent.be
-	 */
-	private static function is_date_column(& $data, $column)
+    /**
+     * Checks whether a column of a 2D-array contains only dates (GNU date syntax)
+     * @param array $data		The data-array
+     * @param int $column		The index of the column to check
+     * @return bool				TRUE if column contains only dates, FALSE otherwise
+     * @author bart.mollet@hogent.be
+     */
+    private static function is_date_column(& $data, $column)
     {
-		$is_date = true;
-		foreach ($data as $index => & $row) {
-			if (strlen(strip_tags($row[$column])) != 0) {
-				$check_date = strtotime(strip_tags($row[$column]));
-				// strtotime Returns a timestamp on success, FALSE otherwise.
-				// Previous to PHP 5.1.0, this function would return -1 on failure.
-				$is_date &= ($check_date != -1 && $check_date);
-			} else {
-				$is_date &= false;
-			}
-			if (!$is_date) {
-				break;
-			}
-		}
-		return $is_date;
-	}
+        $is_date = true;
+        foreach ($data as $index => & $row) {
+            if (strlen(strip_tags($row[$column])) != 0) {
+                $check_date = strtotime(strip_tags($row[$column]));
+                // strtotime Returns a timestamp on success, FALSE otherwise.
+                // Previous to PHP 5.1.0, this function would return -1 on failure.
+                $is_date &= ($check_date != -1 && $check_date);
+            } else {
+                $is_date &= false;
+            }
+            if (!$is_date) {
+                break;
+            }
+        }
+        return $is_date;
+    }
 
-	/**
-	 * Checks whether a column of a 2D-array contains only images (<img src="path/file.ext" alt=".."/>)
-	 * @param array $data		The data-array
-	 * @param int $column		The index of the column to check
-	 * @return bool				TRUE if column contains only images, FALSE otherwise
-	 * @author bart.mollet@hogent.be
-	 */
-	private static function is_image_column(& $data, $column)
+    /**
+     * Checks whether a column of a 2D-array contains only images (<img src="path/file.ext" alt=".."/>)
+     * @param array $data		The data-array
+     * @param int $column		The index of the column to check
+     * @return bool				TRUE if column contains only images, FALSE otherwise
+     * @author bart.mollet@hogent.be
+     */
+    private static function is_image_column(& $data, $column)
     {
-		$is_image = true;
-		foreach ($data as $index => & $row) {
-			$is_image &= strlen(trim(strip_tags($row[$column], '<img>'))) > 0; // at least one img-tag
-			$is_image &= strlen(trim(strip_tags($row[$column]))) == 0; // and no text outside attribute-values
-			if (!$is_image) {
-				break;
-			}
-		}
-		return $is_image;
-	}
+        $is_image = true;
+        foreach ($data as $index => & $row) {
+            $is_image &= strlen(trim(strip_tags($row[$column], '<img>'))) > 0; // at least one img-tag
+            $is_image &= strlen(trim(strip_tags($row[$column]))) == 0; // and no text outside attribute-values
+            if (!$is_image) {
+                break;
+            }
+        }
+        return $is_image;
+    }
 }

main/inc/lib/template.lib.php

Doc Comments +2 added lines

@@ -330,6 +330,7 @@ 
     /**
      * Sets the footer visibility
      * @param bool true if we show the footer
+     * @param boolean $status
      */
     public function set_footer($status)
     {
@@ -370,6 +371,7 @@ 
     /**
      * Sets the header visibility
      * @param bool true if we show the header
+     * @param boolean $status
      */
     public function set_header($status)
     {

Braces +1 added lines, -1 removed lines

@@ -338,7 +338,7 @@
 
         if (empty($certificatesItem) && empty($searchItem)) {
             return null;
-        }else{
+        } else{
             $content.= $certificatesItem;
             $content.= $searchItem;
         }

Indentation +1 added lines, -1 removed lines

@@ -615,7 +615,7 @@
         return [
             '_p' => $_p,
             '_s' => $_s,
-     //       '_u' => $user_info,
+        //       '_u' => $user_info,
             'template' => 'default' // @todo setup template folder in config.yml;
         ];
     }

Spacing +31 added lines, -31 removed lines

@@ -312,7 +312,7 @@ 
                 $content = '<div class="help">';
                 $content .= Display::url(
                     Display::return_icon('help.large.png', get_lang('Help')),
-                    api_get_path(WEB_CODE_PATH) . 'help/help.php?open=' . $help,
+                    api_get_path(WEB_CODE_PATH).'help/help.php?open='.$help,
                     [
                         'class' => 'ajax',
                         'data-title' => get_lang('Help')
@@ -634,12 +634,12 @@ 
         foreach ($bowerCSSFiles as $file) {
             $css[] = api_get_path(WEB_PATH).'web/assets/'.$file;
         }
-        $css[] = api_get_path(WEB_LIBRARY_PATH) . 'javascript/bootstrap-select/css/bootstrap-select.min.css';
-        $css[] = api_get_path(WEB_LIBRARY_PATH) . 'javascript/chosen/chosen.css';
-        $css[] = api_get_path(WEB_LIBRARY_PATH) . 'javascript/tag/style.css';
+        $css[] = api_get_path(WEB_LIBRARY_PATH).'javascript/bootstrap-select/css/bootstrap-select.min.css';
+        $css[] = api_get_path(WEB_LIBRARY_PATH).'javascript/chosen/chosen.css';
+        $css[] = api_get_path(WEB_LIBRARY_PATH).'javascript/tag/style.css';
 
         if (api_is_global_chat_enabled()) {
-            $css[] = api_get_path(WEB_LIBRARY_PATH) . 'javascript/chat/css/chat.css';
+            $css[] = api_get_path(WEB_LIBRARY_PATH).'javascript/chat/css/chat.css';
         }
 
         //THEME CSS STYLE
@@ -691,7 +691,7 @@ 
 
         if (is_file(api_get_path(SYS_CSS_PATH).'themes/'.$this->theme.'/editor.css')) {
             $css[] = api_get_path(WEB_CSS_PATH).'themes/'.$this->theme.'/editor.css';
-        }else{
+        } else {
             $css[] = api_get_cdn_path(api_get_path(WEB_CSS_PATH).'editor.css');
         }
 
@@ -726,7 +726,7 @@ 
 
             $style_print = '';
             if (is_readable(api_get_path(SYS_CSS_PATH).$this->theme.'/print.css')) {
-                $style_print = api_get_css(api_get_cdn_path(api_get_path(WEB_CSS_PATH) . $this->theme . '/print.css'),
+                $style_print = api_get_css(api_get_cdn_path(api_get_path(WEB_CSS_PATH).$this->theme.'/print.css'),
                     'print');
             }
             $this->assign('css_style_print', $style_print);
@@ -749,10 +749,10 @@ 
 
         $isoCode = api_get_language_isocode();
 
-        $selectLink = 'bootstrap-select/js/i18n/defaults-' . $isoCode . '_' . strtoupper($isoCode) . '.min.js';
+        $selectLink = 'bootstrap-select/js/i18n/defaults-'.$isoCode.'_'.strtoupper($isoCode).'.min.js';
 
         if ($isoCode == 'en') {
-            $selectLink = 'bootstrap-select/js/i18n/defaults-' . $isoCode . '_US.min.js';
+            $selectLink = 'bootstrap-select/js/i18n/defaults-'.$isoCode.'_US.min.js';
         }
         // JS files
         $js_files = array(
@@ -805,8 +805,8 @@ 
         }
 
         if ($isoCode != 'en') {
-            $bowerJsFiles[] = 'jqueryui-timepicker-addon/dist/i18n/jquery-ui-timepicker-' . $isoCode . '.js';
-            $bowerJsFiles[] = 'jquery-ui/ui/minified/i18n/datepicker-' . $isoCode . '.min.js';
+            $bowerJsFiles[] = 'jqueryui-timepicker-addon/dist/i18n/jquery-ui-timepicker-'.$isoCode.'.js';
+            $bowerJsFiles[] = 'jquery-ui/ui/minified/i18n/datepicker-'.$isoCode.'.min.js';
         }
 
         foreach ($bowerJsFiles as $file) {
@@ -889,7 +889,7 @@ 
         }
 
         $this->assign('online_button', Display::return_icon('statusonline.png', null, null, ICON_SIZE_ATOM));
-        $this->assign('offline_button',Display::return_icon('statusoffline.png', null, null, ICON_SIZE_ATOM));
+        $this->assign('offline_button', Display::return_icon('statusoffline.png', null, null, ICON_SIZE_ATOM));
 
         // Get language iso-code for this page - ignore errors
         $this->assign('document_language', api_get_language_isocode());
@@ -948,14 +948,14 @@ 
         $this->assign('section_name', 'section-'.$this_section);
 
         //Defaul root chamilo favicon
-        $favico = '<link rel="shortcut icon" href="' . api_get_path(WEB_PATH) . 'favicon.ico" type="image/x-icon" />';
+        $favico = '<link rel="shortcut icon" href="'.api_get_path(WEB_PATH).'favicon.ico" type="image/x-icon" />';
 
         //Added to verify if in the current Chamilo Theme exist a favicon
-        $favicoThemeUrl = api_get_path(SYS_CSS_PATH) . 'themes/' . $this->theme . '/images/';
+        $favicoThemeUrl = api_get_path(SYS_CSS_PATH).'themes/'.$this->theme.'/images/';
 
         //If exist pick the current chamilo theme favicon
-        if (is_file($favicoThemeUrl . 'favicon.ico')) {
-            $favico = '<link rel="shortcut icon" href="' . api_get_path(WEB_CSS_PATH). 'themes/' . $this->theme . '/images/favicon.ico" type="image/x-icon" />';
+        if (is_file($favicoThemeUrl.'favicon.ico')) {
+            $favico = '<link rel="shortcut icon" href="'.api_get_path(WEB_CSS_PATH).'themes/'.$this->theme.'/images/favicon.ico" type="image/x-icon" />';
         }
 
         if (api_is_multiple_url_enabled()) {
@@ -985,7 +985,7 @@ 
         if (api_get_setting('show_link_bug_notification') == 'true' && $this->user_is_logged_in) {
             $rightFloatMenu = '<div class="report">
 		<a href="https://github.com/chamilo/chamilo-lms/wiki/How-to-report-issues" target="_blank">
-                    '. $iconBug . '
+                    '. $iconBug.'
                 </a>
 		</div>';
         }
@@ -1001,7 +1001,7 @@ 
             $url = api_get_path(WEB_CODE_PATH).'ticket/tickets.php?project_id=1&'.$courseParams;
             $rightFloatMenu .= '<div class="report">
 		        <a href="'.$url.'" target="_blank">
-                    '. $iconTicket . '
+                    '. $iconTicket.'
                 </a>
 		    </div>';
         }
@@ -1108,7 +1108,7 @@ 
 
         // Block Breadcrumb
         //$breadcrumb = return_breadcrumb($interbreadcrumb, $language_file, $nameTools);
-        $breadcrumb  = '';
+        $breadcrumb = '';
         $this->assign('breadcrumb', $breadcrumb);
 
         //Extra content
@@ -1128,13 +1128,13 @@ 
         $socialMeta = '';
         $metaTitle = api_get_setting('meta_title');
         if (!empty($metaTitle)) {
-            $socialMeta .= '<meta name="twitter:card" content="summary" />' . "\n";
+            $socialMeta .= '<meta name="twitter:card" content="summary" />'."\n";
             $metaSite = api_get_setting('meta_twitter_site');
             if (!empty($metaSite)) {
-                $socialMeta .= '<meta name="twitter:site" content="' . $metaSite . '" />' . "\n";
+                $socialMeta .= '<meta name="twitter:site" content="'.$metaSite.'" />'."\n";
                 $metaCreator = api_get_setting('meta_twitter_creator');
                 if (!empty($metaCreator)) {
-                    $socialMeta .= '<meta name="twitter:creator" content="' . $metaCreator . '" />' . "\n";
+                    $socialMeta .= '<meta name="twitter:creator" content="'.$metaCreator.'" />'."\n";
                 }
             }
 
@@ -1146,19 +1146,19 @@ 
             if (!$userId && !$skillId) {
                 // no combination of user and skill ID has been defined,
                 // so print the normal OpenGraph meta tags
-                $socialMeta .= '<meta property="og:title" content="' . $metaTitle . '" />' . "\n";
-                $socialMeta .= '<meta property="og:url" content="' . api_get_path(WEB_PATH) . '" />' . "\n";
+                $socialMeta .= '<meta property="og:title" content="'.$metaTitle.'" />'."\n";
+                $socialMeta .= '<meta property="og:url" content="'.api_get_path(WEB_PATH).'" />'."\n";
 
                 $metaDescription = api_get_setting('meta_description');
                 if (!empty($metaDescription)) {
-                    $socialMeta .= '<meta property="og:description" content="' . $metaDescription . '" />' . "\n";
+                    $socialMeta .= '<meta property="og:description" content="'.$metaDescription.'" />'."\n";
                 }
 
                 $metaImage = api_get_setting('meta_image_path');
                 if (!empty($metaImage)) {
-                    if (is_file(api_get_path(SYS_PATH) . $metaImage)) {
-                        $path = api_get_path(WEB_PATH) . $metaImage;
-                        $socialMeta .= '<meta property="og:image" content="' . $path . '" />' . "\n";
+                    if (is_file(api_get_path(SYS_PATH).$metaImage)) {
+                        $path = api_get_path(WEB_PATH).$metaImage;
+                        $socialMeta .= '<meta property="og:image" content="'.$path.'" />'."\n";
                     }
                 }
             }
@@ -1192,7 +1192,7 @@ 
         // Tutor name
         if (api_get_setting('show_tutor_data') == 'true') {
             // Course manager
-            $courseId  = api_get_course_int_id();
+            $courseId = api_get_course_int_id();
             $id_session = api_get_session_id();
             if (!empty($courseId)) {
                 $tutor_data = '';
@@ -1224,7 +1224,7 @@ 
             $courseId = api_get_course_int_id();
             if (!empty($courseId)) {
                 $teacher_data = '';
-                $mail= CourseManager::get_emails_of_tutors_to_course($courseId);
+                $mail = CourseManager::get_emails_of_tutors_to_course($courseId);
                 if (!empty($mail)) {
                     $teachers_parsed = array();
                     foreach ($mail as $value) {
@@ -1458,7 +1458,7 @@ 
                     'sessionVar'   => basename(__FILE__, '.php'),
                     'imageOptions' => array(
                         'font_size' => 20,
-                        'font_path' => api_get_path(SYS_FONTS_PATH) . 'opensans/',
+                        'font_path' => api_get_path(SYS_FONTS_PATH).'opensans/',
                         'font_file' => 'OpenSans-Regular.ttf',
                         //'output' => 'gif'
                     )

main/inc/lib/text.lib.php

Doc Comments +10 added lines, -5 removed lines

@@ -52,6 +52,7 @@ 
  * Converts the text of a html-document to a given encoding, the meta-tag is changed accordingly.
  * @param string $string                The input full-html document.
  * @param string                        The new encoding value to be set.
+ * @param string $encoding
  */
 function api_set_encoding_html(&$string, $encoding) {
     $old_encoding = api_detect_encoding_html($string);
@@ -74,7 +75,7 @@ 
  * Returns the title of a html document.
  * @param string $string                The contents of the input document.
  * @param string $input_encoding        The encoding of the input document. If the value is not set, it is detected.
- * @param string $$output_encoding      The encoding of the retrieved title. If the value is not set, the system encoding is assumend.
+ * @param string $output_encoding      The encoding of the retrieved title. If the value is not set, the system encoding is assumend.
  * @return string                       The retrieved title, html-entities and extra-whitespace between the words are cleaned.
  */
 function api_get_title_html(&$string, $output_encoding = null, $input_encoding = null) {
@@ -433,7 +434,7 @@ 
  * @since wordpress  2.8.1
  * @access private
  *
- * @param string|array $search The value being searched for, otherwise known as the needle. An array may be used to designate multiple needles.
+ * @param string[] $search The value being searched for, otherwise known as the needle. An array may be used to designate multiple needles.
  * @param string $subject The string being searched and replaced on, otherwise known as the haystack.
  * @return string The string with the replaced svalues.
  */
@@ -628,6 +629,7 @@ 
  * @param string    The text to "cut"
  * @param int       Count of chars
  * @param bool      Whether to embed in a <span title="...">...</span>
+ * @param integer $maxchar
  * @return string
  * */
 function cut($text, $maxchar, $embed = false) {
@@ -645,7 +647,7 @@ 
  *
  * @param mixed     Number to convert
  * @param int       Decimal points 0=never, 1=if needed, 2=always
- * @return mixed    An integer or a float depends on the parameter
+ * @return string|null    An integer or a float depends on the parameter
  */
 function float_format($number, $flag = 1) {
     if (is_numeric($number)) {
@@ -689,7 +691,7 @@ 
 /**
  * Gets the week from a day
  * @param   string   Date in UTC (2010-01-01 12:12:12)
- * @return  int      Returns an integer with the week number of the year
+ * @return  string      Returns an integer with the week number of the year
  */
 function get_week_from_day($date) {
     if (!empty($date)) {
@@ -739,6 +741,9 @@ 
 	return $output.$end;
 }
 
+/**
+ * @param string $glue
+ */
 function implode_with_key($glue, $array) {
     if (!empty($array)) {
         $string = '';
@@ -817,7 +822,7 @@ 
 /**
  * @param string $string
  * @param bool $capitalizeFirstCharacter
- * @return mixed
+ * @return string
  */
 function underScoreToCamelCase($string, $capitalizeFirstCharacter = true)
 {

Spacing +74 added lines, -74 removed lines

@@ -58,10 +58,10 @@ 
     if (@preg_match('/(.*<head.*)(<meta[^>]*content=[^>]*>)(.*<\/head>.*)/si', $string, $matches)) {
         $meta = $matches[2];
         if (@preg_match("/(<meta[^>]*charset=)(.*)([\"';][^>]*>)/si", $meta, $matches1)) {
-            $meta = $matches1[1] . $encoding . $matches1[3];
-            $string = $matches[1] . $meta . $matches[3];
+            $meta = $matches1[1].$encoding.$matches1[3];
+            $string = $matches[1].$meta.$matches[3];
         } else {
-            $string = $matches[1] . '<meta http-equiv="Content-Type" content="text/html; charset='.$encoding.'"/>' . $matches[3];
+            $string = $matches[1].'<meta http-equiv="Content-Type" content="text/html; charset='.$encoding.'"/>'.$matches[3];
         }
     } else {
         $count = 1;
@@ -168,9 +168,9 @@ 
     if (!preg_match(_PCRE_XML_ENCODING, $string)) {
         if (strpos($matches[0], 'standalone') !== false) {
             // The encoding option should precede the standalone option, othewise DOMDocument fails to load the document.
-            $replace = str_replace('standalone', ' encoding="'.$to_encoding.'" standalone' , $matches[0]);
+            $replace = str_replace('standalone', ' encoding="'.$to_encoding.'" standalone', $matches[0]);
         } else {
-            $replace = str_replace('?>', ' encoding="'.$to_encoding.'"?>' , $matches[0]);
+            $replace = str_replace('?>', ' encoding="'.$to_encoding.'"?>', $matches[0]);
         }
         return api_convert_encoding(str_replace($matches[0], $replace, $string), $to_encoding, $from_encoding);
     }
@@ -335,7 +335,7 @@ 
 function _make_url_clickable_cb($matches) {
     $url = $matches[2];
 
-    if ( ')' == $matches[3] && strpos( $url, '(' ) ) {
+    if (')' == $matches[3] && strpos($url, '(')) {
         // If the trailing character is a closing parethesis, and the URL has an opening parenthesis in it, add the closing parenthesis to the URL.
         // Then we can let the parenthesis balancer do its thing below.
         $url .= $matches[3];
@@ -345,16 +345,16 @@ 
     }
 
     // Include parentheses in the URL only if paired
-    while ( substr_count( $url, '(' ) < substr_count( $url, ')' ) ) {
-        $suffix = strrchr( $url, ')' ) . $suffix;
-        $url = substr( $url, 0, strrpos( $url, ')' ) );
+    while (substr_count($url, '(') < substr_count($url, ')')) {
+        $suffix = strrchr($url, ')').$suffix;
+        $url = substr($url, 0, strrpos($url, ')'));
     }
 
     $url = esc_url($url);
-    if ( empty($url) )
+    if (empty($url))
         return $matches[0];
 
-    return $matches[1] . "<a href=\"$url\" rel=\"nofollow\">$url</a>" . $suffix;
+    return $matches[1]."<a href=\"$url\" rel=\"nofollow\">$url</a>".$suffix;
 }
 
 /**
@@ -374,10 +374,10 @@ 
  * @param string $_context Private. Use esc_url_raw() for database usage.
  * @return string The cleaned $url after the 'clean_url' filter is applied.
  */
-function esc_url( $url, $protocols = null, $_context = 'display' ) {
+function esc_url($url, $protocols = null, $_context = 'display') {
     //$original_url = $url;
 
-    if ( '' == $url )
+    if ('' == $url)
         return $url;
     $url = preg_replace('|[^a-z0-9-~+_.?#=!&;,/:%@$\|*\'()\\x80-\\xff]|i', '', $url);
     $strip = array('%0d', '%0a', '%0D', '%0A');
@@ -387,9 +387,9 @@ 
      * presume it needs http:// appended (unless a relative
      * link starting with /, # or ? or a php file).
      */
-    if ( strpos($url, ':') === false && ! in_array( $url[0], array( '/', '#', '?' ) ) &&
-        ! preg_match('/^[a-z0-9-]+?\.php/i', $url) )
-        $url = 'http://' . $url;
+    if (strpos($url, ':') === false && !in_array($url[0], array('/', '#', '?')) &&
+        !preg_match('/^[a-z0-9-]+?\.php/i', $url))
+        $url = 'http://'.$url;
 
     return Security::remove_XSS($url);
 
@@ -437,12 +437,12 @@ 
  * @param string $subject The string being searched and replaced on, otherwise known as the haystack.
  * @return string The string with the replaced svalues.
  */
-function _deep_replace( $search, $subject ) {
+function _deep_replace($search, $subject) {
     $subject = (string) $subject;
 
     $count = 1;
-    while ( $count ) {
-        $subject = str_replace( $search, '', $subject, $count );
+    while ($count) {
+        $subject = str_replace($search, '', $subject, $count);
     }
 
     return $subject;
@@ -464,17 +464,17 @@ 
 function _make_web_ftp_clickable_cb($matches) {
     $ret = '';
     $dest = $matches[2];
-    $dest = 'http://' . $dest;
+    $dest = 'http://'.$dest;
     $dest = esc_url($dest);
-    if ( empty($dest) )
+    if (empty($dest))
         return $matches[0];
 
     // removed trailing [.,;:)] from URL
-    if ( in_array( substr($dest, -1), array('.', ',', ';', ':', ')') ) === true ) {
+    if (in_array(substr($dest, -1), array('.', ',', ';', ':', ')')) === true) {
         $ret = substr($dest, -1);
-        $dest = substr($dest, 0, strlen($dest)-1);
+        $dest = substr($dest, 0, strlen($dest) - 1);
     }
-    return $matches[1] . "<a href=\"$dest\" rel=\"nofollow\">$dest</a>$ret";
+    return $matches[1]."<a href=\"$dest\" rel=\"nofollow\">$dest</a>$ret";
 }
 
 /**
@@ -490,8 +490,8 @@ 
  * @return string HTML A element with email address.
  */
 function _make_email_clickable_cb($matches) {
-    $email = $matches[2] . '@' . $matches[3];
-    return $matches[1] . "<a href=\"mailto:$email\">$email</a>";
+    $email = $matches[2].'@'.$matches[3];
+    return $matches[1]."<a href=\"mailto:$email\">$email</a>";
 }
 
 /**
@@ -505,30 +505,30 @@ 
  * @param string $text Content to convert URIs.
  * @return string Content with converted URIs.
  */
-function make_clickable( $text ) {
+function make_clickable($text) {
     $r = '';
-    $textarr = preg_split( '/(<[^<>]+>)/', $text, -1, PREG_SPLIT_DELIM_CAPTURE ); // split out HTML tags
+    $textarr = preg_split('/(<[^<>]+>)/', $text, -1, PREG_SPLIT_DELIM_CAPTURE); // split out HTML tags
     $nested_code_pre = 0; // Keep track of how many levels link is nested inside <pre> or <code>
-    foreach ( $textarr as $piece ) {
+    foreach ($textarr as $piece) {
 
-        if ( preg_match( '|^<code[\s>]|i', $piece ) || preg_match( '|^<pre[\s>]|i', $piece ) )
+        if (preg_match('|^<code[\s>]|i', $piece) || preg_match('|^<pre[\s>]|i', $piece))
             $nested_code_pre++;
-        elseif ( ( '</code>' === strtolower( $piece ) || '</pre>' === strtolower( $piece ) ) && $nested_code_pre )
+        elseif (('</code>' === strtolower($piece) || '</pre>' === strtolower($piece)) && $nested_code_pre)
             $nested_code_pre--;
 
-        if ( $nested_code_pre || empty( $piece ) || ( $piece[0] === '<' && ! preg_match( '|^<\s*[\w]{1,20}+://|', $piece ) ) ) {
+        if ($nested_code_pre || empty($piece) || ($piece[0] === '<' && !preg_match('|^<\s*[\w]{1,20}+://|', $piece))) {
             $r .= $piece;
             continue;
         }
 
         // Long strings might contain expensive edge cases ...
-        if ( 10000 < strlen( $piece ) ) {
+        if (10000 < strlen($piece)) {
             // ... break it up
-            foreach ( _split_str_by_whitespace( $piece, 2100 ) as $chunk ) { // 2100: Extra room for scheme and leading and trailing paretheses
-                if ( 2101 < strlen( $chunk ) ) {
+            foreach (_split_str_by_whitespace($piece, 2100) as $chunk) { // 2100: Extra room for scheme and leading and trailing paretheses
+                if (2101 < strlen($chunk)) {
                     $r .= $chunk; // Too big, no whitespace: bail.
                 } else {
-                    $r .= make_clickable( $chunk );
+                    $r .= make_clickable($chunk);
                 }
             }
         } else {
@@ -549,18 +549,18 @@ 
 			~xS'; // The regex is a non-anchored pattern and does not have a single fixed starting character.
             // Tell PCRE to spend more time optimizing since, when used on a page load, it will probably be used several times.
 
-            $ret = preg_replace_callback( $url_clickable, '_make_url_clickable_cb', $ret );
+            $ret = preg_replace_callback($url_clickable, '_make_url_clickable_cb', $ret);
 
-            $ret = preg_replace_callback( '#([\s>])((www|ftp)\.[\w\\x80-\\xff\#$%&~/.\-;:=,?@\[\]+]+)#is', '_make_web_ftp_clickable_cb', $ret );
-            $ret = preg_replace_callback( '#([\s>])([.0-9a-z_+-]+)@(([0-9a-z-]+\.)+[0-9a-z]{2,})#i', '_make_email_clickable_cb', $ret );
+            $ret = preg_replace_callback('#([\s>])((www|ftp)\.[\w\\x80-\\xff\#$%&~/.\-;:=,?@\[\]+]+)#is', '_make_web_ftp_clickable_cb', $ret);
+            $ret = preg_replace_callback('#([\s>])([.0-9a-z_+-]+)@(([0-9a-z-]+\.)+[0-9a-z]{2,})#i', '_make_email_clickable_cb', $ret);
 
-            $ret = substr( $ret, 1, -1 ); // Remove our whitespace padding.
+            $ret = substr($ret, 1, -1); // Remove our whitespace padding.
             $r .= $ret;
         }
     }
 
     // Cleanup of accidental links within links
-    $r = preg_replace( '#(<a([ \r\n\t]+[^>]+?>|>))<a [^>]+?>([^>]+?)</a></a>#i', "$1$3</a>", $r );
+    $r = preg_replace('#(<a([ \r\n\t]+[^>]+?>|>))<a [^>]+?>([^>]+?)</a></a>#i', "$1$3</a>", $r);
     return $r;
 }
 
@@ -595,27 +595,27 @@ 
  * @param int $goal The desired chunk length.
  * @return array Numeric array of chunks.
  */
-function _split_str_by_whitespace( $string, $goal ) {
+function _split_str_by_whitespace($string, $goal) {
     $chunks = array();
 
-    $string_nullspace = strtr( $string, "\r\n\t\v\f ", "\000\000\000\000\000\000" );
+    $string_nullspace = strtr($string, "\r\n\t\v\f ", "\000\000\000\000\000\000");
 
-    while ( $goal < strlen( $string_nullspace ) ) {
-        $pos = strrpos( substr( $string_nullspace, 0, $goal + 1 ), "\000" );
+    while ($goal < strlen($string_nullspace)) {
+        $pos = strrpos(substr($string_nullspace, 0, $goal + 1), "\000");
 
-        if ( false === $pos ) {
-            $pos = strpos( $string_nullspace, "\000", $goal + 1 );
-            if ( false === $pos ) {
+        if (false === $pos) {
+            $pos = strpos($string_nullspace, "\000", $goal + 1);
+            if (false === $pos) {
                 break;
             }
         }
 
-        $chunks[] = substr( $string, 0, $pos + 1 );
-        $string = substr( $string, $pos + 1 );
-        $string_nullspace = substr( $string_nullspace, $pos + 1 );
+        $chunks[] = substr($string, 0, $pos + 1);
+        $string = substr($string, $pos + 1);
+        $string_nullspace = substr($string_nullspace, $pos + 1);
     }
 
-    if ( $string ) {
+    if ($string) {
         $chunks[] = $string;
     }
 
@@ -693,7 +693,7 @@ 
  */
 function get_week_from_day($date) {
     if (!empty($date)) {
-       $time = api_strtotime($date,'UTC');
+       $time = api_strtotime($date, 'UTC');
        return date('W', $time);
     } else {
         return date('W');
@@ -710,17 +710,17 @@ 
  * @return a reduce string
  */
 
-function substrwords($text,$maxchar,$end='...')
+function substrwords($text, $maxchar, $end = '...')
 {
-	if(strlen($text)>$maxchar)
+	if (strlen($text) > $maxchar)
 	{
-		$words=explode(" ",$text);
+		$words = explode(" ", $text);
 		$output = '';
-		$i=0;
-		while(1)
+		$i = 0;
+		while (1)
 		{
-			$length = (strlen($output)+strlen($words[$i]));
-			if($length>$maxchar)
+			$length = (strlen($output) + strlen($words[$i]));
+			if ($length > $maxchar)
 			{
 				break;
 			}
@@ -742,7 +742,7 @@ 
 function implode_with_key($glue, $array) {
     if (!empty($array)) {
         $string = '';
-        foreach($array as $key => $value) {
+        foreach ($array as $key => $value) {
             if (empty($value)) {
                 $value = 'null';
             }
@@ -764,13 +764,13 @@ 
 {
     $file_size = intval($file_size);
     if ($file_size >= 1073741824) {
-        $file_size = round($file_size / 1073741824 * 100) / 100 . 'G';
-    } elseif($file_size >= 1048576) {
-        $file_size = round($file_size / 1048576 * 100) / 100 . 'M';
-    } elseif($file_size >= 1024) {
-        $file_size = round($file_size / 1024 * 100) / 100 . 'k';
+        $file_size = round($file_size / 1073741824 * 100) / 100.'G';
+    } elseif ($file_size >= 1048576) {
+        $file_size = round($file_size / 1048576 * 100) / 100.'M';
+    } elseif ($file_size >= 1024) {
+        $file_size = round($file_size / 1024 * 100) / 100.'k';
     } else {
-        $file_size = $file_size . 'B';
+        $file_size = $file_size.'B';
     }
     return $file_size;
 }
@@ -779,18 +779,18 @@ 
 {
     $year	 = '0000';
     $month = $day = $hours = $minutes = $seconds = '00';
-    if (isset($array['Y']) && (isset($array['F']) || isset($array['M']))  && isset($array['d']) && isset($array['H']) && isset($array['i'])) {
+    if (isset($array['Y']) && (isset($array['F']) || isset($array['M'])) && isset($array['d']) && isset($array['H']) && isset($array['i'])) {
         $year = $array['Y'];
-        $month = isset($array['F'])?$array['F']:$array['M'];
-        if (intval($month) < 10 ) $month = '0'.$month;
+        $month = isset($array['F']) ? $array['F'] : $array['M'];
+        if (intval($month) < 10) $month = '0'.$month;
         $day = $array['d'];
-        if (intval($day) < 10 ) $day = '0'.$day;
+        if (intval($day) < 10) $day = '0'.$day;
         $hours = $array['H'];
-        if (intval($hours) < 10 ) $hours = '0'.$hours;
+        if (intval($hours) < 10) $hours = '0'.$hours;
         $minutes = $array['i'];
-        if (intval($minutes) < 10 ) $minutes = '0'.$minutes;
+        if (intval($minutes) < 10) $minutes = '0'.$minutes;
     }
-    if (checkdate($month,$day,$year)) {
+    if (checkdate($month, $day, $year)) {
         $datetime = $year.'-'.$month.'-'.$day.' '.$hours.':'.$minutes.':'.$seconds;
     }
     return $datetime;

Braces +31 added lines, -20 removed lines

@@ -351,8 +351,9 @@ 
     }
 
     $url = esc_url($url);
-    if ( empty($url) )
-        return $matches[0];
+    if ( empty($url) ) {
+            return $matches[0];
+    }
 
     return $matches[1] . "<a href=\"$url\" rel=\"nofollow\">$url</a>" . $suffix;
 }
@@ -377,8 +378,9 @@ 
 function esc_url( $url, $protocols = null, $_context = 'display' ) {
     //$original_url = $url;
 
-    if ( '' == $url )
-        return $url;
+    if ( '' == $url ) {
+            return $url;
+    }
     $url = preg_replace('|[^a-z0-9-~+_.?#=!&;,/:%@$\|*\'()\\x80-\\xff]|i', '', $url);
     $strip = array('%0d', '%0a', '%0D', '%0A');
     $url = _deep_replace($strip, $url);
@@ -388,8 +390,9 @@ 
      * link starting with /, # or ? or a php file).
      */
     if ( strpos($url, ':') === false && ! in_array( $url[0], array( '/', '#', '?' ) ) &&
-        ! preg_match('/^[a-z0-9-]+?\.php/i', $url) )
-        $url = 'http://' . $url;
+        ! preg_match('/^[a-z0-9-]+?\.php/i', $url) ) {
+            $url = 'http://' . $url;
+    }
 
     return Security::remove_XSS($url);
 
@@ -466,8 +469,9 @@ 
     $dest = $matches[2];
     $dest = 'http://' . $dest;
     $dest = esc_url($dest);
-    if ( empty($dest) )
-        return $matches[0];
+    if ( empty($dest) ) {
+            return $matches[0];
+    }
 
     // removed trailing [.,;:)] from URL
     if ( in_array( substr($dest, -1), array('.', ',', ';', ':', ')') ) === true ) {
@@ -511,10 +515,11 @@ 
     $nested_code_pre = 0; // Keep track of how many levels link is nested inside <pre> or <code>
     foreach ( $textarr as $piece ) {
 
-        if ( preg_match( '|^<code[\s>]|i', $piece ) || preg_match( '|^<pre[\s>]|i', $piece ) )
-            $nested_code_pre++;
-        elseif ( ( '</code>' === strtolower( $piece ) || '</pre>' === strtolower( $piece ) ) && $nested_code_pre )
-            $nested_code_pre--;
+        if ( preg_match( '|^<code[\s>]|i', $piece ) || preg_match( '|^<pre[\s>]|i', $piece ) ) {
+                    $nested_code_pre++;
+        } elseif ( ( '</code>' === strtolower( $piece ) || '</pre>' === strtolower( $piece ) ) && $nested_code_pre ) {
+                    $nested_code_pre--;
+        }
 
         if ( $nested_code_pre || empty( $piece ) || ( $piece[0] === '<' && ! preg_match( '|^<\s*[\w]{1,20}+://|', $piece ) ) ) {
             $r .= $piece;
@@ -723,15 +728,13 @@ 
 			if($length>$maxchar)
 			{
 				break;
-			}
-			else
+			} else
 			{
 				$output = $output." ".$words[$i];
 				$i++;
 			};
 		};
-	}
-	else
+	} else
 	{
 		$output = $text;
 		return $output;
@@ -782,13 +785,21 @@ 
     if (isset($array['Y']) && (isset($array['F']) || isset($array['M']))  && isset($array['d']) && isset($array['H']) && isset($array['i'])) {
         $year = $array['Y'];
         $month = isset($array['F'])?$array['F']:$array['M'];
-        if (intval($month) < 10 ) $month = '0'.$month;
+        if (intval($month) < 10 ) {
+            $month = '0'.$month;
+        }
         $day = $array['d'];
-        if (intval($day) < 10 ) $day = '0'.$day;
+        if (intval($day) < 10 ) {
+            $day = '0'.$day;
+        }
         $hours = $array['H'];
-        if (intval($hours) < 10 ) $hours = '0'.$hours;
+        if (intval($hours) < 10 ) {
+            $hours = '0'.$hours;
+        }
         $minutes = $array['i'];
-        if (intval($minutes) < 10 ) $minutes = '0'.$minutes;
+        if (intval($minutes) < 10 ) {
+            $minutes = '0'.$minutes;
+        }
     }
     if (checkdate($month,$day,$year)) {
         $datetime = $year.'-'.$month.'-'.$day.' '.$hours.':'.$minutes.':'.$seconds;

Indentation +27 added lines, -27 removed lines

@@ -693,8 +693,8 @@ 
  */
 function get_week_from_day($date) {
     if (!empty($date)) {
-       $time = api_strtotime($date,'UTC');
-       return date('W', $time);
+        $time = api_strtotime($date,'UTC');
+        return date('W', $time);
     } else {
         return date('W');
     }
@@ -712,31 +712,31 @@ 
 
 function substrwords($text,$maxchar,$end='...')
 {
-	if(strlen($text)>$maxchar)
-	{
-		$words=explode(" ",$text);
-		$output = '';
-		$i=0;
-		while(1)
-		{
-			$length = (strlen($output)+strlen($words[$i]));
-			if($length>$maxchar)
-			{
-				break;
-			}
-			else
-			{
-				$output = $output." ".$words[$i];
-				$i++;
-			};
-		};
-	}
-	else
-	{
-		$output = $text;
-		return $output;
-	}
-	return $output.$end;
+    if(strlen($text)>$maxchar)
+    {
+        $words=explode(" ",$text);
+        $output = '';
+        $i=0;
+        while(1)
+        {
+            $length = (strlen($output)+strlen($words[$i]));
+            if($length>$maxchar)
+            {
+                break;
+            }
+            else
+            {
+                $output = $output." ".$words[$i];
+                $i++;
+            };
+        };
+    }
+    else
+    {
+        $output = $text;
+        return $output;
+    }
+    return $output.$end;
 }
 
 function implode_with_key($glue, $array) {

main/inc/lib/VideoChat.php

Doc Comments +1 added lines, -1 removed lines

@@ -43,7 +43,7 @@
      * Create a video chat
      * @param int $fromUser The sender user
      * @param int $toUser The receiver user
-     * @return int The created video chat id. Otherwise return false
+     * @return false|string The created video chat id. Otherwise return false
      */
     public static function createRoom($fromUser, $toUser)
     {

main/inc/lib/zombie/zombie_report.class.php

Doc Comments +3 added lines

@@ -121,6 +121,9 @@
         return $form->isSubmitted() == false || $form->validate();
     }
 
+    /**
+     * @param string $format
+     */
     function get_ceiling($format = null)
     {
         $result = Request::get('ceiling');

Spacing +2 added lines, -2 removed lines

@@ -167,7 +167,7 @@ 
         }
 
         $action = $this->get_action();
-        $f = array($this, 'action_' . $action);
+        $f = array($this, 'action_'.$action);
         if (is_callable($f)) {
             return call_user_func($f, $ids);
         }
@@ -292,7 +292,7 @@ 
             $text = get_lang('No');
         }
 
-        $result = Display::return_icon($image . '.png', $text);
+        $result = Display::return_icon($image.'.png', $text);
         return $result;
     }
 

main/install/install.lib.php

Doc Comments +14 added lines, -5 removed lines

@@ -97,7 +97,7 @@ 
  * This function return the value of a php.ini setting if not "" or if exists,
  * otherwise return false
  * @param   string  $phpSetting The name of a PHP setting
- * @return  mixed   The value of the setting, or false if not found
+ * @return  string|false   The value of the setting, or false if not found
  */
 function checkPhpSettingExists($phpSetting)
 {
@@ -1268,6 +1268,10 @@ 
  * @param   string  Extra notice (to show on the right side)
  * @param   boolean Whether to display in update mode
  * @param   string  Additional attribute for the <tr> element
+ * @param string $installType
+ * @param string $parameterName
+ * @param string $formFieldName
+ * @param string $extra_notice
  * @return  void    Direct output
  */
 function displayDatabaseParameter(
@@ -1481,6 +1485,11 @@ 
 
     <?php
 }
+/**
+ * @param string $content
+ * @param string $title
+ * @param string $id
+ */
 function panel($content = null, $title = null, $id = null, $style = null) {
     $html = '';
     if (empty($style)) {
@@ -1837,8 +1846,8 @@ 
 }
 
 /**
- * @param $current_value
- * @param $wanted_value
+ * @param string $current_value
+ * @param string $wanted_value
  * @return string
  */
 function compare_setting_values($current_value, $wanted_value)
@@ -1855,8 +1864,8 @@ 
 }
 
 /**
- * @param $course_dir
- * @param $course_attempt_name
+ * @param string $course_dir
+ * @param string $course_attempt_name
  * @param string $file
  * @return bool
  */

Indentation +2 added lines, -2 removed lines

@@ -1682,7 +1682,7 @@ 
         $html .= '<label class="checkbox-inline">
                         <input type="radio" name="allowSelfReg" value="0" id="allowSelfReg0" '. ($allowSelfReg == 'false' ? '' : 'checked="checked" ') .' /> '. get_lang('No') .'
                     </label>';
-         $html .= '<label class="checkbox-inline">
+            $html .= '<label class="checkbox-inline">
                     <input type="radio" name="allowSelfReg" value="0" id="allowSelfReg0" '. ($allowSelfReg == 'approval' ? '' : 'checked="checked" ') .' /> '. get_lang('AfterApproval') .'
                 </label>';
         $html .= '</div>';
@@ -1716,7 +1716,7 @@ 
     </div>';
 
     echo panel($html, get_lang('Platform'), 'platform');
- ?>
+    ?>
     <div class='form-group'>
         <div class="col-sm-6">
             <button type="submit" class="btn btn-default pull-right" name="step3" value="&lt; <?php echo get_lang('Previous'); ?>" ><em class="fa fa-backward"> </em> <?php echo get_lang('Previous'); ?></button>

Braces +12 added lines, -7 removed lines

@@ -972,8 +972,7 @@ 
                 <?php echo get_lang('Error'); ?>!<br />
                 Chamilo <?php echo implode('|', $update_from_version_8).' '.get_lang('HasNotBeenFoundInThatDir'); ?>.
             </div>
-        <?php }
-        else {
+        <?php } else {
             echo '<br />';
         }
         ?>
@@ -1088,7 +1087,10 @@ 
         <button type="submit" name="step1" class="btn btn-default" onclick="javascript: window.location='index.php'; return false;" value="<?php echo get_lang('Previous'); ?>" >
             <em class="fa fa-backward"> </em> <?php echo get_lang('Previous'); ?>
         </button>
-        <button type="submit" name="step2_install" class="btn btn-success" value="<?php echo get_lang("NewInstallation"); ?>" <?php if ($error) echo 'disabled="disabled"'; ?> >
+        <button type="submit" name="step2_install" class="btn btn-success" value="<?php echo get_lang("NewInstallation"); ?>" <?php if ($error) {
+    echo 'disabled="disabled"';
+}
+?> >
             <em class="fa fa-forward"> </em> <?php echo get_lang('NewInstallation'); ?>
         </button>
         <input type="hidden" name="is_executable" id="is_executable" value="-" />
@@ -1374,7 +1376,7 @@ 
                 <input type="hidden" name="dbHostForm" value="<?php echo htmlentities($dbHostForm); ?>" /><?php echo $dbHostForm; ?>
             </div>
             <div class="col-sm-3"></div>
-            <?php }else{ ?>
+            <?php } else{ ?>
             <div class="col-sm-5">
                 <input type="text" class="form-control" size="25" maxlength="50" name="dbHostForm" value="<?php echo htmlentities($dbHostForm); ?>" />
             </div>
@@ -1388,7 +1390,7 @@ 
                 <input type="hidden" name="dbPortForm" value="<?php echo htmlentities($dbPortForm); ?>" /><?php echo $dbPortForm; ?>
             </div>
             <div class="col-sm-3"></div>
-            <?php }else{ ?>
+            <?php } else{ ?>
             <div class="col-sm-5">
                 <input type="text" class="form-control" size="25" maxlength="50" name="dbPortForm" value="<?php echo htmlentities($dbPortForm); ?>" />
             </div>
@@ -1470,9 +1472,12 @@ 
             Database port: <strong><?php echo $manager->getConnection()->getPort(); ?></strong><br/>
             Database driver: <strong><?php echo $manager->getConnection()->getDriver()->getName(); ?></strong><br/>
         </div>
-    <?php else: ?>
+    <?php else {
+    : ?>
         <div id="db_status" class="alert alert-danger">
-            <p><?php echo get_lang('FailedConectionDatabase'); ?></strong></p>
+            <p><?php echo get_lang('FailedConectionDatabase');
+}
+?></strong></p>
             <code><?php echo $database_exists_text ?></code>
         </div>
     <?php endif; ?>

Spacing +64 added lines, -64 removed lines

@@ -408,7 +408,7 @@ 
     if (!is_array($result)) {
         $result = array();
         $exceptions = array('.', '..', 'CVS', '.svn');
-        $search       = array('_latin',   '_unicode',   '_corporate',   '_org'  , '_KM',   '_');
+        $search       = array('_latin', '_unicode', '_corporate', '_org', '_KM', '_');
         $replace_with = array(' (Latin)', ' (unicode)', ' (corporate)', ' (org)', ' (KM)', ' ');
         $dirname = api_get_path(SYS_LANG_PATH);
         $handle = opendir($dirname);
@@ -443,9 +443,9 @@ 
     if ($handle = opendir($directory)) {
         while (false !== ($file = readdir($handle))) {
             if ($file != "." && $file != "..") {
-                if (is_dir($directory. "/" . $file)) {
-                    $array_items = array_merge($array_items, my_directory_to_array($directory. '/' . $file));
-                    $file = $directory . "/" . $file;
+                if (is_dir($directory."/".$file)) {
+                    $array_items = array_merge($array_items, my_directory_to_array($directory.'/'.$file));
+                    $file = $directory."/".$file;
                     $array_items[] = preg_replace("/\/\//si", '/', $file);
                 }
             }
@@ -490,7 +490,7 @@ 
         // try to recover config file from Chamilo 1.9.x
         if (file_exists($updatePath.'main/inc/conf/configuration.php')) {
             $updateFromConfigFile = 'main/inc/conf/configuration.php';
-        } elseif (file_exists($updatePath . 'app/config/configuration.php')) {
+        } elseif (file_exists($updatePath.'app/config/configuration.php')) {
             $updateFromConfigFile = 'app/config/configuration.php';
         } else {
             // Give up recovering.
@@ -651,7 +651,7 @@ 
     <h2><?php get_lang('WelcomeToTheChamiloInstaller'); ?></h2>
     <div class="RequirementHeading">
         <h2><?php echo display_step_sequence(); ?>
-            <?php echo get_lang('InstallationLanguage');?>
+            <?php echo get_lang('InstallationLanguage'); ?>
         </h2>
         <p><?php echo get_lang('PleaseSelectInstallationProcessLanguage'); ?>:</p>
         <form id="lang_form" method="post" action="<?php echo api_get_self(); ?>">
@@ -705,14 +705,14 @@ 
     }
     echo '</div>';
 
-    $properlyAccessUrl =  checkAccessUrl();
+    $properlyAccessUrl = checkAccessUrl();
 
     if (!$properlyAccessUrl) {
         echo '
             <div class="alert alert-danger">
-                ' . Display::return_icon('error.png', get_lang('Error'), [], ICON_SIZE_MEDIUM) .
-            ' ' .
-            sprintf(get_lang('InstallMultiURLDetectedNotMainURL'), api_get_configuration_value('root_web')) . '
+                ' . Display::return_icon('error.png', get_lang('Error'), [], ICON_SIZE_MEDIUM).
+            ' '.
+            sprintf(get_lang('InstallMultiURLDetectedNotMainURL'), api_get_configuration_value('root_web')).'
             </div>
         ';
     }
@@ -736,7 +736,7 @@ 
     if (phpversion() < REQUIRED_PHP_VERSION) {
         echo '<strong><font color="red">'.get_lang('PHPVersionError').'</font></strong>';
     } else {
-        echo '<strong><font color="green">'.get_lang('PHPVersionOK'). ' '.phpversion().'</font></strong>';
+        echo '<strong><font color="green">'.get_lang('PHPVersionOK').' '.phpversion().'</font></strong>';
     }
     echo '</td>
             </tr>
@@ -1094,9 +1094,9 @@ 
         }
 
         $deprecated = [
-            api_get_path(SYS_CODE_PATH) . 'exercice/',
-            api_get_path(SYS_CODE_PATH) . 'newscorm/',
-            api_get_path(SYS_PLUGIN_PATH) . 'ticket/'
+            api_get_path(SYS_CODE_PATH).'exercice/',
+            api_get_path(SYS_CODE_PATH).'newscorm/',
+            api_get_path(SYS_PLUGIN_PATH).'ticket/'
         ];
         $deprecatedToRemove = [];
 
@@ -1206,7 +1206,7 @@ 
 function get_contact_registration_form()
 {
 
-    $html ='
+    $html = '
    <div class="form-horizontal">
     <div class="panel panel-default">
     <div class="panel-body">
@@ -1303,7 +1303,7 @@ 
         <div class="col-sm-9">
             <div class="radio">
                 <label>
-                    <input type="radio" name="financial_decision" id="financial_decision1" value="1" checked /> ' . get_lang('Yes') . '
+                    <input type="radio" name="financial_decision" id="financial_decision1" value="1" checked /> ' . get_lang('Yes').'
                 </label>
             </div>
             <div class="radio">
@@ -1362,8 +1362,8 @@ 
             echo '<input type="hidden" name="'.$formFieldName.'" id="'.$formFieldName.'" value="'.api_htmlentities($parameterValue).'" />';
             echo api_htmlentities($parameterValue);
         } else {
-            echo '<div class="col-sm-5"><input type="' . $inputType . '" class="form-control" size="' . DATABASE_FORM_FIELD_DISPLAY_LENGTH . '" maxlength="' . $maxLength . '" name="' . $formFieldName . '" id="' . $formFieldName . '" value="' . api_htmlentities($parameterValue) . '" />' . "</div>";
-            echo '<div class="col-sm-3">' . $extra_notice . '</div>';
+            echo '<div class="col-sm-5"><input type="'.$inputType.'" class="form-control" size="'.DATABASE_FORM_FIELD_DISPLAY_LENGTH.'" maxlength="'.$maxLength.'" name="'.$formFieldName.'" id="'.$formFieldName.'" value="'.api_htmlentities($parameterValue).'" />'."</div>";
+            echo '<div class="col-sm-3">'.$extra_notice.'</div>';
         }
     }
 }
@@ -1397,12 +1397,12 @@ 
         $dbNameForm = $_configuration['main_database'];
         $dbPortForm = isset($_configuration['db_port']) ? $_configuration['db_port'] : '';
 
-        echo '<div class="RequirementHeading"><h2>' . display_step_sequence() .get_lang('DBSetting') . '</h2></div>';
+        echo '<div class="RequirementHeading"><h2>'.display_step_sequence().get_lang('DBSetting').'</h2></div>';
         echo '<div class="RequirementContent">';
         echo get_lang('DBSettingUpgradeIntro');
         echo '</div>';
     } else {
-        echo '<div class="RequirementHeading"><h2>' . display_step_sequence() .get_lang('DBSetting') . '</h2></div>';
+        echo '<div class="RequirementHeading"><h2>'.display_step_sequence().get_lang('DBSetting').'</h2></div>';
         echo '<div class="RequirementContent">';
         echo get_lang('DBSettingIntro');
         echo '</div>';
@@ -1412,12 +1412,12 @@ 
         <div class="panel-body">
         <div class="form-group">
             <label class="col-sm-4"><?php echo get_lang('DBHost'); ?> </label>
-            <?php if ($installType == 'update'){ ?>
+            <?php if ($installType == 'update') { ?>
             <div class="col-sm-5">
                 <input type="hidden" name="dbHostForm" value="<?php echo htmlentities($dbHostForm); ?>" /><?php echo $dbHostForm; ?>
             </div>
             <div class="col-sm-3"></div>
-            <?php }else{ ?>
+            <?php } else { ?>
             <div class="col-sm-5">
                 <input type="text" class="form-control" size="25" maxlength="50" name="dbHostForm" value="<?php echo htmlentities($dbHostForm); ?>" />
             </div>
@@ -1426,12 +1426,12 @@ 
         </div>
         <div class="form-group">
             <label class="col-sm-4"><?php echo get_lang('DBPort'); ?> </label>
-            <?php if ($installType == 'update'){ ?>
+            <?php if ($installType == 'update') { ?>
             <div class="col-sm-5">
                 <input type="hidden" name="dbPortForm" value="<?php echo htmlentities($dbPortForm); ?>" /><?php echo $dbPortForm; ?>
             </div>
             <div class="col-sm-3"></div>
-            <?php }else{ ?>
+            <?php } else { ?>
             <div class="col-sm-5">
                 <input type="text" class="form-control" size="25" maxlength="50" name="dbPortForm" value="<?php echo htmlentities($dbPortForm); ?>" />
             </div>
@@ -1457,7 +1457,7 @@ 
             <?php
             //Database Name fix replace weird chars
             if ($installType != INSTALL_TYPE_UPDATE) {
-                $dbNameForm = str_replace(array('-','*', '$', ' ', '.'), '', $dbNameForm);
+                $dbNameForm = str_replace(array('-', '*', '$', ' ', '.'), '', $dbNameForm);
             }
 
             displayDatabaseParameter(
@@ -1550,7 +1550,7 @@ 
     if (!empty($title)) {
         $panelTitle = Display::div($title, array('class' => 'panel-heading'));
         $panelBody = Display::div($content, array('class' => 'panel-body'));
-        $panelParent = Display::div($panelTitle . $panelBody, array('id' => $id, 'class' => 'panel panel-'.$style));
+        $panelParent = Display::div($panelTitle.$panelBody, array('id' => $id, 'class' => 'panel panel-'.$style));
     } else {
         $panelBody = Display::div($html, array('class' => 'panel-body'));
         $panelParent = Display::div($panelBody, array('id' => $id, 'class' => 'panel panel-'.$style));
@@ -1576,9 +1576,9 @@ 
     $displayWhenUpdate = 'true'
 ) {
     $html = '<div class="form-group">';
-    $html .= '<label class="col-sm-6 control-label">' . $parameterName . '</label>';
+    $html .= '<label class="col-sm-6 control-label">'.$parameterName.'</label>';
     if ($installType == INSTALL_TYPE_UPDATE && $displayWhenUpdate) {
-        $html .= '<input type="hidden" name="' . $formFieldName . '" value="'. api_htmlentities($parameterValue, ENT_QUOTES). '" />' . $parameterValue;
+        $html .= '<input type="hidden" name="'.$formFieldName.'" value="'.api_htmlentities($parameterValue, ENT_QUOTES).'" />'.$parameterValue;
     } else {
         $html .= '<div class="col-sm-6"><input class="form-control" type="text" size="'.FORM_FIELD_DISPLAY_LENGTH.'" maxlength="'.MAX_FORM_FIELD_LENGTH.'" name="'.$formFieldName.'" value="'.api_htmlentities($parameterValue, ENT_QUOTES).'" />'."</div>";
     }
@@ -1626,7 +1626,7 @@ 
         $languageForm = $_SESSION['install_language'];
     }
     echo '<div class="RequirementHeading">';
-    echo "<h2>" . display_step_sequence() . get_lang("CfgSetting") . "</h2>";
+    echo "<h2>".display_step_sequence().get_lang("CfgSetting")."</h2>";
     echo '</div>';
 
     echo '<p>'.get_lang('ConfigSettingsInfo').' <strong>app/config/configuration.php</strong></p>';
@@ -1644,14 +1644,14 @@ 
 
     // Parameters 3 and 4: administrator's names
 
-    $html .=  display_configuration_parameter($installType, get_lang('AdminFirstName'), 'adminFirstName', $adminFirstName);
-    $html .=  display_configuration_parameter($installType, get_lang('AdminLastName'), 'adminLastName', $adminLastName);
+    $html .= display_configuration_parameter($installType, get_lang('AdminFirstName'), 'adminFirstName', $adminFirstName);
+    $html .= display_configuration_parameter($installType, get_lang('AdminLastName'), 'adminLastName', $adminLastName);
 
     //Parameter 3: administrator's email
-    $html .=  display_configuration_parameter($installType, get_lang('AdminEmail'), 'emailForm', $emailForm);
+    $html .= display_configuration_parameter($installType, get_lang('AdminEmail'), 'emailForm', $emailForm);
 
     //Parameter 6: administrator's telephone
-    $html .=  display_configuration_parameter($installType, get_lang('AdminPhone'), 'adminPhoneForm', $adminPhoneForm);
+    $html .= display_configuration_parameter($installType, get_lang('AdminPhone'), 'adminPhoneForm', $adminPhoneForm);
 
 
     echo panel($html, get_lang('Administrator'), 'administrator');
@@ -1670,12 +1670,12 @@ 
         $html .= display_language_selection_box('languageForm', $languageForm);
         $html .= '</div>';
     }
-    $html.= "</div>";
+    $html .= "</div>";
 
 
     //Second parameter: Chamilo URL
     $html .= '<div class="form-group">';
-    $html .= '<label class="col-sm-6 control-label">'.get_lang('ChamiloURL') .get_lang('ThisFieldIsRequired').'</label>';
+    $html .= '<label class="col-sm-6 control-label">'.get_lang('ChamiloURL').get_lang('ThisFieldIsRequired').'</label>';
 
 
 
@@ -1699,34 +1699,34 @@ 
 
 
     $html .= '<div class="form-group">
-            <label class="col-sm-6 control-label">' . get_lang("EncryptMethodUserPass") . '</label>
+            <label class="col-sm-6 control-label">' . get_lang("EncryptMethodUserPass").'</label>
         <div class="col-sm-6">';
     if ($installType == 'update') {
-        $html .= '<input type="hidden" name="encryptPassForm" value="'. $encryptPassForm .'" />'. $encryptPassForm;
+        $html .= '<input type="hidden" name="encryptPassForm" value="'.$encryptPassForm.'" />'.$encryptPassForm;
     } else {
 
         $html .= '<div class="checkbox">
                     <label>
-                        <input  type="radio" name="encryptPassForm" value="bcrypt" id="encryptPass1" '. ($encryptPassForm == 'bcrypt' ? 'checked="checked" ':'') .'/> bcrypt
+                        <input  type="radio" name="encryptPassForm" value="bcrypt" id="encryptPass1" '. ($encryptPassForm == 'bcrypt' ? 'checked="checked" ' : '').'/> bcrypt
                     </label>';
 
         $html .= '<label>
-                        <input  type="radio" name="encryptPassForm" value="sha1" id="encryptPass1" '. ($encryptPassForm == 'sha1' ? 'checked="checked" ':'') .'/> sha1
+                        <input  type="radio" name="encryptPassForm" value="sha1" id="encryptPass1" '. ($encryptPassForm == 'sha1' ? 'checked="checked" ' : '').'/> sha1
                     </label>';
 
         $html .= '<label>
-                        <input type="radio" name="encryptPassForm" value="md5" id="encryptPass0" '. ($encryptPassForm == 'md5' ? 'checked="checked" ':'') .'/> md5
+                        <input type="radio" name="encryptPassForm" value="md5" id="encryptPass0" '. ($encryptPassForm == 'md5' ? 'checked="checked" ' : '').'/> md5
                     </label>';
 
         $html .= '<label>
-                        <input type="radio" name="encryptPassForm" value="none" id="encryptPass2" '. ($encryptPassForm == 'none' ? 'checked="checked" ':'') .'/>'. get_lang('None').'
+                        <input type="radio" name="encryptPassForm" value="none" id="encryptPass2" '. ($encryptPassForm == 'none' ? 'checked="checked" ' : '').'/>'.get_lang('None').'
                     </label>';
         $html .= '</div>';
     }
     $html .= '</div></div>';
 
     $html .= '<div class="form-group">
-            <label class="col-sm-6 control-label">' . get_lang('AllowSelfReg') . '</label>
+            <label class="col-sm-6 control-label">' . get_lang('AllowSelfReg').'</label>
             <div class="col-sm-6">';
     if ($installType == 'update') {
         if ($allowSelfReg == 'true') {
@@ -1736,17 +1736,17 @@ 
         } else {
             $label = get_lang('AfterApproval');
         }
-        $html .= '<input type="hidden" name="allowSelfReg" value="'. $allowSelfReg .'" />'. $label;
+        $html .= '<input type="hidden" name="allowSelfReg" value="'.$allowSelfReg.'" />'.$label;
     } else {
         $html .= '<div class="control-group">';
         $html .= '<label class="checkbox-inline">
-                        <input type="radio" name="allowSelfReg" value="true" id="allowSelfReg1" '. ($allowSelfReg == 'true' ? 'checked="checked" ' : '') . ' /> '. get_lang('Yes') .'
+                        <input type="radio" name="allowSelfReg" value="true" id="allowSelfReg1" '. ($allowSelfReg == 'true' ? 'checked="checked" ' : '').' /> '.get_lang('Yes').'
                     </label>';
         $html .= '<label class="checkbox-inline">
-                        <input type="radio" name="allowSelfReg" value="false" id="allowSelfReg0" '. ($allowSelfReg == 'false' ? '' : 'checked="checked" ') .' /> '. get_lang('No') .'
+                        <input type="radio" name="allowSelfReg" value="false" id="allowSelfReg0" '. ($allowSelfReg == 'false' ? '' : 'checked="checked" ').' /> '.get_lang('No').'
                     </label>';
          $html .= '<label class="checkbox-inline">
-                    <input type="radio" name="allowSelfReg" value="approval" id="allowSelfReg2" '. ($allowSelfReg == 'approval' ? '' : 'checked="checked" ') .' /> '. get_lang('AfterApproval') .'
+                    <input type="radio" name="allowSelfReg" value="approval" id="allowSelfReg2" '. ($allowSelfReg == 'approval' ? '' : 'checked="checked" ').' /> '.get_lang('AfterApproval').'
                 </label>';
         $html .= '</div>';
     }
@@ -1754,7 +1754,7 @@ 
     $html .= '</div>';
 
     $html .= '<div class="form-group">';
-    $html .= '<label class="col-sm-6 control-label">'. get_lang('AllowSelfRegProf') .'</label>
+    $html .= '<label class="col-sm-6 control-label">'.get_lang('AllowSelfRegProf').'</label>
         <div class="col-sm-6">';
     if ($installType == 'update') {
         if ($allowSelfRegProf == 'true') {
@@ -1762,16 +1762,16 @@ 
         } else {
             $label = get_lang('No');
         }
-        $html .= '<input type="hidden" name="allowSelfRegProf" value="'. $allowSelfRegProf.'" />'. $label;
+        $html .= '<input type="hidden" name="allowSelfRegProf" value="'.$allowSelfRegProf.'" />'.$label;
     } else {
         $html .= '<div class="control-group">
                 <label class="checkbox-inline">
-                    <input type="radio" name="allowSelfRegProf" value="1" id="allowSelfRegProf1" '. ($allowSelfRegProf ? 'checked="checked" ' : '') .'/>
-                ' . get_lang('Yes') .'
+                    <input type="radio" name="allowSelfRegProf" value="1" id="allowSelfRegProf1" '. ($allowSelfRegProf ? 'checked="checked" ' : '').'/>
+                ' . get_lang('Yes').'
                 </label>';
         $html .= '<label class="checkbox-inline">
-                    <input type="radio" name="allowSelfRegProf" value="0" id="allowSelfRegProf0" '. ($allowSelfRegProf ? '' : 'checked="checked" ') .' />
-                   '. get_lang('No') .'
+                    <input type="radio" name="allowSelfRegProf" value="0" id="allowSelfRegProf0" '. ($allowSelfRegProf ? '' : 'checked="checked" ').' />
+                   '. get_lang('No').'
                 </label>';
         $html .= '</div>';
     }
@@ -1836,7 +1836,7 @@ 
         "Macedonia", "Madagascar", "Malawi", "Malaysia", "Maldives", "Mali", "Malta", "Marshall Islands", "Mauritania", "Mauritius", "Mexico", "Micronesia", "Moldova", "Monaco", "Mongolia", "Morocco", "Mozambique", "Myanmar",
         "Namibia", "Nauru", "Nepa", "Netherlands", "New Zealand", "Nicaragua", "Niger", "Nigeria", "Norway",
         "Oman",
-        "Pakistan", "Palau", "Panama", "Papua New Guinea", "Paraguay", "Peru", "Philippines", "Poland","Portugal",
+        "Pakistan", "Palau", "Panama", "Papua New Guinea", "Paraguay", "Peru", "Philippines", "Poland", "Portugal",
         "Qatar",
         "Romania", "Russia", "Rwanda",
         "Saint Kitts and Nevis", "Saint Lucia", "Saint Vincent", "Samoa", "San Marino", "Sao Tome and Principe", "Saudi Arabia", "Senegal", "Serbia and Montenegro", "Seychelles", "Sierra Leone", "Singapore", "Slovakia", "Slovenia", "Solomon Islands", "Somalia", "South Africa", "Spain", "Sri Lanka", "Sudan", "Suriname", "Swaziland", "Sweden", "Switzerland", "Syria",
@@ -1883,11 +1883,11 @@ 
     $permissions_for_new_directories = isset($_SESSION['permissions_for_new_directories']) ? $_SESSION['permissions_for_new_directories'] : 0770;
     $permissions_for_new_files = isset($_SESSION['permissions_for_new_files']) ? $_SESSION['permissions_for_new_files'] : 0660;
     // use decoct() to store as string
-    $sql = "UPDATE $table SET selected_value = '0" . decoct($permissions_for_new_directories) . "'
+    $sql = "UPDATE $table SET selected_value = '0".decoct($permissions_for_new_directories)."'
               WHERE variable  = 'permissions_for_new_directories'";
     Database::query($sql);
 
-    $sql = "UPDATE $table SET selected_value = '0" . decoct($permissions_for_new_files) . "' WHERE variable  = 'permissions_for_new_files'";
+    $sql = "UPDATE $table SET selected_value = '0".decoct($permissions_for_new_files)."' WHERE variable  = 'permissions_for_new_files'";
     Database::query($sql);
 
     if (isset($_SESSION['permissions_for_new_directories'])) {
@@ -1907,8 +1907,8 @@ 
 function compare_setting_values($current_value, $wanted_value)
 {
     $current_value_string = $current_value;
-    $current_value = (float)$current_value;
-    $wanted_value = (float)$wanted_value;
+    $current_value = (float) $current_value;
+    $wanted_value = (float) $wanted_value;
 
     if ($current_value >= $wanted_value) {
         return Display::label($current_value_string, 'success');
@@ -1971,7 +1971,7 @@ 
 
                     fwrite($fp, $out);
                     while (!feof($fp)) {
-                        $result = str_replace("\r\n", '',fgets($fp, 128));
+                        $result = str_replace("\r\n", '', fgets($fp, 128));
                         if (!empty($result) && $result == '123') {
                             $output = true;
                         }
@@ -1994,7 +1994,7 @@ 
                     curl_setopt($ch, CURLOPT_URL, $url);
                     //curl_setopt($ch, CURLOPT_TIMEOUT, 30);
                     curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
-                    $result = curl_exec ($ch);
+                    $result = curl_exec($ch);
                     if (!empty($result) && $result == '123') {
                         $output = true;
                     }
@@ -2755,12 +2755,12 @@ 
         $adminPhoneForm,
         '', //$picture_uri = '',
         PLATFORM_AUTH_SOURCE,
-        '',//$expirationDate,
+        '', //$expirationDate,
         1,
         0,
         null,
         '',
-        false,  //$send_mail = false,
+        false, //$send_mail = false,
         true //$isAdmin = false
     );
 
@@ -2782,7 +2782,7 @@ 
         0,
         null,
         '',
-        false,  //$send_mail = false,
+        false, //$send_mail = false,
         false //$isAdmin = false
     );
 
@@ -2817,7 +2817,7 @@ 
     Database::query($sql);
 
     foreach ($files as $version) {
-        $version = str_replace(['Version',  '.php' ], '', $version->getFilename());
+        $version = str_replace(['Version', '.php'], '', $version->getFilename());
         $sql = "INSERT INTO version (version) VALUES ('$version')";
         Database::query($sql);
     }
@@ -2863,7 +2863,7 @@ 
                 SET selected_value = '".$param->selected_value."'
                 WHERE variable = '".$param->variable."'";
         if (!empty($param->subkey)) {
-            $sql .= " AND subkey='" . $param->subkey . "'";
+            $sql .= " AND subkey='".$param->subkey."'";
         }
         Database::query($sql);
     }

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;

main/user/user.php

Doc Comments -1 removed lines

@@ -735,7 +735,6 @@
  * lock = the user can no longer use this account
  * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
  * @param int $active the current state of the account
- * @param int $user_id The user id
  * @param string $urlParams
  *
  * @return string Some HTML-code with the lock/unlock button

Spacing +18 added lines, -18 removed lines

@@ -13,7 +13,7 @@ 
  */
 $use_anonymous = true;
 require_once '../inc/global.inc.php';
-$current_course_tool  = TOOL_USER;
+$current_course_tool = TOOL_USER;
 $this_section = SECTION_COURSES;
 
 // notice for unauthorized people.
@@ -41,7 +41,7 @@ 
 
 //Can't auto unregister from a session
 if (!empty($sessionId)) {
-    $course_info['unsubscribe']  = 0;
+    $course_info['unsubscribe'] = 0;
 }
 
 /* Unregistering a user section	*/
@@ -173,7 +173,7 @@ 
                             '#',
                             get_lang('UserPicture'),
                             get_lang('OfficialCode'),
-                            get_lang('FirstName') . ', ' . get_lang('LastName'),
+                            get_lang('FirstName').', '.get_lang('LastName'),
                             get_lang('Email'),
                             get_lang('Phone')
                         );
@@ -182,7 +182,7 @@ 
                             '#',
                             get_lang('UserPicture'),
                             get_lang('OfficialCode'),
-                            get_lang('LastName') . ', ' . get_lang('FirstName'),
+                            get_lang('LastName').', '.get_lang('FirstName'),
                             get_lang('Email'),
                             get_lang('Phone')
                         );
@@ -207,7 +207,7 @@ 
                     if (api_is_multiple_url_enabled()) {
                         $sql .= ' , '.Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER).' au ';
                     }
-                    $sql .=" WHERE c_id = '$courseId' AND session_course_user.user_id = user.user_id ";
+                    $sql .= " WHERE c_id = '$courseId' AND session_course_user.user_id = user.user_id ";
                     $sql .= ' AND session_id = '.$sessionId;
 
                     if (api_is_multiple_url_enabled()) {
@@ -255,7 +255,7 @@ 
                                     $counter,
                                     $user_image,
                                     $user['official_code'],
-                                    $user['firstname'] . ', ' . $user['lastname'],
+                                    $user['firstname'].', '.$user['lastname'],
                                     $user['email'],
                                     $user['phone']
                                 );
@@ -264,7 +264,7 @@ 
                                     $counter,
                                     $user_image,
                                     $user['official_code'],
-                                    $user['lastname'] . ', ' . $user['firstname'],
+                                    $user['lastname'].', '.$user['firstname'],
                                     $user['email'],
                                     $user['phone']
                                 );
@@ -343,7 +343,7 @@ 
                                     $counter,
                                     $user_image,
                                     $user['official_code'],
-                                    $user['firstname'] . ', ' . $user['lastname'],
+                                    $user['firstname'].', '.$user['lastname'],
                                     $user['email'],
                                     $user['phone']
                                 );
@@ -352,7 +352,7 @@ 
                                     $counter,
                                     $user_image,
                                     $user['official_code'],
-                                    $user['lastname'] . ', ' . $user['firstname'],
+                                    $user['lastname'].', '.$user['firstname'],
                                     $user['email'],
                                     $user['phone']
                                 );
@@ -701,7 +701,7 @@ 
                 $userInfo = api_get_user_info($user_id);
                 $userPicture = $userInfo['avatar'];
 
-                $photo= '<img src="'.$userPicture.'" alt="'.$userInfo['complete_name'].'" width="22" height="22" title="'.$userInfo['complete_name'].'" />';
+                $photo = '<img src="'.$userPicture.'" alt="'.$userInfo['complete_name'].'" width="22" height="22" title="'.$userInfo['complete_name'].'" />';
 
                 $temp[] = $user_id;
                 $temp[] = $photo;
@@ -824,7 +824,7 @@ 
         if (api_get_setting('allow_user_course_subscription_by_course_admin') === 'true' or api_is_platform_admin()) {
             // unregister
             if ($user_id != $current_user_id || api_is_platform_admin()) {
-                $result .= '<a class="btn btn-small btn-danger" href="'.api_get_self().'?'.api_get_cidreq().'&type='.$type.'&unregister=yes&user_id='.$user_id.'" title="'.get_lang('Unreg').' " onclick="javascript:if(!confirm(\''.addslashes(api_htmlentities(get_lang('ConfirmYourChoice'),ENT_QUOTES,$charset)).'\')) return false;">'.
+                $result .= '<a class="btn btn-small btn-danger" href="'.api_get_self().'?'.api_get_cidreq().'&type='.$type.'&unregister=yes&user_id='.$user_id.'" title="'.get_lang('Unreg').' " onclick="javascript:if(!confirm(\''.addslashes(api_htmlentities(get_lang('ConfirmYourChoice'), ENT_QUOTES, $charset)).'\')) return false;">'.
                     get_lang('Unreg').'</a>&nbsp;';
             } else {
                 //$result .= Display::return_icon('unsubscribe_course_na.png', get_lang('Unreg'),'',ICON_SIZE_SMALL).'</a>&nbsp;';
@@ -834,7 +834,7 @@ 
         // Show buttons for unsubscribe
         if ($course_info['unsubscribe'] == 1) {
             if ($user_id == $current_user_id) {
-                $result .= '<a class="btn btn-small btn-danger" href="'.api_get_self().'?'.api_get_cidreq().'&type='.$type.'&unregister=yes&user_id='.$user_id.'" title="'.get_lang('Unreg').' " onclick="javascript:if(!confirm(\''.addslashes(api_htmlentities(get_lang('ConfirmYourChoice'),ENT_QUOTES,$charset)).'\')) return false;">'.
+                $result .= '<a class="btn btn-small btn-danger" href="'.api_get_self().'?'.api_get_cidreq().'&type='.$type.'&unregister=yes&user_id='.$user_id.'" title="'.get_lang('Unreg').' " onclick="javascript:if(!confirm(\''.addslashes(api_htmlentities(get_lang('ConfirmYourChoice'), ENT_QUOTES, $charset)).'\')) return false;">'.
                     get_lang('Unreg').'</a>&nbsp;';
             }
         }
@@ -914,7 +914,7 @@ 
 
     // Actions column
     $table->set_header($header_nr++, get_lang('Action'), false);
-    $table->set_column_filter($header_nr-1, 'modify_filter');
+    $table->set_column_filter($header_nr - 1, 'modify_filter');
 
     if (api_get_setting('allow_user_course_subscription_by_course_admin') == 'true') {
         $table->set_form_actions(array('unsubscribe' => get_lang('Unreg')), 'user');
@@ -922,7 +922,7 @@ 
 } else {
     if ($course_info['unsubscribe'] == 1) {
         $table->set_header($header_nr++, get_lang('Action'), false);
-        $table->set_column_filter($header_nr-1, 'modify_filter');
+        $table->set_column_filter($header_nr - 1, 'modify_filter');
     }
 }
 
@@ -978,19 +978,19 @@ 
     echo '<div class="col-md-6">';
     echo $icon;
     $actions .= '<a href="user.php?'.api_get_cidreq().'&action=export&format=csv&type='.$type.'">'.
-        Display::return_icon('export_csv.png', get_lang('ExportAsCSV'),'',ICON_SIZE_MEDIUM).'</a> ';
+        Display::return_icon('export_csv.png', get_lang('ExportAsCSV'), '', ICON_SIZE_MEDIUM).'</a> ';
     $actions .= '<a href="user.php?'.api_get_cidreq().'&action=export&format=xls&type='.$type.'">'.
-        Display::return_icon('export_excel.png', get_lang('ExportAsXLS'),'',ICON_SIZE_MEDIUM).'</a> ';
+        Display::return_icon('export_excel.png', get_lang('ExportAsXLS'), '', ICON_SIZE_MEDIUM).'</a> ';
 
     if (api_get_setting('allow_user_course_subscription_by_course_admin') == 'true' ||
         api_is_platform_admin()
     ) {
         $actions .= '<a href="user_import.php?'.api_get_cidreq().'&action=import">'.
-            Display::return_icon('import_csv.png', get_lang('ImportUsersToACourse'),'',ICON_SIZE_MEDIUM).'</a> ';
+            Display::return_icon('import_csv.png', get_lang('ImportUsersToACourse'), '', ICON_SIZE_MEDIUM).'</a> ';
     }
 
     $actions .= '<a href="user.php?'.api_get_cidreq().'&action=export&format=pdf&type='.$type.'">'.
-        Display::return_icon('pdf.png', get_lang('ExportToPDF'),'',ICON_SIZE_MEDIUM).'</a> ';
+        Display::return_icon('pdf.png', get_lang('ExportToPDF'), '', ICON_SIZE_MEDIUM).'</a> ';
     echo $actions;
 
     echo '</div>';