[Linpha-cvs] SF.net SVN: linpha: [4460] trunk/linpha2
Status: Inactive
Brought to you by:
bzrudi
Menu
▾
▴
[Linpha-cvs] SF.net SVN: linpha: [4460] trunk/linpha2
|
From: <bz...@us...> - 2006-03-31 11:52:49
|
Revision: 4460 Author: bzrudi Date: 2006-03-31 03:52:26 -0800 (Fri, 31 Mar 2006) ViewCVS: http://svn.sourceforge.net/linpha/?rev=4460&view=rev Log Message: ----------- sqlite installation should work now Modified Paths: -------------- trunk/linpha2/ChangeLog trunk/linpha2/install/manual_install.php trunk/linpha2/install/sql/sql.data.php trunk/linpha2/install/sql/sql.sqlite.php trunk/linpha2/install/step10_postsettings.php trunk/linpha2/install/step4_selectdirectories.php trunk/linpha2/install/step7_selectprefix.php trunk/linpha2/install/step8_testing.php trunk/linpha2/install/step9_createtables.php trunk/linpha2/lib/classes/linpha.sql.class.php Modified: trunk/linpha2/ChangeLog =================================================================== --- trunk/linpha2/ChangeLog 2006-03-31 08:17:14 UTC (rev 4459) +++ trunk/linpha2/ChangeLog 2006-03-31 11:52:26 UTC (rev 4460) @@ -1,7 +1,9 @@ 2006-03-31 bzrudi <linpha2_AT_tuxpower_DOT_de> * Installer: - + at least mysql installation should work now (automatic mode only) + + at least mysql installation should work now + made i18n ready using tr() + + sqlite should work now also + todo: we should take care of some still hardcoded paths! e.g. /var ... 2006-03-30 flo * fixing some errors in browse by date view Modified: trunk/linpha2/install/manual_install.php =================================================================== --- trunk/linpha2/install/manual_install.php 2006-03-31 08:17:14 UTC (rev 4459) +++ trunk/linpha2/install/manual_install.php 2006-03-31 11:52:26 UTC (rev 4460) @@ -62,14 +62,15 @@ define('PREFIX', $_SESSION['sql_prefix']); define('DB_TYPE', $_SESSION['sql_dbtype']); + + +echo "<h2>".tr("LinPHA Manual Install")."</h2>"; ?> - -<h2>Installing LinPHA manual</h2> <br /> </form> <form method="POST" action="manual_install.php"> -Table prefix: +<?php echo tr("Table Prefix").":"; ?> <input type="text" name="sql_prefix" value="<?php echo $_SESSION['sql_prefix']; ?>"> <input type="submit" name="submit" value="Change"> </form> @@ -113,7 +114,7 @@ ?> <br /> -SQL executes<br /> +<?php echo tr("SQL Queries To Execute")."<br />"; ?> <textarea style="width: 95%; " rows="8" wrap="off"><?php echo $str_query; ?></textarea> @@ -128,7 +129,7 @@ include_once(LINPHA_DIR.'/install/sql/config.dir.php'); ?> <br /><br /> -Folders to create<br /> +<?php echo tr("Folders To Create")."<br />"; ?> <textarea style="width: 95%; " rows="3" wrap="off"> <?php echo $_SESSION['album_dir']."\n"; @@ -150,7 +151,7 @@ </textarea> <br /><br /> -Config file <b>sql/config.dir.php</b><br /> +<?php echo tr("Config File <b>sql/config.dir.php</b>")."<br />"; ?> <textarea style="width: 95%; " rows="3" wrap="off"><?php echo $str; ?></textarea> @@ -165,7 +166,7 @@ include_once(LINPHA_DIR.'/install/sql/config.sql.php'); ?> <br /><br /> -Database connection file <b><?php echo $_SESSION['sql_dir']; ?>config.sql.php</b><br /> +<?php echo tr("Database Connection File"); ?><b><?php echo $_SESSION['sql_dir']; ?>config.sql.php</b><br /> <textarea style="width: 95%; " rows="5" wrap="off"><?php echo $str; ?></textarea> Modified: trunk/linpha2/install/sql/sql.data.php =================================================================== --- trunk/linpha2/install/sql/sql.data.php 2006-03-31 08:17:14 UTC (rev 4459) +++ trunk/linpha2/install/sql/sql.data.php 2006-03-31 11:52:26 UTC (rev 4460) @@ -69,34 +69,34 @@ * metadata */ $sql_queries[] = "INSERT INTO ".PREFIX."meta_fields " . - "(`id`, `name`, `field_type`, `flags`) VALUES (1, 'description', 1, 5)"; + "(id, name, field_type, flags) VALUES (1, 'description', 1, 5)"; $sql_queries[] = "INSERT INTO ".PREFIX."meta_fields " . - "(`id`, `name`, `field_type`, `flags`) VALUES (2, 'category', 2, 5)"; + "(id, name, field_type, flags) VALUES (2, 'category', 2, 5)"; $sql_queries[] = "INSERT INTO ".PREFIX."meta_fields " . - "(`id`, `name`, `field_type`, `flags`) VALUES (3, 'persons', 2, 5)"; + "(id, name, field_type, flags) VALUES (3, 'persons', 2, 5)"; $sql_queries[] = "INSERT INTO ".PREFIX."meta_fields " . - "(`id`, `name`, `field_type`, `flags`) VALUES (4, 'date', 3, 5)"; + "(id, name, field_type, flags) VALUES (4, 'date', 3, 5)"; $sql_queries[] = "INSERT INTO ".PREFIX."meta_fields " . - "(`id`, `name`, `field_type`, `flags`) VALUES (6, 'filename', 0, 1)"; + "(id, name, field_type, flags) VALUES (6, 'filename', 0, 1)"; $sql_queries[] = "INSERT INTO ".PREFIX."meta_fields " . - "(`id`, `name`, `field_type`, `flags`) VALUES (7, 'imagesize', 0, 1)"; + "(id, name, field_type, flags) VALUES (7, 'imagesize', 0, 1)"; $sql_queries[] = "INSERT INTO ".PREFIX."meta_fields " . - "(`id`, `name`, `field_type`, `flags`) VALUES (8, 'dimension', 0, 1)"; + "(id, name, field_type, flags) VALUES (8, 'dimension', 0, 1)"; $sql_queries[] = "INSERT INTO ".PREFIX."meta_fields " . - "(`name`, `field_type`, `flags`) VALUES ('id_6', 0, 10)"; + "(name, field_type, flags) VALUES ('id_6', 0, 10)"; $sql_queries[] = "INSERT INTO ".PREFIX."meta_fields " . - "(`name`, `field_type`, `flags`) VALUES ('id_7', 0, 10)"; + "(name, field_type, flags) VALUES ('id_7', 0, 10)"; $sql_queries[] = "INSERT INTO ".PREFIX."meta_fields " . - "(`name`, `field_type`, `flags`) VALUES ('id_8', 0, 10)"; + "(name, field_type, flags) VALUES ('id_8', 0, 10)"; $sql_queries[] = "INSERT INTO ".PREFIX."meta_fields " . - "(`name`, `field_type`, `flags`) VALUES ('id_1', 0, 10)"; + "(name, field_type, flags) VALUES ('id_1', 0, 10)"; $sql_queries[] = "INSERT INTO ".PREFIX."meta_fields " . - "(`name`, `field_type`, `flags`) VALUES ('id_2', 0, 10)"; + "(name, field_type, flags) VALUES ('id_2', 0, 10)"; $sql_queries[] = "INSERT INTO ".PREFIX."meta_fields " . - "(`name`, `field_type`, `flags`) VALUES ('id_3', 0, 10)"; + "(name, field_type, flags) VALUES ('id_3', 0, 10)"; $sql_queries[] = "INSERT INTO ".PREFIX."meta_fields " . - "(`name`, `field_type`, `flags`) VALUES ('exif_datetimeoriginal', 0, 10)"; + "(name, field_type, flags) VALUES ('exif_datetimeoriginal', 0, 10)"; ?> Modified: trunk/linpha2/install/sql/sql.sqlite.php =================================================================== --- trunk/linpha2/install/sql/sql.sqlite.php 2006-03-31 08:17:14 UTC (rev 4459) +++ trunk/linpha2/install/sql/sql.sqlite.php 2006-03-31 11:52:26 UTC (rev 4460) @@ -21,211 +21,78 @@ * linpha installer */ -$sql_tables = array ( +$sql_tables = array( "CREATE TABLE ".$linpha_tables['config']." ( ". - "ID INTEGER PRIMARY KEY, ". - "option_name VARCHAR(50) not null, ". - "option_value VARCHAR(100) not null, ". - "userid INTEGER ". + "id SMALLINT PRIMARY KEY, " . + "option_name VARCHAR(50) NOT NULL default '', " . + "option_value VARCHAR(100) NOT NULL default '', " . + "userid MEDIUMINT unsigned default '0' " . ")", - - "CREATE TABLE ".$linpha_tables['users']." ( ". - "ID INTEGER PRIMARY KEY, ". - "nickname VARCHAR(20) not null, ". - "password VARCHAR(32) not null, ". - "email VARCHAR(255), ". - "lang VARCHAR(100) default 'English', ". - "level SMALLINT, ". - "groups VARCHAR(255), ". - "fullname VARCHAR(50) ". + "CREATE TABLE ".$linpha_tables['groups']." ( ". + "id INTEGER PRIMARY KEY, " . + "name VARCHAR(100) NOT NULL default '' " . ")", - - "CREATE TABLE ".$linpha_tables['first_lev_album']." ( ". - "ID INTEGER PRIMARY KEY, ". - "date TIMESTAMP, ". - "path VARCHAR(255) not null, ". - "name VARCHAR(255) not null, ". - "level INTEGER, ". - "groups VARCHAR(255) DEFAULT ';public;', ". - "photos SMALLINT ". + "CREATE TABLE ".$linpha_tables['permissions']." ( ". + "id INTEGER PRIMARY KEY, " . + "photos_id INTEGER NOT NULL default '0', " . + "perm_type VARCHAR(255) NOT NULL default '0', " . + "permission VARCHAR(255) NOT NULL default '' " . ")", - - "CREATE TABLE ".$linpha_tables['sec_lev_album']." ( ". - "ID INTEGER PRIMARY KEY, ". - "date TIMESTAMP, ". - "path VARCHAR(255) not null, ". - "name VARCHAR(255) not null, ". - "prev_alb_name VARCHAR(255) not null, ". - "level INTEGER, ". - "res VARCHAR(64), ". - "res1 VARCHAR(64) ". - ")", - - "CREATE TABLE ".$linpha_tables['third_lev_album']." ( ". - "ID INTEGER PRIMARY KEY, ". - "date TIMESTAMP, ". - "path VARCHAR(255) not null, ". - "name VARCHAR(255) not null, ". - "prev_alb_name VARCHAR(255) not null, ". - "level INTEGER, ". - "res VARCHAR(64), ". - "res1 VARCHAR(64) ". - ")", - "CREATE TABLE ".$linpha_tables['photos']." ( ". - "ID INTEGER PRIMARY KEY, ". - "date TIMESTAMP, ". - "name VARCHAR(255), ". - "filename VARCHAR(255) not null, ". - "thumbnail BLOB, ". - "prev_path VARCHAR(255), ". - "level INTEGER, ". - "res INT(5) DEFAULT 0 NOT NULL, ". - "md5sum VARCHAR(40), ". - "downloads INTEGER, ". - "fmkey_location VARCHAR(100), ". - "fmkey_type VARCHAR(100), ". - "fmkey_date VARCHAR(100) ". + "id INTEGER PRIMARY KEY, " . + "parent_id INTEGER NOT NULL default '0', " . + "img_type INTEGER NOT NULL default '0', " . + "name text NOT NULL, " . + "md5sum VARCHAR(40) NOT NULL default '', " . + "time_add INTEGER NOT NULL default '0', " . + "time_mod INTEGER NOT NULL default '0', " . + "time_exif INTEGER NOT NULL default '0', " . + "stats_numbers INTEGER NOT NULL default '0', " . + "stats_views INTEGER NOT NULL default '0', " . + "stats_downloads INTEGER NOT NULL default '0' " . ")", - - "CREATE TABLE ".$linpha_tables['photo_cache']." ( ". - "filename VARCHAR(255) PRIMARY KEY NOT NULL, ". - "photo_id INT UNSIGNED NOT NULL, ". - "date DATETIME NOT NULL, ". - "used TIMESTAMP, ". - "hits MEDIUMINT UNSIGNED DEFAULT '0' NOT NULL, ". - "size INT UNSIGNED DEFAULT '0' NOT NULL, ". - "convert_time FLOAT DEFAULT '0.0' NOT NULL ". + "CREATE TABLE ".$linpha_tables['meta_fields']." ( ". + "id INTEGER PRIMARY KEY, " . + "name VARCHAR(255) NOT NULL default '', " . + "field_type INTEGER NOT NULL default '0', " . + "flags INTEGER NOT NULL default '0' " . ")", - - "CREATE TABLE ".$linpha_tables['category']." ( ". - "ID INTEGER PRIMARY KEY, ". - "name VARCHAR(255) not null, ". - "isprivate SMALLINT ". + "CREATE TABLE ".$linpha_tables['meta_category']." ( ". + "id INTEGER PRIMARY KEY, " . + "field_id INTEGER NOT NULL default '0', " . + "name VARCHAR(255) NOT NULL default '', " . + "isprivate INTEGER default NULL " . ")", - - "CREATE TABLE ".$linpha_tables['counter_stats']." ( ". - "ID INTEGER PRIMARY KEY, ". - "date TIMESTAMP, ". - "ip VARCHAR(32), ". - "res INTEGER ". + "CREATE TABLE ".$linpha_tables['meta_exif']." ( ". + "md5sum VARCHAR(32) NOT NULL default '', " . + "datetimeoriginal VARCHAR(255) default NULL, " . + "make VARCHAR(255) default NULL, " . + "model VARCHAR(255) default NULL, " . + "artist VARCHAR(255) default NULL, " . + "copyright VARCHAR(255) default NULL, " . + "aperturevalue VARCHAR(255) default NULL, " . + "shutterspeedvalue VARCHAR(255) default NULL, " . + "exposuretime VARCHAR(255) default NULL, " . + "isospeedratings VARCHAR(255) default NULL, " . + "flash VARCHAR(255) default NULL, " . + "focallength VARCHAR(255) default NULL, " . + "fnumber VARCHAR(255) default NULL " . ")", - - "CREATE TABLE ".$linpha_tables['groups']." ( ". - "ID INTEGER PRIMARY KEY, ". - "groups VARCHAR(15) NOT NULL, ". - "res VARCHAR(20) ". + "CREATE TABLE ".$linpha_tables['meta_iptc']." ( ". + "md5sum VARCHAR(32) NOT NULL default '' " . ")", - - "CREATE TABLE ".$linpha_tables['image_comments']." ( ". - "ID INTEGER PRIMARY KEY, ". - "date TIMESTAMP, ". - "md5sum VARCHAR(40), ". - "author VARCHAR(20), ". - "comment TEXT, ". - "description VARCHAR(255), ". - "category VARCHAR(255) ". + "CREATE TABLE ".$linpha_tables['meta_comments']." ( ". + "id INTEGER PRIMARY KEY, " . + "time INTEGER NOT NULL default '0', " . + "md5sum VARCHAR(32) NOT NULL default '', " . + "author VARCHAR(255) NOT NULL default '', " . + "comment text NOT NULL " . ")", - - "CREATE TABLE ".$linpha_tables['album_comments']." ( ". - "ID INTEGER PRIMARY KEY, ". - "date TIMESTAMP, ". - "album VARCHAR(255), ". - "author VARCHAR(20), ". - "comment TEXT ". - ")", - - "CREATE TABLE ".$linpha_tables['plugins']." ( ". - "ID INTEGER PRIMARY KEY, ". - "name VARCHAR(255), ". - "active SMALLINT(1) DEFAULT '0' NOT NULL ". - ")", - - "CREATE TABLE ".$linpha_tables['guestbook']." ( ". - "ID INTEGER PRIMARY KEY, ". - "name VARCHAR (50) ,". - "email VARCHAR (50) ,". - "country VARCHAR (50) ,". - "url VARCHAR (150) ,". - "comment TEXT not null ,". - "date INT (11) ". - ")", - - "CREATE TABLE ".$linpha_tables['mail_list']." ( ". - "ID INTERGER PRIMARY KEY, ". - "name varchar(100), ". - "email varchar(100), ". - "date INT (14), ". - "active SMALLINT(1) DEFAULT '0' NOT NULL ". - ")", - - "CREATE TABLE ".$linpha_tables['permissions']." ( ". - "ID INTEGER PRIMARY KEY, ". - "type varchar(255) NOT NULL, ". - "who int(1) NOT NULL default '0', ". - "groups_exceptions varchar(255) NOT NULL default '', ". - "groups_additional varchar(255) NOT NULL default '', ". - "and_or int(1) NOT NULL default '0', ". - "alb int(1) NOT NULL default '0', ". - "albums text NOT NULL ". - ")", - - "CREATE TABLE ".$linpha_tables['meta_iptc']." ( ". - "md5sum VARCHAR(32) NOT NULL, ". - - // caption fields - "caption VARCHAR(255) NOT NULL, ". - "caption_writer VARCHAR(255) NOT NULL, ". - "headline VARCHAR(255) NOT NULL, ". - "instructions VARCHAR(255) NOT NULL, ". - - // keywords fields - "keywords VARCHAR(255) NOT NULL, ". - - // categories fields - "category VARCHAR(3) NOT NULL, ". - "supplemental_categorie VARCHAR(255) NOT NULL, ". - - //credits fields - "copyright VARCHAR(255) NOT NULL, ". - "byline VARCHAR(255) NOT NULL, " . - "byline_title VARCHAR(255) NOT NULL, ". - "credit VARCHAR(255) NOT NULL, " . - "source VARCHAR(255) NOT NULL, " . - - //status fields - "edit_status VARCHAR(255) NOT NULL, ". - "priority VARCHAR(255) NOT NULL, ". - "object_cycle VARCHAR(255) NOT NULL, ". - "job_id VARCHAR(255) NOT NULL, ". - "program VARCHAR(255) NOT NULL, ". - - // origin fields - "object_name VARCHAR(255) NOT NULL, ". - "date_created VARCHAR(255) NOT NULL, ". - "date_released VARCHAR(255) NOT NULL, ". - "time_created VARCHAR(255) NOT NULL, ". - "time_released VARCHAR(255) NOT NULL, ". - "city VARCHAR(255) NOT NULL, ". - "sublocation VARCHAR(255) NOT NULL, ". - "state VARCHAR(255) NOT NULL, ". - "country VARCHAR(255) NOT NULL, ". - "country_code VARCHAR(5) NOT NULL, ". - "trans_reference VARCHAR(255) NOT NULL, ". - "marked_ignored INT(1) ". - ")", - - "CREATE TABLE ".$linpha_tables['blacklist']." ( ". - "action VARCHAR(20), ". - "value TEXT ". + "CREATE TABLE ".$linpha_tables['meta_data']." ( ". + "id INTEGER PRIMARY KEY, " . + "field_id INTEGER NOT NULL default '0', " . + "md5sum VARCHAR(32) NOT NULL default '', " . + "meta_data VARCHAR(255) NOT NULL default '' " . ")" ); - - -/** - * create dynamically the linpha_meta_exif table - */ -include_once(LINPHA_DIR.'/lib/classes/linpha.metadata.class.php'); -$sql_tables[] = Metadata::createExifTable(); - -?> \ No newline at end of file +?> Modified: trunk/linpha2/install/step10_postsettings.php =================================================================== --- trunk/linpha2/install/step10_postsettings.php 2006-03-31 08:17:14 UTC (rev 4459) +++ trunk/linpha2/install/step10_postsettings.php 2006-03-31 11:52:26 UTC (rev 4460) @@ -42,7 +42,7 @@ include_once(LINPHA_DIR.'/install/header_html.php'); -echo tr("Connected To Database")."... "; +echo tr("Connecting To Database")."... "; unset($_SESSION['installmode1']); include_once(LINPHA_DIR.'/lib/classes/linpha.class.php'); Modified: trunk/linpha2/install/step4_selectdirectories.php =================================================================== --- trunk/linpha2/install/step4_selectdirectories.php 2006-03-31 08:17:14 UTC (rev 4459) +++ trunk/linpha2/install/step4_selectdirectories.php 2006-03-31 11:52:26 UTC (rev 4460) @@ -17,12 +17,17 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -if(!defined('LINPHA_DIR')) { define('LINPHA_DIR','..'); } - /** * linpha installer */ +if(!defined('LINPHA_DIR')) { define('LINPHA_DIR','..'); } + +$album_dir = (isset($_SESSION['album_dir']) ? $_SESSION['album_dir'] : 'albums'); +$sql_dir = (isset($_SESSION['sql_dir']) ? $_SESSION['sql_dir_parent'] : 'var/'); +$cache_dir = (isset($_SESSION['cache_dir']) ? $_SESSION['cache_dir_parent'] : 'var/'); +$tmp_dir = (isset($_SESSION['tmp_dir']) ? $_SESSION['tmp_dir_parent'] : 'var/'); + include_once(LINPHA_DIR.'/install/header.php'); /** @@ -56,11 +61,6 @@ include_once(LINPHA_DIR.'/install/header_html.php'); - -$album_dir = (isset($_SESSION['album_dir']) ? $_SESSION['album_dir'] : 'albums'); -$sql_dir = (isset($_SESSION['sql_dir']) ? $_SESSION['sql_dir_parent'] : 'var/'); -$cache_dir = (isset($_SESSION['cache_dir']) ? $_SESSION['cache_dir_parent'] : 'var/'); -$tmp_dir = (isset($_SESSION['tmp_dir']) ? $_SESSION['tmp_dir_parent'] : 'var/'); ?> <div class="boxalign"> Modified: trunk/linpha2/install/step7_selectprefix.php =================================================================== --- trunk/linpha2/install/step7_selectprefix.php 2006-03-31 08:17:14 UTC (rev 4459) +++ trunk/linpha2/install/step7_selectprefix.php 2006-03-31 11:52:26 UTC (rev 4460) @@ -126,16 +126,61 @@ case "sqlite": echo tr("Testing File Connection")."<br /><br />"; echo tr("Connecting SQLite Database")."... "; - - if(file_exists($_SESSION['sql_dbname'])) +/** + * save settings from previous page + */ + $array = array('album', 'sql','cache','tmp'); + foreach($array AS $value) { + if( isset( $_POST[$value.'_dir'] ) ) + { + /** + * save correctly in session + */ + /** + * append '/' if not already done + */ + $len = strlen( $_POST[$value.'_dir'] ); + $lastsign = substr( $_POST[$value.'_dir'], $len-1); + if($lastsign != '/' && $lastsign != '\\') + { + $_POST[$value.'_dir'] .= '/'; + } + + /** + * save current value and append correct dir names + */ + $_SESSION[$value.'_dir_parent'] = $_POST[$value.'_dir']; + switch($value) + { + case 'album': $_SESSION[$value.'_dir'] = $_POST[$value.'_dir']; break; + case 'sql': $_SESSION[$value.'_dir'] = $_POST[$value.'_dir'].'sql/'; break; + case 'cache': $_SESSION[$value.'_dir'] = $_POST[$value.'_dir'].'cache/'; break; + case 'tmp': $_SESSION[$value.'_dir'] = $_POST[$value.'_dir'].'tmp/'; break; + } + } + + /** + * get correct dir names (take care of relativ and absolute paths, add + * LINPHA_DIR if necessary) + */ + $dirs[$value] = get_full_path( $_SESSION[$value.'_dir'] ); + $dirs[$value.'_parent'] = get_full_path( $_SESSION[$value.'_dir_parent'] ); + } + if(file_exists(LINPHA_DIR.'/'.$_SESSION['sql_dir'].$_SESSION['sql_dbname'])) + { echo failed_msg(); echo "<br />".tr("Database Already Exists, Delete The File ".$_SESSION['sql_dbname']." first!").""; $error_nr = 3; } else { - if ($db = @sqlite_open(LINPHA_DIR.'/sql/'.$_SESSION['sql_dbname'], 0666, $sqliteerror)) + + /** + * 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(); } Modified: trunk/linpha2/install/step8_testing.php =================================================================== --- trunk/linpha2/install/step8_testing.php 2006-03-31 08:17:14 UTC (rev 4459) +++ trunk/linpha2/install/step8_testing.php 2006-03-31 11:52:26 UTC (rev 4460) @@ -58,7 +58,7 @@ include_once(LINPHA_DIR.'/lib/classes/linpha.class.php'); - $linpha = new linpha(); + $linpha = new Linpha(); $linpha->sql->dbConnect(); echo success_msg(); @@ -173,6 +173,12 @@ /** * running tests */ +/** + * prevent test running sqlite db + */ +if($_SESSION['sql_dbtype'] != 'sqlite') +{ + for($i = 1; $i <= $n_runs; $i++) { /** @@ -192,7 +198,7 @@ $table_name = $_SESSION['sql_prefix']."test".time(); echo "<br />".tr("Running Tests").": "; - + $array_tests = array( "CREATE" => "CREATE TABLE ".$table_name." ( id INT NOT NULL )", "INSERT" => "INSERT into ".$table_name." ( id ) VALUES ( '5' )", @@ -200,11 +206,11 @@ "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 - ); + "DROP" => "DROP TABLE ".$table_name ); foreach($array_tests AS $key=>$value) { + echo " ".$key." "; $result = $linpha->db->Execute($value); @@ -261,7 +267,11 @@ } } } - +} +else +{ + echo tr("Skipping Database Tests"); +} /** * new user failed, use old connection */ Modified: trunk/linpha2/install/step9_createtables.php =================================================================== --- trunk/linpha2/install/step9_createtables.php 2006-03-31 08:17:14 UTC (rev 4459) +++ trunk/linpha2/install/step9_createtables.php 2006-03-31 11:52:26 UTC (rev 4460) @@ -92,6 +92,7 @@ if(!$result) { echo failed_msg(); + echo $value; echo ' '.$linpha->db->ErrorMsg().'<br />'; $error_nr = 1; } @@ -134,7 +135,7 @@ * create tmp dirs */ @mkdir( get_full_path( $_SESSION['tmp_dir'] ), 0700 ); - @mkdir( get_full_path( $_SESSION['tmp_dir'] ).'adocache',0700 ); + //@mkdir( get_full_path( $_SESSION['tmp_dir'] ).'adocache',0700 ); /** * create sql dir Modified: trunk/linpha2/lib/classes/linpha.sql.class.php =================================================================== --- trunk/linpha2/lib/classes/linpha.sql.class.php 2006-03-31 08:17:14 UTC (rev 4459) +++ trunk/linpha2/lib/classes/linpha.sql.class.php 2006-03-31 11:52:26 UTC (rev 4460) @@ -47,14 +47,19 @@ $db_hostname = $_SESSION['sql_hostname']; $db_username = $_SESSION['sql_username']; $db_password = $_SESSION['sql_password']; - $db_name = ($db_type == "sqlite" ? LINPHA_DIR.'/sql/' : '').$_SESSION['sql_dbname']; + $db_name = ($db_type == "sqlite" ? LINPHA_DIR.'/'.$_SESSION['sql_dir'] : '').$_SESSION['sql_dbname']; $db_prefix = $_SESSION['sql_prefix']; + } else { include_once(LINPHA_DIR.'/lib/adodb/adodb-errorhandler.inc.php'); $sql_dir = ''; + /** + * @todo get /var value from config table + */ + include_once(LINPHA_DIR.'/var/config.dir.php'); $include_file = linFilesys::getFullPath( $sql_dir ).'config.sql.php'; @@ -76,7 +81,28 @@ */ include_once(LINPHA_DIR.'/lib/adodb/adodb.inc.php'); $GLOBALS['linpha']->db = NewADOConnection($db_type); - @$GLOBALS['linpha']->db->Connect($db_hostname, $db_username, $db_password, $db_name); + switch(DB_TYPE) + { + case "sqlite": + { + if(isset($_SESSION['installmode1'])) + { + $sql_dir = linFilesys::getFullPath($_SESSION['sql_dir']); + $GLOBALS['linpha']->db->Connect($sql_dir.'database.sqlite'); + } + else + { + $GLOBALS['linpha']->db->Connect(LINPHA_DIR."/"."$sql_dir".'database.sqlite'); + } + break; + } + case "mysql": + $GLOBALS['linpha']->db->Connect($db_hostname, $db_username, $db_password, $db_name); + break; + case "pgsql": + $GLOBALS['linpha']->db->Connect($db_hostname, $db_username, $db_password, $db_name); + break; + } if( !isset($GLOBALS['linpha']->db) OR !$GLOBALS['linpha']->db->isConnected() ) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
