Inspection of "Update gitlog to better ignore language terms mess..." - chamilo/chamilo-lms - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Push — 1.10.x ( ad23de...73a570 )

by Yannick

created 2016-05-20 17:16 UTC

Status

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -5,7 +5,7 @@
 block discarded – undo
  * @since 25/september/2010
  */
 
-require_once '../../../inc/global.inc.php';//hack for Chamilo
+require_once '../../../inc/global.inc.php'; //hack for Chamilo
 api_protect_course_script();
 api_block_anonymous_users();
 if (!isset($_SESSION['draw_dir'])) {

Please login to merge, or discard this patch.

main/inc/lib/svg-edit/extensions/imagelib/index.php 1 patch

Spacing +6 added lines, -6 removed lines patch added patch discarded remove patch

@@ -12,7 +12,7 @@  discard block
 block discarded – undo
 
 $is_allowed_to_edit = api_is_allowed_to_edit(null, true);
 
-$curdirpath='/images/gallery'; //path of library directory
+$curdirpath = '/images/gallery'; //path of library directory
 
 $course_info = api_get_course_info();
 
@@ -36,7 +36,7 @@  discard block
 block discarded – undo
 		$slideshow_extension = strrchr($file, '.');
 		$slideshow_extension = strtolower($slideshow_extension);
 		if (in_array($slideshow_extension, $accepted_extensions)) {
-			$png_svg_files[] =$file;
+			$png_svg_files[] = $file;
 		}
 	}
 }
@@ -47,7 +47,7 @@  discard block
 block discarded – undo
 $style = '<style>';
 $style .= '@import "'.api_get_path(WEB_CSS_PATH).'base.css";';
 $style .= '@import "'.api_get_path(WEB_CSS_PATH).'themes/'.api_get_visual_theme().'/default.css";';
-$style .='</style>';
+$style .= '</style>';
 
 ?>
 <!doctype html>
@@ -59,10 +59,10 @@  discard block
 block discarded – undo
 if (!empty($png_svg_files)) {
 	echo '<h3>'.get_lang('SelectSVGEditImage').'</h3>';
 	echo '<ul>';
-	foreach($png_svg_files as $filename) {
-		$image=$disk_path.$filename;
+	foreach ($png_svg_files as $filename) {
+		$image = $disk_path.$filename;
 
-		if (strpos($filename, "svg")){
+		if (strpos($filename, "svg")) {
 			$new_sizes['width'] = 60;
 			$new_sizes['height'] = 60;
 		}

Please login to merge, or discard this patch.

main/inc/lib/svg-edit/extensions/imagelib/groups.php 1 patch

Spacing +5 added lines, -5 removed lines patch added patch discarded remove patch

@@ -47,7 +47,7 @@  discard block
 block discarded – undo
         $slideshow_extension = strrchr($file, '.');
         $slideshow_extension = strtolower($slideshow_extension);
         if (in_array($slideshow_extension, $accepted_extensions)) {
-            $png_svg_files[] =$file;
+            $png_svg_files[] = $file;
         }
     }
 }
@@ -55,7 +55,7 @@  discard block
 block discarded – undo
 $style = '<style>';
 $style .= '@import "'.api_get_path(WEB_CSS_PATH).'base.css";';
 $style .= '@import "'.api_get_path(WEB_CSS_PATH).'themes/'.api_get_visual_theme().'/default.css";';
-$style .='</style>';
+$style .= '</style>';
 
 ?>
 <!doctype html>
@@ -68,15 +68,15 @@  discard block
 block discarded – undo
 if ((
         $group_properties['doc_state'] == 2 &&
         ($is_allowed_to_edit || GroupManager :: is_user_in_group($_user['user_id'], $groupId))) || $group_properties['doc_state'] == 1
-){
+) {
 
 	if (!empty($png_svg_files)) {
 		echo '<h3>'.get_lang('SelectSVGEditImage').'</h3>';
 		echo '<ul>';
-		foreach($png_svg_files as $filename) {
+		foreach ($png_svg_files as $filename) {
 			$image = $group_disk_path.$filename;
 
-			if (strpos($filename, "svg")){
+			if (strpos($filename, "svg")) {
 				$new_sizes['width'] = 60;
 				$new_sizes['height'] = 60;
 			} else {

Please login to merge, or discard this patch.

main/inc/lib/svg-edit/extensions/imagelib/users.php 1 patch

Spacing +4 added lines, -4 removed lines patch added patch discarded remove patch

@@ -25,14 +25,14 @@  discard block
 block discarded – undo
 		$slideshow_extension = strrchr($file, '.');
 		$slideshow_extension = strtolower($slideshow_extension);
 		if (in_array($slideshow_extension, $accepted_extensions)) {
-			$png_svg_files[] =$file;
+			$png_svg_files[] = $file;
 		}
 	}
 }
 $style = '<style>';
 $style .= '@import "'.api_get_path(WEB_CSS_PATH).'base.css";';
 $style .= '@import "'.api_get_path(WEB_CSS_PATH).'themes/'.api_get_visual_theme().'/default.css";';
-$style .='</style>';
+$style .= '</style>';
 
 ?>
 <!doctype html>
@@ -48,10 +48,10 @@  discard block
 block discarded – undo
 if (!empty($png_svg_files)) {
 	echo '<h3>'.get_lang('SelectSVGEditImage').'</h3>';
 	echo '<ul>';
-	foreach($png_svg_files as $filename) {
+	foreach ($png_svg_files as $filename) {
 		$image = $user_disk_path.$filename;
 
-		if (strpos($filename, "svg")){
+		if (strpos($filename, "svg")) {
 			$new_sizes['width'] = 60;
 			$new_sizes['height'] = 60;
 		} else {

Please login to merge, or discard this patch.

main/inc/lib/group_portal_manager.lib.php 1 patch

Spacing +5 added lines, -5 removed lines patch added patch discarded remove patch

@@ -331,7 +331,7 @@  discard block
 block discarded – undo
             if ($i == $max_level) {
                 $select_part .= "rg$rg_number.group_id as id_$rg_number ";
             } else {
-                $select_part .="rg$rg_number.group_id as id_$rg_number, ";
+                $select_part .= "rg$rg_number.group_id as id_$rg_number, ";
             }
             if ($i == 1) {
                 $cond_part .= "FROM $t_rel_group rg0 LEFT JOIN $t_rel_group rg$i on rg$rg_number.group_id = rg$i.subgroup_id ";
@@ -1334,14 +1334,14 @@  discard block
 block discarded – undo
      */
     public static function get_groups_by_user_count($user_id = null, $relation_type = GROUP_USER_PERMISSION_READER, $with_image = false)
     {
-        $table_group_rel_user	= Database::get_main_table(TABLE_MAIN_USER_REL_GROUP);
-		$tbl_group				= Database::get_main_table(TABLE_MAIN_GROUP);
+        $table_group_rel_user = Database::get_main_table(TABLE_MAIN_USER_REL_GROUP);
+		$tbl_group = Database::get_main_table(TABLE_MAIN_GROUP);
 		$user_id = intval($user_id);
 
 		if ($relation_type == 0) {
 			$where_relation_condition = '';
 		} else {
-			$relation_type 			= intval($relation_type);
+			$relation_type = intval($relation_type);
 			$where_relation_condition = "AND gu.relation_type = $relation_type ";
 		}
 
@@ -1394,7 +1394,7 @@  discard block
 block discarded – undo
 
         // Picture
         $form->addElement('file', 'picture', get_lang('AddPicture'));
-        $allowed_picture_types = array ('jpg', 'jpeg', 'png', 'gif');
+        $allowed_picture_types = array('jpg', 'jpeg', 'png', 'gif');
         $form->addRule('picture', get_lang('OnlyImagesAllowed').' ('.implode(',', $allowed_picture_types).')', 'filetype', $allowed_picture_types);
 
         if (!empty($groupData)) {

Please login to merge, or discard this patch.

main/inc/lib/extra_field.lib.php 1 patch

Spacing +33 added lines, -33 removed lines patch added patch discarded remove patch

@@ -26,19 +26,19 @@  discard block
 block discarded – undo
     );
 
     public $ops = array(
-        'eq' => '=',        //equal
-        'ne' => '<>',       //not equal
-        'lt' => '<',        //less than
-        'le' => '<=',       //less than or equal
-        'gt' => '>',        //greater than
-        'ge' => '>=',       //greater than or equal
-        'bw' => 'LIKE',     //begins with
+        'eq' => '=', //equal
+        'ne' => '<>', //not equal
+        'lt' => '<', //less than
+        'le' => '<=', //less than or equal
+        'gt' => '>', //greater than
+        'ge' => '>=', //greater than or equal
+        'bw' => 'LIKE', //begins with
         'bn' => 'NOT LIKE', //doesn't begin with
-        'in' => 'LIKE',     //is in
+        'in' => 'LIKE', //is in
         'ni' => 'NOT LIKE', //is not in
-        'ew' => 'LIKE',     //ends with
+        'ew' => 'LIKE', //ends with
         'en' => 'NOT LIKE', //doesn't end with
-        'cn' => 'LIKE',     //contains
+        'cn' => 'LIKE', //contains
         'nc' => 'NOT LIKE'  //doesn't contain
     );
 
@@ -323,7 +323,7 @@  discard block
 block discarded – undo
      */
     public static function get_extra_fields_by_handler($handler)
     {
-        $types= array();
+        $types = array();
         $types[self::FIELD_TYPE_TEXT] = get_lang('FieldTypeText');
         $types[self::FIELD_TYPE_TEXTAREA] = get_lang('FieldTypeTextarea');
         $types[self::FIELD_TYPE_RADIO] = get_lang('FieldTypeRadio');
@@ -962,7 +962,7 @@  discard block
 block discarded – undo
                         // chzn-select doesn't work for sessions??
                         $form->addElement(
                             'select',
-                            'extra_' . $field_details['variable'],
+                            'extra_'.$field_details['variable'],
                             $field_details['display_text'],
                             $options,
                             array('id' => 'extra_'.$field_details['variable'])
@@ -1021,7 +1021,7 @@  discard block
 block discarded – undo
 
                         if (!$admin_permissions) {
                             if ($field_details['visible'] == 0) {
-                                $form->freeze('extra_' . $field_details['variable']);
+                                $form->freeze('extra_'.$field_details['variable']);
                             }
                         }
                         break;
@@ -1369,9 +1369,9 @@  discard block
 block discarded – undo
 
                         if (is_array($extraData) && array_key_exists($fieldVariable, $extraData)) {
 
-                            if (file_exists(api_get_path(SYS_UPLOAD_PATH) . $extraData[$fieldVariable])) {
+                            if (file_exists(api_get_path(SYS_UPLOAD_PATH).$extraData[$fieldVariable])) {
                                 $fieldTexts[] = Display::img(
-                                    api_get_path(WEB_UPLOAD_PATH) . $extraData[$fieldVariable],
+                                    api_get_path(WEB_UPLOAD_PATH).$extraData[$fieldVariable],
                                     $field_details['display_text'],
                                     array('width' => '300')
                                 );
@@ -1388,10 +1388,10 @@  discard block
 block discarded – undo
                         $form->applyFilter('extra_'.$field_details['variable'], 'stripslashes');
                         $form->applyFilter('extra_'.$field_details['variable'], 'trim');
 
-                        $allowed_picture_types = array ('jpg', 'jpeg', 'png', 'gif');
+                        $allowed_picture_types = array('jpg', 'jpeg', 'png', 'gif');
                         $form->addRule(
                             'extra_'.$field_details['variable'],
-                            get_lang('OnlyImagesAllowed') . ' ('.implode(',', $allowed_picture_types).')',
+                            get_lang('OnlyImagesAllowed').' ('.implode(',', $allowed_picture_types).')',
                             'filetype',
                             $allowed_picture_types
                         );
@@ -1433,10 +1433,10 @@  discard block
 block discarded – undo
                         if (is_array($extraData) &&
                             array_key_exists($fieldVariable, $extraData)
                         ) {
-                            if (file_exists(api_get_path(SYS_UPLOAD_PATH) . $extraData[$fieldVariable])) {
+                            if (file_exists(api_get_path(SYS_UPLOAD_PATH).$extraData[$fieldVariable])) {
                                 $fieldTexts[] = Display::url(
-                                    api_get_path(WEB_UPLOAD_PATH) . $extraData[$fieldVariable],
-                                    api_get_path(WEB_UPLOAD_PATH) . $extraData[$fieldVariable],
+                                    api_get_path(WEB_UPLOAD_PATH).$extraData[$fieldVariable],
+                                    api_get_path(WEB_UPLOAD_PATH).$extraData[$fieldVariable],
                                     array(
                                         'title' => $field_details['display_text'],
                                         'target' => '_blank'
@@ -1486,12 +1486,12 @@  discard block
 block discarded – undo
                             "extra_{$field_details['variable']}",
                             $field_details['display_text']
                         );
-                        $form->applyFilter('extra_' . $field_details['variable'], 'stripslashes');
+                        $form->applyFilter('extra_'.$field_details['variable'], 'stripslashes');
 
                         if (!$admin_permissions) {
                             if ($field_details['visible'] == 0) {
                                 $form->freeze(
-                                    'extra_' . $field_details['variable']
+                                    'extra_'.$field_details['variable']
                                 );
                             }
                         }
@@ -1502,13 +1502,13 @@  discard block
 block discarded – undo
                             $field_details['display_text']
                         );
                         $form->applyFilter(
-                            'extra_' . $field_details['variable'],
+                            'extra_'.$field_details['variable'],
                             'stripslashes'
                         );
                         if (!$admin_permissions) {
                             if ($field_details['visible'] == 0) {
                                 $form->freeze(
-                                    'extra_' . $field_details['variable']
+                                    'extra_'.$field_details['variable']
                                 );
                             }
                         }
@@ -1518,12 +1518,12 @@  discard block
 block discarded – undo
                             "extra_{$field_details['variable']}",
                             $field_details['display_text']
                         );
-                        $form->applyFilter('extra_' . $field_details['variable'], 'stripslashes');
+                        $form->applyFilter('extra_'.$field_details['variable'], 'stripslashes');
 
                         if (!$admin_permissions) {
                             if ($field_details['visible'] == 0) {
                                 $form->freeze(
-                                    'extra_' . $field_details['variable']
+                                    'extra_'.$field_details['variable']
                                 );
                             }
                         }
@@ -1534,13 +1534,13 @@  discard block
 block discarded – undo
                             $field_details['display_text']
                         );
                         $form->applyFilter(
-                            'extra_' . $field_details['variable'],
+                            'extra_'.$field_details['variable'],
                             'stripslashes'
                         );
                         if (!$admin_permissions) {
                             if ($field_details['visible'] == 0) {
                                 $form->freeze(
-                                    'extra_' . $field_details['variable']
+                                    'extra_'.$field_details['variable']
                                 );
                             }
                         }
@@ -2221,19 +2221,19 @@  discard block
 block discarded – undo
                         break;
                     }
 
-                    if (!file_exists(api_get_path(SYS_UPLOAD_PATH) . $valueData['value'])) {
+                    if (!file_exists(api_get_path(SYS_UPLOAD_PATH).$valueData['value'])) {
                         break;
                     }
 
                     $image = Display::img(
-                        api_get_path(WEB_UPLOAD_PATH) . $valueData['value'],
+                        api_get_path(WEB_UPLOAD_PATH).$valueData['value'],
                         $field['display_text'],
                         array('width' => '300')
                     );
 
                     $displayedValue = Display::url(
                         $image,
-                        api_get_path(WEB_UPLOAD_PATH) . $valueData['value'],
+                        api_get_path(WEB_UPLOAD_PATH).$valueData['value'],
                         array('target' => '_blank')
                     );
                     break;
@@ -2242,13 +2242,13 @@  discard block
 block discarded – undo
                         break;
                     }
 
-                    if (!file_exists(api_get_path(SYS_UPLOAD_PATH) . $valueData['value'])) {
+                    if (!file_exists(api_get_path(SYS_UPLOAD_PATH).$valueData['value'])) {
                         break;
                     }
 
                     $displayedValue = Display::url(
                         get_lang('Download'),
-                        api_get_path(WEB_UPLOAD_PATH) . $valueData['value'],
+                        api_get_path(WEB_UPLOAD_PATH).$valueData['value'],
                         array(
                             'title' => $field['display_text'],
                             'target' => '_blank'

Please login to merge, or discard this patch.

main/inc/lib/skill.visualizer.lib.php 1 patch

Spacing +13 added lines, -13 removed lines patch added patch discarded remove patch

@@ -27,7 +27,7 @@  discard block
 block discarded – undo
     {
         $this->skills   = $skills;
         $this->type     = $type;
-        $this->center_x = intval($offset_x + $this->canvas_x/2 - $this->block_size/2);
+        $this->center_x = intval($offset_x + $this->canvas_x / 2 - $this->block_size / 2);
     }
 
     function prepare_skill_box($skill, $position, $class)
@@ -39,9 +39,9 @@  discard block
 block discarded – undo
             $extra_class = 'second_window';
         }
 
-        $this->html .= '<div id="block_'.$block_id.'" class = "open_block window '.$extra_class.'  '.$class.'" style = "top:' . $position['y'] . 'px; left:' . $position['x'] . 'px;">';
+        $this->html .= '<div id="block_'.$block_id.'" class = "open_block window '.$extra_class.'  '.$class.'" style = "top:'.$position['y'].'px; left:'.$position['x'].'px;">';
 
-        $content =  $skill['name'];
+        $content = $skill['name'];
         $content .= '<div class="btn-group">';
         $content .= Display::url(get_lang('Edit'), '#', array('id'=>'edit_block_'.$block_id, 'class'=>'edit_block btn'));
         $content .= Display::url('+', '#', array('id'=>'edit_block_'.$block_id, 'class'=>'edit_block btn'));
@@ -87,9 +87,9 @@  discard block
 block discarded – undo
         }
         //default_arrow_color
 
-        $this->js .= 'var e'.$block_id.' = prepare("block_' . $block_id.'",  '.$end_point.');'."\n";
-        $this->js .= 'var e'.$skill['parent_id'].' = prepare("block_' . $skill['parent_id'].'",  '.$end_point.');'."\n";
-        $this->js .= 'jsPlumb.connect({source: e'.$block_id.', target:e'.$skill['parent_id'].'});'."\n";;
+        $this->js .= 'var e'.$block_id.' = prepare("block_'.$block_id.'",  '.$end_point.');'."\n";
+        $this->js .= 'var e'.$skill['parent_id'].' = prepare("block_'.$skill['parent_id'].'",  '.$end_point.');'."\n";
+        $this->js .= 'jsPlumb.connect({source: e'.$block_id.', target:e'.$skill['parent_id'].'});'."\n"; ;
     }
 
     /**
@@ -125,10 +125,10 @@  discard block
 block discarded – undo
         $brothers = array();
 
         foreach ($this->skills as &$skill) {
-            if (!in_array($skill['parent_id'], array(0,1))) {
+            if (!in_array($skill['parent_id'], array(0, 1))) {
                 continue;
             }
-            $childs = isset($skill['children']) ? count($skill['children']) : 0 ;
+            $childs = isset($skill['children']) ? count($skill['children']) : 0;
 
             //$x = round($this->offsetX * sin(deg2rad($corner * $count)));
             //$y = round($this->offsetY * cos(deg2rad($corner * $count)));
@@ -144,10 +144,10 @@  discard block
 block discarded – undo
             if ($skill['parent_id'] == 0) {
                 //$x = 130*$childs/2;
                 //$x = $this->space_between_blocks_x*$childs/2;
-                $x = $this->canvas_x/2  - $this->block_size/2;
+                $x = $this->canvas_x / 2 - $this->block_size / 2;
             } else {
                 $max = isset($this->skills[$skill['parent_id']]['children']) ? count($this->skills[$skill['parent_id']]['children']) : 0;
-                foreach($this->skills[$skill['parent_id']]['children'] as  $id => $sk) {
+                foreach ($this->skills[$skill['parent_id']]['children'] as  $id => $sk) {
                     if ($skill['id'] == $sk['id']) {
                         break;
                     }
@@ -155,17 +155,17 @@  discard block
 block discarded – undo
                 }
                 $parent_x = isset($this->skills[$skill['parent_id']]['x']) ? $this->skills[$skill['parent_id']]['x'] : 0;
                 //$x = $my_count*$this->space_between_blocks_x + $parent_x  + $this->block_size - ($this->space_between_blocks_x*$max/2) ;
-                $x = $my_count*$this->space_between_blocks_x + $parent_x  + $this->block_size - ($this->canvas_x/2 ) ;
+                $x = $my_count * $this->space_between_blocks_x + $parent_x + $this->block_size - ($this->canvas_x / 2);
             }
 
-            $y = $skill['level']*$this->space_between_blocks_y;
+            $y = $skill['level'] * $this->space_between_blocks_y;
 
             $skill['x'] = $x;
             $skill['y'] = $y;
 
             //$skill['description']  = "{$brothers[$skill['parent_id']]} $x - $y";
             //$skill['name']  =  $skill['name']."  |  $x = $my_count * 150  +  $parent_x - (150* $max/2) - 10*$childs ";
-            $this->add_item($skill, array('x' => $this->offset_x + $x, 'y' => $this->offset_y +$y));
+            $this->add_item($skill, array('x' => $this->offset_x + $x, 'y' => $this->offset_y + $y));
         }
         return $this->get_html();
     }

Please login to merge, or discard this patch.

main/inc/lib/extra_field_value.lib.php 1 patch

Spacing +8 added lines, -8 removed lines patch added patch discarded remove patch

@@ -209,7 +209,7 @@  discard block
 block discarded – undo
                             break;
                     }
 
-                    $fileName = ExtraField::FIELD_TYPE_FILE_IMAGE . "_{$params['item_id']}.png";
+                    $fileName = ExtraField::FIELD_TYPE_FILE_IMAGE."_{$params['item_id']}.png";
 
                     if (!file_exists($fileDir)) {
                         mkdir($fileDir, $dirPermissions, true);
@@ -217,11 +217,11 @@  discard block
 block discarded – undo
 
                     if ($value['error'] == 0) {
                         $imageExtraField = new Image($value['tmp_name']);
-                        $imageExtraField->send_image($fileDir . $fileName, -1, 'png');
+                        $imageExtraField->send_image($fileDir.$fileName, -1, 'png');
                         $newParams = array(
                             'item_id' => $params['item_id'],
                             'field_id' => $extraFieldInfo['id'],
-                            'value' => $fileDirStored . $fileName,
+                            'value' => $fileDirStored.$fileName,
                             'comment' => $comment
                         );
 
@@ -247,18 +247,18 @@  discard block
 block discarded – undo
                     }
 
                     $cleanedName = api_replace_dangerous_char($value['name']);
-                    $fileName = ExtraField::FIELD_TYPE_FILE . "_{$params['item_id']}_$cleanedName";
+                    $fileName = ExtraField::FIELD_TYPE_FILE."_{$params['item_id']}_$cleanedName";
                     if (!file_exists($fileDir)) {
                         mkdir($fileDir, $dirPermissions, true);
                     }
 
                     if ($value['error'] == 0) {
-                        moveUploadedFile($value, $fileDir . $fileName);
+                        moveUploadedFile($value, $fileDir.$fileName);
 
                         $new_params = array(
                             'item_id' => $params['item_id'],
                             'field_id' => $extraFieldInfo['id'],
-                            'value' => $fileDirStored . $fileName
+                            'value' => $fileDirStored.$fileName
                         );
 
                         if ($this->type !== 'session' && $this->type !== 'course') {
@@ -380,7 +380,7 @@  discard block
 block discarded – undo
                 */
                 if (false) {
                     global $app;
-                    switch($this->type) {
+                    switch ($this->type) {
                         case 'question':
                             $extraFieldValue = new ChamiloLMS\Entity\QuestionFieldValues();
                             $extraFieldValue->setUserId(api_get_user_id());
@@ -442,7 +442,7 @@  discard block
 block discarded – undo
                 */
                 if (false) {
                     global $app;
-                    switch($this->type) {
+                    switch ($this->type) {
                         case 'question':
                             $extraFieldValue = $app['orm.ems']['db_write']->getRepository('ChamiloLMS\Entity\QuestionFieldValues')->find($field_values['id']);
                             $extraFieldValue->setUserId(api_get_user_id());

Please login to merge, or discard this patch.

main/inc/lib/export.lib.inc.php 1 patch

Spacing +5 added lines, -5 removed lines patch added patch discarded remove patch

@@ -99,7 +99,7 @@  discard block
 block discarded – undo
         }
         foreach ($data as $row) {
             $string = implode("</td><td>", $row);
-            $string = '<tr><td>' . $string . '</td></tr>';
+            $string = '<tr><td>'.$string.'</td></tr>';
             if ($encoding != 'utf-8') {
                 $string = api_convert_encoding($string, $encoding, $systemEncoding);
             }
@@ -173,7 +173,7 @@  discard block
 block discarded – undo
             fwrite($handle, '<'.$wrapper_tagname.'>');
         }
         $s = self::_export_complex_table_xml_helper($data);
-        fwrite($handle,$s);
+        fwrite($handle, $s);
         if (!is_null($wrapper_tagname)) {
             fwrite($handle, '</'.$wrapper_tagname.'>'."\n");
         }
@@ -195,10 +195,10 @@  discard block
 block discarded – undo
         }
         $string = '';
         foreach ($data as $row) {
-            $string .= "\n".str_repeat("\t",$level).'<'.$row['name'].'>';
+            $string .= "\n".str_repeat("\t", $level).'<'.$row['name'].'>';
             if (is_array($row['value'])) {
-            	$string .= self::_export_complex_table_xml_helper($row['value'],$level+1)."\n";
-                $string .= str_repeat("\t",$level).'</'.$row['name'].'>';
+            	$string .= self::_export_complex_table_xml_helper($row['value'], $level + 1)."\n";
+                $string .= str_repeat("\t", $level).'</'.$row['name'].'>';
             } else {
                 $string .= $row['value'];
                 $string .= '</'.$row['name'].'>';

Please login to merge, or discard this patch.

		@@ -331,7 +331,7 @@ discard block
		block discarded – undo
331	331	if ($i == $max_level) {
332	332	$select_part .= "rg$rg_number.group_id as id_$rg_number ";
333	333	} else {
334		- $select_part .="rg$rg_number.group_id as id_$rg_number, ";
	334	+ $select_part .= "rg$rg_number.group_id as id_$rg_number, ";
335	335	}
336	336	if ($i == 1) {
337	337	$cond_part .= "FROM $t_rel_group rg0 LEFT JOIN $t_rel_group rg$i on rg$rg_number.group_id = rg$i.subgroup_id ";
		@@ -1334,14 +1334,14 @@ discard block
		block discarded – undo
1334	1334	*/
1335	1335	public static function get_groups_by_user_count($user_id = null, $relation_type = GROUP_USER_PERMISSION_READER, $with_image = false)
1336	1336	{
1337		- $table_group_rel_user = Database::get_main_table(TABLE_MAIN_USER_REL_GROUP);
1338		- $tbl_group = Database::get_main_table(TABLE_MAIN_GROUP);
	1337	+ $table_group_rel_user = Database::get_main_table(TABLE_MAIN_USER_REL_GROUP);
	1338	+ $tbl_group = Database::get_main_table(TABLE_MAIN_GROUP);
1339	1339	$user_id = intval($user_id);
1340	1340
1341	1341	if ($relation_type == 0) {
1342	1342	$where_relation_condition = '';
1343	1343	} else {
1344		- $relation_type = intval($relation_type);
	1344	+ $relation_type = intval($relation_type);
1345	1345	$where_relation_condition = "AND gu.relation_type = $relation_type ";
1346	1346	}
1347	1347
		@@ -1394,7 +1394,7 @@ discard block
		block discarded – undo
1394	1394
1395	1395	// Picture
1396	1396	$form->addElement('file', 'picture', get_lang('AddPicture'));
1397		- $allowed_picture_types = array ('jpg', 'jpeg', 'png', 'gif');
	1397	+ $allowed_picture_types = array('jpg', 'jpeg', 'png', 'gif');
1398	1398	$form->addRule('picture', get_lang('OnlyImagesAllowed').' ('.implode(',', $allowed_picture_types).')', 'filetype', $allowed_picture_types);
1399	1399
1400	1400	if (!empty($groupData)) {

		@@ -209,7 +209,7 @@ discard block
		block discarded – undo
209	209	break;
210	210	}
211	211
212		- $fileName = ExtraField::FIELD_TYPE_FILE_IMAGE . "_{$params['item_id']}.png";
	212	+ $fileName = ExtraField::FIELD_TYPE_FILE_IMAGE."_{$params['item_id']}.png";
213	213
214	214	if (!file_exists($fileDir)) {
215	215	mkdir($fileDir, $dirPermissions, true);
		@@ -217,11 +217,11 @@ discard block
		block discarded – undo
217	217
218	218	if ($value['error'] == 0) {
219	219	$imageExtraField = new Image($value['tmp_name']);
220		- $imageExtraField->send_image($fileDir . $fileName, -1, 'png');
	220	+ $imageExtraField->send_image($fileDir.$fileName, -1, 'png');
221	221	$newParams = array(
222	222	'item_id' => $params['item_id'],
223	223	'field_id' => $extraFieldInfo['id'],
224		- 'value' => $fileDirStored . $fileName,
	224	+ 'value' => $fileDirStored.$fileName,
225	225	'comment' => $comment
226	226	);
227	227
		@@ -247,18 +247,18 @@ discard block
		block discarded – undo
247	247	}
248	248
249	249	$cleanedName = api_replace_dangerous_char($value['name']);
250		- $fileName = ExtraField::FIELD_TYPE_FILE . "_{$params['item_id']}_$cleanedName";
	250	+ $fileName = ExtraField::FIELD_TYPE_FILE."_{$params['item_id']}_$cleanedName";
251	251	if (!file_exists($fileDir)) {
252	252	mkdir($fileDir, $dirPermissions, true);
253	253	}
254	254
255	255	if ($value['error'] == 0) {
256		- moveUploadedFile($value, $fileDir . $fileName);
	256	+ moveUploadedFile($value, $fileDir.$fileName);
257	257
258	258	$new_params = array(
259	259	'item_id' => $params['item_id'],
260	260	'field_id' => $extraFieldInfo['id'],
261		- 'value' => $fileDirStored . $fileName
	261	+ 'value' => $fileDirStored.$fileName
262	262	);
263	263
264	264	if ($this->type !== 'session' && $this->type !== 'course') {
		@@ -380,7 +380,7 @@ discard block
		block discarded – undo
380	380	*/
381	381	if (false) {
382	382	global $app;
383		- switch($this->type) {
	383	+ switch ($this->type) {
384	384	case 'question':
385	385	$extraFieldValue = new ChamiloLMS\Entity\QuestionFieldValues();
386	386	$extraFieldValue->setUserId(api_get_user_id());
		@@ -442,7 +442,7 @@ discard block
		block discarded – undo
442	442	*/
443	443	if (false) {
444	444	global $app;
445		- switch($this->type) {
	445	+ switch ($this->type) {
446	446	case 'question':
447	447	$extraFieldValue = $app['orm.ems']['db_write']->getRepository('ChamiloLMS\Entity\QuestionFieldValues')->find($field_values['id']);
448	448	$extraFieldValue->setUserId(api_get_user_id());

		@@ -5,7 +5,7 @@
		block discarded – undo
5	5	* @since 25/september/2010
6	6	*/
7	7
8		-require_once '../../../inc/global.inc.php';//hack for Chamilo
	8	+require_once '../../../inc/global.inc.php'; //hack for Chamilo
9	9	api_protect_course_script();
10	10	api_block_anonymous_users();
11	11	if (!isset($_SESSION['draw_dir'])) {

		@@ -12,7 +12,7 @@ discard block
		block discarded – undo
12	12
13	13	$is_allowed_to_edit = api_is_allowed_to_edit(null, true);
14	14
15		-$curdirpath='/images/gallery'; //path of library directory
	15	+$curdirpath = '/images/gallery'; //path of library directory
16	16
17	17	$course_info = api_get_course_info();
18	18
		@@ -36,7 +36,7 @@ discard block
		block discarded – undo
36	36	$slideshow_extension = strrchr($file, '.');
37	37	$slideshow_extension = strtolower($slideshow_extension);
38	38	if (in_array($slideshow_extension, $accepted_extensions)) {
39		- $png_svg_files[] =$file;
	39	+ $png_svg_files[] = $file;
40	40	}
41	41	}
42	42	}
		@@ -47,7 +47,7 @@ discard block
		block discarded – undo
47	47	$style = '<style>';
48	48	$style .= '@import "'.api_get_path(WEB_CSS_PATH).'base.css";';
49	49	$style .= '@import "'.api_get_path(WEB_CSS_PATH).'themes/'.api_get_visual_theme().'/default.css";';
50		-$style .='</style>';
	50	+$style .= '</style>';
51	51
52	52	?>
53	53	<!doctype html>
		@@ -59,10 +59,10 @@ discard block
		block discarded – undo
59	59	if (!empty($png_svg_files)) {
60	60	echo '<h3>'.get_lang('SelectSVGEditImage').'</h3>';
61	61	echo '<ul>';
62		- foreach($png_svg_files as $filename) {
63		- $image=$disk_path.$filename;
	62	+ foreach ($png_svg_files as $filename) {
	63	+ $image = $disk_path.$filename;
64	64
65		- if (strpos($filename, "svg")){
	65	+ if (strpos($filename, "svg")) {
66	66	$new_sizes['width'] = 60;
67	67	$new_sizes['height'] = 60;
68	68	}

		@@ -25,14 +25,14 @@ discard block
		block discarded – undo
25	25	$slideshow_extension = strrchr($file, '.');
26	26	$slideshow_extension = strtolower($slideshow_extension);
27	27	if (in_array($slideshow_extension, $accepted_extensions)) {
28		- $png_svg_files[] =$file;
	28	+ $png_svg_files[] = $file;
29	29	}
30	30	}
31	31	}
32	32	$style = '<style>';
33	33	$style .= '@import "'.api_get_path(WEB_CSS_PATH).'base.css";';
34	34	$style .= '@import "'.api_get_path(WEB_CSS_PATH).'themes/'.api_get_visual_theme().'/default.css";';
35		-$style .='</style>';
	35	+$style .= '</style>';
36	36
37	37	?>
38	38	<!doctype html>
		@@ -48,10 +48,10 @@ discard block
		block discarded – undo
48	48	if (!empty($png_svg_files)) {
49	49	echo '<h3>'.get_lang('SelectSVGEditImage').'</h3>';
50	50	echo '<ul>';
51		- foreach($png_svg_files as $filename) {
	51	+ foreach ($png_svg_files as $filename) {
52	52	$image = $user_disk_path.$filename;
53	53
54		- if (strpos($filename, "svg")){
	54	+ if (strpos($filename, "svg")) {
55	55	$new_sizes['width'] = 60;
56	56	$new_sizes['height'] = 60;
57	57	} else {

		@@ -26,19 +26,19 @@ discard block
		block discarded – undo
26	26	);
27	27
28	28	public $ops = array(
29		- 'eq' => '=', //equal
30		- 'ne' => '<>', //not equal
31		- 'lt' => '<', //less than
32		- 'le' => '<=', //less than or equal
33		- 'gt' => '>', //greater than
34		- 'ge' => '>=', //greater than or equal
35		- 'bw' => 'LIKE', //begins with
	29	+ 'eq' => '=', //equal
	30	+ 'ne' => '<>', //not equal
	31	+ 'lt' => '<', //less than
	32	+ 'le' => '<=', //less than or equal
	33	+ 'gt' => '>', //greater than
	34	+ 'ge' => '>=', //greater than or equal
	35	+ 'bw' => 'LIKE', //begins with
36	36	'bn' => 'NOT LIKE', //doesn't begin with
37		- 'in' => 'LIKE', //is in
	37	+ 'in' => 'LIKE', //is in
38	38	'ni' => 'NOT LIKE', //is not in
39		- 'ew' => 'LIKE', //ends with
	39	+ 'ew' => 'LIKE', //ends with
40	40	'en' => 'NOT LIKE', //doesn't end with
41		- 'cn' => 'LIKE', //contains
	41	+ 'cn' => 'LIKE', //contains
42	42	'nc' => 'NOT LIKE' //doesn't contain
43	43	);
44	44
		@@ -323,7 +323,7 @@ discard block
		block discarded – undo
323	323	*/
324	324	public static function get_extra_fields_by_handler($handler)
325	325	{
326		- $types= array();
	326	+ $types = array();
327	327	$types[self::FIELD_TYPE_TEXT] = get_lang('FieldTypeText');
328	328	$types[self::FIELD_TYPE_TEXTAREA] = get_lang('FieldTypeTextarea');
329	329	$types[self::FIELD_TYPE_RADIO] = get_lang('FieldTypeRadio');
		@@ -962,7 +962,7 @@ discard block
		block discarded – undo
962	962	// chzn-select doesn't work for sessions??
963	963	$form->addElement(
964	964	'select',
965		- 'extra_' . $field_details['variable'],
	965	+ 'extra_'.$field_details['variable'],
966	966	$field_details['display_text'],
967	967	$options,
968	968	array('id' => 'extra_'.$field_details['variable'])
		@@ -1021,7 +1021,7 @@ discard block
		block discarded – undo
1021	1021
1022	1022	if (!$admin_permissions) {
1023	1023	if ($field_details['visible'] == 0) {
1024		- $form->freeze('extra_' . $field_details['variable']);
	1024	+ $form->freeze('extra_'.$field_details['variable']);
1025	1025	}
1026	1026	}
1027	1027	break;
		@@ -1369,9 +1369,9 @@ discard block
		block discarded – undo
1369	1369
1370	1370	if (is_array($extraData) && array_key_exists($fieldVariable, $extraData)) {
1371	1371
1372		- if (file_exists(api_get_path(SYS_UPLOAD_PATH) . $extraData[$fieldVariable])) {
	1372	+ if (file_exists(api_get_path(SYS_UPLOAD_PATH).$extraData[$fieldVariable])) {
1373	1373	$fieldTexts[] = Display::img(
1374		- api_get_path(WEB_UPLOAD_PATH) . $extraData[$fieldVariable],
	1374	+ api_get_path(WEB_UPLOAD_PATH).$extraData[$fieldVariable],
1375	1375	$field_details['display_text'],
1376	1376	array('width' => '300')
1377	1377	);
		@@ -1388,10 +1388,10 @@ discard block
		block discarded – undo
1388	1388	$form->applyFilter('extra_'.$field_details['variable'], 'stripslashes');
1389	1389	$form->applyFilter('extra_'.$field_details['variable'], 'trim');
1390	1390
1391		- $allowed_picture_types = array ('jpg', 'jpeg', 'png', 'gif');
	1391	+ $allowed_picture_types = array('jpg', 'jpeg', 'png', 'gif');
1392	1392	$form->addRule(
1393	1393	'extra_'.$field_details['variable'],
1394		- get_lang('OnlyImagesAllowed') . ' ('.implode(',', $allowed_picture_types).')',
	1394	+ get_lang('OnlyImagesAllowed').' ('.implode(',', $allowed_picture_types).')',
1395	1395	'filetype',
1396	1396	$allowed_picture_types
1397	1397	);
		@@ -1433,10 +1433,10 @@ discard block
		block discarded – undo
1433	1433	if (is_array($extraData) &&
1434	1434	array_key_exists($fieldVariable, $extraData)
1435	1435	) {
1436		- if (file_exists(api_get_path(SYS_UPLOAD_PATH) . $extraData[$fieldVariable])) {
	1436	+ if (file_exists(api_get_path(SYS_UPLOAD_PATH).$extraData[$fieldVariable])) {
1437	1437	$fieldTexts[] = Display::url(
1438		- api_get_path(WEB_UPLOAD_PATH) . $extraData[$fieldVariable],
1439		- api_get_path(WEB_UPLOAD_PATH) . $extraData[$fieldVariable],
	1438	+ api_get_path(WEB_UPLOAD_PATH).$extraData[$fieldVariable],
	1439	+ api_get_path(WEB_UPLOAD_PATH).$extraData[$fieldVariable],
1440	1440	array(
1441	1441	'title' => $field_details['display_text'],
1442	1442	'target' => '_blank'
		@@ -1486,12 +1486,12 @@ discard block
		block discarded – undo
1486	1486	"extra_{$field_details['variable']}",
1487	1487	$field_details['display_text']
1488	1488	);
1489		- $form->applyFilter('extra_' . $field_details['variable'], 'stripslashes');
	1489	+ $form->applyFilter('extra_'.$field_details['variable'], 'stripslashes');
1490	1490
1491	1491	if (!$admin_permissions) {
1492	1492	if ($field_details['visible'] == 0) {
1493	1493	$form->freeze(
1494		- 'extra_' . $field_details['variable']
	1494	+ 'extra_'.$field_details['variable']
1495	1495	);
1496	1496	}
1497	1497	}
		@@ -1502,13 +1502,13 @@ discard block
		block discarded – undo
1502	1502	$field_details['display_text']
1503	1503	);
1504	1504	$form->applyFilter(
1505		- 'extra_' . $field_details['variable'],
	1505	+ 'extra_'.$field_details['variable'],
1506	1506	'stripslashes'
1507	1507	);
1508	1508	if (!$admin_permissions) {
1509	1509	if ($field_details['visible'] == 0) {
1510	1510	$form->freeze(
1511		- 'extra_' . $field_details['variable']
	1511	+ 'extra_'.$field_details['variable']
1512	1512	);
1513	1513	}
1514	1514	}
		@@ -1518,12 +1518,12 @@ discard block
		block discarded – undo
1518	1518	"extra_{$field_details['variable']}",
1519	1519	$field_details['display_text']
1520	1520	);
1521		- $form->applyFilter('extra_' . $field_details['variable'], 'stripslashes');
	1521	+ $form->applyFilter('extra_'.$field_details['variable'], 'stripslashes');
1522	1522
1523	1523	if (!$admin_permissions) {
1524	1524	if ($field_details['visible'] == 0) {
1525	1525	$form->freeze(
1526		- 'extra_' . $field_details['variable']
	1526	+ 'extra_'.$field_details['variable']
1527	1527	);
1528	1528	}
1529	1529	}
		@@ -1534,13 +1534,13 @@ discard block
		block discarded – undo
1534	1534	$field_details['display_text']
1535	1535	);
1536	1536	$form->applyFilter(
1537		- 'extra_' . $field_details['variable'],
	1537	+ 'extra_'.$field_details['variable'],
1538	1538	'stripslashes'
1539	1539	);
1540	1540	if (!$admin_permissions) {
1541	1541	if ($field_details['visible'] == 0) {
1542	1542	$form->freeze(
1543		- 'extra_' . $field_details['variable']
	1543	+ 'extra_'.$field_details['variable']
1544	1544	);
1545	1545	}
1546	1546	}
		@@ -2221,19 +2221,19 @@ discard block
		block discarded – undo
2221	2221	break;
2222	2222	}
2223	2223
2224		- if (!file_exists(api_get_path(SYS_UPLOAD_PATH) . $valueData['value'])) {
	2224	+ if (!file_exists(api_get_path(SYS_UPLOAD_PATH).$valueData['value'])) {
2225	2225	break;
2226	2226	}
2227	2227
2228	2228	$image = Display::img(
2229		- api_get_path(WEB_UPLOAD_PATH) . $valueData['value'],
	2229	+ api_get_path(WEB_UPLOAD_PATH).$valueData['value'],
2230	2230	$field['display_text'],
2231	2231	array('width' => '300')
2232	2232	);
2233	2233
2234	2234	$displayedValue = Display::url(
2235	2235	$image,
2236		- api_get_path(WEB_UPLOAD_PATH) . $valueData['value'],
	2236	+ api_get_path(WEB_UPLOAD_PATH).$valueData['value'],
2237	2237	array('target' => '_blank')
2238	2238	);
2239	2239	break;
		@@ -2242,13 +2242,13 @@ discard block
		block discarded – undo
2242	2242	break;
2243	2243	}
2244	2244
2245		- if (!file_exists(api_get_path(SYS_UPLOAD_PATH) . $valueData['value'])) {
	2245	+ if (!file_exists(api_get_path(SYS_UPLOAD_PATH).$valueData['value'])) {
2246	2246	break;
2247	2247	}
2248	2248
2249	2249	$displayedValue = Display::url(
2250	2250	get_lang('Download'),
2251		- api_get_path(WEB_UPLOAD_PATH) . $valueData['value'],
	2251	+ api_get_path(WEB_UPLOAD_PATH).$valueData['value'],
2252	2252	array(
2253	2253	'title' => $field['display_text'],
2254	2254	'target' => '_blank'

		@@ -27,7 +27,7 @@ discard block
		block discarded – undo
27	27	{
28	28	$this->skills = $skills;
29	29	$this->type = $type;
30		- $this->center_x = intval($offset_x + $this->canvas_x/2 - $this->block_size/2);
	30	+ $this->center_x = intval($offset_x + $this->canvas_x / 2 - $this->block_size / 2);
31	31	}
32	32
33	33	function prepare_skill_box($skill, $position, $class)
		@@ -39,9 +39,9 @@ discard block
		block discarded – undo
39	39	$extra_class = 'second_window';
40	40	}
41	41
42		- $this->html .= '<div id="block_'.$block_id.'" class = "open_block window '.$extra_class.' '.$class.'" style = "top:' . $position['y'] . 'px; left:' . $position['x'] . 'px;">';
	42	+ $this->html .= '<div id="block_'.$block_id.'" class = "open_block window '.$extra_class.' '.$class.'" style = "top:'.$position['y'].'px; left:'.$position['x'].'px;">';
43	43
44		- $content = $skill['name'];
	44	+ $content = $skill['name'];
45	45	$content .= '<div class="btn-group">';
46	46	$content .= Display::url(get_lang('Edit'), '#', array('id'=>'edit_block_'.$block_id, 'class'=>'edit_block btn'));
47	47	$content .= Display::url('+', '#', array('id'=>'edit_block_'.$block_id, 'class'=>'edit_block btn'));
		@@ -87,9 +87,9 @@ discard block
		block discarded – undo
87	87	}
88	88	//default_arrow_color
89	89
90		- $this->js .= 'var e'.$block_id.' = prepare("block_' . $block_id.'", '.$end_point.');'."\n";
91		- $this->js .= 'var e'.$skill['parent_id'].' = prepare("block_' . $skill['parent_id'].'", '.$end_point.');'."\n";
92		- $this->js .= 'jsPlumb.connect({source: e'.$block_id.', target:e'.$skill['parent_id'].'});'."\n";;
	90	+ $this->js .= 'var e'.$block_id.' = prepare("block_'.$block_id.'", '.$end_point.');'."\n";
	91	+ $this->js .= 'var e'.$skill['parent_id'].' = prepare("block_'.$skill['parent_id'].'", '.$end_point.');'."\n";
	92	+ $this->js .= 'jsPlumb.connect({source: e'.$block_id.', target:e'.$skill['parent_id'].'});'."\n"; ;
93	93	}
94	94
95	95	/**
		@@ -125,10 +125,10 @@ discard block
		block discarded – undo
125	125	$brothers = array();
126	126
127	127	foreach ($this->skills as &$skill) {
128		- if (!in_array($skill['parent_id'], array(0,1))) {
	128	+ if (!in_array($skill['parent_id'], array(0, 1))) {
129	129	continue;
130	130	}
131		- $childs = isset($skill['children']) ? count($skill['children']) : 0 ;
	131	+ $childs = isset($skill['children']) ? count($skill['children']) : 0;
132	132
133	133	//$x = round($this->offsetX * sin(deg2rad($corner * $count)));
134	134	//$y = round($this->offsetY * cos(deg2rad($corner * $count)));
		@@ -144,10 +144,10 @@ discard block
		block discarded – undo
144	144	if ($skill['parent_id'] == 0) {
145	145	//$x = 130*$childs/2;
146	146	//$x = $this->space_between_blocks_x*$childs/2;
147		- $x = $this->canvas_x/2 - $this->block_size/2;
	147	+ $x = $this->canvas_x / 2 - $this->block_size / 2;
148	148	} else {
149	149	$max = isset($this->skills[$skill['parent_id']]['children']) ? count($this->skills[$skill['parent_id']]['children']) : 0;
150		- foreach($this->skills[$skill['parent_id']]['children'] as $id => $sk) {
	150	+ foreach ($this->skills[$skill['parent_id']]['children'] as $id => $sk) {
151	151	if ($skill['id'] == $sk['id']) {
152	152	break;
153	153	}
		@@ -155,17 +155,17 @@ discard block
		block discarded – undo
155	155	}
156	156	$parent_x = isset($this->skills[$skill['parent_id']]['x']) ? $this->skills[$skill['parent_id']]['x'] : 0;
157	157	//$x = $my_count$this->space_between_blocks_x + $parent_x + $this->block_size - ($this->space_between_blocks_x$max/2) ;
158		- $x = $my_count*$this->space_between_blocks_x + $parent_x + $this->block_size - ($this->canvas_x/2 ) ;
	158	+ $x = $my_count * $this->space_between_blocks_x + $parent_x + $this->block_size - ($this->canvas_x / 2);
159	159	}
160	160
161		- $y = $skill['level']*$this->space_between_blocks_y;
	161	+ $y = $skill['level'] * $this->space_between_blocks_y;
162	162
163	163	$skill['x'] = $x;
164	164	$skill['y'] = $y;
165	165
166	166	//$skill['description'] = "{$brothers[$skill['parent_id']]} $x - $y";
167	167	//$skill['name'] = $skill['name']." \| $x = $my_count * 150 + $parent_x - (150* $max/2) - 10*$childs ";
168		- $this->add_item($skill, array('x' => $this->offset_x + $x, 'y' => $this->offset_y +$y));
	168	+ $this->add_item($skill, array('x' => $this->offset_x + $x, 'y' => $this->offset_y + $y));
169	169	}
170	170	return $this->get_html();
171	171	}

		@@ -99,7 +99,7 @@ discard block
		block discarded – undo
99	99	}
100	100	foreach ($data as $row) {
101	101	$string = implode("</td><td>", $row);
102		- $string = '<tr><td>' . $string . '</td></tr>';
	102	+ $string = '<tr><td>'.$string.'</td></tr>';
103	103	if ($encoding != 'utf-8') {
104	104	$string = api_convert_encoding($string, $encoding, $systemEncoding);
105	105	}
		@@ -173,7 +173,7 @@ discard block
		block discarded – undo
173	173	fwrite($handle, '<'.$wrapper_tagname.'>');
174	174	}
175	175	$s = self::_export_complex_table_xml_helper($data);
176		- fwrite($handle,$s);
	176	+ fwrite($handle, $s);
177	177	if (!is_null($wrapper_tagname)) {
178	178	fwrite($handle, '</'.$wrapper_tagname.'>'."\n");
179	179	}
		@@ -195,10 +195,10 @@ discard block
		block discarded – undo
195	195	}
196	196	$string = '';
197	197	foreach ($data as $row) {
198		- $string .= "\n".str_repeat("\t",$level).'<'.$row['name'].'>';
	198	+ $string .= "\n".str_repeat("\t", $level).'<'.$row['name'].'>';
199	199	if (is_array($row['value'])) {
200		- $string .= self::_export_complex_table_xml_helper($row['value'],$level+1)."\n";
201		- $string .= str_repeat("\t",$level).'</'.$row['name'].'>';
	200	+ $string .= self::_export_complex_table_xml_helper($row['value'], $level + 1)."\n";
	201	+ $string .= str_repeat("\t", $level).'</'.$row['name'].'>';
202	202	} else {
203	203	$string .= $row['value'];
204	204	$string .= '</'.$row['name'].'>';

chamilo / chamilo-lms

Push — 1.10.x ( ad23de...73a570 )

Status

Category

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

Spacing +6 added lines, -6 removed lines patch added patch discarded remove patch

Spacing +5 added lines, -5 removed lines patch added patch discarded remove patch

Spacing +4 added lines, -4 removed lines patch added patch discarded remove patch

Spacing +5 added lines, -5 removed lines patch added patch discarded remove patch

Spacing +33 added lines, -33 removed lines patch added patch discarded remove patch

Spacing +13 added lines, -13 removed lines patch added patch discarded remove patch

Spacing +8 added lines, -8 removed lines patch added patch discarded remove patch

Spacing +5 added lines, -5 removed lines patch added patch discarded remove patch