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: Eloi G. <ada...@us...> - 2008-08-21 20:17:57
|
Update of /cvsroot/phpwebsite-comm/modules/article/javascript/panel In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2278/javascript/panel Modified Files: head.js Log Message: Article Manager 4.1.0 Index: head.js =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/article/javascript/panel/head.js,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** head.js 9 Jul 2007 00:20:25 -0000 1.2 --- head.js 21 Aug 2008 20:17:35 -0000 1.3 *************** *** 1,44 **** ! <script type="text/javascript"> ! //<![CDATA[ ! ! function FName() { ! return "Edit_Article"; ! } ! ! function addHiddenField(myform, varname, varvalue) { ! var field = document.createElement("input"); ! field.setAttribute("type","hidden"); ! field.setAttribute("name",varname); ! field.setAttribute("value",varvalue); ! //add new element to the existing form ! document.getElementById(FName()).appendChild(field); ! } ! ! function editPage(pagenum) { ! myform = "Edit_Article"; ! addHiddenField(myform, "page", pagenum); ! addHiddenField(myform, "op", "update"); ! document.getElementById(FName()).submit(); ! } ! function addPage() { ! myform = "Edit_Article"; ! addHiddenField(myform, "op", "add_page"); ! document.getElementById(FName()).submit(); ! } ! function Preview(version_id) { ! myform = "Edit_Article"; ! addHiddenField(myform, "op", "view_version"); ! addHiddenField(myform, "version_id", version_id); ! document.getElementById(FName()).submit(); ! } ! function confirmButton(message, n1, v1) { ! myform = "Edit_Article"; ! if (confirm(message)) { ! addHiddenField(myform, n1, v1); ! document.getElementById(FName()).submit(); ! } else { ! return; ! } ! } ! //]]> ! </script> --- 1,44 ---- ! <script type="text/javascript"> ! //<![CDATA[ ! ! function FName() { ! return "Edit_Article"; ! } ! ! function addHiddenField(myform, varname, varvalue) { ! var field = document.createElement("input"); ! field.setAttribute("type","hidden"); ! field.setAttribute("name",varname); ! field.setAttribute("value",varvalue); ! //add new element to the existing form ! document.getElementById(FName()).appendChild(field); ! } ! ! function editPage(pagenum) { ! myform = "Edit_Article"; ! addHiddenField(myform, "page", pagenum); ! addHiddenField(myform, "op", "update"); ! document.getElementById(FName()).submit(); ! } ! function addPage() { ! myform = "Edit_Article"; ! addHiddenField(myform, "op", "add_page"); ! document.getElementById(FName()).submit(); ! } ! function Preview(version_id) { ! myform = "Edit_Article"; ! addHiddenField(myform, "op", "view_version"); ! addHiddenField(myform, "version_id", version_id); ! document.getElementById(FName()).submit(); ! } ! function confirmButton(message, n1, v1) { ! myform = "Edit_Article"; ! if (confirm(message)) { ! addHiddenField(myform, n1, v1); ! document.getElementById(FName()).submit(); ! } else { ! return; ! } ! } ! //]]> ! </script> |
|
From: Eloi G. <ada...@us...> - 2008-08-21 20:17:55
|
Update of /cvsroot/phpwebsite-comm/modules/article/templates/article In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2278/templates/article Modified Files: Byline.tpl Blank.tpl Dated.tpl Added Files: Image_Wrap_Right.tpl Image_Wrap_Left.tpl Log Message: Article Manager 4.1.0 Index: Byline.tpl =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/article/templates/article/Byline.tpl,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Byline.tpl 9 Jul 2007 00:20:49 -0000 1.3 --- Byline.tpl 21 Aug 2008 20:17:33 -0000 1.4 *************** *** 10,14 **** <table class="smaller" width="100%" border="0"> <tr> ! <td>by {CREATED_USER} on {CREATED_DATE}</td> <td><div style="text-align:right">{NAVBAR}</div></td> </tr> --- 10,14 ---- <table class="smaller" width="100%" border="0"> <tr> ! <td>{CREATED_TEXT} -- {CREATED_DATE_SHORT}</td> <td><div style="text-align:right">{NAVBAR}</div></td> </tr> *************** *** 16,22 **** </div> <div class="box-content"> <!-- BEGIN SUMMARY --> ! <div class="smaller"> <i>{SUMMARYTEXT}</i> </div> --- 16,29 ---- </div> <div class="box-content"> + + <!-- BEGIN IMAGE --> + <div class="smaller" style="text-align:center"> + {IMAGE}<br /> + {CAPTION} + </div> + <!-- END IMAGE --> <!-- BEGIN SUMMARY --> ! <div class="smaller"> <i>{SUMMARYTEXT}</i> </div> Index: Dated.tpl =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/article/templates/article/Dated.tpl,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Dated.tpl 9 Jul 2007 00:20:49 -0000 1.3 --- Dated.tpl 21 Aug 2008 20:17:33 -0000 1.4 *************** *** 10,14 **** </div> <div class="box-content"> ! <!-- BEGIN NAVIGATION --> <div class="smaller" style="text-align:right"> --- 10,14 ---- </div> <div class="box-content"> ! <!-- BEGIN NAVIGATION --> <div class="smaller" style="text-align:right"> *************** *** 17,20 **** --- 17,28 ---- <br /> <!-- END NAVIGATION --> + + <!-- BEGIN IMAGE --> + <div class="smaller" style="text-align:center"> + {IMAGE}<br /> + {CAPTION} + </div> + <!-- END IMAGE --> + <!-- BEGIN SUMMARY --> <div class="smaller"> *************** *** 36,41 **** <!-- BEGIN DATEINFO --> <div style="text-align:right"> ! {CREATED_TEXT}<br /> ! {UPDATED_TEXT}<br /> {EDIT} {DELETE} </div> --- 44,49 ---- <!-- BEGIN DATEINFO --> <div style="text-align:right"> ! {CREATED_TEXT} -- {CREATED_DATE_SHORT}<br /> ! {UPDATED_TEXT} -- {UPDATED_DATE_SHORT}<br /> {EDIT} {DELETE} </div> --- NEW FILE: Image_Wrap_Right.tpl --- <div class="box"> <div class="box-title"> <!-- BEGIN OPTIONS --> <div class="smaller"style="float: right; text-align: right;"> {PRINT_ICON} {EMAIL} </div> <!-- END OPTIONS --> <h1>{TITLE}</h1> </div> <div class="box-content"> <!-- BEGIN NAVIGATION --> <div class="smaller" style="text-align:right"> {NAVBAR} </div> <br /> <!-- END NAVIGATION --> <!-- BEGIN IMAGE --> <div style="float:right; margin-bottom:.5em; margin-left:1em"> {IMAGE} <div class="smaller" style="text-align:center"> {CAPTION} </div> </div> <!-- END IMAGE --> <!-- BEGIN SUMMARY --> <div class="smaller"> <i>{SUMMARYTEXT}</i> </div> <br /> <!-- END SUMMARY --> {BODYTEXT} <!-- BEGIN PAGETURN --> <div style="float: left; text-align: left;">{PREV}</div> <div style="float: right; text-align: right;">{NEXT}</div> <div style="text-align: center;">{NAVBAR}</div> <br /> <div style="text-align: center;">{NAVLIST}</div> <!-- END PAGETURN --> <!-- BEGIN OPTIONS --> <div style="text-align:right"> <br /> {EDIT} {DELETE} </div> <!-- END OPTIONS --> {COMMENTS} </div> </div> --- NEW FILE: Image_Wrap_Left.tpl --- <div class="box"> <div class="box-title"> <!-- BEGIN OPTIONS --> <div class="smaller"style="float: right; text-align: right;"> {PRINT_ICON} {EMAIL} </div> <!-- END OPTIONS --> <h1>{TITLE}</h1> </div> <div class="box-content"> <!-- BEGIN NAVIGATION --> <div class="smaller" style="text-align:right"> {NAVBAR} </div> <br /> <!-- END NAVIGATION --> <!-- BEGIN IMAGE --> <div style="float:left; margin-bottom:.5em; margin-right:1em"> {IMAGE} <div class="smaller" style="text-align:center"> {CAPTION} </div> </div> <!-- END IMAGE --> <!-- BEGIN SUMMARY --> <div class="smaller"> <i>{SUMMARYTEXT}</i> </div> <br /> <!-- END SUMMARY --> {BODYTEXT} <!-- BEGIN PAGETURN --> <div style="float: left; text-align: left;">{PREV}</div> <div style="float: right; text-align: right;">{NEXT}</div> <div style="text-align: center;">{NAVBAR}</div> <br /> <div style="text-align: center;">{NAVLIST}</div> <!-- END PAGETURN --> <!-- BEGIN OPTIONS --> <div style="text-align:right"> <br /> {EDIT} {DELETE} </div> <!-- END OPTIONS --> {COMMENTS} </div> </div> Index: Blank.tpl =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/article/templates/article/Blank.tpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Blank.tpl 2 Jul 2007 07:46:22 -0000 1.2 --- Blank.tpl 21 Aug 2008 20:17:33 -0000 1.3 *************** *** 6,10 **** </div> <!-- END OPTIONS --> ! <h1>{TITLE}</h1> </div> --- 6,10 ---- </div> <!-- END OPTIONS --> ! <h1>{TITLE}</h1> </div> *************** *** 16,21 **** <br /> <!-- END NAVIGATION --> ! ! <!-- BEGIN SUMMARY --> <div class="smaller"> <i>{SUMMARYTEXT}</i> --- 16,27 ---- <br /> <!-- END NAVIGATION --> ! ! <!-- BEGIN IMAGE --> ! <div class="smaller" style="text-align:center"> ! {IMAGE}<br /> ! {CAPTION} ! </div> ! <!-- END IMAGE --> ! <div class="smaller"> <i>{SUMMARYTEXT}</i> *************** *** 23,29 **** <br /> <!-- END SUMMARY --> ! {BODYTEXT} ! <!-- BEGIN PAGETURN --> <div style="float: left; text-align: left;">{PREV}</div> --- 29,35 ---- <br /> <!-- END SUMMARY --> ! {BODYTEXT} ! <!-- BEGIN PAGETURN --> <div style="float: left; text-align: left;">{PREV}</div> |
Update of /cvsroot/phpwebsite-comm/modules/article/boost In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2278/boost Modified Files: permission.php dependency.xml uninstall.php boost.php controlpanel.php install.sql update.php Log Message: Article Manager 4.1.0 Index: uninstall.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/article/boost/uninstall.php,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** uninstall.php 21 Oct 2007 05:52:53 -0000 1.9 --- uninstall.php 21 Aug 2008 20:17:29 -0000 1.10 *************** *** 1,19 **** ! <?php ! /** ! * This is the Article Manager uninstall file for Boost ! * ! * @version $Id$ ! * @author Eloi George <el...@NO...> ! */ ! function article_uninstall(&$content) ! { ! if (!PHPWS_File::rmdir(PHPWS_HOME_DIR.'files/article')) ! return FALSE; ! $content[] = dgettext('article', 'Article Manager configuration files removed.'); ! if (!PHPWS_DB::dropTable('article')) ! return FALSE; ! $content[] = dgettext('article', 'Article Manager tables removed.'); ! return TRUE; ! } ! ?> \ No newline at end of file --- 1,19 ---- ! <?php ! /** ! * This is the Article Manager uninstall file for Boost ! * ! * @version $Id$ ! * @author Eloi George <el...@NO...> ! */ ! function article_uninstall(&$content) ! { ! if (!PHPWS_File::rmdir(PHPWS_HOME_DIR.'files/article')) ! return FALSE; ! $content[] = dgettext('article', 'Article Manager configuration files removed.'); ! if (!PHPWS_DB::dropTable('article')) ! return FALSE; ! $content[] = dgettext('article', 'Article Manager tables removed.'); ! return TRUE; ! } ! ?> \ No newline at end of file Index: dependency.xml =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/article/boost/dependency.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** dependency.xml 21 Oct 2007 18:03:57 -0000 1.3 --- dependency.xml 21 Aug 2008 20:17:29 -0000 1.4 *************** *** 4,8 **** <title>core</title> <properName>phpWebSite Core</properName> ! <version>1.6.3</version> <url>http://phpwebsite.appstate.edu/downloads/modules/base/</url> </module> --- 4,8 ---- <title>core</title> <properName>phpWebSite Core</properName> ! <version>1.8.2</version> <url>http://phpwebsite.appstate.edu/downloads/modules/base/</url> </module> *************** *** 10,14 **** <title>categories</title> <properName>Categories</properName> ! <version>2.1.10</version> <url>http://phpwebsite.appstate.edu/downloads/modules/categories</url> </module> --- 10,14 ---- <title>categories</title> <properName>Categories</properName> ! <version>2.2.2</version> <url>http://phpwebsite.appstate.edu/downloads/modules/categories</url> </module> *************** *** 16,20 **** <title>controlpanel</title> <properName>Control Panel</properName> ! <version>2.1.3</version> <url>http://phpwebsite.appstate.edu/downloads/modules/controlpanel</url> </module> --- 16,20 ---- <title>controlpanel</title> <properName>Control Panel</properName> ! <version>2.1.6</version> <url>http://phpwebsite.appstate.edu/downloads/modules/controlpanel</url> </module> *************** *** 22,26 **** <title>filecabinet</title> <properName>File Cabinet</properName> ! <version>1.3.0</version> <url>http://phpwebsite.appstate.edu/downloads/modules/filecabinet</url> </module> --- 22,26 ---- <title>filecabinet</title> <properName>File Cabinet</properName> ! <version>2.1.0</version> <url>http://phpwebsite.appstate.edu/downloads/modules/filecabinet</url> </module> *************** *** 28,32 **** <title>users</title> <properName>Users</properName> ! <version>2.4.5</version> <url>http://phpwebsite.appstate.edu/downloads/modules/users</url> </module> --- 28,32 ---- <title>users</title> <properName>Users</properName> ! <version>2.5.0</version> <url>http://phpwebsite.appstate.edu/downloads/modules/users</url> </module> *************** *** 34,38 **** <title>version</title> <properName>Version</properName> ! <version>0.1.5</version> <url>http://phpwebsite.appstate.edu/downloads/modules/version</url> </module> --- 34,38 ---- <title>version</title> <properName>Version</properName> ! <version>0.1.6</version> <url>http://phpwebsite.appstate.edu/downloads/modules/version</url> </module> Index: permission.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/article/boost/permission.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** permission.php 16 Sep 2007 23:15:48 -0000 1.2 --- permission.php 21 Aug 2008 20:17:29 -0000 1.3 *************** *** 1,19 **** ! <?php ! ! $use_permissions = TRUE; ! ! $permissions['create_articles'] = dgettext('article', 'Create Articles'); ! $permissions['edit_articles'] = dgettext('article', 'Edit Articles'); ! $permissions['delete_articles'] = dgettext('article', 'Delete Articles'); ! $permissions['images_in_article'] = dgettext('article', 'Place Images In Articles'); ! $permissions['choose_section_template'] = dgettext('article', 'Choose Section Templates'); ! $permissions['choose_article_template'] = dgettext('article', 'Choose Article Templates'); ! $permissions['insert_external_pages'] = dgettext('article', 'Insert External Pages'); ! $permissions['allow_comments'] = dgettext('article', 'Allow/Disallow Comments'); ! $permissions['allow_anon'] = dgettext('article', 'Allow/Disallow Anonymous Comments'); ! $permissions['change_dates'] = dgettext('article', 'Change dates of Publication/Expiration'); ! $permissions['set_mainarticle'] = dgettext('article', 'Set Mainarticle'); ! $permissions['edit_robots'] = dgettext('article', 'Edit Search Engine Instructions'); ! ! $item_permissions = TRUE; ! ?> --- 1,19 ---- ! <?php ! ! $use_permissions = TRUE; ! ! $permissions['create_articles'] = dgettext('article', 'Create Articles'); ! $permissions['edit_articles'] = dgettext('article', 'Edit Articles'); ! $permissions['delete_articles'] = dgettext('article', 'Delete Articles'); ! $permissions['images_in_article'] = dgettext('article', 'Place Images In Articles'); ! $permissions['choose_section_template'] = dgettext('article', 'Choose Section Templates'); ! $permissions['choose_article_template'] = dgettext('article', 'Choose Article Templates'); ! $permissions['insert_external_pages'] = dgettext('article', 'Insert External Pages'); ! $permissions['allow_comments'] = dgettext('article', 'Allow/Disallow Comments'); ! $permissions['allow_anon'] = dgettext('article', 'Allow/Disallow Anonymous Comments'); ! $permissions['change_dates'] = dgettext('article', 'Change dates of Publication/Expiration'); ! $permissions['set_mainarticle'] = dgettext('article', 'Set Mainarticle'); ! $permissions['edit_robots'] = dgettext('article', 'Edit Search Engine Instructions'); ! ! $item_permissions = TRUE; ! ?> Index: boost.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/article/boost/boost.php,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** boost.php 26 Oct 2007 07:27:44 -0000 1.8 --- boost.php 21 Aug 2008 20:17:29 -0000 1.9 *************** *** 1,23 **** ! <?php ! /** ! * This is the Articlemaster mod_info file for Boost ! * ! * @version $Id$ ! * ! * @author Eloi George <el...@NO...> ! * @module Article Manager ! */ ! ! $proper_name = 'Article Manager'; ! $version = '4.0.6'; ! $register = FALSE; ! $unregister = FALSE; ! $import_sql = TRUE; ! $image_dir = TRUE; ! $file_dir = TRUE; ! $about = TRUE; ! $version_http = 'http://bygeorgeware.com/downloads/article/check.xml'; ! $priority = 50; ! $dependency = TRUE; ! ! ?> \ No newline at end of file --- 1,23 ---- ! <?php ! /** ! * This is the Articlemaster mod_info file for Boost ! * ! * @version $Id$ ! * ! * @author Eloi George <el...@NO...> ! * @module Article Manager ! */ ! ! $proper_name = 'Article Manager'; ! $version = '4.1.0'; ! $register = FALSE; ! $unregister = FALSE; ! $import_sql = TRUE; ! $image_dir = TRUE; ! $file_dir = TRUE; ! $about = TRUE; ! $version_http = 'http://bygeorgeware.com/downloads/article/check.xml'; ! $priority = 50; ! $dependency = TRUE; ! ! ?> Index: update.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/article/boost/update.php,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** update.php 26 Oct 2007 07:27:44 -0000 1.20 --- update.php 21 Aug 2008 20:17:29 -0000 1.21 *************** *** 1,154 **** ! <?php ! ! /** ! * @author Eloi George <el...@NO...> ! * @version $Id$ ! */ ! ! function article_update(&$content, $currentVersion) ! { ! switch ($currentVersion) { ! ! case version_compare($currentVersion, '4.0', '<'): ! $content[] = 'This package will not update versions prior to 4.0.'; ! return false; - case version_compare($currentVersion, '4.0.1', '<'): - $db = new PHPWS_DB('phpws_key'); - $sql = 'UPDATE phpws_key SET url = CONCAT("index.php?module=article&id=", item_id) WHERE module = "article"'; - $result = $db->query($sql); - if (PHPWS_Error::logIfError($result)) { - $content[] = 'Unable to fix key URLs.</pre>'; - return false; - } - $content[] = '+ Fixed Key URLs.'; - - $files = array('templates/edit.tpl', - 'templates/edit_section.tpl'); - $content[] = '+ Updated template files'; - if (PHPWS_Boost::updateFiles($files, 'article')) { - $content[] = ' o Files copied successfully:'; - } else { - $content[] = ' o Failed to copy files:'; - } - $content[] = ' ' . implode("\n ", $files); $content[] = '<pre> ======================== ! Changes in version 4.0.1 ======================== ! - I think core::loadobject may have changed, causing a bug in loading the right article ! - FilingCabinet\'s image selection dialog changed so that it\'s REAL BIG now. ! I made a small change to the editing form so that it won\'t look so cluttered. ! - Fixed a problem with MiniAdmin not showing up on some views. </pre>'; ! case version_compare($currentVersion, '4.0.2', '<'): ! $db = new PHPWS_DB('phpws_key'); ! $sql = 'UPDATE phpws_key SET edit_permission = "edit_articles" WHERE module = "article"'; ! $result = $db->query($sql); ! if (PHPWS_Error::logIfError($result)) { ! $content[] = 'Unable to fix key URLs.</pre>'; ! return false; ! } ! $content[] = '+ Fixed Key permissions.'; ! $content[] = '<pre> ! ======================== ! Changes in version 4.0.2 ! ======================== ! - Fixed a bug "Edit permission column does not exist" ! </pre>'; - case version_compare($currentVersion, '4.0.4', '<'): $db = new PHPWS_DB(); ! $result = $db->query('ALTER TABLE mod_article RENAME TO article'); ! if (PHPWS_Error::logIfError($result)) { ! $content[] = 'Unable to rename mod_article.</pre>'; ! return false; ! } ! $result = $db->query('ALTER TABLE mod_article_seq RENAME TO article_seq'); ! if (PHPWS_Error::logIfError($result)) { ! $content[] = 'Unable to rename mod_article_seq.</pre>'; ! return false; ! } ! $result = $db->query('ALTER TABLE mod_article_version RENAME TO article_version'); ! if (PHPWS_Error::logIfError($result)) { ! $content[] = 'Unable to rename mod_article_version.</pre>'; ! return false; ! } ! $result = $db->query('ALTER TABLE mod_article_version_seq RENAME TO article_version_seq'); ! if (PHPWS_Error::logIfError($result)) { ! $content[] = 'Unable to rename mod_article_version_seq.</pre>'; ! return false; ! } ! $result = PHPWS_DB::dropTable('mod_article_langs'); ! if (PHPWS_Error::logIfError($result)) { ! $content[] = 'Unable to delete table "mod_article_langs"</pre>'; ! return false; ! } ! $content[] = '+ Renamed module tables to conform to 1.x naming'; ! ! $files = array('templates/list_articles.tpl', ! 'templates/summary_view.tpl', ! 'templates/search_advanced.tpl', ! 'templates/edit_section.tpl', ! 'templates/edit.tpl'); ! if (PHPWS_Boost::updateFiles($files, 'article')) ! $content[] = '+ Updated the following files:'; ! else ! $content[] = '+ Unable to update the following files:'; ! $content[] = " " . implode("\n ", $files); ! ! $content[] = '<pre> ! ======================== ! Changes in version 4.0.4 ! ======================== ! + Fixed various error notices ! + Fixed various permissioning errors ! + Renamed module tables to conform to 1.x naming ! </pre>'; ! ! ! case version_compare($currentVersion, '4.0.5', '<'): ! if ($GLOBALS['PHPWS_DB']['tbl_prefix']) { ! $db = new PHPWS_DB(); ! $result = $db->query('ALTER TABLE article CHANGE '.$GLOBALS['PHPWS_DB']['tbl_prefix'].'mainarticle mainarticle SMALLINT NOT NULL DEFAULT 0'); ! $result = $db->query('ALTER TABLE article CHANGE is_base_'.$GLOBALS['PHPWS_DB']['tbl_prefix'].'article is_base_article SMALLINT NOT NULL DEFAULT 1'); ! $result = $db->query('ALTER TABLE article_version CHANGE '.$GLOBALS['PHPWS_DB']['tbl_prefix'].'mainarticle mainarticle SMALLINT NOT NULL DEFAULT 0'); ! $result = $db->query('ALTER TABLE article_version CHANGE is_base_'.$GLOBALS['PHPWS_DB']['tbl_prefix'].'article is_base_article SMALLINT NOT NULL DEFAULT 1'); ! $content[] = '+ Renamed maligned table columns'; ! } ! ! $content[] = '<pre> ! ======================== ! Changes in version 4.0.5 ! ======================== ! + Image selection dialog now disappears when not authorized ! + Changed processing of ARTICLE_vars to avoid faulty "each()" command ! + Featured articles will now not show up in the summary lists as well ! + Configuration files are now deleted on uninstallation ! + Renamed maligned table columns to correct previous PHPWS_db prefixing bug ! </pre>'; ! ! ! case version_compare($currentVersion, '4.0.6', '<'): ! $files = array('templates/import_result.tpl'); ! if (PHPWS_Boost::updateFiles($files, 'article')) ! $content[] = '+ Updated templates/import_result.tpl'; ! else ! $content[] = '+ Unable to update templates/import_result.tpl'; ! $content[] = '<pre> ======================== ! Changes in version 4.0.6 ======================== ! + Fixed an XML article import bug that was importing all articles to 0 </pre>'; ! ! ! } // end of switch ! return true; ! } ! ?> \ No newline at end of file --- 1,219 ---- ! <?php ! ! /** ! * @author Eloi George <el...@NO...> ! * @version $Id$ ! */ ! ! function article_update(&$content, $currentVersion) ! { ! switch ($currentVersion) { ! ! case version_compare($currentVersion, '4.0', '<'): ! $content[] = 'This package will not update versions prior to 4.0.'; ! return false; ! ! case version_compare($currentVersion, '4.0.1', '<'): ! $db = new PHPWS_DB('phpws_key'); ! $sql = 'UPDATE phpws_key SET url = CONCAT("index.php?module=article&id=", item_id) WHERE module = "article"'; ! $result = $db->query($sql); ! if (PHPWS_Error::logIfError($result)) { ! $content[] = 'Unable to fix key URLs.</pre>'; ! return false; ! } ! $content[] = '+ Fixed Key URLs.'; ! ! $files = array('templates/edit.tpl', ! 'templates/edit_section.tpl'); ! $content[] = '+ Updated template files'; ! if (PHPWS_Boost::updateFiles($files, 'article')) { ! $content[] = ' o Files copied successfully:'; ! } else { ! $content[] = ' o Failed to copy files:'; ! } ! $content[] = ' ' . implode("\n ", $files); ! ! $content[] = '<pre> ! ======================== ! Changes in version 4.0.1 ! ======================== ! - I think core::loadobject may have changed, causing a bug in loading the right article ! - FilingCabinet\'s image selection dialog changed so that it\'s REAL BIG now. ! I made a small change to the editing form so that it won\'t look so cluttered. ! - Fixed a problem with MiniAdmin not showing up on some views. ! </pre>'; ! ! ! case version_compare($currentVersion, '4.0.2', '<'): ! $db = new PHPWS_DB('phpws_key'); ! $sql = 'UPDATE phpws_key SET edit_permission = "edit_articles" WHERE module = "article"'; ! $result = $db->query($sql); ! if (PHPWS_Error::logIfError($result)) { ! $content[] = 'Unable to fix key URLs.</pre>'; ! return false; ! } ! $content[] = '+ Fixed Key permissions.'; ! $content[] = '<pre> ! ======================== ! Changes in version 4.0.2 ! ======================== ! - Fixed a bug "Edit permission column does not exist" ! </pre>'; ! ! case version_compare($currentVersion, '4.0.4', '<'): ! $db = new PHPWS_DB(); ! $result = $db->query('ALTER TABLE mod_article RENAME TO article'); ! if (PHPWS_Error::logIfError($result)) { ! $content[] = 'Unable to rename mod_article.</pre>'; ! return false; ! } ! $result = $db->query('ALTER TABLE mod_article_seq RENAME TO article_seq'); ! if (PHPWS_Error::logIfError($result)) { ! $content[] = 'Unable to rename mod_article_seq.</pre>'; ! return false; ! } ! $result = $db->query('ALTER TABLE mod_article_version RENAME TO article_version'); ! if (PHPWS_Error::logIfError($result)) { ! $content[] = 'Unable to rename mod_article_version.</pre>'; ! return false; ! } ! $result = $db->query('ALTER TABLE mod_article_version_seq RENAME TO article_version_seq'); ! if (PHPWS_Error::logIfError($result)) { ! $content[] = 'Unable to rename mod_article_version_seq.</pre>'; ! return false; ! } ! $result = PHPWS_DB::dropTable('mod_article_langs'); ! if (PHPWS_Error::logIfError($result)) { ! $content[] = 'Unable to delete table "mod_article_langs"</pre>'; ! return false; ! } ! $content[] = '+ Renamed module tables to conform to 1.x naming'; ! ! $files = array('templates/list_articles.tpl', ! 'templates/summary_view.tpl', ! 'templates/search_advanced.tpl', ! 'templates/edit_section.tpl', ! 'templates/edit.tpl'); ! if (PHPWS_Boost::updateFiles($files, 'article')) ! $content[] = '+ Updated the following files:'; ! else ! $content[] = '+ Unable to update the following files:'; ! $content[] = " " . implode("\n ", $files); ! ! $content[] = '<pre> ! ======================== ! Changes in version 4.0.4 ! ======================== ! + Fixed various error notices ! + Fixed various permissioning errors ! + Renamed module tables to conform to 1.x naming ! </pre>'; ! ! ! case version_compare($currentVersion, '4.0.5', '<'): ! if ($GLOBALS['PHPWS_DB']['tbl_prefix']) { ! $db = new PHPWS_DB(); ! $result = $db->query('ALTER TABLE article CHANGE '.$GLOBALS['PHPWS_DB']['tbl_prefix'].'mainarticle mainarticle SMALLINT NOT NULL DEFAULT 0'); ! $result = $db->query('ALTER TABLE article CHANGE is_base_'.$GLOBALS['PHPWS_DB']['tbl_prefix'].'article is_base_article SMALLINT NOT NULL DEFAULT 1'); ! $result = $db->query('ALTER TABLE article_version CHANGE '.$GLOBALS['PHPWS_DB']['tbl_prefix'].'mainarticle mainarticle SMALLINT NOT NULL DEFAULT 0'); ! $result = $db->query('ALTER TABLE article_version CHANGE is_base_'.$GLOBALS['PHPWS_DB']['tbl_prefix'].'article is_base_article SMALLINT NOT NULL DEFAULT 1'); ! $content[] = '+ Renamed maligned table columns'; ! } ! ! $content[] = '<pre> ! ======================== ! Changes in version 4.0.5 ! ======================== ! + Image selection dialog now disappears when not authorized ! + Changed processing of ARTICLE_vars to avoid faulty "each()" command ! + Featured articles will now not show up in the summary lists as well ! + Configuration files are now deleted on uninstallation ! + Renamed maligned table columns to correct previous PHPWS_db prefixing bug ! </pre>'; ! ! ! case version_compare($currentVersion, '4.0.6', '<'): ! $files = array('templates/import_result.tpl'); ! if (PHPWS_Boost::updateFiles($files, 'article')) ! $content[] = '+ Updated templates/import_result.tpl'; ! else ! $content[] = '+ Unable to update templates/import_result.tpl'; ! ! $content[] = '<pre> ! ======================== ! Changes in version 4.0.6 ! ======================== ! + Fixed an XML article import bug that was importing all articles to 0 ! </pre>'; + case version_compare($currentVersion, '4.0.9', '<'): + $files = array('templates/runtime_chronological.tpl', + 'templates/runtime_categorized.tpl', + 'templates/article/Blank.tpl', + 'templates/article/Byline.tpl', + 'templates/article/Dated.tpl', + 'templates/article/Image_Wrap_Left.tpl', + 'templates/article/Image_Wrap_Right.tpl', + 'templates/list_summaries.tpl'); + if (PHPWS_Boost::updateFiles($files, 'article')) + $content[] = '+ Updated the following files:'; + else + $content[] = '+ Unable to update the following files:'; + $content[] = " " . implode("\n ", $files); + $content[] = '<pre> ======================== ! Changes in version 4.0.9 ======================== ! + Created generic tags (CREATED_DATE, UPDATED_DATE) with time-format-specific template tags: ! CREATED_DATE_LONG ! UPDATED_DATE_LONG ! CREATED_DATE_SHORT ! UPDATED_DATE_SHORT ! CREATED_DATE_REL ! UPDATED_DATE_REL ! + Added summary image tags (IMAGE and CAPTION) to the default page and summary templates ! + Fixed notice where $_POST[`meta_keywords`] wasn`t being created. ! + Added image-related fields to PHPWS_AM_Data::bulk_load_db() so that images can show up on summary lists ! + trf000 reported that the import/export xml feature isn`t working with branches. Fixed by replacing the PHPWS_SOURCE_DIRs with PHPWS_HOME_DIRs </pre>'; ! case version_compare($currentVersion, '4.1.0', '<'): ! $files = array('templates/article/edit.tpl', ! 'templates/mail_link.tpl'); ! if (PHPWS_Boost::updateFiles($files, 'article')) ! $content[] = '+ Updated the following files:'; ! else ! $content[] = '+ Unable to update the following files:'; ! $content[] = " " . implode("<br />s\n ", $files); $db = new PHPWS_DB(); ! $db->query('ALTER TABLE article DROP allow_anonymous'); ! $content[] = '+ Deleted row "allow_anonymous" from Article table'; ! $content[] = '<pre> ======================== ! Changes in version 4.1.0 ======================== ! + CREATED_DATE & UPDATED_DATE tags use the CREATED_DATE_SHORT & UPDATED_DATE_SHORT date formats ! + Removed references to the obsolete Category::getTag() ! + The allow_anonymous setting is already stored in the Comment thread, so it`s been taken out of the Article record ! + AM now allows you to set the new Comments default_approval setting ! + Article->save() now exposes its Key (_key) and Comment_Thread (_thread) to reduce extra queries ! + Fixed Bug [2030665] Help not working properly ! + Fixed Bug [2030668] Email Article ! + Fixed Bug [2030733] Print doesn`t compile pages ! + Fixed Bug [2030671] Email Article Pt II ! + Fixed Bug [2008378] Comments are not converted correctly ! + Fixed Bug [2008368] Images are not converted correctly ! + 0.10.x Convertor now ignores comments if you`ve disabled them for the entire module </pre>'; ! ! ! } // end of switch ! return true; ! } ! ?> \ No newline at end of file Index: install.sql =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/article/boost/install.sql,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** install.sql 17 Sep 2007 01:12:26 -0000 1.14 --- install.sql 21 Aug 2008 20:17:29 -0000 1.15 *************** *** 1,43 **** ! CREATE TABLE article ( ! id int NOT NULL default '0', ! key_id INT NOT NULL, ! title varchar(80) NOT NULL, ! mainarticle smallint NOT NULL DEFAULT '0', ! rank smallint NOT NULL DEFAULT '50', ! created_username varchar(20) NOT NULL, ! created_id int NOT NULL DEFAULT '0', ! updated_username varchar(20) NOT NULL, ! updated_id int NOT NULL DEFAULT '0', ! created_date int NOT NULL, ! updated_date int NOT NULL, ! summary text NOT NULL, ! allow_comments smallint NOT NULL DEFAULT '0', ! allow_anonymous smallint NOT NULL DEFAULT '0', ! hits int NOT NULL DEFAULT '0', ! expiration_date int NOT NULL, ! publication_date int NOT NULL, ! wordcount smallint NOT NULL DEFAULT '0', ! pagecount smallint NOT NULL, ! template varchar(50) NOT NULL DEFAULT 'Blank.tpl', ! editlock smallint NOT NULL DEFAULT '0', ! edituser int NOT NULL, ! approved smallint NOT NULL DEFAULT '0', ! version smallint NOT NULL DEFAULT '0', ! announce smallint NOT NULL DEFAULT '1', ! language char(2) NOT NULL DEFAULT 'en', ! is_base_article smallint NOT NULL DEFAULT '1', ! pages longtext NOT NULL, ! image_id int NOT NULL DEFAULT '0', ! image_link varchar(255) NOT NULL, ! image_caption varchar(255) NOT NULL, ! draft smallint NOT NULL DEFAULT '0', ! active smallint NOT NULL DEFAULT '1', ! ! PRIMARY KEY (id) ! ); ! CREATE INDEX hits_idx on article(hits); ! CREATE INDEX expiration_date_idx on article(expiration_date); ! CREATE INDEX updated_date_idx on article(updated_date); ! CREATE INDEX publication_date_idx on article(publication_date); ! CREATE INDEX language_idx on article(language); ! CREATE INDEX is_base_article_idx on article(is_base_article); --- 1,42 ---- ! CREATE TABLE article ( ! id int NOT NULL default '0', ! key_id INT NOT NULL, ! title varchar(80) NOT NULL, ! mainarticle smallint NOT NULL DEFAULT '0', ! rank smallint NOT NULL DEFAULT '50', ! created_username varchar(20) NOT NULL, ! created_id int NOT NULL DEFAULT '0', ! updated_username varchar(20) NOT NULL, ! updated_id int NOT NULL DEFAULT '0', ! created_date int NOT NULL, ! updated_date int NOT NULL, ! summary text NOT NULL, ! allow_comments smallint NOT NULL DEFAULT '0', ! hits int NOT NULL DEFAULT '0', ! expiration_date int NOT NULL, ! publication_date int NOT NULL, ! wordcount smallint NOT NULL DEFAULT '0', ! pagecount smallint NOT NULL, ! template varchar(50) NOT NULL DEFAULT 'Blank.tpl', ! editlock smallint NOT NULL DEFAULT '0', ! edituser int NOT NULL, ! approved smallint NOT NULL DEFAULT '0', ! version smallint NOT NULL DEFAULT '0', ! announce smallint NOT NULL DEFAULT '1', ! language char(2) NOT NULL DEFAULT 'en', ! is_base_article smallint NOT NULL DEFAULT '1', ! pages longtext NOT NULL, ! image_id int NOT NULL DEFAULT '0', ! image_link varchar(255) NOT NULL, ! image_caption varchar(255) NOT NULL, ! draft smallint NOT NULL DEFAULT '0', ! active smallint NOT NULL DEFAULT '1', ! ! PRIMARY KEY (id) ! ); ! CREATE INDEX hits_idx on article(hits); ! CREATE INDEX expiration_date_idx on article(expiration_date); ! CREATE INDEX updated_date_idx on article(updated_date); ! CREATE INDEX publication_date_idx on article(publication_date); ! CREATE INDEX language_idx on article(language); ! CREATE INDEX is_base_article_idx on article(is_base_article); Index: controlpanel.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/article/boost/controlpanel.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** controlpanel.php 9 Jul 2007 00:18:53 -0000 1.2 --- controlpanel.php 21 Aug 2008 20:17:29 -0000 1.3 *************** *** 1,9 **** ! <?php ! $link[] = array ('label' => dgettext('article', 'Article Manager'), ! 'restricted' => TRUE, ! 'url' => 'index.php?module=article&op=main_menu', ! 'description' => 'Go here to post articles, information & web pages.', ! 'image' => 'articlemanager.gif', ! 'tab' => 'content'); ! ?> \ No newline at end of file --- 1,9 ---- ! <?php ! $link[] = array ('label' => dgettext('article', 'Article Manager'), ! 'restricted' => TRUE, ! 'url' => 'index.php?module=article&op=main_menu', ! 'description' => 'Go here to post articles, information & web pages.', ! 'image' => 'articlemanager.gif', ! 'tab' => 'content'); ! ?> \ No newline at end of file |
|
From: Eloi G. <ada...@us...> - 2008-08-21 20:17:53
|
Update of /cvsroot/phpwebsite-comm/modules/article/locale/en_US/LC_MESSAGES In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2278/locale/en_US/LC_MESSAGES Modified Files: article.po Log Message: Article Manager 4.1.0 Index: article.po =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/article/locale/en_US/LC_MESSAGES/article.po,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** article.po 11 Jul 2007 03:01:06 -0000 1.1 --- article.po 21 Aug 2008 20:17:30 -0000 1.2 *************** *** 1,995 **** ! # Article Manager 4.0. ! # Copyright (C) 2007 ! # This file is distributed under the same license as the PACKAGE package. ! # Eloi George <el...@NO...>, 2007. ! # ! #, fuzzy ! msgid "" ! msgstr "" ! "Project-Id-Version: PACKAGE VERSION\n" ! "Report-Msgid-Bugs-To: \n" [...1961 lines suppressed...] ! msgid "delete" ! msgstr "" ! ! msgid "eMail" ! msgstr "" ! ! msgid "last" ! msgstr "" ! ! msgid "more words" ! msgstr "" ! ! msgid "page" ! msgstr "" ! ! msgid "pages" ! msgstr "" ! ! msgid "sent to" ! msgstr "" |
|
From: Eloi G. <ada...@us...> - 2008-08-21 20:17:52
|
Update of /cvsroot/phpwebsite-comm/modules/article/templates/section In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2278/templates/section Modified Files: Page_Insertion_to_Fit_Page.tpl Page_Insertion_for_Max_Page.tpl Image_Block_Right.tpl Page_Insertion_with_Title_is_Size.tpl Page_Insertion_to_Fit_Block.tpl Image_Block_Left.tpl No_Images.tpl Log Message: Article Manager 4.1.0 Index: Page_Insertion_to_Fit_Page.tpl =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/article/templates/section/Page_Insertion_to_Fit_Page.tpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Page_Insertion_to_Fit_Page.tpl 2 Jul 2007 07:46:23 -0000 1.2 --- Page_Insertion_to_Fit_Page.tpl 21 Aug 2008 20:17:26 -0000 1.3 *************** *** 1,170 **** ! <!-- 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 --> ! <br /> --- 1,170 ---- ! <!-- 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 --> ! <br /> Index: Image_Block_Left.tpl =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/article/templates/section/Image_Block_Left.tpl,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Image_Block_Left.tpl 2 Jul 2007 07:46:23 -0000 1.4 --- Image_Block_Left.tpl 21 Aug 2008 20:17:26 -0000 1.5 *************** *** 1,24 **** ! <table border="0" width="100%" cellpadding="4" cellspacing="0"> ! <tr valign="top"> ! <!-- BEGIN IMAGE --> ! <td style="text-align : center"> ! <br />{IMAGE} ! <div class="smaller"> ! {CAPTION} ! </div> ! </td> ! <!-- END IMAGE --> ! <td width="100%"> ! <!-- BEGIN TITLE_TEXT --> ! <!-- BEGIN TITLE --> ! <h2>{TITLE}</h2> ! <!-- END TITLE --> ! <!-- BEGIN TEXT --> ! {TEXT} ! <!-- END TEXT --> ! <!-- END TITLE_TEXT --> ! </td> ! </tr> ! </table> ! <br /> ! <br /> --- 1,24 ---- ! <table border="0" width="100%" cellpadding="4" cellspacing="0"> ! <tr valign="top"> ! <!-- BEGIN IMAGE --> ! <td style="text-align : center"> ! <br />{IMAGE} ! <div class="smaller"> ! {CAPTION} ! </div> ! </td> ! <!-- END IMAGE --> ! <td width="100%"> ! <!-- BEGIN TITLE_TEXT --> ! <!-- BEGIN TITLE --> ! <h2>{TITLE}</h2> ! <!-- END TITLE --> ! <!-- BEGIN TEXT --> ! {TEXT} ! <!-- END TEXT --> ! <!-- END TITLE_TEXT --> ! </td> ! </tr> ! </table> ! <br /> ! <br /> Index: No_Images.tpl =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/article/templates/section/No_Images.tpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** No_Images.tpl 2 Jul 2007 07:46:23 -0000 1.2 --- No_Images.tpl 21 Aug 2008 20:17:26 -0000 1.3 *************** *** 1,8 **** ! <!-- BEGIN TITLE --> ! <h2>{TITLE}</h2> ! <!-- END TITLE --> ! <!-- BEGIN TEXT --> ! {TEXT} ! <!-- END TEXT --> ! <br /> ! <br /> --- 1,8 ---- ! <!-- BEGIN TITLE --> ! <h2>{TITLE}</h2> ! <!-- END TITLE --> ! <!-- BEGIN TEXT --> ! {TEXT} ! <!-- END TEXT --> ! <br /> ! <br /> Index: Page_Insertion_to_Fit_Block.tpl =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/article/templates/section/Page_Insertion_to_Fit_Block.tpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Page_Insertion_to_Fit_Block.tpl 2 Jul 2007 07:46:23 -0000 1.2 --- Page_Insertion_to_Fit_Block.tpl 21 Aug 2008 20:17:26 -0000 1.3 *************** *** 1,170 **** ! <!-- 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 --> ! <br /> --- 1,170 ---- ! <!-- 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 --> ! <br /> Index: Page_Insertion_for_Max_Page.tpl =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/article/templates/section/Page_Insertion_for_Max_Page.tpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Page_Insertion_for_Max_Page.tpl 2 Jul 2007 07:46:23 -0000 1.2 --- Page_Insertion_for_Max_Page.tpl 21 Aug 2008 20:17:26 -0000 1.3 *************** *** 1,177 **** ! <!-- 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 --> ! <br /> --- 1,177 ---- ! <!-- 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 --> ! <br /> Index: Image_Block_Right.tpl =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/article/templates/section/Image_Block_Right.tpl,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Image_Block_Right.tpl 2 Jul 2007 07:46:23 -0000 1.4 --- Image_Block_Right.tpl 21 Aug 2008 20:17:26 -0000 1.5 *************** *** 1,26 **** ! <!-- BEGIN TABLE --> ! <table border="0" width="100%" cellpadding="4" cellspacing="0"> ! <tr valign="top"> ! <td width="100%"> ! <!-- BEGIN TITLE_TEXT --> ! <!-- BEGIN TITLE --> ! <h2>{TITLE}</h2> ! <!-- END TITLE --> ! <!-- BEGIN TEXT --> ! {TEXT} ! <!-- END TEXT --> ! <!-- END TITLE_TEXT --> ! </td> ! <!-- BEGIN IMAGE --> ! <td style="text-align : center"> ! <br />{IMAGE} ! <div class="smaller"> ! {CAPTION} ! </div> ! </td> ! <!-- END IMAGE --> ! </tr> ! </table> ! <!-- END TABLE --> ! <br /> ! <br /> --- 1,26 ---- ! <!-- BEGIN TABLE --> ! <table border="0" width="100%" cellpadding="4" cellspacing="0"> ! <tr valign="top"> ! <td width="100%"> ! <!-- BEGIN TITLE_TEXT --> ! <!-- BEGIN TITLE --> ! <h2>{TITLE}</h2> ! <!-- END TITLE --> ! <!-- BEGIN TEXT --> ! {TEXT} ! <!-- END TEXT --> ! <!-- END TITLE_TEXT --> ! </td> ! <!-- BEGIN IMAGE --> ! <td style="text-align : center"> ! <br />{IMAGE} ! <div class="smaller"> ! {CAPTION} ! </div> ! </td> ! <!-- END IMAGE --> ! </tr> ! </table> ! <!-- END TABLE --> ! <br /> ! <br /> Index: Page_Insertion_with_Title_is_Size.tpl =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/article/templates/section/Page_Insertion_with_Title_is_Size.tpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Page_Insertion_with_Title_is_Size.tpl 2 Jul 2007 07:46:23 -0000 1.2 --- Page_Insertion_with_Title_is_Size.tpl 21 Aug 2008 20:17:26 -0000 1.3 *************** *** 1,170 **** ! <!-- 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 --> ! <br /> --- 1,170 ---- ! <!-- 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 --> ! <br /> |
|
From: Eloi G. <ada...@us...> - 2008-08-21 20:17:52
|
Update of /cvsroot/phpwebsite-comm/modules/article/javascript/tooltip In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2278/javascript/tooltip Modified Files: body.js Log Message: Article Manager 4.1.0 Index: body.js =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/article/javascript/tooltip/body.js,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** body.js 17 Jun 2007 20:41:19 -0000 1.1 --- body.js 21 Aug 2008 20:17:28 -0000 1.2 *************** *** 1,69 **** ! <div id="dhtmltooltip"></div> ! ! <script type="text/javascript"> ! ! /*********************************************** ! * Cool DHTML tooltip script- © Dynamic Drive DHTML code library (www.dynamicdrive.com) ! * This notice MUST stay intact for legal use ! * Visit Dynamic Drive at http://www.dynamicdrive.com/ for full source code ! ***********************************************/ ! ! var offsetxpoint=-60 //Customize x offset of tooltip ! var offsetypoint=20 //Customize y offset of tooltip ! var ie=document.all ! var ns6=document.getElementById && !document.all ! var enabletip=false ! if (ie||ns6) ! var tipobj=document.all? document.all["dhtmltooltip"] : document.getElementById? document.getElementById("dhtmltooltip") : "" ! ! function ietruebody(){ ! return (document.compatMode && document.compatMode!="BackCompat")? document.documentElement : document.body ! } ! ! function ddrivetip(thetext, thecolor, thewidth){ ! if (ns6||ie){ ! if (typeof thewidth!="undefined") tipobj.style.width=thewidth+"px" ! if (typeof thecolor!="undefined" && thecolor!="") tipobj.style.backgroundColor=thecolor ! tipobj.innerHTML=thetext ! enabletip=true ! return false ! } ! } ! ! function positiontip(e){ ! if (enabletip && tipobj.style.visibility!="visible"){ ! var curX=(ns6)?e.pageX : event.x+ietruebody().scrollLeft; ! var curY=(ns6)?e.pageY : event.y+ietruebody().scrollTop; ! var rightedge=ie&&!window.opera? ietruebody().clientWidth-event.clientX-offsetxpoint : window.innerWidth-e.clientX-offsetxpoint-20 ! var bottomedge=ie&&!window.opera? ietruebody().clientHeight-event.clientY-offsetypoint : window.innerHeight-e.clientY-offsetypoint-20 ! ! var leftedge=(offsetxpoint<0)? offsetxpoint*(-1) : -1000 ! ! if (rightedge<tipobj.offsetWidth) ! tipobj.style.left=ie? ietruebody().scrollLeft+event.clientX-tipobj.offsetWidth+"px" : window.pageXOffset+e.clientX-tipobj.offsetWidth+"px" ! else if (curX<leftedge) ! tipobj.style.left="5px" ! else ! tipobj.style.left=curX+offsetxpoint+"px" ! ! if (bottomedge<tipobj.offsetHeight) ! tipobj.style.top=ie? ietruebody().scrollTop+event.clientY-tipobj.offsetHeight-offsetypoint+"px" : window.pageYOffset+e.clientY-tipobj.offsetHeight-offsetypoint+"px" ! else ! tipobj.style.top=curY+offsetypoint+"px" ! tipobj.style.visibility="visible" ! } ! } ! ! function hideddrivetip(){ ! if (ns6||ie){ ! enabletip=false ! tipobj.style.visibility="hidden" ! tipobj.style.left="-1000px" ! tipobj.style.backgroundColor="" ! tipobj.style.width="" ! } ! } ! ! document.onmousemove=positiontip ! ! </script> --- 1,69 ---- ! <div id="dhtmltooltip"></div> ! ! <script type="text/javascript"> ! ! /*********************************************** ! * Cool DHTML tooltip script- © Dynamic Drive DHTML code library (www.dynamicdrive.com) ! * This notice MUST stay intact for legal use ! * Visit Dynamic Drive at http://www.dynamicdrive.com/ for full source code ! ***********************************************/ ! ! var offsetxpoint=-60 //Customize x offset of tooltip ! var offsetypoint=20 //Customize y offset of tooltip ! var ie=document.all ! var ns6=document.getElementById && !document.all ! var enabletip=false ! if (ie||ns6) ! var tipobj=document.all? document.all["dhtmltooltip"] : document.getElementById? document.getElementById("dhtmltooltip") : "" ! ! function ietruebody(){ ! return (document.compatMode && document.compatMode!="BackCompat")? document.documentElement : document.body ! } ! ! function ddrivetip(thetext, thecolor, thewidth){ ! if (ns6||ie){ ! if (typeof thewidth!="undefined") tipobj.style.width=thewidth+"px" ! if (typeof thecolor!="undefined" && thecolor!="") tipobj.style.backgroundColor=thecolor ! tipobj.innerHTML=thetext ! enabletip=true ! return false ! } ! } ! ! function positiontip(e){ ! if (enabletip && tipobj.style.visibility!="visible"){ ! var curX=(ns6)?e.pageX : event.x+ietruebody().scrollLeft; ! var curY=(ns6)?e.pageY : event.y+ietruebody().scrollTop; ! var rightedge=ie&&!window.opera? ietruebody().clientWidth-event.clientX-offsetxpoint : window.innerWidth-e.clientX-offsetxpoint-20 ! var bottomedge=ie&&!window.opera? ietruebody().clientHeight-event.clientY-offsetypoint : window.innerHeight-e.clientY-offsetypoint-20 ! ! var leftedge=(offsetxpoint<0)? offsetxpoint*(-1) : -1000 ! ! if (rightedge<tipobj.offsetWidth) ! tipobj.style.left=ie? ietruebody().scrollLeft+event.clientX-tipobj.offsetWidth+"px" : window.pageXOffset+e.clientX-tipobj.offsetWidth+"px" ! else if (curX<leftedge) ! tipobj.style.left="5px" ! else ! tipobj.style.left=curX+offsetxpoint+"px" ! ! if (bottomedge<tipobj.offsetHeight) ! tipobj.style.top=ie? ietruebody().scrollTop+event.clientY-tipobj.offsetHeight-offsetypoint+"px" : window.pageYOffset+e.clientY-tipobj.offsetHeight-offsetypoint+"px" ! else ! tipobj.style.top=curY+offsetypoint+"px" ! tipobj.style.visibility="visible" ! } ! } ! ! function hideddrivetip(){ ! if (ns6||ie){ ! enabletip=false ! tipobj.style.visibility="hidden" ! tipobj.style.left="-1000px" ! tipobj.style.backgroundColor="" ! tipobj.style.width="" ! } ! } ! ! document.onmousemove=positiontip ! ! </script> |
|
From: Eloi G. <ada...@us...> - 2008-08-21 20:17:46
|
Update of /cvsroot/phpwebsite-comm/modules/article/templates In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2278/templates Modified Files: edit.tpl config.tpl runtime_chronological.tpl approval_summary_view.tpl runtime_categorized.tpl history.tpl import.tpl import_result.tpl style.css edit_page.tpl edit_section.tpl summary_view.tpl mail_link.tpl mail_full.tpl Log Message: Article Manager 4.1.0 Index: runtime_chronological.tpl =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/article/templates/runtime_chronological.tpl,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** runtime_chronological.tpl 9 Jul 2007 00:19:00 -0000 1.4 --- runtime_chronological.tpl 21 Aug 2008 20:17:22 -0000 1.5 *************** *** 1,41 **** ! <table style="text-align: left; width: 100%;" border="0" cellpadding="10" cellspacing="10"> ! <tbody> ! ! <!-- BEGIN list_rows --> ! <tr> ! <!-- BEGIN list_columns --> ! <td style="width:{CELL_WIDTH}%" > ! ! <!-- BEGIN TITLE --> ! <h2>{TITLE_LINK}</h2> ! <div class="smaller"> ! {UPDATED_TEXT} (Read: {HITS} times) ! </div> ! <br /> ! <!-- END TITLE --> ! <!-- BEGIN CONTENT --> ! <!-- BEGIN CATEGORIES --> ! <div style="float:right;"> ! {CATEGORY_ICONS} ! </div> ! <!-- END CATEGORIES --> ! ! {SUMMARYTEXT} ! ! <div class="smaller" style="clear:both; text-align:right"> ! <br /> ! <!-- BEGIN INFO --> ! {READMORE} {MOREWORDS} - {MOREPAGES} ! <!-- END INFO --> ! {EDIT} {DELETE} {NUM_COMMENTS} {PRINT_ICON} {EMAIL} ! <br /> ! </div> ! <!-- END CONTENT --> ! ! </td> ! <!-- END list_columns --> ! </tr> ! <!-- END list_rows --> ! ! </tbody> ! </table> --- 1,53 ---- ! <table style="text-align: left; width: 100%;" border="0" cellpadding="10" cellspacing="10"> ! <tbody> ! ! <!-- BEGIN list_rows --> ! <tr> ! <!-- BEGIN list_columns --> ! <td style="width:{CELL_WIDTH}%" > ! ! <!-- BEGIN TITLE --> ! <h2>{TITLE_LINK}</h2> ! <div class="smaller"> ! {UPDATED_TEXT} -- {UPDATED_DATE_SHORT} (Read: {HITS} times) ! </div> ! <br /> ! <!-- END TITLE --> ! <!-- BEGIN CONTENT --> ! <!-- BEGIN CATEGORIES --> ! <div style="float:right;"> ! {CATEGORY_ICONS} ! </div> ! <!-- END CATEGORIES --> ! ! <!-- BEGIN IMG --> ! <div> ! {IMAGE} ! <!-- BEGIN IMG_CAP --> ! <div class="smaller"> ! {CAPTION} ! </div> ! <!-- END IMG_CAP --> ! </div> ! <br /> ! <!-- END IMG --> ! ! {SUMMARYTEXT} ! ! <div class="smaller" style="clear:both; text-align:right"> ! <br /> ! <!-- BEGIN INFO --> ! {READMORE} {MOREWORDS} - {MOREPAGES} ! <!-- END INFO --> ! {EDIT} {DELETE} {NUM_COMMENTS} {PRINT_ICON} {EMAIL} ! <br /> ! </div> ! <!-- END CONTENT --> ! ! </td> ! <!-- END list_columns --> ! </tr> ! <!-- END list_rows --> ! ! </tbody> ! </table> Index: import.tpl =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/article/templates/import.tpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** import.tpl 17 Jun 2007 22:28:39 -0000 1.1 --- import.tpl 21 Aug 2008 20:17:22 -0000 1.2 *************** *** 1,31 **** ! {START_FORM} ! ! {INSTRUCTIONS} ! <br /> ! <br /> ! {NUMBERING} ! <br /> ! <br /> ! {AVAILABLE_ID} ! <br /> ! <br /> ! <h2> ! {SETTINGS_TITLE} ! </h2> ! {OVERWRITE} {OVERWRITE_LABEL} ! <br /> ! {CONVERT_HTTP} {CONVERT_HTTP_LABEL} ! <br /> ! <br /> ! <h2> ! {LIST_TITLE} ! </h2> ! <!-- BEGIN file_list --> ! {FILE} ! <br /> ! <!-- END file_list --> ! ! <br /> ! {BTN_IMPORT} ! ! {END_FORM} --- 1,31 ---- ! {START_FORM} ! ! {INSTRUCTIONS} ! <br /> ! <br /> ! {NUMBERING} ! <br /> ! <br /> ! {AVAILABLE_ID} ! <br /> ! <br /> ! <h2> ! {SETTINGS_TITLE} ! </h2> ! {OVERWRITE} {OVERWRITE_LABEL} ! <br /> ! {CONVERT_HTTP} {CONVERT_HTTP_LABEL} ! <br /> ! <br /> ! <h2> ! {LIST_TITLE} ! </h2> ! <!-- BEGIN file_list --> ! {FILE} ! <br /> ! <!-- END file_list --> ! ! <br /> ! {BTN_IMPORT} ! ! {END_FORM} Index: runtime_categorized.tpl =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/article/templates/runtime_categorized.tpl,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** runtime_categorized.tpl 4 Jul 2007 23:02:07 -0000 1.3 --- runtime_categorized.tpl 21 Aug 2008 20:17:22 -0000 1.4 *************** *** 1,40 **** ! <table style="text-align: left; width: 100%;" border="0" cellpadding="10" cellspacing="10"> ! <tbody> ! ! <!-- BEGIN list_rows --> ! <tr> ! <!-- BEGIN list_columns --> ! <td style="width:{CELL_WIDTH}%" > ! <!-- BEGIN CATEGORY_IMAGE --> ! <div style="float:left; padding-right:10px"> ! {CATEGORY_ICON} ! </div> ! <!-- END CATEGORY_IMAGE --> ! <hr> ! <h2> ! {CATEGORY_NAME} ! </h2> ! <hr> ! <!-- BEGIN list_headline_summaries --> ! <h3 style="clear:left">{TITLE_LINK}</h3> ! <!-- BEGIN SUMMARY --> ! <span class="smaller">{SUMMARYTEXT}</span> ! <br /> ! <br /> ! <!-- END SUMMARY --> ! ! <!-- END list_headline_summaries --> ! <ul> ! <!-- BEGIN list_headline_titles --> ! <li> ! {TITLE_LINK} ! </li> ! <!-- END list_headline_titles --> ! </ul> ! </td> ! <!-- END list_columns --> ! </tr> ! <!-- END list_rows --> ! ! </tbody> ! </table> --- 1,52 ---- ! <table style="text-align: left; width: 100%;" border="0" cellpadding="10" cellspacing="10"> ! <tbody> ! ! <!-- BEGIN list_rows --> ! <tr> ! <!-- BEGIN list_columns --> ! <td style="width:{CELL_WIDTH}%" > ! <!-- BEGIN CATEGORY_IMAGE --> ! <div style="float:left; padding-right:10px"> ! {CATEGORY_ICON} ! </div> ! <!-- END CATEGORY_IMAGE --> ! <hr> ! <h2> ! {CATEGORY_NAME} ! </h2> ! <hr> ! <!-- BEGIN list_headline_summaries --> ! <h3 style="clear:left">{TITLE_LINK}</h3> ! ! <!-- BEGIN IMG --> ! <div> ! {IMAGE} ! <!-- BEGIN IMG_CAP --> ! <div class="smaller"> ! {CAPTION} ! </div> ! <!-- END IMG_CAP --> ! </div> ! <!-- END IMG --> ! ! <!-- BEGIN SUMMARY --> ! <span class="smaller">{SUMMARYTEXT}</span> ! <br /> ! <br /> ! <!-- END SUMMARY --> ! ! <!-- END list_headline_summaries --> ! <ul> ! <!-- BEGIN list_headline_titles --> ! <li> ! {TITLE_LINK} ! </li> ! <!-- END list_headline_titles --> ! </ul> ! </td> ! <!-- END list_columns --> ! </tr> ! <!-- END list_rows --> ! ! </tbody> ! </table> Index: mail_full.tpl =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/article/templates/mail_full.tpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** mail_full.tpl 19 Feb 2004 21:48:55 -0000 1.1 --- mail_full.tpl 21 Aug 2008 20:17:22 -0000 1.2 *************** *** 1,20 **** ! {INTRO} ! <br /> ! {PLUG} ! <br /> ! <br /> ! <b>{MESSAGE_LABEL}</b> ! <br /> ! {MESSAGE} ! <br /> ! <br /> ! <hr /> ! {TEXT} ! <hr /> ! <br /> ! <br /> ! {MAIL_LINK} ! <br /> ! <br /> ! <hr /> ! {FOOTER} --- 1,20 ---- ! {INTRO} ! <br /> ! {PLUG} ! <br /> ! <br /> ! <b>{MESSAGE_LABEL}</b> ! <br /> ! {MESSAGE} ! <br /> ! <br /> ! <hr /> ! {TEXT} ! <hr /> ! <br /> ! <br /> ! {MAIL_LINK} ! <br /> ! <br /> ! <hr /> ! {FOOTER} Index: summary_view.tpl =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/article/templates/summary_view.tpl,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** summary_view.tpl 17 Sep 2007 04:24:30 -0000 1.6 --- summary_view.tpl 21 Aug 2008 20:17:22 -0000 1.7 *************** *** 1,26 **** ! <!-- BEGIN TITLE --> ! {TITLE_LINK} ! <div class="smaller"> ! {UPDATED_TEXT} (Read: {HITS} times) ! </div> ! <!-- END TITLE --> ! <!-- BEGIN CONTENT --> ! <!-- BEGIN CATEGORIES --> ! <div style="float:right;"> ! {CATEGORY} ! </div> ! <!-- END CATEGORIES --> ! <!-- BEGIN SUMMARY --> ! <br /> ! {SUMMARYTEXT} ! <!-- END SUMMARY --> ! <div class="smaller" style="clear:both; text-align:right"> ! <!-- BEGIN INFO --> ! {READMORE} {MOREWORDS} - {MOREPAGES} ! <!-- END INFO --> ! {EDIT} {DELETE} {NUM_COMMENTS} {PRINT_ICON} {EMAIL} ! <br /> ! </div> ! <hr /> ! <br /> <!-- END CONTENT --> \ No newline at end of file --- 1,26 ---- ! <!-- BEGIN TITLE --> ! {TITLE_LINK} ! <div class="smaller"> ! {UPDATED_TEXT} (Read: {HITS} times) ! </div> ! <!-- END TITLE --> ! <!-- BEGIN CONTENT --> ! <!-- BEGIN CATEGORIES --> ! <div style="float:right;"> ! {CATEGORY} ! </div> ! <!-- END CATEGORIES --> ! <!-- BEGIN SUMMARY --> ! <br /> ! {SUMMARYTEXT} ! <!-- END SUMMARY --> ! <div class="smaller" style="clear:both; text-align:right"> ! <!-- BEGIN INFO --> ! {READMORE} {MOREWORDS} - {MOREPAGES} ! <!-- END INFO --> ! {EDIT} {DELETE} {NUM_COMMENTS} {PRINT_ICON} {EMAIL} ! <br /> ! </div> ! <hr /> ! <br /> <!-- END CONTENT --> \ No newline at end of file Index: approval_summary_view.tpl =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/article/templates/approval_summary_view.tpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** approval_summary_view.tpl 17 Jun 2007 22:28:39 -0000 1.1 --- approval_summary_view.tpl 21 Aug 2008 20:17:22 -0000 1.2 *************** *** 1,14 **** ! {TITLE} ! <!-- BEGIN CATEGORIES --> ! <div style="float:right;"> ! {CATEGORY} ! </div> ! <!-- END CATEGORIES --> ! <!-- BEGIN SUMMARY --> ! <br /> ! {SUMMARYTEXT} ! <!-- END SUMMARY --> ! <div class="smaller" style="clear:both; text-align:right"> ! <br /> ! (Read: {HITS} times) {MOREWORDS} - {MOREPAGES} ! </div> --- 1,14 ---- ! {TITLE} ! <!-- BEGIN CATEGORIES --> ! <div style="float:right;"> ! {CATEGORY} ! </div> ! <!-- END CATEGORIES --> ! <!-- BEGIN SUMMARY --> ! <br /> ! {SUMMARYTEXT} ! <!-- END SUMMARY --> ! <div class="smaller" style="clear:both; text-align:right"> ! <br /> ! (Read: {HITS} times) {MOREWORDS} - {MOREPAGES} ! </div> Index: mail_link.tpl =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/article/templates/mail_link.tpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** mail_link.tpl 19 Feb 2004 21:48:55 -0000 1.1 --- mail_link.tpl 21 Aug 2008 20:17:22 -0000 1.2 *************** *** 1,19 **** ! {INTRO} ! {PLUG} ! ! {MESSAGE_LABEL} ! {MESSAGE} ! ! ================================================================ ! {TITLE} ! ================================================================ ! {TEXT} ! {VIEW_LINK} - {MAIL_LINK} ! ============ ! {FOOTER} --- 1,17 ---- ! {INTRO} ! {PLUG} ! {MESSAGE_LABEL} ! {MESSAGE} + ================================================================ + {TITLE} + ================================================================ + {TEXT} + {VIEW_LINK} + {MAIL_LINK} ! ============ ! {FOOTER} \ No newline at end of file Index: config.tpl =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/article/templates/config.tpl,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** config.tpl 13 Jul 2007 16:43:18 -0000 1.8 --- config.tpl 21 Aug 2008 20:17:22 -0000 1.9 *************** *** 1,96 **** ! {START_FORM} ! <h2>{ARTICLE_HEADER}</h2> ! {DEFAULT_ARTICLE_TEMPLATE} {DEFAULT_ARTICLE_TEMPLATE_LABEL}{DEFAULT_ARTICLE_TEMPLATE_HELP} ! <br /> ! {DEFAULT_SECTION_TEMPLATE} {DEFAULT_SECTION_TEMPLATE_LABEL}{DEFAULT_SECTION_TEMPLATE_HELP} ! <br /> ! {LOCK_EXPIRATION_TIME} ! <br /> ! {NEED_APPROVAL} {NEED_APPROVAL_LABEL}{NEED_APPROVAL_HELP} ! <br /> ! {USE_COMMENTS} {USE_COMMENTS_LABEL}{USE_COMMENTS_HELP} ! <br /> ! <div style="padding-left: 2em;"> ! {DEFAULT_ALLOW_COMMENTS} {DEFAULT_ALLOW_COMMENTS_LABEL}{DEFAULT_ALLOW_COMMENTS_HELP} ! <br /> ! {DEFAULT_ALLOW_ANON} {DEFAULT_ALLOW_ANON_LABEL}{DEFAULT_ALLOW_ANON_HELP} ! </div> ! {CAN_EXPIRE} {CAN_EXPIRE_LABEL}{CAN_EXPIRE_HELP} ! <br /> ! {EXPIRATION_LABEL} ! <br /> ! <br /> ! ! <h2>{IMAGE_HEADER}</h2> ! {MAX_IMAGE_SIZE_LABEL} ! <br /> ! {MAX_IMAGE_HEIGHT_LABEL} ! <br /> ! {MAX_IMAGE_WIDTH_LABEL} ! <br /> ! <br /> ! ! <h2>{FORMAT_HEADER}</h2> ! <span class="smaller">{LONG_DATE_FORMAT_EXAMPLE}</span> ! <br /> ! {LONG_DATE_FORMAT_LABEL} {LONG_DATE_FORMAT}{DATE_FORMAT_HELP} ! <br /> ! <br /> ! <span class="smaller">{SHORT_DATE_FORMAT_EXAMPLE}</span> ! <br /> ! {SHORT_DATE_FORMAT_LABEL} {SHORT_DATE_FORMAT}{DATE_FORMAT_HELP} ! <br /> ! <br /> ! ! <h2>{HOMEPAGE_HEADER}</h2> ! {SUMMARIES_ON_HOMEPAGE} {SUMMARIES_ON_HOMEPAGE_LABEL}{SUMMARIES_ON_HOMEPAGE_HELP} ! <br /> ! {POPULAR_ARTICLES} {POPULAR_ARTICLES_LABEL}{POPULAR_ARTICLES_HELP} ! <br /> ! {PREV_N_ARTICLES} {PREV_N_ARTICLES_LABEL}{PREV_N_ARTICLES_HELP} ! <br /> ! {LISTINGS_PER_PAGE} {LISTINGS_PER_PAGE_LABEL}{LISTINGS_PER_PAGE_HELP} ! <br /> ! {DISPLAY_COLUMNS} {DISPLAY_COLUMNS_LABEL} ! <br /> ! {CATEGORIZED_DISPLAY} {CATEGORIZED_DISPLAY_LABEL} ! <br /> ! <div style="padding-left: 2em;"> ! {SUMMARIES_PER_CATEGORY} {SUMMARIES_PER_CATEGORY_LABEL} ! <br /> ! <br /> ! <span class="smaller">{CATEGORY_ORDER_EXAMPLE}</span> ! <br /> ! {CATEGORY_ORDER_LABEL} {CATEGORY_ORDER} ! </div> ! <br /> ! ! ! <table border="1" cellpadding="5" align="center"> ! <caption>{CATEGORY_INDEX_LABEL}</caption> ! <tbody> ! <t> ! <th><b>{CATEGORY_INDEX_TITLE_1}</b></th> ! <th><b>{CATEGORY_INDEX_TITLE_2}</b></th> ! </tr> ! <!-- BEGIN category_index --> ! <tr {TOGGLE}> ! <td class="smaller"> ! {CAT_ID} ! </td> ! <td class="smaller"> ! {CAT_NAME} ! </td> ! </tr> ! <!-- END category_index --> ! </tbody></table> ! ! ! <br /> ! <br /> ! <div style="text-align: center;"> ! {SAVE} ! ! {RESET} ! </div> {END_FORM} \ No newline at end of file --- 1,96 ---- ! {START_FORM} ! <h2>{ARTICLE_HEADER}</h2> ! {DEFAULT_ARTICLE_TEMPLATE} {DEFAULT_ARTICLE_TEMPLATE_LABEL}{DEFAULT_ARTICLE_TEMPLATE_HELP} ! <br /> ! {DEFAULT_SECTION_TEMPLATE} {DEFAULT_SECTION_TEMPLATE_LABEL}{DEFAULT_SECTION_TEMPLATE_HELP} ! <br /> ! {LOCK_EXPIRATION_TIME} ! <br /> ! {NEED_APPROVAL} {NEED_APPROVAL_LABEL}{NEED_APPROVAL_HELP} ! <br /> ! {USE_COMMENTS} {USE_COMMENTS_LABEL}{USE_COMMENTS_HELP} ! <br /> ! <div style="padding-left: 2em;"> ! {DEFAULT_ALLOW_COMMENTS} {DEFAULT_ALLOW_COMMENTS_LABEL}{DEFAULT_ALLOW_COMMENTS_HELP} ! <br /> ! {DEFAULT_ALLOW_ANON} {DEFAULT_ALLOW_ANON_LABEL}{DEFAULT_ALLOW_ANON_HELP} ! </div> ! {CAN_EXPIRE} {CAN_EXPIRE_LABEL}{CAN_EXPIRE_HELP} ! <br /> ! {EXPIRATION_LABEL} ! <br /> ! <br /> ! ! <h2>{IMAGE_HEADER}</h2> ! {MAX_IMAGE_SIZE_LABEL} ! <br /> ! {MAX_IMAGE_HEIGHT_LABEL} ! <br /> ! {MAX_IMAGE_WIDTH_LABEL} ! <br /> ! <br /> ! ! <h2>{FORMAT_HEADER}</h2> ! <span class="smaller">{LONG_DATE_FORMAT_EXAMPLE}</span> ! <br /> ! {LONG_DATE_FORMAT_LABEL} {LONG_DATE_FORMAT}{DATE_FORMAT_HELP} ! <br /> ! <br /> ! <span class="smaller">{SHORT_DATE_FORMAT_EXAMPLE}</span> ! <br /> ! {SHORT_DATE_FORMAT_LABEL} {SHORT_DATE_FORMAT}{DATE_FORMAT_HELP} ! <br /> ! <br /> ! ! <h2>{HOMEPAGE_HEADER}</h2> ! {SUMMARIES_ON_HOMEPAGE} {SUMMARIES_ON_HOMEPAGE_LABEL}{SUMMARIES_ON_HOMEPAGE_HELP} ! <br /> ! {POPULAR_ARTICLES} {POPULAR_ARTICLES_LABEL}{POPULAR_ARTICLES_HELP} ! <br /> ! {PREV_N_ARTICLES} {PREV_N_ARTICLES_LABEL}{PREV_N_ARTICLES_HELP} ! <br /> ! {LISTINGS_PER_PAGE} {LISTINGS_PER_PAGE_LABEL}{LISTINGS_PER_PAGE_HELP} ! <br /> ! {DISPLAY_COLUMNS} {DISPLAY_COLUMNS_LABEL} ! <br /> ! {CATEGORIZED_DISPLAY} {CATEGORIZED_DISPLAY_LABEL} ! <br /> ! <div style="padding-left: 2em;"> ! {SUMMARIES_PER_CATEGORY} {SUMMARIES_PER_CATEGORY_LABEL} ! <br /> ! <br /> ! <span class="smaller">{CATEGORY_ORDER_EXAMPLE}</span> ! <br /> ! {CATEGORY_ORDER_LABEL} {CATEGORY_ORDER} ! </div> ! <br /> ! ! ! <table border="1" cellpadding="5" align="center"> ! <caption>{CATEGORY_INDEX_LABEL}</caption> ! <tbody> ! <t> ! <th><b>{CATEGORY_INDEX_TITLE_1}</b></th> ! <th><b>{CATEGORY_INDEX_TITLE_2}</b></th> ! </tr> ! <!-- BEGIN category_index --> ! <tr {TOGGLE}> ! <td class="smaller"> ! {CAT_ID} ! </td> ! <td class="smaller"> ! {CAT_NAME} ! </td> ! </tr> ! <!-- END category_index --> ! </tbody></table> ! ! ! <br /> ! <br /> ! <div style="text-align: center;"> ! {SAVE} ! ! {RESET} ! </div> {END_FORM} \ No newline at end of file Index: style.css =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/article/templates/style.css,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** style.css 17 Jun 2007 22:28:40 -0000 1.1 --- style.css 21 Aug 2008 20:17:22 -0000 1.2 *************** *** 1,8 **** ! #dhtmltooltip { ! position: absolute; ! border: 2px solid black; ! padding: 2px; ! background-color: lightyellow; ! visibility: hidden; ! z-index: 10000; ! } --- 1,8 ---- ! #dhtmltooltip { ! position: absolute; ! border: 2px solid black; ! padding: 2px; ! background-color: lightyellow; ! visibility: hidden; ! z-index: 10000; ! } Index: history.tpl =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/article/templates/history.tpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** history.tpl 12 Jul 2007 19:15:46 -0000 1.2 --- history.tpl 21 Aug 2008 20:17:22 -0000 1.3 *************** *** 1,46 **** ! <h2>{TITLE1}</h2> ! <strong>{TITLE2} </strong> ! <form name="ARTICLE_view_diff" action="index.php" method="post"> ! <input name="module" value="article" type="hidden"> ! <input name="id" value="{ID}" type="hidden"> ! <input name="op" value="viewdiff" type="hidden"> ! ! <table border="0" width="100%" cellspacing="1" cellpadding="6" style="text-align:center"> ! <tr class="bg_dark"> ! <th scope="col" style="text-align:center" nowrap="nowrap">{VERSION_LABEL} {VERSION_ORDER_LINK}</th> ! <th scope="col" style="text-align:center" nowrap="nowrap">{UPDATED_LABEL} {UPDATED_ORDER_LINK}</th> ! <th scope="col" style="text-align:center" nowrap="nowrap" colspan="2">{DIFF_LABEL}{DIFF_HELP}</th> ! <th scope="col" style="text-align:center" nowrap="nowrap">{EDITOR_LABEL} {EDITOR_ORDER_LINK}</th> ! </tr> ! ! ! <!-- BEGIN listrows --> ! <tr {TOGGLE}> ! <td style="text-align:center"> ! [{VERSION}] {VERSION_STATUS} ! </td> ! <td> ! {UPDATED} ! </td> ! <td style="text-align:right"> ! {DIFF} ! </td> ! <td> ! {PICK} ! </td> ! <td style="text-align:center"> ! {EDITOR} ! </td> ! </tr> ! <!-- END listrows --> ! ! ! ! <tr> ! <td></td> ! <td></td> ! <td colspan="2" style="text-align:right"><input name="cmp_button" value="{COMPARE_BTN}" type="submit"></td> ! <td></td> ! </tr> ! </table><br /> ! </form> --- 1,46 ---- ! <h2>{TITLE1}</h2> ! <strong>{TITLE2} </strong> ! <form name="ARTICLE_view_diff" action="index.php" method="post"> ! <input name="module" value="article" type="hidden"> ! <input name="id" value="{ID}" type="hidden"> ! <input name="op" value="viewdiff" type="hidden"> ! ! <table border="0" width="100%" cellspacing="1" cellpadding="6" style="text-align:center"> ! <tr class="bg_dark"> ! <th scope="col" style="text-align:center" nowrap="nowrap">{VERSION_LABEL} {VERSION_ORDER_LINK}</th> ! <th scope="col" style="text-align:center" nowrap="nowrap">{UPDATED_LABEL} {UPDATED_ORDER_LINK}</th> ! <th scope="col" style="text-align:center" nowrap="nowrap" colspan="2">{DIFF_LABEL}{DIFF_HELP}</th> ! <th scope="col" style="text-align:center" nowrap="nowrap">{EDITOR_LABEL} {EDITOR_ORDER_LINK}</th> ! </tr> ! ! ! <!-- BEGIN listrows --> ! <tr {TOGGLE}> ! <td style="text-align:center"> ! [{VERSION}] {VERSION_STATUS} ! </td> ! <td> ! {UPDATED} ! </td> ! <td style="text-align:right"> ! {DIFF} ! </td> ! <td> ! {PICK} ! </td> ! <td style="text-align:center"> ! {EDITOR} ! </td> ! </tr> ! <!-- END listrows --> ! ! ! ! <tr> ! <td></td> ! <td></td> ! <td colspan="2" style="text-align:right"><input name="cmp_button" value="{COMPARE_BTN}" type="submit"></td> ! <td></td> ! </tr> ! </table><br /> ! </form> Index: import_result.tpl =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/article/templates/import_result.tpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** import_result.tpl 26 Oct 2007 07:25:40 -0000 1.2 --- import_result.tpl 21 Aug 2008 20:17:22 -0000 1.3 *************** *** 1,9 **** ! <h2> ! {CONVERTED} ! <br /> ! {RESULT} ! </h2> ! <!-- BEGIN file_list --> ! {FILE} ! <br /> ! <!-- END file_list --> --- 1,9 ---- ! <h2> ! {CONVERTED} ! <br /> ! {RESULT} ! </h2> ! <!-- BEGIN file_list --> ! {FILE} ! <br /> ! <!-- END file_list --> Index: edit.tpl =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/article/templates/edit.tpl,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** edit.tpl 19 Sep 2007 04:49:37 -0000 1.9 --- edit.tpl 21 Aug 2008 20:17:22 -0000 1.10 *************** *** 45,59 **** <div class="bg_light"> ! <label>{TEMPLATE_LABEL}: {TEMPLATE}</label>{TEMPLATE_HELP} <br /> ! <label>{ANNOUNCE} {ANNOUNCE_LABEL}{ANNOUNCE_HELP}</label> <br /> <!-- BEGIN COMM --> ! <label>{ALLOW_COMMENTS} {ALLOW_COMMENTS_LABEL}{ALLOW_COMMENTS_HELP}</label> <br /> <!-- END COMM --> <!-- BEGIN ANON --> ! <label>{ALLOW_ANONYMOUS} {ALLOW_ANONYMOUS_LABEL}{ALLOW_ANONYMOUS_HELP}</label> ! <br /> <!-- END ANON --> <br /> --- 45,61 ---- <div class="bg_light"> ! {TEMPLATE_LABEL}: {TEMPLATE}{TEMPLATE_HELP} <br /> ! {ANNOUNCE} {ANNOUNCE_LABEL}{ANNOUNCE_HELP} <br /> <!-- BEGIN COMM --> ! {ALLOW_COMMENTS} {ALLOW_COMMENTS_LABEL}{ALLOW_COMMENTS_HELP} <br /> <!-- END COMM --> <!-- BEGIN ANON --> ! {ALLOW_ANONYMOUS} {ALLOW_ANONYMOUS_LABEL}{ALLOW_ANONYMOUS_HELP} ! <br /> ! {DEFAULT_APPROVAL_LABEL} {DEFAULT_APPROVAL} ! <br /> <!-- END ANON --> <br /> Index: edit_page.tpl =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/article/templates/edit_page.tpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** edit_page.tpl 29 Jun 2007 07:00:28 -0000 1.2 --- edit_page.tpl 21 Aug 2008 20:17:22 -0000 1.3 *************** *** 1,18 **** ! <!-- BEGIN KLUDGE --> ! {MANUAL_UPDATE} ! <br /> ! <br /> ! <!-- END KLUDGE --> ! ! <fieldset style="padding:2px; margin-top:0; margin-left:0"> ! <legend>{NAV_TITLE}:</legend> ! <span class="smaller"> ! {BUTTONS} {PAGE_REMOVE} {PAGE_MOVE_UP_2}{PAGE_MOVE_UP}{PAGE_MOVE_DOWN}{PAGE_MOVE_DOWN_2}{PAGE_MOVE_HELP} ! </span> ! <!-- BEGIN TEASER --> ! <br />{PAGE_TEASER_LABEL} {PAGE_TEASER} ! <!-- END TEASER --> ! </fieldset> ! ! ! {CONTENT} --- 1,18 ---- ! <!-- BEGIN KLUDGE --> ! {MANUAL_UPDATE} ! <br /> ! <br /> ! <!-- END KLUDGE --> ! ! <fieldset style="padding:2px; margin-top:0; margin-left:0"> ! <legend>{NAV_TITLE}:</legend> ! <span class="smaller"> ! {BUTTONS} {PAGE_REMOVE} {PAGE_MOVE_UP_2}{PAGE_MOVE_UP}{PAGE_MOVE_DOWN}{PAGE_MOVE_DOWN_2}{PAGE_MOVE_HELP} ! </span> ! <!-- BEGIN TEASER --> ! <br />{PAGE_TEASER_LABEL} {PAGE_TEASER} ! <!-- END TEASER --> ! </fieldset> ! ! ! {CONTENT} Index: edit_section.tpl =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/article/templates/edit_section.tpl,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** edit_section.tpl 19 Sep 2007 04:49:37 -0000 1.4 --- edit_section.tpl 21 Aug 2008 20:17:22 -0000 1.5 *************** *** 1,37 **** ! {SECTION_TITLE_ERR} ! {SECTION_TITLE_LABEL}{SECTION_TITLE_HELP} ! <br /> ! {SECTION_TITLE} ! <br /> ! ! {SECTION_TEXT_ERR} ! {SECTION_TEXT_LABEL}{SECTION_TEXT_HELP} ! <br /> ! {SECTION_TEXT} ! <br /> ! ! <!-- BEGIN IMG --> ! <fieldset> ! <legend>{IMAGE_TITLE}:</legend> ! {IMAGE_ID} ! <br /> ! {IMAGE_LINK_LABEL}...{IMAGE_LINK_HELP} ! <br /> ! {IMAGE_LINK} ! <br /> ! {IMAGE_CAPTION_LABEL}...{IMAGE_CAPTION_HELP} ! <br /> ! {IMAGE_CAPTION} ! </fieldset> ! <!-- END IMG --> ! ! ! <fieldset> ! <legend>{SETTINGS_TITLE}:</legend> ! <div class="smaller" style="float:right; text-align:right"> ! {SECTION_INSERT} {SECTION_REMOVE} {SECTION_MOVE_UP_2}{SECTION_MOVE_UP}{SECTION_MOVE_DOWN}{SECTION_MOVE_DOWN_2}{SECTION_MOVE_HELP} ! </div> ! {SECTION_TPL_LABEL}: {SECTION_TPL}{SECTION_TPL_HELP} ! </fieldset> ! ! <hr /> --- 1,37 ---- ! {SECTION_TITLE_ERR} ! {SECTION_TITLE_LABEL}{SECTION_TITLE_HELP} ! <br /> ! {SECTION_TITLE} ! <br /> ! ! {SECTION_TEXT_ERR} ! {SECTION_TEXT_LABEL}{SECTION_TEXT_HELP} ! <br /> ! {SECTION_TEXT} ! <br /> ! ! <!-- BEGIN IMG --> ! <fieldset> ! <legend>{IMAGE_TITLE}:</legend> ! {IMAGE_ID} ! <br /> ! {IMAGE_LINK_LABEL}...{IMAGE_LINK_HELP} ! <br /> ! {IMAGE_LINK} ! <br /> ! {IMAGE_CAPTION_LABEL}...{IMAGE_CAPTION_HELP} ! <br /> ! {IMAGE_CAPTION} ! </fieldset> ! <!-- END IMG --> ! ! ! <fieldset> ! <legend>{SETTINGS_TITLE}:</legend> ! <div class="smaller" style="float:right; text-align:right"> ! {SECTION_INSERT} {SECTION_REMOVE} {SECTION_MOVE_UP_2}{SECTION_MOVE_UP}{SECTION_MOVE_DOWN}{SECTION_MOVE_DOWN_2}{SECTION_MOVE_HELP} ! </div> ! {SECTION_TPL_LABEL}: {SECTION_TPL}{SECTION_TPL_HELP} ! </fieldset> ! ! <hr /> |
|
From: Eloi G. <ada...@us...> - 2008-08-21 20:17:43
|
Update of /cvsroot/phpwebsite-comm/modules/article In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2278 Modified Files: index_admin.php index.php Added Files: .project Log Message: Article Manager 4.1.0 --- NEW FILE: .project --- <?xml version="1.0" encoding="UTF-8"?> <projectDescription> <name>Article manager</name> <comment></comment> <projects> </projects> <buildSpec> <buildCommand> <name>org.eclipse.php.core.PhpIncrementalProjectBuilder</name> <arguments> </arguments> </buildCommand> <buildCommand> <name>org.eclipse.wst.validation.validationbuilder</name> <arguments> </arguments> </buildCommand> </buildSpec> <natures> <nature>org.eclipse.php.core.PHPNature</nature> </natures> </projectDescription> Index: index_admin.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/article/index_admin.php,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** index_admin.php 26 Oct 2007 07:25:38 -0000 1.17 --- index_admin.php 21 Aug 2008 20:17:21 -0000 1.18 *************** *** 1,724 **** ! <?php ! /** ! * This is the index admin-only file for the article module. ! * ! * @version $Id$ ! * ! * @author Eloi George <el...@NO...> ! * @module Article Manager ! */ ! if (!defined('PHPWS_SOURCE_DIR') || !Current_User::allow('article')) { [...1421 lines suppressed...] ! if($status['isDraft']) { ! $title = dgettext('article', 'Editing Rough Draft'); ! $message = dgettext('article', 'This is a rough draft of changes to this article.'); ! } ! /* otherwise its waiting for approval */ ! else { ! $title = dgettext('article', 'Editing Unapproved Article Version'); ! $message = dgettext('article', 'This is a newer version of this article that is awaiting approval.'); ! } ! $message .= "<br />\n". dgettext('article', "If you want to see the changes between this one and the one being displayed, select 'Version History'."); ! /* Reviewer Notes */ ! if (!empty($status['msg'])) ! $message .= "<br /><br />\n". dgettext('article', 'The following Reviewer\'s note is attatched to this version:') ! . '<br />' . PHPWS_Text::parseOutput($status['msg']); ! return $article; ! } ! ! ?> \ No newline at end of file Index: index.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/article/index.php,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** index.php 19 Sep 2007 04:50:37 -0000 1.22 --- index.php 21 Aug 2008 20:17:21 -0000 1.23 *************** *** 1,82 **** ! <?php ! /** ! * This is the index file for the article module. ! * ! * @version $Id$ ! * ! * @author Eloi George <el...@NO...> ! * @module Article Manager ! */ ! if (!defined('PHPWS_SOURCE_DIR')) { ! include '../../config/core/404.html'; ! exit(); ! } ! ! PHPWS_Core::initModClass('article', 'AM_ModSettings.php'); ! PHPWS_AM_ModSettings::init(); ! ! /* Process any form button submissions */ ! /* Button format is ARTICLE_vars[tab:command<::key:value><::key:value>...] */ ! if (isset($_REQUEST['ARTICLE_vars'])) ! { ! $key = array_keys($_REQUEST['ARTICLE_vars']); ! $arr = explode('::', $key[0]); ! foreach($arr AS $value) { ! $req = explode(':', $value); ! $_REQUEST[$req[0]] = $req[1]; ! } ! unset($_REQUEST['ARTICLE_vars']); ! } ! ! /* Determine the command to be executed */ ! if (isset($_REQUEST['xmlrpc'])) ! { ! require_once(PHPWS_SOURCE_DIR.'mod/article/inc/xmlrpc.php'); ! } ! ! if (!isset($_REQUEST['op'])) ! { ! if (is_numeric($_REQUEST['id'])) { ! $temp = new PHPWS_Article((int) $_REQUEST['id']); ! Layout::add($temp->view_full()); ! /* Increment the articleview counter */ ! $temp->increment_counter((int) $_REQUEST['id']); ! unset($temp); ! } ! elseif ($_REQUEST['id']=='news' || $_REQUEST['id']=='archives') { ! PHPWS_Core::initModClass('article', 'AM_Lists.php'); ! Layout::add(PHPWS_AM_Lists::list_summaries()); ! } ! return; ! } ! elseif ($_REQUEST['op']=='email') ! { ! $temp = new PHPWS_Article($_REQUEST['id']); ! $temp->mail(); ! unset($temp); ! return; ! } ! elseif ($_REQUEST['op']=='print') ! { ! $temp = new PHPWS_Article((int) $_REQUEST['id']); ! Layout::add($temp->view_full()); ! /* Increment the articleview counter */ ! $temp->increment_counter((int) $_REQUEST['id']); ! $GLOBALS['Layout'] = array('layout' => $GLOBALS['Layout']['layout']); ! unset($GLOBALS['Layout_Plugs']); ! exit(Layout::display()); ! } ! ! /* The rest of this module's functions are off-limits to non-users */ ! elseif (!Current_User::allow('article')) ! { ! $template['TITLE'] = 'Article Manager'; ! $template['CONTENT'] = dgettext('article', 'Members get to do fun stuff! Login or Register today!') . '<br />'; ! $finalContent = PHPWS_Template::process($template, 'layout', 'box.tpl'); ! Layout::add($finalContent); ! return; } ! else ! include(PHPWS_SOURCE_DIR . 'mod/article/index_admin.php'); ! ?> \ No newline at end of file --- 1,88 ---- ! <?php ! /** ! * This is the index file for the article module. ! * ! * @version $Id$ ! * ! * @author Eloi George <el...@NO...> ! * @module Article Manager ! */ ! if (!defined('PHPWS_SOURCE_DIR')) { ! include '../../config/core/404.html'; ! exit(); ! } ! ! PHPWS_Core::initModClass('article', 'AM_ModSettings.php'); ! PHPWS_AM_ModSettings::init(); ! ! /* Process any mod-rewrite submissions */ ! if (isset($_GET['var1'])) { ! $_REQUEST['id'] = (int)$_GET['var1']; ! if (isset($_GET['var2'])) ! $_REQUEST['page'] = (int)$_GET['var2']; } ! /* Process any form button submissions */ ! /* Button format is ARTICLE_vars[tab:command<::key:value><::key:value>...] */ ! if (isset($_REQUEST['ARTICLE_vars'])) ! { ! $key = array_keys($_REQUEST['ARTICLE_vars']); ! $arr = explode('::', $key[0]); ! foreach($arr AS $value) { ! $req = explode(':', $value); ! $_REQUEST[$req[0]] = $req[1]; ! } ! unset($_REQUEST['ARTICLE_vars']); ! } ! ! /* Determine the command to be executed */ ! if (isset($_REQUEST['xmlrpc'])) ! { ! require_once(PHPWS_SOURCE_DIR.'mod/article/inc/xmlrpc.php'); ! } ! ! if (!isset($_REQUEST['op'])) ! { ! if (is_numeric($_REQUEST['id'])) { ! $temp = new PHPWS_Article((int) $_REQUEST['id']); ! Layout::add($temp->view_full()); ! /* Increment the articleview counter */ ! $temp->increment_counter((int) $_REQUEST['id']); ! unset($temp); ! } ! elseif ($_REQUEST['id']=='news' || $_REQUEST['id']=='archives') { ! PHPWS_Core::initModClass('article', 'AM_Lists.php'); ! Layout::add(PHPWS_AM_Lists::list_summaries()); ! } ! return; ! } ! elseif ($_REQUEST['op']=='email') ! { ! $temp = new PHPWS_Article($_REQUEST['id']); ! $temp->mail(); ! unset($temp); ! return; ! } ! elseif ($_REQUEST['op']=='print') ! { ! $temp = new PHPWS_Article((int) $_REQUEST['id']); ! Layout::add($temp->view_full()); ! /* Increment the articleview counter */ ! $temp->increment_counter((int) $_REQUEST['id']); ! $GLOBALS['Layout'] = array('layout' => $GLOBALS['Layout']['layout']); ! unset($GLOBALS['Layout_Plugs']); ! exit(Layout::display()); ! } ! ! /* The rest of this module's functions are off-limits to non-users */ ! elseif (!Current_User::allow('article')) ! { ! $template['TITLE'] = 'Article Manager'; ! $template['CONTENT'] = dgettext('article', 'Members get to do fun stuff! Login or Register today!') . '<br />'; ! $finalContent = PHPWS_Template::process($template, 'layout', 'box.tpl'); ! Layout::add($finalContent); ! return; ! } ! else ! include(PHPWS_SOURCE_DIR . 'mod/article/index_admin.php'); ! ?> \ No newline at end of file |
Update of /cvsroot/phpwebsite-comm/modules/article/inc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2278/inc Modified Files: A_save.php A_mail.php A_update.php runtime.php runtime_categorized.php runtime_chronological.php xmlrpc.php Log Message: Article Manager 4.1.0 Index: xmlrpc.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/article/inc/xmlrpc.php,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** xmlrpc.php 17 Sep 2007 01:12:29 -0000 1.8 --- xmlrpc.php 21 Aug 2008 20:17:19 -0000 1.9 *************** *** 1,525 **** ! <?php ! require_once(PHPWS_SOURCE_DIR . 'mod/article/lib/XML-RPC/IXR_Library.inc.php'); ! /** ! * This is a XML-RPC Server. ! * ! * This script allows offline blog editors to manipulate articles on the website. ! * ! * @version $Id$ ! * ! * @author Eloi George <el...@NO...> [...1023 lines suppressed...] ! function helloWorld($args) { ! return 'Hello, World!'; ! } ! function ooh($args) { ! return new IXR_Error(4000, 'ha ha ha'); ! } ! function times10($value) { ! return array( ! 'times10' => (int)$value * 10, ! 'times100' => (int)$value * 10, ! 'times1000' => (int)$value * 10, ! ); ! } ! } ! ! // Run the server, serve the request ! $s = new MyServer(); ! ?> \ No newline at end of file Index: runtime.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/article/inc/runtime.php,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** runtime.php 17 Sep 2007 04:24:28 -0000 1.15 --- runtime.php 21 Aug 2008 20:17:19 -0000 1.16 *************** *** 1,87 **** ! <?php ! /** ! * This is the runtime file for the article module. ! * ! * @version $Id$ ! * ! * @author Eloi George <el...@NO...> ! * @module Article Manager ! */ ! if(!isset($_REQUEST['module'])) ! { ! PHPWS_Core::initModClass('article', 'AM_ModSettings.php'); ! PHPWS_AM_ModSettings::init(); ! ! $config = $GLOBALS['Article']['val']; ! ! /* Display the homepage articles */ ! $db = & new PHPWS_DB('article'); ! $db->addWhere('mainarticle', '1'); ! Key::restrictView($db, 'article'); ! $db->addOrder('rank desc'); ! $result = $db->select(); ! if (PHPWS_Error::logIfError($result)) ! return; ! if ($result) ! foreach($result as $row) ! { ! /* Initialize Article object */ ! $article = new PHPWS_Article($row); ! Layout::add($article->view_full(), 'article', 'view', true); ! /* Increment the articleview counter */ ! $article->increment_counter((int) $result); ! } ! unset($article); ! ! if ($config['summaries_on_homepage']>0) { ! if ($config['categorized_display'] && !empty($config['category_order'])) ! include(PHPWS_SOURCE_DIR . 'mod/article/inc/runtime_categorized.php'); ! else { ! /* Display summary listings of last n articles on the homepage. */ ! $TotalCount = $config['summaries_on_homepage'] + $config['prev_n_articles']; ! /* Determine how many summaries we're going to show */ ! if ($TotalCount>0) ! include(PHPWS_SOURCE_DIR . 'mod/article/inc/runtime_chronological.php'); ! } ! } ! ! ! /* Display a block listing of the n most popular last n articles. */ ! if ($config['popular_articles']>0) ! { ! /* Load all articles at once */ ! $db = & new PHPWS_DB('article'); ! $db->addColumn('id'); ! $db->addColumn('title'); ! $db->addWhere('announce', '1'); ! $db->addOrder('hits desc'); ! PHPWS_AM_Data::get_published_sql($db); ! $db->setLimit($config['popular_articles']); ! $result = $db->select(); ! if (PHPWS_Error::logIfError($result)) ! exit('Article::Runtime -- a database error occured.'); ! /* If there are summaries to display, display 'em */ ! if(count($result)) ! { ! $content = ''; ! foreach($result AS $summary) { ! if (MOD_REWRITE_ENABLED && $summary['id'] > 0) ! $link = PHPWS_Text::rewriteLink($summary['title'], 'article', $summary['id']); ! else ! $link = PHPWS_Text::moduleLink($summary['title'], 'article', array('id'=> $summary['id'])); ! $content .= '<li>'.$link.'</li><br />
'; ! } ! if (!empty($content)) ! { ! $template['TITLE'] = dgettext('article', 'Popular Articles'); ! $template['CONTENT'] = '<ul>'.$content.'</ul>'; ! $finalContent = PHPWS_Template::process($template, 'layout', 'box.tpl'); ! Layout::add($finalContent, 'article', 'popular'); ! } ! } ! } ! /* Display MiniAdmin Options */ ! PHPWS_AM_Data::MiniAdmin(); ! } ! ?> \ No newline at end of file --- 1,87 ---- ! <?php ! /** ! * This is the runtime file for the article module. ! * ! * @version $Id$ ! * ! * @author Eloi George <el...@NO...> ! * @module Article Manager ! */ ! if(!isset($_REQUEST['module'])) ! { ! PHPWS_Core::initModClass('article', 'AM_ModSettings.php'); ! PHPWS_AM_ModSettings::init(); ! ! $config = $GLOBALS['Article']['val']; ! ! /* Display the homepage articles */ ! $db = & new PHPWS_DB('article'); ! $db->addWhere('mainarticle', '1'); ! Key::restrictView($db, 'article'); ! $db->addOrder('rank desc'); ! $result = $db->select(); ! if (PHPWS_Error::logIfError($result)) ! return; ! if ($result) ! foreach($result as $row) ! { ! /* Initialize Article object */ ! $article = new PHPWS_Article($row); ! Layout::add($article->view_full(), 'article', 'view', true); ! /* Increment the articleview counter */ ! $article->increment_counter((int) $result); ! } ! unset($article); ! ! if ($config['summaries_on_homepage']>0) { ! if ($config['categorized_display'] && !empty($config['category_order'])) ! include(PHPWS_SOURCE_DIR . 'mod/article/inc/runtime_categorized.php'); ! else { ! /* Display summary listings of last n articles on the homepage. */ ! $TotalCount = $config['summaries_on_homepage'] + $config['prev_n_articles']; ! /* Determine how many summaries we're going to show */ ! if ($TotalCount>0) ! include(PHPWS_SOURCE_DIR . 'mod/article/inc/runtime_chronological.php'); ! } ! } ! ! ! /* Display a block listing of the n most popular last n articles. */ ! if ($config['popular_articles']>0) ! { ! /* Load all articles at once */ ! $db = & new PHPWS_DB('article'); ! $db->addColumn('id'); ! $db->addColumn('title'); ! $db->addWhere('announce', '1'); ! $db->addOrder('hits desc'); ! PHPWS_AM_Data::get_published_sql($db); ! $db->setLimit($config['popular_articles']); ! $result = $db->select(); ! if (PHPWS_Error::logIfError($result)) ! exit('Article::Runtime -- a database error occured.'); ! /* If there are summaries to display, display 'em */ ! if(count($result)) ! { ! $content = ''; ! foreach($result AS $summary) { ! if (MOD_REWRITE_ENABLED && $summary['id'] > 0) ! $link = PHPWS_Text::rewriteLink($summary['title'], 'article', $summary['id']); ! else ! $link = PHPWS_Text::moduleLink($summary['title'], 'article', array('id'=> $summary['id'])); ! $content .= '<li>'.$link.'</li><br />
'; ! } ! if (!empty($content)) ! { ! $template['TITLE'] = dgettext('article', 'Popular Articles'); ! $template['CONTENT'] = '<ul>'.$content.'</ul>'; ! $finalContent = PHPWS_Template::process($template, 'layout', 'box.tpl'); ! Layout::add($finalContent, 'article', 'popular'); ! } ! } ! } ! /* Display MiniAdmin Options */ ! PHPWS_AM_Data::MiniAdmin(); ! } ! ?> \ No newline at end of file Index: A_mail.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/article/inc/A_mail.php,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** A_mail.php 22 Jan 2008 04:55:07 -0000 1.12 --- A_mail.php 21 Aug 2008 20:17:19 -0000 1.13 *************** *** 17,88 **** $sendmail = false; if (isset($_POST['ART_yes']) && isset($_POST['ART_mail_type'])) { ! $error = array(); ! if (!isset($_POST['ART_r_email']) || !PHPWS_Text::isValidInput($_POST['ART_r_email'], 'email')) ! $error[0] = dgettext('article', 'Please enter a valid email address'); ! if (!isset($_POST['ART_s_name'])) ! $error[1] = dgettext('article', 'Please enter your name'); ! if (!isset($_POST['ART_s_email']) || !PHPWS_Text::isValidInput($_POST['ART_s_email'], 'email')) ! $error[2] = dgettext('article', 'Please enter a valid email address'); ! if (Captcha::verify($_POST['captcha'])) ! $error[3] = dgettext('article', 'The string you entered for the image verification did not match what was displayed.'); ! if (!count($error)) ! $sendmail = true; } if ($sendmail) { ! /* Construct email */ ! $homepage = PHPWS_Core::getHomeHttp(0, 0, 0); ! $homepage_link = '<a href="'.PHPWS_Core::getHomeHttp().'">'.$homepage.'</a>'; ! if (isset($_POST['ART_s_msg'])) { ! $tags['MESSAGE_LABEL'] = dgettext('article', 'Personal Message').':'; ! $tags['MESSAGE'] = $_POST['ART_s_msg']; ! } ! $L1 = PHPWS_Core::getHomeHttp().'index.php?module=article&view='.$this->id; ! $L2 = PHPWS_Core::getHomeHttp().'index.php?module=article&email='.$this->id; ! $tags['VIEW_LINK'] = sprintf(dgettext('article', 'To view the entire article, go to %1$s or %2$s') ! , $L1, '<a href="'.$L1.'">'.dgettext('article', 'Click Here').'</a>'); ! $tags['MAIL_LINK'] = sprintf(dgettext('article', 'Would you like to send this article to a friend? Go to %1$s or %2$s') ! , $L2, '<a href="'.$L2.'">'.dgettext('article', 'Click Here').'</a>'); ! $text = $html = ''; ! if ($_POST['ART_mail_type']=='full') ! { ! $tags['INTRO'] = sprintf(dgettext('article', '%s has sent you a news article! (Email address not verified)'), '<b>'.$_POST['ART_s_name'].'</b> ('.$_POST['ART_s_email'].')'); ! $tags['PLUG'] = sprintf(dgettext('article', 'Courtesy of %s'), $homepage_link); ! $tags['FOOTER'] = sprintf(dgettext('article', 'Copyright %1$s %2$s'), date('Y'), $homepage_link); ! $tags['TEXT'] = $this->view_full(); ! $html_body = PHPWS_Template::processTemplate($tags, 'article', 'mail_full.tpl'); ! $tags['TEXT'] = ''; ! } ! /* text email body creation */ ! $tags['INTRO'] = sprintf(dgettext('article', '%s has sent you a news article! (Email address not verified)'), $_POST['ART_s_name'].' ('.$_POST['ART_s_email'].')'); ! $tags['PLUG'] = sprintf(dgettext('article', 'Courtesy of %s'), $homepage); ! $tags['TITLE'] = PHPWS_Text::parseOutput($this->title); ! $tags['FOOTER'] = sprintf(dgettext('article', 'Copyright %1$s %2$s'), date('Y'), $homepage); ! if ($this->summary) ! $tags['TEXT'] = PHPWS_AM_Data::parseOutput($this->summary); ! $txt_body = strip_tags(PHPWS_Template::processTemplate($tags, 'article', 'mail_link.tpl')); ! $subject = $homepage.' '.dgettext('article', 'Article').' - '.PHPWS_Text::parseOutput($this->title); ! $sender_name = $_POST['ART_s_name']; ! $sender_email = $_POST['ART_s_email']; ! $recipient_email = $_POST['ART_r_email']; ! $status = PHPWS_AM_Actions::sendmail ($subject, $sender_name, $sender_email, $recipient_email, $txt_body, $html_body = '', $CC = true) ! if ($status===true) { ! $content = sprintf(dgettext('article', 'The %1$s <b>%2$s</b> has successfully been %s') ! , dgettext('article', 'article') ! , $this->title ! , dgettext('article', 'sent to').' '.$recipient_email); ! } elseif($status===false) ! $content = 'EMAIL ERROR: '.$content = dgettext('article', 'Email is not correctly set up on this server.'); ! else ! $content = 'EMAIL ERROR: ' . $status->getMessage(); Layout::addPageTitle(dgettext('article', 'E-mail A Friend').': "'.$this->title); ! $template['TITLE'] = dgettext('article', 'E-mail this Article to a Friend'); ! $template['CONTENT'] = $content .'<br /><br /><div style="text-align:center">[' . PHPWS_Text::moduleLink(sprintf(dgettext('article', 'Go back to %s'), PHPWS_Text::parseOutput($this->title)), 'article', array('id'=>$this->id)). ']</div>'; $finalContent = PHPWS_Template::process($template, 'layout', 'box.tpl'); --- 17,89 ---- $sendmail = false; + $error = array(); if (isset($_POST['ART_yes']) && isset($_POST['ART_mail_type'])) { ! if (!isset($_POST['ART_r_email']) || !PHPWS_Text::isValidInput($_POST['ART_r_email'], 'email')) ! $error[0] = dgettext('article', 'Please enter a valid email address'); ! if (!isset($_POST['ART_s_name'])) ! $error[1] = dgettext('article', 'Please enter your name'); ! if (!isset($_POST['ART_s_email']) || !PHPWS_Text::isValidInput($_POST['ART_s_email'], 'email')) ! $error[2] = dgettext('article', 'Please enter a valid email address'); ! if (!Captcha::verify($_POST['captcha'])) ! $error[3] = dgettext('article', 'The string you entered for the image verification did not match what was displayed.'); ! if (!count($error)) ! $sendmail = true; } if ($sendmail) { ! /* Construct email */ ! $homepage = PHPWS_Core::getHomeHttp(0, 0, 0); ! $homepage_link = '<a href="'.PHPWS_Core::getHomeHttp().'">'.$homepage.'</a>'; ! if (isset($_POST['ART_s_msg'])) { ! $tags['MESSAGE_LABEL'] = dgettext('article', 'Personal Message').':'; ! $tags['MESSAGE'] = $_POST['ART_s_msg']; ! } ! $L1 = PHPWS_Core::getHomeHttp().'index.php?module=article&op=view&id='.$this->id; ! $L2 = PHPWS_Core::getHomeHttp().'index.php?module=article&op=email&id='.$this->id; ! $tags['VIEW_LINK'] = sprintf(dgettext('article', 'To view the entire article, go to %1$s or %2$s') ! , $L1, '<a href="'.$L1.'">'.dgettext('article', 'Click Here').'</a>'); ! $tags['MAIL_LINK'] = sprintf(dgettext('article', 'Would you like to send this article to a friend? Go to %1$s or %2$s') ! , $L2, '<a href="'.$L2.'">'.dgettext('article', 'Click Here').'</a>'); ! $txt_body = $html_body = ''; ! if ($_POST['ART_mail_type']=='full') ! { ! $tags['INTRO'] = sprintf(dgettext('article', '%s has sent you a news article! (Email address not verified)'), '<b>'.$_POST['ART_s_name'].'</b> ('.$_POST['ART_s_email'].')'); ! $tags['PLUG'] = sprintf(dgettext('article', 'Courtesy of %s'), $homepage_link); ! $tags['FOOTER'] = sprintf(dgettext('article', 'Copyright %1$s %2$s'), date('Y'), $homepage_link); ! $tags['TEXT'] = $this->view_full(); ! $html_body = PHPWS_Template::processTemplate($tags, 'article', 'mail_full.tpl'); ! $tags['TEXT'] = ''; ! } ! /* text email body creation */ ! $tags['INTRO'] = sprintf(dgettext('article', '%s has sent you a news article! (Email address not verified)'), $_POST['ART_s_name'].' ('.$_POST['ART_s_email'].')'); ! $tags['PLUG'] = sprintf(dgettext('article', 'Courtesy of %s'), $homepage); ! $tags['TITLE'] = PHPWS_Text::parseOutput($this->title); ! $tags['FOOTER'] = sprintf(dgettext('article', 'Copyright %1$s %2$s'), date('Y'), $homepage); ! if ($this->summary) ! $tags['TEXT'] = strip_tags(PHPWS_AM_Data::parseOutput($this->summary)); ! $txt_body = PHPWS_Template::processTemplate($tags, 'article', 'mail_link.tpl'); ! $subject = $homepage.' '.dgettext('article', 'Article').' - '.PHPWS_Text::parseOutput($this->title); ! $sender_name = $_POST['ART_s_name']; ! $sender_email = $_POST['ART_s_email']; ! $recipient_email = $_POST['ART_r_email']; ! PHPWS_Core::initModClass('article', 'AM_Actions.php'); ! $status = PHPWS_AM_Actions::sendmail ($subject, $sender_name, $sender_email, $recipient_email, $txt_body, $html_body, $CC = true); ! if ($status===true) { ! $content = sprintf(dgettext('article', 'The %1$s <b>%2$s</b> has successfully been %3$s') ! , dgettext('article', 'article') ! , $this->title ! , dgettext('article', 'sent to').' '.$recipient_email); ! } elseif($status===false) ! $content = 'EMAIL ERROR: '.$content = dgettext('article', 'Email is not correctly set up on this server.'); ! else ! $content = 'EMAIL ERROR: ' . $status->getMessage(); Layout::addPageTitle(dgettext('article', 'E-mail A Friend').': "'.$this->title); ! $template['TITLE'] = dgettext('article', 'E-mail this Article to a Friend'); ! $template['CONTENT'] = $content .'<br /><br /><div style="text-align:center">[' . PHPWS_Text::moduleLink(sprintf(dgettext('article', 'Go back to %s'), PHPWS_Text::parseOutput($this->title)), 'article', array('id'=>$this->id)). ']</div>'; $finalContent = PHPWS_Template::process($template, 'layout', 'box.tpl'); *************** *** 91,140 **** else if(isset($_POST['ART_no'])) { ! Layout::add($this->view_full()); } else { ! $tags['SEND'] = '<input name="ART_yes" value="'.dgettext('article', 'Send').'" type="submit">'; ! $tags['CANCEL'] = '<input name="ART_no" value="'.dgettext('article', 'Cancel').'" type="submit">'; ! $tags['TITLE'] = PHPWS_Text::parseOutput($this->title); ! if ($this->summary) ! $tags['SUMMARYTEXT'] = PHPWS_AM_Data::parseOutput($this->summary); ! if (MOD_REWRITE_ENABLED && $this->id > 0) ! $link = PHPWS_Text::rewriteLink(dgettext('article', 'Back to Article'), 'article', $this->id); ! else ! $link = PHPWS_Text::moduleLink(dgettext('article', 'Back to Article'), 'article', array('id' => $this->id)); ! $tags['BACKLINK'] = '['.. ']'; ! $tags['R_MAIL_ERROR'] = dgettext('article', 'Friend\'s Email').':'; ! $tags['R_MAIL_LABEL'] = dgettext('article', 'Friend\'s Email').':'; ! $tags['R_MAIL_ADDR'] = '<input type="text" name="ART_r_email" value="" maxlength="200" style="width:50%" />'; ! $tags['R_MAIL_HELP'] = dgettext('article', 'Separate multiple addresses with commas. Maximum 200 characters.'); ! $tags['S_NAME_LABEL'] = dgettext('article', 'Your Full Name: (optional)'); ! $tags['S_NAME'] = '<input type="text" name="ART_s_name" value="'.Current_User::getDisplayName().'" maxlength="155" style="width:50%" />'; ! $tags['S_MAIL_LABEL'] = dgettext('article', 'Your Email Address').':'; ! $tags['S_MAIL_ADDR'] = '<input type="text" name="ART_s_email" value="'.Current_User::getEmail().'" maxlength="100" style="width:50%" />'; ! $tags['S_MAIL_HELP'] = dgettext('article', '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.'); ! $tags['S_COPY_LABEL'] = dgettext('article', 'Send a copy to yourself'); ! $tags['S_COPY'] = '<input name="ART_copy_s" value="1" type="checkbox">'; ! $tags['S_MSG_LABEL'] = dgettext('article', 'Enter a brief message to your friend: (optional)'); ! $tags['S_MSG'] = '<textarea id="ART_s_msg" name="ART_s_msg" rows="3" style="width:95%"></textarea>'; ! $tags['MAIL_TYPE1_LABEL'] = dgettext('article', 'Full Information in HTML'); ! $tags['MAIL_TYPE1'] = '<input name="ART_mail_type" value="full" checked="checked" type="radio">'; ! $tags['MAIL_TYPE2_LABEL'] = dgettext('article', 'Link Only'); ! $tags['MAIL_TYPE2'] = '<input name="ART_mail_type" value="link" type="radio">'; ! foreach ($error AS $key => $value) ! $tags['ERROR_'.$key] = '
<span class="error">'.dgettext('article', 'ERROR: ').$value.'</span><br />
'; ! $tags['CAPTCHA_MSG'] = '<input type="text" name="captcha" value="" maxlength="10" style="width:20%" />'; ! $tags['CAPTCHA_IMAGE'] = Captcha::get(); ! $tags['CAPTCHA_LABEL'] = dgettext('article', 'Copy the word seen in the above image'); Layout::addPageTitle(dgettext('article', 'E-mail A Friend').': "'.$this->title); ! $template['TITLE'] = dgettext('article', 'E-mail this Article to a Friend'); ! $template['CONTENT'] = '<form name="ARTICLE_emailAfriend" action="index.php" method="post">' ! . '<input name="module" value="article" type="hidden">' ! . '<input name="id" value="'.$this->id.'" type="hidden">' ! . '<input name="op" value="email" type="hidden">' ! . PHPWS_Template::processTemplate($tags,'article','mail_form.tpl') ! . '</form>'; $finalContent = PHPWS_Template::process($template, 'layout', 'box.tpl'); Layout::add($finalContent); --- 92,141 ---- else if(isset($_POST['ART_no'])) { ! Layout::add($this->view_full()); } else { ! $tags['SEND'] = '<input name="ART_yes" value="'.dgettext('article', 'Send').'" type="submit">'; ! $tags['CANCEL'] = '<input name="ART_no" value="'.dgettext('article', 'Cancel').'" type="submit">'; ! $tags['TITLE'] = PHPWS_Text::parseOutput($this->title); ! if ($this->summary) ! $tags['SUMMARYTEXT'] = PHPWS_AM_Data::parseOutput($this->summary); ! if (MOD_REWRITE_ENABLED && $this->id > 0) ! $link = PHPWS_Text::rewriteLink(dgettext('article', 'Back to Article'), 'article', $this->id); ! else ! $link = PHPWS_Text::moduleLink(dgettext('article', 'Back to Article'), 'article', array('id' => $this->id)); ! $tags['BACKLINK'] = '["../"]'; ! $tags['R_MAIL_ERROR'] = dgettext('article', 'Friend\'s Email').':'; ! $tags['R_MAIL_LABEL'] = dgettext('article', 'Friend\'s Email').':'; ! $tags['R_MAIL_ADDR'] = '<input type="text" name="ART_r_email" value="" maxlength="200" style="width:50%" />'; ! $tags['R_MAIL_HELP'] = dgettext('article', 'Separate multiple addresses with commas. Maximum 200 characters.'); ! $tags['S_NAME_LABEL'] = dgettext('article', 'Your Full Name: (optional)'); ! $tags['S_NAME'] = '<input type="text" name="ART_s_name" value="'.Current_User::getDisplayName().'" maxlength="155" style="width:50%" />'; ! $tags['S_MAIL_LABEL'] = dgettext('article', 'Your Email Address').':'; ! $tags['S_MAIL_ADDR'] = '<input type="text" name="ART_s_email" value="'.Current_User::getEmail().'" maxlength="100" style="width:50%" />'; ! $tags['S_MAIL_HELP'] = dgettext('article', '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.'); ! $tags['S_COPY_LABEL'] = dgettext('article', 'Send a copy to yourself'); ! $tags['S_COPY'] = '<input name="ART_copy_s" value="1" type="checkbox">'; ! $tags['S_MSG_LABEL'] = dgettext('article', 'Enter a brief message to your friend: (optional)'); ! $tags['S_MSG'] = '<textarea id="ART_s_msg" name="ART_s_msg" rows="3" style="width:95%"></textarea>'; ! $tags['MAIL_TYPE1_LABEL'] = dgettext('article', 'Full Information in HTML'); ! $tags['MAIL_TYPE1'] = '<input name="ART_mail_type" value="full" checked="checked" type="radio">'; ! $tags['MAIL_TYPE2_LABEL'] = dgettext('article', 'Link Only'); ! $tags['MAIL_TYPE2'] = '<input name="ART_mail_type" value="link" type="radio">'; ! foreach ($error AS $key => $value) ! $tags['ERROR_'.$key] = '
<span class="error">'.dgettext('article', 'ERROR: ').$value.'</span><br />
'; ! $tags['CAPTCHA_MSG'] = '<input type="text" name="captcha" value="" maxlength="10" style="width:20%" />'; ! $tags['CAPTCHA_IMAGE'] = Captcha::get(); ! $tags['CAPTCHA_LABEL'] = dgettext('article', 'Copy the word seen in the above image'); Layout::addPageTitle(dgettext('article', 'E-mail A Friend').': "'.$this->title); ! $template['TITLE'] = dgettext('article', 'E-mail this Article to a Friend'); ! $template['CONTENT'] = '<form name="ARTICLE_emailAfriend" action="index.php" method="post">' ! . '<input name="module" value="article" type="hidden">' ! . '<input name="id" value="'.$this->id.'" type="hidden">' ! . '<input name="op" value="email" type="hidden">' ! . PHPWS_Template::processTemplate($tags,'article','mail_form.tpl') ! . '</form>'; $finalContent = PHPWS_Template::process($template, 'layout', 'box.tpl'); Layout::add($finalContent); Index: A_save.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/article/inc/A_save.php,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** A_save.php 17 Oct 2007 04:35:33 -0000 1.18 --- A_save.php 21 Aug 2008 20:17:19 -0000 1.19 *************** *** 1,147 **** ! <?php ! /** ! * function save () ! * Saves this article to the database. ! * ! * @version $Id$ ! * ! * @author Eloi George <el...@NO...> ! * @module Article Manager ! * @param none ! * @return none ! * ! */ ! if(is_string($this->pages)) ! $this->unserialize_sections(); ! /* Save any POSTed article edits */ ! $result = $this->update(); ! if (is_array($result)) ! return implode('<br />', $result); ! if ($result===false) ! return false; ! ! $db = & new PHPWS_DB('article'); ! ! /* Process all sections */ ! $this->pagecount = count($this->pages); ! $this->wordcount = 0; ! foreach($this->pages as $page) { ! foreach($page['section'] as $section) { ! $this->wordcount += substr_count($section['title'],' ') ! + substr_count($section['text'],' ') ! + (($section['title'] !=='')?1:0) ! + (($section['text'] !=='')?1:0); ! } ! } ! ! /* Convert all sections to XML for storage */ ! require_once(PHPWS_SOURCE_DIR . 'lib/pear/XML/Serializer.php'); ! $XML_buffer = $this->pages; ! $options = array( ! 'indent' => "\t", ! 'defaultTagName' => 'array_item', ! 'typeHints' => true ! // 'keyAttribute' => false, ! // 'classAttribute' => true, ! // "addDecl" => true, ! // "encoding" => "UTF-8", ! // 'rootName' => 'PHPWS_Article' ! ); ! $serializer = new XML_Serializer($options); ! $serializer->setErrorHandling(PEAR_ERROR_DIE); ! $serializer->serialize($this->pages); ! $this->pages = str_replace(array(' _type="string"',' _type="integer"'), '', $serializer->getSerializedData()); ! ! ! /* If this is a new or approved article... */ ! if ($this->approved || !$this->id) { ! if ($this->approved) ! $this->draft = 0; ! /* Kludge to allow AM to use negative numbers */ ! if ($autodetect_id && ($this->id < 0)) ! $db->addWhere('id', $this->id); ! /* save the article to article */ ! $result = $db->saveObject($this, FALSE, $autodetect_id); ! if (PHPWS_Error::logIfError($result)) ! return sprintf(dgettext('article', 'There was an error when inserting %1$s into the database %2$s'), 'article data','article').'!';; ! } ! ! ! if ($this->approved) { ! /* Create/Update this article's Key */ ! $update_article = FALSE; ! if (empty($this->key_id)) ! { ! $key = & new Key; ! $update_article = TRUE; ! } ! else ! { ! $key = & new Key($this->key_id); ! if (PHPWS_Error::logIfError($key->_error)) { ! $key = & new Key; ! $update_article = TRUE; ! } ! } ! $key->setModule('article'); ! $key->setItemName('article'); ! $key->setItemId($this->id); ! $key->setEditPermission('edit_articles'); ! $key->setUrl('index.php?module=article&id='.$this->id); ! $key->setTitle($this->title); ! $key->setSummary($this->summary); ! $key->active = 1; ! $result = $key->save(); ! $this->key_id = $key->id; ! if ($update_article) { ! $db1 = & new PHPWS_DB('article'); ! $db1->addValue('key_id', $this->key_id); ! $db1->addWhere('id', $this->id); ! $db1->update(); ! } ! ! /* Comments */ ! if($this->allow_comments && PHPWS_Core::initModClass('comments', 'Comments.php')) { ! $thread = Comments::getThread($this->key_id); ! $thread->allowAnonymous($this->allow_anonymous); ! $thread->save(); ! } ! ! /* Search */ ! $texttags = $this->_get_tags(); ! $search = new Search($this->key_id); ! $search->resetKeywords(); ! $search->addKeywords($texttags['TITLE']); ! $search->addKeywords(@$texttags['SUMMARYTEXT']); ! $search->addKeywords($texttags['BODYTEXT']); ! $result = $search->save(); ! unset($texttags); ! if (PHPWS_Error::logIfError($result)) ! return $result; ! ! /* Save Metatags */ ! require_once(PHPWS_SOURCE_DIR . 'mod/layout/class/LayoutAdmin.php'); ! $_POST['key_id'] = $this->key_id; ! $_POST['page_title'] = strip_tags($this->title); $_POST['meta_description'] = strip_tags($this->summary); ! Layout_Admin::postMeta(); ! ! /* Reset headline caching if this will be on there */ ! if ($this->announce) ! PHPWS_AM_ModSettings::reset_cache(); ! } ! ! /* Save the article in the version archives */ ! PHPWS_Core::initModClass('version', 'Version.php'); ! $version = & new Version('article'); ! $version->setSource($this); ! if (!empty($this->_version_id)) ! $version->setId($this->_version_id); ! $version->setApproved($this->approved); ! $version->save(); ! ! /* Put sections array back into place */ ! $this->pages = $XML_buffer; ! ! return true; ?> \ No newline at end of file --- 1,153 ---- ! <?php ! /** ! * function save () ! * Saves this article to the database. ! * ! * @version $Id$ ! * ! * @author Eloi George <el...@NO...> ! * @module Article Manager ! * @param bool $autodetect_id : If false, the article will be saved as a new article with the supplied id ! * @return none ! * ! */ ! if(is_string($this->pages)) ! $this->unserialize_sections(); ! /* Save any POSTed article edits */ ! $result = $this->update(); ! if (is_array($result)) ! return implode('<br />', $result); ! if ($result===false) ! return false; ! ! $db = & new PHPWS_DB('article'); ! ! /* Process all sections */ ! $this->pagecount = count($this->pages); ! $this->wordcount = 0; ! foreach($this->pages as $page) { ! foreach($page['section'] as $section) { ! $this->wordcount += substr_count($section['title'],' ') ! + substr_count($section['text'],' ') ! + (($section['title'] !=='')?1:0) ! + (($section['text'] !=='')?1:0); ! } ! } ! ! /* Convert all sections to XML for storage */ ! require_once(PHPWS_SOURCE_DIR . 'lib/pear/XML/Serializer.php'); ! $XML_buffer = $this->pages; ! $options = array( ! 'indent' => "\t", ! 'defaultTagName' => 'array_item', ! 'typeHints' => true ! // 'keyAttribute' => false, ! // 'classAttribute' => true, ! // "addDecl" => true, ! // "encoding" => "UTF-8", ! // 'rootName' => 'PHPWS_Article' ! ); ! $serializer = new XML_Serializer($options); ! $serializer->setErrorHandling(PEAR_ERROR_DIE); ! $serializer->serialize($this->pages); ! $this->pages = str_replace(array(' _type="string"',' _type="integer"'), '', $serializer->getSerializedData()); ! ! ! /* If this is a new or approved article... */ ! if ($this->approved || !$this->id) { ! if ($this->approved) ! $this->draft = 0; ! /* Kludge to allow AM to use negative numbers */ ! if ($autodetect_id && ($this->id < 0)) ! $db->addWhere('id', $this->id); ! /* save the article to article */ ! $result = $db->saveObject($this, FALSE, $autodetect_id); ! if (PHPWS_Error::logIfError($result)) ! return sprintf(dgettext('article', 'There was an error when inserting %1$s into the database %2$s'), 'article data','article').'!';; ! } ! ! ! if ($this->approved) { ! /* Create/Update this article's Key */ ! $update_article = FALSE; ! if (empty($this->key_id)) ! { ! $this->_key = new Key; ! $update_article = TRUE; ! } ! else ! { ! $this->_key = new Key($this->key_id); ! if (PHPWS_Error::logIfError($this->_key->_error)) { ! $this->_key = new Key; ! $update_article = TRUE; ! } ! } ! $this->_key->setModule('article'); ! $this->_key->setItemName('article'); ! $this->_key->setItemId($this->id); ! $this->_key->setEditPermission('edit_articles'); ! $this->_key->setUrl('index.php?module=article&id='.$this->id); ! $this->_key->setTitle($this->title); ! $this->_key->setSummary($this->summary); ! $this->_key->active = 1; ! $result = $this->_key->save(); ! $this->key_id = $this->_key->id; ! if ($update_article) { ! $db1 = new PHPWS_DB('article'); ! $db1->addValue('key_id', $this->key_id); ! $db1->addWhere('id', $this->id); ! $db1->update(); ! } ! ! /* Comments */ ! if($this->allow_comments && isset($this->_allow_anonymous)) { ! PHPWS_Core::initModClass('comments', 'Comments.php'); ! $this->_thread = Comments::getThread($this->_key); ! $this->_thread->allowAnonymous($this->_allow_anonymous); ! $this->_thread->setApproval($this->_default_approval); ! $this->_thread->save(); ! } ! ! /* Search */ ! $texttags = $this->_get_tags(); ! $search = new Search($this->key_id); ! $search->resetKeywords(); ! $search->addKeywords($texttags['TITLE']); ! $search->addKeywords(@$texttags['SUMMARYTEXT']); ! $search->addKeywords($texttags['BODYTEXT']); ! $result = $search->save(); ! unset($texttags); ! if (PHPWS_Error::logIfError($result)) ! return $result; ! ! /* Save Metatags */ ! require_once(PHPWS_SOURCE_DIR . 'mod/layout/class/LayoutAdmin.php'); ! $_POST['key_id'] = $this->key_id; ! $_POST['page_title'] = strip_tags($this->title); $_POST['meta_description'] = strip_tags($this->summary); ! if (!isset($_POST['meta_keywords'])) ! $_POST['meta_keywords'] = ''; ! Layout_Admin::postMeta(); ! ! /* Reset headline caching if this will be on there */ ! if ($this->announce) { ! PHPWS_Core::initModClass('article', 'AM_ModSettings.php'); ! PHPWS_AM_ModSettings::reset_cache(); ! } ! } ! ! /* Save the article in the version archives */ ! PHPWS_Core::initModClass('version', 'Version.php'); ! $version = & new Version('article'); ! $version->setSource($this); ! if (!empty($this->_version_id)) ! $version->setId($this->_version_id); ! $version->setApproved($this->approved); ! $version->save(); ! ! /* Put sections array back into place */ ! $this->pages = $XML_buffer; ! ! return true; ?> \ No newline at end of file Index: runtime_chronological.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/article/inc/runtime_chronological.php,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** runtime_chronological.php 17 Dec 2007 02:29:38 -0000 1.12 --- runtime_chronological.php 21 Aug 2008 20:17:19 -0000 1.13 *************** *** 1,136 **** ! <?php ! /** ! * This is the code to display articles on the homepage grouped by categories. ! * ! * @version $Id$ ! * ! * @author Eloi George <el...@NO...> ! * @module Article Manager ! */ ! $TotalCount = $config['summaries_on_homepage']+$config['prev_n_articles']; ! ! $cachekey = 'ChronologicalArticleHeadlines'; ! $s = PHPWS_Cache::get($cachekey); ! if (empty($s)) { ! /* Load records to display */ ! // if ($_SESSION['translate']->langActive) ! // $lang = ' AND language="'.$_SESSION['translate']->current_language.'"'; ! // else ! // $lang - ''; ! /* Load all articles at once */ ! $db = PHPWS_AM_Data::bulk_load_db(null, true); ! $db->addWhere('announce', '1'); ! $db->addWhere('mainarticle', '0'); ! $db->addOrder('updated_date desc'); ! PHPWS_AM_Data::get_published_sql($db); ! $db->setLimit($TotalCount); ! $result = $db->select(); ! if (PHPWS_Error::logIfError($result)) ! exit('Article::Runtime -- a database error occured.'); ! /* Load all category info for the summary display */ ! $idx = $list = array(); ! if (count($result)) ! { ! $num_rows = min($config['summaries_on_homepage'], count($result)); ! $item_list = $cat_list = array(); ! for($i=0; $i < $num_rows; $i++) ! $queried[] = $result[$i]['key_id']; ! $db = & new PHPWS_DB('categories'); ! $db->addColumn('category_items.key_id'); ! $db->addColumn('categories.id'); ! $db->addColumn('categories.title'); ! $db->addColumn('categories.icon'); ! $db->addWhere('category_items.key_id', $queried, 'IN'); ! $db->addWhere('id', 'category_items.cat_id'); ! $categories = $db->select(); ! ! if (count($categories)) { ! foreach ($categories AS $cat_item) { ! /* If not done already, develop this category's icon & link */ ! if (!isset($list[$cat_item['id']])) { ! $category = & new Category(); ! PHPWS_Core::plugObject($category, $cat_item); ! $list[$cat_item['id']]['cat_link'] = $category->getViewLink('article'); ! if ($category->icon) { ! $icon = $category->getIcon(); ! $category->title = $icon->getTag(); ! $list[$cat_item['id']]['cat_icon'] = $category->getViewLink('article'); ! } ! } ! /* Add to article-category index */ ! $idx[$cat_item['key_id']]['cat_link'][] = $list[$cat_item['id']]['cat_link']; ! $idx[$cat_item['key_id']]['cat_icon'][] = $list[$cat_item['id']]['cat_icon']; ! } ! } ! $GLOBALS['AMcategoryIdx'] = $idx; ! } ! /* Cache this so we don't have to do it for awhile */ ! $s = serialize(array('result' => $result, 'AMcategoryIdx' => $idx)); ! $lifetime = 86400; // number of seconds until cache refresh ! // default is set in CACHE_LIFETIME in the ! // config/core/config.php file ! PHPWS_Cache::save($cachekey, $s, $lifetime); ! } ! else { ! $arr = unserialize($s); ! $result = $arr['result']; ! $GLOBALS['AMcategoryIdx'] = $arr['AMcategoryIdx']; ! } ! ! ! ! /* If there are summaries to display, display 'em */ ! if (count($result)) ! { ! $tpl = & new PHPWS_Template('article'); ! $status = $tpl->setFile('runtime_chronological.tpl'); ! $columns = $config['display_columns']; ! $width = (int) (100 / $columns); ! $num_rows = min($config['summaries_on_homepage'], count($result)); ! $rows = ceil($num_rows / $columns); ! /* Loop for the amount of rows */ ! for($i = 0; $i < $rows; $i++) { ! /* Loop for the amount of columns */ ! for($j = 0; $j < $columns; $j++) { ! if(isset($result[$i + ($j * $rows)])) { ! $tpl->setCurrentBlock('list_columns'); ! $temp = & new PHPWS_Article($result[$i + ($j * $rows)]); ! $arr = $temp->_get_tags() + array('CELL_WIDTH' => $width); ! $tpl->setData($arr); ! $tpl->parseCurrentBlock(); ! } ! } ! $tpl->setCurrentBlock('list_rows'); ! $tpl->parseCurrentBlock(); ! } ! $template['CONTENT'] = $tpl->get(); ! ! $template['TITLE'] = dgettext('article', 'Also on this Site...'); ! $finalContent = PHPWS_Template::process($template, 'layout', 'box.tpl'); ! Layout::add($finalContent, 'article', 'summaries', true); ! } ! /* If there are x articles before these, display the "Prev Articles" Block */ ! $content = ''; ! if ($config['prev_n_articles'] > 0 && count($result)-$config['summaries_on_homepage'] > 0) ! { ! for($i=$config['summaries_on_homepage']; $i < count($result) && isset($result[$i]); $i++) ! { ! if ($i>0) ! $content .= '<br />'; ! if (MOD_REWRITE_ENABLED && $result[$i]['id']) ! $link = PHPWS_Text::rewriteLink($result[$i]['title'], 'article', $result[$i]['id']); ! else ! $link = PHPWS_Text::moduleLink($result[$i]['title'], 'article',array('id'=>$result[$i]['id'])); ! $content .= date('F d', $result[$i]['updated_date']).' <br />'.$link.'
'; ! } ! if (!empty($content)) ! { ! $template['TITLE'] = sprintf(dgettext('article', 'Previous %s Articles'), $config['prev_n_articles']); ! $template['CONTENT'] = &$content; ! $finalContent = PHPWS_Template::process($template, 'layout', 'box.tpl'); ! Layout::add($finalContent, 'article', 'past'); ! } ! } ! ! ?> \ No newline at end of file --- 1,132 ---- ! <?php ! /** ! * This is the code to display articles on the homepage grouped by categories. ! * ! * @version $Id$ ! * ! * @author Eloi George <el...@NO...> ! * @module Article Manager ! */ ! $TotalCount = $config['summaries_on_homepage']+$config['prev_n_articles']; ! ! $cachekey = 'ChronologicalArticleHeadlines'; ! $s = PHPWS_Cache::get($cachekey); ! if (empty($s)) { ! /* Load records to display */ ! // if ($_SESSION['translate']->langActive) ! // $lang = ' AND language="'.$_SESSION['translate']->current_language.'"'; ! // else ! // $lang - ''; ! /* Load all articles at once */ ! $db = PHPWS_AM_Data::bulk_load_db(null, true); ! $db->addWhere('announce', '1'); ! $db->addOrder('updated_date desc'); ! PHPWS_AM_Data::get_published_sql($db); ! $db->setLimit($TotalCount); ! $result = $db->select(); ! if (PHPWS_Error::logIfError($result)) ! exit('Article::Runtime -- a database error occured.'); ! /* Load all category info for the summary display */ ! $idx = $list = array(); ! if (count($result)) ! { ! $num_rows = min($config['summaries_on_homepage'], count($result)); ! $item_list = $cat_list = array(); ! for($i=0; $i < $num_rows; $i++) ! $queried[] = $result[$i]['key_id']; ! $db = & new PHPWS_DB('categories'); ! $db->addColumn('category_items.key_id'); ! $db->addColumn('categories.id'); ! $db->addColumn('categories.title'); ! $db->addColumn('categories.icon'); ! $db->addWhere('category_items.key_id', $queried, 'IN'); ! $db->addWhere('id', 'category_items.cat_id'); ! $categories = $db->select(); ! ! if (count($categories)) { ! foreach ($categories AS $cat_item) { ! /* If not done already, develop this category's icon & link */ ! if (!isset($list[$cat_item['id']])) { ! $category = & new Category(); ! PHPWS_Core::plugObject($category, $cat_item); ! $list[$cat_item['id']]['cat_link'] = $category->getViewLink('article'); ! if ($category->icon) ! $list[$cat_item['id']]['cat_icon'] = $category->getViewLink('article', $category->getIcon()); ! } ! /* Add to article-category index */ ! $idx[$cat_item['key_id']]['cat_link'][] = $list[$cat_item['id']]['cat_link']; ! $idx[$cat_item['key_id']]['cat_icon'][] = $list[$cat_item['id']]['cat_icon']; ! } ! } ! $GLOBALS['AMcategoryIdx'] = $idx; ! } ! /* Cache this so we don't have to do it for awhile */ ! $s = serialize(array('result' => $result, 'AMcategoryIdx' => $idx)); ! $lifetime = 86400; // number of seconds until cache refresh ! // default is set in CACHE_LIFETIME in the ! // config/core/config.php file ! PHPWS_Cache::save($cachekey, $s, $lifetime); ! } ! else { ! $arr = unserialize($s); ! $result = $arr['result']; ! $GLOBALS['AMcategoryIdx'] = $arr['AMcategoryIdx']; ! } ! ! ! ! /* If there are summaries to display, display 'em */ ! if (count($result)) ! { ! $tpl = & new PHPWS_Template('article'); ! $status = $tpl->setFile('runtime_chronological.tpl'); ! $columns = $config['display_columns']; ! $width = (int) (100 / $columns); ! $num_rows = min($config['summaries_on_homepage'], count($result)); ! $rows = ceil($num_rows / $columns); ! /* Loop for the amount of rows */ ! for($i = 0; $i < $rows; $i++) { ! /* Loop for the amount of columns */ ! for($j = 0; $j < $columns; $j++) { ! if(isset($result[$i + ($j * $rows)])) { ! $tpl->setCurrentBlock('list_columns'); ! $temp = & new PHPWS_Article($result[$i + ($j * $rows)]); ! $arr = $temp->_get_tags() + array('CELL_WIDTH' => $width); ! $tpl->setData($arr); ! $tpl->parseCurrentBlock(); ! } ! } ! $tpl->setCurrentBlock('list_rows'); ! $tpl->parseCurrentBlock(); ! } ! $template['CONTENT'] = $tpl->get(); ! ! $template['TITLE'] = dgettext('article', 'Also on this Site...'); ! $finalContent = PHPWS_Template::process($template, 'layout', 'box.tpl'); ! Layout::add($finalContent, 'article', 'summaries', true); ! } ! /* If there are x articles before these, display the "Prev Articles" Block */ ! $content = ''; ! if ($config['prev_n_articles'] > 0 && count($result)-$config['summaries_on_homepage'] > 0) ! { ! for($i=$config['summaries_on_homepage']; $i < count($result) && isset($result[$i]); $i++) ! { ! if ($i>0) ! $content .= '<br />'; ! if (MOD_REWRITE_ENABLED && $result[$i]['id']) ! $link = PHPWS_Text::rewriteLink($result[$i]['title'], 'article', $result[$i]['id']); ! else ! $link = PHPWS_Text::moduleLink($result[$i]['title'], 'article',array('id'=>$result[$i]['id'])); ! $content .= date('F d', $result[$i]['updated_date']).' <br />'.$link.'
'; ! } ! if (!empty($content)) ! { ! $template['TITLE'] = sprintf(dgettext('article', 'Previous %s Articles'), $config['prev_n_articles']); ! $template['CONTENT'] = &$content; ! $finalContent = PHPWS_Template::process($template, 'layout', 'box.tpl'); ! Layout::add($finalContent, 'article', 'past'); ! } ! } ! ! ?> \ No newline at end of file Index: runtime_categorized.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/article/inc/runtime_categorized.php,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** runtime_categorized.php 21 Oct 2007 05:47:37 -0000 1.9 --- runtime_categorized.php 21 Aug 2008 20:17:19 -0000 1.10 *************** *** 1,104 **** ! <?php ! /** ! * This is the code to display articles on the homepage in chronological order. ! * ! * @version $Id$ ! * ! * @author Eloi George <el...@NO...> ! * @module Article Manager ! */ ! $cachekey = 'CategorizedArticleHeadlines'; ! $s = PHPWS_Cache::get($cachekey); ! if (empty($s)) { ! $category_index = Categories::getCategories('list'); ! $category_order = array(0) + explode(' ', $config['category_order']); ! $content = array(); ! ! foreach ($category_order AS $cat_id) { ! $db = PHPWS_AM_Data::bulk_load_db (null, true); ! $db->addWhere('announce', '1'); ! $db->addWhere('mainarticle', '0'); ! $db->addWhere('category_items.cat_id', $cat_id); ! $db->addWhere('category_items.module', 'article'); ! $db->addWhere('category_items.key_id', 'article.key_id'); ! $db->addOrder('updated_date desc'); ! PHPWS_AM_Data::get_published_sql($db); ! $db->setLimit($config['summaries_on_homepage']); ! ! $result = $db->select(); ! if (PHPWS_Error::logIfError($result)) ! exit('Article::Runtime -- a database error occured.'); ! ! if (!($result)) ! continue; ! foreach ($result AS $key => $value) { ! if ($key > $config['summaries_per_category']) ! unset($result[$key]['summary']); ! } ! ! $content[] = $result; ! $category = & new Category($cat_id); ! $a = array('CATEGORY_NAME' => $category->getViewLink('article'), ! 'CATEGORY_DESCRIPTION' => $category->getDescription()); ! if ($category->icon) { ! $icon = $category->getIcon(); ! $category->title = $icon->getTag(); ! $a['CATEGORY_ICON'] = $category->getViewLink('article'); ! } ! $cat_arr[] = $a; ! } ! /* Cache this so we don't have to do it for awhile */ ! $s = serialize(array('content' => $content, 'cat_arr' => $cat_arr)); ! $lifetime = 86400; // number of seconds until cache refresh ! // default is set in CACHE_LIFETIME in the ! // config/core/config.php file ! PHPWS_Cache::save($cachekey, $s, $lifetime); ! } ! else { ! $arr = unserialize($s); ! $content = $arr['content']; ! $cat_arr = $arr['cat_arr']; ! } ! unset($s); ! ! /* If there are summaries to display, display 'em */ ! if (count($content)) ! { ! $tpl = & new PHPWS_Template('article'); ! $status = $tpl->setFile('runtime_categorized.tpl'); ! $columns = $config['display_columns']; ! $width = (int) (100 / $columns); ! $num_rows = min($config['summaries_on_homepage'], count($content)); ! $rows = ceil($num_rows / $columns); ! /* Loop for the amount of rows */ ! for($i = 0; $i < $rows; $i++) { ! /* Loop for the amount of columns */ ! for($j = 0; $j < $columns; $j++) { ! if(isset($content[$i + ($j * $rows)])) { ! /* Single category display */ ! $pos = $i + ($j * $rows); ! foreach ($content[$pos] AS $key => $value) { ! if ($key < $config['summaries_per_category']) ! $tpl->setCurrentBlock('list_headline_summaries'); ! else ! $tpl->setCurrentBlock('list_headline_titles'); ! $temp = new PHPWS_Article($value); ! $arr = $temp->_get_tags(); ! $tpl->setData($arr); ! $tpl->parseCurrentBlock(); ! } ! $tpl->setCurrentBlock('list_columns'); ! $arr = $cat_arr[$pos] + array('CELL_WIDTH' => $width); ! $tpl->setData($arr); ! $tpl->parseCurrentBlock(); ! } ! } ! $tpl->setCurrentBlock('list_rows'); ! $tpl->parseCurrentBlock(); ! } ! $template['CONTENT'] = $tpl->get(); ! $template['TITLE'] = dgettext('article', 'Also on this Site...'); ! $finalContent = PHPWS_Template::process($template, 'layout', 'box.tpl'); ! Layout::add($finalContent, 'article', 'summaries', true); ! } ?> \ No newline at end of file --- 1,101 ---- ! <?php ! /** ! * This is the code to display articles on the homepage in chronological order. ! * ! * @version $Id$ ! * ! * @author Eloi George <el...@NO...> ! * @module Article Manager ! */ ! $cachekey = 'CategorizedArticleHeadlines'; ! $s = PHPWS_Cache::get($cachekey); ! if (empty($s)) { ! $category_index = Categories::getCategories('list'); ! $category_order = explode(' ', $config['category_order']); ! array_unshift($category_order, 0); ! $content = array(); ! ! foreach ($category_order AS $cat_id) { ! $db = PHPWS_AM_Data::bulk_load_db (null, true); ! $db->addWhere('announce', '1'); ! $db->addWhere('category_items.cat_id', $cat_id); ! $db->addWhere('category_items.module', 'article'); ! $db->addWhere('category_items.key_id', 'article.key_id'); ! $db->addOrder('updated_date desc'); ! PHPWS_AM_Data::get_published_sql($db); ! $db->setLimit($config['summaries_on_homepage']); ! ! $result = $db->select(); ! if (PHPWS_Error::logIfError($result)) ! exit('Article::Runtime -- a database error occured.'); ! ! if (!($result)) ! continue; ! foreach ($result AS $key => $value) { ! if ($key > $config['summaries_per_category']) ! unset($result[$key]['summary']); ! } ! ! $content[] = $result; ! $category = & new Category($cat_id); ! $a = array('CATEGORY_NAME' => $category->getViewLink('article'), ! 'CATEGORY_DESCRIPTION' => $category->getDescription()); ! if ($category->icon) ! $a['CATEGORY_ICON'] = $category->getViewLink('article', $category->getIcon()); ! $cat_arr[] = $a; ! } ! /* Cache this so we don't have to do it for awhile */ ! $s = serialize(array('content' => $content, 'cat_arr' => $cat_arr)); ! $lifetime = 86400; // number of seconds until cache refresh ! // default is set in CACHE_LIFETIME in the ! // config/core/config.php file ! PHPWS_Cache::save($cachekey, $s, $lifetime); ! } ! else { ! $arr = unserialize($s); ! $content = $arr['content']; ! $cat_arr = $arr['cat_arr']; ! } ! unset($s); ! ! /* If there are summaries to display, display 'em */ ! if (count($content)) ! { ! $tpl = & new PHPWS_Template('article'); ! $status = $tpl->setFile('runtime_categorized.tpl'); ! $columns = $config['display_columns']; ! $width = (int) (100 / $columns); ! $num_rows = min($config['summaries_on_homepage'], count($content)); ! $rows = ceil($num_rows / $columns); ! /* Loop for the amount of rows */ ! for($i = 0; $i < $rows; $i++) { ! /* Loop for the amount of columns */ ! for($j = 0; $j < $columns; $j++) { ! if(isset($content[$i + ($j * $rows)])) { ! /* Single category display */ ! $pos = $i + ($j * $rows); ! foreach ($content[$pos] AS $key => $value) { ! if ($key < $config['summaries_per_category']) ! $tpl->setCurrentBlock('list_headline_summaries'); ! else ! $tpl->setCurrentBlock('list_headline_titles'); ! $temp = new PHPWS_Article($value); ! $arr = $temp->_get_tags(); ! $tpl->setData($arr); ! $tpl->parseCurrentBlock(); ! } ! $tpl->setCurrentBlock('list_columns'); ! $arr = $cat_arr[$pos] + array('CELL_WIDTH' => $width); ! $tpl->setData($arr); ! $tpl->parseCurrentBlock(); ! } ! } ! $tpl->setCurrentBlock('list_rows'); ! $tpl->parseCurrentBlock(); ! } ! $template['CONTENT'] = $tpl->get(); ! $template['TITLE'] = dgettext('article', 'Also on this Site...'); ! $finalContent = PHPWS_Template::process($template, 'layout', 'box.tpl'); ! Layout::add($finalContent, 'article', 'summaries', true); ! } ?> \ No newline at end of file Index: A_update.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/article/inc/A_update.php,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** A_update.php 22 Jan 2008 04:55:07 -0000 1.9 --- A_update.php 21 Aug 2008 20:17:19 -0000 1.10 *************** *** 1,79 **** ! <?php ! /** ! * function update_settings () ! * Updates this article's information in memory ! * ! * @version $Id$ ! * ! * @author Eloi George <el...@NO...> ! * @module Article Manager ! * @param none ! * @return none ! */ ! $this->updated_username = Current_User::getDisplayName(); ! $this->updated_date = time(); ! ! if (!isset($_POST['ARTICLE_title']) && !isset($_POST['ARTICLE_summary'])) ! return false; ! ! /* Update title and summary data */ ! $this->title = strip_tags($_POST['ARTICLE_title']); ! $this->summary = PHPWS_Text::parseInput($_POST['ARTICLE_summary']); ! ! /* Update all section data */ ! if (isset($_POST['page'])) ! { ! if($s_arr = PHPWS_Article_Section::get_post('a')) { ! /* Summary Image data fields */ ! $result = PHPWS_Article_Image::update($this, $s_arr); ! if(!empty($result)) ! $GLOBALS['Article']['error']['ARTICLE_alt'][] = $result; ! } ! ! foreach($this->pages AS $pagenum => $page) { ! if(isset($_POST['ARTICLE_page_'.($pagenum + 1).'_teaser'])) ! $this->pages[$pagenum]['teaser'] = strip_tags($_POST['ARTICLE_page_'.($pagenum + 1).'_teaser']); ! foreach($page['section'] AS $sectnum => $section_data) { ! $s_arr = PHPWS_Article_Section::get_post($section_data['id']); ! if(!empty($s_arr)) { ! $section = new PHPWS_Article_Section($section_data); ! $section->update($s_arr); ! $this->pages[$pagenum]['section'][$sectnum] = get_object_vars($section); ! } ! } ! } ! } ! ! ! /* If this is a translation, nothing else can be changed */ ! //if (!$this->is_base_article) ! // return true; ! ! $this->announce = ($_POST['ARTICLE_announce'])?1:0; ! ! if (Current_User::allow('article', "allow_comments") ! || ($GLOBALS['Article']['val']['users_allow_comments'] && Current_User::getId())) ! { ! $this->allow_comments = (isset($_POST['ARTICLE_allow_comments']))?1:0; ! if (Current_User::allow('article', "allow_anon")) ! $this->allow_anonymous = (isset($_POST['ARTICLE_allow_anonymous']))?1:0; ! } ! ! if(isset($_POST['ARTICLE_publication_date'])) ! { ! $this->publication_date = strtotime($_POST['ARTICLE_publication_date']); ! if ($this->publication_date < $this->created_date) ! $this->publication_date = $this->created_date; ! if ($this->updated_date < $this->publication_date) ! $this->updated_date = $this->publication_date; ! } ! ! if (isset($_POST['ARTICLE_expiration_date'])) ! $this->expiration_date = strtotime($_POST['ARTICLE_expiration_date']); ! if (isset($_POST['ARTICLE_expiration_flag']) || !$GLOBALS['Article']['val']['can_expire']) ! $this->expiration_date = 0; ! if (isset($_POST['ARTICLE_template'])) ! $this->template = str_replace(' ','_',$_POST['ARTICLE_template']); ! ! return true; ! ?> --- 1,81 ---- ! <?php ! /** ! * function update_settings () ! * Updates this article's information in memory ! * ! * @version $Id$ ! * ! * @author Eloi George <el...@NO...> ! * @module Article Manager ! * @param none ! * @return none ! */ ! $this->updated_username = Current_User::getDisplayName(); ! $this->updated_date = time(); ! ! if (!isset($_POST['ARTICLE_title']) && !isset($_POST['ARTICLE_summary'])) ! return false; ! ! /* Update title and summary data */ ! $this->title = strip_tags($_POST['ARTICLE_title']); ! $this->summary = PHPWS_Text::parseInput($_POST['ARTICLE_summary']); ! ! /* Update all section data */ ! if (isset($_POST['page'])) ! { ! if($s_arr = PHPWS_Article_Section::get_post('a')) { ! /* Summary Image data fields */ ! $result = PHPWS_Article_Image::update($this, $s_arr); ! if(!empty($result)) ! $GLOBALS['Article']['error']['ARTICLE_alt'][] = $result; ! } ! ! foreach($this->pages AS $pagenum => $page) { ! if(isset($_POST['ARTICLE_page_'.($pagenum + 1).'_teaser'])) ! $this->pages[$pagenum]['teaser'] = strip_tags($_POST['ARTICLE_page_'.($pagenum + 1).'_teaser']); ! foreach($page['section'] AS $sectnum => $section_data) { ! $s_arr = PHPWS_Article_Section::get_post($section_data['id']); ! if(!empty($s_arr)) { ! $section = new PHPWS_Article_Section($section_data); ! $section->update($s_arr); ! $this->pages[$pagenum]['section'][$sectnum] = get_object_vars($section); ! } ! } ! } ! } ! ! ! /* If this is a translation, nothing else can be changed */ ! //if (!$this->is_base_article) ! // return true; ! ! $this->announce = (int) !empty($_POST['ARTICLE_announce']); ! ! if (Current_User::allow('article', "allow_comments") ! || ($GLOBALS['Article']['val']['users_allow_comments'] && Current_User::getId())) ! { ! $this->allow_comments = (int) !empty($_POST['ARTICLE_allow_comments']); ! if (Current_User::allow('article', "allow_anon")) { ! $this->_allow_anonymous = (int) !empty($_POST['ARTICLE_allow_anonymous']); ! $this->_default_approval = (int) $_POST['ARTICLE_default_approval']; ! } ! } ! ! if(isset($_POST['ARTICLE_publication_date'])) ! { ! $this->publication_date = strtotime($_POST['ARTICLE_publication_date']); ! if ($this->publication_date < $this->created_date) ! $this->publication_date = $this->created_date; ! if ($this->updated_date < $this->publication_date) ! $this->updated_date = $this->publication_date; ! } ! ! if (isset($_POST['ARTICLE_expiration_date'])) ! $this->expiration_date = strtotime($_POST['ARTICLE_expiration_date']); ! if (isset($_POST['ARTICLE_expiration_flag']) || !$GLOBALS['Article']['val']['can_expire']) ! $this->expiration_date = 0; ! if (isset($_POST['ARTICLE_template'])) ! $this->template = str_replace(' ','_',$_POST['ARTICLE_template']); ! ! return true; ! ?> |
|
From: Eloi G. <ada...@us...> - 2008-08-21 20:17:32
|
Update of /cvsroot/phpwebsite-comm/modules/article/lib/XML-RPC In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2278/lib/XML-RPC Modified Files: IXR_Library.inc.php Log Message: Article Manager 4.1.0 Index: IXR_Library.inc.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/article/lib/XML-RPC/IXR_Library.inc.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** IXR_Library.inc.php 30 Jun 2007 19:48:38 -0000 1.3 --- IXR_Library.inc.php 21 Aug 2008 20:17:37 -0000 1.4 *************** *** 1,818 **** ! <?php ! ! /* ! IXR - The Inutio XML-RPC Library - (c) Incutio Ltd 2002 ! Version 1.61 - Simon Willison, 11th July 2003 (htmlentities -> htmlspecialchars) ! Site: http://scripts.incutio.com/xmlrpc/ ! Manual: http://scripts.incutio.com/xmlrpc/manual.php ! Made available under the Artistic License: http://www.opensource.org/licenses/artistic-license.php ! */ ! [...1609 lines suppressed...] ! parent::IXR_Client($server, $path, $port); ! $this->useragent = 'The Incutio XML-RPC PHP Library (multicall client)'; ! } ! function addCall() { ! $args = func_get_args(); ! $methodName = array_shift($args); ! $struct = array( ! 'methodName' => $methodName, ! 'params' => $args ! ); ! $this->calls[] = $struct; ! } ! function query() { ! // Prepare multicall, then call the parent::query() method ! return parent::query('system.multicall', $this->calls); ! } ! } ! ?> \ No newline at end of file |
|
From: Eloi G. <ada...@us...> - 2008-08-21 20:17:30
|
Update of /cvsroot/phpwebsite-comm/modules/article/conf In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2278/conf Modified Files: help.ini Added Files: config.php Log Message: Article Manager 4.1.0 --- NEW FILE: config.php --- <?php $settings['default_article_template'] = 'Blank.tpl'; $settings['default_section_template'] = 'Centered_Image.tpl'; $settings['summaries_on_homepage'] = 5; $settings['prev_n_articles'] = 5; $settings['popular_articles'] = 5; $settings['listings_per_page'] = 20; $settings['need_approval'] = 1; $settings['default_allow_comments'] = 1; $settings['default_allow_anon'] = 0; $settings['can_expire'] = 0; $settings['expiration_years'] = 5; $settings['expiration_months'] = 5; $settings['expiration_days'] = 5; $settings['max_image_size'] = 5; $settings['max_image_height'] = 5; $settings['max_image_width'] = 5; $settings['lock_expiration_time'] = 5; $settings['use_comments'] = 5; $settings['long_date_format'] = '%I:%M:%S%p, %A, %B %d %Y'; /** * Marks this forum as inactive in the Key class. Same as Show/Hide. * * @author Eloi George <el...@NO...> * @module phpwsBB * @param bool $active : Show/Hide. * @return none */ $settings['short_date_format'] = '%b/%d/%y'; $settings['categorized_display'] = 0; $settings['display_columns'] = 1; $settings['summaries_per_category'] = 1; $settings['category_order'] = ''; ?> Index: help.ini =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/article/conf/help.ini,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** help.ini 29 Jun 2007 07:00:26 -0000 1.2 --- help.ini 21 Aug 2008 20:17:36 -0000 1.3 *************** *** 1,155 **** ! [article_title] ! title = "Article Title" ! content = "All articles need titles! Enter one here" ! ! [article_summary] ! title = "Article Summary" ! content = "Type in a SHORT description of the article here. When a list of articles is shown on the site, this will be displayed as a teaser to get the user to read more.<br /><br /> REMEMBER: It's just a teaser. Keep it short. And try not to use HTML." ! ! [list_mainarticle] ! title = "Current Mainarticle" ! content = "This column will designate which article is currently set to be shown on your web site mainarticle. The current mainarticle is marked with a <font color=\"lime\"><b><i>CURRENT</i></b></font> flag." ! ! [list_action] ! title = "Current Article Action" ! content = "These are actions you can perform on unsaved articles. The current actions are:<br /><br /><b>Publish/Expire</b> - This button allows you to immediately PUBLISH (allow articles to be seen) or EXPIRE (remove articles from view without actually deleting them) the article. Publication & Expiration dates will be changed to accordingly.<br /><b>Edit</b> - This allows you to edit am existing article.<br /><b>Delete</b> - This allows you to remove a article from your database. You will be asked to confirm the deletion with a \"Yes\" or \"No\" answer." ! ! [current_updated] ! title = "Updated Date" ! content = "This is the date and user who last updated the article." ! ! [section_title] ! title = "Section Subtitle" ! content = "This is the subtitle given to this section. HTML is allowed and encouraged." ! ! [section_text] ! title = "Section Text" ! content = "This is the body text for this section. HTML is allowed and encouraged." ! ! [section_image] ! title = "Section Image" ! content = "This lets you upload an image that will be associated with this section. If you choose to use an image, you must also add a \"Short Image Description\"." ! ! [section_image_desc] ! title = "Short Image Description" ! content = "This is a short description of the image associated with this section. It is recommended that the description is no more than 5-6 words." ! ! [section_image_link] ! title = "Image Link" ! content = "Putting a link URL in here will turn the image into a clickable link." ! ! [section_image_caption] ! title = "Image Caption" ! content = "Sometimes you might want some text to appear above or below the image (eq: Photo Credits). Enter that text here." ! ! [section_template] ! title = "Section Template" ! content = "This is the template that will be applied to this section when it is viewed. \nMost templates have names that are fairly intuitive. \nIf you wish to create custom templates, please see the TEMPLATE_README included with ArticleManager." ! ! [section_remove] ! title = "Section Remove" ! content = "This option will remove a section from this article entirely. You will be asked to confirm the action." ! ! [section_move] ! title = 'Moving a Section' ! content = 'Sometimes you may want to move a section to another area on the same page. In stead of a lot of cutting and pasting, you can use the "Move Up" and "Move Down" buttons to shift this section by one space.' ! ! [article_save_draft] ! title = 'Save Article as Draft' ! content = "This button will save your article as a rough draft. Until it is Published, it cannot be seen by anyone without editing or approval capability. If you were editing an existing article, the old version will still be seen by site visitors until this version is finalized." ! ! [article_save_approval] ! title = 'Send Article for Approval' ! content = "This button will save this article to the database and mark it as a finalized version.<br /><br />A site administrator will have to approve it before it can be viewed by site visitors." ! ! [article_save_publish] ! title = 'Save & Publish Article' ! content = "This button will save this article to the database and mark it as a finalized version.<br /><br />If you are authorized to approve articles for publication it will be automatically approved and can be immediately viewed by site visitors." ! ! [article_announce] ! title = "Announce Article" ! content = "This option lets you decide whether this article will show up on the homepage article summary listings.<br /><br />It can still show up everywhere else." ! ! [article_allow_comments] ! title = "Allow Comments" ! content = "This option lets you decide whether users can add discussion or comments to this article." ! ! [article_allow_anonymous] ! title = "Allow Anonymous Comments" ! content = "This option lets you decide whether unregistered users can add discussion or comments to this article. We recommend that you leave this on NO to discourage trolling posts." ! ! [article_publication_date] ! title = "Date of Publication" ! content = "A story can only be viewable on the site after it is published. You don't need to change this value. It is automatically set to the date this story was created. \nIf you want this story to be invisible until a future date, then you can set it here." ! ! [article_expiration_date] ! title = "Date of Expiration" ! content = "A story can only remain on the site until it expires. You don't need to change this value. The site administrator has set a default period before stories expire. If you want this story to be deleted before or after this date, then you can set it here." ! ! [article_expiration_flag] ! title = 'Never Expires' ! content = 'Check this box if you want this article to never expire.' ! ! [save_title] ! title = 'Change Title & Summary Text' ! content = 'If you\'ve made any changes to the article title or summary, pressing this button will save them. Make sure that you save any editing you\'ve done to any sections first.' ! ! [article_template] ! title = "Article Template" ! content = "This is the template that will be applied to this article when it is viewed. \nMost templates have names that are fairly intuitive. \nIf you wish to create custom templates, please see the TEMPLATE_README included with ArticleManager." ! ! [summaries_on_homepage] ! title = 'Number of Article Summaries' ! content = 'This specifies the number of summaries of the most recent articles that will show on the home page.<br /><br />A value of 0 result in the box not being shown at all.' ! ! [popular_articles] ! title = 'Number of Popular Articles' ! content = 'This specifies how many links to the most popular articles will be shown on the home page.<br /><br />A value of 0 result in the box not being shown at all.' ! ! [prev_n_articles] ! title = 'Number of Previous Articles' ! content = 'This specifies how many links to the most recent articles will be shown on the home page.<br /><br />These links will not include the articles that are shown in the "Also on this Site" box. If the amount set for this is 10 and the 5 most recent articles are showing up in the Article Summaries Block, then links for the 6th to 16th most recent articles will be shown.<br /><br />A value of 0 result in the box not being shown at all.' ! ! [listings_per_page] ! title = 'Default Number of Listings to Show per Page' ! content = 'Here you can set the default amount of article listings that will show up under the administrative menu.' ! ! [expiration_default] ! title = 'Default Expiration Date' ! content = 'Here you can specify how long an article will last in terms of days, months or years on your site.<br /><br />Tip: If you want them to last more that 5 years, save yourself some hassle and just uncheck the "Articles Can Expire" box.' ! ! [can_expire] ! title = 'Articles can expire on a predefined date' ! content = 'If this is unchecked, articles will never expire from the site.' ! ! [max_image_size] ! title = 'Maximum Uploaded Image Size' ! content = 'Remember that bigger pictures = more page loading time and higher bandwitdh usage. They can also make your site look bad.<br /><br />Set this to a reasonable amount in Kilobytes to keep your users from uploading huge files.<br /><br />Keep in mind that the maximum efficient page size is 40 to 50 kilobytes, so if you expect to have 2 pictures per page, you may want to limit the maximum size to 15Kb.' ! ! [make_metatags] ! title = 'Automatically Generate Meta Descriptions' ! content = 'Checking this box will let phpWebsite automatically change the browser title and description metatag to match the article title and summary.<br /><br />This feature may or may not work depending on which version of phpWebsite you are using.' ! ! [meta_keywords] ! title = 'Keywords for this article' ! content = 'Enter keywords for this article, separated by commas. When this article is shown, these keywords will automatically be added to the site-wide keyword metatag to aid Search Engines in indexing this page.<br /><br />example: "help,keywords,metatags,search engine,optimization"<br /><br />This feature may or may not work depending on which version of phpWebsite you are using.' ! ! [meta_robots] ! title = 'Search Engine instructions' ! content = 'Select the instructions that you want search engine spiders to follow when they see this page. Select "Default Settings" if you\'re not sure which to pick. This option will use the site-wide setting selected in "Layout".<br /><br />This feature may or may not work depending on which version of phpWebsite you are using.' ! ! [lock_expiration_time] ! title = 'Lock Expiration Time' ! content = '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] ! title = 'Viewing Revision Histories' ! content = '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.' ! ! [page_teaser] ! title = 'Page Teaser' ! content = 'A "teaser" is essentially a short title designed to make the user want to read the next page.<br /><br />They will appear in the navigation list of multi-page articles. You cannot make a teaser for the first page. Also, if you don't specify a teaser for a page, the title of the first section will be used.' ! ! [date_format] ! title = 'Customizing Your Date Formats' ! content = 'You can change the format of dates shown in Article Manager here. Refer to http://php.net/date for an explanation of the PHP date() format specifiers you'll use to construct new date formats.' --- 1,155 ---- ! [article_title] ! title = "Article Title" ! content = "All articles need titles! Enter one here" ! ! [article_summary] ! title = "Article Summary" ! content = "Type in a SHORT description of the article here. When a list of articles is shown on the site, this will be displayed as a teaser to get the user to read more.<br /><br /> REMEMBER: It's just a teaser. Keep it short. And try not to use HTML." ! ! [list_mainarticle] ! title = "Current Mainarticle" ! content = "This column will designate which article is currently set to be shown on your web site mainarticle. The current mainarticle is marked with a <font color=\"lime\"><b><i>CURRENT</i></b></font> flag." ! ! [list_action] ! title = "Current Article Action" ! content = "These are actions you can perform on unsaved articles. The current actions are:<br /><br /><b>Publish/Expire</b> - This button allows you to immediately PUBLISH (allow articles to be seen) or EXPIRE (remove articles from view without actually deleting them) the article. Publication & Expiration dates will be changed to accordingly.<br /><b>Edit</b> - This allows you to edit am existing article.<br /><b>Delete</b> - This allows you to remove a article from your database. You will be asked to confirm the deletion with a \"Yes\" or \"No\" answer." ! ! [current_updated] ! title = "Updated Date" ! content = "This is the date and user who last updated the article." ! ! [section_title] ! title = "Section Subtitle" ! content = "This is the subtitle given to this section. HTML is allowed and encouraged." ! ! [section_text] ! title = "Section Text" ! content = "This is the body text for this section. HTML is allowed and encouraged." ! ! [section_image] ! title = "Section Image" ! content = "This lets you upload an image that will be associated with this section. If you choose to use an image, you must also add a \"Short Image Description\"." ! ! [section_image_desc] ! title = "Short Image Description" ! content = "This is a short description of the image associated with this section. It is recommended that the description is no more than 5-6 words." ! ! [section_image_link] ! title = "Image Link" ! content = "Putting a link URL in here will turn the image into a clickable link." ! ! [section_image_caption] ! title = "Image Caption" ! content = "Sometimes you might want some text to appear above or below the image (eq: Photo Credits). Enter that text here." ! ! [section_template] ! title = "Section Template" ! content = "This is the template that will be applied to this section when it is viewed. \nMost templates have names that are fairly intuitive. \nIf you wish to create custom templates, please see the TEMPLATE_README included with ArticleManager." ! ! [section_remove] ! title = "Section Remove" ! content = "This option will remove a section from this article entirely. You will be asked to confirm the action." ! ! [section_move] ! title = 'Moving a Section' ! content = 'Sometimes you may want to move a section to another area on the same page. In stead of a lot of cutting and pasting, you can use the "Move Up" and "Move Down" buttons to shift this section by one space.' ! ! [article_save_draft] ! title = 'Save Article as Draft' ! content = "This button will save your article as a rough draft. Until it is Published, it cannot be seen by anyone without editing or approval capability. If you were editing an existing article, the old version will still be seen by site visitors until this version is finalized." ! ! [article_save_approval] ! title = 'Send Article for Approval' ! content = "This button will save this article to the database and mark it as a finalized version.<br /><br />A site administrator will have to approve it before it can be viewed by site visitors." ! ! [article_save_publish] ! title = 'Save & Publish Article' ! content = "This button will save this article to the database and mark it as a finalized version.<br /><br />If you are authorized to approve articles for publication it will be automatically approved and can be immediately viewed by site visitors." ! ! [article_announce] ! title = "Announce Article" ! content = "This option lets you decide whether this article will show up on the homepage article summary listings.<br /><br />It can still show up everywhere else." ! ! [article_allow_comments] ! title = "Allow Comments" ! content = "This option lets you decide whether users can add discussion or comments to this article." ! ! [article_allow_anonymous] ! title = "Allow Anonymous Comments" ! content = "This option lets you decide whether unregistered users can add discussion or comments to this article. We recommend that you leave this on NO to discourage trolling posts." ! ! [article_publication_date] ! title = "Date of Publication" ! content = "A story can only be viewable on the site after it is published. You don't need to change this value. It is automatically set to the date this story was created. \nIf you want this story to be invisible until a future date, then you can set it here." ! ! [article_expiration_date] ! title = "Date of Expiration" ! content = "A story can only remain on the site until it expires. You don't need to change this value. The site administrator has set a default period before stories expire. If you want this story to be deleted before or after this date, then you can set it here." ! ! [article_expiration_flag] ! title = 'Never Expires' ! content = 'Check this box if you want this article to never expire.' ! ! [save_title] ! title = 'Change Title & Summary Text' ! content = 'If you\'ve made any changes to the article title or summary, pressing this button will save them. Make sure that you save any editing you\'ve done to any sections first.' ! ! [article_template] ! title = "Article Template" ! content = "This is the template that will be applied to this article when it is viewed. \nMost templates have names that are fairly intuitive. \nIf you wish to create custom templates, please see the TEMPLATE_README included with ArticleManager." ! ! [summaries_on_homepage] ! title = 'Number of Article Summaries' ! content = 'This specifies the number of summaries of the most recent articles that will show on the home page.<br /><br />A value of 0 result in the box not being shown at all.' ! ! [popular_articles] ! title = 'Number of Popular Articles' ! content = 'This specifies how many links to the most popular articles will be shown on the home page.<br /><br />A value of 0 result in the box not being shown at all.' ! ! [prev_n_articles] ! title = 'Number of Previous Articles' ! content = 'This specifies how many links to the most recent articles will be shown on the home page.<br /><br />These links will not include the articles that are shown in the "Also on this Site" box. If the amount set for this is 10 and the 5 most recent articles are showing up in the Article Summaries Block, then links for the 6th to 16th most recent articles will be shown.<br /><br />A value of 0 result in the box not being shown at all.' ! ! [listings_per_page] ! title = 'Default Number of Listings to Show per Page' ! content = 'Here you can set the default amount of article listings that will show up under the administrative menu.' ! ! [expiration_default] ! title = 'Default Expiration Date' ! content = 'Here you can specify how long an article will last in terms of days, months or years on your site.<br /><br />Tip: If you want them to last more that 5 years, save yourself some hassle and just uncheck the "Articles Can Expire" box.' ! ! [can_expire] ! title = 'Articles can expire on a predefined date' ! content = 'If this is unchecked, articles will never expire from the site.' ! ! [max_image_size] ! title = 'Maximum Uploaded Image Size' ! content = 'Remember that bigger pictures = more page loading time and higher bandwitdh usage. They can also make your site look bad.<br /><br />Set this to a reasonable amount in Kilobytes to keep your users from uploading huge files.<br /><br />Keep in mind that the maximum efficient page size is 40 to 50 kilobytes, so if you expect to have 2 pictures per page, you may want to limit the maximum size to 15Kb.' ! ! [make_metatags] ! title = 'Automatically Generate Meta Descriptions' ! content = 'Checking this box will let phpWebsite automatically change the browser title and description metatag to match the article title and summary.<br /><br />This feature may or may not work depending on which version of phpWebsite you are using.' ! ! [meta_keywords] ! title = 'Keywords for this article' ! content = 'Enter keywords for this article, separated by commas. When this article is shown, these keywords will automatically be added to the site-wide keyword metatag to aid Search Engines in indexing this page.<br /><br />example: "help,keywords,metatags,search engine,optimization"<br /><br />This feature may or may not work depending on which version of phpWebsite you are using.' ! ! [meta_robots] ! title = 'Search Engine instructions' ! content = 'Select the instructions that you want search engine spiders to follow when they see this page. Select "Default Settings" if you\'re not sure which to pick. This option will use the site-wide setting selected in "Layout".<br /><br />This feature may or may not work depending on which version of phpWebsite you are using.' ! ! [lock_expiration_time] ! title = 'Lock Expiration Time' ! content = '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] ! title = 'Viewing Revision Histories' ! content = '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.' ! ! [page_teaser] ! title = 'Page Teaser' ! content = 'A "teaser" is essentially a short title designed to make the user want to read the next page.<br /><br />They will appear in the navigation list of multi-page articles. You cannot make a teaser for the first page. Also, if you don't specify a teaser for a page, the title of the first section will be used.' ! ! [date_format] ! title = 'Customizing Your Date Formats' ! content = 'You can change the format of dates shown in Article Manager here. Refer to http://php.net/date for an explanation of the PHP date() format specifiers you'll use to construct new date formats.' |
Update of /cvsroot/phpwebsite-comm/modules/article/img In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2278/img Added Files: btn_moveup.gif mark.gif btn_movedown.gif articlemanager.gif mailto.png print.gif btn_del.gif btn_edit.gif Log Message: Article Manager 4.1.0 --- NEW FILE: mailto.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: btn_moveup.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: print.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: mark.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: btn_movedown.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: btn_del.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: articlemanager.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: btn_edit.gif --- (This appears to be a binary file; contents omitted.) |
|
From: Eloi G. <ada...@us...> - 2008-08-21 20:17:15
|
Update of /cvsroot/phpwebsite-comm/modules/article/.settings In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2278/.settings Added Files: org.eclipse.php.core.projectOptions.prefs Log Message: Article Manager 4.1.0 --- NEW FILE: org.eclipse.php.core.projectOptions.prefs --- #Thu Aug 21 16:05:52 AST 2008 eclipse.preferences.version=1 org.eclipse.php.core.contextRoot= org.eclipse.php.core.defaultEncoding= org.eclipse.php.core.includePath=<?xml version\="1.0" encoding\="UTF-8"?>\n<includepath>\n</includepath>\n |
|
From: Eloi G. <ada...@us...> - 2008-08-21 20:16:44
|
Update of /cvsroot/phpwebsite-comm/modules/article/.settings In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2204/.settings Log Message: Directory /cvsroot/phpwebsite-comm/modules/article/.settings added to the repository |
|
From: Greg M. <bli...@us...> - 2008-08-16 23:34:57
|
Update of /cvsroot/phpwebsite-comm/modules/ads/docs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18460/docs Modified Files: ChangeLog Log Message: Preparing for 1.3.0 Index: ChangeLog =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/ads/docs/ChangeLog,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** ChangeLog 16 Aug 2008 20:19:16 -0000 1.12 --- ChangeLog 16 Aug 2008 23:35:00 -0000 1.13 *************** *** 3,7 **** ! *cvs Now use demographics module to store the business name of advertisers. --- 3,7 ---- ! *ads-1.3.0 (16 Aug 2008) Now use demographics module to store the business name of advertisers. |
|
From: Greg M. <bli...@us...> - 2008-08-16 23:07:52
|
Update of /cvsroot/phpwebsite-comm/modules/ads/boost In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7344/boost Modified Files: boost.php update.php Log Message: Preparing for 1.3.0 Index: boost.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/ads/boost/boost.php,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** boost.php 22 Jun 2008 20:04:15 -0000 1.5 --- boost.php 16 Aug 2008 23:07:57 -0000 1.6 *************** *** 24,28 **** $proper_name = 'Ads'; ! $version = '1.2.0'; $register = FALSE; $unregister = FALSE; --- 24,28 ---- $proper_name = 'Ads'; ! $version = '1.3.0'; $register = FALSE; $unregister = FALSE; Index: update.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/ads/boost/update.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** update.php 22 Jun 2008 20:04:15 -0000 1.2 --- update.php 16 Aug 2008 23:07:57 -0000 1.3 *************** *** 42,45 **** --- 42,86 ---- $content[] = '- Added empty messages to DBPager.'; $content[] = '- Corrected a few phrases that were not being translated.'; + + case version_compare($currentVersion, '1.3.0', '<'): + /* Step 1: Update advertiser ids in campaign table to user ids. */ + $db = new PHPWS_DB('ads_campaigns'); + PHPWS_Error::logIfError($db->query('UPDATE ads_campaigns,ads_advertisers + SET ads_campaigns.advertiser_id = ads_advertisers.user_id + WHERE ( ads_campaigns.advertiser_id = ads_advertisers.id )')); + + /* Step 2: Read out current contents of advertisers table. */ + $db2 = new PHPWS_DB('ads_advertisers'); + $results = $db2->select(); + PHPWS_Error::logIfError($results); + + /* Step 3: Change advertisers table to new structure. */ + PHPWS_Error::logIfError($db2->dropTableColumn('id')); + PHPWS_Error::logIfError($db2->dropTableColumn('business')); + PHPWS_Error::logIfError($db2->createTableIndex('user_id', 'userid_idx', true)); + + /* Step 4: Update demographics table with advertiser business name. */ + if (!empty($results)) + { + PHPWS_Core::initModClass('ads', 'advertiser.php'); + Demographics::register('ads'); + + foreach ($results as $row) + { + $advertiser = new Ads_Advertiser($row['user_id']); + $advertiser->setBusinessName($row['business']); + PHPWS_Error::logIfError($advertiser->save()); + } + } + + /* Step 5: Update the templates. */ + $files = array('templates/advertiser/list.tpl', + 'templates/advertiser/select.tpl', + 'templates/advertiser/add.tpl'); + ads_update_files($files, $content); + + /* Done */ + $content[] = '- Now use demographics module to store the business name of advertisers.'; + $content[] = '- Removed call to help module which wasn\'t working anyway.'; } |
|
From: Greg M. <bli...@us...> - 2008-08-16 20:25:36
|
Update of /cvsroot/phpwebsite-comm/modules/ads/locale/en_US/LC_MESSAGES In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6910/locale/en_US/LC_MESSAGES Modified Files: ads.po Log Message: Now use demographics module to store business name for advertisers. Index: ads.po =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/ads/locale/en_US/LC_MESSAGES/ads.po,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** ads.po 29 Mar 2008 17:01:28 -0000 1.3 --- ads.po 16 Aug 2008 20:25:40 -0000 1.4 *************** *** 22,26 **** "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" ! "POT-Creation-Date: 2008-03-29 11:59-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" --- 22,26 ---- "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" ! "POT-Creation-Date: 2008-08-16 15:23-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" *************** *** 160,163 **** --- 160,166 ---- msgstr "" + msgid "Available users" + msgstr "" + msgid "Banner" msgstr "" *************** *** 169,172 **** --- 172,181 ---- msgstr "" + msgid "Business name must be specified" + msgstr "" + + msgid "Business/Organization" + msgstr "" + msgid "CTR" msgstr "" *************** *** 196,199 **** --- 205,211 ---- msgstr "" + msgid "Continue" + msgstr "" + msgid "Copy" msgstr "" *************** *** 282,285 **** --- 294,303 ---- msgstr "" + msgid "New Advertiser - Step 1" + msgstr "" + + msgid "New Advertiser - Step 2" + msgstr "" + msgid "New Banner Ad" msgstr "" *************** *** 351,354 **** --- 369,377 ---- msgstr "" + msgid "" + "Sorry, there are no users available. You will have to create a user account " + "first." + msgstr "" + msgid "Text Ad" msgstr "" *************** *** 381,387 **** msgstr "" - msgid "User not found or already advertiser" - msgstr "" - msgid "Username" msgstr "" --- 404,407 ---- |
|
From: Greg M. <bli...@us...> - 2008-08-16 20:19:39
|
Update of /cvsroot/phpwebsite-comm/modules/ads/boost In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4340/boost Modified Files: dependency.xml install.sql Added Files: demographics.php Log Message: Now use demographics module to store business name for advertisers. Index: install.sql =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/ads/boost/install.sql,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** install.sql 22 Jun 2008 20:04:15 -0000 1.11 --- install.sql 16 Aug 2008 20:19:12 -0000 1.12 *************** *** 18,28 **** CREATE TABLE ads_advertisers ( - id INT NOT NULL, user_id INT DEFAULT '0' NOT NULL, ! business VARCHAR(100) NOT NULL default '', ! created INT NOT NULL, ! PRIMARY KEY (id) ); CREATE TABLE ads_campaigns ( id INT NOT NULL, --- 18,27 ---- CREATE TABLE ads_advertisers ( user_id INT DEFAULT '0' NOT NULL, ! created INT NOT NULL ); + CREATE UNIQUE INDEX userid_idx on ads_advertisers(user_id); + CREATE TABLE ads_campaigns ( id INT NOT NULL, --- NEW FILE: demographics.php --- <?php /** * Ads for phpWebSite * * See docs/CREDITS for copyright information * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * * @author Greg Meiste <blindman1344 at users dot sourceforge dot net> * @version $Id: demographics.php,v 1.1 2008/08/16 20:19:12 blindman1344 Exp $ */ /* New field for ads module that matches rolodex module. */ $fields['business_name']['limit'] = 255; ?> Index: dependency.xml =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/ads/boost/dependency.xml,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** dependency.xml 22 Jun 2008 20:04:15 -0000 1.5 --- dependency.xml 16 Aug 2008 20:19:12 -0000 1.6 *************** *** 13,15 **** --- 13,21 ---- <url>http://phpwebsite.appstate.edu/downloads/modules/users/</url> </module> + <module> + <title>demographics</title> + <properName>Demographics</properName> + <version>1.1.0</version> + <url>http://phpwebsite.appstate.edu/downloads/modules/demographics/</url> + </module> </dependency> |
|
From: Greg M. <bli...@us...> - 2008-08-16 20:19:39
|
Update of /cvsroot/phpwebsite-comm/modules/ads/class In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4340/class Modified Files: ad.php admin.php advertiser.php campaign.php my_page.php Log Message: Now use demographics module to store business name for advertisers. Index: campaign.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/ads/class/campaign.php,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** campaign.php 22 Jun 2008 20:04:19 -0000 1.12 --- campaign.php 16 Aug 2008 20:19:15 -0000 1.13 *************** *** 103,112 **** function save() { ! $db = new PHPWS_DB('ads_advertisers'); ! $db->addWhere('ads_advertisers.id', $this->advertiser_id); ! $db->addWhere('users.id', 'ads_advertisers.user_id'); ! $db->addColumn('users.username'); ! $result = $db->select('col'); ! if (($result[0] != Current_User::getUsername()) && !Current_User::authorized('ads')) { Current_User::disallow(); --- 103,107 ---- function save() { ! if ((Current_User::getId() != $this->advertiser_id) && !Current_User::authorized('ads')) { Current_User::disallow(); *************** *** 115,123 **** $db = new PHPWS_DB('ads_campaigns'); ! $result = $db->saveObject($this); ! if (PEAR::isError($result)) ! { ! return $result; ! } } --- 110,114 ---- $db = new PHPWS_DB('ads_campaigns'); ! return $db->saveObject($this); } *************** *** 151,166 **** function kill($override=false) { ! if (!$override) { ! $db = new PHPWS_DB('ads_advertisers'); ! $db->addWhere('ads_advertisers.id', $this->advertiser_id); ! $db->addWhere('users.id', 'ads_advertisers.user_id'); ! $db->addColumn('users.username'); ! $result = $db->select('col'); ! if (($result[0] != Current_User::getUsername()) && !Current_User::authorized('ads')) ! { ! Current_User::disallow(); ! return; ! } } --- 142,149 ---- function kill($override=false) { ! if ((!$override) && (Current_User::getId() != $this->advertiser_id) && !Current_User::authorized('ads')) { ! Current_User::disallow(); ! return; } Index: admin.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/ads/class/admin.php,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** admin.php 22 Jun 2008 20:04:19 -0000 1.21 --- admin.php 16 Aug 2008 20:19:15 -0000 1.22 *************** *** 236,241 **** case 'newAdvertiser': ! $title = dgettext('ads', 'New Advertiser'); ! $content = Ads_Admin::addAdvertiser(); break; --- 236,246 ---- case 'newAdvertiser': ! $title = dgettext('ads', 'New Advertiser - Step 1'); ! $content = Ads_Admin::selectAdvertiser(); ! break; ! ! case 'addAdvertiser': ! $title = dgettext('ads', 'New Advertiser - Step 2'); ! $content = Ads_Admin::addAdvertiser($advertiser); break; *************** *** 249,253 **** Ads_Admin::sendMessage(dgettext('ads', 'Advertiser saved'), 'manageAdvertisers'); } ! Ads_Admin::sendMessage(dgettext('ads', 'User not found or already advertiser'), 'manageAdvertisers'); break; --- 254,258 ---- Ads_Admin::sendMessage(dgettext('ads', 'Advertiser saved'), 'manageAdvertisers'); } ! Ads_Admin::sendMessage(dgettext('ads', 'Business name must be specified'), 'manageAdvertisers'); break; *************** *** 716,720 **** } ! function addAdvertiser() { if (!Current_User::allow('ads', 'edit_advertisers')) --- 721,725 ---- } ! function selectAdvertiser() { if (!Current_User::allow('ads', 'edit_advertisers')) *************** *** 724,774 **** } $form = new PHPWS_Form; $form->addHidden('module', 'ads'); ! $form->addHidden('action', 'postAdvertiser'); ! $form->addText('username'); ! $form->setLabel('username', dgettext('ads', 'Username')); ! $form->setSize('username', 30, 255); ! $form->addText('business'); ! $form->setLabel('business', dgettext('ads', 'Business Name')); ! $form->setSize('business', 50, 100); $form->addSubmit('submit', dgettext('ads', 'Save New Advertiser')); ! $template = $form->getTemplate(); ! return PHPWS_Template::process($template, 'ads', 'advertiser/add.tpl'); } function postAdvertiser(&$advertiser) { ! if (!empty($_POST['username']) && !empty($_POST['business'])) { ! // Check if user exists ! $db = new PHPWS_DB('users'); ! $db->addWhere('username', $_POST['username']); ! $db->addColumn('id'); ! $result = $db->select('col'); ! if (!PHPWS_Error::logIfError($result) && ($result != NULL)) ! { ! // Check that user is not already an advertiser ! $db->setTable('ads_advertisers'); ! $db->resetWhere(); ! $db->columns = NULL; ! $db->addWhere('user_id', $result[0]); ! $result2 = $db->select(); ! if (!PHPWS_Error::logIfError($result2) && ($result2 == NULL)) ! { ! $advertiser->setUserId($result[0]); ! $advertiser->setBusiness($_POST['business']); ! $advertiser->setCreated(mktime()); ! return TRUE; ! } ! } } ! return FALSE; } --- 729,802 ---- } + PHPWS_Core::initModClass('user', 'Users.php'); + $form = new PHPWS_Form; $form->addHidden('module', 'ads'); ! $form->addHidden('action', 'addAdvertiser'); ! $db = new PHPWS_DB('users'); ! $db->addColumn('id'); ! $db->addColumn('username'); ! $db->addColumn('display_name'); ! $db->addJoin('left', 'users', 'ads_advertisers', 'id', 'user_id'); ! $db->addWhere('ads_advertisers.user_id', null, 'is'); ! $result = $db->getObjects('PHPWS_User'); ! if ($result) ! { ! foreach ($result as $user) ! { ! $choices[$user->id] = $user->display_name; ! } ! $form->addSelect('advertiser_id', $choices); ! $form->setLabel('advertiser_id', dgettext('ads', 'Available users')); ! $form->addSubmit('submit', dgettext('ads', 'Continue')); ! } ! else ! { ! $form->addTplTag('NO_USERS_NOTE', dgettext('ads', 'Sorry, there are no users available. You will have to create a user account first.')); ! } ! ! return PHPWS_Template::process($form->getTemplate(), 'ads', 'advertiser/select.tpl'); ! } ! ! function addAdvertiser(&$advertiser) ! { ! if (!Current_User::allow('ads', 'edit_advertisers')) ! { ! Current_User::disallow(); ! return; ! } ! ! $form = new PHPWS_Form; ! $form->addHidden('module', 'ads'); ! $form->addHidden('action', 'postAdvertiser'); ! $form->addHidden('advertiser_id', $advertiser->user_id); ! ! $form->addText('business_name', $advertiser->business_name); ! $form->setLabel('business_name', dgettext('ads', 'Business/Organization')); ! $form->setSize('business_name', 50, 255); $form->addSubmit('submit', dgettext('ads', 'Save New Advertiser')); ! return PHPWS_Template::process($form->getTemplate(), 'ads', 'advertiser/add.tpl'); } function postAdvertiser(&$advertiser) { ! if (!Current_User::allow('ads', 'edit_advertisers')) { ! Current_User::disallow(); ! return; ! } ! if (!empty($_POST['advertiser_id']) && !empty($_POST['business_name'])) ! { ! $advertiser->setBusinessName($_POST['business_name']); ! $advertiser->setCreated(mktime()); ! return true; } ! return false; } *************** *** 778,782 **** $pageTags['DISPLAY_NAME'] = dgettext('ads', 'Username'); ! $pageTags['BUSINESS'] = dgettext('ads', 'Business Name'); $pageTags['CREATED'] = dgettext('ads', 'Advertising Since'); $pageTags['ACTION'] = dgettext('ads', 'Action'); --- 806,810 ---- $pageTags['DISPLAY_NAME'] = dgettext('ads', 'Username'); ! $pageTags['BUSINESS_NAME'] = dgettext('ads', 'Business Name'); $pageTags['CREATED'] = dgettext('ads', 'Advertising Since'); $pageTags['ACTION'] = dgettext('ads', 'Action'); *************** *** 787,794 **** $pager->addPageTags($pageTags); $pager->addRowTags('getTpl'); ! $pager->setSearch('business'); ! $pager->setDefaultOrder('business', 'asc'); ! $pager->setEmptyMessage(dgettext('ads', 'No advertisers found.')); $pager->joinResult('user_id', 'users', 'id', 'display_name', 'display_name'); $pager->cacheQueries(); --- 815,823 ---- $pager->addPageTags($pageTags); $pager->addRowTags('getTpl'); ! $pager->joinResult('user_id', 'demographics', 'user_id', 'business_name', 'business_name'); $pager->joinResult('user_id', 'users', 'id', 'display_name', 'display_name'); + $pager->setSearch('demographics.business_name'); + $pager->setDefaultOrder('demographics.business_name', 'asc'); + $pager->setEmptyMessage(dgettext('ads', 'No advertisers found.')); $pager->cacheQueries(); Index: advertiser.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/ads/class/advertiser.php,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** advertiser.php 22 Jun 2008 20:04:19 -0000 1.9 --- advertiser.php 16 Aug 2008 20:19:15 -0000 1.10 *************** *** 23,76 **** */ ! class Ads_Advertiser ! { ! var $id = 0; ! var $user_id = 0; ! var $business = NULL; ! var $created = 0; ! ! /* Joined variables. */ ! var $display_name = NULL; ! ! function Ads_Advertiser($id=NULL) ! { ! if (!empty($id)) ! { ! $this->setId($id); ! $db = new PHPWS_DB('ads_advertisers'); ! $db->loadObject($this); ! } ! } ! function setId($id) ! { ! $this->id = (int)$id; ! } ! function getId() ! { ! return $this->id; ! } - function setUserId($user_id) - { - $this->user_id = (int)$user_id; - } ! function getUserId() { ! return $this->user_id; } ! function setBusiness($business) { ! $this->business = PHPWS_Text::parseInput($business); } ! function getBusiness() { ! return PHPWS_Text::parseOutput($this->business); } --- 23,60 ---- */ ! PHPWS_Core::initModClass('demographics', 'Demographics.php'); ! class Ads_Advertiser extends Demographics_User ! { ! /* new demographics field */ ! var $business_name = null; ! /* ads field */ ! var $created = 0; ! /* using a second table with demographics */ ! var $_table = 'ads_advertisers'; ! /* advanced join fields */ ! var $display_name = null; ! function Ads_Advertiser($user_id=null) { ! if (!empty($user_id)) ! { ! $this->user_id = (int)$user_id; ! $this->load(); ! } } ! function setBusinessName($business_name) { ! $this->business_name = PHPWS_Text::parseInput($business_name); } ! function getBusinessName() { ! return PHPWS_Text::parseOutput($this->business_name); } *************** *** 98,104 **** } ! function save() { ! if (!Current_User::authorized('ads', 'edit_advertisers')) { Current_User::disallow(); --- 82,93 ---- } ! /** ! * Removes advertiser and associated campaigns from the database. ! * ! * @param override Should ONLY be used when user being deleted (see remove_user.php). ! */ ! function kill($override=false) { ! if (!Current_User::authorized('ads', 'delete_advertisers') && !$override) { Current_User::disallow(); *************** *** 106,121 **** } - $db = new PHPWS_DB('ads_advertisers'); - $result = $db->saveObject($this); - if (PEAR::isError($result)) - { - return $result; - } - } - - function clearCampaigns($override) - { $db = new PHPWS_DB('ads_campaigns'); ! $db->addWhere('advertiser_id', $this->id); $campaigns = $db->getObjects('Ads_Campaign'); --- 95,100 ---- } $db = new PHPWS_DB('ads_campaigns'); ! $db->addWhere('advertiser_id', $this->user_id); $campaigns = $db->getObjects('Ads_Campaign'); *************** *** 127,155 **** } } - } ! /** ! * Removes advertiser and associated campaigns from the database. ! * ! * @param override Should ONLY be used when user being deleted (see remove_user.php). ! */ ! function kill($override=false) ! { ! if (!Current_User::authorized('ads', 'delete_advertisers', $this->id) && !$override) ! { ! Current_User::disallow(); ! return; ! } ! ! $this->clearCampaigns($override); ! $db = new PHPWS_DB('ads_advertisers'); ! $db->addWhere('id', $this->id); ! ! return !PHPWS_Error::logIfError($db->delete()); } function getTpl() { ! $vars['advertiser_id'] = $this->getId(); $vars['action'] = 'manageCampaigns'; --- 106,116 ---- } } ! return $this->delete(); } function getTpl() { ! $vars['advertiser_id'] = $this->user_id; $vars['action'] = 'manageCampaigns'; *************** *** 167,171 **** $template['ACTION'] = implode(' | ', $links); $template['DISPLAY_NAME'] = $this->getDisplayName(); ! $template['BUSINESS'] = $this->getBusiness(); $template['CREATED'] = $this->getCreated(); --- 128,132 ---- $template['ACTION'] = implode(' | ', $links); $template['DISPLAY_NAME'] = $this->getDisplayName(); ! $template['BUSINESS_NAME'] = $this->getBusinessName(); $template['CREATED'] = $this->getCreated(); Index: my_page.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/ads/class/my_page.php,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** my_page.php 16 Aug 2008 14:23:37 -0000 1.8 --- my_page.php 16 Aug 2008 20:19:15 -0000 1.9 *************** *** 30,50 **** $db = new PHPWS_DB('ads_advertisers'); $db->addWhere('user_id', Current_User::getId()); $result = $db->getObjects('Ads_Advertiser'); ! if (PEAR::isError($result)) { - PHPWS_Error::log($result); $content = dgettext('ads', 'Currently unavailable. Please try again later.'); } else { ! if (empty($result)) ! { ! $content = dgettext('ads', 'You are currently not an advertiser on this site.'); ! } ! else ! { ! $content = Ads_My_Page::showReport($result[0]->getId()); ! $box['BUSINESS'] = $result[0]->getBusiness(); ! } } --- 30,49 ---- $db = new PHPWS_DB('ads_advertisers'); $db->addWhere('user_id', Current_User::getId()); + $db->addColumn('ads_advertisers.*'); + $db->addColumn('demographics.business_name'); $result = $db->getObjects('Ads_Advertiser'); ! ! if (PHPWS_Error::logIfError($result)) { $content = dgettext('ads', 'Currently unavailable. Please try again later.'); } + else if (empty($result)) + { + $content = dgettext('ads', 'You are currently not an advertiser on this site.'); + } else { ! $content = Ads_My_Page::showReport($result[0]->user_id); ! $box['BUSINESS'] = $result[0]->getBusinessName(); } *************** *** 59,107 **** $db->addWhere('advertiser_id', $advertiser_id); $result = $db->getObjects('Ads_Campaign'); ! if (PEAR::isError($result)) { - PHPWS_Error::log($result); $content = dgettext('ads', 'Currently unavailable. Please try again later.'); } else { ! if (empty($result)) ! { ! $content = dgettext('ads', 'You currently do not have any active ad campaigns.'); ! } ! else ! { ! PHPWS_Core::initCoreClass('DBPager.php'); ! $pageTags['NAME'] = dgettext('ads', 'Ad Name'); ! $pageTags['TYPE'] = dgettext('ads', 'Type'); ! $pageTags['ACTIVE'] = dgettext('ads', 'Active'); ! $pageTags['APPROVED'] = dgettext('ads', 'Approved'); ! $pageTags['VIEWS'] = dgettext('ads', 'Views'); ! $pageTags['HITS'] = dgettext('ads', 'Hits'); ! $pageTags['CTR'] = dgettext('ads', 'CTR'); ! foreach($result as $campaign) { ! $pageTags['CAMPAIGN'] = $campaign->getName(); ! $pager = new DBPager('ads', 'Ads_Ad'); ! $pager->setModule('ads'); ! $pager->setTemplate('campaign/report.tpl'); ! $pager->addToggle(' class="bgcolor1"'); ! $pager->addPageTags($pageTags); ! $pager->addRowTags('getTpl'); ! $pager->setDefaultOrder('title', 'asc'); ! if (($num_ads = $campaign->getNumberOfAds()) > 0) ! { ! $pager->setLimitList(array($num_ads)); ! $pager->setDefaultLimit($num_ads); ! } ! $pager->setEmptyMessage(dgettext('ads', 'No ads found for this campaign.')); ! $pager->addWhere('campaign_id', $campaign->getId()); ! ! $report[] = $pager->get(); } ! $content = implode('', $report); } } --- 58,102 ---- $db->addWhere('advertiser_id', $advertiser_id); $result = $db->getObjects('Ads_Campaign'); ! if (PHPWS_Error::logIfError($result)) { $content = dgettext('ads', 'Currently unavailable. Please try again later.'); } + else if (empty($result)) + { + $content = dgettext('ads', 'You currently do not have any active ad campaigns.'); + } else { ! PHPWS_Core::initCoreClass('DBPager.php'); ! $pageTags['NAME'] = dgettext('ads', 'Ad Name'); ! $pageTags['TYPE'] = dgettext('ads', 'Type'); ! $pageTags['ACTIVE'] = dgettext('ads', 'Active'); ! $pageTags['APPROVED'] = dgettext('ads', 'Approved'); ! $pageTags['VIEWS'] = dgettext('ads', 'Views'); ! $pageTags['HITS'] = dgettext('ads', 'Hits'); ! $pageTags['CTR'] = dgettext('ads', 'CTR'); ! foreach($result as $campaign) ! { ! $pageTags['CAMPAIGN'] = $campaign->getName(); ! $pager = new DBPager('ads', 'Ads_Ad'); ! $pager->setModule('ads'); ! $pager->setTemplate('campaign/report.tpl'); ! $pager->addToggle(PHPWS_LIST_TOGGLE_CLASS); ! $pager->addPageTags($pageTags); ! $pager->addRowTags('getTpl'); ! $pager->setDefaultOrder('title', 'asc'); ! if (($num_ads = $campaign->getNumberOfAds()) > 0) { ! $pager->setLimitList(array($num_ads)); ! $pager->setDefaultLimit($num_ads); } ! $pager->setEmptyMessage(dgettext('ads', 'No ads found for this campaign.')); ! $pager->addWhere('campaign_id', $campaign->getId()); ! ! $report[] = $pager->get(); } + $content = implode('', $report); } Index: ad.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/ads/class/ad.php,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** ad.php 22 Jun 2008 20:04:19 -0000 1.15 --- ad.php 16 Aug 2008 20:19:15 -0000 1.16 *************** *** 258,266 **** $db = new PHPWS_DB('ads_campaigns'); $db->addWhere('ads_campaigns.id', $this->campaign_id); ! $db->addWhere('ads_advertisers.id', 'ads_campaigns.advertiser_id'); ! $db->addWhere('users.id', 'ads_advertisers.user_id'); ! $db->addColumn('users.username'); ! $result = $db->select('col'); ! if (($result[0] != Current_User::getUsername()) && !Current_User::authorized('ads')) { Current_User::disallow(); --- 258,265 ---- $db = new PHPWS_DB('ads_campaigns'); $db->addWhere('ads_campaigns.id', $this->campaign_id); ! $db->addWhere('users.id', 'ads_campaigns.advertiser_id'); ! $db->addColumn('users.id'); ! $result = $db->select('one'); ! if ((PEAR::isError($result) || ($result != Current_User::getId())) && !Current_User::authorized('ads')) { Current_User::disallow(); *************** *** 309,321 **** PHPWS_Core::initModClass('version', 'Version.php'); ! if (!$override) { $db = new PHPWS_DB('ads_campaigns'); $db->addWhere('ads_campaigns.id', $this->campaign_id); ! $db->addWhere('ads_advertisers.id', 'ads_campaigns.advertiser_id'); ! $db->addWhere('users.id', 'ads_advertisers.user_id'); ! $db->addColumn('users.username'); ! $result = $db->select('col'); ! if (($result[0] != Current_User::getUsername()) && !Current_User::authorized('ads')) { Current_User::disallow(); --- 308,319 ---- PHPWS_Core::initModClass('version', 'Version.php'); ! if (!$override && !Current_User::authorized('ads')) { $db = new PHPWS_DB('ads_campaigns'); $db->addWhere('ads_campaigns.id', $this->campaign_id); ! $db->addWhere('users.id', 'ads_campaigns.advertiser_id'); ! $db->addColumn('users.id'); ! $result = $db->select('one'); ! if (PEAR::isError($result) || ($result != Current_User::getId())) { Current_User::disallow(); |
|
From: Greg M. <bli...@us...> - 2008-08-16 20:19:39
|
Update of /cvsroot/phpwebsite-comm/modules/ads/docs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4340/docs Modified Files: ChangeLog Log Message: Now use demographics module to store business name for advertisers. Index: ChangeLog =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/ads/docs/ChangeLog,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** ChangeLog 16 Aug 2008 14:23:39 -0000 1.11 --- ChangeLog 16 Aug 2008 20:19:16 -0000 1.12 *************** *** 5,8 **** --- 5,9 ---- *cvs + Now use demographics module to store the business name of advertisers. Removed call to help module which wasn't working anyway. |
|
From: Greg M. <bli...@us...> - 2008-08-16 20:19:11
|
Update of /cvsroot/phpwebsite-comm/modules/ads/inc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4340/inc Modified Files: key.php Log Message: Now use demographics module to store business name for advertisers. Index: key.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/ads/inc/key.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** key.php 30 Sep 2006 20:00:29 -0000 1.2 --- key.php 16 Aug 2008 20:19:18 -0000 1.3 *************** *** 30,41 **** } ! $db = & new PHPWS_DB('ads_zone_pins'); $db->addWhere('key_id', $key->id); ! $result = $db->delete(); ! ! if (PEAR::isError($result)) ! { ! PHPWS_Error::log($result); ! } } --- 30,36 ---- } ! $db = new PHPWS_DB('ads_zone_pins'); $db->addWhere('key_id', $key->id); ! PHPWS_Error::logIfError($db->delete()); } |
|
From: Greg M. <bli...@us...> - 2008-08-16 20:19:11
|
Update of /cvsroot/phpwebsite-comm/modules/ads/templates/advertiser In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4340/templates/advertiser Modified Files: add.tpl list.tpl Added Files: select.tpl Log Message: Now use demographics module to store business name for advertisers. --- NEW FILE: select.tpl --- {START_FORM} <table class="form-table"> <!-- BEGIN advertiser-id --> <tr><td>{ADVERTISER_ID_LABEL}</td><td>{ADVERTISER_ID}</td></tr> <!-- END advertiser-id --> <!-- BEGIN no-users-note --> <tr><td>{NO_USERS_NOTE}</td></tr> <!-- END no-users-note --> </table> {SUBMIT} {END_FORM} Index: add.tpl =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/ads/templates/advertiser/add.tpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** add.tpl 11 Feb 2007 23:38:29 -0000 1.2 --- add.tpl 16 Aug 2008 20:19:19 -0000 1.3 *************** *** 1,11 **** {START_FORM} ! <table class="form-table" width="99%"> ! <tr> ! <td>{USERNAME_LABEL}</td> ! <td>{USERNAME}</td> ! </tr> <tr> ! <td>{BUSINESS_LABEL}</td> ! <td>{BUSINESS}</td> </tr> </table> --- 1,7 ---- {START_FORM} ! <table class="form-table"> <tr> ! <td>{BUSINESS_NAME_LABEL}</td> ! <td>{BUSINESS_NAME}</td> </tr> </table> Index: list.tpl =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/ads/templates/advertiser/list.tpl,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** list.tpl 22 Jun 2008 20:04:22 -0000 1.3 --- list.tpl 16 Aug 2008 20:19:19 -0000 1.4 *************** *** 1,5 **** <table cellpadding="4" cellspacing="1" width="100%"> <tr> ! <th>{BUSINESS} {BUSINESS_SORT}</th> <th>{DISPLAY_NAME} {DISPLAY_NAME_SORT}</th> <th>{CREATED} {CREATED_SORT}</th> --- 1,5 ---- <table cellpadding="4" cellspacing="1" width="100%"> <tr> ! <th>{BUSINESS_NAME} {BUSINESS_NAME_SORT}</th> <th>{DISPLAY_NAME} {DISPLAY_NAME_SORT}</th> <th>{CREATED} {CREATED_SORT}</th> *************** *** 8,12 **** <!-- BEGIN listrows --> <tr{TOGGLE}> ! <td>{BUSINESS}</td> <td>{DISPLAY_NAME}</td> <td>{CREATED}</td> --- 8,12 ---- <!-- BEGIN listrows --> <tr{TOGGLE}> ! <td>{BUSINESS_NAME}</td> <td>{DISPLAY_NAME}</td> <td>{CREATED}</td> |
|
From: Greg M. <bli...@us...> - 2008-08-16 14:23:59
|
Update of /cvsroot/phpwebsite-comm/modules/ads/class In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23122/class Modified Files: my_page.php Log Message: Removed call to help module which wasn't working anyway Index: my_page.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/ads/class/my_page.php,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** my_page.php 28 May 2007 21:21:49 -0000 1.7 --- my_page.php 16 Aug 2008 14:23:37 -0000 1.8 *************** *** 73,77 **** { PHPWS_Core::initCoreClass('DBPager.php'); - PHPWS_Core::initModClass('help', 'Help.php'); $pageTags['NAME'] = dgettext('ads', 'Ad Name'); --- 73,76 ---- *************** *** 81,85 **** $pageTags['VIEWS'] = dgettext('ads', 'Views'); $pageTags['HITS'] = dgettext('ads', 'Hits'); ! $pageTags['CTR'] = PHPWS_Help::show_link('ads', 'click_through_rate', dgettext('ads', 'CTR')); foreach($result as $campaign) --- 80,84 ---- $pageTags['VIEWS'] = dgettext('ads', 'Views'); $pageTags['HITS'] = dgettext('ads', 'Hits'); ! $pageTags['CTR'] = dgettext('ads', 'CTR'); foreach($result as $campaign) |
|
From: Greg M. <bli...@us...> - 2008-08-16 14:23:32
|
Update of /cvsroot/phpwebsite-comm/modules/ads/docs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23122/docs Modified Files: ChangeLog Log Message: Removed call to help module which wasn't working anyway Index: ChangeLog =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/ads/docs/ChangeLog,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** ChangeLog 23 Jun 2008 02:17:23 -0000 1.10 --- ChangeLog 16 Aug 2008 14:23:39 -0000 1.11 *************** *** 3,6 **** --- 3,10 ---- + *cvs + + Removed call to help module which wasn't working anyway. + *ads-1.2.0 (22 Jun 2008) |
|
From: Greg M. <bli...@us...> - 2008-08-16 14:23:30
|
Update of /cvsroot/phpwebsite-comm/modules/ads/conf In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23122/conf Removed Files: help.ini Log Message: Removed call to help module which wasn't working anyway --- help.ini DELETED --- |
