chamilo
/
chamilo-lms
mirror of https://github.com/chamilo/chamilo-lms/tree/1.11.x
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Scrutinizer Auto-Fixes

Browse Source 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
pull/2487/head
Scrutinizer Auto-Fixer 8 years ago
parent e0d21096e3
commit 1f7844380e
41 changed files with 253 additions and 256 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 2
      main/auth/cas/logincas.php
  2. 2
      main/auth/cas/logout.php
  3. 2
      main/auth/external_login/functions.inc.php
  4. 2
      main/course_info/legal.php
  5. 20
      main/cron/lang/langstats.php
  6. 22
      main/document/webcam_receiver.php
  7. 2
      main/forum/iframe_thread.php
  8. 20
      main/mySpace/admin.php
  9. 26
      main/mySpace/current_courses.php
  10. 44
      main/social/profile_friends_and_groups.inc.php
  11. 22
      main/webservices/courses_list.soap.php
  12. 16
      main/wiki/diff.inc.php
  13. 2
      news_list.php
  14. 4
      plugin/add_facebook_login_button/index.php
  15. 2
      plugin/advanced_subscription/config.php
  16. 17
      plugin/advanced_subscription/cron/notify_by_mail.php
  17. 2
      plugin/advanced_subscription/plugin.php
  18. 83
      plugin/advanced_subscription/src/AdvancedSubscriptionPlugin.php
  19. 19
      plugin/advanced_subscription/test/mails.php
  20. 6
      plugin/advanced_subscription/test/terms_to_pdf.php
  21. 2
      plugin/bbb/lib/VM.php
  22. 10
      plugin/bbb/lib/vm/DigitalOceanVM.php
  23. 18
      plugin/bbb/start.php
  24. 2
      plugin/buycourses/src/configuration.php
  25. 32
      plugin/buycourses/src/panel.ajax.php
  26. 2
      plugin/clockworksms/config.php
  27. 2
      plugin/courseblock/plugin.php
  28. 2
      plugin/courselegal/config.php
  29. 2
      plugin/courselegal/plugin.php
  30. 8
      plugin/dashboard/block_session/block_session.class.php
  31. 24
      plugin/dashboard/block_student_graph/block_student_graph.class.php
  32. 4
      plugin/date/index.act.php
  33. 10
      plugin/jcapture/action.php
  34. 4
      plugin/jcapture/upload.php
  35. 20
      plugin/openmeetings/lib/openmeetings.class.php
  36. 6
      plugin/openmeetings/lib/room.class.php
  37. 2
      plugin/resubscription/config.php
  38. 2
      plugin/resubscription/index.php
  39. 2
      plugin/resubscription/uninstall.php
  40. 38
      plugin/vchamilo/views/editinstance_form.php
  41. 2
      plugin/vchamilo/views/manage.testdatapath.php

2
main/auth/cas/logincas.php
Unescape View File

@ -39,7 +39,7 @@ if (cas_configured()) {
$firstpage = $_GET['firstpage'];
setcookie("GotoCourse", $firstpage);
}
if (!is_object($PHPCAS_CLIENT) ) {
if (!is_object($PHPCAS_CLIENT)) {
phpCAS::client(
$cas_auth_ver,
$cas_auth_server,

2
main/auth/cas/logout.php
Unescape View File

@ -9,5 +9,5 @@ require '../..//inc/global.inc.php';
require_once('authcas.php');
global $cas_auth_ver, $cas_auth_server, $cas_auth_port, $cas_auth_uri;
phpCAS::client($cas_auth_ver,$cas_auth_server,$cas_auth_port,$cas_auth_uri);
phpCAS::client($cas_auth_ver, $cas_auth_server, $cas_auth_port, $cas_auth_uri);
phpCAS::logout();

2
main/auth/external_login/functions.inc.php
Unescape View File

@ -21,7 +21,7 @@ function external_get_user_info($login, $password)
//Those are the mandatory fields for user creation.
//See external_add_user function for all the fields you can have.
$table = USERINFO_TABLE;
$sql = "SELECT * from $table where username='" . Database::escape_string($login) . "'";
$sql = "SELECT * from $table where username='".Database::escape_string($login)."'";
$result = Database::query($sql);
if (Database::num_rows($result) == 0) { //false password

2
main/course_info/legal.php
Unescape View File

@ -87,7 +87,7 @@ if ($form->validate()) {
}
if ($pluginLegal) {
header('Location:' .$url);
header('Location:'.$url);
exit;
}
}

20
main/cron/lang/langstats.php
Unescape View File

@ -32,16 +32,16 @@ if ($_GET['output'] == 1) {
/**
* Display
*/
if (count($list)==0) { echo 'No terms loaded so far'; }
if (count($list)>0) {
if (count($list) == 0) { echo 'No terms loaded so far'; }
if (count($list) > 0) {
$i = 1;
$j = 1;
$k = 0;
$files = array();
$trans = array();
echo 'Number of records: '.count($list).'<br />';
echo '<table><tr><th>Index</th><th>Registration order</th><th>Term</th>'.($output==1?'<th>Origin</th>':'').'<th>Count</th></tr>';
foreach($list as $elem) {
echo '<table><tr><th>Index</th><th>Registration order</th><th>Term</th>'.($output == 1 ? '<th>Origin</th>' : '').'<th>Count</th></tr>';
foreach ($list as $elem) {
if ($k > $terms_limit) { break; }
$fixed_elem = $elem;
if ($output) {
@ -57,13 +57,13 @@ if (count($list)>0) {
$trans[$fixed_elem['term_name']] = $translation;
$j++;
}
echo '<tr><td>',$i,
'</td><td>',$fixed_elem['id'],
'</td><td>',$fixed_elem['term_name'];
echo '<tr><td>', $i,
'</td><td>', $fixed_elem['id'],
'</td><td>', $fixed_elem['term_name'];
if ($output) {
echo '</td><td>'.$variables_origin[$fixed_elem['term_name']];
}
echo '</td><td>',$fixed_elem['term_count'],'</td></tr>';
echo '</td><td>', $fixed_elem['term_count'], '</td></tr>';
$i++;
}
echo '</table>';
@ -71,9 +71,9 @@ if (count($list)>0) {
@mkdir('/tmp/lang');
foreach ($files as $file => $terms) {
@touch('/tmp/lang/'.$file);
file_put_contents('/tmp/lang/'.$file,"<?php".PHP_EOL);
file_put_contents('/tmp/lang/'.$file, "<?php".PHP_EOL);
foreach ($terms as $term) {
file_put_contents('/tmp/lang/'.$file,'$'.$term.' = "'.str_replace('"','\"',$trans[$term]).'";'.PHP_EOL, FILE_APPEND);
file_put_contents('/tmp/lang/'.$file, '$'.$term.' = "'.str_replace('"', '\"', $trans[$term]).'";'.PHP_EOL, FILE_APPEND);
}
}
}

22
main/document/webcam_receiver.php
Unescape View File

@ -13,7 +13,7 @@ api_block_anonymous_users();
# Save the audio to a URL-accessible directory for playback.
parse_str($_SERVER['QUERY_STRING'], $params);
if(isset($params['webcamname']) && isset($params['webcamdir']) && isset($params['webcamuserid'])) {
if (isset($params['webcamname']) && isset($params['webcamdir']) && isset($params['webcamuserid'])) {
$webcamname = $params['webcamname'];
$webcamdir = $params['webcamdir'];
$webcamuserid = $params['webcamuserid'];
@ -23,7 +23,7 @@ else {
die();
}
if ($webcamuserid!= api_get_user_id() || api_get_user_id()==0 || $webcamuserid==0) {
if ($webcamuserid != api_get_user_id() || api_get_user_id() == 0 || $webcamuserid == 0) {
api_not_allowed();
die();
}
@ -41,7 +41,7 @@ $webcamdir = Security::remove_XSS($webcamdir);
$ext = explode('.', $webcamname);
$ext = strtolower($ext[sizeof($ext) - 1]);
if($ext!= 'jpg'){
if ($ext != 'jpg') {
die();
}
@ -53,15 +53,15 @@ $current_session_id = api_get_session_id();
$groupId = api_get_group_id();
//Avoid duplicates
$webcamname_to_save=$webcamname;
$title_to_save=str_replace('_',' ',$webcamname);
$webcamname_noex=basename($webcamname, ".jpg");
if (file_exists($saveDir.'/'.$webcamname_noex.'.'.$ext)){
$webcamname_to_save = $webcamname;
$title_to_save = str_replace('_', ' ', $webcamname);
$webcamname_noex = basename($webcamname, ".jpg");
if (file_exists($saveDir.'/'.$webcamname_noex.'.'.$ext)) {
$i = 1;
while (file_exists($saveDir.'/'.$webcamname_noex.'_'.$i.'.'.$ext)) $i++;
$webcamname_to_save = $webcamname_noex . '_' . $i . '.'.$ext;
$title_to_save = $webcamname_noex . '_' . $i . '.'.$ext;
$title_to_save = str_replace('_',' ',$title_to_save);
$webcamname_to_save = $webcamname_noex.'_'.$i.'.'.$ext;
$title_to_save = $webcamname_noex.'_'.$i.'.'.$ext;
$title_to_save = str_replace('_', ' ', $title_to_save);
}
$documentPath = $saveDir.'/'.$webcamname_to_save;
@ -78,5 +78,5 @@ if (!$content) {
$doc_id = add_document($_course, $webcamdir.'/'.$webcamname_to_save, 'file', filesize($documentPath), $title_to_save);
api_item_property_update($_course, TOOL_DOCUMENT, $doc_id, 'DocumentAdded', $_user['user_id'], $groupId, null, null, null, $current_session_id);
///
$url = 'http://' . $_SERVER['HTTP_HOST'] . dirname($_SERVER['REQUEST_URI']) . '/' . $documentPath;
$url = 'http://'.$_SERVER['HTTP_HOST'].dirname($_SERVER['REQUEST_URI']).'/'.$documentPath;
print get_lang('ClipSent');

2
main/forum/iframe_thread.php
Unescape View File

@ -76,7 +76,7 @@ while ($row = Database::fetch_array($result)) {
echo "<tr>";
echo "<td rowspan=\"2\" class=\"forum_message_left\">";
$username = api_htmlentities(sprintf(get_lang('LoginX'), $row['username']), ENT_QUOTES);
if ($row['user_id']=='0') {
if ($row['user_id'] == '0') {
$name = $row['poster_name'];
} else {
$name = api_get_person_name($row['firstname'], $row['lastname']);

20
main/mySpace/admin.php
Unescape View File

@ -35,13 +35,13 @@ if (isset($_POST['export'])) {
}
$sql = "SELECT user.user_id,lastname,firstname,email
FROM $tbl_user as user, $tbl_admin as admin
WHERE admin.user_id=user.user_id" . $order_clause;
WHERE admin.user_id=user.user_id".$order_clause;
$result_admins = Database::query($sql);
if (api_is_western_name_order()) {
echo '<table class="data_table"><tr><th>' . get_lang('FirstName') . '</th><th>' . get_lang('LastName') . '</th><th>' . get_lang('Email') . '</th></tr>';
echo '<table class="data_table"><tr><th>'.get_lang('FirstName').'</th><th>'.get_lang('LastName').'</th><th>'.get_lang('Email').'</th></tr>';
} else {
echo '<table class="data_table"><tr><th>' . get_lang('LastName') . '</th><th>' . get_lang('FirstName') . '</th><th>' . get_lang('Email') . '</th></tr>';
echo '<table class="data_table"><tr><th>'.get_lang('LastName').'</th><th>'.get_lang('FirstName').'</th><th>'.get_lang('Email').'</th></tr>';
}
if (api_is_western_name_order(PERSON_NAME_DATA_EXPORT)) {
@ -65,9 +65,9 @@ if (Database::num_rows($result_admins) > 0) {
$css_class = "row_odd";
if ($i % 20 == 0 && $i != 0) {
if (api_is_western_name_order()) {
echo '<tr><th>' . get_lang('FirstName') . '</th><th>' . get_lang('LastName') . '</th><th>' . get_lang('Email') . '</th></tr>';
echo '<tr><th>'.get_lang('FirstName').'</th><th>'.get_lang('LastName').'</th><th>'.get_lang('Email').'</th></tr>';
} else {
echo '<tr><th>' . get_lang('LastName') . '</th><th>' . get_lang('FirstName') . '</th><th>' . get_lang('Email') . '</th></tr>';
echo '<tr><th>'.get_lang('LastName').'</th><th>'.get_lang('FirstName').'</th><th>'.get_lang('Email').'</th></tr>';
}
}
} else {
@ -77,9 +77,9 @@ if (Database::num_rows($result_admins) > 0) {
$i++;
if (api_is_western_name_order()) {
echo "<tr class=" . $css_class . "><td>$firstname</td><td>$lastname</td><td><a href='mailto:" . $email . "'>$email</a></td></tr>";
echo "<tr class=".$css_class."><td>$firstname</td><td>$lastname</td><td><a href='mailto:".$email."'>$email</a></td></tr>";
} else {
echo "<tr class=" . $css_class . "><td>$lastname</td><td>$firstname</td><td><a href='mailto:" . $email . "'>$email</a></td></tr>";
echo "<tr class=".$css_class."><td>$lastname</td><td>$firstname</td><td><a href='mailto:".$email."'>$email</a></td></tr>";
}
if (api_is_western_name_order(PERSON_NAME_DATA_EXPORT)) {
@ -93,7 +93,7 @@ if (Database::num_rows($result_admins) > 0) {
}
} else {
// No results
echo '<tr><td colspan="3">' . get_lang('NoResults') . '</td></tr>';
echo '<tr><td colspan="3">'.get_lang('NoResults').'</td></tr>';
}
echo '</table>';
@ -104,8 +104,8 @@ if (isset($_POST['export'])) {
echo "
<br /><br />
<form method='post' action='admin.php'>
<button type='submit' class='save' name='export' value='" . get_lang('ExportExcel') . "'>
" . get_lang('ExportExcel') . "
<button type='submit' class='save' name='export' value='" . get_lang('ExportExcel')."'>
" . get_lang('ExportExcel')."
</button>
<form>
";

26
main/mySpace/current_courses.php
Unescape View File

@ -34,11 +34,11 @@ if (!empty($my_courses)) {
}
$teachers = CourseManager::get_teacher_list_from_course_code($course_code);
$teacher_list = array();
$teacher_list = array();
if (!empty($teachers)) {
foreach($teachers as $teacher) {
$teacher_list[]= $teacher['firstname'].' '.$teacher['lastname'];
foreach ($teachers as $teacher) {
$teacher_list[] = $teacher['firstname'].' '.$teacher['lastname'];
}
}
@ -54,7 +54,7 @@ if (!empty($my_courses)) {
$students[] = $student['user_id'];
}
$t_lp = Database :: get_course_table(TABLE_LP_MAIN);
$t_lp = Database :: get_course_table(TABLE_LP_MAIN);
$sql_lp = "SELECT lp.name, lp.id FROM $t_lp lp
WHERE c_id = $course_id AND lp.session_id = 0";
$rs_lp = Database::query($sql_lp);
@ -67,7 +67,7 @@ if (!empty($my_courses)) {
);
$total_tools = 0;
foreach($total_tools_list as $tool) {
foreach ($total_tools_list as $tool) {
$total_tools += $tool['count_access_tool'];
}
@ -93,16 +93,16 @@ if (!empty($my_courses)) {
if (!empty($students)) {
foreach ($students as $student_id) {
$avg_student_progress = Tracking::get_avg_student_progress($student_id, $course_code, array($lp_id), $session_id);
$myavg_temp = Tracking::get_avg_student_score($student_id, $course_code, array($lp_id), $session_id);
$myavg_temp = Tracking::get_avg_student_score($student_id, $course_code, array($lp_id), $session_id);
$avg_progress_in_course = Tracking::get_avg_student_progress($student_id, $course_code, array($lp_id), $session_id);
if (intval($avg_progress_in_course) == 100) {
$count_students_complete_all_activities++;
}
if (intval($avg_progress_in_course) > 0 && intval($avg_progress_in_course) <= 50) {
$count_students_complete_all_activities_at_50 ++;
$count_students_complete_all_activities_at_50++;
}
$total_average_progress +=$avg_progress_in_course;
$total_average_progress += $avg_progress_in_course;
$time_spent = Tracking::get_time_spent_on_the_course($student_id, $course_id, $session_id);
$total_time_spent += $time_spent;
@ -139,7 +139,7 @@ if (!empty($my_courses)) {
ORDER BY item_type";
$res_lpi = Database::query($sql_lpi);
while ($row_lpi = Database::fetch_array($res_lpi)) {
switch($row_lpi['item_type']) {
switch ($row_lpi['item_type']) {
case 'document':
$array[$i]['learnpath_docs']++;
break;
@ -171,10 +171,10 @@ if (!empty($my_courses)) {
if (!empty($student_count)) {
$array[$i]['count_students_accessing'] = $count_students_accessing;
$array[$i]['count_students_accessing_percentage'] = round($count_students_accessing / $student_count *100 , 0);
$array[$i]['count_students_accessing_percentage'] = round($count_students_accessing / $student_count * 100, 0);
$array[$i]['count_students_complete_all_activities_at_50'] = $count_students_complete_all_activities;
$array[$i]['count_students_complete_all_activities'] = round($count_students_complete_all_activities / $student_count *100 , 0);;
$array[$i]['average_percentage_activities_completed_per_student'] = round($count_students_complete_all_activities/$student_count*100,2);
$array[$i]['count_students_complete_all_activities'] = round($count_students_complete_all_activities / $student_count * 100, 0); ;
$array[$i]['average_percentage_activities_completed_per_student'] = round($count_students_complete_all_activities / $student_count * 100, 2);
$array[$i]['total_time_spent'] = 0;
$array[$i]['average_time_spent_per_student'] = 0;
@ -245,7 +245,7 @@ if (isset($_GET['export'])) {
exit;
}
$interbreadcrumb[] = array ('url' => 'index.php', 'name' => get_lang('MySpace'));
$interbreadcrumb[] = array('url' => 'index.php', 'name' => get_lang('MySpace'));
Display::display_header(get_lang('CurrentCourses'));

44
main/social/profile_friends_and_groups.inc.php
Unescape View File

@ -32,14 +32,14 @@ if (isset($_GET['view']) && in_array($_GET['view'], $views)) {
);
$number_friends = count($friends);
$friend_html = '';
$friend_html .= '<div><h3>' . get_lang('SocialFriend') . '</h3></div>';
$friend_html .= '<div><h3>'.get_lang('SocialFriend').'</h3></div>';
$friend_html .= '<div id="friend-container" class="social-friend-container">';
$friend_html .= '<div id="friend-header" >';
if ($number_friends == 1) {
$friend_html .= '<div style="float:left;width:80%">' . $number_friends . ' ' . get_lang('Friend') . '</div>';
$friend_html .= '<div style="float:left;width:80%">'.$number_friends.' '.get_lang('Friend').'</div>';
} else {
$friend_html .= '<div style="float:left;width:80%">' . $number_friends . ' ' . get_lang('Friends') . '</div>';
$friend_html .= '<div style="float:left;width:80%">'.$number_friends.' '.get_lang('Friends').'</div>';
}
$friend_html .= '</div>'; // close div friend-header
@ -51,14 +51,14 @@ if (isset($_GET['view']) && in_array($_GET['view'], $views)) {
$friend['firstName'],
$friend['lastName']
);
$friend_html .= '<div id=div_' . $friend['friend_user_id'] . ' class="image_friend_network" ><span><center>';
$friend_html .= '<div id=div_'.$friend['friend_user_id'].' class="image_friend_network" ><span><center>';
$userPicture = UserManager::getUserPicture($friend['friend_user_id']);
$friend_html .= '<a href="profile.php?u=' . $friend['friend_user_id'].'">';
$friend_html .= '<img src="' . $userPicture . '" id="imgfriend_' . $friend['friend_user_id'] . '" title="' . $name_user . '" />';
$friend_html .= '<a href="profile.php?u='.$friend['friend_user_id'].'">';
$friend_html .= '<img src="'.$userPicture.'" id="imgfriend_'.$friend['friend_user_id'].'" title="'.$name_user.'" />';
$friend_html .= '</center></span>';
$friend_html .= '<center class="friend">' . $name_user . '</a></center>';
$friend_html .= '<center class="friend">'.$name_user.'</a></center>';
$friend_html .= '</div>';
}
}
@ -73,7 +73,7 @@ if (isset($_GET['view']) && in_array($_GET['view'], $views)) {
$i = 1;
foreach ($results as $result) {
$id = $result['id'];
$url_open = '<a href="group_view.php?id=' . $id . '">';
$url_open = '<a href="group_view.php?id='.$id.'">';
$url_close = '</a>';
$icon = '';
$name = cut($result['name'], 20, true);
@ -94,11 +94,11 @@ if (isset($_GET['view']) && in_array($_GET['view'], $views)) {
$userGroup->get_all_users_by_group($id)
);
if ($count_users_group == 1) {
$count_users_group = $count_users_group . ' ' . get_lang(
$count_users_group = $count_users_group.' '.get_lang(
'Member'
);
} else {
$count_users_group = $count_users_group . ' ' . get_lang(
$count_users_group = $count_users_group.' '.get_lang(
'Members'
);
}
@ -107,40 +107,40 @@ if (isset($_GET['view']) && in_array($_GET['view'], $views)) {
$result['picture_uri'],
80
);
$item_name = '<div class="box_shared_profile_group_title">' . $url_open . api_xml_http_response_encode($name) . $icon . $url_close . '</div>';
$item_name = '<div class="box_shared_profile_group_title">'.$url_open.api_xml_http_response_encode($name).$icon.$url_close.'</div>';
$item_description = '';
if (!empty($result['description'])) {
$item_description = '<div class="box_shared_profile_group_description">
<span class="social-groups-text2">' .
api_xml_http_response_encode(get_lang('Description')) . '</span><p class="social-groups-text4">' .
cut(api_xml_http_response_encode($result['description']), 120, true ) . '</p></div>';
api_xml_http_response_encode(get_lang('Description')).'</span><p class="social-groups-text4">'.
cut(api_xml_http_response_encode($result['description']), 120, true).'</p></div>';
}
$result['picture_uri'] = '<div class="box_shared_profile_group_image">
<img class="social-groups-image" src="' . $picture['file'] . '" /></div>';
<img class="social-groups-image" src="' . $picture['file'].'" /></div>';
$item_actions = '';
if (api_get_user_id() == $user_id) {
$item_actions = '<div class="box_shared_profile_group_actions"><a href="group_view.php?id=' . $id . '">' .
get_lang('SeeMore') . $url_close . '</div>';
$item_actions = '<div class="box_shared_profile_group_actions"><a href="group_view.php?id='.$id.'">'.
get_lang('SeeMore').$url_close.'</div>';
}
$grid_my_groups[] = array(
$item_name,
$url_open . $result['picture_uri'] . $url_close,
$item_description . $item_actions
$url_open.$result['picture_uri'].$url_close,
$item_description.$item_actions
);
$i++;
}
}
if (count($grid_my_groups) > 0) {
echo '<div style="margin-top:20px">';
echo '<div><h3>' . get_lang('MyGroups') . '</h3></div>';
echo '<div><h3>'.get_lang('MyGroups').'</h3></div>';
$count_groups = 0;
if (count($results) == 1) {
$count_groups = count($results) . ' ' . get_lang('Group');
$count_groups = count($results).' '.get_lang('Group');
} else {
$count_groups = count($results) . ' ' . get_lang('Groups');
$count_groups = count($results).' '.get_lang('Groups');
}
echo '<div>' . $count_groups . '</div>';
echo '<div>'.$count_groups.'</div>';
Display::display_sortable_grid(
'shared_profile_mygroups',

22
main/webservices/courses_list.soap.php
Unescape View File

@ -28,11 +28,11 @@ $server->wsdl->addComplexType(
'all',
'',
array(
'name'=>'code' , 'type'=>'xsd:string',
'name'=>'title' , 'type'=>'xsd:string',
'name'=>'url' , 'type'=>'xsd:string',
'name'=>'code', 'type'=>'xsd:string',
'name'=>'title', 'type'=>'xsd:string',
'name'=>'url', 'type'=>'xsd:string',
'name'=>'teacher', 'type'=>'xsd:string',
'name'=>'language','type'=>'xsd:string',
'name'=>'language', 'type'=>'xsd:string',
)
);
@ -51,15 +51,15 @@ $server->wsdl->addComplexType(
);
// Register the method to expose
$server->register('WSCourseList', // method name
$server->register('WSCourseList', // method name
array('username' => 'xsd:string',
'signature' => 'xsd:string',
'visibilities' => 'xsd:string'), // input parameters
array('return' => 'xsd:Array'), // output parameters
'urn:WSCourseList', // namespace
'urn:WSCourseList#WSCourseList', // soapaction
'rpc', // style
'encoded', // use
'visibilities' => 'xsd:string'), // input parameters
array('return' => 'xsd:Array'), // output parameters
'urn:WSCourseList', // namespace
'urn:WSCourseList#WSCourseList', // soapaction
'rpc', // style
'encoded', // use
'This service returns a list of courses' // documentation
);

16
main/wiki/diff.inc.php
Unescape View File

@ -137,19 +137,19 @@ function format_line($line, $type, $value, $skip_empty = false)
switch ($type) {
case DIFF_EQUAL:
// return $line. ' : ' . ' = <span class="diffEqual" >' . $value . '</span><br />' . "\n" ;
return '<span class="diffEqual" >' . $value . '</span><br />' . "\n"; //juan carlos muestra solo color
return '<span class="diffEqual" >'.$value.'</span><br />'."\n"; //juan carlos muestra solo color
break;
case DIFF_MOVED:
//return $line. ' : ' . ' M <span class="diffMoved" >' . $value . '</span><br />' . "\n" ; //juan carlos ra<EFBFBD>a la sustitye la inverior
return '<span class="diffMoved" >' . $value . '</span><br />' . "\n"; //juan carlos muestra solo color
return '<span class="diffMoved" >'.$value.'</span><br />'."\n"; //juan carlos muestra solo color
break;
case DIFF_ADDED:
//return $line . ' : ' . ' + <span class="diffAdded" >' . $value . '</span><br />' . "\n" ;
return '<span class="diffAdded" >' . $value . '</span><br />' . "\n"; //juan carlos muestra solo color
return '<span class="diffAdded" >'.$value.'</span><br />'."\n"; //juan carlos muestra solo color
break;
case DIFF_DELETED:
//return $line . ' : ' . ' - <span class="diffDeleted" >' . $value . '</span><br />' . "\n" ; //juan carlos ra<EFBFBD>a la sustitye la inverior
return '<span class="diffDeleted" >' . $value . '</span><br />' . "\n"; //juan carlos muestra solo color
return '<span class="diffDeleted" >'.$value.'</span><br />'."\n"; //juan carlos muestra solo color
break;
}
}
@ -169,19 +169,19 @@ function format_table_line($line, $type, $value, $skip_empty = false)
switch ($type) {
case DIFF_EQUAL:
//return '<tr><td>' . $line. '&nbsp;:&nbsp;' . '&nbsp;=</td><td><span class="diffEqual" >' . $value . '</span></td></tr>' . "\n"; //juan carlos comentado
return '<tr><td></td><td bgcolor="#FFFFFF">' . $value . '</td></tr>' . "\n"; //juan carlos muestra solo color (no tambi<EFBFBD>n la l<EFBFBD>nea). Adem<EFBFBD>s EN IEXPLORER VA BIEN PERO EN FIREFOX 3 la etiqueta span no muestra el color de fondo que est<EFBFBD> definido en la hoja de estilos como background-color, aceptando s<EFBFBD>lo la propiedad color pero esta solo da color al texto con lo cual los cambios quedan poco resaltados, adem<EFBFBD>s los cambios de otros objetos que no sean texto no se indican por ej. a<EFBFBD>adir una imagen, por esta raz<EFBFBD>n doy el color de fondo al td directamente.
return '<tr><td></td><td bgcolor="#FFFFFF">'.$value.'</td></tr>'."\n"; //juan carlos muestra solo color (no tambi<EFBFBD>n la l<EFBFBD>nea). Adem<EFBFBD>s EN IEXPLORER VA BIEN PERO EN FIREFOX 3 la etiqueta span no muestra el color de fondo que est<EFBFBD> definido en la hoja de estilos como background-color, aceptando s<EFBFBD>lo la propiedad color pero esta solo da color al texto con lo cual los cambios quedan poco resaltados, adem<EFBFBD>s los cambios de otros objetos que no sean texto no se indican por ej. a<EFBFBD>adir una imagen, por esta raz<EFBFBD>n doy el color de fondo al td directamente.
break;
case DIFF_MOVED:
// return '<tr><td>' . $line. '&nbsp;:&nbsp;' . '&nbsp;M</td><td><span class="diffMoved" >' . $value . '</span></td></tr>' . "\n" //juan carlos comenta
return '<tr><td></td><td bgcolor="#FFFFAA">' . $value . '</td></tr>' . "\n"; //juan carlos muestra solo color (no tambi<EFBFBD>n la l<EFBFBD>nea). Adem<EFBFBD>s EN IEXPLORER VA BIEN PERO EN FIREFOX 3 la etiqueta span no muestra el color de fondo que est<EFBFBD> definido en la hoja de estilos como background-color, aceptando s<EFBFBD>lo la propiedad color pero esta solo da color al texto con lo cual los cambios quedan poco resaltados, adem<EFBFBD>s los cambios de otros objetos que no sean texto no se indican por ej. a<EFBFBD>adir una imagen, por esta raz<EFBFBD>n doy el color de fondo al td directamente.
return '<tr><td></td><td bgcolor="#FFFFAA">'.$value.'</td></tr>'."\n"; //juan carlos muestra solo color (no tambi<EFBFBD>n la l<EFBFBD>nea). Adem<EFBFBD>s EN IEXPLORER VA BIEN PERO EN FIREFOX 3 la etiqueta span no muestra el color de fondo que est<EFBFBD> definido en la hoja de estilos como background-color, aceptando s<EFBFBD>lo la propiedad color pero esta solo da color al texto con lo cual los cambios quedan poco resaltados, adem<EFBFBD>s los cambios de otros objetos que no sean texto no se indican por ej. a<EFBFBD>adir una imagen, por esta raz<EFBFBD>n doy el color de fondo al td directamente.
break;
case DIFF_ADDED:
// return '<tr><td>' . $line. '&nbsp;:&nbsp;' . '&nbsp;+</td><td><span class="diffAdded" >' . $value . '</span></td></tr>' . "\n" ; //juan carlos comentado
return '<tr><td></td><td bgcolor="#CCFFCC">' . $value . '</td></tr>' . "\n"; //juan carlos muestra solo color (no tambi<EFBFBD>n la l<EFBFBD>nea). Adem<EFBFBD>s EN IEXPLORER VA BIEN PERO EN FIREFOX 3 la etiqueta span no muestra el color de fondo que est<EFBFBD> definido en la hoja de estilos como background-color, aceptando s<EFBFBD>lo la propiedad color pero esta solo da color al texto con lo cual los cambios quedan poco resaltados, adem<EFBFBD>s los cambios de otros objetos que no sean texto no se indican por ej. a<EFBFBD>adir una imagen, por esta raz<EFBFBD>n doy el color de fondo al td directamente.
return '<tr><td></td><td bgcolor="#CCFFCC">'.$value.'</td></tr>'."\n"; //juan carlos muestra solo color (no tambi<EFBFBD>n la l<EFBFBD>nea). Adem<EFBFBD>s EN IEXPLORER VA BIEN PERO EN FIREFOX 3 la etiqueta span no muestra el color de fondo que est<EFBFBD> definido en la hoja de estilos como background-color, aceptando s<EFBFBD>lo la propiedad color pero esta solo da color al texto con lo cual los cambios quedan poco resaltados, adem<EFBFBD>s los cambios de otros objetos que no sean texto no se indican por ej. a<EFBFBD>adir una imagen, por esta raz<EFBFBD>n doy el color de fondo al td directamente.
break;
case DIFF_DELETED:
// return '<tr><td>' . $line. '&nbsp;:&nbsp;' . '&nbsp;-</td><td><span class="diffDeleted" >' . $value . '</span></td></tr>' . "\n" ; //juan carlos comentado
return '<tr><td></td><td bgcolor="#FFAAAA">' . $value . '</td></tr>' . "\n"; //juan carlos muestra solo color (no tambi<EFBFBD>n la l<EFBFBD>nea). Adem<EFBFBD>s EN IEXPLORER VA BIEN PERO EN FIREFOX 3 la etiqueta span no muestra el color de fondo que est<EFBFBD> definido en la hoja de estilos como background-color, aceptando s<EFBFBD>lo la propiedad color pero esta solo da color al texto con lo cual los cambios quedan poco resaltados, adem<EFBFBD>s los cambios de otros objetos que no sean texto no se indican por ej. a<EFBFBD>adir una imagen, por esta raz<EFBFBD>n doy el color de fondo al td directamente.
return '<tr><td></td><td bgcolor="#FFAAAA">'.$value.'</td></tr>'."\n"; //juan carlos muestra solo color (no tambi<EFBFBD>n la l<EFBFBD>nea). Adem<EFBFBD>s EN IEXPLORER VA BIEN PERO EN FIREFOX 3 la etiqueta span no muestra el color de fondo que est<EFBFBD> definido en la hoja de estilos como background-color, aceptando s<EFBFBD>lo la propiedad color pero esta solo da color al texto con lo cual los cambios quedan poco resaltados, adem<EFBFBD>s los cambios de otros objetos que no sean texto no se indican por ej. a<EFBFBD>adir una imagen, por esta raz<EFBFBD>n doy el color de fondo al td directamente.
}
}

2
news_list.php
Unescape View File

@ -12,7 +12,7 @@ if (api_is_anonymous()) {
}
if (!isset($_GET['id']) || empty($_GET['id'])) {
$content = SystemAnnouncementManager::display_announcements_slider($visibility, $_GET['id']);
$content = SystemAnnouncementManager::display_announcements_slider($visibility, $_GET['id']);
} else {
$content = SystemAnnouncementManager::displayAnnouncement($_GET['id'], $visibility);
}

4
plugin/add_facebook_login_button/index.php
Unescape View File

@ -1,11 +1,11 @@
<?php
// Show the FACEBOOK login button
$_template['show_message'] = false;
$_template['show_message'] = false;
//if (api_is_anonymous() && api_get_setting('facebook_login_activate') == 'true') {
if (api_is_anonymous()) {
require_once api_get_path(SYS_CODE_PATH)."auth/external_login/facebook.inc.php";
$_template['show_message'] = true;
$_template['show_message'] = true;
// the default title
$button_url = api_get_path(WEB_PLUGIN_PATH)."add_facebook_login_button/img/cnx_fb.png";
$href_link = facebookGetLoginUrl();

2
plugin/advanced_subscription/config.php
Unescape View File

@ -33,4 +33,4 @@ define('ADVANCED_SUBSCRIPTION_TERMS_MODE_FINAL', 2);
require_once __DIR__ . '/../../main/inc/global.inc.php';
require_once __DIR__.'/../../main/inc/global.inc.php';

17
plugin/advanced_subscription/cron/notify_by_mail.php
Unescape View File

@ -9,7 +9,7 @@
* Init
*/
require_once __DIR__ . '/../config.php';
require_once __DIR__.'/../config.php';
$plugin = AdvancedSubscriptionPlugin::create();
$now = api_get_utc_datetime();
$weekAgo = api_get_utc_datetime('-1 week');
@ -18,10 +18,10 @@ $sessionExtraFieldValue = new ExtraFieldValue('session');
/**
* Get session list
*/
$joinTables = Database::get_main_table(TABLE_MAIN_SESSION) . ' s INNER JOIN ' .
Database::get_main_table(TABLE_MAIN_SESSION_USER) . ' su ON s.id = su.session_id INNER JOIN ' .
Database::get_main_table(TABLE_MAIN_USER_REL_USER) . ' uu ON su.user_id = uu.user_id INNER JOIN ' .
Database::get_main_table(TABLE_ADVANCED_SUBSCRIPTION_QUEUE) . ' asq ON su.session_id = asq.session_id AND su.user_id = asq.user_id';
$joinTables = Database::get_main_table(TABLE_MAIN_SESSION).' s INNER JOIN '.
Database::get_main_table(TABLE_MAIN_SESSION_USER).' su ON s.id = su.session_id INNER JOIN '.
Database::get_main_table(TABLE_MAIN_USER_REL_USER).' uu ON su.user_id = uu.user_id INNER JOIN '.
Database::get_main_table(TABLE_ADVANCED_SUBSCRIPTION_QUEUE).' asq ON su.session_id = asq.session_id AND su.user_id = asq.user_id';
$columns = 's.id AS session_id, uu.friend_user_id AS superior_id, uu.user_id AS student_id, asq.id AS queue_id, asq.status AS status';
$conditions = array(
'where' => array(
@ -133,8 +133,7 @@ $admins = UserManager::get_all_administrators();
$isWesternNameOrder = api_is_western_name_order();
foreach ($admins as &$admin) {
$admin['complete_name'] = $isWesternNameOrder ?
$admin['firstname'] . ', ' . $admin['lastname'] :
$admin['lastname'] . ', ' . $admin['firstname']
$admin['firstname'].', '.$admin['lastname'] : $admin['lastname'].', '.$admin['firstname']
;
}
unset($admin);
@ -149,8 +148,8 @@ $data = array(
);
foreach ($queueByAdmin as $sessionId => $studentInfo) {
$data['sessionId'] = $sessionId;
$data['admin_view_url'] = api_get_path(WEB_PLUGIN_PATH) .
'advanced_subscription/src/admin_view.php?s=' . $data['sessionId'];
$data['admin_view_url'] = api_get_path(WEB_PLUGIN_PATH).
'advanced_subscription/src/admin_view.php?s='.$data['sessionId'];
$data['session'] = $sessionInfoList[$sessionId];
$data['students'] = $studentInfo['students'];
$plugin->sendMail($data, ADVANCED_SUBSCRIPTION_ACTION_REMINDER_ADMIN);

2
plugin/advanced_subscription/plugin.php
Unescape View File

@ -8,5 +8,5 @@
/**
* Plugin details (must be present)
*/
require_once __DIR__ . '/config.php';
require_once __DIR__.'/config.php';
$plugin_info = AdvancedSubscriptionPlugin::create()->get_info();

83
plugin/advanced_subscription/src/AdvancedSubscriptionPlugin.php
Unescape View File

@ -106,15 +106,15 @@ class AdvancedSubscriptionPlugin extends Plugin implements HookPluginInterface
{
$advancedSubscriptionQueueTable = Database::get_main_table(TABLE_ADVANCED_SUBSCRIPTION_QUEUE);
$sql = "CREATE TABLE IF NOT EXISTS $advancedSubscriptionQueueTable (" .
"id int UNSIGNED NOT NULL AUTO_INCREMENT, " .
"session_id int UNSIGNED NOT NULL, " .
"user_id int UNSIGNED NOT NULL, " .
"status int UNSIGNED NOT NULL, " .
"last_message_id int UNSIGNED NOT NULL, " .
"created_at datetime NOT NULL, " .
"updated_at datetime NULL, " .
"PRIMARY KEY PK_advanced_subscription_queue (id), " .
$sql = "CREATE TABLE IF NOT EXISTS $advancedSubscriptionQueueTable (".
"id int UNSIGNED NOT NULL AUTO_INCREMENT, ".
"session_id int UNSIGNED NOT NULL, ".
"user_id int UNSIGNED NOT NULL, ".
"status int UNSIGNED NOT NULL, ".
"last_message_id int UNSIGNED NOT NULL, ".
"created_at datetime NOT NULL, ".
"updated_at datetime NULL, ".
"PRIMARY KEY PK_advanced_subscription_queue (id), ".
"UNIQUE KEY UK_advanced_subscription_queue (user_id, session_id)); ";
Database::query($sql);
}
@ -265,11 +265,10 @@ class AdvancedSubscriptionPlugin extends Plugin implements HookPluginInterface
$now = new DateTime(api_get_utc_datetime());
$newYearDate = $plugin->get('course_session_credit_year_start_date');
$newYearDate = !empty($newYearDate) ?
new \DateTime($newYearDate . $now->format('/Y')) :
$now;
new \DateTime($newYearDate.$now->format('/Y')) : $now;
$extra = new ExtraFieldValue('session');
$joinSessionTable = Database::get_main_table(TABLE_MAIN_SESSION_USER) . ' su INNER JOIN ' .
Database::get_main_table(TABLE_MAIN_SESSION) . ' s ON s.id = su.session_id';
$joinSessionTable = Database::get_main_table(TABLE_MAIN_SESSION_USER).' su INNER JOIN '.
Database::get_main_table(TABLE_MAIN_SESSION).' s ON s.id = su.session_id';
$whereSessionParams = 'su.relation_type = ? AND s.access_start_date >= ? AND su.user_id = ?';
$whereSessionParamsValues = array(
0,
@ -734,14 +733,14 @@ class AdvancedSubscriptionPlugin extends Plugin implements HookPluginInterface
$tpl->assign('termsContent', $termsAndConditions);
$termsAndConditions = $tpl->fetch('/advanced_subscription/views/terms_and_conditions_to_pdf.tpl');
$pdf = new PDF();
$filename = 'terms' . sha1(rand(0,99999));
$filename = 'terms'.sha1(rand(0, 99999));
$pdf->content_to_pdf($termsAndConditions, null, $filename, null, 'F');
$fileAttachments['file'][] = array(
'name' => $filename . '.pdf',
'application/pdf' => $filename . '.pdf',
'tmp_name' => api_get_path(SYS_ARCHIVE_PATH) . $filename . '.pdf',
'name' => $filename.'.pdf',
'application/pdf' => $filename.'.pdf',
'tmp_name' => api_get_path(SYS_ARCHIVE_PATH).$filename.'.pdf',
'error' => UPLOAD_ERR_OK,
'size' => filesize(api_get_path(SYS_ARCHIVE_PATH) . $filename . '.pdf'),
'size' => filesize(api_get_path(SYS_ARCHIVE_PATH).$filename.'.pdf'),
);
$fileAttachments['comments'][] = get_lang('TermsAndConditions');
}
@ -1032,7 +1031,7 @@ class AdvancedSubscriptionPlugin extends Plugin implements HookPluginInterface
$mergedArray = array_merge(array($sessionId), array_keys($fields));
$sql = "SELECT * FROM " . Database::get_main_table(TABLE_EXTRA_FIELD_VALUES) ."
$sql = "SELECT * FROM ".Database::get_main_table(TABLE_EXTRA_FIELD_VALUES)."
WHERE item_id = %d AND field_id IN (%d, %d, %d, %d, %d, %d, %d)";
$sql = vsprintf($sql, $mergedArray);
$sessionFieldValueList = Database::query($sql);
@ -1048,10 +1047,10 @@ class AdvancedSubscriptionPlugin extends Plugin implements HookPluginInterface
$sessionArray['description'] = SessionManager::getDescriptionFromSessionId($sessionId);
if (isset($sessionArray['brochure'])) {
$sessionArray['brochure'] = api_get_path(WEB_UPLOAD_PATH) . $sessionArray['brochure'];
$sessionArray['brochure'] = api_get_path(WEB_UPLOAD_PATH).$sessionArray['brochure'];
}
if (isset($sessionArray['banner'])) {
$sessionArray['banner'] = api_get_path(WEB_UPLOAD_PATH) . $sessionArray['banner'];
$sessionArray['banner'] = api_get_path(WEB_UPLOAD_PATH).$sessionArray['banner'];
}
return $sessionArray;
@ -1108,7 +1107,7 @@ class AdvancedSubscriptionPlugin extends Plugin implements HookPluginInterface
*/
public function getSessionUrl($sessionId)
{
$url = api_get_path(WEB_CODE_PATH) . 'session/?session_id=' . intval($sessionId);
$url = api_get_path(WEB_CODE_PATH).'session/?session_id='.intval($sessionId);
return $url;
}
@ -1157,16 +1156,16 @@ class AdvancedSubscriptionPlugin extends Plugin implements HookPluginInterface
*/
public function getQueueUrl($params)
{
$url = api_get_path(WEB_PLUGIN_PATH) . 'advanced_subscription/ajax/advanced_subscription.ajax.php?' .
'a=' . Security::remove_XSS($params['action']) . '&' .
's=' . intval($params['sessionId']) . '&' .
'current_user_id=' . intval($params['currentUserId']) . '&' .
'e=' . intval($params['newStatus']) . '&' .
'u=' . intval($params['studentUserId']) . '&' .
'q=' . intval($params['queueId']) . '&' .
'is_connected=' . 1 . '&' .
'profile_completed=' . intval($params['profile_completed']) . '&' .
'v=' . $this->generateHash($params);
$url = api_get_path(WEB_PLUGIN_PATH).'advanced_subscription/ajax/advanced_subscription.ajax.php?'.
'a='.Security::remove_XSS($params['action']).'&'.
's='.intval($params['sessionId']).'&'.
'current_user_id='.intval($params['currentUserId']).'&'.
'e='.intval($params['newStatus']).'&'.
'u='.intval($params['studentUserId']).'&'.
'q='.intval($params['queueId']).'&'.
'is_connected='.1.'&'.
'profile_completed='.intval($params['profile_completed']).'&'.
'v='.$this->generateHash($params);
return $url;
}
@ -1219,7 +1218,7 @@ class AdvancedSubscriptionPlugin extends Plugin implements HookPluginInterface
}
$queueTable = Database::get_main_table(TABLE_ADVANCED_SUBSCRIPTION_QUEUE);
$userTable = Database::get_main_table(TABLE_MAIN_USER);
$userJoinTable = $queueTable . ' q INNER JOIN ' . $userTable . ' u ON q.user_id = u.user_id';
$userJoinTable = $queueTable.' q INNER JOIN '.$userTable.' u ON q.user_id = u.user_id';
$where = array(
'where' => array(
'q.session_id = ?' => array(
@ -1232,7 +1231,7 @@ class AdvancedSubscriptionPlugin extends Plugin implements HookPluginInterface
$students = Database::select($select, $userJoinTable, $where);
foreach ($students as &$student) {
$status = intval($student['status']);
switch($status) {
switch ($status) {
case ADVANCED_SUBSCRIPTION_QUEUE_STATUS_NO_QUEUE:
case ADVANCED_SUBSCRIPTION_QUEUE_STATUS_START:
$student['validation'] = '';
@ -1246,7 +1245,7 @@ class AdvancedSubscriptionPlugin extends Plugin implements HookPluginInterface
$student['validation'] = 'Yes';
break;
default:
error_log(__FILE__ . ' ' . __FUNCTION__ . ' Student status no detected');
error_log(__FILE__.' '.__FUNCTION__.' Student status no detected');
}
}
$return = array(
@ -1295,7 +1294,7 @@ class AdvancedSubscriptionPlugin extends Plugin implements HookPluginInterface
$dataPrepared['queueId'] = intval($data['queueId']);
$dataPrepared['newStatus'] = intval($data['newStatus']);
$dataPrepared = serialize($dataPrepared);
return sha1($dataPrepared . $key);
return sha1($dataPrepared.$key);
}
/**
@ -1350,12 +1349,12 @@ class AdvancedSubscriptionPlugin extends Plugin implements HookPluginInterface
break;
}
$url = api_get_path(WEB_PLUGIN_PATH) . "advanced_subscription/src/terms_and_conditions.php?";
$url = api_get_path(WEB_PLUGIN_PATH)."advanced_subscription/src/terms_and_conditions.php?";
$url .= http_build_query($urlParams);
// Launch popup
if ($mode == ADVANCED_SUBSCRIPTION_TERMS_MODE_POPUP) {
$url = 'javascript:void(window.open(\'' . $url .'\',\'AdvancedSubscriptionTerms\', \'toolbar=no,location=no,status=no,menubar=no,scrollbars=yes,resizable=yes,width=700px,height=600px\', \'100\' ))';
$url = 'javascript:void(window.open(\''.$url.'\',\'AdvancedSubscriptionTerms\', \'toolbar=no,location=no,status=no,menubar=no,scrollbars=yes,resizable=yes,width=700px,height=600px\', \'100\' ))';
}
return $url;
}
@ -1367,9 +1366,9 @@ class AdvancedSubscriptionPlugin extends Plugin implements HookPluginInterface
*/
public function getRenderMailUrl($params)
{
$url = api_get_path(WEB_PLUGIN_PATH) . 'advanced_subscription/src/render_mail.php?' .
'q=' . $params['queueId'] . '&' .
'v=' . $this->generateHash($params);
$url = api_get_path(WEB_PLUGIN_PATH).'advanced_subscription/src/render_mail.php?'.
'q='.$params['queueId'].'&'.
'v='.$this->generateHash($params);
return $url;
}
@ -1440,7 +1439,7 @@ class AdvancedSubscriptionPlugin extends Plugin implements HookPluginInterface
sf.extra_field_type = $extraFieldType AND
sf.variable = 'is_induction_session' AND
su.relation_type = 0 AND
su.user_id = " . intval($userId);
su.user_id = ".intval($userId);
$result = Database::query($sql);

19
plugin/advanced_subscription/test/mails.php
Unescape View File

@ -5,7 +5,7 @@
* @package chamilo.plugin.advanced_subscription
*/
require_once __DIR__ . '/../config.php';
require_once __DIR__.'/../config.php';
// Protect test
api_protect_admin_script();
@ -78,8 +78,7 @@ $adminsArray = UserManager::get_all_administrators();
$isWesternNameOrder = api_is_western_name_order();
foreach ($adminsArray as &$admin) {
$admin['complete_name'] = $isWesternNameOrder ?
$admin['firstname'] . ', ' . $admin['lastname'] :
$admin['lastname'] . ', ' . $admin['firstname']
$admin['firstname'].', '.$admin['lastname'] : $admin['lastname'].', '.$admin['firstname']
;
}
unset($admin);
@ -91,8 +90,8 @@ $data['admins'] = $adminsArray;
$data['admin'] = current($adminsArray);
$data['session'] = $sessionArray;
$data['signature'] = api_get_setting('Institution');
$data['admin_view_url'] = api_get_path(WEB_PLUGIN_PATH) .
'advanced_subscription/src/admin_view.php?s=' . $data['sessionId'];
$data['admin_view_url'] = api_get_path(WEB_PLUGIN_PATH).
'advanced_subscription/src/admin_view.php?s='.$data['sessionId'];
$data['newStatus'] = ADVANCED_SUBSCRIPTION_QUEUE_STATUS_BOSS_APPROVED;
$data['student']['acceptUrl'] = $plugin->getQueueUrl($data);
$data['newStatus'] = ADVANCED_SUBSCRIPTION_QUEUE_STATUS_BOSS_DISAPPROVED;
@ -116,21 +115,21 @@ foreach ($tplParams as $tplParam) {
$tpl->assign($tplParam, $data[$tplParam]);
}
$dir = __DIR__ . '/../views/';
$dir = __DIR__.'/../views/';
$files = scandir($dir);
echo '<br>', '<pre>' , print_r($files, 1) , '</pre>';
echo '<br>', '<pre>', print_r($files, 1), '</pre>';
foreach ($files as $k =>&$file) {
if (
is_file($dir . $file) &&
is_file($dir.$file) &&
strpos($file, '.tpl') &&
$file != 'admin_view.tpl'
) {
echo '<pre>', $file, '</pre>';
echo $tpl->fetch('/advanced_subscription/views/' . $file);
echo $tpl->fetch('/advanced_subscription/views/'.$file);
} else {
unset($files[$k]);
}
}
echo '<br>', '<pre>' , print_r($files, 1) , '</pre>';
echo '<br>', '<pre>', print_r($files, 1), '</pre>';

6
plugin/advanced_subscription/test/terms_to_pdf.php
Unescape View File

@ -5,7 +5,7 @@
* @package chamilo.plugin.advanced_subscription
*/
require_once __DIR__ . '/../config.php';
require_once __DIR__.'/../config.php';
// Protect test
api_protect_admin_script();
@ -39,9 +39,9 @@ if (!empty($data['sessionId']) && !empty($data['studentUserId'])) {
$tpl->assign('termsContent', $termsAndConditions);
$termsAndConditions = $tpl->fetch('/advanced_subscription/views/terms_and_conditions_to_pdf.tpl');
$pdf = new PDF();
$filename = 'terms' . sha1(rand(0,99999));
$filename = 'terms'.sha1(rand(0, 99999));
$pdf->content_to_pdf($termsAndConditions, null, $filename, null, 'F');
$fileDir = api_get_path(WEB_ARCHIVE_PATH) . $filename . '.pdf';
$fileDir = api_get_path(WEB_ARCHIVE_PATH).$filename.'.pdf';
echo '<pre>', print_r($fileDir, 1), '</pre>';
}
}

2
plugin/bbb/lib/VM.php
Unescape View File

@ -75,7 +75,7 @@ class VM
foreach ($vmList as $vm) {
if (isset($vm['enabled']) && $vm['enabled'] == true) {
$className = $vm['name'] . 'VM';
$className = $vm['name'].'VM';
return new $className($vm);
break;

10
plugin/bbb/lib/vm/DigitalOceanVM.php
Unescape View File

@ -100,7 +100,7 @@ class DigitalOceanVM extends AbstractVM implements VirtualMachineInterface
break;
}
} else {
throw new \Exception(" Id " . $this->vmId . " doesn't exists.");
throw new \Exception(" Id ".$this->vmId." doesn't exists.");
}
} catch (Exception $e) {
die($e->getMessage());
@ -118,22 +118,22 @@ class DigitalOceanVM extends AbstractVM implements VirtualMachineInterface
$powerOff = $droplets->powerOff($this->vmId);
$this->addMessage('Power off droplet #' . $this->vmId);
$this->addMessage('Power off droplet #'.$this->vmId);
$this->waitForEvent($powerOff->event_id);
$this->addMessage('Current status: ' . $dropletInfo->droplet->status);
$this->addMessage('Current status: '.$dropletInfo->droplet->status);
$resizeDroplet = $droplets->resize(
$this->vmId,
array('size_id' => intval($sizeId))
);
$this->addMessage('Resize droplet to size id: ' . $sizeId);
$this->addMessage('Resize droplet to size id: '.$sizeId);
$this->waitForEvent($resizeDroplet->event_id);
$powerOn = $droplets->powerOn($this->vmId);
$this->waitForEvent($powerOn->event_id);
$this->addMessage('Power on droplet #' . $this->vmId);
$this->addMessage('Power on droplet #'.$this->vmId);
}

18
plugin/bbb/start.php
Unescape View File

@ -4,7 +4,7 @@
* @package chamilo.plugin.bigbluebutton
*/
require __DIR__ . '/../../vendor/autoload.php';
require __DIR__.'/../../vendor/autoload.php';
$course_plugin = 'bbb'; //needed in order to load the plugin lang variables
require_once __DIR__.'/config.php';
@ -16,22 +16,22 @@ $vmIsEnabled = false;
$host = '';
$salt = '';
$isGlobal = isset($_GET['global']) ? true : false;
$isGlobalPerUser = isset($_GET['user_id']) ? (int) $_GET['user_id']: false;
$isGlobalPerUser = isset($_GET['user_id']) ? (int) $_GET['user_id'] : false;
$bbb = new bbb('', '', $isGlobal, $isGlobalPerUser);
if ($bbb->pluginEnabled) {
if ($bbb->isServerRunning()) {
if (isset($_GET['launch']) && $_GET['launch'] == 1) {
if (file_exists(__DIR__ . '/config.vm.php')) {
$config = require __DIR__ . '/config.vm.php';
if (file_exists(__DIR__.'/config.vm.php')) {
$config = require __DIR__.'/config.vm.php';
$vmIsEnabled = true;
$host = '';
$salt = '';
require __DIR__ . '/lib/vm/AbstractVM.php';
require __DIR__ . '/lib/vm/VMInterface.php';
require __DIR__ . '/lib/vm/DigitalOceanVM.php';
require __DIR__ . '/lib/VM.php';
require __DIR__.'/lib/vm/AbstractVM.php';
require __DIR__.'/lib/vm/VMInterface.php';
require __DIR__.'/lib/vm/DigitalOceanVM.php';
require __DIR__.'/lib/VM.php';
$vm = new VM($config);
@ -60,7 +60,7 @@ if ($bbb->pluginEnabled) {
$bbb->redirectToBBB($url);
} else {
$url = $bbb->getListingUrl();
header('Location: ' . $url);
header('Location: '.$url);
exit;
}
} else {

2
plugin/buycourses/src/configuration.php
Unescape View File

@ -26,7 +26,7 @@ $courses = $plugin->getCoursesForConfiguration();
// breadcrumbs
$interbreadcrumb[] = [
'url' => api_get_path(WEB_PLUGIN_PATH) . 'buycourses/index.php',
'url' => api_get_path(WEB_PLUGIN_PATH).'buycourses/index.php',
'name' => $plugin->get_lang('plugin_title')
];

32
plugin/buycourses/src/panel.ajax.php
Unescape View File

@ -36,20 +36,20 @@ switch ($action) {
$userInfo = api_get_user_info($sale['user_id']);
$html = '<h2>' . $sale['product_name'] .'</h2>';
$html = '<h2>'.$sale['product_name'].'</h2>';
$html .= '<div class="row">';
$html .= '<div class="col-sm-6 col-md-6">';
$html .= '<ul>';
$html .= '<li><b>'. $plugin->get_lang('OrderPrice') . ':</b> '. $sale['price'] . '</li>';
$html .= '<li><b>'. $plugin->get_lang('CurrencyType') . ':</b> '. $currency['iso_code'] . '</li>';
$html .= '<li><b>'. $plugin->get_lang('ProductType') . ':</b> '. $productType . '</li>';
$html .= '<li><b>'. $plugin->get_lang('OrderDate') . ':</b> '. api_format_date($sale['date'], DATE_TIME_FORMAT_LONG_24H) . '</li>';
$html .= '<li><b>'. $plugin->get_lang('Buyer') . ':</b> '. $userInfo['complete_name'] . '</li>';
$html .= '<li><b>'. $plugin->get_lang('PaymentMethods') . ':</b> '. $paymentType . '</li>';
$html .= '<li><b>'.$plugin->get_lang('OrderPrice').':</b> '.$sale['price'].'</li>';
$html .= '<li><b>'.$plugin->get_lang('CurrencyType').':</b> '.$currency['iso_code'].'</li>';
$html .= '<li><b>'.$plugin->get_lang('ProductType').':</b> '.$productType.'</li>';
$html .= '<li><b>'.$plugin->get_lang('OrderDate').':</b> '.api_format_date($sale['date'], DATE_TIME_FORMAT_LONG_24H).'</li>';
$html .= '<li><b>'.$plugin->get_lang('Buyer').':</b> '.$userInfo['complete_name'].'</li>';
$html .= '<li><b>'.$plugin->get_lang('PaymentMethods').':</b> '.$paymentType.'</li>';
$html .= '</ul>';
$html .= '</div>';
$html .= '<div class="col-sm-6 col-md-6">';
$html .= '<img class="thumbnail" src="'. $productImage .'" >';
$html .= '<img class="thumbnail" src="'.$productImage.'" >';
$html .= '</div>';
$html .= '</div>';
echo $html;
@ -89,9 +89,9 @@ switch ($action) {
$html = '<div class="row">'
. '<p>'
. '<ul>'
. '<li>'. get_plugin_lang("PayoutsTotalCompleted", "BuyCoursesPlugin") .' <b>'. $stats['completed_count'] .'</b> - '. get_plugin_lang("TotalAmount", "BuyCoursesPlugin") .' <b>'. $stats['completed_total_amount'] .' '. $currency['iso_code'] . '</b></li>'
. '<li>'. get_plugin_lang("PayoutsTotalPending", "BuyCoursesPlugin") .' <b>'. $stats['pending_count'] .'</b> - '. get_plugin_lang("TotalAmount", "BuyCoursesPlugin") .' <b>'. $stats['pending_total_amount'] .' '. $currency['iso_code'] . '</b></li>'
. '<li>'. get_plugin_lang("PayoutsTotalCanceled", "BuyCoursesPlugin") .' <b>'. $stats['canceled_count'] .'</b> - '. get_plugin_lang("TotalAmount", "BuyCoursesPlugin") .' <b>'. $stats['canceled_total_amount'] .' '. $currency['iso_code'] . '</b></li>'
. '<li>'.get_plugin_lang("PayoutsTotalCompleted", "BuyCoursesPlugin").' <b>'.$stats['completed_count'].'</b> - '.get_plugin_lang("TotalAmount", "BuyCoursesPlugin").' <b>'.$stats['completed_total_amount'].' '.$currency['iso_code'].'</b></li>'
. '<li>'.get_plugin_lang("PayoutsTotalPending", "BuyCoursesPlugin").' <b>'.$stats['pending_count'].'</b> - '.get_plugin_lang("TotalAmount", "BuyCoursesPlugin").' <b>'.$stats['pending_total_amount'].' '.$currency['iso_code'].'</b></li>'
. '<li>'.get_plugin_lang("PayoutsTotalCanceled", "BuyCoursesPlugin").' <b>'.$stats['canceled_count'].'</b> - '.get_plugin_lang("TotalAmount", "BuyCoursesPlugin").' <b>'.$stats['canceled_total_amount'].' '.$currency['iso_code'].'</b></li>'
. '</ul>'
. '</p>';
$html .= '</div>';
@ -127,15 +127,15 @@ switch ($action) {
$isoCode = $currentCurrency['iso_code'];
$html .= '<p>'. get_plugin_lang("VerifyTotalAmountToProceedPayout", "BuyCoursesPlugin") .'</p>';
$html .= '<p>'.get_plugin_lang("VerifyTotalAmountToProceedPayout", "BuyCoursesPlugin").'</p>';
$html .= ''
. '<p>'
. '<ul>'
. '<li>'. get_plugin_lang("TotalAcounts", "BuyCoursesPlugin") .' <b>'. $totalAccounts .'</b></li>'
. '<li>'. get_plugin_lang("TotalPayout", "BuyCoursesPlugin") .' <b>'. $isoCode .' '. $totalPayout .'</b></li>'
. '<li>'.get_plugin_lang("TotalAcounts", "BuyCoursesPlugin").' <b>'.$totalAccounts.'</b></li>'
. '<li>'.get_plugin_lang("TotalPayout", "BuyCoursesPlugin").' <b>'.$isoCode.' '.$totalPayout.'</b></li>'
. '</ul>'
. '</p>';
$html .= '<p>'. get_plugin_lang("CautionThisProcessCantBeCanceled", "BuyCoursesPlugin") .'</p>';
$html .= '<p>'.get_plugin_lang("CautionThisProcessCantBeCanceled", "BuyCoursesPlugin").'</p>';
$html .= '<br /><br />';
$html .= '<div id="spinner" class="text-center"></div>';
@ -182,7 +182,7 @@ switch ($action) {
}
echo Display::return_message(get_plugin_lang("PayoutSuccess", "BuyCoursesPlugin"), 'success', false);
} else {
echo Display::return_message('<b>'.$result['L_SEVERITYCODE0'].' '.$result['L_ERRORCODE0'].'</b> - '.$result['L_SHORTMESSAGE0'].'<br /><ul><li>'. $result['L_LONGMESSAGE0'].'</li></ul>', 'error', false);
echo Display::return_message('<b>'.$result['L_SEVERITYCODE0'].' '.$result['L_ERRORCODE0'].'</b> - '.$result['L_SHORTMESSAGE0'].'<br /><ul><li>'.$result['L_LONGMESSAGE0'].'</li></ul>', 'error', false);
}
break;

2
plugin/clockworksms/config.php
Unescape View File

@ -7,7 +7,7 @@
* @package chamilo.plugin.clockworksms
* @author Imanol Losada <imanol.losada@beeznest.com>
*/
require_once __DIR__ . '/../../main/inc/global.inc.php';
require_once __DIR__.'/../../main/inc/global.inc.php';
require_once 'lib/clockworksms.lib.php';
require_once 'vendor/clockworksms_api.php';

2
plugin/courseblock/plugin.php
Unescape View File

@ -1,4 +1,4 @@
<?php
require_once __DIR__ . '/config.php';
require_once __DIR__.'/config.php';
$plugin_info = CourseBlockPlugin::create()->get_info();

2
plugin/courselegal/config.php
Unescape View File

@ -1,5 +1,5 @@
<?php
/* For licensing terms, see /license.txt */
require_once __DIR__ . '/../../main/inc/global.inc.php';
require_once __DIR__.'/../../main/inc/global.inc.php';
require_once __DIR__.'/CourseLegalPlugin.php';

2
plugin/courselegal/plugin.php
Unescape View File

@ -1,4 +1,4 @@
<?php
require_once __DIR__ . '/config.php';
require_once __DIR__.'/config.php';
$plugin_info = CourseLegalPlugin::create()->get_info();

8
plugin/dashboard/block_session/block_session.class.php
Unescape View File

@ -22,9 +22,9 @@ class BlockSession extends Block
/**
* Constructor
*/
public function __construct ($user_id)
public function __construct($user_id)
{
$this->user_id = $user_id;
$this->user_id = $user_id;
$this->path = 'block_session';
if ($this->is_block_visible_for_user($user_id)) {
$this->sessions = SessionManager::get_sessions_followed_by_drh($user_id);
@ -66,7 +66,7 @@ class BlockSession extends Block
<div class="panel panel-default" id="intro">
<div class="panel-heading">
'.get_lang('SessionsInformation').'
<div class="pull-right"><a class="btn btn-danger btn-xs" onclick="javascript:if(!confirm(\''.addslashes(api_htmlentities(get_lang('ConfirmYourChoice'),ENT_QUOTES,$charset)).'\')) return false;" href="index.php?action=disable_block&path='.$this->path.'">
<div class="pull-right"><a class="btn btn-danger btn-xs" onclick="javascript:if(!confirm(\''.addslashes(api_htmlentities(get_lang('ConfirmYourChoice'), ENT_QUOTES, $charset)).'\')) return false;" href="index.php?action=disable_block&path='.$this->path.'">
<em class="fa fa-times"></em>
</a></div>
</div>
@ -127,7 +127,7 @@ class BlockSession extends Block
$count_courses_in_session = count(Tracking::get_courses_list_from_session($session_id));
if ($i%2 == 0) $class_tr = 'row_odd';
if ($i % 2 == 0) $class_tr = 'row_odd';
else $class_tr = 'row_even';
$sessions_table .= '<tr class="'.$class_tr.'">

24
plugin/dashboard/block_student_graph/block_student_graph.class.php
Unescape View File

@ -29,15 +29,15 @@ class BlockStudentGraph extends Block
/**
* Constructor
*/
public function __construct ($user_id)
public function __construct($user_id)
{
$this->user_id = $user_id;
$this->path = 'block_student_graph';
$this->user_id = $user_id;
$this->path = 'block_student_graph';
if ($this->is_block_visible_for_user($user_id)) {
/*if (api_is_platform_admin()) {
$this->students = UserManager::get_user_list(array('status' => STUDENT));
} else if (api_is_drh()) {*/
$this->students = UserManager::get_users_followed_by_drh($user_id, STUDENT);
$this->students = UserManager::get_users_followed_by_drh($user_id, STUDENT);
//}
}
}
@ -75,7 +75,7 @@ class BlockStudentGraph extends Block
$html = '<div class="panel panel-default" id="intro">
<div class="panel-heading">
'.get_lang('StudentsInformationsGraph').'
<div class="pull-right"><a class="btn btn-danger btn-xs" onclick="javascript:if(!confirm(\''.addslashes(api_htmlentities(get_lang('ConfirmYourChoice'),ENT_QUOTES,$charset)).'\')) return false;" href="index.php?action=disable_block&path='.$this->path.'">
<div class="pull-right"><a class="btn btn-danger btn-xs" onclick="javascript:if(!confirm(\''.addslashes(api_htmlentities(get_lang('ConfirmYourChoice'), ENT_QUOTES, $charset)).'\')) return false;" href="index.php?action=disable_block&path='.$this->path.'">
<em class="fa fa-times"></em>
</a></div>
</div>
@ -155,9 +155,9 @@ class BlockStudentGraph extends Block
$myCache = new pCache(array('CacheFolder' => substr($cachePath, 0, strlen($cachePath) - 1)));
$chartHash = $myCache->getHash($dataSet);
if ($myCache->isInCache($chartHash)) {
$imgPath = api_get_path(SYS_ARCHIVE_PATH) . $chartHash;
$imgPath = api_get_path(SYS_ARCHIVE_PATH).$chartHash;
$myCache->saveFromCache($chartHash, $imgPath);
$imgPath = api_get_path(WEB_ARCHIVE_PATH) . $chartHash;
$imgPath = api_get_path(WEB_ARCHIVE_PATH).$chartHash;
} else {
$maxCounts = max(count($usernames), count($faults));
@ -182,7 +182,7 @@ class BlockStudentGraph extends Block
/* Set the default font */
$myPicture->setFontProperties(
array(
'FontName' => api_get_path(SYS_FONTS_PATH) . 'opensans/OpenSans-Regular.ttf',
'FontName' => api_get_path(SYS_FONTS_PATH).'opensans/OpenSans-Regular.ttf',
'FontSize' => 10
)
);
@ -228,13 +228,13 @@ class BlockStudentGraph extends Block
/* Write and save into cache */
$myCache->writeToCache($chartHash, $myPicture);
$imgPath = api_get_path(SYS_ARCHIVE_PATH) . $chartHash;
$imgPath = api_get_path(SYS_ARCHIVE_PATH).$chartHash;
$myCache->saveFromCache($chartHash, $imgPath);
$imgPath = api_get_path(WEB_ARCHIVE_PATH) . $chartHash;
$imgPath = api_get_path(WEB_ARCHIVE_PATH).$chartHash;
}
$graph = '<img src="' . $imgPath . '" >';
$graph = '<img src="'.$imgPath.'" >';
} else {
$graph = '<p>'.api_convert_encoding(get_lang('GraphicNotAvailable'),'UTF-8').'</p>';
$graph = '<p>'.api_convert_encoding(get_lang('GraphicNotAvailable'), 'UTF-8').'</p>';
}
return $graph;

4
plugin/date/index.act.php
Unescape View File

@ -14,8 +14,8 @@ $convert_lang_to_code = array(
"japanese" => "ja_JP",
"danish" => "da_DK",
);
if(!empty($_SESSION['user_language_choice']) && !empty($convert_lang_to_code[$_SESSION['user_language_choice']])){
if (!empty($_SESSION['user_language_choice']) && !empty($convert_lang_to_code[$_SESSION['user_language_choice']])) {
$code = $convert_lang_to_code[$_SESSION['user_language_choice']];
$locale = setlocale(LC_TIME,$code);
$locale = setlocale(LC_TIME, $code);
}
$date = strftime('%c');

10
plugin/jcapture/action.php
Unescape View File

@ -6,15 +6,15 @@
*/
if (!defined('DOKU_INC')) die();
if (!defined('DOKU_PLUGIN')) define('DOKU_PLUGIN', DOKU_INC . 'lib/plugins/');
require_once (DOKU_PLUGIN . 'action.php');
if (!defined('DOKU_PLUGIN')) define('DOKU_PLUGIN', DOKU_INC.'lib/plugins/');
require_once (DOKU_PLUGIN.'action.php');
class action_plugin_jcapture extends DokuWiki_Action_Plugin {
/**
* return some info
*/
function getInfo(){
function getInfo() {
return array(
'author' => 'Pavel Vlasov',
'email' => 'Pavel.Vlasov@nasdanika.com',
@ -28,14 +28,14 @@ class action_plugin_jcapture extends DokuWiki_Action_Plugin {
* Register the eventhandlers
*/
function register(&$controller) {
$controller->register_hook('TOOLBAR_DEFINE', 'AFTER', $this, 'insert_button', array ());
$controller->register_hook('TOOLBAR_DEFINE', 'AFTER', $this, 'insert_button', array());
}
/**
* Inserts the toolbar button
*/
function insert_button(& $event, $param) {
$event->data[] = array (
$event->data[] = array(
'type' => 'JCapture',
'title' => 'Screen capture',
'icon' => '../../plugins/jcapture/camera.png',

4
plugin/jcapture/upload.php
Unescape View File

@ -21,9 +21,9 @@ $folderName = 'captures';
$documentId = DocumentManager::get_document_id($courseInfo, '/'.$folderName);
$path = null;
if (empty($documentId)) {
$course_dir = $courseInfo['path'] . '/document';
$course_dir = $courseInfo['path'].'/document';
$sys_course_path = api_get_path(SYS_COURSE_PATH);
$dir = $sys_course_path . $course_dir;
$dir = $sys_course_path.$course_dir;
$createdDir = create_unexisting_directory(
$courseInfo,
api_get_user_id(),

20
plugin/openmeetings/lib/openmeetings.class.php
Unescape View File

@ -49,9 +49,9 @@ class OpenMeetings
$om_user = $plugin->get('user');
$om_pass = $plugin->get('pass');
$accessUrl = api_get_access_url($_configuration['access_url']);
$this->externalType = substr($accessUrl['url'], strpos($accessUrl['url'], '://')+3, -1);
$this->externalType = substr($accessUrl['url'], strpos($accessUrl['url'], '://') + 3, -1);
if (strcmp($this->externalType, 'localhost') == 0) {
$this->externalType = substr(api_get_path(WEB_PATH), strpos(api_get_path(WEB_PATH), '://')+3, -1);
$this->externalType = substr(api_get_path(WEB_PATH), strpos(api_get_path(WEB_PATH), '://') + 3, -1);
}
$this->externalType = 'chamilolms.'.$this->externalType;
$this->table = \Database::get_main_table('plugin_openmeetings');
@ -161,7 +161,7 @@ class OpenMeetings
// This fills the following attributes: status, name, comment, chamiloCourseId, chamiloSessionId
$room = new Room();
$room->loadRoomId($meetingData['room_id']);
$roomArray = (array)$room;
$roomArray = (array) $room;
$roomArray['SID'] = $this->sessionId;
$roomId = $this->gateway->updateRoomWithModeration($room);
if ($roomId != $meetingData['room_id']) {
@ -176,7 +176,7 @@ class OpenMeetings
$room->SID = $this->sessionId;
$room->name = $this->roomName;
//$room->roomtypes_id = $room->roomtypes_id;
$room->comment = urlencode(get_lang('Course').': ' . $params['meeting_name'] . ' - '.$_configuration['software_name']);
$room->comment = urlencode(get_lang('Course').': '.$params['meeting_name'].' - '.$_configuration['software_name']);
//$room->numberOfPartizipants = $room->numberOfPartizipants;
$room->ispublic = $room->getString('isPublic', 'false');
//$room->appointment = $room->getString('appointment');
@ -200,7 +200,7 @@ class OpenMeetings
$params['room_id'] = $roomId;
$params['c_id'] = api_get_course_int_id();
$params['session_id'] = api_get_session_id();
$params['record'] = ($room->allowRecording?1:0);
$params['record'] = ($room->allowRecording ? 1 : 0);
$id = \Database::insert($this->table, $params);
@ -238,7 +238,7 @@ class OpenMeetings
}
$params = array('room_id' => $meetingData['room_id']);
$returnVal = $this->setUserObjectAndGenerateRoomHashByURLAndRecFlag($params);
$iframe = $this->url . "/?" ."secureHash=" . $returnVal;
$iframe = $this->url."/?"."secureHash=".$returnVal;
printf("<iframe src='%s' width='%s' height = '%s' />", $iframe, "100%", 640);
}
@ -346,7 +346,7 @@ class OpenMeetings
$userId = $_SESSION['_user']['user_id'];
$systemType = 'Chamilo';
$room_id = $params['room_id'];
$becomeModerator = ( $this->isTeacher() ? 1 : 0 );
$becomeModerator = ($this->isTeacher() ? 1 : 0);
$allowRecording = 1; //Provisional
$urlWsdl = $this->url."/services/UserService?wsdl";
@ -420,7 +420,7 @@ class OpenMeetings
error_log(__FILE__.'+'.__LINE__.' Meetings found: '.print_r($meetingDb, 1));
$remoteMeeting = array();
$meetingDb['created_at'] = api_get_local_time($meetingDb['created_at']);
$meetingDb['closed_at'] = (!empty($meetingDb['closed_at']) ? api_get_local_time($meetingDb['closed_at']):'');
$meetingDb['closed_at'] = (!empty($meetingDb['closed_at']) ? api_get_local_time($meetingDb['closed_at']) : '');
// Fixed value for now
$meetingDb['participantCount'] = 40;
$rec = $this->gateway->getFlvRecordingByRoomId($meetingDb['room_id']);
@ -436,7 +436,7 @@ class OpenMeetings
\Display::url('[.avi]', $link2, array('target' => '_blank'));
}
$item['show_links'] = implode('<br />', $links);
$item['show_links'] = implode('<br />', $links);
// The following code is currently commented because the web service
// says this is not allowed by the SOAP user.
@ -486,7 +486,7 @@ class OpenMeetings
$remoteMeeting = $current_room;
*/
if (empty( $remoteMeeting )) {
if (empty($remoteMeeting)) {
/*
error_log(__FILE__.'+'.__LINE__.' Empty remote Meeting for now');
if ($meetingDb['status'] == 1 && $this->isTeacher()) {

6
plugin/openmeetings/lib/room.class.php
Unescape View File

@ -49,9 +49,9 @@ class Room
global $_configuration;
$this->name = 'C'.api_get_course_int_id().'-'.api_get_session_id();
$accessUrl = api_get_access_url($_configuration['access_url']);
$this->externalRoomType = substr($accessUrl['url'], strpos($accessUrl['url'],'://')+3,-1);
$this->externalRoomType = substr($accessUrl['url'], strpos($accessUrl['url'], '://') + 3, -1);
if (strcmp($this->externalRoomType, 'localhost') == 0) {
$this->externalRoomType = substr(api_get_path(WEB_PATH), strpos(api_get_path(WEB_PATH),'://')+3, -1);
$this->externalRoomType = substr(api_get_path(WEB_PATH), strpos(api_get_path(WEB_PATH), '://') + 3, -1);
}
$this->externalRoomType = 'chamilolms.'.$this->externalRoomType;
}
@ -110,6 +110,6 @@ class Room
if (!isset($this->$attribute)) {
return $voidReturn;
}
return $this->$attribute?'true':'false';
return $this->$attribute ? 'true' : 'false';
}
}

2
plugin/resubscription/config.php
Unescape View File

@ -6,4 +6,4 @@
* @package chamilo.plugin.resubscription
*/
require_once api_get_path(SYS_PATH) . 'main/inc/global.inc.php';
require_once api_get_path(SYS_PATH).'main/inc/global.inc.php';

2
plugin/resubscription/index.php
Unescape View File

@ -5,4 +5,4 @@
* @author Imanol Losada Oriol <imanol.losada@beeznest.com>
* @package chamilo.plugin.resubscription
*/
require_once __DIR__ . '/config.php';
require_once __DIR__.'/config.php';

2
plugin/resubscription/uninstall.php
Unescape View File

@ -5,6 +5,6 @@
* @author Imanol Losada Oriol <imanol.losada@beeznest.com>
* @package chamilo.plugin.resubscription
*/
require_once __DIR__ . '/config.php';
require_once __DIR__.'/config.php';
Resubscription::create()->uninstall();

38
plugin/vchamilo/views/editinstance_form.php
Unescape View File

@ -44,7 +44,7 @@ abstract class ChamiloForm
return $this->_form->display();
}
public function definition_after_data(){
public function definition_after_data() {
}
public function return_form()
@ -64,9 +64,9 @@ abstract class ChamiloForm
* @param bool $slashed true means return data with addslashes applied
* @return object submitted data; NULL if not valid or not submitted
*/
public function get_data($slashed=true)
public function get_data($slashed = true)
{
$cform =& $this->_form;
$cform = & $this->_form;
if ($this->is_submitted() and $this->is_validated()) {
$data = $cform->exportValues(null, $slashed);
@ -74,7 +74,7 @@ abstract class ChamiloForm
if (empty($data)) {
return null;
} else {
return (object)$data;
return (object) $data;
}
} else {
return null;
@ -87,9 +87,9 @@ abstract class ChamiloForm
* @param bool $slashed true means return data with addslashes applied
* @return object submitted data; NULL if not submitted
*/
public function get_submitted_data($slashed=true)
public function get_submitted_data($slashed = true)
{
$cform =& $this->_form;
$cform = & $this->_form;
if ($this->is_submitted()) {
$data = $cform->exportValues(null, $slashed);
@ -97,7 +97,7 @@ abstract class ChamiloForm
if (empty($data)) {
return null;
} else {
return (object)$data;
return (object) $data;
}
} else {
return null;
@ -121,10 +121,10 @@ abstract class ChamiloForm
*/
public function is_cancelled()
{
$cform =& $this->_form;
if ($cform->isSubmitted()){
foreach ($cform->_cancelButtons as $cancelbutton){
if (optional_param($cancelbutton, 0, PARAM_RAW)){
$cform = & $this->_form;
if ($cform->isSubmitted()) {
foreach ($cform->_cancelButtons as $cancelbutton) {
if (optional_param($cancelbutton, 0, PARAM_RAW)) {
return true;
}
}
@ -168,12 +168,12 @@ abstract class ChamiloForm
*
* @return bool true if form data valid
*/
public function validate_defined_fields($validateonnosubmit=false)
public function validate_defined_fields($validateonnosubmit = false)
{
static $validated = null; // one validation is enough
$cform =& $this->_form;
$cform = & $this->_form;
if ($this->no_submit_button_pressed() && empty($validateonnosubmit)){
if ($this->no_submit_button_pressed() && empty($validateonnosubmit)) {
return false;
} elseif ($validated === null) {
$internal_val = $cform->validate();
@ -191,7 +191,7 @@ abstract class ChamiloForm
$data = $cform->exportValues(null, true);
$chamilo_val = $this->validation($data, $files);
if ((is_array($chamilo_val) && count($chamilo_val)!==0)) {
if ((is_array($chamilo_val) && count($chamilo_val) !== 0)) {
// non-empty array means errors
foreach ($chamilo_val as $element => $msg) {
$cform->setElementError($element, $msg);
@ -217,7 +217,7 @@ abstract class ChamiloForm
return $nosubmit;
}
$cform =& $this->_form;
$cform = & $this->_form;
$nosubmit = false;
if (!$this->is_submitted()) {
return false;
@ -246,7 +246,7 @@ abstract class ChamiloForm
public function set_data($default_values, $slashed = false)
{
if (is_object($default_values)) {
$default_values = (array)$default_values;
$default_values = (array) $default_values;
}
$filter = $slashed ? 'stripslashes' : NULL;
$this->_form->setDefaults($default_values, $filter);
@ -266,14 +266,14 @@ abstract class ChamiloForm
}
$errors = array();
$mform =& $this->_form;
$mform = & $this->_form;
// check the files
$status = $this->_upload_manager->preprocess_files();
// now check that we really want each file
foreach ($_FILES as $elname => $file) {
if ($mform->elementExists($elname) and $mform->getElementType($elname)=='file') {
if ($mform->elementExists($elname) and $mform->getElementType($elname) == 'file') {
$required = $mform->isElementRequired($elname);
if (!empty($this->_upload_manager->files[$elname]['uploadlog']) &&
empty($this->_upload_manager->files[$elname]['clear'])

2
plugin/vchamilo/views/manage.testdatapath.php
Unescape View File

@ -20,7 +20,7 @@ $plugin = VChamiloPlugin::create();
$dataroot = $_REQUEST['dataroot'];
$absalternatecourse = Virtual::getConfig('vchamilo', 'course_real_root');
if (!empty($absalternatecourse)){
if (!empty($absalternatecourse)) {
// this is the relocated case
$coursedir = str_replace('//', '/', $absalternatecourse.'/'.$dataroot);
} else {

Write Preview
Loading…
Cancel
Save