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

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

Revision: 4781
          http://linpha.svn.sourceforge.net/linpha/?rev=4781&view=rev
Author:   bzrudi
Date:     2007-11-06 09:20:31 -0800 (Tue, 06 Nov 2007)

Log Message:
-----------
"sql.data.phpmove  fixes"

Modified Paths:
--------------
    trunk/linpha2/ChangeLog
    trunk/linpha2/lib/classes/linpha.sql.class.php
    trunk/linpha2/lib/include/sql.data.php
    trunk/linpha2/reset_database.php

Modified: trunk/linpha2/ChangeLog
===================================================================
--- trunk/linpha2/ChangeLog	2007-11-06 17:16:52 UTC (rev 4780)
+++ trunk/linpha2/ChangeLog	2007-11-06 17:20:31 UTC (rev 4781)
@@ -1,5 +1,8 @@
+2007-11-06 bzrudi
+ * moved sql.data.php out of install folder into /lib/include to make sure we 
+   can delete /install folder after installation.
+ * Add check for /install directory to integrity.php and abort if exist.  
 
-
 2007-11-05 flo
  * worked some more on the map plugin
    delete markers is now working

Modified: trunk/linpha2/lib/classes/linpha.sql.class.php
===================================================================
--- trunk/linpha2/lib/classes/linpha.sql.class.php	2007-11-06 17:16:52 UTC (rev 4780)
+++ trunk/linpha2/lib/classes/linpha.sql.class.php	2007-11-06 17:20:31 UTC (rev 4781)
@@ -754,12 +754,12 @@
 }
 
 /**
- * returns the correct path to the album, cache or tmp directory
+ * returns the correct path to the album, cache, install or tmp directory
  * pay attention to use this getPath and not access directly 'sys_path_album_dir' !
  */
-function getPath($what)
+function getPath($which)
 {
-	$path = $GLOBALS['linpha']->sql->config->value['sys_path_'.$what.'_dir'];
+	$path = $GLOBALS['linpha']->sql->config->value['sys_path_'.$which.'_dir'];
 	return LinFilesys::getFullPath( $path );
 }
 

Modified: trunk/linpha2/lib/include/sql.data.php
===================================================================
--- trunk/linpha2/lib/include/sql.data.php	2007-11-06 17:16:52 UTC (rev 4780)
+++ trunk/linpha2/lib/include/sql.data.php	2007-11-06 17:20:31 UTC (rev 4781)
@@ -50,6 +50,7 @@
 	'sys_path_album_dir' => $_SESSION['album_dir'],
 	'sys_path_cache_dir' => $_SESSION['cache_dir'],
 	'sys_path_tmp_dir' => $_SESSION['tmp_dir'],
+	'sys_path_install_dir' => 'install',
 
 	'sys_basket_mail_max_size' => (1024*1024*2),
 	'sys_basket_mail_smpthost' => 'localhost',

Modified: trunk/linpha2/reset_database.php
===================================================================
--- trunk/linpha2/reset_database.php	2007-11-06 17:16:52 UTC (rev 4780)
+++ trunk/linpha2/reset_database.php	2007-11-06 17:20:31 UTC (rev 4781)
@@ -135,4 +135,4 @@
 {
 	return $str;
 }
-?>
\ No newline at end of file
+?>


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