[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [7165] Merge 7159:7164 from trunk
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [7165] Merge 7159:7164 from trunk |
|
Date: |
Sat, 02 Apr 2011 16:04:46 +0000 |
Revision: 7165
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=7165
Author: sigurdne
Date: 2011-04-02 16:04:45 +0000 (Sat, 02 Apr 2011)
Log Message:
-----------
Merge 7159:7164 from trunk
Modified Paths:
--------------
branches/Version-1_0-branch/admin/inc/class.uiloglevels.inc.php
branches/Version-1_0-branch/frontend/inc/class.bofellesdata.inc.php
branches/Version-1_0-branch/property/inc/class.fileuploader.inc.php
branches/Version-1_0-branch/rental/inc/class.bofellesdata.inc.php
branches/Version-1_0-branch/rental/inc/hook_config.inc.php
branches/Version-1_0-branch/rental/templates/base/config.tpl
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,6905-6907,6909,6911-6929,6931-6936,6938-6947,6949,6951,6953,6955-6956,6958-6959,6961-6968,6970-6971,6973-6974,6976-6978,6980,6982-7017,7019-7025,7027-7035,7037-7039,7041-7045,7047-7055,7057,7059-7065,7067-7069,7071,7073,7075-7076,7078,7080-7081,7083,7085,7087,7089-7097,7099-7102,7104-7105,7107-7111,7113-7120,7122-7124,7126-7129,7131,7133-7141,7143,7145-7146,7148-7150,7152-7153,7155-7158
+
/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,6909,6911-6929,6931-6936,6938-6947,6949,6951,6953,6955-6956,6958-6959,6961-6968,6970-6971,6973-6974,6976-6978,6980,6982-7017,7019-7025,7027-7035,7037-7039,7041-7045,7047-7055,7057,7059-7065,7067-7069,7071,7073,7075-7076,7078,7080-7081,7083,7085,7087,7089-7097,7099-7102,7104-7105,7107-7111,7113-7120,7122-7124,7126-7129,7131,7133-7141,7143,7145-7146,7148-7150,7152-7153,7155-7158,7160-7164
Modified: branches/Version-1_0-branch/admin/inc/class.uiloglevels.inc.php
===================================================================
--- branches/Version-1_0-branch/admin/inc/class.uiloglevels.inc.php
2011-04-02 16:02:42 UTC (rev 7164)
+++ branches/Version-1_0-branch/admin/inc/class.uiloglevels.inc.php
2011-04-02 16:04:45 UTC (rev 7165)
@@ -260,7 +260,7 @@
}
$this->template->set_var($var);
- return $this->template->fp('select',
'log_level_select', True);
+ return $this->template->fp('select',
'log_level_select');
}
private function update_level($level_type, $level_key,
$new_level)
Modified: branches/Version-1_0-branch/frontend/inc/class.bofellesdata.inc.php
===================================================================
--- branches/Version-1_0-branch/frontend/inc/class.bofellesdata.inc.php
2011-04-02 16:02:42 UTC (rev 7164)
+++ branches/Version-1_0-branch/frontend/inc/class.bofellesdata.inc.php
2011-04-02 16:04:45 UTC (rev 7165)
@@ -48,6 +48,8 @@
public function populate_result_units(array $unit_ids)
{
+ $this->log(__class__, __function__);
+
$columns = "V_ORG_ENHET.ORG_ENHET_ID,
V_ORG_ENHET.ORG_NAVN, V_ORG_ENHET.RESULTATENHET";
$table = "V_ORG_ENHET";
@@ -82,6 +84,8 @@
*/
public function get_result_units($username)
{
+ $this->log(__class__, __function__);
+
/* 1. Get all organizational units this user has access to
* 2. Check level for each unit and traverse if necessary
* 3. Build an array of result units this user has access to
@@ -175,6 +179,8 @@
*/
public function get_organisational_unit_name($number)
{
+ $this->log(__class__, __function__);
+
if(isset($number) && is_numeric($number))
{
$sql = "SELECT V_ORG_ENHET.ORG_NAVN FROM V_ORG_ENHET
WHERE V_ORG_ENHET.RESULTATENHET = $number";
@@ -195,6 +201,8 @@
public function get_organisational_unit_info($number)
{
+ $this->log(__class__, __function__);
+
if(isset($number) && is_numeric($number))
{
$sql = "SELECT V_ORG_ENHET.ORG_NAVN,
V_ORG_ENHET.RESULTATENHET FROM V_ORG_ENHET WHERE V_ORG_ENHET.ORG_ENHET_ID =
$number";
@@ -222,6 +230,8 @@
*/
public function get_user(string $username)
{
+ $this->log(__class__, __function__);
+
$sql = "SELECT BRUKERNAVN, FORNAVN, ETTERNAVN, EPOST FROM
V_AD_BRUKERE WHERE BRUKERNAVN = '{$username}'";
$db = $this->get_db();
$db->query($sql,__LINE__,__FILE__);
@@ -240,4 +250,20 @@
return false;
}
}
+
+ protected function log($class, $function)
+ {
+
if(isset($GLOBALS['phpgw_info']['server']['log_levels']['module']['frontend'])
&& $GLOBALS['phpgw_info']['server']['log_levels']['module']['frontend'])
+ {
+ $bt = debug_backtrace();
+ $GLOBALS['phpgw']->log->debug(array(
+ 'text' =>
"{$class}::{$function} called from file: {$bt[1]['file']} line:
{$bt[1]['line']}",
+ 'p1' => '',
+ 'p2' => '',
+ 'line' => __LINE__,
+ 'file' => __FILE__
+ ));
+ unset($bt);
+ }
+ }
}
Modified: branches/Version-1_0-branch/property/inc/class.fileuploader.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.fileuploader.inc.php
2011-04-02 16:02:42 UTC (rev 7164)
+++ branches/Version-1_0-branch/property/inc/class.fileuploader.inc.php
2011-04-02 16:04:45 UTC (rev 7165)
@@ -165,6 +165,7 @@
//
'checkExisting' :
'{$GLOBALS['phpgw_info']['server']['webserver_url']}/index.php?check=1',
'cancelImage' :
'{$GLOBALS['phpgw_info']['server']['webserver_url']}/phpgwapi/js/uploadify/cancel.png',
'uploaderType' : 'flash', // 'html5'|'flash'
+
'requeueErrors' : false
'debug'
: true,
'method' : 'GET',
'multi'
: true,
Modified: branches/Version-1_0-branch/rental/inc/class.bofellesdata.inc.php
===================================================================
--- branches/Version-1_0-branch/rental/inc/class.bofellesdata.inc.php
2011-04-02 16:02:42 UTC (rev 7164)
+++ branches/Version-1_0-branch/rental/inc/class.bofellesdata.inc.php
2011-04-02 16:04:45 UTC (rev 7165)
@@ -49,6 +49,8 @@
public function responsibility_id_exist($responsibility_id)
{
+ $this->log(__class__, __function__);
+
if(isset($responsibility_id))
{
$column = "V_ORG_ENHET.ORG_ENHET_ID,
V_ORG_ENHET.ORG_NAVN";
@@ -72,6 +74,8 @@
public function result_unit_exist($result_unit, $level)
{
+ $this->log(__class__, __function__);
+
if(isset($result_unit) && is_numeric($result_unit))
{
$column = "V_ORG_ENHET.ORG_ENHET_ID,
V_ORG_ENHET.ORG_NAVN";
@@ -93,6 +97,8 @@
public function org_unit_exist($org_unit_id, $level)
{
+ $this->log(__class__, __function__);
+
if(isset($org_unit_id) && is_numeric($org_unit_id))
{
$column = "V_ORG_ENHET.ORG_ENHET_ID,
V_ORG_ENHET.ORG_NAVN";
@@ -114,6 +120,8 @@
public function get_result_unit($org_unit_id)
{
+ $this->log(__class__, __function__);
+
//Must traverse down u hierarchy
$columns = "V_ORG_ENHET.ORG_ENHET_ID,
V_ORG_ENHET.ORG_NIVAA, V_ORG_ENHET.ORG_NAVN, V_ORG_ENHET.ENHET_ID,
V_ORG_ENHET.RESULTATENHET";
$tables = "V_ORG_ENHET";
@@ -138,7 +146,8 @@
public function get_result_units()
{
-
+ $this->log(__class__, __function__);
+
$columns = "V_ORG_ENHET.ORG_ENHET_ID,
V_ORG_ENHET.ORG_NAVN, V_ORG_ENHET.RESULTATENHET";
$tables = "V_ORG_ENHET";
$sql = "SELECT $columns FROM $tables WHERE
V_ORG_ENHET.ORG_NIVAA = 4 ORDER BY V_ORG_ENHET.RESULTATENHET ASC";
@@ -159,6 +168,8 @@
public function get_result_unit_with_leader($org_unit_id)
{
+ $this->log(__class__, __function__);
+
$columns = "V_ORG_ENHET.ORG_ENHET_ID,
V_ORG_ENHET.ORG_NAVN, V_ORG_PERSON.FORNAVN, V_ORG_PERSON.ETTERNAVN,
V_ORG_PERSON.BRUKERNAVN";
$tables = "V_ORG_ENHET";
$joins = "LEFT JOIN V_ORG_PERSON_ENHET ON
(V_ORG_ENHET.ORG_ENHET_ID = V_ORG_PERSON_ENHET.ORG_ENHET_ID AND
V_ORG_PERSON_ENHET.prioritet = 1) ".
@@ -184,7 +195,8 @@
public function get_result_units_with_leader($start_index,
$num_of_objects, $sort_field, $sort_ascending,$search_for, $search_type)
{
-
+ $this->log(__class__, __function__);
+
$columns = "V_ORG_ENHET.ORG_ENHET_ID,
V_ORG_ENHET.ORG_NAVN, V_ORG_PERSON.FORNAVN, V_ORG_PERSON.ETTERNAVN,
V_ORG_PERSON.BRUKERNAVN";
$tables = "V_ORG_ENHET";
$joins = "LEFT JOIN V_ORG_PERSON_ENHET ON
(V_ORG_ENHET.ORG_ENHET_ID = V_ORG_PERSON_ENHET.ORG_ENHET_ID AND
V_ORG_PERSON_ENHET.prioritet = 1) ".
@@ -254,7 +266,10 @@
return $result_units;
}
- public function get_result_units_count($search_for,
$search_type){
+ public function get_result_units_count($search_for,
$search_type)
+ {
+ $this->log(__class__, __function__);
+
$columns = "count(*)";
$tables = "V_ORG_ENHET";
$joins = "LEFT JOIN V_ORG_PERSON_ENHET ON
(V_ORG_ENHET.ORG_ENHET_ID = V_ORG_PERSON_ENHET.ORG_ENHET_ID AND
V_ORG_PERSON_ENHET.prioritet = 1) ".
@@ -293,14 +308,28 @@
}
return 0;
}
-
-
-
+
+ protected function log($class, $function)
+ {
+
if(isset($GLOBALS['phpgw_info']['server']['log_levels']['module']['rental']) &&
$GLOBALS['phpgw_info']['server']['log_levels']['module']['rental'])
+ {
+ $bt = debug_backtrace();
+ $GLOBALS['phpgw']->log->debug(array(
+ 'text' =>
"{$class}::{$function} called from file: {$bt[1]['file']} line:
{$bt[1]['line']}",
+ 'p1' => '',
+ 'p2' => '',
+ 'line' => __LINE__,
+ 'file' => __FILE__
+ ));
+ unset($bt);
+ }
+ }
+
public function is_connected()
{
return $this->connected;
}
-
+
public function get_status()
{
return $this->status;
Modified: branches/Version-1_0-branch/rental/inc/hook_config.inc.php
===================================================================
--- branches/Version-1_0-branch/rental/inc/hook_config.inc.php 2011-04-02
16:02:42 UTC (rev 7164)
+++ branches/Version-1_0-branch/rental/inc/hook_config.inc.php 2011-04-02
16:04:45 UTC (rev 7165)
@@ -50,28 +50,36 @@
function entity_config_move_in_out($config)
{
- $entity =
CreateObject('property.soadmin_entity');
- $entities = $entity->read(array('allrows' => true, 'type'
=> 'catch'));
- $selected_entity = isset($config['entity_config_move_in_out'])
? $config['entity_config_move_in_out'] : '';
- $out = '<option value="">' . lang('none selected') .
'</option>' . "\n";
- if ( is_array($entities) && count($entities) )
+ if(isset($GLOBALS['phpgw_info']['apps']['catch']))
{
- foreach($entities as $entry)
+ $entity =
CreateObject('property.soadmin_entity');
+ $entities = $entity->read(array('allrows' =>
true, 'type' => 'catch'));
+ $selected_entity =
isset($config['entity_config_move_in_out']) ?
$config['entity_config_move_in_out'] : '';
+ $out = '<select
name="newsettings[entity_config_move_in_out]">' . "\n";
+ $out .= '<option value="">' . lang('none selected') .
'</option>' . "\n";
+ if ( is_array($entities) && count($entities) )
{
-
- $id = $entry['id'];
- $selected = '';
- if ( $selected_entity == $id )
+ foreach($entities as $entry)
{
- $selected = ' selected';
+
+ $id = $entry['id'];
+ $selected = '';
+ if ( $selected_entity == $id )
+ {
+ $selected = ' selected';
+ }
+
+ $out .= <<<HTML
+ <option
value="{$id}"{$selected}>{$entry['name']}</option>
+HTML;
}
-
- $out .= <<<HTML
- <option
value="{$id}"{$selected}>{$entry['name']}</option>
-
-HTML;
}
+ $out .= ' </select>' . "\n";
}
+ else
+ {
+ $out = '<b>The catch-module is not installed</b>' .
"\n";
+ }
return $out;
}
@@ -140,4 +148,4 @@
}
}
return $out;
- }
\ No newline at end of file
+ }
Modified: branches/Version-1_0-branch/rental/templates/base/config.tpl
===================================================================
--- branches/Version-1_0-branch/rental/templates/base/config.tpl
2011-04-02 16:02:42 UTC (rev 7164)
+++ branches/Version-1_0-branch/rental/templates/base/config.tpl
2011-04-02 16:04:45 UTC (rev 7165)
@@ -55,9 +55,7 @@
<tr class="row_off">
<td>{lang_entity_config_move_in_out}:</td>
<td>
- <select name="newsettings[entity_config_move_in_out]">
{hook_entity_config_move_in_out}
- </select>
</td>
</tr>
<tr class="row_on">
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [7165] Merge 7159:7164 from trunk,
Sigurd Nes <=