fixes for code review suggestions

uw_lib_refshelf.module

@@ -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
-    $regEx = '\'(?!((<.*?)|(<a.*?)))(\b' . $word . '\b)(?!(([^<>]*?)>)|([^>]*?</a>))\'si';
+    $regex = '\'(?!((<.*?)|(<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($regEx, $word_style, $str);
+    $highlighted = preg_replace($regex, $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>";
-  $regEx = '\'(?!((<.*?)|(<a.*?)))(\b' . $word . '\b)(?!(([^<>]*?)>)|([^>]*?</a>))\'s';
-  $highlighted = preg_replace($regEx, $word_style, $data);
+  $regex = '\'(?!((<.*?)|(<a.*?)))(\b' . $word . '\b)(?!(([^<>]*?)>)|([^>]*?</a>))\'s';
+  $highlighted = preg_replace($regex, $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;
         }