[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: sitemgr/inc class.Categories_SO.inc.php,1.14,1.1
|
From: |
Michael Totschnig <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] CVS: sitemgr/inc class.Categories_SO.inc.php,1.14,1.15 class.Categories_UI.inc.php,1.2,1.3 class.Common_UI.inc.php,1.11,1.12 class.Content_UI.inc.php,1.5,1.6 class.MainMenu_UI.inc.php,1.7,1.8 class.Modules_UI.inc.php,1.3,1.4 class.Pages_UI.inc.php,1.2,1.3 class.Sites_BO.inc.php,1.2,1.3 class.Translations_UI.inc.php,1.4,1.5 |
|
Date: |
Thu, 22 May 2003 02:19:26 -0400 |
Update of /cvsroot/phpgroupware/sitemgr/inc
In directory subversions:/tmp/cvs-serv24135/inc
Modified Files:
class.Categories_SO.inc.php class.Categories_UI.inc.php
class.Common_UI.inc.php class.Content_UI.inc.php
class.MainMenu_UI.inc.php class.Modules_UI.inc.php
class.Pages_UI.inc.php class.Sites_BO.inc.php
class.Translations_UI.inc.php
Log Message:
some small adjustments
Index: class.Categories_SO.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/sitemgr/inc/class.Categories_SO.inc.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** class.Categories_SO.inc.php 22 May 2003 02:36:53 -0000 1.14
--- class.Categories_SO.inc.php 22 May 2003 06:19:23 -0000 1.15
***************
*** 123,131 ****
$cat_info->description =
$this->db->f('description');
}
! else
! {
! //return False;
! $cat_info->name = lang("not yet
translated");
! }
}
--- 123,131 ----
$cat_info->description =
$this->db->f('description');
}
! // else
! // {
! // //return False;
! // $cat_info->name = lang("not yet
translated");
! // }
}
Index: class.Categories_UI.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/sitemgr/inc/class.Categories_UI.inc.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** class.Categories_UI.inc.php 22 May 2003 02:36:53 -0000 1.2
--- class.Categories_UI.inc.php 22 May 2003 06:19:23 -0000 1.3
***************
*** 36,40 ****
$this->acl = $GLOBALS['Common_BO']->acl;
$this->isadmin = $this->acl->is_admin();
! $this->sitelanguages =
explode(',',$GLOBALS['Common_BO']->sites->current_site['site_languages']);
}
--- 36,40 ----
$this->acl = $GLOBALS['Common_BO']->acl;
$this->isadmin = $this->acl->is_admin();
! $this->sitelanguages =
$GLOBALS['Common_BO']->sites->current_site['sitelanguages'];
}
Index: class.Common_UI.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/sitemgr/inc/class.Common_UI.inc.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** class.Common_UI.inc.php 22 May 2003 03:06:14 -0000 1.11
--- class.Common_UI.inc.php 22 May 2003 06:19:23 -0000 1.12
***************
*** 61,68 ****
if ($_POST['btnSave'])
{
- $preferences = array(
-
'home_page_id','themesel','site_languages');
-
$oldsitelanguages =
$GLOBALS['Common_BO']->sites->current_site['site_languages'];
if ($oldsitelanguages &&
($oldsitelanguages != $_POST['pref']['site_languages']))
{
--- 61,66 ----
if ($_POST['btnSave'])
{
$oldsitelanguages =
$GLOBALS['Common_BO']->sites->current_site['site_languages'];
+
if ($oldsitelanguages &&
($oldsitelanguages != $_POST['pref']['site_languages']))
{
***************
*** 107,125 ****
$oldsitelanguages = $oldsitelanguages ?
explode(',',$oldsitelanguages) : array("en");
- foreach ($oldsitelanguages as $lang)
- {
-
array_push($preferences,'sitemgr-site-name-' . $lang);
- }
$GLOBALS['Common_BO']->sites->saveprefs($_POST['pref']);
echo '<p><b>' . lang('Changes Saved.')
. '</b></p>';
- unset($preferences);
}
!
! $sitelanguages =
explode(',',$GLOBALS['Common_BO']->sites->current_site['site_languages']);
! $sitelanguages = $sitelanguages ?
$sitelanguages : array("en");
!
! foreach ($sitelanguages as $lang)
{
$langname =
$GLOBALS['Common_BO']->getlangname($lang);
--- 105,115 ----
$oldsitelanguages = $oldsitelanguages ?
explode(',',$oldsitelanguages) : array("en");
$GLOBALS['Common_BO']->sites->saveprefs($_POST['pref']);
echo '<p><b>' . lang('Changes Saved.')
. '</b></p>';
}
!
! foreach
($GLOBALS['Common_BO']->sites->current_site['sitelanguages'] as $lang)
{
$langname =
$GLOBALS['Common_BO']->getlangname($lang);
***************
*** 132,135 ****
--- 122,126 ----
'title'=>lang('Site
descriptioin'). ' ' . $langname,
'note'=>lang('This is used
chiefly for meta data. If you change the site languages below you have to save
before being able to set this preference for a new language.'),
+ 'input'=>'textarea'
);
}
***************
*** 173,176 ****
--- 164,170 ----
switch($details['input'])
{
+ case 'textarea':
+ $inputbox =
$this->inputtextarea($name);
+ break;
case 'checkbox':
$inputbox =
$this->inputCheck($name);
***************
*** 213,216 ****
--- 207,222 ----
return '<input type="text" size="'.$size.
'" name="pref['.$name.']" value="'.$val.'">';
+ }
+
+ function inputtextarea($name='',$cols=40,$rows=5,$default='')
+ {
+ $val =
$GLOBALS['Common_BO']->sites->current_site[$name];
+ if (!$val)
+ {
+ $val = $default;
+ }
+
+ return '<textarea cols="' . $cols . '" rows="' . $rows
.
+ '" name="pref['.$name.']">'.
$GLOBALS['phpgw']->strip_html($val).'</textarea>';
}
Index: class.Content_UI.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/sitemgr/inc/class.Content_UI.inc.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** class.Content_UI.inc.php 22 May 2003 02:36:53 -0000 1.5
--- class.Content_UI.inc.php 22 May 2003 06:19:23 -0000 1.6
***************
*** 31,35 ****
'3' => lang('anonymous')
);
! $this->sitelanguages =
explode(',',$GLOBALS['Common_BO']->sites->current_site['site_languages']);
$sessionlang =
$GLOBALS['phpgw']->session->appsession('worklanguage','sitemgr');
$this->worklanguage = $sessionlang ? $sessionlang :
$this->sitelanguages[0];
--- 31,35 ----
'3' => lang('anonymous')
);
! $this->sitelanguages =
$GLOBALS['Common_BO']->sites->current_site['site_languages'];
$sessionlang =
$GLOBALS['phpgw']->session->appsession('worklanguage','sitemgr');
$this->worklanguage = $sessionlang ? $sessionlang :
$this->sitelanguages[0];
Index: class.MainMenu_UI.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/sitemgr/inc/class.MainMenu_UI.inc.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** class.MainMenu_UI.inc.php 22 May 2003 02:36:53 -0000 1.7
--- class.MainMenu_UI.inc.php 22 May 2003 06:19:23 -0000 1.8
***************
*** 48,55 ****
'lang_configure' => lang('Configure
SiteMgr'),
'lang_check' => lang('check here after
every upgrade'),
- 'lang_editheadfoot' => lang('Edit Site
Header and Footer'),
'lang_managesitemodules' =>
lang('Manage site-wide module properties'),
'lang_managesitecontent' =>
lang('Manage Site Content'),
- // 'headerandfooter' =>
$GLOBALS['phpgw']->link('/index.php',
'menuaction=sitemgr.SiteContent_UI._editHeaderAndFooter'),
'setup' =>
$GLOBALS['phpgw']->link('/index.php','menuaction=sitemgr.Common_UI.DisplayPrefs')
));
--- 48,53 ----
Index: class.Modules_UI.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/sitemgr/inc/class.Modules_UI.inc.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** class.Modules_UI.inc.php 3 May 2003 21:08:11 -0000 1.3
--- class.Modules_UI.inc.php 22 May 2003 06:19:23 -0000 1.4
***************
*** 64,67 ****
--- 64,71 ----
$this->t->set_var('configureurl',
$GLOBALS['phpgw']->link('/index.php',$link_data));
$contentareas =
$GLOBALS['Common_BO']->content->getContentAreas();
+ if (!is_array($contentareas))
+ {
+ $contentareas = array();
+ }
array_unshift($contentareas,'__PAGE__');
Index: class.Pages_UI.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/sitemgr/inc/class.Pages_UI.inc.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** class.Pages_UI.inc.php 22 May 2003 02:36:53 -0000 1.2
--- class.Pages_UI.inc.php 22 May 2003 06:19:23 -0000 1.3
***************
*** 35,39 ****
$this->pagebo = &$GLOBALS['Common_BO']->pages;
$this->categorybo = &$GLOBALS['Common_BO']->cats;
! $this->sitelanguages =
explode(',',$GLOBALS['Common_BO']->sites->current_site['site_languages']);
}
--- 35,39 ----
$this->pagebo = &$GLOBALS['Common_BO']->pages;
$this->categorybo = &$GLOBALS['Common_BO']->cats;
! $this->sitelanguages =
$GLOBALS['Common_BO']->sites->current_site['sitelanguages'];
}
Index: class.Sites_BO.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/sitemgr/inc/class.Sites_BO.inc.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** class.Sites_BO.inc.php 22 May 2003 03:06:14 -0000 1.2
--- class.Sites_BO.inc.php 22 May 2003 06:19:23 -0000 1.3
***************
*** 92,97 ****
if ($result)
{
! $sitelanguages =
explode(',',$result['site_languages']);
! foreach($sitelanguages as $lang)
{
$langinfo =
$GLOBALS['Common_BO']->cats->getCategory($id,$lang);
--- 92,97 ----
if ($result)
{
! $result['sitelanguages'] =
$result['site_languages'] ? explode(',',$result['site_languages']) :
array('en');;
! foreach($result['sitelanguages'] as $lang)
{
$langinfo =
$GLOBALS['Common_BO']->cats->getCategory($id,$lang);
***************
*** 131,135 ****
{
$this->so->saveprefs($prefs);
! $sitelanguages =
explode(',',$this->current_site['site_languages']);
foreach ($sitelanguages as $lang)
{
--- 131,137 ----
{
$this->so->saveprefs($prefs);
! $sitelanguages = $this->current_site['site_languages']
?
!
explode(',',$this->current_site['site_languages']) :
! array('en');
foreach ($sitelanguages as $lang)
{
Index: class.Translations_UI.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/sitemgr/inc/class.Translations_UI.inc.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** class.Translations_UI.inc.php 22 May 2003 02:36:53 -0000 1.4
--- class.Translations_UI.inc.php 22 May 2003 06:19:23 -0000 1.5
***************
*** 35,39 ****
$this->cat_bo = &$GLOBALS['Common_BO']->cats;
$this->acl = &$GLOBALS['Common_BO']->acl;
! $this->sitelanguages =
explode(',',$GLOBALS['Common_BO']->sites->current_site['site_languages']);
$this->pagebo = &$GLOBALS['Common_BO']->pages;
$this->contentbo = &$GLOBALS['Common_BO']->content;
--- 35,39 ----
$this->cat_bo = &$GLOBALS['Common_BO']->cats;
$this->acl = &$GLOBALS['Common_BO']->acl;
! $this->sitelanguages =
$GLOBALS['Common_BO']->sites->current_site['sitelanguages'];
$this->pagebo = &$GLOBALS['Common_BO']->pages;
$this->contentbo = &$GLOBALS['Common_BO']->content;
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: sitemgr/inc class.Categories_SO.inc.php,1.14,1.15 class.Categories_UI.inc.php,1.2,1.3 class.Common_UI.inc.php,1.11,1.12 class.Content_UI.inc.php,1.5,1.6 class.MainMenu_UI.inc.php,1.7,1.8 class.Modules_UI.inc.php,1.3,1.4 class.Pages_UI.inc.php,1.2,1.3 class.Sites_BO.inc.php,1.2,1.3 class.Translations_UI.inc.php,1.4,1.5,
Michael Totschnig <address@hidden> <=
- Prev by Date:
[Phpgroupware-cvs] CVS: sitemgr/inc class.Common_UI.inc.php,1.10,1.11 class.Sites_BO.inc.php,1.1,1.2 class.Sites_UI.inc.php,1.1,1.2
- Next by Date:
[Phpgroupware-cvs] CVS: sitemgr/templates/default delete_common.tpl,NONE,1.1 mainmenu.tpl,1.6,1.7
- Previous by thread:
[Phpgroupware-cvs] CVS: sitemgr/inc class.Common_UI.inc.php,1.10,1.11 class.Sites_BO.inc.php,1.1,1.2 class.Sites_UI.inc.php,1.1,1.2
- Next by thread:
[Phpgroupware-cvs] CVS: sitemgr/templates/default delete_common.tpl,NONE,1.1 mainmenu.tpl,1.6,1.7
- Index(es):