Changeset 25425

Timestamp:

Nov 10, 2013, 5:18:55 PM (10 years ago)

Author:

mistic100

Message:

delete replace_space function, modify get_cat_display_name_* functions

Location:

trunk

Files:

• admin/cat_list.php (modified) (1 diff)
• admin/picture_modify.php (modified) (1 diff)
• admin/user_perm.php (modified) (1 diff)
• include/category_cats.inc.php (modified) (1 diff)
• include/functions.inc.php (modified) (1 diff)
• include/functions_category.inc.php (modified) (1 diff)
• include/functions_html.inc.php (modified) (5 diffs)
• include/ws_functions/pwg.categories.php (modified) (1 diff)
• index.php (modified) (1 diff)
• search_rules.php (modified) (1 diff)

trunk/admin/cat_list.php

@@ -204 +204 @@
   $navigation.= get_cat_display_name_from_id(
     $_GET['parent_id'],
-    $base_url.'&parent_id=',
-    false
+    $base_url.'&parent_id='
     );
 }

trunk/admin/picture_modify.php

@@ -393 +393 @@
     get_cat_display_name_cache(
       $row['uppercats'],
-      get_root_url().'admin.php?page=album-',
-      false
+      get_root_url().'admin.php?page=album-'
       );
 

trunk/admin/user_perm.php

@@ -129 +129 @@
     $template->append(
       'categories_because_of_groups',
-      get_cat_display_name_cache($category['uppercats'], null, false)
+      get_cat_display_name_cache($category['uppercats'], null)
       );
   }

trunk/include/category_cats.inc.php

@@ -297 +297 @@
     if ($page['section']=='recent_cats')
     {
-      $name = get_cat_display_name_cache($category['uppercats'], null, false);
+      $name = get_cat_display_name_cache($category['uppercats'], null);
     }
     else

trunk/include/functions.inc.php

@@ -63 +63 @@
 {
   return number_format( $end - $start, 3, '.', ' ').' s';
-}
-
-// - The replace_space function replaces space and '-' characters
-//   by their HTML equivalent  &nbsb; and −
-// - The function does not replace characters in HTML tags
-// - This function was created because IE5 does not respect the
-//   CSS "white-space: nowrap;" property unless space and minus
-//   characters are replaced like this function does.
-// - Example :
-//                 <div class="foo">My friend</div>
-//               ( 01234567891111111111222222222233 )
-//               (           0123456789012345678901 )
-// becomes :
-//             <div class="foo">My&nbsp;friend</div>
-function replace_space( $string )
-{
-  //return $string;
-  $return_string = '';
-  // $remaining is the rest of the string where to replace spaces characters
-  $remaining = $string;
-  // $start represents the position of the next '<' character
-  // $end   represents the position of the next '>' character
-  ; // -> 0
-  $end   = strpos ( $remaining, '>' ); // -> 16
-  // as long as a '<' and his friend '>' are found, we loop
-  while ( ($start=strpos( $remaining, '<' )) !==false
-        and ($end=strpos( $remaining, '>' )) !== false )
-  {
-    // $treatment is the part of the string to treat
-    // In the first loop of our example, this variable is empty, but in the
-    // second loop, it equals 'My friend'
-    $treatment = substr ( $remaining, 0, $start );
-    // Replacement of ' ' by his equivalent '&nbsp;'
-    $treatment = str_replace( ' ', '&nbsp;', $treatment );
-    $treatment = str_replace( '-', '&minus;', $treatment );
-    // composing the string to return by adding the treated string and the
-    // following HTML tag -> 'My&nbsp;friend</div>'
-    $return_string.= $treatment.substr( $remaining, $start, $end-$start+1 );
-    // the remaining string is deplaced to the part after the '>' of this
-    // loop
-    $remaining = substr ( $remaining, $end + 1, strlen( $remaining ) );
-  }
-  $treatment = str_replace( ' ', '&nbsp;', $remaining );
-  $treatment = str_replace( '-', '&minus;', $treatment );
-  $return_string.= $treatment;
-
-  return $return_string;
 }
 

trunk/include/functions_category.inc.php

@@ -251 +251 @@
         get_cat_display_name_cache(
           $category['uppercats'],
-          null,
-          false
+          null
           )
         );

trunk/include/functions_html.inc.php

@@ -32 +32 @@
  * @param array cat_informations
  * @param string url
- * @param boolean replace_space
  * @return string
  */
-function get_cat_display_name($cat_informations,
-                              $url = '',
-                              $replace_space = false)
+function get_cat_display_name($cat_informations, $url = '')
 {
   global $conf;
@@ -87 +84 @@
     }
   }
-  if ($replace_space)
-  {
-    return replace_space($output);
-  }
-  else
-  {
-    return $output;
-  }
+  return $output;
 }
 
@@ -107 +97 @@
  * @param string uppercats
  * @param string url
- * @param boolean replace_space
  * @return string
  */
 function get_cat_display_name_cache($uppercats,
                                     $url = '',
-                                    $replace_space = false,
                                     $single_link = false,
                                     $link_class = null)
@@ -185 +173 @@
   }
 
-  if ($replace_space)
-  {
-    return replace_space($output);
-  }
-  else
-  {
-    return $output;
-  }
+  return $output;
 }
 
@@ -231 +212 @@
 }
 
-function get_cat_display_name_from_id($cat_id,
-                                      $url = '',
-                                      $replace_space = false)
+function get_cat_display_name_from_id($cat_id, $url = '')
 {
   $cat_info = get_cat_info($cat_id);
-  return get_cat_display_name($cat_info['upper_names'], $url, $replace_space);
+  return get_cat_display_name($cat_info['upper_names'], $url);
 }
 

trunk/include/ws_functions/pwg.categories.php

@@ -260 +260 @@
     if ($params['fullname'])
     {
-      $row['name'] = strip_tags(get_cat_display_name_cache($row['uppercats'], null, false));
+      $row['name'] = strip_tags(get_cat_display_name_cache($row['uppercats'], null));
     }
     else

trunk/index.php

@@ -231 +231 @@
       foreach ( $cats as $cat )
       {
-        $hints[] = get_cat_display_name( array($cat), '', false );
+        $hints[] = get_cat_display_name( array($cat), '' );
       }
       $template->assign( 'category_search_results', $hints);

trunk/search_rules.php

@@ -150 +150 @@
       get_cat_display_name_cache(
           $category['uppercats'],
-          null,                      // no url on category names
-          false                    // no blank replacement
+          null                      // no url on category names
           )
       );