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

[<fan...@us...>]

Revision: 4555
Author:   fangehrn
Date:     2006-07-15 10:01:25 -0700 (Sat, 15 Jul 2006)
ViewCVS:  http://svn.sourceforge.net/linpha/?rev=4555&view=rev

Log Message:
-----------
updated

Modified Paths:
--------------
    trunk/linpha2/ChangeLog
    trunk/linpha2/docs/dev/TODO.txt
    trunk/linpha2/install/lib.requirements.php
    trunk/linpha2/lib/classes/archiver.class.php
    trunk/linpha2/lib/classes/linpha.imgview.class.php
    trunk/linpha2/lib/modules/module.filemanager.php
Modified: trunk/linpha2/ChangeLog
===================================================================
--- trunk/linpha2/ChangeLog	2006-07-09 18:46:23 UTC (rev 4554)
+++ trunk/linpha2/ChangeLog	2006-07-15 17:01:25 UTC (rev 4555)
@@ -1,3 +1,14 @@
+2006-07-15 flo
+ * fixed bracket support detection during installation
+	if we use 	exec($str, $array_output=array(), $return_value='');
+	it will always return empty $array_output and $return_value
+
+	you have to initialize $array_output and $return_value before!
+
+	$array_output = array(); $return_value = '';
+	exec($str, $array_output, $return_value);
+
+
 2006-07-09 bzrudi 
  * install: fixed bug in sqlite install - $_SESSION vars not inited and initial
    directories (sql/tmp/cache) under /var not created. Moved some functions to 

Modified: trunk/linpha2/docs/dev/TODO.txt
===================================================================
--- trunk/linpha2/docs/dev/TODO.txt	2006-07-09 18:46:23 UTC (rev 4554)
+++ trunk/linpha2/docs/dev/TODO.txt	2006-07-15 17:01:25 UTC (rev 4555)
@@ -22,7 +22,7 @@
   - Write IPTC/XMP entries
   - UTF-8 support
   - see also
-    https://sourceforge.net/forum/message.php?msg_id=3648731)
+	https://sourceforge.net/forum/message.php?msg_id=3648731
     and
     https://sourceforge.net/forum/message.php?msg_id=3674100
 
@@ -35,6 +35,8 @@
 - Admin
   - User Settings
 
+- ImageMagick
+  - Bracket Support, enable by default, only if old version found, disable it, or require imagemagick > "6.1.4"
 
 
 

Modified: trunk/linpha2/install/lib.requirements.php
===================================================================
--- trunk/linpha2/install/lib.requirements.php	2006-07-09 18:46:23 UTC (rev 4554)
+++ trunk/linpha2/install/lib.requirements.php	2006-07-15 17:01:25 UTC (rev 4555)
@@ -107,6 +107,7 @@
 	/**
 	* now, we do an improved check
 	*/
+	$arr=array(); $return_var='';	// do not this directly in exec() !
 	exec($array[1].$convert.' -help',$arr,$return_var);
 
 	if(isset($return_var) && $return_var == 0)

Modified: trunk/linpha2/lib/classes/archiver.class.php
===================================================================
--- trunk/linpha2/lib/classes/archiver.class.php	2006-07-09 18:46:23 UTC (rev 4554)
+++ trunk/linpha2/lib/classes/archiver.class.php	2006-07-15 17:01:25 UTC (rev 4555)
@@ -127,7 +127,7 @@
 	}
 	
 	$array_output=array(); $return_value='';	// do not this directly in exec() !
-	exec($command,$array_output=Array(),$return_value=0);
+	exec($command,$array_output,$return_value);
 	
 	/**
 	 * chdir back

Modified: trunk/linpha2/lib/classes/linpha.imgview.class.php
===================================================================
--- trunk/linpha2/lib/classes/linpha.imgview.class.php	2006-07-09 18:46:23 UTC (rev 4554)
+++ trunk/linpha2/lib/classes/linpha.imgview.class.php	2006-07-15 17:01:25 UTC (rev 4555)
@@ -309,8 +309,8 @@
 				$array_nr_links[] = Array('name' => $value, 'value' =>"javascript:set_nr_images('".$value."')");
 			}
 			
-			$array_views_links[] = Array('name' => i18n('Normal'), 'value' => $GLOBALS['linpha']->template->URL_full.'&view=thumb');
-			$array_views_links[] = Array('name' => i18n('Detail'), 'value' => $GLOBALS['linpha']->template->URL_full.'&view=thumbdetail');
+			$array_views_links[] = Array('name' => i18n("Normal"), 'value' => $GLOBALS['linpha']->template->URL_full.'&view=thumb');
+			$array_views_links[] = Array('name' => i18n("Detail"), 'value' => $GLOBALS['linpha']->template->URL_full.'&view=thumbdetail');
 
 	
 		 	$GLOBALS['linpha']->template->output['menu_More']['basket'] =

Modified: trunk/linpha2/lib/modules/module.filemanager.php
===================================================================
--- trunk/linpha2/lib/modules/module.filemanager.php	2006-07-09 18:46:23 UTC (rev 4554)
+++ trunk/linpha2/lib/modules/module.filemanager.php	2006-07-15 17:01:25 UTC (rev 4555)
@@ -588,6 +588,7 @@
 	                        throw new Exception( sprintf( i18n("Unable to switch (chdir) to %s directory. File being processed: %s"), $tmpfolder, $thisfile[ 'name' ] ) );
 						}
 
+						$output=array(); $return_value='';	// do not this directly in exec() !
 						exec( $command, $output, $return_value );
 						chdir( $oldpwd );
                         


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