[Phpgroupware-cvs] news_admin inc/class.uinews.inc.php templates/b...

[Dave Hall]

CVSROOT:        /cvsroot/phpgroupware
Module name:    news_admin
Changes by:     Dave Hall <skwashd>     06/08/15 15:12:48

Modified files:
        inc            : class.uinews.inc.php 
        templates/base/css: base.css 

Log message:
        more cosmetic and minor fixes

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/news_admin/inc/class.uinews.inc.php?cvsroot=phpgroupware&r1=1.41&r2=1.42
http://cvs.savannah.gnu.org/viewcvs/news_admin/templates/base/css/base.css?cvsroot=phpgroupware&r1=1.1&r2=1.2

Patches:
Index: inc/class.uinews.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/news_admin/inc/class.uinews.inc.php,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -b -r1.41 -r1.42
--- inc/class.uinews.inc.php    15 Aug 2006 14:36:05 -0000      1.41
+++ inc/class.uinews.inc.php    15 Aug 2006 15:12:47 -0000      1.42
@@ -14,7 +14,7 @@
  * Many enhancements were sponsored by ecotrader.net                        *
  \**************************************************************************/
 
-/* $Id: class.uinews.inc.php,v 1.41 2006/08/15 14:36:05 skwashd Exp $ */
+/* $Id: class.uinews.inc.php,v 1.42 2006/08/15 15:12:47 skwashd Exp $ */
 
 class uinews
 {
@@ -61,10 +61,10 @@
         */
        function read_news()
        {
-               $limit = ($GLOBALS['phpgw_info']['common']['maxmatchs'] 
-                               ? $GLOBALS['phpgw_info']['common']['maxmatchs'] 
: 10 );
+               $limit = isset($GLOBALS['phpgw_info']['common']['maxmatchs'])
+                               ? $GLOBALS['phpgw_info']['common']['maxmatchs'] 
: 10;
 
-               $news_id = get_var('news_id', array('GET'));
+               $news_id = isset($_REQUEST['news_id']) ? $_REQUEST['news_id'] : 
0;
 
                $news = $news_id ? array($news_id => 
$this->bo->get_news($news_id)) :  
                        
$this->bo->get_newslist($this->cat_id,$this->start,'','',$limit,True);
@@ -80,8 +80,6 @@
                $this->template->set_block('news', 'summary_item', 
'summary_items');
                $this->template->set_block('news','news_summary', 'news_sum');
 
-               $GLOBALS['phpgw_info']['flags']['css'] .= "-->\n</style>\n<link 
rel=\"StyleSheet\" 
href=\"{$GLOBALS['phpgw_info']['server']['webserver_url']}/news_admin/css/base.css\"/>\n<style
 type=\"text/css\"><!--\n";
-
                $GLOBALS['phpgw']->common->phpgw_header();
                echo parse_navbar();
 
@@ -144,6 +142,7 @@
                        $this->template->set_var('maintain', '&nbsp;');
                }
 
+               /*
                if ( count( $this->bo->acl->get_permissions(true) ) > 1 )
                {
                        $this->template->set_var(
@@ -159,6 +158,8 @@
                        $this->template->parse('newsletter', 'newsletter_li');
                }
                else
+               */
+               if (true)
                {
                        $this->template->set_var('newsletter', '&nbsp;');
 
@@ -180,7 +181,7 @@
                                        'submission'    => lang('submitted by 
%1 on %2', 
                                                
$GLOBALS['phpgw']->accounts->id2name($newsitem['submittedby']), 
                                                
$GLOBALS['phpgw']->common->show_date($newsitem['date']) ),
-                                       'content'       => 
($newsitem['is_html'] ? htmlspecialchars($newsitem['content']) : 
nl2br(htmlspecialchars($newsitem['content']))),
+                                       'content'       => $newsitem['is_html'] 
? $newsitem['content'] : nl2br(htmlspecialchars($newsitem['content']) ),
                                        );
 
                        $this->template->set_var($var);

Index: templates/base/css/base.css
===================================================================
RCS file: /cvsroot/phpgroupware/news_admin/templates/base/css/base.css,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- templates/base/css/base.css 15 Aug 2006 11:42:57 -0000      1.1
+++ templates/base/css/base.css 15 Aug 2006 15:12:47 -0000      1.2
@@ -90,8 +90,6 @@
 
 #app_menu_bar
 {
-       background-color: #999;
-       color: #fff;
        height: 26px;
        padding: 3px;
 }
@@ -197,6 +195,7 @@
 /* Fix select lists in tinyMCE (when used) */
 #news_form .mceEditorContainer select
 {
+       display: inline;
        width: auto;
 }