Changeset 3136 for trunk/include

Timestamp:

Feb 13, 2009, 2:01:03 PM (15 years ago)

Author:

rvelices

Message:

• moved check upgrade feed code to admin/include/functions_upgrade.php
• refactored some code (shorter and somehow faster - but nothing revolutionary)
• decrease lost space in permalinks.tpl and hard coded column width (was illisible)

Location:

trunk/include

Files:

• category_default.inc.php (modified) (2 diffs)
• common.inc.php (modified) (2 diffs)
• config_default.inc.php (modified) (1 diff)
• functions.inc.php (modified) (9 diffs)
• functions_plugins.inc.php (modified) (5 diffs)

trunk/include/category_default.inc.php

@@ -135 +135 @@
 
   if ($conf['show_thumbnail_caption'])
-  {
-    // name of the picture
+  {// name of the picture
     if (isset($row['name']) and $row['name'] != '')
     {
@@ -167 +166 @@
   if ( isset($nb_comments_of) )
   {
-    $row['nb_comments'] = isset($nb_comments_of[$row['id']])
-        ? (int)$nb_comments_of[$row['id']] : 0;
-    $tpl_var['NB_COMMENTS'] = $row['nb_comments'];
+    $tpl_var['NB_COMMENTS'] = (int)@$nb_comments_of[$row['id']];
   }
 

trunk/include/common.inc.php

@@ -116 +116 @@
   }
 }
-else
-{
-  if ( strtolower(PWG_CHARSET)!='iso-8859-1' )
-  {
-    fatal_error('PWG supports only iso-8859-1 charset on MySql version '.mysql_get_server_info());
-  }
-}
-
-//
-// Setup gallery wide options, if this fails then we output a CRITICAL_ERROR
-// since basic gallery information is not available
-//
+elseif ( strtolower(PWG_CHARSET)!='iso-8859-1' )
+{
+  fatal_error('PWG supports only iso-8859-1 charset on MySql version '.mysql_get_server_info());
+}
+
 load_conf_from_db();
 load_plugins();
@@ -188 +181 @@
 if ($conf['check_upgrade_feed'])
 {
-
-  // retrieve already applied upgrades
-  $query = '
-SELECT id
-  FROM '.UPGRADE_TABLE.'
-;';
-  $applied = array_from_query($query, 'id');
-
-  // retrieve existing upgrades
-  $existing = get_available_upgrade_ids();
-
-  // which upgrades need to be applied?
-  if (count(array_diff($existing, $applied)) > 0)
+  include_once(PHPWG_ROOT_PATH.'admin/include/functions_upgrade.php');
+  if (check_upgrade_feed())
   {
     $header_msgs[] = 'Some database upgrades are missing, '

trunk/include/config_default.inc.php

@@ -689 +689 @@
     'password' => array('cancel' => true),
     'register' => array('cancel' => true),
-    'upgrade_feed' => array('cancel' => true),
   );
 

trunk/include/functions.inc.php

@@ -134 +134 @@
   // $start represents the position of the next '<' character
   // $end   represents the position of the next '>' character
-  $start = 0;
-  $end = 0;
-  $start = strpos ( $remaining, '<' ); // -> 0
+  ; // -> 0
   $end   = strpos ( $remaining, '>' ); // -> 16
   // as long as a '<' and his friend '>' are found, we loop
-  while ( is_numeric( $start ) and is_numeric( $end ) )
+  while ( ($start=strpos( $remaining, '<' )) !==false
+        and ($end=strpos( $remaining, '>' )) !== false )
   {
     // $treatment is the part of the string to treat
@@ -154 +153 @@
     // loop
     $remaining = substr ( $remaining, $end + 1, strlen( $remaining ) );
-    $start = strpos ( $remaining, '<' );
-    $end   = strpos ( $remaining, '>' );
   }
   $treatment = str_replace( ' ', '&nbsp;', $remaining );
@@ -243 +240 @@
   if ( !is_writable($dir) )
   {
-    if ( !is_writable($dir) )
-    {
-      !($flags&MKGETDIR_DIE_ON_ERROR) or fatal_error( "$dir ".l10n('no_write_access'));
-      return false;
-    }
+    !($flags&MKGETDIR_DIE_ON_ERROR) or fatal_error( "$dir ".l10n('no_write_access'));
+    return false;
   }
   return true;
@@ -465 +459 @@
   {
     $path = PHPWG_ROOT_PATH.'language/'.$file;
-    if (is_dir($path) and !is_link($path) and file_exists($path.'/iso.txt'))
+    if (!is_link($path) and file_exists($path.'/iso.txt'))
     {
       list($language_name) = @file($path.'/iso.txt');
@@ -527 +521 @@
 
   $tags_string = null;
-  if (isset($page['section']) and $page['section'] == 'tags')
-  {
-    $tag_ids = array();
-    foreach ($page['tags'] as $tag)
-    {
-      array_push($tag_ids, $tag['id']);
-    }
-
-    $tags_string = implode(',', $tag_ids);
+  if ('tags'==@$page['section'])
+  {
+    $tags_string = implode(',', $page['tag_ids']);
   }
 
@@ -912 +900 @@
   if (!empty($element_info['filesize']))
   {
-    $thumbnail_title .= ' : '.l10n_dec('%d Kb', '%d Kb', $element_info['filesize']);
+    $thumbnail_title .= ' : '.sprintf(l10n('%d Kb'), $element_info['filesize']);
   }
 
@@ -1140 +1128 @@
 
 /**
- * which upgrades are available ?
- *
- * @return array
- */
-function get_available_upgrade_ids()
-{
-  $upgrades_path = PHPWG_ROOT_PATH.'install/db';
-
-  $available_upgrade_ids = array();
-
-  if ($contents = opendir($upgrades_path))
-  {
-    while (($node = readdir($contents)) !== false)
-    {
-      if (is_file($upgrades_path.'/'.$node)
-          and preg_match('/^(.*?)-database\.php$/', $node, $match))
-      {
-        array_push($available_upgrade_ids, $match[1]);
-      }
-    }
-  }
-  natcasesort($available_upgrade_ids);
-
-  return $available_upgrade_ids;
-}
-
-/**
  * Add configuration parameters from database to global $conf array
  *
@@ -1275 +1236 @@
   foreach (array('SCRIPT_NAME', 'SCRIPT_FILENAME', 'PHP_SELF') as $value)
   {
-    $continue = !empty($_SERVER[$value]);
-    if ($continue)
+    if (!empty($_SERVER[$value]))
     {
       $filename = strtolower($_SERVER[$value]);
-
-      if ($conf['php_extension_in_urls'])
-      {
-        $continue = get_extension($filename) ===  'php';
-      }
-
-      if ($continue)
-      {
-        $basename = basename($filename, '.php');
-        $continue = !empty($basename);
-      }
-
-      if ($continue)
+      if ($conf['php_extension_in_urls'] and get_extension($filename)!=='php')
+        continue;
+      $basename = basename($filename, '.php');
+      if (!empty($basename))
       {
         return $basename;
@@ -1297 +1248 @@
     }
   }
-
   return '';
 }

trunk/include/functions_plugins.inc.php

@@ -110 +110 @@
   global $pwg_event_handlers;
 
-  // just for debugging
-  trigger_action('pre_trigger_event',
-        array('event'=>$event, 'data'=>$data) );
+  if ( isset($pwg_event_handlers['trigger']) )
+  {// just for debugging
+    trigger_action('trigger',
+        array('type'=>'event', 'event'=>$event, 'data'=>$data) );
+  }
 
   if ( !isset($pwg_event_handlers[$event]) )
   {
-    trigger_action('post_trigger_event',
-        array('event'=>$event, 'data'=>$data) );
     return $data;
   }
@@ -124 +124 @@
   foreach ($pwg_event_handlers[$event] as $priority => $handlers)
   {
-    if ( !is_null($handlers) )
-    {
-      foreach($handlers as $handler)
-      {
-        $all_args = array_merge( array($data), $args);
-        $function_name = $handler['function'];
-        $accepted_args = $handler['accepted_args'];
-
-        if ( $accepted_args == 1 )
-          $the_args = array($data);
-        elseif ( $accepted_args > 1 )
-          $the_args = array_slice($all_args, 0, $accepted_args);
-        elseif ( $accepted_args == 0 )
-          $the_args = NULL;
-        else
-          $the_args = $all_args;
-
-        $data = call_user_func_array($function_name, $the_args);
-      }
-    }
-  }
-  trigger_action('post_trigger_event',
-        array('event'=>$event, 'data'=>$data) );
+    foreach($handlers as $handler)
+    {
+      $all_args = array_merge( array($data), $args);
+      $function_name = $handler['function'];
+      $accepted_args = $handler['accepted_args'];
+
+      if ( $accepted_args == 1 )
+        $the_args = array($data);
+      elseif ( $accepted_args > 1 )
+        $the_args = array_slice($all_args, 0, $accepted_args);
+      elseif ( $accepted_args == 0 )
+        $the_args = NULL;
+      else
+        $the_args = $all_args;
+
+      $data = call_user_func_array($function_name, $the_args);
+    }
+  }
+  trigger_action('trigger',
+       array('type'=>'post_event', 'event'=>$event, 'data'=>$data) );
   return $data;
 }
@@ -153 +150 @@
 {
   global $pwg_event_handlers;
-  if ($event!='pre_trigger_event'
-    and $event!='post_trigger_event'
-    and $event!='trigger_action')
+  if ( isset($pwg_event_handlers['trigger']) and $event!='trigger' )
   {// special case for debugging - avoid recursive calls
-    trigger_action('trigger_action',
-        array('event'=>$event, 'data'=>$data) );
+    trigger_action('trigger',
+        array('type'=>'action', 'event'=>$event, 'data'=>$data) );
   }
 
@@ -169 +164 @@
   foreach ($pwg_event_handlers[$event] as $priority => $handlers)
   {
-    if ( !is_null($handlers) )
-    {
-      foreach($handlers as $handler)
-      {
-        $all_args = array_merge( array($data), $args);
-        $function_name = $handler['function'];
-        $accepted_args = $handler['accepted_args'];
-
-        if ( $accepted_args == 1 )
-          $the_args = array($data);
-        elseif ( $accepted_args > 1 )
-          $the_args = array_slice($all_args, 0, $accepted_args);
-        elseif ( $accepted_args == 0 )
-          $the_args = NULL;
-        else
-          $the_args = $all_args;
-
-        call_user_func_array($function_name, $the_args);
-      }
+    foreach($handlers as $handler)
+    {
+      $all_args = array_merge( array($data), $args);
+      $function_name = $handler['function'];
+      $accepted_args = $handler['accepted_args'];
+
+      if ( $accepted_args == 1 )
+        $the_args = array($data);
+      elseif ( $accepted_args > 1 )
+        $the_args = array_slice($all_args, 0, $accepted_args);
+      elseif ( $accepted_args == 0 )
+        $the_args = NULL;
+      else
+        $the_args = $all_args;
+
+      call_user_func_array($function_name, $the_args);
     }
   }
@@ -230 +222 @@
   $query = '
 SELECT * FROM '.PLUGINS_TABLE;
-  if (!empty($state) or !empty($id) )
-  {
-    $query .= '
-WHERE 1=1';
-    if (!empty($state))
-    {
+  $clauses = array();
+  if (!empty($state))
+  {
+    $clauses[] = 'state="'.$state.'"';
+  }
+  if (!empty($id))
+  {
+    $clauses[] = 'id="'.$id.'"';
+  }
+  if (count($clauses))
+  {
       $query .= '
-  AND state="'.$state.'"';
-    }
-    if (!empty($id))
-    {
-      $query .= '
-  AND id="'.$id.'"';
-    }
+  WHERE '. implode(' AND ', $clauses);
   }