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

Merge pull request #1916 from chamilo/scrutinizer-patch-1

Browse Source 
Scrutinizer Auto-Fixes
pull/2487/head
Julio Montoya 9 years ago committed by GitHub
parent 8a6757f923 6cd214a50f
commit 47b6fe8496
9 changed files with 74 additions and 74 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. 16
      main/document/showinframes.php
  2. 30
      main/gradebook/lib/fe/flatviewtable.class.php
  3. 22
      main/install/update-files-1.9.0-1.10.0.inc.php
  4. 6
      main/lp/lp_view_item.php
  5. 64
      main/social/home.php
  6. 2
      plugin/google_maps/lang/english.php
  7. 2
      plugin/google_maps/lang/french.php
  8. 4
      plugin/ims_lti/edit.php
  9. 2
      plugin/vchamilo/views/editinstance.php

16
main/document/showinframes.php
Unescape View File

@ -145,7 +145,7 @@ if (empty($document_data['parents'])) {
}
} else {
foreach ($document_data['parents'] as $document_sub_data) {
if (!isset($_GET['createdir']) && $document_sub_data['id'] == $document_data['id']) {
if (!isset($_GET['createdir']) && $document_sub_data['id'] == $document_data['id']) {
$document_sub_data['document_url'] = '#';
}
$interbreadcrumb[] = array(
@ -173,7 +173,7 @@ $frameheight = 135;
if ($is_courseAdmin) {
$frameheight = 165;
}
$js_glossary_in_documents = '
$js_glossary_in_documents = '
$.frameReady(function(){
// $("<div>I am a div courses</div>").prependTo("body");
}, "top.mainFrame",
@ -193,7 +193,7 @@ $web_odf_supported_files = DocumentManager::get_web_odf_extension_list();
// PDF should be displayed with viewerJS
$web_odf_supported_files[] = 'pdf';
if (in_array(strtolower($pathinfo['extension']), $web_odf_supported_files)) {
$show_web_odf = true;
$show_web_odf = true;
/*
$htmlHeadXtra[] = api_get_js('webodf/webodf.js');
$htmlHeadXtra[] = api_get_css(api_get_path(WEB_LIBRARY_PATH).'javascript/webodf/webodf.css');
@ -236,7 +236,7 @@ if ($isChatFolder) {
$htmlHeadXtra[] = api_get_js('highlight/highlight.pack.js');
$htmlHeadXtra[] = api_get_css(api_get_path(WEB_CSS_PATH).'chat.css');
$htmlHeadXtra[] = api_get_css(
api_get_path(WEB_LIBRARY_PATH) . 'javascript/highlight/styles/github.css'
api_get_path(WEB_LIBRARY_PATH).'javascript/highlight/styles/github.css'
);
$htmlHeadXtra[] = '
<script>
@ -288,7 +288,7 @@ if ($show_web_odf) {
$execute_iframe = false;
}
$is_freemind_available = $pathinfo['extension']=='mm' && api_get_setting('enable_freemind') == 'true';
$is_freemind_available = $pathinfo['extension'] == 'mm' && api_get_setting('enable_freemind') == 'true';
if ($is_freemind_available) {
$execute_iframe = false;
}
@ -331,18 +331,18 @@ $file_url = api_get_path(WEB_COURSE_PATH).$courseInfo['path'].'/document'.$heade
$file_url_web = $file_url.'?'.api_get_cidreq();
if (in_array(strtolower($pathinfo['extension']), array('html', "htm"))) {
echo '<a class="btn btn-default" href="' . $file_url_web . '" target="_blank">' . get_lang('CutPasteLink') . '</a>';
echo '<a class="btn btn-default" href="'.$file_url_web.'" target="_blank">'.get_lang('CutPasteLink').'</a>';
}
if ($show_web_odf) {
$browser = api_get_navigator();
$pdfUrl = api_get_path(WEB_LIBRARY_PATH) . 'javascript/ViewerJS/index.html#' . $file_url;
$pdfUrl = api_get_path(WEB_LIBRARY_PATH).'javascript/ViewerJS/index.html#'.$file_url;
if ($browser['name'] == 'Mozilla' && preg_match('|.*\.pdf|i', $header_file)) {
$pdfUrl = $file_url;
}
echo '<div id="viewerJS">';
echo '<iframe id="viewerJSContent" frameborder="0" allowfullscreen="allowfullscreen" webkitallowfullscreen style="width:100%;"
src="' . $pdfUrl. '">
src="' . $pdfUrl.'">
</iframe>';
echo '</div>';
} elseif (!$originIsLearnpath) {

30
main/gradebook/lib/fe/flatviewtable.class.php
Unescape View File

@ -204,9 +204,9 @@ class FlatViewTable extends SortableTable
$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 {
/* Create the pChart object */
$widthSize = 480;
@ -233,7 +233,7 @@ class FlatViewTable extends SortableTable
/* 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
)
);
@ -305,11 +305,11 @@ class FlatViewTable extends SortableTable
/* Render the picture (choose the best way) */
$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;
}
echo '<img src="' . $imgPath . '" >';
echo '<img src="'.$imgPath.'" >';
if ($i % 2 == 0 && $i != 0) {
echo '<br /><br />';
} else {
@ -352,10 +352,10 @@ class FlatViewTable extends SortableTable
// previous X
$header .= '<td style="width:100%;">';
if ($this->offset >= GRADEBOOK_ITEM_LIMIT) {
$header .= '<a href="' . api_get_self()
. '?selectcat=' . Security::remove_XSS($_GET['selectcat'])
. '&offset=' . (($this->offset) - GRADEBOOK_ITEM_LIMIT)
. (isset($_GET['search']) ? '&search=' . Security::remove_XSS($_GET['search']) : '') . '">'
$header .= '<a href="'.api_get_self()
. '?selectcat='.Security::remove_XSS($_GET['selectcat'])
. '&offset='.(($this->offset) - GRADEBOOK_ITEM_LIMIT)
. (isset($_GET['search']) ? '&search='.Security::remove_XSS($_GET['search']) : '').'">'
. Display::return_icon('action_prev.png', get_lang('PreviousPage'), array(), 32)
. '</a>';
} else {
@ -367,10 +367,10 @@ class FlatViewTable extends SortableTable
($totalitems - (GRADEBOOK_ITEM_LIMIT + $this->offset)) : GRADEBOOK_ITEM_LIMIT;
if ($calcnext > 0) {
$header .= '<a href="' . api_get_self()
. '?selectcat=' . Security::remove_XSS($_GET['selectcat'])
. '&offset=' . ($this->offset + GRADEBOOK_ITEM_LIMIT)
. (isset($_GET['search']) ? '&search=' . Security::remove_XSS($_GET['search']) : '') . '">'
$header .= '<a href="'.api_get_self()
. '?selectcat='.Security::remove_XSS($_GET['selectcat'])
. '&offset='.($this->offset + GRADEBOOK_ITEM_LIMIT)
. (isset($_GET['search']) ? '&search='.Security::remove_XSS($_GET['search']) : '').'">'
. Display::return_icon('action_next.png', get_lang('NextPage'), array(), 32)
. '</a>';
} else {
@ -477,6 +477,6 @@ class FlatViewTable extends SortableTable
*/
private function build_name_link($userId, $name)
{
return '<a href="user_stats.php?userid=' . $userId . '&selectcat=' . $this->selectcat->get_id() . '&'.api_get_cidreq().'">' . $name . '</a>';
return '<a href="user_stats.php?userid='.$userId.'&selectcat='.$this->selectcat->get_id().'&'.api_get_cidreq().'">'.$name.'</a>';
}
}

22
main/install/update-files-1.9.0-1.10.0.inc.php
Unescape View File

@ -14,7 +14,7 @@ use Symfony\Component\Filesystem\Exception\IOException;
* current configuration file.
* @package chamilo.install
*/
error_log("Starting " . basename(__FILE__));
error_log("Starting ".basename(__FILE__));
global $debug;
@ -143,12 +143,12 @@ if (defined('SYSTEM_INSTALLATION')) {
$list = scandir($langPath);
foreach ($list as $entry) {
if (is_dir($langPath . $entry) &&
if (is_dir($langPath.$entry) &&
in_array($entry, $officialLanguages)
) {
foreach ($filesToDelete as $file) {
if (is_file($langPath . $entry . '/' . $file . '.inc.php')) {
unlink($langPath . $entry . '/' . $file . '.inc.php');
if (is_file($langPath.$entry.'/'.$file.'.inc.php')) {
unlink($langPath.$entry.'/'.$file.'.inc.php');
}
}
}
@ -173,12 +173,12 @@ if (defined('SYSTEM_INSTALLATION')) {
// Move dirs into new structures.
$movePathList = [
api_get_path(SYS_CODE_PATH).'upload/users/groups' => api_get_path(SYS_UPLOAD_PATH) . 'groups',
api_get_path(SYS_CODE_PATH).'upload/users' => api_get_path(SYS_UPLOAD_PATH) . 'users',
api_get_path(SYS_CODE_PATH).'upload/badges' => api_get_path(SYS_UPLOAD_PATH) . 'badges',
api_get_path(SYS_PATH).'courses' => api_get_path(SYS_APP_PATH) . 'courses',
api_get_path(SYS_CODE_PATH).'upload/users/groups' => api_get_path(SYS_UPLOAD_PATH).'groups',
api_get_path(SYS_CODE_PATH).'upload/users' => api_get_path(SYS_UPLOAD_PATH).'users',
api_get_path(SYS_CODE_PATH).'upload/badges' => api_get_path(SYS_UPLOAD_PATH).'badges',
api_get_path(SYS_PATH).'courses' => api_get_path(SYS_APP_PATH).'courses',
api_get_path(SYS_PATH).'searchdb' => api_get_path(SYS_UPLOAD_PATH).'plugins/xapian/',
api_get_path(SYS_PATH).'home' => api_get_path(SYS_APP_PATH) . 'home'
api_get_path(SYS_PATH).'home' => api_get_path(SYS_APP_PATH).'home'
];
if ($debug) {
@ -199,7 +199,7 @@ if (defined('SYSTEM_INSTALLATION')) {
$fs->remove($origin);
} catch (IOException $e) {
// If removing the directory doesn't work, just log an error and continue
error_log('Could not move ' . $origin . ' to ' . $destination . '(' . $e->getMessage() . '). Please move it manually.');
error_log('Could not move '.$origin.' to '.$destination.'('.$e->getMessage().'). Please move it manually.');
}
}
}
@ -246,5 +246,5 @@ if (defined('SYSTEM_INSTALLATION')) {
@rrmdir(api_get_path(SYS_PATH).'archive');
} else {
echo 'You are not allowed here !'. __FILE__;
echo 'You are not allowed here !'.__FILE__;
}

6
main/lp/lp_view_item.php
Unescape View File

@ -19,7 +19,7 @@ api_protect_course_script();
if (isset($_GET['lp_item_id'])) {
// Get parameter only came from lp_view.php.
$lp_item_id = intval($_GET['lp_item_id']);
$lp_item_id = intval($_GET['lp_item_id']);
if (isset($_SESSION['lpobject'])) {
$oLP = unserialize($_SESSION['lpobject']);
}
@ -69,12 +69,12 @@ if ((!$is_allowed_to_edit) || $isStudentView) {
$course_id = api_get_course_int_id();
$sql = "SELECT * FROM $tbl_lp
WHERE c_id = $course_id AND id = $learnpath_id";
$result=Database::query($sql);
$result = Database::query($sql);
$therow = Database::fetch_array($result);
/* SHOWING THE ADMIN TOOLS */
if (api_is_in_gradebook()) {
$interbreadcrumb[] = array (
$interbreadcrumb[] = array(
'url' => api_get_path(WEB_CODE_PATH).'gradebook/index.php?'.api_get_cidreq(),
'name' => get_lang('ToolGradebook')
);

64
main/social/home.php
Unescape View File

@ -20,8 +20,8 @@ unset($_SESSION['this_section']);
api_block_anonymous_users();
if (api_get_setting('allow_social_tool') != 'true') {
$url = api_get_path(WEB_CODE_PATH) . 'auth/profile.php';
header('Location: ' . $url);
$url = api_get_path(WEB_CODE_PATH).'auth/profile.php';
header('Location: '.$url);
exit;
}
@ -45,10 +45,10 @@ if (api_get_setting('profile', 'picture') == 'true') {
$allowed_picture_types = api_get_supported_image_extensions();
$form->addRule(
'picture',
get_lang('OnlyImagesAllowed') . ' (' . implode(
get_lang('OnlyImagesAllowed').' ('.implode(
',',
$allowed_picture_types
) . ')',
).')',
'filetype',
$allowed_picture_types
);
@ -68,7 +68,7 @@ if (api_get_setting('profile', 'picture') == 'true') {
$sql = "UPDATE $table_user
SET
picture_uri = '$new_picture'
WHERE user_id = " . api_get_user_id();
WHERE user_id = ".api_get_user_id();
$result = Database::query($sql);
}
@ -95,9 +95,9 @@ if (!empty($results)) {
$result['name'] = Security::remove_XSS($result['name'], STUDENT, true);
if ($result['count'] == 1) {
$result['count'] = '1 ' . get_lang('Member');
$result['count'] = '1 '.get_lang('Member');
} else {
$result['count'] = $result['count'] . ' ' . get_lang('Members');
$result['count'] = $result['count'].' '.get_lang('Members');
}
$group_url = "group_view.php?id=$id";
@ -117,9 +117,9 @@ if (!empty($results)) {
GROUP_IMAGE_SIZE_BIG
);
$result['picture'] = '<img class="img-responsive" src="' . $picture['file'] . '" />';
$group_actions = '<div class="group-more"><a class="btn btn-default" href="groups.php?#tab_browse-2">' . get_lang('SeeMore') . '</a></div>';
$group_info= '<div class="description"><p>' . cut($result['description'], 120, true) . "</p></div>";
$result['picture'] = '<img class="img-responsive" src="'.$picture['file'].'" />';
$group_actions = '<div class="group-more"><a class="btn btn-default" href="groups.php?#tab_browse-2">'.get_lang('SeeMore').'</a></div>';
$group_info = '<div class="description"><p>'.cut($result['description'], 120, true)."</p></div>";
$groups_newest[] = array(
Display::url(
$result['picture'],
@ -146,9 +146,9 @@ foreach ($results as $result) {
$group_url = "group_view.php?id=$id";
if ($result['count'] == 1) {
$result['count'] = '1 ' . get_lang('Member');
$result['count'] = '1 '.get_lang('Member');
} else {
$result['count'] = $result['count'] . ' ' . get_lang('Members');
$result['count'] = $result['count'].' '.get_lang('Members');
}
$result['name'] = '<div class="group-name">'.Display::url(
api_ucwords(cut($result['name'], 40, true)), $group_url)
@ -160,42 +160,42 @@ foreach ($results as $result) {
null,
GROUP_IMAGE_SIZE_BIG
);
$result['picture_uri'] = '<img class="img-responsive" src="' . $picture['file'] . '" />';
$group_actions = '<div class="group-more"><a class="btn btn-default" href="groups.php?#tab_browse-3">' . get_lang('SeeMore') . '</a></div>';
$group_info= '<div class="description"><p>' . cut($result['description'], 120, true) . "</p></div>";
$result['picture_uri'] = '<img class="img-responsive" src="'.$picture['file'].'" />';
$group_actions = '<div class="group-more"><a class="btn btn-default" href="groups.php?#tab_browse-3">'.get_lang('SeeMore').'</a></div>';
$group_info = '<div class="description"><p>'.cut($result['description'], 120, true)."</p></div>";
$groups_pop[] = array(
Display::url($result['picture_uri'], $group_url),
$result['name'],$group_info. $group_actions
$result['name'], $group_info.$group_actions
);
}
$list=count($groups_newest);
$list = count($groups_newest);
$social_group_block = null;
if ($list > 0) {
$social_group_block .= '<div class="list-group-newest">';
$social_group_block .= '<div class="group-title">' . get_lang('Newest') . '</div>';
$social_group_block .= '<div class="group-title">'.get_lang('Newest').'</div>';
for ($i = 0; $i < $list; $i++) {
$social_group_block.='<div class="row">';
$social_group_block.='<div class="col-md-3">' . $groups_newest[$i][0] . '</div>';
$social_group_block.='<div class="col-md-9">' . $groups_newest[$i][1];
$social_group_block.= $groups_newest[$i][2] . '</div>';
$social_group_block.="</div>";
$social_group_block .= '<div class="row">';
$social_group_block .= '<div class="col-md-3">'.$groups_newest[$i][0].'</div>';
$social_group_block .= '<div class="col-md-9">'.$groups_newest[$i][1];
$social_group_block .= $groups_newest[$i][2].'</div>';
$social_group_block .= "</div>";
}
$social_group_block.= "</div>";
$social_group_block .= "</div>";
}
$list=count($groups_pop);
$list = count($groups_pop);
if ($list > 0) {
$social_group_block .= '<div class="list-group-newest">';
$social_group_block .= '<div class="group-title">' . get_lang('Popular') . '</div>';
$social_group_block .= '<div class="group-title">'.get_lang('Popular').'</div>';
for ($i = 0; $i < $list; $i++) {
$social_group_block.='<div class="row">';
$social_group_block.='<div class="col-md-3">' . $groups_pop[$i][0] . '</div>';
$social_group_block.='<div class="col-md-9">' . $groups_pop[$i][1];
$social_group_block.= $groups_pop[$i][2] . '</div>';
$social_group_block.="</div>";
$social_group_block .= '<div class="row">';
$social_group_block .= '<div class="col-md-3">'.$groups_pop[$i][0].'</div>';
$social_group_block .= '<div class="col-md-9">'.$groups_pop[$i][1];
$social_group_block .= $groups_pop[$i][2].'</div>';
$social_group_block .= "</div>";
}
$social_group_block.= "</div>";
$social_group_block .= "</div>";
}
// My friends
$friend_html = SocialManager::listMyFriendsBlock(

2
plugin/google_maps/lang/english.php
Unescape View File

@ -6,7 +6,7 @@ $strings['extra_field_name_help'] = "Enter one or many extra user fields name se
<br><br>
<img src='//maps.google.com/mapfiles/ms/icons/red-dot.png'> <img src='//maps.google.com/mapfiles/ms/icons/blue-dot.png'> <img src='//maps.google.com/mapfiles/ms/icons/green-dot.png'> <img src='//maps.google.com/mapfiles/ms/icons/yellow-dot.png'> <img src='//maps.google.com/mapfiles/ms/icons/purple-dot.png'>
<br><br>
Follow the link below to see the map : <a href='". api_get_path(WEB_PLUGIN_PATH) . "google_maps/src/map_coordinates.php'>" . api_get_path(WEB_PLUGIN_PATH) . "google_maps/src/map_coordinates.php</a>";
Follow the link below to see the map : <a href='". api_get_path(WEB_PLUGIN_PATH)."google_maps/src/map_coordinates.php'>".api_get_path(WEB_PLUGIN_PATH)."google_maps/src/map_coordinates.php</a>";
$strings['enable_api'] = "Enable API";
$strings['api_key'] = "Api Key";
$strings['extra_field_name'] = "Extra field name";

2
plugin/google_maps/lang/french.php
Unescape View File

@ -6,7 +6,7 @@ $strings['extra_field_name_help'] = "Entrez ici le ou les nom(s) des champs extr
<br><br>
<img src='//maps.google.com/mapfiles/ms/icons/red-dot.png'> <img src='//maps.google.com/mapfiles/ms/icons/blue-dot.png'> <img src='//maps.google.com/mapfiles/ms/icons/green-dot.png'> <img src='//maps.google.com/mapfiles/ms/icons/yellow-dot.png'> <img src='//maps.google.com/mapfiles/ms/icons/purple-dot.png'>
<br><br>
Suivez le lien pour voir la carte : <a href='". api_get_path(WEB_PLUGIN_PATH) . "google_maps/src/map_coordinates.php'>" . api_get_path(WEB_PLUGIN_PATH) . "google_maps/src/map_coordinates.php</a>";
Suivez le lien pour voir la carte : <a href='". api_get_path(WEB_PLUGIN_PATH)."google_maps/src/map_coordinates.php'>".api_get_path(WEB_PLUGIN_PATH)."google_maps/src/map_coordinates.php</a>";
$strings['enable_api'] = "Enable API";
$strings['api_key'] = "Api Key";
$strings['extra_field_name'] = "Nom de champ supplémentaire";

4
plugin/ims_lti/edit.php
Unescape View File

@ -20,7 +20,7 @@ if (empty($tool)) {
Display::return_message($plugin->get_lang('NoTool'), 'error')
);
header('Location: ' . api_get_path(WEB_PLUGIN_PATH) . 'ims_lti/list.php');
header('Location: '.api_get_path(WEB_PLUGIN_PATH).'ims_lti/list.php');
exit;
}
@ -58,7 +58,7 @@ if ($form->validate()) {
Display::return_message($plugin->get_lang('ToolEdited'), 'success')
);
header('Location: ' . api_get_path(WEB_PLUGIN_PATH) . 'ims_lti/list.php');
header('Location: '.api_get_path(WEB_PLUGIN_PATH).'ims_lti/list.php');
exit;
}

2
plugin/vchamilo/views/editinstance.php
Unescape View File

@ -23,7 +23,7 @@ $thisurl = api_get_path(WEB_PLUGIN_PATH).'vchamilo/views/manage.php';
if ($id) {
$mode = 'update';
} else {
$mode = $registeronly ? 'register' : 'add' ;
$mode = $registeronly ? 'register' : 'add';
}
$vhost = (array) Virtual::getInstance($id);

Write Preview
Loading…
Cancel
Save