chamilo / chamilo-lms

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

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 UserTable($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 UserTable($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() . ']';
+        }
+    }
 }

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;
 			}
 		}

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/fe/scoredisplayform.class.php

Indentation +74 added lines, -74 removed lines

@@ -10,47 +10,47 @@ 
  */
 class ScoreDisplayForm extends FormValidator
 {
-	/**
-	 * @param $form_name
-	 * @param null $action
-	 */
-	public function ScoreDisplayForm($form_name, $action= null)
-	{
-		parent :: __construct($form_name, 'post', $action);
-		$displayscore = ScoreDisplay :: instance();
-		$customdisplays = $displayscore->get_custom_score_display_settings();
-
-		$nr_items = (count($customdisplays)!='0') ? count($customdisplays) : '1';
-		$this->setDefaults(array (
+    /**
+     * @param $form_name
+     * @param null $action
+     */
+    public function ScoreDisplayForm($form_name, $action= null)
+    {
+        parent :: __construct($form_name, 'post', $action);
+        $displayscore = ScoreDisplay :: instance();
+        $customdisplays = $displayscore->get_custom_score_display_settings();
+
+        $nr_items = (count($customdisplays)!='0') ? count($customdisplays) : '1';
+        $this->setDefaults(array (
             'scorecolpercent' => $displayscore->get_color_split_value()
-		));
+        ));
 
-		$this->addElement('hidden', 'maxvalue', '100');
-		$this->addElement('hidden', 'minvalue', '0');
-		$counter= 1;
+        $this->addElement('hidden', 'maxvalue', '100');
+        $this->addElement('hidden', 'minvalue', '0');
+        $counter= 1;
 
-		//setting the default values
+        //setting the default values
 
-		if(is_array($customdisplays)) {
-			foreach ($customdisplays as $customdisplay) {
-				$this->setDefaults(array (
-					'endscore[' . $counter . ']' => $customdisplay['score'],
-					'displaytext[' . $counter . ']' => $customdisplay['display']
-				));
-				$counter++;
-			}
-		}
-		$scorecol = array();
+        if(is_array($customdisplays)) {
+            foreach ($customdisplays as $customdisplay) {
+                $this->setDefaults(array (
+                    'endscore[' . $counter . ']' => $customdisplay['score'],
+                    'displaytext[' . $counter . ']' => $customdisplay['display']
+                ));
+                $counter++;
+            }
+        }
+        $scorecol = array();
 
-		//settings for the colored score
-		$this->addElement('header', get_lang('ScoreEdit'));
+        //settings for the colored score
+        $this->addElement('header', get_lang('ScoreEdit'));
 
         if ($displayscore->is_coloring_enabled()) {
             $this->addElement('html', '<b>' . get_lang('ScoreColor') . '</b>');
             $this->addElement('text', 'scorecolpercent', array(get_lang('Below'), get_lang('WillColorRed'), '%'), array(
                 'size' => 5,
                 'maxlength' => 5,
-				'input-size' => 2
+                'input-size' => 2
             ));
 
             if (api_get_setting('teachers_can_change_score_settings') != 'true') {
@@ -62,25 +62,25 @@ 
             $this->addRule(array('scorecolpercent','minvalue'), get_lang('UnderMin'), 'compare', '>');
         }
 
-		//Settings for the scoring system
+        //Settings for the scoring system
 
-		if ($displayscore->is_custom()) {
+        if ($displayscore->is_custom()) {
             $this->addElement('html', '<br /><b>' . get_lang('ScoringSystem') . '</b>');
-			$this->addElement('static', null, null, get_lang('ScoreInfo'));
-			$this->setDefaults(array(
-				'beginscore' => '0'
-			));
-			$this->addElement('text', 'beginscore', array(get_lang('Between'), null, '%'), array(
-				'size' => 5,
-				'maxlength' => 5,
-				'disabled' => 'disabled',
-				'input-size' => 2
-			));
-
-			for ($counter= 1; $counter <= 20; $counter++) {
-				$renderer =& $this->defaultRenderer();
-				$elementTemplateTwoLabel =
-				'<div id=' . $counter . ' style="display: '.(($counter<=$nr_items)?'inline':'none').';">
+            $this->addElement('static', null, null, get_lang('ScoreInfo'));
+            $this->setDefaults(array(
+                'beginscore' => '0'
+            ));
+            $this->addElement('text', 'beginscore', array(get_lang('Between'), null, '%'), array(
+                'size' => 5,
+                'maxlength' => 5,
+                'disabled' => 'disabled',
+                'input-size' => 2
+            ));
+
+            for ($counter= 1; $counter <= 20; $counter++) {
+                $renderer =& $this->defaultRenderer();
+                $elementTemplateTwoLabel =
+                '<div id=' . $counter . ' style="display: '.(($counter<=$nr_items)?'inline':'none').';">
 
 				<!-- BEGIN required --><span class="form_required">*</span> <!-- END required -->
 
@@ -105,7 +105,7 @@ 
 
 				';
 
-				$elementTemplateTwoLabel2 ='
+                $elementTemplateTwoLabel2 ='
 				<div class="col-sm-2">
 					<!-- BEGIN error --><span class="form_error">{error}</span>
 					<!-- END error -->
@@ -118,33 +118,33 @@ 
 				</div>
 				</div>';
 
-				$scorebetw = array();
-				$this->addElement('text', 'endscore[' . $counter . ']', null, array (
-					'size' => 5,
-					'maxlength' => 5,
-					'id' => 'txta-'.$counter,
-					'input-size' => 2
-				));
-
-				$this->addElement('text', 'displaytext[' . $counter . ']', null,array (
-					'size' => 40,
-					'maxlength' => 40,
-					'id' => 'txtb-'.$counter
-				));
-				$renderer->setElementTemplate($elementTemplateTwoLabel, 'endscore[' . $counter . ']');
-				$renderer->setElementTemplate($elementTemplateTwoLabel2, 'displaytext[' . $counter . ']');
-				$this->addRule('endscore[' . $counter . ']', get_lang('OnlyNumbers'), 'numeric');
-				$this->addRule(array ('endscore[' . $counter . ']', 'maxvalue'), get_lang('Over100'), 'compare', '<=');
-				$this->addRule(array ('endscore[' . $counter . ']', 'minvalue'), get_lang('UnderMin'), 'compare', '>');
-			}
-		}
+                $scorebetw = array();
+                $this->addElement('text', 'endscore[' . $counter . ']', null, array (
+                    'size' => 5,
+                    'maxlength' => 5,
+                    'id' => 'txta-'.$counter,
+                    'input-size' => 2
+                ));
+
+                $this->addElement('text', 'displaytext[' . $counter . ']', null,array (
+                    'size' => 40,
+                    'maxlength' => 40,
+                    'id' => 'txtb-'.$counter
+                ));
+                $renderer->setElementTemplate($elementTemplateTwoLabel, 'endscore[' . $counter . ']');
+                $renderer->setElementTemplate($elementTemplateTwoLabel2, 'displaytext[' . $counter . ']');
+                $this->addRule('endscore[' . $counter . ']', get_lang('OnlyNumbers'), 'numeric');
+                $this->addRule(array ('endscore[' . $counter . ']', 'maxvalue'), get_lang('Over100'), 'compare', '<=');
+                $this->addRule(array ('endscore[' . $counter . ']', 'minvalue'), get_lang('UnderMin'), 'compare', '>');
+            }
+        }
 
         if ($displayscore->is_custom()) {
-			$this->addButtonSave(get_lang('Ok'));
-		}
-	}
+            $this->addButtonSave(get_lang('Ok'));
+        }
+    }
 
-	function validate() {
-		return parent :: validate();
-	}
+    function validate() {
+        return parent :: validate();
+    }
 }

Spacing +27 added lines, -27 removed lines

@@ -14,28 +14,28 @@ 
 	 * @param $form_name
 	 * @param null $action
 	 */
-	public function ScoreDisplayForm($form_name, $action= null)
+	public function ScoreDisplayForm($form_name, $action = null)
 	{
 		parent :: __construct($form_name, 'post', $action);
 		$displayscore = ScoreDisplay :: instance();
 		$customdisplays = $displayscore->get_custom_score_display_settings();
 
-		$nr_items = (count($customdisplays)!='0') ? count($customdisplays) : '1';
-		$this->setDefaults(array (
+		$nr_items = (count($customdisplays) != '0') ? count($customdisplays) : '1';
+		$this->setDefaults(array(
             'scorecolpercent' => $displayscore->get_color_split_value()
 		));
 
 		$this->addElement('hidden', 'maxvalue', '100');
 		$this->addElement('hidden', 'minvalue', '0');
-		$counter= 1;
+		$counter = 1;
 
 		//setting the default values
 
-		if(is_array($customdisplays)) {
+		if (is_array($customdisplays)) {
 			foreach ($customdisplays as $customdisplay) {
-				$this->setDefaults(array (
-					'endscore[' . $counter . ']' => $customdisplay['score'],
-					'displaytext[' . $counter . ']' => $customdisplay['display']
+				$this->setDefaults(array(
+					'endscore['.$counter.']' => $customdisplay['score'],
+					'displaytext['.$counter.']' => $customdisplay['display']
 				));
 				$counter++;
 			}
@@ -46,7 +46,7 @@ 
 		$this->addElement('header', get_lang('ScoreEdit'));
 
         if ($displayscore->is_coloring_enabled()) {
-            $this->addElement('html', '<b>' . get_lang('ScoreColor') . '</b>');
+            $this->addElement('html', '<b>'.get_lang('ScoreColor').'</b>');
             $this->addElement('text', 'scorecolpercent', array(get_lang('Below'), get_lang('WillColorRed'), '%'), array(
                 'size' => 5,
                 'maxlength' => 5,
@@ -58,14 +58,14 @@ 
             }
 
             $this->addRule('scorecolpercent', get_lang('OnlyNumbers'), 'numeric');
-            $this->addRule(array('scorecolpercent','maxvalue'), get_lang('Over100'), 'compare', '<=');
-            $this->addRule(array('scorecolpercent','minvalue'), get_lang('UnderMin'), 'compare', '>');
+            $this->addRule(array('scorecolpercent', 'maxvalue'), get_lang('Over100'), 'compare', '<=');
+            $this->addRule(array('scorecolpercent', 'minvalue'), get_lang('UnderMin'), 'compare', '>');
         }
 
 		//Settings for the scoring system
 
 		if ($displayscore->is_custom()) {
-            $this->addElement('html', '<br /><b>' . get_lang('ScoringSystem') . '</b>');
+            $this->addElement('html', '<br /><b>'.get_lang('ScoringSystem').'</b>');
 			$this->addElement('static', null, null, get_lang('ScoreInfo'));
 			$this->setDefaults(array(
 				'beginscore' => '0'
@@ -77,10 +77,10 @@ 
 				'input-size' => 2
 			));
 
-			for ($counter= 1; $counter <= 20; $counter++) {
-				$renderer =& $this->defaultRenderer();
+			for ($counter = 1; $counter <= 20; $counter++) {
+				$renderer = & $this->defaultRenderer();
 				$elementTemplateTwoLabel =
-				'<div id=' . $counter . ' style="display: '.(($counter<=$nr_items)?'inline':'none').';">
+				'<div id='.$counter.' style="display: '.(($counter <= $nr_items) ? 'inline' : 'none').';">
 
 				<!-- BEGIN required --><span class="form_required">*</span> <!-- END required -->
 
@@ -105,39 +105,39 @@ 
 
 				';
 
-				$elementTemplateTwoLabel2 ='
+				$elementTemplateTwoLabel2 = '
 				<div class="col-sm-2">
 					<!-- BEGIN error --><span class="form_error">{error}</span>
 					<!-- END error -->
 					{element}
 				</div>
 				<div class="col-sm-1">
-                    <a href="javascript:plusItem(' . ($counter+1) . ')">
-                    <img style="display: '.(($counter>=$nr_items)?'inline':'none').';" id="plus-' . ($counter+1) . '" src="'.Display::returnIconPath('add.png').'" alt="'.get_lang('Add').'" title="'.get_lang('Add').'"></a>
-        			<a href="javascript:minItem(' . ($counter) . ')">
-        			<img style="display: '.(($counter>=$nr_items && $counter!=1)?'inline':'none').';" id="min-' . $counter . '" src="'.Display::returnIconPath('delete.png').'" alt="'.get_lang('Delete').'" title="'.get_lang('Delete').'"></a>
+                    <a href="javascript:plusItem(' . ($counter + 1).')">
+                    <img style="display: '.(($counter >= $nr_items) ? 'inline' : 'none').';" id="plus-'.($counter + 1).'" src="'.Display::returnIconPath('add.png').'" alt="'.get_lang('Add').'" title="'.get_lang('Add').'"></a>
+        			<a href="javascript:minItem(' . ($counter).')">
+        			<img style="display: '.(($counter >= $nr_items && $counter != 1) ? 'inline' : 'none').';" id="min-'.$counter.'" src="'.Display::returnIconPath('delete.png').'" alt="'.get_lang('Delete').'" title="'.get_lang('Delete').'"></a>
 				</div>
 				</div>
 				</div>';
 
 				$scorebetw = array();
-				$this->addElement('text', 'endscore[' . $counter . ']', null, array (
+				$this->addElement('text', 'endscore['.$counter.']', null, array(
 					'size' => 5,
 					'maxlength' => 5,
 					'id' => 'txta-'.$counter,
 					'input-size' => 2
 				));
 
-				$this->addElement('text', 'displaytext[' . $counter . ']', null,array (
+				$this->addElement('text', 'displaytext['.$counter.']', null, array(
 					'size' => 40,
 					'maxlength' => 40,
 					'id' => 'txtb-'.$counter
 				));
-				$renderer->setElementTemplate($elementTemplateTwoLabel, 'endscore[' . $counter . ']');
-				$renderer->setElementTemplate($elementTemplateTwoLabel2, 'displaytext[' . $counter . ']');
-				$this->addRule('endscore[' . $counter . ']', get_lang('OnlyNumbers'), 'numeric');
-				$this->addRule(array ('endscore[' . $counter . ']', 'maxvalue'), get_lang('Over100'), 'compare', '<=');
-				$this->addRule(array ('endscore[' . $counter . ']', 'minvalue'), get_lang('UnderMin'), 'compare', '>');
+				$renderer->setElementTemplate($elementTemplateTwoLabel, 'endscore['.$counter.']');
+				$renderer->setElementTemplate($elementTemplateTwoLabel2, 'displaytext['.$counter.']');
+				$this->addRule('endscore['.$counter.']', get_lang('OnlyNumbers'), 'numeric');
+				$this->addRule(array('endscore['.$counter.']', 'maxvalue'), get_lang('Over100'), 'compare', '<=');
+				$this->addRule(array('endscore['.$counter.']', 'minvalue'), get_lang('UnderMin'), 'compare', '>');
 			}
 		}
 

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);
 }

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

Indentation +202 added lines, -202 removed lines

@@ -8,48 +8,48 @@ 
  */
 class AttendanceLink extends AbstractLink
 {
-	private $attendance_table = null;
-	private $itemprop_table = null;
+    private $attendance_table = null;
+    private $itemprop_table = null;
 
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-		$this->set_type(LINK_ATTENDANCE);
-	}
+    /**
+     * Constructor
+     */
+    public function __construct()
+    {
+        parent::__construct();
+        $this->set_type(LINK_ATTENDANCE);
+    }
 
-	/**
-	 * @return string
-	 */
-	public function get_type_name()
-	{
-		return get_lang('Attendance');
-	}
+    /**
+     * @return string
+     */
+    public function get_type_name()
+    {
+        return get_lang('Attendance');
+    }
 
-	/**
-	 * @return bool
-	 */
-	public function is_allowed_to_change_name()
-	{
-		return false;
-	}
+    /**
+     * @return bool
+     */
+    public function is_allowed_to_change_name()
+    {
+        return false;
+    }
 
-	/**
-	 * Generate an array of attendances that a teacher hasn't created a link for.
-	 * @return array 2-dimensional array - every element contains 2 subelements (id, name)
-	 * @todo seems to be depracated
-	 */
-	public function get_not_created_links()
-	{
-		return false;
-		if (empty($this->course_code)) {
-			die('Error in get_not_created_links() : course code not set');
-		}
-		$tbl_grade_links = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_LINK);
+    /**
+     * Generate an array of attendances that a teacher hasn't created a link for.
+     * @return array 2-dimensional array - every element contains 2 subelements (id, name)
+     * @todo seems to be depracated
+     */
+    public function get_not_created_links()
+    {
+        return false;
+        if (empty($this->course_code)) {
+            die('Error in get_not_created_links() : course code not set');
+        }
+        $tbl_grade_links = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_LINK);
 
-		$sql = 'SELECT att.id, att.name, att.attendance_qualify_title
+        $sql = 'SELECT att.id, att.name, att.attendance_qualify_title
 				FROM '.$this->get_attendance_table().' att
 				WHERE
 					att.c_id = '.$this->course_id.' AND
@@ -60,7 +60,7 @@ 
 							course_code = "'.Database::escape_string($this->get_course_code()).'"
 					)
 				AND att.session_id='.api_get_session_id().'';
-		$result = Database::query($sql);
+        $result = Database::query($sql);
 
         $cats = array();
         while ($data = Database::fetch_array($result)) {
@@ -71,13 +71,13 @@ 
             }
         }
 
-		return $cats;
-	}
+        return $cats;
+    }
 
-	/**
-	 * Generate an array of all attendances available.
-	 * @return array 2-dimensional array - every element contains 2 subelements (id, name)
-	 */
+    /**
+     * Generate an array of all attendances available.
+     * @return array 2-dimensional array - every element contains 2 subelements (id, name)
+     */
     public function get_all_links()
     {
         if (empty($this->course_code)) {
@@ -104,55 +104,55 @@ 
         $my_cats = isset($cats) ? $cats : null;
 
         return $my_cats;
-	}
+    }
 
-	/**
-	 * Has anyone done this exercise yet ?
-	 */
-	public function has_results()
-	{
-		$tbl_attendance_result = Database :: get_course_table(TABLE_ATTENDANCE_RESULT);
-		$session_id = api_get_session_id();
-		$sql = 'SELECT count(*) AS number FROM '.$tbl_attendance_result."
+    /**
+     * Has anyone done this exercise yet ?
+     */
+    public function has_results()
+    {
+        $tbl_attendance_result = Database :: get_course_table(TABLE_ATTENDANCE_RESULT);
+        $session_id = api_get_session_id();
+        $sql = 'SELECT count(*) AS number FROM '.$tbl_attendance_result."
 				WHERE
 					session_id = $session_id AND
 					c_id = '.$this->course_id.' AND
 					attendance_id = '".intval($this->get_ref_id())."'";
-		$result = Database::query($sql);
-		$number = Database::fetch_row($result);
+        $result = Database::query($sql);
+        $number = Database::fetch_row($result);
 
-		return $number[0] != 0;
-	}
+        return $number[0] != 0;
+    }
 
-	/**
-	 * @param int $stud_id
-	 * @return array|null
-	 */
-	public function calc_score($stud_id = null, $type = null)
-	{
-		$tbl_attendance_result = Database::get_course_table(TABLE_ATTENDANCE_RESULT);
-		$session_id = api_get_session_id();
+    /**
+     * @param int $stud_id
+     * @return array|null
+     */
+    public function calc_score($stud_id = null, $type = null)
+    {
+        $tbl_attendance_result = Database::get_course_table(TABLE_ATTENDANCE_RESULT);
+        $session_id = api_get_session_id();
 
-		// get attendance qualify max
-		$sql = 'SELECT att.attendance_qualify_max
+        // get attendance qualify max
+        $sql = 'SELECT att.attendance_qualify_max
 		        FROM '.$this->get_attendance_table().' att
   				WHERE
   					att.c_id = '.$this->course_id.' AND
   					att.id = '.intval($this->get_ref_id()).' AND
   					att.session_id='.intval($session_id).'';
-		$query = Database::query($sql);
-		$attendance = Database::fetch_array($query, 'ASSOC');
+        $query = Database::query($sql);
+        $attendance = Database::fetch_array($query, 'ASSOC');
 
-		// Get results
-		$sql = 'SELECT *
+        // Get results
+        $sql = 'SELECT *
 		        FROM '.$tbl_attendance_result.'
   	    		WHERE c_id = '.$this->course_id.' AND attendance_id = '.intval($this->get_ref_id());
-		if (isset($stud_id)) {
-			$sql .= ' AND user_id = '.intval($stud_id);
-		}
-		$scores = Database::query($sql);
-		// for 1 student
-		if (isset($stud_id)) {
+        if (isset($stud_id)) {
+            $sql .= ' AND user_id = '.intval($stud_id);
+        }
+        $scores = Database::query($sql);
+        // for 1 student
+        if (isset($stud_id)) {
             if ($data = Database::fetch_array($scores, 'ASSOC')) {
                 return array(
                     $data['score'],
@@ -162,7 +162,7 @@ 
                 //We sent the 0/attendance_qualify_max instead of null for correct calculations
                 return array(0, $attendance['attendance_qualify_max']);
             }
-		} else {
+        } else {
             // all students -> get average
             $students = array();  // user list, needed to make sure we only
             // take first attempts into account
@@ -171,144 +171,144 @@ 
             $sumResult = 0;
             $bestResult = 0;
 
-			while ($data = Database::fetch_array($scores)) {
-				if (!(array_key_exists($data['user_id'], $students))) {
-					if ($attendance['attendance_qualify_max'] != 0) {
-						$students[$data['user_id']] = $data['score'];
-						$rescount++;
-						$sum += $data['score'] / $attendance['attendance_qualify_max'];
-						$sumResult += $data['score'];
-						if ($data['score'] > $bestResult) {
-							$bestResult = $data['score'];
-						}
-						$weight = $attendance['attendance_qualify_max'];
-					}
-				}
-			}
+            while ($data = Database::fetch_array($scores)) {
+                if (!(array_key_exists($data['user_id'], $students))) {
+                    if ($attendance['attendance_qualify_max'] != 0) {
+                        $students[$data['user_id']] = $data['score'];
+                        $rescount++;
+                        $sum += $data['score'] / $attendance['attendance_qualify_max'];
+                        $sumResult += $data['score'];
+                        if ($data['score'] > $bestResult) {
+                            $bestResult = $data['score'];
+                        }
+                        $weight = $attendance['attendance_qualify_max'];
+                    }
+                }
+            }
 
-			if ($rescount == 0) {
-				return null;
-			} else {
-				switch ($type) {
-					case 'best':
-						return array($bestResult, $weight);
-						break;
-					case 'average':
-						return array($sumResult / $rescount, $weight);
-						break;
-					case 'ranking':
-						return AbstractLink::getCurrentUserRanking($stud_id, $students);
-						break;
-					default:
-						return array($sum, $rescount);
-						break;
-				}
-			}
-		}
-	}
+            if ($rescount == 0) {
+                return null;
+            } else {
+                switch ($type) {
+                    case 'best':
+                        return array($bestResult, $weight);
+                        break;
+                    case 'average':
+                        return array($sumResult / $rescount, $weight);
+                        break;
+                    case 'ranking':
+                        return AbstractLink::getCurrentUserRanking($stud_id, $students);
+                        break;
+                    default:
+                        return array($sum, $rescount);
+                        break;
+                }
+            }
+        }
+    }
 
-	/**
-	 * Lazy load function to get the database table of the student publications
-	 */
-	private function get_attendance_table()
-	{
-		$this->attendance_table = Database::get_course_table(TABLE_ATTENDANCE);
-		return $this->attendance_table;
-	}
+    /**
+     * Lazy load function to get the database table of the student publications
+     */
+    private function get_attendance_table()
+    {
+        $this->attendance_table = Database::get_course_table(TABLE_ATTENDANCE);
+        return $this->attendance_table;
+    }
 
-	public function needs_name_and_description()
-	{
-		return false;
-	}
+    public function needs_name_and_description()
+    {
+        return false;
+    }
 
-	public function needs_max()
-	{
-		return false;
-	}
+    public function needs_max()
+    {
+        return false;
+    }
 
-	public function needs_results()
-	{
-		return false;
-	}
+    public function needs_results()
+    {
+        return false;
+    }
 
-	/**
-	 * @return string
-	 */
-	public function get_name()
-	{
-		$this->get_attendance_data();
-		$attendance_title = isset($this->attendance_data['name']) ? $this->attendance_data['name'] : '';
-		$attendance_qualify_title = isset($this->attendance_data['attendance_qualify_title']) ? $this->attendance_data['attendance_qualify_title'] : '';
-		if ( isset($attendance_qualify_title) && $attendance_qualify_title != '') {
-			return $this->attendance_data['attendance_qualify_title'];
-		} else {
-			return $attendance_title;
-		}
-	}
+    /**
+     * @return string
+     */
+    public function get_name()
+    {
+        $this->get_attendance_data();
+        $attendance_title = isset($this->attendance_data['name']) ? $this->attendance_data['name'] : '';
+        $attendance_qualify_title = isset($this->attendance_data['attendance_qualify_title']) ? $this->attendance_data['attendance_qualify_title'] : '';
+        if ( isset($attendance_qualify_title) && $attendance_qualify_title != '') {
+            return $this->attendance_data['attendance_qualify_title'];
+        } else {
+            return $attendance_title;
+        }
+    }
 
-	/**
-	 * @return string
-	 */
-	public function get_description()
-	{
-		return '';
-	}
+    /**
+     * @return string
+     */
+    public function get_description()
+    {
+        return '';
+    }
 
-	/**
-	 * Check if this still links to an exercise
-	 */
-	public function is_valid_link()
-	{
-		$session_id = api_get_session_id();
-		$sql = 'SELECT count(att.id) FROM '.$this->get_attendance_table().' att
+    /**
+     * Check if this still links to an exercise
+     */
+    public function is_valid_link()
+    {
+        $session_id = api_get_session_id();
+        $sql = 'SELECT count(att.id) FROM '.$this->get_attendance_table().' att
         		 WHERE att.c_id = '.$this->course_id.' AND att.id = '.intval($this->get_ref_id()).' ';
-		$result = Database::query($sql);
-		$number = Database::fetch_row($result);
-		return ($number[0] != 0);
-	}
+        $result = Database::query($sql);
+        $number = Database::fetch_row($result);
+        return ($number[0] != 0);
+    }
 
-	public function get_test_id()
-	{
-		return 'DEBUG:ID';
-	}
+    public function get_test_id()
+    {
+        return 'DEBUG:ID';
+    }
 
-	public function get_link()
-	{
-		//it was extracts the attendance id
-		$session_id = api_get_session_id();
-		$sql = 'SELECT * FROM '.$this->get_attendance_table().' att
+    public function get_link()
+    {
+        //it was extracts the attendance id
+        $session_id = api_get_session_id();
+        $sql = 'SELECT * FROM '.$this->get_attendance_table().' att
     			WHERE att.c_id = '.$this->course_id.' AND att.id = '.intval($this->get_ref_id()).' ';
-		$result = Database::query($sql);
-		$row = Database::fetch_array($result,'ASSOC');
-		$attendance_id = $row['id'];
-		$url = api_get_path(WEB_PATH).'main/attendance/index.php?action=attendance_sheet_list&gradebook=view&attendance_id='.$attendance_id.'&session_id='.$session_id.'&cidReq='.$this->get_course_code();
+        $result = Database::query($sql);
+        $row = Database::fetch_array($result,'ASSOC');
+        $attendance_id = $row['id'];
+        $url = api_get_path(WEB_PATH).'main/attendance/index.php?action=attendance_sheet_list&gradebook=view&attendance_id='.$attendance_id.'&session_id='.$session_id.'&cidReq='.$this->get_course_code();
 
-		return $url;
-	}
+        return $url;
+    }
 
-	/**
-	 * @return array|bool
-	 */
-	private function get_attendance_data()
-	{
-		$tbl_name = $this->get_attendance_table();
-		$session_id = api_get_session_id();
-		if ($tbl_name == '') {
-			return false;
-		} elseif (!isset($this->attendance_data)) {
-			$sql = 'SELECT * FROM '.$this->get_attendance_table().' att
+    /**
+     * @return array|bool
+     */
+    private function get_attendance_data()
+    {
+        $tbl_name = $this->get_attendance_table();
+        $session_id = api_get_session_id();
+        if ($tbl_name == '') {
+            return false;
+        } elseif (!isset($this->attendance_data)) {
+            $sql = 'SELECT * FROM '.$this->get_attendance_table().' att
 					WHERE att.c_id = '.$this->course_id.' AND att.id = '.intval($this->get_ref_id()).' ';
-			$query = Database::query($sql);
-			$this->attendance_data = Database::fetch_array($query);
-		}
-		return $this->attendance_data;
-	}
+            $query = Database::query($sql);
+            $this->attendance_data = Database::fetch_array($query);
+        }
+        return $this->attendance_data;
+    }
 
-	/**
-	 * @return string
-	 */
-	public function get_icon_name()
-	{
-		return 'attendance';
-	}
+    /**
+     * @return string
+     */
+    public function get_icon_name()
+    {
+        return 'attendance';
+    }
 }

Spacing +3 added lines, -3 removed lines

@@ -164,7 +164,7 @@ 
             }
 		} else {
             // all students -> get average
-            $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
             $rescount = 0;
             $sum = 0;
@@ -239,7 +239,7 @@ 
 		$this->get_attendance_data();
 		$attendance_title = isset($this->attendance_data['name']) ? $this->attendance_data['name'] : '';
 		$attendance_qualify_title = isset($this->attendance_data['attendance_qualify_title']) ? $this->attendance_data['attendance_qualify_title'] : '';
-		if ( isset($attendance_qualify_title) && $attendance_qualify_title != '') {
+		if (isset($attendance_qualify_title) && $attendance_qualify_title != '') {
 			return $this->attendance_data['attendance_qualify_title'];
 		} else {
 			return $attendance_title;
@@ -279,7 +279,7 @@ 
 		$sql = 'SELECT * FROM '.$this->get_attendance_table().' att
     			WHERE att.c_id = '.$this->course_id.' AND att.id = '.intval($this->get_ref_id()).' ';
 		$result = Database::query($sql);
-		$row = Database::fetch_array($result,'ASSOC');
+		$row = Database::fetch_array($result, 'ASSOC');
 		$attendance_id = $row['id'];
 		$url = api_get_path(WEB_PATH).'main/attendance/index.php?action=attendance_sheet_list&gradebook=view&attendance_id='.$attendance_id.'&session_id='.$session_id.'&cidReq='.$this->get_course_code();
 

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

Spacing +4 added lines, -4 removed lines

@@ -47,10 +47,10 @@ 
         $eval = $this->get_evaluation();
         // course/platform admin can go to the view_results page
         if (api_is_allowed_to_edit()) {
-            return 'gradebook_view_result.php?' . api_get_cidreq() . '&selecteval=' . $eval->get_id();
+            return 'gradebook_view_result.php?'.api_get_cidreq().'&selecteval='.$eval->get_id();
         } // students can go to the statistics page (if custom display enabled)
         elseif (ScoreDisplay :: instance()->is_custom()) {
-            return 'gradebook_statistics.php?' . api_get_cidreq() . '&selecteval=' . $eval->get_id();
+            return 'gradebook_statistics.php?'.api_get_cidreq().'&selecteval='.$eval->get_id();
         } else {
             return null;
         }
@@ -176,8 +176,8 @@ 
                 $eval = new Evaluation();
                 $eval->set_category_id(-1);
                 $eval->set_date(api_get_utc_datetime()); // these values will be changed
-                $eval->set_weight(0);    //   when the link setter
-                $eval->set_visible(0);   //     is called
+                $eval->set_weight(0); //   when the link setter
+                $eval->set_visible(0); //     is called
                 $eval->set_id(-1); // a 'real' id will be set when eval is added to db
                 $eval->set_user_id($this->get_user_id());
                 $eval->set_course_code($this->get_course_code());

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

Indentation +243 added lines, -243 removed lines

@@ -8,94 +8,94 @@ 
  */
 class SurveyLink extends AbstractLink
 {
-	private $survey_table = null;
-
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-		$this->set_type(LINK_SURVEY);
-	}
-
-	public function get_name()
-	{
-		$this->get_survey_data();
-		return $this->survey_data['code'].': '.self::html_to_text($this->survey_data['title']);
-	}
-
-	public function get_description()
-	{
-		$this->get_survey_data();
-		return $this->survey_data['subtitle'];
-	}
-
-	public function get_type_name()
-	{
-		return get_lang('Survey');
-	}
-
-	public function is_allowed_to_change_name()
-	{
-		return false;
-	}
-
-	public function needs_name_and_description()
-	{
-		return false;
-	}
-
-	public function needs_max()
-	{
-		return false;
-	}
-
-	public function needs_results()
-	{
-		return false;
-	}
-
-	/**
-	 * Generates an array of all surveys available.
-	 * @return array 2-dimensional array - every element contains 2 subelements (id, name)
-	 */
-	public function get_all_links()
-	{
-		if (empty($this->course_code)) {
-			die('Error in get_all_links() : course code not set');
-		}
-		$tbl_survey = $this->get_survey_table();
-		$session_id = api_get_session_id();
-		$course_id = api_get_course_int_id();
-		$sql = 'SELECT survey_id, title, code FROM '.$tbl_survey.'
+    private $survey_table = null;
+
+    /**
+     * Constructor
+     */
+    public function __construct()
+    {
+        parent::__construct();
+        $this->set_type(LINK_SURVEY);
+    }
+
+    public function get_name()
+    {
+        $this->get_survey_data();
+        return $this->survey_data['code'].': '.self::html_to_text($this->survey_data['title']);
+    }
+
+    public function get_description()
+    {
+        $this->get_survey_data();
+        return $this->survey_data['subtitle'];
+    }
+
+    public function get_type_name()
+    {
+        return get_lang('Survey');
+    }
+
+    public function is_allowed_to_change_name()
+    {
+        return false;
+    }
+
+    public function needs_name_and_description()
+    {
+        return false;
+    }
+
+    public function needs_max()
+    {
+        return false;
+    }
+
+    public function needs_results()
+    {
+        return false;
+    }
+
+    /**
+     * Generates an array of all surveys available.
+     * @return array 2-dimensional array - every element contains 2 subelements (id, name)
+     */
+    public function get_all_links()
+    {
+        if (empty($this->course_code)) {
+            die('Error in get_all_links() : course code not set');
+        }
+        $tbl_survey = $this->get_survey_table();
+        $session_id = api_get_session_id();
+        $course_id = api_get_course_int_id();
+        $sql = 'SELECT survey_id, title, code FROM '.$tbl_survey.'
 				WHERE c_id = '.$course_id.' AND session_id = '.intval($session_id).'';
-		$result = Database::query($sql);
-		while ($data = Database::fetch_array($result)) {
-			$links[] = array(
-				$data['survey_id'],
-				api_trunc_str(
-					$data['code'] . ': ' . self::html_to_text($data['title']),
-					80
-				)
-			);
-		}
-
-		return isset($links) ? $links : null;
-	}
-
-	/**
-	 * Generates an array of surveys that a teacher hasn't created a link for.
-	 * @return array 2-dimensional array - every element contains 2 subelements (id, name)
-	 */
-	public function get_not_created_links()
-	{
-		if (empty($this->course_code)) {
-			die('Error in get_not_created_links() : course code not set');
-		}
-		$tbl_grade_links = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_LINK);
-
-		$sql = 'SELECT survey_id, title, code
+        $result = Database::query($sql);
+        while ($data = Database::fetch_array($result)) {
+            $links[] = array(
+                $data['survey_id'],
+                api_trunc_str(
+                    $data['code'] . ': ' . self::html_to_text($data['title']),
+                    80
+                )
+            );
+        }
+
+        return isset($links) ? $links : null;
+    }
+
+    /**
+     * Generates an array of surveys that a teacher hasn't created a link for.
+     * @return array 2-dimensional array - every element contains 2 subelements (id, name)
+     */
+    public function get_not_created_links()
+    {
+        if (empty($this->course_code)) {
+            die('Error in get_not_created_links() : course code not set');
+        }
+        $tbl_grade_links = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_LINK);
+
+        $sql = 'SELECT survey_id, title, code
     			FROM '.$this->get_survey_table().' AS srv
 				WHERE survey_id NOT IN
 					(
@@ -106,28 +106,28 @@ 
 					)
 					AND srv.session_id = '.api_get_session_id();
 
-		$result = Database::query($sql);
-
-		$links = array();
-		while ($data = Database::fetch_array($result)) {
-			$links[] = array(
-				$data['survey_id'],
-				api_trunc_str($data['code'].': '.self::html_to_text($data['title']), 80)
-			);
-		}
-		return $links;
-	}
-
-	/**
-	 * Has anyone done this survey yet?
-	 */
-	public function has_results($stud_id=null)
-	{
-		$ref_id = intval($this->get_ref_id());
-		$session_id = api_get_session_id();
-		$tbl_survey = Database::get_course_table(TABLE_SURVEY);
-		$tbl_survey_invitation = Database::get_course_table(TABLE_SURVEY_INVITATION);
-		$sql = "SELECT
+        $result = Database::query($sql);
+
+        $links = array();
+        while ($data = Database::fetch_array($result)) {
+            $links[] = array(
+                $data['survey_id'],
+                api_trunc_str($data['code'].': '.self::html_to_text($data['title']), 80)
+            );
+        }
+        return $links;
+    }
+
+    /**
+     * Has anyone done this survey yet?
+     */
+    public function has_results($stud_id=null)
+    {
+        $ref_id = intval($this->get_ref_id());
+        $session_id = api_get_session_id();
+        $tbl_survey = Database::get_course_table(TABLE_SURVEY);
+        $tbl_survey_invitation = Database::get_course_table(TABLE_SURVEY_INVITATION);
+        $sql = "SELECT
 				COUNT(i.answered)
 				FROM $tbl_survey AS s
 				JOIN $tbl_survey_invitation AS i ON s.code = i.survey_code
@@ -137,30 +137,30 @@ 
 					s.survey_id = $ref_id AND
 					i.session_id = $session_id";
 
-		$sql_result = Database::query($sql);
-		$data = Database::fetch_array($sql_result);
+        $sql_result = Database::query($sql);
+        $data = Database::fetch_array($sql_result);
 
-		return ($data[0] != 0);
-	}
+        return ($data[0] != 0);
+    }
 
-	/**
-	 * @param int $stud_id
-	 * @return array|null
-	 */
-	public function calc_score($stud_id = null, $type = null)
-	{
-		// Note: Max score is assumed to be always 1 for surveys,
-		// only student's participation is to be taken into account.
-		$max_score = 1;
+    /**
+     * @param int $stud_id
+     * @return array|null
+     */
+    public function calc_score($stud_id = null, $type = null)
+    {
+        // Note: Max score is assumed to be always 1 for surveys,
+        // only student's participation is to be taken into account.
+        $max_score = 1;
 
-		$ref_id = intval($this->get_ref_id());
-		$session_id = api_get_session_id();
-		$tbl_survey = Database::get_course_table(TABLE_SURVEY);
-		$tbl_survey_invitation = Database::get_course_table(TABLE_SURVEY_INVITATION);
+        $ref_id = intval($this->get_ref_id());
+        $session_id = api_get_session_id();
+        $tbl_survey = Database::get_course_table(TABLE_SURVEY);
+        $tbl_survey_invitation = Database::get_course_table(TABLE_SURVEY_INVITATION);
 
-		$get_individual_score = !is_null($stud_id);
+        $get_individual_score = !is_null($stud_id);
 
-		$sql = "SELECT i.answered
+        $sql = "SELECT i.answered
 				FROM $tbl_survey AS s
 				JOIN $tbl_survey_invitation AS i
 				ON s.code = i.survey_code
@@ -171,131 +171,131 @@ 
 					i.session_id = $session_id
 				";
 
-		if ($get_individual_score) {
-			$sql .= ' AND i.user = '.intval($stud_id);
-		}
-
-		$sql_result = Database::query($sql);
-
-		if ($get_individual_score) {
-			// for 1 student
-			if ($data = Database::fetch_array($sql_result)) {
-				return array($data['answered'] ? $max_score : 0, $max_score);
-			}
-			return array(0, $max_score);
-		} else {
-			// for all the students -> get average
-			$rescount = 0;
-			$sum = 0;
-			$bestResult = 0;
-			$weight = 0;
-			while ($data = Database::fetch_array($sql_result)) {
-				$sum += $data['answered'] ? $max_score : 0;
-				$rescount++;
-				if ($data['answered'] > $bestResult) {
-					$bestResult = $data['answered'];
-					$weight = $assignment['qualification'];
-				}
-			}
-			$sum = $sum / $max_score;
-
-			if ($rescount == 0) {
-				return null;
-			}
-
-			switch ($type) {
-				case 'best':
-					return array($bestResult, $rescount);
-					break;
-				case 'average':
-					return array($sum, $rescount);
-					break;
-				case 'ranking':
-					return null;
-					break;
-				default:
-					return array($sum, $rescount);
-					break;
-			}
-		}
-	}
-
-	/**
-	 * Lazy load function to get the database table of the surveys
-	 */
-	private function get_survey_table()
-	{
-		$this->survey_table = Database :: get_course_table(TABLE_SURVEY);
-		return $this->survey_table;
-	}
-
-	/**
-	 * Check if this still links to a survey
-	 */
-	public function is_valid_link()
-	{
-		$session_id = api_get_session_id();
-		$sql = 'SELECT count(survey_id) FROM '.$this->get_survey_table().'
+        if ($get_individual_score) {
+            $sql .= ' AND i.user = '.intval($stud_id);
+        }
+
+        $sql_result = Database::query($sql);
+
+        if ($get_individual_score) {
+            // for 1 student
+            if ($data = Database::fetch_array($sql_result)) {
+                return array($data['answered'] ? $max_score : 0, $max_score);
+            }
+            return array(0, $max_score);
+        } else {
+            // for all the students -> get average
+            $rescount = 0;
+            $sum = 0;
+            $bestResult = 0;
+            $weight = 0;
+            while ($data = Database::fetch_array($sql_result)) {
+                $sum += $data['answered'] ? $max_score : 0;
+                $rescount++;
+                if ($data['answered'] > $bestResult) {
+                    $bestResult = $data['answered'];
+                    $weight = $assignment['qualification'];
+                }
+            }
+            $sum = $sum / $max_score;
+
+            if ($rescount == 0) {
+                return null;
+            }
+
+            switch ($type) {
+                case 'best':
+                    return array($bestResult, $rescount);
+                    break;
+                case 'average':
+                    return array($sum, $rescount);
+                    break;
+                case 'ranking':
+                    return null;
+                    break;
+                default:
+                    return array($sum, $rescount);
+                    break;
+            }
+        }
+    }
+
+    /**
+     * Lazy load function to get the database table of the surveys
+     */
+    private function get_survey_table()
+    {
+        $this->survey_table = Database :: get_course_table(TABLE_SURVEY);
+        return $this->survey_table;
+    }
+
+    /**
+     * Check if this still links to a survey
+     */
+    public function is_valid_link()
+    {
+        $session_id = api_get_session_id();
+        $sql = 'SELECT count(survey_id) FROM '.$this->get_survey_table().'
         		 WHERE
         		 	c_id = '.$this->course_id.' AND
         		 	survey_id = '.intval($this->get_ref_id()).' AND
         		 	session_id='.intval($session_id).'';
-		$result = Database::query($sql);
-		$number = Database::fetch_row($result);
-		return ($number[0] != 0);
-	}
-
-	public function get_test_id()
-	{
-		return 'DEBUG:ID';
-	}
-
-	public function get_link()
-	{
-		if (api_is_allowed_to_edit()) { // Let students make access only through "Surveys" tool.
-			$tbl_name = $this->get_survey_table();
-			$session_id = api_get_session_id();
-			if ($tbl_name != '') {
-				$sql = 'SELECT survey_id FROM '.$this->get_survey_table().'
+        $result = Database::query($sql);
+        $number = Database::fetch_row($result);
+        return ($number[0] != 0);
+    }
+
+    public function get_test_id()
+    {
+        return 'DEBUG:ID';
+    }
+
+    public function get_link()
+    {
+        if (api_is_allowed_to_edit()) { // Let students make access only through "Surveys" tool.
+            $tbl_name = $this->get_survey_table();
+            $session_id = api_get_session_id();
+            if ($tbl_name != '') {
+                $sql = 'SELECT survey_id FROM '.$this->get_survey_table().'
     					WHERE
     						c_id = '.$this->course_id.' AND
     						survey_id = '.intval($this->get_ref_id()).' AND
     						session_id = '.intval($session_id).' ';
-				$result = Database::query($sql);
-				$row = Database::fetch_array($result, 'ASSOC');
-				$survey_id = $row['survey_id'];
-				return api_get_path(WEB_PATH).'main/survey/reporting.php?cidReq='.$this->get_course_code().'&survey_id='.$survey_id;
-			}
-		}
-		return null;
-	}
-
-	private function get_survey_data()
-	{
-		$tbl_name = $this->get_survey_table();
-		$session_id = api_get_session_id();
-		if ($tbl_name == '') {
-			return false;
-		} elseif (!isset($this->survey_data)) {
-			$sql = 'SELECT * FROM '.$tbl_name.'
+                $result = Database::query($sql);
+                $row = Database::fetch_array($result, 'ASSOC');
+                $survey_id = $row['survey_id'];
+                return api_get_path(WEB_PATH).'main/survey/reporting.php?cidReq='.$this->get_course_code().'&survey_id='.$survey_id;
+            }
+        }
+        return null;
+    }
+
+    private function get_survey_data()
+    {
+        $tbl_name = $this->get_survey_table();
+        $session_id = api_get_session_id();
+        if ($tbl_name == '') {
+            return false;
+        } elseif (!isset($this->survey_data)) {
+            $sql = 'SELECT * FROM '.$tbl_name.'
 					WHERE
 						c_id = '.$this->course_id.' AND
 						survey_id = '.intval($this->get_ref_id()).' AND
 						session_id='.intval($session_id).'';
-			$query = Database::query($sql);
-			$this->survey_data = Database::fetch_array($query);
-		}
-		return $this->survey_data;
-	}
-
-	public function get_icon_name()
-	{
-		return 'survey';
-	}
-
-	private static function html_to_text($string)
-	{
-		return strip_tags($string);
-		//return trim(api_html_entity_decode(strip_tags(str_ireplace(array('<p>', '</p>', '<br />', '<br/>', '<br>'), array('', ' ', ' ', ' ', ' '), $string)), ENT_QUOTES));
-	}
+            $query = Database::query($sql);
+            $this->survey_data = Database::fetch_array($query);
+        }
+        return $this->survey_data;
+    }
+
+    public function get_icon_name()
+    {
+        return 'survey';
+    }
+
+    private static function html_to_text($string)
+    {
+        return strip_tags($string);
+        //return trim(api_html_entity_decode(strip_tags(str_ireplace(array('<p>', '</p>', '<br />', '<br/>', '<br>'), array('', ' ', ' ', ' ', ' '), $string)), ENT_QUOTES));
+    }
 }

Spacing +2 added lines, -2 removed lines

@@ -75,7 +75,7 @@ 
 			$links[] = array(
 				$data['survey_id'],
 				api_trunc_str(
-					$data['code'] . ': ' . self::html_to_text($data['title']),
+					$data['code'].': '.self::html_to_text($data['title']),
 					80
 				)
 			);
@@ -121,7 +121,7 @@ 
 	/**
 	 * Has anyone done this survey yet?
 	 */
-	public function has_results($stud_id=null)
+	public function has_results($stud_id = null)
 	{
 		$ref_id = intval($this->get_ref_id());
 		$session_id = api_get_session_id();

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

Spacing +2 added lines, -2 removed lines

@@ -58,7 +58,7 @@ 
      * @param string $name_mask search string
      * @return array link objects matching the search criterium
      */
-    public function find_links($name_mask,$selectcat)
+    public function find_links($name_mask, $selectcat)
     {
         return AbstractLink::find_links($name_mask, $selectcat);
     }
@@ -98,7 +98,7 @@ 
     public static function get_all_types()
     {
         //LINK_DROPBOX,
-        return array (
+        return array(
             LINK_EXERCISE,
             //LINK_DROPBOX,
             LINK_HOTPOTATOES,

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

Indentation +317 added lines, -317 removed lines

@@ -8,102 +8,102 @@ 
  */
 class StudentPublicationLink extends AbstractLink
 {
-	private $studpub_table = null;
-	private $itemprop_table = null;
-
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-		$this->set_type(LINK_STUDENTPUBLICATION);
-	}
-
-	/**
-	 *
-	 * Returns the URL of a document
-	 * This function is loaded when using a gradebook as a tab (gradebook = -1)
-	 * see issue #2705
-	 *
-	 */
-	public function get_view_url($stud_id)
-	{
-		// find a file uploaded by the given student,
-		// with the same title as the evaluation name
-
-		$eval = $this->get_evaluation();
-		$stud_id = intval($stud_id);
-
-		$sql = 'SELECT pub.url
+    private $studpub_table = null;
+    private $itemprop_table = null;
+
+    /**
+     * Constructor
+     */
+    public function __construct()
+    {
+        parent::__construct();
+        $this->set_type(LINK_STUDENTPUBLICATION);
+    }
+
+    /**
+     *
+     * Returns the URL of a document
+     * This function is loaded when using a gradebook as a tab (gradebook = -1)
+     * see issue #2705
+     *
+     */
+    public function get_view_url($stud_id)
+    {
+        // find a file uploaded by the given student,
+        // with the same title as the evaluation name
+
+        $eval = $this->get_evaluation();
+        $stud_id = intval($stud_id);
+
+        $sql = 'SELECT pub.url
 				FROM '.$this->get_itemprop_table().' prop, '.$this->get_studpub_table().' pub'
-			." WHERE
+            ." WHERE
 					prop.c_id = ".$this->course_id." AND
 					pub.c_id = ".$this->course_id." AND
 					prop.tool = 'work'"
-			.' AND prop.insert_user_id = '.$stud_id
-			.' AND prop.ref = pub.id'
-			." AND pub.title = '".Database::escape_string($eval->get_name())."' AND pub.session_id=".api_get_session_id()."";
-
-		$result = Database::query($sql);
-		if ($fileurl = Database::fetch_row($result)) {
-			return null;
-		} else {
-			return null;
-		}
-	}
-
-	public function get_type_name()
-	{
-		return get_lang('Works');
-	}
-
-	public function is_allowed_to_change_name()
-	{
-		return false;
-	}
-
-	/**
-	 * Generate an array of exercises that a teacher hasn't created a link for.
-	 * @return array 2-dimensional array - every element contains 2 subelements (id, name)
-	 */
-	public function get_not_created_links()
-	{
-		return false;
-		if (empty($this->course_code)) {
-			die('Error in get_not_created_links() : course code not set');
-		}
-		$tbl_grade_links = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_LINK);
-
-		$sql = 'SELECT id, url from '.$this->get_studpub_table()
-			.' pup WHERE c_id = '.$this->course_id.' AND has_properties != '."''".' AND id NOT IN'
-			.' (SELECT ref_id FROM '.$tbl_grade_links
-			.' WHERE type = '.LINK_STUDENTPUBLICATION
-			." AND course_code = '".Database::escape_string($this->get_course_code())."'"
-			.') AND pub.session_id='.api_get_session_id().'';
-
-		$result = Database::query($sql);
-
-		$cats=array();
-		while ($data=Database::fetch_array($result)) {
-			$cats[] = array ($data['id'], $data['url']);
-		}
-		return $cats;
-	}
-
-	/**
-	 * Generate an array of all exercises available.
-	 * @return array 2-dimensional array - every element contains 2 subelements (id, name)
-	 */
-	public function get_all_links()
-	{
-		if (empty($this->course_code)) {
-			die('Error in get_not_created_links() : course code not set');
-		}
-		$tbl_grade_links = Database :: get_course_table(TABLE_STUDENT_PUBLICATION);
-
-		$session_id = api_get_session_id();
-		/*
+            .' AND prop.insert_user_id = '.$stud_id
+            .' AND prop.ref = pub.id'
+            ." AND pub.title = '".Database::escape_string($eval->get_name())."' AND pub.session_id=".api_get_session_id()."";
+
+        $result = Database::query($sql);
+        if ($fileurl = Database::fetch_row($result)) {
+            return null;
+        } else {
+            return null;
+        }
+    }
+
+    public function get_type_name()
+    {
+        return get_lang('Works');
+    }
+
+    public function is_allowed_to_change_name()
+    {
+        return false;
+    }
+
+    /**
+     * Generate an array of exercises that a teacher hasn't created a link for.
+     * @return array 2-dimensional array - every element contains 2 subelements (id, name)
+     */
+    public function get_not_created_links()
+    {
+        return false;
+        if (empty($this->course_code)) {
+            die('Error in get_not_created_links() : course code not set');
+        }
+        $tbl_grade_links = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_LINK);
+
+        $sql = 'SELECT id, url from '.$this->get_studpub_table()
+            .' pup WHERE c_id = '.$this->course_id.' AND has_properties != '."''".' AND id NOT IN'
+            .' (SELECT ref_id FROM '.$tbl_grade_links
+            .' WHERE type = '.LINK_STUDENTPUBLICATION
+            ." AND course_code = '".Database::escape_string($this->get_course_code())."'"
+            .') AND pub.session_id='.api_get_session_id().'';
+
+        $result = Database::query($sql);
+
+        $cats=array();
+        while ($data=Database::fetch_array($result)) {
+            $cats[] = array ($data['id'], $data['url']);
+        }
+        return $cats;
+    }
+
+    /**
+     * Generate an array of all exercises available.
+     * @return array 2-dimensional array - every element contains 2 subelements (id, name)
+     */
+    public function get_all_links()
+    {
+        if (empty($this->course_code)) {
+            die('Error in get_not_created_links() : course code not set');
+        }
+        $tbl_grade_links = Database :: get_course_table(TABLE_STUDENT_PUBLICATION);
+
+        $session_id = api_get_session_id();
+        /*
         if (empty($session_id)) {
             $session_condition = api_get_session_condition(0, true);
         } else {
@@ -112,68 +112,68 @@ 
         $sql = "SELECT id, url, title FROM $tbl_grade_links
                 WHERE c_id = {$this->course_id}  AND filetype='folder' AND active = 1 $session_condition ";*/
 
-		//Only show works from the session
-		//AND has_properties != ''
-		$sql = "SELECT id, url, title FROM $tbl_grade_links
+        //Only show works from the session
+        //AND has_properties != ''
+        $sql = "SELECT id, url, title FROM $tbl_grade_links
 				WHERE
 					c_id = {$this->course_id} AND
 					active = 1 AND
 					filetype='folder' AND
 					session_id = ".api_get_session_id()."";
 
-		$result = Database::query($sql);
-		while ($data = Database::fetch_array($result)) {
-			$work_name = $data['title'];
-			if (empty($work_name)) {
-				$work_name = basename($data['url']);
-			}
-			$cats[] = array ($data['id'], $work_name);
-		}
-		$cats=isset($cats) ? $cats : array();
-		return $cats;
-	}
-
-	/**
-	 * Has anyone done this exercise yet ?
-	 */
-	public function has_results()
-	{
-		$tbl_grade_links = Database :: get_course_table(TABLE_STUDENT_PUBLICATION);
-		$sql = 'SELECT count(*) AS number FROM '.$tbl_grade_links."
+        $result = Database::query($sql);
+        while ($data = Database::fetch_array($result)) {
+            $work_name = $data['title'];
+            if (empty($work_name)) {
+                $work_name = basename($data['url']);
+            }
+            $cats[] = array ($data['id'], $work_name);
+        }
+        $cats=isset($cats) ? $cats : array();
+        return $cats;
+    }
+
+    /**
+     * Has anyone done this exercise yet ?
+     */
+    public function has_results()
+    {
+        $tbl_grade_links = Database :: get_course_table(TABLE_STUDENT_PUBLICATION);
+        $sql = 'SELECT count(*) AS number FROM '.$tbl_grade_links."
 				WHERE 	c_id 		= {$this->course_id} AND
 						parent_id 	= '".intval($this->get_ref_id())."' AND
 						session_id	=".api_get_session_id()."";
-		$result = Database::query($sql);
-		$number = Database::fetch_row($result);
-		return ($number[0] != 0);
-	}
-
-	/**
-	 * @param null $stud_id
-	 * @return array|null
-	 */
-	public function calc_score($stud_id = null, $type = null)
-	{
-		$stud_id = intval($stud_id);
-		$table = Database::get_course_table(TABLE_STUDENT_PUBLICATION);
-		$sql = 'SELECT * FROM '.$table."
+        $result = Database::query($sql);
+        $number = Database::fetch_row($result);
+        return ($number[0] != 0);
+    }
+
+    /**
+     * @param null $stud_id
+     * @return array|null
+     */
+    public function calc_score($stud_id = null, $type = null)
+    {
+        $stud_id = intval($stud_id);
+        $table = Database::get_course_table(TABLE_STUDENT_PUBLICATION);
+        $sql = 'SELECT * FROM '.$table."
     			WHERE
     				c_id = {$this->course_id} AND
     				id  = '".intval($this->get_ref_id())."' AND
     				session_id	= ".api_get_session_id()."
 				"
-		;
+        ;
 
-		$query = Database::query($sql);
-		$assignment = Database::fetch_array($query);
+        $query = Database::query($sql);
+        $assignment = Database::fetch_array($query);
 
-		if (count($assignment) == 0) {
-			$parentId = '0';
-		} else {
-			$parentId = $assignment['id'];
-		}
+        if (count($assignment) == 0) {
+            $parentId = '0';
+        } else {
+            $parentId = $assignment['id'];
+        }
 
-		$sql = 'SELECT * FROM '.$table.'
+        $sql = 'SELECT * FROM '.$table.'
     			WHERE
     				c_id = '.$this->course_id.' AND
     				active = 1 AND
@@ -181,190 +181,190 @@ 
     				session_id = '.api_get_session_id() .' AND
     				qualificator_id <> 0
 				';
-		if (!empty($stud_id)) {
-			$sql .= " AND user_id = $stud_id ";
-		}
-
-		$order = api_get_setting('student_publication_to_take_in_gradebook');
-
-		switch ($order) {
-			case 'last':
-				// latest attempt
-				$sql .= ' ORDER BY sent_date DESC';
-				break;
-			case 'first':
-			default:
-				// first attempt
-				$sql .= ' ORDER BY id';
-				break;
-		}
-
-		$scores = Database::query($sql);
-
-		// for 1 student
-		if (!empty($stud_id)) {
-			if ($data = Database::fetch_array($scores)) {
-				return array(
-					$data['qualification'],
-					$assignment['qualification']
-				);
-			} else {
-				return '';
-			}
-		} else {
-			$students = array();  // user list, needed to make sure we only
-			// take first attempts into account
-			$rescount = 0;
-			$sum = 0;
-			$bestResult = 0;
-			$weight = 0;
-			$sumResult = 0;
-			$myResult = 0;
-
-			while ($data = Database::fetch_array($scores)) {
-				if (!(array_key_exists($data['user_id'], $students))) {
-					if ($assignment['qualification'] != 0) {
-						$students[$data['user_id']] = $data['qualification'];
-						$rescount++;
-						$sum += $data['qualification'] / $assignment['qualification'];
-						$sumResult += $data['qualification'];
-
-						if ($data['qualification'] > $bestResult) {
-							$bestResult = $data['qualification'];
-						}
-						$weight = $assignment['qualification'];
-					}
-				}
-			}
-
-			if ($rescount == 0) {
-				return null;
-			} else {
-				switch ($type) {
-					case 'best':
-						return array($bestResult, $weight);
-						break;
-					case 'average':
-						return array($sumResult/$rescount, $weight);
-						break;
-					case 'ranking':
-						return AbstractLink::getCurrentUserRanking($stud_id, $students);
-						break;
-					default:
-						return array($sum, $rescount);
-						break;
-				}
-			}
-		}
-	}
-
-	/**
-	 * Lazy load function to get the database table of the student publications
-	 */
-	private function get_studpub_table()
-	{
-		return $this->studpub_table = Database :: get_course_table(TABLE_STUDENT_PUBLICATION);
-	}
-
-	/**
-	 * Lazy load function to get the database table of the item properties
-	 */
-	private function get_itemprop_table()
-	{
-		return $this->itemprop_table = Database :: get_course_table(TABLE_ITEM_PROPERTY);
-	}
-
-	public function needs_name_and_description()
-	{
-		return false;
-	}
-
-	public function get_name()
-	{
-		$this->get_exercise_data();
-		return (isset($this->exercise_data['title']) && !empty($this->exercise_data['title'])) ? $this->exercise_data['title'] : get_lang('Untitled');
-	}
-
-	public function get_description()
-	{
-		$this->get_exercise_data();
-		return isset($this->exercise_data['description']) ? $this->exercise_data['description'] : null;
-	}
-
-	public function get_test_id()
-	{
-		return 'DEBUG:ID';
-	}
-
-	public function get_link()
-	{
-		$session_id = api_get_session_id();
-		$url = api_get_path(WEB_PATH).'main/work/work.php?session_id='.$session_id.'&cidReq='.$this->get_course_code().'&id='.$this->exercise_data['id'].'&gradebook=view';
-		return $url;
-	}
-
-	private function get_exercise_data()
-	{
-		$tbl_name = $this->get_studpub_table();
-		$course_info = api_get_course_info($this->get_course_code());
-		if ($tbl_name=='') {
-			return false;
-		} elseif (!isset($this->exercise_data)) {
-			$sql = 'SELECT * FROM '.$this->get_studpub_table()."
+        if (!empty($stud_id)) {
+            $sql .= " AND user_id = $stud_id ";
+        }
+
+        $order = api_get_setting('student_publication_to_take_in_gradebook');
+
+        switch ($order) {
+            case 'last':
+                // latest attempt
+                $sql .= ' ORDER BY sent_date DESC';
+                break;
+            case 'first':
+            default:
+                // first attempt
+                $sql .= ' ORDER BY id';
+                break;
+        }
+
+        $scores = Database::query($sql);
+
+        // for 1 student
+        if (!empty($stud_id)) {
+            if ($data = Database::fetch_array($scores)) {
+                return array(
+                    $data['qualification'],
+                    $assignment['qualification']
+                );
+            } else {
+                return '';
+            }
+        } else {
+            $students = array();  // user list, needed to make sure we only
+            // take first attempts into account
+            $rescount = 0;
+            $sum = 0;
+            $bestResult = 0;
+            $weight = 0;
+            $sumResult = 0;
+            $myResult = 0;
+
+            while ($data = Database::fetch_array($scores)) {
+                if (!(array_key_exists($data['user_id'], $students))) {
+                    if ($assignment['qualification'] != 0) {
+                        $students[$data['user_id']] = $data['qualification'];
+                        $rescount++;
+                        $sum += $data['qualification'] / $assignment['qualification'];
+                        $sumResult += $data['qualification'];
+
+                        if ($data['qualification'] > $bestResult) {
+                            $bestResult = $data['qualification'];
+                        }
+                        $weight = $assignment['qualification'];
+                    }
+                }
+            }
+
+            if ($rescount == 0) {
+                return null;
+            } else {
+                switch ($type) {
+                    case 'best':
+                        return array($bestResult, $weight);
+                        break;
+                    case 'average':
+                        return array($sumResult/$rescount, $weight);
+                        break;
+                    case 'ranking':
+                        return AbstractLink::getCurrentUserRanking($stud_id, $students);
+                        break;
+                    default:
+                        return array($sum, $rescount);
+                        break;
+                }
+            }
+        }
+    }
+
+    /**
+     * Lazy load function to get the database table of the student publications
+     */
+    private function get_studpub_table()
+    {
+        return $this->studpub_table = Database :: get_course_table(TABLE_STUDENT_PUBLICATION);
+    }
+
+    /**
+     * Lazy load function to get the database table of the item properties
+     */
+    private function get_itemprop_table()
+    {
+        return $this->itemprop_table = Database :: get_course_table(TABLE_ITEM_PROPERTY);
+    }
+
+    public function needs_name_and_description()
+    {
+        return false;
+    }
+
+    public function get_name()
+    {
+        $this->get_exercise_data();
+        return (isset($this->exercise_data['title']) && !empty($this->exercise_data['title'])) ? $this->exercise_data['title'] : get_lang('Untitled');
+    }
+
+    public function get_description()
+    {
+        $this->get_exercise_data();
+        return isset($this->exercise_data['description']) ? $this->exercise_data['description'] : null;
+    }
+
+    public function get_test_id()
+    {
+        return 'DEBUG:ID';
+    }
+
+    public function get_link()
+    {
+        $session_id = api_get_session_id();
+        $url = api_get_path(WEB_PATH).'main/work/work.php?session_id='.$session_id.'&cidReq='.$this->get_course_code().'&id='.$this->exercise_data['id'].'&gradebook=view';
+        return $url;
+    }
+
+    private function get_exercise_data()
+    {
+        $tbl_name = $this->get_studpub_table();
+        $course_info = api_get_course_info($this->get_course_code());
+        if ($tbl_name=='') {
+            return false;
+        } elseif (!isset($this->exercise_data)) {
+            $sql = 'SELECT * FROM '.$this->get_studpub_table()."
 					WHERE
 					 	c_id ='".$course_info['real_id']."' AND
 					 	id = '".intval($this->get_ref_id())."' ";
-			$query = Database::query($sql);
-			$this->exercise_data = Database::fetch_array($query);
-		}
-		return $this->exercise_data;
-	}
-
-	public function needs_max()
-	{
-		return false;
-	}
-
-	public function needs_results()
-	{
-		return false;
-	}
-
-	public function is_valid_link()
-	{
-		$sql = 'SELECT count(id) FROM '.$this->get_studpub_table().'
+            $query = Database::query($sql);
+            $this->exercise_data = Database::fetch_array($query);
+        }
+        return $this->exercise_data;
+    }
+
+    public function needs_max()
+    {
+        return false;
+    }
+
+    public function needs_results()
+    {
+        return false;
+    }
+
+    public function is_valid_link()
+    {
+        $sql = 'SELECT count(id) FROM '.$this->get_studpub_table().'
     			WHERE c_id = "'.$this->course_id.'" AND id = '.intval($this->get_ref_id()).'';
-		$result = Database::query($sql);
-		$number = Database::fetch_row($result);
-		return ($number[0] != 0);
-	}
-
-	public function get_icon_name()
-	{
-		return 'studentpublication';
-	}
-
-	public function save_linked_data()
-	{
-		$weight = (float)$this->get_weight();
-		$ref_id = $this->get_ref_id();
-
-		if (!empty($ref_id)) {
-			//Cleans works
-			$sql = 'UPDATE '.$this->get_studpub_table().' SET weight= '.$weight.'
+        $result = Database::query($sql);
+        $number = Database::fetch_row($result);
+        return ($number[0] != 0);
+    }
+
+    public function get_icon_name()
+    {
+        return 'studentpublication';
+    }
+
+    public function save_linked_data()
+    {
+        $weight = (float)$this->get_weight();
+        $ref_id = $this->get_ref_id();
+
+        if (!empty($ref_id)) {
+            //Cleans works
+            $sql = 'UPDATE '.$this->get_studpub_table().' SET weight= '.$weight.'
                     WHERE c_id = '.$this->course_id.' AND id ='.$ref_id;
-			Database::query($sql);
-		}
-	}
-
-	public function delete_linked_data()
-	{
-		$ref_id = $this->get_ref_id();
-		if (!empty($ref_id)) {
-			//Cleans works
-			$sql = 'UPDATE '.$this->get_studpub_table().' SET weight=0
+            Database::query($sql);
+        }
+    }
+
+    public function delete_linked_data()
+    {
+        $ref_id = $this->get_ref_id();
+        if (!empty($ref_id)) {
+            //Cleans works
+            $sql = 'UPDATE '.$this->get_studpub_table().' SET weight=0
                     WHERE c_id = '.$this->course_id.' AND id ='.$ref_id;
-			Database::query($sql);
-		}
-	}
+            Database::query($sql);
+        }
+    }
 }

Spacing +10 added lines, -10 removed lines

@@ -84,9 +84,9 @@ 
 
 		$result = Database::query($sql);
 
-		$cats=array();
-		while ($data=Database::fetch_array($result)) {
-			$cats[] = array ($data['id'], $data['url']);
+		$cats = array();
+		while ($data = Database::fetch_array($result)) {
+			$cats[] = array($data['id'], $data['url']);
 		}
 		return $cats;
 	}
@@ -127,9 +127,9 @@ 
 			if (empty($work_name)) {
 				$work_name = basename($data['url']);
 			}
-			$cats[] = array ($data['id'], $work_name);
+			$cats[] = array($data['id'], $work_name);
 		}
-		$cats=isset($cats) ? $cats : array();
+		$cats = isset($cats) ? $cats : array();
 		return $cats;
 	}
 
@@ -178,7 +178,7 @@ 
     				c_id = '.$this->course_id.' AND
     				active = 1 AND
     				parent_id = "'.$parentId.'" AND
-    				session_id = '.api_get_session_id() .' AND
+    				session_id = '.api_get_session_id().' AND
     				qualificator_id <> 0
 				';
 		if (!empty($stud_id)) {
@@ -212,7 +212,7 @@ 
 				return '';
 			}
 		} else {
-			$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
 			$rescount = 0;
 			$sum = 0;
@@ -245,7 +245,7 @@ 
 						return array($bestResult, $weight);
 						break;
 					case 'average':
-						return array($sumResult/$rescount, $weight);
+						return array($sumResult / $rescount, $weight);
 						break;
 					case 'ranking':
 						return AbstractLink::getCurrentUserRanking($stud_id, $students);
@@ -307,7 +307,7 @@ 
 	{
 		$tbl_name = $this->get_studpub_table();
 		$course_info = api_get_course_info($this->get_course_code());
-		if ($tbl_name=='') {
+		if ($tbl_name == '') {
 			return false;
 		} elseif (!isset($this->exercise_data)) {
 			$sql = 'SELECT * FROM '.$this->get_studpub_table()."
@@ -346,7 +346,7 @@ 
 
 	public function save_linked_data()
 	{
-		$weight = (float)$this->get_weight();
+		$weight = (float) $this->get_weight();
 		$ref_id = $this->get_ref_id();
 
 		if (!empty($ref_id)) {