[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [6644] merge 6640:6643 from trunk
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [6644] merge 6640:6643 from trunk |
|
Date: |
Sun, 05 Dec 2010 11:57:42 +0000 |
Revision: 6644
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=6644
Author: sigurdne
Date: 2010-12-05 11:57:41 +0000 (Sun, 05 Dec 2010)
Log Message:
-----------
merge 6640:6643 from trunk
Modified Paths:
--------------
branches/Version-1_0-branch/login.php
branches/Version-1_0-branch/phpgwapi/inc/functions.inc.php
branches/Version-1_0-branch/phpgwapi/inc/sso/include_login.inc.php
branches/Version-1_0-branch/phpgwapi/templates/base/login.tpl
branches/Version-1_0-branch/property/inc/class.soproject.inc.php
branches/Version-1_0-branch/property/inc/class.soworkorder.inc.php
branches/Version-1_0-branch/property/js/yahoo/property.js
branches/Version-1_0-branch/property/js/yahoo/tts.add.js
Property Changed:
----------------
branches/Version-1_0-branch/
Property changes on: branches/Version-1_0-branch
___________________________________________________________________
Modified: svn:mergeinfo
-
/trunk:6439-6441,6443,6445-6447,6449-6464,6466-6468,6470-6474,6476-6477,6479-6480,6483-6488,6490-6491,6493-6494,6496-6501,6503-6504,6506,6508,6510-6511,6513,6515-6516,6518,6520-6524,6526-6528,6533-6534,6536-6541,6543-6565,6567,6569,6571-6576,6578,6580-6586,6588-6596,6598-6600,6602-6604,6606-6607,6609-6611,6613-6625,6629-6639
+
/trunk:6439-6441,6443,6445-6447,6449-6464,6466-6468,6470-6474,6476-6477,6479-6480,6483-6488,6490-6491,6493-6494,6496-6501,6503-6504,6506,6508,6510-6511,6513,6515-6516,6518,6520-6524,6526-6528,6533-6534,6536-6541,6543-6565,6567,6569,6571-6576,6578,6580-6586,6588-6596,6598-6600,6602-6604,6606-6607,6609-6611,6613-6625,6629-6639,6641-6643
Modified: branches/Version-1_0-branch/login.php
===================================================================
--- branches/Version-1_0-branch/login.php 2010-12-05 11:54:24 UTC (rev
6643)
+++ branches/Version-1_0-branch/login.php 2010-12-05 11:57:41 UTC (rev
6644)
@@ -197,6 +197,7 @@
$cd_array['cd'] =
$GLOBALS['phpgw']->session->cd_reason;
}
$cd_array['skip_remote'] = true;
+ $cd_array['lightbox'] = $lightbox;
$GLOBALS['phpgw']->redirect_link("/{$partial_url}",
$cd_array);
exit;
}
Modified: branches/Version-1_0-branch/phpgwapi/inc/functions.inc.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/inc/functions.inc.php 2010-12-05
11:54:24 UTC (rev 6643)
+++ branches/Version-1_0-branch/phpgwapi/inc/functions.inc.php 2010-12-05
11:57:41 UTC (rev 6644)
@@ -668,7 +668,7 @@
if(phpgw::get_var('lightbox', 'bool'))
{
- $cd_array['lightbox'] = true;
+// $cd_array['lightbox'] = true;
}
if(phpgw::get_var('phpgw_return_as', 'string') ==
'json')
Modified: branches/Version-1_0-branch/phpgwapi/inc/sso/include_login.inc.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/inc/sso/include_login.inc.php
2010-12-05 11:54:24 UTC (rev 6643)
+++ branches/Version-1_0-branch/phpgwapi/inc/sso/include_login.inc.php
2010-12-05 11:57:41 UTC (rev 6644)
@@ -10,12 +10,12 @@
* @package phpgroupware
* @version $Id$
*/
-
+
/*
* Generic include for login.php like pages
*/
$GLOBALS['phpgw_info'] = array();
-
+
$GLOBALS['phpgw_info']['flags'] = array
(
'disable_template_class' => true,
@@ -140,8 +140,8 @@
return ' ';
}
}
-
-
+
+
/**
* Check languages
*/
@@ -158,14 +158,14 @@
$GLOBALS['phpgw_info']['server']['lang_ctimes']
= array();
}
//
_debug_array($GLOBALS['phpgw_info']['server']['lang_ctimes']);
-
+
$lang =
$GLOBALS['phpgw_info']['user']['preferences']['common']['lang'];
$apps = (array)$GLOBALS['phpgw_info']['user']['apps'];
$apps['phpgwapi'] = true; // check the api too
foreach ( array_keys($apps) as $app )
{
$fname = PHPGW_SERVER_ROOT .
"/$app/setup/phpgw_$lang.lang";
-
+
if (file_exists($fname))
{
$ctime = filectime($fname);
@@ -173,7 +173,7 @@
isset($GLOBALS['phpgw_info']['server']['lang_ctimes'][$lang][$app]) ?
(int)
$GLOBALS['phpgw_info']['server']['lang_ctimes'][$lang][$app] : 0;
//echo "checking lang='$lang',
app='$app', ctime='$ctime', ltime='$ltime'<br>\n";
-
+
if ($ctime != $ltime)
{
$this->update_langs();
// update all langs
@@ -240,7 +240,7 @@
{
$text = str_repeat(' ',
($text_len-strlen($text))) . $text;
}
-
+
$this->tmpl->set_file(array('login_form' =>
'login.tpl'));
$this->tmpl->set_block('login_form', 'message_block',
'message_blocks');
@@ -267,7 +267,7 @@
elseif(
$GLOBALS['phpgw_info']['server']['show_domain_selectbox'] )
{
foreach($GLOBALS['phpgw_domain'] as
$domain_name => $domain_vars)
- {
+ {
$this->tmpl->set_var('domain_name',
$domain_name);
if (isset($_COOKIE['last_domain']) &&
$_COOKIE['last_domain'] == $domain_name)
@@ -297,7 +297,7 @@
'domain_from_hosts'
=> ''
)
);
-
+
}
$GLOBALS['phpgw']->translation->add_app('login');
@@ -331,7 +331,7 @@
unset($_COOKIE['last_domain']);
}
}
-
+
$last_loginid = isset($_COOKIE['last_loginid']) ?
$_COOKIE['last_loginid'] : '';
if($GLOBALS['phpgw_info']['server']['show_domain_selectbox'] && $last_loginid
!== '')
{
@@ -414,23 +414,34 @@
$this->tmpl->set_var('last_loginid', $last_loginid);
if(isset($_REQUEST['skip_remote']) &&
$_REQUEST['skip_remote'])
{
- $this->tmpl->set_var('skip_remote', true);
+ $this->tmpl->set_var('skip_remote', true);
}
if(isset($_REQUEST['lightbox']) &&
$_REQUEST['lightbox'])
{
- $this->tmpl->set_var('lightbox', true);
+ $this->tmpl->set_var('lightbox', true);
}
if(isset($_REQUEST['hide_lightbox']) &&
$_REQUEST['hide_lightbox'])
{
- $hide_lightbox = <<<JS
+ $onload = <<<JS
<script language="javascript"
type="text/javascript">
parent.lightbox_login.hide();
</script>
JS;
- $this->tmpl->set_var('hide_lightbox',
$hide_lightbox);
}
+ else
+ {
+ $onload = <<<JS
+ <script language="javascript"
type="text/javascript">
+ window.onload = function()
+ {
+ document.login.login.select();
+ document.login.login.focus();
+ }
+ </script>
+JS;
+ }
+ $this->tmpl->set_var('onload', $onload);
-
$this->tmpl->set_var('lang_username',
$lang['username']);
$this->tmpl->set_var('lang_password',
$lang['password']);
if(isset($variables['lang_login']))
@@ -452,7 +463,7 @@
);
$this->tmpl->set_var('template_set',
$GLOBALS['phpgw_info']['login_template_set']);
-
+
if(
is_file("{$GLOBALS['phpgw_info']['server']['template_dir']}/css/base.css") )
{
$base_css =
"phpgwapi/templates/{$GLOBALS['phpgw_info']['server']['template_set']}/css/base.css";
@@ -482,7 +493,7 @@
}
$this->tmpl->set_var('autocomplete', $autocomplete);
unset($autocomplete);
-
+
if($cd)
{
if($cd == 1)
@@ -497,7 +508,7 @@
}
$this->tmpl->parse('message_blocks',
'message_block');
}
-
+
if(!$this->msg_only)
{
$this->tmpl->parse('loging_blocks',
'loging_block');
Modified: branches/Version-1_0-branch/phpgwapi/templates/base/login.tpl
===================================================================
--- branches/Version-1_0-branch/phpgwapi/templates/base/login.tpl
2010-12-05 11:54:24 UTC (rev 6643)
+++ branches/Version-1_0-branch/phpgwapi/templates/base/login.tpl
2010-12-05 11:57:41 UTC (rev 6644)
@@ -24,16 +24,7 @@
<link rel="stylesheet" type="text/css"
href="phpgwapi/templates/base/css/rounded.css">
- <script language="javascript" type="text/javascript">
- <!--
- window.onload = function()
- {
- document.login.login.select();
- document.login.login.focus();
- }
- -->
- </script>
- {hide_lightbox}
+ {onload}
</head>
<body>
Modified: branches/Version-1_0-branch/property/inc/class.soproject.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.soproject.inc.php
2010-12-05 11:54:24 UTC (rev 6643)
+++ branches/Version-1_0-branch/property/inc/class.soproject.inc.php
2010-12-05 11:57:41 UTC (rev 6644)
@@ -340,7 +340,7 @@
{
$cats = CreateObject('phpgwapi.categories',
-1, 'property', '.project');
$cats->supress_info = true;
- $cat_list_project =
$cats->return_sorted_array(0,$limit = false,$query = '',$sort = '',$order =
'',$globals = False, $parent_id = $cat_id, $use_acl = false);
+ $cat_list_project =
$cats->return_sorted_array(0, false, '', '', '', false, $cat_id,
false);//(0,$limit = false,$query = '',$sort = '',$order = '',$globals = False,
$parent_id = $cat_id, $use_acl = false);
$cat_filter = array($cat_id);
foreach ($cat_list_project as $_category)
{
Modified: branches/Version-1_0-branch/property/inc/class.soworkorder.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.soworkorder.inc.php
2010-12-05 11:54:24 UTC (rev 6643)
+++ branches/Version-1_0-branch/property/inc/class.soworkorder.inc.php
2010-12-05 11:57:41 UTC (rev 6644)
@@ -370,7 +370,7 @@
{
$cats = CreateObject('phpgwapi.categories',
-1, 'property', '.project');
$cats->supress_info = true;
- $cat_list_project =
$cats->return_sorted_array(0,$limit = false,$query = '',$sort = '',$order =
'',$globals = False, $parent_id = $cat_id, $use_acl = false);
+ $cat_list_project =
$cats->return_sorted_array(0, false, '', '', '', false, $cat_id, false);
$cat_filter = array($cat_id);
foreach ($cat_list_project as $_category)
{
Modified: branches/Version-1_0-branch/property/js/yahoo/property.js
===================================================================
--- branches/Version-1_0-branch/property/js/yahoo/property.js 2010-12-05
11:54:24 UTC (rev 6643)
+++ branches/Version-1_0-branch/property/js/yahoo/property.js 2010-12-05
11:57:41 UTC (rev 6644)
@@ -324,20 +324,53 @@
*/
this.onSearchClick = function()
{
- //no es necesario actualizar los valores actuales de
path_value. Este es global y siempre esta actualizado
- for(i=0;i<textImput.length;i++)
+ var callback4 =
{
- var busq =
encodeURIComponent(YAHOO.util.Dom.get(textImput[i].id).value);
- eval("path_values."+textImput[i].name+"='"+busq+"'")
- }
+ success: function(o)
+ {
+ var values = [];
+ try
+ {
+ values = JSON.parse(o.responseText);
+ }
+ catch (e)
+ {
+ return;
+ }
- //si esta configurado que la busqueda sea por fechas
- if(config_values.date_search != undefined &&
config_values.date_search != 0)
- {
- path_values.start_date =
YAHOO.util.Dom.get('start_date').value;
- path_values.end_date =
YAHOO.util.Dom.get('end_date').value;
- }
- execute_ds();
+ if(values['sessionExpired'] == true)
+ {
+ window.alert('sessionExpired - please
log in');
+
lightboxlogin('onSearchClick');//defined i phpgwapi/templates/portico/js/base.js
+ }
+ else
+ {
+ //no es necesario actualizar los
valores actuales de path_value. Este es global y siempre esta actualizado
+ for(i=0;i<textImput.length;i++)
+ {
+ var busq =
encodeURIComponent(YAHOO.util.Dom.get(textImput[i].id).value);
+
eval("path_values."+textImput[i].name+"='"+busq+"'")
+ }
+
+ //si esta configurado que la busqueda
sea por fechas
+ if(config_values.date_search !=
undefined && config_values.date_search != 0)
+ {
+ path_values.start_date =
YAHOO.util.Dom.get('start_date').value;
+ path_values.end_date =
YAHOO.util.Dom.get('end_date').value;
+ }
+ execute_ds();
+ }
+ },
+ failure: function(o)
+ {
+ window.alert('failure - try again - once')
+ },
+ timeout: 1000
+ };
+
+ var oArgs = {menuaction:'property.bocommon.confirm_session'};
+ var strURL = phpGWLink('index.php', oArgs, true);
+ var request = YAHOO.util.Connect.asyncRequest('POST', strURL,
callback4);
}
/********************************************************************************
*
@@ -753,12 +786,19 @@
myLoading.hide();
}
values_ds = JSON.parse(o.responseText);
- // eval('values_ds ='+o.responseText);
- flag_particular_setting='update';
- particular_setting();
-
myPaginator.setRowsPerPage(values_ds.recordsReturned,true);
- update_datatable();
- update_filter();
+ if(values_ds['sessionExpired'] == true)
+ {
+ window.alert('sessionExpired - please
log in');
+ lightboxlogin();//defined i
phpgwapi/templates/portico/js/base.js
+ }
+ else
+ {
+ flag_particular_setting='update';
+ particular_setting();
+
myPaginator.setRowsPerPage(values_ds.recordsReturned,true);
+ update_datatable();
+ update_filter();
+ }
},
failure: function(o) {window.alert('Server or your
connection is dead.')},
timeout: 10000,
Modified: branches/Version-1_0-branch/property/js/yahoo/tts.add.js
===================================================================
--- branches/Version-1_0-branch/property/js/yahoo/tts.add.js 2010-12-05
11:54:24 UTC (rev 6643)
+++ branches/Version-1_0-branch/property/js/yahoo/tts.add.js 2010-12-05
11:57:41 UTC (rev 6644)
@@ -1,40 +1,40 @@
this.confirm_session = function(action)
{
- var callback = {
- success: function(o)
- {
- var values = [];
- try
- {
- values
= JSON.parse(o.responseText);
- //
console.log(values);
- }
- catch (e)
- {
- return;
- }
+ var callback =
+ {
+ success: function(o)
+ {
+ var values = [];
+ try
+ {
+ values = JSON.parse(o.responseText);
+// console.log(values);
+ }
+ catch (e)
+ {
+ return;
+ }
-
if(values['sessionExpired'] == true)
- {
-
window.alert('sessionExpired - please log in');
-
lightboxlogin();//defined i phpgwapi/templates/portico/js/base.js
- }
- else
- {
-
document.getElementById(action).value = 1;
-
document.form.submit();
- }
+ if(values['sessionExpired'] == true)
+ {
+ window.alert('sessionExpired - please
log in');
+ lightboxlogin();//defined i
phpgwapi/templates/portico/js/base.js
+ }
+ else
+ {
+ document.getElementById(action).value =
1;
+ document.form.submit();
+ }
- },
- failure: function(o)
- {
-
window.alert('failure - try again - once')
- },
- timeout: 1000
- };
+ },
+ failure: function(o)
+ {
+ window.alert('failure - try again - once')
+ },
+ timeout: 1000
+ };
var oArgs = {menuaction:'property.bocommon.confirm_session'};
var strURL = phpGWLink('index.php', oArgs, true);
var request = YAHOO.util.Connect.asyncRequest('POST', strURL,
callback);
}
-
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [6644] merge 6640:6643 from trunk,
Sigurd Nes <=