[Linpha-cvs] SF.net SVN: linpha: [4504] trunk/linpha2
Status: Inactive
Brought to you by:
bzrudi
Menu
▾
▴
[Linpha-cvs] SF.net SVN: linpha: [4504] trunk/linpha2
|
From: <bz...@us...> - 2006-04-10 17:48:12
|
Revision: 4504 Author: bzrudi Date: 2006-04-10 10:47:47 -0700 (Mon, 10 Apr 2006) ViewCVS: http://svn.sourceforge.net/linpha/?rev=4504&view=rev Log Message: ----------- Modified Paths: -------------- trunk/linpha2/ChangeLog trunk/linpha2/admin/image_fields_define.php trunk/linpha2/admin/image_fields_select.php trunk/linpha2/admin/import.php trunk/linpha2/admin/permissions_groups.php trunk/linpha2/admin/permissions_others.php trunk/linpha2/admin/permissions_usergroup.php trunk/linpha2/admin/permissions_users.php trunk/linpha2/lib/classes/linpha.image.class.php trunk/linpha2/lib/classes/linpha.metadata.class.php trunk/linpha2/lib/classes/linpha.sql.class.php trunk/linpha2/templates/default/view_meta.html.php Modified: trunk/linpha2/ChangeLog =================================================================== --- trunk/linpha2/ChangeLog 2006-04-10 17:46:35 UTC (rev 4503) +++ trunk/linpha2/ChangeLog 2006-04-10 17:47:47 UTC (rev 4504) @@ -5,6 +5,7 @@ databases. - make sure to run reset_database.php! - ...still more to rename + - add ADODB_FETCH_ASSOC where we should have it, don't rely on defaults 2006-04-10 flo * fixed some eclipse warnings Modified: trunk/linpha2/admin/image_fields_define.php =================================================================== --- trunk/linpha2/admin/image_fields_define.php 2006-04-10 17:46:35 UTC (rev 4503) +++ trunk/linpha2/admin/image_fields_define.php 2006-04-10 17:47:47 UTC (rev 4504) @@ -65,7 +65,7 @@ * get builtin fields */ $query = $GLOBALS['linpha']->db->Execute("SELECT id, name, field_type, flags FROM ".PREFIX."meta_fields WHERE flags = '5' OR flags = '6' "); - while($data = $query->FetchRow()) + while($data = $query->FetchRow(ADODB_FETCH_ASSOC)) { echo '<tr><td>'; echo $data['name']; @@ -135,7 +135,7 @@ </tr> <?php - while($data = $query->FetchRow()) + while($data = $query->FetchRow(ADODB_FETCH_ASSOC)) { ?> <tr> @@ -181,7 +181,7 @@ function show_add_data() { $query = $GLOBALS['linpha']->db->Execute("SELECT id, name FROM ".PREFIX."meta_fields WHERE field_type = '2'"); - while($data = $query->FetchRow()) + while($data = $query->FetchRow(ADODB_FETCH_ASSOC)) { ?> <h3><?php echo $data['name']; ?></h3> @@ -194,7 +194,7 @@ </tr> <?php $query2 = $GLOBALS['linpha']->db->Execute("SELECT id, name, isprivate FROM ".PREFIX."meta_category WHERE field_id = '".$data['id']."'"); - while($data2 = $query2->FetchRow()) + while($data2 = $query2->FetchRow(ADODB_FETCH_ASSOC)) { ?> <tr> Modified: trunk/linpha2/admin/image_fields_select.php =================================================================== --- trunk/linpha2/admin/image_fields_select.php 2006-04-10 17:46:35 UTC (rev 4503) +++ trunk/linpha2/admin/image_fields_select.php 2006-04-10 17:47:47 UTC (rev 4504) @@ -70,7 +70,7 @@ <select id="select_image_fields" name="select_image_fields[]" size="25" style="width: 200px;" multiple="multiple"> <?php $query = $GLOBALS['linpha']->db->Execute("SELECT id, name FROM ".PREFIX."meta_fields WHERE flags = '".$flag_nr."' ORDER by id"); - while($data = $query->FetchRow()) + while($data = $query->FetchRow(ADODB_FETCH_ASSOC)) { echo '<option value="'.$data['name'].'">'.$MetaData->getNameOfField($data['name'],true).'</option>'; } @@ -94,7 +94,7 @@ <?php $query = $GLOBALS['linpha']->db->Execute("SELECT id, name FROM ".PREFIX."meta_fields " . "WHERE flags = '1' OR flags = '5'"); - while($data = $query->FetchRow()) + while($data = $query->FetchRow(ADODB_FETCH_ASSOC)) { echo '<option value="builtin_'.$data['name'].'">'.i18n( ucfirst( $data['name'] ) ).'</option>'; } @@ -112,7 +112,7 @@ <?php $query = $GLOBALS['linpha']->db->Execute("SELECT id, name FROM ".PREFIX."meta_fields " . "WHERE flags = '7'"); - while($data = $query->FetchRow()) + while($data = $query->FetchRow(ADODB_FETCH_ASSOC)) { echo '<option value="id_'.$data['id'].'">'.$data['name'].'</option>'; } Modified: trunk/linpha2/admin/import.php =================================================================== --- trunk/linpha2/admin/import.php 2006-04-10 17:46:35 UTC (rev 4503) +++ trunk/linpha2/admin/import.php 2006-04-10 17:47:47 UTC (rev 4504) @@ -20,7 +20,7 @@ * first, only for images */ $query = $GLOBALS['linpha']->db->Execute("SELECT id, img_type FROM ".PREFIX."photos WHERE img_type <> 0 AND img_type <> 9999999"); - while($data = $query->FetchRow()) + while($data = $query->FetchRow(ADODB_FETCH_ASSOC)) { LinImage::createThumbnail($data['id'],$data['img_type'],$force=false); } Modified: trunk/linpha2/admin/permissions_groups.php =================================================================== --- trunk/linpha2/admin/permissions_groups.php 2006-04-10 17:46:35 UTC (rev 4503) +++ trunk/linpha2/admin/permissions_groups.php 2006-04-10 17:47:47 UTC (rev 4504) @@ -75,7 +75,7 @@ </tr> <?php $query = $GLOBALS['linpha']->db->Execute("SELECT id, group_name FROM ".PREFIX."groups ORDER BY group_name"); - while($data = $query->FetchRow()) + while($data = $query->FetchRow(ADODB_FETCH_ASSOC)) { ?> <tr> Modified: trunk/linpha2/admin/permissions_others.php =================================================================== --- trunk/linpha2/admin/permissions_others.php 2006-04-10 17:46:35 UTC (rev 4503) +++ trunk/linpha2/admin/permissions_others.php 2006-04-10 17:47:47 UTC (rev 4504) @@ -102,7 +102,7 @@ <select id="selectgroups" name="groups[]" size="5" style="width: 200;" multiple="multiple"> <?php $query = $GLOBALS['linpha']->db->Execute("SELECT id, group_name FROM ".PREFIX."groups ORDER by group_name"); - while($data = $query->FetchRow()) + while($data = $query->FetchRow(ADODB_FETCH_ASSOC)) { if(in_array($data['id'],$array_permissions)) { Modified: trunk/linpha2/admin/permissions_usergroup.php =================================================================== --- trunk/linpha2/admin/permissions_usergroup.php 2006-04-10 17:46:35 UTC (rev 4503) +++ trunk/linpha2/admin/permissions_usergroup.php 2006-04-10 17:47:47 UTC (rev 4504) @@ -6,7 +6,7 @@ */ echo '<b>'.i18n("Edit Group Members").'</b><br />'; $query = $GLOBALS['linpha']->db->Execute("SELECT id, group_name FROM ".PREFIX."groups ORDER by group_name"); -while($data = $query->FetchRow()) +while($data = $query->FetchRow(ADODB_FETCH_ASSOC)) { echo '<a href="'.LINPHA_DIR.'/admin/?cat=permissions_usergroup&edit=group&id='.$data['id'].'">'.$data['group_name'].'</a><br />'; } @@ -106,7 +106,7 @@ <select name="usergroup[]" size="5" style="width: 200;" multiple="multiple"> <?php $query = $GLOBALS['linpha']->db->Execute("SELECT id, ".$other_select_name." FROM ".PREFIX.$other_table_name." ORDER by ".$other_select_name); - while($data = $query->FetchRow()) + while($data = $query->FetchRow(ADODB_FETCH_ASSOC)) { /** * check if selected Modified: trunk/linpha2/admin/permissions_users.php =================================================================== --- trunk/linpha2/admin/permissions_users.php 2006-04-10 17:46:35 UTC (rev 4503) +++ trunk/linpha2/admin/permissions_users.php 2006-04-10 17:47:47 UTC (rev 4504) @@ -91,7 +91,7 @@ * show users */ $query = $GLOBALS['linpha']->db->Execute("SELECT id, username, display_name, user_email FROM ".PREFIX."users ORDER BY username"); - while($data = $query->FetchRow()) + while($data = $query->FetchRow(ADODB_FETCH_ASSOC)) { ?> <tr> Modified: trunk/linpha2/lib/classes/linpha.image.class.php =================================================================== --- trunk/linpha2/lib/classes/linpha.image.class.php 2006-04-10 17:46:35 UTC (rev 4503) +++ trunk/linpha2/lib/classes/linpha.image.class.php 2006-04-10 17:47:47 UTC (rev 4504) @@ -183,7 +183,7 @@ return false; } - $data = $query->FetchRow(); + $data = $query->FetchRow(ADODB_FETCH_ASSOC); if( ! LinSql::photoIsAllowed( $data['id'] ) ) { @@ -352,7 +352,7 @@ $query = $GLOBALS['linpha']->db->Execute("SELECT id FROM ".PREFIX."photos WHERE parent_id = '".LinSql::linAddslashes( $this->photo_id )."'"); $array_ids = Array(); $i=0; - while($data = $query->FetchRow()) + while($data = $query->FetchRow(ADODB_FETCH_ASSOC)) { if($i >= 4) { Modified: trunk/linpha2/lib/classes/linpha.metadata.class.php =================================================================== --- trunk/linpha2/lib/classes/linpha.metadata.class.php 2006-04-10 17:46:35 UTC (rev 4503) +++ trunk/linpha2/lib/classes/linpha.metadata.class.php 2006-04-10 17:47:47 UTC (rev 4504) @@ -76,7 +76,7 @@ function readInformations($full_filename,$filename,$md5sum,$flag_nr) { $query = $GLOBALS['linpha']->db->Execute("SELECT name FROM ".PREFIX."meta_fields WHERE flags = '".$flag_nr."' ORDER by id"); - while($fields_data = $query->FetchRow()) + while($fields_data = $query->FetchRow(ADODB_FETCH_ASSOC)) { $name = MetaData::getNameOfField( $fields_data['name'], false ); $value = ''; Modified: trunk/linpha2/lib/classes/linpha.sql.class.php =================================================================== --- trunk/linpha2/lib/classes/linpha.sql.class.php 2006-04-10 17:46:35 UTC (rev 4503) +++ trunk/linpha2/lib/classes/linpha.sql.class.php 2006-04-10 17:47:47 UTC (rev 4504) @@ -178,7 +178,7 @@ $query = $GLOBALS['linpha']->db->Execute("SELECT username, display_name FROM ".PREFIX."users ". "WHERE id = '".LinSql::linAddslashes($_COOKIE['linpha_userid'])."' ". "AND password = '".LinSql::linAddslashes($_COOKIE['linpha_password'])."'"); - if($data = $query->FetchRow()) + if($data = $query->FetchRow(ADODB_FETCH_ASSOC)) { //linpha_log('login','notice','User '.$_POST['user_name'].": successfully logged in."); linSysLog(i18n("Successfully Logged In!<br />")); @@ -336,7 +336,7 @@ * get user_groups */ $query = $GLOBALS['linpha']->db->Execute("SELECT group_id FROM ".PREFIX."user_group WHERE user_id = '".$userid."'"); - while($data = $query->FetchRow()) + while($data = $query->FetchRow(ADODB_FETCH_ASSOC)) { $_SESSION['user_groups'][] = $data['group_id']; } Modified: trunk/linpha2/templates/default/view_meta.html.php =================================================================== --- trunk/linpha2/templates/default/view_meta.html.php 2006-04-10 17:46:35 UTC (rev 4503) +++ trunk/linpha2/templates/default/view_meta.html.php 2006-04-10 17:47:47 UTC (rev 4504) @@ -22,7 +22,7 @@ <td rowspan="<?php echo $num+1; ?>"><?php echo $GLOBALS['linpha']->template->output['image']; ?></td> </tr> <?php - while($data = $query->FetchRow()) + while($data = $query->FetchRow(ADODB_FETCH_ASSOC)) { ?> <tr> @@ -55,7 +55,7 @@ <?php $cat_query = $GLOBALS['linpha']->db->Execute("SELECT id, name FROM ".PREFIX."meta_category " . "WHERE field_id = '".$data['id']."'"); - while($cat_data = $cat_query->FetchRow()) + while($cat_data = $cat_query->FetchRow(ADODB_FETCH_ASSOC)) { if(in_array($cat_data['id'],$array_pieces)) { $checked = ' selected="selected"'; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
