[Linpha-cvs] SF.net SVN: linpha: [4852] trunk/linpha2
Status: Inactive
Brought to you by:
bzrudi
Menu
▾
▴
[Linpha-cvs] SF.net SVN: linpha: [4852] trunk/linpha2
|
From: <fan...@us...> - 2008-02-04 22:12:53
|
Revision: 4852
http://linpha.svn.sourceforge.net/linpha/?rev=4852&view=rev
Author: fangehrn
Date: 2008-02-04 14:12:44 -0800 (Mon, 04 Feb 2008)
Log Message:
-----------
2008-02-04 flo
* Some more work on the installer
- fixed several bugs (absolute paths, sqlite, manual mode, back navigation)
- don't like the gray background
- added hash_secret variable in config.sql.php
will be used by iha.class
Modified Paths:
--------------
trunk/linpha2/ChangeLog
trunk/linpha2/docs/dev/security.txt
trunk/linpha2/install/header.php
trunk/linpha2/install/header_html.php
trunk/linpha2/install/lib.install.php
trunk/linpha2/install/look.css
trunk/linpha2/install/manual_install.php
trunk/linpha2/install/step10_postsettings.php
trunk/linpha2/install/step3_dbtype.php
trunk/linpha2/install/step4_selectdirectories.php
trunk/linpha2/install/step6_selectdatabase.php
trunk/linpha2/install/step7_selectprefix.php
trunk/linpha2/install/step8_testing.php
trunk/linpha2/install/step9_createtables.php
trunk/linpha2/lib/classes/linpha.admin.class.php
trunk/linpha2/lib/classes/linpha.class.php
trunk/linpha2/lib/classes/linpha.exiftool.class.php
trunk/linpha2/lib/classes/linpha.filesys.class.php
trunk/linpha2/lib/classes/linpha.functions.php
trunk/linpha2/lib/classes/linpha.identify.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.pjmt.class.php
trunk/linpha2/lib/classes/linpha.sql.class.php
trunk/linpha2/lib/classes/linpha.template.class.php
trunk/linpha2/lib/include/sql/config.dir.php
trunk/linpha2/lib/include/sql/config.sql.php
trunk/linpha2/lib/plugins/log/sql/sql.data.php
Added Paths:
-----------
trunk/linpha2/lib/iha/
trunk/linpha2/lib/iha/License-LGPL.txt
trunk/linpha2/lib/iha/iha.php
Modified: trunk/linpha2/ChangeLog
===================================================================
--- trunk/linpha2/ChangeLog 2008-02-04 13:52:22 UTC (rev 4851)
+++ trunk/linpha2/ChangeLog 2008-02-04 22:12:44 UTC (rev 4852)
@@ -1,3 +1,11 @@
+
+2008-02-04 flo
+ * Some more work on the installer
+ - fixed several bugs (absolute paths, sqlite, manual mode, back navigation)
+ - don't like the gray background
+ - added hash_secret variable in config.sql.php
+ will be used by iha.class
+
2008-02-02 bzrudi
* It should now be possible to auto adjust images to fit tracks AND to auto
assign images to closest/nearest trackpoint in GPX file using some offset
Modified: trunk/linpha2/docs/dev/security.txt
===================================================================
--- trunk/linpha2/docs/dev/security.txt 2008-02-04 13:52:22 UTC (rev 4851)
+++ trunk/linpha2/docs/dev/security.txt 2008-02-04 22:12:44 UTC (rev 4852)
@@ -11,4 +11,13 @@
- check every data coming by the user (GET/POST/COOKIE)
-- every switch statement should have a default: case to prevent manipulation
\ No newline at end of file
+- every switch statement should have a default: case to prevent manipulation
+
+
+
+
+
+
+
+http://www.php-einfach.de/improved_hash_algorithm.php
+http://cookies.lcs.mit.edu/pubs/webauth:tr.pdf
\ No newline at end of file
Modified: trunk/linpha2/install/header.php
===================================================================
--- trunk/linpha2/install/header.php 2008-02-04 13:52:22 UTC (rev 4851)
+++ trunk/linpha2/install/header.php 2008-02-04 22:12:44 UTC (rev 4852)
@@ -86,19 +86,6 @@
"step11_finish.php"
);
-$title_str[0] = i18n_install("Welcome");
-$title_str[1] = i18n_install("Accept GPL");
-$title_str[2] = i18n_install("Requirements");
-$title_str[3] = i18n_install("Database Type");
-$title_str[4] = i18n_install("Directories");
-$title_str[5] = i18n_install("Database Login");
-$title_str[6] = i18n_install("Select Database");
-$title_str[7] = i18n_install("Select Prefix");
-$title_str[8] = i18n_install("System Checks");
-$title_str[9] = i18n_install("Database Tables");
-$title_str[10] = i18n_install("Post Settings");
-$title_str[11] = i18n_install("Finalizing");
-
if(! isset($is_special))
{
$current_file = basename($_SERVER['PHP_SELF']);
@@ -141,10 +128,14 @@
if($key >= 3)
{
session_start();
+
+ /**
+ * not needed?! this will delete our saved requirements and dbtype
+ *
if($key==3)
{
$_SESSION = Array();
- }
+ }*/
}
Modified: trunk/linpha2/install/header_html.php
===================================================================
--- trunk/linpha2/install/header_html.php 2008-02-04 13:52:22 UTC (rev 4851)
+++ trunk/linpha2/install/header_html.php 2008-02-04 22:12:44 UTC (rev 4852)
@@ -24,75 +24,54 @@
* @package Installation
*/
+$menu_str[0] = i18n_install("Welcome");
+$menu_str[1] = i18n_install("Accept GPL");
+$menu_str[2] = i18n_install("Requirements");
+$menu_str[3] = i18n_install("Database Type");
+$menu_str[4] = i18n_install("Directories");
+$menu_str[5] = i18n_install("Database Login");
+$menu_str[6] = i18n_install("Select Database");
+$menu_str[7] = i18n_install("Select Prefix");
+$menu_str[8] = i18n_install("System Checks");
+$menu_str[9] = i18n_install("Database Tables");
+$menu_str[10] = i18n_install("Post Settings");
+$menu_str[11] = i18n_install("Finalizing");
+
+$icon_str[0] = './graphics/start.png';
+$icon_str[1] = './graphics/gnu.png';
+$icon_str[2] = './graphics/important.png';
+$icon_str[3] = './graphics/phppg.png';
+$icon_str[4] = './graphics/directories.png';
+$icon_str[5] = './graphics/login.png';
+$icon_str[6] = './graphics/phppg.png';
+$icon_str[7] = './graphics/phppg.png';
+$icon_str[8] = './graphics/phppg.png';
+$icon_str[9] = './graphics/createtables.png';
+$icon_str[10] = './graphics/settings.png';
+$icon_str[11] = './graphics/finish.png';
+
+$title_str[0] = i18n_install("Welcome To LinPHA2 Installation Wizzard");
+$title_str[1] = i18n_install("Accept The GNU General Public License GPL");
+$title_str[2] = i18n_install("Checking For Required Software");
+$title_str[3] = i18n_install("Select Type Of Database To Use");
+$title_str[4] = i18n_install("Define LinPHA Storage And Album Directories");
+$title_str[5] = i18n_install("Directories Testing And Database Login");
+$title_str[6] = i18n_install("Connection Test And Database Selection");
+$title_str[7] = i18n_install("Database Table Prefix Selection");
+$title_str[8] = i18n_install("Running Database Tests And Checking Permissions");
+$title_str[9] = i18n_install("Creating Database Tables And Writing Config Files");
+$title_str[10] = i18n_install("Setup LinPHA Admin And Initial Settings");
+$title_str[11] = i18n_install("Finishing LinPHA2 Setup");
+
+$icon = $icon_str[$key];
+$title = $title_str[$key];
+
$end = count($files)-1;
$step = $key+1;
$finalstep = $end+1;
$strStep = i18n_install("Step %d of %d");
$strStep = sprintf($strStep, $step, $finalstep);
-
-switch($step)
-{
- case 1:
- $icon = './graphics/start.png';
- $title = i18n_install("Welcome To LinPHA2 Installation Wizzard");
- break;
-
- case 2:
- $icon = './graphics/gnu.png';
- $title = i18n_install("Accept The GNU General Public License GPL");
- break;
-
- case 3:
- $icon = './graphics/important.png';
- $title = i18n_install("Checking For Required Software");
- break;
-
- case 4:
- $icon = './graphics/phppg.png';
- $title = i18n_install("Select Type Of Database To Use");
- break;
-
- case 5:
- $icon = './graphics/directories.png';
- $title = i18n_install("Define LinPHA Storage And Album Directories");
- break;
-
- case 6:
- $icon = './graphics/login.png';
- $title = i18n_install("Directories Testing And Database Login");
- break;
-
- case 7:
- $icon = './graphics/phppg.png';
- $title = i18n_install("Connection Test And Database Selection");
- break;
-
- case 8:
- $icon = './graphics/phppg.png';
- $title = i18n_install("Database Table Prefix Selection");
- break;
-
- case 9:
- $icon = './graphics/phppg.png';
- $title = i18n_install("Running Database Tests And Checking Permissions");
- break;
-
- case 10:
- $icon = './graphics/createtables.png';
- $title = i18n_install("Creating Database Tables And Writing Config Files");
- break;
-
- case 11:
- $icon = './graphics/settings.png';
- $title = i18n_install("Setup LinPHA Admin And Initial Settings");
- break;
-
- case 12:
- $icon = './graphics/finish.png';
- $title = i18n_install("Finishing LinPHA2 Setup");
- break;
-}
?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
@@ -131,20 +110,13 @@
}
echo '<div class="leftsidebox'.$style.'">';
- echo $title_str[$i];
- /* switch($i)
- {
- case 0:
- echo i18n_install("Welcome");
- break;
- case $end:
- echo i18n_install("Finish");
- break;
- default:
- echo $title_str[$i];
- break;
+
+ if ($i==0) {
+ echo '<a href="'.$_SERVER['PHP_SELF'].'?reset">'.$menu_str[$i].'</a>';
+ } else {
+ echo $menu_str[$i];
}
-*/
+
echo "</div>";
}
Modified: trunk/linpha2/install/lib.install.php
===================================================================
--- trunk/linpha2/install/lib.install.php 2008-02-04 13:52:22 UTC (rev 4851)
+++ trunk/linpha2/install/lib.install.php 2008-02-04 22:12:44 UTC (rev 4852)
@@ -105,7 +105,7 @@
}
if( installMkdir_p( substr( $target,0,strrpos( $target,'/') ) ) )
{
- return mkdir($target,intval($mode,8)); // crawl back up & create dir tree
+ return @mkdir($target,intval($mode,8)); // crawl back up & create dir tree
}
else
{
@@ -161,6 +161,11 @@
/**
* if $path is absolute, this is returned, if $path is relative, the relative path starting
* from the linpha rootdirectory is returned
+*
+* always removed ending '/' to have unified paths in linpha
+*
+* this function is also defined in linpha.filesys.class.php
+* always update both files!
*
* @author flo
* @param string $path a path
@@ -170,17 +175,29 @@
*/
function installGetFullPath($path)
{
- if(installIsAbsolutePath($path)) {
- $full_path = $path;
- } else {
- $full_path = LINPHA_DIR.'/'.$path;
- }
-
- return $full_path;
+ if ( ! installIsAbsolutePath($path) )
+ {
+ $path = LINPHA_DIR.'/'.$path;
+ }
+
+ /**
+ * remove ending '/' if exists
+ */
+ $len = strlen( $path );
+ $lastsign = substr( $path, $len-1);
+ if($lastsign == '/' OR $lastsign == '\\')
+ {
+ $path = substr($path,0,$len-1);
+ }
+
+ return $path;
}
/**
* checks wether $path is absolute or relative
+*
+* this function is also defined in linpha.filesys.class.php
+* always update both files!
*
* @author flo
* @param string $path a path
@@ -190,10 +207,10 @@
*/
function installIsAbsolutePath($path)
{
- if(substr($path,0,1) == '/' OR // string begins with a '/' -> absolut path
+ if (substr($path,0,1) == '/' OR // string begins with a '/' -> absolut path
((strpos($path, ':') !== false) AND (strpos( PHP_OS, 'WIN' ) !== FALSE))
// we are on windows and the string contains a ':' -> absolut path (c:/..)
- ) { // absolut path
+ ) { // absolute path
return true;
} else {
return false;
@@ -201,9 +218,13 @@
}
/**
- * creates a random password
+ * generates a random string/password in given length
+ * @author bzrudi
+ * @param int length of random string to generate
+ * @return string random string
+ * @package functions
*/
-function random_password($len)
+function installRandomString($len)
{
$pass = '';
$lchar = 0;
@@ -296,26 +317,30 @@
$array = array('album','sql','cache','tmp');
foreach($array AS $value)
{
- /**
- * remove ending slash if not already done
- */
- $len = strlen( $_POST[$value.'_dir'] );
- $lastsign = substr( $_POST[$value.'_dir'], $len-1);
- if($lastsign == '/' && $lastsign == '\\')
- {
- $_POST[$value.'_dir'] = substr($_POST[$value.'_dir'],0,$len-1);
- }
+ if (isset($_POST[$value.'_dir']))
+ {
+ /**
+ * remove ending slash if not already done
+ */
+ $len = strlen( $_POST[$value.'_dir'] );
+ $lastsign = substr( $_POST[$value.'_dir'], $len-1);
+ if($lastsign == '/' && $lastsign == '\\')
+ {
+ $_POST[$value.'_dir'] = substr($_POST[$value.'_dir'],0,$len-1);
+ }
+
+ /**
+ * save current value and append correct dir names
+ */
+ $_SESSION[$value.'_dir'] = $_POST[$value.'_dir'];
+
+ /**
+ * get correct dir names (take care of relativ and absolute paths, add
+ * LINPHA_DIR if necessary)
+ */
+ }
- /**
- * save current value and append correct dir names
- */
- $_SESSION[$value.'_dir'] = $_POST[$value.'_dir'];
-
- /**
- * get correct dir names (take care of relativ and absolute paths, add
- * LINPHA_DIR if necessary)
- */
- $dirs[$value] = installGetFullPath( $_SESSION[$value.'_dir'] );
+ $dirs[$value] = installGetFullPath( $_SESSION[$value.'_dir'] );
}
return $dirs;
}
Modified: trunk/linpha2/install/look.css
===================================================================
--- trunk/linpha2/install/look.css 2008-02-04 13:52:22 UTC (rev 4851)
+++ trunk/linpha2/install/look.css 2008-02-04 22:12:44 UTC (rev 4852)
@@ -55,12 +55,12 @@
.leftside {
- background: #F3F3F3; /*#e2e2e2;*/
+ background: #E0E8FF; /*#F3F3F3; /*#e2e2e2;*/
border-right: 0px;
}
.rightside {
- background: #F3F3F3; /*#eeeeee;*/
+ background: #E0E8FF; /*#F3F3F3; /*#eeeeee;*/
}
.button {
@@ -85,6 +85,10 @@
font-weight: bold;
}
+.leftsidebox a {
+ color: #000000;
+}
+
.box2 {
}
Modified: trunk/linpha2/install/manual_install.php
===================================================================
--- trunk/linpha2/install/manual_install.php 2008-02-04 13:52:22 UTC (rev 4851)
+++ trunk/linpha2/install/manual_install.php 2008-02-04 22:12:44 UTC (rev 4852)
@@ -59,6 +59,7 @@
$_SESSION['sql_password'] = "";
$_SESSION['sql_dbname'] = "linpha";
$_SESSION['sql_dbport'] = "3306";
+ $_SESSION['hash_secret'] = "";
define('LIN_PREFIX', $_SESSION['sql_prefix']);
@@ -137,16 +138,8 @@
echo $_SESSION['album_dir']."\n";
echo $_SESSION['sql_dir']."\n";
echo $_SESSION['cache_dir']."\n";
-echo $_SESSION['cache_dir'].'/imgcache/'."\n";
-for($i = 0; $i < 10; $i++)
-{
- echo $_SESSION['cache_dir'].'/imgcache/'.$i.'/'."\n";
-}
-echo $_SESSION['cache_dir'].'/thumbache/'."\n";
-for($i = 0; $i < 10; $i++)
-{
- echo $_SESSION['cache_dir'].'/thumbache/'.$i.'/'."\n";
-}
+echo $_SESSION['cache_dir'].'/img'."\n";
+echo $_SESSION['cache_dir'].'/thumb/'."\n";
echo $_SESSION['tmp_dir']."\n";
echo $_SESSION['tmp_dir'].'/adocache/';
?>
@@ -165,6 +158,7 @@
$comment[2] = $changeme; $comment[3] = $changeme; $comment[4] = $changeme; $comment[5] = $changeme;
$comment[6] = $donotchange;
$comment[7] = $changeme;
+$comment[8] = $changeme;
include_once(LINPHA_DIR.'/lib/include/sql/config.sql.php');
?>
Modified: trunk/linpha2/install/step10_postsettings.php
===================================================================
--- trunk/linpha2/install/step10_postsettings.php 2008-02-04 13:52:22 UTC (rev 4851)
+++ trunk/linpha2/install/step10_postsettings.php 2008-02-04 22:12:44 UTC (rev 4852)
@@ -45,13 +45,14 @@
echo i18n_install("Connecting To Database...").' ';
unset($_SESSION['installmode1']);
+$_SESSION['installmode2'] = true;
include_once(LINPHA_DIR.'/lib/classes/linpha.class.php');
$linpha = new Linpha();
-$linpha->sql->dbConnect();
+$linpha->sql->dbConnect(); // will exit on failure
-echo success_msg(); // TODO: we should check for success before stating it ;-)
+echo success_msg();
/**
* add new linpha admin user
Modified: trunk/linpha2/install/step3_dbtype.php
===================================================================
--- trunk/linpha2/install/step3_dbtype.php 2008-02-04 13:52:22 UTC (rev 4851)
+++ trunk/linpha2/install/step3_dbtype.php 2008-02-04 22:12:44 UTC (rev 4852)
@@ -77,21 +77,22 @@
* check for supported databases
* define disabled and checked variables
*/
-foreach($array_databases AS $key=>$value)
+foreach ($array_databases as $key=>$value)
{
- if(!function_exists($value)) {
+ if (!function_exists($value)) {
$disabled = ' disabled="disabled"';
} else {
$disabled = '';
}
- if(isset($_SESSION['sql_dbtype']) && $_SESSION['sql_dbtype'] == $key) {
+ if (isset($_SESSION['sql_dbtype']) && $_SESSION['sql_dbtype'] == $key && empty($disabled)) {
$checked = ' checked="checked"';
+ $is_first = false;
} else {
/**
* use first entry as checked
*/
- if(!isset($is_first) && empty($disabled))
+ if (!isset($is_first) && empty($disabled))
{
$is_first = false;
$checked = ' checked="checked"';
@@ -125,12 +126,10 @@
<br /><br />
<h1><?php echo i18n_install("Select Installation Mode"); ?></h1><hr>
-<input type='radio' id='linInputModeAutomatic' name='install_mode' value='automatic' checked="checked"><?php
-/* no linebreak between <input> and <label> tag */ ?><label for="linInputModeAutomatic">
+<label for="linInputModeAutomatic"><input type='radio' id='linInputModeAutomatic' name='install_mode' value='automatic' checked="checked">
<?php echo i18n_install("Automatic mode"); ?></label>
<br />
-<input type='radio' id='linInputModeManual' name='install_mode' value='manual'><?php
-/* no linebreak between <input> and <label> tag */ ?><label for="linInputModeManual">
+<label for="linInputModeManual"><input type='radio' id='linInputModeManual' name='install_mode' value='manual'>
<?php echo i18n_install("Manual Mode (Experts Only)"); ?></label>
<?php
Modified: trunk/linpha2/install/step4_selectdirectories.php
===================================================================
--- trunk/linpha2/install/step4_selectdirectories.php 2008-02-04 13:52:22 UTC (rev 4851)
+++ trunk/linpha2/install/step4_selectdirectories.php 2008-02-04 22:12:44 UTC (rev 4852)
@@ -27,9 +27,9 @@
include_once(LINPHA_DIR.'/install/header.php');
if (!isset($_SESSION['default_sql_dir']) ) { // save for later use in initInitialDirectories()
- $_SESSION['default_sql_dir'] = 'var/sql-'.random_password(10);
- $_SESSION['default_cache_dir'] = 'var/cache-'.random_password(10);
- $_SESSION['default_tmp_dir'] = 'var/tmp-'.random_password(10);
+ $_SESSION['default_sql_dir'] = 'var/sql-'.installRandomString(10);
+ $_SESSION['default_cache_dir'] = 'var/cache-'.installRandomString(10);
+ $_SESSION['default_tmp_dir'] = 'var/tmp-'.installRandomString(10);
}
$album_dir = (isset($_SESSION['album_dir']) ? $_SESSION['album_dir'] : 'albums');
@@ -69,12 +69,13 @@
include_once(LINPHA_DIR.'/install/header_html.php');
+
+echo i18n_install("For security reasons folders were named random.").' ';
+echo i18n_install("For maximum security place all these folders outside of the www root!").' ';
+echo '('.i18n_install("Relative or absolute paths are allowed.").')<br /><br />';
?>
<div class="boxalign">
<?php
-echo '<b>'.i18n_install("For maximum security place all these folders outside of the www root!") .
- '</b><br />('.i18n_install("Relative or absolute paths allowed.").')<br /><br />';
-
echo i18n_install("Album Directory").":"; ?>
<input class="boxalignelement" type="text" id="check01" onKeyup="checkForm()"
name="album_dir" size="30" value="<?php echo $album_dir; ?>">
@@ -113,11 +114,7 @@
(-> <?php echo installLinRealpath( installGetFullPath($tmp_dir) ); ?>)
<br /><br />
-<?php
-echo i18n_install("For security reasons folders were named random.");
-?>
-
<input type="hidden" name="cmd_step4" value="save">
Modified: trunk/linpha2/install/step6_selectdatabase.php
===================================================================
--- trunk/linpha2/install/step6_selectdatabase.php 2008-02-04 13:52:22 UTC (rev 4851)
+++ trunk/linpha2/install/step6_selectdatabase.php 2008-02-04 22:12:44 UTC (rev 4852)
@@ -110,7 +110,7 @@
$_SESSION['allowed_to_create_db'] = false;
break;
-// case "sqlite": sqlite goes directly to stage8
+// case "sqlite": sqlite goes directly to stage7
}
if(isset($error_nr))
Modified: trunk/linpha2/install/step7_selectprefix.php
===================================================================
--- trunk/linpha2/install/step7_selectprefix.php 2008-02-04 13:52:22 UTC (rev 4851)
+++ trunk/linpha2/install/step7_selectprefix.php 2008-02-04 22:12:44 UTC (rev 4852)
@@ -133,39 +133,55 @@
/**
* checking album, sql, cache and tmp directory
*/
- $dirs = initSessionValues();
- if(initInitialDirectories($dirs) != true)
- {
- $show_next_button = false;
- include_once(LINPHA_DIR.'/install/footer.php');
- exit();
- }
-
- echo i18n_install("Connecting SQLite Database...").' ';
-
- if(file_exists(LINPHA_DIR.'/'.$_SESSION['sql_dir'].'/'.$_SESSION['sql_dbname']))
+ if(isset($_POST['cmd_step4']))
+ {
+ /**
+ * checking album, sql, cache and tmp directory
+ */
+ $dirs = initSessionValues();
+ if(initInitialDirectories($dirs) != true)
+ {
+ $show_next_button = false;
+ include_once(LINPHA_DIR.'/install/footer.php');
+ exit();
+ }
+ }
+
+
+ if (isset($_SESSION['sqlite_db_created']) && $_SESSION['sqlite_db_created']==$_SESSION['sql_dir'])
{
- echo failed_msg();
- echo "<br />".sprintf( i18n_install("Database Already Exists, Delete First The File %s!"),$_SESSION['sql_dbname'] );
- $error_nr = 3;
+ echo i18n_install("Sqlite database already created, please continue to next step.");
}
else
{
-
- /**
- * store in session to be used when switching to adodb
- */
-
- if ($db = @sqlite_open(LINPHA_DIR.'/'.$_SESSION['sql_dir'].'/'.$_SESSION['sql_dbname'], 0666, $sqliteerror))
- {
- echo success_msg();
- }
- else
- {
- echo failed_msg();
- echo "<br />".i18n_install("Failed To Create Database").": ".$sqliteerror;
- $error_nr = 3;
- }
+ echo i18n_install("Creating SQLite Database...").' ';
+
+ $sqlite_file = installGetFullPath( $_SESSION['sql_dir'] ).'/'.$_SESSION['sql_dbname'];
+ if(file_exists($sqlite_file))
+ {
+ echo failed_msg();
+ echo "<br />".sprintf( i18n_install("Database Already Exists, Delete First The File %s!"),$_SESSION['sql_dbname'] );
+ $error_nr = 3;
+ }
+ else
+ {
+ if ($db = @sqlite_open($sqlite_file, 0666, $sqliteerror))
+ {
+ echo success_msg();
+
+ /**
+ * do check for sqlite database already exist only once per sql_dir
+ * to prevent error message when pushing back button on step8
+ */
+ $_SESSION['sqlite_db_created'] = $_SESSION['sql_dir'];
+ }
+ else
+ {
+ echo failed_msg();
+ echo "<br />".i18n_install("Failed To Create Database").": ".$sqliteerror;
+ $error_nr = 3;
+ }
+ }
}
break;
case "oci8po":
Modified: trunk/linpha2/install/step8_testing.php
===================================================================
--- trunk/linpha2/install/step8_testing.php 2008-02-04 13:52:22 UTC (rev 4851)
+++ trunk/linpha2/install/step8_testing.php 2008-02-04 22:12:44 UTC (rev 4852)
@@ -61,10 +61,10 @@
* switching to AdoDB
* connect to db and check if connection was succesfull
*/
- echo i18n_install("Switching To AdoDB..").' ';
+ echo i18n_install("Switching To AdoDB...").' ';
$_SESSION['installmode1'] = true;
$_SESSION['installmode2'] = true;
-
+
include_once(LINPHA_DIR.'/lib/classes/linpha.class.php');
$linpha = new Linpha();
@@ -130,8 +130,8 @@
if($_SESSION['sql_dbtype'] == "mysql")
{
echo i18n_install("Trying To Create New LinPHA Database User...").' ';
- $random_pass = random_password(8);
- $random_user = "linpha_".random_password(4);
+ $random_pass = installRandomString(10);
+ $random_user = "linpha_".installRandomString(4);
if($_SESSION['sql_hostname'] == 'localhost' OR $_SESSION['sql_hostname'] == '127.0.0.1')
{
@@ -180,21 +180,13 @@
}
}
}
- echo '<br /><br /><hr /><br />';
+ echo '<br /><br />';
}
+echo '<br /><br />';
/**
* running tests
*/
-/**
- * prevent test running sqlite db
- * @todo why?? -flo
- * @todo - because at least alter will fail ;-) - bzrudi
- */
-
-if($_SESSION['sql_dbtype'] != 'sqlite')
-{
-
for($i = 1; $i <= $n_runs; $i++)
{
/**
@@ -215,16 +207,32 @@
echo "<br />".i18n_install("Running Tests").": ";
- $array_tests = array(
- "CREATE" => "CREATE TABLE ".$table_name." ( id INT NOT NULL )",
- "INSERT" => "INSERT into ".$table_name." ( id ) VALUES ( '5' )",
- "ALTER" => "ALTER TABLE ".$table_name." ADD md5sum VARCHAR(32)",
- "UPDATE" => "UPDATE ".$table_name." SET md5sum = '".md5('the life ist beautiful')."'",
- "SELECT" => "SELECT * FROM ".$table_name,
- "DELETE" => "DELETE FROM ".$table_name,
- "DROP" => "DROP TABLE ".$table_name );
-
- foreach($array_tests AS $key=>$value)
+ if ($_SESSION['sql_dbtype'] == 'sqlite')
+ {
+ /**
+ * sqlite does not support ALTER commands
+ */
+ $array_tests = array(
+ "CREATE" => "CREATE TABLE ".$table_name." ( id INT NOT NULL, md5sum VARCHAR(32) )",
+ "INSERT" => "INSERT into ".$table_name." ( id ) VALUES ( '5' )",
+ "UPDATE" => "UPDATE ".$table_name." SET md5sum = '".md5('the life ist beautiful')."'",
+ "SELECT" => "SELECT * FROM ".$table_name,
+ "DELETE" => "DELETE FROM ".$table_name,
+ "DROP" => "DROP TABLE ".$table_name
+ );
+ } else {
+ $array_tests = array(
+ "CREATE" => "CREATE TABLE ".$table_name." ( id INT NOT NULL )",
+ "INSERT" => "INSERT into ".$table_name." ( id ) VALUES ( '5' )",
+ "ALTER" => "ALTER TABLE ".$table_name." ADD md5sum VARCHAR(32)",
+ "UPDATE" => "UPDATE ".$table_name." SET md5sum = '".md5('the life ist beautiful')."'",
+ "SELECT" => "SELECT * FROM ".$table_name,
+ "DELETE" => "DELETE FROM ".$table_name,
+ "DROP" => "DROP TABLE ".$table_name
+ );
+ }
+
+ foreach($array_tests AS $key=>$value)
{
echo " ".$key." ";
@@ -283,21 +291,14 @@
}
}
}
-}
-else
-{
- /**
- * skip tests for sqlite
- */
- echo i18n_install("Skipping Database Tests");
-}
+
/**
* new user failed, use old connection
*/
if(isset($use_other_conn))
{
echo "<br /><br /><b>".i18n_install("New User Tests Failed, Falling Back...")."</b>";
- $linpha->db = $orig_conn;
+ $linpha->db = $orig_conn; // @TODO flo: i don't think that this makes any sense...
}
elseif($n_runs == 2)
{
Modified: trunk/linpha2/install/step9_createtables.php
===================================================================
--- trunk/linpha2/install/step9_createtables.php 2008-02-04 13:52:22 UTC (rev 4851)
+++ trunk/linpha2/install/step9_createtables.php 2008-02-04 22:12:44 UTC (rev 4852)
@@ -211,6 +211,8 @@
$comment[5] = '';
$comment[6] = '';
$comment[7] = '';
+ $comment[8] = '';
+ $_SESSION['hash_secret'] = installRandomString(32);
include_once(LINPHA_DIR.'/lib/include/sql/config.sql.php');
Modified: trunk/linpha2/lib/classes/linpha.admin.class.php
===================================================================
--- trunk/linpha2/lib/classes/linpha.admin.class.php 2008-02-04 13:52:22 UTC (rev 4851)
+++ trunk/linpha2/lib/classes/linpha.admin.class.php 2008-02-04 22:12:44 UTC (rev 4852)
@@ -22,6 +22,9 @@
* This class provides functions for edit configs etc.
* @package Admin
*/
+
+if(!defined('LINPHA_DIR')) { exit(1); }
+
class LinAdmin
{
Modified: trunk/linpha2/lib/classes/linpha.class.php
===================================================================
--- trunk/linpha2/lib/classes/linpha.class.php 2008-02-04 13:52:22 UTC (rev 4851)
+++ trunk/linpha2/lib/classes/linpha.class.php 2008-02-04 22:12:44 UTC (rev 4852)
@@ -22,6 +22,7 @@
* This is the base class which needs to be included. It takes care of
* including a number of class files and sets up basic things.
*/
+
if(!defined('LINPHA_DIR')) { exit(1); }
include_once(LINPHA_DIR.'/lib/classes/linpha.sql.class.php');
Modified: trunk/linpha2/lib/classes/linpha.exiftool.class.php
===================================================================
--- trunk/linpha2/lib/classes/linpha.exiftool.class.php 2008-02-04 13:52:22 UTC (rev 4851)
+++ trunk/linpha2/lib/classes/linpha.exiftool.class.php 2008-02-04 22:12:44 UTC (rev 4852)
@@ -25,6 +25,9 @@
* @package MetaData
* @author bzrudi
*/
+
+if(!defined('LINPHA_DIR')) { exit(1); }
+
class LinExifTool extends LinMetaData
{
Modified: trunk/linpha2/lib/classes/linpha.filesys.class.php
===================================================================
--- trunk/linpha2/lib/classes/linpha.filesys.class.php 2008-02-04 13:52:22 UTC (rev 4851)
+++ trunk/linpha2/lib/classes/linpha.filesys.class.php 2008-02-04 22:12:44 UTC (rev 4852)
@@ -23,11 +23,10 @@
* @package Filesystem
*/
+if(!defined('LINPHA_DIR')) { exit(1); }
class LinFilesys
{
-
-
/**
* create directory recursively - same as "mkdir -p"
*/
@@ -174,6 +173,9 @@
* the relative path starting from the linpha root directory is returned
*
* always removed ending '/' to have unified paths in linpha
+*
+* this function is also defined in lib.install.php
+* always update both files!
*
* @author flo
* @param string $path a path
@@ -200,9 +202,11 @@
return $path;
}
-
/**
* checks wether $path is absolute or relative
+*
+* this function is also defined in linpha.filesys.class.php
+* always update both files!
*
* @author flo
* @param string $path a path
@@ -213,7 +217,7 @@
{
if(substr($path,0,1) == '/' OR // string begins with a '/' -> absolut path
((strpos($path, ':') !== false) AND (strpos( PHP_OS, 'WIN' ) !== FALSE)) // we are on windows and the string contains a ':' -> absolut path (c:/..)
- ) { // absolut path
+ ) { // absolute path
return true;
} else {
return false;
Modified: trunk/linpha2/lib/classes/linpha.functions.php
===================================================================
--- trunk/linpha2/lib/classes/linpha.functions.php 2008-02-04 13:52:22 UTC (rev 4851)
+++ trunk/linpha2/lib/classes/linpha.functions.php 2008-02-04 22:12:44 UTC (rev 4852)
@@ -23,6 +23,8 @@
* @package Functions
*/
+if(!defined('LINPHA_DIR')) { exit(1); }
+
/**
* get content of the systems PATH variable and remove dirs not in open_basedir and safe_mode_exec_dir (only if activated)
*/
@@ -582,7 +584,6 @@
/**
* Setup Log Time Output Message & Remote IP
*/
- $time = linStrftime(time());
$ip = $_SERVER["REMOTE_ADDR"];
if( !isset($_SESSION['user_name'])) {
$user = 'anonymous';
@@ -612,6 +613,8 @@
if(isset($GLOBALS['linpha']->sql->config->value['plugins_log_enable']) &&
$GLOBALS['linpha']->sql->config->value['plugins_log_enable'] == '1')
{
+ $time = linStrftime(time()); // only when database is connected
+
/**
* In case of database connection error a file named
* db_error_tmp.log is created. If the file exists, copy it's content
@@ -946,7 +949,6 @@
* @param int length of random string to generate
* @return string random string
* @package functions
-
*/
function random_string($len)
{
Modified: trunk/linpha2/lib/classes/linpha.identify.class.php
===================================================================
--- trunk/linpha2/lib/classes/linpha.identify.class.php 2008-02-04 13:52:22 UTC (rev 4851)
+++ trunk/linpha2/lib/classes/linpha.identify.class.php 2008-02-04 22:12:44 UTC (rev 4852)
@@ -24,6 +24,8 @@
* @package Image
*/
+if(!defined('LINPHA_DIR')) { exit(1); }
+
class LinIdentify
{
Modified: trunk/linpha2/lib/classes/linpha.imgview.class.php
===================================================================
--- trunk/linpha2/lib/classes/linpha.imgview.class.php 2008-02-04 13:52:22 UTC (rev 4851)
+++ trunk/linpha2/lib/classes/linpha.imgview.class.php 2008-02-04 22:12:44 UTC (rev 4852)
@@ -22,6 +22,7 @@
* This class takes care of all different views (thumb view, menus...)
* @package Image
*/
+
if(!defined('LINPHA_DIR')) { exit(1); }
define('LIN_SELECT_FIELDS',
Modified: trunk/linpha2/lib/classes/linpha.import.class.php
===================================================================
--- trunk/linpha2/lib/classes/linpha.import.class.php 2008-02-04 13:52:22 UTC (rev 4851)
+++ trunk/linpha2/lib/classes/linpha.import.class.php 2008-02-04 22:12:44 UTC (rev 4852)
@@ -18,13 +18,16 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
+
/**
* This class takes automagic care of added/deleted images and albums
* @package Image
*/
+
+if(!defined('LINPHA_DIR')) { exit(1); }
+
class LinImport
{
-
/**
* update selected directory
* add new dirs/files, delete old ones
Modified: trunk/linpha2/lib/classes/linpha.metadata.class.php
===================================================================
--- trunk/linpha2/lib/classes/linpha.metadata.class.php 2008-02-04 13:52:22 UTC (rev 4851)
+++ trunk/linpha2/lib/classes/linpha.metadata.class.php 2008-02-04 22:12:44 UTC (rev 4852)
@@ -18,15 +18,16 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-if (!defined('LINPHA_DIR')) { exit (1); }
-include_once LINPHA_DIR.'/lib/pjmt/Unicode.php';
-
/**
* This is the baseclass to handle all the EXIF/IPTC/XMP stuff used in LinPHA
* It is extended by LinExifTool and LinPjmtTool class
* @package MetaData
* @author bzrudi,flo
*/
+
+if (!defined('LINPHA_DIR')) { exit (1); }
+include_once LINPHA_DIR.'/lib/pjmt/Unicode.php';
+
class LinMetaData
{
public $defined_fields, $available_fields, $objMetaTool;
Modified: trunk/linpha2/lib/classes/linpha.pjmt.class.php
===================================================================
--- trunk/linpha2/lib/classes/linpha.pjmt.class.php 2008-02-04 13:52:22 UTC (rev 4851)
+++ trunk/linpha2/lib/classes/linpha.pjmt.class.php 2008-02-04 22:12:44 UTC (rev 4852)
@@ -24,6 +24,9 @@
* @package MetaData
* @author bzrudi,flo
*/
+
+if(!defined('LINPHA_DIR')) { exit(1); }
+
class LinPjmtTool extends LinMetaData
{
/**
Modified: trunk/linpha2/lib/classes/linpha.sql.class.php
===================================================================
--- trunk/linpha2/lib/classes/linpha.sql.class.php 2008-02-04 13:52:22 UTC (rev 4851)
+++ trunk/linpha2/lib/classes/linpha.sql.class.php 2008-02-04 22:12:44 UTC (rev 4852)
@@ -23,6 +23,8 @@
* @package Database
*/
+if(!defined('LINPHA_DIR')) { exit(1); }
+
class LinSql
{
private $isLoggedIn, $isAdmin;
@@ -49,9 +51,8 @@
$db_username = $_SESSION['sql_username'];
$db_password = $_SESSION['sql_password'];
$db_port = $_SESSION['sql_dbport'];
- $db_name = ($db_type == "sqlite" ? LINPHA_DIR.'/'.$_SESSION['sql_dir'] : '').$_SESSION['sql_dbname'];
+ $db_name = $_SESSION['sql_dbname'];
$db_prefix = $_SESSION['sql_prefix'];
-
}
else
{
@@ -61,20 +62,23 @@
include_once(LINPHA_DIR.'/lib/adodb/adodb-errorhandler.inc.php');
*/
+ /**
+ * if this file does not exists we already switch to installer
+ */
$sql_dir = '';
- include(LINPHA_DIR.'/var/config.dir.php'); // no include_once if we reconnect from another directory...
+ require_once(LINPHA_DIR.'/var/config.dir.php'); // no include_once if we reconnect from another directory...
$include_file = LinFilesys::getFullPath( $sql_dir ) . '/config.sql.php';
if( file_exists($include_file) )
{
- include_once( $include_file );
+ require_once( $include_file );
}
else
{
- linLog(LOG_TYPE_DB,LOG_EMERG,'db_connect',"Cannot connect to the database !!! Cannot get config file ./var/config.sql.php");
+ linLog(LOG_TYPE_DB,LOG_EMERG,'db_connect',"Cannot connect to the database !!! Cannot get config file $include_file");
include(LINPHA_DIR."/lib/include/db_connect_error.html");
- echo "<br /><br /><b>ERROR MESSAGE: Failed to include config file './var/config.sql.php' is it missing?</b>";
+ echo "<br /><br /><b>ERROR MESSAGE: Failed to include config file. See log file for details.</b>";
exit(1);
}
@@ -114,15 +118,11 @@
switch(LIN_DB_TYPE)
{
case "sqlite":
- if(isset($_SESSION['installmode1']))
- {
- $sql_dir = LinFilesys::getFullPath($_SESSION['sql_dir']);
- $GLOBALS['linpha']->db->Connect($sql_dir.'/database.sqlite');
+ if(isset($_SESSION['installmode1'])) {
+ $sql_dir = $_SESSION['sql_dir'];
}
- else
- {
- $GLOBALS['linpha']->db->Connect(LinFilesys::getFullPath( $sql_dir ).'/database.sqlite');
- }
+
+ $GLOBALS['linpha']->db->Connect(LinFilesys::getFullPath( $sql_dir ).'/'.$db_name);
break;
case "mysql":
$GLOBALS['linpha']->db->Connect("$db_hostname:$db_port", $db_username, $db_password, $db_name);
Modified: trunk/linpha2/lib/classes/linpha.template.class.php
===================================================================
--- trunk/linpha2/lib/classes/linpha.template.class.php 2008-02-04 13:52:22 UTC (rev 4851)
+++ trunk/linpha2/lib/classes/linpha.template.class.php 2008-02-04 22:12:44 UTC (rev 4852)
@@ -22,6 +22,9 @@
* This class takes care of LinPHAs template layouts
* @package Template
*/
+
+if(!defined('LINPHA_DIR')) { exit(1); }
+
class LinTemplate
{
public $template_name, $layout_name;
@@ -159,8 +162,8 @@
</style>
<![endif]-->
-<script type="text/javascript" language="JavaScript" src="<?php echo LINPHA_CLIENT; ?>/lib/js/prototype.js"></script>
-<script type="text/javascript" language="JavaScript" src="<?php echo LINPHA_CLIENT; ?>/lib/js/LinGlobal.js"></script>
+<script type="text/javascript" language="JavaScript" src="<?php echo LINPHA_CLIENT; ?>/lib/js/prototype.js"></script>
+<script type="text/javascript" language="JavaScript" src="<?php echo LINPHA_CLIENT; ?>/lib/js/LinGlobal.js"></script>
<script type="text/javascript" language="JavaScript">
var LINPHA_LINK = '<?php echo LINPHA_LINK; ?>';
var LINPHA_CLIENT = '<?php echo LINPHA_CLIENT; ?>';
@@ -169,11 +172,11 @@
var IdCurrent = startIdCurrent;
<?php
if(! isset($_SESSION['use_js']) && ! isset($_SESSION['disable_ajax'])) {
- //echo "var checkAjaxCompatibility = true;"."\n";
- echo "myLinGlobal.checkAjaxCompatibility();"."\n";
-} /*else {
- echo "var checkAjaxCompatibility = false;"."\n";
-}*/
+ //echo "var checkAjaxCompatibility = true;"."\n";
+ echo "myLinGlobal.checkAjaxCompatibility();"."\n";
+} /*else {
+ echo "var checkAjaxCompatibility = false;"."\n";
+}*/
?>
</script>
Added: trunk/linpha2/lib/iha/License-LGPL.txt
===================================================================
--- trunk/linpha2/lib/iha/License-LGPL.txt (rev 0)
+++ trunk/linpha2/lib/iha/License-LGPL.txt 2008-02-04 22:12:44 UTC (rev 4852)
@@ -0,0 +1,506 @@
+ GNU LESSER GENERAL PUBLIC LICENSE
+ Version 2.1, February 1999
+
+ Copyright (C) 1991, 1999 Free Software Foundation, Inc.
+ 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+[This is the first released version of the Lesser GPL. It also counts
+ as the successor of the GNU Library Public License, version 2, hence
+ the version number 2.1.]
+
+ Preamble
+
+ The licenses for most software are designed to take away your
+freedom to share and change it. By contrast, the GNU General Public
+Licenses are intended to guarantee your freedom to share and change
+free software--to make sure the software is free for all its users.
+
+ This license, the Lesser General Public License, applies to some
+specially designated software packages--typically libraries--of the
+Free Software Foundation and other authors who decide to use it. You
+can use it too, but we suggest you first think carefully about whether
+this license or the ordinary General Public License is the better
+strategy to use in any particular case, based on the explanations below.
+
+ When we speak of free software, we are referring to freedom of use,
+not price. Our General Public Licenses are designed to make sure that
+you have the freedom to distribute copies of free software (and charge
+for this service if you wish); that you receive source code or can get
+it if you want it; that you can change the software and use pieces of
+it in new free programs; and that you are informed that you can do
+these things.
+
+ To protect your rights, we need to make restrictions that forbid
+distributors to deny you these rights or to ask you to surrender these
+rights. These restrictions translate to certain responsibilities for
+you if you distribute copies of the library or if you modify it.
+
+ For example, if you distribute copies of the library, whether gratis
+or for a fee, you must give the recipients all the rights that we gave
+you. You must make sure that they, too, receive or can get the source
+code. If you link other code with the library, you must provide
+complete object files to the recipients, so that they can relink them
+with the library after making changes to the library and recompiling
+it. And you must show them these terms so they know their rights.
+
+ We protect your rights with a two-step method: (1) we copyright the
+library, and (2) we offer you this license, which gives you legal
+permission to copy, distribute and/or modify the library.
+
+ To protect each distributor, we want to make it very clear that
+there is no warranty for the free library. Also, if the library is
+modified by someone else and passed on, the recipients should know
+that what they have is not the original version, so that the original
+author's reputation will not be affected by problems that might be
+introduced by others.
+
+ Finally, software patents pose a constant threat to the existence of
+any free program. We wish to make sure that a company cannot
+effectively restrict the users of a free program by obtaining a
+restrictive license from a patent holder. Therefore, we insist that
+any patent license obtained for a version of the library must be
+consistent with the full freedom of use specified in this license.
+
+ Most GNU software, including some libraries, is covered by the
+ordinary GNU General Public License. This license, the GNU Lesser
+General Public License, applies to certain designated libraries, and
+is quite different from the ordinary General Public License. We use
+this license for certain libraries in order to permit linking those
+libraries into non-free programs.
+
+ When a program is linked with a library, whether statically or using
+a shared library, the combination of the two is legally speaking a
+combined work, a derivative of the original library. The ordinary
+General Public License therefore permits such linking only if the
+entire combination fits its criteria of freedom. The Lesser General
+Public License permits more lax criteria for linking other code with
+the library.
+
+ We call this license the "Lesser" General Public License because it
+does Less to protect the user's freedom than the ordinary General
+Public License. It also provides other free software developers Less
+of an advantage over competing non-free programs. These disadvantages
+are the reason we use the ordinary General Public License for many
+libraries. However, the Lesser license provides advantages in certain
+special circumstances.
+
+ For example, on rare occasions, there may be a special need to
+encourage the widest possible use of a certain library, so that it becomes
+a de-facto standard. To achieve this, non-free programs must be
+allowed to use the library. A more frequent case is that a free
+library does the same job as widely used non-free libraries. In this
+case, there is little to gain by limiting the free library to free
+software only, so we use the Lesser General Public License.
+
+ In other cases, permission to use a particular library in non-free
+programs enables a greater number of people to use a large body of
+free software. For example, permission to use the GNU C Library in
+non-free programs enables many more people to use the whole GNU
+operating system, as well as its variant, the GNU/Linux operating
+system.
+
+ Although the Lesser General Public License is Less protective of the
+users' freedom, it does ensure that the user of a program that is
+linked with the Library has the freedom and the wherewithal to run
+that program using a modified version of the Library.
+
+ The precise terms and conditions for copying, distribution and
+modification follow. Pay close attention to the difference between a
+"work based on the library" and a "work that uses the library". The
+former contains code derived from the library, whereas the latter must
+be combined with the library in order to run.
+
+ GNU LESSER GENERAL PUBLIC LICENSE
+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+ 0. This License Agreement applies to any software library or other
+program which contains a notice placed by the copyright holder or
+other authorized party saying it may be distributed under the terms of
+this Lesser General Public License (also called "this License").
+Each licensee is addressed as "you".
+
+ A "library" means a collection of software functions and/or data
+prepared so as to be conveniently linked with application programs
+(which use some of those functions and data) to form executables.
+
+ The "Library", below, refers to any such software library or work
+which has been distributed under these terms. A "work based on the
+Library" means either the Library or any derivative work under
+copyright law: that is to say, a work containing the Library or a
+portion of it, either verbatim or with modifications and/or translated
+straightforwardly into another language. (Hereinafter, translation is
+included without limitation in the term "modification".)
+
+ "Source code" for a work means the preferred form of the work for
+making modifications to it. For a library, complete source code means
+all the source code for all modules it contains, plus any associated
+interface definition files, plus the scripts used to control compilation
+and installation of the library.
+
+ Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope. The act of
+running a program using the Library is not restricted, and output from
+such a program is covered only if its contents constitute a work based
+on the Library (independent of the use of the Library in a tool for
+writing it). Whether that is true depends on what the Library does
+and what the program that uses the Library does.
+
+ 1. You may copy and distribute verbatim copies of the Library's
+complete source code as you receive it, in any medium, provided that
+you conspicuously and appropriately publish on each copy an
+appropriate copyright notice and disclaimer of warranty; keep intact
+all the notices that refer to this License and to the absence of any
+warranty; and distribute a copy of this License along with the
+Library.
+
+ You may charge a fee for the physical act of transferring a copy,
+and you may at your option offer warranty protection in exchange for a
+fee.
+
+ 2. You may modify your copy or copies of the Library or any portion
+of it, thus forming a work based on the Library, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+ a) The modified work must itself be a software library.
+
+ b) You must cause the files modified to carry prominent notices
+ stating that you changed the files and the date of any change.
+
+ c) You must cause the whole of the work to be licensed at no
+ charge to all third parties under the terms of this License.
+
+ d) If a facility in the modified Library refers to a function or a
+ table of data to be supplied by an application program that uses
+ the facility, other than as an argument passed when the facility
+ is invoked, then you must make a good faith effort to ensure that,
+ in the event an application does not supply such function or
+ table, the facility still operates, and performs whatever part of
+ its purpose remains meaningful.
+
+ (For example, a function in a library to compute square roots has
+ a purpose that is entirely well-defined independent of the
+ application. Therefore, Subsection 2d requires that any
+ application-supplied function or table used by this function must
+ be optional: if the application does not supply it, the square
+ root function must still compute square roots.)
+
+These requirements apply to the modified work as a whole. If
+identifiable sections of that work are not derived from the Library,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works. But when you
+distribute the same sections as part of a whole which is a work based
+on the Library, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote
+it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Library.
+
+In addition, mere aggregation of another work not based on the Library
+with the Library (or with a work based on the Library) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+ 3. You may opt to apply the terms of the ordinary GNU General Public
+License instead of this License to a given copy of the Library. To do
+this, you must alter all the notices that refer to this License, so
+that they refer to the ordinary GNU General Public License, version 2,
+instead of to this License. (If a newer version than version 2 of the
+ordinary GNU General Public License has appeared, then you can specify
+that version instead if you wish.) Do not make any other change in
+these notices.
+
+ Once this change is made in a given copy, it is irreversible for
+that copy, so the ordinary GNU General Public License applies to all
+subsequent copies and derivative works made from that copy.
+
+ This option is useful when you wish to copy part of the code of
+the Library into a program that is not a library.
+
+ 4. You may copy and distribute the Library (or a portion or
+derivative of it, under Section 2) in object code or executable form
+under the terms of Sections 1 and 2 above provided that you accompany
+it with the complete corresponding machine-readable source code, which
+must be distributed under the terms of Sections 1 and 2 above on a
+medium customarily used for software interchange.
+
+ If distribution of object code is made by offering access to copy
+from a designated place, then offering equivalent access to copy the
+source code from the same place satisfies the requirement to
+distribute the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+ 5. A program that contains no derivative of any portion of the
+Library, but is designed to work with the Library by being compiled or
+linked with it, is called a "work that uses the Library". Such a
+work, in isolation, is not a derivative work of the Library, and
+therefore falls outside the scope of this License.
+
+ However, linking a "work that uses the Library" with the Library
+creates an executable that is a derivative of the Library (because it
+contains portions of the Library), rather than a "work that uses the
+library". The executable is therefore covered by this License.
+Section 6 states terms for distribution of such executables.
+
+ When a "work that uses the Library" uses material from a header file
+that is part of the Library, the object code for the work may be a
+derivative work of the Library even though the source code is not.
+Whether this is true is especially significant if the work can be
+linked without the Library, or if the work is itself a library. The
+threshold for this to be true is not precisely defined by law.
+
+ If such an object file uses only numerical parameters, data
+structure layouts and accessors, and small macros and small inline
+functions (ten lines or less in length), then the use of the object
+file is unrestricted, regardless of whether it is legally a derivative
+work. (Executables containing this object code plus portions of the
+Library will still fall under Section 6.)
+
+ Otherwise, if the work is a derivative of the Library, you may
+distribute the object code for the work under the terms of Section 6.
+Any executables containing that work also fall under Section 6,
+whether or not they are linked directly with the Library itself.
+
+ 6. As an exception to the Sections above, you may also combine or
+link a "work that uses the Library" with the Library to produce a
+work containing portions of the Library, and distribute that work
+under terms of your choice, provided that the terms permit
+modification of the work for the customer's own use and reverse
+engineering for debugging such modifications.
+
+ You must give prominent notice with each copy of the work that the
+Library is used in it and that the Library and its use are covered by
+this License. You must supply a copy of this License. If the work
+during execution displays copyright notices, you must include the
+copyright notice for the Library among them, as well as a reference
+directing the user to the copy of this License. Also, you must do one
+of these things:
+
+ a) Accompany the work with the complete corresponding
+ machine-readable source code for the Library including whatever
+ changes were used in the work (which must be distributed under
+ Sections 1 and 2 above); and, if the work is an executable linked
+ with the Library, with the complete machine-readable "work that
+ uses the Library", as object code and/or source code, so that the
+ user can modify the Library and then relink to produce a modified
+ executable containing the modified Library. (It is understood
+ that the user who changes the contents of definitions files in the
+ Library will not necessarily be able to recompile the application
+ to use the modified definitions.)
+
+ b) Use a suitable shared library mechanism for linking with the
+ Library. A suitable mechanism is one that (1) uses at run time a
+ copy of the library already present on the user's computer system,
+ rather than copying library functions into the executable, and (2)
+ will operate properly with a modified version of the library, if
+ the user installs one, as long as the modified version is
+ interface-compatible with the version that the work was made with.
+
+ c) Accompany the work with a written offer, valid for at
+ least three years, to give the same user the materials
+ specified in Subsection 6a, above, for a charge no more
+ than the cost of performing this distribution.
+
+ d) If distribution of the work is made by offering access to copy
+ from a designated place, offer equivalent access to copy the above
+ specified materials from the same place.
+
+ e) Verify that the user has already received a copy of these
+ materials or that you have already sent this user a copy.
+
+ For an executable, the required form of the "work that uses the
+Library" must include any data and utility programs needed for
+reproducing the executable from it. However, as a special exception,
+the materials to be distributed need not include anything that is
+normally distributed (in either source or binary form) with the major
+components (compiler, kernel, and so on) of the operating system on
+which the executable runs, unless that component itself accompanies
+the executable.
+
+ It may happen that this requirement contradicts the license
+restrictions of other proprietary libraries that do not normally
+accompany the operating system. Such a contradiction means you cannot
+use both them and the Library together in an executable that you
+distribute.
+
+ 7. You may place library facilities that are a work based on the
+Library side-by-side in a single library together with other library
+facilities not covered by this License, and distribute such a combined
+library, provided that the separate distribution of the work based on
+the Library and of the other library facilities is otherwise
+permitted, and provided that you do these two things:
+
+ a) Accompany the combined library with a copy of the same work
+ based on the Library, uncombined with any other library
+ facilities. This must be distributed under the terms of the
+ Sections above.
+
+ b) Give prominent notice with the combined library of the fact
+ that part of it is a work based on the Library, and explaining
+ where to find the accompanying uncombined form of the same work.
+
+ 8. You may not copy, modify, sublicense, link with, or distribute
+the Library except as expressly provided under this License. Any
+attempt otherwise to copy, modify, sublicense, link with, or
+distribute the Library is void, and will automatically terminate your
+rights under this License. However, parties who have received copies,
+or rights, from you under this License will not have their licenses
+terminated so long as such parties remain in full compliance.
+
+ 9. You are not required to accept this License, since you have not
+signed it. However, nothing else grants you permission to modify or
+distribute the Library or its derivative works. These actions are
+prohibited by law if you do not accept this License. Therefore, by
+modifying or distributing the Library (or any work based on the
+Library), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Library or works based on it.
+
+ 10. Each time you redistribute the Library (or any work based on the
+Library), the recipient automatically receives a license from the
+original licensor to copy, distribute, link with or modify the Library
+subject to these terms and conditions. You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties with
+this License.
+
+ 11. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Library at all. For example, if a patent
+license would not permit royalty-free redistribution of the Library by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Library.
+
+If any portio...
[truncated message content] |
