Menu
▾
▴
[phpws-comm-commits] modules/article/class Article.php,1.21,1.22 ArticleManager.php,1.15,1.16 Section.php,1.12,1.13
|
From: Eloi G. <ada...@us...> - 2004-10-10 15:37:14
|
Update of /cvsroot/phpwebsite-comm/modules/article/class In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11677/class Modified Files: Article.php ArticleManager.php Section.php Log Message: Version 2.8 release files Index: Section.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/article/class/Section.php,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** Section.php 30 Sep 2004 05:14:30 -0000 1.12 --- Section.php 10 Oct 2004 15:35:55 -0000 1.13 *************** *** 205,210 **** { include(PHPWS_SOURCE_DIR . 'mod/article/inc/S_edit.php'); ! return $section_title ! . '<form name="SECT_edit" action="index.php#'.$this->id.'" method="post" enctype="multipart/form-data">' . $tags['HIDDEN'] . PHPWS_Template::processTemplate($tags,'article','edit/section.tpl') --- 205,209 ---- { include(PHPWS_SOURCE_DIR . 'mod/article/inc/S_edit.php'); ! return '<form name="SECT_edit" action="index.php#'.$this->id.'" method="post" enctype="multipart/form-data">' . $tags['HIDDEN'] . PHPWS_Template::processTemplate($tags,'article','edit/section.tpl') Index: Article.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/article/class/Article.php,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** Article.php 30 Sep 2004 05:14:30 -0000 1.21 --- Article.php 10 Oct 2004 15:35:55 -0000 1.22 *************** *** 114,118 **** --- 114,121 ---- . $_SESSION['SES_ART_master']->sql_article_table .' WHERE id = '.$id . $_SESSION['SES_ART_master']->sql_predicate)) + { + $_SESSION['SES_ART_master']->error['article'][] = $_SESSION['translate']->it('Article data could not be found'); return; + } /* Load section data */ $this->order = unserialize($data['section_order']); *************** *** 122,125 **** --- 125,130 ---- while ($row = $result->fetchrow(DB_FETCHMODE_ASSOC)) $this->sections[$row['id']] = new PHPWS_Article_Section($row['id'],$row); + else + $_SESSION['SES_ART_master']->error['article'][] = $_SESSION['translate']->it('Section data could not be found'); } *************** *** 151,156 **** $this->meta_keywords = $data['meta_keywords']; $this->meta_robots = $data['meta_robots']; ! $this->$language = $data['language']; ! $this->$translation_group = $id; } // otherwise this is a new article. Load Default values. --- 156,161 ---- $this->meta_keywords = $data['meta_keywords']; $this->meta_robots = $data['meta_robots']; ! // $this->language = $data['language']; ! // $this->translation_group = $id; } // otherwise this is a new article. Load Default values. *************** *** 190,195 **** $this->announce = 1; $this->meta_keywords = $this->meta_robots = ''; ! $this->$language = $_SESSION['translate']->current_language; ! $this->$translation_group = $data['translation_group']; } } --- 195,200 ---- $this->announce = 1; $this->meta_keywords = $this->meta_robots = ''; ! $this->language = $_SESSION['translate']->current_language; ! $this->translation_group = $data['translation_group']; } } *************** *** 212,216 **** $_SESSION['SES_ART_master']->error['article'][] = $_SESSION['translate']->it('The article you requested either does not exist or is not available to your group.'); ! $_SESSION['SES_ART_master']->get_error('article'); return; } --- 217,221 ---- $_SESSION['SES_ART_master']->error['article'][] = $_SESSION['translate']->it('The article you requested either does not exist or is not available to your group.'); ! $GLOBALS['CNT_article']['content'] = $_SESSION['SES_ART_master']->get_error('article'); return; } *************** *** 220,228 **** $GLOBALS['CNT_article']['title'] = $_SESSION['translate']->it('Sorry!'); if(!$this->approved) ! $GLOBALS['CNT_article']['content'] = $_SESSION['translate']->it('The article you requested is awaiting approval by an administrator.'); else ! $GLOBALS['CNT_article']['content'] = $_SESSION['translate']->it('The article you requested is not viewable.'); PHPWS_Fatcat::deactivate($this->id, 'article'); return; --- 225,234 ---- $GLOBALS['CNT_article']['title'] = $_SESSION['translate']->it('Sorry!'); if(!$this->approved) ! $_SESSION['SES_ART_master']->error['article'][] = $_SESSION['translate']->it('The article you requested is awaiting approval by an administrator.'); else ! $_SESSION['SES_ART_master']->error['article'][] = $_SESSION['translate']->it('The article you requested is not viewable.'); + $GLOBALS['CNT_article']['content'] = $_SESSION['SES_ART_master']->get_error('article'); PHPWS_Fatcat::deactivate($this->id, 'article'); return; *************** *** 231,236 **** /* My copyright statement. Do not disable or remove. */ $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)].'"><img src="http://'.PHPWS_SOURCE_HTTP ! . 'mod/article/img/mark.gif" border="0" title="Article Manager module by by George! Software." alt="Article Manager module by by George! Software."></a>'; $article_link = './index.php?module=article&view='.$this->id; --- 237,242 ---- /* My copyright statement. Do not disable or remove. */ $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="http://'.PHPWS_SOURCE_HTTP ! . 'mod/article/img/mark.gif" border="0" alt="Article Manager module by by George! Software." /></a>'; $article_link = './index.php?module=article&view='.$this->id; *************** *** 241,249 **** $article_tags['SUMMARYTEXT'] = PHPWS_Text::parseOutput($this->summary); if(!$this->approved) ! $article_tags['SUMMARYTEXT'] .= '<br /><span class="errortext">'.$_SESSION['translate']->it('<b>NOTE:</b> This [var1] is awaiting approval. Visitors cannot see it.', $_SESSION['translate']->it('article')).'</span>'; $article_tags['HITS'] = $this->hits; $article_tags['CREATED_DATE'] = date(PHPWS_DATE_FORMAT . ' ' . PHPWS_TIME_FORMAT, (strtotime($this->created_date)+$GLOBALS['core']->datetime->time_dif)); $article_tags['UPDATED_DATE'] = date(PHPWS_DATE_FORMAT . ' ' . PHPWS_TIME_FORMAT, (strtotime($this->updated_date)+$GLOBALS['core']->datetime->time_dif)); ! $article_tags['EXPIRATION_DATE'] = date(PHPWS_DATE_FORMAT . ' ' . PHPWS_TIME_FORMAT, (strtotime($this->expiration_date)+$GLOBALS['core']->datetime->time_dif)); $article_tags['PUBLICATION_DATE'] = date(PHPWS_DATE_FORMAT . ' ' . PHPWS_TIME_FORMAT, (strtotime($this->publication_date)+$GLOBALS['core']->datetime->time_dif)); $article_tags['VERSION'] = $this->version; --- 247,259 ---- $article_tags['SUMMARYTEXT'] = PHPWS_Text::parseOutput($this->summary); if(!$this->approved) ! $article_tags['SUMMARYTEXT'] = PHPWS_Text::parseOutput($this->summary) ! . '<br /><span class="errortext">'.$_SESSION['translate']->it('<b>NOTE:</b> This [var1] is awaiting approval. Visitors cannot see it.', $_SESSION['translate']->it('article')).'</span>'; $article_tags['HITS'] = $this->hits; $article_tags['CREATED_DATE'] = date(PHPWS_DATE_FORMAT . ' ' . PHPWS_TIME_FORMAT, (strtotime($this->created_date)+$GLOBALS['core']->datetime->time_dif)); $article_tags['UPDATED_DATE'] = date(PHPWS_DATE_FORMAT . ' ' . PHPWS_TIME_FORMAT, (strtotime($this->updated_date)+$GLOBALS['core']->datetime->time_dif)); ! if(!empty($this->expiration_date)) ! $article_tags['EXPIRATION_DATE'] = date(PHPWS_DATE_FORMAT . ' ' . PHPWS_TIME_FORMAT, (strtotime($this->expiration_date)+$GLOBALS['core']->datetime->time_dif)); ! else ! $article_tags['EXPIRATION_DATE'] = $_SESSION['translate']->it('Never'); $article_tags['PUBLICATION_DATE'] = date(PHPWS_DATE_FORMAT . ' ' . PHPWS_TIME_FORMAT, (strtotime($this->publication_date)+$GLOBALS['core']->datetime->time_dif)); $article_tags['VERSION'] = $this->version; *************** *** 260,264 **** { $GLOBALS['Layout_title'] = $article_tags['TITLE'] . ' - ' . strip_tags($_SESSION['OBJ_layout']->page_title); ! $_SESSION['OBJ_layout']->meta_vars['meta_description'] = strip_tags($article_tags['SUMMARYTEXT']); $_SESSION['OBJ_layout']->meta_vars['meta_author'] = strip_tags($article_tags['CREATED_USER'].' @ '.PHPWS_HOME_HTTP); $_SESSION['OBJ_layout']->meta_vars['meta_keywords'] = strip_tags($this->meta_keywords); --- 270,275 ---- { $GLOBALS['Layout_title'] = $article_tags['TITLE'] . ' - ' . strip_tags($_SESSION['OBJ_layout']->page_title); ! if(isset($article_tags['SUMMARYTEXT'])) ! $_SESSION['OBJ_layout']->meta_vars['meta_description'] = strip_tags($article_tags['SUMMARYTEXT']); $_SESSION['OBJ_layout']->meta_vars['meta_author'] = strip_tags($article_tags['CREATED_USER'].' @ '.PHPWS_HOME_HTTP); $_SESSION['OBJ_layout']->meta_vars['meta_keywords'] = strip_tags($this->meta_keywords); *************** *** 304,307 **** --- 315,319 ---- if ($this->pages>1 && !$printAll) { + $article_tags['NAVLIST'] = $article_tags['NAVBAR'] = ''; for ($page_count = 1; ($page_count <= $this->pages); $page_count++) { *************** *** 369,379 **** $s = $_SESSION['translate']->it('Printable Version'); $article_tags['PRINT_ICON'] = '<a href="' . $article_link ! .'&lay_quiet=1" target="_blank" style="text-decoration:none" alt="' ! . $s . '" title="'. $s . '"><img src="http://' . PHPWS_SOURCE_HTTP ! . 'mod/article/img/print.gif" border="0" width="22" height="20" alt="'.$s.'" title="'.$s.'"/>'.$_SESSION['translate']->it('Print').'</a>'; $s = $_SESSION['translate']->it('E-mail this Article to a Friend'); $article_tags['EMAIL'] = '<a href="./index.php?module=article&email='.$this->id ! .'" style="text-decoration:none" alt="'.$s.'" title="'.$s.'"><img src="http://'. PHPWS_SOURCE_HTTP ! . 'mod/article/img/mailto.png" border="0" width="19" height="12" alt="'.$s.'" title="'.$s.'"/>'.$_SESSION['translate']->it('eMail').'</a>'; } --- 381,390 ---- $s = $_SESSION['translate']->it('Printable Version'); $article_tags['PRINT_ICON'] = '<a href="' . $article_link ! .'&lay_quiet=1" target="_blank" style="text-decoration:none" title="'. $s . '"><img src="http://' . PHPWS_SOURCE_HTTP ! . 'mod/article/img/print.gif" border="0" width="22" height="20" alt="'.$s.'" />'.$_SESSION['translate']->it('Print').'</a>'; $s = $_SESSION['translate']->it('E-mail this Article to a Friend'); $article_tags['EMAIL'] = '<a href="./index.php?module=article&email='.$this->id ! .'" style="text-decoration:none" title="'.$s.'"><img src="http://'. PHPWS_SOURCE_HTTP ! . 'mod/article/img/mailto.png" border="0" width="19" height="12" alt="'.$s.'" />'.$_SESSION['translate']->it('eMail').'</a>'; } Index: ArticleManager.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/article/class/ArticleManager.php,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** ArticleManager.php 30 Sep 2004 05:14:30 -0000 1.15 --- ArticleManager.php 10 Oct 2004 15:35:55 -0000 1.16 *************** *** 53,56 **** --- 53,57 ---- var $filter; var $date_filter; + var $news_filter; /** *************** *** 106,110 **** /* If search criteria are specified, set them */ ! if ($_POST['LIST_group']) { $this->list_group = $_POST['LIST_group']; --- 107,111 ---- /* If search criteria are specified, set them */ ! if (!empty($_POST['LIST_group'])) { $this->list_group = $_POST['LIST_group']; *************** *** 112,120 **** $this->list_order = $_POST['LIST_order']; } ! if ($_REQUEST['LIST_group'] && array_key_exists($_REQUEST['LIST_group'], $this->group_array)) $this->list_group = $_REQUEST['LIST_group']; ! if ($_REQUEST['LIST_sort'] && array_key_exists($_REQUEST['LIST_sort'], $this->sort_array)) $this->list_sort = $_REQUEST['LIST_sort']; ! if ($_REQUEST['LIST_order'] && array_key_exists($_REQUEST['LIST_order'], $this->order_array)) $this->list_order = $_REQUEST['LIST_order']; --- 113,121 ---- $this->list_order = $_POST['LIST_order']; } ! if (!empty($_REQUEST['LIST_group']) && array_key_exists($_REQUEST['LIST_group'], $this->group_array)) $this->list_group = $_REQUEST['LIST_group']; ! if (!empty($_REQUEST['LIST_sort']) && array_key_exists($_REQUEST['LIST_sort'], $this->sort_array)) $this->list_sort = $_REQUEST['LIST_sort']; ! if (!empty($_REQUEST['LIST_order']) && array_key_exists($_REQUEST['LIST_order'], $this->order_array)) $this->list_order = $_REQUEST['LIST_order']; *************** *** 252,256 **** . ','.PHPWS_TBL_PREFIX.'mod_article_sections AS S ' . $where . ' AND A.id=S.article_id AND '. $this->get_published_sql() ! . $this->sql_predicate . ' ORDER BY updated_date DESC'; $articleResult = $GLOBALS['core']->query($sql); --- 253,257 ---- . ','.PHPWS_TBL_PREFIX.'mod_article_sections AS S ' . $where . ' AND A.id=S.article_id AND '. $this->get_published_sql() ! . $this->sql_predicate . ' GROUP BY A.id ORDER BY updated_date DESC'; $articleResult = $GLOBALS['core']->query($sql); *************** *** 259,263 **** /* Only save/show the first occurence per article */ if (!isset($returnArray[$resultRow['id']])) ! $returnArray[$resultRow['id']] = '<b>' . $resultRow['title'] . '</b><br />' . $resultRow['summary'] . '...'; } return $returnArray; --- 260,264 ---- /* Only save/show the first occurence per article */ if (!isset($returnArray[$resultRow['id']])) ! $returnArray[$resultRow['id']] = '<b>' . $resultRow['title'] . '</b><br />' . $resultRow['summary']; } return $returnArray; *************** *** 298,308 **** $content = true; } ! if (isset($content)) ! { ! $GLOBALS['CNT_article_summaries']['title'] = $_SESSION['translate']->it('Also on this Site') . '...'; ! unset($content); ! } } /* If there are x articles before these, display the "Prev Articles" Block */ if ($this->val['prev_n_articles']>0) { --- 299,309 ---- $content = true; } ! if(!empty($content)) ! $GLOBALS['CNT_article_summaries']['title'] = $_SESSION['translate']->it('Also on this Site...'); ! if($this->can('create')) ! $GLOBALS['CNT_article_summaries']['content'] .= '<div style="text-align:center"><a href="./index.php?module=article&edit=create">'.$_SESSION['translate']->it('Submit a new article').'</a></div>'; } /* If there are x articles before these, display the "Prev Articles" Block */ + $content = ''; if ($this->val['prev_n_articles']>0) { *************** *** 315,319 **** ,array('view'=>$summary['id'])).'
'; } ! if (isset($content)) { $GLOBALS['CNT_article_past']['title'] = --- 316,320 ---- ,array('view'=>$summary['id'])).'
'; } ! if (!empty($content)) { $GLOBALS['CNT_article_past']['title'] = *************** *** 349,352 **** --- 350,354 ---- /* If there are summaries to display, display 'em */ $i = 0; + $content = ''; while($summary=$result->fetchrow(DB_FETCHMODE_ASSOC)) { *************** *** 514,517 **** --- 516,521 ---- function popbox ($title, $content) { + if(!isset($GLOBALS['CNT_article']['content'])) + $GLOBALS['CNT_article']['content'] = ''; $GLOBALS['CNT_article']['content'] .= '<h3>' . $title . '</h3>' . $content; } |
