[Linpha-cvs] SF.net SVN: linpha: [4734] trunk/linpha2

[<bz...@us...>]

Revision: 4734
          http://svn.sourceforge.net/linpha/?rev=4734&view=rev
Author:   bzrudi
Date:     2007-07-06 11:29:01 -0700 (Fri, 06 Jul 2007)

Log Message:
-----------
"make use of http_build_query() whenever we have more than 
3 arguments! "

Modified Paths:
--------------
    trunk/linpha2/ChangeLog
    trunk/linpha2/lib/classes/linpha.template.class.php

Modified: trunk/linpha2/ChangeLog
===================================================================
--- trunk/linpha2/ChangeLog	2007-07-06 13:49:56 UTC (rev 4733)
+++ trunk/linpha2/ChangeLog	2007-07-06 18:29:01 UTC (rev 4734)
@@ -1,4 +1,7 @@
-2007-07-04 bzrudi
+2007-07-06 bzrudi
+ * Bumped Exiftool to latest stable 6.90 (windows bin 6.92)
+ 
+2007-07-05 bzrudi
  * Added Exiftool configuration support to Installer. Checks also for Perl and
    OS. Needs Windows testing!
    TODO: Save path to perl in DB

Modified: trunk/linpha2/lib/classes/linpha.template.class.php
===================================================================
--- trunk/linpha2/lib/classes/linpha.template.class.php	2007-07-06 13:49:56 UTC (rev 4733)
+++ trunk/linpha2/lib/classes/linpha.template.class.php	2007-07-06 18:29:01 UTC (rev 4734)
@@ -82,32 +82,66 @@
 ?>
 <!-- css includes -->
 
+<?php
+/**
+ * Prepare http url
+ */
+$urlParams = array(
+    'bg'            => ''.$this->bgcolor.'',
+    'bodybg'        => ''.$this->bodybgcolor.'',
+    'font'          => ''.$this->fontcolor.'',
+    'albumsbg'      => ''.$this->albumsbgcolor.'',
+    'links'         => ''.$this->linkscolor.'',
+    'linkshover'    => ''.$this->linkshovercolor.'',
+    'fieldscolor'   => ''.$this->fieldscolor.''
+    );
+?>
 <!-- colorsettings.php -->
-<link rel='stylesheet' href='<?php echo LINPHA_CLIENT.'/templates/'.$this->template_name.'/themes/default/colorsettings.php'.
-	'?bg='.$this->bgcolor.'&amp;bodybg='.$this->bodybgcolor.'&amp;font='.$this->fontcolor.
-	'&amp;albumsbg='.$this->albumsbgcolor.'&amp;links='.$this->linkscolor.'&amp;linkshover='.$this->linkshovercolor.'&amp;fieldscolor='.$this->fieldscolor; ?>' type='text/css'>  
+
+<link rel='stylesheet' 
+    href='<?php echo LINPHA_CLIENT.'/templates/'.
+    $this->template_name.'/themes/default/colorsettings.php?'.
+    http_build_query($urlParams);?>' type='text/css'>  
+
 <?php if($this->layout_name != 'default' &&
-	file_exists(LINPHA_DIR.'/templates/'.$this->template_name.'/themes/'.$this->layout_name.'/colorsettings.php'))
-{ ?>
-<link rel='stylesheet' href='<?php echo LINPHA_CLIENT.'/templates/'.$this->template_name.'/themes/'.$this->layout_name."/colorsettings.php?bg=".
-		$this->bgcolor."&amp;bodybg=".$this->bodybgcolor."&amp;font=".$this->fontcolor.
-		"&amp;albumsbg=".$this->albumsbgcolor."&amp;links=".$this->linkscolor."&amp;linkshover=".$this->linkshovercolor.'&amp;fieldscolor='.$this->fieldscolor; ?>' type='text/css'>  
+	file_exists(LINPHA_DIR.'/templates/'.$this->template_name.'/themes/'.
+	$this->layout_name.'/colorsettings.php'))
+    { ?>
+
+    <link rel='stylesheet' 
+        href='<?php echo LINPHA_CLIENT.'/templates/'.
+        $this->template_name.'/themes/'.$this->layout_name."/colorsettings.php?".
+        http_build_query($urlParams); ?>' type='text/css'>  
 <?php } ?>
 
 <!-- global.css -->
-<link rel='stylesheet' href='<?php echo LINPHA_CLIENT.'/templates/'.$this->template_name.'/themes/default/css/global.css'; ?>' type='text/css'>
+
+<link rel='stylesheet' 
+    href='<?php echo LINPHA_CLIENT.'/templates/'.
+    $this->template_name.'/themes/default/css/global.css'; ?>' type='text/css'>
+
 <?php if($this->layout_name != 'default' &&
-	file_exists(LINPHA_DIR.'/templates/'.$this->template_name.'/themes/'.$this->layout_name.'/css/global.css'))
-{ ?>
-<link rel='stylesheet' href='<?php echo LINPHA_CLIENT.'/templates/'.$this->template_name.'/themes/'.$this->layout_name.'/css/global.css'; ?>' type='text/css'>  
+	file_exists(LINPHA_DIR.'/templates/'.$this->template_name.'/themes/'.
+	$this->layout_name.'/css/global.css'))
+    { ?>
+        <link rel='stylesheet' href='<?php echo LINPHA_CLIENT.'/templates/'.
+            $this->template_name.'/themes/'.$this->layout_name.'/css/global.css'; ?>' 
+            type='text/css'>  
 <?php } ?>
 
 <!-- body css -->
-<link rel='stylesheet' href='<?php echo LINPHA_CLIENT.'/templates/'.$this->template_name.'/themes/default/css/'.$this->css_name.'.css'; ?>' type='text/css'>
+
+<link rel='stylesheet' href='<?php echo LINPHA_CLIENT.'/templates/'.
+    $this->template_name.'/themes/default/css/'.$this->css_name.'.css'; ?>' 
+    type='text/css'>
+
 <?php if($this->layout_name != 'default' &&
-	file_exists(LINPHA_DIR.'/templates/'.$this->template_name.'/themes/'.$this->layout_name.'/css/'.$this->css_name.'.css'))
-{ ?>
-<link rel='stylesheet' href='<?php echo LINPHA_CLIENT.'/templates/'.$this->template_name.'/themes/'.$this->layout_name.'/css/'.$this->css_name.'.css'; ?>' type='text/css'>
+	file_exists(LINPHA_DIR.'/templates/'.$this->template_name.'/themes/'.
+	$this->layout_name.'/css/'.$this->css_name.'.css'))
+    { ?>
+        <link rel='stylesheet' href='<?php echo LINPHA_CLIENT.'/templates/'.
+            $this->template_name.'/themes/'.$this->layout_name.'/css/'.
+            $this->css_name.'.css'; ?>' type='text/css'>
 <?php } ?>
 
 	<!--[if IE]>
@@ -351,21 +385,51 @@
 			$alignleft = 'bl';
 			$alignright = 'br';
 		}
-
+        
+		/**
+		 * Prepare http url
+		 */
+		$lcornerParam = array(
+            'color'         => ''.$color.'',
+            'bgcolor'       => ''.$bgcolor.'',
+            'size'          => ''.$size.'',
+            'align'         => ''.$alignleft.''
+		);
+    		
+		$rcornerParam = array(
+            'color'     => ''.$color.'',
+            'bgcolor'   => ''.$bgcolor.'',
+            'size'      => ''.$size.'',
+            'align'     => ''.$alignright.''
+		);
+		
 		if(empty($alpha))	// default
 		{
-			$str = '<div style="background: url('.LINPHA_CLIENT.'/templates/misc/roundcorners.php?color='.$color.'&amp;bgcolor='.$bgcolor.'&amp;size='.$size.'&amp;align='.$alignright.') no-repeat top right;">';
-			$str .= '<img src="'.LINPHA_CLIENT.'/templates/misc/roundcorners.php?color='.$color.'&amp;bgcolor='.$bgcolor.'&amp;size='.$size.'&amp;align='.$alignleft.'" alt="" width="'.$size.'" height="'.$size.'" />';
-			$str .= '</div>';
+		    $str = '<div style="background: 
+		    url('.LINPHA_CLIENT.'/templates/misc/roundcorners.php?'.
+		    http_build_query($rcornerParam).') no-repeat top right;">';
+			
+		    $str .= '<img src="'.LINPHA_CLIENT.'/templates/misc/roundcorners.php?'.
+		    http_build_query($lcornerParam).'" 
+		    alt="" width="'.$size.'" height="'.$size.'" />';
+			
+		    $str .= '</div>';
 		}
-		else	// currently only used in slideshow, does not work well in internet explorer
+		else	// currently only used in slideshow, sucks with IE
 		{
-			$str = '<div style="position: relative; background: url('.LINPHA_CLIENT.'/templates/misc/roundcorners.php?color='.$color.'&amp;bgcolor='.$bgcolor.'&amp;size='.$size.'&amp;alpha&amp;align='.$alignright.') no-repeat top right;">';
+		    $str = '<div style="position: relative; background: 
+		    url('.LINPHA_CLIENT.'/templates/misc/roundcorners.php?'.
+		    http_build_query($rcornerParam).'&alpha) no-repeat top right;">';
+		    
 			$str .= '<div class="roundAlphabottomInner">&nbsp;</div>';
-			$str .= '<img src="'.LINPHA_CLIENT.'/templates/misc/roundcorners.php?color='.$color.'&amp;bgcolor='.$bgcolor.'&amp;size='.$size.'&amp;align='.$alignleft.'&amp;alpha" alt="" width="'.$size.'" height="'.$size.'" class="AlphaCorner" />';
+			
+			$str .= '<img src="'.LINPHA_CLIENT.'/templates/misc/roundcorners.php?'.
+			http_build_query($lcornerParam).'&alpha" 
+			alt="" width="'.$size.'" height="'.$size.'" class="AlphaCorner" />';
+			
 			$str .= '</div>';
 		}
-		
+
 		return $str;
 	}
 
@@ -382,4 +446,4 @@
 	}
 } // end class linTemplate
 
-?>
\ No newline at end of file
+?>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.