[php-blog-cvs] serendipity serendipity_functions.inc.php,1.293,1.294 serendipity_sidebar_items.php,1.64,1.65

[Garvin H. <gar...@us...>]

Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16044

Modified Files:
	serendipity_functions.inc.php serendipity_sidebar_items.php 
Log Message:
Jannis: We use no TABs to indent code. :-)


Index: serendipity_sidebar_items.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_sidebar_items.php,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -d -r1.64 -r1.65
--- serendipity_sidebar_items.php	17 Jun 2004 20:30:18 -0000	1.64
+++ serendipity_sidebar_items.php	17 Jun 2004 20:36:42 -0000	1.65
@@ -552,12 +552,11 @@
                 $propbag->add('description',  CATEGORIES_TO_FETCH_DESC);
                 $propbag->add('select_values', $this->author_select_values);
                 break;
-						case 'image':
-								$propbag->add('type',         'string');
+            case 'image':
+                $propbag->add('type',         'string');
                 $propbag->add('name',         XML_IMAGE_TO_DISPLAY);
-                $propbag->add('description',  XML_IMAGE_TO_DISPLAY_DESC);				
-                				
-						   	break;
+                $propbag->add('description',  XML_IMAGE_TO_DISPLAY_DESC);
+                break;
             default:
                 return false;
         }
@@ -571,10 +570,8 @@
         $categories = serendipity_fetchCategories(empty($which_category) ? 'all' : $which_category);
         $title      = CATEGORIES;
         $html       = '';
-				$image = $this->get_config('image', $image);
-				if (empty($image)) 
-					$image = serendipity_getTemplateFile('img/xml.gif');
-				$image = (($image == "'none'" || $image == 'none') ? '' : $image);
+        $image = $this->get_config('image', serendipity_getTemplateFile('img/xml.gif'));
+        $image = (($image == "'none'" || $image == 'none') ? '' : $image);
         if (is_array($categories) && count($categories)) {
             $html .= serendipity_generateCategoryList($categories, array(0), 3, 0, 0, $image);
         }

Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.293
retrieving revision 1.294
diff -u -d -r1.293 -r1.294
--- serendipity_functions.inc.php	16 Jun 2004 18:28:58 -0000	1.293
+++ serendipity_functions.inc.php	17 Jun 2004 20:36:41 -0000	1.294
@@ -2388,26 +2388,27 @@
                    break;
                 case 3:
                     $category_id = serendipity_makeFilename($cat['category_name']);
-                    if (!empty($xmlImg)) 
-                    $ret .= sprintf(
-                      '<a href="%s" title="%s"><img alt="xml" %s src="%s" /></a>&nbsp;%s' .
-                      '<a href="%s" title="%s">%s</a><br />',
-                      $serendipity['serendipityHTTPPath'] . 'rss.php?category=' . $cat['categoryid'] . '_' . $category_id,
-                      htmlspecialchars($cat['category_description']),
-                      ($serendipity['XHTML11'] ? 'style="display: inline; border: 0px"' : 'border="0"'),
-                      $xmlImg,
-                      str_repeat('&nbsp;', $level * 3),
-                      $serendipity['serendipityHTTPPath'] . ($serendipity['rewrite'] == 'none' ? $serendipity['indexFile'] . '?/' : '') . PATH_CATEGORIES . '/' . $cat['categoryid'] . '_' . $category_id,
-                      htmlspecialchars($cat['category_description']),
-                      htmlspecialchars($cat['category_name']));
-                    else
-                    	$ret .= sprintf(
-                      '%s<a href="%s" title="%s">%s</a><br />',
-                      str_repeat('&nbsp;', $level * 3),
-                      $serendipity['serendipityHTTPPath'] . ($serendipity['rewrite'] == 'none' ? $serendipity['indexFile'] . '?/' : '') . PATH_CATEGORIES . '/' . $cat['categoryid'] . '_' . $category_id,
-                      htmlspecialchars($cat['category_description']),
-                      htmlspecialchars($cat['category_name']));
-                 break;
+                    if (!empty($xmlImg)) {
+                        $ret .= sprintf(
+                          '<a href="%s" title="%s"><img alt="xml" %s src="%s" /></a>&nbsp;%s' .
+                          '<a href="%s" title="%s">%s</a><br />',
+                          $serendipity['serendipityHTTPPath'] . 'rss.php?category=' . $cat['categoryid'] . '_' . $category_id,
+                          htmlspecialchars($cat['category_description']),
+                          ($serendipity['XHTML11'] ? 'style="display: inline; border: 0px"' : 'border="0"'),
+                          $xmlImg,
+                          str_repeat('&nbsp;', $level * 3),
+                          $serendipity['serendipityHTTPPath'] . ($serendipity['rewrite'] == 'none' ? $serendipity['indexFile'] . '?/' : '') . PATH_CATEGORIES . '/' . $cat['categoryid'] . '_' . $category_id,
+                          htmlspecialchars($cat['category_description']),
+                          htmlspecialchars($cat['category_name']));
+                    } else {
+                        $ret .= sprintf(
+                          '%s<a href="%s" title="%s">%s</a><br />',
+                          str_repeat('&nbsp;', $level * 3),
+                          $serendipity['serendipityHTTPPath'] . ($serendipity['rewrite'] == 'none' ? $serendipity['indexFile'] . '?/' : '') . PATH_CATEGORIES . '/' . $cat['categoryid'] . '_' . $category_id,
+                          htmlspecialchars($cat['category_description']),
+                          htmlspecialchars($cat['category_name']));
+                    }
+                    break;
             }
             $ret .= serendipity_generateCategoryList($cats, $select, $type, $cat['categoryid'], $level + 1, $xmlImg);
         }