@@ -47,7 +47,7 @@ |
||
47 | 47 | while ($session = Database::fetch_array($rs)) { |
48 | 48 | $i++; |
49 | 49 | if ($i <= 10) { |
50 | - $return .= '<a href="#" onclick="add_user_to_url(\''.addslashes($session['id']).'\',\''.addslashes($session['name']).' ('.addslashes($session['id']).')'.'\')">'.$session['name'].' </a><br />'; |
|
50 | + $return .= '<a href="#" onclick="add_user_to_url(\''.addslashes($session['id']).'\',\''.addslashes($session['name']).' ('.addslashes($session['id']).')'.'\')">'.$session['name'].' </a><br />'; |
|
51 | 51 | } else { |
52 | 52 | $return .= '...<br />'; |
53 | 53 | } |
@@ -135,10 +135,10 @@ discard block |
||
135 | 135 | ?> |
136 | 136 | <div id="message" style="display: none"> |
137 | 137 | <?php |
138 | - if (!empty($message)) { |
|
138 | + if (!empty($message)) { |
|
139 | 139 | echo Display::return_message($message, 'normal'); |
140 | 140 | } |
141 | - ?> |
|
141 | + ?> |
|
142 | 142 | </div> |
143 | 143 | |
144 | 144 | <div id="content" align="center"> |
@@ -201,7 +201,7 @@ discard block |
||
201 | 201 | </div> |
202 | 202 | </div> |
203 | 203 | <?php |
204 | - /* |
|
204 | + /* |
|
205 | 205 | <!-- EPHORUS --> |
206 | 206 | <div id="main_ephorus"> |
207 | 207 | <div id="extension_header_ephorus" class="accordion_header"> |
@@ -53,93 +53,93 @@ discard block |
||
53 | 53 | //if ($annee == "" && $composante == "" && $etape == "") { |
54 | 54 | if (empty($annee) && empty($id_session)) |
55 | 55 | { |
56 | - Display::display_header($tool_name); |
|
57 | - echo '<div style="align:center">'; |
|
58 | - echo Display::return_icon('group.gif', get_lang('LDAPSelectFilterOnUsersOU')).' '.get_lang('LDAPSelectFilterOnUsersOU'); |
|
59 | - echo '<form method="get" action="'.api_get_self().'"><br />'; |
|
60 | - echo '<em>'.get_lang('LDAPOUAttributeFilter').' :</em> '; |
|
61 | - echo '<input type="text" name="annee" size="4" maxlength="30" value="'.$annee_base.'"> '; |
|
62 | - echo '<input type="submit" value="'.get_lang('Submit').'">'; |
|
63 | - echo '</form>'; |
|
64 | - echo '</div>'; |
|
56 | + Display::display_header($tool_name); |
|
57 | + echo '<div style="align:center">'; |
|
58 | + echo Display::return_icon('group.gif', get_lang('LDAPSelectFilterOnUsersOU')).' '.get_lang('LDAPSelectFilterOnUsersOU'); |
|
59 | + echo '<form method="get" action="'.api_get_self().'"><br />'; |
|
60 | + echo '<em>'.get_lang('LDAPOUAttributeFilter').' :</em> '; |
|
61 | + echo '<input type="text" name="annee" size="4" maxlength="30" value="'.$annee_base.'"> '; |
|
62 | + echo '<input type="submit" value="'.get_lang('Submit').'">'; |
|
63 | + echo '</form>'; |
|
64 | + echo '</div>'; |
|
65 | 65 | |
66 | 66 | } |
67 | 67 | elseif (!empty($annee) && empty($id_session)) |
68 | 68 | { |
69 | - Display::display_header($tool_name); |
|
70 | - echo '<div style="align:center">'; |
|
71 | - echo Display::return_icon( |
|
72 | - 'course.png', |
|
73 | - get_lang('SelectSessionToImportUsersTo')).' '.get_lang('SelectSessionToImportUsersTo').'<br />'; |
|
74 | - echo '<form method="post" action="'.api_get_self().'?annee='.Security::remove_XSS($annee).'"><br />'; |
|
75 | - echo '<select name="id_session">'; |
|
76 | - |
|
77 | - $tbl_session = Database::get_main_table(TABLE_MAIN_SESSION); |
|
78 | - $sql = "SELECT id,name,nbr_courses,access_start_date,access_end_date ". |
|
79 | - " FROM $tbl_session ". |
|
80 | - " ORDER BY name"; |
|
81 | - $result = Database::query($sql); |
|
82 | - |
|
83 | - $sessions = Database::store_result($result); |
|
84 | - $nbr_results = count($sessions); |
|
85 | - foreach ($sessions as $row) { |
|
86 | - echo '<option value="'.$row['id'].'">'.api_htmlentities($row['name']).' ('.$row['access_start_date'].' - '.$row['access_end_date'].')</option>'; |
|
87 | - } |
|
88 | - echo '</select>'; |
|
89 | - echo '<input type="submit" value="'.get_lang('Submit').'">'; |
|
90 | - echo '</form>'; |
|
91 | - echo '</div>'; |
|
69 | + Display::display_header($tool_name); |
|
70 | + echo '<div style="align:center">'; |
|
71 | + echo Display::return_icon( |
|
72 | + 'course.png', |
|
73 | + get_lang('SelectSessionToImportUsersTo')).' '.get_lang('SelectSessionToImportUsersTo').'<br />'; |
|
74 | + echo '<form method="post" action="'.api_get_self().'?annee='.Security::remove_XSS($annee).'"><br />'; |
|
75 | + echo '<select name="id_session">'; |
|
76 | + |
|
77 | + $tbl_session = Database::get_main_table(TABLE_MAIN_SESSION); |
|
78 | + $sql = "SELECT id,name,nbr_courses,access_start_date,access_end_date ". |
|
79 | + " FROM $tbl_session ". |
|
80 | + " ORDER BY name"; |
|
81 | + $result = Database::query($sql); |
|
82 | + |
|
83 | + $sessions = Database::store_result($result); |
|
84 | + $nbr_results = count($sessions); |
|
85 | + foreach ($sessions as $row) { |
|
86 | + echo '<option value="'.$row['id'].'">'.api_htmlentities($row['name']).' ('.$row['access_start_date'].' - '.$row['access_end_date'].')</option>'; |
|
87 | + } |
|
88 | + echo '</select>'; |
|
89 | + echo '<input type="submit" value="'.get_lang('Submit').'">'; |
|
90 | + echo '</form>'; |
|
91 | + echo '</div>'; |
|
92 | 92 | } |
93 | 93 | // form4 annee != 0; composante != 0 etape != 0 |
94 | 94 | //elseif ($annee <> "" && $composante <> "" && $etape <> "" && $listeok != 'yes') { |
95 | 95 | elseif (!empty($annee) && !empty($id_session) && empty($_POST['confirmed'])) |
96 | 96 | { |
97 | - Display::display_header($tool_name); |
|
98 | - echo '<div style="align: center;">'; |
|
99 | - echo '<br />'; |
|
100 | - echo '<br />'; |
|
101 | - echo '<h3>'.Display::return_icon('group.gif', get_lang('SelectStudents')).' '.get_lang('SelectStudents').'</h3>'; |
|
102 | - //echo "Connection ..."; |
|
103 | - $ds = ldap_connect($ldap_host, $ldap_port) or die(get_lang('LDAPConnectionError')); |
|
104 | - ldap_set_version($ds); |
|
105 | - |
|
106 | - if ($ds) { |
|
107 | - |
|
108 | - $r = false; |
|
109 | - $res = ldap_handle_bind($ds, $r); |
|
110 | - |
|
111 | - //$sr = @ ldap_search($ds, "ou=people,$LDAPbasedn", "(|(edupersonprimaryorgunitdn=ou=$etape,ou=$annee,ou=diploma,o=Paris1,$LDAPbasedn)(edupersonprimaryorgunitdn=ou=02PEL,ou=$annee,ou=diploma,o=Paris1,$LDAPbasedn))"); |
|
112 | - //echo "(ou=*$annee,ou=$composante)"; |
|
113 | - $sr = @ ldap_search($ds, $ldap_basedn, "(ou=*$annee)"); |
|
114 | - |
|
115 | - $info = ldap_get_entries($ds, $sr); |
|
116 | - |
|
117 | - for ($key = 0; $key < $info["count"]; $key++) { |
|
118 | - $nom_form[] = $info[$key]["sn"][0]; |
|
119 | - $prenom_form[] = $info[$key]["givenname"][0]; |
|
120 | - $email_form[] = $info[$key]["mail"][0]; |
|
121 | - // Get uid from dn |
|
122 | - //$dn_array=ldap_explode_dn($info[$key]["dn"],1); |
|
123 | - //$username_form[] = $dn_array[0]; // uid is first key |
|
124 | - $username_form[] = $info[$key]['uid'][0]; |
|
125 | - $outab[] = $info[$key]["eduPersonPrimaryAffiliation"][0]; // Ici "student" |
|
126 | - //$val = ldap_get_values_len($ds, $entry, "userPassword"); |
|
127 | - //$password_form[] = $val[0]; |
|
128 | - $password_form[] = $info[$key]['userPassword'][0]; |
|
129 | - } |
|
130 | - ldap_unbind($ds); |
|
131 | - |
|
132 | - /*-----------------------------------------------*/ |
|
133 | - |
|
134 | - asort($nom_form); |
|
135 | - reset($nom_form); |
|
136 | - |
|
137 | - $statut = 5; |
|
138 | - include ('ldap_form_add_users_group.php'); |
|
139 | - } else { |
|
140 | - echo '<h4>'.get_lang('UnableToConnectTo').' '.$host.'</h4>'; |
|
141 | - } |
|
142 | - echo '<br /><br />'; |
|
97 | + Display::display_header($tool_name); |
|
98 | + echo '<div style="align: center;">'; |
|
99 | + echo '<br />'; |
|
100 | + echo '<br />'; |
|
101 | + echo '<h3>'.Display::return_icon('group.gif', get_lang('SelectStudents')).' '.get_lang('SelectStudents').'</h3>'; |
|
102 | + //echo "Connection ..."; |
|
103 | + $ds = ldap_connect($ldap_host, $ldap_port) or die(get_lang('LDAPConnectionError')); |
|
104 | + ldap_set_version($ds); |
|
105 | + |
|
106 | + if ($ds) { |
|
107 | + |
|
108 | + $r = false; |
|
109 | + $res = ldap_handle_bind($ds, $r); |
|
110 | + |
|
111 | + //$sr = @ ldap_search($ds, "ou=people,$LDAPbasedn", "(|(edupersonprimaryorgunitdn=ou=$etape,ou=$annee,ou=diploma,o=Paris1,$LDAPbasedn)(edupersonprimaryorgunitdn=ou=02PEL,ou=$annee,ou=diploma,o=Paris1,$LDAPbasedn))"); |
|
112 | + //echo "(ou=*$annee,ou=$composante)"; |
|
113 | + $sr = @ ldap_search($ds, $ldap_basedn, "(ou=*$annee)"); |
|
114 | + |
|
115 | + $info = ldap_get_entries($ds, $sr); |
|
116 | + |
|
117 | + for ($key = 0; $key < $info["count"]; $key++) { |
|
118 | + $nom_form[] = $info[$key]["sn"][0]; |
|
119 | + $prenom_form[] = $info[$key]["givenname"][0]; |
|
120 | + $email_form[] = $info[$key]["mail"][0]; |
|
121 | + // Get uid from dn |
|
122 | + //$dn_array=ldap_explode_dn($info[$key]["dn"],1); |
|
123 | + //$username_form[] = $dn_array[0]; // uid is first key |
|
124 | + $username_form[] = $info[$key]['uid'][0]; |
|
125 | + $outab[] = $info[$key]["eduPersonPrimaryAffiliation"][0]; // Ici "student" |
|
126 | + //$val = ldap_get_values_len($ds, $entry, "userPassword"); |
|
127 | + //$password_form[] = $val[0]; |
|
128 | + $password_form[] = $info[$key]['userPassword'][0]; |
|
129 | + } |
|
130 | + ldap_unbind($ds); |
|
131 | + |
|
132 | + /*-----------------------------------------------*/ |
|
133 | + |
|
134 | + asort($nom_form); |
|
135 | + reset($nom_form); |
|
136 | + |
|
137 | + $statut = 5; |
|
138 | + include ('ldap_form_add_users_group.php'); |
|
139 | + } else { |
|
140 | + echo '<h4>'.get_lang('UnableToConnectTo').' '.$host.'</h4>'; |
|
141 | + } |
|
142 | + echo '<br /><br />'; |
|
143 | 143 | echo '<a href="ldap_import_students.php?annee=">'.get_lang('BackToNewSearch').'</a>'; |
144 | 144 | echo '<br /><br />'; |
145 | 145 | echo '</div>'; |
@@ -147,23 +147,23 @@ discard block |
||
147 | 147 | } |
148 | 148 | elseif (!empty($annee) && !empty($id_session) && ($_POST['confirmed'] == 'yes')) |
149 | 149 | { |
150 | - $id = $_POST['username_form']; |
|
151 | - $UserList = array(); |
|
152 | - $userid_match_login = array(); |
|
153 | - foreach ($id as $form_index=>$user_id) |
|
154 | - { |
|
155 | - if (is_array($_POST['checkboxes']) && in_array($form_index, array_values($_POST['checkboxes']))) |
|
156 | - { |
|
157 | - $tmp = ldap_add_user($user_id); |
|
158 | - $UserList[] = $tmp; |
|
159 | - $userid_match_login[$tmp] = $user_id; |
|
160 | - } |
|
161 | - } |
|
162 | - if (!empty($_POST['id_session'])) { |
|
163 | - $num = 0; |
|
164 | - $tbl_session_user = Database::get_main_table(TABLE_MAIN_SESSION_USER); |
|
165 | - $tbl_session = Database::get_main_table(TABLE_MAIN_SESSION); |
|
166 | - foreach ($UserList as $user_id) { |
|
150 | + $id = $_POST['username_form']; |
|
151 | + $UserList = array(); |
|
152 | + $userid_match_login = array(); |
|
153 | + foreach ($id as $form_index=>$user_id) |
|
154 | + { |
|
155 | + if (is_array($_POST['checkboxes']) && in_array($form_index, array_values($_POST['checkboxes']))) |
|
156 | + { |
|
157 | + $tmp = ldap_add_user($user_id); |
|
158 | + $UserList[] = $tmp; |
|
159 | + $userid_match_login[$tmp] = $user_id; |
|
160 | + } |
|
161 | + } |
|
162 | + if (!empty($_POST['id_session'])) { |
|
163 | + $num = 0; |
|
164 | + $tbl_session_user = Database::get_main_table(TABLE_MAIN_SESSION_USER); |
|
165 | + $tbl_session = Database::get_main_table(TABLE_MAIN_SESSION); |
|
166 | + foreach ($UserList as $user_id) { |
|
167 | 167 | $res_user = Database::insert( |
168 | 168 | $tbl_session_user, |
169 | 169 | [ |
@@ -175,15 +175,15 @@ discard block |
||
175 | 175 | if ($res_user !== false) { |
176 | 176 | $num++; |
177 | 177 | } |
178 | - } |
|
179 | - |
|
180 | - if ($num > 0) { |
|
181 | - $sql = 'UPDATE '.$tbl_session.' SET nbr_users = (nbr_users + '.$num.') WHERE id = '.intval($id_session); |
|
182 | - $res = Database::query($sql); |
|
183 | - } |
|
184 | - header('Location: resume_session.php?id_session='.Security::remove_XSS($_POST['id_session'])); |
|
185 | - } |
|
186 | - /* |
|
178 | + } |
|
179 | + |
|
180 | + if ($num > 0) { |
|
181 | + $sql = 'UPDATE '.$tbl_session.' SET nbr_users = (nbr_users + '.$num.') WHERE id = '.intval($id_session); |
|
182 | + $res = Database::query($sql); |
|
183 | + } |
|
184 | + header('Location: resume_session.php?id_session='.Security::remove_XSS($_POST['id_session'])); |
|
185 | + } |
|
186 | + /* |
|
187 | 187 | else |
188 | 188 | { |
189 | 189 | Display :: display_header($tool_name); |
@@ -202,13 +202,13 @@ discard block |
||
202 | 202 | Display::addFlash(Display::return_message($message, 'normal', false)); |
203 | 203 | } |
204 | 204 | */ |
205 | - else |
|
206 | - { |
|
207 | - $message = get_lang('NoUserAdded'); |
|
208 | - Display::addFlash(Display::return_message($message, 'normal', false)); |
|
205 | + else |
|
206 | + { |
|
207 | + $message = get_lang('NoUserAdded'); |
|
208 | + Display::addFlash(Display::return_message($message, 'normal', false)); |
|
209 | 209 | Display::display_header($tool_name); |
210 | - } |
|
211 | - echo '<br /><br />'; |
|
210 | + } |
|
211 | + echo '<br /><br />'; |
|
212 | 212 | echo '<a href="ldap_import_students.php?annee=&composante=&etape=">'.get_lang('BackToNewSearch').'</a>'; |
213 | 213 | echo '<br /><br />'; |
214 | 214 | } |
@@ -60,9 +60,9 @@ |
||
60 | 60 | |
61 | 61 | <?php |
62 | 62 | if (isset($action) && ($action == "synchro")) { |
63 | - $included = true; |
|
64 | - require('ldap_synchro.php'); |
|
65 | - echo Display::return_message($message, 'normal', false); |
|
63 | + $included = true; |
|
64 | + require('ldap_synchro.php'); |
|
65 | + echo Display::return_message($message, 'normal', false); |
|
66 | 66 | } |
67 | 67 | Display::display_footer(); |
68 | 68 | ?> |
@@ -25,8 +25,8 @@ discard block |
||
25 | 25 | class CourseRestorer |
26 | 26 | { |
27 | 27 | /** |
28 | - * The course-object |
|
29 | - */ |
|
28 | + * The course-object |
|
29 | + */ |
|
30 | 30 | public $course; |
31 | 31 | public $destination_course_info; |
32 | 32 | |
@@ -45,7 +45,7 @@ discard block |
||
45 | 45 | 'events', |
46 | 46 | 'forum_category', |
47 | 47 | 'forums', |
48 | - // 'forum_topics', |
|
48 | + // 'forum_topics', |
|
49 | 49 | 'glossary', |
50 | 50 | 'quizzes', |
51 | 51 | 'test_category', |
@@ -2864,15 +2864,15 @@ discard block |
||
2864 | 2864 | } |
2865 | 2865 | |
2866 | 2866 | /** |
2867 | - * copy all directory and sub directory |
|
2868 | - * @param string The path origin |
|
2869 | - * @param string The path destination |
|
2870 | - * @param boolean Option Overwrite |
|
2871 | - * @param string $source |
|
2872 | - * @param string $dest |
|
2873 | - * @return void |
|
2874 | - * @deprecated |
|
2875 | - */ |
|
2867 | + * copy all directory and sub directory |
|
2868 | + * @param string The path origin |
|
2869 | + * @param string The path destination |
|
2870 | + * @param boolean Option Overwrite |
|
2871 | + * @param string $source |
|
2872 | + * @param string $dest |
|
2873 | + * @return void |
|
2874 | + * @deprecated |
|
2875 | + */ |
|
2876 | 2876 | public function allow_create_all_directory($source, $dest, $overwrite = false) |
2877 | 2877 | { |
2878 | 2878 | if (!is_dir($dest)) { |
@@ -2885,7 +2885,7 @@ discard block |
||
2885 | 2885 | if ($file != '.' && $file != '..') { |
2886 | 2886 | $path = $source.'/'.$file; |
2887 | 2887 | if (is_file($path)) { |
2888 | - /* if (!is_file($dest . '/' . $file) || $overwrite) |
|
2888 | + /* if (!is_file($dest . '/' . $file) || $overwrite) |
|
2889 | 2889 | if (!@copy($path, $dest . '/' . $file)) { |
2890 | 2890 | echo '<font color="red">File ('.$path.') '.get_lang('NotHavePermission').'</font>'; |
2891 | 2891 | }*/ |
@@ -3415,7 +3415,7 @@ discard block |
||
3415 | 3415 | break; |
3416 | 3416 | } |
3417 | 3417 | |
3418 | - if ($this->course->has_resources($type) && |
|
3418 | + if ($this->course->has_resources($type) && |
|
3419 | 3419 | isset($this->course->resources[$type][$itemId]) |
3420 | 3420 | ) { |
3421 | 3421 | $item = $this->course->resources[$type][$itemId]; |
@@ -51,10 +51,10 @@ discard block |
||
51 | 51 | */ |
52 | 52 | protected $externalCareId; |
53 | 53 | |
54 | - /** |
|
55 | - * @ORM\ManyToOne(targetEntity="Chamilo\UserBundle\Entity\User", cascade={"persist"}) |
|
56 | - * @ORM\JoinColumn(name="insert_user_id", referencedColumnName="id", nullable=false) |
|
57 | - */ |
|
54 | + /** |
|
55 | + * @ORM\ManyToOne(targetEntity="Chamilo\UserBundle\Entity\User", cascade={"persist"}) |
|
56 | + * @ORM\JoinColumn(name="insert_user_id", referencedColumnName="id", nullable=false) |
|
57 | + */ |
|
58 | 58 | private $insertUser; |
59 | 59 | |
60 | 60 | /** |
@@ -110,10 +110,10 @@ discard block |
||
110 | 110 | */ |
111 | 111 | private $parent; |
112 | 112 | |
113 | - /** |
|
114 | - * @ORM\OneToMany(targetEntity="CarePost", mappedBy="parent") |
|
115 | - * @ORM\OrderBy({"createdAt" = "DESC"}) |
|
116 | - */ |
|
113 | + /** |
|
114 | + * @ORM\OneToMany(targetEntity="CarePost", mappedBy="parent") |
|
115 | + * @ORM\OrderBy({"createdAt" = "DESC"}) |
|
116 | + */ |
|
117 | 117 | private $children; |
118 | 118 | |
119 | 119 | /** |
@@ -237,12 +237,12 @@ |
||
237 | 237 | ]; |
238 | 238 | } else { |
239 | 239 | $add = "\t<Session>\n" |
240 | - ."\t\t<SessionName>$row[name]</SessionName>\n" |
|
241 | - ."\t\t<Coach>$row[username]</Coach>\n" |
|
242 | - ."\t\t<DateStart>$row[access_start_date]</DateStart>\n" |
|
243 | - ."\t\t<DateEnd>$row[access_end_date]</DateEnd>\n" |
|
244 | - ."\t\t<Visibility>$row[visibility]</Visibility>\n" |
|
245 | - ."\t\t<SessionCategory>$row[session_category]</SessionCategory>\n"; |
|
240 | + ."\t\t<SessionName>$row[name]</SessionName>\n" |
|
241 | + ."\t\t<Coach>$row[username]</Coach>\n" |
|
242 | + ."\t\t<DateStart>$row[access_start_date]</DateStart>\n" |
|
243 | + ."\t\t<DateEnd>$row[access_end_date]</DateEnd>\n" |
|
244 | + ."\t\t<Visibility>$row[visibility]</Visibility>\n" |
|
245 | + ."\t\t<SessionCategory>$row[session_category]</SessionCategory>\n"; |
|
246 | 246 | } |
247 | 247 | |
248 | 248 | if (!$cvs) { |
@@ -880,7 +880,7 @@ |
||
880 | 880 | } |
881 | 881 | |
882 | 882 | if ($origin != 'learnpath') { |
883 | - echo '<div id="highlight-plugin" class="glossary-content">'; |
|
883 | + echo '<div id="highlight-plugin" class="glossary-content">'; |
|
884 | 884 | } |
885 | 885 | |
886 | 886 | if ($reminder == 2) { |
@@ -1736,7 +1736,7 @@ |
||
1736 | 1736 | * @param int $user_id |
1737 | 1737 | * @param int $group_id |
1738 | 1738 | * @param int $relation_type |
1739 | - * |
|
1739 | + * |
|
1740 | 1740 | * @return boolean true if success |
1741 | 1741 | **/ |
1742 | 1742 | public function add_user_to_group($user_id, $group_id, $relation_type = GROUP_USER_PERMISSION_READER) |