Minor - format code.

main/admin/settings.lib.php

@@ -497,16 +497,16 @@ function store_regions()
 */
 function store_plugins()
 {
-    $plugin_obj = new AppPlugin();
+    $appPlugin = new AppPlugin();
 
     // Get a list of all current 'Plugins' settings
-    $plugin_list = $plugin_obj->read_plugins_from_path();
+    $plugin_list = $appPlugin->read_plugins_from_path();
 
     $installed_plugins = array();
 
     foreach ($plugin_list as $plugin) {
         if (isset($_POST['plugin_'.$plugin])) {
-            $plugin_obj->install($plugin);
+            $appPlugin->install($plugin);
             $installed_plugins[] = $plugin;
         }
     }
@@ -516,8 +516,9 @@ function store_plugins()
     } else {
         $remove_plugins = $plugin_list;
     }
+
     foreach ($remove_plugins as $plugin) {
-        $plugin_obj->uninstall($plugin);
+        $appPlugin->uninstall($plugin);
     }
 }
 

main/exercice/matching.class.php

@@ -12,7 +12,6 @@
 /**
  * Code
  */
-if(!class_exists('Matching')):
 /**
  * Matching questions type class
  * @package chamilo.exercise
@@ -238,4 +237,3 @@ class Matching extends Question {
         return $header;
 	}
 }
-endif;

main/exercice/multiple_answer.class.php

@@ -8,8 +8,6 @@
 /**
  * Code
  */
-if(!class_exists('MultipleAnswer')):
-
 /**
 	CLASS MultipleAnswer
  *
@@ -213,4 +211,3 @@ class MultipleAnswer extends Question {
         return $header;
 	}
 }
-endif;

main/exercice/multiple_answer_combination.class.php

@@ -9,8 +9,6 @@
 /**
  * Code
  */
-if(class_exists('MultipleAnswerCombination')) { return true; }
-
 /**
 	CLASS MultipleAnswer
  *

main/exercice/multiple_answer_combination_true_false.class.php

@@ -9,8 +9,6 @@
 /**
  * Code
  */
-if(class_exists('MultipleAnswerCombinationTrueFalse')) { return true; }
-require_once 'multiple_answer_combination.class.php';
 /**
 	CLASS MultipleAnswer
  *
@@ -20,8 +18,8 @@ require_once 'multiple_answer_combination.class.php';
  *	@author Eric Marguin
  *	@package chamilo.exercise
  **/
-class MultipleAnswerCombinationTrueFalse extends MultipleAnswerCombination {
-
+class MultipleAnswerCombinationTrueFalse extends MultipleAnswerCombination
+{
 	static $typePicture = 'mcmaco.gif';
 	static $explanationLangVar = 'MultipleAnswerCombinationTrueFalse';
     var    $options;
@@ -29,7 +27,8 @@ class MultipleAnswerCombinationTrueFalse extends MultipleAnswerCombination {
 	/**
 	 * Constructor
 	 */
-	function MultipleAnswerCombinationTrueFalse(){
+	function MultipleAnswerCombinationTrueFalse()
+    {
 		parent::question();
 		$this -> type = MULTIPLE_ANSWER_COMBINATION_TRUE_FALSE;
 		$this -> isContent = $this-> getIsContent();

main/exercice/multiple_answer_true_false.class.php

@@ -11,7 +11,6 @@
 /**
  * Code
  */
-if(!class_exists('MultipleAnswerTrueFalse')):
 /**
  * Class
  * @package chamilo.exercise
@@ -294,4 +293,3 @@ class MultipleAnswerTrueFalse extends Question {
         return $header;
 	}
 }
-endif;

main/exercice/oral_expression.class.php

@@ -11,7 +11,6 @@
 /**
  * Code
  */
-if(!class_exists('OralExpression')):
 /**
  * @package chamilo.exercise
  */
@@ -71,4 +70,3 @@ class OralExpression extends Question {
         return $header;
 	}
 }
-endif;

main/exercice/unique_answer_no_option.class.php

@@ -11,8 +11,6 @@
  * Code
  */
 
-if(!class_exists('UniqueAnswerNoOption')):
-
 /**
 	CLASS UNIQUE_ANSWER
  *
@@ -24,8 +22,8 @@ if(!class_exists('UniqueAnswerNoOption')):
  *	@package chamilo.exercise
  **/
 
-class UniqueAnswerNoOption extends Question {
-
+class UniqueAnswerNoOption extends Question
+{
 	static $typePicture = 'mcuao.gif';
 	static $explanationLangVar = 'UniqueAnswerNoOption';
 
@@ -241,8 +239,6 @@ class UniqueAnswerNoOption extends Question {
         $form->addElement('text', 'weighting['.$i.']', null, array('class' => "span1", 'value' => '0', 'readonly' =>'readonly'));
         $form->addElement ('html', '</tr>');
 
-     //}
-    
 
 		$form -> addElement ('html', '</table>');
 		$form -> addElement ('html', '<br />');
@@ -402,4 +398,3 @@ class UniqueAnswerNoOption extends Question {
         return $header;
 	}
 }
-endif;