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: applied PSR-2 coding conventions

Browse Source
skala
Yannick Warnier 12 years ago
parent ed455504b8
commit 7242cbfc1d
3 changed files with 121 additions and 123 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. 85
      main/inc/lib/access_url_edit_courses_to_url_functions.lib.php
  2. 76
      main/inc/lib/access_url_edit_sessions_to_url_functions.lib.php
  3. 83
      main/inc/lib/access_url_edit_users_to_url_functions.lib.php

85
main/inc/lib/access_url_edit_courses_to_url_functions.lib.php
Unescape View File

@ -18,48 +18,47 @@ require_once ('xajax/xajax.inc.php');
* @author Julio Montoya - Cleaning code * @author Julio Montoya - Cleaning code
* @author Ricardo Rodriguez - Separated the function and code * @author Ricardo Rodriguez - Separated the function and code
*/ */
class Accessurleditcoursestourl { class Accessurleditcoursestourl
{
/** /**
* Search for a list of available courses by title or code, based on * Search for a list of available courses by title or code, based on
* a given string * a given string
* @param string String to search for * @param string String to search for
* @param int Deprecated param * @param int Deprecated param
* @return string A formatted, xajax answer block * @return string A formatted, xajax answer block
* @assert () === false * @assert () === false
*/ */
function search_courses($needle, $id) function search_courses($needle, $id)
{ {
global $tbl_course; global $tbl_course;
$xajax_response = new XajaxResponse(); $xajax_response = new XajaxResponse();
$return = ''; $return = '';
if(!empty($needle)) {
// xajax send utf8 datas... datas in db can be non-utf8 datas
$charset = api_get_system_encoding();
$needle = api_convert_encoding($needle, $charset, 'utf-8');
$needle = Database::escape_string($needle);
// search courses where username or firstname or lastname begins likes $needle
$sql = 'SELECT code, title FROM '.$tbl_course.' u
WHERE (title LIKE "'.$needle.'%"
OR code LIKE "'.$needle.'%"
)
ORDER BY title, code
LIMIT 11';
$rs = Database::query($sql);
$i=0;
while ($course = Database :: fetch_array($rs)) {
$i++;
if ($i<=10) {
$return .= '<a href="javascript: void(0);" onclick="javascript: add_user_to_url(\''.addslashes($course['code']).'\',\''.addslashes($course['title']).' ('.addslashes($course['code']).')'.'\')">'.$course['title'].' ('.$course['code'].')</a><br />';
} else {
$return .= '...<br />';
}
}
}
$xajax_response -> addAssign('ajax_list_courses','innerHTML',api_utf8_encode($return));
return $xajax_response;
}
if (!empty($needle)) {
// xajax send utf8 datas... datas in db can be non-utf8 datas
$charset = api_get_system_encoding();
$needle = api_convert_encoding($needle, $charset, 'utf-8');
$needle = Database::escape_string($needle);
// search courses where username or firstname or lastname begins likes $needle
$sql = 'SELECT code, title FROM '.$tbl_course.' u '.
' WHERE (title LIKE "'.$needle.'%" '.
' OR code LIKE "'.$needle.'%" '.
' ) '.
' ORDER BY title, code '.
' LIMIT 11';
$rs = Database::query($sql);
$i=0;
while ($course = Database :: fetch_array($rs)) {
$i++;
if ($i<=10) {
$return .= '<a href="javascript: void(0);" onclick="javascript: add_user_to_url(\''.addslashes($course['code']).'\',\''.addslashes($course['title']).' ('.addslashes($course['code']).')'.'\')">'.$course['title'].' ('.$course['code'].')</a><br />';
} else {
$return .= '...<br />';
}
}
}
$xajax_response -> addAssign('ajax_list_courses','innerHTML',api_utf8_encode($return));
return $xajax_response;
}
} }
?>

76
main/inc/lib/access_url_edit_sessions_to_url_functions.lib.php
Unescape View File

@ -18,44 +18,44 @@ require_once ('xajax/xajax.inc.php');
* @author Julio Montoya - Cleaning code * @author Julio Montoya - Cleaning code
* @author Ricardo Rodriguez - Separated the function and code * @author Ricardo Rodriguez - Separated the function and code
*/ */
class Accessurleditsessionstourl { class Accessurleditsessionstourl
/** {
* Search sessions by name, based on a search string /**
* @param string Search string * Search sessions by name, based on a search string
* @param int Deprecated param * @param string Search string
* @return string Xajax response block * @param int Deprecated param
* @assert () === false * @return string Xajax response block
*/ * @assert () === false
function search_sessions($needle, $id) */
{ function search_sessions($needle, $id)
global $tbl_session; {
$xajax_response = new XajaxResponse(); global $tbl_session;
$return = ''; $xajax_response = new XajaxResponse();
$return = '';
if(!empty($needle)) { if (!empty($needle)) {
// xajax send utf8 datas... datas in db can be non-utf8 datas // xajax send utf8 datas... datas in db can be non-utf8 datas
$charset = api_get_system_encoding(); $charset = api_get_system_encoding();
$needle = api_convert_encoding($needle, $charset, 'utf-8'); $needle = api_convert_encoding($needle, $charset, 'utf-8');
$needle = Database::escape_string($needle); $needle = Database::escape_string($needle);
// search sessiones where username or firstname or lastname begins likes $needle // search sessiones where username or firstname or lastname begins likes $needle
$sql = 'SELECT id, name FROM '.$tbl_session.' u $sql = 'SELECT id, name FROM '.$tbl_session.' u
WHERE (name LIKE "'.$needle.'%") WHERE (name LIKE "'.$needle.'%")
ORDER BY name, id ORDER BY name, id
LIMIT 11'; LIMIT 11';
$rs = Database::query($sql); $rs = Database::query($sql);
$i=0; $i=0;
while ($session = Database :: fetch_array($rs)) { while ($session = Database :: fetch_array($rs)) {
$i++; $i++;
if ($i<=10) { if ($i<=10) {
$return .= '<a href="#" onclick="add_user_to_url(\''.addslashes($session['id']).'\',\''.addslashes($session['name']).' ('.addslashes($session['id']).')'.'\')">'.$session['name'].' </a><br />'; $return .= '<a href="#" onclick="add_user_to_url(\''.addslashes($session['id']).'\',\''.addslashes($session['name']).' ('.addslashes($session['id']).')'.'\')">'.$session['name'].' </a><br />';
} else { } else {
$return .= '...<br />'; $return .= '...<br />';
} }
} }
} }
$xajax_response -> addAssign('ajax_list_courses','innerHTML',api_utf8_encode($return)); $xajax_response -> addAssign('ajax_list_courses','innerHTML',api_utf8_encode($return));
return $xajax_response; return $xajax_response;
} }
} }
?>

83
main/inc/lib/access_url_edit_users_to_url_functions.lib.php
Unescape View File

@ -21,49 +21,48 @@ require_once ('xajax/xajax.inc.php');
*/ */
class Accessurledituserstourl class Accessurledituserstourl
{ {
/** /**
* Search users by username, firstname or lastname, based on the given * Search users by username, firstname or lastname, based on the given
* search string * search string
* @param string Search string * @param string Search string
* @param int Deprecated param * @param int Deprecated param
* @return string Xajax response block * @return string Xajax response block
* @assert () === false * @assert () === false
*/ */
function search_users($needle, $id) function search_users($needle, $id)
{ {
global $tbl_user, $tbl_access_url_rel_user; global $tbl_user, $tbl_access_url_rel_user;
$xajax_response = new XajaxResponse(); $xajax_response = new XajaxResponse();
$return = ''; $return = '';
if(!empty($needle)) { if (!empty($needle)) {
// xajax send utf8 datas... datas in db can be non-utf8 datas // xajax send utf8 datas... datas in db can be non-utf8 datas
$charset = api_get_system_encoding(); $charset = api_get_system_encoding();
$needle = api_convert_encoding($needle, $charset, 'utf-8'); $needle = api_convert_encoding($needle, $charset, 'utf-8');
$needle = Database::escape_string($needle); $needle = Database::escape_string($needle);
// search users where username or firstname or lastname begins likes $needle // search users where username or firstname or lastname begins likes $needle
$order_clause = api_sort_by_first_name() ? ' ORDER BY firstname, lastname, username' : ' ORDER BY lastname, firstname, username'; $order_clause = api_sort_by_first_name() ? ' ORDER BY firstname, lastname, username' : ' ORDER BY lastname, firstname, username';
$sql = 'SELECT u.user_id, username, lastname, firstname FROM '.$tbl_user.' u $sql = 'SELECT u.user_id, username, lastname, firstname FROM '.$tbl_user.' u '.
WHERE (username LIKE "'.$needle.'%" ' WHERE (username LIKE "'.$needle.'%" '.
OR firstname LIKE "'.$needle.'%" ' OR firstname LIKE "'.$needle.'%" '.
OR lastname LIKE "'.$needle.'%")'. ' OR lastname LIKE "'.$needle.'%") '.
$order_clause. $order_clause .
' LIMIT 11'; ' LIMIT 11';
$rs = Database::query($sql); $rs = Database::query($sql);
$i=0; $i=0;
while ($user = Database :: fetch_array($rs)) {
$i++;
if ($i<=10) {
$return .= '<a href="javascript: void(0);" onclick="javascript: add_user_to_url(\''.addslashes($user['user_id']).'\',\''.api_get_person_name(addslashes($user['firstname']), addslashes($user['lastname'])).' ('.addslashes($user['username']).')'.'\')">'.api_get_person_name($user['firstname'], $user['lastname']).' ('.$user['username'].')</a><br />';
} else {
$return .= '...<br />';
}
}
}
$xajax_response -> addAssign('ajax_list_users','innerHTML',api_utf8_encode($return));
return $xajax_response;
}
while ($user = Database :: fetch_array($rs)) {
$i++;
if ($i<=10) {
$return .= '<a href="javascript: void(0);" onclick="javascript: add_user_to_url(\''.addslashes($user['user_id']).'\',\''.api_get_person_name(addslashes($user['firstname']), addslashes($user['lastname'])).' ('.addslashes($user['username']).')'.'\')">'.api_get_person_name($user['firstname'], $user['lastname']).' ('.$user['username'].')</a><br />';
} else {
$return .= '...<br />';
}
}
}
$xajax_response -> addAssign('ajax_list_users','innerHTML',api_utf8_encode($return));
return $xajax_response;
}
} }
?>

Write Preview
Loading…
Cancel
Save