[Phpgroupware-cvs] CVS: /sitemgr/sitemgr-site blockconfig.inc.php,1.2.2.1,1.2.2.2 functions.inc.php,1.2.2.3,1.2.2.4 index.php,1.4.2.1,1.4.2.2

[Patrick Walsh <address@hidden>]

Update of /cvsroot/phpgroupware//sitemgr/sitemgr-site
In directory subversions:/tmp/cvs-serv23819

Modified Files:
      Tag: Version-0_9_14-branch
        blockconfig.inc.php functions.inc.php index.php 
Log Message:
Various language updates and added support for center blocks


Index: blockconfig.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware//sitemgr/sitemgr-site/blockconfig.inc.php,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -C2 -r1.2.2.1 -r1.2.2.2
*** blockconfig.inc.php 18 Oct 2002 23:22:22 -0000      1.2.2.1
--- blockconfig.inc.php 22 Nov 2002 06:03:55 -0000      1.2.2.2
***************
*** 13,19 ****
                'blanguage' => '',
                'blockfile' => 'block-Amazon.php',
!               'view' => 0        // 0=everybody, 1=admins 2=phpgw users 
3=anonymous
        );
        */
        $blocks[]=array(
                'title' => lang('Root Site Index'),
--- 13,29 ----
                'blanguage' => '',
                'blockfile' => 'block-Amazon.php',
!               'view' => 0        // 0=everybody, 1=phpgw users 2=admins 
3=anonymous
        );
        */
+ 
+ 
+         $blocks[]=array(
+               'title' => lang('Choose language'),
+               'blockfile' => 'block-Choose_lang.php',
+               'position' => 'l',
+               'refresh' => 0,
+               'view' => 0
+       );
+ 
        $blocks[]=array(
                'title' => lang('Root Site Index'),
***************
*** 24,28 ****
        $blocks[]=array(
                'title' => lang('Table of Contents'),
!               'position' => 'l',
                'blockfile' => 'block-Table_of_Contents.php',
                'view' => 0
--- 34,38 ----
        $blocks[]=array(
                'title' => lang('Table of Contents'),
!               'position' => 'r',
                'blockfile' => 'block-Table_of_Contents.php',
                'view' => 0

Index: functions.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware//sitemgr/sitemgr-site/functions.inc.php,v
retrieving revision 1.2.2.3
retrieving revision 1.2.2.4
diff -C2 -r1.2.2.3 -r1.2.2.4
*** functions.inc.php   5 Nov 2002 05:17:00 -0000       1.2.2.3
--- functions.inc.php   22 Nov 2002 06:03:55 -0000      1.2.2.4
***************
*** 28,32 ****
  
                // Change http://xyz/index.php?page_name=page1 to
!               // http://xyz/page1/ i the htaccess stuff is enabled
                $page_name = '';
                if (!is_array($extravars))
--- 28,32 ----
  
                // Change http://xyz/index.php?page_name=page1 to
!               // http://xyz/page1/ if the htaccess stuff is enabled
                $page_name = '';
                if (!is_array($extravars))
***************
*** 53,59 ****
                }
  
                $url = $GLOBALS['sitemgr_info']['sitemgr-site_url'] . $url;
! 
!               $url = ereg_replace('([^:])//','\1/',$url);
  
                // build the extravars string from a array
--- 53,61 ----
                }
  
+               // In certain instances a url may look like this: 
'http://xyz//hi.php' or
+               // like this: '//index.php?blahblahblah' -- so the code below 
will remove
+               // the inappropriate double slashes and leave appropriate ones
                $url = $GLOBALS['sitemgr_info']['sitemgr-site_url'] . $url;
!               $url = substr(ereg_replace('([^:])//','\1/','s'.$url),1);
  
                // build the extravars string from a array

Index: index.php
===================================================================
RCS file: /cvsroot/phpgroupware//sitemgr/sitemgr-site/index.php,v
retrieving revision 1.4.2.1
retrieving revision 1.4.2.2
diff -C2 -r1.4.2.1 -r1.4.2.2
*** index.php   1 Nov 2002 06:25:14 -0000       1.4.2.1
--- index.php   22 Nov 2002 06:03:55 -0000      1.4.2.2
***************
*** 33,36 ****
--- 33,38 ----
        }
  
+       require_once('./functions.inc.php');
+       require_once('./blockconfig.inc.php');
  
        include './inc/class.ui.inc.php';
***************
*** 39,53 ****
        include './inc/class.Template2.inc.php';
  
        $objui = new ui;
      
-       require_once('./functions.inc.php');
-       require_once('./blockconfig.inc.php');
- 
  
!       global $page_id;
!       global $page_name;
!       global $category_id;
!       global $toc;
!       global $index;
  
        if ($page_name)
--- 41,53 ----
        include './inc/class.Template2.inc.php';
  
+ 
        $objui = new ui;
      
  
!       $page_id = $_GET['page_id'];
!       $page_name = $_GET['page_name'];
!       $category_id = $_GET['category_id'];
!       $toc = $_GET['toc'];
!       $index = $_GET['index'];
  
        if ($page_name)