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

Removed useless backticks

Browse Source
skala
ywarnier 14 years ago
parent 4659f08621
commit 64fc415966
6 changed files with 75 additions and 75 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. 4
      main/inc/banner.inc.php
  2. 4
      main/inc/lib/fileManage.lib.php
  3. 12
      main/inc/lib/fileUpload.lib.php
  4. 40
      main/inc/lib/groupmanager.lib.php
  5. 2
      main/inc/lib/main_api.lib.php
  6. 88
      main/inc/lib/stats.lib.inc.php

4
main/inc/banner.inc.php
Unescape View File

@ -494,10 +494,10 @@ if (api_get_setting('show_toolshortcuts') == 'true') {
if (isset($database_connection)) {
// connect to the main database.
// if single database, don't pefix table names with the main database name in SQL queries
// (ex. SELECT * FROM `table`)
// (ex. SELECT * FROM table)
// if multiple database, prefix table names with the course database name in SQL queries (or no prefix if the table is in
// the main database)
// (ex. SELECT * FROM `table_from_main_db` - SELECT * FROM `courseDB`.`table_from_course_db`)
// (ex. SELECT * FROM table_from_main_db - SELECT * FROM courseDB.table_from_course_db)
Database::select_db($_configuration['main_database'], $database_connection);
}
?>

4
main/inc/lib/fileManage.lib.php
Unescape View File

@ -27,7 +27,7 @@ function update_db_info($action, $old_path, $new_path = '') {
if ($action == 'delete') {
/* // RH: metadata, update 2004/08/23
these two lines replaced by new code below:
$query = "DELETE FROM `$dbTable`
$query = "DELETE FROM $dbTable
WHERE path='".$old_path."' OR path LIKE '".$old_path."/%'";
*/
$old_path = Database::escape_string($old_path);
@ -61,7 +61,7 @@ function update_db_info($action, $old_path, $new_path = '') {
//Display::display_normal_message("new_path = $new_path");
// Older broken version
//$query = "UPDATE `$dbTable`
//$query = "UPDATE $dbTable
//SET path = CONCAT('".$new_path."', SUBSTRING(path, LENGTH('".$old_path."')+1) )
//WHERE path = '".$old_path."' OR path LIKE '".$old_path."/%'";

12
main/inc/lib/fileUpload.lib.php
Unescape View File

@ -818,7 +818,7 @@ function add_document($_course, $path, $filetype, $filesize, $title, $comment =
$session_id = api_get_session_id();
$table_document = Database::get_course_table(TABLE_DOCUMENT, $_course['dbName']);
$sql = "INSERT INTO $table_document
(`path`, `filetype`, `size`, `title`, `comment`, `readonly`, `session_id`)
(path, filetype, size, title, comment, readonly, session_id)
VALUES ('$path','$filetype','$filesize','".
Database::escape_string(htmlspecialchars($title, ENT_QUOTES, api_get_system_encoding()))."', '$comment', $readonly, $session_id)";
if (Database::query($sql)) {
@ -891,7 +891,7 @@ function item_property_update_on_folder($_course, $path, $user_id) {
$folder_id = DocumentManager::get_document_id($_course, $newpath);
if ($folder_id) {
$sql = "UPDATE $TABLE_ITEMPROPERTY SET `lastedit_date`='$time',`lastedit_type`='DocumentInFolderUpdated', `lastedit_user_id`='$user_id' WHERE tool='".TOOL_DOCUMENT."' AND ref='$folder_id'";
$sql = "UPDATE $TABLE_ITEMPROPERTY SET lastedit_date='$time',lastedit_type='DocumentInFolderUpdated', lastedit_user_id='$user_id' WHERE tool='".TOOL_DOCUMENT."' AND ref='$folder_id'";
Database::query($sql);
}
}
@ -944,16 +944,16 @@ function set_default_settings($upload_path, $filename, $filetype = 'file') {
$filename = substr($filename, 0, -1);
}
// $dbTable already has `backticks`!
//$query = "select count(*) as bestaat from `$dbTable` where path='$upload_path/$filename'";
// $dbTable already has backticks!
//$query = "select count(*) as bestaat from $dbTable where path='$upload_path/$filename'";
$query = "select count(*) as bestaat from $dbTable where path='$upload_path/$filename'";
$result = Database::query($query);
$row = Database::fetch_array($result);
if ($row['bestaat'] > 0) {
//$query = "update `$dbTable` set path='$upload_path/$filename',visibility='$default_visibility', filetype='$filetype' where path='$upload_path/$filename'";
//$query = "update $dbTable set path='$upload_path/$filename',visibility='$default_visibility', filetype='$filetype' where path='$upload_path/$filename'";
$query = "update $dbTable set path='$upload_path/$filename',visibility='$default_visibility', filetype='$filetype' where path='$upload_path/$filename'";
} else {
//$query = "INSERT INTO `$dbTable` (path,visibility,filetype) VALUES('$upload_path/$filename','$default_visibility','$filetype')";
//$query = "INSERT INTO $dbTable (path,visibility,filetype) VALUES('$upload_path/$filename','$default_visibility','$filetype')";
$query = "INSERT INTO $dbTable (path,visibility,filetype) VALUES('$upload_path/$filename','$default_visibility','$filetype')";
}
Database::query($query);

40
main/inc/lib/groupmanager.lib.php
Unescape View File

@ -120,11 +120,11 @@ class GroupManager {
g.session_id,
ug.user_id is_member,
COUNT(ug2.id) number_of_members
FROM ".$table_group." `g`
LEFT JOIN ".$table_group_user." `ug`
ON `ug`.`group_id` = `g`.`id` AND `ug`.`user_id` = '".$_user['user_id']."'
LEFT JOIN ".$table_group_user." `ug2`
ON `ug2`.`group_id` = `g`.`id`";
FROM ".$table_group." g
LEFT JOIN ".$table_group_user." ug
ON ug.group_id = g.id AND ug.user_id = '".$_user['user_id']."'
LEFT JOIN ".$table_group_user." ug2
ON ug2.group_id = g.id";
} elseif ($my_status_of_user_in_course==STUDENT || $is_student_in_session===true || $_SESSION['studentview'] == 'studentview') {
$sql = "SELECT g.id ,
@ -138,11 +138,11 @@ class GroupManager {
g.session_id,
ug.user_id is_member,
COUNT(ug2.id) number_of_members
FROM ".$table_group." `g`
LEFT JOIN ".$table_group_user." `ug`
ON `ug`.`group_id` = `g`.`id` AND `ug`.`user_id` = '".$_user['user_id']."'
LEFT JOIN ".$table_group_user." `ug2`
ON `ug2`.`group_id` = `g`.`id`";
FROM ".$table_group." g
LEFT JOIN ".$table_group_user." ug
ON ug.group_id = g.id AND ug.user_id = '".$_user['user_id']."'
LEFT JOIN ".$table_group_user." ug2
ON ug2.group_id = g.id";
}
if ($category != null){
@ -828,9 +828,9 @@ class GroupManager {
$sql = "SELECT g.id gid, g.max_student-count(ug.user_id) nbPlaces, g.max_student
FROM ".$group_table." g
LEFT JOIN ".$group_user_table." ug
ON `g`.`id` = `ug`.`group_id`
ON g.id = ug.group_id
WHERE g.id IN (".implode(',', $group_ids).")
GROUP BY (`g`.`id`)
GROUP BY (g.id)
HAVING (nbPlaces > 0 OR g.max_student = ".MEMBER_PER_GROUP_NO_LIMIT.")
ORDER BY nbPlaces DESC";
$sql_result = Database::query($sql);
@ -1043,12 +1043,12 @@ class GroupManager {
public static function get_subscribed_users ($group_id) {
$table_user = Database :: get_main_table(TABLE_MAIN_USER);
$table_group_user = Database :: get_course_table(TABLE_GROUP_USER);
$order_clause = api_sort_by_first_name() ? ' ORDER BY `u`.`firstname`, `u`.`lastname`' : ' ORDER BY `u`.`lastname`, `u`.`firstname`';
$order_clause = api_sort_by_first_name() ? ' ORDER BY u.firstname, u.lastname' : ' ORDER BY u.lastname, u.firstname';
$group_id = Database::escape_string($group_id);
$sql = "SELECT `ug`.`id`, `u`.`user_id`, `u`.`lastname`, `u`.`firstname`, `u`.`email`
$sql = "SELECT ug.id, u.user_id, u.lastname, u.firstname, u.email
FROM ".$table_user." u, ".$table_group_user." ug
WHERE `ug`.`group_id`='".$group_id."'
AND `ug`.`user_id`=`u`.`user_id`". $order_clause;
WHERE ug.group_id='".$group_id."'
AND ug.user_id=u.user_id". $order_clause;
$db_result = Database::query($sql);
$users = array ();
while ($user = Database::fetch_object($db_result))
@ -1072,12 +1072,12 @@ class GroupManager {
public static function get_subscribed_tutors ($group_id,$id_only=false) {
$table_user = Database :: get_main_table(TABLE_MAIN_USER);
$table_group_tutor = Database :: get_course_table(TABLE_GROUP_TUTOR);
$order_clause = api_sort_by_first_name() ? ' ORDER BY `u`.`firstname`, `u`.`lastname`' : ' ORDER BY `u`.`lastname`, `u`.`firstname`';
$order_clause = api_sort_by_first_name() ? ' ORDER BY u.firstname, u.lastname' : ' ORDER BY u.lastname, u.firstname';
$group_id = Database::escape_string($group_id);
$sql = "SELECT `tg`.`id`, `u`.`user_id`, `u`.`lastname`, `u`.`firstname`, `u`.`email`
$sql = "SELECT tg.id, u.user_id, u.lastname, u.firstname, u.email
FROM ".$table_user." u, ".$table_group_tutor." tg
WHERE `tg`.`group_id`='".$group_id."'
AND `tg`.`user_id`=`u`.`user_id`".$order_clause;
WHERE tg.group_id='".$group_id."'
AND tg.user_id=u.user_id".$order_clause;
$db_result = Database::query($sql);
$users = array ();
while ($user = Database::fetch_object($db_result))

2
main/inc/lib/main_api.lib.php
Unescape View File

@ -3556,7 +3556,7 @@ function api_get_access_url($id) {
//$table_access_url = Database::get_main_table(TABLE_MAIN_ACCESS_URL);
$table = 'access_url';
$database = $_configuration['main_database'];
$table_access_url = "`".$database."`.`".$table."`";
$table_access_url = "".$database.".".$table."";
$sql = "SELECT url, description, active, created_by, tms
FROM $table_access_url WHERE id = '$id' ";
$res = Database::query($sql);

88
main/inc/lib/stats.lib.inc.php
Unescape View File

@ -43,13 +43,13 @@
*/
// regroup table names for maintenance purpose
$TABLETRACK_OPEN = $_configuration['statistics_database']."`.`track_e_open";
$TABLETRACK_OPEN = $_configuration['statistics_database'].".track_e_open";
$TABLESTATS_PROVIDERS = $_configuration['statistics_database']."`.`track_c_providers";
$TABLESTATS_COUNTRIES = $_configuration['statistics_database']."`.`track_c_countries";
$TABLESTATS_BROWSERS = $_configuration['statistics_database']."`.`track_c_browsers";
$TABLESTATS_OS = $_configuration['statistics_database']."`.`track_c_os";
$TABLESTATS_REFERERS = $_configuration['statistics_database']."`.`track_c_referers";
$TABLESTATS_PROVIDERS = $_configuration['statistics_database'].".track_c_providers";
$TABLESTATS_COUNTRIES = $_configuration['statistics_database'].".track_c_countries";
$TABLESTATS_BROWSERS = $_configuration['statistics_database'].".track_c_browsers";
$TABLESTATS_OS = $_configuration['statistics_database'].".track_c_os";
$TABLESTATS_REFERERS = $_configuration['statistics_database'].".track_c_referers";
/*
@ -61,7 +61,7 @@ $TABLESTATS_REFERERS = $_configuration['statistics_database']."`.`track_c_ref
/**
* @author Sebastien Piraux <piraux_seb@hotmail.com>
* @desc uses `$TABLETRACK_OPEN` to split recorded
* @desc uses $TABLETRACK_OPEN to split recorded
information, to count occurences (for os, provider,...)
and to increment the number of occurrences of each
different element into the corresponding tables
@ -77,7 +77,7 @@ function decodeOpenInfos() {
// only processed record have to be cleaned
$sql = "SELECT open_id
FROM `$TABLETRACK_OPEN`
FROM $TABLETRACK_OPEN
WHERE open_date <= NOW()
ORDER BY open_id DESC
LIMIT 1";
@ -90,7 +90,7 @@ function decodeOpenInfos() {
//--Providers And Countries-------------------------------------------//
$sql = "SELECT open_remote_host
FROM `$TABLETRACK_OPEN`
FROM $TABLETRACK_OPEN
WHERE open_remote_host != ''
AND open_id <= '".$processBegin."' ";
$query = Database::query($sql);
@ -120,7 +120,7 @@ function decodeOpenInfos() {
// provider and countries done
//--Browsers and OS---------------------------------------------------//
$sql = "SELECT open_agent
FROM `$TABLETRACK_OPEN`
FROM $TABLETRACK_OPEN
WHERE open_remote_host != ''
AND open_id <= '".$processBegin."' ";
$query =Database::query( $sql );
@ -147,7 +147,7 @@ function decodeOpenInfos() {
//--Referers----------------------------------------------------------//
$sql = "SELECT open_referer
FROM `$TABLETRACK_OPEN`
FROM $TABLETRACK_OPEN
WHERE open_referer != ''
AND open_id <= '".$processBegin."' ";
$query = Database::query( $sql );
@ -186,7 +186,7 @@ function decodeOpenInfos() {
function cleanProcessedRecords( $limit ) {
global $TABLETRACK_OPEN;
$limit = Database::escape_string($limit);
$sql = "UPDATE `".$TABLETRACK_OPEN."`
$sql = "UPDATE $TABLETRACK_OPEN
SET open_remote_host = '',
open_agent = '',
open_referer =''
@ -252,20 +252,20 @@ function fillProvidersTable($providers_array) {
if(is_array($providers_array)) {
foreach ( $providers_array as $prov=>$number ) {
$sql = "SELECT counter
FROM `".$TABLESTATS_PROVIDERS."`
WHERE `provider` = '".$prov."'";
FROM ".$TABLESTATS_PROVIDERS."
WHERE provider = '".$prov."'";
$res = Database::query($sql);
// if this provider already exists in the DB
if($row = Database::num_rows($res)) {
// update
$sql2 = "UPDATE `".$TABLESTATS_PROVIDERS."`
SET `counter` = counter + '$number'
WHERE `provider` = '".$prov."'";
$sql2 = "UPDATE $TABLESTATS_PROVIDERS
SET counter = counter + '$number'
WHERE provider = '".$prov."'";
} else {
// insert
$sql2 = "INSERT INTO `".$TABLESTATS_PROVIDERS."`
(`provider`,`counter`)
$sql2 = "INSERT INTO $TABLESTATS_PROVIDERS
(provider,counter)
VALUES ('".$prov."','".$number."')";
}
Database::query($sql2);;
@ -288,7 +288,7 @@ function fillProvidersTable($providers_array) {
function loadCountries() {
global $TABLESTATS_COUNTRIES;
$sql = "SELECT code, country
FROM `".$TABLESTATS_COUNTRIES."`";
FROM $TABLESTATS_COUNTRIES";
$res = Database::query($sql);
$i = 0 ;
if (Database::num_rows($res) > 0){
@ -351,9 +351,9 @@ function fillCountriesTable($countries_array) {
if(is_array($countries_array)) {
foreach ( $countries_array as $country=>$number ) {
// update
$sql = "UPDATE `".$TABLESTATS_COUNTRIES."`
SET `counter` = counter + '$number'
WHERE `country` = '".$country."'";
$sql = "UPDATE $TABLESTATS_COUNTRIES
SET counter = counter + '$number'
WHERE country = '".$country."'";
Database::query($sql);
}
}
@ -486,20 +486,20 @@ function fillBrowsersTable($browsers_array) {
if (is_array($browsers_array)) {
foreach ( $browsers_array as $browser=>$number ) {
$sql = "SELECT counter
FROM `".$TABLESTATS_BROWSERS."`
WHERE `browser` = '".$browser."'";
FROM $TABLESTATS_BROWSERS
WHERE browser = '".$browser."'";
$res = Database::query($sql);
// if this provider already exists in the DB
if($row = Database::num_rows($res)) {
// update
$sql2 = "UPDATE `".$TABLESTATS_BROWSERS."`
SET `counter` = counter + '$number'
WHERE `browser` = '".$browser."'";
$sql2 = "UPDATE $TABLESTATS_BROWSERS
SET counter = counter + '$number'
WHERE browser = '".$browser."'";
} else {
// insert
$sql2 = "INSERT INTO `".$TABLESTATS_BROWSERS."`
(`browser`,`counter`)
$sql2 = "INSERT INTO $TABLESTATS_BROWSERS
(browser,counter)
VALUES ('".$browser."','".$number."')";
}
Database::query($sql2);
@ -517,20 +517,20 @@ function fillOsTable($os_array) {
if (is_array($os_array)) {
foreach ($os_array as $os=>$number) {
$sql = "SELECT counter
FROM `".$TABLESTATS_OS."`
WHERE `os` = '".$os."'";
FROM $TABLESTATS_OS
WHERE os = '".$os."'";
$res = Database::query($sql);
// if this provider already exists in the DB
if($row = Database::num_rows($res)) {
// update
$sql2 = "UPDATE `".$TABLESTATS_OS."`
SET `counter` = counter + '$number'
WHERE `os` = '".$os."'";
$sql2 = "UPDATE $TABLESTATS_OS
SET counter = counter + '$number'
WHERE os = '".$os."'";
} else {
// insert
$sql2 = "INSERT INTO `".$TABLESTATS_OS."`
(`os`,`counter`)
$sql2 = "INSERT INTO $TABLESTATS_OS
(os,counter)
VALUES ('".$os."','".$number."')";
}
Database::query($sql2);
@ -574,20 +574,20 @@ function fillReferersTable($referers_array) {
if (is_array($referers_array)) {
foreach ( $referers_array as $referer=>$number ) {
$sql = "SELECT counter
FROM `".$TABLESTATS_REFERERS."`
WHERE `referer` = '".$referer."'";
FROM $TABLESTATS_REFERERS
WHERE referer = '".$referer."'";
$res = Database::query($sql);
// if this provider already exists in the DB
if($row = Database::num_rows($res)) {
// update
$sql2 = "UPDATE `".$TABLESTATS_REFERERS."`
SET `counter` = counter + '$number'
WHERE `referer` = '".$referer."'";
$sql2 = "UPDATE $TABLESTATS_REFERERS
SET counter = counter + '$number'
WHERE referer = '".$referer."'";
} else {
// insert
$sql2 = "INSERT INTO `".$TABLESTATS_REFERERS."`
(`referer`,`counter`)
$sql2 = "INSERT INTO $TABLESTATS_REFERERS
(referer,counter)
VALUES ('".$referer."','".$number."')";
}
Database::query($sql2);

Write Preview
Loading…
Cancel
Save