chamilo / chamilo-lms

main/gradebook/lib/fe/linkaddeditform.class.php

Spacing +14 added lines, -14 removed lines

@@ -31,7 +31,7 @@ 
 		if (isset($link_object)) {
 			$link = $link_object;
 		} elseif (isset($link_type) && isset($category_object)) {
-			$link = LinkFactory :: create ($link_type);
+			$link = LinkFactory :: create($link_type);
 			$link->set_course_code(api_get_course_id());
 			$link->set_category_id($category_object[0]->get_id());
 		} else {
@@ -52,12 +52,12 @@ 
 			} else {
 				$select = $this->addElement('select', 'select_link', get_lang('ChooseItem'));
 				foreach ($link->get_all_links() as $newlink) {
-					$select->addoption($newlink[1],$newlink[0]);
+					$select->addoption($newlink[1], $newlink[0]);
 				}
 			}
 		} else {
-			$this->addElement('label',get_lang('Name'),  '<span class="freeze">'.$link->get_name().' ['.$link->get_type_name().']</span>');
-			$this->addElement('hidden','name_link',$link->get_name(),array('id'=>'name_link'));
+			$this->addElement('label', get_lang('Name'), '<span class="freeze">'.$link->get_name().' ['.$link->get_type_name().']</span>');
+			$this->addElement('hidden', 'name_link', $link->get_name(), array('id'=>'name_link'));
 		}
 
 		if (count($category_object) == 1) {
@@ -80,7 +80,7 @@ 
 						$grade_model_id = $my_cat->get_grade_model_id();
 						if (empty($grade_model_id)) {
 
-							if ($my_cat->get_parent_id() == 0 ) {
+							if ($my_cat->get_parent_id() == 0) {
 								$default_weight = $my_cat->get_weight();
 								$select_gradebook->addoption(get_lang('Default'), $my_cat->get_id());
 							} else {
@@ -119,8 +119,8 @@ 
             'class' => 'span1'
         ));*/
 
-		$this->addRule('weight_mask',get_lang('OnlyNumbers'),'numeric');
-		$this->addRule(array ('weight_mask', 'zero'), get_lang('NegativeValue'), 'compare', '>=');
+		$this->addRule('weight_mask', get_lang('OnlyNumbers'), 'numeric');
+		$this->addRule(array('weight_mask', 'zero'), get_lang('NegativeValue'), 'compare', '>=');
 		if ($form_type == self :: TYPE_EDIT) {
 			$parent_cat = Category :: load($link->get_category_id());
 
@@ -133,20 +133,20 @@ 
 				//var_dump($global_weight, $link->get_weight(), $parent_cat[0]->get_weight());
 				//$weight = $parent_cat[0]->get_weight()* $link->get_weight() / $global_weight;
 				//$values['weight'] = $weight;
-				$values['weight'] = $link->get_weight() ;
+				$values['weight'] = $link->get_weight();
 			}
-			$defaults['weight_mask'] = $values['weight'] ;
+			$defaults['weight_mask'] = $values['weight'];
 			$defaults['select_gradebook'] = $link->get_category_id();
 
 		}
 		// ELEMENT: max
 		if ($link->needs_max()) {
 			if ($form_type == self :: TYPE_EDIT && $link->has_results()) {
-				$this->addText('max', get_lang('QualificationNumeric'), false, array ('size' => '4','maxlength' => '5', 'disabled' => 'disabled'));
+				$this->addText('max', get_lang('QualificationNumeric'), false, array('size' => '4', 'maxlength' => '5', 'disabled' => 'disabled'));
 			} else {
-				$this->addText('max', get_lang('QualificationNumeric'), true, array ('size' => '4','maxlength' => '5'));
+				$this->addText('max', get_lang('QualificationNumeric'), true, array('size' => '4', 'maxlength' => '5'));
 				$this->addRule('max', get_lang('OnlyNumbers'), 'numeric');
-				$this->addRule(array ('max', 'zero'), get_lang('NegativeValue'), 'compare', '>=');
+				$this->addRule(array('max', 'zero'), get_lang('NegativeValue'), 'compare', '>=');
 			}
 			if ($form_type == self :: TYPE_EDIT) {
 				$defaults['max'] = $link->get_max();
@@ -155,7 +155,7 @@ 
 
 		// ELEMENT: description
 		if ($link->needs_name_and_description()) {
-			$this->addElement('textarea', 'description', get_lang('Description'), array ('rows' => '3','cols' => '34'));
+			$this->addElement('textarea', 'description', get_lang('Description'), array('rows' => '3', 'cols' => '34'));
 			if ($form_type == self :: TYPE_EDIT) {
 				$defaults['description'] = $link->get_description();
 			}
@@ -185,7 +185,7 @@ 
 			if (isset($setting['gradebook']) && $setting['gradebook'] == 'false') {
 				$visibility_default = 0;
 			}
-			$defaults['visible']  = $visibility_default;
+			$defaults['visible'] = $visibility_default;
 		}
 
 		// set default values

Indentation +174 added lines, -174 removed lines

@@ -9,108 +9,108 @@ 
  */
 class LinkAddEditForm extends FormValidator
 {
-	const TYPE_ADD  = 1;
-	const TYPE_EDIT = 2;
-
-	/**
-	 * Constructor
-	 * To add link, define category_object and link_type
-	 * To edit link, define link_object
-	 */
-	public function __construct(
-		$form_type,
-		$category_object,
-		$link_type,
-		$link_object,
-		$form_name,
-		$action = null
-	) {
-		parent :: __construct($form_name, 'post', $action);
-
-		// set or create link object
-		if (isset($link_object)) {
-			$link = $link_object;
-		} elseif (isset($link_type) && isset($category_object)) {
-			$link = LinkFactory :: create ($link_type);
-			$link->set_course_code(api_get_course_id());
-			$link->set_category_id($category_object[0]->get_id());
-		} else {
-			die ('LinkAddEditForm error: define link_type/category_object or link_object');
-		}
-
-		$defaults = array();
-		$this->addElement('hidden', 'zero', 0);
-
-		if (!empty($_GET['editlink'])) {
-			$this->addElement('header', '', get_lang('EditLink'));
-		}
-
-		// ELEMENT: name
-		if ($form_type == self :: TYPE_ADD || $link->is_allowed_to_change_name()) {
-			if ($link->needs_name_and_description()) {
-				$this->addText('name', get_lang('Name'), true, array('size'=>'40', 'maxlength'=>'40'));
-			} else {
-				$select = $this->addElement('select', 'select_link', get_lang('ChooseItem'));
-				foreach ($link->get_all_links() as $newlink) {
-					$select->addoption($newlink[1],$newlink[0]);
-				}
-			}
-		} else {
-			$this->addElement('label',get_lang('Name'),  '<span class="freeze">'.$link->get_name().' ['.$link->get_type_name().']</span>');
-			$this->addElement('hidden','name_link',$link->get_name(),array('id'=>'name_link'));
-		}
-
-		if (count($category_object) == 1) {
-			$this->addElement('hidden', 'select_gradebook', $category_object[0]->get_id());
-		} else {
-			$select_gradebook = $this->addElement(
-				'select',
-				'select_gradebook',
-				get_lang('SelectGradebook'),
-				array(),
-				array('id' => 'hide_category_id')
-			);
-			$this->addRule('select_gradebook', get_lang('ThisFieldIsRequired'), 'nonzero');
-
-			$default_weight = 0;
-			if (!empty($category_object)) {
-				foreach ($category_object as $my_cat) {
-
-					if ($my_cat->get_course_code() == api_get_course_id()) {
-						$grade_model_id = $my_cat->get_grade_model_id();
-						if (empty($grade_model_id)) {
-
-							if ($my_cat->get_parent_id() == 0 ) {
-								$default_weight = $my_cat->get_weight();
-								$select_gradebook->addoption(get_lang('Default'), $my_cat->get_id());
-							} else {
-								$select_gradebook->addoption($my_cat->get_name(), $my_cat->get_id());
-							}
-						} else {
-							$select_gradebook->addoption(get_lang('Select'), 0);
-						}
-						if ($link->get_category_id() == $my_cat->get_id()) {
-							$default_weight = $my_cat->get_weight();
-						}
-					}
-				}
-			}
-		}
-
-		$this->addText(
-			'weight_mask',
-			array(get_lang('Weight'), null, ' [0 .. <span id="max_weight">'.$category_object[0]->get_weight().'</span>] '),
-			true,
-			array(
-				'size' => '4',
-				'maxlength' => '5',
-				'class' => 'span1'
-			)
-		);
-
-		$this->addElement('hidden', 'weight');
-
-		/*
+    const TYPE_ADD  = 1;
+    const TYPE_EDIT = 2;
+
+    /**
+     * Constructor
+     * To add link, define category_object and link_type
+     * To edit link, define link_object
+     */
+    public function __construct(
+        $form_type,
+        $category_object,
+        $link_type,
+        $link_object,
+        $form_name,
+        $action = null
+    ) {
+        parent :: __construct($form_name, 'post', $action);
+
+        // set or create link object
+        if (isset($link_object)) {
+            $link = $link_object;
+        } elseif (isset($link_type) && isset($category_object)) {
+            $link = LinkFactory :: create ($link_type);
+            $link->set_course_code(api_get_course_id());
+            $link->set_category_id($category_object[0]->get_id());
+        } else {
+            die ('LinkAddEditForm error: define link_type/category_object or link_object');
+        }
+
+        $defaults = array();
+        $this->addElement('hidden', 'zero', 0);
+
+        if (!empty($_GET['editlink'])) {
+            $this->addElement('header', '', get_lang('EditLink'));
+        }
+
+        // ELEMENT: name
+        if ($form_type == self :: TYPE_ADD || $link->is_allowed_to_change_name()) {
+            if ($link->needs_name_and_description()) {
+                $this->addText('name', get_lang('Name'), true, array('size'=>'40', 'maxlength'=>'40'));
+            } else {
+                $select = $this->addElement('select', 'select_link', get_lang('ChooseItem'));
+                foreach ($link->get_all_links() as $newlink) {
+                    $select->addoption($newlink[1],$newlink[0]);
+                }
+            }
+        } else {
+            $this->addElement('label',get_lang('Name'),  '<span class="freeze">'.$link->get_name().' ['.$link->get_type_name().']</span>');
+            $this->addElement('hidden','name_link',$link->get_name(),array('id'=>'name_link'));
+        }
+
+        if (count($category_object) == 1) {
+            $this->addElement('hidden', 'select_gradebook', $category_object[0]->get_id());
+        } else {
+            $select_gradebook = $this->addElement(
+                'select',
+                'select_gradebook',
+                get_lang('SelectGradebook'),
+                array(),
+                array('id' => 'hide_category_id')
+            );
+            $this->addRule('select_gradebook', get_lang('ThisFieldIsRequired'), 'nonzero');
+
+            $default_weight = 0;
+            if (!empty($category_object)) {
+                foreach ($category_object as $my_cat) {
+
+                    if ($my_cat->get_course_code() == api_get_course_id()) {
+                        $grade_model_id = $my_cat->get_grade_model_id();
+                        if (empty($grade_model_id)) {
+
+                            if ($my_cat->get_parent_id() == 0 ) {
+                                $default_weight = $my_cat->get_weight();
+                                $select_gradebook->addoption(get_lang('Default'), $my_cat->get_id());
+                            } else {
+                                $select_gradebook->addoption($my_cat->get_name(), $my_cat->get_id());
+                            }
+                        } else {
+                            $select_gradebook->addoption(get_lang('Select'), 0);
+                        }
+                        if ($link->get_category_id() == $my_cat->get_id()) {
+                            $default_weight = $my_cat->get_weight();
+                        }
+                    }
+                }
+            }
+        }
+
+        $this->addText(
+            'weight_mask',
+            array(get_lang('Weight'), null, ' [0 .. <span id="max_weight">'.$category_object[0]->get_weight().'</span>] '),
+            true,
+            array(
+                'size' => '4',
+                'maxlength' => '5',
+                'class' => 'span1'
+            )
+        );
+
+        $this->addElement('hidden', 'weight');
+
+        /*
 
         // ELEMENT: weight
         $this->addText('weight', array(get_lang('Weight'), null, '/ <span id="max_weight">'.$default_weight.'</span>'), true, array (
@@ -119,76 +119,76 @@ 
             'class' => 'span1'
         ));*/
 
-		$this->addRule('weight_mask',get_lang('OnlyNumbers'),'numeric');
-		$this->addRule(array ('weight_mask', 'zero'), get_lang('NegativeValue'), 'compare', '>=');
-		if ($form_type == self :: TYPE_EDIT) {
-			$parent_cat = Category :: load($link->get_category_id());
-
-			if ($parent_cat[0]->get_parent_id() == 0) {
-				$values['weight'] = $link->get_weight();
-			} else {
-				$cat = Category :: load($parent_cat[0]->get_parent_id());
-				//$global_weight = $cat[0]->get_weight();
-				//$values['weight'] = $link->get_weight()/$parent_cat[0]->get_weight()*$global_weight;
-				//var_dump($global_weight, $link->get_weight(), $parent_cat[0]->get_weight());
-				//$weight = $parent_cat[0]->get_weight()* $link->get_weight() / $global_weight;
-				//$values['weight'] = $weight;
-				$values['weight'] = $link->get_weight() ;
-			}
-			$defaults['weight_mask'] = $values['weight'] ;
-			$defaults['select_gradebook'] = $link->get_category_id();
-
-		}
-		// ELEMENT: max
-		if ($link->needs_max()) {
-			if ($form_type == self :: TYPE_EDIT && $link->has_results()) {
-				$this->addText('max', get_lang('QualificationNumeric'), false, array ('size' => '4','maxlength' => '5', 'disabled' => 'disabled'));
-			} else {
-				$this->addText('max', get_lang('QualificationNumeric'), true, array ('size' => '4','maxlength' => '5'));
-				$this->addRule('max', get_lang('OnlyNumbers'), 'numeric');
-				$this->addRule(array ('max', 'zero'), get_lang('NegativeValue'), 'compare', '>=');
-			}
-			if ($form_type == self :: TYPE_EDIT) {
-				$defaults['max'] = $link->get_max();
-			}
-		}
-
-		// ELEMENT: description
-		if ($link->needs_name_and_description()) {
-			$this->addElement('textarea', 'description', get_lang('Description'), array ('rows' => '3','cols' => '34'));
-			if ($form_type == self :: TYPE_EDIT) {
-				$defaults['description'] = $link->get_description();
-			}
-		}
-
-		// ELEMENT: visible
-		$visible = ($form_type == self :: TYPE_EDIT && $link->is_visible()) ? '1' : '0';
-		$this->addElement('checkbox', 'visible', null, get_lang('Visible'), $visible);
-		if ($form_type == self :: TYPE_EDIT) {
-			$defaults['visible'] = $link->is_visible();
-		}
-
-		// ELEMENT: add results
-		if ($form_type == self :: TYPE_ADD && $link->needs_results()) {
-			$this->addElement('checkbox', 'addresult', get_lang('AddResult'));
-		}
-		// submit button
-		if ($form_type == self :: TYPE_ADD) {
-			$this->addButtonCreate(get_lang('CreateLink'));
-		} else {
-			$this->addButtonUpdate(get_lang('LinkMod'));
-		}
-
-		if ($form_type == self :: TYPE_ADD) {
-			$setting = api_get_setting('tool_visible_by_default_at_creation');
-			$visibility_default = 1;
-			if (isset($setting['gradebook']) && $setting['gradebook'] == 'false') {
-				$visibility_default = 0;
-			}
-			$defaults['visible']  = $visibility_default;
-		}
-
-		// set default values
-		$this->setDefaults($defaults);
-	}
+        $this->addRule('weight_mask',get_lang('OnlyNumbers'),'numeric');
+        $this->addRule(array ('weight_mask', 'zero'), get_lang('NegativeValue'), 'compare', '>=');
+        if ($form_type == self :: TYPE_EDIT) {
+            $parent_cat = Category :: load($link->get_category_id());
+
+            if ($parent_cat[0]->get_parent_id() == 0) {
+                $values['weight'] = $link->get_weight();
+            } else {
+                $cat = Category :: load($parent_cat[0]->get_parent_id());
+                //$global_weight = $cat[0]->get_weight();
+                //$values['weight'] = $link->get_weight()/$parent_cat[0]->get_weight()*$global_weight;
+                //var_dump($global_weight, $link->get_weight(), $parent_cat[0]->get_weight());
+                //$weight = $parent_cat[0]->get_weight()* $link->get_weight() / $global_weight;
+                //$values['weight'] = $weight;
+                $values['weight'] = $link->get_weight() ;
+            }
+            $defaults['weight_mask'] = $values['weight'] ;
+            $defaults['select_gradebook'] = $link->get_category_id();
+
+        }
+        // ELEMENT: max
+        if ($link->needs_max()) {
+            if ($form_type == self :: TYPE_EDIT && $link->has_results()) {
+                $this->addText('max', get_lang('QualificationNumeric'), false, array ('size' => '4','maxlength' => '5', 'disabled' => 'disabled'));
+            } else {
+                $this->addText('max', get_lang('QualificationNumeric'), true, array ('size' => '4','maxlength' => '5'));
+                $this->addRule('max', get_lang('OnlyNumbers'), 'numeric');
+                $this->addRule(array ('max', 'zero'), get_lang('NegativeValue'), 'compare', '>=');
+            }
+            if ($form_type == self :: TYPE_EDIT) {
+                $defaults['max'] = $link->get_max();
+            }
+        }
+
+        // ELEMENT: description
+        if ($link->needs_name_and_description()) {
+            $this->addElement('textarea', 'description', get_lang('Description'), array ('rows' => '3','cols' => '34'));
+            if ($form_type == self :: TYPE_EDIT) {
+                $defaults['description'] = $link->get_description();
+            }
+        }
+
+        // ELEMENT: visible
+        $visible = ($form_type == self :: TYPE_EDIT && $link->is_visible()) ? '1' : '0';
+        $this->addElement('checkbox', 'visible', null, get_lang('Visible'), $visible);
+        if ($form_type == self :: TYPE_EDIT) {
+            $defaults['visible'] = $link->is_visible();
+        }
+
+        // ELEMENT: add results
+        if ($form_type == self :: TYPE_ADD && $link->needs_results()) {
+            $this->addElement('checkbox', 'addresult', get_lang('AddResult'));
+        }
+        // submit button
+        if ($form_type == self :: TYPE_ADD) {
+            $this->addButtonCreate(get_lang('CreateLink'));
+        } else {
+            $this->addButtonUpdate(get_lang('LinkMod'));
+        }
+
+        if ($form_type == self :: TYPE_ADD) {
+            $setting = api_get_setting('tool_visible_by_default_at_creation');
+            $visibility_default = 1;
+            if (isset($setting['gradebook']) && $setting['gradebook'] == 'false') {
+                $visibility_default = 0;
+            }
+            $defaults['visible']  = $visibility_default;
+        }
+
+        // set default values
+        $this->setDefaults($defaults);
+    }
 }

main/gradebook/lib/fe/flatviewtable.class.php

Spacing +15 added lines, -15 removed lines

@@ -201,9 +201,9 @@ 
             $myCache = new pCache(array('CacheFolder' => substr($cachePath, 0, strlen($cachePath) - 1)));
             $chartHash = $myCache->getHash($dataSet);
             if ($myCache->isInCache($chartHash)) {
-                $imgPath = api_get_path(SYS_ARCHIVE_PATH) . $chartHash;
+                $imgPath = api_get_path(SYS_ARCHIVE_PATH).$chartHash;
                 $myCache->saveFromCache($chartHash, $imgPath);
-                $imgPath = api_get_path(WEB_ARCHIVE_PATH) . $chartHash;
+                $imgPath = api_get_path(WEB_ARCHIVE_PATH).$chartHash;
             } else {
                 /* Create the pChart object */
                 $widthSize = 480;
@@ -230,7 +230,7 @@ 
                 /* Set the default font */
                 $myPicture->setFontProperties(
                     array(
-                        'FontName' => api_get_path(SYS_FONTS_PATH) . 'opensans/OpenSans-Regular.ttf',
+                        'FontName' => api_get_path(SYS_FONTS_PATH).'opensans/OpenSans-Regular.ttf',
                         'FontSize' => 10
                     )
                 );
@@ -302,11 +302,11 @@ 
                 /* Render the picture (choose the best way) */
 
                 $myCache->writeToCache($chartHash, $myPicture);
-                $imgPath = api_get_path(SYS_ARCHIVE_PATH) . $chartHash;
+                $imgPath = api_get_path(SYS_ARCHIVE_PATH).$chartHash;
                 $myCache->saveFromCache($chartHash, $imgPath);
-                $imgPath = api_get_path(WEB_ARCHIVE_PATH) . $chartHash;
+                $imgPath = api_get_path(WEB_ARCHIVE_PATH).$chartHash;
             }
-            echo '<img src="' . $imgPath . '" >';
+            echo '<img src="'.$imgPath.'" >';
             if ($i % 2 == 0 && $i != 0) {
                 echo '<br /><br />';
             } else {
@@ -349,10 +349,10 @@ 
             // previous X
             $header .= '<td style="width:100%;">';
             if ($this->offset >= GRADEBOOK_ITEM_LIMIT) {
-                $header .= '<a href="' . api_get_self()
-                    . '?selectcat=' . Security::remove_XSS($_GET['selectcat'])
-                    . '&offset=' . (($this->offset) - GRADEBOOK_ITEM_LIMIT)
-                    . (isset($_GET['search']) ? '&search=' . Security::remove_XSS($_GET['search']) : '') . '">'
+                $header .= '<a href="'.api_get_self()
+                    . '?selectcat='.Security::remove_XSS($_GET['selectcat'])
+                    . '&offset='.(($this->offset) - GRADEBOOK_ITEM_LIMIT)
+                    . (isset($_GET['search']) ? '&search='.Security::remove_XSS($_GET['search']) : '').'">'
                     . Display::return_icon('action_prev.png', get_lang('PreviousPage'), array(), 32)
                     . '</a>';
             } else {
@@ -364,10 +364,10 @@ 
                 ($totalitems - (GRADEBOOK_ITEM_LIMIT + $this->offset)) : GRADEBOOK_ITEM_LIMIT;
 
             if ($calcnext > 0) {
-                $header .= '<a href="' . api_get_self()
-                    . '?selectcat=' . Security::remove_XSS($_GET['selectcat'])
-                    . '&offset=' . ($this->offset + GRADEBOOK_ITEM_LIMIT)
-                    . (isset($_GET['search']) ? '&search=' . Security::remove_XSS($_GET['search']) : '') . '">'
+                $header .= '<a href="'.api_get_self()
+                    . '?selectcat='.Security::remove_XSS($_GET['selectcat'])
+                    . '&offset='.($this->offset + GRADEBOOK_ITEM_LIMIT)
+                    . (isset($_GET['search']) ? '&search='.Security::remove_XSS($_GET['search']) : '').'">'
                     . Display::return_icon('action_next.png', get_lang('NextPage'), array(), 32)
                     . '</a>';
             } else {
@@ -475,6 +475,6 @@ 
      */
     private function build_name_link($user_id, $name)
     {
-        return '<a href="user_stats.php?userid=' . $user_id . '&selectcat=' . $this->selectcat->get_id() . '&'.api_get_cidreq().'">' . $name . '</a>';
+        return '<a href="user_stats.php?userid='.$user_id.'&selectcat='.$this->selectcat->get_id().'&'.api_get_cidreq().'">'.$name.'</a>';
     }
 }

Braces +3 added lines, -2 removed lines

@@ -149,8 +149,9 @@
                 }
 
                 foreach ($customdisplays as $display) {
-                    if (!in_array($display['display'], $key_list))
-                        $resource_list[$key][$display['display']] = 0;
+                    if (!in_array($display['display'], $key_list)) {
+                                            $resource_list[$key][$display['display']] = 0;
+                    }
                 }
                 $i++;
             }

main/gradebook/lib/fe/usertable.class.php

Spacing +6 added lines, -6 removed lines

@@ -18,7 +18,7 @@ 
 	 */
 	public function UserTable($userid, $evals = array(), $links = array(), $addparams = null)
 	{
-		parent :: __construct ('userlist', null, null, 0);
+		parent :: __construct('userlist', null, null, 0);
 		$this->userid = $userid;
 		$this->datagen = new UserDataGenerator($userid, $evals, $links);
 		if (isset($addparams)) {
@@ -87,8 +87,8 @@ 
 		// generate the data to display
 		$sortable_data = array();
 		foreach ($data_array as $data) {
-			if ($data[2]!="") {//filter by course removed
-				$row = array ();
+			if ($data[2] != "") {//filter by course removed
+				$row = array();
 				$row[] = $this->build_type_column($data[0]);
 				$row[] = $this->build_name_link($data[0]);
 				$row[] = $data[2];
@@ -123,15 +123,15 @@ 
 			// evaluation
 			case 'E' :
 				return ' '
-				. '<a href="gradebook_view_result.php?selecteval=' . $item->get_id() . '">'
+				. '<a href="gradebook_view_result.php?selecteval='.$item->get_id().'">'
 				. $item->get_name()
 				. '</a>';
 			// link
 			case 'L' :
-				return '&nbsp;<a href="' . $item->get_link() . '">'
+				return '&nbsp;<a href="'.$item->get_link().'">'
 				. $item->get_name()
 				. '</a>'
-				. '&nbsp;[' . $item->get_type_name() . ']';
+				. '&nbsp;['.$item->get_type_name().']';
 		}
 	}
 }

Braces +3 added lines, -2 removed lines

@@ -95,8 +95,9 @@
 				$row[] = $data[3];
 				$row[] = $data[4];
 				$row[] = $data[5];
-				if ($scoredisplay->is_custom())
-					$row[] = $data[6];
+				if ($scoredisplay->is_custom()) {
+									$row[] = $data[6];
+				}
 				$sortable_data[] = $row;
 			}
 		}

Indentation +116 added lines, -116 removed lines

@@ -10,128 +10,128 @@
  */
 class UserTable extends SortableTable
 {
-	private $userid;
-	private $datagen;
+    private $userid;
+    private $datagen;
 
-	/**
-	 * Constructor
-	 */
-	public function __construct($userid, $evals = array(), $links = array(), $addparams = null)
-	{
-		parent :: __construct ('userlist', null, null, 0);
-		$this->userid = $userid;
-		$this->datagen = new UserDataGenerator($userid, $evals, $links);
-		if (isset($addparams)) {
-			$this->set_additional_parameters($addparams);
-		}
-		$column = 0;
-		$this->set_header($column++, get_lang('Type'));
-		$this->set_header($column++, get_lang('Evaluation'));
-		$this->set_header($column++, get_lang('Course'));
-		$this->set_header($column++, get_lang('Category'));
-		$this->set_header($column++, get_lang('EvaluationAverage'));
-		$this->set_header($column++, get_lang('Result'));
+    /**
+     * Constructor
+     */
+    public function __construct($userid, $evals = array(), $links = array(), $addparams = null)
+    {
+        parent :: __construct ('userlist', null, null, 0);
+        $this->userid = $userid;
+        $this->datagen = new UserDataGenerator($userid, $evals, $links);
+        if (isset($addparams)) {
+            $this->set_additional_parameters($addparams);
+        }
+        $column = 0;
+        $this->set_header($column++, get_lang('Type'));
+        $this->set_header($column++, get_lang('Evaluation'));
+        $this->set_header($column++, get_lang('Course'));
+        $this->set_header($column++, get_lang('Category'));
+        $this->set_header($column++, get_lang('EvaluationAverage'));
+        $this->set_header($column++, get_lang('Result'));
 
-		$scoredisplay = ScoreDisplay :: instance();
-		if ($scoredisplay->is_custom()) {
-			$this->set_header($column++, get_lang('Display'));
-		}
-	}
+        $scoredisplay = ScoreDisplay :: instance();
+        if ($scoredisplay->is_custom()) {
+            $this->set_header($column++, get_lang('Display'));
+        }
+    }
 
-	/**
-	 * Function used by SortableTable to get total number of items in the table
-	 */
-	function get_total_number_of_items()
-	{
-		return $this->datagen->get_total_items_count();
-	}
+    /**
+     * Function used by SortableTable to get total number of items in the table
+     */
+    function get_total_number_of_items()
+    {
+        return $this->datagen->get_total_items_count();
+    }
 
-	/**
-	 * Function used by SortableTable to generate the data to display
-	 */
-	public function get_table_data($from = 1, $per_page = null, $column = null, $direction = null, $sort = null)
-	{
-		$scoredisplay = ScoreDisplay :: instance();
+    /**
+     * Function used by SortableTable to generate the data to display
+     */
+    public function get_table_data($from = 1, $per_page = null, $column = null, $direction = null, $sort = null)
+    {
+        $scoredisplay = ScoreDisplay :: instance();
 
-		// determine sorting type
-		switch ($this->column) {
-			// Type
-			case 0:
-				$sorting = UserDataGenerator :: UDG_SORT_TYPE;
-				break;
-			case 1:
-				$sorting = UserDataGenerator :: UDG_SORT_NAME;
-				break;
-			case 2:
-				$sorting = UserDataGenerator :: UDG_SORT_COURSE;
-				break;
-			case 3:
-				$sorting = UserDataGenerator :: UDG_SORT_CATEGORY;
-				break;
-			case 4:
-				$sorting = UserDataGenerator :: UDG_SORT_AVERAGE;
-				break;
-			case 5:
-				$sorting = UserDataGenerator :: UDG_SORT_SCORE;
-				break;
-			case 6:
-				$sorting = UserDataGenerator :: UDG_SORT_MASK;
-				break;
-		}
-		if ($this->direction == 'DESC') {
-			$sorting |= UserDataGenerator :: UDG_SORT_DESC;
-		} else {
-			$sorting |= UserDataGenerator :: UDG_SORT_ASC;
-		}
-		$data_array = $this->datagen->get_data($sorting, $from, $this->per_page);
-		// generate the data to display
-		$sortable_data = array();
-		foreach ($data_array as $data) {
-			if ($data[2]!="") {//filter by course removed
-				$row = array ();
-				$row[] = $this->build_type_column($data[0]);
-				$row[] = $this->build_name_link($data[0]);
-				$row[] = $data[2];
-				$row[] = $data[3];
-				$row[] = $data[4];
-				$row[] = $data[5];
-				if ($scoredisplay->is_custom())
-					$row[] = $data[6];
-				$sortable_data[] = $row;
-			}
-		}
+        // determine sorting type
+        switch ($this->column) {
+            // Type
+            case 0:
+                $sorting = UserDataGenerator :: UDG_SORT_TYPE;
+                break;
+            case 1:
+                $sorting = UserDataGenerator :: UDG_SORT_NAME;
+                break;
+            case 2:
+                $sorting = UserDataGenerator :: UDG_SORT_COURSE;
+                break;
+            case 3:
+                $sorting = UserDataGenerator :: UDG_SORT_CATEGORY;
+                break;
+            case 4:
+                $sorting = UserDataGenerator :: UDG_SORT_AVERAGE;
+                break;
+            case 5:
+                $sorting = UserDataGenerator :: UDG_SORT_SCORE;
+                break;
+            case 6:
+                $sorting = UserDataGenerator :: UDG_SORT_MASK;
+                break;
+        }
+        if ($this->direction == 'DESC') {
+            $sorting |= UserDataGenerator :: UDG_SORT_DESC;
+        } else {
+            $sorting |= UserDataGenerator :: UDG_SORT_ASC;
+        }
+        $data_array = $this->datagen->get_data($sorting, $from, $this->per_page);
+        // generate the data to display
+        $sortable_data = array();
+        foreach ($data_array as $data) {
+            if ($data[2]!="") {//filter by course removed
+                $row = array ();
+                $row[] = $this->build_type_column($data[0]);
+                $row[] = $this->build_name_link($data[0]);
+                $row[] = $data[2];
+                $row[] = $data[3];
+                $row[] = $data[4];
+                $row[] = $data[5];
+                if ($scoredisplay->is_custom())
+                    $row[] = $data[6];
+                $sortable_data[] = $row;
+            }
+        }
 
-		return $sortable_data;
-	}
+        return $sortable_data;
+    }
 
-	/**
-	 * @param $item
-	 * @return string
-	 */
-	private function build_type_column($item)
-	{
-		return GradebookUtils::build_type_icon_tag($item->get_icon_name());
-	}
+    /**
+     * @param $item
+     * @return string
+     */
+    private function build_type_column($item)
+    {
+        return GradebookUtils::build_type_icon_tag($item->get_icon_name());
+    }
 
-	/**
-	 * @param $item
-	 * @return string
-	 */
-	private function build_name_link($item)
-	{
-		switch ($item->get_item_type()) {
-			// evaluation
-			case 'E' :
-				return ' '
-				. '<a href="gradebook_view_result.php?selecteval=' . $item->get_id() . '">'
-				. $item->get_name()
-				. '</a>';
-			// link
-			case 'L' :
-				return '&nbsp;<a href="' . $item->get_link() . '">'
-				. $item->get_name()
-				. '</a>'
-				. '&nbsp;[' . $item->get_type_name() . ']';
-		}
-	}
+    /**
+     * @param $item
+     * @return string
+     */
+    private function build_name_link($item)
+    {
+        switch ($item->get_item_type()) {
+            // evaluation
+            case 'E' :
+                return '&nbsp;'
+                . '<a href="gradebook_view_result.php?selecteval=' . $item->get_id() . '">'
+                . $item->get_name()
+                . '</a>';
+            // link
+            case 'L' :
+                return '&nbsp;<a href="' . $item->get_link() . '">'
+                . $item->get_name()
+                . '</a>'
+                . '&nbsp;[' . $item->get_type_name() . ']';
+        }
+    }
 }

main/gradebook/lib/fe/evalform.class.php

Spacing +52 added lines, -52 removed lines

@@ -91,7 +91,7 @@ 
             'onchange' => 'document.add_users_to_evaluation.submit()'
         ));
         $select->addOption('', '');
-        for ($i = 65; $i <= 90; $i ++) {
+        for ($i = 65; $i <= 90; $i++) {
             $letter = chr($i);
             if (isset($this->extra) && $this->extra == $letter) {
                 $select->addOption($letter, $letter, 'selected');
@@ -106,7 +106,7 @@ 
         ));
         foreach ($this->evaluation_object->get_not_subscribed_students() as $user) {
             if ((!isset($this->extra)) || empty($this->extra) || api_strtoupper(api_substr($user[1], 0, 1)) == $this->extra) {
-                $select->addoption($user[1] . ' ' . $user[2] . ' (' . $user[3] . ')', $user[0]);
+                $select->addoption($user[1].' '.$user[2].' ('.$user[3].')', $user[0]);
             }
         }
         $this->addButtonCreate(get_lang('AddUserToEval'), 'submit_button');
@@ -134,21 +134,21 @@ 
         if (api_is_western_name_order()) {
             $renderer->setHeaderTemplate(
                     '<tr>
-    		       <th>' . get_lang('OfficialCode') . '</th>
-    		      <th>' . get_lang('UserName') . '</th>
-    		      <th>' . get_lang('FirstName') . '</th>
-    		      <th>' . get_lang('LastName') . '</th>
-    		      <th>' . get_lang('Qualify') . '</th>
+    		       <th>' . get_lang('OfficialCode').'</th>
+    		      <th>' . get_lang('UserName').'</th>
+    		      <th>' . get_lang('FirstName').'</th>
+    		      <th>' . get_lang('LastName').'</th>
+    		      <th>' . get_lang('Qualify').'</th>
     		   </tr>'
             );
         } else {
             $renderer->setHeaderTemplate(
                     '<tr>
-                   <th>' . get_lang('OfficialCode') . '</th>
-                  <th>' . get_lang('UserName') . '</th>
-                  <th>' . get_lang('LastName') . '</th>
-                  <th>' . get_lang('FirstName') . '</th>
-                  <th>' . get_lang('Qualify') . '</th>
+                   <th>' . get_lang('OfficialCode').'</th>
+                  <th>' . get_lang('UserName').'</th>
+                  <th>' . get_lang('LastName').'</th>
+                  <th>' . get_lang('FirstName').'</th>
+                  <th>' . get_lang('Qualify').'</th>
                </tr>'
             );
         }
@@ -174,33 +174,33 @@ 
             $result = $result_and_user['result'];
 
             $renderer = &$this->defaultRenderer();
-            $this->addText('score[' . $result->get_id() . ']', $this->build_stud_label($user['user_id'], $user['username'], $user['lastname'], $user['firstname']), false, array('class' => "span2",
+            $this->addText('score['.$result->get_id().']', $this->build_stud_label($user['user_id'], $user['username'], $user['lastname'], $user['firstname']), false, array('class' => "span2",
                 'maxlength' => 5));
 
-            $this->addRule('score[' . $result->get_id() . ']', get_lang('OnlyNumbers'), 'numeric');
+            $this->addRule('score['.$result->get_id().']', get_lang('OnlyNumbers'), 'numeric');
             $this->addRule(array(
-                'score[' . $result->get_id() . ']', 'maxvalue'), get_lang('OverMax'), 'compare', '<=');
+                'score['.$result->get_id().']', 'maxvalue'), get_lang('OverMax'), 'compare', '<=');
             $this->addRule(array(
-                'score[' . $result->get_id() . ']', 'minvalue'), get_lang('UnderMin'), 'compare', '>=');
-            $defaults['score[' . $result->get_id() . ']'] = $result->get_score();
+                'score['.$result->get_id().']', 'minvalue'), get_lang('UnderMin'), 'compare', '>=');
+            $defaults['score['.$result->get_id().']'] = $result->get_score();
 
             if (api_is_western_name_order()) {
-                $user_info = '<td align="left" >' . $user['firstname'] . '</td>';
-                $user_info .= '<td align="left" >' . $user['lastname'] . '</td>';
+                $user_info = '<td align="left" >'.$user['firstname'].'</td>';
+                $user_info .= '<td align="left" >'.$user['lastname'].'</td>';
             } else {
-                $user_info = '<td align="left" >' . $user['lastname'] . '</td>';
-                $user_info .= '<td align="left" >' . $user['firstname'] . '</td>';
+                $user_info = '<td align="left" >'.$user['lastname'].'</td>';
+                $user_info .= '<td align="left" >'.$user['firstname'].'</td>';
             }
 
             $template = '<tr>
-		      <td align="left" >' . $user['official_code'] . '</td>
-		      <td align="left" >' . $user['username'] . '</td>
-		      ' . $user_info . '
-		       <td align="left">{element} / ' . $this->evaluation_object->get_max() . '
+		      <td align="left" >' . $user['official_code'].'</td>
+		      <td align="left" >' . $user['username'].'</td>
+		      ' . $user_info.'
+		       <td align="left">{element} / ' . $this->evaluation_object->get_max().'
 		         <!-- BEGIN error --><br /><span style="color: #ff0000;font-size:10px">{error}</span><!-- END error -->
 		      </td>
 		   </tr>';
-            $renderer->setElementTemplate($template, 'score[' . $result->get_id() . ']');
+            $renderer->setElementTemplate($template, 'score['.$result->get_id().']');
         }
         $this->setDefaults($defaults);
         $this->addButtonSave(get_lang('EditResult'), 'submit');
@@ -215,15 +215,15 @@ 
     {
         $renderer = & $this->defaultRenderer();
         $renderer->setCustomElementTemplate('<span>{element}</span> ');
-        $this->addElement('static', null, null, '"' . $this->evaluation_object->get_name() . '" ');
-        $this->addElement('static', null, null, get_lang('MoveTo') . ' : ');
+        $this->addElement('static', null, null, '"'.$this->evaluation_object->get_name().'" ');
+        $this->addElement('static', null, null, get_lang('MoveTo').' : ');
         $select = $this->addElement('select', 'move_cat', null, null);
         $line = '';
         foreach ($this->evaluation_object->get_target_categories() as $cat) {
             for ($i = 0; $i < $cat[2]; $i++) {
                 $line .= '&mdash;';
             }
-            $select->addoption($line . ' ' . $cat[1], $cat[0]);
+            $select->addoption($line.' '.$cat[1], $cat[0]);
             $line = '';
         }
         $this->addButtonSave(get_lang('Ok'), 'submit');
@@ -253,21 +253,21 @@ 
         if (api_is_western_name_order()) {
             $renderer->setHeaderTemplate(
                     '<tr>
-                   <th>' . get_lang('OfficialCode') . '</th>
-                  <th>' . get_lang('UserName') . '</th>
-                  <th>' . get_lang('FirstName') . '</th>
-                  <th>' . get_lang('LastName') . '</th>
-                  <th>' . get_lang('Qualify') . '</th>
+                   <th>' . get_lang('OfficialCode').'</th>
+                  <th>' . get_lang('UserName').'</th>
+                  <th>' . get_lang('FirstName').'</th>
+                  <th>' . get_lang('LastName').'</th>
+                  <th>' . get_lang('Qualify').'</th>
                </tr>'
             );
         } else {
             $renderer->setHeaderTemplate(
                     '<tr>
-                   <th>' . get_lang('OfficialCode') . '</th>
-                  <th>' . get_lang('UserName') . '</th>
-                  <th>' . get_lang('LastName') . '</th>
-                  <th>' . get_lang('FirstName') . '</th>
-                  <th>' . get_lang('Qualify') . '</th>
+                   <th>' . get_lang('OfficialCode').'</th>
+                  <th>' . get_lang('UserName').'</th>
+                  <th>' . get_lang('LastName').'</th>
+                  <th>' . get_lang('FirstName').'</th>
+                  <th>' . get_lang('Qualify').'</th>
                </tr>'
             );
         }
@@ -275,7 +275,7 @@ 
         $firstUser = true;
         foreach ($tblusers as $user) {
 
-            $element_name = 'score[' . $user[0] . ']';
+            $element_name = 'score['.$user[0].']';
 
             $scoreColumnProperties = array('maxlength' => 5);
             if ($firstUser) {
@@ -290,19 +290,19 @@ 
             $this->addRule(array($element_name, 'minvalue'), get_lang('UnderMin'), 'compare', '>=');
 
             if (api_is_western_name_order()) {
-                $user_info = '<td align="left" >' . $user[3] . '</td>';
-                $user_info .= '<td align="left" >' . $user[2] . '</td>';
+                $user_info = '<td align="left" >'.$user[3].'</td>';
+                $user_info .= '<td align="left" >'.$user[2].'</td>';
             } else {
-                $user_info = '<td align="left" >' . $user[2] . '</td>';
-                $user_info .= '<td align="left" >' . $user[3] . '</td>';
+                $user_info = '<td align="left" >'.$user[2].'</td>';
+                $user_info .= '<td align="left" >'.$user[3].'</td>';
             }
             $nr_users++;
 
             $template = '<tr>
-		      <td align="left" >' . $user[4] . '</td>
-		      <td align="left" >' . $user[1] . '</td>
-		      ' . $user_info . '
-		       <td align="left">{element} / ' . $this->evaluation_object->get_max() . '
+		      <td align="left" >' . $user[4].'</td>
+		      <td align="left" >' . $user[1].'</td>
+		      ' . $user_info.'
+		       <td align="left">{element} / ' . $this->evaluation_object->get_max().'
 		         <!-- BEGIN error --><br /><span style="color: #ff0000;font-size:10px">{error}</span><!-- END error -->
 		      </td>
             </tr>';
@@ -336,7 +336,7 @@ 
         $renderer->setCustomElementTemplate('<span>{element}</span> ');
         $this->addElement('label', get_lang('User'), $userinfo['complete_name']);
 
-        $this->addText('score', array(get_lang('Score'), null, '/ ' . $this->evaluation_object->get_max()), false, array(
+        $this->addText('score', array(get_lang('Score'), null, '/ '.$this->evaluation_object->get_max()), false, array(
             'size' => '4',
             'class' => 'span1',
             'maxlength' => '5'
@@ -471,7 +471,7 @@ 
             }
         }
 
-        $this->addText('weight_mask', array(get_lang('Weight'), null, ' [0 .. <span id="max_weight">' . $all_categories[0]->get_weight() . '</span>] '), true, array(
+        $this->addText('weight_mask', array(get_lang('Weight'), null, ' [0 .. <span id="max_weight">'.$all_categories[0]->get_weight().'</span>] '), true, array(
             'size' => '4',
             'maxlength' => '5',
             'class' => 'span1'
@@ -543,11 +543,11 @@ 
             $link = LinkFactory :: get_evaluation_link($this->evaluation_object->get_id());
             $doc_url = $link->get_view_url($id);
             if ($doc_url != null) {
-                $opendocurl_start .= '<a href="' . $doc_url . '" target="_blank">';
+                $opendocurl_start .= '<a href="'.$doc_url.'" target="_blank">';
                 $opendocurl_end = '</a>';
             }
         }
-        return $opendocurl_start . api_get_person_name($firstname, $lastname) . ' (' . $username . ')' . $opendocurl_end;
+        return $opendocurl_start.api_get_person_name($firstname, $lastname).' ('.$username.')'.$opendocurl_end;
     }
 
     function sort_by_user($item1, $item2)

main/gradebook/lib/scoredisplay.class.php

Spacing +18 added lines, -18 removed lines

@@ -34,7 +34,7 @@ 
     /**
      * Compare the custom display of 2 scores, can be useful in sorting
      */
-    public static function compare_scores_by_custom_display ($score1, $score2)
+    public static function compare_scores_by_custom_display($score1, $score2)
     {
         if (!isset($score1)) {
             return (isset($score2) ? 1 : 0);
@@ -47,7 +47,7 @@ 
             if ($custom1 == $custom2) {
                 return 0;
             } else {
-                return (($score1[0]/$score1[1]) < ($score2[0]/$score2[1]) ? -1 : 1);
+                return (($score1[0] / $score1[1]) < ($score2[0] / $score2[1]) ? -1 : 1);
             }
         }
     }
@@ -79,7 +79,7 @@ 
         //Setting custom enabled
         $value = api_get_setting('gradebook_score_display_custom');
         $value = $value['my_display_custom'];
-        $this->custom_enabled  = $value == 'true' ? true : false;
+        $this->custom_enabled = $value == 'true' ? true : false;
 
         if ($this->custom_enabled) {
             $params = array('category = ?' =>  array('Gradebook'));
@@ -96,10 +96,10 @@ 
                 sort($portal_displays);
             }
             $this->custom_display = $portal_displays;
-            if (count($this->custom_display)>0) {
+            if (count($this->custom_display) > 0) {
                 $value = api_get_setting('gradebook_score_display_upperlimit');
                 $value = $value['my_display_upperlimit'];
-                $this->upperlimit_included  = $value == 'true' ? true : false;
+                $this->upperlimit_included = $value == 'true' ? true : false;
                 $this->custom_display_conv = $this->convert_displays($this->custom_display);
             }
         }
@@ -110,7 +110,7 @@ 
             //Load course settings
             if ($this->custom_enabled) {
                 $this->custom_display = $this->get_custom_displays();
-                if (count($this->custom_display)> 0) {
+                if (count($this->custom_display) > 0) {
                     $this->custom_display_conv = $this->convert_displays($this->custom_display);
                 }
             }
@@ -182,7 +182,7 @@ 
         }
 
         $sql = 'SELECT id FROM '.$tbl_gradebook_category.'
-                WHERE course_code = "'.$curr_course_code.'" '. $session_condition;
+                WHERE course_code = "'.$curr_course_code.'" '.$session_condition;
         $rs  = Database::query($sql);
         $category_id = 0;
         if (Database::num_rows($rs) > 0) {
@@ -251,7 +251,7 @@ 
         );
 
         $tbl_display = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_SCORE_DISPLAY);
-        foreach($display as $value => $text) {
+        foreach ($display as $value => $text) {
             $params = array(
                 'score' => $value,
                 'display' => $text,
@@ -307,7 +307,7 @@ 
         $my_score = $score == 0 ? 1 : $score;
 
         if ($type == SCORE_BAR) {
-            $percentage = $my_score[0]/$my_score[1]*100;
+            $percentage = $my_score[0] / $my_score[1] * 100;
 
             return Display::bar_progress($percentage);
         }
@@ -348,7 +348,7 @@ 
             case SCORE_PERCENT :                        // XX %
                 return $this->display_as_percent($score);
             case SCORE_DIV_PERCENT :                    // X / Y (XX %)
-                return $this->display_as_div($score).' (' . $this->display_as_percent($score) . ')';
+                return $this->display_as_div($score).' ('.$this->display_as_percent($score).')';
             case SCORE_AVERAGE :                        // XX %
                 return $this->display_as_percent($score);
             case SCORE_DECIMAL :                        // 0.50  (X/Y)
@@ -358,7 +358,7 @@ 
                 if (!empty($custom)) {
                     $custom = ' - '.$custom;
                 }
-                return $this->display_as_div($score).' (' . $this->display_as_percent($score) . ')'.$custom;
+                return $this->display_as_div($score).' ('.$this->display_as_percent($score).')'.$custom;
             case SCORE_DIV_SIMPLE_WITH_CUSTOM :         // X - Good!
                 $custom = $this->display_custom($score);
 
@@ -410,9 +410,9 @@ 
      */
     private function display_as_decimal($score)
     {
-        $score_denom = ($score[1]==0) ? 1 : $score[1];
+        $score_denom = ($score[1] == 0) ? 1 : $score[1];
 
-        return $this->format_score($score[0]/$score_denom);
+        return $this->format_score($score[0] / $score_denom);
     }
 
     /**
@@ -420,9 +420,9 @@ 
      */
     private function display_as_percent($score)
     {
-        $score_denom = ($score[1]==0) ? 1 : $score[1];
+        $score_denom = ($score[1] == 0) ? 1 : $score[1];
 
-        return $this->format_score($score[0]/$score_denom*100) . ' %';
+        return $this->format_score($score[0] / $score_denom * 100).' %';
     }
 
     /**
@@ -438,7 +438,7 @@ 
         } else {
             $score[0] = isset($score[0]) ? $this->format_score($score[0]) : 0;
             $score[1] = isset($score[1]) ? $this->format_score($score[1]) : 0;
-            return  $score[0] . ' / ' . $score[1];
+            return  $score[0].' / '.$score[1];
         }
     }
 
@@ -448,7 +448,7 @@ 
      */
     private function display_custom($score)
     {
-        $my_score_denom= ($score[1]==0) ? 1 : $score[1];
+        $my_score_denom = ($score[1] == 0) ? 1 : $score[1];
         $scaledscore = $score[0] / $my_score_denom;
         if ($this->upperlimit_included) {
             foreach ($this->custom_display_conv as $displayitem) {
@@ -512,7 +512,7 @@ 
                 ORDER BY score';
         $result = Database::query($sql);
 
-        return Database::store_result($result,'ASSOC');
+        return Database::store_result($result, 'ASSOC');
     }
 
     /**

main/gradebook/lib/gradebook_data_generator.class.php

Spacing +10 added lines, -10 removed lines

@@ -42,12 +42,12 @@ 
         if (count($allcats) > 0) {
             // get sub categories id
             $tabCategories = array();
-            for ($i=0; $i < count($allcats); $i++) {
+            for ($i = 0; $i < count($allcats); $i++) {
                 $tabCategories[] = $allcats[$i]->get_id();
             }
             // dont display links that belongs to a sub category
             $tabLinkToDisplay = array();
-            for ($i=0; $i < count($alllinks); $i++) {
+            for ($i = 0; $i < count($alllinks); $i++) {
                 if (!in_array($alllinks[$i]->get_category_id(), $tabCategories)) {
                     $tabLinkToDisplay[] = $alllinks[$i];
                 }
@@ -89,7 +89,7 @@ 
         //$status = CourseManager::get_user_in_course_status(api_get_user_id(), api_get_course_id());
         // do some checks on count, redefine if invalid value
         if (!isset($count)) {
-            $count = count ($this->items) - $start;
+            $count = count($this->items) - $start;
         }
         if ($count < 0) {
             $count = 0;
@@ -246,7 +246,7 @@ 
         $display = $scoreDisplay->display_score($score, SCORE_DIV, SCORE_BOTH, true);
         $type = $item->get_item_type();
         if ($type == 'L' && get_class($item) == 'ExerciseLink') {
-            $display  = ExerciseLib::show_score($score[0], $score[1], false);
+            $display = ExerciseLib::show_score($score[0], $score[1], false);
         }
 
         return array(
@@ -268,7 +268,7 @@ 
         $type = $item->get_item_type();
 
         if ($type == 'L' && get_class($item) == 'ExerciseLink') {
-            $display  = ExerciseLib::show_score($score[0], $score[1], false);
+            $display = ExerciseLib::show_score($score[0], $score[1], false);
         }
 
         return array(
@@ -361,7 +361,7 @@ 
 
                 $type = $item->get_item_type();
                 if ($type == 'L' && get_class($item) == 'ExerciseLink') {
-                    $display  = ExerciseLib::show_score($score[0], $score[1], false);
+                    $display = ExerciseLib::show_score($score[0], $score[1], false);
                 }
 
                 return array(
@@ -442,7 +442,7 @@ 
     public function sort_by_type($item1, $item2)
     {
         if ($item1->get_item_type() == $item2->get_item_type()) {
-            return $this->sort_by_name($item1,$item2);
+            return $this->sort_by_name($item1, $item2);
         } else {
             return ($item1->get_item_type() < $item2->get_item_type() ? -1 : 1);
         }
@@ -457,7 +457,7 @@ 
     {
         $result = api_strcmp($item1->get_description(), $item2->get_description());
         if ($result == 0) {
-            return $this->sort_by_name($item1,$item2);
+            return $this->sort_by_name($item1, $item2);
         }
         return $result;
     }
@@ -470,7 +470,7 @@ 
     public function sort_by_weight($item1, $item2)
     {
         if ($item1->get_weight() == $item2->get_weight()) {
-            return $this->sort_by_name($item1,$item2);
+            return $this->sort_by_name($item1, $item2);
         } else {
             return ($item1->get_weight() < $item2->get_weight() ? -1 : 1);
         }
@@ -501,7 +501,7 @@ 
         }
 
         if ($timestamp1 == $timestamp2) {
-            return $this->sort_by_name($item1,$item2);
+            return $this->sort_by_name($item1, $item2);
         } else {
             return ($timestamp1 < $timestamp2 ? -1 : 1);
         }

main/gradebook/lib/be/exerciselink.class.php

Indentation +13 added lines, -13 removed lines

@@ -194,13 +194,13 @@ 
         in exercice/exercice.php, look for note-query-exe-results marker*/
         $session_id = api_get_session_id();
         $courseId = $this->getCourseId();
-	    $exercise = new Exercise($courseId);
+        $exercise = new Exercise($courseId);
         $exercise->read($this->get_ref_id());
 
         if (!$this->is_hp) {
 
-		if ($exercise->exercise_was_added_in_lp == false) {
-			$sql = "SELECT * FROM $tblStats
+        if ($exercise->exercise_was_added_in_lp == false) {
+            $sql = "SELECT * FROM $tblStats
 			        WHERE
 			            exe_exo_id = ".intval($this->get_ref_id())." AND
 			            orig_lp_id = 0 AND
@@ -209,15 +209,15 @@ 
 			            session_id = $session_id AND
                                     c_id = $courseId 
                                 ";
-		    } else {
-		        $lpId = null;
-		        if (!empty($exercise->lpList)) {
-		            // Taking only the first LP
-		            $lpId = current($exercise->lpList);
-		            $lpId = $lpId['lp_id'];
-		        }
-
-		        $sql = "SELECT * FROM $tblStats
+            } else {
+                $lpId = null;
+                if (!empty($exercise->lpList)) {
+                    // Taking only the first LP
+                    $lpId = current($exercise->lpList);
+                    $lpId = $lpId['lp_id'];
+                }
+
+                $sql = "SELECT * FROM $tblStats
 		                WHERE
 		                    exe_exo_id = ".intval($this->get_ref_id())." AND
 		                    orig_lp_id = $lpId AND
@@ -225,7 +225,7 @@ 
 		                    session_id = $session_id AND
                                     c_id = $courseId 
                                 ";
-		    }
+            }
 
             if (!empty($stud_id) && $type != 'ranking') {
                 $sql .= " AND exe_user_id = $stud_id ";

Spacing +11 added lines, -11 removed lines

@@ -51,8 +51,8 @@ 
 
         $result = Database::query($sql);
         $cats = array();
-        while ($data=Database::fetch_array($result)) {
-            $cats[] = array ($data['id'], $data['title']);
+        while ($data = Database::fetch_array($result)) {
+            $cats[] = array($data['id'], $data['title']);
         }
 
         return $cats;
@@ -116,15 +116,15 @@ 
         $cats = array();
         if (isset($result)) {
             if (Database::num_rows($result) > 0) {
-                while ($data=Database::fetch_array($result)) {
-                    $cats[] = array ($data['id'], $data['title']);
+                while ($data = Database::fetch_array($result)) {
+                    $cats[] = array($data['id'], $data['title']);
                 }
             }
         }
 
         if (isset($result2)) {
             if (Database::num_rows($result2) > 0) {
-                while ($row=Database::fetch_array($result2)) {
+                while ($row = Database::fetch_array($result2)) {
                     /*$path = $data['path'];
                     $fname = GetQuizName($path,$documentPath);
         			$cats[] = array ($data['id'], $fname);*/
@@ -170,9 +170,9 @@ 
                 WHERE
                     session_id = $session_id AND
                     c_id = $course_id AND
-                    exe_exo_id   = ".(int)$this->get_ref_id();
+                    exe_exo_id   = ".(int) $this->get_ref_id();
         $result = Database::query($sql);
-        $number=Database::fetch_row($result);
+        $number = Database::fetch_row($result);
         return ($number[0] != 0);
     }
 
@@ -254,7 +254,7 @@ 
         } else {
             // all students -> get average
             // normal way of getting the info
-            $students = array();  // user list, needed to make sure we only
+            $students = array(); // user list, needed to make sure we only
             // take first attempts into account
             $student_count = 0;
             $sum = 0;
@@ -289,7 +289,7 @@ 
                         /*if (empty($count)) {
                             return null;
                         }*/
-                        return array($sumResult/$count , $weight);
+                        return array($sumResult / $count, $weight);
                         break;
                     case 'ranking':
                         return AbstractLink::getCurrentUserRanking($stud_id, $students);
@@ -319,7 +319,7 @@ 
         $session_id = api_get_session_id();
 
         $url = api_get_path(WEB_CODE_PATH).'gradebook/exercise_jump.php?session_id='.$session_id.'&cidReq='.$this->get_course_code().'&gradebook=view&exerciseId='.$this->get_ref_id().'&type='.$this->get_type();
-        if ((!api_is_allowed_to_edit() && $this->calc_score(api_get_user_id()) == null) || $status_user!=1) {
+        if ((!api_is_allowed_to_edit() && $this->calc_score(api_get_user_id()) == null) || $status_user != 1) {
             $url .= '&doexercise='.$this->get_ref_id();
         }
 
@@ -364,7 +364,7 @@ 
     public function is_valid_link()
     {
         $sql = 'SELECT count(id) from '.$this->get_exercise_table().'
-                WHERE c_id = '.$this->course_id.' AND id = '.(int)$this->get_ref_id().' ';
+                WHERE c_id = '.$this->course_id.' AND id = '.(int) $this->get_ref_id().' ';
         $result = Database::query($sql);
         $number = Database::fetch_row($result);
 

main/gradebook/lib/be/abstractlink.class.php

Spacing +24 added lines, -24 removed lines

@@ -138,22 +138,22 @@ 
         return $this->visible;
     }
 
-    public function set_id ($id)
+    public function set_id($id)
     {
         $this->id = $id;
     }
 
-    public function set_type ($type)
+    public function set_type($type)
     {
         $this->type = $type;
     }
 
-    public function set_ref_id ($ref_id)
+    public function set_ref_id($ref_id)
     {
         $this->ref_id = $ref_id;
     }
 
-    public function set_user_id ($user_id)
+    public function set_user_id($user_id)
     {
         $this->user_id = $user_id;
     }
@@ -231,29 +231,29 @@ 
         $sql = 'SELECT * FROM '.$tbl_grade_links;
         $paramcount = 0;
         if (isset ($id)) {
-            $sql.= ' WHERE id = '.intval($id);
-            $paramcount ++;
+            $sql .= ' WHERE id = '.intval($id);
+            $paramcount++;
         }
         if (isset ($type)) {
             if ($paramcount != 0) $sql .= ' AND';
             else $sql .= ' WHERE';
             $sql .= ' type = '.intval($type);
-            $paramcount ++;
+            $paramcount++;
         }
         if (isset ($ref_id)) {
             if ($paramcount != 0) $sql .= ' AND';
             else $sql .= ' WHERE';
             $sql .= ' ref_id = '.intval($ref_id);
-            $paramcount ++;
+            $paramcount++;
         }
         if (isset ($user_id)) {
             if ($paramcount != 0) {
                 $sql .= ' AND';
-            }else {
+            } else {
                 $sql .= ' WHERE';
             }
             $sql .= ' user_id = '.intval($user_id);
-            $paramcount ++;
+            $paramcount++;
         }
         if (isset ($course_code)) {
             if ($paramcount != 0) {
@@ -262,16 +262,16 @@ 
                 $sql .= ' WHERE';
             }
             $sql .= " course_code = '".Database::escape_string($course_code)."'";
-            $paramcount ++;
+            $paramcount++;
         }
         if (isset ($category_id)) {
             if ($paramcount != 0) {
                 $sql .= ' AND';
-            }else {
+            } else {
                 $sql .= ' WHERE';
             }
             $sql .= ' category_id = '.intval($category_id);
-            $paramcount ++;
+            $paramcount++;
         }
         if (isset ($visible)) {
             if ($paramcount != 0) {
@@ -311,7 +311,7 @@ 
             $session_id = api_get_session_id();
 
             $link->set_session_id($session_id);
-            $links[]=$link;
+            $links[] = $link;
         }
         return $links;
     }
@@ -402,12 +402,12 @@ 
         $dateobject = AbstractLink::load($idevaluation, null, null, null, null);
         $current_date_server = api_get_utc_datetime();
         $arreval = get_object_vars($dateobject[0]);
-        $description_log = isset($arreval['description']) ? $arreval['description']:'';
+        $description_log = isset($arreval['description']) ? $arreval['description'] : '';
         if (empty($nameLog)) {
             if (isset($_POST['name_link'])) {
                 $name_log = isset($_POST['name_link']) ? $_POST['name_link'] : $arreval['course_code'];
-            } elseif (isset($_POST['link_' . $idevaluation]) && $_POST['link_' . $idevaluation]) {
-                $name_log = $_POST['link_' . $idevaluation];
+            } elseif (isset($_POST['link_'.$idevaluation]) && $_POST['link_'.$idevaluation]) {
+                $name_log = $_POST['link_'.$idevaluation];
             } else {
                 $name_log = $arreval['course_code'];
             }
@@ -452,10 +452,10 @@ 
         $targets = array();
         $level = 0;
 
-        $crscats = Category::load(null,null,$this->get_course_code(),0);
+        $crscats = Category::load(null, null, $this->get_course_code(), 0);
         foreach ($crscats as $cat) {
-            $targets[] = array($cat->get_id(), $cat->get_name(), $level+1);
-            $targets = $this->add_target_subcategories($targets, $level+1, $cat->get_id());
+            $targets[] = array($cat->get_id(), $cat->get_name(), $level + 1);
+            $targets = $this->add_target_subcategories($targets, $level + 1, $cat->get_id());
         }
 
         return $targets;
@@ -466,10 +466,10 @@ 
      */
     private function add_target_subcategories($targets, $level, $catid)
     {
-        $subcats = Category::load(null,null,null,$catid);
+        $subcats = Category::load(null, null, null, $catid);
         foreach ($subcats as $cat) {
-            $targets[] = array ($cat->get_id(), $cat->get_name(), $level+1);
-            $targets = $this->add_target_subcategories($targets, $level+1, $cat->get_id());
+            $targets[] = array($cat->get_id(), $cat->get_name(), $level + 1);
+            $targets = $this->add_target_subcategories($targets, $level + 1, $cat->get_id());
         }
         return $targets;
     }
@@ -493,7 +493,7 @@ 
      * To keep consistency, do not call this method but LinkFactory::find_links instead.
      * @todo can be written more efficiently using a new (but very complex) sql query
      */
-    public function find_links ($name_mask,$selectcat)
+    public function find_links($name_mask, $selectcat)
     {
         $rootcat = Category::load($selectcat);
         $links = $rootcat[0]->get_links((api_is_allowed_to_edit() ? null : api_get_user_id()), true);

Braces +12 added lines, -6 removed lines

@@ -235,21 +235,27 @@ 
             $paramcount ++;
         }
         if (isset ($type)) {
-            if ($paramcount != 0) $sql .= ' AND';
-            else $sql .= ' WHERE';
+            if ($paramcount != 0) {
+                $sql .= ' AND';
+            } else {
+                $sql .= ' WHERE';
+            }
             $sql .= ' type = '.intval($type);
             $paramcount ++;
         }
         if (isset ($ref_id)) {
-            if ($paramcount != 0) $sql .= ' AND';
-            else $sql .= ' WHERE';
+            if ($paramcount != 0) {
+                $sql .= ' AND';
+            } else {
+                $sql .= ' WHERE';
+            }
             $sql .= ' ref_id = '.intval($ref_id);
             $paramcount ++;
         }
         if (isset ($user_id)) {
             if ($paramcount != 0) {
                 $sql .= ' AND';
-            }else {
+            } else {
                 $sql .= ' WHERE';
             }
             $sql .= ' user_id = '.intval($user_id);
@@ -267,7 +273,7 @@ 
         if (isset ($category_id)) {
             if ($paramcount != 0) {
                 $sql .= ' AND';
-            }else {
+            } else {
                 $sql .= ' WHERE';
             }
             $sql .= ' category_id = '.intval($category_id);

main/gradebook/lib/be/gradebookitem.class.php

Indentation +12 added lines, -12 removed lines

@@ -8,16 +8,16 @@
  */
 interface GradebookItem
 {
-	public function get_item_type();
-	public function get_id();
-	public function get_name();
-	public function get_description();
-	public function get_course_code();
-	public function get_weight();
-	public function get_date();
-	public function is_visible();
-	public function get_icon_name();
-	public function getStudentList();
-	public function setStudentList($list);
-	public function calc_score($stud_id = null, $type = null);
+    public function get_item_type();
+    public function get_id();
+    public function get_name();
+    public function get_description();
+    public function get_course_code();
+    public function get_weight();
+    public function get_date();
+    public function is_visible();
+    public function get_icon_name();
+    public function getStudentList();
+    public function setStudentList($list);
+    public function calc_score($stud_id = null, $type = null);
 }