chamilo / chamilo-lms

main/inc/lib/formvalidator/Rule/CompareFields.php

Indentation +15 added lines, -15 removed lines

@@ -6,24 +6,24 @@
  */
 class HTML_QuickForm_Compare_Fields extends HTML_QuickForm_Rule_Compare 
 {
-	/**
-	 * Function to check an array of fields 	 
-	 * @param   array of field names
+    /**
+     * Function to check an array of fields 	 
+     * @param   array of field names
      * @param   string operator ==, >=, etc
      * @param   string the value to compare
-	 * @return boolean True if date is valid
-	 */
-	function validate($values, $operator_and_max_value) {
+     * @return boolean True if date is valid
+     */
+    function validate($values, $operator_and_max_value) {
         if (is_array($values) && !empty($values) && !empty($operator_and_max_value)) {
-           $final_value = 0;
-           foreach ($values as $value) {
-               $final_value += $value;
-           }
-           $params = explode('@', $operator_and_max_value);
-           $operator    = $params[0];
-           $max_value   = $params[1];                      
-           return parent::validate(array($final_value, $max_value), $operator);
+            $final_value = 0;
+            foreach ($values as $value) {
+                $final_value += $value;
+            }
+            $params = explode('@', $operator_and_max_value);
+            $operator    = $params[0];
+            $max_value   = $params[1];                      
+            return parent::validate(array($final_value, $max_value), $operator);
         }
         return false;        
-	}
+    }
 }
\ No newline at end of file

main/inc/lib/chamilo_session.class.php

Spacing +1 added lines, -1 removed lines

@@ -109,7 +109,7 @@
         }*/
         // If the session time has expired, refresh the starttime value,
         //  so we're starting to count down from a later time
-        if ( $session->has('starttime') && $session->is_expired()) {
+        if ($session->has('starttime') && $session->is_expired()) {
             $session->destroy();
         } else {
             //error_log('Time not expired, extend session for a bit more');

main/inc/lib/dashboard.lib.php

Spacing +13 added lines, -13 removed lines

@@ -52,7 +52,7 @@ 
 
                 echo '<tr>';
                 self::display_dashboard_plugin_checkboxes($testplugin);
-                for ($i = 0 ; $i < count($table_cols); $i++) {
+                for ($i = 0; $i < count($table_cols); $i++) {
                     if (isset($plugin_info[strtolower($table_cols[$i])])) {
                         echo '<td>';
                         echo $plugin_info[$table_cols[$i]];
@@ -67,7 +67,7 @@ 
                     echo Display::tag(
                         'tr',
                         Display::tag('td',
-                            get_lang('CheckFilePermissions') . ' ' . Security::remove_XSS($plugin_info_file),
+                            get_lang('CheckFilePermissions').' '.Security::remove_XSS($plugin_info_file),
                             array('colspan' => '3'))
                     );
                 }
@@ -79,7 +79,7 @@ 
             foreach ($disabled_blocks_data as $disabled_block) {
                 echo '<tr style="background-color:#eee">';
                 echo '<td><center><input type="checkbox" name="disabled_block" value="true" checked disabled /></center>';
-                for ($j = 0 ; $j < count($table_cols); $j++) {
+                for ($j = 0; $j < count($table_cols); $j++) {
                     if (isset($disabled_block[strtolower($table_cols[$j])])) {
                         if ($j == 2) {
                             echo '<td>';
@@ -189,10 +189,10 @@ 
             }
             // clean from block data
             if (!empty($not_selected_blocks_id)) {
-                $sql_check = "SELECT id FROM $tbl_block WHERE id IN(".implode(',',$not_selected_blocks_id).")";
+                $sql_check = "SELECT id FROM $tbl_block WHERE id IN(".implode(',', $not_selected_blocks_id).")";
                 $rs_check = Database::query($sql_check);
                 if (Database::num_rows($rs_check) > 0) {
-                    $del = "DELETE FROM $tbl_block WHERE id IN(".implode(',',$not_selected_blocks_id).")";
+                    $del = "DELETE FROM $tbl_block WHERE id IN(".implode(',', $not_selected_blocks_id).")";
                     Database::query($del);
                 }
             }
@@ -212,7 +212,7 @@ 
                         $affected_rows = Database::affected_rows($result);
                     } else {
                         // insert
-                        $plugin_info_file = $dashboard_pluginpath . $testplugin . "/$testplugin.info";
+                        $plugin_info_file = $dashboard_pluginpath.$testplugin."/$testplugin.info";
                         $plugin_info = array();
                         if (file_exists($plugin_info_file)) {
                             $plugin_info = parse_info_file($plugin_info_file);
@@ -282,10 +282,10 @@ 
 		// We check if plugin exists inside directory for updating active field
 		$sql = "SELECT * FROM $tbl_block";
 		$rs = Database::query($sql);
-		if (Database::num_rows($rs) > 0){
+		if (Database::num_rows($rs) > 0) {
 			while ($row = Database::fetch_array($rs)) {
 				$path = $row['path'];
-				if (!in_array($row['path'],$possibleplugins)) {
+				if (!in_array($row['path'], $possibleplugins)) {
 					$active = 0;
 				} else {
 					$active = 1;
@@ -390,13 +390,13 @@ 
 					echo '<td>'.$block['description'].'</td>';
 					echo '<td>
                             <select class="selectpicker show-tick form-control" name="columns['.$block['id'].']">
-                            <option value="1" '.(isset($user_block_data[$block['id']]) && $user_block_data[$block['id']]['column']==1?'selected':'').' >1</option>
-                            <option value="2" '.(isset($user_block_data[$block['id']]) && $user_block_data[$block['id']]['column']==2?'selected':'').' >2</option>
+                            <option value="1" '.(isset($user_block_data[$block['id']]) && $user_block_data[$block['id']]['column'] == 1 ? 'selected' : '').' >1</option>
+                            <option value="2" '.(isset($user_block_data[$block['id']]) && $user_block_data[$block['id']]['column'] == 2 ? 'selected' : '').' >2</option>
                             </select>
                           </td>';
 					echo '</tr>';
 				} else {
-					echo Display::tag('tr',  Display::tag('td', get_lang('Error').' '.$controller_class, array('colspan'=>'3')));
+					echo Display::tag('tr', Display::tag('td', get_lang('Error').' '.$controller_class, array('colspan'=>'3')));
 				}
 			}
 
@@ -475,10 +475,10 @@ 
 		$user_id = intval($user_id);
 		$field_variable = 'dashboard';
 		$extra_user_data = UserManager::get_extra_user_data_by_field($user_id, $field_variable);
-		$extra_user_data = explode(';',$extra_user_data[$field_variable]);
+		$extra_user_data = explode(';', $extra_user_data[$field_variable]);
 		$data = array();
 		foreach ($extra_user_data as $extra) {
-			$split_extra = explode(':',$extra);
+			$split_extra = explode(':', $extra);
 			if (!empty($split_extra)) {
 				$block_id = $split_extra[0];
 				$column = isset($split_extra[1]) ? $split_extra[1] : null;

Braces +3 added lines, -1 removed lines

@@ -380,7 +380,9 @@
 					// check if user is allowed to see the block
 					if (method_exists($obj_block, 'is_block_visible_for_user')) {
 						$is_block_visible_for_user = $obj_block->is_block_visible_for_user($user_id);
-						if (!$is_block_visible_for_user) continue;
+						if (!$is_block_visible_for_user) {
+						    continue;
+						}
 					}
 
 					echo '<tr>';

Indentation +256 added lines, -256 removed lines

@@ -249,283 +249,283 @@
         return $affected_rows;
     }
 
-	/**
-	 * Get all plugins path inside dashboard directory
-	 * @return array name plugins directories
-	 */
-	public static function getPossibleDashboardPluginsPath()
+    /**
+     * Get all plugins path inside dashboard directory
+     * @return array name plugins directories
+     */
+    public static function getPossibleDashboardPluginsPath()
     {
-		// get all plugins path inside plugin directory
-		/* We scan the plugin directory. Each folder is a potential plugin. */
-		$possiblePlugins = array();
-		$dashboard_pluginpath = api_get_path(SYS_PLUGIN_PATH).'dashboard/';
-		$handle = @opendir($dashboard_pluginpath);
-		while (false !== ($file = readdir($handle))) {
-			if ($file <> '.' AND $file <> '..' AND is_dir($dashboard_pluginpath.$file)) {
-				$possiblePlugins[] = $file;
-			}
-		}
-		@closedir($handle);
-
-		return $possiblePlugins;
-	}
-
-	/**
-	 * Get all blocks data without plugin directory
-	 * @return array Block data
-	 */
-	public static function get_block_data_without_plugin()
+        // get all plugins path inside plugin directory
+        /* We scan the plugin directory. Each folder is a potential plugin. */
+        $possiblePlugins = array();
+        $dashboard_pluginpath = api_get_path(SYS_PLUGIN_PATH).'dashboard/';
+        $handle = @opendir($dashboard_pluginpath);
+        while (false !== ($file = readdir($handle))) {
+            if ($file <> '.' AND $file <> '..' AND is_dir($dashboard_pluginpath.$file)) {
+                $possiblePlugins[] = $file;
+            }
+        }
+        @closedir($handle);
+
+        return $possiblePlugins;
+    }
+
+    /**
+     * Get all blocks data without plugin directory
+     * @return array Block data
+     */
+    public static function get_block_data_without_plugin()
     {
-		$tbl_block = Database :: get_main_table(TABLE_MAIN_BLOCK);
-		$possibleplugins = self::getPossibleDashboardPluginsPath();
-
-		// We check if plugin exists inside directory for updating active field
-		$sql = "SELECT * FROM $tbl_block";
-		$rs = Database::query($sql);
-		if (Database::num_rows($rs) > 0){
-			while ($row = Database::fetch_array($rs)) {
-				$path = $row['path'];
-				if (!in_array($row['path'],$possibleplugins)) {
-					$active = 0;
-				} else {
-					$active = 1;
-				}
-				// update active
-				$upd = "UPDATE $tbl_block SET active = '$active'
+        $tbl_block = Database :: get_main_table(TABLE_MAIN_BLOCK);
+        $possibleplugins = self::getPossibleDashboardPluginsPath();
+
+        // We check if plugin exists inside directory for updating active field
+        $sql = "SELECT * FROM $tbl_block";
+        $rs = Database::query($sql);
+        if (Database::num_rows($rs) > 0){
+            while ($row = Database::fetch_array($rs)) {
+                $path = $row['path'];
+                if (!in_array($row['path'],$possibleplugins)) {
+                    $active = 0;
+                } else {
+                    $active = 1;
+                }
+                // update active
+                $upd = "UPDATE $tbl_block SET active = '$active'
 				        WHERE path = '".$row['path']."'";
-				Database::query($upd);
-			}
-		}
-
-		// get disabled block data
-		$block_data = array();
-		$sql = "SELECT * FROM $tbl_block WHERE active = 0";
-		$rs_block = Database::query($sql);
-		if (Database::num_rows($rs_block) > 0) {
-			while ($row_block = Database::fetch_array($rs_block)) {
-				$block_data[] = $row_block;
-			}
-		}
-
-		return $block_data;
-
-	}
-
-	/**
-	 * get data about enabled dashboard block (stored insise block table)
-	 * @param  string	plugin path
-	 * @return array 	data
-	 */
-	public static function get_enabled_dashboard_blocks($path = '')
+                Database::query($upd);
+            }
+        }
+
+        // get disabled block data
+        $block_data = array();
+        $sql = "SELECT * FROM $tbl_block WHERE active = 0";
+        $rs_block = Database::query($sql);
+        if (Database::num_rows($rs_block) > 0) {
+            while ($row_block = Database::fetch_array($rs_block)) {
+                $block_data[] = $row_block;
+            }
+        }
+
+        return $block_data;
+
+    }
+
+    /**
+     * get data about enabled dashboard block (stored insise block table)
+     * @param  string	plugin path
+     * @return array 	data
+     */
+    public static function get_enabled_dashboard_blocks($path = '')
     {
-		$tbl_block = Database :: get_main_table(TABLE_MAIN_BLOCK);
-		$condition_path = '';
-		if (!empty($path)) {
-			$path = Database::escape_string($path);
-			$condition_path = ' AND path = "'.$path.'" ';
-		}
-
-		$sql = "SELECT * FROM $tbl_block WHERE active = 1 $condition_path ";
-		$rs  = Database::query($sql);
-		$block_data = array();
-		if (Database::num_rows($rs) > 0) {
-			while ($row = Database::fetch_array($rs)) {
-				$block_data[$row['path']] = $row;
-			}
-		}
-		return $block_data;
-	}
-
-	/**
-	 * display user dashboard list
-	 * @param int  User id
-	 * @return void
-	 */
-	public static function display_user_dashboard_list($user_id)
+        $tbl_block = Database :: get_main_table(TABLE_MAIN_BLOCK);
+        $condition_path = '';
+        if (!empty($path)) {
+            $path = Database::escape_string($path);
+            $condition_path = ' AND path = "'.$path.'" ';
+        }
+
+        $sql = "SELECT * FROM $tbl_block WHERE active = 1 $condition_path ";
+        $rs  = Database::query($sql);
+        $block_data = array();
+        if (Database::num_rows($rs) > 0) {
+            while ($row = Database::fetch_array($rs)) {
+                $block_data[$row['path']] = $row;
+            }
+        }
+        return $block_data;
+    }
+
+    /**
+     * display user dashboard list
+     * @param int  User id
+     * @return void
+     */
+    public static function display_user_dashboard_list($user_id)
     {
-		$enabled_dashboard_plugins = self::get_enabled_dashboard_blocks();
-		$user_block_data = self::get_user_block_data($user_id);
-
-		if (count($enabled_dashboard_plugins) > 0) {
-			echo '<div style="margin-top:20px">';
-			echo '<div><strong>'.get_lang('SelectBlockForDisplayingInsideBlocksDashboardView').'</strong></div><br />';
-			echo '<form name="dashboard_list" method="post" action="index.php?action=store_user_block">';
-			echo '<table class="data_table">';
-			echo '<tr>';
-			echo '<th width="5%">';
-			echo get_lang('Enabled');
-			echo '</th>';
-			echo '<th width="30%">';
-			echo get_lang('Name');
-			echo '</th>';
-			echo '<th width="40%">';
-			echo get_lang('Description');
-			echo '</th>';
-			echo '<th>';
-			echo get_lang('ColumnPosition');
-			echo '</th>';
-			echo '</tr>';
-
-			// We display all enabled plugins and the checkboxes
-			foreach ($enabled_dashboard_plugins as $block) {
-
-				$path = $block['path'];
-				$controller_class = $block['controller'];
-				$filename_controller = $path.'.class.php';
-				$dashboard_plugin_path = api_get_path(SYS_PLUGIN_PATH).'dashboard/'.$path.'/';
-				require_once $dashboard_plugin_path.$filename_controller;
-				if (class_exists($controller_class)) {
-					$obj_block = new $controller_class($user_id);
-
-					// check if user is allowed to see the block
-					if (method_exists($obj_block, 'is_block_visible_for_user')) {
-						$is_block_visible_for_user = $obj_block->is_block_visible_for_user($user_id);
-						if (!$is_block_visible_for_user) continue;
-					}
-
-					echo '<tr>';
-					// checkboxes
-					self::display_user_dashboard_list_checkboxes($user_id, $block['id']);
-					echo '<td>'.$block['name'].'</td>';
-					echo '<td>'.$block['description'].'</td>';
-					echo '<td>
+        $enabled_dashboard_plugins = self::get_enabled_dashboard_blocks();
+        $user_block_data = self::get_user_block_data($user_id);
+
+        if (count($enabled_dashboard_plugins) > 0) {
+            echo '<div style="margin-top:20px">';
+            echo '<div><strong>'.get_lang('SelectBlockForDisplayingInsideBlocksDashboardView').'</strong></div><br />';
+            echo '<form name="dashboard_list" method="post" action="index.php?action=store_user_block">';
+            echo '<table class="data_table">';
+            echo '<tr>';
+            echo '<th width="5%">';
+            echo get_lang('Enabled');
+            echo '</th>';
+            echo '<th width="30%">';
+            echo get_lang('Name');
+            echo '</th>';
+            echo '<th width="40%">';
+            echo get_lang('Description');
+            echo '</th>';
+            echo '<th>';
+            echo get_lang('ColumnPosition');
+            echo '</th>';
+            echo '</tr>';
+
+            // We display all enabled plugins and the checkboxes
+            foreach ($enabled_dashboard_plugins as $block) {
+
+                $path = $block['path'];
+                $controller_class = $block['controller'];
+                $filename_controller = $path.'.class.php';
+                $dashboard_plugin_path = api_get_path(SYS_PLUGIN_PATH).'dashboard/'.$path.'/';
+                require_once $dashboard_plugin_path.$filename_controller;
+                if (class_exists($controller_class)) {
+                    $obj_block = new $controller_class($user_id);
+
+                    // check if user is allowed to see the block
+                    if (method_exists($obj_block, 'is_block_visible_for_user')) {
+                        $is_block_visible_for_user = $obj_block->is_block_visible_for_user($user_id);
+                        if (!$is_block_visible_for_user) continue;
+                    }
+
+                    echo '<tr>';
+                    // checkboxes
+                    self::display_user_dashboard_list_checkboxes($user_id, $block['id']);
+                    echo '<td>'.$block['name'].'</td>';
+                    echo '<td>'.$block['description'].'</td>';
+                    echo '<td>
                             <select class="selectpicker show-tick form-control" name="columns['.$block['id'].']">
                             <option value="1" '.(isset($user_block_data[$block['id']]) && $user_block_data[$block['id']]['column']==1?'selected':'').' >1</option>
                             <option value="2" '.(isset($user_block_data[$block['id']]) && $user_block_data[$block['id']]['column']==2?'selected':'').' >2</option>
                             </select>
                           </td>';
-					echo '</tr>';
-				} else {
-					echo Display::tag('tr',  Display::tag('td', get_lang('Error').' '.$controller_class, array('colspan'=>'3')));
-				}
-			}
-
-			echo '</table>';
-			echo '<div class="row"><div class="col-md-12">';
-			echo '<button class="btn btn-default" type="submit" name="submit_dashboard_list" value="'.get_lang('EnableDashboardBlock').'"><em class="fa fa-check-square"></em> '.
+                    echo '</tr>';
+                } else {
+                    echo Display::tag('tr',  Display::tag('td', get_lang('Error').' '.$controller_class, array('colspan'=>'3')));
+                }
+            }
+
+            echo '</table>';
+            echo '<div class="row"><div class="col-md-12">';
+            echo '<button class="btn btn-default" type="submit" name="submit_dashboard_list" value="'.get_lang('EnableDashboardBlock').'"><em class="fa fa-check-square"></em> '.
                 get_lang('EnableDashboardBlock').'</button></form>';
-			echo '</div></div>';
-		} else {
-			echo '<div style="margin-top:20px">'.get_lang('ThereAreNoEnabledDashboardPlugins').'</div>';
-			if (api_is_platform_admin()) {
-				echo '<a class="btn btn-default" href="'.api_get_path(WEB_CODE_PATH).'admin/settings.php?category=Plugins">'.
+            echo '</div></div>';
+        } else {
+            echo '<div style="margin-top:20px">'.get_lang('ThereAreNoEnabledDashboardPlugins').'</div>';
+            if (api_is_platform_admin()) {
+                echo '<a class="btn btn-default" href="'.api_get_path(WEB_CODE_PATH).'admin/settings.php?category=Plugins">'.
                     get_lang('ConfigureDashboardPlugin').'</a>';
-			}
-		}
-	}
-
-	/**
-	 * display checkboxes for user dashboard list
-	 * @param int 	User id
-	 * @param int	Block id
-	 * @return void
-	 */
-	public static function display_user_dashboard_list_checkboxes($user_id, $block_id) {
-
-		$user_id = intval($user_id);
-		$user_block_data = self::get_user_block_data($user_id);
-		$enabled_blocks_id = array_keys($user_block_data);
-
-		$checked = '';
-		if (in_array($block_id, $enabled_blocks_id)) {
-			$checked = "checked";
-		}
-
-		echo "<td align=\"center\">";
-		echo '<input type="checkbox" name="enabled_blocks['.$block_id.']" value="true" '.$checked.'/>';
-		echo "</td>";
-	}
-
-	/**
-	 * This function store enabled blocks id with its column position (block_id1:colum;block_id2:colum; ...) inside extra user fields
-	 * @param int User id
-	 * @param array selected blocks
-	 * @param array columns position
-	 * @return bool
-	 */
-	public static function store_user_blocks($user_id, $enabled_blocks, $columns) {
-		$selected_blocks_id  = array();
-		if (is_array($enabled_blocks) && count($enabled_blocks) > 0) {
-			$selected_blocks_id = array_keys($enabled_blocks);
-		}
-
-		// build data for storing inside extra user field
-		$fname = 'dashboard';
-		$fvalue = array();
-		foreach ($selected_blocks_id as $block_id) {
-			$fvalue[] = $block_id.':'.$columns[$block_id];
-		}
+            }
+        }
+    }
+
+    /**
+     * display checkboxes for user dashboard list
+     * @param int 	User id
+     * @param int	Block id
+     * @return void
+     */
+    public static function display_user_dashboard_list_checkboxes($user_id, $block_id) {
+
+        $user_id = intval($user_id);
+        $user_block_data = self::get_user_block_data($user_id);
+        $enabled_blocks_id = array_keys($user_block_data);
+
+        $checked = '';
+        if (in_array($block_id, $enabled_blocks_id)) {
+            $checked = "checked";
+        }
+
+        echo "<td align=\"center\">";
+        echo '<input type="checkbox" name="enabled_blocks['.$block_id.']" value="true" '.$checked.'/>';
+        echo "</td>";
+    }
+
+    /**
+     * This function store enabled blocks id with its column position (block_id1:colum;block_id2:colum; ...) inside extra user fields
+     * @param int User id
+     * @param array selected blocks
+     * @param array columns position
+     * @return bool
+     */
+    public static function store_user_blocks($user_id, $enabled_blocks, $columns) {
+        $selected_blocks_id  = array();
+        if (is_array($enabled_blocks) && count($enabled_blocks) > 0) {
+            $selected_blocks_id = array_keys($enabled_blocks);
+        }
+
+        // build data for storing inside extra user field
+        $fname = 'dashboard';
+        $fvalue = array();
+        foreach ($selected_blocks_id as $block_id) {
+            $fvalue[] = $block_id.':'.$columns[$block_id];
+        }
         $upd_extra_field = UserManager::update_extra_field_value(
             $user_id,
             $fname,
             $fvalue
         );
 
-		return $upd_extra_field;
+        return $upd_extra_field;
 
-	}
+    }
 
-	/**
-	 * This function get user block data (block id with its number of column) from extra user data
-	 * @param int  		User id
-	 * @return array  	data (block_id,column)
-	 */
-	public static function get_user_block_data($user_id)
+    /**
+     * This function get user block data (block id with its number of column) from extra user data
+     * @param int  		User id
+     * @return array  	data (block_id,column)
+     */
+    public static function get_user_block_data($user_id)
     {
-		$user_id = intval($user_id);
-		$field_variable = 'dashboard';
-		$extra_user_data = UserManager::get_extra_user_data_by_field($user_id, $field_variable);
-		$extra_user_data = explode(';',$extra_user_data[$field_variable]);
-		$data = array();
-		foreach ($extra_user_data as $extra) {
-			$split_extra = explode(':',$extra);
-			if (!empty($split_extra)) {
-				$block_id = $split_extra[0];
-				$column = isset($split_extra[1]) ? $split_extra[1] : null;
-				$data[$block_id] = array('block_id' => $block_id, 'column' => $column);
-			}
-		}
-
-		return $data;
-	}
-
-	/**
-	 * This function update extra user blocks data after closing a dashboard block
-	 * @param int 		User id
-	 * @param string	plugin path
-	 * @param integer $user_id
-	 * @return bool
-	 */
-	public static function close_user_block($user_id, $path)
+        $user_id = intval($user_id);
+        $field_variable = 'dashboard';
+        $extra_user_data = UserManager::get_extra_user_data_by_field($user_id, $field_variable);
+        $extra_user_data = explode(';',$extra_user_data[$field_variable]);
+        $data = array();
+        foreach ($extra_user_data as $extra) {
+            $split_extra = explode(':',$extra);
+            if (!empty($split_extra)) {
+                $block_id = $split_extra[0];
+                $column = isset($split_extra[1]) ? $split_extra[1] : null;
+                $data[$block_id] = array('block_id' => $block_id, 'column' => $column);
+            }
+        }
+
+        return $data;
+    }
+
+    /**
+     * This function update extra user blocks data after closing a dashboard block
+     * @param int 		User id
+     * @param string	plugin path
+     * @param integer $user_id
+     * @return bool
+     */
+    public static function close_user_block($user_id, $path)
     {
-		$enabled_dashboard_blocks = self::get_enabled_dashboard_blocks($path);
-		$user_block_data = self::get_user_block_data($user_id);
-
-		foreach ($enabled_dashboard_blocks as $enabled_block) {
-			unset($user_block_data[$enabled_block['id']]);
-		}
-
-		// get columns and blocks id for updating extra user data
-		$columns = array();
-		$user_blocks_id = array();
-		foreach ($user_block_data as $data) {
-			$user_blocks_id[$data['block_id']] = true;
-			$columns[$data['block_id']] = $data['column'];
-		}
-
-		// update extra user blocks data
-		$upd_extra_field = self::store_user_blocks($user_id, $user_blocks_id, $columns);
-
-		return $upd_extra_field;
-	}
-
-	/**
-	 * get links for styles from dashboard plugins
-	 * @return string   links
-	 */
-	public static function get_links_for_styles_from_dashboard_plugins() {
-
-		return '<link rel="stylesheet" href="'.api_get_path(WEB_PLUGIN_PATH).'dashboard/css/default.css" type="text/css" />'.PHP_EOL;
-	}
+        $enabled_dashboard_blocks = self::get_enabled_dashboard_blocks($path);
+        $user_block_data = self::get_user_block_data($user_id);
+
+        foreach ($enabled_dashboard_blocks as $enabled_block) {
+            unset($user_block_data[$enabled_block['id']]);
+        }
+
+        // get columns and blocks id for updating extra user data
+        $columns = array();
+        $user_blocks_id = array();
+        foreach ($user_block_data as $data) {
+            $user_blocks_id[$data['block_id']] = true;
+            $columns[$data['block_id']] = $data['column'];
+        }
+
+        // update extra user blocks data
+        $upd_extra_field = self::store_user_blocks($user_id, $user_blocks_id, $columns);
+
+        return $upd_extra_field;
+    }
+
+    /**
+     * get links for styles from dashboard plugins
+     * @return string   links
+     */
+    public static function get_links_for_styles_from_dashboard_plugins() {
+
+        return '<link rel="stylesheet" href="'.api_get_path(WEB_PLUGIN_PATH).'dashboard/css/default.css" type="text/css" />'.PHP_EOL;
+    }
 
 }

main/inc/lib/events_email.class.php

Spacing +14 added lines, -14 removed lines

@@ -124,7 +124,7 @@ 
 
                 // If the mail only need to be send once (we know that thanks to the events.conf), we log it in the table
                 if ($event_config[$event_name]["sending_mail_once"]) {
-                    $sql = 'INSERT INTO ' . Database::get_main_table(TABLE_EVENT_SENT) . ' (user_from, user_to, event_type_name)
+                    $sql = 'INSERT INTO '.Database::get_main_table(TABLE_EVENT_SENT).' (user_from, user_to, event_type_name)
                             VALUES ('.$event_data["user_id"].', '.$id.' ,"'.Database::escape_string($event_name).'")
                     ';
                     Database::query($sql);
@@ -135,9 +135,9 @@ 
         // Second, we send to people linked to the event
         // So, we get everyone
         $sql = 'SELECT u.user_id, u.language, u.email, u.firstname, u.lastname
-                FROM ' . Database::get_main_table(TABLE_EVENT_TYPE_REL_USER) . ' ue
+                FROM ' . Database::get_main_table(TABLE_EVENT_TYPE_REL_USER).' ue
                 INNER JOIN '.Database::get_main_table(TABLE_MAIN_USER).' u ON u.user_id = ue.user_id
-                WHERE event_type_name = "' . $event_name . '"';
+                WHERE event_type_name = "' . $event_name.'"';
         $result = Database::store_result(Database::query($sql), 'ASSOC');
         // for each of the linked users
         foreach ($result as $key => $value) {
@@ -177,7 +177,7 @@ 
 
             // If the mail only need to be send once (we know that thanks to the events.conf, we log it in the table
             if ($event_config[$event_name]["sending_mail_once"]) {
-                $sql = 'INSERT INTO ' . Database::get_main_table(TABLE_EVENT_SENT) . '
+                $sql = 'INSERT INTO '.Database::get_main_table(TABLE_EVENT_SENT).'
                     (user_from, user_to, event_type_name)
                     VALUES ('.$event_data["user_id"].', '.$value["user_id"].' , "'.Database::escape_string($event_name).'");
                     ';
@@ -202,16 +202,16 @@ 
         $current_language = api_get_interface_language();
 
         $sql = 'SELECT COUNT(*) as total
-                FROM ' . Database::get_main_table(TABLE_EVENT_EMAIL_TEMPLATE) . ' em
-                INNER JOIN ' . Database::get_main_table(TABLE_MAIN_LANGUAGE) . ' l
+                FROM ' . Database::get_main_table(TABLE_EVENT_EMAIL_TEMPLATE).' em
+                INNER JOIN ' . Database::get_main_table(TABLE_MAIN_LANGUAGE).' l
                 ON em.language_id = l.id
                 WHERE
-                    em.event_type_name = "' . $event_name . '" and
+                    em.event_type_name = "' . $event_name.'" and
                     l.dokeos_folder = "'.$current_language.'" and
                     em.activated = 1';
 
         $exists = Database::store_result(Database::query($sql), 'ASSOC');
-        if ($exists[0]["total"])  {
+        if ($exists[0]["total"]) {
             return true;
         } else {
             return false;
@@ -228,12 +228,12 @@ 
     private static function getMessage($event_name, $language)
     {
         $sql = 'SELECT message, subject, l.dokeos_folder
-                FROM ' . Database::get_main_table(TABLE_EVENT_EMAIL_TEMPLATE) . ' em
-                INNER JOIN ' . Database::get_main_table(TABLE_MAIN_LANGUAGE) . ' l
+                FROM ' . Database::get_main_table(TABLE_EVENT_EMAIL_TEMPLATE).' em
+                INNER JOIN ' . Database::get_main_table(TABLE_MAIN_LANGUAGE).' l
                 ON em.language_id = l.id
                 WHERE
-                    em.event_type_name = "' . $event_name . '" AND
-                    (l.dokeos_folder = "' . $language . '" OR l.dokeos_folder = "english") AND
+                    em.event_type_name = "' . $event_name.'" AND
+                    (l.dokeos_folder = "' . $language.'" OR l.dokeos_folder = "english") AND
                     em.message <> ""
                 ';
         return Database::store_result(Database::query($sql), 'ASSOC');
@@ -274,8 +274,8 @@ 
     private static function formatMessage(&$message, &$subject, $event_config, $event_name, &$event_data)
     {
         foreach ($event_config[$event_name]["available_keyvars"] as $key => $word) {
-            $message = str_replace('((' . $key . '))', $event_data[$word], $message);
-            $subject = str_replace('((' . $key . '))', $event_data[$word], $subject);
+            $message = str_replace('(('.$key.'))', $event_data[$word], $message);
+            $subject = str_replace('(('.$key.'))', $event_data[$word], $subject);
         }
     }
 }

main/inc/lib/event_email_template.class.php

Indentation +11 added lines, -11 removed lines

@@ -12,10 +12,10 @@ 
     /**
      * Constructor
      */
-	public function __construct()
+    public function __construct()
     {
         $this->table =  Database::get_main_table(TABLE_EVENT_EMAIL_TEMPLATE);
-	}
+    }
 
     public function get_all($where_conditions = array())
     {
@@ -29,19 +29,19 @@ 
     /**
      * Displays the title + grid
      */
-	public function display()
+    public function display()
     {
-		// action links
-		$content = Display::actions(array(
+        // action links
+        $content = Display::actions(array(
                 array(
                     'url' => 'event_type.php' ,
                     'content' => Display::return_icon('new_document.png', get_lang('Add'), array(), ICON_SIZE_MEDIUM)
-                 )
+                    )
             )
         );
         $content .= Display::grid_html('event_email_template');
         return $content;
-	}
+    }
 
     public function get_status_list()
     {
@@ -82,7 +82,7 @@ 
                 'Height' => '250',
             )
         );
-	    $status_list = $this->get_status_list();
+        $status_list = $this->get_status_list();
         $form->addElement('select', 'status', get_lang('Status'), $status_list);
         if ($action == 'edit') {
             $form->addElement('text', 'created_at', get_lang('CreatedAt'));
@@ -99,17 +99,17 @@ 
         $defaults = $this->get($id);
 
         if (!empty($defaults['created_at'])) {
-        	$defaults['created_at'] = api_convert_and_format_date($defaults['created_at']);
+            $defaults['created_at'] = api_convert_and_format_date($defaults['created_at']);
         }
         if (!empty($defaults['updated_at'])) {
-        	$defaults['updated_at'] = api_convert_and_format_date($defaults['updated_at']);
+            $defaults['updated_at'] = api_convert_and_format_date($defaults['updated_at']);
         }
         $form->setDefaults($defaults);
 
         // Setting the rules
         $form->addRule('name', get_lang('ThisFieldIsRequired'), 'required');
 
-		return $form;
+        return $form;
     }
 
     public function get_count()

Doc Comments +1 added lines, -1 removed lines

@@ -84,7 +84,7 @@
 
     /**
      * Available driver list.
-     * @return array
+     * @return string[]
      */
     private function getDefaultDriverList()
     {

Spacing +3 added lines, -3 removed lines

@@ -14,7 +14,7 @@ 
      */
 	public function __construct()
     {
-        $this->table =  Database::get_main_table(TABLE_EVENT_EMAIL_TEMPLATE);
+        $this->table = Database::get_main_table(TABLE_EVENT_EMAIL_TEMPLATE);
 	}
 
     /**
@@ -38,7 +38,7 @@ 
 		// action links
 		$content = Display::actions(array(
                 array(
-                    'url' => 'event_type.php' ,
+                    'url' => 'event_type.php',
                     'content' => Display::return_icon('new_document.png', get_lang('Add'), array(), ICON_SIZE_MEDIUM)
                  )
             )
@@ -121,7 +121,7 @@ 
 
     public function get_count()
     {
-        $row = Database::select('count(*) as count', $this->table, array(),'first');
+        $row = Database::select('count(*) as count', $this->table, array(), 'first');
 
         return $row['count'];
     }

main/inc/lib/access_url_edit_users_to_url_functions.lib.php

Spacing +4 added lines, -4 removed lines

@@ -43,22 +43,22 @@
                    ' WHERE (username LIKE "'.$needle.'%" '.
                    ' OR firstname LIKE "'.$needle.'%" '.
                    ' OR lastname LIKE "'.$needle.'%") '.
-                    $order_clause .
+                    $order_clause.
                    ' LIMIT 11';
 
             $rs = Database::query($sql);
-            $i=0;
+            $i = 0;
 
             while ($user = Database :: fetch_array($rs)) {
                 $i++;
-                if ($i<=10) {
+                if ($i <= 10) {
                     $return .= '<a href="javascript: void(0);" onclick="javascript: add_user_to_url(\''.addslashes($user['user_id']).'\',\''.api_get_person_name(addslashes($user['firstname']), addslashes($user['lastname'])).' ('.addslashes($user['username']).')'.'\')">'.api_get_person_name($user['firstname'], $user['lastname']).' ('.$user['username'].')</a><br />';
                 } else {
                     $return .= '...<br />';
                 }
             }
         }
-        $xajax_response -> addAssign('ajax_list_users','innerHTML',api_utf8_encode($return));
+        $xajax_response -> addAssign('ajax_list_users', 'innerHTML', api_utf8_encode($return));
         return $xajax_response;
     }
 }

Indentation +4 added lines, -4 removed lines

@@ -40,11 +40,11 @@
             // search users where username or firstname or lastname begins likes $needle
             $order_clause = api_sort_by_first_name() ? ' ORDER BY firstname, lastname, username' : ' ORDER BY lastname, firstname, username';
             $sql = 'SELECT u.user_id, username, lastname, firstname FROM '.$tbl_user.' u '.
-                   ' WHERE (username LIKE "'.$needle.'%" '.
-                   ' OR firstname LIKE "'.$needle.'%" '.
-                   ' OR lastname LIKE "'.$needle.'%") '.
+                    ' WHERE (username LIKE "'.$needle.'%" '.
+                    ' OR firstname LIKE "'.$needle.'%" '.
+                    ' OR lastname LIKE "'.$needle.'%") '.
                     $order_clause .
-                   ' LIMIT 11';
+                    ' LIMIT 11';
 
             $rs = Database::query($sql);
             $i=0;

main/inc/lib/nusoap/class.soap_parser.php

Spacing +76 added lines, -76 removed lines

@@ -18,7 +18,7 @@ 
 	var $root_struct_name = '';

 	var $root_struct_namespace = '';

 	var $root_header = '';

-    var $document = '';			// incoming SOAP body (text)

+    var $document = ''; // incoming SOAP body (text)

 	// determines where in the message we are (envelope,header,body,method)

 	var $status = '';

 	var $position = 0;

@@ -33,9 +33,9 @@ 
 	var $fault_detail = '';

 	var $depth_array = array();

 	var $debug_flag = true;

-	var $soapresponse = NULL;	// parsed SOAP Body

-	var $soapheader = NULL;		// parsed SOAP Header

-	var $responseHeaders = '';	// incoming SOAP headers (text)

+	var $soapresponse = NULL; // parsed SOAP Body

+	var $soapheader = NULL; // parsed SOAP Header

+	var $responseHeaders = ''; // incoming SOAP headers (text)

 	var $body_position = 0;

 	// for multiref parsing:

 	// array of id => pos

@@ -54,7 +54,7 @@ 
 	* @param    string $decode_utf8 whether to decode UTF-8 to ISO-8859-1

 	* @access   public

 	*/

-	function nusoap_parser($xml,$encoding='UTF-8',$method='',$decode_utf8=true){

+	function nusoap_parser($xml, $encoding = 'UTF-8', $method = '', $decode_utf8 = true) {

 		parent::nusoap_base();

 		$this->xml = $xml;

 		$this->xml_encoding = $encoding;

@@ -62,7 +62,7 @@ 
 		$this->decode_utf8 = $decode_utf8;

 

 		// Check whether content has been read.

-		if(!empty($this->xml)){

+		if (!empty($this->xml)) {

 			// Check XML encoding

 			$pos_xml = strpos($xml, '<?xml');

 			if ($pos_xml !== FALSE) {

@@ -70,7 +70,7 @@ 
 				if (preg_match("/encoding=[\"']([^\"']*)[\"']/", $xml_decl, $res)) {

 					$xml_encoding = $res[1];

 					if (strtoupper($xml_encoding) != $encoding) {

-						$err = "Charset from HTTP Content-Type '" . $encoding . "' does not match encoding from XML declaration '" . $xml_encoding . "'";

+						$err = "Charset from HTTP Content-Type '".$encoding."' does not match encoding from XML declaration '".$xml_encoding."'";

 						$this->debug($err);

 						if ($encoding != 'ISO-8859-1' || strtoupper($xml_encoding) != 'UTF-8') {

 							$this->setError($err);

@@ -96,8 +96,8 @@ 
 			// Set the object for the parser.

 			xml_set_object($this->parser, $this);

 			// Set the element handlers for the parser.

-			xml_set_element_handler($this->parser, 'start_element','end_element');

-			xml_set_character_data_handler($this->parser,'character_data');

+			xml_set_element_handler($this->parser, 'start_element', 'end_element');

+			xml_set_character_data_handler($this->parser, 'character_data');

 

 			xml_parse($this->parser, $this->xml);

 

@@ -109,7 +109,7 @@ 
 			    xml_get_current_line_number($this->parser),

 			    xml_error_string(xml_get_error_code($this->parser)));

 				$this->debug($err);

-				$this->debug("XML payload:\n" . $xml);

+				$this->debug("XML payload:\n".$xml);

 				$this->setError($err);

 			} else {

 				$this->debug('in nusoap_parser ctor, message:');

@@ -118,18 +118,18 @@ 
 				// get final value

 				$this->soapresponse = $this->message[$this->root_struct]['result'];

 				// get header value

-				if($this->root_header != '' && isset($this->message[$this->root_header]['result'])){

+				if ($this->root_header != '' && isset($this->message[$this->root_header]['result'])) {

 					$this->soapheader = $this->message[$this->root_header]['result'];

 				}

 				// resolve hrefs/ids

-				if(sizeof($this->multirefs) > 0){

-					foreach($this->multirefs as $id => $hrefs){

+				if (sizeof($this->multirefs) > 0) {

+					foreach ($this->multirefs as $id => $hrefs) {

 						$this->debug('resolving multirefs for id: '.$id);

 						$idVal = $this->buildVal($this->ids[$id]);

 						if (is_array($idVal) && isset($idVal['!id'])) {

 							unset($idVal['!id']);

 						}

-						foreach($hrefs as $refPos => $ref){

+						foreach ($hrefs as $refPos => $ref) {

 							$this->debug('resolving href at pos '.$refPos);

 							$this->multirefs[$id][$refPos] = $idVal;

 						}

@@ -157,13 +157,13 @@ 
 		// update class level pos

 		$pos = $this->position++;

 		// and set mine

-		$this->message[$pos] = array('pos' => $pos,'children'=>'','cdata'=>'');

+		$this->message[$pos] = array('pos' => $pos, 'children'=>'', 'cdata'=>'');

 		// depth = how many levels removed from root?

 		// set mine as current global depth and increment global depth value

 		$this->message[$pos]['depth'] = $this->depth++;

 

 		// else add self as child to whoever the current parent is

-		if($pos != 0){

+		if ($pos != 0) {

 			$this->message[$this->parent]['children'] .= '|'.$pos;

 		}

 		// set my parent

@@ -173,11 +173,11 @@ 
 		// set self as current value for this depth

 		$this->depth_array[$this->depth] = $pos;

 		// get element prefix

-		if(strpos($name,':')){

+		if (strpos($name, ':')) {

 			// get ns prefix

-			$prefix = substr($name,0,strpos($name,':'));

+			$prefix = substr($name, 0, strpos($name, ':'));

 			// get unqualified name

-			$name = substr(strstr($name,':'),1);

+			$name = substr(strstr($name, ':'), 1);

 		}

 		// set status

 		if ($name == 'Envelope' && $this->status == '') {

@@ -185,11 +185,11 @@ 
 		} elseif ($name == 'Header' && $this->status == 'envelope') {

 			$this->root_header = $pos;

 			$this->status = 'header';

-		} elseif ($name == 'Body' && $this->status == 'envelope'){

+		} elseif ($name == 'Body' && $this->status == 'envelope') {

 			$this->status = 'body';

 			$this->body_position = $pos;

 		// set method

-		} elseif($this->status == 'body' && $pos == ($this->body_position+1)) {

+		} elseif ($this->status == 'body' && $pos == ($this->body_position + 1)) {

 			$this->status = 'method';

 			$this->root_struct_name = $name;

 			$this->root_struct = $pos;

@@ -205,23 +205,23 @@ 
 

 		// loop through atts, logging ns and type declarations

         $attstr = '';

-		foreach($attrs as $key => $value){

+		foreach ($attrs as $key => $value) {

         	$key_prefix = $this->getPrefix($key);

 			$key_localpart = $this->getLocalPart($key);

 			// if ns declarations, add to class level array of valid namespaces

-            if($key_prefix == 'xmlns'){

-				if(preg_match('/^http:\/\/www.w3.org\/[0-9]{4}\/XMLSchema$/',$value)){

+            if ($key_prefix == 'xmlns') {

+				if (preg_match('/^http:\/\/www.w3.org\/[0-9]{4}\/XMLSchema$/', $value)) {

 					$this->XMLSchemaVersion = $value;

 					$this->namespaces['xsd'] = $this->XMLSchemaVersion;

 					$this->namespaces['xsi'] = $this->XMLSchemaVersion.'-instance';

 				}

                 $this->namespaces[$key_localpart] = $value;

 				// set method namespace

-				if($name == $this->root_struct_name){

+				if ($name == $this->root_struct_name) {

 					$this->methodNamespace = $value;

 				}

 			// if it's a type declaration, set type

-        } elseif($key_localpart == 'type'){

+        } elseif ($key_localpart == 'type') {

         		if (isset($this->message[$pos]['type']) && $this->message[$pos]['type'] == 'array') {

         			// do nothing: already processed arrayType

         		} else {

@@ -229,14 +229,14 @@ 
 	                $value_localpart = $this->getLocalPart($value);

 					$this->message[$pos]['type'] = $value_localpart;

 					$this->message[$pos]['typePrefix'] = $value_prefix;

-	                if(isset($this->namespaces[$value_prefix])){

+	                if (isset($this->namespaces[$value_prefix])) {

 	                	$this->message[$pos]['type_namespace'] = $this->namespaces[$value_prefix];

-	                } else if(isset($attrs['xmlns:'.$value_prefix])) {

+	                } else if (isset($attrs['xmlns:'.$value_prefix])) {

 						$this->message[$pos]['type_namespace'] = $attrs['xmlns:'.$value_prefix];

 	                }

 					// should do something here with the namespace of specified type?

 				}

-			} elseif($key_localpart == 'arrayType'){

+			} elseif ($key_localpart == 'arrayType') {

 				$this->message[$pos]['type'] = 'array';

 				/* do arrayType ereg here

 				[1]    arrayTypeValue    ::=    atype asize

@@ -247,7 +247,7 @@ 
 				[6]    nextDimension    ::=    Digit+ ','

 				*/

 				$expr = '/([A-Za-z0-9_]+):([A-Za-z]+[A-Za-z0-9_]+)\[([0-9]+),?([0-9]*)\]/';

-				if(preg_match($expr,$value,$regs)){

+				if (preg_match($expr, $value, $regs)) {

 					$this->message[$pos]['typePrefix'] = $regs[1];

 					$this->message[$pos]['arrayTypePrefix'] = $regs[1];

 	                if (isset($this->namespaces[$regs[1]])) {

@@ -260,22 +260,22 @@ 
 					$this->message[$pos]['arrayCols'] = $regs[4];

 				}

 			// specifies nil value (or not)

-			} elseif ($key_localpart == 'nil'){

+			} elseif ($key_localpart == 'nil') {

 				$this->message[$pos]['nil'] = ($value == 'true' || $value == '1');

 			// some other attribute

 			} elseif ($key != 'href' && $key != 'xmlns' && $key_localpart != 'encodingStyle' && $key_localpart != 'root') {

-				$this->message[$pos]['xattrs']['!' . $key] = $value;

+				$this->message[$pos]['xattrs']['!'.$key] = $value;

 			}

 

 			if ($key == 'xmlns') {

 				$this->default_namespace = $value;

 			}

 			// log id

-			if($key == 'id'){

+			if ($key == 'id') {

 				$this->ids[$value] = $pos;

 			}

 			// root

-			if($key_localpart == 'root' && $value == 1){

+			if ($key_localpart == 'root' && $value == 1) {

 				$this->status = 'method';

 				$this->root_struct_name = $name;

 				$this->root_struct = $pos;

@@ -285,18 +285,18 @@ 
             $attstr .= " $key=\"$value\"";

 		}

         // get namespace - must be done after namespace atts are processed

-		if(isset($prefix)){

+		if (isset($prefix)) {

 			$this->message[$pos]['namespace'] = $this->namespaces[$prefix];

 			$this->default_namespace = $this->namespaces[$prefix];

 		} else {

 			$this->message[$pos]['namespace'] = $this->default_namespace;

 		}

-        if($this->status == 'header'){

+        if ($this->status == 'header') {

         	if ($this->root_header != $pos) {

-	        	$this->responseHeaders .= "<" . (isset($prefix) ? $prefix . ':' : '') . "$name$attstr>";

+	        	$this->responseHeaders .= "<".(isset($prefix) ? $prefix.':' : '')."$name$attstr>";

 	        }

-        } elseif($this->root_struct_name != ''){

-        	$this->document .= "<" . (isset($prefix) ? $prefix . ':' : '') . "$name$attstr>";

+        } elseif ($this->root_struct_name != '') {

+        	$this->document .= "<".(isset($prefix) ? $prefix.':' : '')."$name$attstr>";

         }

 	}

 

@@ -312,27 +312,27 @@ 
 		$pos = $this->depth_array[$this->depth--];

 

         // get element prefix

-		if(strpos($name,':')){

+		if (strpos($name, ':')) {

 			// get ns prefix

-			$prefix = substr($name,0,strpos($name,':'));

+			$prefix = substr($name, 0, strpos($name, ':'));

 			// get unqualified name

-			$name = substr(strstr($name,':'),1);

+			$name = substr(strstr($name, ':'), 1);

 		}

 		

 		// build to native type

-		if(isset($this->body_position) && $pos > $this->body_position){

+		if (isset($this->body_position) && $pos > $this->body_position) {

 			// deal w/ multirefs

-			if(isset($this->message[$pos]['attrs']['href'])){

+			if (isset($this->message[$pos]['attrs']['href'])) {

 				// get id

-				$id = substr($this->message[$pos]['attrs']['href'],1);

+				$id = substr($this->message[$pos]['attrs']['href'], 1);

 				// add placeholder to href array

 				$this->multirefs[$id][$pos] = 'placeholder';

 				// add set a reference to it as the result value

-				$this->message[$pos]['result'] =& $this->multirefs[$id][$pos];

+				$this->message[$pos]['result'] = & $this->multirefs[$id][$pos];

             // build complexType values

-			} elseif($this->message[$pos]['children'] != ''){

+			} elseif ($this->message[$pos]['children'] != '') {

 				// if result has already been generated (struct/array)

-				if(!isset($this->message[$pos]['result'])){

+				if (!isset($this->message[$pos]['result'])) {

 					$this->message[$pos]['result'] = $this->buildVal($pos);

 				}

 			// build complexType values of attributes and possibly simpleContent

@@ -382,15 +382,15 @@ 
 		}

 		

         // for doclit

-        if($this->status == 'header'){

+        if ($this->status == 'header') {

         	if ($this->root_header != $pos) {

-	        	$this->responseHeaders .= "</" . (isset($prefix) ? $prefix . ':' : '') . "$name>";

+	        	$this->responseHeaders .= "</".(isset($prefix) ? $prefix.':' : '')."$name>";

 	        }

-        } elseif($pos >= $this->root_struct){

-        	$this->document .= "</" . (isset($prefix) ? $prefix . ':' : '') . "$name>";

+        } elseif ($pos >= $this->root_struct) {

+        	$this->document .= "</".(isset($prefix) ? $prefix.':' : '')."$name>";

         }

 		// switch status

-		if ($pos == $this->root_struct){

+		if ($pos == $this->root_struct) {

 			$this->status = 'body';

 			$this->root_struct_namespace = $this->message[$pos]['namespace'];

 		} elseif ($pos == $this->root_header) {

@@ -416,17 +416,17 @@ 
 	function character_data($parser, $data)

     {

 		$pos = $this->depth_array[$this->depth];

-		if ($this->xml_encoding == 'UTF-8'){

+		if ($this->xml_encoding == 'UTF-8') {

 			// TODO: add an option to disable this for folks who want

 			// raw UTF-8 that, e.g., might not map to iso-8859-1

 			// TODO: this can also be handled with xml_parser_set_option($this->parser, XML_OPTION_TARGET_ENCODING, "ISO-8859-1");

-			if($this->decode_utf8){

+			if ($this->decode_utf8) {

 				$data = utf8_decode($data);

 			}

 		}

         $this->message[$pos]['cdata'] .= $data;

         // for doclit

-        if($this->status == 'header'){

+        if ($this->status == 'header') {

         	$this->responseHeaders .= $data;

         } else {

         	$this->document .= $data;

@@ -440,7 +440,7 @@ 
 	* @access   public

 	* @deprecated	use get_soapbody instead

 	*/

-	function get_response(){

+	function get_response() {

 		return $this->soapresponse;

 	}

 

@@ -450,7 +450,7 @@ 
 	* @return	mixed

 	* @access   public

 	*/

-	function get_soapbody(){

+	function get_soapbody() {

 		return $this->soapresponse;

 	}

 

@@ -460,7 +460,7 @@ 
 	* @return	mixed

 	* @access   public

 	*/

-	function get_soapheader(){

+	function get_soapheader() {

 		return $this->soapheader;

 	}

 

@@ -470,7 +470,7 @@ 
 	* @return	string XML or empty if no Header

 	* @access   public

 	*/

-	function getHeaders(){

+	function getHeaders() {

 	    return $this->responseHeaders;

 	}

 

@@ -527,40 +527,40 @@ 
 	* @return	mixed	PHP value

 	* @access   private

 	*/

-	function buildVal($pos){

-		if(!isset($this->message[$pos]['type'])){

+	function buildVal($pos) {

+		if (!isset($this->message[$pos]['type'])) {

 			$this->message[$pos]['type'] = '';

 		}

 		$this->debug('in buildVal() for '.$this->message[$pos]['name']."(pos $pos) of type ".$this->message[$pos]['type']);

 		// if there are children...

-		if($this->message[$pos]['children'] != ''){

+		if ($this->message[$pos]['children'] != '') {

 			$this->debug('in buildVal, there are children');

-			$children = explode('|',$this->message[$pos]['children']);

+			$children = explode('|', $this->message[$pos]['children']);

 			array_shift($children); // knock off empty

 			// md array

-			if(isset($this->message[$pos]['arrayCols']) && $this->message[$pos]['arrayCols'] != ''){

-            	$r=0; // rowcount

-            	$c=0; // colcount

-            	foreach($children as $child_pos){

+			if (isset($this->message[$pos]['arrayCols']) && $this->message[$pos]['arrayCols'] != '') {

+            	$r = 0; // rowcount

+            	$c = 0; // colcount

+            	foreach ($children as $child_pos) {

 					$this->debug("in buildVal, got an MD array element: $r, $c");

 					$params[$r][] = $this->message[$child_pos]['result'];

 				    $c++;

-				    if($c == $this->message[$pos]['arrayCols']){

+				    if ($c == $this->message[$pos]['arrayCols']) {

 				    	$c = 0;

 						$r++;

 				    }

                 }

             // array

-			} elseif($this->message[$pos]['type'] == 'array' || $this->message[$pos]['type'] == 'Array'){

+			} elseif ($this->message[$pos]['type'] == 'array' || $this->message[$pos]['type'] == 'Array') {

                 $this->debug('in buildVal, adding array '.$this->message[$pos]['name']);

-                foreach($children as $child_pos){

+                foreach ($children as $child_pos) {

                 	$params[] = &$this->message[$child_pos]['result'];

                 }

             // apache Map type: java hashtable

-            } elseif($this->message[$pos]['type'] == 'Map' && $this->message[$pos]['type_namespace'] == 'http://xml.apache.org/xml-soap'){

+            } elseif ($this->message[$pos]['type'] == 'Map' && $this->message[$pos]['type_namespace'] == 'http://xml.apache.org/xml-soap') {

                 $this->debug('in buildVal, Java Map '.$this->message[$pos]['name']);

-                foreach($children as $child_pos){

-                	$kv = explode("|",$this->message[$child_pos]['children']);

+                foreach ($children as $child_pos) {

+                	$kv = explode("|", $this->message[$child_pos]['children']);

                    	$params[$this->message[$kv[1]]['result']] = &$this->message[$kv[2]]['result'];

                 }

             // generic compound type

@@ -574,8 +574,8 @@ 
 					$notstruct = 0;

 	            }

             	//

-            	foreach($children as $child_pos){

-            		if($notstruct){

+            	foreach ($children as $child_pos) {

+            		if ($notstruct) {

             			$params[] = &$this->message[$child_pos]['result'];

             		} else {

             			if (isset($params[$this->message[$child_pos]['name']])) {

Doc Comments +1 added lines, -1 removed lines

@@ -52,7 +52,7 @@
 	* @param    string $encoding character encoding scheme of message

 	* @param    string $method method for which XML is parsed (unused?)

 	* @param    bool $decode_utf8 whether to decode UTF-8 to ISO-8859-1

-	* @return void|bool

+	* @return false|null

 	* @access   public

 	*/

 	function nusoap_parser($xml,$encoding='UTF-8',$method='',$decode_utf8=true){

Indentation +546 added lines, -546 removed lines

@@ -11,235 +11,235 @@ 
 */

 class nusoap_parser extends nusoap_base

 {

-	var $xml = '';

-	var $xml_encoding = '';

-	var $method = '';

-	var $root_struct = '';

-	var $root_struct_name = '';

-	var $root_struct_namespace = '';

-	var $root_header = '';

+    var $xml = '';

+    var $xml_encoding = '';

+    var $method = '';

+    var $root_struct = '';

+    var $root_struct_name = '';

+    var $root_struct_namespace = '';

+    var $root_header = '';

     var $document = '';			// incoming SOAP body (text)

-	// determines where in the message we are (envelope,header,body,method)

-	var $status = '';

-	var $position = 0;

-	var $depth = 0;

-	var $default_namespace = '';

-	var $namespaces = array();

-	var $message = array();

+    // determines where in the message we are (envelope,header,body,method)

+    var $status = '';

+    var $position = 0;

+    var $depth = 0;

+    var $default_namespace = '';

+    var $namespaces = array();

+    var $message = array();

     var $parent;

-	var $fault = false;

-	var $fault_code = '';

-	var $fault_str = '';

-	var $fault_detail = '';

-	var $depth_array = array();

-	var $debug_flag = true;

-	var $soapresponse = NULL;	// parsed SOAP Body

-	var $soapheader = NULL;		// parsed SOAP Header

-	var $responseHeaders = '';	// incoming SOAP headers (text)

-	var $body_position = 0;

-	// for multiref parsing:

-	// array of id => pos

-	var $ids = array();

-	// array of id => hrefs => pos

-	var $multirefs = array();

-	// toggle for auto-decoding element content

-	var $decode_utf8 = true;

+    var $fault = false;

+    var $fault_code = '';

+    var $fault_str = '';

+    var $fault_detail = '';

+    var $depth_array = array();

+    var $debug_flag = true;

+    var $soapresponse = NULL;	// parsed SOAP Body

+    var $soapheader = NULL;		// parsed SOAP Header

+    var $responseHeaders = '';	// incoming SOAP headers (text)

+    var $body_position = 0;

+    // for multiref parsing:

+    // array of id => pos

+    var $ids = array();

+    // array of id => hrefs => pos

+    var $multirefs = array();

+    // toggle for auto-decoding element content

+    var $decode_utf8 = true;

 

-	/**

-	* constructor that actually does the parsing

-	*

-	* @param    string $xml SOAP message

-	* @param    string $encoding character encoding scheme of message

-	* @param    string $method method for which XML is parsed (unused?)

-	* @param    bool $decode_utf8 whether to decode UTF-8 to ISO-8859-1

-	* @return void|bool

-	* @access   public

-	*/

-	function nusoap_parser($xml,$encoding='UTF-8',$method='',$decode_utf8=true){

-		parent::nusoap_base();

-		$this->xml = $xml;

-		$this->xml_encoding = $encoding;

-		$this->method = $method;

-		$this->decode_utf8 = $decode_utf8;

+    /**

+     * constructor that actually does the parsing

+     *

+     * @param    string $xml SOAP message

+     * @param    string $encoding character encoding scheme of message

+     * @param    string $method method for which XML is parsed (unused?)

+     * @param    bool $decode_utf8 whether to decode UTF-8 to ISO-8859-1

+     * @return void|bool

+     * @access   public

+     */

+    function nusoap_parser($xml,$encoding='UTF-8',$method='',$decode_utf8=true){

+        parent::nusoap_base();

+        $this->xml = $xml;

+        $this->xml_encoding = $encoding;

+        $this->method = $method;

+        $this->decode_utf8 = $decode_utf8;

 

-		// Check whether content has been read.

-		if(!empty($this->xml)){

-			// Check XML encoding

-			$pos_xml = strpos($xml, '<?xml');

-			if ($pos_xml !== FALSE) {

-				$xml_decl = substr($xml, $pos_xml, strpos($xml, '?>', $pos_xml + 2) - $pos_xml + 1);

-				if (preg_match("/encoding=[\"']([^\"']*)[\"']/", $xml_decl, $res)) {

-					$xml_encoding = $res[1];

-					if (strtoupper($xml_encoding) != $encoding) {

-						$err = "Charset from HTTP Content-Type '" . $encoding . "' does not match encoding from XML declaration '" . $xml_encoding . "'";

-						$this->debug($err);

-						if ($encoding != 'ISO-8859-1' || strtoupper($xml_encoding) != 'UTF-8') {

-							$this->setError($err);

-							return false;

-						}

-						// when HTTP says ISO-8859-1 (the default) and XML says UTF-8 (the typical), assume the other endpoint is just sloppy and proceed

-					} else {

-						$this->debug('Charset from HTTP Content-Type matches encoding from XML declaration');

-					}

-				} else {

-					$this->debug('No encoding specified in XML declaration');

-				}

-			} else {

-				$this->debug('No XML declaration');

-			}

-			$this->debug('Entering nusoap_parser(), length='.strlen($xml).', encoding='.$encoding);

-			// Create an XML parser - why not xml_parser_create_ns?

-			$this->parser = xml_parser_create($this->xml_encoding);

-			// Set the options for parsing the XML data.

-			//xml_parser_set_option($parser, XML_OPTION_SKIP_WHITE, 1);

-			xml_parser_set_option($this->parser, XML_OPTION_CASE_FOLDING, 0);

-			xml_parser_set_option($this->parser, XML_OPTION_TARGET_ENCODING, $this->xml_encoding);

-			// Set the object for the parser.

-			xml_set_object($this->parser, $this);

-			// Set the element handlers for the parser.

-			xml_set_element_handler($this->parser, 'start_element','end_element');

-			xml_set_character_data_handler($this->parser,'character_data');

+        // Check whether content has been read.

+        if(!empty($this->xml)){

+            // Check XML encoding

+            $pos_xml = strpos($xml, '<?xml');

+            if ($pos_xml !== FALSE) {

+                $xml_decl = substr($xml, $pos_xml, strpos($xml, '?>', $pos_xml + 2) - $pos_xml + 1);

+                if (preg_match("/encoding=[\"']([^\"']*)[\"']/", $xml_decl, $res)) {

+                    $xml_encoding = $res[1];

+                    if (strtoupper($xml_encoding) != $encoding) {

+                        $err = "Charset from HTTP Content-Type '" . $encoding . "' does not match encoding from XML declaration '" . $xml_encoding . "'";

+                        $this->debug($err);

+                        if ($encoding != 'ISO-8859-1' || strtoupper($xml_encoding) != 'UTF-8') {

+                            $this->setError($err);

+                            return false;

+                        }

+                        // when HTTP says ISO-8859-1 (the default) and XML says UTF-8 (the typical), assume the other endpoint is just sloppy and proceed

+                    } else {

+                        $this->debug('Charset from HTTP Content-Type matches encoding from XML declaration');

+                    }

+                } else {

+                    $this->debug('No encoding specified in XML declaration');

+                }

+            } else {

+                $this->debug('No XML declaration');

+            }

+            $this->debug('Entering nusoap_parser(), length='.strlen($xml).', encoding='.$encoding);

+            // Create an XML parser - why not xml_parser_create_ns?

+            $this->parser = xml_parser_create($this->xml_encoding);

+            // Set the options for parsing the XML data.

+            //xml_parser_set_option($parser, XML_OPTION_SKIP_WHITE, 1);

+            xml_parser_set_option($this->parser, XML_OPTION_CASE_FOLDING, 0);

+            xml_parser_set_option($this->parser, XML_OPTION_TARGET_ENCODING, $this->xml_encoding);

+            // Set the object for the parser.

+            xml_set_object($this->parser, $this);

+            // Set the element handlers for the parser.

+            xml_set_element_handler($this->parser, 'start_element','end_element');

+            xml_set_character_data_handler($this->parser,'character_data');

 

-			xml_parse($this->parser, $this->xml);

+            xml_parse($this->parser, $this->xml);

 

-			// Parse the XML file.

-			//if (!xml_parse($this->parser,$xml,true)){

-			if (false) {

-			    // Display an error message.

-			    $err = sprintf('XML error parsing SOAP payload on line %d: %s',

-			    xml_get_current_line_number($this->parser),

-			    xml_error_string(xml_get_error_code($this->parser)));

-				$this->debug($err);

-				$this->debug("XML payload:\n" . $xml);

-				$this->setError($err);

-			} else {

-				$this->debug('in nusoap_parser ctor, message:');

-				$this->appendDebug($this->varDump($this->message));

-				$this->debug('parsed successfully, found root struct: '.$this->root_struct.' of name '.$this->root_struct_name);

-				// get final value

-				$this->soapresponse = $this->message[$this->root_struct]['result'];

-				// get header value

-				if($this->root_header != '' && isset($this->message[$this->root_header]['result'])){

-					$this->soapheader = $this->message[$this->root_header]['result'];

-				}

-				// resolve hrefs/ids

-				if(sizeof($this->multirefs) > 0){

-					foreach($this->multirefs as $id => $hrefs){

-						$this->debug('resolving multirefs for id: '.$id);

-						$idVal = $this->buildVal($this->ids[$id]);

-						if (is_array($idVal) && isset($idVal['!id'])) {

-							unset($idVal['!id']);

-						}

-						foreach($hrefs as $refPos => $ref){

-							$this->debug('resolving href at pos '.$refPos);

-							$this->multirefs[$id][$refPos] = $idVal;

-						}

-					}

-				}

-			}

-			xml_parser_free($this->parser);

-		} else {

-			$this->debug('xml was empty, didn\'t parse!');

-			$this->setError('xml was empty, didn\'t parse!');

-		}

-	}

+            // Parse the XML file.

+            //if (!xml_parse($this->parser,$xml,true)){

+            if (false) {

+                // Display an error message.

+                $err = sprintf('XML error parsing SOAP payload on line %d: %s',

+                xml_get_current_line_number($this->parser),

+                xml_error_string(xml_get_error_code($this->parser)));

+                $this->debug($err);

+                $this->debug("XML payload:\n" . $xml);

+                $this->setError($err);

+            } else {

+                $this->debug('in nusoap_parser ctor, message:');

+                $this->appendDebug($this->varDump($this->message));

+                $this->debug('parsed successfully, found root struct: '.$this->root_struct.' of name '.$this->root_struct_name);

+                // get final value

+                $this->soapresponse = $this->message[$this->root_struct]['result'];

+                // get header value

+                if($this->root_header != '' && isset($this->message[$this->root_header]['result'])){

+                    $this->soapheader = $this->message[$this->root_header]['result'];

+                }

+                // resolve hrefs/ids

+                if(sizeof($this->multirefs) > 0){

+                    foreach($this->multirefs as $id => $hrefs){

+                        $this->debug('resolving multirefs for id: '.$id);

+                        $idVal = $this->buildVal($this->ids[$id]);

+                        if (is_array($idVal) && isset($idVal['!id'])) {

+                            unset($idVal['!id']);

+                        }

+                        foreach($hrefs as $refPos => $ref){

+                            $this->debug('resolving href at pos '.$refPos);

+                            $this->multirefs[$id][$refPos] = $idVal;

+                        }

+                    }

+                }

+            }

+            xml_parser_free($this->parser);

+        } else {

+            $this->debug('xml was empty, didn\'t parse!');

+            $this->setError('xml was empty, didn\'t parse!');

+        }

+    }

 

-	/**

-	* start-element handler

-	*

-	* @param    resource $parser XML parser object

-	* @param    string $name element name

-	* @param    array $attrs associative array of attributes

-	* @access   private

-	*/

-	function start_element($parser, $name, $attrs) {

+    /**

+     * start-element handler

+     *

+     * @param    resource $parser XML parser object

+     * @param    string $name element name

+     * @param    array $attrs associative array of attributes

+     * @access   private

+     */

+    function start_element($parser, $name, $attrs) {

 

-		// position in a total number of elements, starting from 0

-		// update class level pos

-		$pos = $this->position++;

-		// and set mine

-		$this->message[$pos] = array('pos' => $pos,'children'=>'','cdata'=>'');

-		// depth = how many levels removed from root?

-		// set mine as current global depth and increment global depth value

-		$this->message[$pos]['depth'] = $this->depth++;

+        // position in a total number of elements, starting from 0

+        // update class level pos

+        $pos = $this->position++;

+        // and set mine

+        $this->message[$pos] = array('pos' => $pos,'children'=>'','cdata'=>'');

+        // depth = how many levels removed from root?

+        // set mine as current global depth and increment global depth value

+        $this->message[$pos]['depth'] = $this->depth++;

 

-		// else add self as child to whoever the current parent is

-		if($pos != 0){

-			$this->message[$this->parent]['children'] .= '|'.$pos;

-		}

-		// set my parent

-		$this->message[$pos]['parent'] = $this->parent;

-		// set self as current parent

-		$this->parent = $pos;

-		// set self as current value for this depth

-		$this->depth_array[$this->depth] = $pos;

-		// get element prefix

-		if(strpos($name,':')){

-			// get ns prefix

-			$prefix = substr($name,0,strpos($name,':'));

-			// get unqualified name

-			$name = substr(strstr($name,':'),1);

-		}

-		// set status

-		if ($name == 'Envelope' && $this->status == '') {

-			$this->status = 'envelope';

-		} elseif ($name == 'Header' && $this->status == 'envelope') {

-			$this->root_header = $pos;

-			$this->status = 'header';

-		} elseif ($name == 'Body' && $this->status == 'envelope'){

-			$this->status = 'body';

-			$this->body_position = $pos;

-		// set method

-		} elseif($this->status == 'body' && $pos == ($this->body_position+1)) {

-			$this->status = 'method';

-			$this->root_struct_name = $name;

-			$this->root_struct = $pos;

-			$this->message[$pos]['type'] = 'struct';

-			$this->debug("found root struct $this->root_struct_name, pos $this->root_struct");

-		}

-		// set my status

-		$this->message[$pos]['status'] = $this->status;

-		// set name

-		$this->message[$pos]['name'] = htmlspecialchars($name);

-		// set attrs

-		$this->message[$pos]['attrs'] = $attrs;

+        // else add self as child to whoever the current parent is

+        if($pos != 0){

+            $this->message[$this->parent]['children'] .= '|'.$pos;

+        }

+        // set my parent

+        $this->message[$pos]['parent'] = $this->parent;

+        // set self as current parent

+        $this->parent = $pos;

+        // set self as current value for this depth

+        $this->depth_array[$this->depth] = $pos;

+        // get element prefix

+        if(strpos($name,':')){

+            // get ns prefix

+            $prefix = substr($name,0,strpos($name,':'));

+            // get unqualified name

+            $name = substr(strstr($name,':'),1);

+        }

+        // set status

+        if ($name == 'Envelope' && $this->status == '') {

+            $this->status = 'envelope';

+        } elseif ($name == 'Header' && $this->status == 'envelope') {

+            $this->root_header = $pos;

+            $this->status = 'header';

+        } elseif ($name == 'Body' && $this->status == 'envelope'){

+            $this->status = 'body';

+            $this->body_position = $pos;

+        // set method

+        } elseif($this->status == 'body' && $pos == ($this->body_position+1)) {

+            $this->status = 'method';

+            $this->root_struct_name = $name;

+            $this->root_struct = $pos;

+            $this->message[$pos]['type'] = 'struct';

+            $this->debug("found root struct $this->root_struct_name, pos $this->root_struct");

+        }

+        // set my status

+        $this->message[$pos]['status'] = $this->status;

+        // set name

+        $this->message[$pos]['name'] = htmlspecialchars($name);

+        // set attrs

+        $this->message[$pos]['attrs'] = $attrs;

 

-		// loop through atts, logging ns and type declarations

+        // loop through atts, logging ns and type declarations

         $attstr = '';

-		foreach($attrs as $key => $value){

-        	$key_prefix = $this->getPrefix($key);

-			$key_localpart = $this->getLocalPart($key);

-			// if ns declarations, add to class level array of valid namespaces

+        foreach($attrs as $key => $value){

+            $key_prefix = $this->getPrefix($key);

+            $key_localpart = $this->getLocalPart($key);

+            // if ns declarations, add to class level array of valid namespaces

             if($key_prefix == 'xmlns'){

-				if(preg_match('/^http:\/\/www.w3.org\/[0-9]{4}\/XMLSchema$/',$value)){

-					$this->XMLSchemaVersion = $value;

-					$this->namespaces['xsd'] = $this->XMLSchemaVersion;

-					$this->namespaces['xsi'] = $this->XMLSchemaVersion.'-instance';

-				}

+                if(preg_match('/^http:\/\/www.w3.org\/[0-9]{4}\/XMLSchema$/',$value)){

+                    $this->XMLSchemaVersion = $value;

+                    $this->namespaces['xsd'] = $this->XMLSchemaVersion;

+                    $this->namespaces['xsi'] = $this->XMLSchemaVersion.'-instance';

+                }

                 $this->namespaces[$key_localpart] = $value;

-				// set method namespace

-				if($name == $this->root_struct_name){

-					$this->methodNamespace = $value;

-				}

-			// if it's a type declaration, set type

+                // set method namespace

+                if($name == $this->root_struct_name){

+                    $this->methodNamespace = $value;

+                }

+            // if it's a type declaration, set type

         } elseif($key_localpart == 'type'){

-        		if (isset($this->message[$pos]['type']) && $this->message[$pos]['type'] == 'array') {

-        			// do nothing: already processed arrayType

-        		} else {

-	            	$value_prefix = $this->getPrefix($value);

-	                $value_localpart = $this->getLocalPart($value);

-					$this->message[$pos]['type'] = $value_localpart;

-					$this->message[$pos]['typePrefix'] = $value_prefix;

-	                if(isset($this->namespaces[$value_prefix])){

-	                	$this->message[$pos]['type_namespace'] = $this->namespaces[$value_prefix];

-	                } else if(isset($attrs['xmlns:'.$value_prefix])) {

-						$this->message[$pos]['type_namespace'] = $attrs['xmlns:'.$value_prefix];

-	                }

-					// should do something here with the namespace of specified type?

-				}

-			} elseif($key_localpart == 'arrayType'){

-				$this->message[$pos]['type'] = 'array';

-				/* do arrayType ereg here

+                if (isset($this->message[$pos]['type']) && $this->message[$pos]['type'] == 'array') {

+                    // do nothing: already processed arrayType

+                } else {

+                    $value_prefix = $this->getPrefix($value);

+                    $value_localpart = $this->getLocalPart($value);

+                    $this->message[$pos]['type'] = $value_localpart;

+                    $this->message[$pos]['typePrefix'] = $value_prefix;

+                    if(isset($this->namespaces[$value_prefix])){

+                        $this->message[$pos]['type_namespace'] = $this->namespaces[$value_prefix];

+                    } else if(isset($attrs['xmlns:'.$value_prefix])) {

+                        $this->message[$pos]['type_namespace'] = $attrs['xmlns:'.$value_prefix];

+                    }

+                    // should do something here with the namespace of specified type?

+                }

+            } elseif($key_localpart == 'arrayType'){

+                $this->message[$pos]['type'] = 'array';

+                /* do arrayType ereg here

 				[1]    arrayTypeValue    ::=    atype asize

 				[2]    atype    ::=    QName rank*

 				[3]    rank    ::=    '[' (',')* ']'

@@ -247,129 +247,129 @@ 
 				[5]    length    ::=    nextDimension* Digit+

 				[6]    nextDimension    ::=    Digit+ ','

 				*/

-				$expr = '/([A-Za-z0-9_]+):([A-Za-z]+[A-Za-z0-9_]+)\[([0-9]+),?([0-9]*)\]/';

-				if(preg_match($expr,$value,$regs)){

-					$this->message[$pos]['typePrefix'] = $regs[1];

-					$this->message[$pos]['arrayTypePrefix'] = $regs[1];

-	                if (isset($this->namespaces[$regs[1]])) {

-	                	$this->message[$pos]['arrayTypeNamespace'] = $this->namespaces[$regs[1]];

-	                } else if (isset($attrs['xmlns:'.$regs[1]])) {

-						$this->message[$pos]['arrayTypeNamespace'] = $attrs['xmlns:'.$regs[1]];

-	                }

-					$this->message[$pos]['arrayType'] = $regs[2];

-					$this->message[$pos]['arraySize'] = $regs[3];

-					$this->message[$pos]['arrayCols'] = $regs[4];

-				}

-			// specifies nil value (or not)

-			} elseif ($key_localpart == 'nil'){

-				$this->message[$pos]['nil'] = ($value == 'true' || $value == '1');

-			// some other attribute

-			} elseif ($key != 'href' && $key != 'xmlns' && $key_localpart != 'encodingStyle' && $key_localpart != 'root') {

-				$this->message[$pos]['xattrs']['!' . $key] = $value;

-			}

+                $expr = '/([A-Za-z0-9_]+):([A-Za-z]+[A-Za-z0-9_]+)\[([0-9]+),?([0-9]*)\]/';

+                if(preg_match($expr,$value,$regs)){

+                    $this->message[$pos]['typePrefix'] = $regs[1];

+                    $this->message[$pos]['arrayTypePrefix'] = $regs[1];

+                    if (isset($this->namespaces[$regs[1]])) {

+                        $this->message[$pos]['arrayTypeNamespace'] = $this->namespaces[$regs[1]];

+                    } else if (isset($attrs['xmlns:'.$regs[1]])) {

+                        $this->message[$pos]['arrayTypeNamespace'] = $attrs['xmlns:'.$regs[1]];

+                    }

+                    $this->message[$pos]['arrayType'] = $regs[2];

+                    $this->message[$pos]['arraySize'] = $regs[3];

+                    $this->message[$pos]['arrayCols'] = $regs[4];

+                }

+            // specifies nil value (or not)

+            } elseif ($key_localpart == 'nil'){

+                $this->message[$pos]['nil'] = ($value == 'true' || $value == '1');

+            // some other attribute

+            } elseif ($key != 'href' && $key != 'xmlns' && $key_localpart != 'encodingStyle' && $key_localpart != 'root') {

+                $this->message[$pos]['xattrs']['!' . $key] = $value;

+            }

 

-			if ($key == 'xmlns') {

-				$this->default_namespace = $value;

-			}

-			// log id

-			if($key == 'id'){

-				$this->ids[$value] = $pos;

-			}

-			// root

-			if($key_localpart == 'root' && $value == 1){

-				$this->status = 'method';

-				$this->root_struct_name = $name;

-				$this->root_struct = $pos;

-				$this->debug("found root struct $this->root_struct_name, pos $pos");

-			}

+            if ($key == 'xmlns') {

+                $this->default_namespace = $value;

+            }

+            // log id

+            if($key == 'id'){

+                $this->ids[$value] = $pos;

+            }

+            // root

+            if($key_localpart == 'root' && $value == 1){

+                $this->status = 'method';

+                $this->root_struct_name = $name;

+                $this->root_struct = $pos;

+                $this->debug("found root struct $this->root_struct_name, pos $pos");

+            }

             // for doclit

             $attstr .= " $key=\"$value\"";

-		}

+        }

         // get namespace - must be done after namespace atts are processed

-		if(isset($prefix)){

-			$this->message[$pos]['namespace'] = $this->namespaces[$prefix];

-			$this->default_namespace = $this->namespaces[$prefix];

-		} else {

-			$this->message[$pos]['namespace'] = $this->default_namespace;

-		}

+        if(isset($prefix)){

+            $this->message[$pos]['namespace'] = $this->namespaces[$prefix];

+            $this->default_namespace = $this->namespaces[$prefix];

+        } else {

+            $this->message[$pos]['namespace'] = $this->default_namespace;

+        }

         if($this->status == 'header'){

-        	if ($this->root_header != $pos) {

-	        	$this->responseHeaders .= "<" . (isset($prefix) ? $prefix . ':' : '') . "$name$attstr>";

-	        }

+            if ($this->root_header != $pos) {

+                $this->responseHeaders .= "<" . (isset($prefix) ? $prefix . ':' : '') . "$name$attstr>";

+            }

         } elseif($this->root_struct_name != ''){

-        	$this->document .= "<" . (isset($prefix) ? $prefix . ':' : '') . "$name$attstr>";

+            $this->document .= "<" . (isset($prefix) ? $prefix . ':' : '') . "$name$attstr>";

         }

-	}

+    }

 

-	/**

-	* end-element handler

-	*

-	* @param    resource $parser XML parser object

-	* @param    string $name element name

-	* @access   private

-	*/

-	function end_element($parser, $name) {

-		// position of current element is equal to the last value left in depth_array for my depth

-		$pos = $this->depth_array[$this->depth--];

+    /**

+     * end-element handler

+     *

+     * @param    resource $parser XML parser object

+     * @param    string $name element name

+     * @access   private

+     */

+    function end_element($parser, $name) {

+        // position of current element is equal to the last value left in depth_array for my depth

+        $pos = $this->depth_array[$this->depth--];

 

         // get element prefix

-		if(strpos($name,':')){

-			// get ns prefix

-			$prefix = substr($name,0,strpos($name,':'));

-			// get unqualified name

-			$name = substr(strstr($name,':'),1);

-		}

+        if(strpos($name,':')){

+            // get ns prefix

+            $prefix = substr($name,0,strpos($name,':'));

+            // get unqualified name

+            $name = substr(strstr($name,':'),1);

+        }

 		

-		// build to native type

-		if(isset($this->body_position) && $pos > $this->body_position){

-			// deal w/ multirefs

-			if(isset($this->message[$pos]['attrs']['href'])){

-				// get id

-				$id = substr($this->message[$pos]['attrs']['href'],1);

-				// add placeholder to href array

-				$this->multirefs[$id][$pos] = 'placeholder';

-				// add set a reference to it as the result value

-				$this->message[$pos]['result'] =& $this->multirefs[$id][$pos];

+        // build to native type

+        if(isset($this->body_position) && $pos > $this->body_position){

+            // deal w/ multirefs

+            if(isset($this->message[$pos]['attrs']['href'])){

+                // get id

+                $id = substr($this->message[$pos]['attrs']['href'],1);

+                // add placeholder to href array

+                $this->multirefs[$id][$pos] = 'placeholder';

+                // add set a reference to it as the result value

+                $this->message[$pos]['result'] =& $this->multirefs[$id][$pos];

             // build complexType values

-			} elseif($this->message[$pos]['children'] != ''){

-				// if result has already been generated (struct/array)

-				if(!isset($this->message[$pos]['result'])){

-					$this->message[$pos]['result'] = $this->buildVal($pos);

-				}

-			// build complexType values of attributes and possibly simpleContent

-			} elseif (isset($this->message[$pos]['xattrs'])) {

-				if (isset($this->message[$pos]['nil']) && $this->message[$pos]['nil']) {

-					$this->message[$pos]['xattrs']['!'] = null;

-				} elseif (isset($this->message[$pos]['cdata']) && trim($this->message[$pos]['cdata']) != '') {

-	            	if (isset($this->message[$pos]['type'])) {

-						$this->message[$pos]['xattrs']['!'] = $this->decodeSimple($this->message[$pos]['cdata'], $this->message[$pos]['type'], isset($this->message[$pos]['type_namespace']) ? $this->message[$pos]['type_namespace'] : '');

-					} else {

-						$parent = $this->message[$pos]['parent'];

-						if (isset($this->message[$parent]['type']) && ($this->message[$parent]['type'] == 'array') && isset($this->message[$parent]['arrayType'])) {

-							$this->message[$pos]['xattrs']['!'] = $this->decodeSimple($this->message[$pos]['cdata'], $this->message[$parent]['arrayType'], isset($this->message[$parent]['arrayTypeNamespace']) ? $this->message[$parent]['arrayTypeNamespace'] : '');

-						} else {

-							$this->message[$pos]['xattrs']['!'] = $this->message[$pos]['cdata'];

-						}

-					}

-				}

-				$this->message[$pos]['result'] = $this->message[$pos]['xattrs'];

-			// set value of simpleType (or nil complexType)

-			} else {

-            	//$this->debug('adding data for scalar value '.$this->message[$pos]['name'].' of value '.$this->message[$pos]['cdata']);

-				if (isset($this->message[$pos]['nil']) && $this->message[$pos]['nil']) {

-					$this->message[$pos]['xattrs']['!'] = null;

-				} elseif (isset($this->message[$pos]['type'])) {

-					$this->message[$pos]['result'] = $this->decodeSimple($this->message[$pos]['cdata'], $this->message[$pos]['type'], isset($this->message[$pos]['type_namespace']) ? $this->message[$pos]['type_namespace'] : '');

-				} else {

-					$parent = $this->message[$pos]['parent'];

-					if (isset($this->message[$parent]['type']) && ($this->message[$parent]['type'] == 'array') && isset($this->message[$parent]['arrayType'])) {

-						$this->message[$pos]['result'] = $this->decodeSimple($this->message[$pos]['cdata'], $this->message[$parent]['arrayType'], isset($this->message[$parent]['arrayTypeNamespace']) ? $this->message[$parent]['arrayTypeNamespace'] : '');

-					} else {

-						$this->message[$pos]['result'] = $this->message[$pos]['cdata'];

-					}

-				}

+            } elseif($this->message[$pos]['children'] != ''){

+                // if result has already been generated (struct/array)

+                if(!isset($this->message[$pos]['result'])){

+                    $this->message[$pos]['result'] = $this->buildVal($pos);

+                }

+            // build complexType values of attributes and possibly simpleContent

+            } elseif (isset($this->message[$pos]['xattrs'])) {

+                if (isset($this->message[$pos]['nil']) && $this->message[$pos]['nil']) {

+                    $this->message[$pos]['xattrs']['!'] = null;

+                } elseif (isset($this->message[$pos]['cdata']) && trim($this->message[$pos]['cdata']) != '') {

+                    if (isset($this->message[$pos]['type'])) {

+                        $this->message[$pos]['xattrs']['!'] = $this->decodeSimple($this->message[$pos]['cdata'], $this->message[$pos]['type'], isset($this->message[$pos]['type_namespace']) ? $this->message[$pos]['type_namespace'] : '');

+                    } else {

+                        $parent = $this->message[$pos]['parent'];

+                        if (isset($this->message[$parent]['type']) && ($this->message[$parent]['type'] == 'array') && isset($this->message[$parent]['arrayType'])) {

+                            $this->message[$pos]['xattrs']['!'] = $this->decodeSimple($this->message[$pos]['cdata'], $this->message[$parent]['arrayType'], isset($this->message[$parent]['arrayTypeNamespace']) ? $this->message[$parent]['arrayTypeNamespace'] : '');

+                        } else {

+                            $this->message[$pos]['xattrs']['!'] = $this->message[$pos]['cdata'];

+                        }

+                    }

+                }

+                $this->message[$pos]['result'] = $this->message[$pos]['xattrs'];

+            // set value of simpleType (or nil complexType)

+            } else {

+                //$this->debug('adding data for scalar value '.$this->message[$pos]['name'].' of value '.$this->message[$pos]['cdata']);

+                if (isset($this->message[$pos]['nil']) && $this->message[$pos]['nil']) {

+                    $this->message[$pos]['xattrs']['!'] = null;

+                } elseif (isset($this->message[$pos]['type'])) {

+                    $this->message[$pos]['result'] = $this->decodeSimple($this->message[$pos]['cdata'], $this->message[$pos]['type'], isset($this->message[$pos]['type_namespace']) ? $this->message[$pos]['type_namespace'] : '');

+                } else {

+                    $parent = $this->message[$pos]['parent'];

+                    if (isset($this->message[$parent]['type']) && ($this->message[$parent]['type'] == 'array') && isset($this->message[$parent]['arrayType'])) {

+                        $this->message[$pos]['result'] = $this->decodeSimple($this->message[$pos]['cdata'], $this->message[$parent]['arrayType'], isset($this->message[$parent]['arrayTypeNamespace']) ? $this->message[$parent]['arrayTypeNamespace'] : '');

+                    } else {

+                        $this->message[$pos]['result'] = $this->message[$pos]['cdata'];

+                    }

+                }

 

-				/* add value to parent's result, if parent is struct/array

+                /* add value to parent's result, if parent is struct/array

 				$parent = $this->message[$pos]['parent'];

 				if($this->message[$parent]['type'] != 'map'){

 					if(strtolower($this->message[$parent]['type']) == 'array'){

@@ -379,261 +379,261 @@ 
 					}

 				}

 				*/

-			}

-		}

+            }

+        }

 		

         // for doclit

         if($this->status == 'header'){

-        	if ($this->root_header != $pos) {

-	        	$this->responseHeaders .= "</" . (isset($prefix) ? $prefix . ':' : '') . "$name>";

-	        }

+            if ($this->root_header != $pos) {

+                $this->responseHeaders .= "</" . (isset($prefix) ? $prefix . ':' : '') . "$name>";

+            }

         } elseif($pos >= $this->root_struct){

-        	$this->document .= "</" . (isset($prefix) ? $prefix . ':' : '') . "$name>";

+            $this->document .= "</" . (isset($prefix) ? $prefix . ':' : '') . "$name>";

         }

-		// switch status

-		if ($pos == $this->root_struct){

-			$this->status = 'body';

-			$this->root_struct_namespace = $this->message[$pos]['namespace'];

-		} elseif ($pos == $this->root_header) {

-			$this->status = 'envelope';

-		} elseif ($name == 'Body' && $this->status == 'body') {

-			$this->status = 'envelope';

-		} elseif ($name == 'Header' && $this->status == 'header') { // will never happen

-			$this->status = 'envelope';

-		} elseif ($name == 'Envelope' && $this->status == 'envelope') {

-			$this->status = '';

-		}

-		// set parent back to my parent

-		$this->parent = $this->message[$pos]['parent'];

-	}

+        // switch status

+        if ($pos == $this->root_struct){

+            $this->status = 'body';

+            $this->root_struct_namespace = $this->message[$pos]['namespace'];

+        } elseif ($pos == $this->root_header) {

+            $this->status = 'envelope';

+        } elseif ($name == 'Body' && $this->status == 'body') {

+            $this->status = 'envelope';

+        } elseif ($name == 'Header' && $this->status == 'header') { // will never happen

+            $this->status = 'envelope';

+        } elseif ($name == 'Envelope' && $this->status == 'envelope') {

+            $this->status = '';

+        }

+        // set parent back to my parent

+        $this->parent = $this->message[$pos]['parent'];

+    }

 

-	/**

-	* element content handler

-	*

-	* @param    resource $parser XML parser object

-	* @param    string $data element content

-	* @access   private

-	*/

-	function character_data($parser, $data)

+    /**

+     * element content handler

+     *

+     * @param    resource $parser XML parser object

+     * @param    string $data element content

+     * @access   private

+     */

+    function character_data($parser, $data)

     {

-		$pos = $this->depth_array[$this->depth];

-		if ($this->xml_encoding == 'UTF-8'){

-			// TODO: add an option to disable this for folks who want

-			// raw UTF-8 that, e.g., might not map to iso-8859-1

-			// TODO: this can also be handled with xml_parser_set_option($this->parser, XML_OPTION_TARGET_ENCODING, "ISO-8859-1");

-			if($this->decode_utf8){

-				$data = utf8_decode($data);

-			}

-		}

+        $pos = $this->depth_array[$this->depth];

+        if ($this->xml_encoding == 'UTF-8'){

+            // TODO: add an option to disable this for folks who want

+            // raw UTF-8 that, e.g., might not map to iso-8859-1

+            // TODO: this can also be handled with xml_parser_set_option($this->parser, XML_OPTION_TARGET_ENCODING, "ISO-8859-1");

+            if($this->decode_utf8){

+                $data = utf8_decode($data);

+            }

+        }

         $this->message[$pos]['cdata'] .= $data;

         // for doclit

         if($this->status == 'header'){

-        	$this->responseHeaders .= $data;

+            $this->responseHeaders .= $data;

         } else {

-        	$this->document .= $data;

+            $this->document .= $data;

         }

-	}

+    }

 

-	/**

-	* get the parsed message (SOAP Body)

-	*

-	* @return	mixed

-	* @access   public

-	* @deprecated	use get_soapbody instead

-	*/

-	function get_response(){

-		return $this->soapresponse;

-	}

+    /**

+     * get the parsed message (SOAP Body)

+     *

+     * @return	mixed

+     * @access   public

+     * @deprecated	use get_soapbody instead

+     */

+    function get_response(){

+        return $this->soapresponse;

+    }

 

-	/**

-	* get the parsed SOAP Body (NULL if there was none)

-	*

-	* @return	mixed

-	* @access   public

-	*/

-	function get_soapbody(){

-		return $this->soapresponse;

-	}

+    /**

+     * get the parsed SOAP Body (NULL if there was none)

+     *

+     * @return	mixed

+     * @access   public

+     */

+    function get_soapbody(){

+        return $this->soapresponse;

+    }

 

-	/**

-	* get the parsed SOAP Header (NULL if there was none)

-	*

-	* @return	mixed

-	* @access   public

-	*/

-	function get_soapheader(){

-		return $this->soapheader;

-	}

+    /**

+     * get the parsed SOAP Header (NULL if there was none)

+     *

+     * @return	mixed

+     * @access   public

+     */

+    function get_soapheader(){

+        return $this->soapheader;

+    }

 

-	/**

-	* get the unparsed SOAP Header

-	*

-	* @return	string XML or empty if no Header

-	* @access   public

-	*/

-	function getHeaders(){

-	    return $this->responseHeaders;

-	}

+    /**

+     * get the unparsed SOAP Header

+     *

+     * @return	string XML or empty if no Header

+     * @access   public

+     */

+    function getHeaders(){

+        return $this->responseHeaders;

+    }

 

-	/**

-	* decodes simple types into PHP variables

-	*

-	* @param    string $value value to decode

-	* @param    string $type XML type to decode

-	* @param    string $typens XML type namespace to decode

-	* @return	mixed PHP value

-	* @access   private

-	*/

-	function decodeSimple($value, $type, $typens) {

-		// TODO: use the namespace!

-		if ((!isset($type)) || $type == 'string' || $type == 'long' || $type == 'unsignedLong') {

-			return (string) $value;

-		}

-		if ($type == 'int' || $type == 'integer' || $type == 'short' || $type == 'byte') {

-			return (int) $value;

-		}

-		if ($type == 'float' || $type == 'double' || $type == 'decimal') {

-			return (double) $value;

-		}

-		if ($type == 'boolean') {

-			if (strtolower($value) == 'false' || strtolower($value) == 'f') {

-				return false;

-			}

-			return (boolean) $value;

-		}

-		if ($type == 'base64' || $type == 'base64Binary') {

-			$this->debug('Decode base64 value');

-			return base64_decode($value);

-		}

-		// obscure numeric types

-		if ($type == 'nonPositiveInteger' || $type == 'negativeInteger'

-			|| $type == 'nonNegativeInteger' || $type == 'positiveInteger'

-			|| $type == 'unsignedInt'

-			|| $type == 'unsignedShort' || $type == 'unsignedByte') {

-			return (int) $value;

-		}

-		// bogus: parser treats array with no elements as a simple type

-		if ($type == 'array') {

-			return array();

-		}

-		// everything else

-		return (string) $value;

-	}

+    /**

+     * decodes simple types into PHP variables

+     *

+     * @param    string $value value to decode

+     * @param    string $type XML type to decode

+     * @param    string $typens XML type namespace to decode

+     * @return	mixed PHP value

+     * @access   private

+     */

+    function decodeSimple($value, $type, $typens) {

+        // TODO: use the namespace!

+        if ((!isset($type)) || $type == 'string' || $type == 'long' || $type == 'unsignedLong') {

+            return (string) $value;

+        }

+        if ($type == 'int' || $type == 'integer' || $type == 'short' || $type == 'byte') {

+            return (int) $value;

+        }

+        if ($type == 'float' || $type == 'double' || $type == 'decimal') {

+            return (double) $value;

+        }

+        if ($type == 'boolean') {

+            if (strtolower($value) == 'false' || strtolower($value) == 'f') {

+                return false;

+            }

+            return (boolean) $value;

+        }

+        if ($type == 'base64' || $type == 'base64Binary') {

+            $this->debug('Decode base64 value');

+            return base64_decode($value);

+        }

+        // obscure numeric types

+        if ($type == 'nonPositiveInteger' || $type == 'negativeInteger'

+            || $type == 'nonNegativeInteger' || $type == 'positiveInteger'

+            || $type == 'unsignedInt'

+            || $type == 'unsignedShort' || $type == 'unsignedByte') {

+            return (int) $value;

+        }

+        // bogus: parser treats array with no elements as a simple type

+        if ($type == 'array') {

+            return array();

+        }

+        // everything else

+        return (string) $value;

+    }

 

-	/**

-	* builds response structures for compound values (arrays/structs)

-	* and scalars

-	*

-	* @param    integer $pos position in node tree

-	* @return	mixed	PHP value

-	* @access   private

-	*/

-	function buildVal($pos){

-		if(!isset($this->message[$pos]['type'])){

-			$this->message[$pos]['type'] = '';

-		}

-		$this->debug('in buildVal() for '.$this->message[$pos]['name']."(pos $pos) of type ".$this->message[$pos]['type']);

-		// if there are children...

-		if($this->message[$pos]['children'] != ''){

-			$this->debug('in buildVal, there are children');

-			$children = explode('|',$this->message[$pos]['children']);

-			array_shift($children); // knock off empty

-			// md array

-			if(isset($this->message[$pos]['arrayCols']) && $this->message[$pos]['arrayCols'] != ''){

-            	$r=0; // rowcount

-            	$c=0; // colcount

-            	foreach($children as $child_pos){

-					$this->debug("in buildVal, got an MD array element: $r, $c");

-					$params[$r][] = $this->message[$child_pos]['result'];

-				    $c++;

-				    if($c == $this->message[$pos]['arrayCols']){

-				    	$c = 0;

-						$r++;

-				    }

+    /**

+     * builds response structures for compound values (arrays/structs)

+     * and scalars

+     *

+     * @param    integer $pos position in node tree

+     * @return	mixed	PHP value

+     * @access   private

+     */

+    function buildVal($pos){

+        if(!isset($this->message[$pos]['type'])){

+            $this->message[$pos]['type'] = '';

+        }

+        $this->debug('in buildVal() for '.$this->message[$pos]['name']."(pos $pos) of type ".$this->message[$pos]['type']);

+        // if there are children...

+        if($this->message[$pos]['children'] != ''){

+            $this->debug('in buildVal, there are children');

+            $children = explode('|',$this->message[$pos]['children']);

+            array_shift($children); // knock off empty

+            // md array

+            if(isset($this->message[$pos]['arrayCols']) && $this->message[$pos]['arrayCols'] != ''){

+                $r=0; // rowcount

+                $c=0; // colcount

+                foreach($children as $child_pos){

+                    $this->debug("in buildVal, got an MD array element: $r, $c");

+                    $params[$r][] = $this->message[$child_pos]['result'];

+                    $c++;

+                    if($c == $this->message[$pos]['arrayCols']){

+                        $c = 0;

+                        $r++;

+                    }

                 }

             // array

-			} elseif($this->message[$pos]['type'] == 'array' || $this->message[$pos]['type'] == 'Array'){

+            } elseif($this->message[$pos]['type'] == 'array' || $this->message[$pos]['type'] == 'Array'){

                 $this->debug('in buildVal, adding array '.$this->message[$pos]['name']);

                 foreach($children as $child_pos){

-                	$params[] = &$this->message[$child_pos]['result'];

+                    $params[] = &$this->message[$child_pos]['result'];

                 }

             // apache Map type: java hashtable

             } elseif($this->message[$pos]['type'] == 'Map' && $this->message[$pos]['type_namespace'] == 'http://xml.apache.org/xml-soap'){

                 $this->debug('in buildVal, Java Map '.$this->message[$pos]['name']);

                 foreach($children as $child_pos){

-                	$kv = explode("|",$this->message[$child_pos]['children']);

-                   	$params[$this->message[$kv[1]]['result']] = &$this->message[$kv[2]]['result'];

+                    $kv = explode("|",$this->message[$child_pos]['children']);

+                        $params[$this->message[$kv[1]]['result']] = &$this->message[$kv[2]]['result'];

                 }

             // generic compound type

             //} elseif($this->message[$pos]['type'] == 'SOAPStruct' || $this->message[$pos]['type'] == 'struct') {

-		    } else {

-	    		// Apache Vector type: treat as an array

+            } else {

+                // Apache Vector type: treat as an array

                 $this->debug('in buildVal, adding Java Vector or generic compound type '.$this->message[$pos]['name']);

-				if ($this->message[$pos]['type'] == 'Vector' && $this->message[$pos]['type_namespace'] == 'http://xml.apache.org/xml-soap') {

-					$notstruct = 1;

-				} else {

-					$notstruct = 0;

-	            }

-            	//

-            	foreach($children as $child_pos){

-            		if($notstruct){

-            			$params[] = &$this->message[$child_pos]['result'];

-            		} else {

-            			if (isset($params[$this->message[$child_pos]['name']])) {

-            				// de-serialize repeated element name into an array

-            				if ((!is_array($params[$this->message[$child_pos]['name']])) || (!isset($params[$this->message[$child_pos]['name']][0]))) {

-            					$params[$this->message[$child_pos]['name']] = array($params[$this->message[$child_pos]['name']]);

-            				}

-            				$params[$this->message[$child_pos]['name']][] = &$this->message[$child_pos]['result'];

-            			} else {

-					    	$params[$this->message[$child_pos]['name']] = &$this->message[$child_pos]['result'];

-					    }

-                	}

+                if ($this->message[$pos]['type'] == 'Vector' && $this->message[$pos]['type_namespace'] == 'http://xml.apache.org/xml-soap') {

+                    $notstruct = 1;

+                } else {

+                    $notstruct = 0;

                 }

-			}

-			if (isset($this->message[$pos]['xattrs'])) {

+                //

+                foreach($children as $child_pos){

+                    if($notstruct){

+                        $params[] = &$this->message[$child_pos]['result'];

+                    } else {

+                        if (isset($params[$this->message[$child_pos]['name']])) {

+                            // de-serialize repeated element name into an array

+                            if ((!is_array($params[$this->message[$child_pos]['name']])) || (!isset($params[$this->message[$child_pos]['name']][0]))) {

+                                $params[$this->message[$child_pos]['name']] = array($params[$this->message[$child_pos]['name']]);

+                            }

+                            $params[$this->message[$child_pos]['name']][] = &$this->message[$child_pos]['result'];

+                        } else {

+                            $params[$this->message[$child_pos]['name']] = &$this->message[$child_pos]['result'];

+                        }

+                    }

+                }

+            }

+            if (isset($this->message[$pos]['xattrs'])) {

                 $this->debug('in buildVal, handling attributes');

-				foreach ($this->message[$pos]['xattrs'] as $n => $v) {

-					$params[$n] = $v;

-				}

-			}

-			// handle simpleContent

-			if (isset($this->message[$pos]['cdata']) && trim($this->message[$pos]['cdata']) != '') {

+                foreach ($this->message[$pos]['xattrs'] as $n => $v) {

+                    $params[$n] = $v;

+                }

+            }

+            // handle simpleContent

+            if (isset($this->message[$pos]['cdata']) && trim($this->message[$pos]['cdata']) != '') {

                 $this->debug('in buildVal, handling simpleContent');

-            	if (isset($this->message[$pos]['type'])) {

-					$params['!'] = $this->decodeSimple($this->message[$pos]['cdata'], $this->message[$pos]['type'], isset($this->message[$pos]['type_namespace']) ? $this->message[$pos]['type_namespace'] : '');

-				} else {

-					$parent = $this->message[$pos]['parent'];

-					if (isset($this->message[$parent]['type']) && ($this->message[$parent]['type'] == 'array') && isset($this->message[$parent]['arrayType'])) {

-						$params['!'] = $this->decodeSimple($this->message[$pos]['cdata'], $this->message[$parent]['arrayType'], isset($this->message[$parent]['arrayTypeNamespace']) ? $this->message[$parent]['arrayTypeNamespace'] : '');

-					} else {

-						$params['!'] = $this->message[$pos]['cdata'];

-					}

-				}

-			}

-			$ret = is_array($params) ? $params : array();

-			$this->debug('in buildVal, return:');

-			//$this->appendDebug($this->varDump($ret));

-			return $ret;

-		} else {

-        	$this->debug('in buildVal, no children, building scalar');

-			$cdata = isset($this->message[$pos]['cdata']) ? $this->message[$pos]['cdata'] : '';

-        	if (isset($this->message[$pos]['type'])) {

-				$ret = $this->decodeSimple($cdata, $this->message[$pos]['type'], isset($this->message[$pos]['type_namespace']) ? $this->message[$pos]['type_namespace'] : '');

-				$this->debug("in buildVal, return: $ret");

-				return $ret;

-			}

-			$parent = $this->message[$pos]['parent'];

-			if (isset($this->message[$parent]['type']) && ($this->message[$parent]['type'] == 'array') && isset($this->message[$parent]['arrayType'])) {

-				$ret = $this->decodeSimple($cdata, $this->message[$parent]['arrayType'], isset($this->message[$parent]['arrayTypeNamespace']) ? $this->message[$parent]['arrayTypeNamespace'] : '');

-				$this->debug("in buildVal, return: $ret");

-				return $ret;

-			}

-           	$ret = $this->message[$pos]['cdata'];

-			$this->debug("in buildVal, return: $ret");

-           	return $ret;

-		}

-	}

+                if (isset($this->message[$pos]['type'])) {

+                    $params['!'] = $this->decodeSimple($this->message[$pos]['cdata'], $this->message[$pos]['type'], isset($this->message[$pos]['type_namespace']) ? $this->message[$pos]['type_namespace'] : '');

+                } else {

+                    $parent = $this->message[$pos]['parent'];

+                    if (isset($this->message[$parent]['type']) && ($this->message[$parent]['type'] == 'array') && isset($this->message[$parent]['arrayType'])) {

+                        $params['!'] = $this->decodeSimple($this->message[$pos]['cdata'], $this->message[$parent]['arrayType'], isset($this->message[$parent]['arrayTypeNamespace']) ? $this->message[$parent]['arrayTypeNamespace'] : '');

+                    } else {

+                        $params['!'] = $this->message[$pos]['cdata'];

+                    }

+                }

+            }

+            $ret = is_array($params) ? $params : array();

+            $this->debug('in buildVal, return:');

+            //$this->appendDebug($this->varDump($ret));

+            return $ret;

+        } else {

+            $this->debug('in buildVal, no children, building scalar');

+            $cdata = isset($this->message[$pos]['cdata']) ? $this->message[$pos]['cdata'] : '';

+            if (isset($this->message[$pos]['type'])) {

+                $ret = $this->decodeSimple($cdata, $this->message[$pos]['type'], isset($this->message[$pos]['type_namespace']) ? $this->message[$pos]['type_namespace'] : '');

+                $this->debug("in buildVal, return: $ret");

+                return $ret;

+            }

+            $parent = $this->message[$pos]['parent'];

+            if (isset($this->message[$parent]['type']) && ($this->message[$parent]['type'] == 'array') && isset($this->message[$parent]['arrayType'])) {

+                $ret = $this->decodeSimple($cdata, $this->message[$parent]['arrayType'], isset($this->message[$parent]['arrayTypeNamespace']) ? $this->message[$parent]['arrayTypeNamespace'] : '');

+                $this->debug("in buildVal, return: $ret");

+                return $ret;

+            }

+                $ret = $this->message[$pos]['cdata'];

+            $this->debug("in buildVal, return: $ret");

+                return $ret;

+        }

+    }

 }

 

 /**

main/inc/lib/nusoap/class.wsdlcache.php

Indentation +175 added lines, -175 removed lines

@@ -16,189 +16,189 @@
 * @access public 

 */

 class nusoap_wsdlcache {

-	/**

-	 *	@var resource

-	 *	@access private

-	 */

-	var $fplock;

-	/**

-	 *	@var integer

-	 *	@access private

-	 */

-	var $cache_lifetime;

-	/**

-	 *	@var string

-	 *	@access private

-	 */

-	var $cache_dir;

-	/**

-	 *	@var string

-	 *	@access public

-	 */

-	var $debug_str = '';

+    /**

+     *	@var resource

+     *	@access private

+     */

+    var $fplock;

+    /**

+     *	@var integer

+     *	@access private

+     */

+    var $cache_lifetime;

+    /**

+     *	@var string

+     *	@access private

+     */

+    var $cache_dir;

+    /**

+     *	@var string

+     *	@access public

+     */

+    var $debug_str = '';

 

-	/**

-	* constructor

-	*

-	* @param string $cache_dir directory for cache-files

-	* @param integer $cache_lifetime lifetime for caching-files in seconds or 0 for unlimited

-	* @access public

-	*/

-	function nusoap_wsdlcache($cache_dir='.', $cache_lifetime=0) {

-		$this->fplock = array();

-		$this->cache_dir = $cache_dir != '' ? $cache_dir : '.';

-		$this->cache_lifetime = $cache_lifetime;

-	}

+    /**

+     * constructor

+     *

+     * @param string $cache_dir directory for cache-files

+     * @param integer $cache_lifetime lifetime for caching-files in seconds or 0 for unlimited

+     * @access public

+     */

+    function nusoap_wsdlcache($cache_dir='.', $cache_lifetime=0) {

+        $this->fplock = array();

+        $this->cache_dir = $cache_dir != '' ? $cache_dir : '.';

+        $this->cache_lifetime = $cache_lifetime;

+    }

 

-	/**

-	* creates the filename used to cache a wsdl instance

-	*

-	* @param string $wsdl The URL of the wsdl instance

-	* @return string The filename used to cache the instance

-	* @access private

-	*/

-	function createFilename($wsdl) {

-		return $this->cache_dir.'/wsdlcache-' . md5($wsdl);

-	}

+    /**

+     * creates the filename used to cache a wsdl instance

+     *

+     * @param string $wsdl The URL of the wsdl instance

+     * @return string The filename used to cache the instance

+     * @access private

+     */

+    function createFilename($wsdl) {

+        return $this->cache_dir.'/wsdlcache-' . md5($wsdl);

+    }

 

-	/**

-	* adds debug data to the class level debug string

-	*

-	* @param    string $string debug data

-	* @access   private

-	*/

-	function debug($string){

-		$this->debug_str .= get_class($this).": $string\n";

-	}

+    /**

+     * adds debug data to the class level debug string

+     *

+     * @param    string $string debug data

+     * @access   private

+     */

+    function debug($string){

+        $this->debug_str .= get_class($this).": $string\n";

+    }

 

-	/**

-	* gets a wsdl instance from the cache

-	*

-	* @param string $wsdl The URL of the wsdl instance

-	* @return object wsdl The cached wsdl instance, null if the instance is not in the cache

-	* @access public

-	*/

-	function get($wsdl) {

-		$filename = $this->createFilename($wsdl);

-		if ($this->obtainMutex($filename, "r")) {

-			// check for expired WSDL that must be removed from the cache

- 			if ($this->cache_lifetime > 0) {

-				if (file_exists($filename) && (time() - filemtime($filename) > $this->cache_lifetime)) {

-					unlink($filename);

-					$this->debug("Expired $wsdl ($filename) from cache");

-					$this->releaseMutex($filename);

-					return null;

-  				}

-			}

-			// see what there is to return

-			if (!file_exists($filename)) {

-				$this->debug("$wsdl ($filename) not in cache (1)");

-				$this->releaseMutex($filename);

-				return null;

-			}

-			$fp = @fopen($filename, "r");

-			if ($fp) {

-				$s = implode("", @file($filename));

-				fclose($fp);

-				$this->debug("Got $wsdl ($filename) from cache");

-			} else {

-				$s = null;

-				$this->debug("$wsdl ($filename) not in cache (2)");

-			}

-			$this->releaseMutex($filename);

-			return (!is_null($s)) ? unserialize($s) : null;

-		} else {

-			$this->debug("Unable to obtain mutex for $filename in get");

-		}

-		return null;

-	}

+    /**

+     * gets a wsdl instance from the cache

+     *

+     * @param string $wsdl The URL of the wsdl instance

+     * @return object wsdl The cached wsdl instance, null if the instance is not in the cache

+     * @access public

+     */

+    function get($wsdl) {

+        $filename = $this->createFilename($wsdl);

+        if ($this->obtainMutex($filename, "r")) {

+            // check for expired WSDL that must be removed from the cache

+                if ($this->cache_lifetime > 0) {

+                if (file_exists($filename) && (time() - filemtime($filename) > $this->cache_lifetime)) {

+                    unlink($filename);

+                    $this->debug("Expired $wsdl ($filename) from cache");

+                    $this->releaseMutex($filename);

+                    return null;

+                    }

+            }

+            // see what there is to return

+            if (!file_exists($filename)) {

+                $this->debug("$wsdl ($filename) not in cache (1)");

+                $this->releaseMutex($filename);

+                return null;

+            }

+            $fp = @fopen($filename, "r");

+            if ($fp) {

+                $s = implode("", @file($filename));

+                fclose($fp);

+                $this->debug("Got $wsdl ($filename) from cache");

+            } else {

+                $s = null;

+                $this->debug("$wsdl ($filename) not in cache (2)");

+            }

+            $this->releaseMutex($filename);

+            return (!is_null($s)) ? unserialize($s) : null;

+        } else {

+            $this->debug("Unable to obtain mutex for $filename in get");

+        }

+        return null;

+    }

 

-	/**

-	* obtains the local mutex

-	*

-	* @param string $filename The Filename of the Cache to lock

-	* @param string $mode The open-mode ("r" or "w") or the file - affects lock-mode

-	* @return boolean Lock successfully obtained ?!

-	* @access private

-	*/

-	function obtainMutex($filename, $mode) {

-		if (isset($this->fplock[md5($filename)])) {

-			$this->debug("Lock for $filename already exists");

-			return false;

-		}

-		$this->fplock[md5($filename)] = fopen($filename.".lock", "w");

-		if ($mode == "r") {

-			return flock($this->fplock[md5($filename)], LOCK_SH);

-		} else {

-			return flock($this->fplock[md5($filename)], LOCK_EX);

-		}

-	}

+    /**

+     * obtains the local mutex

+     *

+     * @param string $filename The Filename of the Cache to lock

+     * @param string $mode The open-mode ("r" or "w") or the file - affects lock-mode

+     * @return boolean Lock successfully obtained ?!

+     * @access private

+     */

+    function obtainMutex($filename, $mode) {

+        if (isset($this->fplock[md5($filename)])) {

+            $this->debug("Lock for $filename already exists");

+            return false;

+        }

+        $this->fplock[md5($filename)] = fopen($filename.".lock", "w");

+        if ($mode == "r") {

+            return flock($this->fplock[md5($filename)], LOCK_SH);

+        } else {

+            return flock($this->fplock[md5($filename)], LOCK_EX);

+        }

+    }

 

-	/**

-	* adds a wsdl instance to the cache

-	*

-	* @param object wsdl $wsdl_instance The wsdl instance to add

-	* @return boolean WSDL successfully cached

-	* @access public

-	*/

-	function put($wsdl_instance) {

-		$filename = $this->createFilename($wsdl_instance->wsdl);

-		$s = serialize($wsdl_instance);

-		if ($this->obtainMutex($filename, "w")) {

-			$fp = fopen($filename, "w");

-			if (! $fp) {

-				$this->debug("Cannot write $wsdl_instance->wsdl ($filename) in cache");

-				$this->releaseMutex($filename);

-				return false;

-			}

-			fputs($fp, $s);

-			fclose($fp);

-			$this->debug("Put $wsdl_instance->wsdl ($filename) in cache");

-			$this->releaseMutex($filename);

-			return true;

-		} else {

-			$this->debug("Unable to obtain mutex for $filename in put");

-		}

-		return false;

-	}

+    /**

+     * adds a wsdl instance to the cache

+     *

+     * @param object wsdl $wsdl_instance The wsdl instance to add

+     * @return boolean WSDL successfully cached

+     * @access public

+     */

+    function put($wsdl_instance) {

+        $filename = $this->createFilename($wsdl_instance->wsdl);

+        $s = serialize($wsdl_instance);

+        if ($this->obtainMutex($filename, "w")) {

+            $fp = fopen($filename, "w");

+            if (! $fp) {

+                $this->debug("Cannot write $wsdl_instance->wsdl ($filename) in cache");

+                $this->releaseMutex($filename);

+                return false;

+            }

+            fputs($fp, $s);

+            fclose($fp);

+            $this->debug("Put $wsdl_instance->wsdl ($filename) in cache");

+            $this->releaseMutex($filename);

+            return true;

+        } else {

+            $this->debug("Unable to obtain mutex for $filename in put");

+        }

+        return false;

+    }

 

-	/**

-	* releases the local mutex

-	*

-	* @param string $filename The Filename of the Cache to lock

-	* @return boolean Lock successfully released

-	* @access private

-	*/

-	function releaseMutex($filename) {

-		$ret = flock($this->fplock[md5($filename)], LOCK_UN);

-		fclose($this->fplock[md5($filename)]);

-		unset($this->fplock[md5($filename)]);

-		if (! $ret) {

-			$this->debug("Not able to release lock for $filename");

-		}

-		return $ret;

-	}

+    /**

+     * releases the local mutex

+     *

+     * @param string $filename The Filename of the Cache to lock

+     * @return boolean Lock successfully released

+     * @access private

+     */

+    function releaseMutex($filename) {

+        $ret = flock($this->fplock[md5($filename)], LOCK_UN);

+        fclose($this->fplock[md5($filename)]);

+        unset($this->fplock[md5($filename)]);

+        if (! $ret) {

+            $this->debug("Not able to release lock for $filename");

+        }

+        return $ret;

+    }

 

-	/**

-	* removes a wsdl instance from the cache

-	*

-	* @param string $wsdl The URL of the wsdl instance

-	* @return boolean Whether there was an instance to remove

-	* @access public

-	*/

-	function remove($wsdl) {

-		$filename = $this->createFilename($wsdl);

-		if (!file_exists($filename)) {

-			$this->debug("$wsdl ($filename) not in cache to be removed");

-			return false;

-		}

-		// ignore errors obtaining mutex

-		$this->obtainMutex($filename, "w");

-		$ret = unlink($filename);

-		$this->debug("Removed ($ret) $wsdl ($filename) from cache");

-		$this->releaseMutex($filename);

-		return $ret;

-	}

+    /**

+     * removes a wsdl instance from the cache

+     *

+     * @param string $wsdl The URL of the wsdl instance

+     * @return boolean Whether there was an instance to remove

+     * @access public

+     */

+    function remove($wsdl) {

+        $filename = $this->createFilename($wsdl);

+        if (!file_exists($filename)) {

+            $this->debug("$wsdl ($filename) not in cache to be removed");

+            return false;

+        }

+        // ignore errors obtaining mutex

+        $this->obtainMutex($filename, "w");

+        $ret = unlink($filename);

+        $this->debug("Removed ($ret) $wsdl ($filename) from cache");

+        $this->releaseMutex($filename);

+        return $ret;

+    }

 }

 

 /**

Spacing +5 added lines, -5 removed lines

@@ -44,7 +44,7 @@ 
 	* @param integer $cache_lifetime lifetime for caching-files in seconds or 0 for unlimited

 	* @access public

 	*/

-	function nusoap_wsdlcache($cache_dir='.', $cache_lifetime=0) {

+	function nusoap_wsdlcache($cache_dir = '.', $cache_lifetime = 0) {

 		$this->fplock = array();

 		$this->cache_dir = $cache_dir != '' ? $cache_dir : '.';

 		$this->cache_lifetime = $cache_lifetime;

@@ -58,7 +58,7 @@ 
 	* @access private

 	*/

 	function createFilename($wsdl) {

-		return $this->cache_dir.'/wsdlcache-' . md5($wsdl);

+		return $this->cache_dir.'/wsdlcache-'.md5($wsdl);

 	}

 

 	/**

@@ -67,7 +67,7 @@ 
 	* @param    string $string debug data

 	* @access   private

 	*/

-	function debug($string){

+	function debug($string) {

 		$this->debug_str .= get_class($this).": $string\n";

 	}

 

@@ -146,7 +146,7 @@ 
 		$s = serialize($wsdl_instance);

 		if ($this->obtainMutex($filename, "w")) {

 			$fp = fopen($filename, "w");

-			if (! $fp) {

+			if (!$fp) {

 				$this->debug("Cannot write $wsdl_instance->wsdl ($filename) in cache");

 				$this->releaseMutex($filename);

 				return false;

@@ -173,7 +173,7 @@ 
 		$ret = flock($this->fplock[md5($filename)], LOCK_UN);

 		fclose($this->fplock[md5($filename)]);

 		unset($this->fplock[md5($filename)]);

-		if (! $ret) {

+		if (!$ret) {

 			$this->debug("Not able to release lock for $filename");

 		}

 		return $ret;

main/inc/lib/link.lib.php

Spacing +108 added lines, -108 removed lines

@@ -77,11 +77,11 @@ 
         $params['session_id'] = api_get_session_id();
         $params['category_id'] = isset($params['category_id']) ? $params['category_id'] : 0;
 
-        $sql =  "SELECT MAX(display_order)
+        $sql = "SELECT MAX(display_order)
                 FROM  ".$this->table."
                 WHERE
                     c_id = $courseId AND
-                    category_id = '" . intval($params['category_id'])."'";
+                    category_id = '".intval($params['category_id'])."'";
         $result = Database:: query($sql);
         list ($orderMax) = Database:: fetch_row($result);
         $order = $orderMax + 1;
@@ -185,7 +185,7 @@ 
 
             // We ensure URL to be absolute.
             if (strpos($urllink, '://') === false) {
-                $urllink = 'http://' . $urllink;
+                $urllink = 'http://'.$urllink;
             }
 
             // If the title is empty, we use the URL as title.
@@ -207,7 +207,7 @@ 
                     'c_id' => $course_id,
                     'url' => $urllink,
                     'title' => $title,
-                    'description' => $description ,
+                    'description' => $description,
                     'category_id' => $selectcategory,
                     'on_homepage' => $onhomepage,
                     'target' => $target,
@@ -220,9 +220,9 @@ 
                 if ((api_get_setting('search_enabled') == 'true') &&
                     $link_id && extension_loaded('xapian')
                 ) {
-                    require_once api_get_path(LIBRARY_PATH) . 'search/ChamiloIndexer.class.php';
-                    require_once api_get_path(LIBRARY_PATH) . 'search/IndexableChunk.class.php';
-                    require_once api_get_path(LIBRARY_PATH) . 'specific_fields_manager.lib.php';
+                    require_once api_get_path(LIBRARY_PATH).'search/ChamiloIndexer.class.php';
+                    require_once api_get_path(LIBRARY_PATH).'search/IndexableChunk.class.php';
+                    require_once api_get_path(LIBRARY_PATH).'specific_fields_manager.lib.php';
 
                     $course_int_id = $_course['real_id'];
                     $courseCode = $_course['code'];
@@ -235,7 +235,7 @@ 
                         if (isset ($_REQUEST[$specific_field['code']])) {
                             $sterms = trim($_REQUEST[$specific_field['code']]);
                             if (!empty ($sterms)) {
-                                $all_specific_terms .= ' ' . $sterms;
+                                $all_specific_terms .= ' '.$sterms;
                                 $sterms = explode(',', $sterms);
                                 foreach ($sterms as $sterm) {
                                     $ic_slide->addTerm(
@@ -262,12 +262,12 @@ 
                         SE_COURSE_ID => $courseCode,
                         SE_TOOL_ID => TOOL_LINK,
                         SE_DATA => array(
-                            'link_id' => (int)$link_id
+                            'link_id' => (int) $link_id
                         ),
-                        SE_USER => (int)api_get_user_id(),
+                        SE_USER => (int) api_get_user_id(),
                     );
                     $ic_slide->xapian_data = serialize($xapian_data);
-                    $description = $all_specific_terms . ' ' . $description;
+                    $description = $all_specific_terms.' '.$description;
                     $ic_slide->addValue('content', $description);
 
                     // Add category name if set.
@@ -279,7 +279,7 @@ 
                         $sql_cat = sprintf(
                             $sql_cat,
                             $table_link_category,
-                            (int)$selectcategory,
+                            (int) $selectcategory,
                             $course_int_id
                         );
                         $result = Database:: query($sql_cat);
@@ -399,7 +399,7 @@ 
                 // This will make a restore function possible for the platform administrator.
 
                 $sql = "UPDATE $tbl_link SET on_homepage='0'
-                        WHERE c_id = $course_id AND id='" . $id . "'";
+                        WHERE c_id = $course_id AND id='".$id."'";
                 Database:: query($sql);
 
                 api_item_property_update(
@@ -415,12 +415,12 @@ 
                 break;
             case 'category':
                 // First we delete the category itself and afterwards all the links of this category.
-                $sql = "DELETE FROM " . $tbl_categories . "
-                        WHERE c_id = $course_id AND id='" . $id . "'";
+                $sql = "DELETE FROM ".$tbl_categories."
+                        WHERE c_id = $course_id AND id='".$id."'";
                 Database:: query($sql);
 
-                $sql = "DELETE FROM " . $tbl_link . "
-                        WHERE c_id = $course_id AND category_id='" . $id . "'";
+                $sql = "DELETE FROM ".$tbl_link."
+                        WHERE c_id = $course_id AND category_id='".$id."'";
                 Database:: query($sql);
 
                 api_item_property_update(
@@ -459,16 +459,16 @@ 
                 $row = Database:: fetch_array($res);
                 require_once api_get_path(
                         LIBRARY_PATH
-                    ) . 'search/ChamiloIndexer.class.php';
+                    ).'search/ChamiloIndexer.class.php';
                 $di = new ChamiloIndexer();
-                $di->remove_document((int)$row['search_did']);
+                $di->remove_document((int) $row['search_did']);
             }
             $sql = 'DELETE FROM %s WHERE course_code=\'%s\' AND tool_id=\'%s\' AND ref_id_high_level=%s LIMIT 1';
             $sql = sprintf($sql, $tbl_se_ref, $course_id, TOOL_LINK, $link_id);
             Database:: query($sql);
 
             // Remove terms from db.
-            require_once api_get_path(LIBRARY_PATH) . 'specific_fields_manager.lib.php';
+            require_once api_get_path(LIBRARY_PATH).'specific_fields_manager.lib.php';
             delete_all_values_for_item($course_id, TOOL_DOCUMENT, $link_id);
         }
     }
@@ -484,8 +484,8 @@ 
     {
         $tbl_link = Database:: get_course_table(TABLE_LINK);
         $course_id = api_get_course_int_id();
-        $sql = "SELECT * FROM " . $tbl_link . "
-                WHERE c_id = $course_id AND id='" . intval($id) . "' ";
+        $sql = "SELECT * FROM ".$tbl_link."
+                WHERE c_id = $course_id AND id='".intval($id)."' ";
         $result = Database::query($sql);
         $data = array();
         if (Database::num_rows($result)) {
@@ -514,7 +514,7 @@ 
 
         // We ensure URL to be absolute.
         if (strpos($values['url'], '://') === false) {
-            $values['url'] = 'http://' . $_POST['url'];
+            $values['url'] = 'http://'.$_POST['url'];
         }
 
         // If the title is empty, we use the URL as title.
@@ -532,18 +532,18 @@ 
         }
 
         // Finding the old category_id.
-        $sql = "SELECT * FROM " . $tbl_link . "
-                WHERE c_id = $course_id AND id='" . $id . "'";
+        $sql = "SELECT * FROM ".$tbl_link."
+                WHERE c_id = $course_id AND id='".$id."'";
         $result = Database:: query($sql);
         $row = Database:: fetch_array($result);
         $category_id = $row['category_id'];
 
         if ($category_id != $values['category_id']) {
             $sql = "SELECT MAX(display_order)
-                    FROM " . $tbl_link . "
+                    FROM " . $tbl_link."
                     WHERE
                         c_id = $course_id AND
-                        category_id='" . intval($values['category_id']) . "'";
+                        category_id='".intval($values['category_id'])."'";
             $result = Database:: query($sql);
             list ($max_display_order) = Database:: fetch_row($result);
             $max_display_order++;
@@ -560,7 +560,7 @@ 
             'target' => $values['target'],
             'category_id' => $values['category_id'],
         ];
-        Database::update($tbl_link, $params, ['c_id = ? AND id = ?' => [$course_id, $id] ]);
+        Database::update($tbl_link, $params, ['c_id = ? AND id = ?' => [$course_id, $id]]);
 
         // Update search enchine and its values table if enabled.
         if (api_get_setting('search_enabled') == 'true') {
@@ -613,7 +613,7 @@ 
                             $_REQUEST[$specific_field['code']]
                         );
                         if (!empty ($sterms)) {
-                            $all_specific_terms .= ' ' . $sterms;
+                            $all_specific_terms .= ' '.$sterms;
                             $sterms = explode(',', $sterms);
                             foreach ($sterms as $sterm) {
                                 $ic_slide->addTerm(
@@ -640,13 +640,13 @@ 
                     SE_COURSE_ID => $course_id,
                     SE_TOOL_ID => TOOL_LINK,
                     SE_DATA => array(
-                        'link_id' => (int)$id
+                        'link_id' => (int) $id
                     ),
-                    SE_USER => (int)api_get_user_id(),
+                    SE_USER => (int) api_get_user_id(),
 
                 );
                 $ic_slide->xapian_data = serialize($xapian_data);
-                $link_description = $all_specific_terms . ' ' . $link_description;
+                $link_description = $all_specific_terms.' '.$link_description;
                 $ic_slide->addValue('content', $link_description);
 
                 // Add category name if set.
@@ -674,7 +674,7 @@ 
                 $di = new ChamiloIndexer();
                 isset ($_POST['language']) ? $lang = Database:: escape_string($_POST['language']) : $lang = 'english';
                 $di->connectDb(null, null, $lang);
-                $di->remove_document((int)$se_ref['search_did']);
+                $di->remove_document((int) $se_ref['search_did']);
                 $di->addChunk($ic_slide);
 
                 // Index and return search engine document id.
@@ -791,7 +791,7 @@ 
         $sql = "SELECT *, linkcat.id
                 FROM $tblLinkCategory linkcat
                 WHERE
-                    linkcat.c_id = " . $courseId . "
+                    linkcat.c_id = ".$courseId."
                     $sessionCondition
                 ORDER BY linkcat.display_order DESC";
 
@@ -803,10 +803,10 @@ 
                 INNER JOIN $tblItemProperty itemproperties
                 ON (linkcat.id = itemproperties.ref AND linkcat.c_id = itemproperties.c_id)
                 WHERE
-                    itemproperties.tool = '" . TOOL_LINK_CATEGORY . "' AND
+                    itemproperties.tool = '".TOOL_LINK_CATEGORY."' AND
                     (itemproperties.visibility = '0' OR itemproperties.visibility = '1')
                     $sessionCondition AND
-                    linkcat.c_id = " . $courseId . "
+                    linkcat.c_id = ".$courseId."
                 ORDER BY linkcat.display_order DESC";
 
         $result = Database::query($sql);
@@ -829,10 +829,10 @@ 
                 INNER JOIN $tblItemProperty itemproperties
                 ON (linkcat.id = itemproperties.ref AND linkcat.c_id = itemproperties.c_id)
                 WHERE
-                    itemproperties.tool = '" . TOOL_LINK_CATEGORY . "' AND
+                    itemproperties.tool = '".TOOL_LINK_CATEGORY."' AND
                     (itemproperties.visibility = '0' OR itemproperties.visibility = '1')
                     $sessionCondition AND
-                    linkcat.c_id = " . $courseId . "
+                    linkcat.c_id = ".$courseId."
                 ORDER BY linkcat.display_order DESC
                 ";
         $result = Database::query($sql);
@@ -864,12 +864,12 @@ 
                 INNER JOIN $TABLE_ITEM_PROPERTY itemproperties
                 ON (link.id=itemproperties.ref AND link.c_id = itemproperties.c_id )
                 WHERE
-                    itemproperties.tool='" . TOOL_LINK . "' AND
-                    link.category_id='" . $catid . "' AND
+                    itemproperties.tool='".TOOL_LINK."' AND
+                    link.category_id='" . $catid."' AND
                     (itemproperties.visibility='0' OR itemproperties.visibility='1')
                     $condition_session AND
-                    link.c_id = " . $course_id . " AND
-                    itemproperties.c_id = " . $course_id . "
+                    link.c_id = ".$course_id." AND
+                    itemproperties.c_id = " . $course_id."
                 ORDER BY link.display_order DESC";
         $result = Database:: query($sql);
         $numberoflinks = Database:: num_rows($result);
@@ -892,14 +892,14 @@ 
                             'retweet',
                             'default btn-sm',
                             array(
-                                'onclick' => "check_url('" . $myrow['id'] . "', '" . addslashes($myrow['url']) . "');",
+                                'onclick' => "check_url('".$myrow['id']."', '".addslashes($myrow['url'])."');",
                                 'title' => get_lang('CheckURL')
                                 )
                             );
                     $link_validator .= Display::span(
                         '',
                         array(
-                            'id' => 'url_id_' . $myrow['id'],
+                            'id' => 'url_id_'.$myrow['id'],
                             'class' => 'check-link'
                             )
                     );
@@ -909,10 +909,10 @@ 
                 if (api_is_allowed_to_edit(null, true)) {
 
                     if ($session_id == $myrow['session_id']) {
-                        $url = api_get_self() . '?' . api_get_cidreq() .
-                            '&action=editlink&category=' . (!empty ($category) ? $category : '') .
-                            '&id=' . $myrow['id'] .
-                            '&category_id=' . $myrow['id'];
+                        $url = api_get_self().'?'.api_get_cidreq().
+                            '&action=editlink&category='.(!empty ($category) ? $category : '').
+                            '&id='.$myrow['id'].
+                            '&category_id='.$myrow['id'];
                         $title = get_lang('Edit');
                         $toolbar .= Display::toolbarButton(
                             '',
@@ -940,10 +940,10 @@ 
                         }*/
 
                         if ($myrow['visibility'] == '1') {
-                            $url .= 'link.php?' . api_get_cidreq() .
-                                '&sec_token=' . $token .
-                                '&action=invisible&id=' . $myrow['id'] .
-                                '&scope=link&category_id=' . $myrow['category_id'];
+                            $url .= 'link.php?'.api_get_cidreq().
+                                '&sec_token='.$token.
+                                '&action=invisible&id='.$myrow['id'].
+                                '&scope=link&category_id='.$myrow['category_id'];
                             $title = get_lang('MakeInvisible');
                             $toolbar .= Display::toolbarButton(
                                 '',
@@ -957,7 +957,7 @@ 
 
                         }
                         if ($myrow['visibility'] == '0') {
-                            $url .= 'link.php?' . api_get_cidreq() .'&sec_token=' . $token .'&action=visible&id=' . $myrow['id'] .'&scope=link&category_id=' . $myrow['category_id'];
+                            $url .= 'link.php?'.api_get_cidreq().'&sec_token='.$token.'&action=visible&id='.$myrow['id'].'&scope=link&category_id='.$myrow['category_id'];
                             $title = get_lang('MakeVisible');
                             $toolbar .= Display::toolbarButton(
                                 '',
@@ -970,8 +970,8 @@ 
                             );
                         }
 
-                        $url .= api_get_self() . '?' . api_get_cidreq() .'&sec_token=' . $token .'&action=deletelink&id=' . $myrow['id'] .'&category_id=' . $myrow['category_id'];
-                        $event = "javascript: if(!confirm('" . get_lang('LinkDelconfirm') . "'))return false;";
+                        $url .= api_get_self().'?'.api_get_cidreq().'&sec_token='.$token.'&action=deletelink&id='.$myrow['id'].'&category_id='.$myrow['category_id'];
+                        $event = "javascript: if(!confirm('".get_lang('LinkDelconfirm')."'))return false;";
                         $title = get_lang('Delete');
 
                         $toolbar .= Display::toolbarButton(
@@ -1012,7 +1012,7 @@ 
                     $content .= '<div class="pull-right"><div class="btn-group">'.$toolbar.'</div></div>';
                     $content .= '<h4 class="list-group-item-heading">';
                     $content .= $iconLink;
-                    $url =  'link_goto.php?' . api_get_cidreq() .'&link_id=' . $myrow['id'] .'&link_url=' . urlencode($myrow['url']);
+                    $url = 'link_goto.php?'.api_get_cidreq().'&link_id='.$myrow['id'].'&link_url='.urlencode($myrow['url']);
                     $content .= Display::tag(
                             'a',
                             Security:: remove_XSS($myrow['title']),
@@ -1025,7 +1025,7 @@ 
                     $content .= $session_img;
                     $content .= '</h4>';
 
-                    $content .= '<p class="list-group-item-text">' . $myrow['description'] . '</p>';
+                    $content .= '<p class="list-group-item-text">'.$myrow['description'].'</p>';
                     $content .= '</div>';
                 } else {
                     if (api_is_allowed_to_edit(null, true)) {
@@ -1033,7 +1033,7 @@ 
                         $content .= '<div class="pull-right"><div class="btn-group">'.$toolbar.'</div></div>';
                         $content .= '<h4 class="list-group-item-heading">';
                         $content .= $iconLink;
-                        $url = 'link_goto.php?' . api_get_cidreq() .'&link_id=' . $myrow['id'] . "&link_url=" . urlencode($myrow['url']);
+                        $url = 'link_goto.php?'.api_get_cidreq().'&link_id='.$myrow['id']."&link_url=".urlencode($myrow['url']);
                         $content .= Display::tag(
                                 'a',
                                 Security:: remove_XSS($myrow['title']),
@@ -1046,7 +1046,7 @@ 
                         $content .= $link_validator;
                         $content .= $session_img;
                         $content .= '</h4>';
-                        $content .= '<p class="list-group-item-text">' . $myrow['description'] . '</p>';
+                        $content .= '<p class="list-group-item-text">'.$myrow['description'].'</p>';
                         $content .= '</div>';
                     }
                 }
@@ -1068,58 +1068,58 @@ 
     {
         $categoryId = $category['id'];
         $token = null;
-        $tools = '<a href="' . api_get_self() . '?' . api_get_cidreq() . '&sec_token=' . $token . '&action=editcategory&id=' . $categoryId . '&category_id=' . $categoryId . '" title=' . get_lang('Modify') . '">' .
+        $tools = '<a href="'.api_get_self().'?'.api_get_cidreq().'&sec_token='.$token.'&action=editcategory&id='.$categoryId.'&category_id='.$categoryId.'" title='.get_lang('Modify').'">'.
             Display:: return_icon(
                 'edit.png',
                 get_lang('Modify'),
                 array(),
                 ICON_SIZE_SMALL
-            ) . '</a>';
+            ).'</a>';
 
         // DISPLAY MOVE UP COMMAND only if it is not the top link.
         if ($currentCategory != 0) {
-            $tools .= '<a href="' . api_get_self() . '?' . api_get_cidreq() . '&sec_token=' . $token . '&action=up&up='.$categoryId.'&category_id='.$categoryId.'" title="'.get_lang('Up').'">'.
+            $tools .= '<a href="'.api_get_self().'?'.api_get_cidreq().'&sec_token='.$token.'&action=up&up='.$categoryId.'&category_id='.$categoryId.'" title="'.get_lang('Up').'">'.
                 Display:: return_icon(
                     'up.png',
                     get_lang('Up'),
                     array(),
                     ICON_SIZE_SMALL
-                ) . '</a>';
+                ).'</a>';
         } else {
             $tools .= Display:: return_icon(
                 'up_na.png',
                 get_lang('Up'),
                 array(),
                 ICON_SIZE_SMALL
-            ) . '</a>';
+            ).'</a>';
         }
 
         // DISPLAY MOVE DOWN COMMAND only if it is not the bottom link.
-        if ($currentCategory < $countCategories-1) {
-            $tools .= '<a href="' . api_get_self() . '?' . api_get_cidreq() .'&sec_token=' . $token .'&action=down&down=' . $categoryId .'&category_id=' . $categoryId . '">'.
+        if ($currentCategory < $countCategories - 1) {
+            $tools .= '<a href="'.api_get_self().'?'.api_get_cidreq().'&sec_token='.$token.'&action=down&down='.$categoryId.'&category_id='.$categoryId.'">'.
                 Display:: return_icon(
                     'down.png',
                     get_lang('Down'),
                     array(),
                     ICON_SIZE_SMALL
-                ) . '</a>';
+                ).'</a>';
         } else {
             $tools .= Display:: return_icon(
                     'down_na.png',
                     get_lang('Down'),
                     array(),
                     ICON_SIZE_SMALL
-                ) . '</a>';
+                ).'</a>';
         }
 
-        $tools .= '<a href="' . api_get_self() . '?' . api_get_cidreq() .'&sec_token=' . $token .'&action=deletecategory&id='.$categoryId.            "&category_id=$categoryId\"
-            onclick=\"javascript: if(!confirm('" . get_lang('CategoryDelconfirm') . "')) return false;\">".
+        $tools .= '<a href="'.api_get_self().'?'.api_get_cidreq().'&sec_token='.$token.'&action=deletecategory&id='.$categoryId."&category_id=$categoryId\"
+            onclick=\"javascript: if(!confirm('".get_lang('CategoryDelconfirm')."')) return false;\">".
             Display:: return_icon(
                 'delete.png',
                 get_lang('Delete'),
                 array(),
                 ICON_SIZE_SMALL
-            ) . '</a>';
+            ).'</a>';
 
         return $tools;
     }
@@ -1166,7 +1166,7 @@ 
             $movetable = $tbl_link;
             // Getting the category of the link.
             if (!empty ($thiscatlinkId)) {
-                $sql = "SELECT category_id FROM " . $movetable . "
+                $sql = "SELECT category_id FROM ".$movetable."
                         WHERE c_id = $courseId AND id='$thiscatlinkId'";
                 $result = Database:: query($sql);
                 $catid = Database:: fetch_array($result);
@@ -1186,7 +1186,7 @@ 
                         ORDER BY display_order $sortDirection";
             } else {
                 $sql = "SELECT id, display_order FROM  $movetable
-                        WHERE c_id = $courseId AND category_id='" . $catid[0] . "'
+                        WHERE c_id = $courseId AND category_id='".$catid[0]."'
                         ORDER BY display_order $sortDirection";
             }
             $linkresult = Database:: query($sql);
@@ -1200,12 +1200,12 @@ 
                     $nextlinkOrder = $sortrow['display_order'];
 
                     Database:: query(
-                        "UPDATE " . $movetable . "
+                        "UPDATE ".$movetable."
                         SET display_order = '$nextlinkOrder'
                         WHERE c_id = $courseId  AND id =  '$thiscatlinkId'"
                     );
                     Database:: query(
-                        "UPDATE " . $movetable . "
+                        "UPDATE ".$movetable."
                         SET display_order = '$thislinkOrder'
                         WHERE c_id = $courseId  AND id =  '$nextlinkId'"
                     );
@@ -1233,10 +1233,10 @@ 
         $course_id = api_get_course_int_id();
 
         $result = Database:: query(
-            "SELECT id FROM " . $tbl_categories . "
-            WHERE c_id = $course_id AND category_title='" . Database::escape_string(
+            "SELECT id FROM ".$tbl_categories."
+            WHERE c_id = $course_id AND category_title='".Database::escape_string(
                 $catname
-            ) . "'"
+            )."'"
         );
         if (Database:: num_rows($result) >= 1 && ($row = Database:: fetch_array(
                 $result
@@ -1246,7 +1246,7 @@ 
         }
 
         $result = Database:: query(
-            "SELECT MAX(display_order) FROM " . $tbl_categories . " WHERE c_id = $course_id "
+            "SELECT MAX(display_order) FROM ".$tbl_categories." WHERE c_id = $course_id "
         );
         list ($max_order) = Database:: fetch_row($result);
 
@@ -1273,12 +1273,12 @@ 
         $tbl_link = Database:: get_course_table(TABLE_LINK);
         $course_id = api_get_course_int_id();
 
-        $urleq = "url='" . Database:: escape_string($url) . "'";
-        $cateq = "category_id=" . intval($cat);
+        $urleq = "url='".Database:: escape_string($url)."'";
+        $cateq = "category_id=".intval($cat);
 
         $result = Database:: query("
             SELECT id FROM $tbl_link
-            WHERE c_id = $course_id AND " . $urleq . ' AND ' . $cateq
+            WHERE c_id = $course_id AND ".$urleq.' AND '.$cateq
         );
 
         if (Database:: num_rows($result) >= 1 && ($row = Database:: fetch_array(
@@ -1286,14 +1286,14 @@ 
             ))
         ) {
             Database:: query(
-                "UPDATE $tbl_link set title='" . Database:: escape_string(
+                "UPDATE $tbl_link set title='".Database:: escape_string(
                     $title
-                ) . "', description='" . Database:: escape_string(
+                )."', description='".Database:: escape_string(
                     $description
-                ) . "'
-                WHERE c_id = $course_id AND  id='" . Database:: escape_string(
+                )."'
+                WHERE c_id = $course_id AND  id='".Database:: escape_string(
                     $row['id']
-                ) . "'"
+                )."'"
             );
 
             $ipu = 'LinkUpdated';
@@ -1302,18 +1302,18 @@ 
             // Add new link
             $result = Database:: query(
                 "SELECT MAX(display_order) FROM  $tbl_link
-                WHERE c_id = $course_id AND category_id='" . intval($cat) . "'"
+                WHERE c_id = $course_id AND category_id='".intval($cat)."'"
             );
             list ($max_order) = Database:: fetch_row($result);
 
             Database:: query(
                 "INSERT INTO $tbl_link (c_id, url, title, description, category_id, display_order, on_homepage)
-                VALUES (" . api_get_course_int_id() . ",
-                '" . Database:: escape_string($url) . "',
-                '" . Database:: escape_string($title) . "',
-                '" . Database:: escape_string($description) . "',
-                '" . intval($cat) . "','" . (intval($max_order) + 1) . "',
-                '" . intval($on_homepage) .
+                VALUES (".api_get_course_int_id().",
+                '" . Database:: escape_string($url)."',
+                '" . Database:: escape_string($title)."',
+                '" . Database:: escape_string($description)."',
+                '" . intval($cat)."','".(intval($max_order) + 1)."',
+                '" . intval($on_homepage).
                 "')"
             );
 
@@ -1391,30 +1391,30 @@ 
                     )
                 ) { // possibly in <...>
                     if (($kwlist = trim($regs[1])) != '') {
-                        $kw = '<i kw="' . htmlspecialchars($kwlist) . '">';
+                        $kw = '<i kw="'.htmlspecialchars($kwlist).'">';
                     } else {
                         $kw = '';
                     }
                     // i.e. assume only one of the $hide_fields will be present
                     // and if found, hide the value as expando property of an <i> tag
                 } elseif (trim($value)) {
-                    $d .= ', ' . $key . ':' . $value;
+                    $d .= ', '.$key.':'.$value;
                 }
             }
         }
         if (!empty($d)) {
-            $d = substr($d, 2) . ' - ';
+            $d = substr($d, 2).' - ';
         }
 
         return Link::put_link(
             $url,
             $cat,
             $title,
-            $kw . ereg_replace(
+            $kw.ereg_replace(
                 '\[((/?(b|big|i|small|sub|sup|u))|br/)\]',
                 '<\\1>',
-                htmlspecialchars($d . $linkdata['description'])
-            ) . ($kw ? '</i>' : ''),
+                htmlspecialchars($d.$linkdata['description'])
+            ).($kw ? '</i>' : ''),
             $linkdata['on_homepage'] ? '1' : '0',
             $linkdata['hidden'] ? '1' : '0'
         );
@@ -1535,19 +1535,19 @@ 
         echo '<div class="actions">';
         if (api_is_allowed_to_edit(null, true)) {
             echo '<a href="'.api_get_self().'?'.api_get_cidreq().'&action=addlink&category_id='.$categoryId.'">'.
-                Display::return_icon('new_link.png', get_lang('LinkAdd'),'',ICON_SIZE_MEDIUM).'</a>';
+                Display::return_icon('new_link.png', get_lang('LinkAdd'), '', ICON_SIZE_MEDIUM).'</a>';
             echo '<a href="'.api_get_self().'?'.api_get_cidreq().'&action=addcategory&category_id='.$categoryId.'">'.
-                Display::return_icon('new_folder.png', get_lang('CategoryAdd'),'',ICON_SIZE_MEDIUM).'</a>';
+                Display::return_icon('new_folder.png', get_lang('CategoryAdd'), '', ICON_SIZE_MEDIUM).'</a>';
         }
 
         $categories = Link::getLinkCategories($course_id, $session_id);
         $count = count($categories);
         if (!empty($count)) {
             echo '<a href="'.api_get_self().'?'.api_get_cidreq().'&action=list&show=none">';
-            echo Display::return_icon('forum_listview.png', get_lang('FlatView'), '', ICON_SIZE_MEDIUM) . ' </a>';
+            echo Display::return_icon('forum_listview.png', get_lang('FlatView'), '', ICON_SIZE_MEDIUM).' </a>';
 
             echo '<a href="'.api_get_self().'?'.api_get_cidreq().'&action=list&show=all">';
-            echo Display::return_icon('forum_nestedview.png', get_lang('NestedView'), '', ICON_SIZE_MEDIUM) . '</a>';
+            echo Display::return_icon('forum_nestedview.png', get_lang('NestedView'), '', ICON_SIZE_MEDIUM).'</a>';
         }
         echo '</div>';
 
@@ -1579,12 +1579,12 @@ 
             $strVisibility = '';
             $visibilityClass = null;
             if ($myrow['visibility'] == '1') {
-                $strVisibility =  '<a href="link.php?' . api_get_cidreq() .  '&sec_token='.$token.'&action=invisible&id=' . $myrow['id'] . '&scope=' . TOOL_LINK_CATEGORY . '" title="' . get_lang('Hide') . '">' .
-                    Display :: return_icon('visible.png', get_lang('Hide'), array (), ICON_SIZE_SMALL) . '</a>';
+                $strVisibility = '<a href="link.php?'.api_get_cidreq().'&sec_token='.$token.'&action=invisible&id='.$myrow['id'].'&scope='.TOOL_LINK_CATEGORY.'" title="'.get_lang('Hide').'">'.
+                    Display :: return_icon('visible.png', get_lang('Hide'), array(), ICON_SIZE_SMALL).'</a>';
             } elseif ($myrow['visibility'] == '0') {
                 $visibilityClass = 'invisible';
-                $strVisibility =  ' <a href="link.php?' . api_get_cidreq() .  '&sec_token='.$token.'&action=visible&id=' . $myrow['id'] . '&scope=' . TOOL_LINK_CATEGORY . '" title="' . get_lang('Show') . '">' .
-                    Display :: return_icon('invisible.png', get_lang('Show'), array (), ICON_SIZE_SMALL) . '</a>';
+                $strVisibility = ' <a href="link.php?'.api_get_cidreq().'&sec_token='.$token.'&action=visible&id='.$myrow['id'].'&scope='.TOOL_LINK_CATEGORY.'" title="'.get_lang('Show').'">'.
+                    Display :: return_icon('invisible.png', get_lang('Show'), array(), ICON_SIZE_SMALL).'</a>';
             }
 
             $header = '';

Doc Comments +10 added lines, -2 removed lines

@@ -477,6 +477,7 @@ 
      *
      * Get link info
      * @param int link id
+     * @param integer $id
      * @return array link info
      *
      **/
@@ -1061,7 +1062,9 @@ 
     /**
      * Displays the edit, delete and move icons
      * @param int   Category ID
-     * @return void
+     * @param integer $currentCategory
+     * @param integer $countCategories
+     * @return string
      * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
      */
     public static function showCategoryAdminTools($category, $currentCategory, $countCategories)
@@ -1225,6 +1228,7 @@ 
     /**
      * CSV file import functions
      * @author René Haentjens , Ghent University
+     * @param string $catname
      */
     public static function get_cat($catname)
     {
@@ -1264,6 +1268,11 @@ 
     /**
      * CSV file import functions
      * @author René Haentjens , Ghent University
+     * @param string $url
+     * @param string $title
+     * @param string $description
+     * @param string $on_homepage
+     * @param string $hidden
      */
     public static function put_link($url, $cat, $title, $description, $on_homepage, $hidden)
     {
@@ -1622,7 +1631,6 @@ 
     /**
      * @param int $linkId
      * @param $action
-     * @param null $urlview
      * @param null $token
      * @return FormValidator
      */