You can subscribe to this list here.
2003 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(49) |
Sep
(18) |
Oct
(166) |
Nov
(130) |
Dec
(130) |
---|---|---|---|---|---|---|---|---|---|---|---|---|
2004 |
Jan
(48) |
Feb
(87) |
Mar
(53) |
Apr
(49) |
May
(59) |
Jun
(54) |
Jul
(58) |
Aug
(24) |
Sep
|
Oct
(15) |
Nov
(18) |
Dec
(15) |
2005 |
Jan
(104) |
Feb
(52) |
Mar
(90) |
Apr
(13) |
May
(14) |
Jun
(35) |
Jul
(1) |
Aug
|
Sep
(13) |
Oct
|
Nov
|
Dec
|
2006 |
Jan
(1) |
Feb
|
Mar
(3) |
Apr
|
May
(7) |
Jun
|
Jul
(5) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
2007 |
Jan
(24) |
Feb
(12) |
Mar
(1) |
Apr
(1) |
May
|
Jun
|
Jul
(38) |
Aug
(20) |
Sep
(3) |
Oct
|
Nov
|
Dec
(2) |
From: Gordon P. H. <gph...@us...> - 2007-12-19 06:27:24
|
Update of /cvsroot/cmsforme/website/downloads In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv21652/downloads Modified Files: index.php Log Message: Fix sorting and formatting. Index: index.php =================================================================== RCS file: /cvsroot/cmsforme/website/downloads/index.php,v retrieving revision 1.37 retrieving revision 1.38 diff -u -d -r1.37 -r1.38 --- index.php 19 Dec 2007 00:28:14 -0000 1.37 +++ index.php 19 Dec 2007 06:27:17 -0000 1.38 @@ -28,33 +28,33 @@ $filelist = array(); $filelist[] = array( + 'date' => 1068354000, 'release' => 'Milestone 1 (0.0.1)', - 'link' => 'http://sourceforge.net/project/showfiles.php?group_id=84963&package_id=87839&release_id=196356', - 'date' => 1068354000 + 'link' => 'http://sourceforge.net/project/showfiles.php?group_id=84963&package_id=87839&release_id=196356' ); $filelist[] = array( + 'date' => 1080018000, 'release' => 'Milestone 2 (0.0.2)', - 'link' => 'http://sourceforge.net/project/showfiles.php?group_id=84963&package_id=87839&release_id=225692', - 'date' => 1080018000 + 'link' => 'http://sourceforge.net/project/showfiles.php?group_id=84963&package_id=87839&release_id=225692' ); $filelist[] = array( + 'date' => 1090123200, 'release' => 'Milestone 3 (0.0.3)', - 'link' => 'http://sourceforge.net/project/showfiles.php?group_id=84963&package_id=87839&release_id=254076', - 'date' => 1090123200 + 'link' => 'http://sourceforge.net/project/showfiles.php?group_id=84963&package_id=87839&release_id=254076' ); $filelist[] = array( + 'date' => 1106703420, 'release' => 'Milestone 4 (0.0.4)', - 'link' => 'http://sourceforge.net/project/showfiles.php?group_id=84963&package_id=87839&release_id=300192', - 'date' => 1106703420 + 'link' => 'http://sourceforge.net/project/showfiles.php?group_id=84963&package_id=87839&release_id=300192' ); $filelist[] = array( + 'date' => 1186023300, 'release' => 'CMSform<sup>E</sup> 0.0.5', - 'link' => 'http://sourceforge.net/project/showfiles.php?group_id=84963&package_id=87839&release_id=529114', - 'date' => 1186023300 + 'link' => 'http://sourceforge.net/project/showfiles.php?group_id=84963&package_id=87839&release_id=529114' ); @arsort( $filelist ); @@ -65,7 +65,7 @@ foreach( $filelist as $info ) { print "\t\t\t" . '<li><strong>' . date( 'F j, Y', $info['date'] ) . ':</strong> '; - print '<a href="' . htmlspecialchars( $info['link'] ) . '">' . htmlspecialchars( $info['release'] ) . '</a>'; + print '<a href="' . htmlentities( $info['link'] ) . '">' . $info['release'] . '</a>'; print '</li>' . "\n"; } |
From: Gordon P. H. <gph...@us...> - 2007-12-19 00:28:20
|
Update of /cvsroot/cmsforme/website/downloads In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv7188/downloads Modified Files: index.php Log Message: Add link to version 0.0.5, among other important download-related pages. Index: index.php =================================================================== RCS file: /cvsroot/cmsforme/website/downloads/index.php,v retrieving revision 1.36 retrieving revision 1.37 diff -u -d -r1.36 -r1.37 --- index.php 2 Jun 2005 23:37:31 -0000 1.36 +++ index.php 19 Dec 2007 00:28:14 -0000 1.37 @@ -20,7 +20,7 @@ <div class="section" id="releases" title="Releases"> <h2>Releases</h2> - <p>CMSform<sup>E</sup> is packaged into a new release after every milestone. The latest packages are listed below.</p> + <p>CMSform<sup>E</sup> is packaged into a new release after every milestone. The latest release is available <a href="http://sourceforge.net/project/platformdownload.php?group_id=84963">here</a>. To see all releases, visit our <a href="http://sourceforge.net/project/showfiles.php?group_id=84963">SourceForge File Releases page</a>, or use the quick links below.</p> <ul> <?php @@ -48,7 +48,13 @@ $filelist[] = array( 'release' => 'Milestone 4 (0.0.4)', 'link' => 'http://sourceforge.net/project/showfiles.php?group_id=84963&package_id=87839&release_id=300192', - 'date' => 1106629200 + 'date' => 1106703420 +); + +$filelist[] = array( + 'release' => 'CMSform<sup>E</sup> 0.0.5', + 'link' => 'http://sourceforge.net/project/showfiles.php?group_id=84963&package_id=87839&release_id=529114', + 'date' => 1186023300 ); @arsort( $filelist ); |
From: Josh <jel...@us...> - 2007-09-02 03:37:01
|
Update of /cvsroot/cmsforme/CMSformE/styles/phpBlue In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv31499/styles/phpBlue Modified Files: news_post.html Log Message: Some fixes: - Fix article editing - eCode auto link fix Index: news_post.html =================================================================== RCS file: /cvsroot/cmsforme/CMSformE/styles/phpBlue/news_post.html,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- news_post.html 17 May 2006 02:01:15 -0000 1.2 +++ news_post.html 2 Sep 2007 03:36:54 -0000 1.3 @@ -37,11 +37,11 @@ <input type="reset" name="reset" value="{L_RESET}" /> <!-- IF B_EDIT_NEWS --> - <input type="hidden" name="mode" value="editnews" /> + <input type="hidden" name="mode" value="edit_news" /> <input type="hidden" name="article" value="{D_ARTICLE}" /> <input type="hidden" name="poster_id" value="{D_USER_ID}" /> <!-- ELSE --> <input type="hidden" name="mode" value="post" /> <!-- ENDIF --> </div> - </form> + </form> \ No newline at end of file |
From: Josh <jel...@us...> - 2007-09-02 03:37:00
|
Update of /cvsroot/cmsforme/CMSformE In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv31499 Modified Files: articlecp.php Log Message: Some fixes: - Fix article editing - eCode auto link fix Index: articlecp.php =================================================================== RCS file: /cvsroot/cmsforme/CMSformE/articlecp.php,v retrieving revision 1.37 retrieving revision 1.38 diff -u -d -r1.37 -r1.38 --- articlecp.php 5 Aug 2007 19:23:52 -0000 1.37 +++ articlecp.php 2 Sep 2007 03:36:53 -0000 1.38 @@ -430,7 +430,7 @@ $extra_sql = ( $poster_id == ANONYMOUS ) ? ", poster_username = '$poster_username'" : ''; $sql = 'UPDATE ' . DB_NEWS_TABLE . " - SET post_subject = '$post_subject', post_text_short = '$post_text_short', post_text = '$post_text', post_comment = '$allow_comments', post_types = '$post_types', ecode_id = '$ecode_id', allow_ecode = '$allow_ecode' + SET post_subject = '$post_subject', post_text_short = '$post_text_short', post_text = '$post_text', post_comment = '$allow_comments', ecode_id = '$ecode_id', allow_ecode = '$allow_ecode' $extra_sql WHERE post_id = '$article'"; @@ -741,31 +741,31 @@ while ( $row = $Database->fetch_assoc( $result ) ) { - $article = $row; + $article_data = $row; $post_types[] = $row['type_id']; } $Database->free_result(); - $article['post_types'] = $post_types; + $article_data['post_types'] = $post_types; unset($post_types); // Authorization check - if( !( is_auth( 'edit_news' ) ) || ( ( $user['level'] <= AUTH_MEMBER ) && ( $user['id'] != $article['user_id'] ) ) ) + if( !( is_auth( 'edit_news' ) ) || ( ( $user['level'] <= AUTH_MEMBER ) && ( $user['id'] != $article_data['user_id'] ) ) ) { message( $lang['no_auth'], $lang['no_auth_edit_news'] ); } $Template->assign_vars( array( 'B_EDIT_NEWS' => TRUE, - 'D_ARTICLE' => $article['post_id'], - 'D_NEWS_SUBJECT' => strip_code_id( $article['post_subject'], $article['ecode_id'] ), - 'D_SHORT_TEXT' => html_entity_decode( strip_code_id( $article['post_text_short'], $article['ecode_id'] ) ), - 'D_TEXT' => html_entity_decode( strip_code_id( $article['post_text'], $article['ecode_id'] ) ), - 'F_ARTICLE_TYPES' => type_select( $article['post_types'] ), - 'F_ALLOW_COMMENTS' => radio_input( $compile_radio, $article['post_comment'], 'allow_comments' ), - 'F_ALLOW_ECODE' => radio_input( $compile_radio, $article['allow_ecode'], 'allow_ecode' ), + 'D_ARTICLE' => $article_data['post_id'], + 'D_NEWS_SUBJECT' => strip_code_id( $article_data['post_subject'], $article_data['ecode_id'] ), + 'D_SHORT_TEXT' => html_entity_decode( strip_code_id( $article_data['post_text_short'], $article_data['ecode_id'] ) ), + 'D_TEXT' => html_entity_decode( strip_code_id( $article_data['post_text'], $article_data['ecode_id'] ) ), + 'F_ARTICLE_TYPES' => type_select( $article_data['post_types'] ), + 'F_ALLOW_COMMENTS' => radio_input( $compile_radio, $article_data['post_comment'], 'allow_comments' ), + 'F_ALLOW_ECODE' => radio_input( $compile_radio, $article_data['allow_ecode'], 'allow_ecode' ), 'F_ACTION' => htmlspecialchars( add_sid( $config['file_path'] ) ), - 'D_USER_ID' => $article['user_id'] + 'D_USER_ID' => $article_data['user_id'] ) ); display_news_form( TRUE ); @@ -820,4 +820,4 @@ gen_footer(); -?> +?> \ No newline at end of file |
From: Josh <jel...@us...> - 2007-09-02 03:37:00
|
Update of /cvsroot/cmsforme/CMSformE/includes In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv31499/includes Modified Files: ecode.php Log Message: Some fixes: - Fix article editing - eCode auto link fix Index: ecode.php =================================================================== RCS file: /cvsroot/cmsforme/CMSformE/includes/ecode.php,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- ecode.php 17 Aug 2007 00:13:18 -0000 1.11 +++ ecode.php 2 Sep 2007 03:36:54 -0000 1.12 @@ -119,10 +119,10 @@ else { // [url]http://www.google.com[/url] - $message = preg_replace( "#\[url:$uid\](https?://|ftp://)([a-z0-9/?\-&()\[\]_=.]+)\[/url:$uid\]#i", '<a href="$1$2">$2</a>', $message ); + $message = preg_replace( "#\[url:$uid\](https?://|ftp://)([a-z0-9/?\-&()\[\]_=.\#]+)\[/url:$uid\]#i", '<a href="$1$2">$2</a>', $message ); // [url=http://www.google.com]Google[/url] or [url=www.google.com]Google[/url] // or [url=https://sourceforge.net]SourceForge[/url] or [url=ftp://somesite.com]FTP[/url] - $message = preg_replace( "#\[url=(https?://|ftp://)?([a-z0-9/\-?&_()\[\]=.]+)\](.*?)\[/url:$uid\]#i", '<a href="$1$2">$3</a>', $message ); + $message = preg_replace( "#\[url=(https?://|ftp://)?([a-z0-9/\-?&_()\[\]=.\#]+)\](.*?)\[/url:$uid\]#i", '<a href="$1$2">$3</a>', $message ); // Match urls without [url][/url] $message = auto_link( $message ); $message = str_replace( '"www.', '"http://www.', $message ); @@ -180,11 +180,11 @@ // far from perfect ;) if( $where == 'comment' ) { - $message = preg_replace( '#(?:^|[ \n\r])(https?://|ftp://)?((?:www.)?[a-z0-9&_.\-]{2,})\.([a-z.]{2,})([a-z0-9/?\[\]()&_=.]*#i', '<a href="$1$2.$3$4" rel="nofollow">$1$2.$3$4</a>', $message ); + $message = preg_replace( '#(?:^|[ \n\r])(https?://|ftp://)((?:www.)?[a-z0-9&_.\-]{2,})\.([a-z.]{2,})([a-z0-9/?\[\]()&_=.\#]*#i', '<a href="$1$2.$3$4" rel="nofollow">$1$2.$3$4</a>', $message ); } else { - $message = preg_replace( "#(?:^|[ \n\r])(https?://|ftp://)?((?:www.)?[a-z0-9&_.\-]{2,})\.([a-z.]{2,})([a-z0-9/?\[\]()&_=.]*)#i", '<a href="$1$2.$3$4">$1$2.$3$4</a>', $message ); + $message = preg_replace( "#(?:^|[ \n\r])(https?://|ftp://)((?:www.)?[a-z0-9&_.\-]{2,})\.([a-z.]{2,})([a-z0-9/?\[\]()&_=.\#]*)#i", '<a href="$1$2.$3$4">$1$2.$3$4</a>', $message ); } return $message; |
From: Josh <jel...@us...> - 2007-08-17 00:13:22
|
Update of /cvsroot/cmsforme/CMSformE/includes In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv32405 Modified Files: ecode.php Log Message: J.C. is not enough to create a URL. [] and () are allowable in query strings. Index: ecode.php =================================================================== RCS file: /cvsroot/cmsforme/CMSformE/includes/ecode.php,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- ecode.php 5 Aug 2007 15:39:11 -0000 1.10 +++ ecode.php 17 Aug 2007 00:13:18 -0000 1.11 @@ -42,7 +42,6 @@ $message = preg_replace( '#\[(\w+?)(=\w+)?\]#i', "[$1$2:$code_id]", $message ); $message = preg_replace( '#\[/([\w: ]+?)\]#i', "[/$1:$code_id]", $message ); - // Bug 0003: This doesn't work when there is an attribute... return $message; } @@ -120,10 +119,10 @@ else { // [url]http://www.google.com[/url] - $message = preg_replace( "#\[url:$uid\](https?://|ftp://)([a-z0-9/?&_=.]+)\[/url:$uid\]#i", '<a href="$1$2">$2</a>', $message ); + $message = preg_replace( "#\[url:$uid\](https?://|ftp://)([a-z0-9/?\-&()\[\]_=.]+)\[/url:$uid\]#i", '<a href="$1$2">$2</a>', $message ); // [url=http://www.google.com]Google[/url] or [url=www.google.com]Google[/url] // or [url=https://sourceforge.net]SourceForge[/url] or [url=ftp://somesite.com]FTP[/url] - $message = preg_replace( "#\[url=(https?://|ftp://)?([a-z0-9/?&_=.]+)\](.*?)\[/url:$uid\]#i", '<a href="$1$2">$3</a>', $message ); + $message = preg_replace( "#\[url=(https?://|ftp://)?([a-z0-9/\-?&_()\[\]=.]+)\](.*?)\[/url:$uid\]#i", '<a href="$1$2">$3</a>', $message ); // Match urls without [url][/url] $message = auto_link( $message ); $message = str_replace( '"www.', '"http://www.', $message ); @@ -181,11 +180,11 @@ // far from perfect ;) if( $where == 'comment' ) { - $message = preg_replace( '#(?:^|[ \n\r])(https?://|ftp://)?([www.]?[a-z0-9&_.\-]+)\.([a-z.]+)([a-z0-9/?&_=.]*)#i', '<a href="$1$2.$3$4" rel="nofollow">$1$2.$3$4</a>', $message ); + $message = preg_replace( '#(?:^|[ \n\r])(https?://|ftp://)?((?:www.)?[a-z0-9&_.\-]{2,})\.([a-z.]{2,})([a-z0-9/?\[\]()&_=.]*#i', '<a href="$1$2.$3$4" rel="nofollow">$1$2.$3$4</a>', $message ); } else { - $message = preg_replace( "#(?:^|[ \n\r])(https?://|ftp://)?([www.]?[a-z0-9&_.\-]+)\.([a-z.]+)([a-z0-9/?&_=.]*)#i", '<a href="$1$2.$3$4">$1$2.$3$4</a>', $message ); + $message = preg_replace( "#(?:^|[ \n\r])(https?://|ftp://)?((?:www.)?[a-z0-9&_.\-]{2,})\.([a-z.]{2,})([a-z0-9/?\[\]()&_=.]*)#i", '<a href="$1$2.$3$4">$1$2.$3$4</a>', $message ); } return $message; |
From: Josh <jel...@us...> - 2007-08-05 20:50:13
|
Update of /cvsroot/cmsforme/CMSformE/install In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv1607 Modified Files: install.php Log Message: Staff table no longer exists Index: install.php =================================================================== RCS file: /cvsroot/cmsforme/CMSformE/install/install.php,v retrieving revision 1.72 retrieving revision 1.73 diff -u -d -r1.72 -r1.73 --- install.php 15 Jul 2007 00:12:14 -0000 1.72 +++ install.php 5 Aug 2007 20:50:00 -0000 1.73 @@ -638,10 +638,7 @@ // Needed for seasoning include( ROOT . 'includes/functions.php' ); - $sql = "INSERT INTO {$prefix}staff (staff_id, user_id, staff_role, staff_bio, staff_pending) - VALUES ('1', '1', 'Administrator', 'This user is the Adminstrator who has successfully installed CMSform<sup>E</sup>!', '1'); - - UPDATE {$prefix}users + $sql = "UPDATE {$prefix}users SET username = '$ausername', user_password = '" . md5( $apassword ) . "', user_email = '$aemail', user_salt = '" . evaporate_water( sid() ) . "' WHERE user_id = '1'"; |
From: Gordon P. H. <gph...@us...> - 2007-08-05 20:21:04
|
Update of /cvsroot/cmsforme/CMSformE In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv25250 Modified Files: index.php Log Message: Fix parse error and simplify SQL syntax. Index: index.php =================================================================== RCS file: /cvsroot/cmsforme/CMSformE/index.php,v retrieving revision 1.66 retrieving revision 1.67 diff -u -d -r1.66 -r1.67 --- index.php 5 Aug 2007 19:23:52 -0000 1.66 +++ index.php 5 Aug 2007 20:20:33 -0000 1.67 @@ -72,21 +72,10 @@ WHERE u.user_id = n.user_id AND nt.post_id = n.post_id $post_limit - ORDER BY n.post_time DESC"; - - // todo: config variable for number of articles per page. - switch ( DB_TYPE ) - { - case 'mysql': - case 'mysqli': - $sql .= " LIMIT $start, 25"; - break; + ORDER BY n.post_time DESC + LIMIT 25 OFFSET $start"; - case 'postgresql': - default: - $sql .= " LIMIT 25 OFFSET $start"; - break; - } + // TODO: config variable for number of articles per page. if( !( $result = $Database->query( $sql ) ) ) { |
From: Gordon P. H. <gph...@us...> - 2007-08-05 20:21:04
|
Update of /cvsroot/cmsforme/CMSformE/modules/syndication/files/includes In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv25250/modules/syndication/files/includes Modified Files: syndication.php Log Message: Fix parse error and simplify SQL syntax. Index: syndication.php =================================================================== RCS file: /cvsroot/cmsforme/CMSformE/modules/syndication/files/includes/syndication.php,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- syndication.php 5 Aug 2007 18:23:36 -0000 1.2 +++ syndication.php 5 Aug 2007 20:20:33 -0000 1.3 @@ -44,23 +44,10 @@ ); $sql = 'SELECT n.*, u.* - FROM ' . DB_NEWS_TABLE . ' n, ' . DB_USERS_TABLE . ' u + FROM ' . DB_NEWS_TABLE . ' n, ' . DB_USERS_TABLE . " u WHERE u.user_id = n.user_id - ORDER BY n.post_time DESC' - - switch( DB_TYPE ) - { - case 'mysql': - case 'mysqli': - $sql .= " LIMIT 0, $limit"; - break; - - case 'postgres': - default: - $sql .= " LIMIT $limit OFFSET 0"; - break; - } - + ORDER BY n.post_time DESC + LIMIT $limit OFFSET 0"; if( !( $result = $Database->query( $sql ) ) ) { |
From: Josh <jel...@us...> - 2007-08-05 20:01:02
|
Update of /cvsroot/cmsforme/CMSformE/l10n/en_US In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv4883/l10n/en_US Modified Files: common.php Log Message: That wasn't too bad. - Fix tagging Index: common.php =================================================================== RCS file: /cvsroot/cmsforme/CMSformE/l10n/en_US/common.php,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- common.php 3 Jan 2007 16:16:06 -0000 1.3 +++ common.php 5 Aug 2007 19:23:52 -0000 1.4 @@ -63,6 +63,7 @@ 'april' => 'April', 'archives' => 'Archives', 'august' => 'August', + 'authors' => 'Authors', 'december' => 'December', 'february' => 'February', 'january' => 'January', @@ -74,7 +75,8 @@ 'october' => 'October', 'registered_user' => 'There is <strong>1</strong> registered user on this CMSform<sup>E</sup> system.', 'registered_users' => 'There are <strong>%d</strong> registered users on this CMSform<sup>E</sup> system.', - 'september' => 'September' + 'september' => 'September', + 'types' => 'Tags' ) ); // News @@ -229,4 +231,4 @@ 'comment_notify_subject' => 'New Comment Notification :: %s', ) ); -?> \ No newline at end of file +?> |
From: Josh <jel...@us...> - 2007-08-05 19:52:57
|
Update of /cvsroot/cmsforme/CMSformE/includes In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv15147 Modified Files: functions.php Log Message: And remove the comment that goes with that unused function :/ Index: functions.php =================================================================== RCS file: /cvsroot/cmsforme/CMSformE/includes/functions.php,v retrieving revision 1.61 retrieving revision 1.62 diff -u -d -r1.61 -r1.62 --- functions.php 5 Aug 2007 19:40:57 -0000 1.61 +++ functions.php 5 Aug 2007 19:52:53 -0000 1.62 @@ -242,8 +242,6 @@ return $count; } -// Fetch level of user (staff or non-staff) - // Convert decimal hours to time format function convert_hours_to_time( $hours ) { |
From: Josh <jel...@us...> - 2007-08-05 19:41:01
|
Update of /cvsroot/cmsforme/CMSformE/includes In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv10786 Modified Files: functions.php Log Message: Remove unused function Index: functions.php =================================================================== RCS file: /cvsroot/cmsforme/CMSformE/includes/functions.php,v retrieving revision 1.60 retrieving revision 1.61 diff -u -d -r1.60 -r1.61 --- functions.php 4 Jul 2006 06:35:12 -0000 1.60 +++ functions.php 5 Aug 2007 19:40:57 -0000 1.61 @@ -243,37 +243,6 @@ } // Fetch level of user (staff or non-staff) -function get_staff( $staff_position ) -{ - global $Database; - - $array = array(); - - $sql = 'SELECT * - FROM ' . DB_STAFF_TABLE . " - WHERE staff_id = $staff_id"; - - if( !( $result = $Database->query( $sql ) ) ) - { - include( ROOT . 'includes/errors.php' ); - $error = $Database->error(); - db_error( $error['code'], 'Could not obtain staff information.', $error['message'], __FILE__, __LINE__, $sql ); - } - - $j = 1; - - while( $row = $Database->fetch_array( $result ) ) - { - foreach( $row as $col_name => $value ) - { - $array[$j][$col_name] = $value; - } - - $j++; - } - - return $array; -} // Convert decimal hours to time format function convert_hours_to_time( $hours ) |
From: Josh <jel...@us...> - 2007-08-05 19:24:13
|
Update of /cvsroot/cmsforme/CMSformE In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv4883 Modified Files: articlecp.php index.php Log Message: That wasn't too bad. - Fix tagging Index: articlecp.php =================================================================== RCS file: /cvsroot/cmsforme/CMSformE/articlecp.php,v retrieving revision 1.36 retrieving revision 1.37 diff -u -d -r1.36 -r1.37 --- articlecp.php 5 Aug 2007 17:08:47 -0000 1.36 +++ articlecp.php 5 Aug 2007 19:23:52 -0000 1.37 @@ -47,12 +47,12 @@ $lang['no'] => 0 ); -function type_select( $article_types = FALSE ) +function type_select( $types = FALSE ) { global $Database, $Template; $news_types = array(); - $types = explode( ',', $article_types ); + $types = ($types) ? $types : array(); // Generate checkbox list for news categorization $sql = 'SELECT * @@ -727,9 +727,10 @@ exit; } - $sql = 'SELECT * - FROM ' . DB_NEWS_TABLE . ' - WHERE post_id = ' . $article; + $sql = 'SELECT n.*, nt.* + FROM ' . DB_NEWS_TABLE . ' n, ' . DB_NEWS_TYPES_TABLE . ' nt + WHERE n.post_id = ' . $article . ' + AND nt.post_id = n.post_id'; if( !( $result = $Database->query( $sql ) ) ) { @@ -738,26 +739,33 @@ db_error( $error['code'], 'Could not get article information.', $error['message'], __FILE__, __LINE__, $sql ); } - $row = $Database->fetch_assoc( $result ); + while ( $row = $Database->fetch_assoc( $result ) ) + { + $article = $row; + $post_types[] = $row['type_id']; + } $Database->free_result(); + + $article['post_types'] = $post_types; + unset($post_types); // Authorization check - if( !( is_auth( 'edit_news' ) ) || ( ( $user['level'] <= AUTH_MEMBER ) && ( $user['id'] != $row['user_id'] ) ) ) + if( !( is_auth( 'edit_news' ) ) || ( ( $user['level'] <= AUTH_MEMBER ) && ( $user['id'] != $article['user_id'] ) ) ) { message( $lang['no_auth'], $lang['no_auth_edit_news'] ); } $Template->assign_vars( array( 'B_EDIT_NEWS' => TRUE, - 'D_ARTICLE' => $row['post_id'], - 'D_NEWS_SUBJECT' => strip_code_id( $row['post_subject'], $row['ecode_id'] ), - 'D_SHORT_TEXT' => html_entity_decode( strip_code_id( $row['post_text_short'], $row['ecode_id'] ) ), - 'D_TEXT' => html_entity_decode( strip_code_id( $row['post_text'], $row['ecode_id'] ) ), - 'F_ARTICLE_TYPES' => type_select( $row['post_types'] ), - 'F_ALLOW_COMMENTS' => radio_input( $compile_radio, $row['post_comment'], 'allow_comments' ), - 'F_ALLOW_ECODE' => radio_input( $compile_radio, $row['allow_ecode'], 'allow_ecode' ), + 'D_ARTICLE' => $article['post_id'], + 'D_NEWS_SUBJECT' => strip_code_id( $article['post_subject'], $article['ecode_id'] ), + 'D_SHORT_TEXT' => html_entity_decode( strip_code_id( $article['post_text_short'], $article['ecode_id'] ) ), + 'D_TEXT' => html_entity_decode( strip_code_id( $article['post_text'], $article['ecode_id'] ) ), + 'F_ARTICLE_TYPES' => type_select( $article['post_types'] ), + 'F_ALLOW_COMMENTS' => radio_input( $compile_radio, $article['post_comment'], 'allow_comments' ), + 'F_ALLOW_ECODE' => radio_input( $compile_radio, $article['allow_ecode'], 'allow_ecode' ), 'F_ACTION' => htmlspecialchars( add_sid( $config['file_path'] ) ), - 'D_USER_ID' => $row['user_id'] + 'D_USER_ID' => $article['user_id'] ) ); display_news_form( TRUE ); Index: index.php =================================================================== RCS file: /cvsroot/cmsforme/CMSformE/index.php,v retrieving revision 1.65 retrieving revision 1.66 diff -u -d -r1.65 -r1.66 --- index.php 5 Aug 2007 18:23:36 -0000 1.65 +++ index.php 5 Aug 2007 19:23:52 -0000 1.66 @@ -95,8 +95,6 @@ db_error( $error['code'], 'Could not obtain news articles.', $error['message'], __FILE__, __LINE__, $sql ); } - $count = $Database->num_rows( $result ); - while( $row = $Database->fetch_assoc( $result ) ) { // one drawback to this approach of types: if an article has multiple types @@ -106,6 +104,9 @@ $post_types[$post_id][] = $row['type_id']; $post_subject = ( $row['post_subject'] && $article_id ) ? $row['post_subject'] : ''; } + + // we cannot use a DB fetch on this because there could be multiple records for a single article + $count = count( $news_articles ); $Database->free_result(); |
From: Josh <jel...@us...> - 2007-08-05 19:24:08
|
Update of /cvsroot/cmsforme/CMSformE/styles/phpBlue In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv4883/styles/phpBlue Modified Files: sidebar.html Log Message: That wasn't too bad. - Fix tagging Index: sidebar.html =================================================================== RCS file: /cvsroot/cmsforme/CMSformE/styles/phpBlue/sidebar.html,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- sidebar.html 12 Feb 2007 23:51:19 -0000 1.3 +++ sidebar.html 5 Aug 2007 19:23:52 -0000 1.4 @@ -7,8 +7,6 @@ <a href="{archive.D_ARCHIVE_URL}">{archive.D_ARCHIVE_LABEL}</a> <!-- END archive --> <hr /> - {D_TOTAL_USERS}<br /> - <hr /> {L_AUTHORS} <!-- BEGIN authors --> <br /> @@ -20,4 +18,6 @@ <br /> <a href="{types.U_FILTER_LINK}">{types.D_TYPE_NAME}</a> <!-- END types --> - </div> \ No newline at end of file + <hr /> + {D_TOTAL_USERS}<br /> + </div> |
From: Gordon P. H. <gph...@us...> - 2007-08-05 19:17:17
|
Update of /cvsroot/cmsforme/CMSformE/includes/db In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv3039/includes/db Modified Files: Tag: branch_v0-0 mysql.php Log Message: I HATE YOU. I HATE YOU. I HATE YOU. Index: mysql.php =================================================================== RCS file: /cvsroot/cmsforme/CMSformE/includes/db/mysql.php,v retrieving revision 1.24.2.1 retrieving revision 1.24.2.2 diff -u -d -r1.24.2.1 -r1.24.2.2 --- mysql.php 31 Jul 2007 19:45:29 -0000 1.24.2.1 +++ mysql.php 5 Aug 2007 19:17:14 -0000 1.24.2.2 @@ -18,7 +18,7 @@ if( !( defined( 'ROOT' ) ) ) { - include( './../../errors.php' ); + include( './../errors.php' ); viewed_alone(); } |
From: Gordon P. H. <gph...@us...> - 2007-08-05 18:35:32
|
Update of /cvsroot/cmsforme/CMSformE/includes/db In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv21198/includes/db Modified Files: mysql.php Log Message: I HATE YOU. I HATE YOU. I HATE YOU. Index: mysql.php =================================================================== RCS file: /cvsroot/cmsforme/CMSformE/includes/db/mysql.php,v retrieving revision 1.29 retrieving revision 1.30 diff -u -d -r1.29 -r1.30 --- mysql.php 5 Aug 2007 15:17:05 -0000 1.29 +++ mysql.php 5 Aug 2007 18:35:28 -0000 1.30 @@ -18,7 +18,7 @@ if( !( defined( 'ROOT' ) ) ) { - include( './../../errors.php' ); + include( './../errors.php' ); viewed_alone(); } |
From: Josh <jel...@us...> - 2007-08-05 18:23:41
|
Update of /cvsroot/cmsforme/CMSformE In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv16432 Modified Files: index.php Log Message: Add a couple of compatibility queries Index: index.php =================================================================== RCS file: /cvsroot/cmsforme/CMSformE/index.php,v retrieving revision 1.64 retrieving revision 1.65 diff -u -d -r1.64 -r1.65 --- index.php 12 Feb 2007 23:51:18 -0000 1.64 +++ index.php 5 Aug 2007 18:23:36 -0000 1.65 @@ -33,10 +33,11 @@ $mode = ( isset( $_REQUEST['mode'] ) ) ? htmlspecialchars( strtolower( $_REQUEST['mode'] ) ) : ''; $news_type = ( isset( $_REQUEST['type'] ) ) ? htmlspecialchars( strtolower( $_REQUEST['type'] ) ) : ''; $poster_id = ( isset( $_REQUEST['u'] ) ) ? (int) $_REQUEST['u'] : 0; +$start = ( isset( $_REQUEST['start'] ) ) ? (int) $_REQUEST['start'] : 0; function display_news( $article_id = '' ) { - global $Database, $Template, $mode, $user, $lang, $post_limit, $page_name, $poster_id, $news_type; + global $Database, $Template, $mode, $user, $lang, $post_limit, $page_name, $poster_id, $news_type, $start; // Limit SQL query if article number is specified if( $article_id != '' ) @@ -71,8 +72,21 @@ WHERE u.user_id = n.user_id AND nt.post_id = n.post_id $post_limit - ORDER BY n.post_time DESC - LIMIT 0,20"; // TODO: LIMIT clause + ORDER BY n.post_time DESC"; + + // todo: config variable for number of articles per page. + switch ( DB_TYPE ) + { + case 'mysql': + case 'mysqli': + $sql .= " LIMIT $start, 25"; + break; + + case 'postgresql': + default: + $sql .= " LIMIT 25 OFFSET $start"; + break; + } if( !( $result = $Database->query( $sql ) ) ) { |
From: Josh <jel...@us...> - 2007-08-05 18:23:39
|
Update of /cvsroot/cmsforme/CMSformE/modules/syndication/files/includes In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv16432/modules/syndication/files/includes Modified Files: syndication.php Log Message: Add a couple of compatibility queries Index: syndication.php =================================================================== RCS file: /cvsroot/cmsforme/CMSformE/modules/syndication/files/includes/syndication.php,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- syndication.php 26 Jun 2005 01:51:57 -0000 1.1 +++ syndication.php 5 Aug 2007 18:23:36 -0000 1.2 @@ -44,10 +44,23 @@ ); $sql = 'SELECT n.*, u.* - FROM ' . DB_NEWS_TABLE . ' n, ' . DB_USERS_TABLE . " u + FROM ' . DB_NEWS_TABLE . ' n, ' . DB_USERS_TABLE . ' u WHERE u.user_id = n.user_id - ORDER BY n.post_time DESC - LIMIT 0,$limit"; + ORDER BY n.post_time DESC' + + switch( DB_TYPE ) + { + case 'mysql': + case 'mysqli': + $sql .= " LIMIT 0, $limit"; + break; + + case 'postgres': + default: + $sql .= " LIMIT $limit OFFSET 0"; + break; + } + if( !( $result = $Database->query( $sql ) ) ) { @@ -119,4 +132,4 @@ } } -?> \ No newline at end of file +?> |
From: Gordon P. H. <gph...@us...> - 2007-08-05 17:42:03
|
Update of /cvsroot/cmsforme/CMSformE/modules/syndication/files In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv1702/modules/syndication/files Modified Files: atom.php Log Message: Atom 1.0 is now implemented. Index: atom.php =================================================================== RCS file: /cvsroot/cmsforme/CMSformE/modules/syndication/files/atom.php,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- atom.php 3 Sep 2005 04:50:59 -0000 1.2 +++ atom.php 5 Aug 2007 17:41:57 -0000 1.3 @@ -2,7 +2,7 @@ /******************************************************************* * Filename: atom.php - * Copyright: (C) 2003-2005 The CMSformE Crew + * Copyright: (C) 2003-2007 The CMSformE Crew * $Id$ ******************************************************************* * This program is free software; you can redistribute it and/or modify @@ -102,32 +102,31 @@ $feed_data = $this->get_feed_data( 20 ); print '<' . '?xml version="1.0" encoding="UTF-8" ?' . ">\n"; - print '<feed xmlns="http://purl.org/atom/ns#" version="0.3" xml:base="' . $feed_data['link'] . '">' . "\n"; - print "\t\t<title type=\"text/plain\">" . $feed_data['title'] . "</title>\n"; - print "\t\t<tagline type=\"text/plain\">" . $feed_data['description'] . "</tagline>\n"; - print "\t\t<modified>" . $this->create_iso8601_datetime( $feed_data['articles'][0]['post_time'] ) . "</modified>\n"; + print '<feed xmlns="http://www.w3.org/2005/Atom">' . "\n"; + print "\t\t<title type=\"text\">" . $feed_data['title'] . "</title>\n"; + print "\t\t<subtitle type=\"text\">" . $feed_data['description'] . "</subtitle>\n"; + print "\t\t<updated>" . $this->create_iso8601_datetime( $feed_data['articles'][0]['post_time'] ) . "</updated>\n"; print "\t\t<id>tag:" . $_SERVER['SERVER_NAME'] . ',' . date( 'Y-m-d', $feed_data['config']['start_date'] ) . ':' . $feed_data['config']['start_date'] . "</id>\n"; + print "\t\t" . '<link rel="self" type="application/atom+xml" href="' . $feed_data['link'] . 'modules.php?id=syndication&file=atom.php&version=1.0" />' . "\n"; print "\t\t" . '<link rel="alternate" type="text/html" href="' . $feed_data['link'] . '" />' . "\n"; - print "\t\t<copyright>" . $feed_data['copyright'] . "</copyright>\n"; + print "\t\t<rights>" . $feed_data['copyright'] . "</rights>\n"; print "\t\t<author>\n"; print "\t\t\t<name>" . $feed_data['admin']['username'] . "</name>\n"; print "\t\t\t<email>" . $feed_data['admin']['user_email'] . "</email>\n"; - print "\t\t\t<url>" . $feed_data['link'] . "</url>\n"; + print "\t\t\t<uri>" . $feed_data['link'] . "</uri>\n"; print "\t\t</author>\n"; print "\t\t<generator>" . $feed_data['generator'] . "</generator>\n"; - print "\t\t<info>http://www.mnot.net/drafts/draft-nottingham-atom-format-02.html</info>\n"; foreach( $feed_data['articles'] as $article_data ) { print "\t\t<entry>\n"; print "\t\t\t<title><![CDATA[" . strip_tags( parse_code( $article_data['post_subject'], 'title', $article_data['ecode_id'] ) ) . "]]></title>\n"; - print "\t\t\t<summary type=\"text/html\" mode=\"escaped\"><![CDATA[" . parse_code( ( ( !( empty( $article_data['post_text_short'] ) ) ) ? $article_data['post_text_short'] : $article_data['post_text'] ), 'article', $article_data['ecode_id'] ) . "]]></summary>\n"; - print "\t\t\t<content type=\"text/html\" mode=\"escaped\"><![CDATA[" . parse_code( $article_data['post_text'], 'article', $article_data['ecode_id'] ) . "]]></content>\n"; + print "\t\t\t<summary type=\"html\"><![CDATA[" . parse_code( ( ( !( empty( $article_data['post_text_short'] ) ) ) ? $article_data['post_text_short'] : $article_data['post_text'] ), 'article', $article_data['ecode_id'] ) . "]]></summary>\n"; + print "\t\t\t<content type=\"html\"><![CDATA[" . parse_code( $article_data['post_text'], 'article', $article_data['ecode_id'] ) . "]]></content>\n"; print "\t\t\t<id>tag:" . $_SERVER['SERVER_NAME'] . ',' . date( 'Y-m-d', $feed_data['config']['start_date'] ) . ':' . $article_data['post_id'] . '.' . $article_data['post_time'] . "</id>\n"; print "\t\t\t" . '<link rel="alternate" type="text/html" href="' . $feed_data['link'] . 'index.php?article=' . $article_data['post_id'] . '&mode=more" />' . "\n"; - print "\t\t\t<created>" . $this->create_iso8601_datetime( $article_data['post_time'] ) . "</created>\n"; - print "\t\t\t<issued>" . $this->create_iso8601_datetime( $article_data['post_time'] ) . "</issued>\n"; - print "\t\t\t<modified>" . $this->create_iso8601_datetime( $article_data['post_time'] ) . "</modified>\n"; + print "\t\t\t<published>" . $this->create_iso8601_datetime( $article_data['post_time'] ) . "</published>\n"; + print "\t\t\t<updated>" . $this->create_iso8601_datetime( $article_data['post_time'] ) . "</updated>\n"; print "\t\t\t<author>\n"; print "\t\t\t\t<name>" . $article_data['username'] . "</name>\n"; @@ -139,7 +138,7 @@ if( $article_data['user_website'] ) { - print "\t\t\t\t<url>" . $article_data['user_website'] . "</url>\n"; + print "\t\t\t\t<uri>" . $article_data['user_website'] . "</uri>\n"; } print "\t\t\t</author>\n"; @@ -157,11 +156,11 @@ switch( $version ) { case '0.3': - default: $Atom->create_atom03_feed(); break; case '1.0': + default: $Atom->create_atom10_feed(); break; } |
From: Josh <jel...@us...> - 2007-08-05 17:08:51
|
Update of /cvsroot/cmsforme/CMSformE/includes In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv21866/includes Modified Files: auth.php Log Message: Removing some "compatibility queries" Index: auth.php =================================================================== RCS file: /cvsroot/cmsforme/CMSformE/includes/auth.php,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- auth.php 1 Mar 2005 00:25:57 -0000 1.14 +++ auth.php 5 Aug 2007 17:08:48 -0000 1.15 @@ -78,7 +78,6 @@ switch( DB_TYPE ) { case 'mysql': - case 'sqlite': case 'mysqli': $sql = 'SELECT auth_value FROM ' . DB_AUTH_TABLE . " @@ -87,26 +86,6 @@ break; case 'postgresql': - $sql = 'SELECT auth_value - FROM ' . DB_AUTH_TABLE . " - WHERE auth_name = '$auth_type' - LIMIT 1 OFFSET 0"; - break; - - case 'mssql': - $sql = 'SELECT TOP 1 auth_value - FROM ' . DB_AUTH_TABLE . " - WHERE auth_name = '$auth_type' - ORDER BY post_time DESC"; - break; - - case 'fbsql': - $sql = 'SELECT FIRST 1 auth_value - FROM ' . DB_AUTH_TABLE . " - WHERE auth_name = '$auth_type' - ORDER BY post_time DESC"; - break; - default: $sql = 'SELECT auth_value FROM ' . DB_AUTH_TABLE . " @@ -140,4 +119,4 @@ } } -?> \ No newline at end of file +?> |
From: Josh <jel...@us...> - 2007-08-05 17:08:50
|
Update of /cvsroot/cmsforme/CMSformE In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv21866 Modified Files: articlecp.php Log Message: Removing some "compatibility queries" Index: articlecp.php =================================================================== RCS file: /cvsroot/cmsforme/CMSformE/articlecp.php,v retrieving revision 1.35 retrieving revision 1.36 diff -u -d -r1.35 -r1.36 --- articlecp.php 12 Feb 2007 23:51:18 -0000 1.35 +++ articlecp.php 5 Aug 2007 17:08:47 -0000 1.36 @@ -347,7 +347,6 @@ { case 'mysql': case 'mysqli': - case 'sqlite': $sql = 'SELECT post_id FROM ' . DB_NEWS_TABLE . " WHERE post_time = '$post_time' @@ -357,24 +356,6 @@ LIMIT 0,1"; break; - case 'mssql': - $sql = 'SELECT TOP 1 post_id - FROM ' . DB_NEWS_TABLE . " - WHERE post_time = '$post_time' - AND post_subject = '$post_subject' - AND post_text_short = '$post_text_short' - ORDER BY post_time DESC"; - break; - - case 'fbsql': - $sql = 'SELECT FIRST 1 post_id - FROM ' . DB_NEWS_TABLE . " - WHERE post_time = '$post_time' - AND post_subject = '$post_subject' - AND post_text_short = '$post_text_short' - ORDER BY post_time DESC"; - break; - case 'postgresql': default: $sql = 'SELECT post_id @@ -533,7 +514,6 @@ { case 'mysql': case 'mysqli': - case 'sqlite': $sql = 'SELECT c.*, n.post_id, n.post_subject, n.allow_ecode AS a_allow_ecode, n.ecode_id as a_ecode_id, u.username FROM ' . DB_COMMENTS_TABLE . ' c, ' . DB_NEWS_TABLE . ' n, ' . DB_USERS_TABLE . ' u WHERE u.user_id = c.user_id @@ -542,22 +522,6 @@ LIMIT 0,25'; break; - case 'mssql': - $sql = 'SELECT TOP 25 c.*, n.post_id, n.post_subject, n.allow_ecode AS a_allow_ecode, n.ecode_id as a_ecode_id, u.username - FROM ' . DB_COMMENTS_TABLE . ' c, ' . DB_NEWS_TABLE . ' n, ' . DB_USERS_TABLE . ' u - WHERE u.user_id = c.user_id - AND n.post_id = c.post_id - ORDER BY c.comment_time DESC'; - break; - - case 'fbsql': - $sql = 'SELECT FIRST 25 c.*, n.post_id, n.post_subject, n.allow_ecode AS a_allow_ecode, n.ecode_id as a_ecode_id, u.username - FROM ' . DB_COMMENTS_TABLE . ' c, ' . DB_NEWS_TABLE . ' n, ' . DB_USERS_TABLE . ' u - WHERE u.user_id = c.user_id - AND n.post_id = c.post_id - ORDER BY c.comment_time DESC'; - break; - case 'postgresql': default: $sql = 'SELECT c.*, n.post_id, n.post_subject, n.allow_ecode AS a_allow_ecode, n.ecode_id as a_ecode_id, u.username @@ -714,7 +678,6 @@ { case 'mysql': case 'mysqli': - case 'sqlite': $sql = 'SELECT n.*, u.username, u.user_id FROM ' . DB_NEWS_TABLE . ' n, ' . DB_USERS_TABLE . ' u WHERE u.user_id = n.user_id @@ -722,20 +685,6 @@ LIMIT 0,25'; break; - case 'mssql': - $sql = 'SELECT TOP 25 n.*, u.username, u.user_id - FROM ' . DB_NEWS_TABLE . ' n, ' . DB_USERS_TABLE . ' u - WHERE u.user_id = n.user_id - ORDER BY n.post_time DESC'; - break; - - case 'fbsql': - $sql = 'SELECT FIRST 25 n.*, u.username, u.user_id - FROM ' . DB_NEWS_TABLE . ' n, ' . DB_USERS_TABLE . ' u - WHERE u.user_id = n.user_id - ORDER BY n.post_time DESC'; - break; - case 'postgresql': default: $sql = 'SELECT n.*, u.username, u.user_id |
From: Gordon P. H. <gph...@us...> - 2007-08-05 15:39:14
|
Update of /cvsroot/cmsforme/CMSformE/includes In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv20545/includes Modified Files: ecode.php Log Message: Fix an eCode bug or two. (Paramaters now work.) Index: ecode.php =================================================================== RCS file: /cvsroot/cmsforme/CMSformE/includes/ecode.php,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- ecode.php 18 Jan 2007 00:54:13 -0000 1.9 +++ ecode.php 5 Aug 2007 15:39:11 -0000 1.10 @@ -2,7 +2,7 @@ /******************************************************************* * Filename: includes/ecode.php - * Copyright: © 2003-2006 CMSformE + * Copyright: (C) 2003-2007 CMSformE * $Id$ ******************************************************************* * This program is free software; you can redistribute it and/or modify @@ -40,7 +40,7 @@ return $message; } - $message = preg_replace( '#\[(\w+?)\]#i', "[$1:$code_id]", $message ); + $message = preg_replace( '#\[(\w+?)(=\w+)?\]#i', "[$1$2:$code_id]", $message ); $message = preg_replace( '#\[/([\w: ]+?)\]#i', "[/$1:$code_id]", $message ); // Bug 0003: This doesn't work when there is an attribute... @@ -78,7 +78,7 @@ $message = nl2br( $message ); // Stop here if no eCode used, or it is disabled in configuration - if( ( strpos( $message, '[' ) || strpos( $message, ']' ) || strpos( $message, '/' ) ) === FALSE || !( $config['enable_ecode'] ) ) + if( !( $config['enable_ecode'] ) || ( strpos( $message, '[' ) || strpos( $message, ']' ) || strpos( $message, '/' ) ) === FALSE ) { return $message; } @@ -94,8 +94,8 @@ // this code removes any eCode within [code] eCode $code_str = substr( $message, $code_start_pos, ( $code_stop_pos - 14 ) ); - $code_str = str_replace( '[', '[', $code_str ); - $code_str = str_replace( ']', ']', $code_str ); + $code_str = str_replace( '[', '[', $code_str ); + $code_str = str_replace( ']', ']', $code_str ); $message = substr_replace( $message, $code_str, $code_start_pos, ( $code_stop_pos - $code_start_pos ) ); $message = preg_replace( "#\[code:$uid\](.+?)\[\/code:$uid\]#si", '<div class="code">$1</div>', $message ); @@ -244,8 +244,10 @@ return; } - $sql = 'SELECT * FROM ' . DB_ECODE_TABLE . ' + $sql = 'SELECT * + FROM ' . DB_ECODE_TABLE . ' WHERE ecode_enabled = 1'; + if( !( $result = $Database->query( $sql ) ) ) { include( ROOT . 'includes/errors.php' ); |
From: Gordon P. H. <gph...@us...> - 2007-08-05 15:17:11
|
Update of /cvsroot/cmsforme/CMSformE/includes/db In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv12183/includes/db Modified Files: mysql.php Log Message: Forwardport bug fix and new error reporting features. Index: mysql.php =================================================================== RCS file: /cvsroot/cmsforme/CMSformE/includes/db/mysql.php,v retrieving revision 1.28 retrieving revision 1.29 diff -u -d -r1.28 -r1.29 --- mysql.php 13 Jun 2005 20:20:47 -0000 1.28 +++ mysql.php 5 Aug 2007 15:17:05 -0000 1.29 @@ -2,7 +2,7 @@ /******************************************************************* * Filename: includes/db/mysql.php - * Copyright: © 2003-2005 CMSformE + * Copyright: (C) 2003-2007 CMSformE * $Id$ ******************************************************************* * This program is free software; you can redistribute it and/or modify @@ -18,7 +18,7 @@ if( !( defined( 'ROOT' ) ) ) { - include( '../../errors.php' ); + include( './../../errors.php' ); viewed_alone(); } @@ -30,6 +30,7 @@ { var $ident_link, $connected, $result; var $query_count = 0; + var $errors = array(); // Get verbose name of database function verbose_name() @@ -137,13 +138,20 @@ { if( !( empty( $query ) ) ) { + $result = @mysql_query( $query, $db ); + if( count( $queries ) > 1 ) { - $this->result[] = @mysql_query( $query, $db ); + $this->result[] = $result; } else { - $this->result = @mysql_query( $query, $db ); + $this->result = $result; + } + + if( !( $result ) ) + { + $this->error(); } $this->query_count++; @@ -256,22 +264,28 @@ // Free up memory function free_result() { - global $result; - - // This isn't complete...we should also empty $row (IMO) - @mysql_free_result( $this->result ); - - unset( $result ); + return @mysql_free_result( $this->result ); } // Report errors - function error( $query = FALSE ) + function error( $all_errors = FALSE, $query_number = FALSE ) { - $result['code'] = @mysql_errno( $this->ident_link ); - $result['message'] = @mysql_error( $this->ident_link ); + $this->errors[$this->query_count]['code'] = @mysql_errno( $this->ident_link ); + $this->errors[$this->query_count]['message'] = @mysql_error( $this->ident_link ); - return $result; + if( $all_errors ) + { + return $this->errors; + } + elseif( $query_number ) + { + return $this->errors[$query_number]; + } + else + { + return $this->errors[$this->query_count]; + } } } -?> +?> \ No newline at end of file |
From: Gordon P. H. <gph...@us...> - 2007-08-01 02:50:23
|
Update of /cvsroot/cmsforme/CMSformE/install/mysql In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv17499/install/mysql Modified Files: Tag: branch_v0-0 data.sql Log Message: Let's get this show on the road. Index: data.sql =================================================================== RCS file: /cvsroot/cmsforme/CMSformE/install/mysql/data.sql,v retrieving revision 1.34.2.3 retrieving revision 1.34.2.4 diff -u -d -r1.34.2.3 -r1.34.2.4 --- data.sql 13 Jul 2007 00:01:07 -0000 1.34.2.3 +++ data.sql 1 Aug 2007 02:50:18 -0000 1.34.2.4 @@ -17,7 +17,7 @@ ## Config Inserts ## INSERT INTO cmsforme_config (config_name, config_value) VALUES ('version', '0.0.5'); -INSERT INTO cmsforme_config (config_name, config_value) VALUES ('revision', '6'); +INSERT INTO cmsforme_config (config_name, config_value) VALUES ('revision', '7'); INSERT INTO cmsforme_config (config_name, config_value) VALUES ('start_date', '1234567890'); INSERT INTO cmsforme_config (config_name, config_value) VALUES ('default_date_format', 'l, F j, Y g:iA'); INSERT INTO cmsforme_config (config_name, config_value) VALUES ('default_timezone', '0.00'); |
From: Gordon P. H. <gph...@us...> - 2007-08-01 02:49:44
|
Update of /cvsroot/cmsforme/CMSformE/documents In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv17043/documents Modified Files: Tag: branch_v0-0 Changelog.txt Log Message: Let's get this show on the road. Index: Changelog.txt =================================================================== RCS file: /cvsroot/cmsforme/CMSformE/documents/Changelog.txt,v retrieving revision 1.104.2.6 retrieving revision 1.104.2.7 diff -u -d -r1.104.2.6 -r1.104.2.7 --- Changelog.txt 31 Jul 2007 19:45:29 -0000 1.104.2.6 +++ Changelog.txt 1 Aug 2007 02:49:41 -0000 1.104.2.7 @@ -21,6 +21,9 @@ //////////////////////////////////////////////////////////////////// 2007-07-31 - Version 0.0.5, Revision 7 - GPHemsley + + Version 0.0.5 released! + + 2007-07-31 - Version 0.0.5, Revision 7 - GPHemsley + Updated and cleaned up install/upgrade.php. + Fixed result array bug in and added more error-retrieving features to includes/db/mysql.php. |