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

Minor - format code, fix php notices

Browse Source
pull/3382/head
Julio Montoya 5 years ago
parent 581505442a
commit 79fd1765a6
2 changed files with 86 additions and 111 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. 51
      main/gradebook/lib/GradebookUtils.php
  2. 146
      main/wiki/wiki.inc.php

51
main/gradebook/lib/GradebookUtils.php
Unescape View File

@ -1,4 +1,5 @@
<?php <?php
/* For licensing terms, see /license.txt */ /* For licensing terms, see /license.txt */
/** /**
@ -260,7 +261,7 @@ class GradebookUtils
if (api_is_allowed_to_edit(null, true)) { if (api_is_allowed_to_edit(null, true)) {
// Locking button // Locking button
if (api_get_setting('gradebook_locking_enabled') == 'true') { if (api_get_setting('gradebook_locking_enabled') === 'true') {
if ($cat->is_locked()) { if ($cat->is_locked()) {
if (api_is_platform_admin()) { if (api_is_platform_admin()) {
$modify_icons .= '&nbsp;<a onclick="javascript:if (!confirm(\''.addslashes(get_lang('ConfirmToUnlockElement')).'\')) return false;" href="'.api_get_self().'?'.api_get_cidreq().'&category_id='.$cat->get_id().'&action=unlock">'. $modify_icons .= '&nbsp;<a onclick="javascript:if (!confirm(\''.addslashes(get_lang('ConfirmToUnlockElement')).'\')) return false;" href="'.api_get_self().'?'.api_get_cidreq().'&category_id='.$cat->get_id().'&action=unlock">'.
@ -444,7 +445,6 @@ class GradebookUtils
$cat = new Category(); $cat = new Category();
$message_link = $cat->show_message_resource_delete($link->get_course_code()); $message_link = $cat->show_message_resource_delete($link->get_course_code());
$is_locked = $link->is_locked(); $is_locked = $link->is_locked();
$modify_icons = null; $modify_icons = null;
if (!api_is_allowed_to_edit(null, true)) { if (!api_is_allowed_to_edit(null, true)) {
@ -513,7 +513,10 @@ class GradebookUtils
ICON_SIZE_SMALL ICON_SIZE_SMALL
); );
} else { } else {
$modify_icons .= '&nbsp;<a href="'.api_get_self().'?deletelink='.$link->get_id().'&selectcat='.$selectcat.' &'.$courseParams.'" onclick="return confirmation();">'. $modify_icons .= '&nbsp;
<a
href="'.api_get_self().'?deletelink='.$link->get_id().'&selectcat='.$selectcat.' &'.$courseParams.'"
onclick="return confirmation();">'.
Display::return_icon( Display::return_icon(
'delete.png', 'delete.png',
get_lang('Delete'), get_lang('Delete'),
@ -759,34 +762,6 @@ class GradebookUtils
return $list_users; return $list_users;
} }
public static function getTotalCertificates($urlId)
{
$urlId = (int) $urlId;
$table_certificate = Database::get_main_table(TABLE_MAIN_GRADEBOOK_CERTIFICATE);
$table_user = Database::get_main_table(TABLE_MAIN_USER);
$sql = 'SELECT DISTINCT u.user_id, u.lastname, u.firstname, u.username
FROM '.$table_user.' u
INNER JOIN '.$table_certificate.' gc
ON u.user_id=gc.user_id ';
if (!is_null($cat_id) && $cat_id > 0) {
$sql .= ' WHERE cat_id='.intval($cat_id);
}
if (!empty($userList)) {
$userList = array_map('intval', $userList);
$userListCondition = implode("','", $userList);
$sql .= " AND u.user_id IN ('$userListCondition')";
}
$sql .= ' ORDER BY '.(api_sort_by_first_name() ? 'u.firstname' : 'u.lastname');
$rs = Database::query($sql);
$list_users = [];
while ($row = Database::fetch_array($rs)) {
$list_users[] = $row;
}
return $list_users;
}
/** /**
* Gets the certificate list by user id. * Gets the certificate list by user id.
* *
@ -932,7 +907,6 @@ class GradebookUtils
$cat->set_weight($default_weight); $cat->set_weight($default_weight);
$cat->set_grade_model_id($gradebook_model_id); $cat->set_grade_model_id($gradebook_model_id);
$cat->set_certificate_min_score(75); $cat->set_certificate_min_score(75);
$cat->set_visible(0); $cat->set_visible(0);
$cat->add(); $cat->add();
$category_id = $cat->get_id(); $category_id = $cat->get_id();
@ -980,7 +954,6 @@ class GradebookUtils
$grade_model_id = $my_cat->get_grade_model_id(); $grade_model_id = $my_cat->get_grade_model_id();
if (empty($grade_model_id)) { if (empty($grade_model_id)) {
if ($my_cat->get_parent_id() == 0) { if ($my_cat->get_parent_id() == 0) {
//$default_weight = $my_cat->get_weight();
$select_gradebook->addOption(get_lang('Default'), $my_cat->get_id()); $select_gradebook->addOption(get_lang('Default'), $my_cat->get_id());
$cats_added[] = $my_cat->get_id(); $cats_added[] = $my_cat->get_id();
} else { } else {
@ -1059,9 +1032,11 @@ class GradebookUtils
if ($use_grade_model) { if ($use_grade_model) {
if ($parent_id == 0) { if ($parent_id == 0) {
$title = api_strtoupper(get_lang('Average')).'<br />'.get_lang('Detailed'); $title = api_strtoupper(get_lang('Average')).
'<br />'.get_lang('Detailed');
} else { } else {
$title = api_strtoupper(get_lang('Average')).'<br />'.$cat[0]->get_description().' - ('.$cat[0]->get_name().')'; $title = api_strtoupper(get_lang('Average')).
'<br />'.$cat[0]->get_description().' - ('.$cat[0]->get_name().')';
} }
} else { } else {
if ($parent_id == 0) { if ($parent_id == 0) {
@ -1332,9 +1307,8 @@ class GradebookUtils
} }
$result = Database::query($sql); $result = Database::query($sql);
$users = Database::store_result($result);
return $users; return Database::store_result($result);
} }
/** /**
@ -1672,9 +1646,6 @@ class GradebookUtils
if ($saveToHtmlFile) { if ($saveToHtmlFile) {
return $result; return $result;
file_put_contents($file, $result);
return $file;
} }
return $file; return $file;

146
main/wiki/wiki.inc.php
Unescape View File

@ -1,7 +1,7 @@
<?php <?php
/* For licensing terms, see /license.txt */ /* For licensing terms, see /license.txt */
use Chamilo\CoreBundle\Component\Filesystem\Data;
use ChamiloSession as Session; use ChamiloSession as Session;
/** /**
@ -11,8 +11,6 @@ use ChamiloSession as Session;
* @author Juan Carlos Raña <herodoto@telefonica.net> * @author Juan Carlos Raña <herodoto@telefonica.net>
* @author Patrick Cool <patrick.cool@UGent.be>, Ghent University, Belgium * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University, Belgium
* @author Julio Montoya <gugli100@gmail.com> using the pdf.lib.php library * @author Julio Montoya <gugli100@gmail.com> using the pdf.lib.php library
*
* @package chamilo.wiki
*/ */
class Wiki class Wiki
{ {
@ -86,10 +84,9 @@ class Wiki
// the value has not been found and is this available // the value has not been found and is this available
if ($num == 0) { if ($num == 0) {
return true; return true;
} else {
// the value has been found
return false;
} }
return false;
} }
/** /**
@ -131,9 +128,8 @@ class Wiki
).' '; ).' ';
} }
} }
$output = implode($all_links);
return $output; return implode($all_links);
} }
/** /**
@ -145,9 +141,8 @@ class Wiki
{ {
$exlink = 'href='; $exlink = 'href=';
$exlinkStyle = 'class="wiki_link_ext" href='; $exlinkStyle = 'class="wiki_link_ext" href=';
$output = str_replace($exlink, $exlinkStyle, $input);
return $output; return str_replace($exlink, $exlinkStyle, $input);
} }
/** /**
@ -1041,7 +1036,10 @@ class Wiki
$result = Database::query($sql); $result = Database::query($sql);
$row = Database::fetch_array($result, 'ASSOC'); $row = Database::fetch_array($result, 'ASSOC');
$KeyVisibility = $row['visibility']; $KeyVisibility = null;
if ($KeyVisibility) {
$KeyVisibility = $row['visibility'];
}
// second, show the last version // second, show the last version
$sql = 'SELECT * FROM '.$tbl_wiki.' w $sql = 'SELECT * FROM '.$tbl_wiki.' w
@ -1063,7 +1061,7 @@ class Wiki
Event::addEvent(LOG_WIKI_ACCESS, LOG_WIKI_PAGE_ID, $row['page_id']); Event::addEvent(LOG_WIKI_ACCESS, LOG_WIKI_PAGE_ID, $row['page_id']);
} }
//update visits //update visits
if ($row['id']) { if ($row && $row['id']) {
$sql = 'UPDATE '.$tbl_wiki.' SET hits=(hits+1) $sql = 'UPDATE '.$tbl_wiki.' SET hits=(hits+1)
WHERE c_id = '.$course_id.' AND id='.$row['id'].''; WHERE c_id = '.$course_id.' AND id='.$row['id'].'';
Database::query($sql); Database::query($sql);
@ -1511,7 +1509,10 @@ class Wiki
$result = Database::query($sql); $result = Database::query($sql);
$row = Database::fetch_array($result); $row = Database::fetch_array($result);
$status_addlock = $row['addlock']; $status_addlock = null;
if ($row) {
$status_addlock = $row['addlock'];
}
// Change status // Change status
if (api_is_allowed_to_edit(false, true) || if (api_is_allowed_to_edit(false, true) ||
@ -1536,9 +1537,12 @@ class Wiki
ORDER BY id ASC'; ORDER BY id ASC';
$result = Database::query($sql); $result = Database::query($sql);
$row = Database::fetch_array($result); $row = Database::fetch_array($result);
if ($row) {
return $row['addlock'];
}
} }
return $row['addlock']; return null;
} }
/** /**
@ -1576,7 +1580,7 @@ class Wiki
$status_editlock = 0; $status_editlock = 0;
} }
$sql = 'UPDATE '.$tbl_wiki.' SET $sql = 'UPDATE '.$tbl_wiki.' SET
editlock="'.Database::escape_string($status_editlock).'" editlock="'.Database::escape_string($status_editlock).'"
WHERE c_id = '.$course_id.' AND page_id="'.$id.'"'; WHERE c_id = '.$course_id.' AND page_id="'.$id.'"';
Database::query($sql); Database::query($sql);
@ -1635,11 +1639,11 @@ class Wiki
$status_visibility = 0; $status_visibility = 0;
} }
$sql = 'UPDATE '.$tbl_wiki.' SET $sql = 'UPDATE '.$tbl_wiki.' SET
visibility = "'.Database::escape_string($status_visibility).'" visibility = "'.Database::escape_string($status_visibility).'"
WHERE WHERE
c_id = '.$course_id.' AND c_id = '.$course_id.' AND
reflink="'.Database::escape_string($page).'" AND reflink="'.Database::escape_string($page).'" AND
'.$groupfilter.$condition_session; '.$groupfilter.$condition_session;
Database::query($sql); Database::query($sql);
@ -1707,7 +1711,7 @@ class Wiki
$status_visibility_disc = 0; $status_visibility_disc = 0;
} }
$sql = 'UPDATE '.$tbl_wiki.' SET $sql = 'UPDATE '.$tbl_wiki.' SET
visibility_disc="'.Database::escape_string($status_visibility_disc).'" visibility_disc="'.Database::escape_string($status_visibility_disc).'"
WHERE WHERE
c_id = '.$course_id.' AND c_id = '.$course_id.' AND
@ -1885,9 +1889,9 @@ class Wiki
$userId = api_get_user_id(); $userId = api_get_user_id();
$sql = 'SELECT * FROM '.$tbl_wiki.' $sql = 'SELECT * FROM '.$tbl_wiki.'
WHERE WHERE
c_id = '.$course_id.' AND c_id = '.$course_id.' AND
reflink="'.$reflink.'" AND reflink="'.$reflink.'" AND
'.$groupfilter.$condition_session.' '.$groupfilter.$condition_session.'
ORDER BY id ASC'; ORDER BY id ASC';
$result = Database::query($sql); $result = Database::query($sql);
@ -1895,9 +1899,9 @@ class Wiki
$id = $row['id']; $id = $row['id'];
$sql = 'SELECT * FROM '.$tbl_wiki_mailcue.' $sql = 'SELECT * FROM '.$tbl_wiki_mailcue.'
WHERE WHERE
c_id = '.$course_id.' AND c_id = '.$course_id.' AND
id="'.$id.'" AND id="'.$id.'" AND
user_id="'.api_get_user_id().'" AND user_id="'.api_get_user_id().'" AND
type="P"'; type="P"';
$result = Database::query($sql); $result = Database::query($sql);
$row = Database::fetch_array($result); $row = Database::fetch_array($result);
@ -1933,10 +1937,10 @@ class Wiki
$status_notify == 1 $status_notify == 1
) { ) {
$sql = 'DELETE FROM '.$tbl_wiki_mailcue.' $sql = 'DELETE FROM '.$tbl_wiki_mailcue.'
WHERE WHERE
id="'.$id.'" AND id="'.$id.'" AND
user_id="'.api_get_user_id().'" AND user_id="'.api_get_user_id().'" AND
type="P" AND type="P" AND
c_id = '.$course_id; c_id = '.$course_id;
Database::query($sql); Database::query($sql);
$status_notify = 0; $status_notify = 0;
@ -1966,16 +1970,16 @@ class Wiki
$session_id = api_get_session_id(); $session_id = api_get_session_id();
$sql = 'SELECT * FROM '.$tbl_wiki.' $sql = 'SELECT * FROM '.$tbl_wiki.'
WHERE WHERE
c_id = '.$course_id.' AND c_id = '.$course_id.' AND
reflink="'.$reflink.'" AND reflink="'.$reflink.'" AND
'.$groupfilter.$condition_session.' '.$groupfilter.$condition_session.'
ORDER BY id ASC'; ORDER BY id ASC';
$result = Database::query($sql); $result = Database::query($sql);
$row = Database::fetch_array($result); $row = Database::fetch_array($result);
$id = $row['id']; $id = $row['id'];
$sql = 'SELECT * FROM '.$tbl_wiki_mailcue.' $sql = 'SELECT * FROM '.$tbl_wiki_mailcue.'
WHERE WHERE
c_id = '.$course_id.' AND id="'.$id.'" AND user_id="'.api_get_user_id().'" AND type="D"'; c_id = '.$course_id.' AND id="'.$id.'" AND user_id="'.api_get_user_id().'" AND type="D"';
$result = Database::query($sql); $result = Database::query($sql);
$row = Database::fetch_array($result); $row = Database::fetch_array($result);
@ -2002,11 +2006,11 @@ class Wiki
$status_notify_disc == 1 $status_notify_disc == 1
) { ) {
$sql = 'DELETE FROM '.$tbl_wiki_mailcue.' $sql = 'DELETE FROM '.$tbl_wiki_mailcue.'
WHERE WHERE
c_id = '.$course_id.' AND c_id = '.$course_id.' AND
id="'.$id.'" AND id="'.$id.'" AND
user_id="'.api_get_user_id().'" AND user_id="'.api_get_user_id().'" AND
type="D" AND type="D" AND
c_id = '.$course_id; c_id = '.$course_id;
Database::query($sql); Database::query($sql);
$status_notify_disc = 0; $status_notify_disc = 0;
@ -2116,9 +2120,9 @@ class Wiki
//second, extract data from first reg //second, extract data from first reg
$sql = 'SELECT * FROM '.$tbl_wiki.' $sql = 'SELECT * FROM '.$tbl_wiki.'
WHERE WHERE
c_id = '.$course_id.' AND c_id = '.$course_id.' AND
reflink="'.$id_or_ref.'" AND reflink="'.$id_or_ref.'" AND
'.$groupfilter.$condition_session.' '.$groupfilter.$condition_session.'
ORDER BY id ASC'; ORDER BY id ASC';
$result = Database::query($sql); $result = Database::query($sql);
@ -2219,10 +2223,10 @@ class Wiki
$sql = 'SELECT * FROM '.$tbl_wiki_mailcue.' $sql = 'SELECT * FROM '.$tbl_wiki_mailcue.'
WHERE WHERE
c_id = '.$course_id.' AND c_id = '.$course_id.' AND
id="'.$id.'" AND id="'.$id.'" AND
type="F" AND type="F" AND
group_id="'.$groupId.'" AND group_id="'.$groupId.'" AND
session_id="'.$session_id.'"'; session_id="'.$session_id.'"';
//type: P=page, D=discuss, F=full //type: P=page, D=discuss, F=full
@ -3467,9 +3471,9 @@ class Wiki
// Total hidden pages // Total hidden pages
$total_hidden = 0; $total_hidden = 0;
$sql = 'SELECT * FROM '.$tbl_wiki.' $sql = 'SELECT * FROM '.$tbl_wiki.'
WHERE WHERE
c_id = '.$course_id.' AND c_id = '.$course_id.' AND
visibility = 0 AND visibility = 0 AND
'.$groupfilter.$condition_session.' '.$groupfilter.$condition_session.'
GROUP BY reflink'; GROUP BY reflink';
// or group by page_id. As the mark of hidden places it in all // or group by page_id. As the mark of hidden places it in all
@ -3482,8 +3486,8 @@ class Wiki
//Total protect pages //Total protect pages
$total_protected = 0; $total_protected = 0;
$sql = 'SELECT * FROM '.$tbl_wiki.' $sql = 'SELECT * FROM '.$tbl_wiki.'
WHERE WHERE
c_id = '.$course_id.' AND c_id = '.$course_id.' AND
editlock = 1 AND editlock = 1 AND
'.$groupfilter.$condition_session.' '.$groupfilter.$condition_session.'
GROUP BY reflink'; GROUP BY reflink';
@ -3512,10 +3516,10 @@ class Wiki
$sql = 'SELECT * FROM '.$tbl_wiki.' s1 $sql = 'SELECT * FROM '.$tbl_wiki.' s1
WHERE s1.c_id = '.$course_id.' AND content="" AND id=( WHERE s1.c_id = '.$course_id.' AND content="" AND id=(
SELECT MAX(s2.id) FROM '.$tbl_wiki.' s2 SELECT MAX(s2.id) FROM '.$tbl_wiki.' s2
WHERE WHERE
s1.c_id = '.$course_id.' AND s1.c_id = '.$course_id.' AND
s1.reflink = s2.reflink AND s1.reflink = s2.reflink AND
'.$groupfilter.' AND '.$groupfilter.' AND
session_id='.$session_id.' session_id='.$session_id.'
)'; )';
$allpages = Database::query($sql); $allpages = Database::query($sql);
@ -3587,9 +3591,9 @@ class Wiki
WHERE s1.c_id = '.$course_id.' AND assignment=1 AND id=( WHERE s1.c_id = '.$course_id.' AND assignment=1 AND id=(
SELECT MAX(s2.id) SELECT MAX(s2.id)
FROM '.$tbl_wiki.' s2 FROM '.$tbl_wiki.' s2
WHERE WHERE
s2.c_id = '.$course_id.' AND s2.c_id = '.$course_id.' AND
s1.reflink = s2.reflink AND s1.reflink = s2.reflink AND
'.$groupfilter.' AND '.$groupfilter.' AND
session_id='.$session_id.' session_id='.$session_id.'
)'; )';
@ -3604,10 +3608,10 @@ class Wiki
$sql = 'SELECT * FROM '.$tbl_wiki.' s1 $sql = 'SELECT * FROM '.$tbl_wiki.' s1
WHERE s1.c_id = '.$course_id.' AND assignment=2 AND WHERE s1.c_id = '.$course_id.' AND assignment=2 AND
id = (SELECT MAX(s2.id) FROM '.$tbl_wiki.' s2 id = (SELECT MAX(s2.id) FROM '.$tbl_wiki.' s2
WHERE WHERE
s2.c_id = '.$course_id.' AND s2.c_id = '.$course_id.' AND
s1.reflink = s2.reflink AND s1.reflink = s2.reflink AND
'.$groupfilter.' AND '.$groupfilter.' AND
session_id='.$session_id.' session_id='.$session_id.'
)'; )';
//mark all versions, but do not use group by reflink because y want the pages not versions //mark all versions, but do not use group by reflink because y want the pages not versions
@ -3636,7 +3640,7 @@ class Wiki
$first_wiki_date = null; $first_wiki_date = null;
$sql = 'SELECT * FROM '.$tbl_wiki.' $sql = 'SELECT * FROM '.$tbl_wiki.'
WHERE c_id = '.$course_id.' AND '.$groupfilter.$condition_session.' WHERE c_id = '.$course_id.' AND '.$groupfilter.$condition_session.'
ORDER BY dtime ASC ORDER BY dtime ASC
LIMIT 1'; LIMIT 1';
$allpages = Database::query($sql); $allpages = Database::query($sql);
while ($row = Database::fetch_array($allpages)) { while ($row = Database::fetch_array($allpages)) {
@ -3648,7 +3652,7 @@ class Wiki
$last_wiki_date = null; $last_wiki_date = null;
$sql = 'SELECT * FROM '.$tbl_wiki.' $sql = 'SELECT * FROM '.$tbl_wiki.'
WHERE c_id = '.$course_id.' AND '.$groupfilter.$condition_session.' WHERE c_id = '.$course_id.' AND '.$groupfilter.$condition_session.'
ORDER BY dtime DESC ORDER BY dtime DESC
LIMIT 1'; LIMIT 1';
$allpages = Database::query($sql); $allpages = Database::query($sql);
while ($row = Database::fetch_array($allpages)) { while ($row = Database::fetch_array($allpages)) {
@ -4463,19 +4467,19 @@ class Wiki
WHERE s1.c_id = '.$course_id.' AND id=( WHERE s1.c_id = '.$course_id.' AND id=(
SELECT MAX(s2.id) FROM '.$tbl_wiki.' s2 SELECT MAX(s2.id) FROM '.$tbl_wiki.' s2
WHERE WHERE
s2.c_id = '.$course_id.' AND s2.c_id = '.$course_id.' AND
s1.reflink = s2.reflink AND s1.reflink = s2.reflink AND
'.$groupfilter.' AND '.$groupfilter.' AND
session_id='.$session_id.')'; session_id='.$session_id.')';
} else { } else {
// warning don't use group by reflink because does not return the last version // warning don't use group by reflink because does not return the last version
$sql = 'SELECT * FROM '.$tbl_wiki.' s1 $sql = 'SELECT * FROM '.$tbl_wiki.' s1
WHERE visibility=1 AND s1.c_id = '.$course_id.' AND id=( WHERE visibility=1 AND s1.c_id = '.$course_id.' AND id=(
SELECT MAX(s2.id) FROM '.$tbl_wiki.' s2 SELECT MAX(s2.id) FROM '.$tbl_wiki.' s2
WHERE WHERE
s2.c_id = '.$course_id.' AND s2.c_id = '.$course_id.' AND
s1.reflink = s2.reflink AND s1.reflink = s2.reflink AND
'.$groupfilter.' AND '.$groupfilter.' AND
session_id='.$session_id.')'; session_id='.$session_id.')';
} }
@ -6772,8 +6776,8 @@ class Wiki
} }
$sql_new = "SELECT * FROM $tbl_wiki $sql_new = "SELECT * FROM $tbl_wiki
WHERE WHERE
c_id = $course_id AND c_id = $course_id AND
id = '".Database::escape_string($_POST['new'])."'"; id = '".Database::escape_string($_POST['new'])."'";
$result_new = Database::query($sql_new); $result_new = Database::query($sql_new);
$version_new = Database::fetch_array($result_new); $version_new = Database::fetch_array($result_new);

Write Preview
Loading…
Cancel
Save