Menu
▾
▴
[phpws-comm-commits] modules/article/class AM_Lists.php, 1.23, 1.24 Article.php, 1.57, 1.58
|
From: Eloi G. <ada...@us...> - 2008-11-21 14:16:30
|
Update of /cvsroot/phpwebsite-comm/modules/article/class In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv19018/class Modified Files: AM_Lists.php Article.php Log Message: mod-rewite URIs now look like the 1.6 spec to insure backwards compatibility Index: AM_Lists.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/article/class/AM_Lists.php,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** AM_Lists.php 21 Nov 2008 06:13:14 -0000 1.23 --- AM_Lists.php 21 Nov 2008 14:16:23 -0000 1.24 *************** *** 403,407 **** Key::restrictView($pager->db, 'article'); if (MOD_REWRITE_ENABLED) ! $link = 'article/news/?'.PHPWS_AM_Lists::http_build_query(PHPWS_AM_Data::get_changed_search_parameters()); else $link = 'index.php?module=article&id=news'.PHPWS_AM_Lists::http_build_query(PHPWS_AM_Data::get_changed_search_parameters()); --- 403,407 ---- Key::restrictView($pager->db, 'article'); if (MOD_REWRITE_ENABLED) ! $link = 'article/id/news/?'.PHPWS_AM_Lists::http_build_query(PHPWS_AM_Data::get_changed_search_parameters()); else $link = 'index.php?module=article&id=news'.PHPWS_AM_Lists::http_build_query(PHPWS_AM_Data::get_changed_search_parameters()); Index: Article.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/article/class/Article.php,v retrieving revision 1.57 retrieving revision 1.58 diff -C2 -d -r1.57 -r1.58 *** Article.php 21 Nov 2008 06:13:14 -0000 1.57 --- Article.php 21 Nov 2008 14:16:23 -0000 1.58 *************** *** 210,214 **** function _get_tags () { ! $page_wanted = 1; if(!empty($_REQUEST['page'])) $page_wanted = (int) $_REQUEST['page']; --- 210,220 ---- 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']; *************** *** 258,265 **** if($this->wordcount>0) { ! if (MOD_REWRITE_ENABLED && $this->id > 0) ! $article_tags['READMORE'] = sprintf('<a href="article/%d">%s</a>', $this->id, dgettext('article', 'Read More')); ! else ! $article_tags['READMORE'] = '[' . sprintf('<a href="index.php?module=article&id=%d">%s</a>', $this->id, dgettext('article', 'Read More')). ']'; $article_tags['MOREWORDS'] = $this->wordcount." ".dgettext('article', 'more words'); $article_tags['MOREPAGES'] = $this->pagecount . ' ' . (($this->pagecount==1) ?dgettext('article', 'page') :dgettext('article', 'pages')); --- 264,268 ---- 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')); *************** *** 330,355 **** } */ - - /* If the Comments module is available, get comments information */ - if(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); - if (MOD_REWRITE_ENABLED && $this->id > 0) - $article_tags['NUM_COMMENTS'] = sprintf('<a href="article/%d#comments">%s</a>', $this->id, $s); - else - $article_tags['NUM_COMMENTS'] = sprintf('<a href="index.php?module=article&id=%d#comments">%s</a>', $this->id, $s); - } /* Develop article content */ $navlist = $navbar = array(); $article_tags['BODYTEXT'] = ''; - if (isset($_REQUEST['op']) && $_REQUEST['op'] == 'view_version') { - $vars['op'] = 'view_version'; - $vars['version_id'] = (int) $_REQUEST['version_id']; - } - else - $vars['id'] = $this->id; if(is_string($this->pages)) --- 333,340 ---- *************** *** 376,389 **** $navbar[] = '['.$pagenum.']'; /* otherwise, create a article link */ ! } else { ! if (MOD_REWRITE_ENABLED && !isset($vars['op']) && $this->id > 0) { ! $navlist[] = sprintf('<a href="article/%d/%d">%s</a>', $this->id, $pagenum, $page_title); ! $navbar[] = sprintf('<a href="article/%d/%d">%s</a>', $this->id, $pagenum, $pagenum); ! } ! else { ! $vars['page'] = $pagenum; ! $navlist[] = PHPWS_Text::moduleLink($page_title, 'article', $vars); ! $navbar[] = PHPWS_Text::moduleLink($pagenum, 'article', $vars); ! } } } --- 361,368 ---- $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); } } *************** *** 407,426 **** $article_tags['PREV'] = $article_tags['NEXT'] = ' '; if ($page_wanted > 1) { ! $vars['page'] = $page_wanted-1; ! if (MOD_REWRITE_ENABLED && !isset($vars['op']) && $this->id > 0) ! $article_tags['PREV'] = sprintf('<a href="article/%d/%d">%s</a>', $this->id, $vars['page'], dgettext('article', 'Previous Page')); ! else ! $article_tags['PREV'] = PHPWS_Text::moduleLink(dgettext('article', 'Previous Page'), 'article', $vars); } if ($page_wanted < $this->pagecount) { $vars['page'] = $page_wanted+1; ! if (MOD_REWRITE_ENABLED && !isset($vars['op']) && $this->id > 0) ! $article_tags['NEXT'] = sprintf('<a href="article/%d/%d">%s</a>', $this->id, $vars['page'], dgettext('article', 'Next Page')); ! else ! $article_tags['NEXT'] = PHPWS_Text::moduleLink(dgettext('article', 'Next Page'), 'article', $vars); ! } } ! unset($vars); return $article_tags; } --- 386,413 ---- $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); } if ($page_wanted < $this->pagecount) { $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; } *************** *** 654,667 **** function get_title_link ($id = null, $title = null) { ! if (!$id) ! $id = $this->id; ! if (!$title) ! $title = $this->title; ! if (MOD_REWRITE_ENABLED && $id > 0) ! $link = sprintf('<a href="article/%d">%s</a>', $id, $title); ! else ! $link = sprintf('<a href="index.php?module=article&id=%d">%s</a>', $id, $title); ! return $link; } /** * Finds a section by id. --- 641,649 ---- function get_title_link ($id = null, $title = null) { ! $vars['id'] = ($id)? $id : $this->id; ! $title = (!empty($title))? $title : $this->title; ! return PHPWS_Text::rewriteLink($title, 'article', $vars); } + /** * Finds a section by id. |
