[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [6908] Merge 6904:6907 from trunk
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [6908] Merge 6904:6907 from trunk |
|
Date: |
Wed, 02 Feb 2011 08:25:08 +0000 |
Revision: 6908
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=6908
Author: sigurdne
Date: 2011-02-02 08:25:07 +0000 (Wed, 02 Feb 2011)
Log Message:
-----------
Merge 6904:6907 from trunk
Modified Paths:
--------------
branches/Version-1_0-branch/phpgwapi/inc/class.account.inc.php
branches/Version-1_0-branch/phpgwapi/setup/phpgw_no.lang
branches/Version-1_0-branch/property/inc/class.botts.inc.php
branches/Version-1_0-branch/property/inc/class.uilookup.inc.php
branches/Version-1_0-branch/property/js/yahoo/lookup.entity.index.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,6641-6643,6645-6646,6648,6650-6654,6656-6659,6661-6663,6665-6666,6668-6669,6672-6673,6675,6677-6678,6680,6682-6686,6688-6717,6719,6721-6722,6724-6728,6730,6732-6734,6736-6739,6741,6743,6745-6746,6748-6756,6758-6762,6764,6766-6788,6790,6792-6798,6800-6814,6816-6819,6821-6822,6824-6826,6828-6837,6839,6841,6843-6849,6851,6853-6869,6871-6874,6876-6877,6879,6881,6883,6885-6886,6888-6893,6895-6897,6899-6901,6903
+
/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,6645-6646,6648,6650-6654,6656-6659,6661-6663,6665-6666,6668-6669,6672-6673,6675,6677-6678,6680,6682-6686,6688-6717,6719,6721-6722,6724-6728,6730,6732-6734,6736-6739,6741,6743,6745-6746,6748-6756,6758-6762,6764,6766-6788,6790,6792-6798,6800-6814,6816-6819,6821-6822,6824-6826,6828-6837,6839,6841,6843-6849,6851,6853-6869,6871-6874,6876-6877,6879,6881,6883,6885-6886,6888-6893,6895-6897,6899-6901,6903,6905-6907
Modified: branches/Version-1_0-branch/phpgwapi/inc/class.account.inc.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/inc/class.account.inc.php
2011-02-02 08:22:47 UTC (rev 6907)
+++ branches/Version-1_0-branch/phpgwapi/inc/class.account.inc.php
2011-02-02 08:25:07 UTC (rev 6908)
@@ -710,38 +710,38 @@
}
else
{
- $error = array();
+ $_error = array();
switch (
$GLOBALS['phpgw_info']['server']['password_level'] )
{
default:
case 'NONALPHA':
- $error[] =
self::_validate_password_level_nonalpha($passwd);
+ $_error[] =
self::_validate_password_level_nonalpha($passwd);
// fall through
case '1NUM':
- $error[] =
self::_validate_password_level_1num($passwd);
+ $_error[] =
self::_validate_password_level_1num($passwd);
// fall through
case '2LOW':
- $error[] =
self::_validate_password_level_2low($passwd);
+ $_error[] =
self::_validate_password_level_2low($passwd);
// fall through
case '2UPPER':
- $error[] =
self::_validate_password_level_2upper($passwd);
+ $_error[] =
self::_validate_password_level_2upper($passwd);
// fall through
case '8CHAR':
- $error[] =
self::_validate_password_level_8char($passwd);
+ $_error[] =
self::_validate_password_level_8char($passwd);
}
}
- if($error)
+ $error = array();
+ foreach($_error as $_msq)
{
- $msq = array();
- foreach($error as $_msq)
+ if($_msq)
{
- if($_msq)
- {
- $msq[] = $_msq;
- }
+ $error[] = $_msq;
}
- throw new
Exception(implode('<br/>',array_reverse($msq)));
}
+ if($error)
+ {
+ throw new
Exception(implode('<br/>',array_reverse($error)));
+ }
}
/**
Modified: branches/Version-1_0-branch/phpgwapi/setup/phpgw_no.lang
===================================================================
--- branches/Version-1_0-branch/phpgwapi/setup/phpgw_no.lang 2011-02-02
08:22:47 UTC (rev 6907)
+++ branches/Version-1_0-branch/phpgwapi/setup/phpgw_no.lang 2011-02-02
08:25:07 UTC (rev 6908)
@@ -134,3 +134,4 @@
Password must contain at least 2 lower case characters common no Passord
må inneholde minst 2 små bosktaver
Password must contain at least 1 number common no Passord må
inneholde minst 1 tall
Password must contain at least 1 non alphanumeric character common no
Passord må inneholde minst 1 spesialtegn
+The passwords don't match common no Passordene er ikke like
Modified: branches/Version-1_0-branch/property/inc/class.botts.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.botts.inc.php
2011-02-02 08:22:47 UTC (rev 6907)
+++ branches/Version-1_0-branch/property/inc/class.botts.inc.php
2011-02-02 08:25:07 UTC (rev 6908)
@@ -932,7 +932,7 @@
}
else
{
- $receipt['error'][] =
array('msg'=> lang('Your message could not be sent!'));
+// $receipt['error'][] =
array('msg'=> lang('Your message could not be sent!'));
$receipt['error'][] =
array('msg'=>lang('This user has not defined an email address !') . ' : ' .
$account_name);
}
}
@@ -960,6 +960,7 @@
}
}
+/*
if (!$rc &&
($this->config->config_data['groupnotification'] ||
$this->config->config_data['ownernotification'] ||
$this->config->config_data['groupnotification']))
{
$receipt['error'][] = array('msg'=> lang('Your
message could not be sent by mail!'));
@@ -975,7 +976,7 @@
$receipt['error'][] = array('msg'=> 'err_msg:
'. htmlspecialchars($this->send->err['msg']));
$receipt['error'][] = array('msg'=> 'err_desc:
'. $this->send->err['desc']);
}
-
+*/
//_debug_array($receipt);
return $receipt;
}
Modified: branches/Version-1_0-branch/property/inc/class.uilookup.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.uilookup.inc.php
2011-02-02 08:22:47 UTC (rev 6907)
+++ branches/Version-1_0-branch/property/inc/class.uilookup.inc.php
2011-02-02 08:25:07 UTC (rev 6908)
@@ -1798,6 +1798,15 @@
$this->location_code =
$boentity->location_code;
$this->criteria_id =
$boentity->criteria_id;
+ $second_display = phpgw::get_var('second_display',
'bool');
+ $default_district =
(isset($GLOBALS['phpgw_info']['user']['preferences']['property']['default_district'])?$GLOBALS['phpgw_info']['user']['preferences']['property']['default_district']:'');
+
+ if ($default_district && !$second_display &&
!$this->district_id)
+ {
+ $this->bo->district_id = $default_district;
+ $this->district_id =
$default_district;
+ }
+
if( phpgw::get_var('phpgw_return_as') != 'json' )
{
@@ -1816,6 +1825,7 @@
$datatable['config']['allow_allrows'] = true;
$datatable['config']['base_java_url'] =
"menuaction:'property.uilookup.entity',"
+ ."second_display:1,"
."entity_id:'{$this->entity_id}',"
."cat_id:'{$this->cat_id}',"
."district_id:'{$this->district_id}',"
@@ -1844,6 +1854,7 @@
array
(
'menuaction'
=> 'property.uilookup.entity',
+
'second_display' => $second_display,
'entity_id'
=> $this->entity_id,
'cat_id'
=> $this->cat_id,
'district_id'
=> $this->district_id,
Modified: branches/Version-1_0-branch/property/js/yahoo/lookup.entity.index.js
===================================================================
--- branches/Version-1_0-branch/property/js/yahoo/lookup.entity.index.js
2011-02-02 08:22:47 UTC (rev 6907)
+++ branches/Version-1_0-branch/property/js/yahoo/lookup.entity.index.js
2011-02-02 08:25:07 UTC (rev 6908)
@@ -6,7 +6,7 @@
var oMenuButton_0, oMenuButton_1, oMenuButton_2;
var selectsButtons = [
{order:0,
var_URL:'cat_id',name:'btn_cat_id',style:'districtbutton',dependiente:''},
- {order:1, var_URL:'district_id',name:'btn_district_id',
style:'districtbutton', dependiente:''},
+ {order:1, var_URL:'district_id',name:'btn_district_id',
style:'districtbutton', dependiente:''},
{order:2, var_URL:'criteria_id',
name:'btn_criteria_id',style:'criteriabutton',dependiente:''}
]
@@ -32,6 +32,13 @@
{
if(flag_particular_setting=='init')
{
+ //district
+ index =
locate_in_array_options(1,"value",path_values.district_id);
+ if(index)
+ {
+ oMenuButton_1.set("label", ("<em>" +
array_options[1][index][1] + "</em>"));
+ }
+
oMenuButton_0.focus();
}
else if(flag_particular_setting=='update')
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [6908] Merge 6904:6907 from trunk,
Sigurd Nes <=