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

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

Revision: 4499
Author:   fangehrn
Date:     2006-04-10 02:40:47 -0700 (Mon, 10 Apr 2006)
ViewCVS:  http://svn.sourceforge.net/linpha/?rev=4499&view=rev

Log Message:
-----------
 * fixed some eclipse warnings
 * change linpha_photo.name form TEXT to varchar(255)

Modified Paths:
--------------
    trunk/linpha2/ChangeLog
    trunk/linpha2/install/lib.install.php
    trunk/linpha2/install/sql/sql.mysql.php
    trunk/linpha2/install/sql/sql.postgres.php
    trunk/linpha2/install/sql/sql.sqlite.php
    trunk/linpha2/lib/classes/linpha.functions.php
Modified: trunk/linpha2/ChangeLog
===================================================================
--- trunk/linpha2/ChangeLog	2006-04-09 19:46:00 UTC (rev 4498)
+++ trunk/linpha2/ChangeLog	2006-04-10 09:40:47 UTC (rev 4499)
@@ -1,3 +1,7 @@
+2006-04-10 flo
+ * fixed some eclipse warnings
+ * change linpha_photo.name form TEXT to varchar(255)
+
 2006-04-09 flo
  * testing another way of setting the height of main div in javascript thumbnail viewer
    	- #main { height: 85%; } and do not set the height in thumbnails.js

Modified: trunk/linpha2/install/lib.install.php
===================================================================
--- trunk/linpha2/install/lib.install.php	2006-04-09 19:46:00 UTC (rev 4498)
+++ trunk/linpha2/install/lib.install.php	2006-04-10 09:40:47 UTC (rev 4499)
@@ -335,7 +335,7 @@
 
 while(strlen($http_accept_language))
 {
-	if(preg_match( "/$eachbit/", $http_accept_language, $m))
+	if(preg_match( "/$eachbit/", $http_accept_language, $m=Array()))
 	{
 		$tag = $m[1];
 		$quality = $m[2];

Modified: trunk/linpha2/install/sql/sql.mysql.php
===================================================================
--- trunk/linpha2/install/sql/sql.mysql.php	2006-04-09 19:46:00 UTC (rev 4498)
+++ trunk/linpha2/install/sql/sql.mysql.php	2006-04-10 09:40:47 UTC (rev 4499)
@@ -62,8 +62,8 @@
 		"id INT NOT NULL AUTO_INCREMENT, " .
 		"parent_id INT NOT NULL default '0', " .
 		"img_type INT NOT NULL default '0', " .
-		"name text NOT NULL, " .
-		"md5sum VARCHAR(40) NOT NULL default '', " .
+		"name VARCHAR(255) NOT NULL, " .
+		"md5sum VARCHAR(32) NOT NULL default '', " .
 		"time_add INT NOT NULL default '0', " .
 		"time_mod INT NOT NULL default '0', " .
 		"time_exif INT NOT NULL default '0', " .

Modified: trunk/linpha2/install/sql/sql.postgres.php
===================================================================
--- trunk/linpha2/install/sql/sql.postgres.php	2006-04-09 19:46:00 UTC (rev 4498)
+++ trunk/linpha2/install/sql/sql.postgres.php	2006-04-10 09:40:47 UTC (rev 4499)
@@ -57,7 +57,7 @@
 		"id SERIAL PRIMARY KEY, " .
 		"parent_id INT NOT NULL default '0', " .
 		"img_type INT NOT NULL default '0', " .
-		"name TEXT NOT NULL, " .
+		"name VARCHAR(255) NOT NULL, " .
 		"md5sum VARCHAR(32) NOT NULL default '', " .
 		"time_add INT NOT NULL default '0', " .
 		"time_mod INT NOT NULL default '0', " .

Modified: trunk/linpha2/install/sql/sql.sqlite.php
===================================================================
--- trunk/linpha2/install/sql/sql.sqlite.php	2006-04-09 19:46:00 UTC (rev 4498)
+++ trunk/linpha2/install/sql/sql.sqlite.php	2006-04-10 09:40:47 UTC (rev 4499)
@@ -57,8 +57,8 @@
 		"id INTEGER PRIMARY KEY, " .
 		"parent_id INTEGER NOT NULL default '0', " .
 		"img_type INTEGER NOT NULL default '0', " .
-		"name text NOT NULL, " .
-		"md5sum VARCHAR(40) NOT NULL default '', " .
+		"name VARCHAR(255) NOT NULL, " .
+		"md5sum VARCHAR(32) NOT NULL default '', " .
 		"time_add INTEGER NOT NULL default '0', " .
 		"time_mod INTEGER NOT NULL default '0', " .
 		"time_exif INTEGER NOT NULL default '0', " .

Modified: trunk/linpha2/lib/classes/linpha.functions.php
===================================================================
--- trunk/linpha2/lib/classes/linpha.functions.php	2006-04-09 19:46:00 UTC (rev 4498)
+++ trunk/linpha2/lib/classes/linpha.functions.php	2006-04-10 09:40:47 UTC (rev 4499)
@@ -149,18 +149,10 @@
 {
 	switch($order)
 	{
-	case 'nameasc':
-		return "name ASC";
-		break;
-	case 'namedesc':
-		return "name DESC";
-		break;
-	case 'dateasc':
-		return "time_add ASC";
-		break;
-	case 'datedesc':
-		return "time_add DESC";
-		break;
+	case 'nameasc':		return "name ASC";
+	case 'namedesc':	return "name DESC";
+	case 'dateasc':		return "time_add ASC";
+	case 'datedesc':	return "time_add DESC";
 	}
 }
 


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