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...> - 2011-06-28 18:29:41
|
Update of /cvsroot/phpwebsite-comm/modules/article/docs In directory vz-cvs-2.sog:/tmp/cvs-serv7851/docs Modified Files: Changes.txt Log Message: + Adjusted copyright tag & Comment block header + Article integrates with the RSS module again Index: Changes.txt =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/article/docs/Changes.txt,v retrieving revision 1.51 retrieving revision 1.52 diff -C2 -d -r1.51 -r1.52 *** Changes.txt 3 Jan 2011 06:02:06 -0000 1.51 --- Changes.txt 28 Jun 2011 18:29:38 -0000 1.52 *************** *** 4,7 **** --- 4,9 ---- Changes in version 4.2.2 ======================== + + Adjusted copyright tag & Comment block header + + Article integrates with the RSS module again + Demo articles now display properly when USE_BREAKER is off + All tags are now stripped out of the summary text in the title link alt property. |
|
From: Eloi G. <ada...@us...> - 2011-06-28 18:29:40
|
Update of /cvsroot/phpwebsite-comm/modules/article/boost
In directory vz-cvs-2.sog:/tmp/cvs-serv7851/boost
Modified Files:
update.php
Log Message:
+ Adjusted copyright tag & Comment block header
+ Article integrates with the RSS module again
Index: update.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/article/boost/update.php,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** update.php 26 Jan 2009 03:13:18 -0000 1.31
--- update.php 28 Jun 2011 18:29:35 -0000 1.32
***************
*** 255,290 ****
</pre>';
!
! case version_compare($currentVersion, '4.2.1', '<'):
! $files = array('templates/popular_links.tpl', 'templates/runtime_categorized.tpl', 'templates/runtime_chronological.tpl',
! 'templates/edit_permissions.tpl', 'templates/edit.tpl', 'templates/history.tpl',
! 'templates/list_articles.tpl', 'templates/list_category_summaries.tpl', 'templates/list_summaries.tpl');
! if (PHPWS_Boost::updateFiles($files, 'article')) {
! $content[] = '+ Updated the following files: ' . implode("\n ", $files);
! }
! else {
! $content[] = '+ Unable to update the following files: ' . implode("\n ", $files);
! return false;
! }
!
! $content[] = '<pre>
! ========================
! Changes in version 4.2.1
! ========================
! + Fixed a minor categorized summary display bug
! + Article title links now show the summary in the tooltip
! + Customized category display added
! + Deleted reference to obsolete file (AM_Modsettings.php)
! + If the specified XML file isn`t found in the branch directory, XML_import will look in the hub directory as well.
! + The conversion script now uses PHPWS_Text::breaker to convert newlines to br tags
! + A `post-upgrade conversion` script is included to convert newlines to br tags in an existing AM installation
! + `Also on this Site` and `Popular Articles` templates now use their own box definitions, not the standard layout one.
! + Chronological Homepage summary views now use their own boxes, not Layout`s
! + Added rel=nofollow to print and email links
! + AM uses breakpost now
! + Changed old bg_dark/medium/light references to bgcolor#
! + PHPWS_AM_EditForms::edit_article was passing a keyid to Categories::getSimpleLinks, not the key object
! </pre>';
!
} // end of switch
--- 255,309 ----
</pre>';
!
! case version_compare($currentVersion, '4.2.1', '<'):
! $files = array('templates/popular_links.tpl', 'templates/runtime_categorized.tpl', 'templates/runtime_chronological.tpl',
! 'templates/edit_permissions.tpl', 'templates/edit.tpl', 'templates/history.tpl',
! 'templates/list_articles.tpl', 'templates/list_category_summaries.tpl', 'templates/list_summaries.tpl');
! if (PHPWS_Boost::updateFiles($files, 'article')) {
! $content[] = '+ Updated the following files: ' . implode("\n ", $files);
! }
! else {
! $content[] = '+ Unable to update the following files: ' . implode("\n ", $files);
! return false;
! }
!
! $content[] = '<pre>
! ========================
! Changes in version 4.2.1
! ========================
! + Fixed a minor categorized summary display bug
! + Article title links now show the summary in the tooltip
! + Customized category display added
! + Deleted reference to obsolete file (AM_Modsettings.php)
! + If the specified XML file isn`t found in the branch directory, XML_import will look in the hub directory as well.
! + The conversion script now uses PHPWS_Text::breaker to convert newlines to br tags
! + A `post-upgrade conversion` script is included to convert newlines to br tags in an existing AM installation
! + `Also on this Site` and `Popular Articles` templates now use their own box definitions, not the standard layout one.
! + Chronological Homepage summary views now use their own boxes, not Layout`s
! + Added rel=nofollow to print and email links
! + AM uses breakpost now
! + Changed old bg_dark/medium/light references to bgcolor#
! + PHPWS_AM_EditForms::edit_article was passing a keyid to Categories::getSimpleLinks, not the key object
! </pre>';
!
!
!
! case version_compare($currentVersion, '4.2.2', '<'):
! PHPWS_Core::initModClass('rss', 'RSS.php');
! RSS::registerModule('article', $content);
!
! $content[] = '<pre>
! ========================
! Changes in version 4.2.2
! ========================
! + Adjusted copyright tag & Comment block header
! + Article integrates with the RSS module again
! + Demo articles now display properly when USE_BREAKER is off
! + All tags are now stripped out of the summary text in the title link alt property.
! + Fixed Bug Report [ 2631456 ] - AM 4.21 permission bug
! + Assigning the return value of new by reference is deprecated in PHP 5.
! + Times viewed is now stored in the associated Key for an article
! </pre>';
!
} // end of switch
|
|
From: Eloi G. <ada...@us...> - 2011-06-28 17:04:44
|
Update of /cvsroot/phpwebsite-comm/modules/article
In directory vz-cvs-2.sog:/tmp/cvs-serv19924
Modified Files:
index.php
Log Message:
Reverting to previous...
Index: index.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/article/index.php,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** index.php 28 Jun 2011 16:59:43 -0000 1.29
--- index.php 28 Jun 2011 17:04:42 -0000 1.30
***************
*** 17,22 ****
PHPWS_Core::initModClass('article', 'Article.php');
PHPWS_Core::initModClass('article', 'Image.php');
- PHPWS_Core::initModClass('rss', 'RSS.php');
- RSS::registerModule('article', $str);
/* Process any form button submissions */
--- 17,20 ----
|
|
From: Eloi G. <ada...@us...> - 2011-06-28 16:59:48
|
Update of /cvsroot/phpwebsite-comm/modules/article
In directory vz-cvs-2.sog:/tmp/cvs-serv17749
Modified Files:
index.php
Log Message:
Formatting & error page changes
Forced RSS module registration
Index: index.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/article/index.php,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** index.php 28 Jun 2011 16:09:22 -0000 1.28
--- index.php 28 Jun 2011 16:59:43 -0000 1.29
***************
*** 17,20 ****
--- 17,22 ----
PHPWS_Core::initModClass('article', 'Article.php');
PHPWS_Core::initModClass('article', 'Image.php');
+ PHPWS_Core::initModClass('rss', 'RSS.php');
+ RSS::registerModule('article', $str);
/* Process any form button submissions */
|
|
From: Eloi G. <ada...@us...> - 2011-06-28 16:09:25
|
Update of /cvsroot/phpwebsite-comm/modules/article
In directory vz-cvs-2.sog:/tmp/cvs-serv7264
Modified Files:
index.php
Log Message:
Formatting & error page changes
Index: index.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/article/index.php,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** index.php 3 Jan 2011 06:02:06 -0000 1.27
--- index.php 28 Jun 2011 16:09:22 -0000 1.28
***************
*** 20,25 ****
/* 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]);
--- 20,24 ----
/* 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]);
***************
*** 32,62 ****
/* 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());
! 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());
--- 31,60 ----
/* 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']);
! if (empty($temp->id)) {
! PHPWS_Core::errorPage('404');
! }
! Layout::add($temp->view_full());
! 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());
***************
*** 67,80 ****
/* 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
--- 65,73 ----
/* The rest of this module's functions are off-limits to non-users */
! elseif (!Current_User::allow('article')) {
! PHPWS_Core::errorPage('403');
}
! else {
include(PHPWS_SOURCE_DIR . 'mod/article/index_admin.php');
! }
?>
\ No newline at end of file
|
|
From: Eloi G. <ada...@us...> - 2011-06-28 16:07:09
|
Update of /cvsroot/phpwebsite-comm/modules/article/class
In directory vz-cvs-2.sog:/tmp/cvs-serv6016/class
Modified Files:
Article.php
Log Message:
Adjusted copyright tag & Comment block header
Index: Article.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/article/class/Article.php,v
retrieving revision 1.65
retrieving revision 1.66
diff -C2 -d -r1.65 -r1.66
*** Article.php 3 Jan 2011 06:02:05 -0000 1.65
--- Article.php 28 Jun 2011 16:07:07 -0000 1.66
***************
*** 83,88 ****
var $_translations_needed;
var $_version_id = 0;
! var $_key = null;
! var $_thread = null;
/**
--- 83,88 ----
var $_translations_needed;
var $_version_id = 0;
! var $_key = null;
! var $_thread = null;
/**
***************
*** 193,197 ****
die($status->getMessage());
}
! $this->pages = $unserializer->getunserializedData();
unset($unserializer);
return true;
--- 193,197 ----
die($status->getMessage());
}
! $this->pages = $unserializer->getunserializedData();
unset($unserializer);
return true;
***************
*** 209,223 ****
function _get_tags ()
{
! if (isset($_REQUEST['op']) && $_REQUEST['op'] == 'view_version') {
! $vars['op'] = 'view_version';
! $vars['version_id'] = (int) $_REQUEST['version_id'];
! }
! else
! $vars['id'] = $this->id;
! $page_wanted = 1;
! if(!empty($_REQUEST['page']))
! $page_wanted = (int) $_REQUEST['page'];
! $printAll = @$_REQUEST['op']=='print' || @$_REQUEST['page']=='all';
!
$article_tags['TITLE'] = $this->title;
if(isset($_REQUEST['viewarchive']))
--- 209,223 ----
function _get_tags ()
{
! if (isset($_REQUEST['op']) && $_REQUEST['op'] == 'view_version') {
! $vars['op'] = 'view_version';
! $vars['version_id'] = (int) $_REQUEST['version_id'];
! }
! else
! $vars['id'] = $this->id;
! $page_wanted = 1;
! if(!empty($_REQUEST['page']))
! $page_wanted = (int) $_REQUEST['page'];
! $printAll = @$_REQUEST['op']=='print' || @$_REQUEST['page']=='all';
!
$article_tags['TITLE'] = $this->title;
if(isset($_REQUEST['viewarchive']))
***************
*** 235,246 ****
$article_tags['CREATED_DATE_LONG'] = PHPWS_AM_Data::get_long_date($this->created_date);
$article_tags['UPDATED_DATE_LONG'] = PHPWS_AM_Data::get_long_date($this->updated_date);
! $article_tags['CREATED_DATE_SHORT'] = PHPWS_AM_Data::get_short_date($this->created_date);
! $article_tags['UPDATED_DATE_SHORT'] = PHPWS_AM_Data::get_short_date($this->updated_date);
! $article_tags['CREATED_DATE_REL'] = PHPWS_Time::relativeTime(PHPWS_Time::getUserTime($this->created_date));
! $article_tags['UPDATED_DATE_REL'] = PHPWS_Time::relativeTime(PHPWS_Time::getUserTime($this->updated_date));
! // Default date format
! $article_tags['CREATED_DATE'] = $article_tags['CREATED_DATE_SHORT'];
! $article_tags['UPDATED_DATE'] = $article_tags['UPDATED_DATE_SHORT'];
!
if(!empty($this->expiration_date))
$article_tags['EXPIRATION_DATE'] = PHPWS_AM_Data::get_long_date($this->expiration_date);
--- 235,246 ----
$article_tags['CREATED_DATE_LONG'] = PHPWS_AM_Data::get_long_date($this->created_date);
$article_tags['UPDATED_DATE_LONG'] = PHPWS_AM_Data::get_long_date($this->updated_date);
! $article_tags['CREATED_DATE_SHORT'] = PHPWS_AM_Data::get_short_date($this->created_date);
! $article_tags['UPDATED_DATE_SHORT'] = PHPWS_AM_Data::get_short_date($this->updated_date);
! $article_tags['CREATED_DATE_REL'] = PHPWS_Time::relativeTime(PHPWS_Time::getUserTime($this->created_date));
! $article_tags['UPDATED_DATE_REL'] = PHPWS_Time::relativeTime(PHPWS_Time::getUserTime($this->updated_date));
! // Default date format
! $article_tags['CREATED_DATE'] = $article_tags['CREATED_DATE_SHORT'];
! $article_tags['UPDATED_DATE'] = $article_tags['UPDATED_DATE_SHORT'];
!
if(!empty($this->expiration_date))
$article_tags['EXPIRATION_DATE'] = PHPWS_AM_Data::get_long_date($this->expiration_date);
***************
*** 258,334 ****
$article_tags['CREATED_TEXT'] = sprintf(dgettext('article', 'Created By %1$s'), $this->created_username);
! $article_tags['UPDATED_TEXT'] = sprintf(dgettext('article', 'Last updated by %1$s'), $this->updated_username);
$article_tags['TITLE_LINK'] = $this->get_title_link();
!
! if($this->wordcount>0) {
! $article_tags['READMORE'] = '[' . PHPWS_Text::rewriteLink(dgettext('article', 'Read More'), 'article', $vars). ']';
! $article_tags['MOREWORDS'] = $this->wordcount." ".dgettext('article', 'more words');
! $article_tags['MOREPAGES'] = $this->pagecount . ' ' . (($this->pagecount==1) ?dgettext('article', 'page') :dgettext('article', 'pages'));
! }
!
! if (@$_REQUEST['module']=='article' && !$printAll) {
! $s = dgettext('article', 'Printable Version');
! $article_tags['PRINT_ICON'] = '<a href="./index.php?module=article&op=print&id='.$this->id
! .'" target="_blank" style="text-decoration:none" title="'. $s . '" rel="nofollow"><img src="' . PHPWS_Core::getHomeHttp()
! . 'images/mod/article/print.gif" border="0" width="22" height="20" alt="'.$s.'" />'.dgettext('article', 'Print').'</a>';
! $s = dgettext('article', 'E-mail this Article to a Friend');
! $article_tags['EMAIL'] = '<a href="./index.php?module=article&op=email&id='.$this->id
! .'" style="text-decoration:none" title="'.$s.'" rel="nofollow"><img src="'. PHPWS_Core::getHomeHttp()
! . 'images/mod/article/mailto.png" border="0" width="19" height="12" alt="'.$s.'" />'.dgettext('article', 'eMail').'</a>';
! }
!
! /* if user can edit articles or can edit this article... */
! if ($this->can_edit()) {
! /* If someone else is editing this article... */
! if ($this->isLocked($this->editlock, $this->edituser))
! $article_tags['EDIT'] = '['. dgettext('article', 'Locked') . ']';
! else
! $article_tags['EDIT'] = '[<a href="./index.php?module=article&op=edit&page='.$page_wanted.'&id='.$this->id
! .'">' . dgettext('article', 'Edit').'</a>]';
! }
!
! /* if user can delete articles or can delete this article... */
! if (Current_User::allow('article', 'delete_articles', $this->id))
! $article_tags['DELETE'] = '[<a href="./index.php?module=article&op=delete&id=' . $this->id.'">'.dgettext('article', 'Delete').' </a>]';
!
! /* Show Category links & icons */
! /* If Category info is cached, use it */
! $cat_link = $cat_icon = array();
! if (isset($GLOBALS['AMcategoryIdx'][$this->key_id])) {
! $cat_link = $GLOBALS['AMcategoryIdx'][$this->key_id]['cat_link'];
! $cat_icon = $GLOBALS['AMcategoryIdx'][$this->key_id]['cat_icon'];
! }
! else {
! $db = new PHPWS_DB('categories');
! $db->addWhere('category_items.key_id', $this->key_id);
! $db->addWhere('id', 'category_items.cat_id');
! $categories = $db->getObjects('Category');
! if (count($categories)) {
! foreach ($categories AS $category) {
! if (!is_object($category))
! break;
! $cat_link[] = $category->getViewLink('article');
! if ($category->icon)
! $cat_icon[] = $category->getViewLink('article', $category->getIcon());
! }
! }
! }
! if (!empty($cat_link))
! $article_tags['CATEGORY_LINKS'] = implode(', ', $cat_link);
! if (!empty($cat_icon))
! $article_tags['CATEGORY_ICONS'] = implode(' ', $cat_icon);
!
! /* Display available translation links */
! /* if ($_SESSION['translate']->langActive) {
! $arr = array();
! foreach ($this->_translations_available AS $key=>$value) {
! if ($this->language != $key)
! $arr[] = '['.PHPWS_Text::moduleLink($value, 'article', array('view'=>$this->id.' ', 'language'=>$key)).']';
! else
! $arr[] = '['.$value.']';
! }
! $article_tags['AVAILABLE_TRANSLATIONS'] = implode(' ', $arr);
! }
! */
/* Develop article content */
--- 258,334 ----
$article_tags['CREATED_TEXT'] = sprintf(dgettext('article', 'Created By %1$s'), $this->created_username);
! $article_tags['UPDATED_TEXT'] = sprintf(dgettext('article', 'Last updated by %1$s'), $this->updated_username);
$article_tags['TITLE_LINK'] = $this->get_title_link();
!
! if($this->wordcount>0) {
! $article_tags['READMORE'] = '[' . PHPWS_Text::rewriteLink(dgettext('article', 'Read More'), 'article', $vars). ']';
! $article_tags['MOREWORDS'] = $this->wordcount." ".dgettext('article', 'more words');
! $article_tags['MOREPAGES'] = $this->pagecount . ' ' . (($this->pagecount==1) ?dgettext('article', 'page') :dgettext('article', 'pages'));
! }
!
! if (@$_REQUEST['module']=='article' && !$printAll) {
! $s = dgettext('article', 'Printable Version');
! $article_tags['PRINT_ICON'] = '<a href="./index.php?module=article&op=print&id='.$this->id
! .'" target="_blank" style="text-decoration:none" title="'. $s . '" rel="nofollow"><img src="' . PHPWS_Core::getHomeHttp()
! . 'images/mod/article/print.gif" border="0" width="22" height="20" alt="'.$s.'" />'.dgettext('article', 'Print').'</a>';
! $s = dgettext('article', 'E-mail this Article to a Friend');
! $article_tags['EMAIL'] = '<a href="./index.php?module=article&op=email&id='.$this->id
! .'" style="text-decoration:none" title="'.$s.'" rel="nofollow"><img src="'. PHPWS_Core::getHomeHttp()
! . 'images/mod/article/mailto.png" border="0" width="19" height="12" alt="'.$s.'" />'.dgettext('article', 'eMail').'</a>';
! }
!
! /* if user can edit articles or can edit this article... */
! if ($this->can_edit()) {
! /* If someone else is editing this article... */
! if ($this->isLocked($this->editlock, $this->edituser))
! $article_tags['EDIT'] = '['. dgettext('article', 'Locked') . ']';
! else
! $article_tags['EDIT'] = '[<a href="./index.php?module=article&op=edit&page='.$page_wanted.'&id='.$this->id
! .'">' . dgettext('article', 'Edit').'</a>]';
! }
!
! /* if user can delete articles or can delete this article... */
! if (Current_User::allow('article', 'delete_articles', $this->id))
! $article_tags['DELETE'] = '[<a href="./index.php?module=article&op=delete&id=' . $this->id.'">'.dgettext('article', 'Delete').' </a>]';
!
! /* Show Category links & icons */
! /* If Category info is cached, use it */
! $cat_link = $cat_icon = array();
! if (isset($GLOBALS['AMcategoryIdx'][$this->key_id])) {
! $cat_link = $GLOBALS['AMcategoryIdx'][$this->key_id]['cat_link'];
! $cat_icon = $GLOBALS['AMcategoryIdx'][$this->key_id]['cat_icon'];
! }
! else {
! $db = new PHPWS_DB('categories');
! $db->addWhere('category_items.key_id', $this->key_id);
! $db->addWhere('id', 'category_items.cat_id');
! $categories = $db->getObjects('Category');
! if (count($categories)) {
! foreach ($categories AS $category) {
! if (!is_object($category))
! break;
! $cat_link[] = $category->getViewLink('article');
! if ($category->icon)
! $cat_icon[] = $category->getViewLink('article', $category->getIcon());
! }
! }
! }
! if (!empty($cat_link))
! $article_tags['CATEGORY_LINKS'] = implode(', ', $cat_link);
! if (!empty($cat_icon))
! $article_tags['CATEGORY_ICONS'] = implode(' ', $cat_icon);
!
! /* Display available translation links */
! /* if ($_SESSION['translate']->langActive) {
! $arr = array();
! foreach ($this->_translations_available AS $key=>$value) {
! if ($this->language != $key)
! $arr[] = '['.PHPWS_Text::moduleLink($value, 'article', array('view'=>$this->id.' ', 'language'=>$key)).']';
! else
! $arr[] = '['.$value.']';
! }
! $article_tags['AVAILABLE_TRANSLATIONS'] = implode(' ', $arr);
! }
! */
/* Develop article content */
***************
*** 359,365 ****
$navbar[] = '['.$pagenum.']';
/* otherwise, create a article link */
! } else {
! $vars['page'] = $pagenum;
! $navlist[] = PHPWS_Text::rewriteLink($page_title, 'article', $vars);
$navbar[] = PHPWS_Text::rewriteLink($pagenum, 'article', $vars);
}
--- 359,365 ----
$navbar[] = '['.$pagenum.']';
/* otherwise, create a article link */
! } else {
! $vars['page'] = $pagenum;
! $navlist[] = PHPWS_Text::rewriteLink($page_title, 'article', $vars);
$navbar[] = PHPWS_Text::rewriteLink($pagenum, 'article', $vars);
}
***************
*** 384,388 ****
$article_tags['PREV'] = $article_tags['NEXT'] = ' ';
if ($page_wanted > 1) {
! $vars['page'] = $page_wanted-1;
$article_tags['PREV'] = PHPWS_Text::rewriteLink(dgettext('article', 'Previous Page'), 'article', $vars);
}
--- 384,388 ----
$article_tags['PREV'] = $article_tags['NEXT'] = ' ';
if ($page_wanted > 1) {
! $vars['page'] = $page_wanted-1;
$article_tags['PREV'] = PHPWS_Text::rewriteLink(dgettext('article', 'Previous Page'), 'article', $vars);
}
***************
*** 391,410 ****
$vars['page'] = $page_wanted+1;
$article_tags['NEXT'] = PHPWS_Text::rewriteLink(dgettext('article', 'Next Page'), 'article', $vars);
! }
unset($vars['page']);
}
!
! /* If the Comments module is available, get comments information */
! if($this->id != 0 && PHPWS_Settings::get('article', 'use_comments') && $this->allow_comments
! && PHPWS_Core::initModClass('comments', 'Comments.php')
! && $article_tags['thread'] = Comments::getThread($this->key_id))
! {
! $s = $article_tags['thread']->countComments(true);
! $link = PHPWS_Text::quickLink($s, 'article', $vars);
! $link->rewrite = true;
! $link->setAnchor('comments');
! $article_tags['NUM_COMMENTS'] = $link->get();
! }
!
unset($vars);
return $article_tags;
--- 391,411 ----
$vars['page'] = $page_wanted+1;
$article_tags['NEXT'] = PHPWS_Text::rewriteLink(dgettext('article', 'Next Page'), 'article', $vars);
! }
unset($vars['page']);
}
!
! /* If the Comments module is available, get comments information */
! if($this->id != 0 && PHPWS_Settings::get('article', 'use_comments') && $this->allow_comments
! && PHPWS_Core::initModClass('comments', 'Comments.php')
! && $article_tags['thread'] = Comments::getThread($this->key_id))
! {
! $s = $article_tags['thread']->countComments(true);
! $link = PHPWS_Text::quickLink($s, 'article', $vars);
! $link->rewrite = true;
! $link->setAnchor('comments');
! $article_tags['NUM_COMMENTS'] = $link->get();
! $article_tags['COMMENTS_TITLE'] = dgettext('article', 'Discuss');
! }
!
unset($vars);
return $article_tags;
***************
*** 452,458 ****
$content = PHPWS_Template::processTemplate($article_tags, 'article', 'article/'.$this->template);
/* My copyright statement. Do not disable or remove. See /docs/LICENSE.txt for an explanation. */
! $rights = array( 'http://www.vibride.com','http://www.realvidreams.com','http://www.bygeorgeware.com','http://www.bygeorgeadvertising.com');
! $copyright = '<a href="'.$rights[rand(0,2)].'" title="Article Manager module by by George! Software."><img src="'.PHPWS_Core::getHomeHttp()
! . 'images/mod/article/mark.gif" border="0" alt="Article Manager module by by George! Software." /></a>';
if (@$GLOBALS['module'] != 'home')
$content .= $copyright;
--- 453,458 ----
$content = PHPWS_Template::processTemplate($article_tags, 'article', 'article/'.$this->template);
/* My copyright statement. Do not disable or remove. See /docs/LICENSE.txt for an explanation. */
! $copyright = '<a href="http://www.bygeorgetech.com" title="Article Manager module by by George! Technologies."><img src="'.PHPWS_Core::getHomeHttp()
! . 'images/mod/article/mark.gif" border="0" alt="Article Manager module by by George! Technologies." /></a>';
if (@$GLOBALS['module'] != 'home')
$content .= $copyright;
***************
*** 622,648 ****
return $id;
}
!
! /**
! * Generates a title link.
! *
! * If no parameters are given, then the method assumes that it was called from inside an active object
! *
! * @author Eloi George <el...@NO...>
! * @param int $id : (optional) article id
! * @param string $title : (optional) article title
! * @return HTML
! */
! function get_title_link ($id = null, $title = null, $summary = null)
! {
! $vars['id'] = ($id)? $id : $this->id;
! if (empty($title)) {
! $title = $this->title;
! if (empty($summary)) {
! $summary = PHPWS_Text::parseOutput($this->summary);
! }
! }
! return PHPWS_Text::rewriteLink($title, 'article', $vars, null, $summary);
}
!
/**
* Finds a section by id.
--- 622,648 ----
return $id;
}
!
! /**
! * Generates a title link.
! *
! * If no parameters are given, then the method assumes that it was called from inside an active object
! *
! * @author Eloi George <el...@NO...>
! * @param int $id : (optional) article id
! * @param string $title : (optional) article title
! * @return HTML
! */
! function get_title_link ($id = null, $title = null, $summary = null)
! {
! $vars['id'] = ($id)? $id : $this->id;
! if (empty($title)) {
! $title = $this->title;
! if (empty($summary)) {
! $summary = PHPWS_Text::parseOutput($this->summary);
! }
! }
! return PHPWS_Text::rewriteLink($title, 'article', $vars, null, $summary);
}
!
/**
* Finds a section by id.
***************
*** 1032,1059 ****
, 'msg' => @$version->source_data['vr_reviewer_note']);
}
!
! /**
! * Determines if an article can be edited by the user.
! *
! * If an id was not given, the method will assume that we're checking the
! * current object's permissions
! *
! * @author Eloi George <el...@NO...>
! * @module Article Manager
! * @param int $id : Article id to check, if known.
! * @param int $creator_id : Article Author id to check, if known.
! * @return bool : true or false.
! * @access public
! */
! function can_edit ($id = null, $creator_id = null) {
! /* If an id was not given, check general editing pro */
! if (empty($id)) {
! $id = $this->id;
! $creator_id = $this->created_id;
! }
! return Current_User::allow('article', 'edit_articles', $id)
! || (Current_User::getId() && $creator_id == Current_User::getId());
! }
}
! ?>
\ No newline at end of file
--- 1032,1059 ----
, 'msg' => @$version->source_data['vr_reviewer_note']);
}
!
! /**
! * Determines if an article can be edited by the user.
! *
! * If an id was not given, the method will assume that we're checking the
! * current object's permissions
! *
! * @author Eloi George <el...@NO...>
! * @module Article Manager
! * @param int $id : Article id to check, if known.
! * @param int $creator_id : Article Author id to check, if known.
! * @return bool : true or false.
! * @access public
! */
! function can_edit ($id = null, $creator_id = null) {
! /* If an id was not given, check general editing pro */
! if (empty($id)) {
! $id = $this->id;
! $creator_id = $this->created_id;
! }
! return Current_User::allow('article', 'edit_articles', $id)
! || (Current_User::getId() && $creator_id == Current_User::getId());
! }
}
! ?>
|
|
From: Eloi G. <ada...@us...> - 2011-06-28 16:01:17
|
Update of /cvsroot/phpwebsite-comm/modules/article/conf In directory vz-cvs-2.sog:/tmp/cvs-serv4054/conf Added Files: rss.php Log Message: Added RSS module registration file --- NEW FILE: rss.php --- <?php /** * This is the Articlemaster mod_info file for Boost * not used : link, pub_date, text_input * * @version $Id: rss.php,v 1.1 2011/06/28 16:01:10 adarkling Exp $ * * @author Eloi George <el...@NO...> * @module Article Manager */ $channel['title'] = 'Article Manager'; $channel['description'] = 'News and Information from this site'; ?> |
|
From: Eloi G. <ada...@us...> - 2011-01-03 06:02:15
|
Update of /cvsroot/phpwebsite-comm/modules/article/inc In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv13381/inc Modified Files: A_save.php runtime.php Log Message: + Times viewed is now stored in the associated Key for an article Index: runtime.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/article/inc/runtime.php,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** runtime.php 2 Jan 2011 23:34:23 -0000 1.20 --- runtime.php 3 Jan 2011 06:02:05 -0000 1.21 *************** *** 31,36 **** $article = new PHPWS_Article($row); Layout::add($article->view_full(), 'article', 'view', true); - /* Increment the articleview counter */ - $article->increment_counter((int) $result); } unset($article); --- 31,34 ---- *************** *** 57,64 **** $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.'); --- 55,63 ---- $db->addColumn('title'); $db->addWhere('announce', '1'); PHPWS_AM_Data::get_published_sql($db); $db->setLimit($config['popular_articles']); ! Key::restrictView($db, 'article', false); ! $db->addOrder('phpws_key.times_viewed desc'); ! $result = $db->select(); if (PHPWS_Error::logIfError($result)) exit('Article::Runtime -- a database error occured.'); Index: A_save.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/article/inc/A_save.php,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** A_save.php 2 Jan 2011 23:34:23 -0000 1.25 --- A_save.php 3 Jan 2011 06:02:05 -0000 1.26 *************** *** 92,95 **** --- 92,98 ---- $this->_key->setSummary($this->summary); $this->_key->active = 1; + // This is how the conversion script passes the old "hits" value + if (!empty($this->hits)) + $this->_key->times_viewed = $this->hits; $result = $this->_key->save(); $this->key_id = $this->_key->id; |
|
From: Eloi G. <ada...@us...> - 2011-01-03 06:02:15
|
Update of /cvsroot/phpwebsite-comm/modules/article/class In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv13381/class Modified Files: AM_Lists.php AM_Actions.php Article.php AM_Data.php Log Message: + Times viewed is now stored in the associated Key for an article Index: AM_Data.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/article/class/AM_Data.php,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** AM_Data.php 2 Jan 2011 23:34:26 -0000 1.23 --- AM_Data.php 3 Jan 2011 06:02:05 -0000 1.24 *************** *** 32,36 **** $db->addColumn('updated_date'); $db->addColumn('allow_comments'); - $db->addColumn('hits'); $db->addColumn('expiration_date'); $db->addColumn('publication_date'); --- 32,35 ---- Index: AM_Lists.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/article/class/AM_Lists.php,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** AM_Lists.php 18 Dec 2008 05:46:08 -0000 1.27 --- AM_Lists.php 3 Jan 2011 06:02:05 -0000 1.28 *************** *** 252,256 **** . dgettext('article', 'Approved').'? ' .(($approved)?dgettext('article', 'Yes'):dgettext('article', 'No')).'<br />' ! . dgettext('article', 'Views').': '.$hits.'<br />' // . dgettext('article', 'Language').': '.$GLOBALS['AMLang'][$language].'<br />' // . $available --- 252,256 ---- . dgettext('article', 'Approved').'? ' .(($approved)?dgettext('article', 'Yes'):dgettext('article', 'No')).'<br />' ! // Stored in the key class now . dgettext('article', 'Views').': '.key->times_viewed.'<br />' // . dgettext('article', 'Language').': '.$GLOBALS['AMLang'][$language].'<br />' // . $available Index: AM_Actions.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/article/class/AM_Actions.php,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** AM_Actions.php 2 Jan 2011 23:34:26 -0000 1.19 --- AM_Actions.php 3 Jan 2011 06:02:05 -0000 1.20 *************** *** 66,70 **** $new_article->created_date = date("Y-m-d H:i:s"); $new_article->updated_date = date("Y-m-d H:i:s"); - $new_article->hits = 0; $new_article->approved = (!PHPWS_Settings::get('article', 'need_approval') || Current_User::allow('article', 'approve')) ?1:0; $new_article->version = -1; --- 66,69 ---- Index: Article.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/article/class/Article.php,v retrieving revision 1.64 retrieving revision 1.65 diff -C2 -d -r1.64 -r1.65 *** Article.php 2 Jan 2011 23:34:26 -0000 1.64 --- Article.php 3 Jan 2011 06:02:05 -0000 1.65 *************** *** 20,24 **** * @param string summary : The Section that serves as summary for this article * @param int allow_comments : Whether users can submit & view comments - * @param int hits : Keeps track of how many times this article was accessed * @param int expiration_date : Date this article will become obsolete * A NULL value means that the article will never expire --- 20,23 ---- *************** *** 61,65 **** var $summary = ''; var $allow_comments; - var $hits = 0; var $expiration_date; var $publication_date; --- 60,63 ---- *************** *** 235,239 **** } - $article_tags['HITS'] = $this->hits; $article_tags['CREATED_DATE_LONG'] = PHPWS_AM_Data::get_long_date($this->created_date); $article_tags['UPDATED_DATE_LONG'] = PHPWS_AM_Data::get_long_date($this->updated_date); --- 233,236 ---- *************** *** 505,509 **** function get_summary_columns ($summary_column = true) { ! $arr = array('id', 'key_id', 'title', 'mainarticle', 'rank', 'created_username', 'created_id', 'updated_username', 'updated_id', 'created_date', 'updated_date', 'allow_comments', 'hits', 'expiration_date', 'publication_date', 'wordcount', 'pagecount', 'editlock', 'edituser', 'approved', 'version', 'announce', 'language', 'is_base_article', 'draft', 'active'); if ($summary_column) $arr[] = 'summary'; --- 502,506 ---- function get_summary_columns ($summary_column = true) { ! $arr = array('id', 'key_id', 'title', 'mainarticle', 'rank', 'created_username', 'created_id', 'updated_username', 'updated_id', 'created_date', 'updated_date', 'allow_comments', 'expiration_date', 'publication_date', 'wordcount', 'pagecount', 'editlock', 'edituser', 'approved', 'version', 'announce', 'language', 'is_base_article', 'draft', 'active'); if ($summary_column) $arr[] = 'summary'; *************** *** 547,552 **** * Saves this article to the database. * - * @author Adam Morton <ad...@NO...> - * @param bool $autodetect_id : If false, the article will be saved as a new article with the supplied id * @return array : On success, id & versionid of article; on failure, FALSE --- 544,547 ---- *************** *** 562,568 **** * and should be manually removed if you are sure no other article is using them. * - * @author Adam Morton <ad...@NO...> * @author Eloi George <el...@NO...> - * @param none * @return none --- 557,561 ---- *************** *** 821,842 **** /** - * Increments the article counter by one to keep track of article accesses - * - * @author Eloi George <el...@NO...> - - * @param none - * @return none - */ - function increment_counter($id=null) - { - if (!$id) - $id = $this->id; - $db = new PHPWS_DB('article'); - $db->addWhere('id', $id); - $db->addValue('hits', ++$this->hits); - $db->update(); - } - - /** * Updates both the current and unapproved version of an article * --- 814,817 ---- |
|
From: Eloi G. <ada...@us...> - 2011-01-03 06:02:15
|
Update of /cvsroot/phpwebsite-comm/modules/article/boost In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv13381/boost Modified Files: install.sql Log Message: + Times viewed is now stored in the associated Key for an article Index: install.sql =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/article/boost/install.sql,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** install.sql 21 Aug 2008 20:17:29 -0000 1.15 --- install.sql 3 Jan 2011 06:02:06 -0000 1.16 *************** *** 13,17 **** 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, --- 13,16 ---- *************** *** 35,39 **** 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); --- 34,37 ---- |
|
From: Eloi G. <ada...@us...> - 2011-01-03 06:02:14
|
Update of /cvsroot/phpwebsite-comm/modules/article In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv13381 Modified Files: index.php Log Message: + Times viewed is now stored in the associated Key for an article Index: index.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/article/index.php,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** index.php 21 Nov 2008 14:16:26 -0000 1.26 --- index.php 3 Jan 2011 06:02:06 -0000 1.27 *************** *** 42,47 **** $temp = new PHPWS_Article((int) $_REQUEST['id']); Layout::add($temp->view_full()); - /* Increment the articleview counter */ - $temp->increment_counter((int) $_REQUEST['id']); unset($temp); } --- 42,45 ---- *************** *** 63,68 **** $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']); --- 61,64 ---- |
Update of /cvsroot/phpwebsite-comm/modules/article/templates In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv13381/templates Modified Files: summary_view.tpl list_category_summaries.tpl approval_summary_view.tpl list_summaries.tpl runtime_chronological.tpl Log Message: + Times viewed is now stored in the associated Key for an article Index: runtime_chronological.tpl =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/article/templates/runtime_chronological.tpl,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** runtime_chronological.tpl 21 Jan 2009 16:27:15 -0000 1.6 --- runtime_chronological.tpl 3 Jan 2011 06:02:01 -0000 1.7 *************** *** 14,18 **** <h2>{TITLE_LINK}</h2> <div class="smaller"> ! {UPDATED_TEXT} -- {UPDATED_DATE_SHORT} (Read: {HITS} times) </div> <br /> --- 14,18 ---- <h2>{TITLE_LINK}</h2> <div class="smaller"> ! {UPDATED_TEXT} -- {UPDATED_DATE_SHORT} </div> <br /> Index: summary_view.tpl =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/article/templates/summary_view.tpl,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** summary_view.tpl 21 Aug 2008 20:17:22 -0000 1.7 --- summary_view.tpl 3 Jan 2011 06:02:01 -0000 1.8 *************** *** 2,6 **** {TITLE_LINK} <div class="smaller"> ! {UPDATED_TEXT} (Read: {HITS} times) </div> <!-- END TITLE --> --- 2,6 ---- {TITLE_LINK} <div class="smaller"> ! {UPDATED_TEXT} </div> <!-- END TITLE --> Index: list_category_summaries.tpl =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/article/templates/list_category_summaries.tpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** list_category_summaries.tpl 25 Jan 2009 21:32:13 -0000 1.2 --- list_category_summaries.tpl 3 Jan 2011 06:02:01 -0000 1.3 *************** *** 37,41 **** {SUMMARYTEXT} <div class="smaller" style="clear:both; text-align:right"> ! (Read: {HITS} times) {MOREWORDS} - {MOREPAGES} </div> </td> --- 37,41 ---- {SUMMARYTEXT} <div class="smaller" style="clear:both; text-align:right"> ! {MOREWORDS} - {MOREPAGES} </div> </td> Index: list_summaries.tpl =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/article/templates/list_summaries.tpl,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** list_summaries.tpl 25 Jan 2009 21:32:13 -0000 1.4 --- list_summaries.tpl 3 Jan 2011 06:02:01 -0000 1.5 *************** *** 42,46 **** {SUMMARYTEXT} <div class="smaller" style="clear:both; text-align:right"> ! (Read: {HITS} times) {MOREWORDS} - {MOREPAGES} </div> </td> --- 42,46 ---- {SUMMARYTEXT} <div class="smaller" style="clear:both; text-align:right"> ! {MOREWORDS} - {MOREPAGES} </div> </td> Index: approval_summary_view.tpl =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/article/templates/approval_summary_view.tpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** approval_summary_view.tpl 21 Aug 2008 20:17:22 -0000 1.2 --- approval_summary_view.tpl 3 Jan 2011 06:02:01 -0000 1.3 *************** *** 11,14 **** <div class="smaller" style="clear:both; text-align:right"> <br /> ! (Read: {HITS} times) {MOREWORDS} - {MOREPAGES} </div> --- 11,14 ---- <div class="smaller" style="clear:both; text-align:right"> <br /> ! {MOREWORDS} - {MOREPAGES} </div> |
|
From: Eloi G. <ada...@us...> - 2011-01-03 06:02:14
|
Update of /cvsroot/phpwebsite-comm/modules/article/docs In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv13381/docs Modified Files: Changes.txt Log Message: + Times viewed is now stored in the associated Key for an article Index: Changes.txt =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/article/docs/Changes.txt,v retrieving revision 1.50 retrieving revision 1.51 diff -C2 -d -r1.50 -r1.51 *** Changes.txt 2 Jan 2011 23:34:27 -0000 1.50 --- Changes.txt 3 Jan 2011 06:02:06 -0000 1.51 *************** *** 8,11 **** --- 8,12 ---- + Fixed Bug Report [ 2631456 ] - AM 4.21 permission bug + Assigning the return value of new by reference is deprecated in PHP 5. + + Times viewed is now stored in the associated Key for an article ======================== |
|
From: Eloi G. <ada...@us...> - 2011-01-02 23:34:34
|
Update of /cvsroot/phpwebsite-comm/modules/article In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv17872 Modified Files: index_admin.php Log Message: + Assigning the return value of new by reference is deprecated in PHP 5. Index: index_admin.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/article/index_admin.php,v retrieving revision 1.28 retrieving revision 1.29 diff -C2 -d -r1.28 -r1.29 *** index_admin.php 26 Feb 2009 23:45:52 -0000 1.28 --- index_admin.php 2 Jan 2011 23:34:26 -0000 1.29 *************** *** 47,51 **** $version_id = (int) $_REQUEST['version_id']; PHPWS_Core::initModClass('version', 'Version.php'); ! $version = & new Version('article', $version_id); $article = new PHPWS_Article; $version->loadObject($article); --- 47,51 ---- $version_id = (int) $_REQUEST['version_id']; PHPWS_Core::initModClass('version', 'Version.php'); ! $version = new Version('article', $version_id); $article = new PHPWS_Article; $version->loadObject($article); *************** *** 425,429 **** $panel->setCurrentTab('approval'); PHPWS_Core::initModClass('version', 'Version.php'); ! $approval = & new Version_Approval('article', 'article', 'PHPWS_Article', 'view_approval_summary'); $approval->setEditUrl('index.php?module=article&op=edit'); $approval->setViewUrl('index.php?module=article&op=view_version'); --- 425,429 ---- $panel->setCurrentTab('approval'); PHPWS_Core::initModClass('version', 'Version.php'); ! $approval = new Version_Approval('article', 'article', 'PHPWS_Article', 'view_approval_summary'); $approval->setEditUrl('index.php?module=article&op=edit'); $approval->setViewUrl('index.php?module=article&op=view_version'); *************** *** 463,467 **** } /* Editor's Note Dialog */ ! $form = & new PHPWS_Form('Edit_Article'); $form->addTextArea('note', ''); $form->setWidth('note', '95%'); --- 463,467 ---- } /* Editor's Note Dialog */ ! $form = new PHPWS_Form('Edit_Article'); $form->addTextArea('note', ''); $form->setWidth('note', '95%'); *************** *** 483,487 **** $version_id = (int) $_REQUEST['version_id']; PHPWS_Core::initModClass('version', 'Version.php'); ! $version = & new Version('article', $version_id); /* Mail Editor's note to author */ $L1 = PHPWS_Core::getHomeHttp().'index.php?module=article&op=edit&version_id='.$version_id; --- 483,487 ---- $version_id = (int) $_REQUEST['version_id']; PHPWS_Core::initModClass('version', 'Version.php'); ! $version = new Version('article', $version_id); /* Mail Editor's note to author */ $L1 = PHPWS_Core::getHomeHttp().'index.php?module=article&op=edit&version_id='.$version_id; *************** *** 505,509 **** $sender_name = PHPWS_Core::getHomeHttp(0,0,0).' Article Manager'; $sender_email = 'noreply@'.PHPWS_Core::getHomeHttp(0,0,0); ! $recipient = & new PHPWS_User($version->source_data['updated_id']); $recipient_email = $recipient->getEmail(); PHPWS_Core::initModClass('article', 'AM_Actions.php'); --- 505,509 ---- $sender_name = PHPWS_Core::getHomeHttp(0,0,0).' Article Manager'; $sender_email = 'noreply@'.PHPWS_Core::getHomeHttp(0,0,0); ! $recipient = new PHPWS_User($version->source_data['updated_id']); $recipient_email = $recipient->getEmail(); PHPWS_Core::initModClass('article', 'AM_Actions.php'); *************** *** 511,515 **** /* If the version table isn't set up to accept edit_note, add it */ ! $version_db = & new PHPWS_DB($version->version_table); if(!$version_db->isTableColumn('vr_edit_note')) { $version_db->addTableColumn('vr_reviewer', 'smallint NOT NULL DEFAULT "0"'); --- 511,515 ---- /* If the version table isn't set up to accept edit_note, add it */ ! $version_db = new PHPWS_DB($version->version_table); if(!$version_db->isTableColumn('vr_edit_note')) { $version_db->addTableColumn('vr_reviewer', 'smallint NOT NULL DEFAULT "0"'); *************** *** 543,547 **** } PHPWS_Core::initModClass('version', 'Version.php'); ! $version = & new Version('article', (int) $_REQUEST['version_id']); $version->restore(); --- 543,547 ---- } PHPWS_Core::initModClass('version', 'Version.php'); ! $version = new Version('article', (int) $_REQUEST['version_id']); $version->restore(); *************** *** 561,565 **** } PHPWS_Core::initModClass('version', 'Version.php'); ! $version = & new Version('article', (int) $_REQUEST['version_id']); $id = $version->getSourceId(); $version->delete(); --- 561,565 ---- } PHPWS_Core::initModClass('version', 'Version.php'); ! $version = new Version('article', (int) $_REQUEST['version_id']); $id = $version->getSourceId(); $version->delete(); *************** *** 703,707 **** function load_latest_version (& $title, & $message, & $panel) { $status = false; ! $article = & new PHPWS_Article(); if(!empty($_REQUEST['id'])) $article->id = (int) $_REQUEST['id']; --- 703,707 ---- function load_latest_version (& $title, & $message, & $panel) { $status = false; ! $article = new PHPWS_Article(); if(!empty($_REQUEST['id'])) $article->id = (int) $_REQUEST['id']; *************** *** 718,722 **** if (!$status) /* No versions?!?! Load the article. */ ! $article = & new PHPWS_Article((int) $_REQUEST['id']); if (!$article->can_edit()) { Current_User::disallow(dgettext('article', 'User tried to edit an article.')); --- 718,722 ---- if (!$status) /* No versions?!?! Load the article. */ ! $article = new PHPWS_Article((int) $_REQUEST['id']); if (!$article->can_edit()) { Current_User::disallow(dgettext('article', 'User tried to edit an article.')); |
|
From: Eloi G. <ada...@us...> - 2011-01-02 23:34:34
|
Update of /cvsroot/phpwebsite-comm/modules/article/docs In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv17872/docs Modified Files: Changes.txt Log Message: + Assigning the return value of new by reference is deprecated in PHP 5. Index: Changes.txt =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/article/docs/Changes.txt,v retrieving revision 1.49 retrieving revision 1.50 diff -C2 -d -r1.49 -r1.50 *** Changes.txt 26 Feb 2009 23:47:29 -0000 1.49 --- Changes.txt 2 Jan 2011 23:34:27 -0000 1.50 *************** *** 7,10 **** --- 7,11 ---- + All tags are now stripped out of the summary text in the title link alt property. + Fixed Bug Report [ 2631456 ] - AM 4.21 permission bug + + Assigning the return value of new by reference is deprecated in PHP 5. ======================== |
|
From: Eloi G. <ada...@us...> - 2011-01-02 23:34:34
|
Update of /cvsroot/phpwebsite-comm/modules/article/class In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv17872/class Modified Files: Article.php AM_EditForms.php AM_Actions.php AM_Data.php AM_DisplayForms.php Log Message: + Assigning the return value of new by reference is deprecated in PHP 5. Index: AM_EditForms.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/article/class/AM_EditForms.php,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** AM_EditForms.php 26 Feb 2009 23:47:29 -0000 1.14 --- AM_EditForms.php 2 Jan 2011 23:34:26 -0000 1.15 *************** *** 22,26 **** function edit_article (& $object, $req_page = 1) { ! $form = & new PHPWS_Form('Edit_Article'); $form->useBreaker(); --- 22,26 ---- function edit_article (& $object, $req_page = 1) { ! $form = new PHPWS_Form('Edit_Article'); $form->useBreaker(); *************** *** 238,242 **** $result = Layout::getMetaPage($object->key_id); if (!$result) { ! $db = & new PHPWS_DB('layout_config'); $result = $db->select('row'); } --- 238,242 ---- $result = Layout::getMetaPage($object->key_id); if (!$result) { ! $db = new PHPWS_DB('layout_config'); $result = $db->select('row'); } *************** *** 296,300 **** function edit_section (& $object, $section_position, $total_sections) { ! $form = & new PHPWS_Form('SECTION_edit'.$object->id); $form->useBreaker(); --- 296,300 ---- function edit_section (& $object, $section_position, $total_sections) { ! $form = new PHPWS_Form('SECTION_edit'.$object->id); $form->useBreaker(); *************** *** 391,395 **** function edit_configuration () { ! $form = & new PHPWS_Form('Config'); $val = PHPWS_Settings::get('article'); --- 391,395 ---- function edit_configuration () { ! $form = new PHPWS_Form('Config'); $val = PHPWS_Settings::get('article'); Index: AM_Data.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/article/class/AM_Data.php,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** AM_Data.php 26 Feb 2009 23:47:29 -0000 1.22 --- AM_Data.php 2 Jan 2011 23:34:26 -0000 1.23 *************** *** 21,25 **** function bulk_load_db ($id, $summary=false) { ! $db = & new PHPWS_DB('article'); $db->addColumn('id'); $db->addColumn('key_id'); --- 21,25 ---- function bulk_load_db ($id, $summary=false) { ! $db = new PHPWS_DB('article'); $db->addColumn('id'); $db->addColumn('key_id'); Index: AM_Actions.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/article/class/AM_Actions.php,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** AM_Actions.php 26 Feb 2009 23:47:29 -0000 1.18 --- AM_Actions.php 2 Jan 2011 23:34:26 -0000 1.19 *************** *** 23,27 **** return; $now = time(); ! $db = & new PHPWS_DB('article'); $db->addValue('mainarticle', (int) (bool) $status); $db->addWhere('id', (int) $id); --- 23,27 ---- return; $now = time(); ! $db = new PHPWS_DB('article'); $db->addValue('mainarticle', (int) (bool) $status); $db->addWhere('id', (int) $id); *************** *** 96,100 **** function purge_articles () { ! $db = & new PHPWS_DB('article'); $db->addColumn('id'); $db->addColumn('key_id'); --- 96,100 ---- function purge_articles () { ! $db = new PHPWS_DB('article'); $db->addColumn('id'); $db->addColumn('key_id'); *************** *** 115,119 **** /* Delete all associated versions */ $db->reset(); ! $db = & new PHPWS_DB('article_version'); $db->addWhere('id', $ids, 'IN'); $db->delete(); --- 115,119 ---- /* Delete all associated versions */ $db->reset(); ! $db = new PHPWS_DB('article_version'); $db->addWhere('id', $ids, 'IN'); $db->delete(); *************** *** 149,158 **** else { ! $db = & new PHPWS_DB('article_seq'); $db->addColumn('id'); $max_id = $db->select('one'); if (PHPWS_Error::logIfError($max_id)) $max_id = 0; ! $form = & new PHPWS_Form('am_import'); $form->addhidden('module', 'article'); $form->addCheckBox('overwrite'); --- 149,158 ---- else { ! $db = new PHPWS_DB('article_seq'); $db->addColumn('id'); $max_id = $db->select('one'); if (PHPWS_Error::logIfError($max_id)) $max_id = 0; ! $form = new PHPWS_Form('am_import'); $form->addhidden('module', 'article'); $form->addCheckBox('overwrite'); *************** *** 224,228 **** // Instantiate the unserializer require_once(PHPWS_SOURCE_DIR . 'lib/pear/XML/Unserializer.php'); ! $unserializer = &new XML_unserializer(); $autodetect = true; $overwritten = false; --- 224,228 ---- // Instantiate the unserializer require_once(PHPWS_SOURCE_DIR . 'lib/pear/XML/Unserializer.php'); ! $unserializer = new XML_unserializer(); $autodetect = true; $overwritten = false; *************** *** 283,287 **** /* Update next available id in the sequence table */ if (!$autodetect) { ! $db = & new PHPWS_DB('article'); $db->updateSequenceTable(); } --- 283,287 ---- /* Update next available id in the sequence table */ if (!$autodetect) { ! $db = new PHPWS_DB('article'); $db->updateSequenceTable(); } Index: AM_DisplayForms.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/article/class/AM_DisplayForms.php,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** AM_DisplayForms.php 21 Nov 2008 06:13:14 -0000 1.8 --- AM_DisplayForms.php 2 Jan 2011 23:34:26 -0000 1.9 *************** *** 34,38 **** $and = dgettext('article', 'and'); ! $form = & new PHPWS_Form('Article_Search'); /* owner */ --- 34,38 ---- $and = dgettext('article', 'and'); ! $form = new PHPWS_Form('Article_Search'); /* owner */ *************** *** 280,284 **** /* Retrieve the older article version */ PHPWS_Core::initModClass('version', 'Version.php'); ! $version = & new Version('article', $oldversion); $old_object = new PHPWS_Article; $version->loadObject($old_object); --- 280,284 ---- /* Retrieve the older article version */ PHPWS_Core::initModClass('version', 'Version.php'); ! $version = new Version('article', $oldversion); $old_object = new PHPWS_Article; $version->loadObject($old_object); *************** *** 290,294 **** /* Retrieve the newer article version */ ! $version = & new Version('article', $newversion); $new_object = new PHPWS_Article; $version->loadObject($new_object); --- 290,294 ---- /* Retrieve the newer article version */ ! $version = new Version('article', $newversion); $new_object = new PHPWS_Article; $version->loadObject($new_object); *************** *** 307,313 **** $lines1 = PHPWS_Text::sentence(strip_tags($old_object->view_full(), $allowedtags)); $lines2 = PHPWS_Text::sentence(strip_tags($new_object->view_full(), $allowedtags)); ! $diff = &new Text_Diff($lines1, $lines2); /* Determine what changes were made */ ! $renderer = &new Text_Diff_Renderer_html(999); $tags['DIFFCONTENT'] = $renderer->render($diff); $tags['BACKLINK'] = '<a href="index.php?module=article&op=viewhistory&id='. $_REQUEST['id'].'">' . dgettext('article', 'Back To Revision History').'</a>'; --- 307,313 ---- $lines1 = PHPWS_Text::sentence(strip_tags($old_object->view_full(), $allowedtags)); $lines2 = PHPWS_Text::sentence(strip_tags($new_object->view_full(), $allowedtags)); ! $diff = new Text_Diff($lines1, $lines2); /* Determine what changes were made */ ! $renderer = new Text_Diff_Renderer_html(999); $tags['DIFFCONTENT'] = $renderer->render($diff); $tags['BACKLINK'] = '<a href="index.php?module=article&op=viewhistory&id='. $_REQUEST['id'].'">' . dgettext('article', 'Back To Revision History').'</a>'; Index: Article.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/article/class/Article.php,v retrieving revision 1.63 retrieving revision 1.64 diff -C2 -d -r1.63 -r1.64 *** Article.php 26 Feb 2009 23:47:29 -0000 1.63 --- Article.php 2 Jan 2011 23:34:26 -0000 1.64 *************** *** 188,192 **** require_once(PHPWS_SOURCE_DIR . 'lib/pear/XML/Unserializer.php'); // Instantiate the unserializer ! $unserializer = &new XML_unserializer(); // Unserialize the data structure $status = $unserializer->unserialize($this->pages); --- 188,192 ---- require_once(PHPWS_SOURCE_DIR . 'lib/pear/XML/Unserializer.php'); // Instantiate the unserializer ! $unserializer =new XML_unserializer(); // Unserialize the data structure $status = $unserializer->unserialize($this->pages); *************** *** 433,437 **** return dgettext('article', 'The article you requested is not viewable.'); } ! $key = & new Key($this->key_id); if (!$key->allowView()) return dgettext('article', 'Sorry you do not have permission to view this article.'); --- 433,437 ---- return dgettext('article', 'The article you requested is not viewable.'); } ! $key = new Key($this->key_id); if (!$key->allowView()) return dgettext('article', 'Sorry you do not have permission to view this article.'); *************** *** 570,574 **** function delete () { ! $key = & new Key($this->key_id); $key->active = 0; $result = $key->save(); --- 570,574 ---- function delete () { ! $key = new Key($this->key_id); $key->active = 0; $result = $key->save(); *************** *** 832,836 **** if (!$id) $id = $this->id; ! $db = & new PHPWS_DB('article'); $db->addWhere('id', $id); $db->addValue('hits', ++$this->hits); --- 832,836 ---- if (!$id) $id = $this->id; ! $db = new PHPWS_DB('article'); $db->addWhere('id', $id); $db->addValue('hits', ++$this->hits); *************** *** 848,857 **** function set_data($data) { ! $db = & new PHPWS_DB('article'); $db->addWhere('id', $this->id); foreach ($data AS $row) $db->addValue($row[0], $row[1]); $db->update(); ! $db = & new PHPWS_DB('article_version'); $db->addWhere('vr_current', 1); $db->addWhere('vr_approved', 0, '=', 'or'); --- 848,857 ---- function set_data($data) { ! $db = new PHPWS_DB('article'); $db->addWhere('id', $this->id); foreach ($data AS $row) $db->addValue($row[0], $row[1]); $db->update(); ! $db = new PHPWS_DB('article_version'); $db->addWhere('vr_current', 1); $db->addWhere('vr_approved', 0, '=', 'or'); *************** *** 962,966 **** */ function get_version_ids($sourceId){ ! $version_db = & new PHPWS_DB('article_version'); $version_db->addColumn('id'); $version_db->addWhere('source_id', $sourceId); --- 962,966 ---- */ function get_version_ids($sourceId){ ! $version_db = new PHPWS_DB('article_version'); $version_db->addColumn('id'); $version_db->addWhere('source_id', $sourceId); *************** *** 1042,1046 **** PHPWS_Core::initModClass('version', 'Version.php'); ! $version = & new Version('article', $this->_version_id); $version->loadObject($this); $this->unserialize_sections(); --- 1042,1046 ---- PHPWS_Core::initModClass('version', 'Version.php'); ! $version = new Version('article', $this->_version_id); $version->loadObject($this); $this->unserialize_sections(); |
|
From: Eloi G. <ada...@us...> - 2011-01-02 23:34:34
|
Update of /cvsroot/phpwebsite-comm/modules/article/inc In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv17872/inc Modified Files: runtime_categorized.php runtime.php A_save.php runtime_chronological.php xmlrpc.php Log Message: + Assigning the return value of new by reference is deprecated in PHP 5. Index: xmlrpc.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/article/inc/xmlrpc.php,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** xmlrpc.php 21 Nov 2008 06:13:14 -0000 1.11 --- xmlrpc.php 2 Jan 2011 23:34:23 -0000 1.12 *************** *** 334,338 **** $version_list = PHPWS_Article::get_version_ids($args[0]); $version_id = $version_list[0]; ! $version = & new Version('article', $version_id); $version->loadObject($article); $article->unserialize_sections(); --- 334,338 ---- $version_list = PHPWS_Article::get_version_ids($args[0]); $version_id = $version_list[0]; ! $version = new Version('article', $version_id); $version->loadObject($article); $article->unserialize_sections(); *************** *** 365,369 **** function metaWeblog_getRecentPosts($args) { ! $db = & new PHPWS_DB('article'); $db->addColumn('id'); $db->addWhere('sectioncount', '1'); --- 365,369 ---- function metaWeblog_getRecentPosts($args) { ! $db = new PHPWS_DB('article'); $db->addColumn('id'); $db->addWhere('sectioncount', '1'); *************** *** 397,401 **** function mt_getRecentPostTitles($args) { ! $db = & new PHPWS_DB('article'); $db->addColumn('id'); $db->addColumn('created_date'); --- 397,401 ---- function mt_getRecentPostTitles($args) { ! $db = new PHPWS_DB('article'); $db->addColumn('id'); $db->addColumn('created_date'); Index: runtime_chronological.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/article/inc/runtime_chronological.php,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** runtime_chronological.php 21 Jan 2009 16:27:18 -0000 1.16 --- runtime_chronological.php 2 Jan 2011 23:34:23 -0000 1.17 *************** *** 36,40 **** 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'); --- 36,40 ---- 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'); *************** *** 49,53 **** /* 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'); --- 49,53 ---- /* 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'); *************** *** 82,86 **** if (count($result)) { ! $tpl = & new PHPWS_Template('article'); $status = $tpl->setFile('runtime_chronological.tpl'); $columns = $config['display_columns']; --- 82,86 ---- if (count($result)) { ! $tpl = new PHPWS_Template('article'); $status = $tpl->setFile('runtime_chronological.tpl'); $columns = $config['display_columns']; *************** *** 94,98 **** 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); --- 94,98 ---- 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); Index: A_save.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/article/inc/A_save.php,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** A_save.php 26 Jan 2009 03:14:07 -0000 1.24 --- A_save.php 2 Jan 2011 23:34:23 -0000 1.25 *************** *** 21,25 **** return false; ! $db = & new PHPWS_DB('article'); /* Process all sections */ --- 21,25 ---- return false; ! $db = new PHPWS_DB('article'); /* Process all sections */ *************** *** 139,143 **** /* 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)) --- 139,143 ---- /* 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)) Index: runtime.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/article/inc/runtime.php,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** runtime.php 21 Jan 2009 16:27:18 -0000 1.19 --- runtime.php 2 Jan 2011 23:34:23 -0000 1.20 *************** *** 18,22 **** /* Display the homepage articles */ ! $db = & new PHPWS_DB('article'); $db->addWhere('mainarticle', '1'); Key::restrictView($db, 'article'); --- 18,22 ---- /* Display the homepage articles */ ! $db = new PHPWS_DB('article'); $db->addWhere('mainarticle', '1'); Key::restrictView($db, 'article'); *************** *** 53,57 **** { /* Load all articles at once */ ! $db = & new PHPWS_DB('article'); $db->addColumn('id'); $db->addColumn('title'); --- 53,57 ---- { /* Load all articles at once */ ! $db = new PHPWS_DB('article'); $db->addColumn('id'); $db->addColumn('title'); Index: runtime_categorized.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/article/inc/runtime_categorized.php,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** runtime_categorized.php 21 Jan 2009 16:27:18 -0000 1.13 --- runtime_categorized.php 2 Jan 2011 23:34:23 -0000 1.14 *************** *** 35,39 **** $content[] = $result; ! $category = & new Category($cat_id); $a = array('CATEGORY_NAME' => $category->getViewLink('article'), 'CATEGORY_DESCRIPTION' => $category->getDescription()); --- 35,39 ---- $content[] = $result; ! $category = new Category($cat_id); $a = array('CATEGORY_NAME' => $category->getViewLink('article'), 'CATEGORY_DESCRIPTION' => $category->getDescription()); *************** *** 61,65 **** if (count($content)) { ! $tpl = & new PHPWS_Template('article'); $status = $tpl->setFile('runtime_categorized.tpl'); $columns = $config['display_columns']; --- 61,65 ---- if (count($content)) { ! $tpl = new PHPWS_Template('article'); $status = $tpl->setFile('runtime_categorized.tpl'); $columns = $config['display_columns']; |
|
From: Verdon V. <ve...@us...> - 2009-06-05 21:07:38
|
Update of /cvsroot/phpwebsite-comm/modules/rolodex/docs In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv5925/docs Modified Files: CHANGELOG Log Message: 1.3.1 prep Index: CHANGELOG =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/rolodex/docs/CHANGELOG,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** CHANGELOG 24 Nov 2008 04:11:57 -0000 1.17 --- CHANGELOG 5 Jun 2009 21:06:16 -0000 1.18 *************** *** 92,93 **** --- 92,106 ---- + Updated CAPTCHA support + Version 1.3.1 -- Nov 2008 + ------------------------------------------------------------------ + + Fixed bug in printCVS function + + Improved privacy in CVS export + + Changed email hiding to hide from all but admins + + Fixed a minor display issue with instances of getDisplay_name() + + + Fixed bug in thumbnail linking to 1.6 url rewriting + + Fixed bug in RDX_Runtime that was usually causing the sideblock + to not show for logged in users (thanks trf000) + + + + |
|
From: Verdon V. <ve...@us...> - 2009-06-05 21:07:24
|
Update of /cvsroot/phpwebsite-comm/modules/rolodex/class In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv5925/class Modified Files: RDX_Forms.php RDX_Location.php RDX_Member.php RDX_Runtime.php Rolodex.php Log Message: 1.3.1 prep Index: RDX_Forms.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/rolodex/class/RDX_Forms.php,v retrieving revision 1.28 retrieving revision 1.29 diff -C2 -d -r1.28 -r1.29 *** RDX_Forms.php 24 Nov 2008 04:11:57 -0000 1.28 --- RDX_Forms.php 5 Jun 2009 21:06:16 -0000 1.29 *************** *** 42,46 **** case 'edit_member': if (empty($this->rolodex->member)) { ! $this->rolodex->loadMember($_REQUEST['user_id']); // I don't think the id in here matters but am unsure? } --- 42,47 ---- case 'edit_member': if (empty($this->rolodex->member)) { ! // $this->rolodex->loadMember($_REQUEST['user_id']); // I don't think the id in here matters but am unsure? ! $this->rolodex->loadMember(); // I don't think the id in here matters but am unsure? } *************** *** 1054,1058 **** $form->addCheckbox('email_privacy', 1); $form->setMatch('email_privacy', $member->email_privacy); ! $form->setLabel('email_privacy', dgettext('rolodex', 'Hide Email/Contact link from public')); if (PHPWS_Settings::get('rolodex', 'custom1_name')) { --- 1055,1059 ---- $form->addCheckbox('email_privacy', 1); $form->setMatch('email_privacy', $member->email_privacy); ! $form->setLabel('email_privacy', dgettext('rolodex', 'Hide Email/Contact link from everyone, except admins')); if (PHPWS_Settings::get('rolodex', 'custom1_name')) { Index: RDX_Runtime.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/rolodex/class/RDX_Runtime.php,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** RDX_Runtime.php 20 Nov 2008 22:49:33 -0000 1.5 --- RDX_Runtime.php 5 Jun 2009 21:06:16 -0000 1.6 *************** *** 48,52 **** $db->addWhere('privacy', 0); } else { ! $db->addWhere('privacy', 1); } if (PHPWS_Settings::get('rolodex', 'block_order_by_rand')) { --- 48,53 ---- $db->addWhere('privacy', 0); } else { ! $db->addWhere('privacy', 0); ! $db->addWhere('privacy', 1, '=', 'or'); } if (PHPWS_Settings::get('rolodex', 'block_order_by_rand')) { Index: Rolodex.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/rolodex/class/Rolodex.php,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** Rolodex.php 24 Nov 2008 04:11:57 -0000 1.23 --- Rolodex.php 5 Jun 2009 21:06:16 -0000 1.24 *************** *** 513,517 **** case 'message_member': $this->loadForm('message_member'); ! $this->title = sprintf(dgettext('rolodex', 'Send a message to %s'), $this->member->getDisplay_name()); break; --- 513,517 ---- case 'message_member': $this->loadForm('message_member'); ! $this->title = sprintf(dgettext('rolodex', 'Send a message to %s'), $this->member->getDisplay_name(true)); break; *************** *** 527,531 **** } else { $this->loadForm('message_member'); ! $this->title = sprintf(dgettext('rolodex', 'Send a message to %s'), $this->member->getDisplay_name()); } break; --- 527,531 ---- } else { $this->loadForm('message_member'); ! $this->title = sprintf(dgettext('rolodex', 'Send a message to %s'), $this->member->getDisplay_name(true)); } break; Index: RDX_Location.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/rolodex/class/RDX_Location.php,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** RDX_Location.php 20 Nov 2008 22:49:33 -0000 1.7 --- RDX_Location.php 5 Jun 2009 21:06:16 -0000 1.8 *************** *** 148,151 **** --- 148,152 ---- { $vars['location'] = $this->id; + $links = null; if (Current_User::allow('rolodex', 'settings', null, null, true)){ Index: RDX_Member.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/rolodex/class/RDX_Member.php,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** RDX_Member.php 20 Nov 2008 22:49:33 -0000 1.19 --- RDX_Member.php 5 Jun 2009 21:06:16 -0000 1.20 *************** *** 204,208 **** } if ($print) { ! return sprintf('<img src="images/rolodex/%s" width="%s" height="%s" alt="%s" />', $this->image['name'], $this->image['width'], $this->image['height'], $this->getDisplay_name()); } else { return $this->image; --- 204,208 ---- } if ($print) { ! return sprintf('<img src="images/rolodex/%s" width="%s" height="%s" alt="%s" />', $this->image['name'], $this->image['width'], $this->image['height'], $this->getDisplay_name(true)); } else { return $this->image; *************** *** 217,225 **** } if ($print) { if ($link) { ! $thumb = sprintf('<img src="images/rolodex/%s" width="%s" height="%s" alt="%s" />', $this->image['thumb_name'], $this->image['thumb_width'], $this->image['thumb_height'], $this->getDisplay_name()); ! return PHPWS_Text::rewriteLink($thumb, 'rolodex', $this->user_id); } else { ! return sprintf('<img src="images/rolodex/%s" width="%s" height="%s" alt="%s" />', $this->image['thumb_name'], $this->image['thumb_width'], $this->image['thumb_height'], $this->getDisplay_name()); } } else { --- 217,225 ---- } if ($print) { + $thumb = sprintf('<img src="images/rolodex/%s" width="%s" height="%s" alt="%s" />', $this->image['thumb_name'], $this->image['thumb_width'], $this->image['thumb_height'], $this->getDisplay_name(true)); if ($link) { ! return sprintf('<a href="%s">%s</a>', $this->viewLink(false, true), $thumb); } else { ! return $thumb; } } else { *************** *** 525,531 **** } else { if (PHPWS_Settings::get('rolodex', 'contact_type')) { ! return PHPWS_Text::moduleLink($this->getDisplay_name(), "rolodex", array('uop'=>'message_member', 'id'=>$this->user_id)); } else { ! return '<a href="mailto:' . $this->contact_email . '" />' . $this->getDisplay_name() . '</a>'; } } --- 525,531 ---- } else { if (PHPWS_Settings::get('rolodex', 'contact_type')) { ! return PHPWS_Text::moduleLink($this->getDisplay_name(true), "rolodex", array('uop'=>'message_member', 'id'=>$this->user_id)); } else { ! return '<a href="mailto:' . $this->contact_email . '" />' . $this->getDisplay_name(true) . '</a>'; } } *************** *** 556,562 **** } else { if (PHPWS_Settings::get('rolodex', 'contact_type')) { ! return PHPWS_Text::moduleLink($this->getDisplay_name(), "rolodex", array('uop'=>'message_member', 'id'=>$this->user_id)); } else { ! return '<a href="mailto:' . $email . '" />' . $this->getDisplay_name() . '</a>'; } } --- 556,562 ---- } else { if (PHPWS_Settings::get('rolodex', 'contact_type')) { ! return PHPWS_Text::moduleLink($this->getDisplay_name(true), "rolodex", array('uop'=>'message_member', 'id'=>$this->user_id)); } else { ! return '<a href="mailto:' . $email . '" />' . $this->getDisplay_name(true) . '</a>'; } } *************** *** 589,593 **** return sprintf('<a href="%s" title="%s">%s</a>', $this->tidyUrl($this->website), ! sprintf(dgettext('rolodex', '%s\'s Website'), $this->getDisplay_name()), PHPWS_Text::shortenUrl($this->tidyUrl($this->website))); } --- 589,593 ---- return sprintf('<a href="%s" title="%s">%s</a>', $this->tidyUrl($this->website), ! sprintf(dgettext('rolodex', '%s\'s Website'), $this->getDisplay_name(true)), PHPWS_Text::shortenUrl($this->tidyUrl($this->website))); } *************** *** 1160,1164 **** $tpl['MEMBER_LINKS'] = $this->memberLinks(); ! Layout::addPageTitle($this->getDisplay_name()); $tpl['TITLE'] = $this->getDisplay_name(true); $tpl['DESCRIPTION'] = PHPWS_Text::parseTag($this->getDescription(true)); --- 1160,1164 ---- $tpl['MEMBER_LINKS'] = $this->memberLinks(); ! Layout::addPageTitle($this->getDisplay_name(true)); $tpl['TITLE'] = $this->getDisplay_name(true); $tpl['DESCRIPTION'] = PHPWS_Text::parseTag($this->getDescription(true)); *************** *** 1217,1225 **** if ($this->isDataVisible('privacy_contact')) { ! if ($this->email_privacy && !Current_User::getId()) { $tpl['CONTACT_EMAIL'] = null; $tpl['CONTACT_EMAIL_LABEL'] = null; } else { $tpl['CONTACT_EMAIL'] = $this->getDisplay_email(true); $tpl['CONTACT_EMAIL_LABEL'] = dgettext('rolodex', 'E-mail'); } --- 1217,1228 ---- if ($this->isDataVisible('privacy_contact')) { ! if ($this->email_privacy && !Current_User::allow('rolodex', 'view_privates')) { $tpl['CONTACT_EMAIL'] = null; $tpl['CONTACT_EMAIL_LABEL'] = null; } else { $tpl['CONTACT_EMAIL'] = $this->getDisplay_email(true); + if (Current_User::allow('rolodex', 'view_privates')) { + $tpl['CONTACT_EMAIL'] .= ' (' . $this->getDisplay_email() . ')'; + } $tpl['CONTACT_EMAIL_LABEL'] = dgettext('rolodex', 'E-mail'); } *************** *** 1365,1369 **** $vars['aop'] = 'delete_member'; $js['ADDRESS'] = PHPWS_Text::linkAddress('rolodex', $vars, true); ! $js['QUESTION'] = sprintf(dgettext('rolodex', 'Are you sure you want to delete the member %s?\nDemographic information will be retained for other modules, but all Rolodex member information will be permanently removed.'), addslashes(htmlspecialchars_decode($this->getDisplay_name(),ENT_QUOTES))); $js['LINK'] = dgettext('rolodex', 'Delete'); $links[] = javascript('confirm', $js); --- 1368,1372 ---- $vars['aop'] = 'delete_member'; $js['ADDRESS'] = PHPWS_Text::linkAddress('rolodex', $vars, true); ! $js['QUESTION'] = sprintf(dgettext('rolodex', 'Are you sure you want to delete the member %s?\nDemographic information will be retained for other modules, but all Rolodex member information will be permanently removed.'), addslashes(htmlspecialchars_decode($this->getDisplay_name(true),ENT_QUOTES))); $js['LINK'] = dgettext('rolodex', 'Delete'); $links[] = javascript('confirm', $js); *************** *** 1377,1381 **** $tpl['THUMBNAIL'] = $this->getThumbnail(true, true); if ($this->isDataVisible('privacy_contact')) { ! if ($this->email_privacy && !Current_User::getId()) { $tpl['CONTACT_EMAIL_LINK'] = ''; } else { --- 1380,1385 ---- $tpl['THUMBNAIL'] = $this->getThumbnail(true, true); if ($this->isDataVisible('privacy_contact')) { ! // if ($this->email_privacy && !Current_User::getId()) { ! if ($this->email_privacy && !Current_User::allow('rolodex', 'view_privates')) { $tpl['CONTACT_EMAIL_LINK'] = ''; } else { *************** *** 1546,1552 **** if ($icon) { ! $name = $this->getDisplay_name() . sprintf(' <img src="images/mod/rolodex/view.gif" alt="%s" title="%s" />', dgettext('rolodex', 'View Details'), dgettext('rolodex', 'View Details')); } else { ! $name = $this->getDisplay_name(); } --- 1550,1556 ---- if ($icon) { ! $name = $this->getDisplay_name(true) . sprintf(' <img src="images/mod/rolodex/view.gif" alt="%s" title="%s" />', dgettext('rolodex', 'View Details'), dgettext('rolodex', 'View Details')); } else { ! $name = $this->getDisplay_name(true); } *************** *** 1870,1874 **** $key->setUrl($this->viewLink(false,true)); $key->active = (int)$this->active; ! $key->setTitle($this->getDisplay_name()); $key->setSummary($this->description); $result = $key->save(); --- 1874,1878 ---- $key->setUrl($this->viewLink(false,true)); $key->active = (int)$this->active; ! $key->setTitle($this->getDisplay_name(true)); $key->setSummary($this->description); $result = $key->save(); *************** *** 1967,1989 **** $content .= '"' . dgettext('rolodex', 'Location(s)') . '",'; $content .= '"' . dgettext('rolodex', 'Feature(s)') . '",'; ! $content .= '"' . dgettext('rolodex', 'E-Mail') . '",'; ! $content .= '"' . dgettext('rolodex', 'Website') . '",'; ! $content .= '"' . dgettext('rolodex', 'Business phone') . '",'; ! $content .= '"' . dgettext('rolodex', 'Ext') . '",'; ! $content .= '"' . dgettext('rolodex', 'Home phone') . '",'; ! $content .= '"' . dgettext('rolodex', 'Fax') . '",'; ! $content .= '"' . dgettext('rolodex', 'Toll-free phone') . '",'; ! $content .= '"' . dgettext('rolodex', 'Home Address 1') . '",'; ! $content .= '"' . dgettext('rolodex', 'Home Address 2') . '",'; ! $content .= '"' . dgettext('rolodex', 'Home City') . '",'; ! $content .= '"' . dgettext('rolodex', 'Home Province/State') . '",'; ! $content .= '"' . dgettext('rolodex', 'Home Country') . '",'; ! $content .= '"' . dgettext('rolodex', 'Home Postal/Zip') . '",'; ! $content .= '"' . dgettext('rolodex', 'Business Address 1') . '",'; ! $content .= '"' . dgettext('rolodex', 'Business Address 2') . '",'; ! $content .= '"' . dgettext('rolodex', 'Business City') . '",'; ! $content .= '"' . dgettext('rolodex', 'Business Province/State') . '",'; ! $content .= '"' . dgettext('rolodex', 'Business Country') . '",'; ! $content .= '"' . dgettext('rolodex', 'Business Postal/Zip') . '",'; if (PHPWS_Settings::get('rolodex', 'custom1_name')) --- 1971,2005 ---- $content .= '"' . dgettext('rolodex', 'Location(s)') . '",'; $content .= '"' . dgettext('rolodex', 'Feature(s)') . '",'; ! if (Rolodex_member::isDataVisible('privacy_contact')) { ! $content .= '"' . dgettext('rolodex', 'E-Mail') . '",'; ! } ! if (Rolodex_member::isDataVisible('privacy_web')) { ! $content .= '"' . dgettext('rolodex', 'Website') . '",'; ! } ! if (Rolodex_member::isDataVisible('privacy_bus_phone')) { ! $content .= '"' . dgettext('rolodex', 'Business phone') . '",'; ! $content .= '"' . dgettext('rolodex', 'Ext') . '",'; ! $content .= '"' . dgettext('rolodex', 'Fax') . '",'; ! $content .= '"' . dgettext('rolodex', 'Toll-free phone') . '",'; ! } ! if (Rolodex_member::isDataVisible('privacy_home_phone')) { ! $content .= '"' . dgettext('rolodex', 'Home phone') . '",'; ! } ! if (Rolodex_member::isDataVisible('privacy_home')) { ! $content .= '"' . dgettext('rolodex', 'Home Address 1') . '",'; ! $content .= '"' . dgettext('rolodex', 'Home Address 2') . '",'; ! $content .= '"' . dgettext('rolodex', 'Home City') . '",'; ! $content .= '"' . dgettext('rolodex', 'Home Province/State') . '",'; ! $content .= '"' . dgettext('rolodex', 'Home Country') . '",'; ! $content .= '"' . dgettext('rolodex', 'Home Postal/Zip') . '",'; ! } ! if (Rolodex_member::isDataVisible('privacy_business')) { ! $content .= '"' . dgettext('rolodex', 'Business Address 1') . '",'; ! $content .= '"' . dgettext('rolodex', 'Business Address 2') . '",'; ! $content .= '"' . dgettext('rolodex', 'Business City') . '",'; ! $content .= '"' . dgettext('rolodex', 'Business Province/State') . '",'; ! $content .= '"' . dgettext('rolodex', 'Business Country') . '",'; ! $content .= '"' . dgettext('rolodex', 'Business Postal/Zip') . '",'; ! } if (PHPWS_Settings::get('rolodex', 'custom1_name')) *************** *** 2023,2050 **** $content .= '"' . $this->getHonorific() . '",'; $content .= '"' . $this->getBusiness_name() . '",'; ! $content .= '"' . $this->getDepartment . '",'; ! $content .= '"' . $this->getPosition_title . '",'; $content .= '"' . implode('; ', $this->get_categories(true, true)) . '",'; $content .= '"' . implode('; ', $this->get_locations(true, true)) . '",'; $content .= '"' . implode('; ', $this->get_features(true, true)) . '",'; ! $content .= '"' . $this->getDisplay_email() . '",'; ! $content .= '"' . $this->getWebsite() . '",'; ! $content .= '"' . $this->getDay_phone() . '",'; ! $content .= '"' . $this->getDay_phone_ext() . '",'; ! $content .= '"' . $this->getEvening_phone() . '",'; ! $content .= '"' . $this->getFax_number() . '",'; ! $content .= '"' . $this->getTollfree_phone() . '",'; ! $content .= '"' . $this->getMailing_address_1() . '",'; ! $content .= '"' . $this->getMailing_address_2() . '",'; ! $content .= '"' . $this->getMailing_city() . '",'; ! $content .= '"' . $this->getMailing_state() . '",'; ! $content .= '"' . $this->getMailing_country() . '",'; ! $content .= '"' . $this->getMailing_zip_code() . '",'; ! $content .= '"' . $this->getBusiness_address_1() . '",'; ! $content .= '"' . $this->getBusiness_address_2() . '",'; ! $content .= '"' . $this->getBusiness_city() . '",'; ! $content .= '"' . $this->getBusiness_state() . '",'; ! $content .= '"' . $this->getBusiness_country() . '",'; ! $content .= '"' . $this->getBusiness_zip_code() . '",'; if (PHPWS_Settings::get('rolodex', 'custom1_name')) --- 2039,2082 ---- $content .= '"' . $this->getHonorific() . '",'; $content .= '"' . $this->getBusiness_name() . '",'; ! $content .= '"' . $this->getDepartment() . '",'; ! $content .= '"' . $this->getPosition_title() . '",'; $content .= '"' . implode('; ', $this->get_categories(true, true)) . '",'; $content .= '"' . implode('; ', $this->get_locations(true, true)) . '",'; $content .= '"' . implode('; ', $this->get_features(true, true)) . '",'; ! if ($this->isDataVisible('privacy_contact')) { ! if ($this->email_privacy && !Current_User::allow('rolodex', 'view_privates')) { ! $content .= '"' . dgettext('rolodex', 'private') . '",'; ! } else { ! $content .= '"' . $this->getDisplay_email() . '",'; ! } ! } ! if ($this->isDataVisible('privacy_web')) { ! $content .= '"' . $this->getWebsite() . '",'; ! } ! if ($this->isDataVisible('privacy_bus_phone')) { ! $content .= '"' . $this->getDay_phone() . '",'; ! $content .= '"' . $this->getDay_phone_ext() . '",'; ! $content .= '"' . $this->getFax_number() . '",'; ! $content .= '"' . $this->getTollfree_phone() . '",'; ! } ! if ($this->isDataVisible('privacy_home_phone')) { ! $content .= '"' . $this->getEvening_phone() . '",'; ! } ! if ($this->isDataVisible('privacy_home')) { ! $content .= '"' . $this->getMailing_address_1() . '",'; ! $content .= '"' . $this->getMailing_address_2() . '",'; ! $content .= '"' . $this->getMailing_city() . '",'; ! $content .= '"' . $this->getMailing_state() . '",'; ! $content .= '"' . $this->getMailing_country() . '",'; ! $content .= '"' . $this->getMailing_zip_code() . '",'; ! } ! if ($this->isDataVisible('privacy_business')) { ! $content .= '"' . $this->getBusiness_address_1() . '",'; ! $content .= '"' . $this->getBusiness_address_2() . '",'; ! $content .= '"' . $this->getBusiness_city() . '",'; ! $content .= '"' . $this->getBusiness_state() . '",'; ! $content .= '"' . $this->getBusiness_country() . '",'; ! $content .= '"' . $this->getBusiness_zip_code() . '",'; ! } if (PHPWS_Settings::get('rolodex', 'custom1_name')) *************** *** 2090,2097 **** $url = PHPWS_Core::getHomeHttp(); if ($new) { ! $message = sprintf(dgettext('rolodex', 'You have a new %s application from %s waiting for your review at %s.'), PHPWS_Settings::get('rolodex', 'module_title'), $this->getDisplay_name(), $url); $subject = sprintf(dgettext('rolodex', 'Pending %s Application'), PHPWS_Settings::get('rolodex', 'module_title')); } else { ! $message = sprintf(dgettext('rolodex', 'The %s profile for %s has been modified at %s.'), PHPWS_Settings::get('rolodex', 'module_title'), $this->getDisplay_name(), $url); $subject = sprintf(dgettext('rolodex', 'Modified %s Profile'), PHPWS_Settings::get('rolodex', 'module_title')); } --- 2122,2129 ---- $url = PHPWS_Core::getHomeHttp(); if ($new) { ! $message = sprintf(dgettext('rolodex', 'You have a new %s application from %s waiting for your review at %s.'), PHPWS_Settings::get('rolodex', 'module_title'), $this->getDisplay_name(true), $url); $subject = sprintf(dgettext('rolodex', 'Pending %s Application'), PHPWS_Settings::get('rolodex', 'module_title')); } else { ! $message = sprintf(dgettext('rolodex', 'The %s profile for %s has been modified at %s.'), PHPWS_Settings::get('rolodex', 'module_title'), $this->getDisplay_name(true), $url); $subject = sprintf(dgettext('rolodex', 'Modified %s Profile'), PHPWS_Settings::get('rolodex', 'module_title')); } |
|
From: Verdon V. <ve...@us...> - 2009-06-05 21:04:42
|
Update of /cvsroot/phpwebsite-comm/modules/podcaster/docs In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv5375/docs Added Files: README Log Message: added readme --- NEW FILE: README --- <p>This is the third release of podcaster for the new 1.x series phpwebsite. This release takes advantage of the new File Cabinet 2.0 features, and media upload/embed tools are now built right in. Support for PDF and other documents types has also been added. Podcaster is now searchable with the search module, and new access module and short url features are implimented.<p> <p>A note on media types: You may specify at a channel level what media type you will allow for all episodes in that channel. Ideally, you should determine this before adding episodes to a channel, though it can be changed at any time.</p> <p>A note on restricted users: If you are allowing restricted users to add podcast episodes, you will also need to allow them to upload to the appropriate folder(s) in File Cabinet.</p> <p>A note on permissons: Honestly, I'm still working on understanding the new system completely. I've done a basic security audit and although I am sure there is no gross holes, I'm sure I may have something wrong too ;-) I wanted to get this rewrite out asap and will do a more thorough permissioning review for the next podcaster release.</p> |
|
From: Greg M. <bli...@us...> - 2009-03-23 03:30:56
|
Update of /cvsroot/phpwebsite-comm/CVSROOT In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv32422 Modified Files: avail Log Message: Giving Verdon access to vmail Index: avail =================================================================== RCS file: /cvsroot/phpwebsite-comm/CVSROOT/avail,v retrieving revision 1.75 retrieving revision 1.76 diff -C2 -d -r1.75 -r1.76 *** avail 25 Nov 2008 16:07:12 -0000 1.75 --- avail 23 Mar 2009 03:30:49 -0000 1.76 *************** *** 37,40 **** --- 37,41 ---- avail|blindman1344|modules/twitter avail|gbrackett|modules/uplink + avail|verdonv|modules/vmail avail|verdonv|modules/vshop avail|techelephant|modules/wapstat |
|
From: Verdon V. <ve...@us...> - 2009-03-04 15:33:15
|
Update of /cvsroot/phpwebsite-comm/modules/vshop/class In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv756/class Modified Files: Tag: VSHOP-0-6-1 vShop.php vShop_Tax.php Log Message: 6.0.1 backports from future Index: vShop.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/vshop/class/vShop.php,v retrieving revision 1.4 retrieving revision 1.4.2.1 diff -C2 -d -r1.4 -r1.4.2.1 *** vShop.php 3 Dec 2008 22:17:42 -0000 1.4 --- vShop.php 4 Mar 2009 15:33:03 -0000 1.4.2.1 *************** *** 144,148 **** } else { $this->forwardMessage(dgettext('vshop', 'Item saved successfully.')); ! PHPWS_Core::reroute('index.php?module=vshop&dept='.$this->item->dept_id); } } else { --- 144,149 ---- } else { $this->forwardMessage(dgettext('vshop', 'Item saved successfully.')); ! // old PHPWS_Core::reroute('index.php?module=vshop&dept='.$this->item->dept_id); ! PHPWS_Core::reroute('index.php?module=vshop&aop=menu&tab=list_items&dept='.$this->item->dept_id); // new from wendall } } else { *************** *** 432,436 **** $new_qty = $qty_incart + $qty; } ! if (PHPWS_Settings::get('vshop', 'use_inventory') && $new_qty <= $this->item->stock) { $cart->addItems($this->item->id, null, $qty); $this->forwardMessage(sprintf(dgettext('vshop', '%s successfully added to your cart.'), $this->item->getTitle(true))); --- 433,438 ---- $new_qty = $qty_incart + $qty; } ! // old if (PHPWS_Settings::get('vshop', 'use_inventory') && $new_qty <= $this->item->stock) { ! if ((PHPWS_Settings::get('vshop', 'use_inventory') && $new_qty <= $this->item->stock) || (!PHPWS_Settings::get('vshop', 'use_inventory'))) { // fixed thanks wendall $cart->addItems($this->item->id, null, $qty); $this->forwardMessage(sprintf(dgettext('vshop', '%s successfully added to your cart.'), $this->item->getTitle(true))); *************** *** 773,777 **** } ! if (!empty($_POST['price']) ) { $this->item->setPrice($_POST['price']); } --- 775,780 ---- } ! // old if (!empty($_POST['price'])) { ! if (is_numeric($_POST['price'])) { $this->item->setPrice($_POST['price']); } *************** *** 781,793 **** $this->item->setTaxable(0) ; ! if (!empty($_POST['stock']) ) { $this->item->setStock((int)$_POST['stock']); } ! if (!empty($_POST['weight']) ) { $this->item->setWeight($_POST['weight']); } ! if (!empty($_POST['shipping']) ) { $this->item->setShipping($_POST['shipping']); } --- 784,799 ---- $this->item->setTaxable(0) ; ! // old if (!empty($_POST['stock'])) { ! if (is_int($_POST['stock'])) { $this->item->setStock((int)$_POST['stock']); } ! // old if (!empty($_POST['weight'])) { ! if (is_numeric($_POST['weight'])) { $this->item->setWeight($_POST['weight']); } ! // old if (!empty($_POST['shipping'])) { ! if (is_numeric($_POST['shipping'])) { $this->item->setShipping($_POST['shipping']); } *************** *** 1312,1316 **** public function navLinks() { ! $links = null; if (!PHPWS_Settings::get('vshop', 'use_breadcrumb')) { if (vShop::countDepts() !== 1) { --- 1318,1322 ---- public function navLinks() { ! $links = array(); if (!PHPWS_Settings::get('vshop', 'use_breadcrumb')) { if (vShop::countDepts() !== 1) { Index: vShop_Tax.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/vshop/class/vShop_Tax.php,v retrieving revision 1.1.1.1 retrieving revision 1.1.1.1.2.1 diff -C2 -d -r1.1.1.1 -r1.1.1.1.2.1 *** vShop_Tax.php 25 Nov 2008 15:19:30 -0000 1.1.1.1 --- vShop_Tax.php 4 Mar 2009 15:33:04 -0000 1.1.1.1.2.1 *************** *** 165,169 **** $links = array(); ! if (Current_User::allow('vshop', 'setting')) { $vars['aop'] = 'edit_tax'; $links[] = PHPWS_Text::secureLink(dgettext('vshop', 'Edit'), 'vshop', $vars); --- 165,169 ---- $links = array(); ! if (Current_User::allow('vshop', 'settings')) { $vars['aop'] = 'edit_tax'; $links[] = PHPWS_Text::secureLink(dgettext('vshop', 'Edit'), 'vshop', $vars); |
|
From: Verdon V. <ve...@us...> - 2009-03-04 15:33:13
|
Update of /cvsroot/phpwebsite-comm/modules/vshop/boost In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv756/boost Modified Files: Tag: VSHOP-0-6-1 boost.php update.php Log Message: 6.0.1 backports from future Index: boost.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/vshop/boost/boost.php,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -C2 -d -r1.2 -r1.2.2.1 *** boost.php 2 Dec 2008 19:43:12 -0000 1.2 --- boost.php 4 Mar 2009 15:29:51 -0000 1.2.2.1 *************** *** 24,28 **** $proper_name = 'vShop'; ! $version = '0.6.0'; $register = false; $unregister = false; --- 24,28 ---- $proper_name = 'vShop'; ! $version = '0.6.1'; $register = false; $unregister = false; Index: update.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/vshop/boost/update.php,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -C2 -d -r1.2 -r1.2.2.1 *** update.php 3 Dec 2008 20:37:45 -0000 1.2 --- update.php 4 Mar 2009 15:29:54 -0000 1.2.2.1 *************** *** 28,32 **** switch ($currentVersion) { ! case version_compare($currentVersion, '0.6.0', '<'): $content[] = '<pre>'; --- 28,32 ---- switch ($currentVersion) { ! case version_compare($currentVersion, '0.6.1', '<'): $content[] = '<pre>'; *************** *** 37,41 **** vshopUpdateFiles($files, $content); ! $content[] = '0.6.0 changes ---------------- + added is_array checks to links() array_merge in dept and item class --- 37,41 ---- vshopUpdateFiles($files, $content); ! $content[] = '0.6.1 changes ---------------- + added is_array checks to links() array_merge in dept and item class *************** *** 45,48 **** --- 45,53 ---- + added ability to have free shipping on orders over $xx.xx + added ability to change order status from within list view + + when saving an item, succes now returns with admin menu (thanks wendall) + + fixed setting links var in navLinks function (thanks wendall) + + fixed bug preventing add to cart when inventory was not being used + and qty in stock is 0 (thanks wendall) + + improved some error checking in post item function (thanks wendall) </pre>'; |
|
From: Verdon V. <ve...@us...> - 2009-03-04 15:33:11
|
Update of /cvsroot/phpwebsite-comm/modules/vshop/docs In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv756/docs Modified Files: Tag: VSHOP-0-6-1 CHANGELOG Log Message: 6.0.1 backports from future Index: CHANGELOG =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/vshop/docs/CHANGELOG,v retrieving revision 1.4 retrieving revision 1.4.2.1 diff -C2 -d -r1.4 -r1.4.2.1 *** CHANGELOG 3 Dec 2008 22:17:42 -0000 1.4 --- CHANGELOG 4 Mar 2009 15:33:04 -0000 1.4.2.1 *************** *** 1,2 **** --- 1,11 ---- + Version 0.6.1 -- Mar 2009 + ------------------------------------------------------------------ + + back-ported the following fixes to 0.6.1 + + when saving an item, succes now returns with admin menu (thanks wendall) + + fixed setting links var in navLinks function (thanks wendall) + + fixed bug preventing add to cart when inventory was not being used + and qty in stock is 0 (thanks wendall) + + improved some error checking in post item function (thanks wendall) + Version 0.6.0 -- Dec 2008 ------------------------------------------------------------------ |
|
From: Verdon V. <ve...@us...> - 2009-03-04 14:48:21
|
Update of /cvsroot/phpwebsite-comm/modules/vshop/docs In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv21558/docs Modified Files: CHANGELOG Log Message: working on attributes Index: CHANGELOG =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/vshop/docs/CHANGELOG,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** CHANGELOG 4 Mar 2009 14:42:24 -0000 1.6 --- CHANGELOG 4 Mar 2009 14:48:15 -0000 1.7 *************** *** 1,6 **** ! Version 0.7.0 -- Dec 2008 - Feb 2009 ------------------------------------------------------------------ ! + added support for product attributes ! + when saving an item, succes now returns with admin menu (thanks wendall) + fixed setting links var in navLinks function (thanks wendall) --- 1,5 ---- ! Version 0.7.1 -- Mar 2009 ------------------------------------------------------------------ ! + back-ported the following fixes to 0.6.1 + when saving an item, succes now returns with admin menu (thanks wendall) + fixed setting links var in navLinks function (thanks wendall) *************** *** 9,12 **** --- 8,15 ---- + improved some error checking in post item function (thanks wendall) + Version 0.7.0 -- Dec 2008 - Feb 2009 + ------------------------------------------------------------------ + + roughed in support for product attributes + Version 0.6.0 -- Dec 2008 ------------------------------------------------------------------ |
