Projekt

Obecné

Profil

« Předchozí | Další » 

Revize 2035

Přidáno uživatelem David Raška před asi 11 roky(ů)

Opravy:
- fixes #654 - Oprava chyby pri vyhledavani

Zobrazit rozdíly:

freenetis/branches/1.1/application/controllers/search.php
* @author Michal Kliment
* @param string $keyword
*/
private function search($keyword = NULL)
private function search($keyword = NULL, $limit = null)
{
$keywords = explode(" ", trim($keyword));
......
else
$total_counts[$rule['model']] = 1;
$result = $search_model->{$rule['method']}($key);
$result = $search_model->{$rule['method']}($key, $limit);
foreach ($result as $row)
{
......
*/
public function ajax($count = 100)
{
$this->search($this->input->get('q'));
$this->search($this->input->get('q'), $count);
$counter = 0;
freenetis/branches/1.1/application/models/search.php
* @param string $keyword
* @return MySQL_Result object
*/
public function member_name($keyword)
public function member_name($keyword, $limit = null)
{
$sql_limit = '';
if ($limit)
{
$sql_limit = ' LIMIT '.$limit;
}
return $this->db->query("
SELECT m.id, m.name AS value,
CONCAT('ID ',m.id,', ',s.street,' ',ap.street_number,', ',tw.town,IF(tw.quarter IS NOT NULL,CONCAT('-',tw.quarter),'')) AS `desc`,
......
LEFT JOIN membership_interrupts mi ON m.id = mi.member_id
LEFT JOIN members_fees mf ON mi.members_fee_id = mf.id AND (mf.activation_date < CURDATE() AND mf.deactivation_date > CURDATE())
WHERE m.name LIKE ? COLLATE utf8_general_ci
", array
".$sql_limit, array
(
" (" . __('I') . ")",
"%$keyword%"
......
* @param string $keyword
* @return MySQL_Result object
*/
public function member_id($keyword)
public function member_id($keyword, $limit = null)
{
$sql_limit = '';
if ($limit)
{
$sql_limit = ' LIMIT '.$limit;
}
return $this->db->query("
SELECT m.id, m.id AS value,
CONCAT('ID ',m.id,', ',s.street,' ',ap.street_number,', ',tw.town,IF(tw.quarter IS NOT NULL,CONCAT('-',tw.quarter),'')) AS `desc`,
......
LEFT JOIN membership_interrupts mi ON m.id = mi.member_id
LEFT JOIN members_fees mf ON mi.members_fee_id = mf.id AND (mf.activation_date < CURDATE() AND mf.deactivation_date > CURDATE())
WHERE m.id LIKE ? COLLATE utf8_general_ci
", array
".$sql_limit, array
(
" (" . __('I') . ")",
"%$keyword%"
......
* @param string $keyword
* @return MySQL_Result object
*/
public function member_variable_symbol($keyword)
public function member_variable_symbol($keyword, $limit = null)
{
$sql_limit = '';
if ($limit)
{
$sql_limit = ' LIMIT '.$limit;
}
return $this->db->query("
SELECT m.id, vs.variable_symbol AS value,
CONCAT(?, vs.variable_symbol) AS `desc`,
......
LEFT JOIN membership_interrupts mi ON m.id = mi.member_id
LEFT JOIN members_fees mf ON mi.members_fee_id = mf.id AND (mf.activation_date < CURDATE() AND mf.deactivation_date > CURDATE())
WHERE vs.variable_symbol LIKE ? COLLATE utf8_general_ci
", array
".$sql_limit, array
(
__('Variable symbol') . ": ",
" (" . __('I') . ")",
......
* @param string $keyword
* @return MySQL_Result object
*/
public function member_comment($keyword)
public function member_comment($keyword, $limit = null)
{
$sql_limit = '';
if ($limit)
{
$sql_limit = ' LIMIT '.$limit;
}
return $this->db->query("
SELECT m.id, m.comment AS value,
CONCAT(?,m.comment) AS `desc`,
......
LEFT JOIN membership_interrupts mi ON m.id = mi.member_id
LEFT JOIN members_fees mf ON mi.members_fee_id = mf.id AND (mf.activation_date < CURDATE() AND mf.deactivation_date > CURDATE())
WHERE m.comment LIKE ? COLLATE utf8_general_ci
", array
".$sql_limit, array
(
__('Comment') . ": ",
" (" . __('I') . ")",
......
* @param string $keyword
* @return MySQL_Result object
*/
public function member_town($keyword)
public function member_town($keyword, $limit = null)
{
$sql_limit = '';
if ($limit)
{
$sql_limit = ' LIMIT '.$limit;
}
return $this->db->query("
SELECT m.id,
CONCAT(town, ' ',IFNULL(quarter,'')) AS value,
......
LEFT JOIN membership_interrupts mi ON m.id = mi.member_id
LEFT JOIN members_fees mf ON mi.members_fee_id = mf.id AND (mf.activation_date < CURDATE() AND mf.deactivation_date > CURDATE())
WHERE CONCAT(tw.town, ' ',IFNULL(tw.quarter,'')) LIKE ? COLLATE utf8_general_ci
", " (" . __('I') . ")", "%$keyword%");
".$sql_limit, " (" . __('I') . ")", "%$keyword%");
}
/**
......
* @param string $keyword
* @return MySQL_Result object
*/
public function member_street($keyword)
public function member_street($keyword, $limit = null)
{
$sql_limit = '';
if ($limit)
{
$sql_limit = ' LIMIT '.$limit;
}
return $this->db->query("
SELECT m.id,
CONCAT(s.street, ' ',ap.street_number) AS value,
......
LEFT JOIN membership_interrupts mi ON m.id = mi.member_id
LEFT JOIN members_fees mf ON mi.members_fee_id = mf.id AND (mf.activation_date < CURDATE() AND mf.deactivation_date > CURDATE())
WHERE CONCAT(s.street, ' ',ap.street_number) LIKE ? COLLATE utf8_general_ci
", " (" . __('I') . ")", "%$keyword%");
".$sql_limit, " (" . __('I') . ")", "%$keyword%");
}
/**
......
* @param string $keyword
* @return MySQL_Result object
*/
public function user_name($keyword)
public function user_name($keyword, $limit = null)
{
$sql_limit = '';
if ($limit)
{
$sql_limit = ' LIMIT '.$limit;
}
return $this->db->query("
SELECT u.id,
CONCAT(u.name,' ',u.surname) AS value,
......
CONCAT(?, u.name, ' ',u.surname) AS return_value, 'users/show/' AS link
FROM users u
WHERE CONCAT(u.name,' ',u.surname) LIKE ? COLLATE utf8_general_ci
", array
".$sql_limit, array
(
__('Username') . ": ",
__('User') . " ",
......
* @param string $keyword
* @return MySQL_Result object
*/
public function user_login($keyword)
public function user_login($keyword, $limit = null)
{
$sql_limit = '';
if ($limit)
{
$sql_limit = ' LIMIT '.$limit;
}
return $this->db->query("
SELECT u.id, u.login AS value,
CONCAT(?,u.login) AS `desc`,
CONCAT(?, u.name, ' ',u.surname) AS return_value,
'users/show/' AS link
FROM users u WHERE u.login LIKE ? COLLATE utf8_general_ci
", array
".$sql_limit, array
(
__('Username') . ": ",
__('User') . " ",
......
* @param string $keyword
* @return MySQL_Result object
*/
public function user_contact($keyword)
public function user_contact($keyword, $limit = null)
{
$sql_limit = '';
if ($limit)
{
$sql_limit = ' LIMIT '.$limit;
}
return $this->db->query("
SELECT u.id, c.value AS value,
CONCAT(IFNULL(t.translated_term,e.value),': ',c.value) AS `desc`,
......
LEFT JOIN enum_types e ON c.type = e.id
LEFT JOIN translations t ON e.value LIKE t.original_term AND t.lang = 'cs'
WHERE c.value LIKE ? COLLATE utf8_general_ci
", __('User') . ": ", "%$keyword%");
".$sql_limit, __('User') . ": ", "%$keyword%");
}
/**
......
* @param string $keyword
* @return MySQL_Result object
*/
public function town_name($keyword)
public function town_name($keyword, $limit = null)
{
$sql_limit = '';
if ($limit)
{
$sql_limit = ' LIMIT '.$limit;
}
return $this->db->query("
SELECT t.id, CONCAT(t.town, ' ',t.quarter) AS value, t.id AS `desc`,
CONCAT(?,t.zip_code) AS `desc`,
......
'towns/show/' AS link
FROM towns t
WHERE CONCAT(t.town, ' ',t.quarter) LIKE ? COLLATE utf8_general_ci
", array
".$sql_limit, array
(
__('ZIP code') . ": ",
__('Town') . " ",
......
* @param string $keyword
* @return MySQL_Result object
*/
public function device_name($keyword)
public function device_name($keyword, $limit = null)
{
$sql_limit = '';
if ($limit)
{
$sql_limit = ' LIMIT '.$limit;
}
return $this->db->query("
SELECT d.id, d.name AS value,
CONCAT(?,u.name,' ',u.surname) AS `desc`,
......
FROM devices d
JOIN users u ON d.user_id = u.id
WHERE d.name LIKE ? COLLATE utf8_general_ci
", array
".$sql_limit, array
(
__('User') . ": ",
__('Device') . " ",
......
* @param string $keyword
* @return MySQL_Result object
*/
public function device_mac($keyword)
public function device_mac($keyword, $limit = null)
{
$sql_limit = '';
if ($limit)
{
$sql_limit = ' LIMIT '.$limit;
}
return $this->db->query("
SELECT d.id, ic.mac AS value,
CONCAT(?, ic.mac) AS `desc`,
......
FROM devices d
JOIN ifaces ic ON ic.device_id = d.id
WHERE ic.mac LIKE ? COLLATE utf8_general_ci
", array
".$sql_limit, array
(
__('MAC address') . ": ",
__('Device') . " ",
......
* @param string $keyword
* @return MySQL_Result object
*/
public function device_ip_address($keyword)
public function device_ip_address($keyword, $limit = null)
{
$sql_limit = '';
if ($limit)
{
$sql_limit = ' LIMIT '.$limit;
}
return $this->db->query("
SELECT d.id, ip.ip_address AS value,
CONCAT(?, ip.ip_address) AS `desc`,
......
JOIN ifaces ic ON ic.device_id = d.id
LEFT JOIN ip_addresses ip ON ip.iface_id = ic.id
WHERE ip.ip_address LIKE ? COLLATE utf8_general_ci
", array
".$sql_limit, array
(
__('IP address') . ": ",
__('Device') . " ",
......
* @param string $keyword
* @return MySQL_Result object
*/
public function device_ssid($keyword)
public function device_ssid($keyword, $limit = null)
{
$sql_limit = '';
if ($limit)
{
$sql_limit = ' LIMIT '.$limit;
}
return $this->db->query("
SELECT d.id, s.wireless_ssid AS value,
CONCAT(?, s.wireless_ssid) AS `desc`,
......
JOIN links s ON i.link_id = s.id
WHERE i.wireless_mode = ? AND s.medium = ? AND
s.wireless_ssid LIKE ? COLLATE utf8_general_ci
", array
".$sql_limit, array
(
__('SSID') . ": ",
__('Device') . " ",
......
* @param string $keyword
* @return MySQL_Result object
*/
public function subnet_name($keyword)
public function subnet_name($keyword, $limit = null)
{
$sql_limit = '';
if ($limit)
{
$sql_limit = ' LIMIT '.$limit;
}
return $this->db->query("
SELECT s.id, s.name AS value,
CONCAT(?,s.network_address,'/',32-log2((~inet_aton(s.netmask) & 0xffffffff) + 1)) AS `desc`,
......
'subnets/show/' AS link
FROM subnets s
WHERE s.name LIKE ? COLLATE utf8_general_ci
", array
".$sql_limit, array
(
__('Address') . ": ",
__('Subnet') . " ",
......
* @param string $keyword
* @return MySQL_Result object
*/
public function subnet_address($keyword)
public function subnet_address($keyword, $limit = null)
{
$sql_limit = '';
if ($limit)
{
$sql_limit = ' LIMIT '.$limit;
}
return $this->db->query("
SELECT s.id,
CONCAT(s.network_address,'/',32-log2((~inet_aton(s.netmask) & 0xffffffff) + 1)) AS value,
......
'subnets/show/' AS link
FROM subnets s
WHERE CONCAT(s.network_address,'/',32-log2((~inet_aton(s.netmask) & 0xffffffff) + 1)) LIKE ? COLLATE utf8_general_ci
", array
".$sql_limit, array
(
__('Address') . ": ",
__('Subnet') . " ",
......
* @param string $keyword
* @return MySQL_Result object
*/
public function link_name($keyword)
public function link_name($keyword, $limit = null)
{
$sql_limit = '';
if ($limit)
{
$sql_limit = ' LIMIT '.$limit;
}
return $this->db->query("
SELECT s.id, s.name AS value,
CONCAT(?, s.name) AS return_value,
......
'links/show/' AS link
FROM links s
WHERE s.name LIKE ? COLLATE utf8_general_ci
", array
".$sql_limit, array
(
__('Link') . ' ',
__('Bitrate') . ': ',

Také k dispozici: Unified diff