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

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

Revision: 4640
          http://svn.sourceforge.net/linpha/?rev=4640&view=rev
Author:   fangehrn
Date:     2006-11-11 08:59:12 -0800 (Sat, 11 Nov 2006)

Log Message:
-----------
2006-11-11 flo
 * renamed:
 	PREFIX -> LIN_PREFIX
 	DB_TYPE -> LIN_DB_TYPE
 	SELECT_FIELDS -> LIN_SELECT_FIELDS

Modified Paths:
--------------
    trunk/linpha2/ChangeLog
    trunk/linpha2/admin/maintenance_db.php
    trunk/linpha2/admin/maintenance_import.php
    trunk/linpha2/admin/metadata_define.php
    trunk/linpha2/admin/metadata_define_post.php
    trunk/linpha2/admin/metadata_select.php
    trunk/linpha2/admin/permissions_groups.php
    trunk/linpha2/admin/permissions_others.php
    trunk/linpha2/admin/permissions_readwrite.php
    trunk/linpha2/admin/permissions_usergroup.php
    trunk/linpha2/admin/permissions_users.php
    trunk/linpha2/admin/settings_layout.php
    trunk/linpha2/install/manual_install.php
    trunk/linpha2/install/sql/sql.data.php
    trunk/linpha2/install/step10_postsettings.php
    trunk/linpha2/install/step11_finish.php
    trunk/linpha2/install/step9_createtables.php
    trunk/linpha2/lib/classes/linpha.admin.class.php
    trunk/linpha2/lib/classes/linpha.functions.php
    trunk/linpha2/lib/classes/linpha.image.class.php
    trunk/linpha2/lib/classes/linpha.imgview.class.php
    trunk/linpha2/lib/classes/linpha.import.class.php
    trunk/linpha2/lib/classes/linpha.metadata.class.php
    trunk/linpha2/lib/classes/linpha.sql.class.php
    trunk/linpha2/lib/classes/metadata_editor.php
    trunk/linpha2/lib/include/basket_build_mail.php
    trunk/linpha2/lib/include/upgrade.php
    trunk/linpha2/lib/modules/module.albums.php
    trunk/linpha2/lib/modules/module.basket.php
    trunk/linpha2/lib/modules/module.browse.php
    trunk/linpha2/lib/modules/module.filemanager.php
    trunk/linpha2/lib/modules/module.newimg.php
    trunk/linpha2/lib/modules/module.search.php
    trunk/linpha2/lib/modules/module.settings.php
    trunk/linpha2/reset_database.php
    trunk/linpha2/templates/default/search.html.php
    trunk/linpha2/templates/default/view_meta.html.php

Modified: trunk/linpha2/ChangeLog
===================================================================
--- trunk/linpha2/ChangeLog	2006-11-10 19:29:08 UTC (rev 4639)
+++ trunk/linpha2/ChangeLog	2006-11-11 16:59:12 UTC (rev 4640)
@@ -1,3 +1,9 @@
+2006-11-11 flo
+ * renamed:
+ 	PREFIX -> LIN_PREFIX
+ 	DB_TYPE -> LIN_DB_TYPE
+ 	SELECT_FIELDS -> LIN_SELECT_FIELDS
+
 2006-11-10 flo
  * implemented thumbnail folder with gdlib
    but the quality is quite bad...why?

Modified: trunk/linpha2/admin/maintenance_db.php
===================================================================
--- trunk/linpha2/admin/maintenance_db.php	2006-11-10 19:29:08 UTC (rev 4639)
+++ trunk/linpha2/admin/maintenance_db.php	2006-11-11 16:59:12 UTC (rev 4640)
@@ -6,14 +6,14 @@
 	echo '<h2>'.i18n("Checking photos table").'</h2>';
 	echo '('.i18n("Checking intern consistency of the photos table. This means every entry must belong to a folder.").')<br /><br />';
 	
-	$query = $GLOBALS['linpha']->db->Execute("SELECT id, parent_id, name FROM ".PREFIX."photos");
+	$query = $GLOBALS['linpha']->db->Execute("SELECT id, parent_id, name FROM ".LIN_PREFIX."photos");
 	$i = 0;
 	$i_tot = 0;
 	while($data = $query->FetchRow())
 	{
 		if($data['parent_id'] != 0)
 		{
-			$query2 = $GLOBALS['linpha']->db->Execute("SELECT id FROM ".PREFIX."photos " .
+			$query2 = $GLOBALS['linpha']->db->Execute("SELECT id FROM ".LIN_PREFIX."photos " .
 				"WHERE id = '".LinSql::linAddslashes($data['parent_id'])."'");
 			$data2 = $query2->FetchRow();
 			if( isset($data2['id']))
@@ -46,10 +46,10 @@
 
 	echo '<h3>'.i18n("Do all cache entries exists in the photos table?").'</h3>';
 
-	$query = $GLOBALS['linpha']->db->Execute("SELECT ".PREFIX."photos_cache.id, ".PREFIX."photos_cache.photo_id" .
-		" FROM ".PREFIX."photos_cache".
-		" LEFT OUTER JOIN ".PREFIX."photos ON ".PREFIX."photos.id = ".PREFIX."photos_cache.photo_id".
-		" WHERE ".PREFIX."photos.id IS NULL");
+	$query = $GLOBALS['linpha']->db->Execute("SELECT ".LIN_PREFIX."photos_cache.id, ".LIN_PREFIX."photos_cache.photo_id" .
+		" FROM ".LIN_PREFIX."photos_cache".
+		" LEFT OUTER JOIN ".LIN_PREFIX."photos ON ".LIN_PREFIX."photos.id = ".LIN_PREFIX."photos_cache.photo_id".
+		" WHERE ".LIN_PREFIX."photos.id IS NULL");
 
 	if( $query->EOF )
 	{
@@ -67,7 +67,7 @@
 	
 
 	echo '<h3>'.i18n("Do all cache entries exists in the filesystem?").'</h3>';
-	$query = $GLOBALS['linpha']->db->Execute("SELECT id, photo_id FROM ".PREFIX."photos_cache");
+	$query = $GLOBALS['linpha']->db->Execute("SELECT id, photo_id FROM ".LIN_PREFIX."photos_cache");
 	$i = 0;
 	$i_tot = 0;
 	while($data = $query->FetchRow() )
@@ -125,7 +125,7 @@
 					}
 					else
 					{
-						$query = $GLOBALS['linpha']->db->Execute("SELECT id FROM ".PREFIX."photos_cache WHERE " .
+						$query = $GLOBALS['linpha']->db->Execute("SELECT id FROM ".LIN_PREFIX."photos_cache WHERE " .
 							"id = '".LinSql::linAddslashes( LinFilesys::getFilenameWithoutFileExt($sub_file) )."'");
 						$data = $query->FetchRow();
 						
@@ -176,7 +176,7 @@
 					}
 					else
 					{
-						$query = $GLOBALS['linpha']->db->Execute("SELECT name FROM ".PREFIX."photos WHERE " .
+						$query = $GLOBALS['linpha']->db->Execute("SELECT name FROM ".LIN_PREFIX."photos WHERE " .
 							"id = '".LinSql::linAddslashes( $filename_without_ext )."'");
 						$data = $query->FetchRow();
 						
@@ -207,10 +207,10 @@
 	$array_meta = array('comments','data','exif','iptc'/*,'xmp'*/);
 	foreach($array_meta AS $value)
 	{
-		echo i18n("Checking table").' '.PREFIX."meta_".$value.' ';
-		$query = $GLOBALS['linpha']->db->Execute("SELECT ".PREFIX."meta_".$value.".md5sum FROM ".PREFIX."meta_".$value.
-			" LEFT OUTER JOIN ".PREFIX."photos ON ".PREFIX."photos.md5sum = ".PREFIX."meta_".$value.".md5sum".
-			" WHERE ".PREFIX."photos.id IS NULL"); 
+		echo i18n("Checking table").' '.LIN_PREFIX."meta_".$value.' ';
+		$query = $GLOBALS['linpha']->db->Execute("SELECT ".LIN_PREFIX."meta_".$value.".md5sum FROM ".LIN_PREFIX."meta_".$value.
+			" LEFT OUTER JOIN ".LIN_PREFIX."photos ON ".LIN_PREFIX."photos.md5sum = ".LIN_PREFIX."meta_".$value.".md5sum".
+			" WHERE ".LIN_PREFIX."photos.id IS NULL"); 
 	
 		if( $query->EOF )
 		{
@@ -249,7 +249,7 @@
 	
 	foreach($array_perms AS $value)
 	{
-		$query = $GLOBALS['linpha']->db->Execute("SELECT permission FROM ".PREFIX."permissions " .
+		$query = $GLOBALS['linpha']->db->Execute("SELECT permission FROM ".LIN_PREFIX."permissions " .
 			"WHERE photos_id = '0' AND perm_type = '".$value."'");
 		$data = $query->FetchRow();
 	
@@ -286,7 +286,7 @@
 	include(LINPHA_DIR.'/install/sql/sql.data.php');
 	foreach($options AS $key=>$value)
 	{
-		$query = $GLOBALS['linpha']->db->Execute("SELECT id FROM ".PREFIX."config " .
+		$query = $GLOBALS['linpha']->db->Execute("SELECT id FROM ".LIN_PREFIX."config " .
 			"WHERE option_name = '".$key."'");
 		$data = $query->FetchRow();
 	

Modified: trunk/linpha2/admin/maintenance_import.php
===================================================================
--- trunk/linpha2/admin/maintenance_import.php	2006-11-10 19:29:08 UTC (rev 4639)
+++ trunk/linpha2/admin/maintenance_import.php	2006-11-11 16:59:12 UTC (rev 4640)
@@ -62,7 +62,7 @@
 		{
 			foreach($_REQUEST['album_select'] AS $key=>$value)
 			{
-				$data = $GLOBALS['linpha']->db->GetRow("SELECT name FROM ".PREFIX."photos WHERE id = '".LinSql::linAddslashes($value)."'");				
+				$data = $GLOBALS['linpha']->db->GetRow("SELECT name FROM ".LIN_PREFIX."photos WHERE id = '".LinSql::linAddslashes($value)."'");				
 				echo i18n("Parsing Directory:").' '.$data['name'].'<br />';
 				LinImport::updateDir( $parent_id = $value, $recursive = true, $dryrun = false );
 			}
@@ -126,7 +126,7 @@
 			if($_REQUEST['index_thumbnails']!='no')
 			{
 				echo '<h3>'.i18n("Parsing All Directories...").'</h3><br />';
-				$createthumbquery = $GLOBALS['linpha']->db->Execute("SELECT id FROM ".PREFIX."photos WHERE img_type <> 0 AND img_type <> 9999999");
+				$createthumbquery = $GLOBALS['linpha']->db->Execute("SELECT id FROM ".LIN_PREFIX."photos WHERE img_type <> 0 AND img_type <> 9999999");
 			}
 		}
 		else	// $all_albums == false -> not all directory selected
@@ -136,10 +136,10 @@
 			 */
 			foreach($_REQUEST['album_select'] AS $key=>$value)
 			{
-				$data = $GLOBALS['linpha']->db->GetRow("SELECT name FROM ".PREFIX."photos WHERE id = '".LinSql::linAddslashes($value)."'");				
+				$data = $GLOBALS['linpha']->db->GetRow("SELECT name FROM ".LIN_PREFIX."photos WHERE id = '".LinSql::linAddslashes($value)."'");				
 				echo i18n("Parsing Directory:").' '.$data['name'].'<br />';
 
-				$sql = "SELECT id FROM ".PREFIX."photos WHERE " .
+				$sql = "SELECT id FROM ".LIN_PREFIX."photos WHERE " .
 						"parent_id = '".LinSql::linAddslashes($value)."' AND " .
 						"img_type <> 0 AND img_type <> 9999999";
 
@@ -217,7 +217,7 @@
 			{
 				echo i18n("All Directories selected").'<br />';
 	
-				$query = $GLOBALS['linpha']->db->Execute("SELECT id, md5sum FROM ".PREFIX."photos WHERE img_type <> 0 AND img_type <> 9999999");
+				$query = $GLOBALS['linpha']->db->Execute("SELECT id, md5sum FROM ".LIN_PREFIX."photos WHERE img_type <> 0 AND img_type <> 9999999");
 				while($data = $query->FetchRow())
 				{
 		        	$array_meta_ids[$data['id']] = $data['md5sum'];
@@ -228,10 +228,10 @@
 				echo i18n("Directory selected:").' ';
 				foreach($_REQUEST['album_select'] AS $key=>$value)
 				{
-					$data = $GLOBALS['linpha']->db->GetRow("SELECT name FROM ".PREFIX."photos WHERE id = '".LinSql::linAddslashes($value)."'");				
+					$data = $GLOBALS['linpha']->db->GetRow("SELECT name FROM ".LIN_PREFIX."photos WHERE id = '".LinSql::linAddslashes($value)."'");				
 					echo $data['name'].', ';
 	
-					$query = $GLOBALS['linpha']->db->Execute("SELECT id, md5sum FROM ".PREFIX."photos WHERE " .
+					$query = $GLOBALS['linpha']->db->Execute("SELECT id, md5sum FROM ".LIN_PREFIX."photos WHERE " .
 							"parent_id = '".LinSql::linAddslashes($value)."' AND " .
 							"img_type <> 0 AND img_type <> 9999999");
 					while($data = $query->FetchRow(ADODB_FETCH_NUM))
@@ -250,14 +250,14 @@
 			   	if( $all_albums )
 			   	{
 			   		echo i18n("Delete all index data").'<br />';
-			   		$GLOBALS['linpha']->db->Execute("DELETE FROM ".PREFIX."meta_".$meta_value);
+			   		$GLOBALS['linpha']->db->Execute("DELETE FROM ".LIN_PREFIX."meta_".$meta_value);
 			   	}
 			   	elseif( isset($array_meta_ids) )
 			   	{
 			   		echo i18n("Delete index data of selected directories").'<br />';
 			   		foreach($array_meta_ids AS $id=>$md5sum)
 			   		{
-			   			$GLOBALS['linpha']->db->Execute("DELETE FROM ".PREFIX."meta_".$meta_value." WHERE md5sum = '".$md5sum."'");
+			   			$GLOBALS['linpha']->db->Execute("DELETE FROM ".LIN_PREFIX."meta_".$meta_value." WHERE md5sum = '".$md5sum."'");
 			   		}
 			   	}
 			}
@@ -274,7 +274,7 @@
 				foreach($array_meta_ids AS $id=>$md5sum)
 				{
 			        $query = $GLOBALS['linpha']->db->Execute("SELECT md5sum ".
-				            "FROM ".PREFIX."meta_exif WHERE md5sum = '".$md5sum."'");
+				            "FROM ".LIN_PREFIX."meta_exif WHERE md5sum = '".$md5sum."'");
 				
 			        if( $query->EOF) // not a single value returned
 			        {
@@ -392,7 +392,7 @@
 	$thumbnail = new LinImage();
 
 	$num = 0;
-	$query = $GLOBALS['linpha']->db->Execute("SELECT id FROM ".PREFIX."photos WHERE img_type <> 0 AND img_type <> 9999999");
+	$query = $GLOBALS['linpha']->db->Execute("SELECT id FROM ".LIN_PREFIX."photos WHERE img_type <> 0 AND img_type <> 9999999");
 	while($data = $query->FetchRow(ADODB_FETCH_NUM))
 	{
 
@@ -413,12 +413,12 @@
  * 
  * nr images to index: (nr_total - nr_indexed)
  */
-	$nr_total = $GLOBALS['linpha']->db->GetRow("SELECT sum(stats_numbers) FROM ".PREFIX."photos WHERE parent_id = '0' GROUP BY parent_id");
+	$nr_total = $GLOBALS['linpha']->db->GetRow("SELECT sum(stats_numbers) FROM ".LIN_PREFIX."photos WHERE parent_id = '0' GROUP BY parent_id");
 	foreach($array_meta AS $value)
 	{
 		if($GLOBALS['linpha']->sql->config->value['sys_image_'.$value])
 		{
-			$nr_indexed = $GLOBALS['linpha']->db->GetRow("SELECT count(md5sum) FROM ".PREFIX."meta_".$value);
+			$nr_indexed = $GLOBALS['linpha']->db->GetRow("SELECT count(md5sum) FROM ".LIN_PREFIX."meta_".$value);
 
 			echo strtoupper($value).': '.i18n("Nr Images Needs Indexing:").' ' . ($nr_total[0] - $nr_indexed[0]) .' <br />';
 		}

Modified: trunk/linpha2/admin/metadata_define.php
===================================================================
--- trunk/linpha2/admin/metadata_define.php	2006-11-10 19:29:08 UTC (rev 4639)
+++ trunk/linpha2/admin/metadata_define.php	2006-11-11 16:59:12 UTC (rev 4640)
@@ -65,7 +65,7 @@
 	 * get builtin fields
 	 */
 	$query = $GLOBALS['linpha']->db->Execute("SELECT id, name, field_type, flags " .
-			"FROM ".PREFIX."meta_fields " .
+			"FROM ".LIN_PREFIX."meta_fields " .
 			"WHERE flags = '5' OR flags = '6' ");
 			
 	while($data = $query->FetchRow())
@@ -122,7 +122,7 @@
 	 * get own fields
 	 */
 	$query = $GLOBALS['linpha']->db->Execute("SELECT id, name, field_type, flags " .
-			"FROM ".PREFIX."meta_fields " .
+			"FROM ".LIN_PREFIX."meta_fields " .
 					"WHERE flags = '7' " .
 					"OR flags = '8'");
 
@@ -187,7 +187,7 @@
 
 function show_add_data()
 {
-	$query = $GLOBALS['linpha']->db->Execute("SELECT id, name FROM ".PREFIX."meta_fields WHERE field_type = '2'");
+	$query = $GLOBALS['linpha']->db->Execute("SELECT id, name FROM ".LIN_PREFIX."meta_fields WHERE field_type = '2'");
 	while($data = $query->FetchRow())
 	{
 		?>
@@ -200,7 +200,7 @@
 				<td>&nbsp;</td>
 			</tr>
 		<?php
-		$query2 = $GLOBALS['linpha']->db->Execute("SELECT id, name, isprivate FROM ".PREFIX."meta_category WHERE field_id = '".$data['id']."'");
+		$query2 = $GLOBALS['linpha']->db->Execute("SELECT id, name, isprivate FROM ".LIN_PREFIX."meta_category WHERE field_id = '".$data['id']."'");
 		while($data2 = $query2->FetchRow())
 		{
 			?>

Modified: trunk/linpha2/admin/metadata_define_post.php
===================================================================
--- trunk/linpha2/admin/metadata_define_post.php	2006-11-10 19:29:08 UTC (rev 4639)
+++ trunk/linpha2/admin/metadata_define_post.php	2006-11-11 16:59:12 UTC (rev 4640)
@@ -13,7 +13,7 @@
 			$flag = 6;
 		}
 
-		$linpha->db->Execute("UPDATE ".PREFIX."meta_fields SET " .
+		$linpha->db->Execute("UPDATE ".LIN_PREFIX."meta_fields SET " .
 				"flags = '".$flag."' ".
 			"WHERE id = '".linSql::linAddslashes($key)."'");
 	}
@@ -23,7 +23,7 @@
 	/**
 	 * check for duplicates with the same name
 	 */
-	$linpha->db->Execute("INSERT into ".PREFIX."meta_fields (name, field_type, flags) " .
+	$linpha->db->Execute("INSERT into ".LIN_PREFIX."meta_fields (name, field_type, flags) " .
 		"VALUES ('".linSql::linAddslashes($_POST['new_name'])."', '".linSql::linAddslashes($_POST['new_type'])."', '7') ");
 	break;
 case 'change_field':
@@ -34,7 +34,7 @@
 		$flag = 8;
 	}
 
-	$linpha->db->Execute("UPDATE ".PREFIX."meta_fields SET " .
+	$linpha->db->Execute("UPDATE ".LIN_PREFIX."meta_fields SET " .
 			"name = '".linSql::linAddslashes($_POST['new_name'])."', ".
 			"flags = '".$flag."' ".
 		"WHERE id = '".linSql::linAddslashes($_POST['id'])."'");
@@ -53,7 +53,7 @@
 	<?php		
 	break;
 case 'do_delete':
-	$linpha->db->Execute("DELETE FROM ".PREFIX."meta_fields WHERE id = '".linSql::linAddslashes($_POST['id'])."'");
+	$linpha->db->Execute("DELETE FROM ".LIN_PREFIX."meta_fields WHERE id = '".linSql::linAddslashes($_POST['id'])."'");
 	break;
 case 'add_new_category':
 	if(isset($_POST['isprivate'])) {
@@ -61,7 +61,7 @@
 	} else {
 		$isprivate = 0;
 	}
-	$linpha->db->Execute("INSERT into ".PREFIX."meta_category (field_id, name, isprivate) VALUES (" .
+	$linpha->db->Execute("INSERT into ".LIN_PREFIX."meta_category (field_id, name, isprivate) VALUES (" .
 		"'".linSql::linAddslashes($_POST['field_id'])."'," .
 		"'".linSql::linAddslashes($_POST['new_name'])."'," .
 		"'".$isprivate."')");
@@ -74,14 +74,14 @@
 		$isprivate = 0;
 	}
 
-	$linpha->db->Execute("UPDATE ".PREFIX."meta_category SET " .
+	$linpha->db->Execute("UPDATE ".LIN_PREFIX."meta_category SET " .
 			"name = '".linSql::linAddslashes($_POST['new_name'])."', ".
 			"isprivate = '".$isprivate."' ".
 		"WHERE id = '".linSql::linAddslashes($_POST['id'])."'");
 
 	break;
 case 'delete_category':
-	$linpha->db->Execute("DELETE FROM ".PREFIX."meta_category WHERE id = '".linSql::linAddslashes($_POST['id'])."'");
+	$linpha->db->Execute("DELETE FROM ".LIN_PREFIX."meta_category WHERE id = '".linSql::linAddslashes($_POST['id'])."'");
 	break;
 case 'update_exifiptc':
 	$linpha->sql->config->updateConfig('sys_image_'.$cat3,$_POST['exifiptc_enable']);
@@ -94,10 +94,10 @@
 		$_POST['selected_fields'] = Array();
 	}
 	if($cat3 == 'exif') {
-		$linpha->db->Execute("DROP TABLE IF EXISTS ".PREFIX."meta_exif");
+		$linpha->db->Execute("DROP TABLE IF EXISTS ".LIN_PREFIX."meta_exif");
 		$linpha->db->Execute( Metadata::createExifTable( $_POST['selected_fields'] ) );
 	} elseif($cat3 == 'iptc') {
-		$linpha->db->Execute("DROP TABLE IF EXISTS ".PREFIX."meta_iptc");
+		$linpha->db->Execute("DROP TABLE IF EXISTS ".LIN_PREFIX."meta_iptc");
 		$linpha->db->Execute( Metadata::createIptcTable( $_POST['selected_fields'] ) );
 	}
 	break;

Modified: trunk/linpha2/admin/metadata_select.php
===================================================================
--- trunk/linpha2/admin/metadata_select.php	2006-11-10 19:29:08 UTC (rev 4639)
+++ trunk/linpha2/admin/metadata_select.php	2006-11-11 16:59:12 UTC (rev 4640)
@@ -56,7 +56,7 @@
 		/**
 		 * delete all existing entries in database
 		 */
-		$GLOBALS['linpha']->db->Execute("DELETE FROM ".PREFIX."meta_fields WHERE flags = '".$flag_nr."'");
+		$GLOBALS['linpha']->db->Execute("DELETE FROM ".LIN_PREFIX."meta_fields WHERE flags = '".$flag_nr."'");
 		
 		/**
 		 * write new entrys
@@ -65,7 +65,7 @@
 		{
 			foreach($_POST['select_image_fields'] AS $value)
 			{
-				$GLOBALS['linpha']->db->Execute("INSERT into ".PREFIX."meta_fields (name, flags)" .
+				$GLOBALS['linpha']->db->Execute("INSERT into ".LIN_PREFIX."meta_fields (name, flags)" .
 					" VALUES ('".linSql::linAddslashes($value)."','".$flag_nr."')");
 			}
 		}
@@ -87,7 +87,7 @@
 				Selected fields<br />
 				<select id="select_image_fields" name="select_image_fields[]" size="25" style="width: 200px;" multiple="multiple">
 				<?php
-				$query = $GLOBALS['linpha']->db->Execute("SELECT id, name FROM ".PREFIX."meta_fields WHERE flags = '".$flag_nr."' ORDER by id");
+				$query = $GLOBALS['linpha']->db->Execute("SELECT id, name FROM ".LIN_PREFIX."meta_fields WHERE flags = '".$flag_nr."' ORDER by id");
 				while($data = $query->FetchRow())
 				{
 					echo '<option value="'.$data['name'].'">'.$MetaData->getNameOfField($data['name'],true).'</option>';
@@ -110,7 +110,7 @@
 				Image fields (builtin)<br />
 				<select id="image_fields" name="image_fields" size="7" style="width: 200px;">
 				<?php
-				$query = $GLOBALS['linpha']->db->Execute("SELECT id, name FROM ".PREFIX."meta_fields " .
+				$query = $GLOBALS['linpha']->db->Execute("SELECT id, name FROM ".LIN_PREFIX."meta_fields " .
 					"WHERE flags = '1' OR flags = '5'");
 				while($data = $query->FetchRow())
 				{
@@ -128,7 +128,7 @@
 				Image fields (own) (<a href="./?cat=metadata_define_own">define</a>)<br />
 				<select id="own_fields" name="own_fields" size="7" style="width: 200px;">
 				<?php
-				$query = $GLOBALS['linpha']->db->Execute("SELECT id, name FROM ".PREFIX."meta_fields " .
+				$query = $GLOBALS['linpha']->db->Execute("SELECT id, name FROM ".LIN_PREFIX."meta_fields " .
 					"WHERE flags = '7'");
 				while($data = $query->FetchRow())
 				{

Modified: trunk/linpha2/admin/permissions_groups.php
===================================================================
--- trunk/linpha2/admin/permissions_groups.php	2006-11-10 19:29:08 UTC (rev 4639)
+++ trunk/linpha2/admin/permissions_groups.php	2006-11-11 16:59:12 UTC (rev 4640)
@@ -16,7 +16,7 @@
 		{
 		case 'ren_group':
 		case 'del_group':
-			$data = $GLOBALS['linpha']->db->GetRow("SELECT id FROM ".PREFIX."groups WHERE group_name = 'admin'");
+			$data = $GLOBALS['linpha']->db->GetRow("SELECT id FROM ".LIN_PREFIX."groups WHERE group_name = 'admin'");
 			$admingroup_id = $data['id'];
 			if($_POST['id'] == $admingroup_id)
 			{
@@ -40,7 +40,7 @@
 			/**
 			 * check if group already exists
 			 */
-			$data = $GLOBALS['linpha']->db->GetRow("SELECT id FROM ".PREFIX."groups " .
+			$data = $GLOBALS['linpha']->db->GetRow("SELECT id FROM ".LIN_PREFIX."groups " .
 				"WHERE group_name = '".LinSql::linAddslashes($_POST['group_name'])."'");
 			if(isset($data['id']))
 			{
@@ -55,18 +55,18 @@
 		switch($_POST['cmd'])
 		{
 		case 'ren_group':
-			$GLOBALS['linpha']->db->Execute("UPDATE ".PREFIX."groups " .
+			$GLOBALS['linpha']->db->Execute("UPDATE ".LIN_PREFIX."groups " .
 				"SET group_name='".LinSql::linAddslashes($_POST['group_name'])."' " .
 				"WHERE id='".LinSql::linAddslashes($_POST['id'])."'");
 			linSysLog(i18n("Group Renamed"));
 			break;
 		case 'del_group':
-			$GLOBALS['linpha']->db->Execute("DELETE FROM ".PREFIX."groups ".
+			$GLOBALS['linpha']->db->Execute("DELETE FROM ".LIN_PREFIX."groups ".
 				"WHERE id='".LinSql::linAddslashes($_POST['id'])."'");
 			linSysLog(i18n("Group Deleted"));
 			break;
 		case 'new_group':
-			$GLOBALS['linpha']->db->Execute("INSERT INTO ".PREFIX."groups (group_name) ".
+			$GLOBALS['linpha']->db->Execute("INSERT INTO ".LIN_PREFIX."groups (group_name) ".
 				"VALUES ('".LinSql::linAddslashes($_POST['group_name'])."')");
 			linSysLog(i18n("Group Created"));
 			break;
@@ -84,7 +84,7 @@
 		<td><b><?php echo i18n("Actions"); ?></b></td>
 	</tr>
 <?php    
-	$query = $GLOBALS['linpha']->db->Execute("SELECT id, group_name FROM ".PREFIX."groups ORDER BY group_name");
+	$query = $GLOBALS['linpha']->db->Execute("SELECT id, group_name FROM ".LIN_PREFIX."groups ORDER BY group_name");
 	while($data = $query->FetchRow())
 	{
 ?>

Modified: trunk/linpha2/admin/permissions_others.php
===================================================================
--- trunk/linpha2/admin/permissions_others.php	2006-11-10 19:29:08 UTC (rev 4639)
+++ trunk/linpha2/admin/permissions_others.php	2006-11-11 16:59:12 UTC (rev 4640)
@@ -51,7 +51,7 @@
 	{
 		if($_POST['allowall'] == 'allowall')
 		{
-			$GLOBALS['linpha']->db->Execute("UPDATE ".PREFIX."permissions " .
+			$GLOBALS['linpha']->db->Execute("UPDATE ".LIN_PREFIX."permissions " .
 				"SET permission = ';public;' " .
 				"WHERE perm_type = '".LinSql::linAddslashes($key)."'");
 		}
@@ -66,7 +66,7 @@
 				$str = ';'.implode(';',$_POST['groups']).';';
 			}
 
-			$GLOBALS['linpha']->db->Execute("UPDATE ".PREFIX."permissions " .
+			$GLOBALS['linpha']->db->Execute("UPDATE ".LIN_PREFIX."permissions " .
 				"SET permission = '".LinSql::linAddslashes($str)."' " .
 				"WHERE perm_type = '".LinSql::linAddslashes($key)."'");
 		}
@@ -75,7 +75,7 @@
 	
 	echo '<b>'.i18n("Edit").': '.i18n($array_menu[$cat3]['name']).'</b><br />';
 
-	$data = $GLOBALS['linpha']->db->GetRow("SELECT permission FROM ".PREFIX."permissions " .
+	$data = $GLOBALS['linpha']->db->GetRow("SELECT permission FROM ".LIN_PREFIX."permissions " .
 		"WHERE perm_type = '".LinSql::linAddslashes($key)."'");
 	$array_permissions = linExplodeAndSlice(';',$data['permission']);
 	
@@ -101,7 +101,7 @@
   
 	<select id="selectgroups" name="groups[]" size="5" style="width: 200;" multiple="multiple">
 	<?php
-	$query = $GLOBALS['linpha']->db->Execute("SELECT id, group_name FROM ".PREFIX."groups ORDER by group_name");
+	$query = $GLOBALS['linpha']->db->Execute("SELECT id, group_name FROM ".LIN_PREFIX."groups ORDER by group_name");
 	while($data = $query->FetchRow())
 	{
 		if(in_array($data['id'],$array_permissions))

Modified: trunk/linpha2/admin/permissions_readwrite.php
===================================================================
--- trunk/linpha2/admin/permissions_readwrite.php	2006-11-10 19:29:08 UTC (rev 4639)
+++ trunk/linpha2/admin/permissions_readwrite.php	2006-11-11 16:59:12 UTC (rev 4640)
@@ -43,7 +43,7 @@
 		/**
 		 * insert or update
 		 */
-		$query = $linpha->db->Execute("SELECT id FROM ".PREFIX."permissions " .
+		$query = $linpha->db->Execute("SELECT id FROM ".LIN_PREFIX."permissions " .
 				"WHERE photos_id = '".LinSql::linAddslashes($_POST['photo_id'])."' AND perm_type = '".$sql_perm_type."'");
 		
 		/**
@@ -55,7 +55,7 @@
 			{
 				if( ! $query->EOF && $_POST['photo_id'] != 0)
 				{
-					$linpha->db->Execute("DELETE FROM ".PREFIX."permissions " .
+					$linpha->db->Execute("DELETE FROM ".LIN_PREFIX."permissions " .
 							"WHERE photos_id = '".LinSql::linAddslashes($_POST['photo_id'])."' " .
 							"AND perm_type = '".$sql_perm_type."'");
 				}
@@ -84,12 +84,12 @@
 			
 				if( ! $query->EOF )
 				{
-					$linpha->db->Execute("UPDATE ".PREFIX."permissions SET permission = ';".LinSql::linAddslashes($str_groups).";' " .
+					$linpha->db->Execute("UPDATE ".LIN_PREFIX."permissions SET permission = ';".LinSql::linAddslashes($str_groups).";' " .
 						"WHERE photos_id = '".LinSql::linAddslashes($_POST['photo_id'])."' AND perm_type = '".$sql_perm_type."'");
 				}
 				else
 				{
-					$linpha->db->Execute("INSERT into ".PREFIX."permissions (photos_id, perm_type, permission) VALUES (" .
+					$linpha->db->Execute("INSERT into ".LIN_PREFIX."permissions (photos_id, perm_type, permission) VALUES (" .
 							"'".LinSql::linAddslashes($_POST['photo_id'])."', '".$sql_perm_type."'," .
 							"';".LinSql::linAddslashes($str_groups).";' )");
 				}
@@ -121,7 +121,7 @@
 	 * get groups
 	 */
 		$array_groups = Array();
-		$query = $GLOBALS['linpha']->db->Execute("SELECT id, group_name FROM ".PREFIX."groups WHERE group_name <> 'admin'");
+		$query = $GLOBALS['linpha']->db->Execute("SELECT id, group_name FROM ".LIN_PREFIX."groups WHERE group_name <> 'admin'");
 		while($data = $query->FetchRow(ADODB_FETCH_NUM))
 		{
 			$array_groups[$data[0]] = $data[1];
@@ -138,7 +138,7 @@
 		/**
 		 * check wether add or edit (insert or update)
 		 */
-		$query = $linpha->db->Execute("SELECT id FROM ".PREFIX."permissions " .
+		$query = $linpha->db->Execute("SELECT id FROM ".LIN_PREFIX."permissions " .
 				"WHERE photos_id = '".LinSql::linAddslashes($linpha->template->idCurrent)."' AND perm_type = '".$sql_perm_type."'");
 	
 		if( ! $query->EOF )
@@ -152,7 +152,7 @@
 			}
 		}
 		
-		$query = $GLOBALS['linpha']->db->Execute("SELECT name FROM ".PREFIX."photos " .
+		$query = $GLOBALS['linpha']->db->Execute("SELECT name FROM ".LIN_PREFIX."photos " .
 				"WHERE id = '".LinSql::linAddslashes($linpha->template->idCurrent)."'");
 		$data = $query->FetchRow(ADODB_FETCH_NUM);
 		?>
@@ -239,7 +239,7 @@
  */
 function printDirPermsEntry( $parent_id , $recursive , $stage)
 {
-	$query = $GLOBALS['linpha']->db->Execute("SELECT id, name, img_type FROM ".PREFIX."photos WHERE parent_id = '".$parent_id."'");
+	$query = $GLOBALS['linpha']->db->Execute("SELECT id, name, img_type FROM ".LIN_PREFIX."photos WHERE parent_id = '".$parent_id."'");
 	while( $data = $query->FetchRow() )
 	{
 		list($i, $perm) = $GLOBALS['linpha']->sql->getPerm( $data['id'], $GLOBALS['sql_perm_type'] );

Modified: trunk/linpha2/admin/permissions_usergroup.php
===================================================================
--- trunk/linpha2/admin/permissions_usergroup.php	2006-11-10 19:29:08 UTC (rev 4639)
+++ trunk/linpha2/admin/permissions_usergroup.php	2006-11-11 16:59:12 UTC (rev 4640)
@@ -5,7 +5,7 @@
  * get groups
  */
 echo '<b>'.i18n("Edit Group Members").'</b><br />';
-$query = $linpha->db->Execute("SELECT id, group_name FROM ".PREFIX."groups ORDER by group_name");
+$query = $linpha->db->Execute("SELECT id, group_name FROM ".LIN_PREFIX."groups ORDER by group_name");
 while($data = $query->FetchRow())
 {
 	echo '<a href="'.LINPHA_DIR.'/admin/?cat=permissions_usergroup&amp;edit=group&amp;linId='.$data['id'].'">'.$data['group_name'].'</a><br />';
@@ -17,7 +17,7 @@
  * get users
  */
 echo '<b>'.i18n("Edit User Memberships").'</b><br />';
-$query = $linpha->db->Execute("SELECT id, username FROM ".PREFIX."users ORDER by username");
+$query = $linpha->db->Execute("SELECT id, username FROM ".LIN_PREFIX."users ORDER by username");
 while($data = $query->FetchRow())
 {
 	echo '<a href="'.LINPHA_DIR.'/admin/?cat=permissions_usergroup&amp;edit=user&amp;linId='.$data['id'].'">'.$data['username'].'</a><br />';
@@ -59,7 +59,7 @@
 		/**
 		 * delete all entries of current user
 		 */
-		$linpha->db->Execute("DELETE FROM ".PREFIX."user_group WHERE ".$column_name." = '".LinSql::linAddslashes($linpha->template->idCurrent)."'");
+		$linpha->db->Execute("DELETE FROM ".LIN_PREFIX."user_group WHERE ".$column_name." = '".LinSql::linAddslashes($linpha->template->idCurrent)."'");
 		
 		/**
 		 * add new entries if exists
@@ -78,7 +78,7 @@
 					$userid = LinSql::linAddslashes($linpha->template->idCurrent);
 					$groupid = LinSql::linAddslashes($value);
 				}
-				$linpha->db->Execute("INSERT into ".PREFIX."user_group (user_id, group_id) VALUES ('".$userid."','".$groupid."')");
+				$linpha->db->Execute("INSERT into ".LIN_PREFIX."user_group (user_id, group_id) VALUES ('".$userid."','".$groupid."')");
 			}
 		}
 	}
@@ -86,7 +86,7 @@
 	/**
 	 * get informations
 	 */
-	$data = $linpha->db->GetRow("SELECT ".$select_name." FROM ".PREFIX.$table_name." WHERE id = '".LinSql::linAddslashes($linpha->template->idCurrent)."'");
+	$data = $linpha->db->GetRow("SELECT ".$select_name." FROM ".LIN_PREFIX.$table_name." WHERE id = '".LinSql::linAddslashes($linpha->template->idCurrent)."'");
 	echo '<b>';
 	if($_GET['edit']=='user')
 	{
@@ -106,7 +106,7 @@
 	<select name="usergroup[]" size="5" style="width: 200;" multiple="multiple">
 	<?php
 	$query = $linpha->db->Execute("SELECT id, ".$other_select_name." " .
-									"FROM ".PREFIX.$other_table_name." " .
+									"FROM ".LIN_PREFIX.$other_table_name." " .
 									"ORDER by ".$other_select_name);
 	while($data = $query->FetchRow())
 	{
@@ -123,7 +123,7 @@
 			$userid = LinSql::linAddslashes($linpha->template->idCurrent);
 			$groupid = $data['id'];
 		}
-		$data2 = $linpha->db->GetRow("SELECT id FROM ".PREFIX."user_group " .
+		$data2 = $linpha->db->GetRow("SELECT id FROM ".LIN_PREFIX."user_group " .
 									"WHERE user_id = '".$userid."' " .
 									"AND group_id = '".$groupid."'");
 		if(isset($data2['id']))

Modified: trunk/linpha2/admin/permissions_users.php
===================================================================
--- trunk/linpha2/admin/permissions_users.php	2006-11-10 19:29:08 UTC (rev 4639)
+++ trunk/linpha2/admin/permissions_users.php	2006-11-11 16:59:12 UTC (rev 4640)
@@ -27,7 +27,7 @@
 		 */
 		if( $_POST['old_user_name'] != $_POST['mod_user_name'] )
 		{
-			$query = $GLOBALS['linpha']->db->Execute("SELECT username FROM ".PREFIX."users " .
+			$query = $GLOBALS['linpha']->db->Execute("SELECT username FROM ".LIN_PREFIX."users " .
 				"WHERE username = '".LinSql::linAddslashes($_POST['mod_user_name'])."'");
 			if( ! $query->EOF )
 			{
@@ -56,7 +56,7 @@
 			$sql_str_new_password = "password='".$md5_pass."', ";
 		}
 
-		$GLOBALS['linpha']->db->Execute("UPDATE ".PREFIX."users SET ".
+		$GLOBALS['linpha']->db->Execute("UPDATE ".LIN_PREFIX."users SET ".
 								"username='".LinSql::linAddslashes($_POST['mod_user_name'])."', ".
 								"display_name='".LinSql::linAddslashes($_POST['mod_user_fullname'])."', ".
 								$sql_str_new_password.
@@ -84,7 +84,7 @@
 
 		break;
 	case 'del_user':
-		$GLOBALS['linpha']->db->Execute("DELETE FROM ".PREFIX."users WHERE id='".LinSql::linAddslashes($_POST['id'])."'");
+		$GLOBALS['linpha']->db->Execute("DELETE FROM ".LIN_PREFIX."users WHERE id='".LinSql::linAddslashes($_POST['id'])."'");
 		break;
 	case 'new_user':
 
@@ -99,7 +99,7 @@
 		/**
 		 * check if username already exists
 		 */
-		$query = $GLOBALS['linpha']->db->Execute("SELECT username FROM ".PREFIX."users " .
+		$query = $GLOBALS['linpha']->db->Execute("SELECT username FROM ".LIN_PREFIX."users " .
 			"WHERE username = '".LinSql::linAddslashes($_POST['new_user_name'])."'");
 		if( ! $query->EOF )
 		{
@@ -114,7 +114,7 @@
 			throw new Exception(i18n("Password To Short"));
 		}
 
-		$GLOBALS['linpha']->db->Execute("INSERT INTO ".PREFIX."users " .
+		$GLOBALS['linpha']->db->Execute("INSERT INTO ".LIN_PREFIX."users " .
 			"(username, password, user_email, display_name) ".
 			"VALUES " .
 			"('".LinSql::linAddslashes($_POST['new_user_name'])."', '".md5($_POST['new_user_pass'])."', ".
@@ -140,7 +140,7 @@
     /**
     * show users
     */
-    $query = $GLOBALS['linpha']->db->Execute("SELECT id, username, display_name, user_email FROM ".PREFIX."users ORDER BY username");
+    $query = $GLOBALS['linpha']->db->Execute("SELECT id, username, display_name, user_email FROM ".LIN_PREFIX."users ORDER BY username");
 	while($data = $query->FetchRow())
 	{
         ?>

Modified: trunk/linpha2/admin/settings_layout.php
===================================================================
--- trunk/linpha2/admin/settings_layout.php	2006-11-10 19:29:08 UTC (rev 4639)
+++ trunk/linpha2/admin/settings_layout.php	2006-11-11 16:59:12 UTC (rev 4640)
@@ -128,7 +128,7 @@
 	break;
 case 'home':
 	$welcometxt = i18n("Add Your Own Welcome Text Here");
-	$data = $GLOBALS['linpha']->db->GetRow("SELECT meta_comment FROM ".PREFIX."meta_comments WHERE md5sum='welcometext'");
+	$data = $GLOBALS['linpha']->db->GetRow("SELECT meta_comment FROM ".LIN_PREFIX."meta_comments WHERE md5sum='welcometext'");
 	if(isset($data['meta_comment']))
 	{
 		$welcometxt = $data['meta_comment'];
@@ -154,14 +154,14 @@
 				 */
 				if(isset($update))
 				{
-					$GLOBALS['linpha']->db->Execute("UPDATE ".PREFIX."meta_comments SET " .
+					$GLOBALS['linpha']->db->Execute("UPDATE ".LIN_PREFIX."meta_comments SET " .
 						"meta_comment = '".LinSql::linAddslashes($_POST['welcometext'])."'" .
 						"WHERE md5sum='welcometext'");
 					$welcometxt = $_POST['welcometext'];
 				}
 				else
 				{
-					$GLOBALS['linpha']->db->Execute("INSERT into ".PREFIX."meta_comments (md5sum, meta_comment) " .
+					$GLOBALS['linpha']->db->Execute("INSERT into ".LIN_PREFIX."meta_comments (md5sum, meta_comment) " .
 							"VALUES ('welcometext', '".LinSql::linAddslashes($_POST['welcometext'])."')");
 					$welcometxt = $_POST['welcometext'];
 				}

Modified: trunk/linpha2/install/manual_install.php
===================================================================
--- trunk/linpha2/install/manual_install.php	2006-11-10 19:29:08 UTC (rev 4639)
+++ trunk/linpha2/install/manual_install.php	2006-11-11 16:59:12 UTC (rev 4640)
@@ -60,8 +60,8 @@
 	$_SESSION['sql_dbname'] = "linpha";
 	
 	
-	define('PREFIX', $_SESSION['sql_prefix']);
-	define('DB_TYPE', $_SESSION['sql_dbtype']);
+	define('LIN_PREFIX', $_SESSION['sql_prefix']);
+	define('LIN_DB_TYPE', $_SESSION['sql_dbtype']);
 
 
 
@@ -86,13 +86,13 @@
 		include_once(LINPHA_DIR.'/install/sql/sql.tables.php');
 		foreach($linpha_tables AS $key=>$value)
 		{
-			$linpha_tables[$key] = PREFIX.$value;
+			$linpha_tables[$key] = LIN_PREFIX.$value;
 		}
 	
 	/**
 	 * include sql strings
 	 */
-		include_once(LINPHA_DIR."/install/sql/sql.".DB_TYPE.".php");
+		include_once(LINPHA_DIR."/install/sql/sql.".LIN_DB_TYPE.".php");
 	
 	/**
 	 * finally create tables

Modified: trunk/linpha2/install/sql/sql.data.php
===================================================================
--- trunk/linpha2/install/sql/sql.data.php	2006-11-10 19:29:08 UTC (rev 4639)
+++ trunk/linpha2/install/sql/sql.data.php	2006-11-11 16:59:12 UTC (rev 4640)
@@ -143,41 +143,41 @@
 	} else {
 		$override = 0;
 	}
-	$sql_queries[] = "INSERT INTO ".PREFIX."config (option_name, option_value, override, user_id) " .
+	$sql_queries[] = "INSERT INTO ".LIN_PREFIX."config (option_name, option_value, override, user_id) " .
 			"VALUES ('".$name."', '".$value."', '".$override."', '0')";
 }
 
 /**
  * groups
  */
-$sql_queries[] = "INSERT INTO ".PREFIX."groups (group_name) VALUES ('admin')";
+$sql_queries[] = "INSERT INTO ".LIN_PREFIX."groups (group_name) VALUES ('admin')";
 
 /**
  * permissions
  */
-$sql_queries[] = "INSERT INTO ".PREFIX."permissions (photos_id, perm_type, permission) " .
+$sql_queries[] = "INSERT INTO ".LIN_PREFIX."permissions (photos_id, perm_type, permission) " .
 		"VALUES (0, 'read', ';public;')";
-$sql_queries[] = "INSERT INTO ".PREFIX."permissions (photos_id, perm_type, permission) " .
+$sql_queries[] = "INSERT INTO ".LIN_PREFIX."permissions (photos_id, perm_type, permission) " .
 		"VALUES (0, 'write', ';;')";
 
 
-$sql_queries[] = "INSERT INTO ".PREFIX."permissions (perm_type, permission) " .
+$sql_queries[] = "INSERT INTO ".LIN_PREFIX."permissions (perm_type, permission) " .
 		"VALUES ('basket_print', '')";
-$sql_queries[] = "INSERT INTO ".PREFIX."permissions (perm_type, permission) " .
+$sql_queries[] = "INSERT INTO ".LIN_PREFIX."permissions (perm_type, permission) " .
 		"VALUES ('basket_mail', '')";
-$sql_queries[] = "INSERT INTO ".PREFIX."permissions (perm_type, permission) " .
+$sql_queries[] = "INSERT INTO ".LIN_PREFIX."permissions (perm_type, permission) " .
 		"VALUES ('basket_download', '')";
-$sql_queries[] = "INSERT INTO ".PREFIX."permissions (perm_type, permission) " .
+$sql_queries[] = "INSERT INTO ".LIN_PREFIX."permissions (perm_type, permission) " .
 		"VALUES ('metadata_comments', ';public;')";
-$sql_queries[] = "INSERT INTO ".PREFIX."permissions (perm_type, permission) " .
+$sql_queries[] = "INSERT INTO ".LIN_PREFIX."permissions (perm_type, permission) " .
 		"VALUES ('metadata_deletecomments', '')";
-$sql_queries[] = "INSERT INTO ".PREFIX."permissions (perm_type, permission) " .
+$sql_queries[] = "INSERT INTO ".LIN_PREFIX."permissions (perm_type, permission) " .
 		"VALUES ('metadata_edit', '')";
-$sql_queries[] = "INSERT INTO ".PREFIX."permissions (perm_type, permission) " .
+$sql_queries[] = "INSERT INTO ".LIN_PREFIX."permissions (perm_type, permission) " .
 		"VALUES ('watermark', '')";
-$sql_queries[] = "INSERT INTO ".PREFIX."permissions (perm_type, permission) " .
+$sql_queries[] = "INSERT INTO ".LIN_PREFIX."permissions (perm_type, permission) " .
 		"VALUES ('stats', '')";
-$sql_queries[] = "INSERT INTO ".PREFIX."permissions (perm_type, permission) " .
+$sql_queries[] = "INSERT INTO ".LIN_PREFIX."permissions (perm_type, permission) " .
 		"VALUES ('download', '')";
 
 /**
@@ -188,63 +188,63 @@
 	 * special fields
 	 * flag_nr 1
 	 */
-	$sql_queries[] = "INSERT INTO ".PREFIX."meta_fields " .
+	$sql_queries[] = "INSERT INTO ".LIN_PREFIX."meta_fields " .
 			"(name, field_type, flags) VALUES ('filename', 0, 1)";
-	$sql_queries[] = "INSERT INTO ".PREFIX."meta_fields " .
+	$sql_queries[] = "INSERT INTO ".LIN_PREFIX."meta_fields " .
 			"(name, field_type, flags) VALUES ('imagesize', 0, 1)";
-	$sql_queries[] = "INSERT INTO ".PREFIX."meta_fields " .
+	$sql_queries[] = "INSERT INTO ".LIN_PREFIX."meta_fields " .
 			"(name, field_type, flags) VALUES ('dimension', 0, 1)";
-	$sql_queries[] = "INSERT INTO ".PREFIX."meta_fields " .
+	$sql_queries[] = "INSERT INTO ".LIN_PREFIX."meta_fields " .
 			"(name, field_type, flags) VALUES ('thumbnail', 0, 1)";
 
-	$sql_queries[] = "INSERT INTO ".PREFIX."meta_fields " .
+	$sql_queries[] = "INSERT INTO ".LIN_PREFIX."meta_fields " .
 			"(name, field_type, flags) VALUES ('time_add', 0, 1)";
-	$sql_queries[] = "INSERT INTO ".PREFIX."meta_fields " .
+	$sql_queries[] = "INSERT INTO ".LIN_PREFIX."meta_fields " .
 			"(name, field_type, flags) VALUES ('time_mod', 0, 1)";
-	$sql_queries[] = "INSERT INTO ".PREFIX."meta_fields " .
+	$sql_queries[] = "INSERT INTO ".LIN_PREFIX."meta_fields " .
 			"(name, field_type, flags) VALUES ('time_exif', 0, 1)";
 
-	$sql_queries[] = "INSERT INTO ".PREFIX."meta_fields " .
+	$sql_queries[] = "INSERT INTO ".LIN_PREFIX."meta_fields " .
 			"(name, field_type, flags) VALUES ('stats_numbers', 0, 1)";
-	$sql_queries[] = "INSERT INTO ".PREFIX."meta_fields " .
+	$sql_queries[] = "INSERT INTO ".LIN_PREFIX."meta_fields " .
 			"(name, field_type, flags) VALUES ('stats_views', 0, 1)";
-	$sql_queries[] = "INSERT INTO ".PREFIX."meta_fields " .
+	$sql_queries[] = "INSERT INTO ".LIN_PREFIX."meta_fields " .
 			"(name, field_type, flags) VALUES ('stats_downloads', 0, 1)";
 
 	/**
 	 * builtin fields
 	 * flag_nr 5 (builtin enabled)
 	 */
-	$sql_queries[] = "INSERT INTO ".PREFIX."meta_fields " .
+	$sql_queries[] = "INSERT INTO ".LIN_PREFIX."meta_fields " .
 			"(name, field_type, flags) VALUES ('description', 1, 5)";
-	$sql_queries[] = "INSERT INTO ".PREFIX."meta_fields " .
+	$sql_queries[] = "INSERT INTO ".LIN_PREFIX."meta_fields " .
 			"(name, field_type, flags) VALUES ('category', 2, 5)";
-	$sql_queries[] = "INSERT INTO ".PREFIX."meta_fields " .
+	$sql_queries[] = "INSERT INTO ".LIN_PREFIX."meta_fields " .
 			"(name, field_type, flags) VALUES ('persons', 2, 5)";
-	$sql_queries[] = "INSERT INTO ".PREFIX."meta_fields " .
+	$sql_queries[] = "INSERT INTO ".LIN_PREFIX."meta_fields " .
 			"(name, field_type, flags) VALUES ('date', 3, 5)";
 
 	/**
 	 * image fields
 	 * flag_nr 10
 	 */
-	$sql_queries[] = "INSERT INTO ".PREFIX."meta_fields " .
+	$sql_queries[] = "INSERT INTO ".LIN_PREFIX."meta_fields " .
 			"(name, field_type, flags) VALUES ('builtin_filename', 0, 10)";
-	$sql_queries[] = "INSERT INTO ".PREFIX."meta_fields " .
+	$sql_queries[] = "INSERT INTO ".LIN_PREFIX."meta_fields " .
 			"(name, field_type, flags) VALUES ('builtin_imagesize', 0, 10)";
-	$sql_queries[] = "INSERT INTO ".PREFIX."meta_fields " .
+	$sql_queries[] = "INSERT INTO ".LIN_PREFIX."meta_fields " .
 			"(name, field_type, flags) VALUES ('builtin_dimension', 0, 10)";
-	$sql_queries[] = "INSERT INTO ".PREFIX."meta_fields " .
+	$sql_queries[] = "INSERT INTO ".LIN_PREFIX."meta_fields " .
 			"(name, field_type, flags) VALUES ('builtin_description', 0, 10)";
-	$sql_queries[] = "INSERT INTO ".PREFIX."meta_fields " .
+	$sql_queries[] = "INSERT INTO ".LIN_PREFIX."meta_fields " .
 			"(name, field_type, flags) VALUES ('builtin_category', 0, 10)";
-	$sql_queries[] = "INSERT INTO ".PREFIX."meta_fields " .
+	$sql_queries[] = "INSERT INTO ".LIN_PREFIX."meta_fields " .
 			"(name, field_type, flags) VALUES ('builtin_persons', 0, 10)";
-	$sql_queries[] = "INSERT INTO ".PREFIX."meta_fields " .
+	$sql_queries[] = "INSERT INTO ".LIN_PREFIX."meta_fields " .
 			"(name, field_type, flags) VALUES ('builtin_time_exif', 0, 10)";
-	$sql_queries[] = "INSERT INTO ".PREFIX."meta_fields " .
+	$sql_queries[] = "INSERT INTO ".LIN_PREFIX."meta_fields " .
 			"(name, field_type, flags) VALUES ('builtin_stats_views', 0, 10)";
-	$sql_queries[] = "INSERT INTO ".PREFIX."meta_fields " .
+	$sql_queries[] = "INSERT INTO ".LIN_PREFIX."meta_fields " .
 			"(name, field_type, flags) VALUES ('builtin_stats_downloads', 0, 10)";
 		
 
@@ -252,20 +252,20 @@
 	 * video fields
 	 * flag_nr 11
 	 */
-	$sql_queries[] = "INSERT INTO ".PREFIX."meta_fields " .
+	$sql_queries[] = "INSERT INTO ".LIN_PREFIX."meta_fields " .
 			"(name, field_type, flags) VALUES ('??', 0, 11)";
 
 	/**
 	 * album fields
 	 * flag_nr 12
 	 */
-	$sql_queries[] = "INSERT INTO ".PREFIX."meta_fields " .
+	$sql_queries[] = "INSERT INTO ".LIN_PREFIX."meta_fields " .
 			"(name, field_type, flags) VALUES ('builtin_filename', 0, 12)";
-	$sql_queries[] = "INSERT INTO ".PREFIX."meta_fields " .
+	$sql_queries[] = "INSERT INTO ".LIN_PREFIX."meta_fields " .
 			"(name, field_type, flags) VALUES ('builtin_description', 0, 12)";
-	$sql_queries[] = "INSERT INTO ".PREFIX."meta_fields " .
+	$sql_queries[] = "INSERT INTO ".LIN_PREFIX."meta_fields " .
 			"(name, field_type, flags) VALUES ('builtin_time_add', 0, 12)";
-	$sql_queries[] = "INSERT INTO ".PREFIX."meta_fields " .
+	$sql_queries[] = "INSERT INTO ".LIN_PREFIX."meta_fields " .
 			"(name, field_type, flags) VALUES ('builtin_stats_numbers', 0, 12)";
 
 
@@ -273,37 +273,37 @@
 	 * thumbnails fields
 	 * flag_nr 13
 	 */
-	$sql_queries[] = "INSERT INTO ".PREFIX."meta_fields " .
+	$sql_queries[] = "INSERT INTO ".LIN_PREFIX."meta_fields " .
 			"(name, field_type, flags) VALUES ('builtin_thumbnail', 0, 13)";
-	$sql_queries[] = "INSERT INTO ".PREFIX."meta_fields " .
+	$sql_queries[] = "INSERT INTO ".LIN_PREFIX."meta_fields " .
 			"(name, field_type, flags) VALUES ('builtin_filename', 0, 13)";
-	$sql_queries[] = "INSERT INTO ".PREFIX."meta_fields " .
+	$sql_queries[] = "INSERT INTO ".LIN_PREFIX."meta_fields " .
 			"(name, field_type, flags) VALUES ('builtin_description', 0, 13)";
 
 	/**
 	 * thumbnails in detail view fields
 	 * flag_nr 14
 	 */
-	$sql_queries[] = "INSERT INTO ".PREFIX."meta_fields " .
+	$sql_queries[] = "INSERT INTO ".LIN_PREFIX."meta_fields " .
 			"(name, field_type, flags) VALUES ('builtin_thumbnail', 0, 14)";
-	$sql_queries[] = "INSERT INTO ".PREFIX."meta_fields " .
+	$sql_queries[] = "INSERT INTO ".LIN_PREFIX."meta_fields " .
 			"(name, field_type, flags) VALUES ('builtin_filename', 0, 14)";
-	$sql_queries[] = "INSERT INTO ".PREFIX."meta_fields " .
+	$sql_queries[] = "INSERT INTO ".LIN_PREFIX."meta_fields " .
 			"(name, field_type, flags) VALUES ('builtin_description', 0, 14)";
-	$sql_queries[] = "INSERT INTO ".PREFIX."meta_fields " .
+	$sql_queries[] = "INSERT INTO ".LIN_PREFIX."meta_fields " .
 			"(name, field_type, flags) VALUES ('builtin_imagesize', 0, 14)";
-	$sql_queries[] = "INSERT INTO ".PREFIX."meta_fields " .
+	$sql_queries[] = "INSERT INTO ".LIN_PREFIX."meta_fields " .
 			"(name, field_type, flags) VALUES ('builtin_dimension', 0, 14)";
-	$sql_queries[] = "INSERT INTO ".PREFIX."meta_fields " .
+	$sql_queries[] = "INSERT INTO ".LIN_PREFIX."meta_fields " .
 			"(name, field_type, flags) VALUES ('exif_datetimeoriginal', 0, 14)";
 
 	/**
 	 * slideshow fields
 	 * flag_nr 15
 	 */
-	$sql_queries[] = "INSERT INTO ".PREFIX."meta_fields " .
+	$sql_queries[] = "INSERT INTO ".LIN_PREFIX."meta_fields " .
 			"(name, field_type, flags) VALUES ('builtin_filename', 0, 15)";
-	$sql_queries[] = "INSERT INTO ".PREFIX."meta_fields " .
+	$sql_queries[] = "INSERT INTO ".LIN_PREFIX."meta_fields " .
 			"(name, field_type, flags) VALUES ('builtin_description', 0, 15)";
  	
 ?>

Modified: trunk/linpha2/install/step10_postsettings.php
===================================================================
--- trunk/linpha2/install/step10_postsettings.php	2006-11-10 19:29:08 UTC (rev 4639)
+++ trunk/linpha2/install/step10_postsettings.php	2006-11-11 16:59:12 UTC (rev 4640)
@@ -81,7 +81,7 @@
 
 <?php
 
-$query = $linpha->db->Execute("SELECT option_value FROM ".PREFIX."config " .
+$query = $linpha->db->Execute("SELECT option_value FROM ".LIN_PREFIX."config " .
 		"WHERE option_name='sys_im_use_imagemagick'");
 $data = $query->FetchRow(ADODB_FETCH_NUM);
 

Modified: trunk/linpha2/install/step11_finish.php
===================================================================
--- trunk/linpha2/install/step11_finish.php	2006-11-10 19:29:08 UTC (rev 4639)
+++ trunk/linpha2/install/step11_finish.php	2006-11-11 16:59:12 UTC (rev 4640)
@@ -55,7 +55,7 @@
 	}
 	
 	echo "Adding linpha admin user... ";
-	$result = $linpha->db->Execute("INSERT INTO ".PREFIX."users (username, password, user_email) VALUES (" .
+	$result = $linpha->db->Execute("INSERT INTO ".LIN_PREFIX."users (username, password, user_email) VALUES (" .
 		"'".LinSql::linAddslashes($_POST['admin_name'])."', " .
 		"'".md5($_POST['admin_pass'])."', " .
 		"'".LinSql::linAddslashes($_POST['admin_email'])."')");
@@ -63,18 +63,18 @@
 	{
 		echo failed_msg();
 	} else {
-		$userid = $GLOBALS['linpha']->db->GetOne("SELECT MAX(id) FROM ".PREFIX."users ");
+		$userid = $GLOBALS['linpha']->db->GetOne("SELECT MAX(id) FROM ".LIN_PREFIX."users ");
 		
 		/**
 		 * fails for pg
 		 */
-		//$userid = $GLOBALS['linpha']->db->PO_Insert_ID(PREFIX."users", "id");
+		//$userid = $GLOBALS['linpha']->db->PO_Insert_ID(LIN_PREFIX."users", "id");
 		
 		/**
 		 * adding user to group 'admin'
 		 */
-		$data = $GLOBALS['linpha']->db->GetRow("SELECT id FROM ".PREFIX."groups WHERE group_name = 'admin'");
-		$GLOBALS['linpha']->db->Execute("INSERT into ".PREFIX."user_group (user_id, group_id) VALUES ('".$userid['id']."','".$data['id']."')");
+		$data = $GLOBALS['linpha']->db->GetRow("SELECT id FROM ".LIN_PREFIX."groups WHERE group_name = 'admin'");
+		$GLOBALS['linpha']->db->Execute("INSERT into ".LIN_PREFIX."user_group (user_id, group_id) VALUES ('".$userid['id']."','".$data['id']."')");
 
 		echo success_msg();
 	}
@@ -85,14 +85,14 @@
 echo "<br />".tr("Saving Thumbnail Size To Database")."... ";
 if( isset( $_POST['sys_style_tn_size'] ) )
 {
-	$result = $linpha->db->Execute("UPDATE ".PREFIX."config " .
+	$result = $linpha->db->Execute("UPDATE ".LIN_PREFIX."config " .
 			"SET option_value = '".LinSql::linAddslashes($_POST['sys_style_tn_size'])."' " .
 			"WHERE option_name = 'sys_style_thumb_size_max'");
 	if(!$result)
 	{
 		echo failed_msg();
 	} else {
-	$result = $linpha->db->Execute("UPDATE ".PREFIX."config " .
+	$result = $linpha->db->Execute("UPDATE ".LIN_PREFIX."config " .
 			"SET option_value = '".LinSql::linAddslashes($_POST['sys_style_tn_size'])."' " .
 			"WHERE option_name = 'sys_style_thumb_size_display'");
 		echo success_msg();

Modified: trunk/linpha2/install/step9_createtables.php
===================================================================
--- trunk/linpha2/install/step9_createtables.php	2006-11-10 19:29:08 UTC (rev 4639)
+++ trunk/linpha2/install/step9_createtables.php	2006-11-11 16:59:12 UTC (rev 4640)
@@ -46,13 +46,13 @@
 		include_once(LINPHA_DIR.'/install/sql/sql.tables.php');
 		foreach($linpha_tables AS $key=>$value)
 		{
-			$linpha_tables[$key] = PREFIX.$value;
+			$linpha_tables[$key] = LIN_PREFIX.$value;
 		}
 	
 	/**
 	 * include sql strings
 	 */
-		include_once(LINPHA_DIR."/install/sql/sql.".DB_TYPE.".php");
+		include_once(LINPHA_DIR."/install/sql/sql.".LIN_DB_TYPE.".php");
 
 	/**
 	 * finally create tables
@@ -65,7 +65,7 @@
 			$result = $linpha->db->Execute($query);
 			if(!$result)
 			{
-				echo PREFIX.$translation_array[$key].' ';
+				echo LIN_PREFIX.$translation_array[$key].' ';
 				echo failed_msg();
 				echo ' '.$linpha->db->ErrorMsg().'<br />';
 				$error_nr = 1;

Modified: trunk/linpha2/lib/classes/linpha.admin.class.php
===================================================================
--- trunk/linpha2/lib/classes/linpha.admin.class.php	2006-11-10 19:29:08 UTC (rev 4639)
+++ trunk/linpha2/lib/classes/linpha.admin.class.php	2006-11-11 16:59:12 UTC (rev 4640)
@@ -37,7 +37,7 @@
 	/**
 	 * get system option names and values and save in array for easier access
 	 */
-	$query = $GLOBALS['linpha']->db->Execute("SELECT option_name, option_value FROM ".PREFIX."config WHERE user_id = '0' ORDER by option_name");
+	$query = $GLOBALS['linpha']->db->Execute("SELECT option_name, option_value FROM ".LIN_PREFIX."config WHERE user_id = '0' ORDER by option_name");
 	while($data = $query->FetchRow())
 	{
 		$this->options[] = $data['option_name'];
@@ -209,7 +209,7 @@
 	/**
 	 * update system config array, used in admin/settings*.php
 	 */	
-	$query = $GLOBALS['linpha']->db->Execute("SELECT option_name, option_value FROM ".PREFIX."config WHERE user_id = '0' ORDER by option_name");
+	$query = $GLOBALS['linpha']->db->Execute("SELECT option_name, option_value FROM ".LIN_PREFIX."config WHERE user_id = '0' ORDER by option_name");
 	while($data = $query->FetchRow())
 	{
 		$this->option_value_system[$data['option_name']] = $data['option_value'];

Modified: trunk/linpha2/lib/classes/linpha.functions.php
===================================================================
--- trunk/linpha2/lib/classes/linpha.functions.php	2006-11-10 19:29:08 UTC (rev 4639)
+++ trunk/linpha2/lib/classes/linpha.functions.php	2006-11-11 16:59:12 UTC (rev 4640)
@@ -284,7 +284,7 @@
 
 function linBuildAlbumSelectSubEntry($id,$text)
 {
-	$query = $GLOBALS['linpha']->db->Execute("SELECT id, name FROM ".PREFIX."photos WHERE parent_id = '".$id."' AND img_type = '0' ORDER by name");
+	$query = $GLOBALS['linpha']->db->Execute("SELECT id, name FROM ".LIN_PREFIX."photos WHERE parent_id = '".$id."' AND img_type = '0' ORDER by name");
 	while($data = $query->FetchRow())
 	{
 		if(!isset($_REQUEST['album_select'])) { 

Modified: trunk/linpha2/lib/classes/linpha.image.class.php
===================================================================
--- trunk/linpha2/lib/classes/linpha.image.class.php	2006-11-10 19:29:08 UTC (rev 4639)
+++ trunk/linpha2/lib/classes/linpha.image.class.php	2006-11-11 16:59:12 UTC (rev 4640)
@@ -54,7 +54,7 @@
 	 * and get img_type and rotate informations
 	 */
 		$query = $GLOBALS['linpha']->db->Execute("SELECT id, img_type, rotate, width, height " .
-				"FROM ".PREFIX."photos " .
+				"FROM ".LIN_PREFIX."photos " .
 				"WHERE id = '".LinSql::linAddslashes( $this->photo_id )."'");
 
 		if( $query->EOF ) // not a single value returned
@@ -220,7 +220,7 @@
 		/**
 		 * check if entry in linpha_photos_cache exists
 		 */
-		$data = $GLOBALS['linpha']->db->GetRow("SELECT id FROM ".PREFIX."photos_cache WHERE " .
+		$data = $GLOBALS['linpha']->db->GetRow("SELECT id FROM ".LIN_PREFIX."photos_cache WHERE " .
 				"photo_id = '".$this->photo_id."' AND " .
 				"img_width = '".$this->img_width."' AND " .
 				"img_height = '".$this->img_height."' AND " .
@@ -239,11 +239,11 @@
 			 * insert an empty entry and get cached_id
 			 * we will update correct values only if create cached image has been successfull
 			 */
-			$GLOBALS['linpha']->db->Execute("INSERT into ".PREFIX."photos_cache " .
+			$GLOBALS['linpha']->db->Execute("INSERT into ".LIN_PREFIX."photos_cache " .
 					"(photo_id) VALUES ('".$this->photo_id."')");
 	
 			$this->cached_id = $GLOBALS['linpha']->db->GetOne("SELECT MAX(id) " .
-					"FROM ".PREFIX."photos_cache ");			
+					"FROM ".LIN_PREFIX."photos_cache ");			
 			$this->output_file = LinImage::getCachePath('img',$this->cached_id,$this->img_type);
 			
 			if(file_exists($this->output_file))
@@ -359,7 +359,7 @@
 		 * check if we have already some thumbnails in this folder
 		 * and create array_ids which holds 4 image ids
 		 */
-		$query = $GLOBALS['linpha']->db->Execute("SELECT id, img_type FROM ".PREFIX."photos WHERE parent_id = '".LinSql::linAddslashes( $this->photo_id )."'");
+		$query = $GLOBALS['linpha']->db->Execute("SELECT id, img_type FROM ".LIN_PREFIX."photos WHERE parent_id = '".LinSql::linAddslashes( $this->photo_id )."'");
 		$array_thumbs = Array();
 		$i=0;
 		while($data = $query->FetchRow())
@@ -457,7 +457,7 @@
 				return false;
 			}
 			
-			$GLOBALS['linpha']->db->Execute("UPDATE ".PREFIX."photos_cache SET " .
+			$GLOBALS['linpha']->db->Execute("UPDATE ".LIN_PREFIX."photos_cache SET " .
 					"img_width = '".$this->img_width."', " .
 					"img_height = '".$this->img_height."', " .
 					"img_quality = '".$this->img_quality."', " .
@@ -473,7 +473,7 @@
 			/**
 			 * got a cached copy, increment counter and time_use
 			 */
-			$GLOBALS['linpha']->db->Execute("UPDATE ".PREFIX."photos_cache " .
+			$GLOBALS['linpha']->db->Execute("UPDATE ".LIN_PREFIX."photos_cache " .
 					"SET hits = hits + 1, time_use = '".time()."' " .
 					"WHERE id = '".$this->cached_id."'");
 		}
@@ -552,7 +552,7 @@
  */
 function deleteCachedImage($id,$img_type)
 {
-	$query = $GLOBALS['linpha']->db->Execute("SELECT id FROM ".PREFIX."photos_cache WHERE photo_id = '".$id."'");
+	$query = $GLOBALS['linpha']->db->Execute("SELECT id FROM ".LIN_PREFIX."photos_cache WHERE photo_id = '".$id."'");
 	while($data = $query->FetchRow(ADODB_FETCH_NUM))
 	{
 		$output = LinImage::getCachePath('img',$data[0],$img_type);

Modified: trunk/linpha2/lib/classes/linpha.imgview.class.php
===================================================================
--- trunk/linpha2/lib/classes/linpha.imgview.class.php	2006-11-10 19:29:08 UTC (rev 4639)
+++ trunk/linpha2/lib/classes/linpha.imgview.class.php	2006-11-11 16:59:12 UTC (rev 4640)
@@ -24,11 +24,11 @@
  */
 if(!defined('LINPHA_DIR')) { exit(1); }
 
-define('SELECT_FIELDS',PREFIX."photos.id AS id, ".PREFIX."photos.name AS name, " .
-		"".PREFIX."photos.img_type AS img_type, ".PREFIX."photos.md5sum AS md5sum, " .
-		"".PREFIX."photos.width AS width, ".PREFIX."photos.height AS height, " .
-		"".PREFIX."photos.stats_numbers AS stats_numbers, " .
-		"".PREFIX."photos.time_add AS time_add");
+define('LIN_SELECT_FIELDS',LIN_PREFIX."photos.id AS id, ".LIN_PREFIX."photos.name AS name, " .
+		"".LIN_PREFIX."photos.img_type AS img_type, ".LIN_PREFIX."photos.md5sum AS md5sum, " .
+		"".LIN_PREFIX."photos.width AS width, ".LIN_PREFIX."photos.height AS height, " .
+		"".LIN_PREFIX."photos.stats_numbers AS stats_numbers, " .
+		"".LIN_PREFIX."photos.time_add AS time_add");
 
 class LinImgview {
 
@@ -85,7 +85,7 @@
 		/**
 		 * set file informations
 		 */
-		$current_data = $GLOBALS['linpha']->db->GetRow("SELECT id, name, img_type, parent_id, md5sum, width, height FROM ".PREFIX."photos " .
+		$current_data = $GLOBALS['linpha']->db->GetRow("SELECT id, name, img_type, parent_id, md5sum, width, height FROM ".LIN_PREFIX."photos " .
 			"WHERE id = '".linSql::linAddslashes($GLOBALS['linpha']->template->idCurrent)."'");
 		/**
 		 * check for valid id
@@ -893,7 +893,7 @@
 		}
 		else
 		{
-			$data = $GLOBALS['linpha']->db->GetRow("SELECT meta_comment FROM ".PREFIX."meta_comments WHERE md5sum='welcometext'");
+			$data = $GLOBALS['linpha']->db->GetRow("SELECT meta_comment FROM ".LIN_PREFIX."meta_comments WHERE md5sum='welcometext'");
 			if(isset($data['meta_comment']))
 			{
 				$GLOBALS['linpha']->template->output['welcome'] = $data['meta_comment'];
@@ -923,7 +923,7 @@
 		$GLOBALS['linpha']->template->output['browse_by_date'] = '';
 	
 		$data = $GLOBALS['linpha']->db->GetRow("SELECT min(datetimeoriginal), max(datetimeoriginal) " .
-			"FROM ".PREFIX."meta_exif");
+			"FROM ".LIN_PREFIX."meta_exif");
 		if(isset($data[0]) && isset($data[1]) && !empty($data[0]) && !empty($data[1]) )
 		{
 			/**
@@ -942,7 +942,7 @@
 				 */
 				if($i > 1900)
 				{
-					$data = $GLOBALS['linpha']->db->GetRow("SELECT count(datetimeoriginal) FROM ".PREFIX."meta_exif WHERE datetimeoriginal LIKE '".$i."%'");
+					$data = $GLOBALS['linpha']->db->GetRow("SELECT count(datetimeoriginal) FROM ".LIN_PREFIX."meta_exif WHERE datetimeoriginal LIKE '".$i."%'");
 					if($data[0]>0)
 					{
 						$GLOBALS['linpha']->template->output['browse_by_date'] .= '<a href="'.LINPHA_LINK.'&amp;linCat=browse&amp;year='.$i.'">'.$i.'</a> ('.$data[0].'), ';
@@ -962,7 +962,7 @@
 
 	if($GLOBALS['linpha']->sql->config->value[$optionname] != 0)
 	{
-	 	switch(DB_TYPE)
+	 	switch(LIN_DB_TYPE)
 	 	{
 	 		case 'mysql':
 	 			$str_random = 'rand()';
@@ -979,7 +979,7 @@
 	 	}
 	 	
 	 	$nr_images = $GLOBALS['linpha']->sql->config->value[$optionname];
-		$query = $GLOBALS['linpha']->db->Execute("SELECT id FROM ".PREFIX."photos WHERE img_type <> 0 AND img_type <> 9999999".$sql." ORDER BY ".$str_random);
+		$query = $GLOBALS['linpha']->db->Execute("SELECT id FROM ".LIN_PREFIX."photos WHERE img_type <> 0 AND img_type <> 9999999".$sql." ORDER BY ".$str_random);
 	
 		for($i = 1; $i <= $nr_images ; )
 		{
@@ -1035,18 +1035,18 @@
 		 *
 		 */
 		$query = $GLOBALS['linpha']->db->Execute("SELECT id " .
-				"FROM ".PREFIX."meta_comments " .
+				"FROM ".LIN_PREFIX."meta_comments " .
 				"WHERE md5sum = '".$GLOBALS['linpha']->template->idCurrent."'");
 
 		if( $query->EOF ) 
 		{
-			$GLOBALS['linpha']->db->Execute("INSERT into ".PREFIX."meta_comments (meta_time, md5sum, meta_author, meta_comment)" .
+			$GLOBALS['linpha']->db->Execute("INSERT into ".LIN_PREFIX."meta_comments (meta_time, md5sum, meta_author, meta_comment)" .
 				"VALUES ('".time()."','".$GLOBALS['linpha']->template->idCurrent."','".linSql::linAddslashes($_POST['author'])."'," .
 					"'".linSql::linAddslashes($_POST['comment'])."')");
 		}
 		else	// update
 		{
-			$GLOBALS['linpha']->db->Execute("UPDATE ".PREFIX."meta_comments SET ".
+			$GLOBALS['linpha']->db->Execute("UPDATE ".LIN_PREFIX."meta_comments SET ".
 					"meta_time = '".time()."', ".
 					"meta_author = '".linSql::linAddslashes($_POST['author'])."', " .
 					"meta_comment = '".linSql::linAddslashes($_POST['comment'])."' " .
@@ -1057,7 +1057,7 @@
 	/**
 	 * get data
 	 */
-	$data = $GLOBALS['linpha']->db->GetRow("SELECT id, meta_time, meta_author, meta_comment FROM ".PREFIX."meta_comments");
+	$data = $GLOBALS['linpha']->db->GetRow("SELECT id, meta_time, meta_author, meta_comment FROM ".LIN_PREFIX."meta_comments");
 	if(isset($data['meta_author']))
 	{
 		$GLOBALS['linpha']->template->output[...
 
[truncated message content]