[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: sitemgr/sitemgr-site blockconfig.inc.php,1.3,1.4
From: |
Michael Totschnig <address@hidden> |
Subject: |
[Phpgroupware-cvs] CVS: sitemgr/sitemgr-site blockconfig.inc.php,1.3,1.4 config.inc.php.template,1.5,1.6 functions.inc.php,1.2,1.3 index.php,1.4,1.5 relocate.php,1.2,1.3 |
Date: |
Thu, 05 Dec 2002 17:15:33 -0500 |
Update of /cvsroot/phpgroupware/sitemgr/sitemgr-site
In directory subversions:/tmp/cvs-serv27375/sitemgr-site
Modified Files:
blockconfig.inc.php config.inc.php.template functions.inc.php
index.php relocate.php
Log Message:
bringing head up to sync with 0.9.14 branch
Index: blockconfig.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/sitemgr/sitemgr-site/blockconfig.inc.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** blockconfig.inc.php 17 Sep 2002 23:51:55 -0000 1.3
--- blockconfig.inc.php 5 Dec 2002 22:15:00 -0000 1.4
***************
*** 13,27 ****
'blanguage' => '',
'blockfile' => 'block-Amazon.php',
! 'view' => 0 // 0=everybody, 1=admins 2=phpgw users
3=anonymous
);
*/
! $blocks[]=array(
! 'skipifblank' => 1,
! 'position' => 'r',
! 'blockfile' => 'block-Current_Section.php',
'view' => 0
);
$blocks[]=array(
! 'title' => 'Root Site Index',
'position' => 'l',
'blockfile' => 'block-SiteIndex.php',
--- 13,31 ----
'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'),
'position' => 'l',
'blockfile' => 'block-SiteIndex.php',
***************
*** 29,39 ****
);
$blocks[]=array(
! 'title' => 'Table of Contents',
! 'position' => 'l',
'blockfile' => 'block-Table_of_Contents.php',
'view' => 0
);
$blocks[]=array(
! 'title' => 'Your Calendar',
'position' => 'l',
'blockfile' => 'block-phpgwCalendar.php',
--- 33,43 ----
);
$blocks[]=array(
! 'title' => lang('Table of Contents'),
! 'position' => 'r',
'blockfile' => 'block-Table_of_Contents.php',
'view' => 0
);
$blocks[]=array(
! 'title' => lang('Your Calendar'),
'position' => 'l',
'blockfile' => 'block-phpgwCalendar.php',
***************
*** 41,45 ****
);
$blocks[]=array(
! 'title' => 'Login',
'position' => 'r',
'blockfile' => 'block-Login.php',
--- 45,49 ----
);
$blocks[]=array(
! 'title' => lang('Login'),
'position' => 'r',
'blockfile' => 'block-Login.php',
***************
*** 56,60 ****
*/
$blocks[]=array(
! 'title' => 'Google Search',
'position' => 'r',
'blockfile' => 'block-GoogleSearch.php',
--- 60,64 ----
*/
$blocks[]=array(
! 'title' => lang('Google Search'),
'position' => 'r',
'blockfile' => 'block-GoogleSearch.php',
***************
*** 64,68 ****
$blocks[]=array(
'bkey' => '',
! 'title' => 'Headlines',
'position' => 'r',
'active' => 1,
--- 68,72 ----
$blocks[]=array(
'bkey' => '',
! 'title' => lang('Headlines'),
'position' => 'r',
'active' => 1,
***************
*** 74,79 ****
$blocks[]=array(
'bkey' => 'admin',
! 'title' => 'Administration',
! 'content' =>
' <strong><big>·</big></strong><a
href="'.phpgw_link('/index.php','menuaction=sitemgr.MainMenu_UI.DisplayMenu').'">Content
Manager</a>',
'position' => 'l',
'active' => 1,
--- 78,83 ----
$blocks[]=array(
'bkey' => 'admin',
! 'title' => lang('Administration'),
! 'content' =>
' <strong><big>·</big></strong><a
href="'.phpgw_link('/index.php','menuaction=sitemgr.MainMenu_UI.DisplayMenu').'">'
. lang('Content Manager') . '</a>',
'position' => 'l',
'active' => 1,
***************
*** 85,89 ****
$blocks[]=array(
! 'title' => 'Amazon',
'position' => 'r',
'refresh' => 3600,
--- 89,93 ----
$blocks[]=array(
! 'title' => lang('Amazon'),
'position' => 'r',
'refresh' => 3600,
Index: config.inc.php.template
===================================================================
RCS file: /cvsroot/phpgroupware/sitemgr/sitemgr-site/config.inc.php.template,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** config.inc.php.template 12 Sep 2002 03:55:57 -0000 1.5
--- config.inc.php.template 5 Dec 2002 22:15:00 -0000 1.6
***************
*** 40,44 ****
'login' =>
$pref->getPreference('anonymous-user'),
'passwd' =>
$pref->getPreference('anonymous-passwd'),
! 'themesel' =>
$pref->getPreference('themesel')
);
--- 40,45 ----
'login' =>
$pref->getPreference('anonymous-user'),
'passwd' =>
$pref->getPreference('anonymous-passwd'),
! 'themesel' =>
$pref->getPreference('themesel'),
! 'sitelanguages' =>
explode(',',$pref->getPreference('sitelanguages'))
);
***************
*** 48,52 ****
if (!$GLOBALS['sessionid'])
{
! die('NO ANONYMOUS USER ACCOUNTS INSTALLED.
NOTIFY THE ADMINISTRATOR.');
//exit;
}
--- 49,53 ----
if (!$GLOBALS['sessionid'])
{
! die(lang('NO ANONYMOUS USER ACCOUNTS INSTALLED.
NOTIFY THE ADMINISTRATOR.'));
//exit;
}
***************
*** 65,69 ****
'login' =>
$pref->getPreference('anonymous-user'),
'passwd' =>
$pref->getPreference('anonymous-passwd'),
! 'themesel' =>
$pref->getPreference('themesel')
);
}
--- 66,71 ----
'login' =>
$pref->getPreference('anonymous-user'),
'passwd' =>
$pref->getPreference('anonymous-passwd'),
! 'themesel' =>
$pref->getPreference('themesel'),
! 'sitelanguages' =>
explode(',',$pref->getPreference('sitelanguages'))
);
}
Index: functions.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/sitemgr/sitemgr-site/functions.inc.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** functions.inc.php 12 Sep 2002 03:55:37 -0000 1.2
--- functions.inc.php 5 Dec 2002 22:15:00 -0000 1.3
***************
*** 14,17 ****
--- 14,23 ----
function sitemgr_link2($url, $extravars = '')
{
+ // humor me with this wrapper function...
+ return sitemgr_link($url, $extravars);
+ }
+
+ function sitemgr_link($url, $extravars = '')
+ {
$kp3 = $GLOBALS['HTTP_GET_VARS']['kp3'] ?
$GLOBALS['HTTP_GET_VARS']['kp3'] : $GLOBALS['HTTP_COOKIE_VARS']['kp3'];
***************
*** 22,26 ****
// 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))
***************
*** 47,53 ****
}
$url = $GLOBALS['sitemgr_info']['sitemgr-site_url'] . $url;
!
! $url = ereg_replace('//','/',$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
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** index.php 5 Sep 2002 09:07:06 -0000 1.4
--- index.php 5 Dec 2002 22:15:00 -0000 1.5
***************
*** 32,37 ****
die ("You need to copy config.inc.php.template to
config.inc.php and edit the file before continuing.");
}
require_once('./functions.inc.php');
- require_once('./blockconfig.inc.php');
include './inc/class.ui.inc.php';
--- 32,37 ----
die ("You need to copy config.inc.php.template to
config.inc.php and edit the file before continuing.");
}
+
require_once('./functions.inc.php');
include './inc/class.ui.inc.php';
***************
*** 40,50 ****
include './inc/class.Template2.inc.php';
- global $page_id;
- global $page_name;
- global $category_id;
- global $toc;
- global $index;
$objui = new ui;
if ($page_name)
{
--- 40,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)
{
Index: relocate.php
===================================================================
RCS file: /cvsroot/phpgroupware/sitemgr/sitemgr-site/relocate.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** relocate.php 14 Sep 2002 07:25:21 -0000 1.2
--- relocate.php 5 Dec 2002 22:15:00 -0000 1.3
***************
*** 72,76 ****
}
! $r = $HTTP_SERVER_VARS["REQUEST_URI"];
$r_doc = substr($r,strlen($base_script_uri));
--- 72,92 ----
}
! //pos stuff is used for stripping get vars from the uri
! $pos = strpos($HTTP_SERVER_VARS['REQUEST_URI'],'?');
! if ($pos === false)
! {
! $r = $HTTP_SERVER_VARS["REQUEST_URI"];
! }
! else
! {
! if ($pos < 1)
! {
! $r = '';
! }
! else
! {
! $r = substr($HTTP_SERVER_VARS['REQUEST_URI'],0,$pos-1);
! }
! }
$r_doc = substr($r,strlen($base_script_uri));
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: sitemgr/sitemgr-site blockconfig.inc.php,1.3,1.4 config.inc.php.template,1.5,1.6 functions.inc.php,1.2,1.3 index.php,1.4,1.5 relocate.php,1.2,1.3,
Michael Totschnig <address@hidden> <=
- Prev by Date:
[Phpgroupware-cvs] CVS: sitemgr/sitemgr-site/templates/phpgroupware centerblock.tpl,1.2,1.3 main.tpl,1.2,1.3
- Next by Date:
[Phpgroupware-cvs] CVS: sitemgr/inc class.ManageTranslations_UI.inc.php,1.1,1.2 class.Admin_ManageCategories_UI.inc.php,1.5,1.6 class.Categories_BO.inc.php,1.4,1.5 class.Categories_SO.inc.php,1.10,1.11 class.Common_UI.inc.php,1.6,1.7 class.MainMenu_UI.inc.php,1.3,1.4 class.Page_SO.inc.php,1.3,1.4 class.Pages_BO.inc.php,1.2,1.3 class.Pages_SO.inc.php,1.8,1.9 class.admin_ManageSiteContent_UI.inc.php,1.1.1.1,1.2 class.contributor_ManagePage_UI.inc.php,1.7,1.8 class.headerFooter_BO.inc.php,1.1.1.1,1.2
- Previous by thread:
[Phpgroupware-cvs] CVS: sitemgr/sitemgr-site/templates/phpgroupware centerblock.tpl,1.2,1.3 main.tpl,1.2,1.3
- Next by thread:
[Phpgroupware-cvs] CVS: sitemgr/inc class.ManageTranslations_UI.inc.php,1.1,1.2 class.Admin_ManageCategories_UI.inc.php,1.5,1.6 class.Categories_BO.inc.php,1.4,1.5 class.Categories_SO.inc.php,1.10,1.11 class.Common_UI.inc.php,1.6,1.7 class.MainMenu_UI.inc.php,1.3,1.4 class.Page_SO.inc.php,1.3,1.4 class.Pages_BO.inc.php,1.2,1.3 class.Pages_SO.inc.php,1.8,1.9 class.admin_ManageSiteContent_UI.inc.php,1.1.1.1,1.2 class.contributor_ManagePage_UI.inc.php,1.7,1.8 class.headerFooter_BO.inc.php,1.1.1.1,1.2
- Index(es):