[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [13953] property: formatting code
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [13953] property: formatting code |
|
Date: |
Thu, 17 Sep 2015 07:55:49 +0000 |
Revision: 13953
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=13953
Author: sigurdne
Date: 2015-09-17 07:55:45 +0000 (Thu, 17 Sep 2015)
Log Message:
-----------
property: formatting code
Modified Paths:
--------------
branches/dev-syncromind/property/help/index.php
branches/dev-syncromind/property/inc/class.XmlToArray.inc.php
branches/dev-syncromind/property/inc/class.boXport.inc.php
branches/dev-syncromind/property/inc/class.boadmin.inc.php
branches/dev-syncromind/property/inc/class.boadmin_entity.inc.php
branches/dev-syncromind/property/inc/class.boadmin_location.inc.php
branches/dev-syncromind/property/inc/class.boagreement.inc.php
branches/dev-syncromind/property/inc/class.boalarm.inc.php
branches/dev-syncromind/property/inc/class.boasync.inc.php
branches/dev-syncromind/property/inc/class.bobudget.inc.php
branches/dev-syncromind/property/inc/class.bocommon.inc.php
branches/dev-syncromind/property/inc/class.bocondition_survey.inc.php
branches/dev-syncromind/property/inc/class.bocustom.inc.php
branches/dev-syncromind/property/inc/class.bodimb_role_user.inc.php
branches/dev-syncromind/property/inc/class.bodocument.inc.php
branches/dev-syncromind/property/inc/class.boentity.inc.php
branches/dev-syncromind/property/inc/class.boevent.inc.php
branches/dev-syncromind/property/inc/class.bofiles.inc.php
branches/dev-syncromind/property/inc/class.bogab.inc.php
branches/dev-syncromind/property/inc/class.bogallery.inc.php
branches/dev-syncromind/property/inc/class.bogeneric.inc.php
branches/dev-syncromind/property/inc/class.boifc.inc.php
branches/dev-syncromind/property/inc/class.boinvestment.inc.php
branches/dev-syncromind/property/inc/class.boinvoice.inc.php
branches/dev-syncromind/property/inc/class.bojasper.inc.php
branches/dev-syncromind/property/inc/class.bolocation.inc.php
branches/dev-syncromind/property/inc/class.bolookup.inc.php
branches/dev-syncromind/property/inc/class.bomigrate.inc.php
branches/dev-syncromind/property/inc/class.bopricebook.inc.php
branches/dev-syncromind/property/inc/class.boproject.inc.php
branches/dev-syncromind/property/inc/class.borequest.inc.php
branches/dev-syncromind/property/inc/class.boresponsible.inc.php
branches/dev-syncromind/property/inc/class.bos_agreement.inc.php
branches/dev-syncromind/property/inc/class.botemplate.inc.php
branches/dev-syncromind/property/inc/class.botenant_claim.inc.php
branches/dev-syncromind/property/inc/class.botts.inc.php
branches/dev-syncromind/property/inc/class.bowo_hour.inc.php
branches/dev-syncromind/property/inc/class.boworkorder.inc.php
branches/dev-syncromind/property/inc/class.cat_hooks.inc.php
branches/dev-syncromind/property/inc/class.custom_fields.inc.php
branches/dev-syncromind/property/inc/class.custom_functions.inc.php
branches/dev-syncromind/property/inc/class.db_mssql.inc.php
branches/dev-syncromind/property/inc/class.db_oci8.inc.php
branches/dev-syncromind/property/inc/class.fileuploader.inc.php
branches/dev-syncromind/property/inc/class.historylog.inc.php
branches/dev-syncromind/property/inc/class.hook_helper.inc.php
branches/dev-syncromind/property/inc/class.import.inc.php
branches/dev-syncromind/property/inc/class.interlink.inc.php
branches/dev-syncromind/property/inc/class.menu.inc.php
branches/dev-syncromind/property/inc/class.notify.inc.php
branches/dev-syncromind/property/inc/class.ods.inc.php
branches/dev-syncromind/property/inc/class.soXport.inc.php
branches/dev-syncromind/property/inc/class.soadmin.inc.php
branches/dev-syncromind/property/inc/class.soadmin_entity.inc.php
branches/dev-syncromind/property/inc/class.soadmin_location.inc.php
branches/dev-syncromind/property/inc/class.soagreement.inc.php
branches/dev-syncromind/property/inc/class.soalarm.inc.php
branches/dev-syncromind/property/inc/class.soasync.inc.php
branches/dev-syncromind/property/inc/class.sobudget.inc.php
branches/dev-syncromind/property/inc/class.socommon.inc.php
branches/dev-syncromind/property/inc/class.socommon_core.inc.php
branches/dev-syncromind/property/inc/class.socondition_survey.inc.php
branches/dev-syncromind/property/inc/class.socustom.inc.php
branches/dev-syncromind/property/inc/class.sodimb_role_user.inc.php
branches/dev-syncromind/property/inc/class.sodocument.inc.php
branches/dev-syncromind/property/inc/class.soentity.inc.php
branches/dev-syncromind/property/inc/class.soevent.inc.php
branches/dev-syncromind/property/inc/class.soexportentity.inc.php
branches/dev-syncromind/property/inc/class.sogab.inc.php
branches/dev-syncromind/property/inc/class.sogallery.inc.php
branches/dev-syncromind/property/inc/class.sogeneric.inc.php
branches/dev-syncromind/property/inc/class.soinvestment.inc.php
branches/dev-syncromind/property/inc/class.soinvoice.inc.php
branches/dev-syncromind/property/inc/class.sojasper.inc.php
branches/dev-syncromind/property/inc/class.solocation.inc.php
branches/dev-syncromind/property/inc/class.solookup.inc.php
branches/dev-syncromind/property/inc/class.sopending_action.inc.php
branches/dev-syncromind/property/inc/class.sopricebook.inc.php
branches/dev-syncromind/property/inc/class.soproject.inc.php
branches/dev-syncromind/property/inc/class.sorequest.inc.php
branches/dev-syncromind/property/inc/class.soresponsible.inc.php
branches/dev-syncromind/property/inc/class.sos_agreement.inc.php
branches/dev-syncromind/property/inc/class.sotemplate.inc.php
branches/dev-syncromind/property/inc/class.sotenant_claim.inc.php
branches/dev-syncromind/property/inc/class.sotts.inc.php
branches/dev-syncromind/property/inc/class.sowo_hour.inc.php
branches/dev-syncromind/property/inc/class.soworkorder.inc.php
branches/dev-syncromind/property/inc/class.test.inc.php
branches/dev-syncromind/property/inc/class.uiXport.inc.php
branches/dev-syncromind/property/inc/class.uiadmin.inc.php
branches/dev-syncromind/property/inc/class.uiadmin_entity.inc.php
branches/dev-syncromind/property/inc/class.uiadmin_location.inc.php
branches/dev-syncromind/property/inc/class.uiagreement.inc.php
branches/dev-syncromind/property/inc/class.uialarm.inc.php
branches/dev-syncromind/property/inc/class.uiasync.inc.php
branches/dev-syncromind/property/inc/class.uibudget.inc.php
branches/dev-syncromind/property/inc/class.uicondition_survey.inc.php
branches/dev-syncromind/property/inc/class.uicustom.inc.php
branches/dev-syncromind/property/inc/class.uidebug_json.inc.php
branches/dev-syncromind/property/inc/class.uidimb_role_user.inc.php
branches/dev-syncromind/property/inc/class.uidocument.inc.php
branches/dev-syncromind/property/inc/class.uidocument2.inc.php
branches/dev-syncromind/property/inc/class.uientity.inc.php
branches/dev-syncromind/property/inc/class.uievent.inc.php
branches/dev-syncromind/property/inc/class.uigab.inc.php
branches/dev-syncromind/property/inc/class.uigallery.inc.php
branches/dev-syncromind/property/inc/class.uigeneric.inc.php
branches/dev-syncromind/property/inc/class.uiifc.inc.php
branches/dev-syncromind/property/inc/class.uiimport.inc.php
branches/dev-syncromind/property/inc/class.uiinvestment.inc.php
branches/dev-syncromind/property/inc/class.uiinvoice.inc.php
branches/dev-syncromind/property/inc/class.uiinvoice2.inc.php
branches/dev-syncromind/property/inc/class.uijasper.inc.php
branches/dev-syncromind/property/inc/class.uilocation.inc.php
branches/dev-syncromind/property/inc/class.uilookup.inc.php
branches/dev-syncromind/property/inc/class.uimigrate.inc.php
branches/dev-syncromind/property/inc/class.uipricebook.inc.php
branches/dev-syncromind/property/inc/class.uiproject.inc.php
branches/dev-syncromind/property/inc/class.uirequest.inc.php
branches/dev-syncromind/property/inc/class.uiresponsible.inc.php
branches/dev-syncromind/property/inc/class.uis_agreement.inc.php
branches/dev-syncromind/property/inc/class.uitemplate.inc.php
branches/dev-syncromind/property/inc/class.uitenant_claim.inc.php
branches/dev-syncromind/property/inc/class.uitts.inc.php
branches/dev-syncromind/property/inc/class.uiwo_hour.inc.php
branches/dev-syncromind/property/inc/class.uiworkorder.inc.php
branches/dev-syncromind/property/inc/cron/class.cron_parent.inc.php
branches/dev-syncromind/property/inc/cron/cron.php
branches/dev-syncromind/property/inc/cron/default/Import_fra_agresso_X205.php
branches/dev-syncromind/property/inc/cron/default/catch_ppc.php
branches/dev-syncromind/property/inc/cron/default/forward_mail_as_sms.php
branches/dev-syncromind/property/inc/cron/default/import_from_scanner.php
branches/dev-syncromind/property/inc/cron/default/import_oppdatering_av_bestilling_fra_agresso_bkb.php
branches/dev-syncromind/property/inc/cron/default/lag_lang_filer.php
branches/dev-syncromind/property/inc/cron/default/oppdater_antall_leieobjekt.php
branches/dev-syncromind/property/inc/cron/default/oppdater_utgaatt_objekt.php
branches/dev-syncromind/property/inc/cron/default/organize_drawing.php
branches/dev-syncromind/property/inc/cron/default/organize_energy_pdf_bbb.php
branches/dev-syncromind/property/inc/cron/default/reset_workorder_cached_budget.php
branches/dev-syncromind/property/inc/cron/default/synkroniser_avdelinger_med_fellesdata.php
branches/dev-syncromind/property/inc/cron/default/synkroniser_med_boei.php
branches/dev-syncromind/property/inc/cron/default/update_googlemap.php
branches/dev-syncromind/property/inc/cron/default/update_phpgw.php
branches/dev-syncromind/property/inc/custom/default/BkBygg_editer_system_oversikt.php
branches/dev-syncromind/property/inc/custom/default/EBF_update_ticket_on_project_change.php
branches/dev-syncromind/property/inc/custom/default/LRS_oppdater_el_anlegg.php
branches/dev-syncromind/property/inc/custom/default/catch_ticket_export.php
branches/dev-syncromind/property/inc/custom/default/estimert_ferdigdato_til_leieobjekt_BBB.php
branches/dev-syncromind/property/inc/custom/default/hent_maaler_nr_til_besikt_rapport.php
branches/dev-syncromind/property/inc/custom/default/innflyttetdato_entity_2_11_BBB.php
branches/dev-syncromind/property/inc/custom/default/kalkuler_risiko_for_ros.php
branches/dev-syncromind/property/inc/custom/default/ticket_NLSH_pre_commit_validate.php
branches/dev-syncromind/property/inc/custom/default/ticket_redirect_based_on_status.php
branches/dev-syncromind/property/inc/custom/default/varsle_prosjektoordinator_ved_avsluttet_relatert_melding_BBB.php
branches/dev-syncromind/property/inc/export/default/Agresso_Bergen_Kostfordeling
branches/dev-syncromind/property/inc/export/default/Agresso_X114
branches/dev-syncromind/property/inc/export/default/El_anlegg_LRS
branches/dev-syncromind/property/inc/hook_config.inc.php
branches/dev-syncromind/property/inc/hook_help.inc.php
branches/dev-syncromind/property/inc/hook_manual.inc.php
branches/dev-syncromind/property/inc/hook_settings.inc.php
branches/dev-syncromind/property/inc/hook_sidebox_menu.inc.php
branches/dev-syncromind/property/inc/import/default/Import_fra_Service_EBF
branches/dev-syncromind/property/inc/import/default/cvs_import_fiktiv_faktura_nlsh
branches/dev-syncromind/property/inc/import/default/cvs_import_kunstoversikt_bilde_bkb
branches/dev-syncromind/property/inc/import/default/cvs_import_kunstoversikt_bkb
branches/dev-syncromind/property/inc/import/default/cvs_import_romdata_bkb
branches/dev-syncromind/property/inc/import/import_update_generic.php
branches/dev-syncromind/property/inc/soap_client/bra5/soap.php
branches/dev-syncromind/property/inc/soap_client/braarkiv/soap.php
branches/dev-syncromind/property/login.php
Modified: branches/dev-syncromind/property/help/index.php
===================================================================
--- branches/dev-syncromind/property/help/index.php 2015-09-17 00:15:11 UTC
(rev 13952)
+++ branches/dev-syncromind/property/help/index.php 2015-09-17 07:55:45 UTC
(rev 13953)
@@ -1,26 +1,26 @@
<?php
- /**************************************************************************\
- * phpGroupWare - User manual *
- * http://www.phpgroupware.org *
- * -------------------------------------------- *
- * This program is free software; you can redistribute it and/or modify it *
- * under the terms of the GNU General Public License as published by the *
- * Free Software Foundation; either version 2 of the License, or (at your *
- * option) any later version. *
- \**************************************************************************/
+ /* *
************************************************************************\
+ * phpGroupWare - User manual
*
+ * http://www.phpgroupware.org
*
+ * --------------------------------------------
*
+ * This program is free software; you can redistribute it and/or
modify it *
+ * under the terms of the GNU General Public License as published by
the *
+ * Free Software Foundation; either version 2 of the License, or (at
your *
+ * option) any later version.
*
+
\************************************************************************* */
/* $Id$ */
- $phpgw_flags = Array(
- 'currentapp' => 'manual'
+ $phpgw_flags = array(
+ 'currentapp' => 'manual'
);
$phpgw_info['flags'] = $phpgw_flags;
include('../../header.inc.php');
- $appname = 'property';
- include(PHPGW_SERVER_ROOT.'/'.$appname.'/setup/setup.inc.php');
+ $appname = 'property';
+ include(PHPGW_SERVER_ROOT . '/' . $appname . '/setup/setup.inc.php');
?>
-<img src="<?php echo $phpgw->common->image($appname,'navbar.gif'); ?>"
border="0"><p/>
-<font face="<?php echo $phpgw_info['theme']['font']; ?>" size="2">
-Version: <b><?php echo $setup_info[$appname]['version']; ?></b><p/>
+<img src="<?php echo $phpgw->common->image($appname, 'navbar.gif');?>"
border="0"><p/>
+<font face="<?php echo $phpgw_info['theme']['font'];?>" size="2">
+Version: <b><?php echo $setup_info[$appname]['version'];?></b><p/>
</font>
-<?php $phpgw->common->phpgw_footer(); ?>
+<?php $phpgw->common->phpgw_footer();?>
Modified: branches/dev-syncromind/property/inc/class.XmlToArray.inc.php
===================================================================
--- branches/dev-syncromind/property/inc/class.XmlToArray.inc.php
2015-09-17 00:15:11 UTC (rev 13952)
+++ branches/dev-syncromind/property/inc/class.XmlToArray.inc.php
2015-09-17 07:55:45 UTC (rev 13953)
@@ -1,5 +1,4 @@
<?php
-
/**
* XmlToArray
* @author Rasmus Andersson address@hidden http://rasmusandersson.se/}
@@ -154,33 +153,31 @@
* @param bool $includeEmptyValues (optional) Defaults
to no/false
* @return object XmlToArray instance
*/
- function __construct( $encoding = NULL, $stripLinebreaks = NULL,
- $includeRootElement = NULL,
$automaticUtf8Decoding = NULL,
- $includeEmptyValues = NULL )
+ function __construct($encoding = NULL, $stripLinebreaks = NULL,
$includeRootElement = NULL, $automaticUtf8Decoding = NULL, $includeEmptyValues
= NULL)
{
- if ( is_string( $encoding ) )
+ if(is_string($encoding))
{
- $this->setEncoding( $encoding );
+ $this->setEncoding($encoding);
}
- if ( is_bool( $stripLinebreaks ) )
+ if(is_bool($stripLinebreaks))
{
- $this->setStripsLinebreaks( $stripLinebreaks );
+ $this->setStripsLinebreaks($stripLinebreaks);
}
- if ( is_bool( $includeRootElement ) )
+ if(is_bool($includeRootElement))
{
- $this->setIncludesRoot( $includeRootElement );
+ $this->setIncludesRoot($includeRootElement);
}
- if ( is_bool( $automaticUtf8Decoding ) )
+ if(is_bool($automaticUtf8Decoding))
{
- $this->setDecodesUTF8Automaticly(
$automaticUtf8Decoding );
+
$this->setDecodesUTF8Automaticly($automaticUtf8Decoding);
}
- if ( is_bool( $includeEmptyValues ) )
+ if(is_bool($includeEmptyValues))
{
- $this->setIncludesEmptyValues(
$includeEmptyValues );
+
$this->setIncludesEmptyValues($includeEmptyValues);
}
- list($usec, $sec) = explode( " ", microtime() );
- $this->_error_start_timer = (float) $usec + (float)
$sec;
+ list($usec, $sec) = explode(" ", microtime());
+ $this->_error_start_timer = (float)$usec + (float)$sec;
}
/**
@@ -190,13 +187,12 @@
*
* @param string $enc
*/
- function setEncoding( $enc )
+ function setEncoding($enc)
{
- $enc = strtoupper( $enc );
- if ( $enc != 'ISO-8859-1' && $enc != 'UTF-8' && $enc !=
'US-ASCII' )
+ $enc = strtoupper($enc);
+ if($enc != 'ISO-8859-1' && $enc != 'UTF-8' && $enc !=
'US-ASCII')
{
- $this->_logError( 'setEncoding',
- 'Unsupported encoding specified.
Using default/current.' );
+ $this->_logError('setEncoding', 'Unsupported
encoding specified. Using default/current.');
return;
}
$this->_encoding = $enc;
@@ -213,7 +209,7 @@
/**
* @param bool $b
*/
- function setStripsLinebreaks( $b )
+ function setStripsLinebreaks($b)
{
$this->_strip_linebreaks = $b;
}
@@ -229,7 +225,7 @@
/**
* @param int $i CASE_LOWER or CASE_UPPER
*/
- function setTagCase( $i )
+ function setTagCase($i)
{
$this->_lower_case_tags = ($i == CASE_LOWER);
}
@@ -240,7 +236,7 @@
*
* @param bool $b
*/
- function setIncludesRoot( $b )
+ function setIncludesRoot($b)
{
$this->_includesRoot = $b;
}
@@ -259,7 +255,7 @@
*
* @param bool $b
*/
- function setDecodesUTF8Automaticly( $b )
+ function setDecodesUTF8Automaticly($b)
{
$this->_automaticUtf8Decoding = $b;
}
@@ -278,7 +274,7 @@
*
* @param bool $b
*/
- function setIncludesEmptyValues( $b )
+ function setIncludesEmptyValues($b)
{
$this->_include_empty_values = $b;
}
@@ -312,30 +308,28 @@
*
or array(&$object, 'function')
* @return bool Success?
*/
- function setValueModifier( $function )
+ function setValueModifier($function)
{
- if ( is_string( $function ) )
+ if(is_string($function))
{
- if ( function_exists( $function ) )
+ if(function_exists($function))
{
$this->_valueModifier = $function;
return true;
}
else
{
- $this->_logError( 'setValueModifier',
- 'Registered value modifier function
can not be found.' );
+ $this->_logError('setValueModifier',
'Registered value modifier function can not be found.');
return false;
}
}
- else if ( is_array( $function ) )
+ else if(is_array($function))
{
$this->_valueModifier = $function;
}
else
{
- $this->_logError( 'setValueModifier',
- 'Parameter of unsupported type.
Should be string or array.' );
+ $this->_logError('setValueModifier', 'Parameter
of unsupported type. Should be string or array.');
return false;
}
return true;
@@ -355,23 +349,23 @@
* @param string $file
* @return array
*/
- function parseFile( $file )
+ function parseFile($file)
{
- if ( !file_exists( $file ) )
+ if(!file_exists($file))
{
- $this->_logError( 'parseFile', 'The file "' .
$file . '" can not be found!' );
+ $this->_logError('parseFile', 'The file "' .
$file . '" can not be found!');
return array();
}
- return $this->parse( file_get_contents( $file ) );
+ return $this->parse(file_get_contents($file));
}
/**
* @access private
*/
- function _logError( $function, $msg )
+ function _logError($function, $msg)
{
- list($usec, $sec) = explode( " ", microtime() );
- $time = ((float)
$usec + (float) $sec) - $this->_error_start_timer;
+ list($usec, $sec) = explode(" ", microtime());
+ $time =
((float)$usec + (float)$sec) - $this->_error_start_timer;
$this->_error_trace[] = array($function, $msg,
$time);
}
@@ -382,13 +376,13 @@
*/
function errors()
{
- if ( count( $this->_error_trace ) == 0 )
+ if(count($this->_error_trace) == 0)
return NULL;
$s = '';
- $len = count( $this->_error_trace ) - 1;
- for ( $i = $len; $i > -1; $i-- )
+ $len = count($this->_error_trace) - 1;
+ for($i = $len; $i > -1; $i--)
{
- $s .= '[' . round( $this->_error_trace[$i][2] *
1000, 2 ) . ' ms] <b>XmlToArray2->' . $this->_error_trace[$i][0] . '()</b> ' .
$this->_error_trace[$i][1] . "<br/>";
+ $s .= '[' . round($this->_error_trace[$i][2] *
1000, 2) . ' ms] <b>XmlToArray2->' . $this->_error_trace[$i][0] . '()</b> ' .
$this->_error_trace[$i][1] . "<br/>";
}
return $s;
}
@@ -399,19 +393,19 @@
*
* @access private
*/
- function _onValue( $value )
+ function _onValue($value)
{
- if ( $this->_strip_linebreaks )
+ if($this->_strip_linebreaks)
{
- $value = preg_replace( '/[\r\n]+/', ' ', $value
);
+ $value = preg_replace('/[\r\n]+/', ' ', $value);
}
- if ( $this->_decodeUtf8 )
+ if($this->_decodeUtf8)
{
- $value = utf8_decode( $value );
+ $value = utf8_decode($value);
}
- if ( $this->_valueModifier != NULL )
+ if($this->_valueModifier != NULL)
{
- $value = @call_user_func(
$this->_valueModifier, $value );
+ $value = @call_user_func($this->_valueModifier,
$value);
}
return $value;
}
@@ -421,11 +415,11 @@
*
* @access private
*/
- function _onAttributes( $attr )
+ function _onAttributes($attr)
{
- foreach ( $attr as $k => $v )
+ foreach($attr as $k => $v)
{
- $attr[$k] = $this->_onValue( $v );
+ $attr[$k] = $this->_onValue($v);
}
return $attr;
}
@@ -436,66 +430,64 @@
* @param string $data
* @return array
*/
- function parse( $data )
+ function parse($data)
{
- $data = trim( $data );
+ $data = trim($data);
$err = false;
- if ( $data == '' )
+ if($data == '')
{
- $this->_logError( 'parse', 'Empty data' );
+ $this->_logError('parse', 'Empty data');
return array();
}
- if ( $this->_automaticUtf8Decoding )
+ if($this->_automaticUtf8Decoding)
{
- if ( $this->_seems_utf8( $data ) )
+ if($this->_seems_utf8($data))
{
$this->_decodeUtf8 = true;
}
}
- $parser = xml_parser_create( $this->_encoding );
- xml_parser_set_option( $parser,
XML_OPTION_CASE_FOLDING, 0 );
- xml_parser_set_option( $parser, XML_OPTION_SKIP_WHITE,
0 );
- xml_parse_into_struct( $parser, $data, $vals, $index )
or $err = true;
+ $parser = xml_parser_create($this->_encoding);
+ xml_parser_set_option($parser, XML_OPTION_CASE_FOLDING,
0);
+ xml_parser_set_option($parser, XML_OPTION_SKIP_WHITE,
0);
+ xml_parse_into_struct($parser, $data, $vals, $index) or
$err = true;
- if ( $err )
+ if($err)
{
- $this->_logError( 'parse',
- 'XML parser failed: '
- . ucfirst( xml_error_string(
xml_get_error_code( $parser ) ) ) );
- xml_parser_free( $parser );
+ $this->_logError('parse', 'XML parser failed: '
+ .
ucfirst(xml_error_string(xml_get_error_code($parser))));
+ xml_parser_free($parser);
return;
}
- xml_parser_free( $parser );
+ xml_parser_free($parser);
- $tree = array();
- $i = 0;
+ $tree = array();
+ $i = 0;
- $tagname = ( $this->_lower_case_tags ) ? strtolower(
$vals[$i]['tag'] ) : $vals[$i]['tag'];
- if ( isset( $vals[$i]['attributes'] ) )
+ $tagname = ( $this->_lower_case_tags ) ?
strtolower($vals[$i]['tag']) : $vals[$i]['tag'];
+ if(isset($vals[$i]['attributes']))
{
- if ( $this->get_attributes )
+ if($this->get_attributes)
{
$tree[$tagname][]['@'] =
$vals[$i]['attributes'];
- $index
= count( $tree[$tagname] ) - 1;
- $tree[$tagname][$index] = array_merge(
$tree[$tagname][$index],
-
$this->_getChildren( $vals, $i ) );
+ $index
= count($tree[$tagname]) - 1;
+ $tree[$tagname][$index] =
array_merge($tree[$tagname][$index], $this->_getChildren($vals, $i));
}
else
{
- $tree[$tagname][] =
$this->_getChildren( $vals, $i );
+ $tree[$tagname][] =
$this->_getChildren($vals, $i);
}
}
else
{
- $tree[$tagname][] = $this->_getChildren( $vals,
$i );
+ $tree[$tagname][] = $this->_getChildren($vals,
$i);
}
- if ( !$this->_includesRoot )
+ if(!$this->_includesRoot)
{
- $keys = array_keys( $tree );
+ $keys = array_keys($tree);
$tree = $tree[$keys[0]][0];
}
return $tree;
@@ -505,30 +497,30 @@
* @access private
* @return mixed
*/
- function _getChildren( $vals, &$i )
+ function _getChildren($vals, &$i)
{
$children = array(); // Contains node data
- if ( isset( $vals[$i]['tag'] ) )
+ if(isset($vals[$i]['tag']))
{
- if ( isset( $vals[$i]['value'] ) && trim(
$vals[$i]['value'] ) != '' )
+ if(isset($vals[$i]['value']) &&
trim($vals[$i]['value']) != '')
{
- $children = $this->_onValue(
$vals[$i]['value'] );
+ $children =
$this->_onValue($vals[$i]['value']);
}
- while ( ++$i < count( $vals ) )
+ while(++$i < count($vals))
{
- switch ( $vals[$i]['type'] )
+ switch($vals[$i]['type'])
{
case 'cdata':
- if ( isset(
$children['#'] ) )
+
if(isset($children['#']))
{
- if ( trim(
$vals[$i]['value'] ) != '' )
+
if(trim($vals[$i]['value']) != '')
{
$children['#'] .= $vals[$i]['value'];
}
}
else
{
- if ( trim(
$vals[$i]['value'] ) != '' )
+
if(trim($vals[$i]['value']) != '')
{
$children['#'] = $vals[$i]['value'];
}
@@ -536,38 +528,38 @@
break;
case 'complete':
- $tagname = (
$this->_lower_case_tags ) ? strtolower( $vals[$i]['tag'] ) : $vals[$i]['tag'];
- if ( isset(
$vals[$i]['attributes'] ) )
+ $tagname = (
$this->_lower_case_tags ) ? strtolower($vals[$i]['tag']) : $vals[$i]['tag'];
+
if(isset($vals[$i]['attributes']))
{
- if (
$this->get_attributes )
+
if($this->get_attributes)
{
$children[$tagname][]['@'] = $vals[$i]['attributes'];
- $index
= count( $children[$tagname] ) - 1;
+ $index
= count($children[$tagname]) - 1;
}
- if ( isset(
$vals[$i]['value'] ) )
+
if(isset($vals[$i]['value']))
{
- if (
$this->get_attributes )
+
if($this->get_attributes)
{
-
$children[$tagname][] = $this->_onValue( $vals[$i]['value'] );
+
$children[$tagname][] = $this->_onValue($vals[$i]['value']);
}
else
{
-
$children[$tagname] = $this->_onValue( $vals[$i]['value'] );
+
$children[$tagname] = $this->_onValue($vals[$i]['value']);
}
}
- else if (
$this->_include_empty_values )
+ else
if($this->_include_empty_values)
{
$children[$tagname] = '';
}
}
else
{
- if ( isset(
$vals[$i]['value'] ) )
+
if(isset($vals[$i]['value']))
{
-
$children[$tagname] = $this->_onValue( $vals[$i]['value'] );
+
$children[$tagname] = $this->_onValue($vals[$i]['value']);
}
- else if (
$this->_include_empty_values )
+ else
if($this->_include_empty_values)
{
$children[$tagname] = '';
}
@@ -575,25 +567,24 @@
break;
case 'open':
- $tagname = (
$this->_lower_case_tags ) ? strtolower( $vals[$i]['tag'] ) : $vals[$i]['tag'];
- if ( isset(
$vals[$i]['attributes'] ) )
+ $tagname = (
$this->_lower_case_tags ) ? strtolower($vals[$i]['tag']) : $vals[$i]['tag'];
+
if(isset($vals[$i]['attributes']))
{
- if (
$this->get_attributes )
+
if($this->get_attributes)
{
-
$children[$tagname][]['@'] = $this->_onAttributes(
$vals[$i]['attributes'] );
+
$children[$tagname][]['@'] =
$this->_onAttributes($vals[$i]['attributes']);
//
$index = count($children[$tagname])-1;
- $index
= count( $children[$vals[$i]['tag']] )
- 1;
-
$children[$tagname][$index] = array_merge( $children[$tagname][$index],
-
$this->_getChildren( $vals, $i ) );
+ $index
= count($children[$vals[$i]['tag']]) -
1;
+
$children[$tagname][$index] = array_merge($children[$tagname][$index],
$this->_getChildren($vals, $i));
}
else
{
-
$children[$tagname][] = $this->_getChildren( $vals, $i );
+
$children[$tagname][] = $this->_getChildren($vals, $i);
}
}
else
{
-
$children[$tagname][] = $this->_getChildren( $vals, $i );
+
$children[$tagname][] = $this->_getChildren($vals, $i);
}
break;
@@ -607,27 +598,27 @@
/**
* @access private
*/
- function _seems_utf8( $Str )
+ function _seems_utf8($Str)
{
- for ( $i = 0; $i < strlen( $Str ); $i++ )
+ for($i = 0; $i < strlen($Str); $i++)
{
- if ( ord( $Str[$i] ) < 0x80 )
+ if(ord($Str[$i]) < 0x80)
continue;# 0bbbbbbb
- elseif ( (ord( $Str[$i] ) & 0xE0) == 0xC0 )
+ elseif((ord($Str[$i]) & 0xE0) == 0xC0)
$n = 1;# 110bbbbb
- elseif ( (ord( $Str[$i] ) & 0xF0) == 0xE0 )
+ elseif((ord($Str[$i]) & 0xF0) == 0xE0)
$n = 2;# 1110bbbb
- elseif ( (ord( $Str[$i] ) & 0xF8) == 0xF0 )
+ elseif((ord($Str[$i]) & 0xF8) == 0xF0)
$n = 3;# 11110bbb
- elseif ( (ord( $Str[$i] ) & 0xFC) == 0xF8 )
+ elseif((ord($Str[$i]) & 0xFC) == 0xF8)
$n = 4;# 111110bb
- elseif ( (ord( $Str[$i] ) & 0xFE) == 0xFC )
+ elseif((ord($Str[$i]) & 0xFE) == 0xFC)
$n = 5;# 1111110b
else
return false;# Does not match any model
- for ( $j = 0; $j < $n; $j++ ) # n bytes
matching 10bbbbbb follow ?
+ for($j = 0; $j < $n; $j++) # n bytes matching
10bbbbbb follow ?
{
- if ( (++$i == strlen( $Str )) || ((ord(
$Str[$i] ) & 0xC0) != 0x80) )
+ if(( ++$i == strlen($Str)) ||
((ord($Str[$i]) & 0xC0) != 0x80))
{
return false;
}
@@ -635,5 +626,4 @@
}
return true;
}
-
- }
+ }
\ No newline at end of file
Modified: branches/dev-syncromind/property/inc/class.boXport.inc.php
===================================================================
--- branches/dev-syncromind/property/inc/class.boXport.inc.php 2015-09-17
00:15:11 UTC (rev 13952)
+++ branches/dev-syncromind/property/inc/class.boXport.inc.php 2015-09-17
07:55:45 UTC (rev 13953)
@@ -315,5 +315,4 @@
_debug_array($receipt);
}
}
-
- }
\ No newline at end of file
+ }
\ No newline at end of file
Modified: branches/dev-syncromind/property/inc/class.boadmin.inc.php
===================================================================
--- branches/dev-syncromind/property/inc/class.boadmin.inc.php 2015-09-17
00:15:11 UTC (rev 13952)
+++ branches/dev-syncromind/property/inc/class.boadmin.inc.php 2015-09-17
07:55:45 UTC (rev 13953)
@@ -1,5 +1,4 @@
<?php
-
/**
* phpGroupWare - property: a Facilities Management System.
*
@@ -45,13 +44,13 @@
function __construct($session = '')
{
// $this->currentapp =
$GLOBALS['phpgw_info']['flags']['currentapp'];
- $this->so =
CreateObject('property.soadmin');
- $this->acl = & $GLOBALS['phpgw']->acl;
- $this->bocommon = CreateObject('property.bocommon');
- $this->right = array(1, 2, 4, 8, 16);
- $this->account_id =
$GLOBALS['phpgw_info']['user']['account_id'];
+ $this->so =
CreateObject('property.soadmin');
+ $this->acl = &
$GLOBALS['phpgw']->acl;
+ $this->bocommon =
CreateObject('property.bocommon');
+ $this->right = array(1, 2, 4, 8, 16);
+ $this->account_id =
$GLOBALS['phpgw_info']['user']['account_id'];
- if ($session)
+ if($session)
{
$this->read_sessiondata();
$this->use_session = true;
@@ -64,13 +63,13 @@
$filter = phpgw::get_var('filter',
'int');
$cat_id = phpgw::get_var('cat_id',
'string');
$permission = phpgw::get_var('permission');
- // $location =
get_var('location',array('POST','GET')); // don't work for some reason...
+ // $location =
get_var('location',array('POST','GET')); // don't work for some reason...
$module = phpgw::get_var('module');
$granting_group = phpgw::get_var('granting_group',
'int');
$allrows = phpgw::get_var('allrows',
'bool');
$acl_app = 'property';
//get_var('acl_app',array('POST','GET'));
- if ($start)
+ if($start)
{
$this->start = $start;
}
@@ -79,38 +78,38 @@
$this->start = 0;
}
- if (isset($query))
+ if(isset($query))
{
$this->query = $query;
}
- if (isset($filter))
+ if(isset($filter))
{
$this->filter = $filter;
}
- if (isset($sort))
+ if(isset($sort))
{
$this->sort = $sort;
}
- if (isset($order))
+ if(isset($order))
{
$this->order = $order;
}
- if (isset($cat_id))
+ if(isset($cat_id))
{
$this->cat_id = $cat_id;
}
- if (isset($module))
+ if(isset($module))
{
$this->location = $module;
}
- if (isset($granting_group))
+ if(isset($granting_group))
{
$this->granting_group = $granting_group;
}
$this->allrows = $allrows ? $allrows : '';
- if (isset($acl_app))
+ if(isset($acl_app))
{
$this->acl_app = $acl_app;
}
@@ -132,7 +131,7 @@
function save_sessiondata($data)
{
- if ($this->use_session)
+ if($this->use_session)
{
$GLOBALS['phpgw']->session->appsession('session_data', 'fm_admin', $data);
}
@@ -140,7 +139,7 @@
function select_category_list($format = '', $selected = '')
{
- switch ($format)
+ switch($format)
{
case 'select':
$GLOBALS['phpgw']->xslttpl->add_file(array('cat_select'));
@@ -160,17 +159,17 @@
function set_permission2($values, $r_processed, $grantor = -1,
$type = 0)
{
- if (!is_array($values))
+ if(!is_array($values))
{
// return;
}
$totalacl = array();
- foreach ($values as $rowinfo => $perm)
+ foreach($values as $rowinfo => $perm)
{
list($user_id, $rights) = explode('_',
$rowinfo);
- if (!isset($totalacl[$user_id]))
+ if(!isset($totalacl[$user_id]))
{
$totalacl[$user_id] = 0;
}
@@ -179,7 +178,7 @@
}
$user_checked = array();
- foreach ($totalacl as $user_id => $rights)
+ foreach($totalacl as $user_id => $rights)
{
$user_checked[] = $user_id;
$this->acl->set_account_id($user_id, true,
$this->acl_app, $this->location, $account_type = 'accounts');
@@ -188,7 +187,7 @@
$this->acl->save_repository($this->acl_app,
$this->location);
}
- if (is_array($r_processed) && count($user_checked))
+ if(is_array($r_processed) && count($user_checked))
{
$user_delete = array_diff($r_processed,
$user_checked);
}
@@ -199,11 +198,11 @@
$users_at_location =
$this->acl->get_accounts_at_location($this->acl_app, $this->location, $grantor,
$type);
- if (is_array($user_delete) && count($user_delete) > 0)
+ if(is_array($user_delete) && count($user_delete) > 0)
{
- foreach ($user_delete as $user_id)
+ foreach($user_delete as $user_id)
{
- if (isset($users_at_location[$user_id])
&& $users_at_location[$user_id])
+ if(isset($users_at_location[$user_id])
&& $users_at_location[$user_id])
{
$this->acl->set_account_id($user_id, true);
$this->acl->delete($this->acl_app, $this->location, $grantor, $type);
@@ -217,27 +216,27 @@
{
$this->acl->enable_inheritance =
phpgw::get_var('enable_inheritance', 'bool', 'POST');
- if ($initials)
+ if($initials)
{
$this->so->set_initials($initials);
}
$process = explode('_', $r_processed);
- if (!isset($values['right']) ||
!is_array($values['right']))
+ if(!isset($values['right']) ||
!is_array($values['right']))
{
$values['right'] = array();
}
- if (!isset($values['mask']) ||
!is_array($values['mask']))
+ if(!isset($values['mask']) ||
!is_array($values['mask']))
{
$values['mask'] = array();
}
$grantor = -1;
- if ($set_grant)
+ if($set_grant)
{
- if ($this->granting_group)
+ if($this->granting_group)
{
$grantor = $this->granting_group;
}
@@ -258,19 +257,19 @@
function get_user_list($type = '', $get_grants = '')
{
- if ($type == 'groups')
+ if($type == 'groups')
{
- $check_account_type = array('accounts');
+ $check_account_type = array('accounts');
$acl_account_type = 'accounts';
$valid_users =
$GLOBALS['phpgw']->acl->get_ids_for_location('run', phpgwapi_acl::READ,
'property');
}
else
{
- $check_account_type = array('groups',
'accounts');
+ $check_account_type = array('groups',
'accounts');
$acl_account_type = 'both';
$_valid_users =
$GLOBALS['phpgw']->acl->get_user_list_right(phpgwapi_acl::READ, 'run',
$this->acl_app);
$valid_users = array();
- foreach ($_valid_users as $_user)
+ foreach($_valid_users as $_user)
{
$valid_users[] = $_user['account_id'];
}
@@ -279,9 +278,9 @@
}
$grantor = -1;
- if ($get_grants)
+ if($get_grants)
{
- if ($this->granting_group)
+ if($this->granting_group)
{
$grantor = $this->granting_group;
}
@@ -291,7 +290,7 @@
}
}
- if ($this->location == '.invoice')
+ if($this->location == '.invoice')
{
$this->right = array(1, 2, 4, 8, 16, 32, 64,
128);
}
@@ -302,9 +301,9 @@
// $allusers =
array_intersect_key($allusers, $valid_users);
- foreach ($allusers as $user)
+ foreach($allusers as $user)
{
- if (!in_array($user->id, $valid_users))
+ if(!in_array($user->id, $valid_users))
{
unset($allusers[$user->id]);
}
@@ -315,7 +314,7 @@
$this->total_records = count($allusers);
$length =
$GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'];
- if ($this->allrows)
+ if($this->allrows)
{
$this->start = 0;
$length = $this->total_records;
@@ -324,17 +323,17 @@
$allusers = array_slice($allusers, $this->start,
$length, true);
$user_list = array();
- if (isset($allusers) && is_array($allusers))
+ if(isset($allusers) && is_array($allusers))
{
$j = 0;
- foreach ($allusers as $account)
+ foreach($allusers as $account)
{
$user_list[$j]['account_id']
= $account->id;
$user_list[$j]['account_lid']
= $account->lid;
$user_list[$j]['account_firstname']
= $account->firstname;
$user_list[$j]['account_lastname']
= $account->lastname;
- if ($this->location == '.invoice')
+ if($this->location == '.invoice')
{
$user_list[$j]['initials'] =
$this->so->get_initials($account->id);
}
@@ -343,23 +342,23 @@
$count_right = count($right);
- for ($i = 0; $i < $count_right; ++$i)
+ for($i = 0; $i < $count_right; ++$i)
{
- if
($this->acl->check_rights($this->location, $right[$i], $this->acl_app,
$grantor, 0, $check_account_type))
+
if($this->acl->check_rights($this->location, $right[$i], $this->acl_app,
$grantor, 0, $check_account_type))
{
- if
($this->acl->account_type == 'g')
+
if($this->acl->account_type == 'g')
{
$user_list[$j]['right'][$right[$i]] = 'from_group';
}
else
{
-
$user_list[$j]['right'][$right[$i]] = 'checked';
+
$user_list[$j]['right'][$right[$i]] = 'checked';
}
$user_list[$j]['result'][$right[$i]] = 'checked';
}
- if
($this->acl->check_rights($this->location, $right[$i], $this->acl_app,
$grantor, 1, $check_account_type))
+
if($this->acl->check_rights($this->location, $right[$i], $this->acl_app,
$grantor, 1, $check_account_type))
{
- if
($this->acl->account_type == 'g')
+
if($this->acl->account_type == 'g')
{
$user_list[$j]['mask'][$right[$i]] = 'from_group';
}
@@ -388,5 +387,4 @@
{
return $this->so->edit_id($values);
}
-
- }
+ }
\ No newline at end of file
Modified: branches/dev-syncromind/property/inc/class.boadmin_entity.inc.php
===================================================================
--- branches/dev-syncromind/property/inc/class.boadmin_entity.inc.php
2015-09-17 00:15:11 UTC (rev 13952)
+++ branches/dev-syncromind/property/inc/class.boadmin_entity.inc.php
2015-09-17 07:55:45 UTC (rev 13953)
@@ -304,7 +304,8 @@
$template_entity_id = $template_info[0];
$template_cat_id = $template_info[1];
- $attrib_group_list = $this->read_attrib_group(
array('entity_id' => $template_entity_id, 'cat_id' => $template_cat_id,
'allrows' =>true) );
+ $attrib_group_list =
$this->read_attrib_group(array('entity_id' => $template_entity_id,
+ 'cat_id' => $template_cat_id, 'allrows' =>
true));
foreach($attrib_group_list as $attrib_group)
{
@@ -319,7 +320,8 @@
$this->custom->add_group($group);
}
- $attrib_list = $this->read_attrib(array('entity_id' =>
$template_entity_id, 'cat_id' => $template_cat_id, 'allrows' =>true));
+ $attrib_list = $this->read_attrib(array('entity_id' =>
$template_entity_id, 'cat_id' => $template_cat_id,
+ 'allrows' => true));
$template_attribs = array();
foreach($attrib_list as $attrib)
@@ -384,7 +386,8 @@
function get_attrib_group_list($entity_id, $cat_id, $selected)
{
- $group_list = $this->read_attrib_group(
array('entity_id' => $entity_id, 'cat_id' => $cat_id, 'allrows' =>true) );
+ $group_list =
$this->read_attrib_group(array('entity_id' => $entity_id, 'cat_id' => $cat_id,
+ 'allrows' => true));
foreach($group_list as &$group)
{
@@ -398,8 +401,8 @@
function read_attrib_group($data = array())
{
- $entity_id = $data['entity_id'];
- $cat_id = $data['cat_id'];
+ $entity_id = $data['entity_id'];
+ $cat_id = $data['cat_id'];
if($data['allrows'])
{
$this->allrows = $data['allrows'];
@@ -418,7 +421,7 @@
{
$this->allrows = $data['allrows'];
}
- $attrib = $this->custom->find(
$this->type_app[$this->type],
".{$this->type}.{$data['entity_id']}.{$data['cat_id']}", $data['start'],
$data['query'], $data['sort'], $data['order'], $this->allrows);
+ $attrib =
$this->custom->find($this->type_app[$this->type],
".{$this->type}.{$data['entity_id']}.{$data['cat_id']}", $data['start'],
$data['query'], $data['sort'], $data['order'], $this->allrows);
$this->total_records = $this->custom->total_records;
return $attrib;
}
Modified: branches/dev-syncromind/property/inc/class.boadmin_location.inc.php
===================================================================
--- branches/dev-syncromind/property/inc/class.boadmin_location.inc.php
2015-09-17 00:15:11 UTC (rev 13952)
+++ branches/dev-syncromind/property/inc/class.boadmin_location.inc.php
2015-09-17 07:55:45 UTC (rev 13953)
@@ -1,5 +1,4 @@
<?php
-
/**
* phpGroupWare - property: a Facilities Management System.
*
@@ -46,7 +45,7 @@
*/
protected $custom;
var $public_functions = array
- (
+ (
'read' => true,
'read_single' => true,
'save' => true,
@@ -54,145 +53,142 @@
'check_perms' => true
);
- function __construct( $session = false )
+ function __construct($session = false)
{
- $this->so = CreateObject(
'property.soadmin_location' );
- $this->bocommon = CreateObject( 'property.bocommon' );
- $this->custom = createObject(
'property.custom_fields' );
+ $this->so =
CreateObject('property.soadmin_location');
+ $this->bocommon = CreateObject('property.bocommon');
+ $this->custom =
createObject('property.custom_fields');
- if ( $session )
+ if($session)
{
// $this->read_sessiondata();
$this->use_session = true;
}
- $start = phpgw::get_var( 'start', 'int', 'REQUEST', 0
);
- $query = phpgw::get_var( 'query' );
- $sort = phpgw::get_var( 'sort' );
- $order = phpgw::get_var( 'order' );
- $allrows = phpgw::get_var( 'allrows', 'bool' );
+ $start = phpgw::get_var('start', 'int', 'REQUEST', 0);
+ $query = phpgw::get_var('query');
+ $sort = phpgw::get_var('sort');
+ $order = phpgw::get_var('order');
+ $allrows = phpgw::get_var('allrows', 'bool');
$this->start = $start ? $start : 0;
- $this->query = isset( $query ) ? $query :
$this->query;
- $this->sort = isset( $sort ) && $sort ?
$sort : '';
- $this->order = isset( $order ) && $order ? $order :
'';
- $this->allrows = isset( $allrows ) && $allrows ?
$allrows : '';
+ $this->query = isset($query) ? $query :
$this->query;
+ $this->sort = isset($sort) && $sort ?
$sort : '';
+ $this->order = isset($order) && $order ? $order :
'';
+ $this->allrows = isset($allrows) && $allrows ?
$allrows : '';
}
- function save_sessiondata( $data )
+ function save_sessiondata($data)
{
- if ( $this->use_session )
+ if($this->use_session)
{
- $GLOBALS['phpgw']->session->appsession(
'session_data', 'standard_e', $data );
+
$GLOBALS['phpgw']->session->appsession('session_data', 'standard_e', $data);
}
}
function read_sessiondata()
{
- $data = $GLOBALS['phpgw']->session->appsession(
'session_data', 'standard_e' );
+ $data =
$GLOBALS['phpgw']->session->appsession('session_data', 'standard_e');
$this->start = $data['start'];
$this->query = $data['query'];
- $this->sort = $data['sort'];
+ $this->sort = $data['sort'];
$this->order = $data['order'];
}
function read($data = array())
- {
- # $data = array()
- #array('start' => $this->start, 'query' =>
$this->query, 'sort' => $this->sort, 'order' => $this->order)
- $standard = $this->so->read($data);
+ {
+ # $data = array()
+ #array('start' => $this->start, 'query' =>
$this->query, 'sort' => $this->sort, 'order' => $this->order)
+ $standard =
$this->so->read($data);
$this->total_records = $this->so->total_records;
return $standard;
}
function read_config()
{
- $standard = $this->so->read_config( array('start' =>
$this->start, 'query' => $this->query, 'sort' => $this->sort, 'order' =>
$this->order) );
+ $standard = $this->so->read_config(array('start' =>
$this->start, 'query' => $this->query,
+ 'sort' => $this->sort, 'order' =>
$this->order));
$this->total_records = $this->so->total_records;
return $standard;
}
- function read_config_single( $column_name )
+ function read_config_single($column_name)
{
- return $this->so->read_config_single( $column_name );
+ return $this->so->read_config_single($column_name);
}
- function read_single( $id )
+ function read_single($id)
{
- return $this->so->read_single( $id );
+ return $this->so->read_single($id);
}
- function save( $standard )
+ function save($standard)
{
- if ( isset( $standard['id'] ) && $standard['id'] )
+ if(isset($standard['id']) && $standard['id'])
{
- $receipt = $this->so->edit( $standard );
+ $receipt = $this->so->edit($standard);
}
else
{
- $receipt = $this->so->add( $standard );
+ $receipt = $this->so->add($standard);
}
return $receipt;
}
- function delete( $type_id, $id, $attrib = '', $group_id )
+ function delete($type_id, $id, $attrib = '', $group_id)
{
- if ( $id && !$attrib )
+ if($id && !$attrib)
{
- $receipt = $this->so->delete( $id );
+ $receipt = $this->so->delete($id);
}
- else if ( $type_id && $id && $attrib )
+ else if($type_id && $id && $attrib)
{
$ok = 0;
$receipt = array();
- if ( $this->custom->delete( 'property',
".location.{$type_id}", $id,
-
"fm_location{$type_id}_history", true ) )
+ if($this->custom->delete('property',
".location.{$type_id}", $id, "fm_location{$type_id}_history", true))
{
$ok++;
}
- if ( $this->custom->delete( 'property',
".location.{$type_id}", $id,
-
"fm_location{$type_id}" ) )
+ if($this->custom->delete('property',
".location.{$type_id}", $id, "fm_location{$type_id}"))
{
$ok++;
}
- if ( $ok == 2 )
+ if($ok == 2)
{
- $receipt['message'][] = array('msg' =>
lang( 'attibute has been deleted' ));
+ $receipt['message'][] = array('msg' =>
lang('attibute has been deleted'));
}
else
{
- $receipt['error'][] = array('msg' =>
lang( 'something went wrong' ));
+ $receipt['error'][] = array('msg' =>
lang('something went wrong'));
}
}
- else if ( $type_id && $group_id )
+ else if($type_id && $group_id)
{
- if ( $this->custom->delete_group( 'property',
".location.{$type_id}",
-
$group_id ) )
+ if($this->custom->delete_group('property',
".location.{$type_id}", $group_id))
{
- $receipt['message'][] = array('msg' =>
lang( 'attibute group %1 has been deleted',
-
$group_id ));
+ $receipt['message'][] = array('msg' =>
lang('attibute group %1 has been deleted', $group_id));
}
else
{
- $receipt['error'][] = array('msg' =>
lang( 'something went wrong' ));
+ $receipt['error'][] = array('msg' =>
lang('something went wrong'));
}
}
return $receipt;
}
- function get_attrib_group_list( $type_id, $selected )
+ function get_attrib_group_list($type_id, $selected)
{
$location = ".location.{$type_id}";
- $group_list = $this->read_attrib_group( $location,
true );
+ $group_list = $this->read_attrib_group($location,
true);
- foreach ( $group_list as &$group )
+ foreach($group_list as &$group)
{
- if ( $group['id'] == $selected )
+ if($group['id'] == $selected)
{
$group['selected'] = true;
}
@@ -200,209 +196,202 @@
return $group_list;
}
- function read_attrib_group( $location, $allrows = '' )
+ function read_attrib_group($location, $allrows = '')
{
- if ( $allrows )
+ if($allrows)
{
$this->allrows = $allrows;
}
- $attrib =
$this->custom->find_group( 'property', $location, $this->start,
-
$this->query, $this->sort, $this->order, $this->allrows );
+ $attrib =
$this->custom->find_group('property', $location, $this->start, $this->query,
$this->sort, $this->order, $this->allrows);
$this->total_records = $this->custom->total_records;
return $attrib;
}
- function read_single_attrib_group( $location, $id )
+ function read_single_attrib_group($location, $id)
{
- return $this->custom->get_group( 'property', $location,
$id, true );
+ return $this->custom->get_group('property', $location,
$id, true);
}
- function resort_attrib_group( $location, $id, $resort )
+ function resort_attrib_group($location, $id, $resort)
{
- $this->custom->resort_group( $id, $resort, 'property',
$location );
+ $this->custom->resort_group($id, $resort, 'property',
$location);
}
- public function save_attrib_group( $group, $action = '' )
+ public function save_attrib_group($group, $action = '')
{
$group['appname'] = 'property';
- if ( $action == 'edit' && $group['id'] )
+ if($action == 'edit' && $group['id'])
{
- if ( $this->custom->edit_group( $group ) )
+ if($this->custom->edit_group($group))
{
return array
- (
- 'msg' => array('msg' => lang(
'group has been updated' ))
+ (
+ 'msg' => array('msg' =>
lang('group has been updated'))
);
}
- return array('error' => lang( 'Unable to update
group' ));
+ return array('error' => lang('Unable to update
group'));
}
else
{
- $id = $this->custom->add_group( $group );
- if ( $id <= 0 )
+ $id = $this->custom->add_group($group);
+ if($id <= 0)
{
- return array('error' => lang( 'Unable
to add group' ));
+ return array('error' => lang('Unable to
add group'));
}
- else if ( $id == -1 )
+ else if($id == -1)
{
return array
- (
+ (
'id' => 0,
'error' => array
- (
- array('msg' => lang(
'group already exists, please choose another name' )),
- array('msg' => lang(
'Attribute group has NOT been saved' ))
+ (
+ array('msg' =>
lang('group already exists, please choose another name')),
+ array('msg' =>
lang('Attribute group has NOT been saved'))
)
);
}
return array
- (
+ (
'id' => $id,
- 'msg' => array('msg' => lang( 'group
has been created' ))
+ 'msg' => array('msg' => lang('group
has been created'))
);
}
}
function read_attrib($data = array())
- {
- if ( $data['allrows'] || phpgw::get_var( 'allrows' ) ==
1 )
+ {
+ if($data['allrows'] || phpgw::get_var('allrows') == 1)
{
$data['allrows'] = true;
}
- $attrib = $this->custom->find(
- 'property',
- '.location.' .
$data['type_id'],
- $data['start'],
- $data['query'],
- $data['sort'],
- $data['order'],
- $data['allrows']
- );
+ $attrib = $this->custom->find(
+ 'property', '.location.' . $data['type_id'],
$data['start'], $data['query'], $data['sort'], $data['order'], $data['allrows']
+ );
$this->total_records = $this->custom->total_records;
return $attrib;
}
- function read_attrib_old( $type_id, $allrows = '' )
+
+ function read_attrib_old($type_id, $allrows = '')
{
- if ( $allrows || phpgw::get_var( 'allrows' ) == 1 )
+ if($allrows || phpgw::get_var('allrows') == 1)
{
$this->allrows = true;
}
- $attrib = $this->custom->find( 'property', '.location.'
. $type_id,
- $this->start,
$this->query, $this->sort, $this->order, $this->allrows );
+ $attrib = $this->custom->find('property', '.location.'
. $type_id, $this->start, $this->query, $this->sort, $this->order,
$this->allrows);
$this->total_records = $this->custom->total_records;
return $attrib;
}
- function read_single_attrib( $type_id, $id )
+ function read_single_attrib($type_id, $id)
{
- return $this->custom->get( 'property',
".location.{$type_id}", $id, true );
+ return $this->custom->get('property',
".location.{$type_id}", $id, true);
}
- function resort_attrib( $data = array() )
+ function resort_attrib($data = array())
{
- $resort = isset( $data['resort'] ) ? $data['resort'] :
'up';
- $type_id = isset( $data['type_id'] ) ? $data['type_id']
: '';
- $id = (isset( $data['id'] ) ? $data['id']
: '');
+ $resort = isset($data['resort']) ? $data['resort'] :
'up';
+ $type_id = isset($data['type_id']) ? $data['type_id'] :
'';
+ $id = (isset($data['id']) ? $data['id'] :
'');
- if ( !$type_id || !$id )
+ if(!$type_id || !$id)
{
return;
}
- $this->custom->resort( $id, $resort, 'property',
'.location.' . $type_id );
+ $this->custom->resort($id, $resort, 'property',
'.location.' . $type_id);
}
- public function save_attrib( $attrib, $action = '' )
+ public function save_attrib($attrib, $action = '')
{
$attrib['appname'] = 'property';
$attrib['location'] = '.location.' .
$attrib['type_id'];
$primary_table = 'fm_location' .
$attrib['type_id'];
$history_table = $primary_table . '_history';
- if ( $action == 'edit' && $attrib['id'] )
+ if($action == 'edit' && $attrib['id'])
{
- if ( $this->custom->edit( $attrib,
$history_table, true ) )
+ if($this->custom->edit($attrib, $history_table,
true))
{
- $this->custom->edit( $attrib,
$primary_table );
+ $this->custom->edit($attrib,
$primary_table);
return array
- (
- 'msg' => array('msg' => lang(
'Field has been updated' ))
+ (
+ 'msg' => array('msg' =>
lang('Field has been updated'))
);
}
- return array('error' => lang( 'Unable to update
field' ));
+ return array('error' => lang('Unable to update
field'));
}
else
{
- $id = $this->custom->add( $attrib,
$primary_table );
- $this->custom->add( $attrib, $history_table,
true );
- if ( $id <= 0 )
+ $id = $this->custom->add($attrib,
$primary_table);
+ $this->custom->add($attrib, $history_table,
true);
+ if($id <= 0)
{
- return array('error' => lang( 'Unable
to add field' ));
+ return array('error' => lang('Unable to
add field'));
}
- else if ( $id == -1 )
+ else if($id == -1)
{
return array
- (
+ (
'id' => 0,
'error' => array
- (
- array('msg' => lang(
'field already exists, please choose another name' )),
- array('msg' => lang(
'Attribute has NOT been saved' ))
+ (
+ array('msg' =>
lang('field already exists, please choose another name')),
+ array('msg' =>
lang('Attribute has NOT been saved'))
)
);
}
return array
- (
+ (
'id' => $id,
- 'msg' => array('msg' => lang(
'Custom field has been created' ))
+ 'msg' => array('msg' => lang('Custom
field has been created'))
);
}
}
- function save_config( $values = '', $column_name = '' )
+ function save_config($values = '', $column_name = '')
{
- return $this->so->save_config( $values, $column_name );
+ return $this->so->save_config($values, $column_name);
}
- function select_location_type( $selected = '' )
+ function select_location_type($selected = '')
{
$location_types = $this->so->select_location_type();
- return $this->bocommon->select_list( $selected,
$location_types );
+ return $this->bocommon->select_list($selected,
$location_types);
}
- function select_nullable( $selected = '' )
+ function select_nullable($selected = '')
{
$nullable[0]['id'] = 'true';
- $nullable[0]['name'] = lang( 'true' );
+ $nullable[0]['name'] = lang('true');
$nullable[1]['id'] = 'false';
- $nullable[1]['name'] = lang( 'false' );
+ $nullable[1]['name'] = lang('false');
- return $this->bocommon->select_list( $selected,
$nullable );
+ return $this->bocommon->select_list($selected,
$nullable);
}
- function get_list_info( $type_id = '', $selected = '' )
+ function get_list_info($type_id = '', $selected = '')
{
- if ( $type_id )
+ if($type_id)
{
$location_types =
$this->so->select_location_type();
- for ( $i = 0; $i < ($type_id); $i++ )
+ for($i = 0; $i < ($type_id); $i++)
{
$location[$i] = $location_types[$i];
- unset( $location[$i]['list_info'] );
- if ( isset( $selected[($i + 1)] ) &&
$selected[($i + 1)] )
+ unset($location[$i]['list_info']);
+ if(isset($selected[($i + 1)]) &&
$selected[($i + 1)])
{
$location[$i]['selected'] =
'selected';
}
@@ -410,5 +399,4 @@
return $location;
}
}
-
}
\ No newline at end of file
Modified: branches/dev-syncromind/property/inc/class.boagreement.inc.php
===================================================================
--- branches/dev-syncromind/property/inc/class.boagreement.inc.php
2015-09-17 00:15:11 UTC (rev 13952)
+++ branches/dev-syncromind/property/inc/class.boagreement.inc.php
2015-09-17 07:55:45 UTC (rev 13953)
@@ -1,5 +1,4 @@
<?php
-
/**
* phpGroupWare - property: a Facilities Management System.
*
@@ -57,64 +56,64 @@
'check_perms' => true
);
- function __construct( $session = false )
+ function __construct($session = false)
{
- $this->so = CreateObject(
'property.soagreement' );
- $this->bocommon = CreateObject( 'property.bocommon' );
- $this->custom = createObject(
'property.custom_fields' );
+ $this->so =
CreateObject('property.soagreement');
+ $this->bocommon = CreateObject('property.bocommon');
+ $this->custom =
createObject('property.custom_fields');
- if ( $session )
+ if($session)
{
$this->read_sessiondata();
$this->use_session = true;
}
- $start = phpgw::get_var( 'start', 'int',
'REQUEST', 0 );
- $query = phpgw::get_var( 'query' );
- $sort = phpgw::get_var( 'sort' );
- $order = phpgw::get_var( 'order' );
- $filter = phpgw::get_var( 'filter', 'int' );
- $cat_id = phpgw::get_var( 'cat_id', 'int' );
- $vendor_id = phpgw::get_var( 'vendor_id', 'int' );
- $allrows = phpgw::get_var( 'allrows', 'bool' );
- $role = phpgw::get_var( 'role' );
- $member_id = phpgw::get_var( 'member_id', 'int' );
- $status_id = phpgw::get_var( 'status_id' );
+ $start = phpgw::get_var('start', 'int',
'REQUEST', 0);
+ $query = phpgw::get_var('query');
+ $sort = phpgw::get_var('sort');
+ $order = phpgw::get_var('order');
+ $filter = phpgw::get_var('filter', 'int');
+ $cat_id = phpgw::get_var('cat_id', 'int');
+ $vendor_id = phpgw::get_var('vendor_id', 'int');
+ $allrows = phpgw::get_var('allrows', 'bool');
+ $role = phpgw::get_var('role');
+ $member_id = phpgw::get_var('member_id', 'int');
+ $status_id = phpgw::get_var('status_id');
$this->role = $role;
$this->so->role = $role;
- $this->status_id = isset( $_REQUEST['status_id'] ) ?
$status_id : $this->status_id;
- $this->start = isset( $_REQUEST['start'] ) ? $start
: $this->start;
- $this->order = isset( $_REQUEST['order'] ) ? $order
: $this->order;
- $this->sort = isset( $_REQUEST['sort'] ) ?
$sort : $this->sort;
- $this->query = isset( $_REQUEST['query'] ) ? $query
: $this->query;
- $this->vendor_id = isset( $_REQUEST['vendor_id'] ) ?
$vendor_id : $this->vendor_id;
- $this->member_id = isset( $_REQUEST['member_id'] ) ?
$member_id : $this->member_id;
- $this->cat_id = isset( $_REQUEST['cat_id'] ) ?
$cat_id : $this->cat_id;
+ $this->status_id = isset($_REQUEST['status_id']) ?
$status_id : $this->status_id;
+ $this->start = isset($_REQUEST['start']) ? $start :
$this->start;
+ $this->order = isset($_REQUEST['order']) ? $order :
$this->order;
+ $this->sort = isset($_REQUEST['sort']) ?
$sort : $this->sort;
+ $this->query = isset($_REQUEST['query']) ? $query :
$this->query;
+ $this->vendor_id = isset($_REQUEST['vendor_id']) ?
$vendor_id : $this->vendor_id;
+ $this->member_id = isset($_REQUEST['member_id']) ?
$member_id : $this->member_id;
+ $this->cat_id = isset($_REQUEST['cat_id']) ? $cat_id
: $this->cat_id;
- if ( !empty( $filter ) )
+ if(!empty($filter))
{
$this->filter = $filter;
}
- if ( $allrows )
+ if($allrows)
{
$this->allrows = $allrows;
}
}
- function save_sessiondata( $data )
+ function save_sessiondata($data)
{
- if ( $this->use_session )
+ if($this->use_session)
{
- $GLOBALS['phpgw']->session->appsession(
'session_data', 'agreement', $data );
+
$GLOBALS['phpgw']->session->appsession('session_data', 'agreement', $data);
}
}
function read_sessiondata()
{
- $data = $GLOBALS['phpgw']->session->appsession(
'session_data', 'agreement' );
+ $data =
$GLOBALS['phpgw']->session->appsession('session_data', 'agreement');
// _debug_array($data);die();
@@ -129,75 +128,77 @@
$this->status_id = $data['status_id'];
}
- function check_perms( $has, $needed )
+ function check_perms($has, $needed)
{
return (!!($has & $needed) == true);
}
- function select_vendor_list( $format = '', $selected = '' )
+ function select_vendor_list($format = '', $selected = '')
{
- switch ( $format )
+ switch($format)
{
case 'select':
- $GLOBALS['phpgw']->xslttpl->add_file(
array('select_vendor') );
+
$GLOBALS['phpgw']->xslttpl->add_file(array('select_vendor'));
break;
case 'filter':
- $GLOBALS['phpgw']->xslttpl->add_file(
array('filter_vendor') );
+
$GLOBALS['phpgw']->xslttpl->add_file(array('filter_vendor'));
break;
}
$input_list = $this->so->select_vendor_list();
- $vendor_list = $this->bocommon->select_list( $selected,
$input_list );
+ $vendor_list = $this->bocommon->select_list($selected,
$input_list);
return $vendor_list;
}
function read($data = array())
{
- /*$agreements = $this->so->read( array('start' =>
$this->start, 'query' => $this->query, 'sort' => $this->sort, 'order' =>
$this->order,
- 'filter' => $this->filter, 'cat_id' =>
$this->cat_id, 'allrows' => $this->allrows, 'member_id' => $this->member_id,
- 'vendor_id' => $this->vendor_id, 'status_id' =>
$this->status_id) );*/
-
- $agreements = $this->so->read($data);
-
- $this->total_records = $this->so->total_records;
- $this->uicols = $this->so->uicols;
+ /* $agreements = $this->so->read( array('start' =>
$this->start, 'query' => $this->query, 'sort' => $this->sort, 'order' =>
$this->order,
+ 'filter' => $this->filter, 'cat_id' => $this->cat_id,
'allrows' => $this->allrows, 'member_id' => $this->member_id,
+ 'vendor_id' => $this->vendor_id, 'status_id' =>
$this->status_id) ); */
- foreach ( $agreements as &$agreement )
+ $agreements = $this->so->read($data);
+
+ $this->total_records = $this->so->total_records;
+ $this->uicols = $this->so->uicols;
+
+ foreach($agreements as &$agreement)
{
- if ( $agreement['start_date'] )
+ if($agreement['start_date'])
{
- $agreement['start_date'] =
$GLOBALS['phpgw']->common->show_date( $agreement['start_date'],
-
$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'] );
+ $agreement['start_date'] =
$GLOBALS['phpgw']->common->show_date($agreement['start_date'],
$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']);
}
- if ( $agreement['termination_date'] )
+ if($agreement['termination_date'])
{
- $agreement['termination_date'] =
$GLOBALS['phpgw']->common->show_date( $agreement['termination_date'],
-
$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'] );
+ $agreement['termination_date'] =
$GLOBALS['phpgw']->common->show_date($agreement['termination_date'],
$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']);
}
- if ( $agreement['end_date'] )
+ if($agreement['end_date'])
{
- $agreement['end_date'] =
$GLOBALS['phpgw']->common->show_date( $agreement['end_date'],
-
$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'] );
+ $agreement['end_date'] =
$GLOBALS['phpgw']->common->show_date($agreement['end_date'],
$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']);
}
}
return $agreements;
}
- function read_details( $id , $params = '')
- {
- if(!empty($params)){
- $sort = $params['sort'] ;
- $order = $params['order'] ;
- }else{
- $sort = $this->sort;
- $order = $this->order;
- }
-
- $list = $this->so->read_details( array('start' =>
$this->start, 'query' => $this->query, 'sort' => $sort, 'order' => $order,
- 'filter' => $this->filter, 'cat_id' =>
$this->cat_id, 'allrows' => $this->allrows, 'member_id' => $this->member_id,
- 'agreement_id' => $id) );
+ function read_details($id, $params = '')
+ {
+ if(!empty($params))
+ {
+ $sort = $params['sort'];
+ $order = $params['order'];
+ }
+ else
+ {
+ $sort = $this->sort;
+ $order = $this->order;
+ }
+
+ $list =
$this->so->read_details(array('start' => $this->start,
'query' => $this->query,
+ 'sort' => $sort, 'order'
=> $order,
+ 'filter' => $this->filter,
'cat_id' => $this->cat_id, 'allrows' => $this->allrows,
+ 'member_id' => $this->member_id,
+ 'agreement_id' => $id));
$this->total_records = $this->so->total_records;
$this->uicols = $this->so->uicols;
@@ -205,87 +206,79 @@
return $list;
}
- function read_prizing( $data )
+ function read_prizing($data)
{
- $list =
$this->so->read_prizing( $data );
+ $list =
$this->so->read_prizing($data);
$this->total_records = $this->so->total_records;
$this->uicols = $this->so->uicols;
- for ( $i = 0; $i < count( $list ); $i++ )
+ for($i = 0; $i < count($list); $i++)
{
- $list[$i]['index_date'] =
$GLOBALS['phpgw']->common->show_date( $list[$i]['index_date'],
-
$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'] );
+ $list[$i]['index_date'] =
$GLOBALS['phpgw']->common->show_date($list[$i]['index_date'],
$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']);
}
return $list;
}
- function read_event( $data )
+ function read_event($data)
{
- $boalarm = CreateObject(
'property.boalarm' );
- $event =
$this->so->read_single( $data['agreement_id'] );
+ $boalarm =
CreateObject('property.boalarm');
+ $event =
$this->so->read_single($data['agreement_id']);
$event['alarm_date'] = $event['termination_date'];
- $event['alarm'] = $boalarm->read_alarms( $type
= 'agreement',
-
$data['agreement_id'] );
+ $event['alarm'] = $boalarm->read_alarms($type
= 'agreement', $data['agreement_id']);
return $event;
}
- function read_single( $data )
+ function read_single($data)
{
- $values['attributes'] = $this->custom->find(
'property', '.agreement', 0, '',
-
'ASC', 'attrib_sort', true, true );
+ $values['attributes'] = $this->custom->find('property',
'.agreement', 0, '', 'ASC', 'attrib_sort', true, true);
- if ( isset( $data['agreement_id'] ) &&
$data['agreement_id'] )
+ if(isset($data['agreement_id']) &&
$data['agreement_id'])
{
- $values = $this->so->read_single(
$data['agreement_id'], $values );
+ $values =
$this->so->read_single($data['agreement_id'], $values);
}
- $values = $this->custom->prepare( $values, 'property',
'.agreement' );
+ $values = $this->custom->prepare($values, 'property',
'.agreement');
$dateformat =
$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'];
- if ( isset( $values['entry_date'] ) &&
$values['entry_date'] )
+ if(isset($values['entry_date']) &&
$values['entry_date'])
{
- $values['entry_date'] =
$GLOBALS['phpgw']->common->show_date( $values['entry_date'],
-
$dateformat );
+ $values['entry_date'] =
$GLOBALS['phpgw']->common->show_date($values['entry_date'], $dateformat);
}
- $values['start_date'] =
$GLOBALS['phpgw']->common->show_date( $values['start_date'],
-
$dateformat );
- $values['end_date'] =
$GLOBALS['phpgw']->common->show_date( $values['end_date'],
-
$dateformat );
- if ( isset( $values['termination_date'] ) &&
$values['termination_date'] )
+ $values['start_date'] =
$GLOBALS['phpgw']->common->show_date($values['start_date'], $dateformat);
+ $values['end_date'] =
$GLOBALS['phpgw']->common->show_date($values['end_date'], $dateformat);
+ if(isset($values['termination_date']) &&
$values['termination_date'])
{
- $values['termination_date'] =
$GLOBALS['phpgw']->common->show_date( $values['termination_date'],
-
$dateformat );
+ $values['termination_date'] =
$GLOBALS['phpgw']->common->show_date($values['termination_date'], $dateformat);
}
- $vfs = CreateObject(
'phpgwapi.vfs' );
+ $vfs =
CreateObject('phpgwapi.vfs');
$vfs->override_acl = 1;
- $values['files'] = $vfs->ls( array(
+ $values['files'] = $vfs->ls(array(
'string' =>
"/property/agreement/{$data['agreement_id']}",
- 'relatives' => array(RELATIVE_NONE)) );
+ 'relatives' => array(RELATIVE_NONE)));
$vfs->override_acl = 0;
- if ( !isset( $values['files'][0]['file_id'] ) ||
!$values['files'][0]['file_id'] )
+ if(!isset($values['files'][0]['file_id']) ||
!$values['files'][0]['file_id'])
{
- unset( $values['files'] );
+ unset($values['files']);
}
return $values;
}
- function read_single_item( $data )
+ function read_single_item($data)
{
- $values['attributes'] = $this->custom->find(
'property', '.agreement.detail',
-
0, '', 'ASC', 'attrib_sort', true, true );
- if ( isset( $data['agreement_id'] ) &&
$data['agreement_id'] && isset( $data['id'] ) && $data['id'] )
+ $values['attributes'] = $this->custom->find('property',
'.agreement.detail', 0, '', 'ASC', 'attrib_sort', true, true);
+ if(isset($data['agreement_id']) &&
$data['agreement_id'] && isset($data['id']) && $data['id'])
{
- $values = $this->so->read_single_item( $data,
$values );
+ $values = $this->so->read_single_item($data,
$values);
}
- $values = $this->custom->prepare( $values, 'property',
'.agreement.detail' );
+ $values = $this->custom->prepare($values, 'property',
'.agreement.detail');
return $values;
}
@@ -297,92 +290,90 @@
*
* @return array the grouped attributes
*/
- public function get_attribute_groups( $location, $attributes =
array() )
+ public function get_attribute_groups($location, $attributes =
array())
{
- return $this->custom->get_attribute_groups( 'property',
$location,
-
$attributes );
+ return $this->custom->get_attribute_groups('property',
$location, $attributes);
}
- function save( $values, $values_attribute = '', $action = '' )
+ function save($values, $values_attribute = '', $action = '')
{
- $values['start_date'] =
$this->bocommon->date_to_timestamp( $values['start_date'] );
- $values['end_date'] =
$this->bocommon->date_to_timestamp( $values['end_date'] );
- $values['termination_date'] =
$this->bocommon->date_to_timestamp( $values['termination_date'] );
+ $values['start_date'] =
$this->bocommon->date_to_timestamp($values['start_date']);
+ $values['end_date'] =
$this->bocommon->date_to_timestamp($values['end_date']);
+ $values['termination_date'] =
$this->bocommon->date_to_timestamp($values['termination_date']);
- if ( is_array( $values_attribute ) )
+ if(is_array($values_attribute))
{
- $values_attribute =
$this->custom->convert_attribute_save( $values_attribute );
+ $values_attribute =
$this->custom->convert_attribute_save($values_attribute);
}
- if ( $action == 'edit' )
+ if($action == 'edit')
// if ($values['agreement_id'])
{
- if ( $values['agreement_id'] != 0 )
+ if($values['agreement_id'] != 0)
{
- $receipt = $this->so->edit( $values,
$values_attribute );
+ $receipt = $this->so->edit($values,
$values_attribute);
}
}
else
{
- $receipt = $this->so->add( $values,
$values_attribute );
+ $receipt = $this->so->add($values,
$values_attribute);
}
return $receipt;
}
- function save_item( $values, $values_attribute = '' )
+ function save_item($values, $values_attribute = '')
{
//_debug_array($values);
- $values['m_cost'] = str_replace( ",",
".", $values['m_cost'] );
- $values['w_cost'] = str_replace( ",",
".", $values['w_cost'] );
+ $values['m_cost'] = str_replace(",",
".", $values['m_cost']);
+ $values['w_cost'] = str_replace(",",
".", $values['w_cost']);
$values['total_cost'] = $values['m_cost'] +
$values['w_cost'];
- if ( $values['index_count'] > 0 )
+ if($values['index_count'] > 0)
{
- if ( $values['id'] != 0 )
+ if($values['id'] != 0)
{
- $receipt = $this->so->edit_item(
$values );
+ $receipt =
$this->so->edit_item($values);
}
}
else
{
- $receipt = $this->so->add_item( $values );
+ $receipt = $this->so->add_item($values);
}
return $receipt;
}
- function update( $values )
+ function update($values)
{
- $values['date'] = $this->bocommon->date_to_timestamp(
$values['date'] );
- return $this->so->update( $values );
+ $values['date'] =
$this->bocommon->date_to_timestamp($values['date']);
+ return $this->so->update($values);
}
- function delete_last_index( $agreement_id, $id )
+ function delete_last_index($agreement_id, $id)
{
- $this->so->delete_last_index( $agreement_id, $id );
+ $this->so->delete_last_index($agreement_id, $id);
}
- function delete_item( $agreement_id, $activity_id )
+ function delete_item($agreement_id, $activity_id)
{
- $this->so->delete_item( $agreement_id, $activity_id );
+ $this->so->delete_item($agreement_id, $activity_id);
}
- function delete( $agreement_id = '' )
+ function delete($agreement_id = '')
{
- $this->so->delete( $agreement_id );
+ $this->so->delete($agreement_id);
}
- function column_list( $selected = '', $allrows = '' )
+ function column_list($selected = '', $allrows = '')
{
- if ( !$selected )
+ if(!$selected)
{
- $selected = isset(
$GLOBALS['phpgw_info']['user']['preferences']['property']["agreement_columns"]
) ?
$GLOBALS['phpgw_info']['user']['preferences']['property']["agreement_columns"]
: '';
+ $selected =
isset($GLOBALS['phpgw_info']['user']['preferences']['property']["agreement_columns"])
?
$GLOBALS['phpgw_info']['user']['preferences']['property']["agreement_columns"]
: '';
}
- $filter = array('list' => ''); // translates to "list
IS NULL"
- $columns = $this->custom->find( 'property',
'.agreement', 0, '', '', '',
- true, false,
$filter );
+ $filter = array('list' => ''); // translates to "list
IS NULL"
+ $columns = $this->custom->find('property',
'.agreement', 0, '', '', '', true, false, $filter);
- $column_list = $this->bocommon->select_multi_list(
$selected, $columns );
+ $column_list =
$this->bocommon->select_multi_list($selected, $columns);
return $column_list;
}
@@ -392,44 +383,43 @@
return $this->so->request_next_id();
}
- function get_agreement_group_list( $selected = '' )
+ function get_agreement_group_list($selected = '')
{
$agreement_groups =
$this->so->get_agreement_group_list();
- return $this->bocommon->select_list( $selected,
$agreement_groups );
+ return $this->bocommon->select_list($selected,
$agreement_groups);
}
- function read_group_activity( $group_id = '', $agreement_id =
'' )
+ function read_group_activity($group_id = '', $agreement_id = '')
{
- $activity_list = $this->so->read_group_activity(
$group_id, $agreement_id );
+ $activity_list =
$this->so->read_group_activity($group_id, $agreement_id);
$this->uicols = $this->so->uicols;
return $activity_list;
}
- function add_activity( $values, $agreement_id )
+ function add_activity($values, $agreement_id)
{
- return $this->so->add_activity( $values, $agreement_id
);
+ return $this->so->add_activity($values, $agreement_id);
}
- function select_status_list( $format = '', $selected = '' )
+ function select_status_list($format = '', $selected = '')
{
- switch ( $format )
+ switch($format)
{
case 'select':
- $GLOBALS['phpgw']->xslttpl->add_file(
array('status_select') );
+
$GLOBALS['phpgw']->xslttpl->add_file(array('status_select'));
break;
case 'filter':
- $GLOBALS['phpgw']->xslttpl->add_file(
array('status_filter') );
+
$GLOBALS['phpgw']->xslttpl->add_file(array('status_filter'));
break;
}
$status_entries = $this->so->select_status_list();
- return $this->bocommon->select_list( $selected,
$status_entries );
+ return $this->bocommon->select_list($selected,
$status_entries);
}
- function get_activity_descr( $id )
+ function get_activity_descr($id)
{
- return $this->so->get_activity_descr( $id );
+ return $this->so->get_activity_descr($id);
}
-
}
\ No newline at end of file
Modified: branches/dev-syncromind/property/inc/class.boalarm.inc.php
===================================================================
--- branches/dev-syncromind/property/inc/class.boalarm.inc.php 2015-09-17
00:15:11 UTC (rev 13952)
+++ branches/dev-syncromind/property/inc/class.boalarm.inc.php 2015-09-17
07:55:45 UTC (rev 13953)
@@ -1,74 +1,74 @@
<?php
/**
- * phpGroupWare - property: a Facilities Management System.
- *
- * @author Sigurd Nes <address@hidden>
- * @copyright Copyright (C) 2003,2004,2005,2006,2007 Free Software
Foundation, Inc. http://www.fsf.org/
- * This file is part of phpGroupWare.
- *
- * phpGroupWare is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * phpGroupWare is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with phpGroupWare; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301
USA
- *
- * @license http://www.gnu.org/licenses/gpl.html GNU General Public
License
- * @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
- * @package property
- * @subpackage admin
- * @version $Id$
- */
+ * phpGroupWare - property: a Facilities Management System.
+ *
+ * @author Sigurd Nes <address@hidden>
+ * @copyright Copyright (C) 2003,2004,2005,2006,2007 Free Software
Foundation, Inc. http://www.fsf.org/
+ * This file is part of phpGroupWare.
+ *
+ * phpGroupWare is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * phpGroupWare is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with phpGroupWare; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
02110-1301 USA
+ *
+ * @license http://www.gnu.org/licenses/gpl.html GNU General Public
License
+ * @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
+ * @package property
+ * @subpackage admin
+ * @version $Id$
+ */
/**
* Description
* @package property
*/
-
class property_boalarm
{
+
public $allrows;
public $method_id;
function __construct($session = '')
{
- $GLOBALS['phpgw_info']['flags']['currentapp'] =
'property';
- if (!is_object($GLOBALS['phpgw']->asyncservice))
+ $GLOBALS['phpgw_info']['flags']['currentapp'] =
'property';
+ if(!is_object($GLOBALS['phpgw']->asyncservice))
{
$GLOBALS['phpgw']->asyncservice =
CreateObject('phpgwapi.asyncservice');
}
- $this->async = &
$GLOBALS['phpgw']->asyncservice;
- $this->so =
CreateObject('property.soalarm');
- $this->bocommon =
CreateObject('property.bocommon');
- if ($session)
+ $this->async = & $GLOBALS['phpgw']->asyncservice;
+ $this->so =
CreateObject('property.soalarm');
+ $this->bocommon = CreateObject('property.bocommon');
+ if($session)
{
$this->read_sessiondata();
$this->use_session = true;
}
- $start = phpgw::get_var('start', 'int',
'REQUEST', 0);
- $query = phpgw::get_var('query');
- $sort = phpgw::get_var('sort');
- $order = phpgw::get_var('order');
- $filter = phpgw::get_var('filter', 'int');
- $cat_id = phpgw::get_var('cat_id', 'int');
- $method_id = phpgw::get_var('method_id', 'int');
- $allrows = phpgw::get_var('allrows', 'bool');
+ $start = phpgw::get_var('start', 'int',
'REQUEST', 0);
+ $query = phpgw::get_var('query');
+ $sort = phpgw::get_var('sort');
+ $order = phpgw::get_var('order');
+ $filter = phpgw::get_var('filter', 'int');
+ $cat_id = phpgw::get_var('cat_id', 'int');
+ $method_id = phpgw::get_var('method_id', 'int');
+ $allrows = phpgw::get_var('allrows', 'bool');
- if ($start)
+ if($start)
{
- $this->start=$start;
+ $this->start = $start;
}
else
{
- $this->start=0;
+ $this->start = 0;
}
if(isset($query))
@@ -103,30 +103,29 @@
function save_sessiondata($data)
{
- if ($this->use_session)
+ if($this->use_session)
{
-
$GLOBALS['phpgw']->session->appsession('session_data','owner',$data);
+
$GLOBALS['phpgw']->session->appsession('session_data', 'owner', $data);
}
}
function read_sessiondata()
{
- $data =
$GLOBALS['phpgw']->session->appsession('session_data','owner');
+ $data =
$GLOBALS['phpgw']->session->appsession('session_data', 'owner');
- $this->start = $data['start'];
- $this->query = $data['query'];
- $this->filter = $data['filter'];
- $this->sort = $data['sort'];
- $this->order = $data['order'];
- $this->cat_id = $data['cat_id'];
- $this->method_id = $data['method_id'];
+ $this->start = $data['start'];
+ $this->query = $data['query'];
+ $this->filter = $data['filter'];
+ $this->sort = $data['sort'];
+ $this->order = $data['order'];
+ $this->cat_id = $data['cat_id'];
+ $this->method_id = $data['method_id'];
}
-
- function select_method_list($selected='')
+ function select_method_list($selected = '')
{
- $list = $this->so->select_method_list();
- $list = $this->bocommon->select_list($selected,$list);
+ $list = $this->so->select_method_list();
+ $list = $this->bocommon->select_list($selected,
$list);
return $list;
}
@@ -139,95 +138,93 @@
{
// $jobs = $this->so->read(array('id'=>'%','start' =>
$this->start,'query' => $this->query,'sort' => $this->sort,'order' =>
$this->order,
// 'filter' =>
$this->filter,'allrows'=>$this->allrows));
- $jobs = $this->so->read($data);
- $this->total_records = $this->so->total_records;
+ $jobs =
$this->so->read($data);
+ $this->total_records = $this->so->total_records;
return $jobs;
}
-
- /*!
- @function read_alarms
- @abstract read the alarms of a calendar-event specified by
$cal_id
- @returns array of alarms with alarm-id as key
- @note the alarm-id is a string of 'cal:'.$cal_id.':'.$alarm_nr,
it is used as the job-id too
+ /* !
+ @function read_alarms
+ @abstract read the alarms of a calendar-event specified by
$cal_id
+ @returns array of alarms with alarm-id as key
+ @note the alarm-id is a string of
'cal:'.$cal_id.':'.$alarm_nr, it is used as the job-id too
*/
- function read_alarms($type='',$input_id,$text='')
+
+ function read_alarms($type = '', $input_id, $text = '')
{
$alarms = array();
- if ($jobs = $this->async->read($type .
':'.intval($input_id).':%'))
+ if($jobs = $this->async->read($type . ':' .
intval($input_id) . ':%'))
{
foreach($jobs as $id => $job)
{
- $alarm =
$job['data']; // text, enabled
- $alarm['alarm_id'] = $id;
- $alarm['time'] =
$GLOBALS['phpgw']->common->show_date($job['next']);
- $alarm['user'] =
$GLOBALS['phpgw']->accounts->id2name($alarm['owner']);
- $alarm['text'] = $text;
+ $alarm =
$job['data']; // text, enabled
+ $alarm['alarm_id'] = $id;
+ $alarm['time'] =
$GLOBALS['phpgw']->common->show_date($job['next']);
+ $alarm['user'] =
$GLOBALS['phpgw']->accounts->id2name($alarm['owner']);
+ $alarm['text'] = $text;
$alarms[] = $alarm;
}
}
return $alarms;
}
-
- /*!
- @function read_alarm
- @abstract read a single alarm specified by it's $id
- @returns array with data of the alarm
- @note the alarm-id is a string of 'cal:'.$cal_id.':'.$alarm_nr,
it is used as the job-id too
+ /* !
+ @function read_alarm
+ @abstract read a single alarm specified by it's $id
+ @returns array with data of the alarm
+ @note the alarm-id is a string of
'cal:'.$cal_id.':'.$alarm_nr, it is used as the job-id too
*/
- function read_alarm($alarm_type,$id)
+
+ function read_alarm($alarm_type, $id)
{
- if (!($jobs = $this->async->read($id)))
+ if(!($jobs = $this->async->read($id)))
{
return false;
}
-
- $alarm = $jobs[$id]['data']; //
text, enabled
- $alarm['id'] = $id;
- $alarm['time'] = $jobs[$id]['next'];
- $alarm['times'] = $jobs[$id]['times'];
- $alarm['method']= $jobs[$id]['method'];
+ $alarm = $jobs[$id]['data']; // text,
enabled
+ $alarm['id'] = $id;
+ $alarm['time'] = $jobs[$id]['next'];
+ $alarm['times'] = $jobs[$id]['times'];
+ $alarm['method'] = $jobs[$id]['method'];
+
// echo "<p>read_alarm('$id')="; print_r($alarm); echo
"</p>\n";
return $alarm;
}
-
-
-
- /*!
- @function enable
- @abstract enable or disable one or more alarms identified by
its ids
- @syntax enable($ids,$enable=true)
- @param $ids array with alarm ids as keys (!)
- @returns the number of alarms enabled or -1 for insuficent
permission to do so
- @note Not found alarms or insuficent perms stop the enableing
of multiple alarms
+ /* !
+ @function enable
+ @abstract enable or disable one or more alarms identified by
its ids
+ @syntax enable($ids,$enable=true)
+ @param $ids array with alarm ids as keys (!)
+ @returns the number of alarms enabled or -1 for insuficent
permission to do so
+ @note Not found alarms or insuficent perms stop the enableing
of multiple alarms
*/
- function enable_alarm($alarm_type,$alarms,$enable=true)
+
+ function enable_alarm($alarm_type, $alarms, $enable = true)
{
$enabled = 0;
- foreach ($alarms as $id)
- {
- $temp = explode(':',$id);
- $alarm_type = $temp[0];
-
- if (!($alarm = $this->read_alarm($alarm_type,$id)))
+ foreach($alarms as $id)
+ {
+ $temp = explode(':', $id);
+ $alarm_type = $temp[0];
+
+ if(!($alarm = $this->read_alarm($alarm_type,
$id)))
{
- return 0; // alarm not found
+ return 0; // alarm not found
}
- if (!$alarm['enabled'] == !$enable)
+ if(!$alarm['enabled'] == !$enable)
{
- continue; // nothing to do
+ continue; // nothing to do
}
- $alarm['enabled'] = intval(!$alarm['enabled']);
+ $alarm['enabled'] = intval(!$alarm['enabled']);
- if
($this->save_alarm($alarm_type,$alarm['event_id'],$alarm,$alarm['method']))
+ if($this->save_alarm($alarm_type,
$alarm['event_id'], $alarm, $alarm['method']))
{
++$enabled;
}
- }
+ }
// foreach ($alarms as $id => $field)
// {
//
@@ -252,7 +249,6 @@
return $enabled;
}
-
/**
* save_alarm
* @param string $alarm_type
@@ -261,7 +257,7 @@
* @param string $method
* @return string|boolean
*/
- function save_alarm($alarm_type,$event_id,$alarm,$method='')
+ function save_alarm($alarm_type, $event_id, $alarm, $method =
'')
{
if(!$method)
{
@@ -269,22 +265,22 @@
}
// echo "<p>save_alarm(event_id=$event_id, alarm=";
print_r($alarm); echo ")</p>\n";
- if (!isset($alarm['id']) || !$alarm['id'])
+ if(!isset($alarm['id']) || !$alarm['id'])
{
- $alarms =
$this->read_alarms($alarm_type,$event_id); // find a free alarm#
- $n = count($alarms);
+ $alarms = $this->read_alarms($alarm_type,
$event_id); // find a free alarm#
+ $n = count($alarms);
do
- {
- $id = $alarm_type .':'.intval($event_id).':'.$n;
- ++$n;
- }
- while (@isset($alarms[$id]));
+ {
+ $id = $alarm_type . ':' .
intval($event_id) . ':' . $n;
+ ++$n;
+ }
+ while(@isset($alarms[$id]));
- $alarm[$alarm_type.'_id'] = $event_id;
// we need the back-reference
+ $alarm[$alarm_type . '_id'] = $event_id; // we
need the back-reference
$alarm['id'] = $id;
- if
(!$this->async->set_timer($alarm['times'],$id,$method,$alarm))
+ if(!$this->async->set_timer($alarm['times'],
$id, $method, $alarm))
{
return false;
}
@@ -293,94 +289,92 @@
else
{
$this->async->cancel_timer($alarm['id']);
-
$this->async->set_timer($alarm['times'],$alarm['id'],$method,$alarm);
+ $this->async->set_timer($alarm['times'],
$alarm['id'], $method, $alarm);
return $alarm['id'];
}
}
-
- /*!
- @function add_alarm
- @abstract adds a new alarm to an event
- @syntax add(&$event,$time,$login_id)
- @param &$event event to add the alarm too
- @param $time for the alarm in sec before the starttime of the
event
- @param $login_id user to alarm
- @returns the alarm or false
+ /* !
+ @function add_alarm
+ @abstract adds a new alarm to an event
+ @syntax add(&$event,$time,$login_id)
+ @param &$event event to add the alarm too
+ @param $time for the alarm in sec before the starttime of the
event
+ @param $login_id user to alarm
+ @returns the alarm or false
*/
- function add_alarm($alarm_type,&$event,$time,$owner)
+
+ function add_alarm($alarm_type, &$event, $time, $owner)
{
-/* if (!$this->check_perms(PHPGW_ACL_SETALARM,$owner) ||
!($cal_id = $event['id']))
+ /* if
(!$this->check_perms(PHPGW_ACL_SETALARM,$owner) || !($cal_id = $event['id']))
+ {
+ return false;
+ }
+ */
+ if(!$owner > 0)
{
- return false;
+ $receipt['error'][] = array('msg' => lang('No
user selected'));
+ return $receipt;
}
- */
- if(!$owner>0)
- {
- $receipt['error'][]=array('msg'=>lang('No user
selected'));
- return $receipt;
- }
$alarm = Array(
- 'time' => ($event['alarm_date'] - $time),
//($etime=$this->bo->maketime($event['start'])) - $time,
- 'offset' => $time,
- 'owner' => $owner,
- 'enabled' => 1,
- 'event_id' => $event['id'],
+ 'time' => ($event['alarm_date'] -
$time), //($etime=$this->bo->maketime($event['start'])) - $time,
+ 'offset' => $time,
+ 'owner' => $owner,
+ 'enabled' => 1,
+ 'event_id' => $event['id'],
'event_name' => $event['name']
);
- $alarm['times'] = $alarm['time'];
- $alarm['id'] =
$this->save_alarm($alarm_type,$event['id'],$alarm);
+ $alarm['times'] = $alarm['time'];
+ $alarm['id'] = $this->save_alarm($alarm_type,
$event['id'], $alarm);
$event['alarm'][$alarm['id']] = $alarm;
return $alarm;
}
-
-
- /*!
- @function delete
- @abstract delete one or more alarms identified by its ids
- @syntax delete($ids)
- @param $ids array with alarm ids as keys (!)
- @returns the number of alarms deleted or -1 for insuficent
permission to do so
- @note Not found alarms or insuficent perms stop the deleting of
multiple alarms
+ /* !
+ @function delete
+ @abstract delete one or more alarms identified by its ids
+ @syntax delete($ids)
+ @param $ids array with alarm ids as keys (!)
+ @returns the number of alarms deleted or -1 for insuficent
permission to do so
+ @note Not found alarms or insuficent perms stop the deleting
of multiple alarms
*/
- function delete_alarm($alarm_type,$alarms)
- {
+
+ function delete_alarm($alarm_type, $alarms)
+ {
$deleted = 0;
- foreach ($alarms as $id)
- {
- if (!($alarm =
$this->read_alarm($alarm_type,$id)))
+ foreach($alarms as $id)
+ {
+ if(!($alarm = $this->read_alarm($alarm_type,
$id)))
{
- return 0; // alarm not found
+ return 0; // alarm not found
}
-/* if
(!$this->check_perms(PHPGW_ACL_DELETEALARM,$alarm['owner']))
+ /* if
(!$this->check_perms(PHPGW_ACL_DELETEALARM,$alarm['owner']))
+ {
+ return -1;
+ }
+ */
+ if($this->async->cancel_timer($id))
{
- return -1;
- }
- */
- if ($this->async->cancel_timer($id))
- {
++$deleted;
}
}
return $deleted;
}
-
function test_cron($alarm)
{
$ids = array_values($alarm);
- foreach ($ids as $id)
+ foreach($ids as $id)
{
$event = $this->async->read($id);
}
-
- if(isset($event[$id]) && $event[$id] &&
$event[$id]['method'] && $event[$id]['data']['enabled'])
+
+ if(isset($event[$id]) && $event[$id] &&
$event[$id]['method'] && $event[$id]['data']['enabled'])
{
-
execMethod($event[$id]['method'],$event[$id]['data']);
+ execMethod($event[$id]['method'],
$event[$id]['data']);
}
}
@@ -388,114 +382,114 @@
{
// echo "<p>boalarm::send_alarm("; print_r($alarm); echo
")</p>\n";
- $GLOBALS['phpgw_info']['user']['account_id'] =
$this->owner = $alarm['owner'];
+ $GLOBALS['phpgw_info']['user']['account_id'] =
$this->owner =
$alarm['owner'];
- if (!$alarm['enabled'] || !$alarm['owner'])
+ if(!$alarm['enabled'] || !$alarm['owner'])
{
- return false; // event not found
+ return false; // event not found
}
- $this->config =
CreateObject('phpgwapi.config','property');
+ $this->config = CreateObject('phpgwapi.config',
'property');
$this->config->read();
- $this->send =
CreateObject('phpgwapi.send');
+ $this->send =
CreateObject('phpgwapi.send');
$members = array();
// build subject
- $subject = lang('Alarm').': '.$alarm['event_name'];
+ $subject = lang('Alarm') . ': ' . $alarm['event_name'];
- $prefs_user =
$this->bocommon->create_preferences('property',$alarm['owner']);
+ $prefs_user =
$this->bocommon->create_preferences('property', $alarm['owner']);
- $from_address=$prefs_user['email'];
+ $from_address = $prefs_user['email'];
//-----------from--------
-
$current_user_id=$GLOBALS['phpgw_info']['user']['account_id'];
+ $current_user_id =
$GLOBALS['phpgw_info']['user']['account_id'];
- $current_user_firstname = 'FM';
+ $current_user_firstname = 'FM';
- $current_user_lastname = 'System';
+ $current_user_lastname = 'System';
- $current_user_name= $user_firstname . " "
.$user_lastname ;
+ $current_user_name = $user_firstname . " " .
$user_lastname;
- $current_prefs_user =
$this->bocommon->create_preferences('property',$alarm['owner']);
- $current_user_address=$current_prefs_user['email'];
+ $current_prefs_user =
$this->bocommon->create_preferences('property', $alarm['owner']);
+ $current_user_address = $current_prefs_user['email'];
//-----------from--------
// build body
$info = explode(':', $alarm['id']);
- $body = lang('Alarm').' #'.$alarm['event_id']."\n";
- $body .= lang('Name').': '.$alarm['event_name']."\n";
- $body .= '<a href ="' .
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
"property.ui{$info[0]}.edit", 'id'=> $info[1]),false,true).'">' .
$alarm['event_name'] ."</a>\n";
+ $body = lang('Alarm') . ' #' . $alarm['event_id'] .
"\n";
+ $body .= lang('Name') . ': ' . $alarm['event_name'] .
"\n";
+ $body .= '<a href ="' .
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
"property.ui{$info[0]}.edit",
+ 'id' => $info[1]), false, true) . '">' .
$alarm['event_name'] . "</a>\n";
if(!is_array($alarm['time']))
{
- $dateformat =
$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'];
- $body .= lang('Deadline').': '.
$GLOBALS['phpgw']->common->show_date(($alarm['time']+$alarm['offset']),$dateformat)
."\n";
+ $dateformat =
$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'];
+ $body .= lang('Deadline') . ': ' .
$GLOBALS['phpgw']->common->show_date(($alarm['time'] + $alarm['offset']),
$dateformat) . "\n";
}
- $body .= lang('Assigned To').':
'.$GLOBALS['phpgw']->accounts->id2name($alarm['owner'])."\n";
+ $body .= lang('Assigned To') . ': ' .
$GLOBALS['phpgw']->accounts->id2name($alarm['owner']) . "\n";
// add assigned to recipients
$members[] = array('account_id' => $alarm['owner'],
'account_name' => $GLOBALS['phpgw']->accounts->id2name($alarm['owner']));
- $error = Array();
+ $error = Array();
$toarray = Array();
- $i=0;
- for ($i=0;$i<count($members);$i++)
+ $i = 0;
+ for($i = 0; $i < count($members); $i++)
{
- if ($members[$i]['account_id'])
+ if($members[$i]['account_id'])
{
- $prefs =
$this->bocommon->create_preferences('property',$members[$i]['account_id']);
- if (strlen($prefs['email'])>
(strlen($members[$i]['account_name'])+1))
+ $prefs =
$this->bocommon->create_preferences('property', $members[$i]['account_id']);
+ if(strlen($prefs['email']) >
(strlen($members[$i]['account_name']) + 1))
{
$toarray[$prefs['email']] =
$prefs['email'];
}
else
{
- $receipt['error'][] =
array('msg'=> lang('Your message could not be sent!'));
- $receipt['error'][] =
array('msg'=>lang('This user has not defined an email address !') . ' : ' .
$members[$i]['account_name']);
+ $receipt['error'][] =
array('msg' => lang('Your message could not be sent!'));
+ $receipt['error'][] =
array('msg' => lang('This user has not defined an email address !') . ' : ' .
$members[$i]['account_name']);
}
}
}
if(count($toarray) > 1)
{
- $to = implode(',',$toarray);
+ $to = implode(',', $toarray);
}
else
{
$to = current($toarray);
}
- if
(isset($GLOBALS['phpgw_info']['server']['smtp_server']) &&
$GLOBALS['phpgw_info']['server']['smtp_server'])
+
if(isset($GLOBALS['phpgw_info']['server']['smtp_server']) &&
$GLOBALS['phpgw_info']['server']['smtp_server'])
{
- $body = nl2br($body);
- $rc = $this->send->msg('email', $to, $subject,
$body, '', $cc, $bcc,$current_user_address,$current_user_name,'html');
+ $body = nl2br($body);
+ $rc = $this->send->msg('email',
$to, $subject, $body, '', $cc, $bcc, $current_user_address, $current_user_name,
'html');
}
else
{
- $receipt['error'][]=array('msg'=>lang('SMTP
server is not set! (admin section)'));
+ $receipt['error'][] = array('msg' => lang('SMTP
server is not set! (admin section)'));
}
// $rc=1;
- if (!$rc)
+ if(!$rc)
{
- $receipt['error'][] = array('msg'=> lang('Your
message could not be sent by mail!'));
- $receipt['error'][] = array('msg'=> lang('The
mail server returned'));
- $receipt['error'][] = array('msg'=> 'From :' .
$current_user_name . '<' . $current_user_address .'>');
- $receipt['error'][] = array('msg'=> 'to: '.$to);
- $receipt['error'][] = array('msg'=> 'subject:
'.$subject);
- $receipt['error'][] = array('msg'=> $body );
+ $receipt['error'][] = array('msg' =>
lang('Your message could not be sent by mail!'));
+ $receipt['error'][] = array('msg' =>
lang('The mail server returned'));
+ $receipt['error'][] = array('msg' => 'From
:' . $current_user_name . '<' . $current_user_address . '>');
+ $receipt['error'][] = array('msg' => 'to:
' . $to);
+ $receipt['error'][] = array('msg' =>
'subject: ' . $subject);
+ $receipt['error'][] = array('msg' =>
$body);
// $receipt['error'][] = array('msg'=> 'cc: ' .
$cc);
// $receipt['error'][] = array('msg'=> 'bcc:
'.$bcc);
- $receipt['error'][] = array('msg'=> 'group:
'.$group_name);
- $receipt['error'][] = array('msg'=> 'err_code:
'.$this->send->err['code']);
- $receipt['error'][] = array('msg'=> 'err_msg:
'. htmlspecialchars($this->send->err['msg']));
- $receipt['error'][] = array('msg'=> 'err_desc:
'. $this->send->err['desc']);
+ $receipt['error'][] = array('msg' =>
'group: ' . $group_name);
+ $receipt['error'][] = array('msg' =>
'err_code: ' . $this->send->err['code']);
+ $receipt['error'][] = array('msg' =>
'err_msg: ' . htmlspecialchars($this->send->err['msg']));
+ $receipt['error'][] = array('msg' =>
'err_desc: ' . $this->send->err['desc']);
}
// return $receipt;
}
-
- }
+ }
\ No newline at end of file
Modified: branches/dev-syncromind/property/inc/class.boasync.inc.php
===================================================================
--- branches/dev-syncromind/property/inc/class.boasync.inc.php 2015-09-17
00:15:11 UTC (rev 13952)
+++ branches/dev-syncromind/property/inc/class.boasync.inc.php 2015-09-17
07:55:45 UTC (rev 13953)
@@ -1,39 +1,39 @@
<?php
/**
- * phpGroupWare - property: a Facilities Management System.
- *
- * @author Sigurd Nes <address@hidden>
- * @copyright Copyright (C) 2003,2004,2005,2006,2007 Free Software
Foundation, Inc. http://www.fsf.org/
- * This file is part of phpGroupWare.
- *
- * phpGroupWare is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * phpGroupWare is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with phpGroupWare; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301
USA
- *
- * @license http://www.gnu.org/licenses/gpl.html GNU General Public
License
- * @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
- * @package property
- * @subpackage admin
- * @version $Id$
- */
+ * phpGroupWare - property: a Facilities Management System.
+ *
+ * @author Sigurd Nes <address@hidden>
+ * @copyright Copyright (C) 2003,2004,2005,2006,2007 Free Software
Foundation, Inc. http://www.fsf.org/
+ * This file is part of phpGroupWare.
+ *
+ * phpGroupWare is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * phpGroupWare is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with phpGroupWare; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
02110-1301 USA
+ *
+ * @license http://www.gnu.org/licenses/gpl.html GNU General Public
License
+ * @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
+ * @package property
+ * @subpackage admin
+ * @version $Id$
+ */
/**
* Description
* @package property
*/
-
class property_boasync
{
+
var $start;
var $query;
var $filter;
@@ -41,69 +41,66 @@
var $order;
var $cat_id;
var $allrows;
-
var $public_functions = array
(
- 'read' => true,
- 'read_single' => true,
- 'save' => true,
- 'delete' => true,
- 'check_perms' => true
- );
+ 'read' => true,
+ 'read_single' => true,
+ 'save' => true,
+ 'delete' => true,
+ 'check_perms' => true
+ );
- function __construct($session=false)
+ function __construct($session = false)
{
- $this->so =
CreateObject('property.soasync');
- $this->socommon = CreateObject('property.socommon');
+ $this->so =
CreateObject('property.soasync');
+ $this->socommon = CreateObject('property.socommon');
- if ($session)
+ if($session)
{
$this->read_sessiondata();
$this->use_session = true;
}
- $start =
phpgw::get_var('start', 'int', 'REQUEST', 0);
- $query =
phpgw::get_var('query');
- $sort =
phpgw::get_var('sort');
- $order =
phpgw::get_var('order');
- $cat_id =
phpgw::get_var('cat_id', 'int');
- $allrows =
phpgw::get_var('allrows', 'bool');
+ $start = phpgw::get_var('start', 'int', 'REQUEST', 0);
+ $query = phpgw::get_var('query');
+ $sort = phpgw::get_var('sort');
+ $order = phpgw::get_var('order');
+ $cat_id = phpgw::get_var('cat_id', 'int');
+ $allrows = phpgw::get_var('allrows', 'bool');
- $this->start = $start ? $start : 0;
- $this->query = isset($query) ? $query :
$this->query;
- $this->sort = isset($sort) && $sort
? $sort : '';
- $this->order = isset($order) && $order ?
$order : '';
- $this->cat_id = isset($cat_id) && $cat_id ?
$cat_id : '';
- $this->allrows = isset($allrows) && $allrows ?
$allrows : '';
-
+ $this->start = $start ? $start : 0;
+ $this->query = isset($query) ? $query :
$this->query;
+ $this->sort = isset($sort) && $sort ?
$sort : '';
+ $this->order = isset($order) && $order ? $order :
'';
+ $this->cat_id = isset($cat_id) && $cat_id ? $cat_id
: '';
+ $this->allrows = isset($allrows) && $allrows ?
$allrows : '';
}
function save_sessiondata($data)
{
- if ($this->use_session)
+ if($this->use_session)
{
-
$GLOBALS['phpgw']->session->appsession('session_data','async',$data);
+
$GLOBALS['phpgw']->session->appsession('session_data', 'async', $data);
}
}
function read_sessiondata()
{
- $data =
$GLOBALS['phpgw']->session->appsession('session_data','async');
+ $data =
$GLOBALS['phpgw']->session->appsession('session_data', 'async');
- $this->start = $data['start'];
- $this->query = $data['query'];
- $this->filter = $data['filter'];
- $this->sort = $data['sort'];
- $this->order = $data['order'];
- $this->cat_id = $data['cat_id'];
+ $this->start = $data['start'];
+ $this->query = $data['query'];
+ $this->filter = $data['filter'];
+ $this->sort = $data['sort'];
+ $this->order = $data['order'];
+ $this->cat_id = $data['cat_id'];
}
-
function read($data = array())
{
- /*$method = $this->so->read(array('start' =>
$this->start,'query' => $this->query,'sort' => $this->sort,'order' =>
$this->order,
- 'allrows' => $this->allrows));*/
- $method = $this->so->read($data);
+ /* $method = $this->so->read(array('start' =>
$this->start,'query' => $this->query,'sort' => $this->sort,'order' =>
$this->order,
+ 'allrows' => $this->allrows)); */
+ $method = $this->so->read($data);
$this->total_records = $this->so->total_records;
@@ -115,11 +112,11 @@
return $this->so->read_single($id);
}
- function save($method,$action='')
+ function save($method, $action = '')
{
- if ($action=='edit')
+ if($action == 'edit')
{
- if ($method['id'] != '')
+ if($method['id'] != '')
{
$receipt = $this->so->edit($method);
@@ -130,12 +127,10 @@
$receipt = $this->so->add($method);
}
return $receipt;
-
}
function delete($id)
{
$this->so->delete($id);
}
- }
-
+ }
\ No newline at end of file
Modified: branches/dev-syncromind/property/inc/class.bobudget.inc.php
===================================================================
--- branches/dev-syncromind/property/inc/class.bobudget.inc.php 2015-09-17
00:15:11 UTC (rev 13952)
+++ branches/dev-syncromind/property/inc/class.bobudget.inc.php 2015-09-17
07:55:45 UTC (rev 13953)
@@ -1,39 +1,39 @@
<?php
/**
- * phpGroupWare - property: a Facilities Management System.
- *
- * @author Sigurd Nes <address@hidden>
- * @copyright Copyright (C) 2003,2004,2005,2006,2007 Free Software
Foundation, Inc. http://www.fsf.org/
- * This file is part of phpGroupWare.
- *
- * phpGroupWare is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * phpGroupWare is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with phpGroupWare; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301
USA
- *
- * @license http://www.gnu.org/licenses/gpl.html GNU General Public
License
- * @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
- * @package property
- * @subpackage budget
- * @version $Id$
- */
+ * phpGroupWare - property: a Facilities Management System.
+ *
+ * @author Sigurd Nes <address@hidden>
+ * @copyright Copyright (C) 2003,2004,2005,2006,2007 Free Software
Foundation, Inc. http://www.fsf.org/
+ * This file is part of phpGroupWare.
+ *
+ * phpGroupWare is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * phpGroupWare is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with phpGroupWare; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
02110-1301 USA
+ *
+ * @license http://www.gnu.org/licenses/gpl.html GNU General Public
License
+ * @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
+ * @package property
+ * @subpackage budget
+ * @version $Id$
+ */
/**
* Description
* @package property
*/
-
class property_bobudget
{
+
var $start;
var $query;
var $filter;
@@ -46,104 +46,102 @@
var $revision;
var $allrows;
var $details;
- var $sum_budget_cost = 0;
- var $sum_obligation_cost = 0;
- var $sum_actual_cost = 0;
- var $sum_actual_cost_period = 0;
- var $sum_hits = 0;
- var $total_records = 0;
-
+ var $sum_budget_cost = 0;
+ var $sum_obligation_cost = 0;
+ var $sum_actual_cost = 0;
+ var $sum_actual_cost_period = 0;
+ var $sum_hits = 0;
+ var $total_records = 0;
var $public_functions = array
(
- 'read' => true,
- 'read_single' => true,
- 'save' => true,
- 'delete' => true,
- 'check_perms' => true
- );
+ 'read' => true,
+ 'read_single' => true,
+ 'save' => true,
+ 'delete' => true,
+ 'check_perms' => true
+ );
- function __construct($session=false)
+ function __construct($session = false)
{
- $this->so =
CreateObject('property.sobudget');
- $this->bocommon =
CreateObject('property.bocommon');
- $this->cats = &
$this->so->cats;
+ $this->so =
CreateObject('property.sobudget');
+ $this->bocommon = CreateObject('property.bocommon');
+ $this->cats = & $this->so->cats;
- if ($session)
+ if($session)
{
$this->read_sessiondata();
$this->use_session = true;
}
- $start =
phpgw::get_var('start', 'int', 'REQUEST', 0);
- $query =
phpgw::get_var('query');
- $sort =
phpgw::get_var('sort');
- $order =
phpgw::get_var('order');
- $filter =
phpgw::get_var('filter', 'int');
- $cat_id =
phpgw::get_var('cat_id', 'int');
- $dimb_id =
phpgw::get_var('dimb_id', 'int');
- $org_unit_id =
phpgw::get_var('org_unit_id', 'int');
- $allrows =
phpgw::get_var('allrows', 'bool');
- $district_id =
phpgw::get_var('district_id', 'int');
- $year =
phpgw::get_var('year', 'int');
- $month =
phpgw::get_var('month', 'int');
- $grouping =
phpgw::get_var('grouping', 'int');
- $revision =
phpgw::get_var('revision', 'int');
- $allrows =
phpgw::get_var('allrows', 'bool');
- $details =
phpgw::get_var('details', 'bool');
- $direction =
phpgw::get_var('direction');
+ $start = phpgw::get_var('start', 'int',
'REQUEST', 0);
+ $query = phpgw::get_var('query');
+ $sort = phpgw::get_var('sort');
+ $order = phpgw::get_var('order');
+ $filter = phpgw::get_var('filter', 'int');
+ $cat_id = phpgw::get_var('cat_id', 'int');
+ $dimb_id = phpgw::get_var('dimb_id', 'int');
+ $org_unit_id = phpgw::get_var('org_unit_id', 'int');
+ $allrows = phpgw::get_var('allrows', 'bool');
+ $district_id = phpgw::get_var('district_id', 'int');
+ $year = phpgw::get_var('year', 'int');
+ $month = phpgw::get_var('month', 'int');
+ $grouping = phpgw::get_var('grouping', 'int');
+ $revision = phpgw::get_var('revision', 'int');
+ $allrows = phpgw::get_var('allrows', 'bool');
+ $details = phpgw::get_var('details', 'bool');
+ $direction = phpgw::get_var('direction');
- $this->start = $start;
- $this->query = $query ? $query :
$this->query;
- $this->direction = $direction ?
$direction : $this->direction;
- if( !$this->direction )
+ $this->start = $start;
+ $this->query = $query ? $query : $this->query;
+ $this->direction = $direction ? $direction :
$this->direction;
+ if(!$this->direction)
{
$this->direction = 'expenses';
}
-
- $this->filter = isset($filter) &&
$filter ? $filter : '';
- $this->sort = isset($sort)
&& $sort ? $sort : '';
- $this->order = isset($order) &&
$order ? $order : '';
- $this->cat_id = isset($cat_id) &&
$cat_id ? $cat_id : '';
- $this->dimb_id = isset($dimb_id) &&
$dimb_id ? $dimb_id :
'';//$GLOBALS['phpgw_info']['user']['preferences']['property']['dimb'];
- $this->org_unit_id = isset($org_unit_id)
&& $org_unit_id ? $org_unit_id :
'';//$GLOBALS['phpgw_info']['user']['preferences']['property']['org_unit_id'];
- $this->part_of_town_id = isset($part_of_town_id) &&
$part_of_town_id ? $part_of_town_id : '';
- $this->district_id = isset($district_id)
&& $district_id ? $district_id : '';
- $this->grouping = isset($grouping) &&
$grouping ? $grouping : '';
- $this->revision = isset($revision) &&
$revision ? $revision : 1;
- $this->allrows = isset($allrows) &&
$allrows ? $allrows : '';
- $this->year = isset($year)
&& $year ? $year : date('Y');
- $this->month = isset($month) &&
$month ? $month : 0;
- $this->details = $details;
+ $this->filter = isset($filter) && $filter ?
$filter : '';
+ $this->sort = isset($sort) &&
$sort ? $sort : '';
+ $this->order = isset($order) && $order ?
$order : '';
+ $this->cat_id = isset($cat_id) && $cat_id ?
$cat_id : '';
+ $this->dimb_id = isset($dimb_id) && $dimb_id
? $dimb_id :
'';//$GLOBALS['phpgw_info']['user']['preferences']['property']['dimb'];
+ $this->org_unit_id = isset($org_unit_id) &&
$org_unit_id ? $org_unit_id :
'';//$GLOBALS['phpgw_info']['user']['preferences']['property']['org_unit_id'];
- if(isset($year) && !$this->year == $year &&
!$GLOBALS['phpgw_info']['menuaction']=='property.uibudget.obligations')
+ $this->part_of_town_id = isset($part_of_town_id) &&
$part_of_town_id ? $part_of_town_id : '';
+ $this->district_id = isset($district_id)
&& $district_id ? $district_id : '';
+ $this->grouping = isset($grouping) &&
$grouping ? $grouping : '';
+ $this->revision = isset($revision) &&
$revision ? $revision : 1;
+ $this->allrows = isset($allrows) &&
$allrows ? $allrows : '';
+ $this->year = isset($year)
&& $year ? $year : date('Y');
+ $this->month = isset($month) &&
$month ? $month : 0;
+ $this->details = $details;
+
+ if(isset($year) && !$this->year == $year &&
!$GLOBALS['phpgw_info']['menuaction'] == 'property.uibudget.obligations')
{
- $this->grouping = '';
- $this->revision = '';
+ $this->grouping = '';
+ $this->revision = '';
}
}
-
function save_sessiondata($data)
{
- if ($this->use_session)
+ if($this->use_session)
{
-
$GLOBALS['phpgw']->session->appsession('session_data','budget',$data);
+
$GLOBALS['phpgw']->session->appsession('session_data', 'budget', $data);
}
}
function read_sessiondata()
{
- $data =
$GLOBALS['phpgw']->session->appsession('session_data','budget');
+ $data =
$GLOBALS['phpgw']->session->appsession('session_data', 'budget');
- $this->start =
isset($data['start'])?$data['start']:'';
- $this->filter =
isset($data['filter'])?$data['filter']:'';
- $this->sort =
isset($data['sort'])?$data['sort']:'';
- $this->order =
isset($data['order'])?$data['order']:'';;
- $this->cat_id =
isset($data['cat_id'])?$data['cat_id']:'';
- $this->dimb_id =
isset($data['dimb_id'])?$data['dimb_id']:'';
- $this->details =
isset($data['details'])?$data['details']:'';
- $this->direction =
isset($data['direction'])?$data['direction']:'';
+ $this->start = isset($data['start']) ?
$data['start'] : '';
+ $this->filter = isset($data['filter']) ?
$data['filter'] : '';
+ $this->sort = isset($data['sort']) ?
$data['sort'] : '';
+ $this->order = isset($data['order']) ?
$data['order'] : '';;
+ $this->cat_id = isset($data['cat_id']) ?
$data['cat_id'] : '';
+ $this->dimb_id = isset($data['dimb_id']) ?
$data['dimb_id'] : '';
+ $this->details = isset($data['details']) ?
$data['details'] : '';
+ $this->direction = isset($data['direction']) ?
$data['direction'] : '';
}
function check_perms($has, $needed)
@@ -151,118 +149,116 @@
return (!!($has & $needed) == true);
}
-
- function read($data= array())
+ function read($data = array())
{
- /*$budget = $this->so->read(array('start' =>
$this->start,'query' => $this->query,'sort' => $this->sort,'order' =>
$this->order,
- 'filter' => $this->filter,'cat_id' =>
$this->cat_id,'allrows'=>$this->allrows,
- 'district_id' => $this->district_id,'year' =>
$this->year,'grouping' => $this->grouping,'revision' => $this->revision,
- 'cat_id' => $this->cat_id, 'dimb_id' =>
$this->dimb_id, 'org_unit_id' => $this->org_unit_id));*/
+ /* $budget = $this->so->read(array('start' =>
$this->start,'query' => $this->query,'sort' => $this->sort,'order' =>
$this->order,
+ 'filter' => $this->filter,'cat_id' =>
$this->cat_id,'allrows'=>$this->allrows,
+ 'district_id' => $this->district_id,'year' =>
$this->year,'grouping' => $this->grouping,'revision' => $this->revision,
+ 'cat_id' => $this->cat_id, 'dimb_id' =>
$this->dimb_id, 'org_unit_id' => $this->org_unit_id)); */
$budget = $this->so->read(array
(
- 'start' =>
$data['start'],
- 'query' =>
$data['query'],
- 'sort' =>
$data['sort'],
- 'order' =>
$data['order'],
- 'results' =>
$data['results'],
- 'filter' =>
$this->filter,
- 'cat_id' =>
$this->cat_id,
- 'allrows' =>
isset($data['allrows'])?$data['allrows']:'',
- 'district_id' => $this->district_id,
- 'year' => $this->year,
- 'grouping' =>
$this->grouping,
- 'revision' =>
$this->revision,
- 'cat_id' =>
$this->cat_id,
- 'dimb_id' =>
$this->dimb_id,
- 'org_unit_id' => $this->org_unit_id
- )
+ 'start' => $data['start'],
+ 'query' => $data['query'],
+ 'sort' => $data['sort'],
+ 'order' => $data['order'],
+ 'results' => $data['results'],
+ 'filter' => $this->filter,
+ 'cat_id' => $this->cat_id,
+ 'allrows' =>
isset($data['allrows']) ? $data['allrows'] : '',
+ 'district_id' => $this->district_id,
+ 'year' => $this->year,
+ 'grouping' => $this->grouping,
+ 'revision' => $this->revision,
+ 'cat_id' => $this->cat_id,
+ 'dimb_id' => $this->dimb_id,
+ 'org_unit_id' => $this->org_unit_id
+ )
);
-
- $this->total_records =
$this->so->total_records;
- $this->sum_budget_cost =
$this->so->sum_budget_cost;
- foreach ($budget as & $entry)
+
+ $this->total_records = $this->so->total_records;
+ $this->sum_budget_cost = $this->so->sum_budget_cost;
+ foreach($budget as & $entry)
{
// $entry['entry_date'] =
$GLOBALS['phpgw']->common->show_date($entry['entry_date'],$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']);
- $category =
$this->cats->return_single($entry['cat_id']);
- $entry['category']
=$category[0]['name'];
+ $category =
$this->cats->return_single($entry['cat_id']);
+ $entry['category'] = $category[0]['name'];
}
return $budget;
}
- function read_basis($data= array())
+ function read_basis($data = array())
{
- /*$budget = $this->so->read_basis(array('start' =>
$this->start,'query' => $this->query,'sort' => $this->sort,'order' =>
$this->order,
- 'filter' => $this->filter,'cat_id' =>
$this->cat_id,'allrows'=>$this->allrows,
- 'district_id' => $this->district_id,'year' =>
$this->year,'grouping' => $this->grouping,'revision' => $this->revision,));*/
+ /* $budget = $this->so->read_basis(array('start' =>
$this->start,'query' => $this->query,'sort' => $this->sort,'order' =>
$this->order,
+ 'filter' => $this->filter,'cat_id' =>
$this->cat_id,'allrows'=>$this->allrows,
+ 'district_id' => $this->district_id,'year' =>
$this->year,'grouping' => $this->grouping,'revision' => $this->revision,)); */
$budget = $this->so->read_basis(array
(
- 'start' => $data['start'],
- 'query' => $data['query'],
- 'sort' => $data['sort'],
- 'order' => $data['order'],
- 'results' => $data['results'],
- 'filter' => $this->filter,
- 'cat_id' => $this->cat_id,
- 'allrows' =>
isset($data['allrows'])?$data['allrows']:'',
- 'district_id' => $this->district_id,
- 'year' => $this->year,
- 'grouping' => $this->grouping,
- 'revision' => $this->revision
- )
+ 'start' => $data['start'],
+ 'query' => $data['query'],
+ 'sort' => $data['sort'],
+ 'order' => $data['order'],
+ 'results' => $data['results'],
+ 'filter' => $this->filter,
+ 'cat_id' => $this->cat_id,
+ 'allrows' =>
isset($data['allrows']) ? $data['allrows'] : '',
+ 'district_id' => $this->district_id,
+ 'year' => $this->year,
+ 'grouping' => $this->grouping,
+ 'revision' => $this->revision
+ )
);
-
+
$this->total_records = $this->so->total_records;
- for ($i=0; $i<count($budget); $i++)
+ for($i = 0; $i < count($budget); $i++)
{
- $budget[$i]['entry_date'] =
$GLOBALS['phpgw']->common->show_date($budget[$i]['entry_date'],$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']);
+ $budget[$i]['entry_date'] =
$GLOBALS['phpgw']->common->show_date($budget[$i]['entry_date'],
$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']);
}
return $budget;
}
-
- function read_obligations($data= array())
+ function read_obligations($data = array())
{
//cramirez: add strtoupper function for $this->sort. in
YUI use asc/desc (lowercase letters)
- /*$obligations =
$this->so->read_obligations(array('start' => $this->start, 'query' =>
$this->query,
- 'sort' => strtoupper($this->sort), 'order' =>
$this->order, 'filter' => $this->filter,
- 'cat_id' => $this->cat_id,
'allrows'=>$this->allrows, 'district_id' => $this->district_id,
- 'year' => $this->year,'month' => $this->month,
'grouping' => $this->grouping, 'revision' => $this->revision,
- 'details' => $this->details,'dimb_id' =>
$this->dimb_id, 'org_unit_id' => $this->org_unit_id,
- 'direction' => $this->direction));*/
+ /* $obligations =
$this->so->read_obligations(array('start' => $this->start, 'query' =>
$this->query,
+ 'sort' => strtoupper($this->sort), 'order' =>
$this->order, 'filter' => $this->filter,
+ 'cat_id' => $this->cat_id, 'allrows'=>$this->allrows,
'district_id' => $this->district_id,
+ 'year' => $this->year,'month' => $this->month,
'grouping' => $this->grouping, 'revision' => $this->revision,
+ 'details' => $this->details,'dimb_id' =>
$this->dimb_id, 'org_unit_id' => $this->org_unit_id,
+ 'direction' => $this->direction)); */
$obligations = $this->so->read_obligations(array
(
- 'start' => $data['start'],
- 'query' => $data['query'],
- 'sort' => $data['sort'],
- 'order' => $data['order'],
- 'results' => $data['results'],
- 'filter' => $this->filter,
- 'cat_id' => $this->cat_id,
- 'allrows' =>
isset($data['allrows'])?$data['allrows']:'',
- 'district_id' => $this->district_id,
- 'year' => $this->year,
- 'month' => $this->month,
- 'grouping' => $this->grouping,
- 'revision' => $this->revision,
- 'details' => $this->details,
- 'dimb_id' => $this->dimb_id,
- 'org_unit_id' => $this->org_unit_id,
- 'direction' => $this->direction
- )
+ 'start' => $data['start'],
+ 'query' => $data['query'],
+ 'sort' => $data['sort'],
+ 'order' => $data['order'],
+ 'results' => $data['results'],
+ 'filter' => $this->filter,
+ 'cat_id' => $this->cat_id,
+ 'allrows' =>
isset($data['allrows']) ? $data['allrows'] : '',
+ 'district_id' => $this->district_id,
+ 'year' => $this->year,
+ 'month' => $this->month,
+ 'grouping' => $this->grouping,
+ 'revision' => $this->revision,
+ 'details' => $this->details,
+ 'dimb_id' => $this->dimb_id,
+ 'org_unit_id' => $this->org_unit_id,
+ 'direction' => $this->direction
+ )
);
-
- $this->total_records =
$this->so->total_records;
- $this->sum_budget_cost =
$this->so->sum_budget_cost;
- $this->sum_obligation_cost =
$this->so->sum_obligation_cost;
- $this->sum_actual_cost =
$this->so->sum_actual_cost;
- $this->sum_actual_cost_period =
$this->so->sum_actual_cost_period;
- $this->sum_hits =
$this->so->sum_hits;
+ $this->total_records =
$this->so->total_records;
+ $this->sum_budget_cost =
$this->so->sum_budget_cost;
+ $this->sum_obligation_cost =
$this->so->sum_obligation_cost;
+ $this->sum_actual_cost =
$this->so->sum_actual_cost;
+ $this->sum_actual_cost_period =
$this->so->sum_actual_cost_period;
+ $this->sum_hits =
$this->so->sum_hits;
+
return $obligations;
}
@@ -284,12 +280,12 @@
function save($budget)
{
- if ($budget['budget_id'])
+ if($budget['budget_id'])
{
- if ($budget['budget_id'] != 0)
+ if($budget['budget_id'] != 0)
{
- $budget_id = $budget['budget_id'];
- $receipt=$this->so->edit($budget);
+ $budget_id = $budget['budget_id'];
+ $receipt =
$this->so->edit($budget);
}
}
else
@@ -301,12 +297,12 @@
function save_basis($values)
{
- if ($values['budget_id'])
+ if($values['budget_id'])
{
- if ($values['budget_id'] != 0)
+ if($values['budget_id'] != 0)
{
- $budget_id = $values['budget_id'];
- $receipt=$this->so->edit_basis($values);
+ $budget_id = $values['budget_id'];
+ $receipt =
$this->so->edit_basis($values);
}
}
else
@@ -316,23 +312,23 @@
if(is_array($values['distribute']) &&
is_array($values['distribute_year']) && (!isset($receipt['error']) ||
!$receipt['error']))
{
- if($values['distribute'][0]=='new')
+ if($values['distribute'][0] == 'new')
{
- $values['distribute'][0]=
$receipt['budget_id'];
+ $values['distribute'][0] =
$receipt['budget_id'];
}
- $this->distribute($values,$receipt);
+ $this->distribute($values, $receipt);
}
return $receipt;
}
- function distribute($values,$receipt='')
+ function distribute($values, $receipt = '')
{
- return $this->so->distribute($values,$receipt);
+ return $this->so->distribute($values, $receipt);
}
function delete($params)
{
- if (is_array($params))
+ if(is_array($params))
{
$this->so->delete($params[0]);
}
@@ -344,7 +340,7 @@
function delete_basis($params)
{
- if (is_array($params))
+ if(is_array($params))
{
$this->so->delete_basis($params[0]);
}
@@ -354,28 +350,28 @@
}
}
- function get_distribute_year_list($selected ='')
+ function get_distribute_year_list($selected = '')
{
$distribute_year_list =
$this->so->get_distribute_year_list();
- return
$this->bocommon->select_multi_list($selected,$distribute_year_list);
+ return $this->bocommon->select_multi_list($selected,
$distribute_year_list);
}
- function get_b_group_list($selected ='')
+ function get_b_group_list($selected = '')
{
$b_group_list = $this->so->get_b_group_list();
- return
$this->bocommon->select_list($selected,$b_group_list);
+ return $this->bocommon->select_list($selected,
$b_group_list);
}
- function get_revision_list($selected ='',$year='',$basis = '')
+ function get_revision_list($selected = '', $year = '', $basis =
'')
{
- $revision_list =
$this->so->get_revision_list($year,$basis);
- return
$this->bocommon->select_list($selected,$revision_list);
+ $revision_list = $this->so->get_revision_list($year,
$basis);
+ return $this->bocommon->select_list($selected,
$revision_list);
}
- function get_year_filter_list($selected ='',$basis = '')
+ function get_year_filter_list($selected = '', $basis = '')
{
$year_list = $this->so->get_year_filter_list($basis);
- return
$this->bocommon->select_list($selected,$year_list);
+ return $this->bocommon->select_list($selected,
$year_list);
}
function get_year_list()
@@ -384,42 +380,41 @@
if(!$year_list)
{
- $year_list = array(array('id' =>date('Y'),
'name' =>date('Y')));
+ $year_list = array(array('id' => date('Y'),
'name' => date('Y')));
}
- $k = date('Y') - $year_list[0]['id'] + 5;
- $j = count($year_list);
- for ($i=0; $i < $k; $i++)
+ $k = date('Y') - $year_list[0]['id'] + 5;
+ $j = count($year_list);
+ for($i = 0; $i < $k; $i++)
{
// FIXME
// if($year_list[$j-1]['id'] < date('Y') +
3)
{
- $year_list[$j+$i]['id'] =
$year_list[$j+$i-1]['id'] + 1;
- $year_list[$j+$i]['name'] =
$year_list[$j+$i-1]['id'] + 1;
+ $year_list[$j + $i]['id']
= $year_list[$j + $i - 1]['id'] + 1;
+ $year_list[$j + $i]['name'] =
$year_list[$j + $i - 1]['id'] + 1;
}
}
return $year_list;
}
- function get_revision_filter_list($selected ='',$basis = '')
+ function get_revision_filter_list($selected = '', $basis = '')
{
if(!isset($_GET['year']))
{
- $year = date('Y');
- $this->year = $year;
- $selected =
$this->so->get_max_revision($year,$basis);
- $this->revision = $selected;
+ $year = date('Y');
+ $this->year = $year;
+ $selected =
$this->so->get_max_revision($year, $basis);
+ $this->revision = $selected;
}
else
{
$year = $this->year;
}
- $revision_list =
$this->so->get_revision_filter_list($year,$basis);
- return
$this->bocommon->select_list($selected,$revision_list);
-
+ $revision_list =
$this->so->get_revision_filter_list($year, $basis);
+ return $this->bocommon->select_list($selected,
$revision_list);
}
- function get_grouping_filter_list($selected ='',$basis = '')
+ function get_grouping_filter_list($selected = '', $basis = '')
{
if(!isset($_GET['year']))
{
@@ -429,8 +424,7 @@
{
$year = $this->year;
}
- $grouping_list =
$this->so->get_grouping_filter_list($year,$basis);
- return
$this->bocommon->select_list($selected,$grouping_list);
+ $grouping_list =
$this->so->get_grouping_filter_list($year, $basis);
+ return $this->bocommon->select_list($selected,
$grouping_list);
}
-
- }
+ }
\ No newline at end of file
Modified: branches/dev-syncromind/property/inc/class.bocommon.inc.php
===================================================================
--- branches/dev-syncromind/property/inc/class.bocommon.inc.php 2015-09-17
00:15:11 UTC (rev 13952)
+++ branches/dev-syncromind/property/inc/class.bocommon.inc.php 2015-09-17
07:55:45 UTC (rev 13953)
@@ -1,41 +1,40 @@
<?php
/**
- * phpGroupWare - property: a Facilities Management System.
- *
- * @author Sigurd Nes <address@hidden>
- * @copyright Copyright (C)
2003,2004,2005,2006,2007,2008,2009,2010,2011,2012 Free Software Foundation,
Inc. http://www.fsf.org/
- * This file is part of phpGroupWare.
- *
- * phpGroupWare is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * phpGroupWare is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with phpGroupWare; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301
USA
- *
- * @license http://www.gnu.org/licenses/gpl.html GNU General Public
License
- * @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
- * @package property
- * @subpackage core
- * @version $Id$
- */
-
+ * phpGroupWare - property: a Facilities Management System.
+ *
+ * @author Sigurd Nes <address@hidden>
+ * @copyright Copyright (C)
2003,2004,2005,2006,2007,2008,2009,2010,2011,2012 Free Software Foundation,
Inc. http://www.fsf.org/
+ * This file is part of phpGroupWare.
+ *
+ * phpGroupWare is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * phpGroupWare is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with phpGroupWare; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
02110-1301 USA
+ *
+ * @license http://www.gnu.org/licenses/gpl.html GNU General Public
License
+ * @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
+ * @package property
+ * @subpackage core
+ * @version $Id$
+ */
/**
* Description
* @package property
*/
-
phpgw::import_class('phpgwapi.datetime');
class property_bocommon
{
+
var $start;
var $query;
var $filter;
@@ -43,32 +42,31 @@
var $order;
var $cat_id;
var $district_id;
- var $xsl_rootdir;
+ var $xsl_rootdir;
protected $join;
protected $left_join;
protected $like;
-
var $public_functions = array
(
- 'confirm_session' => true,
- 'get_vendor_email' => true
- );
+ 'confirm_session' => true,
+ 'get_vendor_email' => true
+ );
function __construct()
{
//_debug_array($bt = debug_backtrace());
- $this->socommon =
CreateObject('property.socommon');
- $this->account =
$GLOBALS['phpgw_info']['user']['account_id'];
+ $this->socommon = CreateObject('property.socommon');
+ $this->account =
$GLOBALS['phpgw_info']['user']['account_id'];
- if (!isset($GLOBALS['phpgw']->asyncservice))
+ if(!isset($GLOBALS['phpgw']->asyncservice))
{
$GLOBALS['phpgw']->asyncservice =
CreateObject('phpgwapi.asyncservice');
}
$this->async = &$GLOBALS['phpgw']->asyncservice;
- $this->join = $this->socommon->join;
- $this->left_join = $this->socommon->left_join;
- $this->like = $this->socommon->like;
+ $this->join = $this->socommon->join;
+ $this->left_join = $this->socommon->left_join;
+ $this->like = $this->socommon->like;
$this->xsl_rootdir = PHPGW_SERVER_ROOT .
"/property/templates/{$GLOBALS['phpgw_info']['server']['template_set']}";
}
@@ -78,17 +76,17 @@
return ($rights & $required);
}
- function create_preferences($app='',$user_id='')
+ function create_preferences($app = '', $user_id = '')
{
- return
$this->socommon->create_preferences($app,$user_id);
+ return $this->socommon->create_preferences($app,
$user_id);
}
- function get_lookup_entity($location='')
+ function get_lookup_entity($location = '')
{
return $this->socommon->get_lookup_entity($location);
}
- function get_start_entity($location='')
+ function get_start_entity($location = '')
{
return $this->socommon->get_start_entity($location);
}
@@ -97,7 +95,7 @@
{
$msgbox_data_error = array();
$msgbox_data_message = array();
- if (isSet($receipt['error']) AND
is_array($receipt['error']))
+ if(isSet($receipt['error']) AND
is_array($receipt['error']))
{
foreach($receipt['error'] as $dummy => $error)
{
@@ -105,7 +103,7 @@
}
}
- if (isSet($receipt['message']) AND
is_array($receipt['message']))
+ if(isSet($receipt['message']) AND
is_array($receipt['message']))
{
foreach($receipt['message'] as $dummy =>
$message)
{
@@ -118,35 +116,34 @@
return $msgbox_data;
}
-
function confirm_session()
{
if($GLOBALS['phpgw']->session->verify())
{
header('Content-Type: application/json');
- echo
json_encode(array('sessionExpired'=>false));
+ echo json_encode(array('sessionExpired' =>
false));
$GLOBALS['phpgw']->common->phpgw_exit();
}
}
- function date_to_timestamp($date=array())
+ function date_to_timestamp($date = array())
{
- return phpgwapi_datetime::date_to_timestamp($date);
+ return phpgwapi_datetime::date_to_timestamp($date);
}
- function select_multi_list($selected='',$input_list)
+ function select_multi_list($selected = '', $input_list)
{
- $j=0;
- if (isset($input_list) AND is_array($input_list))
+ $j = 0;
+ if(isset($input_list) AND is_array($input_list))
{
foreach($input_list as $entry)
{
- $output_list[$j]['id'] = $entry['id'];
+ $output_list[$j]['id'] = $entry['id'];
$output_list[$j]['name'] =
$entry['name'];
if(isset($selected) &&
is_array($selected))
{
- for
($i=0;$i<count($selected);$i++)
+ for($i = 0; $i <
count($selected); $i++)
{
if($selected[$i] ==
$entry['id'])
{
@@ -160,13 +157,13 @@
return $output_list;
}
- function select_list($selected='',$list=array())
+ function select_list($selected = '', $list = array())
{
- if (is_array($list))
+ if(is_array($list))
{
foreach($list as &$entry)
{
- if ($entry['id']==$selected)
+ if($entry['id'] == $selected)
{
$entry['selected'] = 'selected';
}
@@ -175,18 +172,17 @@
}
}
-
- function
get_user_list($format='',$selected='',$extra='',$default='',$start='',
$sort='ASC', $order='account_lastname', $query='',$offset='', $enabled = false)
+ function get_user_list($format = '', $selected = '', $extra =
'', $default = '', $start = '', $sort = 'ASC', $order = 'account_lastname',
$query = '', $offset = '', $enabled = false)
{
- $order= $order ? $order : 'account_lastname';
+ $order = $order ? $order : 'account_lastname';
switch($format)
{
case 'select':
-
$GLOBALS['phpgw']->xslttpl->add_file(array('user_id_select'),$this->xsl_rootdir);
+
$GLOBALS['phpgw']->xslttpl->add_file(array('user_id_select'),
$this->xsl_rootdir);
break;
case 'filter':
-
$GLOBALS['phpgw']->xslttpl->add_file(array('user_id_filter'),$this->xsl_rootdir);
+
$GLOBALS['phpgw']->xslttpl->add_file(array('user_id_filter'),
$this->xsl_rootdir);
break;
}
@@ -197,60 +193,59 @@
$all_users = array();
- if (is_array($extra))
+ if(is_array($extra))
{
foreach($extra as $extra_user)
{
- $all_users[]=array
+ $all_users[] = array
(
- 'account_id' =>
$extra_user,
- 'account_firstname' =>
lang($extra_user)
- );
+ 'account_id' =>
$extra_user,
+ 'account_firstname' =>
lang($extra_user)
+ );
}
}
$accounts = & $GLOBALS['phpgw']->accounts;
- $users = $accounts->get_list('accounts', $start, $sort,
$order, $query,$offset);
+ $users = $accounts->get_list('accounts', $start, $sort,
$order, $query, $offset);
unset($accounts);
- if (is_array($users))
+ if(is_array($users))
{
foreach($users as $user)
{
- if (($enabled && $user->enabled) ||
!$enabled)
+ if(($enabled && $user->enabled) ||
!$enabled)
{
$all_users[] = array
(
- 'user_id'
=> $user->id,
- 'name'
=> $user->__toString(),
- );
+ 'user_id' =>
$user->id,
+ 'name' =>
$user->__toString(),
+ );
}
}
}
- if (count($all_users)>0)
+ if(count($all_users) > 0)
{
foreach($all_users as $user)
{
$sel_user = '';
- if ($user['user_id'] == $selected)
+ if($user['user_id'] == $selected)
{
$user_list[] = array
(
- 'user_id'
=> $user['user_id'],
- 'name'
=> $user['name'],
- 'selected'
=> 'selected'
- );
+ 'user_id' =>
$user['user_id'],
+ 'name' =>
$user['name'],
+ 'selected' =>
'selected'
+ );
}
else
{
$user_list[] = array
(
- 'user_id'
=> $user['user_id'],
- 'name'
=> $user['name'],
- );
-
+ 'user_id' =>
$user['user_id'],
+ 'name' =>
$user['name'],
+ );
}
}
}
@@ -258,45 +253,45 @@
return $user_list;
}
- function get_group_list($format='',$selected='',$start='',
$sort='', $order='', $query='',$offset='')
+ function get_group_list($format = '', $selected = '', $start =
'', $sort = '', $order = '', $query = '', $offset = '')
{
switch($format)
{
- case 'select':
-
$GLOBALS['phpgw']->xslttpl->add_file(array('group_select'), $this->xsl_rootdir);
- break;
- case 'filter':
-
$GLOBALS['phpgw']->xslttpl->add_file(array('group_filter'), $this->xsl_rootdir);
- break;
+ case 'select':
+
$GLOBALS['phpgw']->xslttpl->add_file(array('group_select'), $this->xsl_rootdir);
+ break;
+ case 'filter':
+
$GLOBALS['phpgw']->xslttpl->add_file(array('group_filter'), $this->xsl_rootdir);
+ break;
}
- $accounts = & $GLOBALS['phpgw']->accounts;
+ $accounts = & $GLOBALS['phpgw']->accounts;
- $users = $accounts->get_list('groups', $start, $sort,
$order, $query,$offset);
+ $users = $accounts->get_list('groups', $start, $sort,
$order, $query, $offset);
unset($accounts);
- if (isset($users) AND is_array($users))
+ if(isset($users) AND is_array($users))
{
foreach($users as $user)
{
$sel_user = '';
- if ($user->id == $selected)
+ if($user->id == $selected)
{
$sel_user = 'selected';
}
$user_list[] = array
(
- 'id' => $user->id,
- 'name' =>
$user->firstname,
- 'selected' =>
$sel_user
- );
+ 'id' => $user->id,
+ 'name' =>
$user->firstname,
+ 'selected' => $sel_user
+ );
}
}
- $user_count= count($user_list);
- for ($i=0;$i<$user_count;$i++)
+ $user_count = count($user_list);
+ for($i = 0; $i < $user_count; $i++)
{
- if ($user_list[$i]['selected'] != 'selected')
+ if($user_list[$i]['selected'] != 'selected')
{
unset($user_list[$i]['selected']);
}
@@ -306,35 +301,34 @@
return $user_list;
}
-
- function
get_user_list_right($rights,$selected='',$acl_location='',$extra='',$default='')
+ function get_user_list_right($rights, $selected = '',
$acl_location = '', $extra = '', $default = '')
{
if(!$selected && $default)
{
$selected = $default;
}
- if (!is_array($rights))
+ if(!is_array($rights))
{
$rights = array($rights);
}
- if (is_array($extra))
+ if(is_array($extra))
{
foreach($extra as $extra_user)
{
- $users_extra[]=array
+ $users_extra[] = array
(
- 'account_lid'
=> $extra_user,
- 'account_firstname'
=> lang($extra_user),
- 'account_lastname'
=> ''
- );
+ 'account_lid' =>
$extra_user,
+ 'account_firstname' =>
lang($extra_user),
+ 'account_lastname' => ''
+ );
}
}
$right_index = 0;
- foreach ($rights as $right)
+ foreach($rights as $right)
{
$right_index += $right;
}
@@ -346,18 +340,18 @@
if(!$users =
$this->socommon->fm_cache($acl_userlist_name))
{
$users_gross = array();
- foreach ($rights as $right)
+ foreach($rights as $right)
{
$users_gross =
array_merge($users_gross, $GLOBALS['phpgw']->acl->get_user_list_right($right,
$acl_location));
}
- $accounts = array();
- $users = array();
+ $accounts = array();
+ $users = array();
- foreach ($users_gross as $entry => $user)
+ foreach($users_gross as $entry => $user)
{
- if(
!isset($accounts[$user['account_id']]) )
+
if(!isset($accounts[$user['account_id']]))
{
$users[] = $user;
}
@@ -366,9 +360,9 @@
unset($users_gross);
unset($accounts);
- foreach ($users as $key => $row)
+ foreach($users as $key => $row)
{
- $account_lastname[$key] =
$row['account_lastname'];
+ $account_lastname[$key] =
$row['account_lastname'];
$account_firstname[$key] =
$row['account_firstname'];
}
@@ -379,50 +373,49 @@
array_multisort($account_lastname,
SORT_ASC, $account_firstname, SORT_ASC, $users);
}
- $this->socommon->fm_cache('acl_userlist_'.
$rights[0] . '_' . $acl_location,$users);
+ $this->socommon->fm_cache('acl_userlist_' .
$rights[0] . '_' . $acl_location, $users);
}
- if (isset($users_extra) && is_array($users_extra) &&
is_array($users))
+ if(isset($users_extra) && is_array($users_extra) &&
is_array($users))
{
$users = array_merge($users_extra, $users);
}
- $user_list = array();
- $selected_found = false;
+ $user_list = array();
+ $selected_found = false;
- foreach ($users as $user)
+ foreach($users as $user)
{
- if ($user['account_lid']==$selected)
+ if($user['account_lid'] == $selected)
{
$user_list[] = array
(
- 'lid'
=> $user['account_lid'],
- 'firstname'
=> $user['account_firstname'],
- 'lastname'
=> $user['account_lastname'],
- 'selected'
=> 'selected'
- );
+ 'lid' =>
$user['account_lid'],
+ 'firstname' =>
$user['account_firstname'],
+ 'lastname' =>
$user['account_lastname'],
+ 'selected' => 'selected'
+ );
}
else
{
$user_list[] = array
(
- 'lid'
=> $user['account_lid'],
- 'firstname'
=> $user['account_firstname'],
- 'lastname'
=> $user['account_lastname'],
- );
+ 'lid' =>
$user['account_lid'],
+ 'firstname' =>
$user['account_firstname'],
+ 'lastname' =>
$user['account_lastname'],
+ );
}
if(!$selected_found)
{
$selected_found = $user['account_lid']
== $selected ? true : false;
}
-
}
- foreach ($user_list as &$user)
+ foreach($user_list as &$user)
{
- $user['id'] = $user['lid'];
- $user['name'] = ltrim("{$user['lastname']},
{$user['firstname']}",', ');
+ $user['id'] = $user['lid'];
+ $user['name'] = ltrim("{$user['lastname']},
{$user['firstname']}", ', ');
}
unset($user);
@@ -433,30 +426,30 @@
$_user =
$GLOBALS['phpgw']->accounts->get($user_id);
$user_list[] = array
- (
- 'lid' => $_user->lid,
- 'firstname' => $_user->firstname,
- 'lastname' => $_user->lastname,
- 'id' => $selected,
- 'name' => $_user->__toString(),
- 'selected' => 'selected'
+ (
+ 'lid' => $_user->lid,
+ 'firstname' => $_user->firstname,
+ 'lastname' => $_user->lastname,
+ 'id' => $selected,
+ 'name' =>
$_user->__toString(),
+ 'selected' => 'selected'
);
}
return $user_list;
}
- function
get_user_list_right2($format='',$right='',$selected='',$acl_location='',$extra='',$default='')
+ function get_user_list_right2($format = '', $right = '',
$selected = '', $acl_location = '', $extra = '', $default = '')
{
if(is_array($format)) // i.e: called by ExecMethod()
{
- $data = $format;
- $format =
isset($data['format']) ? $data['format'] : '';
- $right = isset($data['right'])
? $data['right'] : '';
- $selected =
isset($data['selected']) ? $data['selected'] : '';
- $acl_location = isset($data['acl_location'])
? $data['acl_location'] : '';
- $extra = isset($data['extra'])
? $data['extra'] : '';
- $default =
isset($data['default']) ? $data['default'] : '';
+ $data = $format;
+ $format =
isset($data['format']) ? $data['format'] : '';
+ $right =
isset($data['right']) ? $data['right'] : '';
+ $selected =
isset($data['selected']) ? $data['selected'] : '';
+ $acl_location = isset($data['acl_location'])
? $data['acl_location'] : '';
+ $extra =
isset($data['extra']) ? $data['extra'] : '';
+ $default =
isset($data['default']) ? $data['default'] : '';
}
switch($format)
@@ -474,44 +467,44 @@
$selected = $default;
}
- if (isset($extra) AND is_array($extra))
+ if(isset($extra) AND is_array($extra))
{
foreach($extra as $extra_user)
{
- $users_extra[]=array
+ $users_extra[] = array
(
- 'account_id' =>
$extra_user,
- 'account_firstname' =>
lang($extra_user)
- );
+ 'account_id' =>
$extra_user,
+ 'account_firstname' =>
lang($extra_user)
+ );
}
}
- if(!$users = $this->socommon->fm_cache('acl_userlist_'.
$right . '_' . $acl_location))
+ if(!$users = $this->socommon->fm_cache('acl_userlist_'
. $right . '_' . $acl_location))
{
$users =
$GLOBALS['phpgw']->acl->get_user_list_right($right, $acl_location);
- $this->socommon->fm_cache('acl_userlist_'.
$right . '_' . $acl_location,$users);
+ $this->socommon->fm_cache('acl_userlist_' .
$right . '_' . $acl_location, $users);
}
- if ((isset($users_extra) && is_array($users_extra)) &&
is_array($users))
+ if((isset($users_extra) && is_array($users_extra)) &&
is_array($users))
{
foreach($users as $users_entry)
{
- array_push($users_extra,$users_entry);
+ array_push($users_extra, $users_entry);
}
- $users=$users_extra;
+ $users = $users_extra;
}
$user_list = array();
$selected_found = false;
- foreach ($users as $user)
+ foreach($users as $user)
{
- $name =
(isset($user['account_lastname'])?$user['account_lastname'].'
':'').$user['account_firstname'];
+ $name =
(isset($user['account_lastname']) ? $user['account_lastname'] . ' ' : '') .
$user['account_firstname'];
$user_list[] = array
- (
- 'id' => $user['account_id'],
- 'name' => $name,
- 'selected' => $user['account_id']
== $selected ? 1 : 0
+ (
+ 'id' => $user['account_id'],
+ 'name' => $name,
+ 'selected' => $user['account_id']
== $selected ? 1 : 0
);
if(!$selected_found)
@@ -523,10 +516,10 @@
if($selected && !$selected_found)
{
$user_list[] = array
- (
- 'id' => $selected,
- 'name' =>
$GLOBALS['phpgw']->accounts->get($selected)->__toString(),
- 'selected' => 1
+ (
+ 'id' => $selected,
+ 'name' =>
$GLOBALS['phpgw']->accounts->get($selected)->__toString(),
+ 'selected' => 1
);
}
@@ -537,7 +530,7 @@
{
//_debug_array($data);
- if( isset($data['type']) && $data['type']=='view')
+ if(isset($data['type']) && $data['type'] == 'view')
{
$GLOBALS['phpgw']->xslttpl->add_file(array('vendor_view'), $this->xsl_rootdir);
}
@@ -546,25 +539,25 @@
$GLOBALS['phpgw']->xslttpl->add_file(array('vendor_form'), $this->xsl_rootdir);
}
- $vendor['value_vendor_id'] =
$data['vendor_id'];
- $vendor['value_vendor_name'] =
$data['vendor_name'];
+ $vendor['value_vendor_id'] = $data['vendor_id'];
+ $vendor['value_vendor_name'] = $data['vendor_name'];
if(isset($data['vendor_id']) && $data['vendor_id'] &&
!$data['vendor_name'])
{
- $contacts =
CreateObject('property.sogeneric');
- $contacts->get_location_info('vendor',false);
+ $contacts = CreateObject('property.sogeneric');
+ $contacts->get_location_info('vendor', false);
- $custom =
createObject('property.custom_fields');
- $vendor_data['attributes'] =
$custom->find('property','.vendor', 0, '', 'ASC', 'attrib_sort', true, true);
+ $custom
= createObject('property.custom_fields');
+ $vendor_data['attributes'] =
$custom->find('property', '.vendor', 0, '', 'ASC', 'attrib_sort', true, true);
- $vendor_data =
$contacts->read_single(array('id' => $data['vendor_id']),$vendor_data);
+ $vendor_data =
$contacts->read_single(array('id' => $data['vendor_id']), $vendor_data);
if(is_array($vendor_data))
{
foreach($vendor_data['attributes'] as
$attribute)
{
-
if($attribute['name']=='org_name')
+ if($attribute['name'] ==
'org_name')
{
-
$vendor['value_vendor_name']=$attribute['value'];
+
$vendor['value_vendor_name'] = $attribute['value'];
break;
}
}
@@ -572,22 +565,21 @@
unset($contacts);
}
- $vendor['vendor_link'] =
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
'property.uilookup.vendor'));
- $vendor['lang_vendor'] =
lang('Vendor');
- $vendor['lang_select_vendor_help'] = lang('click
this link to select vendor');
- $vendor['lang_vendor_name'] = lang('Vendor
Name');
- $vendor['required'] =
isset($data['required']) && $data['required'] ? true : false;
+ $vendor['vendor_link'] =
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'property.uilookup.vendor'));
+ $vendor['lang_vendor'] =
lang('Vendor');
+ $vendor['lang_select_vendor_help'] = lang('click
this link to select vendor');
+ $vendor['lang_vendor_name'] =
lang('Vendor Name');
+ $vendor['required']
= isset($data['required']) && $data['required'] ? true : false;
//_debug_array($vendor);
return $vendor;
}
-
function initiate_ui_contact_lookup($data)
{
//_debug_array($data);
$field = $data['field'];
- if( isset($data['type']) && $data['type']=='view')
+ if(isset($data['type']) && $data['type'] == 'view')
{
$GLOBALS['phpgw']->xslttpl->add_file(array('contact_view'), $this->xsl_rootdir);
}
@@ -596,31 +588,33 @@
$GLOBALS['phpgw']->xslttpl->add_file(array('contact_form'), $this->xsl_rootdir);
}
- $contact['value_contact_id'] =
$data['contact_id'];
+ $contact['value_contact_id'] = $data['contact_id'];
// $contact['value_contact_name']
= $data['contact_name'];
if(isset($data['contact_id']) && $data['contact_id'] &&
!$data['contact_name'])
{
- $contacts
= CreateObject('phpgwapi.contacts');
- $contact_data
= $contacts->read_single_entry($data['contact_id'],
array('fn','tel_work','email'));
- $contact['value_contact_name'] =
$contact_data[0]['fn'];
- $contact['value_contact_email'] =
$contact_data[0]['email'];
- $contact['value_contact_tel'] =
$contact_data[0]['tel_work'];
+ $contacts
= CreateObject('phpgwapi.contacts');
+ $contact_data
= $contacts->read_single_entry($data['contact_id'], array(
+ 'fn', 'tel_work', 'email'));
+ $contact['value_contact_name'] =
$contact_data[0]['fn'];
+ $contact['value_contact_email'] =
$contact_data[0]['email'];
+ $contact['value_contact_tel'] =
$contact_data[0]['tel_work'];
unset($contacts);
}
- $contact['field']
= $field;
- $contact['contact_link']
= $GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
'property.uilookup.addressbook', 'column' => $field));
- $contact['lang_contact']
= lang('contact');
- $contact['lang_select_contact_help'] = lang('click
this link to select');
+ $contact['field']
= $field;
+ $contact['contact_link'] =
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'property.uilookup.addressbook',
+ 'column' => $field));
+ $contact['lang_contact'] =
lang('contact');
+ $contact['lang_select_contact_help'] = lang('click this
link to select');
//_debug_array($contact);
return $contact;
}
function initiate_ui_tenant_lookup($data)
{
- if($data['type']=='view')
+ if($data['type'] == 'view')
{
$GLOBALS['phpgw']->xslttpl->add_file(array('tenant_view'), $this->xsl_rootdir);
}
@@ -629,44 +623,43 @@
$GLOBALS['phpgw']->xslttpl->add_file(array('tenant_form'), $this->xsl_rootdir);
}
- $tenant['value_tenant_id'] =
$data['tenant_id'];
- $tenant['value_first_name'] =
$data['first_name'];
- $tenant['value_last_name'] =
$data['last_name'];
- $tenant['tenant_link'] =
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
'property.uilookup.tenant'));
- if($data['role']=='customer')
+ $tenant['value_tenant_id'] = $data['tenant_id'];
+ $tenant['value_first_name'] = $data['first_name'];
+ $tenant['value_last_name'] = $data['last_name'];
+ $tenant['tenant_link'] =
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'property.uilookup.tenant'));
+ if($data['role'] == 'customer')
{
- $tenant['lang_select_tenant_help']
= lang('click this link to select customer');
- $tenant['lang_tenant']
= lang('Customer');
-
+ $tenant['lang_select_tenant_help'] =
lang('click this link to select customer');
+ $tenant['lang_tenant']
= lang('Customer');
}
else
{
- $tenant['lang_select_tenant_help']
= lang('click this link to select tenant');
- $tenant['lang_tenant']
= lang('Tenant');
+ $tenant['lang_select_tenant_help'] =
lang('click this link to select tenant');
+ $tenant['lang_tenant']
= lang('Tenant');
}
if($data['tenant_id'] && !$data['tenant_name'])
{
- $tenant_object =
CreateObject('property.sogeneric');
-
$tenant_object->get_location_info('tenant',false);
+ $tenant_object =
CreateObject('property.sogeneric');
+ $tenant_object->get_location_info('tenant',
false);
- $custom =
createObject('property.custom_fields');
- $tenant_data['attributes'] =
$custom->find('property','.tenant', 0, '', 'ASC', 'attrib_sort', true, true);
- $tenant_data =
$tenant_object->read_single(array('id' => $data['tenant_id']),$tenant_data);
+ $custom
= createObject('property.custom_fields');
+ $tenant_data['attributes'] =
$custom->find('property', '.tenant', 0, '', 'ASC', 'attrib_sort', true, true);
+ $tenant_data =
$tenant_object->read_single(array('id' => $data['tenant_id']), $tenant_data);
if(is_array($tenant_data['attributes']))
{
//_debug_array($tenant_data);
- foreach ($tenant_data['attributes'] as
$entry)
+ foreach($tenant_data['attributes'] as
$entry)
{
- if ($entry['name'] ==
'first_name')
+ if($entry['name'] ==
'first_name')
{
-
$tenant['value_first_name'] = $entry['value'];
+
$tenant['value_first_name'] = $entry['value'];
}
- if ($entry['name'] ==
'last_name')
+ if($entry['name'] ==
'last_name')
{
-
$tenant['value_last_name'] = $entry['value'];
+
$tenant['value_last_name'] = $entry['value'];
}
}
}
@@ -683,10 +676,9 @@
*
* @return array with information to include in forms
*/
-
function initiate_ui_budget_account_lookup($data)
{
- if( isset($data['type']) && $data['type']=='view')
+ if(isset($data['type']) && $data['type'] == 'view')
{
$GLOBALS['phpgw']->xslttpl->add_file(array('b_account_view'),
$this->xsl_rootdir);
}
@@ -695,33 +687,33 @@
$GLOBALS['phpgw']->xslttpl->add_file(array('b_account_form'),
$this->xsl_rootdir);
}
- $b_account['value_b_account_id'] =
$data['b_account_id'];
- $b_account['value_b_account_name'] =
$data['b_account_name'];
- $b_account['b_account_link'] =
$GLOBALS['phpgw']->link('/index.php',array
+ $b_account['value_b_account_id'] =
$data['b_account_id'];
+ $b_account['value_b_account_name'] =
$data['b_account_name'];
+ $b_account['b_account_link'] =
$GLOBALS['phpgw']->link('/index.php', array
(
- 'menuaction'=>
'property.uilookup.b_account',
- 'role' => isset($data['role'])
&& $data['role'] ? $data['role'] : '',
- 'parent' =>
isset($data['parent']) && $data['parent'] ? $data['parent'] : '',
- ));
- $b_account['lang_select_b_account_help'] =
lang('click this link to select budget account');
- $b_account['lang_b_account'] =
isset($data['role']) && $data['role'] == 'group' ? lang('budget account group')
: lang('Budget account');
+ 'menuaction' => 'property.uilookup.b_account',
+ 'role' => isset($data['role']) &&
$data['role'] ? $data['role'] : '',
+ 'parent' => isset($data['parent']) &&
$data['parent'] ? $data['parent'] : '',
+ ));
+ $b_account['lang_select_b_account_help'] = lang('click
this link to select budget account');
+ $b_account['lang_b_account'] =
isset($data['role']) && $data['role'] == 'group' ? lang('budget account group')
: lang('Budget account');
if($data['b_account_id'] && !$data['b_account_name'])
{
- $b_account_object =
CreateObject('property.sogeneric');
+ $b_account_object =
CreateObject('property.sogeneric');
if(isset($data['role']) && $data['role'] ==
'group')
{
-
$b_account_object->get_location_info('b_account',false);
+
$b_account_object->get_location_info('b_account', false);
}
else
{
-
$b_account_object->get_location_info('budget_account',false);
+
$b_account_object->get_location_info('budget_account', false);
}
- $b_account_data =
$b_account_object->read_single(array('id'=> $data['b_account_id']));
- $b_account['value_b_account_name'] =
$b_account_data['descr'];
+ $b_account_data
= $b_account_object->read_single(array('id' => $data['b_account_id']));
+ $b_account['value_b_account_name'] =
$b_account_data['descr'];
}
- $b_account['disabled'] =
isset($data['disabled']) && $data['disabled'] ? true : false;
- $b_account['required'] =
isset($data['required']) && $data['required'] ? true : false;
+ $b_account['disabled'] = isset($data['disabled']) &&
$data['disabled'] ? true : false;
+ $b_account['required'] = isset($data['required']) &&
$data['required'] ? true : false;
return $b_account;
}
@@ -729,7 +721,7 @@
{
$project_group = array();
- if( isset($data['type']) && $data['type']=='view')
+ if(isset($data['type']) && $data['type'] == 'view')
{
if(!isset($data['project_group']) ||
!$data['project_group'])
{
@@ -743,18 +735,19 @@
$GLOBALS['phpgw']->xslttpl->add_file(array('project_group_form'),
$this->xsl_rootdir);
}
- $project_group['value_project_group']
= $data['project_group'];
- $project_group['value_project_group_descr']
= $data['project_group_descr'];
- $project_group['project_group_url']
= $GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
'property.uilookup.project_group'));
- $project_group['lang_select_project_group_help']
= lang('click to select project group');
- $project_group['lang_project_group']
= lang('project group');
+ $project_group['value_project_group']
= $data['project_group'];
+ $project_group['value_project_group_descr']
= $data['project_group_descr'];
+ $project_group['project_group_url']
= $GLOBALS['phpgw']->link('/index.php', array(
+ 'menuaction' =>
'property.uilookup.project_group'));
+ $project_group['lang_select_project_group_help'] =
lang('click to select project group');
+ $project_group['lang_project_group']
= lang('project group');
if($data['project_group'] &&
(!isset($data['project_group_descr']) || !$data['project_group_descr']))
{
- $project_group_object
= CreateObject('property.sogeneric');
-
$project_group_object->get_location_info('project_group',false);
- $project_group_data
= $project_group_object->read_single(array('id'=>
$data['project_group']));
- $project_group['value_project_group_descr']
= $project_group_data['descr'];
- $project_group['value_project_group_budget']
= $project_group_data['budget'];
+ $project_group_object
= CreateObject('property.sogeneric');
+
$project_group_object->get_location_info('project_group', false);
+ $project_group_data
= $project_group_object->read_single(array('id' =>
$data['project_group']));
+ $project_group['value_project_group_descr']
= $project_group_data['descr'];
+ $project_group['value_project_group_budget'] =
$project_group_data['budget'];
}
return $project_group;
}
@@ -763,7 +756,7 @@
{
$ecodimb = array();
- if( isset($data['type']) && $data['type']=='view')
+ if(isset($data['type']) && $data['type'] == 'view')
{
if(!isset($data['ecodimb']) ||
!$data['ecodimb'])
{
@@ -777,36 +770,35 @@
$GLOBALS['phpgw']->xslttpl->add_file(array('ecodimb_form'), $this->xsl_rootdir);
}
- $ecodimb['value_ecodimb']
= $data['ecodimb'];
- $ecodimb['value_ecodimb_descr'] =
$data['ecodimb_descr'];
- $ecodimb['ecodimb_url']
= $GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
'property.uilookup.ecodimb'));
- $ecodimb['lang_select_ecodimb_help'] = lang('click
to select dimb');
- $ecodimb['lang_ecodimb']
= lang('dimb');
+ $ecodimb['value_ecodimb'] =
$data['ecodimb'];
+ $ecodimb['value_ecodimb_descr'] =
$data['ecodimb_descr'];
@@ Diff output truncated at 153600 characters. @@
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [13953] property: formatting code,
Sigurd Nes <=