[Linpha-cvs] SF.net SVN: linpha: [4502] trunk/linpha2
Status: Inactive
Brought to you by:
bzrudi
Menu
▾
▴
[Linpha-cvs] SF.net SVN: linpha: [4502] trunk/linpha2
|
From: <bz...@us...> - 2006-04-10 15:41:47
|
Revision: 4502 Author: bzrudi Date: 2006-04-10 08:41:20 -0700 (Mon, 10 Apr 2006) ViewCVS: http://svn.sourceforge.net/linpha/?rev=4502&view=rev Log Message: ----------- renamed some preserved table field names. !!! make sure to run reset_database.php !!! Modified Paths: -------------- trunk/linpha2/ChangeLog trunk/linpha2/admin/permissions_usergroup.php trunk/linpha2/admin/permissions_users.php trunk/linpha2/admin/settings_layout.php trunk/linpha2/install/sql/sql.data.php trunk/linpha2/install/sql/sql.mysql.php trunk/linpha2/install/sql/sql.postgres.php trunk/linpha2/install/sql/sql.sqlite.php trunk/linpha2/install/step11_finish.php trunk/linpha2/install/step2_requirements.php trunk/linpha2/install/step8_testing.php trunk/linpha2/lib/classes/linpha.imgview.class.php trunk/linpha2/templates/default/view_comment.html.php trunk/linpha2/templates/default/view_img.html.php Modified: trunk/linpha2/ChangeLog =================================================================== --- trunk/linpha2/ChangeLog 2006-04-10 10:22:20 UTC (rev 4501) +++ trunk/linpha2/ChangeLog 2006-04-10 15:41:20 UTC (rev 4502) @@ -1,3 +1,11 @@ +2006-04-10 bzrudi <linpha2_AT_tuxpower_DOT_de> + * Database + - renamed some preserved table field names. e.g. don't use "date", "name" as + field name to have better portability as these are preserved by many + databases. + - make sure to run reset_database.php! + - ...still more to rename + 2006-04-10 flo * fixed some eclipse warnings * change linpha_photo.name form TEXT to varchar(255) Modified: trunk/linpha2/admin/permissions_usergroup.php =================================================================== --- trunk/linpha2/admin/permissions_usergroup.php 2006-04-10 10:22:20 UTC (rev 4501) +++ trunk/linpha2/admin/permissions_usergroup.php 2006-04-10 15:41:20 UTC (rev 4502) @@ -18,7 +18,7 @@ */ echo '<b>'.i18n("Edit User Memberships").'</b><br />'; $query = $GLOBALS['linpha']->db->Execute("SELECT id, username FROM ".PREFIX."users ORDER by username"); -while($data = $query->FetchRow()) +while($data = $query->FetchRow(ADODB_FETCH_ASSOC)) { echo '<a href="'.LINPHA_DIR.'/admin/?cat=permissions_usergroup&edit=user&id='.$data['id'].'">'.$data['username'].'</a><br />'; } Modified: trunk/linpha2/admin/permissions_users.php =================================================================== --- trunk/linpha2/admin/permissions_users.php 2006-04-10 10:22:20 UTC (rev 4501) +++ trunk/linpha2/admin/permissions_users.php 2006-04-10 15:41:20 UTC (rev 4502) @@ -33,7 +33,7 @@ "username='".LinSql::linAddslashes($_POST['mod_user_name'])."', ". "display_name='".LinSql::linAddslashes($_POST['mod_user_fullname'])."', ". $new_password. - "email='".LinSql::linAddslashes($_POST['mod_user_mail'])."' ". + "user_email='".LinSql::linAddslashes($_POST['mod_user_mail'])."' ". "WHERE id='".LinSql::linAddslashes($_POST['id'])."'"); /** @@ -61,7 +61,7 @@ break; case 'new_user': $GLOBALS['linpha']->db->Execute("INSERT INTO ".PREFIX."users " . - "(username, password, email, display_name) ". + "(username, password, user_email, display_name) ". "VALUES " . "('".LinSql::linAddslashes($_POST['new_user_name'])."', '".md5($_POST['new_user_pass'])."', ". "'".LinSql::linAddslashes($_POST['new_user_mail'])."', '".LinSql::linAddslashes($_POST['new_user_fullname'])."')"); @@ -90,7 +90,7 @@ /** * show users */ - $query = $GLOBALS['linpha']->db->Execute("SELECT id, username, display_name, email FROM ".PREFIX."users ORDER BY username"); + $query = $GLOBALS['linpha']->db->Execute("SELECT id, username, display_name, user_email FROM ".PREFIX."users ORDER BY username"); while($data = $query->FetchRow()) { ?> @@ -106,7 +106,7 @@ <input type="password" name="mod_user_pass" size="20" maxlength="255"> </td> <td> - <input type="text" name="mod_user_mail" size="20" maxlength="255" value="<?php echo $data['email']; ?>"> + <input type="text" name="mod_user_mail" size="20" maxlength="255" value="<?php echo $data['user_email']; ?>"> </td> <td> <input type="hidden" name="id" value="<?php echo $data['id']; ?>"> Modified: trunk/linpha2/admin/settings_layout.php =================================================================== --- trunk/linpha2/admin/settings_layout.php 2006-04-10 10:22:20 UTC (rev 4501) +++ trunk/linpha2/admin/settings_layout.php 2006-04-10 15:41:20 UTC (rev 4502) @@ -22,10 +22,10 @@ { case 'home': $welcometxt = i18n("Add Your Own Welcome Text Here"); - $data = $GLOBALS['linpha']->db->GetRow("SELECT comment FROM ".PREFIX."meta_comments WHERE md5sum='welcometext'"); - if(isset($data['comment'])) + $data = $GLOBALS['linpha']->db->GetRow("SELECT meta_comment FROM ".PREFIX."meta_comments WHERE md5sum='welcometext'"); + if(isset($data['meta_comment'])) { - $welcometxt = $data['comment']; + $welcometxt = $data['meta_comment']; $update = true; } @@ -47,13 +47,13 @@ if(isset($update)) { $GLOBALS['linpha']->db->Execute("UPDATE ".PREFIX."meta_comments SET " . - "comment = '".LinSql::linAddslashes($_POST['welcometext'])."'" . + "meta_comment = '".LinSql::linAddslashes($_POST['welcometext'])."'" . "WHERE md5sum='welcometext'"); $welcometxt = $_POST['welcometext']; } else { - $GLOBALS['linpha']->db->Execute("INSERT into ".PREFIX."meta_comments (md5sum, comment) " . + $GLOBALS['linpha']->db->Execute("INSERT into ".PREFIX."meta_comments (md5sum, meta_comment) " . "VALUES ('welcometext', '".LinSql::linAddslashes($_POST['welcometext'])."')"); $welcometxt = $_POST['welcometext']; } Modified: trunk/linpha2/install/sql/sql.data.php =================================================================== --- trunk/linpha2/install/sql/sql.data.php 2006-04-10 10:22:20 UTC (rev 4501) +++ trunk/linpha2/install/sql/sql.data.php 2006-04-10 15:41:20 UTC (rev 4502) @@ -66,7 +66,7 @@ */ while( list($name, $value) = each($options) ) { - $sql_queries[] = "INSERT INTO ".PREFIX."config (option_name, option_value, userid) " . + $sql_queries[] = "INSERT INTO ".PREFIX."config (option_name, option_value, user_id) " . "VALUES ('".$name."', '".$value."', '0')"; } Modified: trunk/linpha2/install/sql/sql.mysql.php =================================================================== --- trunk/linpha2/install/sql/sql.mysql.php 2006-04-10 10:22:20 UTC (rev 4501) +++ trunk/linpha2/install/sql/sql.mysql.php 2006-04-10 15:41:20 UTC (rev 4502) @@ -26,15 +26,15 @@ "id INT NOT NULL AUTO_INCREMENT, " . "option_name VARCHAR(255) NOT NULL default '', " . "option_value VARCHAR(255) NOT NULL default '', " . - "userid INT default '0', " . - "override INT default '0', " . + "user_id SMALLINT default '0', " . + "override SMALLINT default '0', " . "PRIMARY KEY (id) " . ")", "CREATE TABLE ".$linpha_tables['users']." ( ". "id INT NOT NULL AUTO_INCREMENT , " . "username VARCHAR(255) NOT NULL default '' , " . "password VARCHAR(32) NOT NULL default '' , " . - "email VARCHAR(255) NOT NULL default '' , " . + "user_email VARCHAR(255) NOT NULL default '' , " . "display_name VARCHAR(255) NOT NULL default '' , " . "stats_downloads INT NOT NULL , " . "stats_downloads_size INT NOT NULL, " . @@ -75,12 +75,12 @@ "CREATE TABLE ".$linpha_tables['photos_cache']." ( ". "id INT NOT NULL AUTO_INCREMENT, " . "photo_id INT NOT NULL default '0', " . - "img_width INT NOT NULL default '0', " . - "img_height INT NOT NULL default '0', " . - "img_quality INT NOT NULL default '0', " . + "img_width SMALLINT NOT NULL default '0', " . + "img_height SMALLINT NOT NULL default '0', " . + "img_quality SMALLINT NOT NULL default '0', " . "img_size INT NOT NULL default '0', " . - "is_rotated INT NOT NULL default '0', " . - "has_watermark INT NOT NULL default '0', " . + "is_rotated SMALLINT NOT NULL default '0', " . + "has_watermark SMALLINT NOT NULL default '0', " . "time_add INT NOT NULL default '0', " . "time_use INT NOT NULL default '0', " . "time_creating INT NOT NULL default '0', " . @@ -90,7 +90,7 @@ "CREATE TABLE ".$linpha_tables['meta_fields']." ( ". "id INT NOT NULL AUTO_INCREMENT, " . "name VARCHAR(255) NOT NULL default '', " . - "field_type INT NOT NULL default '0', " . + "field_type SMALLINT NOT NULL default '0', " . "flags INT NOT NULL default '0', " . "PRIMARY KEY (id) " . ")", @@ -98,7 +98,7 @@ "id INT NOT NULL AUTO_INCREMENT, " . "field_id INT NOT NULL default '0', " . "name VARCHAR(255) NOT NULL default '', " . - "isprivate INT default NULL, " . + "isprivate SMALLINT default NULL, " . "PRIMARY KEY (id) " . ")", "CREATE TABLE ".$linpha_tables['meta_exif']." ( ". @@ -126,10 +126,10 @@ ")", "CREATE TABLE ".$linpha_tables['meta_comments']." ( ". "id INT NOT NULL AUTO_INCREMENT, " . - "time INT NOT NULL default '0', " . + "meta_time INT NOT NULL default '0', " . "md5sum VARCHAR(32) NOT NULL default '', " . - "author VARCHAR(255) NOT NULL default '', " . - "comment text NOT NULL, " . + "meta_author VARCHAR(255) NOT NULL default '', " . + "meta_comment text NOT NULL, " . " PRIMARY KEY (id) " . ")", "CREATE TABLE ".$linpha_tables['meta_data']." ( ". Modified: trunk/linpha2/install/sql/sql.postgres.php =================================================================== --- trunk/linpha2/install/sql/sql.postgres.php 2006-04-10 10:22:20 UTC (rev 4501) +++ trunk/linpha2/install/sql/sql.postgres.php 2006-04-10 15:41:20 UTC (rev 4502) @@ -26,14 +26,14 @@ "id SERIAL PRIMARY KEY, " . "option_name VARCHAR(255) NOT NULL default '', " . "option_value VARCHAR(255) NOT NULL default '', " . - "userid INT default '0', " . - "override INT default '0' " . + "user_id INT default '0', " . + "override SMALLINT default '0' " . ")", "CREATE TABLE ".$linpha_tables['users']." ( ". "id SERIAL PRIMARY KEY, " . "username VARCHAR(255) NOT NULL default '' , " . "password VARCHAR(32) NOT NULL default '' , " . - "email VARCHAR(255) NOT NULL default '' , " . + "user_email VARCHAR(255) NOT NULL default '' , " . "display_name VARCHAR(255) NOT NULL default '' , " . "stats_downloads INT NOT NULL default 0 , " . "stats_downloads_size INT NOT NULL default 0 " . @@ -69,12 +69,12 @@ "CREATE TABLE ".$linpha_tables['photos_cache']." ( ". "id SERIAL PRIMARY KEY, " . "photo_id INT NOT NULL default '0', " . - "img_width INT NOT NULL default '0', " . - "img_height INT NOT NULL default '0', " . - "img_quality INT NOT NULL default '0', " . + "img_width SMALLINT NOT NULL default '0', " . + "img_height SMALLINT NOT NULL default '0', " . + "img_quality SMALLINT NOT NULL default '0', " . "img_size INT NOT NULL default '0', " . - "is_rotated INT NOT NULL default '0', " . - "has_watermark INT NOT NULL default '0', " . + "is_rotated SMALLINT NOT NULL default '0', " . + "has_watermark SMALLINT NOT NULL default '0', " . "time_add INT NOT NULL default '0', " . "time_use INT NOT NULL default '0', " . "time_creating INT NOT NULL default '0', " . @@ -83,14 +83,14 @@ "CREATE TABLE ".$linpha_tables['meta_fields']." ( ". "id SERIAL PRIMARY KEY, " . "name VARCHAR(255) NOT NULL default '', " . - "field_type INT NOT NULL default '0', " . + "field_type SMALLINT NOT NULL default '0', " . "flags INT NOT NULL default '0' " . ")", "CREATE TABLE ".$linpha_tables['meta_category']." ( ". "id SERIAL PRIMARY KEY, " . "field_id INT NOT NULL default '0', " . "name VARCHAR(255) NOT NULL default '', " . - "isprivate INT default NULL " . + "isprivate SMALLINT default NULL " . ")", "CREATE TABLE ".$linpha_tables['meta_exif']." ( ". "md5sum VARCHAR(32) NOT NULL default '', " . @@ -113,10 +113,10 @@ ")", "CREATE TABLE ".$linpha_tables['meta_comments']." ( ". "id SERIAL PRIMARY KEY, " . - "time INT NOT NULL default '0', " . + "meta_time INT NOT NULL default '0', " . "md5sum VARCHAR(32) NOT NULL default '', " . - "author VARCHAR(255) NOT NULL default '', " . - "comment TEXT NOT NULL " . + "meta_author VARCHAR(255) NOT NULL default '', " . + "meta_comment TEXT NOT NULL " . ")", "CREATE TABLE ".$linpha_tables['meta_data']." ( ". "id SERIAL PRIMARY KEY, " . Modified: trunk/linpha2/install/sql/sql.sqlite.php =================================================================== --- trunk/linpha2/install/sql/sql.sqlite.php 2006-04-10 10:22:20 UTC (rev 4501) +++ trunk/linpha2/install/sql/sql.sqlite.php 2006-04-10 15:41:20 UTC (rev 4502) @@ -23,20 +23,20 @@ $sql_tables = array( "CREATE TABLE ".$linpha_tables['config']." ( ". - "id SMALLINT PRIMARY KEY, " . + "id INTEGER PRIMARY KEY, " . "option_name VARCHAR(255) NOT NULL default '', " . "option_value VARCHAR(255) NOT NULL default '', " . - "userid INT default '0', " . - "override INT default '0' " . + "user_id INTEGER default '0', " . + "override SMALLINT default '0' " . ")", "CREATE TABLE ".$linpha_tables['users']." ( ". "id INTEGER PRIMARY KEY, " . "username VARCHAR(255) NOT NULL default '' , " . "password VARCHAR(32) NOT NULL default '' , " . - "email VARCHAR(255) NOT NULL default '' , " . + "user_email VARCHAR(255) NOT NULL default '' , " . "display_name VARCHAR(255) NOT NULL default '' , " . - "stats_downloads INT NOT NULL default '0'' , " . - "stats_downloads_size INT NOT NULL default '0'' " . + "stats_downloads INTEGER NOT NULL default '0'' , " . + "stats_downloads_size INTEGER NOT NULL default '0'' " . ")", "CREATE TABLE ".$linpha_tables['groups']." ( ". "id INTEGER PRIMARY KEY, " . @@ -44,8 +44,8 @@ ")", "CREATE TABLE ".$linpha_tables['user_group']." ( ". "id INTEGER PRIMARY KEY, " . - "group_id INT NOT NULL default '0', " . - "user_id INT NOT NULL default '0'" . + "group_id INTEGER NOT NULL default '0', " . + "user_id INTEGER NULL default '0'" . ")", "CREATE TABLE ".$linpha_tables['permissions']." ( ". "id INTEGER PRIMARY KEY, " . @@ -69,12 +69,12 @@ "CREATE TABLE ".$linpha_tables['photos_cache']." ( ". "id INTEGER PRIMARY KEY, " . "photo_id INTEGER NOT NULL default '0', " . - "img_width INTEGER NOT NULL default '0', " . - "img_height INTEGER NOT NULL default '0', " . - "img_quality INTEGER NOT NULL default '0', " . + "img_width SMALLINT NOT NULL default '0', " . + "img_height SMALLINT NOT NULL default '0', " . + "img_quality SMALLINT NOT NULL default '0', " . "img_size INTEGER NOT NULL default '0', " . - "is_rotated INTEGER NOT NULL default '0', " . - "has_watermark INTEGER NOT NULL default '0', " . + "is_rotated SMALLINT NOT NULL default '0', " . + "has_watermark SMALLINT NOT NULL default '0', " . "time_add INTEGER NOT NULL default '0', " . "time_use INTEGER NOT NULL default '0', " . "time_creating INTEGER NOT NULL default '0', " . @@ -83,14 +83,14 @@ "CREATE TABLE ".$linpha_tables['meta_fields']." ( ". "id INTEGER PRIMARY KEY, " . "name VARCHAR(255) NOT NULL default '', " . - "field_type INTEGER NOT NULL default '0', " . + "field_type SMALLINT NOT NULL default '0', " . "flags INTEGER NOT NULL default '0' " . ")", "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 " . + "isprivate SMALLINT default NULL " . ")", "CREATE TABLE ".$linpha_tables['meta_exif']." ( ". "md5sum VARCHAR(32) NOT NULL default '', " . @@ -113,10 +113,10 @@ ")", "CREATE TABLE ".$linpha_tables['meta_comments']." ( ". "id INTEGER PRIMARY KEY, " . - "time INTEGER NOT NULL default '0', " . + "meta_time INTEGER NOT NULL default '0', " . "md5sum VARCHAR(32) NOT NULL default '', " . - "author VARCHAR(255) NOT NULL default '', " . - "comment text NOT NULL " . + "meta_author VARCHAR(255) NOT NULL default '', " . + "meta_comment text NOT NULL " . ")", "CREATE TABLE ".$linpha_tables['meta_data']." ( ". "id INTEGER PRIMARY KEY, " . Modified: trunk/linpha2/install/step11_finish.php =================================================================== --- trunk/linpha2/install/step11_finish.php 2006-04-10 10:22:20 UTC (rev 4501) +++ trunk/linpha2/install/step11_finish.php 2006-04-10 15:41:20 UTC (rev 4502) @@ -55,7 +55,7 @@ } echo "Adding linpha admin user... "; - $result = $linpha->db->Execute("INSERT INTO ".PREFIX."users (username, password, email) VALUES (" . + $result = $linpha->db->Execute("INSERT INTO ".PREFIX."users (username, password, user_email) VALUES (" . "'".LinSql::linAddslashes($_POST['admin_name'])."', " . "'".md5($_POST['admin_pass'])."', " . "'".LinSql::linAddslashes($_POST['admin_email'])."')"); Modified: trunk/linpha2/install/step2_requirements.php =================================================================== --- trunk/linpha2/install/step2_requirements.php 2006-04-10 10:22:20 UTC (rev 4501) +++ trunk/linpha2/install/step2_requirements.php 2006-04-10 15:41:20 UTC (rev 4502) @@ -124,7 +124,6 @@ list($convert_avail, $convert_path, $convert_version) = check_convert(); if($convert_avail) { - echo $convert_path ; /** * the imagemagick versions 6.1.1 - 6.1.3 contains a bug with the switch Modified: trunk/linpha2/install/step8_testing.php =================================================================== --- trunk/linpha2/install/step8_testing.php 2006-04-10 10:22:20 UTC (rev 4501) +++ trunk/linpha2/install/step8_testing.php 2006-04-10 15:41:20 UTC (rev 4502) @@ -28,6 +28,14 @@ include_once(LINPHA_DIR.'/install/header_html.php'); /** + * prevent php notices, as sqlite doesn't know about ports' + */ +if(false == isset($_SESSION['sql_port'])) +{ + $_SESSION['sql_dbport'] = "0"; +} + +/** * save settings from previous page */ if(isset($_POST['sql_prefix'])) @@ -156,8 +164,7 @@ * close connection and connect with just created user */ $test_conn = NewADOConnection($_SESSION['sql_dbtype']); - if(! $test_conn->Connect("$_SESSION['sql_hostname']:$_SESSION['sql_dbport']", - $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/lib/classes/linpha.imgview.class.php =================================================================== --- trunk/linpha2/lib/classes/linpha.imgview.class.php 2006-04-10 10:22:20 UTC (rev 4501) +++ trunk/linpha2/lib/classes/linpha.imgview.class.php 2006-04-10 15:41:20 UTC (rev 4502) @@ -820,16 +820,16 @@ if($query->RecordCount()==0) // insert { - $GLOBALS['linpha']->db->Execute("INSERT into ".PREFIX."meta_comments (time, md5sum, author, comment)" . + $GLOBALS['linpha']->db->Execute("INSERT into ".PREFIX."meta_comments (meta_time, md5sum, meta_author, meta_comment)" . "VALUES ('".time()."','".$GLOBALS['linpha']->imgview->id_current."','".linSql::linAddslashes($_POST['author'])."'," . "'".linSql::linAddslashes($_POST['comment'])."')"); } else // update { $GLOBALS['linpha']->db->Execute("UPDATE ".PREFIX."meta_comments SET ". - "time = '".time()."', ". - "author = '".linSql::linAddslashes($_POST['author'])."', " . - "comment = '".linSql::linAddslashes($_POST['comment'])."' " . + "meta_time = '".time()."', ". + "meta_author = '".linSql::linAddslashes($_POST['author'])."', " . + "meta_comment = '".linSql::linAddslashes($_POST['comment'])."' " . "WHERE md5sum = '".$GLOBALS['linpha']->imgview->id_current."'"); } } @@ -837,7 +837,7 @@ /** * get data */ - $GLOBALS['linpha']->template->output['comment'] = $GLOBALS['linpha']->db->GetRow("SELECT id, time, author, comment FROM ".PREFIX."meta_comments"); + $GLOBALS['linpha']->template->output['comment'] = $GLOBALS['linpha']->db->GetRow("SELECT id, meta_time, meta_author, meta_comment FROM ".PREFIX."meta_comments"); } function viewImgCommon() @@ -882,7 +882,7 @@ $comment = $_POST['comment_text']; } - $GLOBALS['linpha']->db->Execute("INSERT into ".PREFIX."meta_comments (time, md5sum, author, comment)" . + $GLOBALS['linpha']->db->Execute("INSERT into ".PREFIX."meta_comments (meta_time, md5sum, meta_author, meta_comment)" . "VALUES ('".time()."','".$GLOBALS['linpha']->imgview->md5sum."','".linSql::linAddslashes($_POST['author'])."'," . "'".linSql::linAddslashes($comment)."')"); } @@ -890,7 +890,7 @@ /** * get comments */ - $GLOBALS['linpha']->template->output['image_comments'] = $GLOBALS['linpha']->db->Execute("SELECT id, time, author, comment FROM ".PREFIX."meta_comments " . + $GLOBALS['linpha']->template->output['image_comments'] = $GLOBALS['linpha']->db->Execute("SELECT id, meta_time, meta_author, meta_comment FROM ".PREFIX."meta_comments " . "WHERE md5sum = '".$GLOBALS['linpha']->imgview->md5sum."'"); } } Modified: trunk/linpha2/templates/default/view_comment.html.php =================================================================== --- trunk/linpha2/templates/default/view_comment.html.php 2006-04-10 10:22:20 UTC (rev 4501) +++ trunk/linpha2/templates/default/view_comment.html.php 2006-04-10 15:41:20 UTC (rev 4502) @@ -4,9 +4,9 @@ <br /><br /> Author: -<input type="text" name="author" value="<?php echo $GLOBALS['linpha']->template->output['comment']['author']; ?>" size="40" maxlength="40" /> +<input type="text" name="author" value="<?php echo $GLOBALS['linpha']->template->output['meta_comment']['meta_author']; ?>" size="40" maxlength="40" /> <br /> -<textarea name="comment" rows="10" cols="50"><?php echo $GLOBALS['linpha']->template->output['comment']['comment']; ?></textarea> +<textarea name="comment" rows="10" cols="50"><?php echo $GLOBALS['linpha']->template->output['comment']['meta_comment']; ?></textarea> <br /> <input type="hidden" name="cmd" value="add_comment" /> <input type="submit" name="submit" value="submit" /> Modified: trunk/linpha2/templates/default/view_img.html.php =================================================================== --- trunk/linpha2/templates/default/view_img.html.php 2006-04-10 10:22:20 UTC (rev 4501) +++ trunk/linpha2/templates/default/view_img.html.php 2006-04-10 15:41:20 UTC (rev 4502) @@ -57,11 +57,11 @@ <br /><br /> <!-- show image comments --> - <?php while($data = $GLOBALS['linpha']->template->output['image_comments']->FetchRow()) { ?> + <?php while($data = $GLOBALS['linpha']->template->output['image_comments']->FetchRow(ADODB_FETCH_ASSOC)) { ?> <div class="comments"> - <?php echo $data['time']; ?> <?php echo $data['author']; ?> + <?php echo $data['meta_time']; ?> <?php echo $data['meta_author']; ?> <br /> - <?php echo $data['comment']; ?> + <?php echo $data['meta_comment']; ?> <br /><br /> </div> <?php } ?> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
