Completed
Pull Request — 1.11.x (#1318)
by José
66:27 queued 30:05
created
main/admin/ldap_synchro.php 1 patch
Indentation   +102 added lines, -102 removed lines patch added patch discarded remove patch
@@ -44,121 +44,121 @@
 block discarded – undo
44 44
 $users=Database::store_result($result);
45 45
 
46 46
 foreach($Sessions as $session){
47
-	$id_session = $session['id'];
48
-	$name_session = $session['name'];
49
-	$UserList=array();
50
-	$UserUpdate=array();
51
-	$UserAdd=array();
47
+    $id_session = $session['id'];
48
+    $name_session = $session['name'];
49
+    $UserList=array();
50
+    $UserUpdate=array();
51
+    $UserAdd=array();
52 52
 
53
-	// Parse des code etape de la session
54
-	/*
53
+    // Parse des code etape de la session
54
+    /*
55 55
 	$sql = "SELECT  id_session, code_etape, etape_description, code_ufr, annee
56 56
 		FROM $tbl_session_rel_etape
57 57
 		WHERE id_session='$id_session'
58 58
 		ORDER BY code_ufr, code_etape";
59 59
 	$result = Database::query($sql);
60 60
 	*/
61
-	$ds = ldap_connect($ldap_host, $ldap_port) or die(get_lang('LDAPConnectionError'));
62
-	ldap_set_version($ds);
63
-	// Import des utilisateurs des etapes dans la session
64
-	if ($ds)
65
-	{
66
-		$r = false;
67
-		$res = ldap_handle_bind($ds, $r);
68
-		$UserList=array();
69
-		if($result !== false)
70
-		{
71
-			//while($row = Database::fetch_array($result))
72
-			//{
73
-				/*
61
+    $ds = ldap_connect($ldap_host, $ldap_port) or die(get_lang('LDAPConnectionError'));
62
+    ldap_set_version($ds);
63
+    // Import des utilisateurs des etapes dans la session
64
+    if ($ds)
65
+    {
66
+        $r = false;
67
+        $res = ldap_handle_bind($ds, $r);
68
+        $UserList=array();
69
+        if($result !== false)
70
+        {
71
+            //while($row = Database::fetch_array($result))
72
+            //{
73
+                /*
74 74
 				$annee = $row['annee'];
75 75
 				$code_ufr = $row['code_ufr'];
76 76
 				$etape = $row['code_etape'];
77 77
 				*/
78
-				// LDAP Query
79
-				// edupersonorgunitdn=ou=12CI1,ou=2006,ou=diploma,o=Paris1,dc=univ-paris1,dc=fr
80
-				//etapescommented
81
-				//$sr = @ ldap_search($ds, "ou=people,$LDAPbasedn", "edupersonorgunitdn=ou=$etape,ou=$annee,ou=diploma,$LDAPbasedn");
82
-				$sr = @ ldap_search($ds, $ldap_basedn, '(uid=*)');
83
-				$info = ldap_get_entries($ds, $sr);
84
-				for ($key = 0; $key < $info["count"]; $key ++)
85
-				{
86
-					echo "<pre>";
87
-					print_r($info[$key]);
88
-					echo "</pre>";
89
-					$lastname = api_utf8_decode($info[$key]["sn"][0]);
90
-					$firstname = api_utf8_decode($info[$key]["givenname"][0]);
91
-					$email = $info[$key]["mail"][0];
92
-					// Get uid from dn
93
-					$dn_array=ldap_explode_dn($info[$key]["dn"],1);
94
-					$username = $dn_array[0]; // uid is first key
95
-					$outab[] = $info[$key]["edupersonprimaryaffiliation"][0]; // Ici "student"
96
-					$val = ldap_get_values_len($ds, $sr, "userPassword");
97
-					$password = $val[0];
98
-					// Pour faciliter la gestion on ajoute le code "etape-annee"
99
-					$official_code=$etape."-".$annee;
100
-					$auth_source="ldap";
101
-					// Pas de date d'expiration d'etudiant (a recuperer par rapport au shadow expire LDAP)
102
-					$expiration_date='';
103
-					$active=1;
104
-					// Ajout de l'utilisateur
105
-					if (UserManager::is_username_available($username)) {
106
-						$user_id = UserManager::create_user($firstname,$lastname,$status,$email,$username,$password,$official_code,api_get_setting('platformLanguage'),$phone,$picture_uri,$auth_source,$expiration_date,$active);
107
-						$UserAdd[]=$user_id;
108
-					} else {
109
-						$user = api_get_user_info_from_username($username);
110
-						$user_id=$user['user_id'];
111
-						UserManager::update_user($user_id, $firstname, $lastname, $username, null, null, $email, $status, $official_code, $phone, $picture_uri, $expiration_date, $active);
112
-						$UserUpdate[]=$user_id;
113
-					}
114
-					$UserList[]=$user_id;
115
-				}
116
-			//}
117
-		}
118
-		if (isset($included) && ($included))
119
-		{
120
-			$message .= "> $name_session: ".count($UserAdd)." ".get_lang('Added').' '.get_lang('And').' '.count($UserUpdate).' '.get_lang('Modified').'<br/>';
121
-		}
122
-		else
123
-		{
124
-			print "> $name_session: ".count($UserAdd).get_lang('Added').' '.get_lang('And').' '.count($UserUpdate).' '.get_lang('Modified')."\n";
125
-		}
78
+                // LDAP Query
79
+                // edupersonorgunitdn=ou=12CI1,ou=2006,ou=diploma,o=Paris1,dc=univ-paris1,dc=fr
80
+                //etapescommented
81
+                //$sr = @ ldap_search($ds, "ou=people,$LDAPbasedn", "edupersonorgunitdn=ou=$etape,ou=$annee,ou=diploma,$LDAPbasedn");
82
+                $sr = @ ldap_search($ds, $ldap_basedn, '(uid=*)');
83
+                $info = ldap_get_entries($ds, $sr);
84
+                for ($key = 0; $key < $info["count"]; $key ++)
85
+                {
86
+                    echo "<pre>";
87
+                    print_r($info[$key]);
88
+                    echo "</pre>";
89
+                    $lastname = api_utf8_decode($info[$key]["sn"][0]);
90
+                    $firstname = api_utf8_decode($info[$key]["givenname"][0]);
91
+                    $email = $info[$key]["mail"][0];
92
+                    // Get uid from dn
93
+                    $dn_array=ldap_explode_dn($info[$key]["dn"],1);
94
+                    $username = $dn_array[0]; // uid is first key
95
+                    $outab[] = $info[$key]["edupersonprimaryaffiliation"][0]; // Ici "student"
96
+                    $val = ldap_get_values_len($ds, $sr, "userPassword");
97
+                    $password = $val[0];
98
+                    // Pour faciliter la gestion on ajoute le code "etape-annee"
99
+                    $official_code=$etape."-".$annee;
100
+                    $auth_source="ldap";
101
+                    // Pas de date d'expiration d'etudiant (a recuperer par rapport au shadow expire LDAP)
102
+                    $expiration_date='';
103
+                    $active=1;
104
+                    // Ajout de l'utilisateur
105
+                    if (UserManager::is_username_available($username)) {
106
+                        $user_id = UserManager::create_user($firstname,$lastname,$status,$email,$username,$password,$official_code,api_get_setting('platformLanguage'),$phone,$picture_uri,$auth_source,$expiration_date,$active);
107
+                        $UserAdd[]=$user_id;
108
+                    } else {
109
+                        $user = api_get_user_info_from_username($username);
110
+                        $user_id=$user['user_id'];
111
+                        UserManager::update_user($user_id, $firstname, $lastname, $username, null, null, $email, $status, $official_code, $phone, $picture_uri, $expiration_date, $active);
112
+                        $UserUpdate[]=$user_id;
113
+                    }
114
+                    $UserList[]=$user_id;
115
+                }
116
+            //}
117
+        }
118
+        if (isset($included) && ($included))
119
+        {
120
+            $message .= "> $name_session: ".count($UserAdd)." ".get_lang('Added').' '.get_lang('And').' '.count($UserUpdate).' '.get_lang('Modified').'<br/>';
121
+        }
122
+        else
123
+        {
124
+            print "> $name_session: ".count($UserAdd).get_lang('Added').' '.get_lang('And').' '.count($UserUpdate).' '.get_lang('Modified')."\n";
125
+        }
126 126
 
127
-		// Une fois les utilisateurs importer dans la base des utilisateurs, on peux les affecter la session
128
-		$result=Database::query("SELECT c_id FROM $tbl_session_rel_course WHERE session_id='$id_session'");
129
-		$CourseList=array();
130
-		while($row=Database::fetch_array($result)) {
131
-			$CourseList[]= $row['c_id'];
132
-		}
127
+        // Une fois les utilisateurs importer dans la base des utilisateurs, on peux les affecter la session
128
+        $result=Database::query("SELECT c_id FROM $tbl_session_rel_course WHERE session_id='$id_session'");
129
+        $CourseList=array();
130
+        while($row=Database::fetch_array($result)) {
131
+            $CourseList[]= $row['c_id'];
132
+        }
133 133
 
134
-		foreach ($CourseList as $enreg_course) {
135
-			// On ajoute la relation entre l'utilisateur et le cours
136
-			foreach ($UserList as $enreg_user) {
137
-				$sql = "INSERT IGNORE INTO $tbl_session_rel_course_rel_user(session_id,c_id,user_id)
134
+        foreach ($CourseList as $enreg_course) {
135
+            // On ajoute la relation entre l'utilisateur et le cours
136
+            foreach ($UserList as $enreg_user) {
137
+                $sql = "INSERT IGNORE INTO $tbl_session_rel_course_rel_user(session_id,c_id,user_id)
138 138
 						VALUES('$id_session','$enreg_course','$enreg_user')";
139
-				Database::query($sql);
140
-			}
141
-			$sql = "SELECT COUNT(user_id) as nbUsers " .
142
-					"FROM $tbl_session_rel_course_rel_user " .
143
-					"WHERE session_id='$id_session' AND c_id='$enreg_course'";
144
-			$rs = Database::query($sql);
145
-			list($nbr_users) = Database::fetch_array($rs);
146
-			$sql = "UPDATE $tbl_session_rel_course SET nbr_users=$nbr_users
139
+                Database::query($sql);
140
+            }
141
+            $sql = "SELECT COUNT(user_id) as nbUsers " .
142
+                    "FROM $tbl_session_rel_course_rel_user " .
143
+                    "WHERE session_id='$id_session' AND c_id='$enreg_course'";
144
+            $rs = Database::query($sql);
145
+            list($nbr_users) = Database::fetch_array($rs);
146
+            $sql = "UPDATE $tbl_session_rel_course SET nbr_users=$nbr_users
147 147
 					WHERE session_id='$id_session' AND c_id = '$enreg_course'";
148
-			Database::query($sql);
149
-		}
150
-		// On ajoute la relation entre l'utilisateur et la session
151
-		foreach($UserList as $enreg_user){
152
-			$sql = "INSERT IGNORE INTO $tbl_session_rel_user(session_id, user_id, registered_at) " .
153
-					"VALUES('$id_session','$enreg_user', '" . api_get_utc_datetime() . "')";
154
-			Database::query($sql);
155
-		}
156
-		$sql = "SELECT COUNT(user_id) as nbUsers " .
157
-				"FROM $tbl_session_rel_user " .
158
-				"WHERE session_id='$id_session' AND relation_type<>".SESSION_RELATION_TYPE_RRHH."";
159
-		$rs = Database::query($sql);
160
-		list($nbr_users) = Database::fetch_array($rs);
161
-		$sql = "UPDATE $tbl_session SET nbr_users=$nbr_users WHERE id='$id_session'";
162
-		Database::query($sql);
163
-	}
148
+            Database::query($sql);
149
+        }
150
+        // On ajoute la relation entre l'utilisateur et la session
151
+        foreach($UserList as $enreg_user){
152
+            $sql = "INSERT IGNORE INTO $tbl_session_rel_user(session_id, user_id, registered_at) " .
153
+                    "VALUES('$id_session','$enreg_user', '" . api_get_utc_datetime() . "')";
154
+            Database::query($sql);
155
+        }
156
+        $sql = "SELECT COUNT(user_id) as nbUsers " .
157
+                "FROM $tbl_session_rel_user " .
158
+                "WHERE session_id='$id_session' AND relation_type<>".SESSION_RELATION_TYPE_RRHH."";
159
+        $rs = Database::query($sql);
160
+        list($nbr_users) = Database::fetch_array($rs);
161
+        $sql = "UPDATE $tbl_session SET nbr_users=$nbr_users WHERE id='$id_session'";
162
+        Database::query($sql);
163
+    }
164 164
 }
Please login to merge, or discard this patch.
main/inc/lib/formvalidator/Element/receivers.php 1 patch
Indentation   +66 added lines, -66 removed lines patch added patch discarded remove patch
@@ -10,66 +10,66 @@  discard block
 block discarded – undo
10 10
  */
11 11
 class HTML_QuickForm_receivers extends HTML_QuickForm_group
12 12
 {
13
-	/**
14
-	 * Array of all receivers
15
-	 */
16
-	var $receivers;
17
-	/**
18
-	 * Array of selected receivers
19
-	 */
20
-	var $receivers_selected;
13
+    /**
14
+     * Array of all receivers
15
+     */
16
+    var $receivers;
17
+    /**
18
+     * Array of selected receivers
19
+     */
20
+    var $receivers_selected;
21 21
 
22
-	/**
23
-	 * Constructor
24
-	 * @param string $elementName
25
-	 * @param string $elementLabel
26
-	 * @param array $attributes This should contain the keys 'receivers' and
27
-	 * 'receivers_selected'
28
-	 */
29
-	public function __construct($elementName = null, $elementLabel = null, $attributes = null)
30
-	{
31
-		$this->receivers = $attributes['receivers'];
32
-		$this->receivers_selected = $attributes['receivers_selected'];
33
-		unset($attributes['receivers']);
34
-		unset($attributes['receivers_selected']);
35
-		parent::__construct($elementName, $elementLabel, $attributes);
36
-		$this->_persistantFreeze = true;
37
-		$this->_appendName = true;
38
-		$this->_type = 'receivers';
39
-	}
40
-	/**
41
-	 * Create the form elements to build this element group
42
-	 */
43
-	function _createElements()
44
-	{
45
-		$this->_elements[] = new HTML_QuickForm_Radio('receivers', '', get_lang('Everybody'), '0', array ('onclick' => 'javascript:receivers_hide(\'receivers_to\')'));
46
-		$this->_elements[0]->setChecked(true);
47
-		$this->_elements[] = new HTML_QuickForm_Radio('receivers', '', get_lang('SelectGroupsUsers'), '1', array ('onclick' => 'javascript:receivers_show(\'receivers_to\')'));
48
-		$this->_elements[] = new HTML_QuickForm_advmultiselect('to', '', $this->receivers);
49
-		$this->_elements[2]->setSelected($this->receivers_selected);
50
-	}
51
-	/**
52
-	 * HTML representation
53
-	 */
54
-	public function toHtml()
55
-	{
56
-		include_once ('HTML/QuickForm/Renderer/Default.php');
57
-		$this->_separator = '<br/>';
58
-		$renderer = & new HTML_QuickForm_Renderer_Default();
59
-		$renderer->setElementTemplate('{element}');
60
-		$select_boxes = $this->_elements[2];
61
-		$select_boxes->setElementTemplate('<div style="margin-left:20px;display:block;" id="receivers_'.$select_boxes->getName().'">'.$select_boxes->_elementTemplate.'</div>');
62
-		parent :: accept($renderer);
63
-		$js = $this->getElementJS();
64
-		return $renderer->toHtml().$js;
65
-	}
22
+    /**
23
+     * Constructor
24
+     * @param string $elementName
25
+     * @param string $elementLabel
26
+     * @param array $attributes This should contain the keys 'receivers' and
27
+     * 'receivers_selected'
28
+     */
29
+    public function __construct($elementName = null, $elementLabel = null, $attributes = null)
30
+    {
31
+        $this->receivers = $attributes['receivers'];
32
+        $this->receivers_selected = $attributes['receivers_selected'];
33
+        unset($attributes['receivers']);
34
+        unset($attributes['receivers_selected']);
35
+        parent::__construct($elementName, $elementLabel, $attributes);
36
+        $this->_persistantFreeze = true;
37
+        $this->_appendName = true;
38
+        $this->_type = 'receivers';
39
+    }
40
+    /**
41
+     * Create the form elements to build this element group
42
+     */
43
+    function _createElements()
44
+    {
45
+        $this->_elements[] = new HTML_QuickForm_Radio('receivers', '', get_lang('Everybody'), '0', array ('onclick' => 'javascript:receivers_hide(\'receivers_to\')'));
46
+        $this->_elements[0]->setChecked(true);
47
+        $this->_elements[] = new HTML_QuickForm_Radio('receivers', '', get_lang('SelectGroupsUsers'), '1', array ('onclick' => 'javascript:receivers_show(\'receivers_to\')'));
48
+        $this->_elements[] = new HTML_QuickForm_advmultiselect('to', '', $this->receivers);
49
+        $this->_elements[2]->setSelected($this->receivers_selected);
50
+    }
51
+    /**
52
+     * HTML representation
53
+     */
54
+    public function toHtml()
55
+    {
56
+        include_once ('HTML/QuickForm/Renderer/Default.php');
57
+        $this->_separator = '<br/>';
58
+        $renderer = & new HTML_QuickForm_Renderer_Default();
59
+        $renderer->setElementTemplate('{element}');
60
+        $select_boxes = $this->_elements[2];
61
+        $select_boxes->setElementTemplate('<div style="margin-left:20px;display:block;" id="receivers_'.$select_boxes->getName().'">'.$select_boxes->_elementTemplate.'</div>');
62
+        parent :: accept($renderer);
63
+        $js = $this->getElementJS();
64
+        return $renderer->toHtml().$js;
65
+    }
66 66
 
67
-	/**
68
-	 * Get the necessary javascript
69
-	 */
67
+    /**
68
+     * Get the necessary javascript
69
+     */
70 70
     public function getElementJS()
71
-	{
72
-		$js = "<script type=\"text/javascript\">
71
+    {
72
+        $js = "<script type=\"text/javascript\">
73 73
 					/* <![CDATA[ */
74 74
 					receivers_hide('receivers_to');
75 75
 					function receivers_show(item) {
@@ -82,14 +82,14 @@  discard block
 block discarded – undo
82 82
 					}
83 83
 					/* ]]> */
84 84
 					</script>\n";
85
-		return $js;
86
-	}
87
-	/**
88
-	 * accept renderer
89
-	 */
90
-	function accept(& $renderer, $required = false, $error = null)
91
-	{
92
-		$renderer->renderElement($this, $required, $error);
93
-	}
85
+        return $js;
86
+    }
87
+    /**
88
+     * accept renderer
89
+     */
90
+    function accept(& $renderer, $required = false, $error = null)
91
+    {
92
+        $renderer->renderElement($this, $required, $error);
93
+    }
94 94
 }
95 95
 ?>
Please login to merge, or discard this patch.
src/Chamilo/CoreBundle/Menu/NavBuilder.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -136,7 +136,7 @@
 block discarded – undo
136 136
             );
137 137
             /** @var Category $category */
138 138
             foreach ($categories as $category) {
139
-                 $faq->addChild(
139
+                    $faq->addChild(
140 140
                     $category->getHeadline(),
141 141
                     array(
142 142
                         'route' => 'faq',
Please login to merge, or discard this patch.
main/survey/survey_invite.php 1 patch
Indentation   +93 added lines, -93 removed lines patch added patch discarded remove patch
@@ -18,10 +18,10 @@  discard block
 block discarded – undo
18 18
 $this_section = SECTION_COURSES;
19 19
 
20 20
 if (!api_is_allowed_to_edit(false, true)) {
21
-	Display :: display_header(get_lang('ToolSurvey'));
22
-	Display :: display_error_message(get_lang('NotAllowed'), false);
23
-	Display :: display_footer();
24
-	exit;
21
+    Display :: display_header(get_lang('ToolSurvey'));
22
+    Display :: display_error_message(get_lang('NotAllowed'), false);
23
+    Display :: display_footer();
24
+    exit;
25 25
 }
26 26
 
27 27
 // Database table definitions
@@ -37,15 +37,15 @@  discard block
 block discarded – undo
37 37
 $survey_id = Security::remove_XSS($_GET['survey_id']);
38 38
 $survey_data = SurveyManager::get_survey($survey_id);
39 39
 if (empty($survey_data)) {
40
-	Display :: display_header(get_lang('ToolSurvey'));
41
-	Display :: display_error_message(get_lang('InvallidSurvey'), false);
42
-	Display :: display_footer();
43
-	exit;
40
+    Display :: display_header(get_lang('ToolSurvey'));
41
+    Display :: display_error_message(get_lang('InvallidSurvey'), false);
42
+    Display :: display_footer();
43
+    exit;
44 44
 }
45 45
 
46 46
 $urlname = strip_tags(api_substr(api_html_entity_decode($survey_data['title'], ENT_QUOTES), 0, 40));
47 47
 if (api_strlen(strip_tags($survey_data['title'])) > 40) {
48
-	$urlname .= '...';
48
+    $urlname .= '...';
49 49
 }
50 50
 
51 51
 // Breadcrumbs
@@ -80,23 +80,23 @@  discard block
 block discarded – undo
80 80
 		WHERE c_id = $course_id AND code='".Database::escape_string($survey_data['code'])."'";
81 81
 $result = Database::query($sql);
82 82
 if (Database::num_rows($result) > 1) {
83
-	Display::display_warning_message(get_lang('IdenticalSurveycodeWarning'));
83
+    Display::display_warning_message(get_lang('IdenticalSurveycodeWarning'));
84 84
 }
85 85
 
86 86
 // Invited / answered message
87 87
 if ($survey_data['invited'] > 0 && !isset($_POST['submit'])) {
88
-	$message  = '<a href="'.api_get_path(WEB_CODE_PATH).'survey/survey_invitation.php?view=answered&survey_id='.$survey_data['survey_id'].'">'.$survey_data['answered'].'</a> ';
89
-	$message .= get_lang('HaveAnswered').' ';
90
-	$message .= '<a href="'.api_get_path(WEB_CODE_PATH).'survey/survey_invitation.php?view=invited&survey_id='.$survey_data['survey_id'].'">'.$survey_data['invited'].'</a> ';
91
-	$message .= get_lang('WereInvited');
92
-	Display::display_normal_message($message, false);
88
+    $message  = '<a href="'.api_get_path(WEB_CODE_PATH).'survey/survey_invitation.php?view=answered&survey_id='.$survey_data['survey_id'].'">'.$survey_data['answered'].'</a> ';
89
+    $message .= get_lang('HaveAnswered').' ';
90
+    $message .= '<a href="'.api_get_path(WEB_CODE_PATH).'survey/survey_invitation.php?view=invited&survey_id='.$survey_data['survey_id'].'">'.$survey_data['invited'].'</a> ';
91
+    $message .= get_lang('WereInvited');
92
+    Display::display_normal_message($message, false);
93 93
 }
94 94
 
95 95
 // Building the form for publishing the survey
96 96
 $form = new FormValidator(
97
-	'publish_form',
98
-	'post',
99
-	api_get_self().'?survey_id='.$survey_id.'&'.api_get_cidreq()
97
+    'publish_form',
98
+    'post',
99
+    api_get_self().'?survey_id='.$survey_id.'&'.api_get_cidreq()
100 100
 );
101 101
 $form->addElement('header', '', $tool_name);
102 102
 
@@ -109,7 +109,7 @@  discard block
 block discarded – undo
109 109
 );
110 110
 $possible_users = array();
111 111
 foreach ($complete_user_list as & $user) {
112
-	$possible_users[$user['user_id']] = api_get_person_name($user['firstname'], $user['lastname']);
112
+    $possible_users[$user['user_id']] = api_get_person_name($user['firstname'], $user['lastname']);
113 113
 }
114 114
 
115 115
 
@@ -125,10 +125,10 @@  discard block
 block discarded – undo
125 125
 
126 126
 // Additional users
127 127
 $form->addElement(
128
-	'textarea',
129
-	'additional_users',
130
-	array(get_lang('AdditonalUsers'), get_lang('AdditonalUsersComment')),
131
-	array('rows' => 5)
128
+    'textarea',
129
+    'additional_users',
130
+    array(get_lang('AdditonalUsers'), get_lang('AdditonalUsersComment')),
131
+    array('rows' => 5)
132 132
 );
133 133
 
134 134
 $form->addElement('html', '<div id="check_mail">');
@@ -141,15 +141,15 @@  discard block
 block discarded – undo
141 141
 $form->addText('mail_title', get_lang('MailTitle'), false);
142 142
 // The text of the mail
143 143
 $form->addHtmlEditor(
144
-	'mail_text',
145
-	array(get_lang('MailText'), get_lang('UseLinkSyntax')),
146
-	false,
147
-	array('ToolbarSet' => 'Survey', 'Height' => '150')
144
+    'mail_text',
145
+    array(get_lang('MailText'), get_lang('UseLinkSyntax')),
146
+    false,
147
+    array('ToolbarSet' => 'Survey', 'Height' => '150')
148 148
 );
149 149
 $form->addElement('html', '</div>');
150 150
 // You cab send a reminder to unanswered people if the survey is not anonymous
151 151
 if ($survey_data['anonymous'] != 1) {
152
-	$form->addElement('checkbox', 'remindUnAnswered', '', get_lang('RemindUnanswered'));
152
+    $form->addElement('checkbox', 'remindUnAnswered', '', get_lang('RemindUnanswered'));
153 153
 }
154 154
 // Allow resending to all selected users
155 155
 $form->addElement('checkbox', 'resend_to_all', '', get_lang('ReminderResendToAllUsers'));
@@ -163,11 +163,11 @@  discard block
 block discarded – undo
163 163
 }*/
164 164
 $portal_url = api_get_path(WEB_PATH);
165 165
 if (api_is_multiple_url_enabled()) {
166
-	$access_url_id = api_get_current_access_url_id();
167
-	if ($access_url_id != -1) {
168
-		$url = api_get_access_url($access_url_id);
169
-		$portal_url = $url['url'];
170
-	}
166
+    $access_url_id = api_get_current_access_url_id();
167
+    if ($access_url_id != -1) {
168
+        $url = api_get_access_url($access_url_id);
169
+        $portal_url = $url['url'];
170
+    }
171 171
 }
172 172
 
173 173
 // Show the URL that can be used by users to fill a survey without invitation
@@ -177,56 +177,56 @@  discard block
 block discarded – undo
177 177
 $form->addElement('label', null, $auto_survey_link);
178 178
 
179 179
 if ($form->validate()) {
180
-   	$values = $form->exportValues();
180
+        $values = $form->exportValues();
181 181
     if (isset($values['send_mail']) && $values['send_mail'] == 1) {
182 182
         if (empty($values['mail_title']) || empty($values['mail_text'])) {
183 183
             Display :: display_error_message(get_lang('FormHasErrorsPleaseComplete'));
184 184
             // Getting the invited users
185
-        	$defaults = SurveyUtil::get_invited_users($survey_data['code']);
186
-
187
-        	// Getting the survey mail text
188
-        	if (!empty($survey_data['reminder_mail'])) {
189
-        		$defaults['mail_text'] = $survey_data['reminder_mail'];
190
-        	} else {
191
-        		$defaults['mail_text'] = $survey_data['invite_mail'];
192
-        	}
193
-        	$defaults['mail_title'] = $survey_data['mail_subject'];
194
-        	$defaults['send_mail'] = 1;
195
-        	$form->setDefaults($defaults);
185
+            $defaults = SurveyUtil::get_invited_users($survey_data['code']);
186
+
187
+            // Getting the survey mail text
188
+            if (!empty($survey_data['reminder_mail'])) {
189
+                $defaults['mail_text'] = $survey_data['reminder_mail'];
190
+            } else {
191
+                $defaults['mail_text'] = $survey_data['invite_mail'];
192
+            }
193
+            $defaults['mail_title'] = $survey_data['mail_subject'];
194
+            $defaults['send_mail'] = 1;
195
+            $form->setDefaults($defaults);
196 196
             $form->display();
197 197
             return;
198 198
         }
199 199
     }
200 200
     // Save the invitation mail
201
-	SurveyUtil::save_invite_mail(
202
-		$values['mail_text'],
203
-		$values['mail_title'],
204
-		!empty($survey_data['invite_mail'])
205
-	);
201
+    SurveyUtil::save_invite_mail(
202
+        $values['mail_text'],
203
+        $values['mail_title'],
204
+        !empty($survey_data['invite_mail'])
205
+    );
206 206
 
207 207
     $resendAll = isset($values['resend_to_all']) ? $values['resend_to_all'] : '';
208 208
     $sendMail = isset($values['send_mail']) ? $values['send_mail'] : '';
209 209
     $remindUnAnswered = isset($values['remindUnAnswered']) ? $values['remindUnAnswered'] : '';
210 210
 
211
-	// Saving the invitations for the course users
212
-	$count_course_users = SurveyUtil::saveInvitations(
213
-		$values['users'],
214
-		$values['mail_title'],
215
-		$values['mail_text'],
211
+    // Saving the invitations for the course users
212
+    $count_course_users = SurveyUtil::saveInvitations(
213
+        $values['users'],
214
+        $values['mail_title'],
215
+        $values['mail_text'],
216 216
         $resendAll,
217 217
         $sendMail,
218 218
         $remindUnAnswered
219
-	);
219
+    );
220 220
 
221
-	// Saving the invitations for the additional users
222
-	$values['additional_users'] = $values['additional_users'].';'; 	// This is for the case when you enter only one email
223
-	$temp = str_replace(',', ';', $values['additional_users']);		// This is to allow , and ; as email separators
224
-	$additional_users = explode(';', $temp);
225
-	for ($i = 0; $i < count($additional_users); $i++) {
226
-		$additional_users[$i] = trim($additional_users[$i]);
227
-	}
221
+    // Saving the invitations for the additional users
222
+    $values['additional_users'] = $values['additional_users'].';'; 	// This is for the case when you enter only one email
223
+    $temp = str_replace(',', ';', $values['additional_users']);		// This is to allow , and ; as email separators
224
+    $additional_users = explode(';', $temp);
225
+    for ($i = 0; $i < count($additional_users); $i++) {
226
+        $additional_users[$i] = trim($additional_users[$i]);
227
+    }
228 228
 
229
-	$counter_additional_users = SurveyUtil::saveInvitations(
229
+    $counter_additional_users = SurveyUtil::saveInvitations(
230 230
         $additional_users,
231 231
         $values['mail_title'],
232 232
         $values['mail_text'],
@@ -235,43 +235,43 @@  discard block
 block discarded – undo
235 235
         $remindUnAnswered
236 236
     );
237 237
 
238
-	// Updating the invited field in the survey table
239
-	SurveyUtil::update_count_invited($survey_data['code']);
240
-	$total_count = $count_course_users + $counter_additional_users;
238
+    // Updating the invited field in the survey table
239
+    SurveyUtil::update_count_invited($survey_data['code']);
240
+    $total_count = $count_course_users + $counter_additional_users;
241 241
     $table_survey = Database :: get_course_table(TABLE_SURVEY);
242
-	// Counting the number of people that are invited
243
-	$sql = "SELECT * FROM $table_survey
242
+    // Counting the number of people that are invited
243
+    $sql = "SELECT * FROM $table_survey
244 244
 	        WHERE
245 245
 	        	c_id = $course_id AND
246 246
 	        	code = '".Database::escape_string($survey_data['code'])."'
247 247
 			";
248
-	$result = Database::query($sql);
249
-	$row = Database::fetch_array($result);
250
-	$total_invited = $row['invited'];
248
+    $result = Database::query($sql);
249
+    $row = Database::fetch_array($result);
250
+    $total_invited = $row['invited'];
251 251
     if ($total_invited > 0) {
252
-    	$message  = '<a href="'.api_get_path(WEB_CODE_PATH).'survey/survey_invitation.php?view=answered&survey_id='.$survey_data['survey_id'].'">'.
253
-			$survey_data['answered'].'</a> ';
254
-    	$message .= get_lang('HaveAnswered').' ';
255
-    	$message .= '<a href="'.api_get_path(WEB_CODE_PATH).'survey/survey_invitation.php?view=invited&survey_id='.$survey_data['survey_id'].'">'.
256
-			$total_invited.'</a> ';
257
-    	$message .= get_lang('WereInvited');
258
-    	Display::display_normal_message($message, false);
259
-    	Display::display_confirmation_message($total_count.' '.get_lang('InvitationsSend'));
252
+        $message  = '<a href="'.api_get_path(WEB_CODE_PATH).'survey/survey_invitation.php?view=answered&survey_id='.$survey_data['survey_id'].'">'.
253
+            $survey_data['answered'].'</a> ';
254
+        $message .= get_lang('HaveAnswered').' ';
255
+        $message .= '<a href="'.api_get_path(WEB_CODE_PATH).'survey/survey_invitation.php?view=invited&survey_id='.$survey_data['survey_id'].'">'.
256
+            $total_invited.'</a> ';
257
+        $message .= get_lang('WereInvited');
258
+        Display::display_normal_message($message, false);
259
+        Display::display_confirmation_message($total_count.' '.get_lang('InvitationsSend'));
260 260
     }
261 261
 } else {
262
-	// Getting the invited users
263
-	$defaults = SurveyUtil::get_invited_users($survey_data['code']);
264
-
265
-	// Getting the survey mail text
266
-	if (!empty($survey_data['reminder_mail'])) {
267
-		$defaults['mail_text'] = $survey_data['reminder_mail'];
268
-	} else {
269
-		$defaults['mail_text'] = $survey_data['invite_mail'];
270
-	}
271
-	$defaults['mail_title'] = $survey_data['mail_subject'];
272
-	$defaults['send_mail'] = 1;
273
-
274
-	$form->setDefaults($defaults);
262
+    // Getting the invited users
263
+    $defaults = SurveyUtil::get_invited_users($survey_data['code']);
264
+
265
+    // Getting the survey mail text
266
+    if (!empty($survey_data['reminder_mail'])) {
267
+        $defaults['mail_text'] = $survey_data['reminder_mail'];
268
+    } else {
269
+        $defaults['mail_text'] = $survey_data['invite_mail'];
270
+    }
271
+    $defaults['mail_title'] = $survey_data['mail_subject'];
272
+    $defaults['send_mail'] = 1;
273
+
274
+    $form->setDefaults($defaults);
275 275
     $form->display();
276 276
 }
277 277
 Display :: display_footer();
Please login to merge, or discard this patch.
main/gradebook/lib/be/attendancelink.class.php 1 patch
Indentation   +202 added lines, -202 removed lines patch added patch discarded remove patch
@@ -8,48 +8,48 @@  discard block
 block discarded – undo
8 8
  */
9 9
 class AttendanceLink extends AbstractLink
10 10
 {
11
-	private $attendance_table = null;
12
-	private $itemprop_table = null;
11
+    private $attendance_table = null;
12
+    private $itemprop_table = null;
13 13
 
14
-	/**
15
-	 * Constructor
16
-	 */
17
-	public function __construct()
18
-	{
19
-		parent::__construct();
20
-		$this->set_type(LINK_ATTENDANCE);
21
-	}
14
+    /**
15
+     * Constructor
16
+     */
17
+    public function __construct()
18
+    {
19
+        parent::__construct();
20
+        $this->set_type(LINK_ATTENDANCE);
21
+    }
22 22
 
23
-	/**
24
-	 * @return string
25
-	 */
26
-	public function get_type_name()
27
-	{
28
-		return get_lang('Attendance');
29
-	}
23
+    /**
24
+     * @return string
25
+     */
26
+    public function get_type_name()
27
+    {
28
+        return get_lang('Attendance');
29
+    }
30 30
 
31
-	/**
32
-	 * @return bool
33
-	 */
34
-	public function is_allowed_to_change_name()
35
-	{
36
-		return false;
37
-	}
31
+    /**
32
+     * @return bool
33
+     */
34
+    public function is_allowed_to_change_name()
35
+    {
36
+        return false;
37
+    }
38 38
 
39
-	/**
40
-	 * Generate an array of attendances that a teacher hasn't created a link for.
41
-	 * @return array 2-dimensional array - every element contains 2 subelements (id, name)
42
-	 * @todo seems to be depracated
43
-	 */
44
-	public function get_not_created_links()
45
-	{
46
-		return false;
47
-		if (empty($this->course_code)) {
48
-			die('Error in get_not_created_links() : course code not set');
49
-		}
50
-		$tbl_grade_links = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_LINK);
39
+    /**
40
+     * Generate an array of attendances that a teacher hasn't created a link for.
41
+     * @return array 2-dimensional array - every element contains 2 subelements (id, name)
42
+     * @todo seems to be depracated
43
+     */
44
+    public function get_not_created_links()
45
+    {
46
+        return false;
47
+        if (empty($this->course_code)) {
48
+            die('Error in get_not_created_links() : course code not set');
49
+        }
50
+        $tbl_grade_links = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_LINK);
51 51
 
52
-		$sql = 'SELECT att.id, att.name, att.attendance_qualify_title
52
+        $sql = 'SELECT att.id, att.name, att.attendance_qualify_title
53 53
 				FROM '.$this->get_attendance_table().' att
54 54
 				WHERE
55 55
 					att.c_id = '.$this->course_id.' AND
@@ -60,7 +60,7 @@  discard block
 block discarded – undo
60 60
 							course_code = "'.Database::escape_string($this->get_course_code()).'"
61 61
 					)
62 62
 				AND att.session_id='.api_get_session_id().'';
63
-		$result = Database::query($sql);
63
+        $result = Database::query($sql);
64 64
 
65 65
         $cats = array();
66 66
         while ($data = Database::fetch_array($result)) {
@@ -71,13 +71,13 @@  discard block
 block discarded – undo
71 71
             }
72 72
         }
73 73
 
74
-		return $cats;
75
-	}
74
+        return $cats;
75
+    }
76 76
 
77
-	/**
78
-	 * Generate an array of all attendances available.
79
-	 * @return array 2-dimensional array - every element contains 2 subelements (id, name)
80
-	 */
77
+    /**
78
+     * Generate an array of all attendances available.
79
+     * @return array 2-dimensional array - every element contains 2 subelements (id, name)
80
+     */
81 81
     public function get_all_links()
82 82
     {
83 83
         if (empty($this->course_code)) {
@@ -104,55 +104,55 @@  discard block
 block discarded – undo
104 104
         $my_cats = isset($cats) ? $cats : null;
105 105
 
106 106
         return $my_cats;
107
-	}
107
+    }
108 108
 
109
-	/**
110
-	 * Has anyone done this exercise yet ?
111
-	 */
112
-	public function has_results()
113
-	{
114
-		$tbl_attendance_result = Database :: get_course_table(TABLE_ATTENDANCE_RESULT);
115
-		$session_id = api_get_session_id();
116
-		$sql = 'SELECT count(*) AS number FROM '.$tbl_attendance_result."
109
+    /**
110
+     * Has anyone done this exercise yet ?
111
+     */
112
+    public function has_results()
113
+    {
114
+        $tbl_attendance_result = Database :: get_course_table(TABLE_ATTENDANCE_RESULT);
115
+        $session_id = api_get_session_id();
116
+        $sql = 'SELECT count(*) AS number FROM '.$tbl_attendance_result."
117 117
 				WHERE
118 118
 					session_id = $session_id AND
119 119
 					c_id = '.$this->course_id.' AND
120 120
 					attendance_id = '".intval($this->get_ref_id())."'";
121
-		$result = Database::query($sql);
122
-		$number = Database::fetch_row($result);
121
+        $result = Database::query($sql);
122
+        $number = Database::fetch_row($result);
123 123
 
124
-		return $number[0] != 0;
125
-	}
124
+        return $number[0] != 0;
125
+    }
126 126
 
127
-	/**
128
-	 * @param int $stud_id
129
-	 * @return array|null
130
-	 */
131
-	public function calc_score($stud_id = null, $type = null)
132
-	{
133
-		$tbl_attendance_result = Database::get_course_table(TABLE_ATTENDANCE_RESULT);
134
-		$session_id = api_get_session_id();
127
+    /**
128
+     * @param int $stud_id
129
+     * @return array|null
130
+     */
131
+    public function calc_score($stud_id = null, $type = null)
132
+    {
133
+        $tbl_attendance_result = Database::get_course_table(TABLE_ATTENDANCE_RESULT);
134
+        $session_id = api_get_session_id();
135 135
 
136
-		// get attendance qualify max
137
-		$sql = 'SELECT att.attendance_qualify_max
136
+        // get attendance qualify max
137
+        $sql = 'SELECT att.attendance_qualify_max
138 138
 		        FROM '.$this->get_attendance_table().' att
139 139
   				WHERE
140 140
   					att.c_id = '.$this->course_id.' AND
141 141
   					att.id = '.intval($this->get_ref_id()).' AND
142 142
   					att.session_id='.intval($session_id).'';
143
-		$query = Database::query($sql);
144
-		$attendance = Database::fetch_array($query, 'ASSOC');
143
+        $query = Database::query($sql);
144
+        $attendance = Database::fetch_array($query, 'ASSOC');
145 145
 
146
-		// Get results
147
-		$sql = 'SELECT *
146
+        // Get results
147
+        $sql = 'SELECT *
148 148
 		        FROM '.$tbl_attendance_result.'
149 149
   	    		WHERE c_id = '.$this->course_id.' AND attendance_id = '.intval($this->get_ref_id());
150
-		if (isset($stud_id)) {
151
-			$sql .= ' AND user_id = '.intval($stud_id);
152
-		}
153
-		$scores = Database::query($sql);
154
-		// for 1 student
155
-		if (isset($stud_id)) {
150
+        if (isset($stud_id)) {
151
+            $sql .= ' AND user_id = '.intval($stud_id);
152
+        }
153
+        $scores = Database::query($sql);
154
+        // for 1 student
155
+        if (isset($stud_id)) {
156 156
             if ($data = Database::fetch_array($scores, 'ASSOC')) {
157 157
                 return array(
158 158
                     $data['score'],
@@ -162,7 +162,7 @@  discard block
 block discarded – undo
162 162
                 //We sent the 0/attendance_qualify_max instead of null for correct calculations
163 163
                 return array(0, $attendance['attendance_qualify_max']);
164 164
             }
165
-		} else {
165
+        } else {
166 166
             // all students -> get average
167 167
             $students = array();  // user list, needed to make sure we only
168 168
             // take first attempts into account
@@ -171,144 +171,144 @@  discard block
 block discarded – undo
171 171
             $sumResult = 0;
172 172
             $bestResult = 0;
173 173
 
174
-			while ($data = Database::fetch_array($scores)) {
175
-				if (!(array_key_exists($data['user_id'], $students))) {
176
-					if ($attendance['attendance_qualify_max'] != 0) {
177
-						$students[$data['user_id']] = $data['score'];
178
-						$rescount++;
179
-						$sum += $data['score'] / $attendance['attendance_qualify_max'];
180
-						$sumResult += $data['score'];
181
-						if ($data['score'] > $bestResult) {
182
-							$bestResult = $data['score'];
183
-						}
184
-						$weight = $attendance['attendance_qualify_max'];
185
-					}
186
-				}
187
-			}
174
+            while ($data = Database::fetch_array($scores)) {
175
+                if (!(array_key_exists($data['user_id'], $students))) {
176
+                    if ($attendance['attendance_qualify_max'] != 0) {
177
+                        $students[$data['user_id']] = $data['score'];
178
+                        $rescount++;
179
+                        $sum += $data['score'] / $attendance['attendance_qualify_max'];
180
+                        $sumResult += $data['score'];
181
+                        if ($data['score'] > $bestResult) {
182
+                            $bestResult = $data['score'];
183
+                        }
184
+                        $weight = $attendance['attendance_qualify_max'];
185
+                    }
186
+                }
187
+            }
188 188
 
189
-			if ($rescount == 0) {
190
-				return null;
191
-			} else {
192
-				switch ($type) {
193
-					case 'best':
194
-						return array($bestResult, $weight);
195
-						break;
196
-					case 'average':
197
-						return array($sumResult / $rescount, $weight);
198
-						break;
199
-					case 'ranking':
200
-						return AbstractLink::getCurrentUserRanking($stud_id, $students);
201
-						break;
202
-					default:
203
-						return array($sum, $rescount);
204
-						break;
205
-				}
206
-			}
207
-		}
208
-	}
189
+            if ($rescount == 0) {
190
+                return null;
191
+            } else {
192
+                switch ($type) {
193
+                    case 'best':
194
+                        return array($bestResult, $weight);
195
+                        break;
196
+                    case 'average':
197
+                        return array($sumResult / $rescount, $weight);
198
+                        break;
199
+                    case 'ranking':
200
+                        return AbstractLink::getCurrentUserRanking($stud_id, $students);
201
+                        break;
202
+                    default:
203
+                        return array($sum, $rescount);
204
+                        break;
205
+                }
206
+            }
207
+        }
208
+    }
209 209
 
210
-	/**
211
-	 * Lazy load function to get the database table of the student publications
212
-	 */
213
-	private function get_attendance_table()
214
-	{
215
-		$this->attendance_table = Database::get_course_table(TABLE_ATTENDANCE);
216
-		return $this->attendance_table;
217
-	}
210
+    /**
211
+     * Lazy load function to get the database table of the student publications
212
+     */
213
+    private function get_attendance_table()
214
+    {
215
+        $this->attendance_table = Database::get_course_table(TABLE_ATTENDANCE);
216
+        return $this->attendance_table;
217
+    }
218 218
 
219
-	public function needs_name_and_description()
220
-	{
221
-		return false;
222
-	}
219
+    public function needs_name_and_description()
220
+    {
221
+        return false;
222
+    }
223 223
 
224
-	public function needs_max()
225
-	{
226
-		return false;
227
-	}
224
+    public function needs_max()
225
+    {
226
+        return false;
227
+    }
228 228
 
229
-	public function needs_results()
230
-	{
231
-		return false;
232
-	}
229
+    public function needs_results()
230
+    {
231
+        return false;
232
+    }
233 233
 
234
-	/**
235
-	 * @return string
236
-	 */
237
-	public function get_name()
238
-	{
239
-		$this->get_attendance_data();
240
-		$attendance_title = isset($this->attendance_data['name']) ? $this->attendance_data['name'] : '';
241
-		$attendance_qualify_title = isset($this->attendance_data['attendance_qualify_title']) ? $this->attendance_data['attendance_qualify_title'] : '';
242
-		if ( isset($attendance_qualify_title) && $attendance_qualify_title != '') {
243
-			return $this->attendance_data['attendance_qualify_title'];
244
-		} else {
245
-			return $attendance_title;
246
-		}
247
-	}
234
+    /**
235
+     * @return string
236
+     */
237
+    public function get_name()
238
+    {
239
+        $this->get_attendance_data();
240
+        $attendance_title = isset($this->attendance_data['name']) ? $this->attendance_data['name'] : '';
241
+        $attendance_qualify_title = isset($this->attendance_data['attendance_qualify_title']) ? $this->attendance_data['attendance_qualify_title'] : '';
242
+        if ( isset($attendance_qualify_title) && $attendance_qualify_title != '') {
243
+            return $this->attendance_data['attendance_qualify_title'];
244
+        } else {
245
+            return $attendance_title;
246
+        }
247
+    }
248 248
 
249
-	/**
250
-	 * @return string
251
-	 */
252
-	public function get_description()
253
-	{
254
-		return '';
255
-	}
249
+    /**
250
+     * @return string
251
+     */
252
+    public function get_description()
253
+    {
254
+        return '';
255
+    }
256 256
 
257
-	/**
258
-	 * Check if this still links to an exercise
259
-	 */
260
-	public function is_valid_link()
261
-	{
262
-		$session_id = api_get_session_id();
263
-		$sql = 'SELECT count(att.id) FROM '.$this->get_attendance_table().' att
257
+    /**
258
+     * Check if this still links to an exercise
259
+     */
260
+    public function is_valid_link()
261
+    {
262
+        $session_id = api_get_session_id();
263
+        $sql = 'SELECT count(att.id) FROM '.$this->get_attendance_table().' att
264 264
         		 WHERE att.c_id = '.$this->course_id.' AND att.id = '.intval($this->get_ref_id()).' ';
265
-		$result = Database::query($sql);
266
-		$number = Database::fetch_row($result);
267
-		return ($number[0] != 0);
268
-	}
265
+        $result = Database::query($sql);
266
+        $number = Database::fetch_row($result);
267
+        return ($number[0] != 0);
268
+    }
269 269
 
270
-	public function get_test_id()
271
-	{
272
-		return 'DEBUG:ID';
273
-	}
270
+    public function get_test_id()
271
+    {
272
+        return 'DEBUG:ID';
273
+    }
274 274
 
275
-	public function get_link()
276
-	{
277
-		//it was extracts the attendance id
278
-		$session_id = api_get_session_id();
279
-		$sql = 'SELECT * FROM '.$this->get_attendance_table().' att
275
+    public function get_link()
276
+    {
277
+        //it was extracts the attendance id
278
+        $session_id = api_get_session_id();
279
+        $sql = 'SELECT * FROM '.$this->get_attendance_table().' att
280 280
     			WHERE att.c_id = '.$this->course_id.' AND att.id = '.intval($this->get_ref_id()).' ';
281
-		$result = Database::query($sql);
282
-		$row = Database::fetch_array($result,'ASSOC');
283
-		$attendance_id = $row['id'];
284
-		$url = api_get_path(WEB_PATH).'main/attendance/index.php?action=attendance_sheet_list&gradebook=view&attendance_id='.$attendance_id.'&'.api_get_cidreq_params($this->get_course_code(), $session_id);
281
+        $result = Database::query($sql);
282
+        $row = Database::fetch_array($result,'ASSOC');
283
+        $attendance_id = $row['id'];
284
+        $url = api_get_path(WEB_PATH).'main/attendance/index.php?action=attendance_sheet_list&gradebook=view&attendance_id='.$attendance_id.'&'.api_get_cidreq_params($this->get_course_code(), $session_id);
285 285
 
286
-		return $url;
287
-	}
286
+        return $url;
287
+    }
288 288
 
289
-	/**
290
-	 * @return array|bool
291
-	 */
292
-	private function get_attendance_data()
293
-	{
294
-		$tbl_name = $this->get_attendance_table();
295
-		$session_id = api_get_session_id();
296
-		if ($tbl_name == '') {
297
-			return false;
298
-		} elseif (!isset($this->attendance_data)) {
299
-			$sql = 'SELECT * FROM '.$this->get_attendance_table().' att
289
+    /**
290
+     * @return array|bool
291
+     */
292
+    private function get_attendance_data()
293
+    {
294
+        $tbl_name = $this->get_attendance_table();
295
+        $session_id = api_get_session_id();
296
+        if ($tbl_name == '') {
297
+            return false;
298
+        } elseif (!isset($this->attendance_data)) {
299
+            $sql = 'SELECT * FROM '.$this->get_attendance_table().' att
300 300
 					WHERE att.c_id = '.$this->course_id.' AND att.id = '.intval($this->get_ref_id()).' ';
301
-			$query = Database::query($sql);
302
-			$this->attendance_data = Database::fetch_array($query);
303
-		}
304
-		return $this->attendance_data;
305
-	}
301
+            $query = Database::query($sql);
302
+            $this->attendance_data = Database::fetch_array($query);
303
+        }
304
+        return $this->attendance_data;
305
+    }
306 306
 
307
-	/**
308
-	 * @return string
309
-	 */
310
-	public function get_icon_name()
311
-	{
312
-		return 'attendance';
313
-	}
307
+    /**
308
+     * @return string
309
+     */
310
+    public function get_icon_name()
311
+    {
312
+        return 'attendance';
313
+    }
314 314
 }
Please login to merge, or discard this patch.
main/gradebook/lib/be/surveylink.class.php 1 patch
Indentation   +246 added lines, -246 removed lines patch added patch discarded remove patch
@@ -8,98 +8,98 @@  discard block
 block discarded – undo
8 8
  */
9 9
 class SurveyLink extends AbstractLink
10 10
 {
11
-	private $survey_table = null;
12
-
13
-	/**
14
-	 * Constructor
15
-	 */
16
-	public function __construct()
17
-	{
18
-		parent::__construct();
19
-		$this->set_type(LINK_SURVEY);
20
-	}
21
-
22
-	/**
23
-	 * @return string
24
-	 */
25
-	public function get_name()
26
-	{
27
-		$this->get_survey_data();
11
+    private $survey_table = null;
12
+
13
+    /**
14
+     * Constructor
15
+     */
16
+    public function __construct()
17
+    {
18
+        parent::__construct();
19
+        $this->set_type(LINK_SURVEY);
20
+    }
21
+
22
+    /**
23
+     * @return string
24
+     */
25
+    public function get_name()
26
+    {
27
+        $this->get_survey_data();
28 28
 		
29
-		return $this->survey_data['code'].': '.self::html_to_text($this->survey_data['title']);
30
-	}
31
-
32
-	public function get_description()
33
-	{
34
-		$this->get_survey_data();
35
-		return $this->survey_data['subtitle'];
36
-	}
37
-
38
-	public function get_type_name()
39
-	{
40
-		return get_lang('Survey');
41
-	}
42
-
43
-	public function is_allowed_to_change_name()
44
-	{
45
-		return false;
46
-	}
47
-
48
-	public function needs_name_and_description()
49
-	{
50
-		return false;
51
-	}
52
-
53
-	public function needs_max()
54
-	{
55
-		return false;
56
-	}
57
-
58
-	public function needs_results()
59
-	{
60
-		return false;
61
-	}
62
-
63
-	/**
64
-	 * Generates an array of all surveys available.
65
-	 * @return array 2-dimensional array - every element contains 2 subelements (id, name)
66
-	 */
67
-	public function get_all_links()
68
-	{
69
-		if (empty($this->course_code)) {
70
-			die('Error in get_all_links() : course code not set');
71
-		}
72
-		$tbl_survey = $this->get_survey_table();
73
-		$session_id = api_get_session_id();
74
-		$course_id = api_get_course_int_id();
75
-		$sql = 'SELECT survey_id, title, code FROM '.$tbl_survey.'
29
+        return $this->survey_data['code'].': '.self::html_to_text($this->survey_data['title']);
30
+    }
31
+
32
+    public function get_description()
33
+    {
34
+        $this->get_survey_data();
35
+        return $this->survey_data['subtitle'];
36
+    }
37
+
38
+    public function get_type_name()
39
+    {
40
+        return get_lang('Survey');
41
+    }
42
+
43
+    public function is_allowed_to_change_name()
44
+    {
45
+        return false;
46
+    }
47
+
48
+    public function needs_name_and_description()
49
+    {
50
+        return false;
51
+    }
52
+
53
+    public function needs_max()
54
+    {
55
+        return false;
56
+    }
57
+
58
+    public function needs_results()
59
+    {
60
+        return false;
61
+    }
62
+
63
+    /**
64
+     * Generates an array of all surveys available.
65
+     * @return array 2-dimensional array - every element contains 2 subelements (id, name)
66
+     */
67
+    public function get_all_links()
68
+    {
69
+        if (empty($this->course_code)) {
70
+            die('Error in get_all_links() : course code not set');
71
+        }
72
+        $tbl_survey = $this->get_survey_table();
73
+        $session_id = api_get_session_id();
74
+        $course_id = api_get_course_int_id();
75
+        $sql = 'SELECT survey_id, title, code FROM '.$tbl_survey.'
76 76
 				WHERE c_id = '.$course_id.' AND session_id = '.intval($session_id).'';
77
-		$result = Database::query($sql);
78
-		while ($data = Database::fetch_array($result)) {
79
-			$links[] = array(
80
-				$data['survey_id'],
81
-				api_trunc_str(
82
-					$data['code'] . ': ' . self::html_to_text($data['title']),
83
-					80
84
-				)
85
-			);
86
-		}
87
-
88
-		return isset($links) ? $links : null;
89
-	}
90
-
91
-	/**
92
-	 * Generates an array of surveys that a teacher hasn't created a link for.
93
-	 * @return array 2-dimensional array - every element contains 2 subelements (id, name)
94
-	 */
95
-	public function get_not_created_links()
96
-	{
97
-		if (empty($this->course_code)) {
98
-			die('Error in get_not_created_links() : course code not set');
99
-		}
100
-		$tbl_grade_links = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_LINK);
101
-
102
-		$sql = 'SELECT survey_id, title, code
77
+        $result = Database::query($sql);
78
+        while ($data = Database::fetch_array($result)) {
79
+            $links[] = array(
80
+                $data['survey_id'],
81
+                api_trunc_str(
82
+                    $data['code'] . ': ' . self::html_to_text($data['title']),
83
+                    80
84
+                )
85
+            );
86
+        }
87
+
88
+        return isset($links) ? $links : null;
89
+    }
90
+
91
+    /**
92
+     * Generates an array of surveys that a teacher hasn't created a link for.
93
+     * @return array 2-dimensional array - every element contains 2 subelements (id, name)
94
+     */
95
+    public function get_not_created_links()
96
+    {
97
+        if (empty($this->course_code)) {
98
+            die('Error in get_not_created_links() : course code not set');
99
+        }
100
+        $tbl_grade_links = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_LINK);
101
+
102
+        $sql = 'SELECT survey_id, title, code
103 103
     			FROM '.$this->get_survey_table().' AS srv
104 104
 				WHERE survey_id NOT IN
105 105
 					(
@@ -110,28 +110,28 @@  discard block
 block discarded – undo
110 110
 					)
111 111
 					AND srv.session_id = '.api_get_session_id();
112 112
 
113
-		$result = Database::query($sql);
114
-
115
-		$links = array();
116
-		while ($data = Database::fetch_array($result)) {
117
-			$links[] = array(
118
-				$data['survey_id'],
119
-				api_trunc_str($data['code'].': '.self::html_to_text($data['title']), 80)
120
-			);
121
-		}
122
-		return $links;
123
-	}
124
-
125
-	/**
126
-	 * Has anyone done this survey yet?
127
-	 */
128
-	public function has_results($stud_id=null)
129
-	{
130
-		$ref_id = intval($this->get_ref_id());
131
-		$session_id = api_get_session_id();
132
-		$tbl_survey = Database::get_course_table(TABLE_SURVEY);
133
-		$tbl_survey_invitation = Database::get_course_table(TABLE_SURVEY_INVITATION);
134
-		$sql = "SELECT
113
+        $result = Database::query($sql);
114
+
115
+        $links = array();
116
+        while ($data = Database::fetch_array($result)) {
117
+            $links[] = array(
118
+                $data['survey_id'],
119
+                api_trunc_str($data['code'].': '.self::html_to_text($data['title']), 80)
120
+            );
121
+        }
122
+        return $links;
123
+    }
124
+
125
+    /**
126
+     * Has anyone done this survey yet?
127
+     */
128
+    public function has_results($stud_id=null)
129
+    {
130
+        $ref_id = intval($this->get_ref_id());
131
+        $session_id = api_get_session_id();
132
+        $tbl_survey = Database::get_course_table(TABLE_SURVEY);
133
+        $tbl_survey_invitation = Database::get_course_table(TABLE_SURVEY_INVITATION);
134
+        $sql = "SELECT
135 135
 				COUNT(i.answered)
136 136
 				FROM $tbl_survey AS s
137 137
 				JOIN $tbl_survey_invitation AS i ON s.code = i.survey_code
@@ -141,30 +141,30 @@  discard block
 block discarded – undo
141 141
 					s.survey_id = $ref_id AND
142 142
 					i.session_id = $session_id";
143 143
 
144
-		$sql_result = Database::query($sql);
145
-		$data = Database::fetch_array($sql_result);
144
+        $sql_result = Database::query($sql);
145
+        $data = Database::fetch_array($sql_result);
146 146
 
147
-		return ($data[0] != 0);
148
-	}
147
+        return ($data[0] != 0);
148
+    }
149 149
 
150
-	/**
151
-	 * @param int $stud_id
152
-	 * @return array|null
153
-	 */
154
-	public function calc_score($stud_id = null, $type = null)
155
-	{
156
-		// Note: Max score is assumed to be always 1 for surveys,
157
-		// only student's participation is to be taken into account.
158
-		$max_score = 1;
150
+    /**
151
+     * @param int $stud_id
152
+     * @return array|null
153
+     */
154
+    public function calc_score($stud_id = null, $type = null)
155
+    {
156
+        // Note: Max score is assumed to be always 1 for surveys,
157
+        // only student's participation is to be taken into account.
158
+        $max_score = 1;
159 159
 
160
-		$ref_id = intval($this->get_ref_id());
161
-		$session_id = api_get_session_id();
162
-		$tbl_survey = Database::get_course_table(TABLE_SURVEY);
163
-		$tbl_survey_invitation = Database::get_course_table(TABLE_SURVEY_INVITATION);
160
+        $ref_id = intval($this->get_ref_id());
161
+        $session_id = api_get_session_id();
162
+        $tbl_survey = Database::get_course_table(TABLE_SURVEY);
163
+        $tbl_survey_invitation = Database::get_course_table(TABLE_SURVEY_INVITATION);
164 164
 
165
-		$get_individual_score = !is_null($stud_id);
165
+        $get_individual_score = !is_null($stud_id);
166 166
 
167
-		$sql = "SELECT i.answered
167
+        $sql = "SELECT i.answered
168 168
 				FROM $tbl_survey AS s
169 169
 				JOIN $tbl_survey_invitation AS i
170 170
 				ON s.code = i.survey_code
@@ -175,131 +175,131 @@  discard block
 block discarded – undo
175 175
 					i.session_id = $session_id
176 176
 				";
177 177
 
178
-		if ($get_individual_score) {
179
-			$sql .= ' AND i.user = '.intval($stud_id);
180
-		}
181
-
182
-		$sql_result = Database::query($sql);
183
-
184
-		if ($get_individual_score) {
185
-			// for 1 student
186
-			if ($data = Database::fetch_array($sql_result)) {
187
-				return array($data['answered'] ? $max_score : 0, $max_score);
188
-			}
189
-			return array(0, $max_score);
190
-		} else {
191
-			// for all the students -> get average
192
-			$rescount = 0;
193
-			$sum = 0;
194
-			$bestResult = 0;
195
-			$weight = 0;
196
-			while ($data = Database::fetch_array($sql_result)) {
197
-				$sum += $data['answered'] ? $max_score : 0;
198
-				$rescount++;
199
-				if ($data['answered'] > $bestResult) {
200
-					$bestResult = $data['answered'];
201
-					$weight = $assignment['qualification'];
202
-				}
203
-			}
204
-			$sum = $sum / $max_score;
205
-
206
-			if ($rescount == 0) {
207
-				return null;
208
-			}
209
-
210
-			switch ($type) {
211
-				case 'best':
212
-					return array($bestResult, $rescount);
213
-					break;
214
-				case 'average':
215
-					return array($sum, $rescount);
216
-					break;
217
-				case 'ranking':
218
-					return null;
219
-					break;
220
-				default:
221
-					return array($sum, $rescount);
222
-					break;
223
-			}
224
-		}
225
-	}
226
-
227
-	/**
228
-	 * Lazy load function to get the database table of the surveys
229
-	 */
230
-	private function get_survey_table()
231
-	{
232
-		$this->survey_table = Database :: get_course_table(TABLE_SURVEY);
233
-		return $this->survey_table;
234
-	}
235
-
236
-	/**
237
-	 * Check if this still links to a survey
238
-	 */
239
-	public function is_valid_link()
240
-	{
241
-		$session_id = api_get_session_id();
242
-		$sql = 'SELECT count(survey_id) FROM '.$this->get_survey_table().'
178
+        if ($get_individual_score) {
179
+            $sql .= ' AND i.user = '.intval($stud_id);
180
+        }
181
+
182
+        $sql_result = Database::query($sql);
183
+
184
+        if ($get_individual_score) {
185
+            // for 1 student
186
+            if ($data = Database::fetch_array($sql_result)) {
187
+                return array($data['answered'] ? $max_score : 0, $max_score);
188
+            }
189
+            return array(0, $max_score);
190
+        } else {
191
+            // for all the students -> get average
192
+            $rescount = 0;
193
+            $sum = 0;
194
+            $bestResult = 0;
195
+            $weight = 0;
196
+            while ($data = Database::fetch_array($sql_result)) {
197
+                $sum += $data['answered'] ? $max_score : 0;
198
+                $rescount++;
199
+                if ($data['answered'] > $bestResult) {
200
+                    $bestResult = $data['answered'];
201
+                    $weight = $assignment['qualification'];
202
+                }
203
+            }
204
+            $sum = $sum / $max_score;
205
+
206
+            if ($rescount == 0) {
207
+                return null;
208
+            }
209
+
210
+            switch ($type) {
211
+                case 'best':
212
+                    return array($bestResult, $rescount);
213
+                    break;
214
+                case 'average':
215
+                    return array($sum, $rescount);
216
+                    break;
217
+                case 'ranking':
218
+                    return null;
219
+                    break;
220
+                default:
221
+                    return array($sum, $rescount);
222
+                    break;
223
+            }
224
+        }
225
+    }
226
+
227
+    /**
228
+     * Lazy load function to get the database table of the surveys
229
+     */
230
+    private function get_survey_table()
231
+    {
232
+        $this->survey_table = Database :: get_course_table(TABLE_SURVEY);
233
+        return $this->survey_table;
234
+    }
235
+
236
+    /**
237
+     * Check if this still links to a survey
238
+     */
239
+    public function is_valid_link()
240
+    {
241
+        $session_id = api_get_session_id();
242
+        $sql = 'SELECT count(survey_id) FROM '.$this->get_survey_table().'
243 243
         		 WHERE
244 244
         		 	c_id = '.$this->course_id.' AND
245 245
         		 	survey_id = '.intval($this->get_ref_id()).' AND
246 246
         		 	session_id='.intval($session_id).'';
247
-		$result = Database::query($sql);
248
-		$number = Database::fetch_row($result);
249
-		return ($number[0] != 0);
250
-	}
251
-
252
-	public function get_test_id()
253
-	{
254
-		return 'DEBUG:ID';
255
-	}
256
-
257
-	public function get_link()
258
-	{
259
-		if (api_is_allowed_to_edit()) { // Let students make access only through "Surveys" tool.
260
-			$tbl_name = $this->get_survey_table();
261
-			$session_id = api_get_session_id();
262
-			if ($tbl_name != '') {
263
-				$sql = 'SELECT survey_id FROM '.$this->get_survey_table().'
247
+        $result = Database::query($sql);
248
+        $number = Database::fetch_row($result);
249
+        return ($number[0] != 0);
250
+    }
251
+
252
+    public function get_test_id()
253
+    {
254
+        return 'DEBUG:ID';
255
+    }
256
+
257
+    public function get_link()
258
+    {
259
+        if (api_is_allowed_to_edit()) { // Let students make access only through "Surveys" tool.
260
+            $tbl_name = $this->get_survey_table();
261
+            $session_id = api_get_session_id();
262
+            if ($tbl_name != '') {
263
+                $sql = 'SELECT survey_id FROM '.$this->get_survey_table().'
264 264
     					WHERE
265 265
     						c_id = '.$this->course_id.' AND
266 266
     						survey_id = '.intval($this->get_ref_id()).' AND
267 267
     						session_id = '.intval($session_id).' ';
268
-				$result = Database::query($sql);
269
-				$row = Database::fetch_array($result, 'ASSOC');
270
-				$survey_id = $row['survey_id'];
271
-				return api_get_path(WEB_PATH).'main/survey/reporting.php?'.api_get_cidreq_params($this->get_course_code(), $session_id).'&survey_id='.$survey_id;
272
-			}
273
-		}
274
-		return null;
275
-	}
276
-
277
-	private function get_survey_data()
278
-	{
279
-		$tbl_name = $this->get_survey_table();
280
-		$session_id = api_get_session_id();
281
-		if ($tbl_name == '') {
282
-			return false;
283
-		} elseif (!isset($this->survey_data)) {
284
-			$sql = 'SELECT * FROM '.$tbl_name.'
268
+                $result = Database::query($sql);
269
+                $row = Database::fetch_array($result, 'ASSOC');
270
+                $survey_id = $row['survey_id'];
271
+                return api_get_path(WEB_PATH).'main/survey/reporting.php?'.api_get_cidreq_params($this->get_course_code(), $session_id).'&survey_id='.$survey_id;
272
+            }
273
+        }
274
+        return null;
275
+    }
276
+
277
+    private function get_survey_data()
278
+    {
279
+        $tbl_name = $this->get_survey_table();
280
+        $session_id = api_get_session_id();
281
+        if ($tbl_name == '') {
282
+            return false;
283
+        } elseif (!isset($this->survey_data)) {
284
+            $sql = 'SELECT * FROM '.$tbl_name.'
285 285
 					WHERE
286 286
 						c_id = '.$this->course_id.' AND
287 287
 						survey_id = '.intval($this->get_ref_id()).' AND
288 288
 						session_id='.intval($session_id).'';
289
-			$query = Database::query($sql);
290
-			$this->survey_data = Database::fetch_array($query);
291
-		}
292
-		return $this->survey_data;
293
-	}
294
-
295
-	public function get_icon_name()
296
-	{
297
-		return 'survey';
298
-	}
299
-
300
-	private static function html_to_text($string)
301
-	{
302
-		return strip_tags($string);
303
-		//return trim(api_html_entity_decode(strip_tags(str_ireplace(array('<p>', '</p>', '<br />', '<br/>', '<br>'), array('', ' ', ' ', ' ', ' '), $string)), ENT_QUOTES));
304
-	}
289
+            $query = Database::query($sql);
290
+            $this->survey_data = Database::fetch_array($query);
291
+        }
292
+        return $this->survey_data;
293
+    }
294
+
295
+    public function get_icon_name()
296
+    {
297
+        return 'survey';
298
+    }
299
+
300
+    private static function html_to_text($string)
301
+    {
302
+        return strip_tags($string);
303
+        //return trim(api_html_entity_decode(strip_tags(str_ireplace(array('<p>', '</p>', '<br />', '<br/>', '<br>'), array('', ' ', ' ', ' ', ' '), $string)), ENT_QUOTES));
304
+    }
305 305
 }
Please login to merge, or discard this patch.
main/gradebook/lib/GradebookUtils.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -251,7 +251,7 @@
 block discarded – undo
251 251
                     }
252 252
                 }
253 253
 
254
-               $modify_icons .= '<a href="gradebook_edit_all.php?selectcat=' .$cat->get_id() . '&' . $courseParams.'">' .
254
+                $modify_icons .= '<a href="gradebook_edit_all.php?selectcat=' .$cat->get_id() . '&' . $courseParams.'">' .
255 255
                     Display::return_icon(
256 256
                         'percentage.png',
257 257
                         get_lang('EditAllWeights'),
Please login to merge, or discard this patch.
main/webservices/cm_webservice.php 1 patch
Indentation   +221 added lines, -221 removed lines patch added patch discarded remove patch
@@ -9,70 +9,70 @@  discard block
 block discarded – undo
9 9
  */
10 10
 class WSCMError
11 11
 {
12
-	/**
13
-	 * Error handler. This needs to be a class that implements the interface WSErrorHandler
14
-	 *
15
-	 * @var WSErrorHandler
16
-	 */
17
-	protected static $_handler;
12
+    /**
13
+     * Error handler. This needs to be a class that implements the interface WSErrorHandler
14
+     *
15
+     * @var WSErrorHandler
16
+     */
17
+    protected static $_handler;
18 18
 
19
-	/**
20
-	 * Error code
21
-	 *
22
-	 * @var int
23
-	 */
24
-	public $code;
19
+    /**
20
+     * Error code
21
+     *
22
+     * @var int
23
+     */
24
+    public $code;
25 25
 
26
-	/**
27
-	 * Error message
28
-	 *
29
-	 * @var string
30
-	 */
31
-	public $message;
26
+    /**
27
+     * Error message
28
+     *
29
+     * @var string
30
+     */
31
+    public $message;
32 32
 
33
-	/**
34
-	 * Constructor
35
-	 *
36
-	 * @param int Error code
37
-	 * @param string Error message
38
-	 */
39
-	public function __construct($code, $message)
33
+    /**
34
+     * Constructor
35
+     *
36
+     * @param int Error code
37
+     * @param string Error message
38
+     */
39
+    public function __construct($code, $message)
40 40
     {
41
-		$this->code = $code;
42
-		$this->message = $message;
43
-	}
41
+        $this->code = $code;
42
+        $this->message = $message;
43
+    }
44 44
 
45
-	/**
46
-	 * Sets the error handler
47
-	 *
48
-	 * @param WSErrorHandler Error handler
49
-	 */
50
-	public static function setErrorHandler($handler)
45
+    /**
46
+     * Sets the error handler
47
+     *
48
+     * @param WSErrorHandler Error handler
49
+     */
50
+    public static function setErrorHandler($handler)
51 51
     {
52
-		if($handler instanceof WSErrorHandler) {
53
-			self::$_handler = $handler;
54
-		}
55
-	}
52
+        if($handler instanceof WSErrorHandler) {
53
+            self::$_handler = $handler;
54
+        }
55
+    }
56 56
 
57
-	/**
58
-	 * Returns the error handler
59
-	 *
60
-	 * @return WSErrorHandler Error handler
61
-	 */
62
-	public static function getErrorHandler()
57
+    /**
58
+     * Returns the error handler
59
+     *
60
+     * @return WSErrorHandler Error handler
61
+     */
62
+    public static function getErrorHandler()
63 63
     {
64
-		return self::$_handler;
65
-	}
64
+        return self::$_handler;
65
+    }
66 66
 
67
-	/**
68
-	 * Transforms the error into an array
69
-	 *
70
-	 * @return array Associative array with code and message
71
-	 */
72
-	public function toArray()
67
+    /**
68
+     * Transforms the error into an array
69
+     *
70
+     * @return array Associative array with code and message
71
+     */
72
+    public function toArray()
73 73
     {
74
-		return array('code' => $this->code, 'message' => $this->message);
75
-	}
74
+        return array('code' => $this->code, 'message' => $this->message);
75
+    }
76 76
 }
77 77
 
78 78
 /**
@@ -80,12 +80,12 @@  discard block
 block discarded – undo
80 80
  */
81 81
 interface WSCMErrorHandler
82 82
 {
83
-	/**
84
-	 * Handle method
85
-	 *
86
-	 * @param WSError Error
87
-	 */
88
-	public function handle($error);
83
+    /**
84
+     * Handle method
85
+     *
86
+     * @param WSError Error
87
+     */
88
+    public function handle($error);
89 89
 }
90 90
 
91 91
 /**
@@ -93,58 +93,58 @@  discard block
 block discarded – undo
93 93
  */
94 94
 class WSCM
95 95
 {
96
-	/**
97
-	 * Chamilo configuration
98
-	 *
99
-	 * @var array
100
-	 */
101
-	protected $_configuration;
96
+    /**
97
+     * Chamilo configuration
98
+     *
99
+     * @var array
100
+     */
101
+    protected $_configuration;
102 102
 
103
-	/**
104
-	 * Constructor
105
-	 */
106
-	public function __construct()
103
+    /**
104
+     * Constructor
105
+     */
106
+    public function __construct()
107 107
     {
108
-		$this->_configuration = $GLOBALS['_configuration'];
109
-	}
108
+        $this->_configuration = $GLOBALS['_configuration'];
109
+    }
110 110
 
111
-	/**
112
-	 * Verifies the API key
113
-	 *
114
-	 * @param string Secret key
115
-	 * @return mixed WSError in case of failure, null in case of success
116
-	 */
117
-	protected function verifyKey($secret_key)
111
+    /**
112
+     * Verifies the API key
113
+     *
114
+     * @param string Secret key
115
+     * @return mixed WSError in case of failure, null in case of success
116
+     */
117
+    protected function verifyKey($secret_key)
118 118
     {
119
-		$ip = trim($_SERVER['REMOTE_ADDR']);
120
-		// if we are behind a reverse proxy, assume it will send the
121
-		// HTTP_X_FORWARDED_FOR header and use this IP instead
122
-		if (!empty($_SERVER['HTTP_X_FORWARDED_FOR'])) {
123
-		  list($ip1,$ip2) = split(',',$_SERVER['HTTP_X_FORWARDED_FOR']);
124
-		  $ip = trim($ip1);
125
-		}
126
-		$security_key = $ip.$this->_configuration['security_key'];
119
+        $ip = trim($_SERVER['REMOTE_ADDR']);
120
+        // if we are behind a reverse proxy, assume it will send the
121
+        // HTTP_X_FORWARDED_FOR header and use this IP instead
122
+        if (!empty($_SERVER['HTTP_X_FORWARDED_FOR'])) {
123
+            list($ip1,$ip2) = split(',',$_SERVER['HTTP_X_FORWARDED_FOR']);
124
+            $ip = trim($ip1);
125
+        }
126
+        $security_key = $ip.$this->_configuration['security_key'];
127 127
 
128
-		if(!api_is_valid_secret_key($secret_key, $security_key)) {
129
-			return new WSCMError(1, "API key is invalid");
130
-		} else {
131
-			return null;
132
-		}
133
-	}
128
+        if(!api_is_valid_secret_key($secret_key, $security_key)) {
129
+            return new WSCMError(1, "API key is invalid");
130
+        } else {
131
+            return null;
132
+        }
133
+    }
134 134
 
135
-	/**
136
-	 * Verifies if the user is valid
137
-	 *
138
-	 * @param <String> $username of the user in chamilo
139
-	 * @param <String> $pass of the same user (in MD5 of SHA)
140
-	 *
141
-	 * return "valid" if username e password are correct! Else, return a message error
142
-	 */
135
+    /**
136
+     * Verifies if the user is valid
137
+     *
138
+     * @param <String> $username of the user in chamilo
139
+     * @param <String> $pass of the same user (in MD5 of SHA)
140
+     *
141
+     * return "valid" if username e password are correct! Else, return a message error
142
+     */
143 143
 
144
-	public function verifyUserPass($username, $pass)
144
+    public function verifyUserPass($username, $pass)
145 145
     {
146
-		$login = $username;
147
-		$password = $pass;
146
+        $login = $username;
147
+        $password = $pass;
148 148
 
149 149
         //lookup the user in the main database
150 150
         $user_table = Database::get_main_table(TABLE_MAIN_USER);
@@ -182,132 +182,132 @@  discard block
 block discarded – undo
182 182
             }
183 183
         }
184 184
         return get_lang('InvalidId');
185
-	}
185
+    }
186 186
 
187
-	/**
188
-	 * Gets the real user id based on the user id field name and value.
189
-	 * Note that if the user id field name is "chamilo_user_id", it will use the user id
190
-	 * in the system database
191
-	 *
192
-	 * @param string User id field name
193
-	 * @param string User id value
194
-	 * @return mixed System user id if the user was found, WSError otherwise
195
-	 */
196
-	protected function getUserId($user_id_field_name, $user_id_value)
187
+    /**
188
+     * Gets the real user id based on the user id field name and value.
189
+     * Note that if the user id field name is "chamilo_user_id", it will use the user id
190
+     * in the system database
191
+     *
192
+     * @param string User id field name
193
+     * @param string User id value
194
+     * @return mixed System user id if the user was found, WSError otherwise
195
+     */
196
+    protected function getUserId($user_id_field_name, $user_id_value)
197 197
     {
198
-		if($user_id_field_name == "chamilo_user_id") {
199
-			if(UserManager::is_user_id_valid(intval($user_id_value))) {
200
-				return intval($user_id_value);
201
-			} else {
202
-				return new WSCMError(100, "User not found");
203
-			}
204
-		} else {
205
-			$user_id = UserManager::get_user_id_from_original_id($user_id_value, $user_id_field_name);
206
-			if($user_id == 0) {
207
-				return new WSCMError(100, "User not found");
208
-			} else {
209
-				return $user_id;
210
-			}
211
-		}
212
-	}
198
+        if($user_id_field_name == "chamilo_user_id") {
199
+            if(UserManager::is_user_id_valid(intval($user_id_value))) {
200
+                return intval($user_id_value);
201
+            } else {
202
+                return new WSCMError(100, "User not found");
203
+            }
204
+        } else {
205
+            $user_id = UserManager::get_user_id_from_original_id($user_id_value, $user_id_field_name);
206
+            if($user_id == 0) {
207
+                return new WSCMError(100, "User not found");
208
+            } else {
209
+                return $user_id;
210
+            }
211
+        }
212
+    }
213 213
 
214
-	/**
215
-	 * Gets the real course id based on the course id field name and value.
216
-	 * Note that if the course id field name is "chamilo_course_id", it will use the course id
217
-	 * in the system database
218
-	 *
219
-	 * @param string Course id field name
220
-	 * @param string Course id value
221
-	 * @return mixed System course id if the course was found, WSError otherwise
222
-	 */
223
-	protected function getCourseId($course_id_field_name, $course_id_value)
214
+    /**
215
+     * Gets the real course id based on the course id field name and value.
216
+     * Note that if the course id field name is "chamilo_course_id", it will use the course id
217
+     * in the system database
218
+     *
219
+     * @param string Course id field name
220
+     * @param string Course id value
221
+     * @return mixed System course id if the course was found, WSError otherwise
222
+     */
223
+    protected function getCourseId($course_id_field_name, $course_id_value)
224 224
     {
225
-		if($course_id_field_name == "chamilo_course_id") {
226
-			if(CourseManager::get_course_code_from_course_id(intval($course_id_value)) != null) {
227
-				return intval($course_id_value);
228
-			} else {
229
-				return new WSCMError(200, "Course not found");
230
-			}
231
-		} else {
232
-			$courseId = CourseManager::get_course_code_from_original_id($course_id_value, $course_id_field_name);
233
-			if (empty($courseId)) {
234
-				return new WSCMError(200, "Course not found");
235
-			} else {
236
-				return $courseId;
237
-			}
238
-		}
239
-	}
225
+        if($course_id_field_name == "chamilo_course_id") {
226
+            if(CourseManager::get_course_code_from_course_id(intval($course_id_value)) != null) {
227
+                return intval($course_id_value);
228
+            } else {
229
+                return new WSCMError(200, "Course not found");
230
+            }
231
+        } else {
232
+            $courseId = CourseManager::get_course_code_from_original_id($course_id_value, $course_id_field_name);
233
+            if (empty($courseId)) {
234
+                return new WSCMError(200, "Course not found");
235
+            } else {
236
+                return $courseId;
237
+            }
238
+        }
239
+    }
240 240
 
241
-	/**
242
-	 * Gets the real session id based on the session id field name and value.
243
-	 * Note that if the session id field name is "chamilo_session_id", it will use the session id
244
-	 * in the system database
245
-	 *
246
-	 * @param string Session id field name
247
-	 * @param string Session id value
248
-	 * @return mixed System session id if the session was found, WSError otherwise
249
-	 */
250
-	protected function getSessionId($session_id_field_name, $session_id_value)
251
-	{
252
-		if ($session_id_field_name == "chamilo_session_id") {
253
-			$session = SessionManager::fetch((int)$session_id_value);
254
-			if(!empty($session)) {
255
-				return intval($session_id_value);
256
-			} else {
257
-				return new WSCMError(300, "Session not found");
258
-			}
259
-		} else {
260
-			$session_id = SessionManager::getSessionIdFromOriginalId(
261
-				$session_id_value,
262
-				$session_id_field_name
263
-			);
264
-			if($session_id == 0) {
265
-				return new WSCMError(300, "Session not found");
266
-			} else {
267
-				return $session_id;
268
-			}
269
-		}
270
-	}
241
+    /**
242
+     * Gets the real session id based on the session id field name and value.
243
+     * Note that if the session id field name is "chamilo_session_id", it will use the session id
244
+     * in the system database
245
+     *
246
+     * @param string Session id field name
247
+     * @param string Session id value
248
+     * @return mixed System session id if the session was found, WSError otherwise
249
+     */
250
+    protected function getSessionId($session_id_field_name, $session_id_value)
251
+    {
252
+        if ($session_id_field_name == "chamilo_session_id") {
253
+            $session = SessionManager::fetch((int)$session_id_value);
254
+            if(!empty($session)) {
255
+                return intval($session_id_value);
256
+            } else {
257
+                return new WSCMError(300, "Session not found");
258
+            }
259
+        } else {
260
+            $session_id = SessionManager::getSessionIdFromOriginalId(
261
+                $session_id_value,
262
+                $session_id_field_name
263
+            );
264
+            if($session_id == 0) {
265
+                return new WSCMError(300, "Session not found");
266
+            } else {
267
+                return $session_id;
268
+            }
269
+        }
270
+    }
271 271
 
272
-	/**
273
-	 * Handles an error by calling the WSError error handler
274
-	 *
275
-	 * @param WSError Error
276
-	 */
277
-	protected function handleError($error)
278
-	{
279
-		$handler = WSCMError::getErrorHandler();
280
-		$handler->handle($error);
281
-	}
272
+    /**
273
+     * Handles an error by calling the WSError error handler
274
+     *
275
+     * @param WSError Error
276
+     */
277
+    protected function handleError($error)
278
+    {
279
+        $handler = WSCMError::getErrorHandler();
280
+        $handler->handle($error);
281
+    }
282 282
 
283
-	/**
284
-	 * Gets a successful result
285
-	 *
286
-	 * @return array Array with a code of 0 and a message 'Operation was successful'
287
-	 */
288
-	protected function getSuccessfulResult()
289
-	{
290
-		return array('code' => 0, 'message' => 'Operation was successful');
291
-	}
283
+    /**
284
+     * Gets a successful result
285
+     *
286
+     * @return array Array with a code of 0 and a message 'Operation was successful'
287
+     */
288
+    protected function getSuccessfulResult()
289
+    {
290
+        return array('code' => 0, 'message' => 'Operation was successful');
291
+    }
292 292
 
293
-	/**
294
-	 * Test function. Returns the string success
295
-	 *
296
-	 * @return string Success
297
-	 */
298
-	public function test()
299
-	{
300
-		return "success";
301
-	}
293
+    /**
294
+     * Test function. Returns the string success
295
+     *
296
+     * @return string Success
297
+     */
298
+    public function test()
299
+    {
300
+        return "success";
301
+    }
302 302
 
303
-	/**
304
-	 * *Strictly* reverts PHP's nl2br() effects (whether it was used in XHTML mode or not)
305
-	 * @param <type> $string
306
-	 * @return <type> $string
307
-	 */
308
-	public function nl2br_revert($string) {
309
-		return preg_replace('`<br(?: /)?>([\\n\\r])`', '$1', $string);
310
-	}
303
+    /**
304
+     * *Strictly* reverts PHP's nl2br() effects (whether it was used in XHTML mode or not)
305
+     * @param <type> $string
306
+     * @return <type> $string
307
+     */
308
+    public function nl2br_revert($string) {
309
+        return preg_replace('`<br(?: /)?>([\\n\\r])`', '$1', $string);
310
+    }
311 311
 
312 312
 
313 313
 }
Please login to merge, or discard this patch.
main/inc/lib/javascript/svgedit/extensions/allowedMimeTypes.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -6,7 +6,7 @@
 block discarded – undo
6 6
     'jpeg' => 'image/jpeg',
7 7
     'bmp' => 'image/bmp',
8 8
     'webp' => 'image/webp',
9
-	'pdf' => 'application/pdf'
9
+    'pdf' => 'application/pdf'
10 10
 );
11 11
 
12 12
 ?>
13 13
\ No newline at end of file
Please login to merge, or discard this patch.