[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] api class.apps.php, 1.1.1.1.2.1, 1.1.1.1.2.2 class.la
|
From: |
Dan Kuykendall <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] api class.apps.php, 1.1.1.1.2.1, 1.1.1.1.2.2 class.lang.php, 1.1.2.4, 1.1.2.5 class.phpgw.php, 1.1.1.1.2.5, 1.1.1.1.2.6 starter.inc.php, 1.1.1.1.2.3, 1.1.1.1.2.4 |
|
Date: |
Sun, 26 Oct 2003 06:15:46 +0000 |
Update of /cvsroot/phpgroupware/api
In directory subversions:/tmp/cvs-serv21847/api
Modified Files:
Tag: proposal-branch
class.apps.php class.lang.php class.phpgw.php starter.inc.php
Log Message:
updated lang class stuff
Index: starter.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/api/starter.inc.php,v
retrieving revision 1.1.1.1.2.3
retrieving revision 1.1.1.1.2.4
diff -C2 -d -r1.1.1.1.2.3 -r1.1.1.1.2.4
*** starter.inc.php 25 Oct 2003 18:29:22 -0000 1.1.1.1.2.3
--- starter.inc.php 26 Oct 2003 06:15:44 -0000 1.1.1.1.2.4
***************
*** 105,109 ****
$GLOBALS['phpgw'] = createobject('api_phpgw');
$GLOBALS['msgbox'] = createobject('api_msgbox');
- $GLOBALS['lang'] = createobject('api_lang');
$GLOBALS['phpgw']->db = createobject('api_db');
$GLOBALS['phpgw']->db->Host =
$GLOBALS['phpgw_data']['server']['db_host'];
--- 105,108 ----
***************
*** 118,127 ****
/****************************************************************************\
! * START - Session creation, op processing, login and logout checking
*
! * DO NOT ECHO OUT ANYTHING FROM IN HERE, OR SESSIONS WILL BREAK
*
\****************************************************************************/
reg_var('op', 'any', 'any','##NOVAL##');
-
$new_session = $GLOBALS['phpgw']->session =
createobject('api_sessions');
if($GLOBALS['missing_critical'])
{
--- 117,131 ----
/****************************************************************************\
! * Register op and then create the session, which will be anonymous if
user *
! * is not yet logged in with something else
*
\****************************************************************************/
reg_var('op', 'any', 'any','##NOVAL##');
$new_session = $GLOBALS['phpgw']->session =
createobject('api_sessions');
+
+
+
/********************************************************************************\
+ * If some critical stuff is mising, such as the db and core tables,
then we *
+ * just force the user to the setup app and stage that we detect has the
problem *
+
\********************************************************************************/
if($GLOBALS['missing_critical'])
{
***************
*** 146,149 ****
--- 150,159 ----
$GLOBALS['phpgw']->db->Halt_On_Error='yes';
+
+
/**********************************************************************************\
+ * If everything pasts inspection, then we continue with getting things
done *
+ * We start by checking the login, auth a login request and load up the
users stuff *
+
\**********************************************************************************/
+
if(!$GLOBALS['missing_critical'])
{
***************
*** 166,173 ****
$appclass =
$GLOBALS['phpgw_data']['flags']['req_app'].'.'.$GLOBALS['phpgw_data']['flags']['req_class'];
-
/****************************************************************************\
- * END - Session creation, login and logout checking
*
-
\****************************************************************************/
-
/************************************************************************\
* If possible dump some risky data from being avaible to apps
*
--- 176,179 ----
***************
*** 190,194 ****
unset($inputs['op'], $inputs['nextop'], $inputs['prevop']);
unset($inputs['phpgw_user'], $inputs['phpgw_pass']);
! unset($inputs['fxsl']);
/**************************************************************************\
--- 196,200 ----
unset($inputs['op'], $inputs['nextop'], $inputs['prevop']);
unset($inputs['phpgw_user'], $inputs['phpgw_pass']);
! unset($inputs['fxsl'], $inputs['lang_cache']);
/**************************************************************************\
Index: class.lang.php
===================================================================
RCS file: /cvsroot/phpgroupware/api/Attic/class.lang.php,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -C2 -d -r1.1.2.4 -r1.1.2.5
*** class.lang.php 25 Oct 2003 18:29:21 -0000 1.1.2.4
--- class.lang.php 26 Oct 2003 06:15:44 -0000 1.1.2.5
***************
*** 199,203 ****
$this->language =
$GLOBALS['phpgw_data']['prefs']['api.lang'];
$this->envset = False;
!
//unset($GLOBALS['phpgw_session']['lang_cache']);
}
if(!$this->envset)
--- 199,203 ----
$this->language =
$GLOBALS['phpgw_data']['prefs']['api.lang'];
$this->envset = False;
! unset($GLOBALS['phpgw_session']['lang_cache']);
}
if(!$this->envset)
***************
*** 283,286 ****
function lang()
{
! return $GLOBALS['lang']->get(func_get_args());
}
--- 283,286 ----
function lang()
{
! return $GLOBALS['phpgw']->lang->get(func_get_args());
}
Index: class.apps.php
===================================================================
RCS file: /cvsroot/phpgroupware/api/class.apps.php,v
retrieving revision 1.1.1.1.2.1
retrieving revision 1.1.1.1.2.2
diff -C2 -d -r1.1.1.1.2.1 -r1.1.1.1.2.2
*** class.apps.php 24 Oct 2003 22:09:44 -0000 1.1.1.1.2.1
--- class.apps.php 26 Oct 2003 06:15:44 -0000 1.1.1.1.2.2
***************
*** 40,44 ****
while ($this->db->next_record())
{
! $title =
$GLOBALS['lang']->trans($this->db->f('app_title'), $this->db->f('app_name'));
$this->allapps[$this->db->f('app_name')] =
array('name'=>$this->db->f('app_name'), 'title'=>$title);
}
--- 40,44 ----
while ($this->db->next_record())
{
! $title =
lang($this->db->f('app_title'), $this->db->f('app_name'));
$this->allapps[$this->db->f('app_name')] =
array('name'=>$this->db->f('app_name'), 'title'=>$title);
}
Index: class.phpgw.php
===================================================================
RCS file: /cvsroot/phpgroupware/api/class.phpgw.php,v
retrieving revision 1.1.1.1.2.5
retrieving revision 1.1.1.1.2.6
diff -C2 -d -r1.1.1.1.2.5 -r1.1.1.1.2.6
*** class.phpgw.php 25 Oct 2003 18:29:22 -0000 1.1.1.1.2.5
--- class.phpgw.php 26 Oct 2003 06:15:44 -0000 1.1.1.1.2.6
***************
*** 97,102 ****
$this->prefs = createobject('api_prefs');
$this->prefs->fill_phpgw_data();
//$GLOBALS['phpgw_data']['prefs']['api.lang'] = 'es';
! $GLOBALS['lang']->switchlang();
$this->apps = createobject('api_apps');
--- 97,105 ----
$this->prefs = createobject('api_prefs');
$this->prefs->fill_phpgw_data();
+
//$GLOBALS['phpgw_data']['prefs']['api.lang'] = 'es';
! $this->lang = createobject('api_lang');
!
! $this->lang->switchlang();
$this->apps = createobject('api_apps');
***************
*** 129,133 ****
{
$menu[] = array(
! 'title' =>
$GLOBALS['lang']->trans('Home', 'api'),
'op' => 'api.base.start',
);
--- 132,136 ----
{
$menu[] = array(
! 'title' => lang('Home', 'api'),
'op' => 'api.base.start',
);
***************
*** 136,140 ****
{
$menu[] = array(
! 'title' =>
$GLOBALS['lang']->trans('Admin', 'api'),
'op' => 'api.admin.start',
);
--- 139,143 ----
{
$menu[] = array(
! 'title' => lang('Admin', 'api'),
'op' => 'api.admin.start',
);
***************
*** 143,147 ****
{
$menu[] = array(
! 'title' =>
$GLOBALS['lang']->trans('Preferences', 'api'),
'op' => 'api.base.prefs',
);
--- 146,150 ----
{
$menu[] = array(
! 'title' => lang('Preferences',
'api'),
'op' => 'api.base.prefs',
);
***************
*** 150,154 ****
{
$menu[] = array(
! 'title' =>
$GLOBALS['lang']->trans('About', 'api'),
'op' => 'api.base.about',
);
--- 153,157 ----
{
$menu[] = array(
! 'title' => lang('About', 'api'),
'op' => 'api.base.about',
);
***************
*** 156,160 ****
}
$menu[] = array(
! 'title' => $GLOBALS['lang']->trans('Logout',
'api'),
'op' => 'api.base.logout',
);
--- 159,163 ----
}
$menu[] = array(
! 'title' => lang('Logout', 'api'),
'op' => 'api.base.logout',
);
***************
*** 234,239 ****
/* This will add the list of langs to the XML */
! $GLOBALS['lang']->addtoxml();
! $GLOBALS['lang']->addfromskin($this->xsl_files);
/* Add root node to the main doc object */
--- 237,242 ----
/* This will add the list of langs to the XML */
! $this->lang->addtoxml();
! $this->lang->addfromskin($this->xsl_files);
/* Add root node to the main doc object */
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] api class.apps.php, 1.1.1.1.2.1, 1.1.1.1.2.2 class.lang.php, 1.1.2.4, 1.1.2.5 class.phpgw.php, 1.1.1.1.2.5, 1.1.1.1.2.6 starter.inc.php, 1.1.1.1.2.3, 1.1.1.1.2.4,
Dan Kuykendall <address@hidden> <=