[Phpgroupware-cvs] sitemgr/sitemgr-site index.php [skwashd-16-compat]

[Dave Hall]

CVSROOT:        /cvsroot/phpgroupware
Module name:    sitemgr
Branch:         skwashd-16-compat
Changes by:     Dave Hall <skwashd>     06/09/04 07:14:46

Modified files:
        sitemgr-site   : index.php 

Log message:
        change execution order to make news work properly

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/sitemgr/sitemgr-site/index.php?cvsroot=phpgroupware&only_with_tag=skwashd-16-compat&r1=1.7.2.2.4.3&r2=1.7.2.2.4.4

Patches:
Index: index.php
===================================================================
RCS file: /cvsroot/phpgroupware/sitemgr/sitemgr-site/index.php,v
retrieving revision 1.7.2.2.4.3
retrieving revision 1.7.2.2.4.4
diff -u -b -r1.7.2.2.4.3 -r1.7.2.2.4.4
--- index.php   23 Aug 2006 13:32:03 -0000      1.7.2.2.4.3
+++ index.php   4 Sep 2006 07:14:46 -0000       1.7.2.2.4.4
@@ -8,7 +8,7 @@
        *  Free Software Foundation; either version 2 of the License, or (at 
your  *
        *  option) any later version.                                           
   *
        
\**************************************************************************/
-       /* $Id: index.php,v 1.7.2.2.4.3 2006/08/23 13:32:03 skwashd Exp $ */
+       /* $Id: index.php,v 1.7.2.2.4.4 2006/09/04 07:14:46 skwashd Exp $ */
 
        $GLOBALS['phpgw_info']['flags'] = array
        (
@@ -48,7 +48,32 @@
 
        $page = CreateObject('sitemgr.Page_SO');
 
-       if ( isset($_GET['page_name']) && $_GET['page_name'] )
+       if (isset($_GET['news']) )
+       {
+               echo "GET[news] == {$_GET['news']}<br>";
+               if ( strpos($_GET['news'], 'feed') === 0 )
+               {
+                        $cat_id = 0;
+                        if ( strpos($_GET['news'], 'feed-cat-') === 0 )
+                        {
+                               $cat_id =  (int) substr($_GET['news'], 9);
+                               exit;
+                        }
+                        $objbo->export_news($cat_id);
+                        exit;
+               }
+               else if ( strpos($_GET['news'], 'cat-') === 0 )
+               {
+                       $objui->displayNews( 0, (int) substr($_GET['news'], 4) 
);
+                       exit;
+               }
+               else
+               {
+                       $objui->displayNews( (int) $_GET['news']);
+                       exit;
+               }
+       }
+       else if ( isset($_GET['page_name']) && $_GET['page_name'] )
        {
                $objui->displayPageByName($_GET['page_name']);
        }
@@ -78,30 +103,6 @@
        {
                $objui->displayTOC();
        }
-       else if (isset($_GET['news']) )
-       {
-               if ( strpos($_GET['news'], 'feed') === 0 )
-               {
-                        $cat_id = 0;
-                        if ( strpos($_GET['news'], 'feed-cat-') === 0 )
-                        {
-                               $cat_id =  (int) substr($_GET['news'], 9);
-                               exit;
-                        }
-                        $objbo->export_news($cat_id);
-                        exit;
-               }
-               else if ( strpos($_GET['news'], 'cat-') === 0 )
-               {
-                       $objui->displayNews( 0, (int) substr($_GET['news'], 4) 
);
-                       exit;
-               }
-               else
-               {
-                       $objui->displayNews( (int) $_GET['news']);
-                       exit;
-               }
-       }
        else
        {
                if ($sitemgr_info['home_page_id'])