Menu
▾
▴
phpwebsite-comm-cvs-commits — Read-Only CVS commits log list
You can subscribe to this list here.
| 2003 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(120) |
Jun
(74) |
Jul
(97) |
Aug
(35) |
Sep
(35) |
Oct
(34) |
Nov
|
Dec
(6) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2004 |
Jan
(18) |
Feb
(8) |
Mar
(7) |
Apr
(23) |
May
(28) |
Jun
(31) |
Jul
(27) |
Aug
(34) |
Sep
(48) |
Oct
(511) |
Nov
(197) |
Dec
(333) |
| 2005 |
Jan
(212) |
Feb
(33) |
Mar
(94) |
Apr
(51) |
May
(16) |
Jun
|
Jul
(200) |
Aug
(43) |
Sep
(88) |
Oct
(60) |
Nov
(62) |
Dec
(41) |
| 2006 |
Jan
(94) |
Feb
(49) |
Mar
(54) |
Apr
|
May
(39) |
Jun
(39) |
Jul
(61) |
Aug
(36) |
Sep
(23) |
Oct
(76) |
Nov
(73) |
Dec
(32) |
| 2007 |
Jan
|
Feb
(87) |
Mar
|
Apr
(8) |
May
(36) |
Jun
(49) |
Jul
(54) |
Aug
(8) |
Sep
(50) |
Oct
(36) |
Nov
|
Dec
(3) |
| 2008 |
Jan
(133) |
Feb
(54) |
Mar
(39) |
Apr
(2) |
May
(6) |
Jun
(74) |
Jul
(97) |
Aug
(70) |
Sep
(12) |
Oct
(20) |
Nov
(64) |
Dec
(24) |
| 2009 |
Jan
(25) |
Feb
(49) |
Mar
(18) |
Apr
|
May
|
Jun
(3) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2011 |
Jan
(10) |
Feb
|
Mar
|
Apr
|
May
|
Jun
(7) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Mike N. <mh...@us...> - 2004-09-11 00:13:25
|
Update of /cvsroot/phpwebsite-comm/CVSROOT In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31543 Modified Files: avail Log Message: gave Thomas Luft write access to modules/joboffers Index: avail =================================================================== RCS file: /cvsroot/phpwebsite-comm/CVSROOT/avail,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** avail 24 Aug 2004 03:55:02 -0000 1.26 --- avail 10 Sep 2004 20:46:01 -0000 1.27 *************** *** 8,11 **** --- 8,12 ---- avail|blindman1344|modules/featuredphoto avail|gbrackett, wendall911|modules/jobman + avail|tluft|modules/joboffers avail|cl00bie|modules/mailto avail|cl00bie|modules/quotes |
|
From: Mike N. <mh...@us...> - 2004-09-10 21:46:15
|
Update of /cvsroot/phpwebsite-comm/CVSROOT In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4835 Modified Files: avail Log Message: minor change Index: avail =================================================================== RCS file: /cvsroot/phpwebsite-comm/CVSROOT/avail,v retrieving revision 1.28 retrieving revision 1.29 diff -C2 -d -r1.28 -r1.29 *** avail 10 Sep 2004 21:03:28 -0000 1.28 --- avail 10 Sep 2004 21:06:14 -0000 1.29 *************** *** 26,31 **** # Global access for all project members ! avail||documents/howto ! avail||documents/guide # Complete repository access for project admins --- 26,30 ---- # Global access for all project members ! avail||documents # Complete repository access for project admins |
|
From: Mike N. <mh...@us...> - 2004-09-10 21:40:18
|
Update of /cvsroot/phpwebsite-comm/CVSROOT In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4269 Modified Files: avail Log Message: minor change Index: avail =================================================================== RCS file: /cvsroot/phpwebsite-comm/CVSROOT/avail,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** avail 10 Sep 2004 20:46:01 -0000 1.27 --- avail 10 Sep 2004 21:03:28 -0000 1.28 *************** *** 27,30 **** --- 27,31 ---- # Global access for all project members avail||documents/howto + avail||documents/guide # Complete repository access for project admins |
|
From: David <neo...@us...> - 2004-08-24 16:52:55
|
Update of /cvsroot/phpwebsite-comm/themes/blogged/templates/controlpanel/grid In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3145/templates/controlpanel/grid Modified Files: grid.tpl Log Message: Index: grid.tpl =================================================================== RCS file: /cvsroot/phpwebsite-comm/themes/blogged/templates/controlpanel/grid/grid.tpl,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** grid.tpl 24 Aug 2004 03:47:24 -0000 1.1.1.1 --- grid.tpl 24 Aug 2004 16:52:11 -0000 1.2 *************** *** 1,3 **** ! <table cellpadding="5" cellspacing="0" width="100%" border="0"> {ROWS} </table> --- 1,3 ---- ! <table cellpadding="4" cellspacing="0" width="100%" border="0"> {ROWS} </table> |
|
From: David <neo...@us...> - 2004-08-24 16:52:52
|
Update of /cvsroot/phpwebsite-comm/themes/blogged/templates/controlpanel In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3145/templates/controlpanel Modified Files: panel.tpl Log Message: Index: panel.tpl =================================================================== RCS file: /cvsroot/phpwebsite-comm/themes/blogged/templates/controlpanel/panel.tpl,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** panel.tpl 24 Aug 2004 03:47:24 -0000 1.1.1.1 --- panel.tpl 24 Aug 2004 16:52:09 -0000 1.2 *************** *** 4,8 **** </tr> </table> ! <table border="0" width="100%" cellpadding="8" cellspacing="0"> <tr><td class="bg_dark"> <table border="0" width="100%" cellpadding="0" cellspacing="0"> --- 4,8 ---- </tr> </table> ! <table border="0" width="100%" cellpadding="4" cellspacing="0"> <tr><td class="bg_dark"> <table border="0" width="100%" cellpadding="0" cellspacing="0"> |
|
From: David <neo...@us...> - 2004-08-24 16:52:51
|
Update of /cvsroot/phpwebsite-comm/themes/blogged/boxstyles In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3145/boxstyles Modified Files: default_box.tpl default_pop.tpl Log Message: Index: default_box.tpl =================================================================== RCS file: /cvsroot/phpwebsite-comm/themes/blogged/boxstyles/default_box.tpl,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** default_box.tpl 24 Aug 2004 03:47:24 -0000 1.1.1.1 --- default_box.tpl 24 Aug 2004 16:52:08 -0000 1.2 *************** *** 1,8 **** <!-- BEGIN TITLE --> ! <div id="bheader">{TITLE}</div> <!-- END TITLE --> <!-- BEGIN CONTENT --> ! <div id="bcontent">{CONTENT}</div> ! <br /> ! <hr /> <!-- END CONTENT --> --- 1,6 ---- <!-- BEGIN TITLE --> ! <div class="bheader">{TITLE}</div> <!-- END TITLE --> <!-- BEGIN CONTENT --> ! <div class="bcontent">{CONTENT}</div> <!-- END CONTENT --> Index: default_pop.tpl =================================================================== RCS file: /cvsroot/phpwebsite-comm/themes/blogged/boxstyles/default_pop.tpl,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** default_pop.tpl 24 Aug 2004 03:47:24 -0000 1.1.1.1 --- default_pop.tpl 24 Aug 2004 16:52:08 -0000 1.2 *************** *** 1,9 **** <!-- BEGIN TITLE --> ! <div id="bheader">{TITLE}</div> <!-- END TITLE --> <!-- BEGIN CONTENT --> ! <div id="bcontent">{CONTENT}</div> ! <br /> ! <hr /> <!-- END CONTENT --> --- 1,7 ---- <!-- BEGIN TITLE --> ! <div class="bheader">{TITLE}</div> <!-- END TITLE --> <!-- BEGIN CONTENT --> ! <div class="bcontent">{CONTENT}</div> <!-- END CONTENT --> |
|
From: David <neo...@us...> - 2004-08-24 16:52:49
|
Update of /cvsroot/phpwebsite-comm/themes/blogged In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3145 Modified Files: readme style.css theme.php theme.tpl Log Message: Index: theme.tpl =================================================================== RCS file: /cvsroot/phpwebsite-comm/themes/blogged/theme.tpl,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** theme.tpl 24 Aug 2004 03:47:12 -0000 1.1.1.1 --- theme.tpl 24 Aug 2004 16:51:50 -0000 1.2 *************** *** 11,23 **** <div id="layout"> - <!-- HEADER TABLE - Replace /images/logo.png with your own. --> <div id="header"> ! </div> <div id="hbar"> ! <div id="subh">Your Community To GNU/Linux & Opensource</div> ! <div id="date">{DATE}</div> </div> <!-- END HEADER TABLE --> <!-- BEGIN LEFT COLUMN --> <div id="lcolumn"> --- 11,23 ---- <div id="layout"> <div id="header"> ! <!-- REPLACE logo.gif with your own logo and ! adjust header pixel height in style.css --> </div> <div id="hbar"> ! <div id="subh">Your Community Portal To GNU/Linux & Open source</div> </div> <!-- END HEADER TABLE --> + <!-- BEGIN LEFT COLUMN --> <div id="lcolumn"> *************** *** 29,32 **** --- 29,33 ---- <!-- BEGIN RIGHT COLUMN --> <div id="rcolumn"> + <div id="rheader">{DATE}</div> {RIGHT_COL_TOP} {RIGHT_COL_MID} *************** *** 34,38 **** </div> <!-- END RIGHT COLUMN --> - <!-- BEGIN CENTER COLUMN --> <div id="content"> --- 35,38 ---- *************** *** 42,56 **** </div> <!-- END CENTER COLUMN --> - <!-- END TABLE LAYOUT --> - </div> - <!-- BEGIN FOOTER --> <div id="footer"> Linux® is a registered trademark of Linus Torvalds.<br /> ! All other trademarks and copyrights are the property of their respective owners. Comments are owned by the poster.<br />Copyright © Linux Portal 2002 - 2004<br /> ! All Rights Reserved<br /> </div> - <!-- END FOOTER --> </div> </body> </html> --- 42,53 ---- </div> <!-- END CENTER COLUMN --> <!-- END TABLE LAYOUT --> <div id="footer"> Linux® is a registered trademark of Linus Torvalds.<br /> ! Copyright © Linux Portal 2002 - 2004<br />All Rights Reserved<br /> ! All other trademarks and copyrights are the property of their respective owners. Comments are owned by the poster.<br /> </div> </div> + </body> </html> Index: theme.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/themes/blogged/theme.php,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** theme.php 24 Aug 2004 03:47:12 -0000 1.1.1.1 --- theme.php 24 Aug 2004 16:51:50 -0000 1.2 *************** *** 9,12 **** // Uncomment this line then look at the bottom of your Default theme page."; ! $THEME['DATE'] = date('l, F d, Y h:i'); ?> \ No newline at end of file --- 9,12 ---- // Uncomment this line then look at the bottom of your Default theme page."; ! $THEME['DATE'] = date('l F d, Y'); ?> \ No newline at end of file Index: readme =================================================================== RCS file: /cvsroot/phpwebsite-comm/themes/blogged/readme,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 Binary files /tmp/cvseM22L9 and /tmp/cvsR2WzpM differ Index: style.css =================================================================== RCS file: /cvsroot/phpwebsite-comm/themes/blogged/style.css,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** style.css 24 Aug 2004 03:47:12 -0000 1.1.1.1 --- style.css 24 Aug 2004 16:51:50 -0000 1.2 *************** *** 1,37 **** /**Module specific color styles*/ .white { background: white; } - .black { background: black; } - .bg_dark { color: #000000; background: #7c7984; } - .bg_medium { background: #bcbcbc; } - .bg_light { background: #cccccc; } ! ! .alt_bg_dark { color : #000000; background: #3200ff;} ! .alt_bg_medium { background-color: #7c7984; } ! ! .alt_bg_light { background-color: #cccccc;} /**standard styles for modules*/ ! .smalltext { font-size: .9em;} ! body { font: .9em verdana, "myriad web", serif, sans-serif; color: #000000; background: #2C4265; /* DO NOT REMOVE THIS -> */ text-align: center;} ! ! /* Column Layout Style. Warning - Do Not Modify These Unless You Know Your CSS!!! */ /* Sets Initial Table Layout For Nested Columns */ div#layout { ! width: 95%; ! margin: 10px auto; background-color: #cccccc; color: #000000; border: 1px solid black; line-height: 130%; ! text-align: left; } ! /* Header Table */ #header { padding: .5em; --- 1,38 ---- /**Module specific color styles*/ .white { background: white; } .black { background: black; } .bg_dark { color: #000000; background: #7c7984; } .bg_medium { background: #bcbcbc; } .bg_light { background: #cccccc; } ! .alt_bg_dark { color : #000000; background: #3200ff; } .alt_bg_medium { background-color: #7c7984; } ! .alt_bg_light { background-color: #cccccc; } /**standard styles for modules*/ ! .smalltext { font-size: .9em; } ! body { ! font: normal normal normal medium serif; ! color: #000000; ! background: #2C4265; ! margin: 0; ! padding: 0; ! /* DO NOT REMOVE THIS -> */ text-align: center; ! } ! ! /* Column Layout Style. ! Warning - Do Not Modify These Unless You Know Your CSS!!! */ /* Sets Initial Table Layout For Nested Columns */ div#layout { ! width: 98%; ! margin: 16px auto; background-color: #cccccc; color: #000000; border: 1px solid black; line-height: 130%; ! text-align: left; } /* DO NOT REMOVE THIS -> */ ! /* Header Table - Change height: to the height of your logo. */ #header { padding: .5em; *************** *** 43,47 **** #header h1 { padding: 0; margin: 0; } ! /* Sub Header Table */ #hbar { padding: .2em; --- 44,48 ---- #header h1 { padding: 0; margin: 0; } ! /* Sub Header Bar */ #hbar { padding: .2em; *************** *** 49,54 **** border-top: 1px solid black; border-bottom: 1px solid black; ! font: .9em verdana, serif, sans-serif; color: #000066; ! } /* Left Column Layout */ --- 50,54 ---- border-top: 1px solid black; border-bottom: 1px solid black; ! font: bold .9em verdana, serif, sans-serif; color: #000066; } /* Left Column Layout */ *************** *** 58,63 **** margin: 0; padding: .3em; ! /*border-right: 1px solid black; */ ! background: #cccccc;} /* Right Column Layout */ --- 58,69 ---- margin: 0; padding: .3em; ! background: #cccccc; } ! ! /*Date Block */ ! #rheader { ! font: 0.8em verdana, sans-serif; ! text-align:left; ! padding: 4px; ! border: 1px dotted black; } /* Right Column Layout */ *************** *** 67,71 **** margin: 0; padding: .3em; ! background: #cccccc;} #lcolumn p, #rcolumn p { margin: 0 0 1em 0; } --- 73,77 ---- margin: 0; padding: .3em; ! background: #cccccc; } #lcolumn p, #rcolumn p { margin: 0 0 1em 0; } *************** *** 76,126 **** border-left: 1px solid black; margin-right: 17%; ! padding: .4em; border-right: 1px dotted black; background: #ffffff; } - #content h2 { margin: 0 0 .5em 0; } ! #content2 { max-width: 38em; } ! ! /* Default Box Header */ ! #bheader { ! font: bold 1em verdana, helvetica, sans-serif; ! color: #000000; ! border-bottom: 1px solid grey; } ! /* Default Box Content */ ! #bcontent { ! font: .9em verdana, helvetica, sans-serif; ! color: #666666; } ! ! #subh { ! width: 50%; ! float: left; ! } ! #date { ! width: 50%; ! margin-left: 50%; ! text-align:right;} ! /* Footer Layout -- Currently Broken */ #footer { clear: both; margin: 0; ! padding: 1em; ! color: #333; ! background-color: #ddd; } /* Standard Formating */ ! ! a { text-decoration: none; font-size: .9em; } ! a:link { color: #000033; } - a:visited { color: #000099; } - a:active { color: #F30; } - a:hover { font-weight: bold; color: #F30; } - a:link, a:visited, a:active { font-weight: bold;} --- 82,115 ---- border-left: 1px solid black; margin-right: 17%; ! padding: .3em; border-right: 1px dotted black; background: #ffffff; } #content h2 { margin: 0 0 .5em 0; } ! #content2 { max-width: 36em; } ! /* Default Box Header and Content */ ! .bheader {font-weight: bold;color: #000000; } ! .bcontent { ! font: normal .9em verdana, helvetica, sans-serif; ! padding: 0 0 10px 0; ! border-bottom: 1px solid black; } ! /* Footer Layout -- */ #footer { + font-style: italic; + color: #c000066; clear: both; margin: 0; ! padding: .5em; ! background-color: #cccccc; ! border-top: 1px solid black; ! text-align: center; } /* Standard Formating */ ! a { text-decoration: none; } a:link { color: #000033; } a:visited { color: #000099; } a:active { color: #F30; } a:hover { font-weight: bold; color: #F30; } a:link, a:visited, a:active { font-weight: bold;} *************** *** 130,153 **** h1 { font-size: 1.6em; font-weight: 600; } - h2 { font-size: 1.4em; font-weight: 400; } - h3 { font-size: 1.38em; font-weight: 500; } - h4 { font-size: 1.33em; font-weight: 600; } - h5, dt { font-size: 1.17em; font-weight: 600; } - h6 { font-size: 1em; font-weight: 700; } - HR { color: #000066; background: #000066; border: 0; height: 1px; } img { border: none; } ! /*Changes submit icons. */ ! .input { ! border: 1px solid #000000; ! font-size: 0.8em; ! background-color: #cccccc; } ! \ No newline at end of file --- 119,132 ---- h1 { font-size: 1.6em; font-weight: 600; } h2 { font-size: 1.4em; font-weight: 400; } h3 { font-size: 1.38em; font-weight: 500; } h4 { font-size: 1.33em; font-weight: 600; } h5, dt { font-size: 1.17em; font-weight: 600; } h6 { font-size: 1em; font-weight: 700; } HR { color: #000066; background: #000066; border: 0; height: 1px; } img { border: none; } ! .input { border: 1px solid #000000; font-size: 0.8em; } ! |
|
From: Mike N. <mh...@us...> - 2004-08-24 03:55:15
|
Update of /cvsroot/phpwebsite-comm/CVSROOT In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1716 Modified Files: avail Log Message: gave neoamphian wite access to themes/blogged Index: avail =================================================================== RCS file: /cvsroot/phpwebsite-comm/CVSROOT/avail,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** avail 17 Aug 2004 18:34:32 -0000 1.25 --- avail 24 Aug 2004 03:55:02 -0000 1.26 *************** *** 16,19 **** --- 16,20 ---- avail|gbrackett|modules/uplink + avail|neoamphian|themes/blogged avail|spiggy|themes/graves avail|spiggy|themes/jungle |
|
From: Eloi G. <ada...@us...> - 2004-08-21 17:38:58
|
Update of /cvsroot/phpwebsite-comm/modules/article/conf In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8062/conf Modified Files: boost.php Log Message: 2.6 Release Files Index: boost.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/article/conf/boost.php,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** boost.php 21 Aug 2004 17:02:10 -0000 1.12 --- boost.php 21 Aug 2004 17:38:17 -0000 1.13 *************** *** 19,23 **** $admin_mod = 1; $active = 'on'; ! $version = '2.5'; $mod_class_files = array('ArticleManager.php', --- 19,23 ---- $admin_mod = 1; $active = 'on'; ! $version = '2.6'; $mod_class_files = array('ArticleManager.php', |
|
From: Eloi G. <ada...@us...> - 2004-08-21 17:38:58
|
Update of /cvsroot/phpwebsite-comm/modules/article/class In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8062/class Modified Files: Article.php ArticleManager.php Log Message: 2.6 Release Files Index: Article.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/article/class/Article.php,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** Article.php 21 Aug 2004 17:02:08 -0000 1.19 --- Article.php 21 Aug 2004 17:38:16 -0000 1.20 *************** *** 45,48 **** --- 45,50 ---- * @param string meta_robots : Search Engine instructions for this page's metatags * @param string oldversion : Serialized copy of this article for archiving + * @param string language : 2-character code of the language that this article is written in + * @param int translation_group : All articles that are translations of each other carry the same id * */ *************** *** 82,85 **** --- 84,89 ---- var $meta_robots; var $oldversion; + var $language; + var $translation_group; /** *************** *** 102,112 **** /* If this is to be an existing article... */ ! if(substr($id,0,3)=='arc') ! { ! echo 'archive '.substr($id,4).'requested'; ! exit; ! } ! /* If this is to be an existing article... */ ! elseif($id) { /* If this is a regular (full) article, load all variables into $data */ --- 106,110 ---- /* If this is to be an existing article... */ ! if($id) { /* If this is a regular (full) article, load all variables into $data */ *************** *** 153,156 **** --- 151,156 ---- $this->meta_keywords = $data['meta_keywords']; $this->meta_robots = $data['meta_robots']; + $this->$language = $data['language']; + $this->$translation_group = $id; } // otherwise this is a new article. Load Default values. *************** *** 186,192 **** --- 186,195 ---- $this->pages = 1; $this->template = $_SESSION['SES_ART_master']->val['default_article_template']; + $this->approved = (!$_SESSION['SES_ART_master']->val['need_approval'] || $_SESSION['OBJ_user']->allow_access('approval')) ?1:0; $this->version = -1; $this->announce = 1; $this->meta_keywords = $this->meta_robots = ''; + $this->$language = $_SESSION['translate']->current_language; + $this->$translation_group = $data['translation_group']; } } *************** *** 238,242 **** $article_tags['SUMMARYTEXT'] = PHPWS_Text::parseOutput($this->summary); if(!$this->approved) ! $article_tags['SUMMARYTEXT'] .= '<br />'.$_SESSION['translate']->it('<b>NOTE:</b> This [var1] is awaiting approval. Visitors cannot see it', $_SESSION['translate']->it('article')); $article_tags['HITS'] = $this->hits; $article_tags['CREATED_DATE'] = date(PHPWS_DATE_FORMAT . ' ' . PHPWS_TIME_FORMAT, (strtotime($this->created_date)+$GLOBALS['core']->datetime->time_dif)); --- 241,245 ---- $article_tags['SUMMARYTEXT'] = PHPWS_Text::parseOutput($this->summary); if(!$this->approved) ! $article_tags['SUMMARYTEXT'] .= '<br /><span class="errortext">'.$_SESSION['translate']->it('<b>NOTE:</b> This [var1] is awaiting approval. Visitors cannot see it.', $_SESSION['translate']->it('article')).'</span>'; $article_tags['HITS'] = $this->hits; $article_tags['CREATED_DATE'] = date(PHPWS_DATE_FORMAT . ' ' . PHPWS_TIME_FORMAT, (strtotime($this->created_date)+$GLOBALS['core']->datetime->time_dif)); Index: ArticleManager.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/article/class/ArticleManager.php,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** ArticleManager.php 21 Aug 2004 17:02:08 -0000 1.13 --- ArticleManager.php 21 Aug 2004 17:38:16 -0000 1.14 *************** *** 491,495 **** { $now = date("Y-m-d H:i:s"); ! return "approved AND publication_date<='$now' AND (expiration_date IS NULL OR expiration_date>'$now')"; } --- 491,495 ---- { $now = date("Y-m-d H:i:s"); ! return '(approved OR updated_username="'.$_SESSION['OBJ_user']->username.'") AND publication_date<="'.$now.'" AND (expiration_date IS NULL OR expiration_date>"'.$now.'")'; } |
|
From: Eloi G. <ada...@us...> - 2004-08-21 17:38:56
|
Update of /cvsroot/phpwebsite-comm/modules/article/boost In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8062/boost Modified Files: install.php uninstall.php update.php Log Message: 2.6 Release Files Index: uninstall.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/article/boost/uninstall.php,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** uninstall.php 21 Aug 2004 17:02:06 -0000 1.4 --- uninstall.php 21 Aug 2004 17:37:46 -0000 1.5 *************** *** 16,21 **** $content .= "All tables successfully removed.<br />"; ! $content .= "Removing images directory ".PHPWS_HOME_DIR."images/article<br />"; ! system("rm -rf " . PHPWS_HOME_DIR . "images/article", $temp); /* Unregister from Help */ --- 16,21 ---- $content .= "All tables successfully removed.<br />"; ! $content .= "Removing images directory ".$GLOBALS['core']->home_dir."images/article<br />"; ! system("rm -rf " . $GLOBALS['core']->home_dir . "images/article", $temp); /* Unregister from Help */ Index: install.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/article/boost/install.php,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** install.php 18 Jun 2004 23:30:28 -0000 1.5 --- install.php 21 Aug 2004 17:37:46 -0000 1.6 *************** *** 43,47 **** function makedir ($dir) { ! $dirname = PHPWS_HOME_DIR . $dir; if (is_dir($dirname)) { --- 43,47 ---- function makedir ($dir) { ! $dirname = $GLOBALS['core']->home_dir . $dir; if (is_dir($dirname)) { Index: update.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/article/boost/update.php,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** update.php 21 Aug 2004 17:02:06 -0000 1.8 --- update.php 21 Aug 2004 17:37:46 -0000 1.9 *************** *** 98,104 **** $oldname = "themes/$theme/templates/article/section/".$file; $newname = "themes/$theme/templates/article/section/".str_replace(' ','_',$file); ! if (!file_exists(PHPWS_HOME_DIR . $oldname)) return; ! if (rename(PHPWS_HOME_DIR.$oldname, PHPWS_HOME_DIR.$newname)) return $file.' was Renamed.<br />'; else --- 98,104 ---- $oldname = "themes/$theme/templates/article/section/".$file; $newname = "themes/$theme/templates/article/section/".str_replace(' ','_',$file); ! if (!file_exists($GLOBALS['core']->home_dir . $oldname)) return; ! if (rename($GLOBALS['core']->home_dir.$oldname, $GLOBALS['core']->home_dir.$newname)) return $file.' was Renamed.<br />'; else *************** *** 300,308 **** $content .= 'Re-registering with the Search Module....Done.<br />'; require_once(PHPWS_SOURCE_DIR.'mod/search/class/Search.php'); - PHPWS_Search::register('article'); $content .= 'Update Complete!'; } - - $_SESSION['OBJ_help']->uninstall_help('article'); - $_SESSION['OBJ_help']->setup_help('article'); ?> \ No newline at end of file --- 300,304 ---- |
|
From: Eloi G. <ada...@us...> - 2004-08-21 17:38:37
|
Update of /cvsroot/phpwebsite-comm/modules/article/lang In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8062/lang Modified Files: article.en.lng Log Message: 2.6 Release Files Index: article.en.lng =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/article/lang/article.en.lng,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** article.en.lng 21 Aug 2004 17:02:15 -0000 1.8 --- article.en.lng 21 Aug 2004 17:38:21 -0000 1.9 *************** *** 1,5 **** en:|:article a:|: Starting With `[var1]`:|: Starting With `[var1]` ! a:|:<b>NOTE:</b> This [var1] is awaiting approval. Visitors cannot see it:|:<b>NOTE:</b> This [var1] is awaiting approval. Visitors cannot see it a:|:[var1] could not be deleted.:|:[var1] could not be deleted. a:|:[var1] has sent you a news article! (Email address not verified):|:[var1] has sent you a news article! (Email address not verified) --- 1,5 ---- en:|:article a:|: Starting With `[var1]`:|: Starting With `[var1]` ! a:|:<b>NOTE:</b> This [var1] is awaiting approval. Visitors cannot see it.:|:<b>NOTE:</b> This [var1] is awaiting approval. Visitors cannot see it. a:|:[var1] could not be deleted.:|:[var1] could not be deleted. a:|:[var1] has sent you a news article! (Email address not verified):|:[var1] has sent you a news article! (Email address not verified) *************** *** 17,20 **** --- 17,21 ---- a:|:Announce changes to this article on the homepage:|:Announce changes to this article on the homepage a:|:Anonymous:|:Anonymous + a:|:Approved:|:Approved a:|:Archived Version [var1]:|:Archived Version [var1] a:|:Are you sure you want to <b>[var1] "[var2]"</b>?:|:Are you sure you want to <b>[var1] "[var2]"</b>? *************** *** 35,38 **** --- 36,40 ---- a:|:Articles:|:Articles a:|:ATTENTION!:|:ATTENTION! + a:|:Available Translations:|:Available Translations a:|:Back to Article:|:Back to Article a:|:Back To Revision History:|:Back To Revision History *************** *** 72,75 **** --- 74,78 ---- a:|:Edit Section:|:Edit Section a:|:Edit:|:Edit + a:|:Editing:|:Editing a:|:Editor:|:Editor a:|:Enable comments for articles:|:Enable comments for articles *************** *** 200,203 **** --- 203,207 ---- a:|:View Revision History:|:View Revision History a:|:View this version on a new page:|:View this version on a new page + a:|:Views:|:Views a:|:Would you like to send this article to a friend? Go to [var1] or [var2]:|:Would you like to send this article to a friend? Go to [var1] or [var2] a:|:Yes:|:Yes |
|
From: Eloi G. <ada...@us...> - 2004-08-21 17:38:36
|
Update of /cvsroot/phpwebsite-comm/modules/article/inc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8062/inc Modified Files: AM_list_articles.php A_delete.php A_edit.php importANN.php importPM.php runtime.php Log Message: 2.6 Release Files Index: AM_list_articles.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/article/inc/AM_list_articles.php,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** AM_list_articles.php 21 Aug 2004 17:02:12 -0000 1.4 --- AM_list_articles.php 21 Aug 2004 17:38:20 -0000 1.5 *************** *** 49,56 **** else { - $where = ' WHERE approved'; if (!$_SESSION['OBJ_user']->allow_access('article', 'change_dates') && !($_SESSION['SES_ART_master']->val['users_change_dates'] && $_SESSION['OBJ_user']->isUser())) ! $where .= ' AND '.$this->get_published_sql(); } $result = $GLOBALS['core']->getCol('SELECT id FROM ' . $this->sql_article_table --- 49,55 ---- else { if (!$_SESSION['OBJ_user']->allow_access('article', 'change_dates') && !($_SESSION['SES_ART_master']->val['users_change_dates'] && $_SESSION['OBJ_user']->isUser())) ! $where = ' WHERE '.$this->get_published_sql(); } $result = $GLOBALS['core']->getCol('SELECT id FROM ' . $this->sql_article_table *************** *** 70,75 **** /* Retrieve all article listings for this page */ ! $sql = 'SELECT id,title,created_username,approved,mainarticle,editlock,edituser,publication_date,expiration_date,created_date,updated_date' ! . ' FROM ' . $this->sql_article_table . ' WHERE id IN (' . $data . ') ORDER BY ' . $this->list_sort . ' ' . $this->list_order; --- 69,73 ---- /* Retrieve all article listings for this page */ ! $sql = 'SELECT * FROM ' . $this->sql_article_table . ' WHERE id IN (' . $data . ') ORDER BY ' . $this->list_sort . ' ' . $this->list_order; Index: importPM.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/article/inc/importPM.php,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** importPM.php 19 Feb 2004 21:46:46 -0000 1.5 --- importPM.php 21 Aug 2004 17:38:20 -0000 1.6 *************** *** 9,15 **** require_once(PHPWS_SOURCE_DIR . 'mod/pagemaster/class/Page.php'); require_once(PHPWS_SOURCE_DIR . 'mod/pagemaster/class/Section.php'); ! $ArticleM_path = PHPWS_HOME_DIR . 'images/article/PM/'; include(PHPWS_SOURCE_DIR . 'mod/pagemaster/conf/config.php'); ! $PageM_path = PHPWS_HOME_DIR . $image_directory; /* Get all the pages from old database */ --- 9,15 ---- require_once(PHPWS_SOURCE_DIR . 'mod/pagemaster/class/Page.php'); require_once(PHPWS_SOURCE_DIR . 'mod/pagemaster/class/Section.php'); ! $ArticleM_path = $GLOBALS['core']->home_dir . 'images/article/PM/'; include(PHPWS_SOURCE_DIR . 'mod/pagemaster/conf/config.php'); ! $PageM_path = $GLOBALS['core']->home_dir . $image_directory; /* Get all the pages from old database */ *************** *** 139,143 **** /* Write routing map to disk (taken from function writeReroute in convert/db.php */ ! $directory = PHPWS_HOME_DIR . 'convert/reroute/'; if (!is_dir($directory) || !is_writable($directory)) { --- 139,143 ---- /* Write routing map to disk (taken from function writeReroute in convert/db.php */ ! $directory = $GLOBALS['core']->home_dir . 'convert/reroute/'; if (!is_dir($directory) || !is_writable($directory)) { Index: A_edit.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/article/inc/A_edit.php,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** A_edit.php 21 Aug 2004 17:02:13 -0000 1.5 --- A_edit.php 21 Aug 2004 17:38:20 -0000 1.6 *************** *** 19,23 **** if ($timeleft = $this->isLocked($this->editlock, $this->edituser)) { ! /* Display an error messase & exit*/ $_SESSION['SES_ART_master']->error['Locked'][] = $_SESSION['translate']->it('This article is currently being edited by ') --- 19,23 ---- if ($timeleft = $this->isLocked($this->editlock, $this->edituser)) { ! /* Display an error message & exit*/ $_SESSION['SES_ART_master']->error['Locked'][] = $_SESSION['translate']->it('This article is currently being edited by ') *************** *** 41,44 **** --- 41,45 ---- $article_tags['TITLE'] = PHPWS_Form::formTextField('ARTICLE_title', $this->title, 55, 70) . CLS_help::show_link('article', 'article_title'); + $GLOBALS['Layout_title'] = $_SESSION['translate']->it('Editing').' '.$this->title . ' - ' . strip_tags($_SESSION['OBJ_layout']->page_title); // Set up link back to main menu Index: importANN.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/article/inc/importANN.php,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** importANN.php 19 Feb 2004 21:46:46 -0000 1.4 --- importANN.php 21 Aug 2004 17:38:20 -0000 1.5 *************** *** 8,13 **** /* Include announce classes */ require_once(PHPWS_SOURCE_DIR . 'mod/announce/class/Announcement.php'); ! $ArticleM_path = PHPWS_HOME_DIR . 'images/article/ANN/'; ! $ANNOUNCE_path = PHPWS_HOME_DIR . 'images/announce/'; /* If you require your announcements to look different than your articles, --- 8,13 ---- /* Include announce classes */ require_once(PHPWS_SOURCE_DIR . 'mod/announce/class/Announcement.php'); ! $ArticleM_path = $GLOBALS['core']->home_dir . 'images/article/ANN/'; ! $ANNOUNCE_path = $GLOBALS['core']->home_dir . 'images/announce/'; /* If you require your announcements to look different than your articles, *************** *** 122,126 **** /* Write routing map to disk (taken from function writeReroute in convert/db.php */ ! $directory = PHPWS_HOME_DIR . 'convert/reroute/'; if (!is_dir($directory) || !is_writable($directory)) { --- 122,126 ---- /* Write routing map to disk (taken from function writeReroute in convert/db.php */ ! $directory = $GLOBALS['core']->home_dir . 'convert/reroute/'; if (!is_dir($directory) || !is_writable($directory)) { Index: runtime.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/article/inc/runtime.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** runtime.php 18 Jun 2004 23:31:10 -0000 1.2 --- runtime.php 21 Aug 2004 17:38:20 -0000 1.3 *************** *** 17,25 **** } /* Script to reroute pagemaster pages... */ ! elseif ($GLOBALS['module']=='pagemaster' && !isset($GLOBALS['core']->modules['pagemaster']) && file_exists(PHPWS_HOME_DIR . 'convert/reroute/pagemaster.AM')) { require_once(PHPWS_SOURCE_DIR.'mod/article/class/ArticleManager.php'); $_SESSION['SES_ART_master'] = new PHPWS_ArticleManager; ! include (PHPWS_HOME_DIR . 'convert/reroute/pagemaster.AM'); $temp = new PHPWS_Article($convert[$_REQUEST['PAGE_id']]); $temp->view(); --- 17,25 ---- } /* Script to reroute pagemaster pages... */ ! elseif ($GLOBALS['module']=='pagemaster' && !isset($GLOBALS['core']->modules['pagemaster']) && file_exists($GLOBALS['core']->home_dir . 'convert/reroute/pagemaster.AM')) { require_once(PHPWS_SOURCE_DIR.'mod/article/class/ArticleManager.php'); $_SESSION['SES_ART_master'] = new PHPWS_ArticleManager; ! include ($GLOBALS['core']->home_dir . 'convert/reroute/pagemaster.AM'); $temp = new PHPWS_Article($convert[$_REQUEST['PAGE_id']]); $temp->view(); *************** *** 29,37 **** } /* Script to reroute announcements... */ ! elseif (($GLOBALS['module']=='announce') && !isset($GLOBALS['core']->modules['announce']) && file_exists(PHPWS_HOME_DIR . 'convert/reroute/announce.AM')) { require_once(PHPWS_SOURCE_DIR.'mod/article/class/ArticleManager.php'); $_SESSION['SES_ART_master'] = new PHPWS_ArticleManager; ! include (PHPWS_HOME_DIR . 'convert/reroute/announce.AM'); $temp = new PHPWS_Article($convert[$_REQUEST['ANN_id']]); $temp->view(); --- 29,37 ---- } /* Script to reroute announcements... */ ! elseif (($GLOBALS['module']=='announce') && !isset($GLOBALS['core']->modules['announce']) && file_exists($GLOBALS['core']->home_dir . 'convert/reroute/announce.AM')) { require_once(PHPWS_SOURCE_DIR.'mod/article/class/ArticleManager.php'); $_SESSION['SES_ART_master'] = new PHPWS_ArticleManager; ! include ($GLOBALS['core']->home_dir . 'convert/reroute/announce.AM'); $temp = new PHPWS_Article($convert[$_REQUEST['ANN_id']]); $temp->view(); Index: A_delete.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/article/inc/A_delete.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** A_delete.php 18 Jun 2004 23:31:09 -0000 1.2 --- A_delete.php 21 Aug 2004 17:38:20 -0000 1.3 *************** *** 12,15 **** --- 12,61 ---- * @return none */ + if (!function_exists('article_eraser')) { + function article_eraser ($id) { + $GLOBALS['core']->sqlDelete('mod_article_sections', 'article_id', $id); + $GLOBALS['core']->sqlDelete('mod_article', 'id', $id); + + /* Delete references to this article in Comments */ + if (class_exists('PHPWS_Comment')) + { + $where['module'] = 'article'; + $where['itemId'] = $id; + $GLOBALS['core']->sqlDelete('mod_comments_data', $where); + } + + /* Delete references to this article in Approval */ + PHPWS_Approval::remove($id, 'article'); + + /* Delete references to this article in FatCat */ + if(isset($_SESSION['OBJ_fatcat'])) + PHPWS_Fatcat::deleteModuleElements('article', $id); + /* Delete references to this article in the menu */ + if($GLOBALS['core']->moduleExists('menuman')) + { + $result = $GLOBALS['core']->getAll('SELECT menu_item_id,menu_item_url FROM mod_menuman_items WHERE menu_item_url = "./index.php?module=article&view='.$id.'" OR menu_item_url = "./article'.$id.'.html"', true); + if(is_array($result)) + { + foreach($result as $value) + { + $children = $GLOBALS['core']->getAll('SELECT menu_item_id FROM mod_menuman_items WHERE menu_item_pid=' + .$value['menu_item_id'].' and menu_item_id !='.$value['menu_item_id'], true); + /* If this menu item has children, just point it to nowhere */ + if(is_array($children)) + { + $isParent = TRUE; + $GLOBALS['core']->query('UPDATE mod_menuman_items SET menu_item_url="./index.php?module=article" WHERE menu_item_id='.$value['menu_item_id'], true); + } + /* otherwise, delete it */ + else + $GLOBALS['core']->sqlDelete('mod_menuman_items', 'menu_item_id', $item['menu_item_id']); + } + unset($_SESSION['OBJ_menuman']); + } + } + } + } + + if (!$this->id) { $GLOBALS['CNT_article']['title'] = $_SESSION['translate']->it('Article Manager') *************** *** 21,67 **** if(isset($_POST['yes'])) { ! $GLOBALS['core']->sqlDelete('mod_article_sections', 'article_id', $this->id); ! $GLOBALS['core']->sqlDelete('mod_article', 'id', $this->id); ! ! /* Delete references to this article in Comments */ ! if (class_exists("PHPWS_Comment")) ! { ! $where['module'] = 'article'; ! $where['itemId'] = $this->_id; ! $GLOBALS['core']->sqlDelete('mod_comments_data', $where); ! } ! ! /* Delete references to this article in Approval */ ! PHPWS_Approval::remove($this->id, 'article'); ! ! /* Delete references to this article in FatCat */ ! if(isset($_SESSION['OBJ_fatcat'])) ! PHPWS_Fatcat::deleteModuleElements('article', $this->id); ! /* Delete references to this article in the menu */ ! if($GLOBALS['core']->moduleExists('menuman')) ! { ! $result = $GLOBALS['core']->getAll('SELECT menu_item_id,menu_item_url FROM mod_menuman_items WHERE menu_item_url = "./index.php?module=article&view='.$this->id.'"', true); ! if(!is_array($result)) ! echo "NO MENU RECORDS FOUND!"; ! else ! { ! foreach($result as $value) ! { ! $children = $GLOBALS['core']->getAll('SELECT menu_item_id FROM mod_menuman_items WHERE menu_item_pid=' ! .$value['menu_item_id'].' and menu_item_id !='.$value['menu_item_id'], true); ! /* If this menu item has children, just point it to nowhere */ ! if(is_array($children)) ! { ! $isParent = TRUE; ! $GLOBALS['core']->query('UPDATE mod_menuman_items SET menu_item_url="./index.php?module=article" WHERE menu_item_id='.$value['menu_item_id'], true); ! } ! /* otherwise, delete it */ ! else ! $GLOBALS['core']->sqlDelete('mod_menuman_items', 'menu_item_id', $item['menu_item_id']); ! } ! unset($_SESSION['OBJ_menuman']); ! } ! } ! $content = $_SESSION['translate']->it('The [var1] <b>[var2]</b> has successfully been [var3]' , $_SESSION['translate']->it('article') --- 67,71 ---- if(isset($_POST['yes'])) { ! article_eraser($this->id); $content = $_SESSION['translate']->it('The [var1] <b>[var2]</b> has successfully been [var3]' , $_SESSION['translate']->it('article') |
|
From: Eloi G. <ada...@us...> - 2004-08-21 17:38:36
|
Update of /cvsroot/phpwebsite-comm/modules/article/templates/edit In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8062/templates/edit Modified Files: settings.tpl Log Message: 2.6 Release Files Index: settings.tpl =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/article/templates/edit/settings.tpl,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** settings.tpl 19 Feb 2004 21:48:56 -0000 1.3 --- settings.tpl 21 Aug 2004 17:38:22 -0000 1.4 *************** *** 1,47 **** ! <!-- BEGIN FOOTER --> ! <div align="center" class="bg_medium"> ! <b>{PAGE_SETTINGS_LABEL}</b> ! </div> ! <div class="bg_light"> ! <!-- BEGIN SETTINGS --> ! {TEMPLATE_LABEL} {TEMPLATE}<br /> ! {ANNOUNCE_LABEL}<br /> ! <!-- BEGIN COMM --> ! {COMMENTS_LABEL}<br /> ! <!-- END COMM --> ! <!-- BEGIN ANON --> ! {ANON_LABEL}<br /> ! <!-- END ANON --> ! {PUBLICATION_LABEL} {PUBLICATION_DATE}<br /> ! {EXPIRATION_LABEL} {EXPIRATION_DATE} {EXPIRATION_FLAG}<br /> ! <!-- END SETTINGS --> ! <table border="0" width="100%" cellpadding="4" cellspacing="0"> ! <tr> ! <td valign="top"> ! {CATEGORY_LABEL} <br /> ! {CATEGORY} <br /> ! </td> ! <td valign="top"> ! {GROUP_LABEL} <br /> ! {GROUP} <br /> ! </td> ! </tr> ! </table> ! <!-- BEGIN METASTUFF --> ! <br /> ! {META_KEYWORDS}<br /><br /> ! {META_ROBOTS}<br /><br /> ! <!-- END METASTUFF --> ! <!-- BEGIN INFO --> ! <div align="center" class="bg_medium"> ! <b>{INFORMATION_LABEL}</b> ! </div> ! {CREATED_TEXT}<br /> ! {UPDATED_TEXT}<br /> ! </div> ! <!-- END INFO --> ! <center> ! {SAVE_WARNING} ! {SAVE_BUTTON} {CANCEL_BUTTON} ! <center> ! <!-- END FOOTER --> --- 1,50 ---- ! <div align="center" class="bg_medium"> ! <b>{PAGE_SETTINGS_LABEL}</b> ! </div> ! ! <div class="bg_light"> ! <!-- BEGIN SETTINGS --> ! {TEMPLATE_LABEL} {TEMPLATE}<br /> ! {ANNOUNCE_LABEL}<br /> ! <!-- BEGIN COMM --> ! {COMMENTS_LABEL}<br /> ! <!-- END COMM --> ! <!-- BEGIN ANON --> ! {ANON_LABEL}<br /> ! <!-- END ANON --> ! {PUBLICATION_LABEL} {PUBLICATION_DATE}<br /> ! {EXPIRATION_LABEL} {EXPIRATION_DATE} {EXPIRATION_FLAG}<br /> ! <!-- END SETTINGS --> ! ! <table border="0" width="100%" cellpadding="4" cellspacing="0"> ! <tr> ! <td valign="top"> ! {CATEGORY_LABEL} <br /> ! {CATEGORY} <br /> ! </td> ! <td valign="top"> ! {GROUP_LABEL} <br /> ! {GROUP} <br /> ! </td> ! </tr> ! </table> ! ! <!-- BEGIN METASTUFF --> ! <br /> ! {META_KEYWORDS}<br /><br /> ! {META_ROBOTS}<br /><br /> ! <!-- END METASTUFF --> ! ! <!-- BEGIN INFO --> ! <div align="center" class="bg_medium"> ! <b>{INFORMATION_LABEL}</b> ! </div> ! {CREATED_TEXT}<br /> ! {UPDATED_TEXT}<br /> ! <!-- END INFO --> ! ! </div> ! <center> ! {SAVE_WARNING} ! {SAVE_BUTTON} {CANCEL_BUTTON} ! <center> |
|
From: Eloi G. <ada...@us...> - 2004-08-21 17:38:32
|
Update of /cvsroot/phpwebsite-comm/modules/article/docs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8062/docs Modified Files: Changes.txt Log Message: 2.6 Release Files Index: Changes.txt =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/article/docs/Changes.txt,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** Changes.txt 21 Aug 2004 17:02:11 -0000 1.11 --- Changes.txt 21 Aug 2004 17:38:18 -0000 1.12 *************** *** 1,3 **** --- 1,9 ---- ======================== + Changes in version 2.6 + ======================== + - Got rid of some deprecated core variables + - Fixed Bug Report [1004402] "Article manager dumping articles". + + ======================== Changes in version 2.5 ======================== |
|
From: Eloi G. <ada...@us...> - 2004-08-21 17:03:09
|
Update of /cvsroot/phpwebsite-comm/modules/article/lang In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29156/lang Modified Files: article.en.lng Log Message: 2.5 Release Files Index: article.en.lng =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/article/lang/article.en.lng,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** article.en.lng 22 Apr 2004 17:05:28 -0000 1.7 --- article.en.lng 21 Aug 2004 17:02:15 -0000 1.8 *************** *** 1,43 **** en:|:article a:|: Starting With `[var1]`:|: Starting With `[var1]` a:|:[var1] could not be deleted.:|:[var1] could not be deleted. a:|:Action:|:Action a:|:Add:|:Add ! a:|:ALL:|:ALL a:|:All Articles:|:All Articles a:|:All menu links removed:|:All menu links removed ! a:|:Allow Comments:|:Allow Comments a:|:Allow Comments by unregistered users:|:Allow Comments by unregistered users a:|:Allow/Disallow comments:|:Allow/Disallow comments a:|:Also on this Site:|:Also on this Site a:|:Announce changes to this article on the homepage:|:Announce changes to this article on the homepage a:|:Anonymous:|:Anonymous a:|:Are you sure you want to <b>[var1] "[var2]"</b>?:|:Are you sure you want to <b>[var1] "[var2]"</b>? a:|:Are you sure you want to [var1] [var2]?:|:Are you sure you want to [var1] [var2]? - a:|:article:|:article - a:|:Article:|:Article a:|:Article Deleted:|:Article Deleted a:|:Article Deletion Cancelled:|:Article Deletion Cancelled a:|:Article Information:|:Article Information a:|:Article Kept:|:Article Kept - a:|:Article Manager:|:Article Manager a:|:Article Manager Configuration:|:Article Manager Configuration a:|:Article Saved:|:Article Saved a:|:Article Settings:|:Article Settings a:|:Article Title:|:Article Title ! a:|:Articles:|:Articles a:|:Articles can expire on a predefined date:|:Articles can expire on a predefined date a:|:Articles need approval before publication:|:Articles need approval before publication a:|:ATTENTION!:|:ATTENTION! a:|:Cancel Editing:|:Cancel Editing a:|:Comment:|:Comment - a:|:Comments:|:Comments a:|:Comments are allowed by default:|:Comments are allowed by default a:|:Comments by unregistered users are allowed by default:|:Comments by unregistered users are allowed by default a:|:Confirm Action:|:Confirm Action a:|:Create New Article:|:Create New Article ! a:|:Created by [var1] on [var2]:|:Created by [var1] on [var2] ! a:|:CURRENT:|:CURRENT a:|:Current Articles:|:Current Articles a:|:Date Created:|:Date Created a:|:Default page template:|:Default page template --- 1,63 ---- en:|:article a:|: Starting With `[var1]`:|: Starting With `[var1]` + a:|:<b>NOTE:</b> This [var1] is awaiting approval. Visitors cannot see it:|:<b>NOTE:</b> This [var1] is awaiting approval. Visitors cannot see it a:|:[var1] could not be deleted.:|:[var1] could not be deleted. + a:|:[var1] has sent you a news article! (Email address not verified):|:[var1] has sent you a news article! (Email address not verified) a:|:Action:|:Action a:|:Add:|:Add ! a:|:All Articles [var1] in [var2]:|:All Articles [var1] in [var2] a:|:All Articles:|:All Articles a:|:All menu links removed:|:All menu links removed ! a:|:ALL:|:ALL a:|:Allow Comments by unregistered users:|:Allow Comments by unregistered users + a:|:Allow Comments:|:Allow Comments a:|:Allow/Disallow comments:|:Allow/Disallow comments a:|:Also on this Site:|:Also on this Site + a:|:An error occured while performing this operation:|:An error occured while performing this operation a:|:Announce changes to this article on the homepage:|:Announce changes to this article on the homepage a:|:Anonymous:|:Anonymous + a:|:Archived Version [var1]:|:Archived Version [var1] a:|:Are you sure you want to <b>[var1] "[var2]"</b>?:|:Are you sure you want to <b>[var1] "[var2]"</b>? a:|:Are you sure you want to [var1] [var2]?:|:Are you sure you want to [var1] [var2]? a:|:Article Deleted:|:Article Deleted a:|:Article Deletion Cancelled:|:Article Deletion Cancelled a:|:Article Information:|:Article Information a:|:Article Kept:|:Article Kept a:|:Article Manager Configuration:|:Article Manager Configuration + a:|:Article Manager:|:Article Manager a:|:Article Saved:|:Article Saved a:|:Article Settings:|:Article Settings a:|:Article Title:|:Article Title ! a:|:article:|:article ! a:|:Article:|:Article a:|:Articles can expire on a predefined date:|:Articles can expire on a predefined date a:|:Articles need approval before publication:|:Articles need approval before publication + a:|:Articles:|:Articles a:|:ATTENTION!:|:ATTENTION! + a:|:Back to Article:|:Back to Article + a:|:Back To Revision History:|:Back To Revision History a:|:Cancel Editing:|:Cancel Editing + a:|:Cancel:|:Cancel + a:|:Category:|:Category + a:|:Click Here:|:Click Here a:|:Comment:|:Comment a:|:Comments are allowed by default:|:Comments are allowed by default a:|:Comments by unregistered users are allowed by default:|:Comments by unregistered users are allowed by default + a:|:Comments:|:Comments + a:|:Compare Selected:|:Compare Selected + a:|:Compare To:|:Compare To + a:|:Compare with the current version:|:Compare with the current version + a:|:Compare with the previous version:|:Compare with the previous version a:|:Confirm Action:|:Confirm Action + a:|:Copyright [var1] [var2]:|:Copyright [var1] [var2] + a:|:Courtesy of [var1]:|:Courtesy of [var1] a:|:Create New Article:|:Create New Article ! a:|:Created By [var1] on [var2]:|:Created by [var1] on [var2] ! a:|:Created:|:Created ! a:|:curr:|:curr a:|:Current Articles:|:Current Articles + a:|:Current Version of This Article:|:Current Version of This Article + a:|:Current Version:|:Current Version + a:|:CURRENT:|:CURRENT a:|:Date Created:|:Date Created a:|:Default page template:|:Default page template *************** *** 46,71 **** a:|:delete:|:delete a:|:deleted:|:deleted ! a:|:Edit:|:Edit a:|:Edit Configuration:|:Edit Configuration a:|:Edit Section:|:Edit Section a:|:Expiration Date:|:Expiration Date a:|:Expire:|:Expire a:|:Expires on:|:Expires on a:|:File to Upload:|:File to Upload a:|:General Settings:|:General Settings a:|:Homepage:|:Homepage a:|:Image Directory "[var1]" could not be created. Image was not saved.:|:Image Directory "[var1]" could not be created. Image was not saved. - a:|:Image Library:|:Image Library a:|:Image Library Management:|:Image Library Management a:|:Image Settings:|:Image Settings a:|:It will be published after approval by an administrator.:|:It will be published after approval by an administrator. a:|:kept:|:kept a:|:Last Update:|:Last Update a:|:Last updated by [var1] on [var2]:|:Last updated by [var1] on [var2] a:|:Let Article Manager automatically generate meta descriptions:|:Let Article Manager automatically generate meta descriptions a:|:Link caption:|:Link caption a:|:List Articles:|:List Articles a:|:Locked:|:Locked a:|:Main Menu:|:Main Menu a:|:more words:|:more words a:|:Move Down:|:Move Down --- 66,109 ---- a:|:delete:|:delete a:|:deleted:|:deleted ! a:|:Difference Between Revisions:|:Difference Between Revisions ! a:|:E-mail A Friend:|:E-mail A Friend ! a:|:E-mail this Article to a Friend:|:E-mail this Article to a Friend a:|:Edit Configuration:|:Edit Configuration a:|:Edit Section:|:Edit Section + a:|:Edit:|:Edit + a:|:Editor:|:Editor + a:|:Enable comments for articles:|:Enable comments for articles + a:|:Enter a brief message to your friend: (optional):|:Enter a brief message to your friend: (optional) + a:|:ERROR: No [var1] were found!:|:ERROR: No [var1] were found! + a:|:Error:|:Error a:|:Expiration Date:|:Expiration Date a:|:Expire:|:Expire a:|:Expires on:|:Expires on a:|:File to Upload:|:File to Upload + a:|:Friend\'s Email:|:Friend\'s Email + a:|:Full Information in HTML:|:Full Information in HTML a:|:General Settings:|:General Settings + a:|:Go back to [var1]:|:Go back to [var1] a:|:Homepage:|:Homepage a:|:Image Directory "[var1]" could not be created. Image was not saved.:|:Image Directory "[var1]" could not be created. Image was not saved. a:|:Image Library Management:|:Image Library Management + a:|:Image Library:|:Image Library a:|:Image Settings:|:Image Settings a:|:It will be published after approval by an administrator.:|:It will be published after approval by an administrator. a:|:kept:|:kept + a:|:Keywords for this article:|:Keywords for this article a:|:Last Update:|:Last Update a:|:Last updated by [var1] on [var2]:|:Last updated by [var1] on [var2] + a:|:Last Updated By [var1] on [var2]:|:Last updated by [var1] on [var2] + a:|:last:|:last a:|:Let Article Manager automatically generate meta descriptions:|:Let Article Manager automatically generate meta descriptions + a:|:Library Image "[var1]" is currently selected:|:Library Image "[var1]" is currently selected + a:|:Lines Added:[var1] Deleted:[var2] Changed:[var3]:|:Lines Added:[var1] Deleted:[var2] Changed:[var3] a:|:Link caption:|:Link caption + a:|:Link Only:|:Link Only a:|:List Articles:|:List Articles a:|:Locked:|:Locked a:|:Main Menu:|:Main Menu + a:|:Members get to do fun stuff! Login or Register today!:|:Members get to do fun stuff! Login or Register today! a:|:more words:|:more words a:|:Move Down:|:Move Down *************** *** 74,129 **** a:|:New Section:|:New Section a:|:Next Page:|:Next Page - a:|:No:|:No a:|:No Articles Found!:|:No Articles Found! a:|:No Images in Library:|:No Images in Library a:|:No matching articles were found in the database!:|:No matching articles were found in the database! a:|:Number of links in the "Popular Articles" Block:|:Number of links in the "Popular Articles" Block a:|:Number of links in the "Previous Articles" Block:|:Number of links in the "Previous Articles" Block a:|:Number of listings to show per page under the Main Menu:|:Number of listings to show per page under the Main Menu a:|:Number of summaries to show on the Home Page:|:Number of summaries to show on the Home Page - a:|:Select an image from the library:|:Select an image from the library - a:|:page:|:page a:|:Page Format:|:Page Format a:|:pages:|:pages a:|:Place images in articles:|:Place images in articles a:|:Please make sure the article is setup the way you like and <b>all sections are saved</b> before selecting "Save Article"!:|:Please make sure the article is setup the way you like and <b>all sections are saved</b> before selecting "Save Article"! a:|:Popular Articles:|:Popular Articles - a:|:Previous:|:Previous a:|:Previous Page:|:Previous Page a:|:Printable Version:|:Printable Version a:|:Publication Date:|:Publication Date a:|:Publication dates can be set up to [var1] year(s) from article creation.:|:Publication dates can be set up to [var1] year(s) from article creation. - a:|:Publish:|:Publish a:|:Publish on:|:Publish on a:|:Read More:|:Read More a:|:Registered users can:|:Registered users can a:|:Related Topics:|:Related Topics - a:|:Remove:|:Remove a:|:Remove Image:|:Remove Image a:|:Reset Settings:|:Reset Settings a:|:Rows to show per page: :|:Rows to show per page: - a:|:Save:|:Save a:|:Save Article:|:Save Article a:|:Save Section:|:Save Section a:|:Save Settings:|:Save Settings a:|:Save Title and Summary:|:Save Title and Summary a:|:Section Template:|:Section Template a:|:Section Text:|:Section Text a:|:Section Title:|:Section Title a:|:Select article templates:|:Select article templates a:|:Select section templates:|:Select section templates a:|:Set as Main:|:Set as Main a:|:Set Publication Dates:|:Set Publication Dates a:|:Short Image Description:|:Short Image Description - a:|:Show page headers and footers on printable versions of articles:|:Show page headers and footers on printable versions of articles a:|:Show me [var1] stuff ordered by [var2][var3]:|:Show me [var1] stuff ordered by [var2][var3] a:|:Some menu links could not be removed:|:Some menu links could not be removed a:|:Start of Page:|:Start of Page a:|:Start on new page?:|:Start on new page? a:|:Submit articles:|:Submit articles a:|:Summary:|:Summary a:|:The [var1] <b>[var2]</b> has successfully been [var3]:|:The [var1] <b>[var2]</b> has successfully been [var3] a:|:The article you requested either does not exist or is not available to your group.:|:The article you requested either does not exist or is not available to your group. a:|:The article you requested is not viewable.:|:The article you requested is not viewable. a:|:The default expiration date is [var1] years, [var2] months, and [var3] days from article creation.:|:The default expiration date is [var1] years, [var2] months, and [var3] days from article creation. a:|:The maximum time someone can spend editing an article is [var1] seconds:|:The maximum time someone can spend editing an article is [var1] seconds --- 112,182 ---- a:|:New Section:|:New Section a:|:Next Page:|:Next Page a:|:No Articles Found!:|:No Articles Found! a:|:No Images in Library:|:No Images in Library a:|:No matching articles were found in the database!:|:No matching articles were found in the database! + a:|:No:|:No + a:|:Number of days to store old versions of articles in the archives.:|:Number of days to store old versions of articles in the archives. a:|:Number of links in the "Popular Articles" Block:|:Number of links in the "Popular Articles" Block a:|:Number of links in the "Previous Articles" Block:|:Number of links in the "Previous Articles" Block a:|:Number of listings to show per page under the Main Menu:|:Number of listings to show per page under the Main Menu a:|:Number of summaries to show on the Home Page:|:Number of summaries to show on the Home Page a:|:Page Format:|:Page Format + a:|:page:|:page a:|:pages:|:pages + a:|:Personal Message:|:Personal Message + a:|:Personal Message:|:Personal Message a:|:Place images in articles:|:Place images in articles a:|:Please make sure the article is setup the way you like and <b>all sections are saved</b> before selecting "Save Article"!:|:Please make sure the article is setup the way you like and <b>all sections are saved</b> before selecting "Save Article"! a:|:Popular Articles:|:Popular Articles a:|:Previous Page:|:Previous Page + a:|:Previous:|:Previous a:|:Printable Version:|:Printable Version a:|:Publication Date:|:Publication Date a:|:Publication dates can be set up to [var1] year(s) from article creation.:|:Publication dates can be set up to [var1] year(s) from article creation. a:|:Publish on:|:Publish on + a:|:Publish:|:Publish + a:|:Published:|:Published a:|:Read More:|:Read More a:|:Registered users can:|:Registered users can a:|:Related Topics:|:Related Topics a:|:Remove Image:|:Remove Image + a:|:Remove:|:Remove a:|:Reset Settings:|:Reset Settings + a:|:Revision [[var2]] as of [var1]:|:Revision [[var2]] as of [var1] + a:|:Revison History:|:Revison History a:|:Rows to show per page: :|:Rows to show per page: a:|:Save Article:|:Save Article a:|:Save Section:|:Save Section a:|:Save Settings:|:Save Settings a:|:Save Title and Summary:|:Save Title and Summary + a:|:Save:|:Save + a:|:Search Engine instructions:|:Search Engine instructions a:|:Section Template:|:Section Template a:|:Section Text:|:Section Text a:|:Section Title:|:Section Title + a:|:Select an image from the library:|:Select an image from the library a:|:Select article templates:|:Select article templates a:|:Select section templates:|:Select section templates + a:|:Send a copy to yourself:|:Send a copy to yourself + a:|:Send:|:Send + a:|:sent to:|:sent to + a:|:Separate multiple addresses with commas. Maximum 200 characters.:|:Separate multiple addresses with commas. Maximum 200 characters. a:|:Set as Main:|:Set as Main a:|:Set Publication Dates:|:Set Publication Dates a:|:Short Image Description:|:Short Image Description a:|:Show me [var1] stuff ordered by [var2][var3]:|:Show me [var1] stuff ordered by [var2][var3] + a:|:Show page headers and footers on printable versions of articles:|:Show page headers and footers on printable versions of articles a:|:Some menu links could not be removed:|:Some menu links could not be removed + a:|:Sorry!:|:Sorry! a:|:Start of Page:|:Start of Page a:|:Start on new page?:|:Start on new page? + a:|:Submit Article:|:Submit Article a:|:Submit articles:|:Submit articles a:|:Summary:|:Summary a:|:The [var1] <b>[var2]</b> has successfully been [var3]:|:The [var1] <b>[var2]</b> has successfully been [var3] a:|:The article you requested either does not exist or is not available to your group.:|:The article you requested either does not exist or is not available to your group. + a:|:The article you requested is awaiting approval by an administrator.:|:The article you requested is awaiting approval by an administrator. a:|:The article you requested is not viewable.:|:The article you requested is not viewable. + a:|:The Current Version Is [var1]:|:The Current Version Is [var1] a:|:The default expiration date is [var1] years, [var2] months, and [var3] days from article creation.:|:The default expiration date is [var1] years, [var2] months, and [var3] days from article creation. a:|:The maximum time someone can spend editing an article is [var1] seconds:|:The maximum time someone can spend editing an article is [var1] seconds *************** *** 131,174 **** a:|:The maximum uploaded image [var1] allowed is [var2] pixels:|:The maximum uploaded image [var1] allowed is [var2] pixels a:|:There was an error when inserting [var1] into the database [var2]:|:There was an error when inserting [var1] into the database [var2] a:|:This article is currently being edited by someone else:|:This article is currently being edited by someone else a:|:This Image Links To:|:This Image Links To a:|:Title:|:Title a:|:Try again in about [var1] minutes:|:Try again in about [var1] minutes a:|:Upload a new image:|:Upload a new image a:|:Upload images to the site:|:Upload images to the site a:|:User Settings:|:User Settings a:|:Users can only see articles that belong to a group that they are members of:|:Users can only see articles that belong to a group that they are members of a:|:Yes:|:Yes a:|:You can return and edit this article after you have saved it:|:You can return and edit this article after you have saved it a:|:You must provide a short description for your image:|:You must provide a short description for your image a:|:You tried to save an empty section:|:You tried to save an empty section ! a:|:Your work has successfully been saved to the database!:|:Your work has successfully been saved to the database! ! a:|:Updated:|:Updated ! a:|:Created:|:Created ! a:|:Published:|:Published ! a:|:All Articles [var1] in [var2]:|:All Articles [var1] in [var2] ! a:|:Keywords for this article:|:Keywords for this article ! a:|:Search Engine instructions:|:Search Engine instructions ! a:|:Personal Message::|:Personal Message: ! a:|:To view the entire article, go to [var1] or [var2]:|:To view the entire article, go to [var1] or [var2] ! a:|:Click Here:|:Click Here ! a:|:Would you like to send this article to a friend? Go to [var1] or [var2]:|:Would you like to send this article to a friend? Go to [var1] or [var2] ! a:|:[var1] has sent you a news article! (Email address not verified):|:[var1] has sent you a news article! (Email address not verified) ! a:|:Courtesy of [var1]:|:Courtesy of [var1] ! a:|:Copyright [var1] [var2]:|:Copyright [var1] [var2] ! a:|:sent to:|:sent to ! a:|:E-mail A Friend:|:E-mail A Friend ! a:|:E-mail this Article to a Friend:|:E-mail this Article to a Friend ! a:|:Go back to [var1]:|:Go back to [var1] ! a:|:Back to Article:|:Back to Article ! a:|:Friend's Email::|:Friend's Email: ! a:|:Separate multiple addresses with commas. Maximum 200 characters.:|:Separate multiple addresses with commas. Maximum 200 characters. a:|:Your Full Name: (optional):|:Your Full Name: (optional) ! a:|:Your Email Address::|:Your Email Address: ! a:|:These email addresses will be used to email the information on your behalf and will not be collected or used by us for any marketing purposes without your permission.:|:These email addresses will be used to email the information on your behalf and will not be collected or used by us for any marketing purposes without your permission. ! a:|:Send a copy to yourself:|:Send a copy to yourself ! a:|:Enter a brief message to your friend: (optional):|:Enter a brief message to your friend: (optional) ! a:|:Full Information in HTML:|:Full Information in HTML ! a:|:Link Only:|:Link Only ! a:|:Enable comments for articles:|:Enable comments for articles ! a:|:An error occured while performing this operation:|:An error occured while performing this operation \ No newline at end of file --- 184,210 ---- a:|:The maximum uploaded image [var1] allowed is [var2] pixels:|:The maximum uploaded image [var1] allowed is [var2] pixels a:|:There was an error when inserting [var1] into the database [var2]:|:There was an error when inserting [var1] into the database [var2] + a:|:These email addresses will be used to email the information on your behalf and will not be collected or used by us for any marketing purposes without your permission.:|:These email addresses will be used to email the information on your behalf and will not be collected or used by us for any marketing purposes without your permission. + a:|:This article is currently being edited by :|:This article is currently being edited by a:|:This article is currently being edited by someone else:|:This article is currently being edited by someone else a:|:This Image Links To:|:This Image Links To + a:|:this lifetime:|:this lifetime a:|:Title:|:Title + a:|:To view the entire article, go to [var1] or [var2]:|:To view the entire article, go to [var1] or [var2] a:|:Try again in about [var1] minutes:|:Try again in about [var1] minutes + a:|:Updated:|:Updated a:|:Upload a new image:|:Upload a new image a:|:Upload images to the site:|:Upload images to the site a:|:User Settings:|:User Settings a:|:Users can only see articles that belong to a group that they are members of:|:Users can only see articles that belong to a group that they are members of + a:|:Version:|:Version + a:|:View Revision History:|:View Revision History + a:|:View this version on a new page:|:View this version on a new page + a:|:Would you like to send this article to a friend? Go to [var1] or [var2]:|:Would you like to send this article to a friend? Go to [var1] or [var2] a:|:Yes:|:Yes a:|:You can return and edit this article after you have saved it:|:You can return and edit this article after you have saved it + a:|:You however, will still be able to see and edit it.:|:You however, will still be able to see and edit it. a:|:You must provide a short description for your image:|:You must provide a short description for your image a:|:You tried to save an empty section:|:You tried to save an empty section ! a:|:Your Email Address:|:Your Email Address a:|:Your Full Name: (optional):|:Your Full Name: (optional) ! a:|:Your work has successfully been saved to the database!:|:Your work has successfully been saved to the database! |
|
From: Eloi G. <ada...@us...> - 2004-08-21 17:03:08
|
Update of /cvsroot/phpwebsite-comm/modules/article/templates In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29156/templates Modified Files: config.tpl Added Files: diff.tpl Log Message: 2.5 Release Files Index: config.tpl =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/article/templates/config.tpl,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** config.tpl 19 Feb 2004 21:48:55 -0000 1.3 --- config.tpl 21 Aug 2004 17:02:17 -0000 1.4 *************** *** 16,19 **** --- 16,21 ---- {RESTRICTED_VIEWING} <br /> + {ARCHIVE_DAYS} + <br /> <br /> --- NEW FILE: diff.tpl --- <h3> {TITLE} </h3> {BACKLINK} <br /> <br /> <center> <table border="0" bgcolor="#cff9f4" width="95%"> <tr> <td align="center" width="50%"><b>{THIS_LABEL}</b></td> <td align="center" width="50%"><b>{THAT_LABEL}</b></td> </tr> </table> {STATS} <table border="0" bgcolor="#cff9f4" width="95%"> {DIFFCONTENT} </table></center> <br /> <br /> <hr /> <h3>{TITLE2}</h3> <br /> <br /> {CURR_ARTICLE} |
|
From: Eloi G. <ada...@us...> - 2004-08-21 17:03:08
|
Update of /cvsroot/phpwebsite-comm/modules/article/templates/edit In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29156/templates/edit Modified Files: title.tpl Log Message: 2.5 Release Files Index: title.tpl =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/article/templates/edit/title.tpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** title.tpl 9 Jul 2003 20:24:29 -0000 1.1 --- title.tpl 21 Aug 2004 17:02:19 -0000 1.2 *************** *** 1,3 **** ! <div align="center">{LINK_BACK}</div> <!-- BEGIN TITLE --> <div class="bg_medium"> --- 1,3 ---- ! <div align="center">{LINK_BACK} {HISTORYLINK}</div> <!-- BEGIN TITLE --> <div class="bg_medium"> |
|
From: Eloi G. <ada...@us...> - 2004-08-21 17:03:08
|
Update of /cvsroot/phpwebsite-comm/modules/article/docs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29156/docs Modified Files: Changes.txt INTRODUCTION.txt Log Message: 2.5 Release Files Index: Changes.txt =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/article/docs/Changes.txt,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** Changes.txt 19 Jul 2004 22:20:48 -0000 1.10 --- Changes.txt 21 Aug 2004 17:02:11 -0000 1.11 *************** *** 1,4 **** ======================== ! Changes in version 2.4 ======================== - Fixed Bug Report [981572] Syntax error in AM_view_news.php. --- 1,20 ---- ======================== ! Changes in version 2.5 ! ======================== ! - Fixed bug preventing articles from being sent to Approval. ! - "Awaiting Approval" messages are now displayed to unauthorized users. ! - While set as the MainArticle, an article cannot be edited by anyone requiring Approval ! - Fixed syntax error in installation SQL script. ! - Fixed Bug Report [993439] "nbsp needs semicolons" ! - Fixed Bug Report [984920] "Non standard file names". The names of the "Page Insert" templates have been changed so that there are no more brackets. ! NEW FEATURE! Article revision tracking & management. ! Version history is accessed from a link at the top of the editing screen. ! - You can set how long old versions are kept via the "Configuration" button. ! - "Articles can be viewed by certain groups" has been deleted from Introduction.txt. ! - Fixed Feature Request [1001272] "multi-page menu titles" The first line of a multipage navigation list now shows the first section title instead of the article title. ! - Re-registered with the new Search Module ! ! ======================== ! Changes in version 2.4-1 ======================== - Fixed Bug Report [981572] Syntax error in AM_view_news.php. *************** *** 7,10 **** --- 23,28 ---- Changes in version 2.3 ======================== + NOTE: This version requires that you place the included file ImgLibrary.php in directory "/core", file "Image_Library.txt" in directory /docs/developers and files ImgLibrary_view_gallery.tpl & ImgLibrary_view_gallery.tpl in directory "/templates". + - Fixed double-display of section editing screen. - Fixed Bug Report [902591] "Bug in Image Library" Index: INTRODUCTION.txt =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/article/docs/INTRODUCTION.txt,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** INTRODUCTION.txt 22 Apr 2004 17:05:28 -0000 1.6 --- INTRODUCTION.txt 21 Aug 2004 17:02:11 -0000 1.7 *************** *** 27,31 **** Articles can be set to not show up in the homepage summary listings Articles can be assigned to topic categories - Articles can be viewed only by certain groups All of your old Announcements & PageMaster Module content can be imported Automatic rerouting of old mod.php, Announcements & PageMaster links --- 27,30 ---- *************** *** 37,43 **** Articles can generate customized webpage metatags You can edit "keywords" and "robots" metatags. ! NEW FEATURE! "Email A Friend" ! ! NOTE: The feature "Articles can be viewed only by certain groups" has been disabled pending the re-vamp of the FatCat module for phpWebsite version 0.93. --- 36,41 ---- Articles can generate customized webpage metatags You can edit "keywords" and "robots" metatags. ! "Email A Friend" ! NEW FEATURE! Article revision tracking & management. |
|
From: Eloi G. <ada...@us...> - 2004-08-21 17:03:07
|
Update of /cvsroot/phpwebsite-comm/modules/article/inc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29156/inc Modified Files: AM_list_articles.php AM_view_news.php A_edit.php A_mail.php A_save.php editconfig.php saveconfig.php Added Files: A_view_diff.php A_view_history.php Log Message: 2.5 Release Files Index: editconfig.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/article/inc/editconfig.php,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** editconfig.php 18 Jun 2004 23:31:10 -0000 1.7 --- editconfig.php 21 Aug 2004 17:02:13 -0000 1.8 *************** *** 93,96 **** --- 93,100 ---- . CLS_help::show_link('configmanager', 'default_allow_anon'); + /* archive_days*/ + $tags['ARCHIVE_DAYS'] = PHPWS_Form::formSelect('CONFIG_archive_days', range(0,60), $this->val['archive_days'], TRUE) + . ' ' . $_SESSION['translate']->it('Number of days to store old versions of articles in the archives.'); + $tags['USERS_LABEL'] = $_SESSION['translate']->it('Registered users can'); Index: AM_list_articles.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/article/inc/AM_list_articles.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** AM_list_articles.php 18 Jun 2004 23:31:09 -0000 1.3 --- AM_list_articles.php 21 Aug 2004 17:02:12 -0000 1.4 *************** *** 123,127 **** /* Set up Edit button */ ! if ($this->can('edit',$value['created_username'])) { /* If someone else is not editing this page... */ --- 123,127 ---- /* Set up Edit button */ ! if ($this->can('edit',$value['created_username'],$value['mainarticle'])) { /* If someone else is not editing this page... */ Index: A_mail.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/article/inc/A_mail.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** A_mail.php 18 Jun 2004 23:31:10 -0000 1.2 --- A_mail.php 21 Aug 2004 17:02:13 -0000 1.3 *************** *** 21,25 **** $homepage = substr(PHPWS_HOME_HTTP, 0, -1); if (isset($_POST['ART_s_msg'])) { ! $tags['MESSAGE_LABEL'] = $_SESSION['translate']->it('Personal Message:'); $tags['MESSAGE'] = $_POST['ART_s_msg']; } --- 21,25 ---- $homepage = substr(PHPWS_HOME_HTTP, 0, -1); if (isset($_POST['ART_s_msg'])) { ! $tags['MESSAGE_LABEL'] = $_SESSION['translate']->it('Personal Message').':'; $tags['MESSAGE'] = $_POST['ART_s_msg']; } *************** *** 107,116 **** $tags['SUMMARYTEXT'] = PHPWS_Text::parseOutput($this->summary); $tags['BACKLINK'] = '['.PHPWS_Text::moduleLink($_SESSION['translate']->it('Back to Article'), 'article', array('view'=>$this->id)). ']'; ! $tags['R_MAIL_LABEL'] = $_SESSION['translate']->it('Friend\'s Email:'); $tags['R_MAIL_ADDR'] = PHPWS_Form::formTextField('ART_r_email', NULL, 40); $tags['R_MAIL_HELP'] = $_SESSION['translate']->it('Separate multiple addresses with commas. Maximum 200 characters.'); $tags['S_NAME_LABEL'] = $_SESSION['translate']->it('Your Full Name: (optional)'); $tags['S_NAME'] = PHPWS_Form::formTextField('ART_s_name', $_SESSION['OBJ_user']->username, 40); ! $tags['S_MAIL_LABEL'] = $_SESSION['translate']->it('Your Email Address:'); $tags['S_MAIL_ADDR'] = PHPWS_Form::formTextField('ART_s_email', $_SESSION['OBJ_user']->email, 40); $tags['S_MAIL_HELP'] = $_SESSION['translate']->it('These email addresses will be used to email the information on your behalf and will not be collected or used by us for any marketing purposes without your permission.'); --- 107,116 ---- $tags['SUMMARYTEXT'] = PHPWS_Text::parseOutput($this->summary); $tags['BACKLINK'] = '['.PHPWS_Text::moduleLink($_SESSION['translate']->it('Back to Article'), 'article', array('view'=>$this->id)). ']'; ! $tags['R_MAIL_LABEL'] = $_SESSION['translate']->it('Friend\'s Email').':'; $tags['R_MAIL_ADDR'] = PHPWS_Form::formTextField('ART_r_email', NULL, 40); $tags['R_MAIL_HELP'] = $_SESSION['translate']->it('Separate multiple addresses with commas. Maximum 200 characters.'); $tags['S_NAME_LABEL'] = $_SESSION['translate']->it('Your Full Name: (optional)'); $tags['S_NAME'] = PHPWS_Form::formTextField('ART_s_name', $_SESSION['OBJ_user']->username, 40); ! $tags['S_MAIL_LABEL'] = $_SESSION['translate']->it('Your Email Address').':'; $tags['S_MAIL_ADDR'] = PHPWS_Form::formTextField('ART_s_email', $_SESSION['OBJ_user']->email, 40); $tags['S_MAIL_HELP'] = $_SESSION['translate']->it('These email addresses will be used to email the information on your behalf and will not be collected or used by us for any marketing purposes without your permission.'); Index: AM_view_news.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/article/inc/AM_view_news.php,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** AM_view_news.php 19 Jul 2004 22:20:49 -0000 1.4 --- AM_view_news.php 21 Aug 2004 17:02:12 -0000 1.5 *************** *** 43,47 **** $result = $GLOBALS['core']->getCol('SELECT id FROM ' . $this->sql_article_table ! . ' WHERE ' . $this->get_published_sql().' AND mainarticle=0'.$this->sql_predicate . $filter.$this->news_filter['order']; $this->pager->setData($result); $result = NULL; --- 43,47 ---- $result = $GLOBALS['core']->getCol('SELECT id FROM ' . $this->sql_article_table ! . ' WHERE ' . $this->get_published_sql().' AND mainarticle=0'.$this->sql_predicate . $filter.$this->news_filter['order']); $this->pager->setData($result); $result = NULL; *************** *** 72,81 **** /* Create NewsPage HTML */ $alphabet = PHPWS_User::alphabet(); ! $tags['ALPHABET'] = PHPWS_Text::moduleLink($_SESSION['translate']->it('ALL'), 'article', array('view'=>'news', 'newsFilter'=>'') ) . " \n"; foreach ($alphabet as $alphachar) if ($alphachar!=$this->news_filter['letter']) ! $tags['ALPHABET'] .= PHPWS_Text::moduleLink($alphachar, 'article', array('view'=>'news', 'newsFilter'=>$alphachar) ) . " \n"; else ! $tags['ALPHABET'] .= $alphachar . " \n"; $tags['PAGE_BACKWARD_LINK'] = $this->pager->getBackLink(); $tags['PAGE_FORWARD_LINK'] = $this->pager->getForwardLink(); --- 72,81 ---- /* Create NewsPage HTML */ $alphabet = PHPWS_User::alphabet(); ! $tags['ALPHABET'] = PHPWS_Text::moduleLink($_SESSION['translate']->it('ALL'), 'article', array('view'=>'news', 'newsFilter'=>'') ) . " \n"; foreach ($alphabet as $alphachar) if ($alphachar!=$this->news_filter['letter']) ! $tags['ALPHABET'] .= PHPWS_Text::moduleLink($alphachar, 'article', array('view'=>'news', 'newsFilter'=>$alphachar) ) . " \n"; else ! $tags['ALPHABET'] .= $alphachar . " \n"; $tags['PAGE_BACKWARD_LINK'] = $this->pager->getBackLink(); $tags['PAGE_FORWARD_LINK'] = $this->pager->getForwardLink(); Index: A_save.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/article/inc/A_save.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** A_save.php 18 Jun 2004 23:31:10 -0000 1.2 --- A_save.php 21 Aug 2004 17:02:13 -0000 1.3 *************** *** 6,10 **** * @version $Id$ * ! * @author Adam Morton <ad...@NO...> * @module Article Manager * @param none --- 6,10 ---- * @version $Id$ * ! * @author Eloi George <el...@NO...> * @module Article Manager * @param none *************** *** 17,21 **** $query_data['rank'] = $this->rank; $query_data['created_username'] = $this->created_username; ! $query_data['updated_username'] = $this->updated_username; $query_data['created_date'] = $this->created_date; $query_data['updated_date'] = $this->updated_date; --- 17,23 ---- $query_data['rank'] = $this->rank; $query_data['created_username'] = $this->created_username; ! $query_data['created_id'] = $this->created_id; ! $query_data['updated_username'] = $_SESSION['OBJ_user']->username; ! $query_data['updated_id'] = $_SESSION['OBJ_user']->user_id; $query_data['created_date'] = $this->created_date; $query_data['updated_date'] = $this->updated_date; *************** *** 81,97 **** . $_SESSION['translate']->it('There was an error when inserting [var1] into the database [var2]' ,'article data','mod_article').'!'; - else - /* otherwise, send it for Approval */ - if (!$this->approved) - { - $information = "\n<b>" . $this->title . "</b><br />\n" . substr($this->summary, 0, 50); - PHPWS_Approval::add($this->id, $information, 'article'); - $this->submitted = TRUE; - } } /* otherwise, update the data */ ! else ! $GLOBALS['core']->sqlUpdate($query_data, 'mod_article', 'id', $this->id); /* Set category in FatCat */ if(isset($_SESSION['OBJ_fatcat'])) --- 83,125 ---- . $_SESSION['translate']->it('There was an error when inserting [var1] into the database [var2]' ,'article data','mod_article').'!'; } /* otherwise, update the data */ ! else { ! $GLOBALS['core']->sqlUpdate($query_data, 'mod_article', 'id', $this->id); ! /* If we're archiving old versions, do it */ ! if($_SESSION['SES_ART_master']->val['archive_days']>0) { ! /* Create a Diff object. */ ! require_once(PHPWS_SOURCE_DIR . 'mod/article/class/unified_diff.php'); ! $that = unserialize(stripslashes($this->oldversion['data'])); ! $lines1 = PHPWS_Text::sentence($that->view(1,1)); ! $lines2 = PHPWS_Text::sentence($this->view(1,1)); ! $diff = &new Text_Diff($lines1, $lines2); ! /*Determine what changes were made */ ! $renderer = &new Text_Diff_Renderer_html(999); ! $renderer->render($diff); ! /* Commit the old version to the archives */ ! $archive_data['article_id'] = $this->id; ! $archive_data['version'] = $this->version-1; ! $archive_data['archived_date'] = $this->updated_date; ! $archive_data['updated_userid'] = $this->oldversion['userid']; ! $archive_data['numadded'] = $renderer->linesadded; ! $archive_data['numdeleted'] = $renderer->linesdeleted; ! $archive_data['numchanged'] = $renderer->lineschanged; ! $archive_data['article'] = $this->oldversion['data']; ! $GLOBALS['core']->sqlInsert($archive_data, 'mod_article_oldversions'); ! /* Erase any versions that are too old */ ! $GLOBALS['core']->sqlDelete('mod_article_oldversions', 'archived_date' ! , date('Y-m-d H:i:s', time()-(86400*$_SESSION['SES_ART_master']->val['archive_days'])) ! , '<'); ! } ! } + /* If it's not automatically approved, send it for Approval */ + if (!$this->approved && !PHPWS_Approval::waitingForApproval($this->id, 'article')) + { + $information = '
<b>' . $this->title . '</b><br />
' . substr($this->summary, 0, 50); + PHPWS_Approval::add($this->id, $information, 'article'); + $this->submitted = TRUE; + } /* Set category in FatCat */ if(isset($_SESSION['OBJ_fatcat'])) *************** *** 106,114 **** $content = $_SESSION['translate']->it('Your work has successfully been saved to the database!'); if(!$this->approved) ! $content .= '<br />'.$_SESSION['translate']->it('It will be published after approval by an administrator.'); $GLOBALS['CNT_article']['title'] = $_SESSION['translate']->it('Article Manager') .' - '. $_SESSION['translate']->it('Article Saved').'!'; $GLOBALS['CNT_article']['content'] = $content .'<br /><br />'. $this->menuLink; - ?> --- 134,142 ---- $content = $_SESSION['translate']->it('Your work has successfully been saved to the database!'); if(!$this->approved) ! $content .= '<br />'.$_SESSION['translate']->it('It will be published after approval by an administrator.') ! . '<br />'.$_SESSION['translate']->it('You however, will still be able to see and edit it.'); $GLOBALS['CNT_article']['title'] = $_SESSION['translate']->it('Article Manager') .' - '. $_SESSION['translate']->it('Article Saved').'!'; $GLOBALS['CNT_article']['content'] = $content .'<br /><br />'. $this->menuLink; ?> Index: A_edit.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/article/inc/A_edit.php,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** A_edit.php 19 Jul 2004 22:23:00 -0000 1.4 --- A_edit.php 21 Aug 2004 17:02:13 -0000 1.5 *************** *** 30,37 **** $this->setEditLock(true); $this->editmode = TRUE; /* Does article need to be re-approved? */ $this->approved = (!$_SESSION['SES_ART_master']->val['need_approval'] || $_SESSION['OBJ_user']->allow_access('approval')) ?1:0; } ! // Get Article Title $article_tags['TITLE_LABEL'] = $_SESSION['translate']->it('Title').':'; $article_tags['TITLE'] = PHPWS_Form::formTextField('ARTICLE_title', $this->title, 55, 70) --- 30,41 ---- $this->setEditLock(true); $this->editmode = TRUE; + /* Serialize the article to save as an archived version */ + $this->oldversion['data'] = addslashes(serialize($this)); + $this->oldversion['userid'] = $this->updated_id; /* Does article need to be re-approved? */ $this->approved = (!$_SESSION['SES_ART_master']->val['need_approval'] || $_SESSION['OBJ_user']->allow_access('approval')) ?1:0; } ! ! /* Get Article Title */ $article_tags['TITLE_LABEL'] = $_SESSION['translate']->it('Title').':'; $article_tags['TITLE'] = PHPWS_Form::formTextField('ARTICLE_title', $this->title, 55, 70) *************** *** 42,45 **** --- 46,53 ---- . $_SESSION['translate']->it('Main Menu') . '</a>'; + //Link to view article history + if($_SESSION['SES_ART_master']->val['archive_days']>0) + $article_tags['HISTORYLINK'] = '<a href="index.php?module=article&viewhistory='. $this->id.'" target="_blank">' . $_SESSION['translate']->it('View Revision History').'</a>'; + // Get the article summary text $article_tags['SUMMARY_LABEL'] = $_SESSION['translate']->it('Summary').':' --- NEW FILE: A_view_history.php --- <?php /** * Displays the revision history of this article. * * @author Eloi George <el...@NO...> * @module Article Manager * @param id : Id of the article to show. * @return none */ /* If user is unathorized to use this method, leave */ /* Construct revision history table template */ /* Append this content to the view of the current article */ /* Retrieve available revision data */ class PHPWS_history_list { function PHPWS_history_list($data) { if(is_array($data)) foreach($data as $key => $value) { $this->$key = $value; } } function getListDiff() { $curr = $_SESSION['translate']->it('Compare with the current version'); $prev = $_SESSION['translate']->it('Compare with the previous version'); return '[<a href="index.php?module=article&viewdiff=' . $_REQUEST['viewhistory'].'&this='.$this->version.'&that=current" title="' . $curr .'" alt="'.$curr.'">'.$_SESSION['translate']->it('curr') . '</a>] [<a href="index.php?module=article&viewdiff=' . $_REQUEST['viewhistory'].'&this='.$this->version.'&that=previous" title="' . $prev .'" alt="'.$prev.'">'.$_SESSION['translate']->it('last') . '</a>]'; } function getListPick() { return '<input name="this" value="'.$this->version.'" type="radio"><input name="that" value="'.$this->version.'" type="radio">'; } function getListArchived_date() { return date(PHPWS_DATE_FORMAT . ' ' . PHPWS_TIME_FORMAT, (strtotime($this->archived_date)+$GLOBALS['core']->datetime->time_dif)); } function getListUsername() { return $this->username; } function getListVersion() { $viewtext = $_SESSION['translate']->it('View this version on a new page'); return '<a href="index.php?module=article&viewarchive='.$_REQUEST['viewhistory'].'&version='.$this->version . '" title="'.$viewtext.'" alt="'.$viewtext.'" target="_blank">'.$this->version.'</a>'; } } if(!isset($this->_list)) $this->_list = new PHPWS_List; $this->_list->setModule('article'); $this->_list->setClass('PHPWS_history_list'); $this->_list->setTable('mod_article_oldversions LEFT JOIN '.PHPWS_TBL_PREFIX.'mod_users ON user_id=updated_userid'); $this->_list->setDbColumns(array('id','version','archived_date','numadded','numdeleted','numchanged','username')); $this->_list->setWhere('article_id='.$this->id); $this->_list->setOrder('version DESC'); $this->_list->setListColumns(array('version', 'diff', 'pick', 'archived_date', 'username')); $this->_list->setName('history'); $this->_list->setOp('viewhistory='.$this->id); $this->_list->setPaging(array('limit'=>20, 'section'=>TRUE, 'limits'=>array(5,10,20,50,100), 'back'=>'<<', 'forward'=>'>>', 'anchor'=>FALSE)); $tags = array(); $tags['ID'] = $this->id; $tags['TITLE1'] = $_SESSION['translate']->it('Revison History'); $tags['TITLE2'] = $_SESSION['translate']->it('The Current Version Is [var1]', $this->version); $tags['DIFF_LABEL'] = $_SESSION['translate']->it('Compare To').':'; $tags['VERSION_LABEL'] = $_SESSION['translate']->it('Version'); $tags['UPDATED_LABEL'] = $_SESSION['translate']->it('Updated'); $tags['EDITOR_LABEL'] = $_SESSION['translate']->it('Editor'); $tags['DIFF_HELP'] = CLS_help::show_link('article', 'history_picker'); $tags['COMPARE_BTN'] = $_SESSION['translate']->it('Compare Selected'); $this->_list->setExtraListTags($tags); $GLOBALS['CNT_article']['title'] = $this->title; $GLOBALS['CNT_article']['content'] = $this->_list->getList(); ?> Index: saveconfig.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/article/inc/saveconfig.php,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** saveconfig.php 18 Jun 2004 23:31:10 -0000 1.5 --- saveconfig.php 21 Aug 2004 17:02:13 -0000 1.6 *************** *** 46,51 **** $query_data['make_metatags'] = ($_POST['CONFIG_make_metatags'])?1:0; $query_data['brand_printable'] = ($_POST['CONFIG_brand_printable'])?1:0; ! $query_data['use_comments'] = ($_POST['CONFIG_use_comments'])?1:0; $GLOBALS['core']->sqlUpdate($query_data, 'mod_article_config'); ?> --- 46,56 ---- $query_data['make_metatags'] = ($_POST['CONFIG_make_metatags'])?1:0; $query_data['brand_printable'] = ($_POST['CONFIG_brand_printable'])?1:0; ! $query_data['use_comments'] = ($_POST['CONFIG_use_comments'])?1:0; ! $query_data['archive_days'] = $_POST['CONFIG_archive_days']; $GLOBALS['core']->sqlUpdate($query_data, 'mod_article_config'); + + /* Erase any versions that are too old */ + $GLOBALS['core']->sqlDelete('mod_article_oldversions', 'archived_date' + , date('Y-m-d H:i:s', time()-(86400*$query_data['archive_days'])), '<'); ?> --- NEW FILE: A_view_diff.php --- <?php /** * Displays differences between 2 versions of this article. * * @author Eloi George <el...@NO...> * @module Article Manager * @param int new : Version # of the newer revision. * @param int old : Version # of the older revision. * @return none */ /* If user is unathorized to use this method, leave */ /* Retrieve the requested versions */ /* If both the requested versions aren't available, leave */ /* Create Diff output of the requested versions */ /* Set the change summary text */ require_once(PHPWS_SOURCE_DIR . 'mod/article/class/unified_diff.php'); $sql = 'SELECT * FROM mod_article_oldversions WHERE article_id='.$this->id.' AND version='; /* Retrieve the older article version */ $result = $GLOBALS['core']->query($sql.$oldversion, 1); $viewtext = $_SESSION['translate']->it('View this version on a new page'); if ($result && $row = $result->fetchrow(DB_FETCHMODE_ASSOC)) { $old_object = unserialize(stripslashes($row['article'])); $tags['THIS_LABEL'] = $_SESSION['translate']->it('Revision [[var2]] as of [var1]', date(PHPWS_DATE_FORMAT . ' ' . PHPWS_TIME_FORMAT, (strtotime($old_object->updated_date)+$GLOBALS['core']->datetime->time_dif)) , '<a href="index.php?module=article&viewarchive='.$this->id.'&version='.$oldversion . '" title="'.$viewtext.'" alt="'.$viewtext.'" target="_blank">'.$oldversion.'</a>'); } else echo 'ERROR: Version '.$oldversion.' not found!!!<br />'; /* Retrieve the newer article version */ if($newversion==$this->version) { $new_object = $this; $tags['THAT_LABEL'] = $_SESSION['translate']->it('Current Version'); } else { $result = $GLOBALS['core']->query($sql.$newversion, 1); if ($result && $row = $result->fetchrow(DB_FETCHMODE_ASSOC)) { $new_object = unserialize(stripslashes($row['article'])); $tags['THAT_LABEL'] = $_SESSION['translate']->it('Revision [[var2]] as of [var1]', date(PHPWS_DATE_FORMAT . ' ' . PHPWS_TIME_FORMAT, (strtotime($new_object->updated_date)+$GLOBALS['core']->datetime->time_dif)) , '<a href="index.php?module=article&viewarchive='.$this->id.'&version='.$newversion . '" title="'.$viewtext.'" alt="'.$viewtext.'" target="_blank">'.$newversion.'</a>'); } else echo 'ERROR: Version '.$newversion.' not found!!!<br />'; } /* Create a Diff object. (Unified HTML - Tags Stripped) */ $allowedtags = '<b>,<a>,<i>,<img>,<h1>,<h2>,<h3>,<h4>,<h5>,<h6>,<font>'; $lines1 = PHPWS_Text::sentence(strip_tags($old_object->view(1,1), $allowedtags)); $lines2 = PHPWS_Text::sentence(strip_tags($new_object->view(1,1), $allowedtags)); $diff = &new Text_Diff($lines1, $lines2); /* Determine what changes were made */ $renderer = &new Text_Diff_Renderer_html(999); $tags['DIFFCONTENT'] = $renderer->render($diff); $tags['BACKLINK'] = '<a href="index.php?module=article&viewhistory='. $_REQUEST['viewdiff'].'">' . $_SESSION['translate']->it('Back To Revision History').'</a>'; $tags['TITLE'] = $_SESSION['translate']->it('Difference Between Revisions'); $tags['STATS'] = $_SESSION['translate']->it('Lines Added:[var1] Deleted:[var2] Changed:[var3]', (string)$renderer->linesadded, $renderer->linesdeleted, $renderer->lineschanged); $tags['TITLE2'] = $_SESSION['translate']->it('Current Version of This Article'); $tags['CURR_ARTICLE'] = $this->view(1,1); $GLOBALS['CNT_article']['title'] = $this->title; $GLOBALS['CNT_article']['content'] = PHPWS_Template::processTemplate($tags, 'article', 'diff.tpl'); ?> |
|
From: Eloi G. <ada...@us...> - 2004-08-21 17:03:06
|
Update of /cvsroot/phpwebsite-comm/modules/article In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29156 Modified Files: index.php Log Message: 2.5 Release Files Index: index.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/article/index.php,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** index.php 18 Jun 2004 23:31:10 -0000 1.8 --- index.php 21 Aug 2004 17:02:13 -0000 1.9 *************** *** 63,67 **** } /* Start processing module operation requests */ ! if (isset($_REQUEST['edit'])) { switch($_REQUEST['edit']) --- 63,92 ---- } /* Start processing module operation requests */ ! if (isset($_REQUEST['viewhistory'])) ! { ! $temp = new PHPWS_Article($_REQUEST['viewhistory']); ! $temp->view_history(); ! } ! elseif (isset($_REQUEST['viewarchive'])) ! { ! $sql = 'SELECT * FROM mod_article_oldversions WHERE article_id='.$_REQUEST['viewarchive'].' AND version='.$_REQUEST['version']; ! /* Retrieve the older article version */ ! $result = $GLOBALS['core']->query($sql, 1); ! if ($result && $row = $result->fetchrow(DB_FETCHMODE_ASSOC)) { ! $old_object = unserialize(stripslashes($row['article'])); ! $old_object->view(); ! } ! } ! elseif (isset($_REQUEST['viewdiff']) && isset($_REQUEST['that']) ! && isset($_REQUEST['this']) && is_numeric($_REQUEST['this'])) ! { ! $temp = new PHPWS_Article((int)$_REQUEST['viewdiff']); ! if ($_REQUEST['that']=='current') ! $_REQUEST['that'] = $temp->version; ! elseif ($_REQUEST['that']=='previous') ! $_REQUEST['that'] = $_REQUEST['this'] - 1; ! $temp->view_diff(min($_REQUEST['this'], $_REQUEST['that']), max($_REQUEST['this'], $_REQUEST['that'])); ! } ! elseif (isset($_REQUEST['edit'])) { switch($_REQUEST['edit']) *************** *** 131,135 **** default: $_SESSION['SES_ART_article'] = new PHPWS_Article($_REQUEST['edit']); ! if ($user->can('edit', $_SESSION['SES_ART_article']->created_username)) $_SESSION['SES_ART_article']->edit_article(); break; --- 156,160 ---- default: $_SESSION['SES_ART_article'] = new PHPWS_Article($_REQUEST['edit']); ! if ($user->can('edit', $_SESSION['SES_ART_article']->created_username, $_SESSION['SES_ART_article']->mainarticle)) $_SESSION['SES_ART_article']->edit_article(); break; |
|
From: Eloi G. <ada...@us...> - 2004-08-21 17:03:06
|
Update of /cvsroot/phpwebsite-comm/modules/article/conf In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29156/conf Modified Files: boost.php help.php Log Message: 2.5 Release Files Index: boost.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/article/conf/boost.php,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** boost.php 19 Jul 2004 22:20:20 -0000 1.11 --- boost.php 21 Aug 2004 17:02:10 -0000 1.12 *************** *** 19,23 **** $admin_mod = 1; $active = 'on'; ! $version = '2.4'; $mod_class_files = array('ArticleManager.php', --- 19,23 ---- $admin_mod = 1; $active = 'on'; ! $version = '2.5'; $mod_class_files = array('ArticleManager.php', Index: help.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/article/conf/help.php,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** help.php 18 Jun 2004 23:31:08 -0000 1.4 --- help.php 21 Aug 2004 17:02:10 -0000 1.5 *************** *** 153,155 **** --- 153,158 ---- $lock_expiration_time = 'Lock Expiration Time'; $lock_expiration_time = 'Once someone starts editing an article, noone else can open it for editing until either they save it, press the "Cancel Editing" or "Back to Menu" buttons, or this amount of time has passed.'; + + $history_picker = 'Viewing Revision Histories'; + $history_picker = 'Ever wonder what changes an article went through between then and now? Here is where you can find out. This screen gives you 4 main options<br /><br /><b>Compare Against Current</b><br />Selecting one of the "Current" links will show you what text has been changed between the corresponding article and the current version. <br /><br /><b>Compare Against Previous</b><br />Selecting one of the "Last" links will show you what text has been changed between the corresponding article and the next oldest version.<br /><br /><b>Compare Against Selected</b><br />The 2 colums of buttons let you select two specific versions that you\'d like to compare.<br /><br /><b>See Specific Version</b><br />If you want to see what a specific version of this article looked like, click on the version number on the left side of the list. A new page will open containing that version.'; ?> |
|
From: Eloi G. <ada...@us...> - 2004-08-21 17:02:50
|
Update of /cvsroot/phpwebsite-comm/modules/article/class In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29156/class Modified Files: Article.php ArticleManager.php Added Files: unified_diff.php Log Message: 2.5 Release Files Index: Article.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/article/class/Article.php,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** Article.php 18 Jun 2004 23:31:07 -0000 1.18 --- Article.php 21 Aug 2004 17:02:08 -0000 1.19 *************** *** 44,48 **** * @param string meta_keywords : Keywords to include in this page's metatags * @param string meta_robots : Search Engine instructions for this page's metatags ! //* @param array categories : Temporary holding array of selected categories * */ --- 44,48 ---- * @param string meta_keywords : Keywords to include in this page's metatags * @param string meta_robots : Search Engine instructions for this page's metatags ! * @param string oldversion : Serialized copy of this article for archiving * */ *************** *** 58,62 **** --- 58,64 ---- var $rank; var $created_username; + var $created_id; var $updated_username; + var $updated_id; var $created_date; var $updated_date; *************** *** 79,82 **** --- 81,85 ---- var $meta_keywords; var $meta_robots; + var $oldversion; /** *************** *** 97,102 **** $this->sectionID = 'a'; $this->editmode = FALSE; /* If this is to be an existing article... */ ! if($id) { /* If this is a regular (full) article, load all variables into $data */ --- 100,112 ---- $this->sectionID = 'a'; $this->editmode = FALSE; + /* If this is to be an existing article... */ ! if(substr($id,0,3)=='arc') ! { ! echo 'archive '.substr($id,4).'requested'; ! exit; ! } ! /* If this is to be an existing article... */ ! elseif($id) { /* If this is a regular (full) article, load all variables into $data */ *************** *** 122,126 **** --- 132,138 ---- $this->rank = $data['rank']; $this->created_username = $data['created_username']; + $this->created_id = $data['created_id']; $this->updated_username = $data['updated_username']; + $this->updated_id = $data['updated_id']; $this->created_date = $data['created_date']; $this->updated_date = $data['updated_date']; *************** *** 150,157 **** $this->mainarticle = 0; $this->rank = 50; ! if ($_SESSION['OBJ_user']->username) $this->created_username = $this->updated_username = $_SESSION['OBJ_user']->username; ! else ! $this->created_username = $this->updated_username = " "; $this->created_date = date("Y-m-d H:i:s"); $this->updated_date = date("Y-m-d H:i:s"); --- 162,173 ---- $this->mainarticle = 0; $this->rank = 50; ! if ($_SESSION['OBJ_user']->username) { $this->created_username = $this->updated_username = $_SESSION['OBJ_user']->username; ! $this->created_id = $this->updated_id = $_SESSION['OBJ_user']->user_id; ! } ! else { ! $this->created_username = $this->updated_username = ""; ! $this->created_id = $this->updated_id = ""; ! } $this->created_date = date("Y-m-d H:i:s"); $this->updated_date = date("Y-m-d H:i:s"); *************** *** 170,175 **** $this->pages = 1; $this->template = $_SESSION['SES_ART_master']->val['default_article_template']; - $this->approved = ($_SESSION['OBJ_user']->allow_access('article', 'create_articles') - || !$_SESSION['SES_ART_master']->val['need_approval']) ?1:0; $this->version = -1; $this->announce = 1; --- 186,189 ---- *************** *** 201,205 **** if ($Fullpage && !$this->is_viewable()) { ! $GLOBALS['CNT_article']['content'] = $_SESSION['translate']->it('The article you requested is not viewable.'); PHPWS_Fatcat::deactivate($this->id, 'article'); --- 215,224 ---- if ($Fullpage && !$this->is_viewable()) { ! $GLOBALS['CNT_article']['title'] = $_SESSION['translate']->it('Sorry!'); ! if(!$this->approved) ! $GLOBALS['CNT_article']['content'] = ! $_SESSION['translate']->it('The article you requested is awaiting approval by an administrator.'); ! else ! $GLOBALS['CNT_article']['content'] = $_SESSION['translate']->it('The article you requested is not viewable.'); PHPWS_Fatcat::deactivate($this->id, 'article'); *************** *** 214,225 **** $article_tags['TITLE'] = $this->title; if ($this->summary) $article_tags['SUMMARYTEXT'] = PHPWS_Text::parseOutput($this->summary); $article_tags['HITS'] = $this->hits; $article_tags['CREATED_DATE'] = date(PHPWS_DATE_FORMAT . ' ' . PHPWS_TIME_FORMAT, (strtotime($this->created_date)+$GLOBALS['core']->datetime->time_dif)); - ; $article_tags['UPDATED_DATE'] = date(PHPWS_DATE_FORMAT . ' ' . PHPWS_TIME_FORMAT, (strtotime($this->updated_date)+$GLOBALS['core']->datetime->time_dif)); $article_tags['EXPIRATION_DATE'] = date(PHPWS_DATE_FORMAT . ' ' . PHPWS_TIME_FORMAT, (strtotime($this->expiration_date)+$GLOBALS['core']->datetime->time_dif)); $article_tags['PUBLICATION_DATE'] = date(PHPWS_DATE_FORMAT . ' ' . PHPWS_TIME_FORMAT, (strtotime($this->publication_date)+$GLOBALS['core']->datetime->time_dif)); /* If Username is blank, substitute "Anonymous" */ --- 233,248 ---- $article_tags['TITLE'] = $this->title; + if(isset($_REQUEST['viewarchive'])) + $article_tags['TITLE'] .= '<br />'.$_SESSION['translate']->it('Archived Version [var1]', $this->version); if ($this->summary) $article_tags['SUMMARYTEXT'] = PHPWS_Text::parseOutput($this->summary); + if(!$this->approved) + $article_tags['SUMMARYTEXT'] .= '<br />'.$_SESSION['translate']->it('<b>NOTE:</b> This [var1] is awaiting approval. Visitors cannot see it', $_SESSION['translate']->it('article')); $article_tags['HITS'] = $this->hits; $article_tags['CREATED_DATE'] = date(PHPWS_DATE_FORMAT . ' ' . PHPWS_TIME_FORMAT, (strtotime($this->created_date)+$GLOBALS['core']->datetime->time_dif)); $article_tags['UPDATED_DATE'] = date(PHPWS_DATE_FORMAT . ' ' . PHPWS_TIME_FORMAT, (strtotime($this->updated_date)+$GLOBALS['core']->datetime->time_dif)); $article_tags['EXPIRATION_DATE'] = date(PHPWS_DATE_FORMAT . ' ' . PHPWS_TIME_FORMAT, (strtotime($this->expiration_date)+$GLOBALS['core']->datetime->time_dif)); $article_tags['PUBLICATION_DATE'] = date(PHPWS_DATE_FORMAT . ' ' . PHPWS_TIME_FORMAT, (strtotime($this->publication_date)+$GLOBALS['core']->datetime->time_dif)); + $article_tags['VERSION'] = $this->version; /* If Username is blank, substitute "Anonymous" */ *************** *** 239,243 **** $_SESSION['OBJ_layout']->meta_vars['meta_robots'] = $this->meta_robots; } ! $article_tags['CREATED_TEXT'] = $_SESSION['translate']->it('Created by [var1] on [var2]' , $this->created_username, $article_tags['CREATED_DATE']); $article_tags['UPDATED_TEXT'] = $_SESSION['translate']->it('Last updated by [var1] on [var2]' --- 262,266 ---- $_SESSION['OBJ_layout']->meta_vars['meta_robots'] = $this->meta_robots; } ! $article_tags['CREATED_TEXT'] = $_SESSION['translate']->it('Created By [var1] on [var2]' , $this->created_username, $article_tags['CREATED_DATE']); $article_tags['UPDATED_TEXT'] = $_SESSION['translate']->it('Last updated by [var1] on [var2]' *************** *** 248,252 **** $printAll = (isset($_REQUEST['page_num']) && $_REQUEST['page_num']=='all') || isset($_REQUEST['lay_quiet']); /* Keep track of any sub-page titles for the NavBar */ ! $page_list[] = $this->title; $page_count = 1; /* Construct article sections */ --- 271,278 ---- $printAll = (isset($_REQUEST['page_num']) && $_REQUEST['page_num']=='all') || isset($_REQUEST['lay_quiet']); /* Keep track of any sub-page titles for the NavBar */ ! if(!empty($this->sections[reset($this->order)]->title)) ! $page_list[] = $this->sections[reset($this->order)]->title; ! else ! $page_list[] = $this->title; $page_count = 1; /* Construct article sections */ *************** *** 338,355 **** } if (!$this->mainarticle) { $article_tags['PRINT_ICON'] = '<a href="' . $article_link .'&lay_quiet=1" target="_blank"><img src="http://' . PHPWS_SOURCE_HTTP . 'mod/article/img/print.gif" border="0" width="22" height="20" alt="' ! . $_SESSION['translate']->it('Printable Version') . '" title="' ! . $_SESSION['translate']->it('Printable Version') . '"/></a>'; $article_tags['EMAIL'] = '<a href="./index.php?module=article&email='.$this->id .'"><img src="http://'. PHPWS_SOURCE_HTTP . 'mod/article/img/mailto.png" border="0" width="19" height="12" alt="' ! . $_SESSION['translate']->it('E-mail this Article to a Friend') . '" title="' ! . $_SESSION['translate']->it('E-mail this Article to a Friend') . '"/></a>'; } /* if user can edit articles or can edit this article... */ ! if ($_SESSION['SES_ART_master']->can('edit',$this->created_username)) /* If someone else is editing this page... */ if ($this->isLocked($this->editlock, $this->edituser)) --- 364,382 ---- } if (!$this->mainarticle) { + $s = $_SESSION['translate']->it('Printable Version'); $article_tags['PRINT_ICON'] = '<a href="' . $article_link .'&lay_quiet=1" target="_blank"><img src="http://' . PHPWS_SOURCE_HTTP . 'mod/article/img/print.gif" border="0" width="22" height="20" alt="' ! . $s . '" title="'. $s . '"/></a>'; ! $s = $_SESSION['translate']->it('E-mail this Article to a Friend'); $article_tags['EMAIL'] = '<a href="./index.php?module=article&email='.$this->id .'"><img src="http://'. PHPWS_SOURCE_HTTP . 'mod/article/img/mailto.png" border="0" width="19" height="12" alt="' ! . $s . '" title="' . $s . '"/></a>'; } /* if user can edit articles or can edit this article... */ ! if ($_SESSION['SES_ART_master']->can('edit',$this->created_username) ! && !($this->mainarticle && !$_SESSION['OBJ_user']->allow_access('approval'))) /* If someone else is editing this page... */ if ($this->isLocked($this->editlock, $this->edituser)) *************** *** 718,721 **** --- 745,789 ---- include(PHPWS_SOURCE_DIR . 'mod/article/inc/A_mail.php'); } + + /** + * Prepares the article for serialization & archival storage + * + * @author Eloi George <el...@NO...> + * @module Article Manager + * @param none + * @return none + */ + function _sleep () + { + unset($this->oldversion); + return $this; + } + + /** + * Displays the revision history of this article. + * + * @author Eloi George <el...@NO...> + * @module Article Manager + * @param none + * @return none + */ + function view_history () + { + include(PHPWS_SOURCE_DIR . 'mod/article/inc/A_view_history.php'); + } + + /** + * Displays differences between 2 versions of this article. + * + * @author Eloi George <el...@NO...> + * @module Article Manager + * @param int oldversion : Version # of the older revision. + * @param int newversion : Version # of the newer revision. + * @return none + */ + function view_diff ($oldversion, $newversion) + { + include(PHPWS_SOURCE_DIR . 'mod/article/inc/A_view_diff.php'); + } } ?> \ No newline at end of file --- NEW FILE: unified_diff.php --- <?php require_once(PHPWS_SOURCE_DIR . 'mod/article/lib/pear/Text/Diff.php'); require_once(PHPWS_SOURCE_DIR . 'mod/article/lib/pear/Text/Diff/Renderer.php'); /** * This is a "HTML" diff renderer. class. * * This class renders a diff in "Html diff" format. * * @version $Id: unified_diff.php,v 1.1 2004/08/21 17:02:09 adarkling Exp $ * * @author Eloi George <el...@NO...> * @module Article Manager * @param int context_lines : Number of leading context "lines" to preserve. */ class Text_Diff_Renderer_html extends Text_Diff_Renderer { /** * Number of leading context "lines" to preserve. * * This should be left at zero for this class, but subclasses * may want to set this to other values. */ var $linesadded = 0; /** * Number of leading context "lines" to preserve. * * This should be left at zero for this class, but subclasses * may want to set this to other values. */ var $linesdeleted = 0; /** * Number of leading context "lines" to preserve. * * This should be left at zero for this class, but subclasses * may want to set this to other values. */ var $lineschanged = 0; function Text_Diff_Renderer_html($context_lines = 4) { $this->_leading_context_lines = $context_lines; $this->_trailing_context_lines = $context_lines; } function _blockHeader($xbeg, $xlen, $ybeg, $ylen) {} function _lines($lines, $prefix = ' ', $suffix = ' ') { foreach ($lines as $line) { echo "$prefix$line$suffix\n"; } } function _context($lines) { $this->_lines($lines, '<tr><td colspan="4">', '</td></tr>'); } function _added($lines) { $this->linesadded=$this->linesadded+count($lines); $this->_lines($lines, '<tr><td width="50%" colspan="2"> </td><td width="2%" bgcolor="white">++</td><td width="45%" bgcolor="#ebf9a4">', '</td></tr>'); } function _deleted($lines) { $this->linesdeleted=$this->linesdeleted+count($lines); $this->_lines($lines, '<tr><td width="2%" bgcolor="white">--</td><td bgcolor="#ffdbde" width="45%">', '</td><td width="50%" colspan="2"> </td></tr>'); } function _changed($orig, $final) { $orig = array_pad($orig, count($final), ' '); $final = array_pad($final, count($orig), ' '); $this->lineschanged=$this->lineschanged+count($final); while (($origLine = each($orig)) && ($finalLine = each($final))) { $this->_lines(array($origLine[1]), '<tr><td width="2%" bgcolor="white">--</td><td bgcolor="#ffdbde" width="50%">', '</td>'); $this->_lines(array($finalLine[1]), '<td width="2%" bgcolor="white">++</td><td bgcolor="#ebf9a4" width="50%">', '</td></tr>'); } } } ?> Index: ArticleManager.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/article/class/ArticleManager.php,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** ArticleManager.php 18 Jun 2004 23:31:07 -0000 1.12 --- ArticleManager.php 21 Aug 2004 17:02:08 -0000 1.13 *************** *** 304,308 **** $content .= date('F d', strtotime($summary['updated_date'])) . ' <br />' . PHPWS_Text::moduleLink($summary['title'], 'article' ! ,array('view'=>$summary['id']))."\n"; } if (isset($content)) --- 304,308 ---- $content .= date('F d', strtotime($summary['updated_date'])) . ' <br />' . PHPWS_Text::moduleLink($summary['title'], 'article' ! ,array('view'=>$summary['id'])).'
'; } if (isset($content)) *************** *** 346,350 **** $content .= date('F d', strtotime($summary['updated_date'])) . ' <br />' . PHPWS_Text::moduleLink($summary['title'], 'article' ! ,array('view'=>$summary['id']))."\n"; } if (isset($content)) --- 346,350 ---- $content .= date('F d', strtotime($summary['updated_date'])) . ' <br />' . PHPWS_Text::moduleLink($summary['title'], 'article' ! ,array('view'=>$summary['id'])).'
'; } if (isset($content)) *************** *** 406,416 **** * @access public */ ! function can($action = NULL, $username = NULL) { if ($action == "edit") ! return ($_SESSION['OBJ_user']->allow_access('article', "edit_articles") || ((($this->val['users_can_submit'] && $_SESSION['OBJ_user']->isUser()) || $_SESSION['OBJ_user']->allow_access('article', "edit_own_article")) ! && $_SESSION['OBJ_user']->username==$username)); elseif ($action == "delete") --- 406,417 ---- * @access public */ ! function can($action = NULL, $username = NULL, $is_mainarticle=NULL) { if ($action == "edit") ! return (($_SESSION['OBJ_user']->allow_access('article', "edit_articles") || ((($this->val['users_can_submit'] && $_SESSION['OBJ_user']->isUser()) || $_SESSION['OBJ_user']->allow_access('article', "edit_own_article")) ! && $_SESSION['OBJ_user']->username==$username)) ! && !($this->val['need_approval'] && $is_mainarticle && !$_SESSION['OBJ_user']->allow_access('approval'))); elseif ($action == "delete") *************** *** 440,447 **** if (isset($this->error[$type])) { ! $str = "\n<span class=\"errortext\">ERROR!<br />\n"; foreach($this->error[$type] as $msg) ! $str .= $msg . "<br />\n"; ! $str .= "</span>\n"; unset($this->error[$type]); return $str; --- 441,448 ---- if (isset($this->error[$type])) { ! $str = '
<span class="errortext">ERROR!<br />
'; foreach($this->error[$type] as $msg) ! $str .= $msg . '<br />
'; ! $str .= '</span>
'; unset($this->error[$type]); return $str; |
|
From: Eloi G. <ada...@us...> - 2004-08-21 17:02:49
|
Update of /cvsroot/phpwebsite-comm/modules/article/boost In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29156/boost Modified Files: install.sql uninstall.php update.php Log Message: 2.5 Release Files Index: install.sql =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/article/boost/install.sql,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** install.sql 19 Feb 2004 21:46:37 -0000 1.7 --- install.sql 21 Aug 2004 17:02:05 -0000 1.8 *************** *** 8,11 **** --- 8,12 ---- created_id int NOT NULL DEFAULT '0', updated_username varchar(20) NOT NULL, + updated_id int NOT NULL DEFAULT '0', created_date datetime NOT NULL, updated_date datetime NOT NULL, *************** *** 33,38 **** ); ! INSERT INTO mod_article VALUES ('Article Manager Demo Article', 'a:1:{i:0;i:1;}', 1, 50, 'eloi', 'eloi', '2002-12-05 13:51:40', '2002-12-05 15:29:24', '', 0, 0, 16, '2007-12-05 00:00:00', '2002-12-05 00:00:00', 54, 1, 'Blank', 0, 0, 1, 0, 1); ! INSERT INTO mod_article VALUES ('Introduction to Article Manager', 'a:11:{i:0;i:2;i:1;i:3;i:2;i:4;i:3;i:6;i:4;i:7;i:5;i:5;i:6;i:8;i:7;i:9;i:8;i:10;i:9;i:11;i:10;i:12;}', 0, 50, 'eloi', 'eloi', '2002-12-05 15:14:06', '2003-03-25 23:19:36', 'The ArticleManager module lets you create dynamic web articles that display your site\'s content the way -you- want it to be displayed!', 0, 0, 57, '2007-12-05 00:00:00', '2002-12-05 00:00:00', 1661, 5, 'Blank', 0, 0, 1, 3, 1); --- 34,39 ---- ); ! INSERT INTO mod_article VALUES ('Article Manager Demo Article', 'a:1:{i:0;i:1;}', 1, 50, 'eloi', 1, 'eloi', '2002-12-05 13:51:40', '2002-12-05 15:29:24', '', 0, 0, 16, '2007-12-05 00:00:00', '2002-12-05 00:00:00', 54, 1, 'Blank', 0, 0, 1, 0, 1); ! INSERT INTO mod_article VALUES ('Introduction to Article Manager', 'a:11:{i:0;i:2;i:1;i:3;i:2;i:4;i:3;i:6;i:4;i:7;i:5;i:5;i:6;i:8;i:7;i:9;i:8;i:10;i:9;i:11;i:10;i:12;}', 0, 50, 'eloi', 1, 'eloi', '2002-12-05 15:14:06', '2003-03-25 23:19:36', 'The ArticleManager module lets you create dynamic web articles that display your site\'s content the way -you- want it to be displayed!', 0, 0, 57, '2007-12-05 00:00:00', '2002-12-05 00:00:00', 1661, 5, 'Blank', 0, 0, 1, 3, 1); *************** *** 57,61 **** INSERT INTO mod_article_sections VALUES ('Article Manager Demo Section', 'Welcome to Article Manager!\r\n\r\nThis article was automatically generated when you installed Article Manager.\r\n\r\nIf you want to see an overview of the features of this module, check out "<a href="index.php?module=article&view=2">Introduction to Article Manager</a>".\r\n\r\nTo get started using Article Manager, proceed to the <a href="index.php?module=article&disp=main_menu">administrative menu</a> or go the the <a href="index.php?module=article&disp=news">"News"</a> page that lists all articles on your site.\r\n\r\nAnd most importantly, have fun with it!\r\n<strong><font color="#FF0000">eloi</font></strong>', '', '', 0, 0, '', '', '', 'Centered_Image', 0, 1); ! INSERT INTO mod_article_sections VALUES ('Features', '<b>NOTE:</b> <i>This introduction is for demo purposes only and is current as of the first release of Article Manager. For the most up-to-date version, look under the docs directory.</i>\r\n\r\nCustom articles - each section can look completely different\r\nDefine your own article and section templates\r\nAdmins can allow/deny ability to display external pages in an embedded frame\r\nUsers can add comments to your article\r\nUsers can view a list of the articles that they have created\r\nArticles keep track of how many times they\'ve been viewed\r\nArticles can be set to start showing at a future date\r\nArticles can expire on specified dates\r\nArticles can be viewed in summary format with a link to the full article\r\nMULTI-ARTICLE STORIES with automatic navigation controls!\r\nOptimization: Images are stored in multiple directories for faster access\r\nA library of approved images can be easily maintained\r\nImages can be clickable links with alternate text and photo captions\r\nExpired articles can be accessed from a list and re-activated\r\nModule settings are easily changeable\r\nUser-submitted articles can require approval before activation\r\n"Also on this site.." Block\r\n"Previous n Articles" Block\r\n"Most Popular Articles" Block\r\nArticles can be set to not show up in the homepage summary listings\r\nArticles can be assigned to topic categories\r\nArticles can be viewed only by certain groups\r\nAll of your old Announcements & PageMaster Module content can be imported\r\nAutomatic rerouting of old mod.php, Announcements & PageMaster links\r\nDisplay a printable version\r\nNothing is saved to disk until you hit "Save Page"\r\n"Edit Locking" - Only 1 user can edit a page at a time\r\nA "News" page that displays all articles', '', '', 0, 0, '', '', '', 'Centered_Image', 0, 5); INSERT INTO mod_article_sections VALUES ('The Main Menu', 'The main menu is the nerve center of the entire module. It allows you to do four basic tasks -- list articles, create a new article, change Article Manager configuration settings and manage the Image Library.', '', '', 0, 0, '', '', '', 'Centered_Image', 1, 3); INSERT INTO mod_article_sections VALUES ('List Articles:', 'Here you can choose to view all approved articles on the site or just your articles ordered by Title or by the date of creation, publication, expiration, or the last update. This list can be viewed in ascending or descending order.\r\n\r\nEach article in the listing is accompanied by buttons allowing you to set it as the homepage, edit it, delete it, or immediately publish or expire it. Of course buttons or options can only be seen if you are authorized to use them.', '', '', 0, 0, '', '', '', 'Centered_Image', 0, 2); --- 58,62 ---- INSERT INTO mod_article_sections VALUES ('Article Manager Demo Section', 'Welcome to Article Manager!\r\n\r\nThis article was automatically generated when you installed Article Manager.\r\n\r\nIf you want to see an overview of the features of this module, check out "<a href="index.php?module=article&view=2">Introduction to Article Manager</a>".\r\n\r\nTo get started using Article Manager, proceed to the <a href="index.php?module=article&disp=main_menu">administrative menu</a> or go the the <a href="index.php?module=article&disp=news">"News"</a> page that lists all articles on your site.\r\n\r\nAnd most importantly, have fun with it!\r\n<strong><font color="#FF0000">eloi</font></strong>', '', '', 0, 0, '', '', '', 'Centered_Image', 0, 1); ! INSERT INTO mod_article_sections VALUES ('Features', '<b>NOTE:</b> <i>This introduction is for demo purposes only and is current as of the first release of Article Manager. For the most up-to-date version, look under the docs directory.</i>\r\n\r\nCustom articles - each section can look completely different\r\nDefine your own article and section templates\r\nAdmins can allow/deny ability to display external pages in an embedded frame\r\nUsers can add comments to your article\r\nUsers can view a list of the articles that they have created\r\nArticles keep track of how many times they\'ve been viewed\r\nArticles can be set to start showing at a future date\r\nArticles can expire on specified dates\r\nArticles can be viewed in summary format with a link to the full article\r\nMULTI-ARTICLE STORIES with automatic navigation controls!\r\nOptimization: Images are stored in multiple directories for faster access\r\nA library of approved images can be easily maintained\r\nImages can be clickable links with alternate text and photo captions\r\nExpired articles can be accessed from a list and re-activated\r\nModule settings are easily changeable\r\nUser-submitted articles can require approval before activation\r\n"Also on this site.." Block\r\n"Previous n Articles" Block\r\n"Most Popular Articles" Block\r\nArticles can be set to not show up in the homepage summary listings\r\nArticles can be assigned to topic categories\r\nAll of your old Announcements & PageMaster Module content can be imported\r\nAutomatic rerouting of old mod.php, Announcements & PageMaster links\r\nDisplay a printable version\r\nNothing is saved to disk until you hit "Save Page"\r\n"Edit Locking" - Only 1 user can edit a page at a time\r\nA "News" page that displays all articles\r\nAn "Archives" page that lists all articles created or updated on a certain day, month or year. Perfect for blogs!\r\nArticles can generate customized webpage metatags\r\nYou can edit "keywords" and "robots" metatags.\r\n"Email A Friend"\r\nNEW FEATURE! Article revision tracking & management.', '', '', 0, 0, '', '', '', 'Centered_Image', 0, 5); INSERT INTO mod_article_sections VALUES ('The Main Menu', 'The main menu is the nerve center of the entire module. It allows you to do four basic tasks -- list articles, create a new article, change Article Manager configuration settings and manage the Image Library.', '', '', 0, 0, '', '', '', 'Centered_Image', 1, 3); INSERT INTO mod_article_sections VALUES ('List Articles:', 'Here you can choose to view all approved articles on the site or just your articles ordered by Title or by the date of creation, publication, expiration, or the last update. This list can be viewed in ascending or descending order.\r\n\r\nEach article in the listing is accompanied by buttons allowing you to set it as the homepage, edit it, delete it, or immediately publish or expire it. Of course buttons or options can only be seen if you are authorized to use them.', '', '', 0, 0, '', '', '', 'Centered_Image', 0, 2); *************** *** 71,116 **** CREATE TABLE mod_article_config ( ! default_article_template varchar(255) NOT NULL DEFAULT "Blank", ! default_section_template varchar(255) NOT NULL DEFAULT "Centered_Image", ! popular_articles smallint NOT NULL DEFAULT '5', ! summaries_on_homepage smallint NOT NULL DEFAULT '5', ! prev_n_articles smallint NOT NULL DEFAULT '5', ! listings_per_page smallint NOT NULL DEFAULT '20', ! need_approval smallint NOT NULL DEFAULT '1', ! default_allow_comments smallint NOT NULL DEFAULT '1', ! default_allow_anon smallint NOT NULL DEFAULT '0', ! can_expire smallint NOT NULL DEFAULT '0', ! expiration_years smallint NOT NULL DEFAULT '3', ! expiration_months smallint NOT NULL DEFAULT '0', ! expiration_days smallint NOT NULL DEFAULT '0', ! default_year_count smallint NOT NULL DEFAULT '10', ! max_image_size int NOT NULL DEFAULT '26700', ! max_image_height int NOT NULL DEFAULT '400', ! max_image_width int NOT NULL DEFAULT '400', ! users_can_submit smallint NOT NULL DEFAULT '0', ! users_select_article_tpl smallint NOT NULL DEFAULT '0', ! users_select_section_tpl smallint NOT NULL DEFAULT '0', ! users_allow_comments smallint NOT NULL DEFAULT '0', ! users_change_dates smallint NOT NULL DEFAULT '0', ! user_images_in_article smallint NOT NULL DEFAULT '0', ! user_upload_images smallint NOT NULL DEFAULT '0', ! restricted_viewing smallint NOT NULL DEFAULT '0', ! lock_expiration_time int NOT NULL DEFAULT '3600', ! make_metatags smallint NOT NULL DEFAULT '0', ! brand_printable smallint NOT NULL DEFAULT '0', ! print_header text NOT NULL, ! use_comments smallint NOT NULL DEFAULT '1' ); ! INSERT INTO mod_article_config VALUES ('Blank', 'Centered_Image', 5, 5, 5, 20, 1, 1, 0, 0, 3, 0, 0, 10, 26, 400, 400, 0, 0, 0, 0, 0, 0, 0, 0, 3600, 0, 0, '\r\n\r\n'); CREATE TABLE mod_article_oldversions ( ! id int PRIMARY KEY, ! article_id int NOT NULL, ! archived_date datetime NOT NULL, ! changes text NOT NULL, ! ! key (article_id), ! key (archived_date) ); --- 72,124 ---- CREATE TABLE mod_article_config ( ! default_article_template varchar(255) NOT NULL DEFAULT "Blank", ! default_section_template varchar(255) NOT NULL DEFAULT "Centered_Image", ! popular_articles smallint NOT NULL DEFAULT '5', ! summaries_on_homepage smallint NOT NULL DEFAULT '5', ! prev_n_articles smallint NOT NULL DEFAULT '5', ! listings_per_page smallint NOT NULL DEFAULT '20', ! need_approval smallint NOT NULL DEFAULT '1', ! default_allow_comments smallint NOT NULL DEFAULT '1', ! default_allow_anon smallint NOT NULL DEFAULT '0', ! can_expire smallint NOT NULL DEFAULT '0', ! expiration_years smallint NOT NULL DEFAULT '3', ! expiration_months smallint NOT NULL DEFAULT '0', ! expiration_days smallint NOT NULL DEFAULT '0', ! default_year_count smallint NOT NULL DEFAULT '10', ! max_image_size int NOT NULL DEFAULT '26700', ! max_image_height int NOT NULL DEFAULT '400', ! max_image_width int NOT NULL DEFAULT '400', ! users_can_submit smallint NOT NULL DEFAULT '0', ! users_select_article_tpl smallint NOT NULL DEFAULT '0', ! users_select_section_tpl smallint NOT NULL DEFAULT '0', ! users_allow_comments smallint NOT NULL DEFAULT '0', ! users_change_dates smallint NOT NULL DEFAULT '0', ! user_images_in_article smallint NOT NULL DEFAULT '0', ! user_upload_images smallint NOT NULL DEFAULT '0', ! restricted_viewing smallint NOT NULL DEFAULT '0', ! lock_expiration_time int NOT NULL DEFAULT '3600', ! make_metatags smallint NOT NULL DEFAULT '0', ! brand_printable smallint NOT NULL DEFAULT '0', ! print_header text NOT NULL, ! use_comments smallint NOT NULL DEFAULT '1', ! archive_days smallint NOT NULL DEFAULT '7' ); ! INSERT INTO mod_article_config VALUES ('Blank', 'Centered_Image', 5, 5, 5, 20, 1, 1, 0, 0, 3, 0, 0, 10, 26, 400, 400, 0, 0, 0, 0, 0, 0, 0, 0, 3600, 0, 0, '\r\n\r\n', 1, 7); CREATE TABLE mod_article_oldversions ( ! id int PRIMARY KEY, ! article_id int NOT NULL, ! version int NOT NULL, ! archived_date datetime NOT NULL, ! updated_userid int NOT NULL DEFAULT '0', ! numadded smallint NOT NULL DEFAULT '0', ! numdeleted smallint NOT NULL DEFAULT '0', ! numchanged smallint NOT NULL DEFAULT '0', ! article text NOT NULL, ! ! key (article_id), ! key (version) ); + 1 lines were added, 1 lines were deleted, 2 lines were changed Index: uninstall.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/article/boost/uninstall.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** uninstall.php 18 Jun 2004 23:30:29 -0000 1.3 --- uninstall.php 21 Aug 2004 17:02:06 -0000 1.4 *************** *** 27,34 **** $_SESSION["OBJ_approval"]->remove("article"); - /* Unregister from Search */ - if(isset($_SESSION["OBJ_search"])) - $GLOBALS['core']->sqlDelete("mod_search_register", "module", "article"); - /* Unregister from Comments */ if(isset($_SESSION['PHPWS_CommentManager']) && $GLOBALS['core']->sqlTableExists('mod_comments_data',1)) --- 27,30 ---- Index: update.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/article/boost/update.php,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** update.php 2 Jul 2004 22:36:13 -0000 1.7 --- update.php 21 Aug 2004 17:02:06 -0000 1.8 *************** *** 189,218 **** $content .= 'Update Failed!<br />Try to run this sql command on your database manually: '.$sql.'<br />'; - $content .= 'Placing user ids of article authors...'; - /* Make a list of names and message ids of all article creators */ - $msg_list = $name_list = array(); - $result = $GLOBALS['core']->query('SELECT id,created_username from mod_article WHERE NOT created_username=""', true); - while ($result && $row = $result->fetchrow(DB_FETCHMODE_ASSOC)) { - if (!$row['created_username']) continue; - $msg_list[$row['created_username']][] = $row['id']; - $name_list[$row['created_username']] = $row['created_username']; - } - unset($result); - /* Make a list of all user ids for the users in the last list */ - $result = $GLOBALS['core']->query('SELECT username,user_id from mod_users WHERE username IN ("' - . implode('","', $name_list) .'")', true); - while ($result && $row = $result->fetchrow(DB_FETCHMODE_ASSOC)) - $name_tbl[$row['username']] = $row['user_id']; - unset($result); - /* Update user id information for all articles submitted by each user */ - if (count($msg_list) && count($name_list)) { - foreach ($msg_list AS $key=>$value) { - if (!isset($name_tbl[$key])) $name_tbl[$key] = 0; - $GLOBALS['core']->query('UPDATE mod_article SET created_id=' - . $name_tbl[$key].' WHERE id IN ('.implode(',', $value).')', true); - $content .= $name_tbl[$key].','; - } - } - $content .= 'Done!<br />'; $content .= 'Adding column "use_comments" to table mod_article_config...'; $sql = 'ALTER TABLE mod_article_config ADD (use_comments smallint NOT NULL DEFAULT 1)'; --- 189,192 ---- *************** *** 239,242 **** --- 213,306 ---- } } + if($currentVersion < '2.5') + { + $prefix = $GLOBALS['core']->getTablePrefix(); + $content .= 'Updating Article Manager to version 2.5<br />' + . 'Finalizing Version Control System.<br />' + . ' Adding archive columns...'; + if($GLOBALS['core']->sqlTableExists('mod_article_oldversions',1)) + $GLOBALS['core']->sqlDropTable('mod_article_oldversions'); + $columns = array(); + $columns['id'] = 'int PRIMARY KEY'; + $columns['article_id'] = 'int NOT NULL'; + $columns['version'] = 'int NOT NULL'; + $columns['archived_date'] = 'datetime NOT NULL'; + $columns['updated_userid'] = 'int NOT NULL DEFAULT "0"'; + $columns['numadded'] = 'smallint NOT NULL DEFAULT "0"'; + $columns['numdeleted'] = 'smallint NOT NULL DEFAULT "0"'; + $columns['numchanged'] = 'smallint NOT NULL DEFAULT "0"'; + $columns['article'] = 'text NOT NULL'; + $GLOBALS['core']->sqlCreateTable('mod_article_oldversions', $columns); + $content .= 'Done<br />'; + $content .= 'Creating new indexes...'; + $GLOBALS['core']->sqlCreateIndex('mod_article_oldversions', array('article_id')); + $GLOBALS['core']->sqlCreateIndex('mod_article_oldversions', array('version')); + $content .= 'Done<br />'; + $content .= 'Adding new configuration settings...'; + if(!$GLOBALS['core']->sqlColumnExists('mod_article_config', 'archive_days')) + $GLOBALS['core']->sqlAddColumn('mod_article_config', array('archive_days'=>'smallint NOT NULL DEFAULT "7"')); + $content .= 'Done<br />'; + + $content .= 'Placing user ids of article authors...'; + /* Make a list of names and userids of all article creators */ + $sql = 'SELECT a.created_username, u.user_id FROM '.$prefix.'mod_article AS a LEFT JOIN '.$prefix.'mod_users AS u ON ( u.username = a.created_username ) WHERE NOT (a.created_username = "") GROUP BY a.created_username'; + $result = $GLOBALS['core']->query($sql); + while ($result && $row = $result->fetchrow(DB_FETCHMODE_ASSOC)) { + if(!$row['user_id']) + $row['user_id'] = '0'; + $GLOBALS['core']->query('UPDATE mod_article SET created_id='.$row['user_id'].' WHERE created_username ="'.$row['created_username'].'"', true); + } + $content .= 'Done!<br />'; + + $content .= 'Adding column "updated_id" to table mod_article...'; + $sql = 'ALTER TABLE mod_article ADD updated_id int NOT NULL DEFAULT 0 AFTER updated_username'; + if ($GLOBALS['core']->query($sql, true)) + $content .= 'Column added successfully!<br />'; + else + $content .= 'Update Failed!<br />Try to run this sql command on your database manually: '.$sql.'<br />'; + + $content .= 'Placing user ids of article editors...'; + /* Make a list of names and userids of all article editors */ + $sql = 'SELECT a.updated_username, u.user_id FROM '.$prefix.'mod_article AS a LEFT JOIN '.$prefix.'mod_users AS u ON ( u.username = a.updated_username ) WHERE NOT (a.updated_username = "") GROUP BY a.updated_username'; + $result = $GLOBALS['core']->query($sql); + while ($result && $row = $result->fetchrow(DB_FETCHMODE_ASSOC)) { + if(!$row['user_id']) + $row['user_id'] = '0'; + $GLOBALS['core']->query('UPDATE mod_article SET updated_id='.$row['user_id'].' WHERE updated_username ="'.$row['updated_username'].'"', true); + } + $content .= 'Done!<br />'; + + /* Update page & section template spellings */ + $content .= 'Updating section template names.<br />'; + $GLOBALS['core']->query('UPDATE mod_article_sections SET template="Page_Insertion_to_Fit_Block.tpl" WHERE template="Page_Insertion_(Fit_Block).tpl"', true); + $GLOBALS['core']->query('UPDATE mod_article_sections SET template="Page_Insertion_to_Fit_Page.tpl" WHERE template="Page_Insertion_(Fit_Page).tpl"', true); + $GLOBALS['core']->query('UPDATE mod_article_sections SET template="Page_Insertion_for_Max_Page.tpl" WHERE template="Page_Insertion_(Max_Page).tpl"', true); + $GLOBALS['core']->query('UPDATE mod_article_sections SET template="Page_Insertion_with_Title_is_Size.tpl" WHERE template="Page_Insertion_(Title_is_Size).tpl"', true); + + /* Delete the old template files */ + if ( ! function_exists('delfile') ) + { + function delfile ($dir, $file) + { + if (file_exists(PHPWS_SOURCE_DIR . $dir . $file)) + { + if (unlink(PHPWS_SOURCE_DIR . $dir . $file)) + return $file.' Deleted.<br />'; + else + return 'ERROR: '.$file.' could not be deleted. Please delete it manually.<br />'; + } + } + $content .= 'Deleting old template files (the ones with parentheses in the names)<br />'; + $content .= delfile('mod/article/templates/section/','Page_Insertion_(Fit_Block).tpl'); + $content .= delfile('mod/article/templates/section/','Page_Insertion_(Fit_Page).tpl'); + $content .= delfile('mod/article/templates/section/','Page_Insertion_(Max_Page).tpl'); + $content .= delfile('mod/article/templates/section/','Page_Insertion_(Title_is_Size).tpl'); + } + + $content .= 'Re-registering with the Search Module....Done.<br />'; + require_once(PHPWS_SOURCE_DIR.'mod/search/class/Search.php'); + PHPWS_Search::register('article'); + $content .= 'Update Complete!'; + } $_SESSION['OBJ_help']->uninstall_help('article'); |
|
From: Eloi G. <ada...@us...> - 2004-08-21 17:02:37
|
Update of /cvsroot/phpwebsite-comm/modules/article/templates/section In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29156/templates/section Added Files: Page_Insertion_for_Max_Page.tpl Page_Insertion_to_Fit_Block.tpl Page_Insertion_to_Fit_Page.tpl Page_Insertion_with_Title_is_Size.tpl Removed Files: Page_Insertion_(Fit_Block).tpl Page_Insertion_(Fit_Page).tpl Page_Insertion_(Max_Page).tpl Page_Insertion_(Title_is_Size).tpl Log Message: 2.5 Release Files --- NEW FILE: Page_Insertion_for_Max_Page.tpl --- <!-- BEGIN PAGE INSERT --> <!-- BEGIN TABLE --> <table class="page" width="100%" cellpadding="4" cellspacing="0"> <tr> <!-- BEGIN IFRAME--> <td valign="top" align="left"> <iframe src="{TEXT}" width="100%"> Sorry! Your browser cannot display the page here." </iframe> </td> <!-- END IFRAME --> </tr> </table> <!-- END TABLE --> <script> function BrowserDetectLite() { var ua = navigator.userAgent.toLowerCase(); // browser name this.isGecko = (ua.indexOf('gecko') != -1); this.isMozilla = (this.isGecko && ua.indexOf("gecko/") + 14 == ua.length); this.isNS = ( (this.isGecko) ? (ua.indexOf('netscape') != -1) : ( (ua.indexOf('mozilla') != -1) && (ua.indexOf('spoofer') == -1) && (ua.indexOf('compatible') == -1) && (ua.indexOf('opera') == -1) && (ua.indexOf('webtv') == -1) && (ua.indexOf('hotjava') == -1) ) ); this.isIE = ( (ua.indexOf("msie") != -1) && (ua.indexOf("opera") == -1) && (ua.indexOf("webtv") == -1) ); this.isOpera = (ua.indexOf("opera") != -1); this.isKonqueror = (ua.indexOf("konqueror") != -1); this.isIcab = (ua.indexOf("icab") != -1); this.isAol = (ua.indexOf("aol") != -1); this.isWebtv = (ua.indexOf("webtv") != -1); // spoofing and compatible browsers this.isIECompatible = ( (ua.indexOf("msie") != -1) && !this.isIE); this.isNSCompatible = ( (ua.indexOf("mozilla") != -1) && !this.isNS && !this.isMozilla); // browser version this.versionMinor = parseFloat(navigator.appVersion); // correct version number for NS6+ if (this.isNS && this.isGecko) { this.versionMinor = parseFloat( ua.substring( ua.lastIndexOf('/') + 1 ) ); } // correct version number for IE4+ else if (this.isIE && this.versionMinor >= 4) { this.versionMinor = parseFloat( ua.substring( ua.indexOf('msie ') + 5 ) ); } // correct version number for Opera else if (this.isOpera) { if (ua.indexOf('opera/') != -1) { this.versionMinor = parseFloat( ua.substring( ua.indexOf('opera/') + 6 ) ); } else { this.versionMinor = parseFloat( ua.substring( ua.indexOf('opera ') + 6 ) ); } } // correct version number for Konqueror else if (this.isKonqueror) { this.versionMinor = parseFloat( ua.substring( ua.indexOf('konqueror/') + 10 ) ); } // correct version number for iCab else if (this.isIcab) { if (ua.indexOf('icab/') != -1) { this.versionMinor = parseFloat( ua.substring( ua.indexOf('icab/') + 6 ) ); } else { this.versionMinor = parseFloat( ua.substring( ua.indexOf('icab ') + 6 ) ); } } // correct version number for WebTV else if (this.isWebtv) { this.versionMinor = parseFloat( ua.substring( ua.indexOf('webtv/') + 6 ) ); } this.versionMajor = parseInt(this.versionMinor); this.geckoVersion = ( (this.isGecko) ? ua.substring( (ua.lastIndexOf('gecko/') + 6), (ua.lastIndexOf('gecko/') + 14) ) : -1 ); // platform this.isWin = (ua.indexOf('win') != -1); this.isWin32 = (this.isWin && ( ua.indexOf('95') != -1 || ua.indexOf('98') != -1 || ua.indexOf('nt') != -1 || ua.indexOf('win32') != -1 || ua.indexOf('32bit') != -1) ); this.isMac = (ua.indexOf('mac') != -1); this.isUnix = (ua.indexOf('unix') != -1 || ua.indexOf('linux') != -1 || ua.indexOf('sunos') != -1 || ua.indexOf('bsd') != -1 || ua.indexOf('x11') != -1) // specific browser shortcuts this.isNS4x = (this.isNS && this.versionMajor == 4); this.isNS40x = (this.isNS4x && this.versionMinor < 4.5); this.isNS47x = (this.isNS4x && this.versionMinor >= 4.7); this.isNS4up = (this.isNS && this.versionMinor >= 4); this.isNS6x = (this.isNS && this.versionMajor == 6); this.isNS6up = (this.isNS && this.versionMajor >= 6); this.isIE4x = (this.isIE && this.versionMajor == 4); this.isIE4up = (this.isIE && this.versionMajor >= 4); this.isIE5x = (this.isIE && this.versionMajor == 5); this.isIE55 = (this.isIE && this.versionMinor == 5.5); this.isIE5up = (this.isIE && this.versionMajor >= 5); this.isIE6x = (this.isIE && this.versionMajor == 6); this.isIE6up = (this.isIE && this.versionMajor >= 6); this.isIE4xMac = (this.isIE4x && this.isMac); } var browser = new BrowserDetectLite(); function fullScreen() { window.resizeTo(screen.width-10,screen.height-55); window.moveTo(5,5); } function walkUp(node) { var currNode=node; var nextNode=node.parentNode; var rowHeight=0; var tableHeight=node.offsetHeight; var freeSpace=0; var totalTop=0; while(currNode != null) { if(currNode.nodeType == 1) { switch(currNode.tagName) { case "TR": rowHeight = currNode.offsetHeight; // remember break; case "TABLE": freeSpace += (rowHeight > tableHeight) ? rowHeight - tableHeight : 0; // accumulate tableHeight = currNode.offsetHeight; // remember totalTop += currNode.offsetTop; // accumulate break; case "TD": totalTop += currNode.offsetTop; default:; } // end switch } // end if currNode=currNode.parentNode; // walk up } // end while result = [totalTop,freeSpace]; return result; } function upsize(vsize) { var docIframes=document.getElementsByTagName('IFRAME'); var theIframe=docIframes[0]; switch(vsize) { case 0: // fit in current window result=walkUp(theIframe); if(browser.isIE6up && (document.childNodes.length > 1)) theIframe.height = document.documentElement.clientHeight - result[0] - 5; else if(browser.isIE5up) theIframe.height = document.body.clientHeight - result[0]; else if(browser.isNS6up || browser.isMozilla) theIframe.height = self.innerHeight - theIframe.offsetTop; scrollTo(0,0); break; case 1: // match current document body result=walkUp(theIframe); theIframe.height = theIframe.offsetHeight + result[1]; break; default: theIframe.height = vsize; } // end switch(vsize) // alert(screen.width); } /* end upsize() */ fullScreen(); upsize(0); </script> <!-- END PAGE INSERT --> --- Page_Insertion_(Title_is_Size).tpl DELETED --- --- NEW FILE: Page_Insertion_to_Fit_Page.tpl --- <!-- BEGIN PAGE INSERT --> <!-- BEGIN TABLE --> <table class="page" width="100%" cellpadding="4" cellspacing="0"> <tr> <!-- BEGIN IFRAME--> <td valign="top" align="left"> <iframe src="{TEXT}" width="100%"> Sorry! Your browser cannot display the page here." </iframe> </td> <!-- END IFRAME --> </tr> </table> <!-- END TABLE --> <script> function BrowserDetectLite() { var ua = navigator.userAgent.toLowerCase(); // browser name this.isGecko = (ua.indexOf('gecko') != -1); this.isMozilla = (this.isGecko && ua.indexOf("gecko/") + 14 == ua.length); this.isNS = ( (this.isGecko) ? (ua.indexOf('netscape') != -1) : ( (ua.indexOf('mozilla') != -1) && (ua.indexOf('spoofer') == -1) && (ua.indexOf('compatible') == -1) && (ua.indexOf('opera') == -1) && (ua.indexOf('webtv') == -1) && (ua.indexOf('hotjava') == -1) ) ); this.isIE = ( (ua.indexOf("msie") != -1) && (ua.indexOf("opera") == -1) && (ua.indexOf("webtv") == -1) ); this.isOpera = (ua.indexOf("opera") != -1); this.isKonqueror = (ua.indexOf("konqueror") != -1); this.isIcab = (ua.indexOf("icab") != -1); this.isAol = (ua.indexOf("aol") != -1); this.isWebtv = (ua.indexOf("webtv") != -1); // spoofing and compatible browsers this.isIECompatible = ( (ua.indexOf("msie") != -1) && !this.isIE); this.isNSCompatible = ( (ua.indexOf("mozilla") != -1) && !this.isNS && !this.isMozilla); // browser version this.versionMinor = parseFloat(navigator.appVersion); // correct version number for NS6+ if (this.isNS && this.isGecko) { this.versionMinor = parseFloat( ua.substring( ua.lastIndexOf('/') + 1 ) ); } // correct version number for IE4+ else if (this.isIE && this.versionMinor >= 4) { this.versionMinor = parseFloat( ua.substring( ua.indexOf('msie ') + 5 ) ); } // correct version number for Opera else if (this.isOpera) { if (ua.indexOf('opera/') != -1) { this.versionMinor = parseFloat( ua.substring( ua.indexOf('opera/') + 6 ) ); } else { this.versionMinor = parseFloat( ua.substring( ua.indexOf('opera ') + 6 ) ); } } // correct version number for Konqueror else if (this.isKonqueror) { this.versionMinor = parseFloat( ua.substring( ua.indexOf('konqueror/') + 10 ) ); } // correct version number for iCab else if (this.isIcab) { if (ua.indexOf('icab/') != -1) { this.versionMinor = parseFloat( ua.substring( ua.indexOf('icab/') + 6 ) ); } else { this.versionMinor = parseFloat( ua.substring( ua.indexOf('icab ') + 6 ) ); } } // correct version number for WebTV else if (this.isWebtv) { this.versionMinor = parseFloat( ua.substring( ua.indexOf('webtv/') + 6 ) ); } this.versionMajor = parseInt(this.versionMinor); this.geckoVersion = ( (this.isGecko) ? ua.substring( (ua.lastIndexOf('gecko/') + 6), (ua.lastIndexOf('gecko/') + 14) ) : -1 ); // platform this.isWin = (ua.indexOf('win') != -1); this.isWin32 = (this.isWin && ( ua.indexOf('95') != -1 || ua.indexOf('98') != -1 || ua.indexOf('nt') != -1 || ua.indexOf('win32') != -1 || ua.indexOf('32bit') != -1) ); this.isMac = (ua.indexOf('mac') != -1); this.isUnix = (ua.indexOf('unix') != -1 || ua.indexOf('linux') != -1 || ua.indexOf('sunos') != -1 || ua.indexOf('bsd') != -1 || ua.indexOf('x11') != -1) // specific browser shortcuts this.isNS4x = (this.isNS && this.versionMajor == 4); this.isNS40x = (this.isNS4x && this.versionMinor < 4.5); this.isNS47x = (this.isNS4x && this.versionMinor >= 4.7); this.isNS4up = (this.isNS && this.versionMinor >= 4); this.isNS6x = (this.isNS && this.versionMajor == 6); this.isNS6up = (this.isNS && this.versionMajor >= 6); this.isIE4x = (this.isIE && this.versionMajor == 4); this.isIE4up = (this.isIE && this.versionMajor >= 4); this.isIE5x = (this.isIE && this.versionMajor == 5); this.isIE55 = (this.isIE && this.versionMinor == 5.5); this.isIE5up = (this.isIE && this.versionMajor >= 5); this.isIE6x = (this.isIE && this.versionMajor == 6); this.isIE6up = (this.isIE && this.versionMajor >= 6); this.isIE4xMac = (this.isIE4x && this.isMac); } var browser = new BrowserDetectLite(); function walkUp(node) { var currNode=node; var nextNode=node.parentNode; var rowHeight=0; var tableHeight=node.offsetHeight; var freeSpace=0; var totalTop=0; while(currNode != null) { if(currNode.nodeType == 1) { switch(currNode.tagName) { case "TR": rowHeight = currNode.offsetHeight; // remember break; case "TABLE": freeSpace += (rowHeight > tableHeight) ? rowHeight - tableHeight : 0; // accumulate tableHeight = currNode.offsetHeight; // remember totalTop += currNode.offsetTop; // accumulate break; case "TD": totalTop += currNode.offsetTop; default:; } // end switch } // end if currNode=currNode.parentNode; // walk up } // end while result = [totalTop,freeSpace]; return result; } function upsize(vsize) { var docIframes=document.getElementsByTagName('IFRAME'); var theIframe=docIframes[0]; switch(vsize) { case 0: // fit in current window result=walkUp(theIframe); if(browser.isIE6up && (document.childNodes.length > 1)) theIframe.height = document.documentElement.clientHeight - result[0] - 5; else if(browser.isIE5up) theIframe.height = document.body.clientHeight - result[0]; else if(browser.isNS6up || browser.isMozilla) theIframe.height = self.innerHeight - theIframe.offsetTop; scrollTo(0,0); break; case 1: // match current document body result=walkUp(theIframe); theIframe.height = theIframe.offsetHeight + result[1]; break; default: theIframe.height = vsize; } // end switch(vsize) // alert(browser.isMozilla); } /* end upsize() */ upsize(0); </script> <!-- END PAGE INSERT --> --- NEW FILE: Page_Insertion_to_Fit_Block.tpl --- <!-- BEGIN PAGE INSERT --> <!-- BEGIN TABLE --> <table class="page" width="100%" cellpadding="4" cellspacing="0"> <tr> <!-- BEGIN IFRAME--> <td valign="top" align="left"> <iframe src="{TEXT}" width="100%"> Sorry! Your browser cannot display the page here." </iframe> </td> <!-- END IFRAME --> </tr> </table> <!-- END TABLE --> <script> function BrowserDetectLite() { var ua = navigator.userAgent.toLowerCase(); // browser name this.isGecko = (ua.indexOf('gecko') != -1); this.isMozilla = (this.isGecko && ua.indexOf("gecko/") + 14 == ua.length); this.isNS = ( (this.isGecko) ? (ua.indexOf('netscape') != -1) : ( (ua.indexOf('mozilla') != -1) && (ua.indexOf('spoofer') == -1) && (ua.indexOf('compatible') == -1) && (ua.indexOf('opera') == -1) && (ua.indexOf('webtv') == -1) && (ua.indexOf('hotjava') == -1) ) ); this.isIE = ( (ua.indexOf("msie") != -1) && (ua.indexOf("opera") == -1) && (ua.indexOf("webtv") == -1) ); this.isOpera = (ua.indexOf("opera") != -1); this.isKonqueror = (ua.indexOf("konqueror") != -1); this.isIcab = (ua.indexOf("icab") != -1); this.isAol = (ua.indexOf("aol") != -1); this.isWebtv = (ua.indexOf("webtv") != -1); // spoofing and compatible browsers this.isIECompatible = ( (ua.indexOf("msie") != -1) && !this.isIE); this.isNSCompatible = ( (ua.indexOf("mozilla") != -1) && !this.isNS && !this.isMozilla); // browser version this.versionMinor = parseFloat(navigator.appVersion); // correct version number for NS6+ if (this.isNS && this.isGecko) { this.versionMinor = parseFloat( ua.substring( ua.lastIndexOf('/') + 1 ) ); } // correct version number for IE4+ else if (this.isIE && this.versionMinor >= 4) { this.versionMinor = parseFloat( ua.substring( ua.indexOf('msie ') + 5 ) ); } // correct version number for Opera else if (this.isOpera) { if (ua.indexOf('opera/') != -1) { this.versionMinor = parseFloat( ua.substring( ua.indexOf('opera/') + 6 ) ); } else { this.versionMinor = parseFloat( ua.substring( ua.indexOf('opera ') + 6 ) ); } } // correct version number for Konqueror else if (this.isKonqueror) { this.versionMinor = parseFloat( ua.substring( ua.indexOf('konqueror/') + 10 ) ); } // correct version number for iCab else if (this.isIcab) { if (ua.indexOf('icab/') != -1) { this.versionMinor = parseFloat( ua.substring( ua.indexOf('icab/') + 6 ) ); } else { this.versionMinor = parseFloat( ua.substring( ua.indexOf('icab ') + 6 ) ); } } // correct version number for WebTV else if (this.isWebtv) { this.versionMinor = parseFloat( ua.substring( ua.indexOf('webtv/') + 6 ) ); } this.versionMajor = parseInt(this.versionMinor); this.geckoVersion = ( (this.isGecko) ? ua.substring( (ua.lastIndexOf('gecko/') + 6), (ua.lastIndexOf('gecko/') + 14) ) : -1 ); // platform this.isWin = (ua.indexOf('win') != -1); this.isWin32 = (this.isWin && ( ua.indexOf('95') != -1 || ua.indexOf('98') != -1 || ua.indexOf('nt') != -1 || ua.indexOf('win32') != -1 || ua.indexOf('32bit') != -1) ); this.isMac = (ua.indexOf('mac') != -1); this.isUnix = (ua.indexOf('unix') != -1 || ua.indexOf('linux') != -1 || ua.indexOf('sunos') != -1 || ua.indexOf('bsd') != -1 || ua.indexOf('x11') != -1) // specific browser shortcuts this.isNS4x = (this.isNS && this.versionMajor == 4); this.isNS40x = (this.isNS4x && this.versionMinor < 4.5); this.isNS47x = (this.isNS4x && this.versionMinor >= 4.7); this.isNS4up = (this.isNS && this.versionMinor >= 4); this.isNS6x = (this.isNS && this.versionMajor == 6); this.isNS6up = (this.isNS && this.versionMajor >= 6); this.isIE4x = (this.isIE && this.versionMajor == 4); this.isIE4up = (this.isIE && this.versionMajor >= 4); this.isIE5x = (this.isIE && this.versionMajor == 5); this.isIE55 = (this.isIE && this.versionMinor == 5.5); this.isIE5up = (this.isIE && this.versionMajor >= 5); this.isIE6x = (this.isIE && this.versionMajor == 6); this.isIE6up = (this.isIE && this.versionMajor >= 6); this.isIE4xMac = (this.isIE4x && this.isMac); } var browser = new BrowserDetectLite(); function walkUp(node) { var currNode=node; var nextNode=node.parentNode; var rowHeight=0; var tableHeight=node.offsetHeight; var freeSpace=0; var totalTop=0; while(currNode != null) { if(currNode.nodeType == 1) { switch(currNode.tagName) { case "TR": rowHeight = currNode.offsetHeight; // remember break; case "TABLE": freeSpace += (rowHeight > tableHeight) ? rowHeight - tableHeight : 0; // accumulate tableHeight = currNode.offsetHeight; // remember totalTop += currNode.offsetTop; // accumulate break; case "TD": totalTop += currNode.offsetTop; default:; } // end switch } // end if currNode=currNode.parentNode; // walk up } // end while result = [totalTop,freeSpace]; return result; } function upsize(vsize) { var docIframes=document.getElementsByTagName('IFRAME'); var theIframe=docIframes[0]; switch(vsize) { case 0: // fit in current window result=walkUp(theIframe); if(browser.isIE6up && (document.childNodes.length > 1)) theIframe.height = document.documentElement.clientHeight - result[0] - 5; else if(browser.isIE5up) theIframe.height = document.body.clientHeight - result[0]; else if(browser.isNS6up || browser.isMozilla) theIframe.height = self.innerHeight - theIframe.offsetTop; scrollTo(0,0); break; case 1: // match current document body result=walkUp(theIframe); theIframe.height = theIframe.offsetHeight + result[1]; break; default: theIframe.height = vsize; } // end switch(vsize) // alert(browser.isMozilla); } /* end upsize() */ upsize(1); </script> <!-- END PAGE INSERT --> --- Page_Insertion_(Fit_Page).tpl DELETED --- --- Page_Insertion_(Max_Page).tpl DELETED --- --- Page_Insertion_(Fit_Block).tpl DELETED --- --- NEW FILE: Page_Insertion_with_Title_is_Size.tpl --- <!-- BEGIN PAGE INSERT --> <!-- BEGIN TABLE --> <table class="page" width="100%" cellpadding="4" cellspacing="0"> <tr> <!-- BEGIN IFRAME--> <td valign="top" align="left"> <iframe src="{TEXT}" width="100%"> Sorry! Your browser cannot display the page here." </iframe> </td> <!-- END IFRAME --> </tr> </table> <!-- END TABLE --> <script> function BrowserDetectLite() { var ua = navigator.userAgent.toLowerCase(); // browser name this.isGecko = (ua.indexOf('gecko') != -1); this.isMozilla = (this.isGecko && ua.indexOf("gecko/") + 14 == ua.length); this.isNS = ( (this.isGecko) ? (ua.indexOf('netscape') != -1) : ( (ua.indexOf('mozilla') != -1) && (ua.indexOf('spoofer') == -1) && (ua.indexOf('compatible') == -1) && (ua.indexOf('opera') == -1) && (ua.indexOf('webtv') == -1) && (ua.indexOf('hotjava') == -1) ) ); this.isIE = ( (ua.indexOf("msie") != -1) && (ua.indexOf("opera") == -1) && (ua.indexOf("webtv") == -1) ); this.isOpera = (ua.indexOf("opera") != -1); this.isKonqueror = (ua.indexOf("konqueror") != -1); this.isIcab = (ua.indexOf("icab") != -1); this.isAol = (ua.indexOf("aol") != -1); this.isWebtv = (ua.indexOf("webtv") != -1); // spoofing and compatible browsers this.isIECompatible = ( (ua.indexOf("msie") != -1) && !this.isIE); this.isNSCompatible = ( (ua.indexOf("mozilla") != -1) && !this.isNS && !this.isMozilla); // browser version this.versionMinor = parseFloat(navigator.appVersion); // correct version number for NS6+ if (this.isNS && this.isGecko) { this.versionMinor = parseFloat( ua.substring( ua.lastIndexOf('/') + 1 ) ); } // correct version number for IE4+ else if (this.isIE && this.versionMinor >= 4) { this.versionMinor = parseFloat( ua.substring( ua.indexOf('msie ') + 5 ) ); } // correct version number for Opera else if (this.isOpera) { if (ua.indexOf('opera/') != -1) { this.versionMinor = parseFloat( ua.substring( ua.indexOf('opera/') + 6 ) ); } else { this.versionMinor = parseFloat( ua.substring( ua.indexOf('opera ') + 6 ) ); } } // correct version number for Konqueror else if (this.isKonqueror) { this.versionMinor = parseFloat( ua.substring( ua.indexOf('konqueror/') + 10 ) ); } // correct version number for iCab else if (this.isIcab) { if (ua.indexOf('icab/') != -1) { this.versionMinor = parseFloat( ua.substring( ua.indexOf('icab/') + 6 ) ); } else { this.versionMinor = parseFloat( ua.substring( ua.indexOf('icab ') + 6 ) ); } } // correct version number for WebTV else if (this.isWebtv) { this.versionMinor = parseFloat( ua.substring( ua.indexOf('webtv/') + 6 ) ); } this.versionMajor = parseInt(this.versionMinor); this.geckoVersion = ( (this.isGecko) ? ua.substring( (ua.lastIndexOf('gecko/') + 6), (ua.lastIndexOf('gecko/') + 14) ) : -1 ); // platform this.isWin = (ua.indexOf('win') != -1); this.isWin32 = (this.isWin && ( ua.indexOf('95') != -1 || ua.indexOf('98') != -1 || ua.indexOf('nt') != -1 || ua.indexOf('win32') != -1 || ua.indexOf('32bit') != -1) ); this.isMac = (ua.indexOf('mac') != -1); this.isUnix = (ua.indexOf('unix') != -1 || ua.indexOf('linux') != -1 || ua.indexOf('sunos') != -1 || ua.indexOf('bsd') != -1 || ua.indexOf('x11') != -1) // specific browser shortcuts this.isNS4x = (this.isNS && this.versionMajor == 4); this.isNS40x = (this.isNS4x && this.versionMinor < 4.5); this.isNS47x = (this.isNS4x && this.versionMinor >= 4.7); this.isNS4up = (this.isNS && this.versionMinor >= 4); this.isNS6x = (this.isNS && this.versionMajor == 6); this.isNS6up = (this.isNS && this.versionMajor >= 6); this.isIE4x = (this.isIE && this.versionMajor == 4); this.isIE4up = (this.isIE && this.versionMajor >= 4); this.isIE5x = (this.isIE && this.versionMajor == 5); this.isIE55 = (this.isIE && this.versionMinor == 5.5); this.isIE5up = (this.isIE && this.versionMajor >= 5); this.isIE6x = (this.isIE && this.versionMajor == 6); this.isIE6up = (this.isIE && this.versionMajor >= 6); this.isIE4xMac = (this.isIE4x && this.isMac); } var browser = new BrowserDetectLite(); function walkUp(node) { var currNode=node; var nextNode=node.parentNode; var rowHeight=0; var tableHeight=node.offsetHeight; var freeSpace=0; var totalTop=0; while(currNode != null) { if(currNode.nodeType == 1) { switch(currNode.tagName) { case "TR": rowHeight = currNode.offsetHeight; // remember break; case "TABLE": freeSpace += (rowHeight > tableHeight) ? rowHeight - tableHeight : 0; // accumulate tableHeight = currNode.offsetHeight; // remember totalTop += currNode.offsetTop; // accumulate break; case "TD": totalTop += currNode.offsetTop; default:; } // end switch } // end if currNode=currNode.parentNode; // walk up } // end while result = [totalTop,freeSpace]; return result; } function upsize(vsize) { var docIframes=document.getElementsByTagName('IFRAME'); var theIframe=docIframes[0]; switch(vsize) { case 0: // fit in current window result=walkUp(theIframe); if(browser.isIE6up && (document.childNodes.length > 1)) theIframe.height = document.documentElement.clientHeight - result[0] - 5; else if(browser.isIE5up) theIframe.height = document.body.clientHeight - result[0]; else if(browser.isNS6up || browser.isMozilla) theIframe.height = self.innerHeight - theIframe.offsetTop; scrollTo(0,0); break; case 1: // match current document body result=walkUp(theIframe); theIframe.height = theIframe.offsetHeight + result[1]; break; default: theIframe.height = vsize; } // end switch(vsize) // alert(browser.isMozilla); } /* end upsize() */ upsize({TITLE}); </script> <!-- END PAGE INSERT --> |
