Changeset 1789

Timestamp:

Feb 8, 2007, 2:31:05 AM (17 years ago)

Author:

rvelices

Message:

• correct php warnings (section_init and mass_inserts)
• flat category view url is now 'flat' instead of 'flat_cat' (it is nicer and shorter)
• small html validation (double class attribute)
• removed unnecessary class=""
• changed 2 times hard coded index.php?recent_pics with make_index_url(...)

Location:

trunk

Files:

• admin/include/functions.php (modified) (1 diff)
• include/functions_html.inc.php (modified) (4 diffs)
• include/functions_notification.inc.php (modified) (3 diffs, 2 props)
• include/functions_url.inc.php (modified) (2 diffs)
• include/section_init.inc.php (modified) (7 diffs)
• template/yoga/mainpage_categories.tpl (modified) (2 diffs)
• template/yoga/picture.tpl (modified) (1 diff)

trunk/admin/include/functions.php

@@ -528 +528 @@
     // inserts all found categories
     $query_begin = '
-  INSERT INTO '.$table_name.'
-    ('.implode(',', $dbfields).')
-     VALUES';
+INSERT INTO '.$table_name.'
+  ('.implode(',', $dbfields).')
+  VALUES';
 
     $first = true;
-    $query_value = array();
-    $query_value_index = 0;
+    $query_value = '';
 
     foreach ($datas as $insert)
     {
-      $query_value[$query_value_index] .= '
-    ';
       if ($first)
       {
         $first = false;
-        if (strlen($query_value[$query_value_index]) > 6)
-        {
-          $query_value[$query_value_index] .= ',';
-        }
       }
       else
       {
-        if (strlen($query_value[$query_value_index]) >= $conf['max_allowed_packet'])
+        if (strlen($query_value) >= $conf['max_allowed_packet'])
         {
-          $query_value_index ++;
-          $query_value[$query_value_index] .= '
-    ';
-          $first = true;
+          pwg_query( $query_begin.$query_value );
+          $query_value = '';
         }
         else
         {
-          $query_value[$query_value_index] .= ',';
+          $query_value .= ',';
         }
       }
-      $query_value[$query_value_index] .= '(';
+
+      $query_value .= '
+    (';
+
       foreach ($dbfields as $field_id => $dbfield)
       {
         if ($field_id > 0)
         {
-          $query_value[$query_value_index] .= ',';
+          $query_value .= ',';
         }
 
         if (!isset($insert[$dbfield]) or $insert[$dbfield] === '')
         {
-          $query_value[$query_value_index] .= 'NULL';
+          $query_value .= 'NULL';
         }
         else
         {
-          $query_value[$query_value_index] .= "'".$insert[$dbfield]."'";
+          $query_value .= "'".$insert[$dbfield]."'";
         }
       }
-      $query_value[$query_value_index] .= ')';
-    }
-    
-    $query_end .= '
-;';
-    foreach ($query_value as $value)
-    {
-      $final_query = $query_begin.$value.$query_end;
-      pwg_query($final_query);
-    }
+      $query_value .= ')';
+    }
+    pwg_query($query_begin.$query_value);
   }
 }

trunk/include/functions_html.inc.php

@@ -287 +287 @@
     elseif ($url == '')
     {
-      $output.= '<a class=""';
-      $output.= ' href="'
+      $output.= '<a href="'
             .make_index_url(
                 array(
@@ -300 +299 @@
     else
     {
-      $output.= '<a class=""';
-      $output.= ' href="'.PHPWG_ROOT_PATH.$url.$id.'">';
+      $output.= '<a href="'.PHPWG_ROOT_PATH.$url.$id.'">';
       $output.= $name.'</a>';
     }
@@ -369 +367 @@
     {
       $output.= '
-<a class=""
-   href="'
+<a href="'
       .make_index_url(
           array(
@@ -382 +379 @@
     {
       $output.= '
-<a class=""
-   href="'.PHPWG_ROOT_PATH.$url.$category_id.'">'.$name.'</a>';
+<a href="'.PHPWG_ROOT_PATH.$url.$category_id.'">'.$name.'</a>';
     }
   }

trunk/include/functions_notification.inc.php

@@ -3 +3 @@
 // | PhpWebGallery - a PHP based picture gallery                           |
 // | Copyright (C) 2002-2003 Pierrick LE GALL - pierrick@phpwebgallery.net |
-// | Copyright (C) 2003-2006 PhpWebGallery Team - http://phpwebgallery.net |
+// | Copyright (C) 2003-2007 PhpWebGallery Team - http://phpwebgallery.net |
 // +-----------------------------------------------------------------------+
 // | branch        : BSF (Best So Far)
-// | file          : $RCSfile$
-// | last update   : $Date: 2005-11-26 21:15:50 +0100 (sam., 26 nov. 2005) $
-// | last modifier : $Author: plg $
-// | revision      : $Revision: 958 $
+// | file          : $Id$
+// | last update   : $Date$
+// | last modifier : $Author$
+// | revision      : $Revision$
 // +-----------------------------------------------------------------------+
 // | This program is free software; you can redistribute it and/or modify  |
@@ -409 +409 @@
     add_news_line( $news,
       nb_new_elements($start, $end), '%d new element', '%d new elements',
-      get_root_url().'index.php?/recent_pics', $add_url );
+      make_index_url(array('section'=>'recent_pics')), $add_url );
   }
 
@@ -416 +416 @@
     add_news_line( $news,
       nb_updated_categories($start, $end), '%d category updated', '%d categories updated',
-      get_root_url().'/index.php?/recent_cats', $add_url );
+      make_index_url(array('section'=>'recent_cats')), $add_url );
   }
 

trunk/include/functions_url.inc.php

@@ -2 +2 @@
 // +-----------------------------------------------------------------------+
 // | PhpWebGallery - a PHP based picture gallery                           |
-// | Copyright (C) 2003-2006 PhpWebGallery Team - http://phpwebgallery.net |
+// | Copyright (C) 2003-2007 PhpWebGallery Team - http://phpwebgallery.net |
 // +-----------------------------------------------------------------------+
 // | branch        : BSF (Best So Far)
-// | file          : $RCSfile$
+// | file          : $Id$
 // | last update   : $Date$
 // | last modifier : $Author$
@@ -272 +272 @@
   if (isset($params['flat_cat']))
   {
-    $url.= '/flat_cat';
+    $url.= '/flat';
   }
 

trunk/include/section_init.inc.php

@@ -129 +129 @@
 }
 
-if (0 === strpos($tokens[$next_token], 'categor'))
+if (0 === strpos(@$tokens[$next_token], 'categor'))
 {
   $page['section'] = 'categories';
@@ -141 +141 @@
   }
 }
-else if (0 === strpos($tokens[$next_token], 'tag'))
+else if (0 === strpos(@$tokens[$next_token], 'tag'))
 {
   $page['section'] = 'tags';
@@ -202 +202 @@
   }
 }
-else if (0 === strpos($tokens[$next_token], 'fav'))
+else if (0 === strpos(@$tokens[$next_token], 'fav'))
 {
   $page['section'] = 'favorites';
   $next_token++;
 }
-else if ('most_visited' == $tokens[$next_token])
+else if ('most_visited' == @$tokens[$next_token])
 {
   $page['section'] = 'most_visited';
   $next_token++;
 }
-else if ('best_rated' == $tokens[$next_token])
+else if ('best_rated' == @$tokens[$next_token])
 {
   $page['section'] = 'best_rated';
   $next_token++;
 }
-else if ('recent_pics' == $tokens[$next_token])
+else if ('recent_pics' == @$tokens[$next_token])
 {
   $page['section'] = 'recent_pics';
   $next_token++;
 }
-else if ('recent_cats' == $tokens[$next_token])
+else if ('recent_cats' == @$tokens[$next_token])
 {
   $page['section'] = 'recent_cats';
   $next_token++;
 }
-else if ('search' == $tokens[$next_token])
+else if ('search' == @$tokens[$next_token])
 {
   $page['section'] = 'search';
@@ -240 +240 @@
   $next_token++;
 }
-else if ('list' == $tokens[$next_token])
+else if ('list' == @$tokens[$next_token])
 {
   $page['section'] = 'list';
@@ -269 +269 @@
 else
 {
-  if (!empty($conf['random_index_redirect']))
+  $page['section'] = 'categories';
+  if (script_basename() == 'picture')
+  {//access a picture only by id, file or id-file without given section
+    $page['flat_cat'] = true;
+  }
+  elseif (!empty($conf['random_index_redirect']) and empty($tokens[$next_token]) )
   {
     $random_index_redirect = array();
@@ -279 +284 @@
       }
     }
-  }
-
-  if (!empty($random_index_redirect))
-  {
-    redirect($random_index_redirect[mt_rand(0, count($random_index_redirect)-1)]);
-  }
-  else
-  {
-    $page['section'] = 'categories';
+    if (!empty($random_index_redirect))
+    {
+      redirect($random_index_redirect[mt_rand(0, count($random_index_redirect)-1)]);
+    }
   }
 }
@@ -301 +301 @@
 
   if ('categories' == $page['section'] and
-      'flat_cat' == $tokens[$i])
+      'flat' == $tokens[$i])
   {
     // indicate a special list of images

trunk/template/yoga/mainpage_categories.tpl

@@ -7 +7 @@
       <div class="illustration">
         <a href="{categories.category.URL}">
-          <img src="{categories.category.SRC}"
-               alt="{categories.category.ALT}"
-             title="{categories.category.TITLE}">
+          <img src="{categories.category.SRC}" alt="{categories.category.ALT}" title="{categories.category.TITLE}">
         </a>
       </div>
@@ -18 +16 @@
         </h3>
         <p>{categories.category.CAPTION_NB_IMAGES}</p>
-        <p>{categories.category.DESCRIPTION}&nbsp;</p> <!-- &nbsp; to avoid a HTML warning -->
+        <p>{categories.category.DESCRIPTION}&nbsp;</p>
       </div>
     </div>

trunk/template/yoga/picture.tpl

@@ -205 +205 @@
       <label>{lang:comment}<textarea name="content" rows="5" cols="80">{comments.add_comment.CONTENT}</textarea></label>
       <input type="hidden" name="key" value="{comments.add_comment.KEY}" />
-      <input class="submit" type="submit" class="submit" value="{lang:submit}">
+      <input class="submit" type="submit" value="{lang:submit}">
     </fieldset>
   </form>