Changeset 8247 for trunk/include

Timestamp:

Dec 23, 2010, 6:22:19 AM (13 years ago)

Author:

rvelices

Message:

removed unused files / code / css; shorter code

Location:

trunk/include

Files:

• common.inc.php (modified) (1 diff)
• functions_html.inc.php (modified) (6 diffs)
• functions_url.inc.php (modified) (1 diff)

trunk/include/common.inc.php

@@ -234 +234 @@
   add_event_handler('render_category_description', 'nl2br');
 }
-add_event_handler('render_comment_content', 'htmlspecialchars');
-add_event_handler('render_comment_content', 'parse_comment_content');
+add_event_handler('render_comment_content', 'render_comment_content');
 add_event_handler('render_comment_author', 'strip_tags');
 add_event_handler('blockmanager_register_blocks', 'register_default_menubar_blocks', EVENT_HANDLER_PRIORITY_NEUTRAL-1);

trunk/include/functions_html.inc.php

@@ -44 +44 @@
   $output = '';
   $is_first=true;
-  
+
   foreach ($cat_informations as $cat)
   {
@@ -186 +186 @@
  * @return string
  */
-function parse_comment_content($content)
-{
+function render_comment_content($content)
+{
+  $content = htmlspecialchars($content);
   $pattern = '/(https?:\/\/\S*)/';
   $replacement = '<a href="$1" rel="nofollow">$1</a>';
@@ -368 +369 @@
     $title = 'Piwigo encountered a non recoverable error';
   }
-  
+
   $btrace_msg = '';
   if ($show_trace and function_exists('debug_backtrace'))
@@ -441 +442 @@
         );
     }
-    
+
     $title.=
       '<a href="'.$remove_url.'" style="border:none;" title="'
@@ -479 +480 @@
     $protocol = 'HTTP/1.0';
 
-  if ( version_compare( phpversion(), '4.3.0', '>=' ) )
-  {
-    header( "$protocol $code $text", true, $code );
-  }
-  else
-  {
-    header( "$protocol $code $text" );
-  }
+  header( "$protocol $code $text", true, $code );
   trigger_action('set_status_header', $code, $text);
 }
@@ -496 +490 @@
 {
   return strip_tags($desc, '<span><p><a><br><b><i><small><big><strong><em>');
-}
-
-/** returns the argument_ids array with new sequenced keys based on related
- * names. Sequence is not case sensitive.
- * Warning: By definition, this function breaks original keys
- */
-function order_by_name($element_ids,$name)
-{
-  $ordered_element_ids = array();
-  foreach ($element_ids as $k_id => $element_id)
-  {
-    $key = strtolower($name[$element_id]) .'-'. $name[$element_id] .'-'. $k_id;
-    $ordered_element_ids[$key] = $element_id;
-  }
-  ksort($ordered_element_ids);
-  return $ordered_element_ids;
 }
 

trunk/include/functions_url.inc.php

@@ -736 +736 @@
   if (!empty($conf['gallery_url']))
   {
-    if (url_is_remote($conf['gallery_url']) or strncmp($conf['gallery_url'], '/', 1)==0)
+    if (url_is_remote($conf['gallery_url']) or $conf['gallery_url'][0]=='/' )
     {
       return $conf['gallery_url'];