Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
library
uw_lib_refshelf
Commits
408535b9
Commit
408535b9
authored
Jan 12, 2018
by
Ganesharatnam
Browse files
fixes for code review suggestions
parent
b353e93a
Changes
1
Hide whitespace changes
Inline
Side-by-side
uw_lib_refshelf.module
View file @
408535b9
...
...
@@ -111,7 +111,7 @@ function uw_lib_refshelf_render_data() {
$filter_pagenum
=
isset
(
$_GET
[
'pagenum'
])
?
filter_var
(
$_GET
[
'pagenum'
],
FILTER_SANITIZE_STRING
)
:
NULL
;
$filter_search
=
isset
(
$_GET
[
'search'
])
?
filter_var
(
$_GET
[
'search'
],
FILTER_SANITIZE_STRING
)
:
NULL
;
//Check for cat_id and toc_id in GET
//Check for cat_id and toc_id in GET
if
(
array_key_exists
(
"cat_id"
,
$_GET
)
||
array_key_exists
(
"toc_id"
,
$_GET
))
{
if
(
isset
(
$filter_cat_id
)
&&
!
empty
(
$filter_cat_id
))
{
//Displaying Subcategories
...
...
@@ -399,22 +399,22 @@ function _highlightSearchWord($word, $str) {
//Replacement for a search keyword -- all uppercase
if
(
ctype_upper
(
$word
))
{
$highlighted
=
handlingKeywordCaseSensitivity
(
$word
,
$str
);
$highlighted
=
_
handlingKeywordCaseSensitivity
(
$word
,
$str
);
}
elseif
(
ctype_lower
(
$word
))
{
//Replacement for a search keyword -- all lowercase
$highlighted
=
handlingKeywordCaseSensitivity
(
$word
,
$str
);
$highlighted
=
_
handlingKeywordCaseSensitivity
(
$word
,
$str
);
}
elseif
(
$word
==
$str_uc_first
)
{
//Replacement for a search keyword -- all first letter uppercase
$highlighted
=
handlingKeywordCaseSensitivity
(
$word
,
$str
);
$highlighted
=
_
handlingKeywordCaseSensitivity
(
$word
,
$str
);
}
else
{
//Replace exctly like search string
$reg
E
x
=
'\'(?!((<.*?)|(<a.*?)))(\b'
.
$word
.
'\b)(?!(([^<>]*?)>)|([^>]*?</a>))\'si'
;
$reg
e
x
=
'\'(?!((<.*?)|(<a.*?)))(\b'
.
$word
.
'\b)(?!(([^<>]*?)>)|([^>]*?</a>))\'si'
;
$word_style
=
"<span class='highlight-search-word'>"
.
$word
.
"</span>"
;
//$highlighted = str_ireplace($word, $word_style, $str);
$highlighted
=
preg_replace
(
$reg
E
x
,
$word_style
,
$str
);
$highlighted
=
preg_replace
(
$reg
e
x
,
$word_style
,
$str
);
}
return
$highlighted
;
}
...
...
@@ -422,7 +422,7 @@ function _highlightSearchWord($word, $str) {
/**
* Handling case sensitivity for the keyword in search results
*/
function
handlingKeywordCaseSensitivity
(
$word
,
$str
)
{
function
_
handlingKeywordCaseSensitivity
(
$word
,
$str
)
{
//For search results keyword -- lowercase
$word_lc
=
strtolower
(
$word
);
$results
=
_styleWord
(
$word_lc
,
$str
);
...
...
@@ -450,8 +450,8 @@ function handlingKeywordCaseSensitivity($word, $str) {
//function _styleWord($word) {
function
_styleWord
(
$word
,
$data
)
{
$word_style
=
"<span class='highlight-search-word'>"
.
$word
.
"</span>"
;
$reg
E
x
=
'\'(?!((<.*?)|(<a.*?)))(\b'
.
$word
.
'\b)(?!(([^<>]*?)>)|([^>]*?</a>))\'s'
;
$highlighted
=
preg_replace
(
$reg
E
x
,
$word_style
,
$data
);
$reg
e
x
=
'\'(?!((<.*?)|(<a.*?)))(\b'
.
$word
.
'\b)(?!(([^<>]*?)>)|([^>]*?</a>))\'s'
;
$highlighted
=
preg_replace
(
$reg
e
x
,
$word_style
,
$data
);
return
$highlighted
;
}
...
...
@@ -538,6 +538,7 @@ function _keywordSearch($word, $data) {
if
(
!
empty
(
$word
)
&&
!
empty
(
$str
))
{
if
(
strlen
(
$str
)
>=
strlen
(
$word
))
{
$s_word
=
"/"
.
$word
.
"/i"
;
//$regEx = '\'(?!((<.*?)|(<a.*?)))(\b' . $word . '\b)(?!(([^<>]*?)>)|([^>]*?</a>))\'si';
if
(
preg_match
(
$s_word
,
$str
))
{
return
TRUE
;
}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment