Changeset 420
- Timestamp:
- May 20, 2004, 11:22:44 PM (20 years ago)
- Location:
- trunk
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/comments.php
r393 r420 92 92 93 93 foreach ( $conf['last_days'] as $option ) { 94 $url = $ PHP_SELF.'?last_days='.($option - 1);94 $url = $_SERVER['PHP_SELF'].'?last_days='.($option - 1); 95 95 if (defined('IN_ADMIN')) $url.= '&page=comments'; 96 $template->assign_block_vars('last_day_option', array ( 97 'OPTION'=>$option, 98 'T_STYLE'=>(( $option == MAX_DAYS + 1 )?'text-decoration:underline;':''), 99 'U_OPTION'=>add_session_id( $url ) 100 )); 96 $template->assign_block_vars( 97 'last_day_option', 98 array( 99 'OPTION'=>$option, 100 'T_STYLE'=>(( $option == MAX_DAYS + 1 )?'text-decoration:underline;':''), 101 'U_OPTION'=>add_session_id( $url ) 102 ) 103 ); 101 104 } 102 105 … … 110 113 $query.= ', '.IMAGE_CATEGORY_TABLE.' AS ic'; 111 114 $query.= ' WHERE c.image_id = ic.image_id'; 112 $query.= ' AND date > '.$maxtime;115 $query.= ' AND date > FROM_UNIXTIME('.$maxtime.')'; 113 116 if ( $user['status'] != 'admin' ) 114 117 { … … 174 177 $query = 'SELECT * FROM '.COMMENTS_TABLE; 175 178 $query.= ' WHERE image_id = '.$row['image_id']; 176 $query.= ' AND date > '.$maxtime;179 $query.= ' AND date > FROM_UNIXTIME('.$maxtime.')'; 177 180 if ( $user['status'] != 'admin' ) 178 181 { … … 202 205 $replacement = '<span style="font-style:italic;">\1</span>'; 203 206 $content = preg_replace( $pattern, $replacement, $content ); 204 $template->assign_block_vars('picture.comment',array( 205 'COMMENT_AUTHOR'=>$author, 206 'COMMENT_DATE'=>format_date( $subrow['date'], 'unix', true ), 207 'COMMENT'=>$content, 208 )); 209 if ( $user['status'] == 'admin' ) 210 { 211 $template->assign_block_vars('picture.comment.validation', array( 212 'ID'=> $subrow['id'], 213 'CHECKED'=>($subrow['validated']=='false')?'checked="checked"': '' 214 )); 215 } 207 $template->assign_block_vars( 208 'picture.comment',array( 209 'COMMENT_AUTHOR'=>$author, 210 'COMMENT_DATE'=>format_date( $subrow['date'],'mysql_datetime',true ), 211 'COMMENT'=>$content, 212 )); 213 if ( $user['status'] == 'admin' ) 214 { 215 $template->assign_block_vars( 216 'picture.comment.validation', array( 217 'ID'=> $subrow['id'], 218 'CHECKED'=>($subrow['validated']=='false')?'checked="checked"': '' 219 )); 220 } 216 221 } 217 222 } -
trunk/include/functions.inc.php
r409 r420 375 375 $unixdate = $date; 376 376 break; 377 case 'mysql_datetime' : 378 preg_match( '/^(\d{4})-(\d{2})-(\d{2}) (\d{2}):(\d{2}):(\d{2})$/', 379 $date, $matches ); 380 $unixdate = mktime($matches[4],$matches[5],$matches[6], 381 $matches[2],$matches[3],$matches[1]); 382 break; 377 383 } 378 384 $formated_date = $lang['day'][date( "w", $unixdate )]; -
trunk/install/dbscheme.txt
r407 r420 1 table categories 2 table comments 3 table config 4 table favorites 5 table group_access 6 table groups 7 table history 8 table image_category 9 table images 10 table sessions 11 table sites 12 table user_access 13 table user_category 14 table user_group 15 table users 16 table waiting 17 column id categories smallint(5) unsigned 18 column date_last categories date 19 column nb_images categories mediumint(8) unsigned 20 column name categories varchar(255) 21 column id_uppercat categories smallint(5) unsigned 22 column comment categories text 23 column dir categories varchar(255) 24 column rank categories tinyint(3) unsigned 25 column status categories enum('public','private') 26 column site_id categories tinyint(4) unsigned 27 column visible categories enum('true','false') 28 column uploadable categories enum('true','false') 29 column representative_picture_id categories mediumint(8) unsigned 30 column uppercats categories varchar(255) 31 column id comments int(11) unsigned 32 column image_id comments mediumint(8) unsigned 33 column date comments int(11) unsigned 34 column author comments varchar(255) 35 column content comments longtext 36 column validated comments enum('true','false') 37 column param config varchar(40) 38 column value config varchar(255) 39 column comment config varchar(255) 40 column user_id favorites smallint(5) unsigned 41 column image_id favorites mediumint(8) unsigned 42 column group_id group_access smallint(5) unsigned 43 column cat_id group_access smallint(5) unsigned 44 column id groups smallint(5) unsigned 45 column name groups varchar(255) 46 column date history int(11) 47 column login history varchar(15) 48 column IP history varchar(50) 49 column category history varchar(150) 50 column file history varchar(50) 51 column picture history varchar(150) 52 column image_id image_category mediumint(8) unsigned 53 column category_id image_category smallint(5) unsigned 54 column id images mediumint(8) unsigned 55 column file images varchar(255) 56 column date_available images date 57 column date_creation images date 58 column tn_ext images char(3) 59 column name images varchar(255) 60 column comment images text 61 column author images varchar(255) 62 column hit images int(10) unsigned 63 column filesize images mediumint(9) unsigned 64 column width images smallint(9) unsigned 65 column height images smallint(9) unsigned 66 column keywords images varchar(255) 67 column storage_category_id images smallint(5) unsigned 68 column id sessions varchar(255) binary 69 column user_id sessions smallint(5) unsigned 70 column expiration sessions int(10) unsigned 71 column ip sessions varchar(255) 72 column id sites tinyint(4) 73 column galleries_url sites varchar(255) 74 column user_id user_access smallint(5) unsigned 75 column cat_id user_access smallint(5) unsigned 76 column user_id user_category smallint(5) unsigned 77 column category_id user_category smallint(5) unsigned 78 column date_last user_category date 79 column nb_sub_categories user_category smallint(5) unsigned 80 column user_id user_group smallint(5) unsigned 81 column group_id user_group smallint(5) unsigned 82 column id users smallint(5) unsigned 83 column username users varchar(20) binary 84 column password users varchar(255) 85 column mail_address users varchar(255) 86 column nb_image_line users tinyint(1) unsigned 87 column nb_line_page users tinyint(3) unsigned 88 column status users enum('admin','guest') 89 column language users varchar(50) 90 column maxwidth users smallint(6) 91 column maxheight users smallint(6) 92 column expand users enum('true','false') 93 column show_nb_comments users enum('true','false') 94 column short_period users tinyint(3) unsigned 95 column long_period users tinyint(3) unsigned 96 column template users varchar(255) 97 column forbidden_categories users text 98 column id waiting int(10) unsigned 99 column storage_category_id waiting smallint(5) unsigned 100 column file waiting varchar(255) 101 column username waiting varchar(255) 102 column mail_address waiting varchar(255) 103 column date waiting int(10) unsigned 104 column tn_ext waiting char(3) 105 column validated waiting enum('true','false') 106 column infos waiting text 107 pk id categories 108 pk id comments 109 pk param config 110 pk user_id favorites 111 pk image_id favorites 112 pk group_id group_access 113 pk cat_id group_access 114 pk id groups 115 pk image_id image_category 116 pk category_id image_category 117 pk id images 118 pk id sessions 119 pk id sites 120 pk user_id user_access 121 pk cat_id user_access 122 pk user_id user_category 123 pk category_id user_category 124 pk group_id user_group 125 pk user_id user_group 126 pk id users 127 pk id waiting 128 index categories_i2 categories id_uppercat 129 index image_category_i1 image_category image_id 130 index image_category_i2 image_category category_id 131 index storage_category_id images storage_category_id 132 index sites_ui1 sites galleries_url 133 index users_ui1 users username 1 2 table:categories 3 table:comments 4 table:config 5 table:favorites 6 table:group_access 7 table:groups 8 table:history 9 table:image_category 10 table:images 11 table:sessions 12 table:sites 13 table:user_access 14 table:user_category 15 table:user_group 16 table:users 17 table:waiting 18 19 column:id table:categories type:smallint nullable:Y length:5 signed:N 20 column:date_last table:categories type:date nullable:N 21 column:nb_images table:categories type:mediumint nullable:Y length:8 signed:N 22 column:name table:categories type:varchar nullable:Y length:255 binary:N 23 column:id_uppercat table:categories type:smallint nullable:N length:5 signed:N 24 column:comment table:categories type:text nullable:N 25 column:dir table:categories type:varchar nullable:N length:255 binary:N 26 column:rank table:categories type:tinyint nullable:N length:3 signed:N 27 column:status table:categories type:enum('public','private') nullable:Y 28 column:site_id table:categories type:tinyint nullable:Y length:4 signed:N 29 column:visible table:categories type:enum('true','false') nullable:Y 30 column:uploadable table:categories type:enum('true','false') nullable:Y 31 column:representative_picture_id table:categories type:mediumint nullable:N length:8 signed:N 32 column:uppercats table:categories type:varchar nullable:Y length:255 binary:N 33 column:id table:comments type:int nullable:Y length:11 signed:N 34 column:image_id table:comments type:mediumint nullable:Y length:8 signed:N 35 column:date table:comments type:datetime nullable:Y 36 column:author table:comments type:varchar nullable:N length:255 binary:N 37 column:content table:comments type:longtext nullable:N 38 column:validated table:comments type:enum('true','false') nullable:Y 39 column:param table:config type:varchar nullable:Y length:40 binary:N 40 column:value table:config type:varchar nullable:N length:255 binary:N 41 column:comment table:config type:varchar nullable:N length:255 binary:N 42 column:user_id table:favorites type:smallint nullable:Y length:5 signed:N 43 column:image_id table:favorites type:mediumint nullable:Y length:8 signed:N 44 column:group_id table:group_access type:smallint nullable:Y length:5 signed:N 45 column:cat_id table:group_access type:smallint nullable:Y length:5 signed:N 46 column:id table:groups type:smallint nullable:Y length:5 signed:N 47 column:name table:groups type:varchar nullable:Y length:255 binary:N 48 column:date table:history type:int nullable:Y length:11 signed:Y 49 column:login table:history type:varchar nullable:N length:15 binary:N 50 column:IP table:history type:varchar nullable:Y length:50 binary:N 51 column:category table:history type:varchar nullable:N length:150 binary:N 52 column:file table:history type:varchar nullable:N length:50 binary:N 53 column:picture table:history type:varchar nullable:N length:150 binary:N 54 column:image_id table:image_category type:mediumint nullable:Y length:8 signed:N 55 column:category_id table:image_category type:smallint nullable:Y length:5 signed:N 56 column:id table:images type:mediumint nullable:Y length:8 signed:N 57 column:file table:images type:varchar nullable:Y length:255 binary:N 58 column:date_available table:images type:date nullable:Y 59 column:date_creation table:images type:date nullable:N 60 column:tn_ext table:images type:char nullable:Y length:3 binary:N 61 column:name table:images type:varchar nullable:N length:255 binary:N 62 column:comment table:images type:text nullable:N 63 column:author table:images type:varchar nullable:N length:255 binary:N 64 column:hit table:images type:int nullable:Y length:10 signed:N 65 column:filesize table:images type:mediumint nullable:N length:9 signed:N 66 column:width table:images type:smallint nullable:N length:9 signed:N 67 column:height table:images type:smallint nullable:N length:9 signed:N 68 column:keywords table:images type:varchar nullable:N length:255 binary:N 69 column:storage_category_id table:images type:smallint nullable:N length:5 signed:N 70 column:id table:sessions type:varchar nullable:Y length:255 binary:Y 71 column:user_id table:sessions type:smallint nullable:Y length:5 signed:N 72 column:expiration table:sessions type:int nullable:Y length:10 signed:N 73 column:ip table:sessions type:varchar nullable:Y length:255 binary:N 74 column:id table:sites type:tinyint nullable:Y length:4 signed:Y 75 column:galleries_url table:sites type:varchar nullable:Y length:255 binary:N 76 column:user_id table:user_access type:smallint nullable:Y length:5 signed:N 77 column:cat_id table:user_access type:smallint nullable:Y length:5 signed:N 78 column:user_id table:user_category type:smallint nullable:Y length:5 signed:N 79 column:category_id table:user_category type:smallint nullable:Y length:5 signed:N 80 column:date_last table:user_category type:date nullable:N 81 column:nb_sub_categories table:user_category type:smallint nullable:Y length:5 signed:N 82 column:user_id table:user_group type:smallint nullable:Y length:5 signed:N 83 column:group_id table:user_group type:smallint nullable:Y length:5 signed:N 84 column:id table:users type:smallint nullable:Y length:5 signed:N 85 column:username table:users type:varchar nullable:Y length:20 binary:Y 86 column:password table:users type:varchar nullable:Y length:255 binary:N 87 column:mail_address table:users type:varchar nullable:N length:255 binary:N 88 column:nb_image_line table:users type:tinyint nullable:Y length:1 signed:N 89 column:nb_line_page table:users type:tinyint nullable:Y length:3 signed:N 90 column:status table:users type:enum('admin','guest') nullable:Y 91 column:language table:users type:varchar nullable:Y length:50 binary:N 92 column:maxwidth table:users type:smallint nullable:N length:6 signed:Y 93 column:maxheight table:users type:smallint nullable:N length:6 signed:Y 94 column:expand table:users type:enum('true','false') nullable:Y 95 column:show_nb_comments table:users type:enum('true','false') nullable:Y 96 column:short_period table:users type:tinyint nullable:Y length:3 signed:N 97 column:long_period table:users type:tinyint nullable:Y length:3 signed:N 98 column:template table:users type:varchar nullable:Y length:255 binary:N 99 column:forbidden_categories table:users type:text nullable:N 100 column:id table:waiting type:int nullable:Y length:10 signed:N 101 column:storage_category_id table:waiting type:smallint nullable:Y length:5 signed:N 102 column:file table:waiting type:varchar nullable:Y length:255 binary:N 103 column:username table:waiting type:varchar nullable:Y length:255 binary:N 104 column:mail_address table:waiting type:varchar nullable:Y length:255 binary:N 105 column:date table:waiting type:int nullable:Y length:10 signed:N 106 column:tn_ext table:waiting type:char nullable:N length:3 binary:N 107 column:validated table:waiting type:enum('true','false') nullable:Y 108 column:infos table:waiting type:text nullable:N 109 110 PK:categories_pk table:categories column:id 111 PK:comments_pk table:comments column:id 112 PK:config_pk table:config column:param 113 PK:favorites_pk table:favorites column:user_id 114 PK:favorites_pk table:favorites column:image_id 115 PK:group_access_pk table:group_access column:group_id 116 PK:group_access_pk table:group_access column:cat_id 117 PK:groups_pk table:groups column:id 118 PK:image_category_pk table:image_category column:image_id 119 PK:image_category_pk table:image_category column:category_id 120 PK:images_pk table:images column:id 121 PK:sessions_pk table:sessions column:id 122 PK:sites_pk table:sites column:id 123 PK:user_access_pk table:user_access column:user_id 124 PK:user_access_pk table:user_access column:cat_id 125 PK:user_category_pk table:user_category column:user_id 126 PK:user_category_pk table:user_category column:category_id 127 PK:user_group_pk table:user_group column:group_id 128 PK:user_group_pk table:user_group column:user_id 129 PK:users_pk table:users column:id 130 PK:waiting_pk table:waiting column:id 131 132 index:categories_i2 table:categories column:id_uppercat 133 index:image_category_i1 table:image_category column:image_id 134 index:image_category_i2 table:image_category column:category_id 135 index:storage_category_id table:images column:storage_category_id 136 index:sites_ui1 table:sites column:galleries_url 137 index:users_ui1 table:users column:username -
trunk/install/phpwebgallery_structure.sql
r407 r420 37 37 id int(11) unsigned NOT NULL auto_increment, 38 38 image_id mediumint(8) unsigned NOT NULL default '0', 39 date int(11) unsigned NOT NULL default '0',39 date datetime NOT NULL default '0000-00-00 00:00:00', 40 40 author varchar(255) default NULL, 41 41 content longtext, -
trunk/picture.php
r405 r420 25 25 // | USA. | 26 26 // +-----------------------------------------------------------------------+ 27 27 28 //----------------------------------------------------------- include 28 29 define('PHPWG_ROOT_PATH','./'); … … 225 226 $reference_date = time() - $conf['anti-flood_time']; 226 227 $query = 'SELECT id FROM '.COMMENTS_TABLE; 227 $query.= ' WHERE date > '.$reference_date;228 $query.= ' WHERE date > FROM_UNIXTIME('.$reference_date.')'; 228 229 $query.= " AND author = '".$author."'"; 229 230 $query.= ';'; … … 234 235 $query.= ' (author,date,image_id,content,validated) VALUES ('; 235 236 $query.= "'".$author."'"; 236 $query.= ', '.time().','.$_GET['image_id'];237 $query.= ',NOW(),'.$_GET['image_id']; 237 238 $query.= ",'".htmlspecialchars( $_POST['content'], ENT_QUOTES)."'"; 238 239 if ( !$conf['comments_validation'] or $user['status'] == 'admin' ) … … 578 579 $template->assign_block_vars('comments.comment', array( 579 580 'COMMENT_AUTHOR'=>empty($row['author'])?$lang['guest']:$row['author'], 580 'COMMENT_DATE'=>format_date( $row['date'], ' unix', true ),581 'COMMENT_DATE'=>format_date( $row['date'], 'mysql_datetime', true ), 581 582 'COMMENT'=>$content 582 583 ));
Note: See TracChangeset
for help on using the changeset viewer.