[Linpha-cvs] SF.net SVN: linpha: [4496] trunk/linpha2
Status: Inactive
Brought to you by:
bzrudi
Menu
▾
▴
[Linpha-cvs] SF.net SVN: linpha: [4496] trunk/linpha2
|
From: <bz...@us...> - 2006-04-09 15:43:34
|
Revision: 4496 Author: bzrudi Date: 2006-04-09 08:43:12 -0700 (Sun, 09 Apr 2006) ViewCVS: http://svn.sourceforge.net/linpha/?rev=4496&view=rev Log Message: ----------- added support for database port selection Modified Paths: -------------- trunk/linpha2/ChangeLog trunk/linpha2/install/sql/config.sql.php trunk/linpha2/install/step10_postsettings.php trunk/linpha2/install/step2_requirements.php trunk/linpha2/install/step4_selectdirectories.php trunk/linpha2/install/step5_getlogin.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.sql.class.php Modified: trunk/linpha2/ChangeLog =================================================================== --- trunk/linpha2/ChangeLog 2006-04-09 15:19:07 UTC (rev 4495) +++ trunk/linpha2/ChangeLog 2006-04-09 15:43:12 UTC (rev 4496) @@ -1,3 +1,9 @@ +2006-04-09 bzrudi <linpha2_AT_tuxpower_DOT_de> + * Installer + -> added database port support + -> allow install without passwd (remove as must have) + TODO: more help entries, better mysql non root install support + 2006-04-08 flo * remove PHP NOTICE in phpmeta/IPTC.php * finished permission and user/group system Modified: trunk/linpha2/install/sql/config.sql.php =================================================================== --- trunk/linpha2/install/sql/config.sql.php 2006-04-09 15:19:07 UTC (rev 4495) +++ trunk/linpha2/install/sql/config.sql.php 2006-04-09 15:43:12 UTC (rev 4496) @@ -4,7 +4,8 @@ $str .= '$db_hostname = "'.$_SESSION['sql_hostname'].'";'.$comment[2]."\n"; $str .= '$db_username = "'.$_SESSION['sql_username'].'";'.$comment[3]."\n"; $str .= '$db_password = "'.$_SESSION['sql_password'].'";'.$comment[4]."\n"; -$str .= '$db_name = "'.($_SESSION['sql_dbtype'] == "sqlite" ? 'sql/' : '').$_SESSION['sql_dbname'].'";'.$comment[5]."\n"; -$str .= '$db_prefix = "'.$_SESSION['sql_prefix'].'";'.$comment[6]."\n"; +$str .= '$db_port = "'.$_SESSION['sql_dbport'].'";'.$comment[5]."\n"; +$str .= '$db_name = "'.($_SESSION['sql_dbtype'] == "sqlite" ? 'sql/' : '').$_SESSION['sql_dbname'].'";'.$comment[6]."\n"; +$str .= '$db_prefix = "'.$_SESSION['sql_prefix'].'";'.$comment[7]."\n"; $str.= '?>'; ?> \ No newline at end of file Modified: trunk/linpha2/install/step10_postsettings.php =================================================================== --- trunk/linpha2/install/step10_postsettings.php 2006-04-09 15:19:07 UTC (rev 4495) +++ trunk/linpha2/install/step10_postsettings.php 2006-04-09 15:43:12 UTC (rev 4496) @@ -133,8 +133,8 @@ $array_check = array( 'check01' => 'text', - 'check02' => 'text', - 'check03' => 'text' + 'check02' => 'text' + //'check03' => 'text' ); $do_javascript_disable_button = true; include_once(LINPHA_DIR.'/install/footer.php'); Modified: trunk/linpha2/install/step2_requirements.php =================================================================== --- trunk/linpha2/install/step2_requirements.php 2006-04-09 15:19:07 UTC (rev 4495) +++ trunk/linpha2/install/step2_requirements.php 2006-04-09 15:43:12 UTC (rev 4496) @@ -124,6 +124,8 @@ list($convert_avail, $convert_path, $convert_version) = check_convert(); if($convert_avail) { + echo $convert_path ; + echo "path war"; /** * the imagemagick versions 6.1.1 - 6.1.3 contains a bug with the switch Modified: trunk/linpha2/install/step4_selectdirectories.php =================================================================== --- trunk/linpha2/install/step4_selectdirectories.php 2006-04-09 15:19:07 UTC (rev 4495) +++ trunk/linpha2/install/step4_selectdirectories.php 2006-04-09 15:43:12 UTC (rev 4496) @@ -66,7 +66,7 @@ ?> <div class="boxalign"> -<?php echo tr("Album Directory:"); ?> +<?php echo tr("Album Directory").":"; ?> <input class="boxalignelement" type="text" id="check01" onKeyup="checkForm()" name="album_dir" size="30" value="<?php echo $album_dir; ?>"> </div> @@ -77,7 +77,7 @@ <br /> <div class="boxalign"> -<?php echo tr("Sql Directory:"); ?> +<?php echo tr("Sql Directory").":"; ?> <input class="boxalignelement" type="text" id="check02" onKeyup="checkForm()" name="sql_dir" size="30" value="<?php echo $sql_dir; ?>"> </div> @@ -85,7 +85,7 @@ <br /><br /> <div class="boxalign"> -<?php echo tr("Cache Directory:"); ?> +<?php echo tr("Cache Directory").":"; ?> <input class="boxalignelement" type="text" id="check03" onKeyup="checkForm()" name="cache_dir" size="30" value="<?php echo $cache_dir; ?>"> </div> @@ -93,7 +93,7 @@ <br /><br /> <div class="boxalign"> -<?php echo tr("Temp Directory:"); ?> +<?php echo tr("Temp Directory").":"; ?> <input class="boxalignelement" type="text" id="check04" onKeyup="checkForm()" name="tmp_dir" size="30" value="<?php echo $tmp_dir; ?>"> </div> Modified: trunk/linpha2/install/step5_getlogin.php =================================================================== --- trunk/linpha2/install/step5_getlogin.php 2006-04-09 15:19:07 UTC (rev 4495) +++ trunk/linpha2/install/step5_getlogin.php 2006-04-09 15:43:12 UTC (rev 4496) @@ -201,6 +201,21 @@ <hr /> <h1><?php echo tr("$title_str[$key]"); ?></h1> <br /> +<?php +if($_SESSION['sql_dbtype'] == 'mysql') +{ + echo tr("NOTE: If you have setup a root Password for your MySQL Database " . + "please login using your root account.")."<br /><br />"; + $_SESSION['sql_dbport'] = '3306'; +} +elseif($_SESSION['sql_dbtype'] == 'postgres') +{ + echo tr("NOTE: There is currently now way to let LinPHA create the required " . + "Database, so you have to create a new Database using \"createdb\" " . + "from commandline before you proceed.")."<br /><br />"; + $_SESSION['sql_dbport'] = '5432'; +} +?> <div class="boxalign"> <?php echo tr("Username").":"; ?> @@ -223,13 +238,23 @@ $_SESSION['sql_hostname'] : 'localhost' ; ?>"> </div> +<div class="boxalign"> +<?php echo tr("Port").":"; ?> +<input class="boxalignelement" type="text" id="check04" onKeyup="checkForm()" + name="sql_dbport" value="<?php echo isset($_SESSION['sql_dbport']) ? + $_SESSION['sql_dbport'] : '3306' ; ?>"> +</div> + + <?php $array_check = array( 'check01' => 'text', - 'check02' => 'text', - 'check03' => 'text' + //'check02' => 'text', + 'check03' => 'text', + 'check04' => 'text' ); + $do_javascript_disable_button = true; include_once(LINPHA_DIR.'/install/footer.php'); ?> \ No newline at end of file Modified: trunk/linpha2/install/step6_selectdatabase.php =================================================================== --- trunk/linpha2/install/step6_selectdatabase.php 2006-04-09 15:19:07 UTC (rev 4495) +++ trunk/linpha2/install/step6_selectdatabase.php 2006-04-09 15:43:12 UTC (rev 4496) @@ -39,12 +39,15 @@ if(isset($_POST['sql_password'])) { $_SESSION['sql_password'] = $_POST['sql_password']; } +if(isset($_POST['sql_dbport'])) { + $_SESSION['sql_dbport'] = $_POST['sql_dbport']; +} /** * validate settings */ if(empty($_SESSION['sql_hostname']) OR empty($_SESSION['sql_username']) - OR empty($_SESSION['sql_password'])) + OR empty($_SESSION['sql_dbport'])) { echo tr("Validating Information")."... "; echo failed_msg(); @@ -63,7 +66,8 @@ echo tr("Testing Server Connection")."<br /><br />"; echo tr("Connecting MySQL-Server")."... "; - $link = @mysql_connect($_SESSION['sql_hostname'], $_SESSION['sql_username'], $_SESSION['sql_password']); + $link = @mysql_connect($_SESSION['sql_hostname'].":".$_SESSION['sql_dbport'], + $_SESSION['sql_username'], $_SESSION['sql_password']); if (!$link) { echo failed_msg(); @@ -216,4 +220,4 @@ } include_once(LINPHA_DIR.'/install/footer.php'); -?> \ No newline at end of file +?> Modified: trunk/linpha2/install/step7_selectprefix.php =================================================================== --- trunk/linpha2/install/step7_selectprefix.php 2006-04-09 15:19:07 UTC (rev 4495) +++ trunk/linpha2/install/step7_selectprefix.php 2006-04-09 15:43:12 UTC (rev 4496) @@ -70,7 +70,8 @@ case "mysql": echo "<h2>".tr("Checking Database")."</h2><br />"; - $link = @mysql_connect($_SESSION['sql_hostname'], $_SESSION['sql_username'], $_SESSION['sql_password']); + $link = @mysql_connect($_SESSION['sql_hostname'].":".$_SESSION['sql_dbport'], + $_SESSION['sql_username'], $_SESSION['sql_password']); if(isset($_POST['create_database']) && $_POST['create_database'] == "create") { @@ -111,8 +112,12 @@ echo tr("Testing Server Connection")."<br /><br />"; echo tr("Connecting PostgreSQL-Server")."... "; - $link = pg_pconnect("host=".$_SESSION['sql_hostname']." dbname=".$_SESSION['sql_dbname']." user=".$_SESSION['sql_username']." password=".$_SESSION['sql_password']); - // port=5432 + $link = pg_connect("host=".$_SESSION['sql_hostname']." " . + "port=".$_SESSION['sql_dbport']." " . + "dbname=".$_SESSION['sql_dbname']." " . + "user=".$_SESSION['sql_username']." " . + "password=".$_SESSION['sql_password'].""); + if (!$link) { echo failed_msg(); Modified: trunk/linpha2/install/step8_testing.php =================================================================== --- trunk/linpha2/install/step8_testing.php 2006-04-09 15:19:07 UTC (rev 4495) +++ trunk/linpha2/install/step8_testing.php 2006-04-09 15:43:12 UTC (rev 4496) @@ -156,7 +156,8 @@ * close connection and connect with just created user */ $test_conn = NewADOConnection($_SESSION['sql_dbtype']); - if(! $test_conn->Connect($_SESSION['sql_hostname'], $random_user, $random_pass, $_SESSION['sql_dbname']) ) + if(! $test_conn->Connect("$_SESSION['sql_hostname']:$_SESSION['sql_dbport']", + $random_user, $random_pass, $_SESSION['sql_dbname']) ) { echo warning_msg(); echo "<br />".tr("Failed To Create New LinPHA User"); Modified: trunk/linpha2/install/step9_createtables.php =================================================================== --- trunk/linpha2/install/step9_createtables.php 2006-04-09 15:19:07 UTC (rev 4495) +++ trunk/linpha2/install/step9_createtables.php 2006-04-09 15:43:12 UTC (rev 4496) @@ -179,6 +179,8 @@ $comment[4] = ''; $comment[5] = ''; $comment[6] = ''; + $comment[7] = ''; + include_once(LINPHA_DIR.'/install/sql/config.sql.php'); fwrite( $fp, $str ); Modified: trunk/linpha2/lib/classes/linpha.sql.class.php =================================================================== --- trunk/linpha2/lib/classes/linpha.sql.class.php 2006-04-09 15:19:07 UTC (rev 4495) +++ trunk/linpha2/lib/classes/linpha.sql.class.php 2006-04-09 15:43:12 UTC (rev 4496) @@ -47,6 +47,7 @@ $db_hostname = $_SESSION['sql_hostname']; $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_prefix = $_SESSION['sql_prefix']; @@ -94,18 +95,18 @@ } case "mysql": - $GLOBALS['linpha']->db->Connect($db_hostname, $db_username, $db_password, $db_name); + $GLOBALS['linpha']->db->Connect("$db_hostname:$db_port", $db_username, $db_password, $db_name); break; case "postgres": { if(isset($db_password)) { - $GLOBALS['linpha']->db->Connect("host=$db_hostname user=$db_username password=$db_password dbname=$db_name"); + $GLOBALS['linpha']->db->Connect("host=$db_hostname port=$db_port user=$db_username password=$db_password dbname=$db_name"); } else { - $GLOBALS['linpha']->db->Connect("host=$db_hostname user=$db_username dbname=$db_name"); + $GLOBALS['linpha']->db->Connect("host=$db_hostname port=$db_port user=$db_username dbname=$db_name"); } break; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
