[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [14622] formatting
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [14622] formatting |
|
Date: |
Tue, 05 Jan 2016 08:54:39 +0000 |
Revision: 14622
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=14622
Author: sigurdne
Date: 2016-01-05 08:54:38 +0000 (Tue, 05 Jan 2016)
Log Message:
-----------
formatting
Modified Paths:
--------------
branches/dev-syncromind/phpgwapi/templates/base/datatable_jquery.xsl
branches/dev-syncromind/property/help/EN/agreements.php
branches/dev-syncromind/property/help/EN/document.php
branches/dev-syncromind/property/help/EN/entities.php
branches/dev-syncromind/property/help/EN/helpdesk.php
branches/dev-syncromind/property/help/EN/invoice.php
branches/dev-syncromind/property/help/EN/location.php
branches/dev-syncromind/property/help/EN/overview.php
branches/dev-syncromind/property/help/EN/project.php
branches/dev-syncromind/property/help/EN/property.php
branches/dev-syncromind/property/help/EN/requirement.php
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/cron/default/update_workorder_status.php
branches/dev-syncromind/property/inc/custom/default/BkBygg_editer_system_oversikt.js
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/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/ticket_NLSH_pre_commit_validate.php
branches/dev-syncromind/property/inc/custom/default/ticket_NLSH_validate.js
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/ods/ods.php
branches/dev-syncromind/property/inc/soap_client/bra5/soap.php
branches/dev-syncromind/property/inc/soap_client/braarkiv/services.php
branches/dev-syncromind/property/inc/soap_client/braarkiv/soap.php
branches/dev-syncromind/property/index.php
branches/dev-syncromind/property/js/core/check.js
branches/dev-syncromind/property/js/dateformat/dateformat.js
branches/dev-syncromind/property/js/jquery/gallery.index.js
branches/dev-syncromind/property/js/jquery/jquery.colorbox.js
branches/dev-syncromind/property/js/jquery/jquery.min.js
branches/dev-syncromind/property/js/overlib/overlib.js
branches/dev-syncromind/property/js/portico/admin_entity.edit_category.js
branches/dev-syncromind/property/js/portico/agreement.edit.js
branches/dev-syncromind/property/js/portico/ajax_dimb_role_user.js
branches/dev-syncromind/property/js/portico/ajax_invoice.js
branches/dev-syncromind/property/js/portico/ajax_project_edit.js
branches/dev-syncromind/property/js/portico/ajax_workorder_edit.js
branches/dev-syncromind/property/js/portico/budget.basis.js
branches/dev-syncromind/property/js/portico/budget.index.js
branches/dev-syncromind/property/js/portico/budget.obligations.js
branches/dev-syncromind/property/js/portico/condition_survey.js
branches/dev-syncromind/property/js/portico/condition_survey_edit.js
branches/dev-syncromind/property/js/portico/custom.edit.js
branches/dev-syncromind/property/js/portico/entity.edit.js
branches/dev-syncromind/property/js/portico/entity.edit_inventory.js
branches/dev-syncromind/property/js/portico/event.index.js
branches/dev-syncromind/property/js/portico/gab.index.js
branches/dev-syncromind/property/js/portico/investment.history.js
branches/dev-syncromind/property/js/portico/investment.index.js
branches/dev-syncromind/property/js/portico/invoice.consume.js
branches/dev-syncromind/property/js/portico/invoice.index.js
branches/dev-syncromind/property/js/portico/invoice.list_sub.js
branches/dev-syncromind/property/js/portico/invoice2.index.js
branches/dev-syncromind/property/js/portico/location.edit.js
branches/dev-syncromind/property/js/portico/location.responsiblility_role.js
branches/dev-syncromind/property/js/portico/notify.js
branches/dev-syncromind/property/js/portico/pricebook.index.js
branches/dev-syncromind/property/js/portico/project.bulk_update_status.js
branches/dev-syncromind/property/js/portico/project.edit.js
branches/dev-syncromind/property/js/portico/project.index.js
branches/dev-syncromind/property/js/portico/request.edit.js
branches/dev-syncromind/property/js/portico/request.index.js
branches/dev-syncromind/property/js/portico/s_agreement.edit.js
branches/dev-syncromind/property/js/portico/tenant_claim.edit.js
branches/dev-syncromind/property/js/portico/tts.add.js
branches/dev-syncromind/property/js/portico/tts.index.js
branches/dev-syncromind/property/js/portico/tts.view.js
branches/dev-syncromind/property/js/portico/uialarm.index.js
branches/dev-syncromind/property/js/portico/wo_hour.deviation.js
branches/dev-syncromind/property/js/portico/wo_hour.index.js
branches/dev-syncromind/property/js/portico/wo_hour.prizebook.js
branches/dev-syncromind/property/js/portico/wo_hour.template.js
branches/dev-syncromind/property/js/portico/workorder.edit.js
branches/dev-syncromind/property/js/portico/workorder.index.js
branches/dev-syncromind/property/login.php
branches/dev-syncromind/property/setup/default_records.inc.php
branches/dev-syncromind/property/setup/setup.inc.php
branches/dev-syncromind/property/setup/tables_current.inc.php
branches/dev-syncromind/property/setup/tables_update.inc.php
branches/dev-syncromind/property/templates/base/abook_form.xsl
branches/dev-syncromind/property/templates/base/abook_view.xsl
branches/dev-syncromind/property/templates/base/admin.xsl
branches/dev-syncromind/property/templates/base/admin_entity.xsl
branches/dev-syncromind/property/templates/base/admin_location.xsl
branches/dev-syncromind/property/templates/base/agreement.xsl
branches/dev-syncromind/property/templates/base/alarm.xsl
branches/dev-syncromind/property/templates/base/alarm_form.xsl
branches/dev-syncromind/property/templates/base/alarm_view.xsl
branches/dev-syncromind/property/templates/base/app_data.xsl
branches/dev-syncromind/property/templates/base/app_delete.xsl
branches/dev-syncromind/property/templates/base/async.xsl
branches/dev-syncromind/property/templates/base/attrib_history.xsl
branches/dev-syncromind/property/templates/base/attributes_form.xsl
branches/dev-syncromind/property/templates/base/attributes_view.xsl
branches/dev-syncromind/property/templates/base/b_account_form.xsl
branches/dev-syncromind/property/templates/base/branch_select.xsl
branches/dev-syncromind/property/templates/base/budget.xsl
branches/dev-syncromind/property/templates/base/building_part_select.xsl
branches/dev-syncromind/property/templates/base/calendar_info.xsl
branches/dev-syncromind/property/templates/base/cat_filter.xsl
branches/dev-syncromind/property/templates/base/cat_select.xsl
branches/dev-syncromind/property/templates/base/cat_sub_select.xsl
branches/dev-syncromind/property/templates/base/chapter_filter.xsl
branches/dev-syncromind/property/templates/base/chapter_select.xsl
branches/dev-syncromind/property/templates/base/choice.xsl
branches/dev-syncromind/property/templates/base/columns.xsl
branches/dev-syncromind/property/templates/base/condition_survey.xsl
branches/dev-syncromind/property/templates/base/condition_survey_import.xsl
branches/dev-syncromind/property/templates/base/condition_survey_summation.xsl
branches/dev-syncromind/property/templates/base/config.tpl
branches/dev-syncromind/property/templates/base/confirm_custom.xsl
branches/dev-syncromind/property/templates/base/contact_form.xsl
branches/dev-syncromind/property/templates/base/contact_view.xsl
branches/dev-syncromind/property/templates/base/css/base.css
branches/dev-syncromind/property/templates/base/css/login.css
branches/dev-syncromind/property/templates/base/css/property.css
branches/dev-syncromind/property/templates/base/custom.xsl
branches/dev-syncromind/property/templates/base/date_search.xsl
branches/dev-syncromind/property/templates/base/dim_d_select.xsl
branches/dev-syncromind/property/templates/base/dimb_role_user.xsl
branches/dev-syncromind/property/templates/base/document.xsl
branches/dev-syncromind/property/templates/base/ecodimb_form.xsl
branches/dev-syncromind/property/templates/base/entity.xsl
branches/dev-syncromind/property/templates/base/event.xsl
branches/dev-syncromind/property/templates/base/event_form.xsl
branches/dev-syncromind/property/templates/base/event_view.xsl
branches/dev-syncromind/property/templates/base/fileuploader.xsl
branches/dev-syncromind/property/templates/base/filter_district.xsl
branches/dev-syncromind/property/templates/base/filter_filter.xsl
branches/dev-syncromind/property/templates/base/filter_location.xsl
branches/dev-syncromind/property/templates/base/filter_member_of.xsl
branches/dev-syncromind/property/templates/base/filter_part_of_town.xsl
branches/dev-syncromind/property/templates/base/filter_permission.xsl
branches/dev-syncromind/property/templates/base/filter_select.xsl
branches/dev-syncromind/property/templates/base/filter_submodule.xsl
branches/dev-syncromind/property/templates/base/filter_vendor.xsl
branches/dev-syncromind/property/templates/base/gab.xsl
branches/dev-syncromind/property/templates/base/generic.xsl
branches/dev-syncromind/property/templates/base/group_filter.xsl
branches/dev-syncromind/property/templates/base/group_select.xsl
branches/dev-syncromind/property/templates/base/grouping_select.xsl
branches/dev-syncromind/property/templates/base/help_data.xsl
branches/dev-syncromind/property/templates/base/hour_data_view.xsl
branches/dev-syncromind/property/templates/base/ifc.xsl
branches/dev-syncromind/property/templates/base/import.xsl
branches/dev-syncromind/property/templates/base/investment.xsl
branches/dev-syncromind/property/templates/base/invoice.xsl
branches/dev-syncromind/property/templates/base/invoice2.xsl
branches/dev-syncromind/property/templates/base/invoice_list_sub.xsl
branches/dev-syncromind/property/templates/base/invoice_reporting.xsl
branches/dev-syncromind/property/templates/base/jasper.xsl
branches/dev-syncromind/property/templates/base/location.xsl
branches/dev-syncromind/property/templates/base/location_form.xsl
branches/dev-syncromind/property/templates/base/location_form2.xsl
branches/dev-syncromind/property/templates/base/location_view.xsl
branches/dev-syncromind/property/templates/base/location_view2.xsl
branches/dev-syncromind/property/templates/base/login.tpl
branches/dev-syncromind/property/templates/base/lookup.entity.xsl
branches/dev-syncromind/property/templates/base/menu.xsl
branches/dev-syncromind/property/templates/base/migrate.xsl
branches/dev-syncromind/property/templates/base/nextmatchs.xsl
branches/dev-syncromind/property/templates/base/no_access.xsl
branches/dev-syncromind/property/templates/base/owner_filter.xsl
branches/dev-syncromind/property/templates/base/owner_select.xsl
branches/dev-syncromind/property/templates/base/preference_acl.tpl
branches/dev-syncromind/property/templates/base/preference_acl_row.tpl
branches/dev-syncromind/property/templates/base/pricebook.xsl
branches/dev-syncromind/property/templates/base/project.xsl
branches/dev-syncromind/property/templates/base/project_group_form.xsl
branches/dev-syncromind/property/templates/base/project_group_view.xsl
branches/dev-syncromind/property/templates/base/receipt.xsl
branches/dev-syncromind/property/templates/base/request.xsl
branches/dev-syncromind/property/templates/base/s_agreement.xsl
branches/dev-syncromind/property/templates/base/search_field.xsl
branches/dev-syncromind/property/templates/base/search_field_grouped.xsl
branches/dev-syncromind/property/templates/base/select_district.xsl
branches/dev-syncromind/property/templates/base/select_multi_user.xsl
branches/dev-syncromind/property/templates/base/select_part_of_town.xsl
branches/dev-syncromind/property/templates/base/select_permission.xsl
branches/dev-syncromind/property/templates/base/select_submodule.xsl
branches/dev-syncromind/property/templates/base/select_vendor.xsl
branches/dev-syncromind/property/templates/base/status_filter.xsl
branches/dev-syncromind/property/templates/base/status_select.xsl
branches/dev-syncromind/property/templates/base/table_header.xsl
branches/dev-syncromind/property/templates/base/template.xsl
branches/dev-syncromind/property/templates/base/tenant_claim.xsl
branches/dev-syncromind/property/templates/base/tenant_form.xsl
branches/dev-syncromind/property/templates/base/tenant_view.xsl
branches/dev-syncromind/property/templates/base/tolerance_select.xsl
branches/dev-syncromind/property/templates/base/tts.xsl
branches/dev-syncromind/property/templates/base/unit_select.xsl
branches/dev-syncromind/property/templates/base/user_id_filter.xsl
branches/dev-syncromind/property/templates/base/user_id_select.xsl
branches/dev-syncromind/property/templates/base/user_lid_filter.xsl
branches/dev-syncromind/property/templates/base/user_lid_select.xsl
branches/dev-syncromind/property/templates/base/values.xsl
branches/dev-syncromind/property/templates/base/vendor_form.xsl
branches/dev-syncromind/property/templates/base/wo_hour.index.xsl
branches/dev-syncromind/property/templates/base/wo_hour.xsl
branches/dev-syncromind/property/templates/base/wo_hour_cat_filter.xsl
branches/dev-syncromind/property/templates/base/wo_hour_cat_select.xsl
branches/dev-syncromind/property/templates/base/workorder.xsl
branches/dev-syncromind/property/templates/default/preference_acl.tpl
branches/dev-syncromind/property/templates/default/preference_acl_row.tpl
branches/dev-syncromind/property/templates/verdilak/app_data.xsl
branches/dev-syncromind/property/templates/verdilak/css/verdilak.css
branches/dev-syncromind/property/test_wiki.php
Modified: branches/dev-syncromind/phpgwapi/templates/base/datatable_jquery.xsl
===================================================================
--- branches/dev-syncromind/phpgwapi/templates/base/datatable_jquery.xsl
2016-01-05 08:48:25 UTC (rev 14621)
+++ branches/dev-syncromind/phpgwapi/templates/base/datatable_jquery.xsl
2016-01-05 08:54:38 UTC (rev 14622)
@@ -672,6 +672,7 @@
//delete stuff comes
here
var action =
"<xsl:value-of select="action"/>";
+
var my_name =
"<xsl:value-of select="my_name"/>";
<xsl:if
test="parameters">
var parameters
= <xsl:value-of select="parameters"/>;
@@ -684,8 +685,8 @@
}
</xsl:if>
-
// look for the word
"DELETE" in URL
-
if(substr_count(action,'delete')>0)
+
// look for the word
"DELETE" in URL and my_name
+
if(substr_count(action,'delete')>0 || substr_count(my_name,'delete')>0)
{
action +=
"&confirm=yes&phpgw_return_as=json";
execute_ajax(action, function(result){
Modified: branches/dev-syncromind/property/help/EN/agreements.php
===================================================================
--- branches/dev-syncromind/property/help/EN/agreements.php 2016-01-05
08:48:25 UTC (rev 14621)
+++ branches/dev-syncromind/property/help/EN/agreements.php 2016-01-05
08:54:38 UTC (rev 14622)
@@ -1,49 +1,46 @@
<?php
/**
- * phpGroupWare - property: a Facilities Management System.
- *
- * @author Sigurd Nes <address@hidden>
- * @copyright Copyright (C) 2003-2005 Free Software Foundation, Inc.
http://www.fsf.org/
- * @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 manual
- * @version $Id$
- */
-
-
+ * phpGroupWare - property: a Facilities Management System.
+ *
+ * @author Sigurd Nes <address@hidden>
+ * @copyright Copyright (C) 2003-2005 Free Software Foundation, Inc.
http://www.fsf.org/
+ * @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 manual
+ * @version $Id$
+ */
/**
* This is the manual entry for agreements
*/
-
$phpgw_flags = Array(
- 'currentapp' => 'manual',
- 'admin_header' => True,
+ 'currentapp' => 'manual',
+ 'admin_header' => True,
);
$phpgw_info['flags'] = $phpgw_flags;
include('../../../header.inc.php');
$appname = 'property';
?>
-<img src="<?php echo $phpgw->common->image($appname,'navbar.gif'); ?>"
border=0>
-<font face="<?php echo $phpgw_info['theme']['font']; ?>" size="2"><p/>
+<img src="<?php echo $phpgw->common->image($appname, 'navbar.gif');?>"
border=0>
+<font face="<?php echo $phpgw_info['theme']['font'];?>" size="2"><p/>
<ul>
-<li><b>Vendor agreements:</b>
+ <li><b>Vendor agreements:</b>
-<p>There is two types of vendor agreements:</p>
+ <p>There is two types of vendor agreements:</p>
-<ol>
- <li class=MsoNormal>Service agreement - which is actions to perform at
- locations or equipment </li>
- <li class=MsoNormal>Pricebook pr type of work or item to deliver. </li>
-</ol>
+ <ol>
+ <li class=MsoNormal>Service agreement - which is
actions to perform at
+ locations or equipment </li>
+ <li class=MsoNormal>Pricebook pr type of work or item
to deliver. </li>
+ </ol>
-<p>All elements in the agreements is subjet to price indexing (with history)
over the agreement period. </p>
+ <p>All elements in the agreements is subjet to price indexing
(with history) over the agreement period. </p>
-<p>The agreements supervisor is alerted by a user-configurable alarm (email
-triggered by async) when it is time to evaluate the agreement for termination
-or renewal.</p>
+ <p>The agreements supervisor is alerted by a user-configurable
alarm (email
+ triggered by async) when it is time to evaluate the
agreement for termination
+ or renewal.</p>
</ul>
</font>
-<?php $phpgw->common->phpgw_footer(); ?>
+<?php $phpgw->common->phpgw_footer();?>
Modified: branches/dev-syncromind/property/help/EN/document.php
===================================================================
--- branches/dev-syncromind/property/help/EN/document.php 2016-01-05
08:48:25 UTC (rev 14621)
+++ branches/dev-syncromind/property/help/EN/document.php 2016-01-05
08:54:38 UTC (rev 14622)
@@ -1,33 +1,31 @@
<?php
/**
- * phpGroupWare - property: a Facilities Management System.
- *
- * @author Sigurd Nes <address@hidden>
- * @copyright Copyright (C) 2003-2005 Free Software Foundation, Inc.
http://www.fsf.org/
- * @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 manual
- * @version $Id$
- */
-
+ * phpGroupWare - property: a Facilities Management System.
+ *
+ * @author Sigurd Nes <address@hidden>
+ * @copyright Copyright (C) 2003-2005 Free Software Foundation, Inc.
http://www.fsf.org/
+ * @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 manual
+ * @version $Id$
+ */
/**
* This is the manual entry for documents
*/
-
$phpgw_flags = Array(
- 'currentapp' => 'manual',
- 'admin_header' => True,
+ 'currentapp' => 'manual',
+ 'admin_header' => True,
);
$phpgw_info['flags'] = $phpgw_flags;
include('../../../header.inc.php');
$appname = 'property';
?>
-<img src="<?php echo $phpgw->common->image($appname,'navbar.gif'); ?>"
border=0>
-<font face="<?php echo $phpgw_info['theme']['font']; ?>" size="2"><p/>
+<img src="<?php echo $phpgw->common->image($appname, 'navbar.gif');?>"
border=0>
+<font face="<?php echo $phpgw_info['theme']['font'];?>" size="2"><p/>
<ul>
-<li><b>Document register/Drawing register</b><p/>
-Files is stored using vfs - linked to location or entity_category (as
elevator)<p/>
+ <li><b>Document register/Drawing register</b><p/>
+ Files is stored using vfs - linked to location or
entity_category (as elevator)<p/>
</ul></font>
-<?php $phpgw->common->phpgw_footer(); ?>
+<?php $phpgw->common->phpgw_footer();?>
Modified: branches/dev-syncromind/property/help/EN/entities.php
===================================================================
--- branches/dev-syncromind/property/help/EN/entities.php 2016-01-05
08:48:25 UTC (rev 14621)
+++ branches/dev-syncromind/property/help/EN/entities.php 2016-01-05
08:54:38 UTC (rev 14622)
@@ -1,39 +1,37 @@
<?php
/**
- * phpGroupWare - property: a Facilities Management System.
- *
- * @author Sigurd Nes <address@hidden>
- * @copyright Copyright (C) 2003-2005 Free Software Foundation, Inc.
http://www.fsf.org/
- * @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 manual
- * @version $Id$
- */
-
+ * phpGroupWare - property: a Facilities Management System.
+ *
+ * @author Sigurd Nes <address@hidden>
+ * @copyright Copyright (C) 2003-2005 Free Software Foundation, Inc.
http://www.fsf.org/
+ * @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 manual
+ * @version $Id$
+ */
/**
* This is the manual entry for entities
*/
-
$phpgw_flags = Array(
- 'currentapp' => 'manual',
- 'admin_header' => True,
+ 'currentapp' => 'manual',
+ 'admin_header' => True,
);
$phpgw_info['flags'] = $phpgw_flags;
include('../../../header.inc.php');
$appname = 'property';
?>
-<img src="<?php echo $phpgw->common->image($appname,'navbar.gif'); ?>"
border=0>
-<font face="<?php echo $phpgw_info['theme']['font']; ?>" size="2"><p/>
+<img src="<?php echo $phpgw->common->image($appname, 'navbar.gif');?>"
border=0>
+<font face="<?php echo $phpgw_info['theme']['font'];?>" size="2"><p/>
<ul>
-<li><b>Entities</b><p/>
-Also a metadatabase (separated from location to) defines entities (as
components, equipment, reports ..) which links to other entities or
locations.<p/>
+ <li><b>Entities</b><p/>
+ Also a metadatabase (separated from location to) defines
entities (as components, equipment, reports ..) which links to other entities
or locations.<p/>
-Entities are organized in class of entitity and entity_category: each
entity_category is represented by their own table.<p/>
+ Entities are organized in class of entitity and
entity_category: each entity_category is represented by their own table.<p/>
-Example: entity_1 is equipment, entity_1_1 is elevator, and entity_1_2 is fire
alarm system<p/>
+ Example: entity_1 is equipment, entity_1_1 is elevator, and
entity_1_2 is fire alarm system<p/>
-There is a set of submodules that all is controlled by ACL2 (also: each
entity_category emerge as its one submodule when defined)<p/>
+ There is a set of submodules that all is controlled by ACL2
(also: each entity_category emerge as its one submodule when defined)<p/>
</ul></font>
-<?php $phpgw->common->phpgw_footer(); ?>
+<?php $phpgw->common->phpgw_footer();?>
Modified: branches/dev-syncromind/property/help/EN/helpdesk.php
===================================================================
--- branches/dev-syncromind/property/help/EN/helpdesk.php 2016-01-05
08:48:25 UTC (rev 14621)
+++ branches/dev-syncromind/property/help/EN/helpdesk.php 2016-01-05
08:54:38 UTC (rev 14622)
@@ -1,35 +1,33 @@
<?php
/**
- * phpGroupWare - property: a Facilities Management System.
- *
- * @author Sigurd Nes <address@hidden>
- * @copyright Copyright (C) 2003-2005 Free Software Foundation, Inc.
http://www.fsf.org/
- * @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 manual
- * @version $Id$
- */
-
+ * phpGroupWare - property: a Facilities Management System.
+ *
+ * @author Sigurd Nes <address@hidden>
+ * @copyright Copyright (C) 2003-2005 Free Software Foundation, Inc.
http://www.fsf.org/
+ * @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 manual
+ * @version $Id$
+ */
/**
* This is the manual entry for helpdesk
*/
-
$phpgw_flags = Array(
- 'currentapp' => 'manual',
- 'admin_header' => True,
+ 'currentapp' => 'manual',
+ 'admin_header' => True,
);
$phpgw_info['flags'] = $phpgw_flags;
include('../../../header.inc.php');
$appname = 'property';
?>
-<img src="<?php echo $phpgw->common->image($appname,'navbar.gif'); ?>"
border=0>
-<font face="<?php echo $phpgw_info['theme']['font']; ?>" size="2"><p/>
+<img src="<?php echo $phpgw->common->image($appname, 'navbar.gif');?>"
border=0>
+<font face="<?php echo $phpgw_info['theme']['font'];?>" size="2"><p/>
<ul>
-<li><b>Helpdesk</b><p/>
-Built from tts - tickets is linked to location or entity. One can start
(several)projects and (configurabel) entities (as reports) from the ticket -
with two way links in the project(s) and the entity.<p/>
+ <li><b>Helpdesk</b><p/>
+ Built from tts - tickets is linked to location or entity. One
can start (several)projects and (configurabel) entities (as reports) from the
ticket - with two way links in the project(s) and the entity.<p/>
-A slightly modified version of ACL2 is implemented in the app property as it
is not properly implemented in api.<p/>
+ A slightly modified version of ACL2 is implemented in the app
property as it is not properly implemented in api.<p/>
</ul></font>
-<?php $phpgw->common->phpgw_footer(); ?>
+<?php $phpgw->common->phpgw_footer();?>
Modified: branches/dev-syncromind/property/help/EN/invoice.php
===================================================================
--- branches/dev-syncromind/property/help/EN/invoice.php 2016-01-05
08:48:25 UTC (rev 14621)
+++ branches/dev-syncromind/property/help/EN/invoice.php 2016-01-05
08:54:38 UTC (rev 14622)
@@ -1,37 +1,35 @@
<?php
/**
- * phpGroupWare - property: a Facilities Management System.
- *
- * @author Sigurd Nes <address@hidden>
- * @copyright Copyright (C) 2003-2005 Free Software Foundation, Inc.
http://www.fsf.org/
- * @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 manual
- * @version $Id$
- */
-
+ * phpGroupWare - property: a Facilities Management System.
+ *
+ * @author Sigurd Nes <address@hidden>
+ * @copyright Copyright (C) 2003-2005 Free Software Foundation, Inc.
http://www.fsf.org/
+ * @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 manual
+ * @version $Id$
+ */
/**
* This is the manual entry for invoice
*/
-
$phpgw_flags = Array(
- 'currentapp' => 'manual',
- 'admin_header' => True,
+ 'currentapp' => 'manual',
+ 'admin_header' => True,
);
$phpgw_info['flags'] = $phpgw_flags;
include('../../../header.inc.php');
$appname = 'property';
?>
-<img src="<?php echo $phpgw->common->image($appname,'navbar.gif'); ?>"
border=0>
-<font face="<?php echo $phpgw_info['theme']['font']; ?>" size="2"><p/>
+<img src="<?php echo $phpgw->common->image($appname, 'navbar.gif');?>"
border=0>
+<font face="<?php echo $phpgw_info['theme']['font'];?>" size="2"><p/>
<ul>
-<li><b>Electronic invoice handling</b><p/>
-Invoices is imported and handled by the system (according to users role -
controlled by ACL2) before exported to accounting system.<p/>
+ <li><b>Electronic invoice handling</b><p/>
+ Invoices is imported and handled by the system (according to
users role - controlled by ACL2) before exported to accounting system.<p/>
-The import filters currently handles cvs ,BBS and XML files (the vendors has
to agree on a template)<p/>
+ The import filters currently handles cvs ,BBS and XML files
(the vendors has to agree on a template)<p/>
-The export format is defined by a drop-in filter per target system(currently
two systems is supported).<p/>
+ The export format is defined by a drop-in filter per target
system(currently two systems is supported).<p/>
</ul></font>
-<?php $phpgw->common->phpgw_footer(); ?>
+<?php $phpgw->common->phpgw_footer();?>
Modified: branches/dev-syncromind/property/help/EN/location.php
===================================================================
--- branches/dev-syncromind/property/help/EN/location.php 2016-01-05
08:48:25 UTC (rev 14621)
+++ branches/dev-syncromind/property/help/EN/location.php 2016-01-05
08:54:38 UTC (rev 14622)
@@ -1,35 +1,33 @@
<?php
/**
- * phpGroupWare - property: a Facilities Management System.
- *
- * @author Sigurd Nes <address@hidden>
- * @copyright Copyright (C) 2003-2005 Free Software Foundation, Inc.
http://www.fsf.org/
- * @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 manual
- * @version $Id$
- */
-
+ * phpGroupWare - property: a Facilities Management System.
+ *
+ * @author Sigurd Nes <address@hidden>
+ * @copyright Copyright (C) 2003-2005 Free Software Foundation, Inc.
http://www.fsf.org/
+ * @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 manual
+ * @version $Id$
+ */
/**
* This is the manual entry for location
*/
-
$phpgw_flags = Array(
- 'currentapp' => 'manual',
- 'admin_header' => True,
+ 'currentapp' => 'manual',
+ 'admin_header' => True,
);
$phpgw_info['flags'] = $phpgw_flags;
include('../../../header.inc.php');
$appname = 'property';
?>
-<img src="<?php echo $phpgw->common->image($appname,'navbar.gif'); ?>"
border=0>
-<font face="<?php echo $phpgw_info['theme']['font']; ?>" size="2"><p/>
+<img src="<?php echo $phpgw->common->image($appname, 'navbar.gif');?>"
border=0>
+<font face="<?php echo $phpgw_info['theme']['font'];?>" size="2"><p/>
<ul>
-<li><b>Location</b><p/>
-A metadatabase keeps track of dynamic configurable location hierarchy - which
is configurable in both width and depth - that is: one can define as many
levels as one like - and each level can also have as many attributes as one
would like.<p/>
+ <li><b>Location</b><p/>
+ A metadatabase keeps track of dynamic configurable location
hierarchy - which is configurable in both width and depth - that is: one can
define as many levels as one like - and each level can also have as many
attributes as one would like.<p/>
-The location hierarchy is linked with foreign keys with - and querying a
certain level generates a query with proper join statements to the top of the
hierarchy. The sql-query is stored in a cache table for later use.<p/>
+ The location hierarchy is linked with foreign keys with - and
querying a certain level generates a query with proper join statements to the
top of the hierarchy. The sql-query is stored in a cache table for later
use.<p/>
</ul></font>
-<?php $phpgw->common->phpgw_footer(); ?>
+<?php $phpgw->common->phpgw_footer();?>
Modified: branches/dev-syncromind/property/help/EN/overview.php
===================================================================
--- branches/dev-syncromind/property/help/EN/overview.php 2016-01-05
08:48:25 UTC (rev 14621)
+++ branches/dev-syncromind/property/help/EN/overview.php 2016-01-05
08:54:38 UTC (rev 14622)
@@ -1,31 +1,29 @@
<?php
/**
- * phpGroupWare - property: a Facilities Management System.
- *
- * @author Sigurd Nes <address@hidden>
- * @copyright Copyright (C) 2003-2005 Free Software Foundation, Inc.
http://www.fsf.org/
- * @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 manual
- * @version $Id$
- */
-
+ * phpGroupWare - property: a Facilities Management System.
+ *
+ * @author Sigurd Nes <address@hidden>
+ * @copyright Copyright (C) 2003-2005 Free Software Foundation, Inc.
http://www.fsf.org/
+ * @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 manual
+ * @version $Id$
+ */
/**
* This is the manual entry for the overview
*/
-
- $GLOBALS['phpgw']->help->set_params(array('app_name' => 'property',
-
'title' => lang('property') . ' - ' . lang('overview'),
-
'controls' => array('down' => 'property.php'
-
)));
- $values = array
- (
- 'title' => lang('property') . ' - ' . lang('overview'),
- 'controls' => array('down' => 'property.php'),
- 'app_name' => 'property',
- 'intro' => 'A web-based Facilities
Management application. Integration with other applications in the phpGroupWare
suite.',
- 'text' => 'Preferences settings:<br>When you enter the
property the first time it shows on the top the message *Please set your
preferences for this application!*. This means you still have to adapt the
application for your special needs. Each applications preferences section can
be found within the preferences application. For further informations please
see the section preferences.'
+ $GLOBALS['phpgw']->help->set_params(array('app_name' => 'property',
+ 'title' => lang('property') . ' - ' . lang('overview'),
+ 'controls' => array('down' => 'property.php'
+ )));
+ $values = array
+ (
+ 'title' => lang('property') . ' - ' . lang('overview'),
+ 'controls' => array('down' => 'property.php'),
+ 'app_name' => 'property',
+ 'intro' => 'A web-based Facilities Management application.
Integration with other applications in the phpGroupWare suite.',
+ 'text' => 'Preferences settings:<br>When you enter the property
the first time it shows on the top the message *Please set your preferences for
this application!*. This means you still have to adapt the application for your
special needs. Each applications preferences section can be found within the
preferences application. For further informations please see the section
preferences.'
);
$GLOBALS['phpgw']->help->xdraw($values);
Modified: branches/dev-syncromind/property/help/EN/project.php
===================================================================
--- branches/dev-syncromind/property/help/EN/project.php 2016-01-05
08:48:25 UTC (rev 14621)
+++ branches/dev-syncromind/property/help/EN/project.php 2016-01-05
08:54:38 UTC (rev 14622)
@@ -1,39 +1,37 @@
<?php
/**
- * phpGroupWare - property: a Facilities Management System.
- *
- * @author Sigurd Nes <address@hidden>
- * @copyright Copyright (C) 2003-2005 Free Software Foundation, Inc.
http://www.fsf.org/
- * @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 manual
- * @version $Id$
- */
-
+ * phpGroupWare - property: a Facilities Management System.
+ *
+ * @author Sigurd Nes <address@hidden>
+ * @copyright Copyright (C) 2003-2005 Free Software Foundation, Inc.
http://www.fsf.org/
+ * @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 manual
+ * @version $Id$
+ */
/**
* This is the manual entry for project
*/
-
$phpgw_flags = Array(
- 'currentapp' => 'manual',
- 'admin_header' => True,
+ 'currentapp' => 'manual',
+ 'admin_header' => True,
);
$phpgw_info['flags'] = $phpgw_flags;
include('../../../header.inc.php');
$appname = 'property';
?>
-<img src="<?php echo $phpgw->common->image($appname,'navbar.gif'); ?>"
border=0>
-<font face="<?php echo $phpgw_info['theme']['font']; ?>" size="2"><p/>
+<img src="<?php echo $phpgw->common->image($appname, 'navbar.gif');?>"
border=0>
+<font face="<?php echo $phpgw_info['theme']['font'];?>" size="2"><p/>
<ul>
-<li><b>Project management:</b><p/>
-A project is a collection of orders/contracts. The project is linked to a
location or entity (e.g equipment). Projects is separated in orders/contracts
that could be subject to bidding contest amongst vendors. Each order is linked
to its parent project and to a vendor - and consists of a series of
work-descriptions to perform and / or items to deliver. An order can be defined
as simple as a brief description of simple tasks - or as a detailed complex
tender document with a full blown deviation auditing system up per record in
the contract.<p/>
+ <li><b>Project management:</b><p/>
+ A project is a collection of orders/contracts. The project is
linked to a location or entity (e.g equipment). Projects is separated in
orders/contracts that could be subject to bidding contest amongst vendors. Each
order is linked to its parent project and to a vendor - and consists of a
series of work-descriptions to perform and / or items to deliver. An order can
be defined as simple as a brief description of simple tasks - or as a detailed
complex tender document with a full blown deviation auditing system up per
record in the contract.<p/>
-When calculating an order - one can either choose elements from the prizebook,
or add custom entries.<p/>
+ When calculating an order - one can either choose elements from
the prizebook, or add custom entries.<p/>
-A typical order can be saved as a template for later re-use.<p/>
+ A typical order can be saved as a template for later re-use.<p/>
-Orders is sent by email to vendors - which in return sends the invoice (also
on email)<p/>
+ Orders is sent by email to vendors - which in return sends the
invoice (also on email)<p/>
</ul></font>
-<?php $phpgw->common->phpgw_footer(); ?>
+<?php $phpgw->common->phpgw_footer();?>
Modified: branches/dev-syncromind/property/help/EN/property.php
===================================================================
--- branches/dev-syncromind/property/help/EN/property.php 2016-01-05
08:48:25 UTC (rev 14621)
+++ branches/dev-syncromind/property/help/EN/property.php 2016-01-05
08:54:38 UTC (rev 14622)
@@ -1,40 +1,38 @@
<?php
/**
- * phpGroupWare - property: a Facilities Management System.
- *
- * @author Sigurd Nes <address@hidden>
- * @copyright Copyright (C) 2003-2005 Free Software Foundation, Inc.
http://www.fsf.org/
- * @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 manual
- * @version $Id$
- */
-
+ * phpGroupWare - property: a Facilities Management System.
+ *
+ * @author Sigurd Nes <address@hidden>
+ * @copyright Copyright (C) 2003-2005 Free Software Foundation, Inc.
http://www.fsf.org/
+ * @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 manual
+ * @version $Id$
+ */
/**
* This is the manual entry for property
*/
-
$phpgw_flags = Array(
- 'currentapp' => 'manual',
- 'admin_header' => True,
+ 'currentapp' => 'manual',
+ 'admin_header' => True,
);
$phpgw_info['flags'] = $phpgw_flags;
include('../../../header.inc.php');
$appname = 'property';
?>
-<img src="<?php echo $phpgw->common->image($appname,'navbar.gif'); ?>"
border=0>
-<font face="<?php echo $phpgw_info['theme']['font']; ?>" size="2"><p/>
+<img src="<?php echo $phpgw->common->image($appname, 'navbar.gif');?>"
border=0>
+<font face="<?php echo $phpgw_info['theme']['font'];?>" size="2"><p/>
A web-based Facilities Management application. Consist of a set of sub-modules.
<ul>
-<li><b>Location</b><br/>
-<li><b>Entities</b><br/>
-<li><b>Project management</b><br/>
-<li><b>Deviation / requirement</b><br/>
-<li><b>Electronic invoice handling </b><br/>
-<li><b>Vendor agreements</b><br/>
-<li><b>Document register/Drawing register</b><br/>
-<li><b>Helpdesk</b><br/>
+ <li><b>Location</b><br/>
+ <li><b>Entities</b><br/>
+ <li><b>Project management</b><br/>
+ <li><b>Deviation / requirement</b><br/>
+ <li><b>Electronic invoice handling </b><br/>
+ <li><b>Vendor agreements</b><br/>
+ <li><b>Document register/Drawing register</b><br/>
+ <li><b>Helpdesk</b><br/>
</ul></font>
-<?php $phpgw->common->phpgw_footer(); ?>
+<?php $phpgw->common->phpgw_footer();?>
Modified: branches/dev-syncromind/property/help/EN/requirement.php
===================================================================
--- branches/dev-syncromind/property/help/EN/requirement.php 2016-01-05
08:48:25 UTC (rev 14621)
+++ branches/dev-syncromind/property/help/EN/requirement.php 2016-01-05
08:54:38 UTC (rev 14622)
@@ -1,35 +1,33 @@
<?php
/**
- * phpGroupWare - property: a Facilities Management System.
- *
- * @author Sigurd Nes <address@hidden>
- * @copyright Copyright (C) 2003-2005 Free Software Foundation, Inc.
http://www.fsf.org/
- * @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 manual
- * @version $Id$
- */
-
+ * phpGroupWare - property: a Facilities Management System.
+ *
+ * @author Sigurd Nes <address@hidden>
+ * @copyright Copyright (C) 2003-2005 Free Software Foundation, Inc.
http://www.fsf.org/
+ * @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 manual
+ * @version $Id$
+ */
/**
* This is the manual entry for requirements
*/
-
$phpgw_flags = Array(
- 'currentapp' => 'manual',
- 'admin_header' => True,
+ 'currentapp' => 'manual',
+ 'admin_header' => True,
);
$phpgw_info['flags'] = $phpgw_flags;
include('../../../header.inc.php');
$appname = 'property';
?>
-<img src="<?php echo $phpgw->common->image($appname,'navbar.gif'); ?>"
border=0>
-<font face="<?php echo $phpgw_info['theme']['font']; ?>" size="2"><p/>
+<img src="<?php echo $phpgw->common->image($appname, 'navbar.gif');?>"
border=0>
+<font face="<?php echo $phpgw_info['theme']['font'];?>" size="2"><p/>
<ul>
-<li><b>Deviation / requirement</b><p/>
-Maintenance need that can wait is recorded in the deviation submodule - and
categorized within six themes by scores within severity, probability and
consequence.<p/>
+ <li><b>Deviation / requirement</b><p/>
+ Maintenance need that can wait is recorded in the deviation
submodule - and categorized within six themes by scores within severity,
probability and consequence.<p/>
-These themes (safety, aesthetics, etc) is subject to weighting to produce a
overall score to help prioritizing among requirements<p/>
+ These themes (safety, aesthetics, etc) is subject to weighting
to produce a overall score to help prioritizing among requirements<p/>
</ul></font>
-<?php $phpgw->common->phpgw_footer(); ?>
+<?php $phpgw->common->phpgw_footer();?>
Modified: branches/dev-syncromind/property/help/index.php
===================================================================
--- branches/dev-syncromind/property/help/index.php 2016-01-05 08:48:25 UTC
(rev 14621)
+++ branches/dev-syncromind/property/help/index.php 2016-01-05 08:54:38 UTC
(rev 14622)
@@ -11,12 +11,12 @@
/* $Id$ */
- $phpgw_flags = array(
+ $phpgw_flags = array(
'currentapp' => 'manual'
);
$phpgw_info['flags'] = $phpgw_flags;
include('../../header.inc.php');
- $appname = 'property';
+ $appname = 'property';
include(PHPGW_SERVER_ROOT . '/' . $appname . '/setup/setup.inc.php');
?>
<img src="<?php echo $phpgw->common->image($appname, 'navbar.gif');?>"
border="0"><p/>
Modified: branches/dev-syncromind/property/inc/class.XmlToArray.inc.php
===================================================================
--- branches/dev-syncromind/property/inc/class.XmlToArray.inc.php
2016-01-05 08:48:25 UTC (rev 14621)
+++ branches/dev-syncromind/property/inc/class.XmlToArray.inc.php
2016-01-05 08:54:38 UTC (rev 14622)
@@ -365,8 +365,8 @@
function _logError($function, $msg)
{
list($usec, $sec) = explode(" ", microtime());
- $time =
((float)$usec + (float)$sec) - $this->_error_start_timer;
- $this->_error_trace[] = array($function, $msg,
$time);
+ $time = ((float)$usec + (float)$sec) -
$this->_error_start_timer;
+ $this->_error_trace[] = array($function, $msg, $time);
}
/**
@@ -378,7 +378,7 @@
{
if(count($this->_error_trace) == 0)
return NULL;
- $s = '';
+ $s = '';
$len = count($this->_error_trace) - 1;
for($i = $len; $i > -1; $i--)
{
@@ -432,8 +432,8 @@
*/
function parse($data)
{
- $data = trim($data);
- $err = false;
+ $data = trim($data);
+ $err = false;
if($data == '')
{
@@ -449,10 +449,10 @@
}
}
- $parser = xml_parser_create($this->_encoding);
+ $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;
+ xml_parse_into_struct($parser, $data, $vals, $index) or
$err = true;
if($err)
{
@@ -463,17 +463,17 @@
}
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']))
{
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));
+ $tree[$tagname][]['@'] =
$vals[$i]['attributes'];
+ $index = count($tree[$tagname]) - 1;
+ $tree[$tagname][$index] =
array_merge($tree[$tagname][$index], $this->_getChildren($vals, $i));
}
else
{
@@ -487,8 +487,8 @@
if(!$this->_includesRoot)
{
- $keys = array_keys($tree);
- $tree = $tree[$keys[0]][0];
+ $keys = array_keys($tree);
+ $tree = $tree[$keys[0]][0];
}
return $tree;
}
@@ -533,8 +533,8 @@
{
if($this->get_attributes)
{
-
$children[$tagname][]['@'] = $vals[$i]['attributes'];
- $index
= count($children[$tagname]) - 1;
+
$children[$tagname][]['@'] = $vals[$i]['attributes'];
+ $index
= count($children[$tagname]) - 1;
}
if(isset($vals[$i]['value']))
@@ -572,10 +572,10 @@
{
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
{
@@ -605,15 +605,15 @@
if(ord($Str[$i]) < 0x80)
continue;# 0bbbbbbb
elseif((ord($Str[$i]) & 0xE0) == 0xC0)
- $n = 1;# 110bbbbb
+ $n = 1;# 110bbbbb
elseif((ord($Str[$i]) & 0xF0) == 0xE0)
- $n = 2;# 1110bbbb
+ $n = 2;# 1110bbbb
elseif((ord($Str[$i]) & 0xF8) == 0xF0)
- $n = 3;# 11110bbb
+ $n = 3;# 11110bbb
elseif((ord($Str[$i]) & 0xFC) == 0xF8)
- $n = 4;# 111110bb
+ $n = 4;# 111110bb
elseif((ord($Str[$i]) & 0xFE) == 0xFC)
- $n = 5;# 1111110b
+ $n = 5;# 1111110b
else
return false;# Does not match any model
for($j = 0; $j < $n; $j++) # n bytes matching
10bbbbbb follow ?
Modified: branches/dev-syncromind/property/inc/class.boXport.inc.php
===================================================================
--- branches/dev-syncromind/property/inc/class.boXport.inc.php 2016-01-05
08:48:25 UTC (rev 14621)
+++ branches/dev-syncromind/property/inc/class.boXport.inc.php 2016-01-05
08:54:38 UTC (rev 14622)
@@ -36,9 +36,9 @@
var $public_functions = array
(
- 'import' => true,
- 'export' => true,
- 'export_cron' => true
+ 'import' => true,
+ 'export' => true,
+ 'export_cron' => true
);
var $start;
var $query;
@@ -46,7 +46,7 @@
var $order;
var $filter;
var $cat_id;
- var $use_session = false;
+ var $use_session = false;
function __construct($session = false)
{
@@ -61,12 +61,12 @@
$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');
+ $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');
if($start || $start == 0)
{
@@ -98,10 +98,10 @@
{
$data = array
(
- 'start' => $this->start,
- 'query' => $this->query,
- 'sort' => $this->sort,
- 'order' => $this->order,
+ 'start' => $this->start,
+ 'query' => $this->query,
+ 'sort' => $this->sort,
+ 'order' => $this->order,
'filter' => $this->filter,
'cat_id' => $this->cat_id
);
@@ -118,20 +118,20 @@
{
$data =
$GLOBALS['phpgw']->session->appsession('session_data', 'export');
- $this->start = $data['start'];
- $this->query = $data['query'];
- $this->sort = $data['sort'];
- $this->order = $data['order'];
- $this->filter = $data['filter'];
- $this->cat_id = $data['cat_id'];
+ $this->start = $data['start'];
+ $this->query = $data['query'];
+ $this->sort = $data['sort'];
+ $this->order = $data['order'];
+ $this->filter = $data['filter'];
+ $this->cat_id = $data['cat_id'];
}
function select_import_conv($selected = '')
{
- $dir_handle = @opendir(PHPGW_SERVER_ROOT .
"/property/inc/import/{$GLOBALS['phpgw_info']['user']['domain']}");
- $i = 0;
+ $dir_handle = @opendir(PHPGW_SERVER_ROOT .
"/property/inc/import/{$GLOBALS['phpgw_info']['user']['domain']}");
+ $i = 0;
$myfilearray = array();
- while($file = readdir($dir_handle))
+ while($file = readdir($dir_handle))
{
if((substr($file, 0, 1) != '.') &&
is_file(PHPGW_SERVER_ROOT .
"/property/inc/import/{$GLOBALS['phpgw_info']['user']['domain']}/{$file}"))
{
@@ -144,8 +144,8 @@
for($i = 0; $i < count($myfilearray); $i++)
{
- $fname = preg_replace('/_/', ' ',
$myfilearray[$i]);
- $sel_file = '';
+ $fname = preg_replace('/_/', ' ',
$myfilearray[$i]);
+ $sel_file = '';
if($myfilearray[$i] == $selected)
{
$sel_file = 'selected';
@@ -153,9 +153,9 @@
$conv_list[] = array
(
- 'id' => $myfilearray[$i],
- 'name' => $fname,
- 'selected' => $sel_file
+ 'id' => $myfilearray[$i],
+ 'name' => $fname,
+ 'selected' => $sel_file
);
}
@@ -172,10 +172,10 @@
function select_export_conv($selected = '')
{
- $dir_handle = @opendir(PHPGW_SERVER_ROOT .
"/property/inc/export/{$GLOBALS['phpgw_info']['user']['domain']}");
- $i = 0;
+ $dir_handle = @opendir(PHPGW_SERVER_ROOT .
"/property/inc/export/{$GLOBALS['phpgw_info']['user']['domain']}");
+ $i = 0;
$myfilearray = array();
- while($file = readdir($dir_handle))
+ while($file = readdir($dir_handle))
{
if((substr($file, 0, 1) != '.') &&
is_file(PHPGW_SERVER_ROOT .
"/property/inc/export/{$GLOBALS['phpgw_info']['user']['domain']}/{$file}"))
{
@@ -188,8 +188,8 @@
for($i = 0; $i < count($myfilearray); $i++)
{
- $fname = preg_replace('/_/', ' ',
$myfilearray[$i]);
- $sel_file = '';
+ $fname = preg_replace('/_/', ' ',
$myfilearray[$i]);
+ $sel_file = '';
if($myfilearray[$i] == $selected)
{
$sel_file = 'selected';
@@ -197,9 +197,9 @@
$conv_list[] = array
(
- 'id' => $myfilearray[$i],
- 'name' => $fname,
- 'selected' => $sel_file
+ 'id' => $myfilearray[$i],
+ 'name' => $fname,
+ 'selected' => $sel_file
);
}
@@ -218,10 +218,10 @@
{
$file_catalog =
$this->config->config_data['export']['path'];
- $dir_handle = @opendir($file_catalog);
- $i = 0;
+ $dir_handle = @opendir($file_catalog);
+ $i = 0;
$myfilearray = '';
- while($file = readdir($dir_handle))
+ while($file = readdir($dir_handle))
{
if((substr($file, 0, 1) != '.') &&
is_file("{$file_catalog}/{$file}"))
{
@@ -234,8 +234,8 @@
for($i = 0; $i < count($myfilearray); $i++)
{
- $fname = preg_replace('/_/', ' ',
$myfilearray[$i]);
- $sel_file = '';
+ $fname = preg_replace('/_/', ' ',
$myfilearray[$i]);
+ $sel_file = '';
if($myfilearray[$i] == $selected)
{
$sel_file = 'selected';
@@ -243,9 +243,9 @@
$rollback_list[] = array
(
- 'id' => $myfilearray[$i],
- 'name' => $fname,
- 'selected' => $sel_file
+ 'id' => $myfilearray[$i],
+ 'name' => $fname,
+ 'selected' => $sel_file
);
}
@@ -268,10 +268,10 @@
$buffer = $invoice->import($invoice_common, $download);
if($download)
{
- $header = $invoice->header;
- $import = $invoice->import;
- $buffer = array(
- 'table' => $buffer,
+ $header = $invoice->header;
+ $import = $invoice->import;
+ $buffer = array(
+ 'table' => $buffer,
'header' => $header,
'import' => $import
);
@@ -281,10 +281,10 @@
function export($data)
{
- $conv_type = $data['conv_type'];
- $download = $data['download'];
- $pre_transfer = $data['pre_transfer'];
- $force_period_year = $data['force_period_year'];
+ $conv_type = $data['conv_type'];
+ $download = $data['download'];
+ $pre_transfer = $data['pre_transfer'];
+ $force_period_year = $data['force_period_year'];
include(PHPGW_SERVER_ROOT .
"/property/inc/export/{$GLOBALS['phpgw_info']['user']['domain']}/{$conv_type}");
$invoice = new export_conv;
@@ -298,7 +298,7 @@
{
include (PHPGW_SERVER_ROOT .
"/property/inc/export/{$GLOBALS['phpgw_info']['user']['domain']}/{$conv_type}");
$invoice = new export_conv;
- $buffer = $invoice->RullTilbake($role_back_date,
$rollback_file, $rollback_voucher, $voucher_id_intern);
+ $buffer = $invoice->RullTilbake($role_back_date,
$rollback_file, $rollback_voucher, $voucher_id_intern);
return $buffer;
}
@@ -306,8 +306,8 @@
{
if(!$data)
{
- $data =
unserialize(urldecode(phpgw::get_var('data')));
- $data = phpgw::clean_value($data);
+ $data =
unserialize(urldecode(phpgw::get_var('data')));
+ $data = phpgw::clean_value($data);
}
_debug_array($data);
$receipt = $this->export($data);
Modified: branches/dev-syncromind/property/inc/class.boadmin.inc.php
===================================================================
--- branches/dev-syncromind/property/inc/class.boadmin.inc.php 2016-01-05
08:48:25 UTC (rev 14621)
+++ branches/dev-syncromind/property/inc/class.boadmin.inc.php 2016-01-05
08:54:38 UTC (rev 14622)
@@ -44,11 +44,11 @@
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)
{
@@ -56,18 +56,18 @@
$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',
'string');
- $permission = phpgw::get_var('permission');
+ $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', 'string');
+ $permission = phpgw::get_var('permission');
// $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'));
+ $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)
{
@@ -119,14 +119,14 @@
{
$data =
$GLOBALS['phpgw']->session->appsession('session_data', 'fm_admin');
- $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->location = $data['location'];
- $this->granting_group = $data['granting_group'];
+ $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->location = $data['location'];
+ $this->granting_group = $data['granting_group'];
}
function save_sessiondata($data)
@@ -149,10 +149,10 @@
break;
}
- $categories[0]['id'] = 'groups';
- $categories[0]['name'] = lang('Groups');
- $categories[1]['id'] = 'accounts';
- $categories[1]['name'] = lang('Users');
+ $categories[0]['id'] = 'groups';
+ $categories[0]['name'] = lang('Groups');
+ $categories[1]['id'] = 'accounts';
+ $categories[1]['name'] = lang('Users');
return $this->bocommon->select_list($selected,
$categories);
}
@@ -180,8 +180,8 @@
$user_checked = array();
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');
+ $user_checked[] = $user_id;
+ $this->acl->set_account_id($user_id, true,
$this->acl_app, $this->location, $account_type = 'accounts');
$this->acl->delete($this->acl_app,
$this->location, $grantor, $type);
$this->acl->add($this->acl_app,
$this->location, $rights, $grantor, $type);
$this->acl->save_repository($this->acl_app,
$this->location);
@@ -248,9 +248,9 @@
$this->set_permission2($values['right'], $process,
$grantor, 0);
$this->set_permission2($values['mask'], $process,
$grantor, 1);
- $cleared =
$this->bocommon->reset_fm_cache_userlist();
- $receipt['message'][] = array('msg' =>
lang('permissions are updated!'));
- $receipt['message'][] = array('msg' => lang('%1
userlists cleared from cache', $cleared));
+ $cleared = $this->bocommon->reset_fm_cache_userlist();
+ $receipt['message'][] = array('msg' =>
lang('permissions are updated!'));
+ $receipt['message'][] = array('msg' => lang('%1
userlists cleared from cache', $cleared));
phpgwapi_cache::user_clear('phpgwapi', 'menu', -1);
return $receipt;
}
@@ -259,16 +259,16 @@
{
if($type == 'groups')
{
- $check_account_type = array('accounts');
- $acl_account_type = 'accounts';
- $valid_users =
$GLOBALS['phpgw']->acl->get_ids_for_location('run', phpgwapi_acl::READ,
'property');
+ $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');
- $acl_account_type = 'both';
- $_valid_users =
$GLOBALS['phpgw']->acl->get_user_list_right(phpgwapi_acl::READ, 'run',
$this->acl_app);
- $valid_users = array();
+ $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)
{
$valid_users[] = $_user['account_id'];
@@ -312,12 +312,12 @@
reset($allusers);
$this->total_records = count($allusers);
- $length =
$GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'];
+ $length =
$GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'];
if($this->allrows)
{
$this->start = 0;
- $length = $this->total_records;
+ $length = $this->total_records;
}
$allusers = array_slice($allusers, $this->start,
$length, true);
@@ -328,10 +328,10 @@
$j = 0;
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;
+ $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')
{
Modified: branches/dev-syncromind/property/inc/class.boadmin_entity.inc.php
===================================================================
--- branches/dev-syncromind/property/inc/class.boadmin_entity.inc.php
2016-01-05 08:48:25 UTC (rev 14621)
+++ branches/dev-syncromind/property/inc/class.boadmin_entity.inc.php
2016-01-05 08:54:38 UTC (rev 14622)
@@ -80,20 +80,20 @@
protected $custom;
var $public_functions = array
(
- 'read' => true,
- 'read_single' => true,
- 'save' => true,
- 'delete' => true,
- 'check_perms' => true,
- 'get_category_list' => true,
- 'get_attrib_list' => true
+ 'read' => true,
+ 'read_single' => true,
+ 'save' => true,
+ 'delete' => true,
+ 'check_perms' => true,
+ 'get_category_list' => true,
+ 'get_attrib_list' => true
);
var $type_app;
function __construct($session = false)
{
- $this->bocommon = CreateObject('property.bocommon');
- $this->custom =
createObject('property.custom_fields');
+ $this->bocommon = CreateObject('property.bocommon');
+ $this->custom = createObject('property.custom_fields');
if($session)
{
@@ -101,26 +101,26 @@
$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');
- $type = phpgw::get_var('type');
- $cat_id = phpgw::get_var('cat_id', 'int');
- $allrows = phpgw::get_var('allrows', 'bool');
- $entity_id = phpgw::get_var('entity_id', 'int');
+ $start = phpgw::get_var('start', 'int', 'REQUEST', 0);
+ $query = phpgw::get_var('query');
+ $sort = phpgw::get_var('sort');
+ $order = phpgw::get_var('order');
+ $type = phpgw::get_var('type');
+ $cat_id = phpgw::get_var('cat_id', 'int');
+ $allrows = phpgw::get_var('allrows', 'bool');
+ $entity_id = phpgw::get_var('entity_id', 'int');
- $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->type = isset($type) && $type &&
isset($this->type_app[$type]) ? $type : 'entity';
- $this->cat_id = isset($cat_id) && $cat_id ? $cat_id
: '';
+ $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->type = isset($type) && $type &&
isset($this->type_app[$type]) ? $type : 'entity';
+ $this->cat_id = isset($cat_id) && $cat_id ? $cat_id :
'';
$this->entity_id = isset($entity_id) && $entity_id ?
$entity_id : '';
- $this->allrows = phpgw::get_var('allrows', 'bool');
- $this->so =
CreateObject('property.soadmin_entity', '', '', $this->bocommon);
- $this->so->type = $this->type;
- $this->type_app = $this->so->get_type_app();
+ $this->allrows = phpgw::get_var('allrows', 'bool');
+ $this->so = CreateObject('property.soadmin_entity', '',
'', $this->bocommon);
+ $this->so->type = $this->type;
+ $this->type_app = $this->so->get_type_app();
}
function save_sessiondata($data)
@@ -135,26 +135,26 @@
{
$data =
$GLOBALS['phpgw']->session->appsession('session_data', 'standard_e');
- $this->start = isset($data['start']) ?
$data['start'] : '';
- $this->query = isset($data['query']) ?
$data['query'] : '';
- $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->start = isset($data['start']) ? $data['start'] :
'';
+ $this->query = isset($data['query']) ? $data['query'] :
'';
+ $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->entity_id = isset($data['entity_id']) ?
$data['entity_id'] : '';
- $this->allrows = isset($data['allrows']) ?
$data['allrows'] : '';
+ $this->allrows = isset($data['allrows']) ?
$data['allrows'] : '';
}
function get_location_level_list($selected = '')
{
- $soadmin_location =
CreateObject('property.soadmin_location');
- $location_types =
$soadmin_location->select_location_type();
- $max_location_type = count($location_types);
+ $soadmin_location =
CreateObject('property.soadmin_location');
+ $location_types =
$soadmin_location->select_location_type();
+ $max_location_type = count($location_types);
for($i = 1; $i <= $max_location_type; $i++)
{
- $location[$i]['id'] = $i;
- $location[$i]['name'] = $i . '-' .
$location_types[($i - 1)]['name'];
+ $location[$i]['id'] = $i;
+ $location[$i]['name'] = $i . '-' .
$location_types[($i - 1)]['name'];
}
return $this->bocommon->select_list($selected,
$location);
@@ -168,26 +168,26 @@
function get_entity_list_2($selected = '')
{
- $list[0]['id'] = 'project';
+ $list[0]['id'] = 'project';
$list[0]['name'] = 'project';
- $list[1]['id'] = 'ticket';
+ $list[1]['id'] = 'ticket';
$list[1]['name'] = 'ticket';
- $list[2]['id'] = 'document';
+ $list[2]['id'] = 'document';
$list[2]['name'] = 'document';
- $list[3]['id'] = 'request';
+ $list[3]['id'] = 'request';
$list[3]['name'] = 'request';
- $list[4]['id'] = 'investment';
+ $list[4]['id'] = 'investment';
$list[4]['name'] = 'investment';
- $list[5]['id'] = 's_agreement';
+ $list[5]['id'] = 's_agreement';
$list[5]['name'] = 'service agreement';
return $this->bocommon->select_multi_list($selected,
$list);
}
function get_entity_list_3($selected = '')
{
- $list[0]['id'] = 'ticket';
+ $list[0]['id'] = 'ticket';
$list[0]['name'] = 'ticket';
- $list[1]['id'] = 'request';
+ $list[1]['id'] = 'request';
$list[1]['name'] = 'request';
return $this->bocommon->select_multi_list($selected,
$list);
}
@@ -202,7 +202,7 @@
# 'order'=> $this->order,
# 'allrows'=> $this->allrows
# ));
- $entity =
$this->so->read($data);
+ $entity = $this->so->read($data);
$this->total_records = $this->so->total_records;
return $entity;
}
@@ -219,7 +219,7 @@
'entity_id' => $entity_id
));
*/
- $category =
$this->so->read_category($data);
+ $category = $this->so->read_category($data);
$this->total_records = $this->so->total_records;
return $category;
@@ -236,8 +236,8 @@
*/
public function get_attrib_list()
{
- $entity_id = phpgw::get_var('entity_id');
- $cat_id = phpgw::get_var('cat_id');
+ $entity_id = phpgw::get_var('entity_id');
+ $cat_id = phpgw::get_var('cat_id');
return $this->custom->find('property',
".entity.{$entity_id}.{$cat_id}", 0, '', '', '', true, true);
}
@@ -286,10 +286,10 @@
{
$values2 = array
(
- 'entity_id'
=> $values['entity_id'],
- 'cat_id'
=> $receipt['id'],
- 'category_template' =>
$values['category_template'],
- 'selected'
=> $values['template_attrib']
+ 'entity_id' =>
$values['entity_id'],
+ 'cat_id' => $receipt['id'],
+ 'category_template' =>
$values['category_template'],
+ 'selected' =>
$values['template_attrib']
);
$this->_add_attrib_from_template($values2);
@@ -300,28 +300,28 @@
protected function _add_attrib_from_template($values)
{
- $template_info = explode('_',
$values['category_template']);
- $template_entity_id = $template_info[0];
- $template_cat_id = $template_info[1];
+ $template_info = explode('_',
$values['category_template']);
+ $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)
{
$group = array
(
- 'appname' =>
$this->type_app[$this->type],
- 'location' =>
".{$this->type}.{$values['entity_id']}.{$values['cat_id']}",
+ 'appname' =>
$this->type_app[$this->type],
+ 'location' =>
".{$this->type}.{$values['entity_id']}.{$values['cat_id']}",
'group_name' => $attrib_group['name'],
- 'descr' =>
$attrib_group['descr'],
- 'remark' =>
$attrib_group['remark']
+ 'descr' => $attrib_group['descr'],
+ 'remark' => $attrib_group['remark']
);
$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)
@@ -334,8 +334,8 @@
foreach($template_attribs as $attrib)
{
- $attrib['appname'] =
$this->type_app[$this->type];
- $attrib['location'] =
".{$this->type}.{$values['entity_id']}.{$values['cat_id']}";
+ $attrib['appname'] =
$this->type_app[$this->type];
+ $attrib['location'] =
".{$this->type}.{$values['entity_id']}.{$values['cat_id']}";
$choices = array();
if(isset($attrib['choice']) &&
$attrib['choice'])
@@ -349,8 +349,8 @@
{
foreach($choices as $choice)
{
- $attrib['new_choice'] =
$choice['value'];
- $attrib['id']
= $id;
+ $attrib['new_choice'] =
$choice['value'];
+ $attrib['id'] = $id;
$this->custom->edit($attrib);
}
}
@@ -386,8 +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)
{
@@ -401,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'];
@@ -421,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;
}
@@ -448,9 +448,9 @@
public function save_attrib_group($group, $action = '')
{
- $receipt = array();
- $group['appname'] = $this->type_app[$this->type];
- $group['location'] =
".{$this->type}.{$group['entity_id']}.{$group['cat_id']}";
+ $receipt = array();
+ $group['appname'] = $this->type_app[$this->type];
+ $group['location'] =
".{$this->type}.{$group['entity_id']}.{$group['cat_id']}";
if($action == 'edit' && $group['id'])
{
if($this->custom->edit_group($group))
@@ -472,30 +472,30 @@
}
else if($id == -1)
{
- $receipt['id'] = 0;
- $receipt['error'][] = array('msg'
=> lang('group already exists, please choose another name'));
- $receipt['error'][] = array('msg'
=> lang('Attribute group has NOT been saved'));
+ $receipt['id'] = 0;
+ $receipt['error'][] = array('msg' =>
lang('group already exists, please choose another name'));
+ $receipt['error'][] = array('msg' =>
lang('Attribute group has NOT been saved'));
return $receipt;
}
- $receipt['id'] = $id;
- $receipt['message'][] = array('msg' =>
lang('group has been created'));
+ $receipt['id'] = $id;
+ $receipt['message'][] = array('msg' =>
lang('group has been created'));
return $receipt;
}
}
public function save_attrib($attrib, $action = '')
{
- $receipt = array();
- $attrib['appname'] = $this->type_app[$this->type];
- $attrib['location'] =
".{$this->type}.{$attrib['entity_id']}.{$attrib['cat_id']}";
- $attrib_table =
$GLOBALS['phpgw']->locations->get_attrib_table($attrib['appname'],
$attrib['location']);
+ $receipt = array();
+ $attrib['appname'] = $this->type_app[$this->type];
+ $attrib['location'] =
".{$this->type}.{$attrib['entity_id']}.{$attrib['cat_id']}";
+ $attrib_table =
$GLOBALS['phpgw']->locations->get_attrib_table($attrib['appname'],
$attrib['location']);
if($action == 'edit' && $attrib['id'])
{
if($this->custom->edit($attrib))
{
- $receipt
= $this->custom->receipt;
- $receipt['message'][] = array('msg'
=> lang('Field has been updated'));
+ $receipt = $this->custom->receipt;
+ $receipt['message'][] = array('msg' =>
lang('Field has been updated'));
return $receipt;
}
$receipt['error'][] = array('msg' =>
lang('Unable to update field'));
@@ -511,14 +511,14 @@
}
else if($id == -1)
{
- $receipt['id'] = 0;
- $receipt['error'][] = array('msg'
=> lang('field already exists, please choose another name'));
- $receipt['error'][] = array('msg'
=> lang('Attribute has NOT been saved'));
+ $receipt['id'] = 0;
+ $receipt['error'][] = array('msg' =>
lang('field already exists, please choose another name'));
+ $receipt['error'][] = array('msg' =>
lang('Attribute has NOT been saved'));
return $receipt;
}
- $receipt['id'] = $id;
- $receipt['message'][] = array('msg' =>
lang('Custom field has been created'));
+ $receipt['id'] = $id;
+ $receipt['message'][] = array('msg' =>
lang('Custom field has been created'));
return $receipt;
}
}
@@ -554,8 +554,8 @@
function save_custom_function($custom_function, $action = '')
{
- $receipt =
array();
- $custom_function['appname'] =
$this->type_app[$this->type];
+ $receipt = array();
+ $custom_function['appname'] =
$this->type_app[$this->type];
if(!$custom_function['location'] &&
$custom_function['entity_id'] && $custom_function['cat_id'])
{
$custom_function['location'] =
".{$this->type}.{$custom_function['entity_id']}.{$custom_function['cat_id']}";
Modified: branches/dev-syncromind/property/inc/class.boadmin_location.inc.php
===================================================================
--- branches/dev-syncromind/property/inc/class.boadmin_location.inc.php
2016-01-05 08:48:25 UTC (rev 14621)
+++ branches/dev-syncromind/property/inc/class.boadmin_location.inc.php
2016-01-05 08:54:38 UTC (rev 14622)
@@ -46,18 +46,18 @@
protected $custom;
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)
{
- $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)
{
@@ -65,17 +65,17 @@
$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');
+ $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->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
: '';
}
function save_sessiondata($data)
@@ -92,7 +92,7 @@
$this->start = $data['start'];
$this->query = $data['query'];
- $this->sort = $data['sort'];
+ $this->sort = $data['sort'];
$this->order = $data['order'];
}
@@ -100,15 +100,15 @@
{
# $data = array()
#array('start' => $this->start, 'query' =>
$this->query, 'sort' => $this->sort, 'order' => $this->order)
- $standard =
$this->so->read($data);
+ $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;
@@ -146,7 +146,7 @@
}
else if($type_id && $id && $attrib)
{
- $ok = 0;
+ $ok = 0;
$receipt = array();
if($this->custom->delete('property',
".location.{$type_id}", $id, "fm_location{$type_id}_history", true))
@@ -183,8 +183,8 @@
function get_attrib_group_list($type_id, $selected)
{
- $location = ".location.{$type_id}";
- $group_list = $this->read_attrib_group($location,
true);
+ $location = ".location.{$type_id}";
+ $group_list = $this->read_attrib_group($location, true);
foreach($group_list as &$group)
{
@@ -216,9 +216,9 @@
function resort_attrib_group($data)
{
- $resort = isset($data['resort']) ? $data['resort'] :
'up';
+ $resort = isset($data['resort']) ? $data['resort'] :
'up';
$type_id = isset($data['type_id']) ? $data['type_id'] :
'';
- $id = (isset($data['id']) ? $data['id'] :
'');
+ $id = (isset($data['id']) ? $data['id'] : '');
if(!$type_id || !$id)
{
@@ -255,8 +255,8 @@
{
return array
(
- 'id' => 0,
- 'error' => array
+ 'id' => 0,
+ 'error' => array
(
array('msg' =>
lang('group already exists, please choose another name')),
array('msg' =>
lang('Attribute group has NOT been saved'))
@@ -266,8 +266,8 @@
return array
(
- 'id' => $id,
- 'msg' => array('msg' => lang('group
has been created'))
+ 'id' => $id,
+ 'msg' => array('msg' => lang('group has
been created'))
);
}
}
@@ -279,7 +279,7 @@
$data['allrows'] = true;
}
- $attrib = $this->custom->find(
+ $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;
@@ -308,9 +308,9 @@
function resort_attrib($data = array())
{
- $resort = isset($data['resort']) ? $data['resort'] :
'up';
+ $resort = isset($data['resort']) ? $data['resort'] :
'up';
$type_id = isset($data['type_id']) ? $data['type_id'] :
'';
- $id = (isset($data['id']) ? $data['id'] :
'');
+ $id = (isset($data['id']) ? $data['id'] : '');
if(!$type_id || !$id)
{
@@ -322,10 +322,10 @@
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';
+ $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'])
{
@@ -352,8 +352,8 @@
{
return array
(
- 'id' => 0,
- 'error' => array
+ 'id' => 0,
+ 'error' => array
(
array('msg' =>
lang('field already exists, please choose another name')),
array('msg' =>
lang('Attribute has NOT been saved'))
@@ -363,8 +363,8 @@
return array
(
- 'id' => $id,
- 'msg' => array('msg' => lang('Custom
field has been created'))
+ 'id' => $id,
+ 'msg' => array('msg' => lang('Custom
field has been created'))
);
}
}
@@ -382,9 +382,9 @@
function select_nullable($selected = '')
{
- $nullable[0]['id'] = 'true';
+ $nullable[0]['id'] = 'true';
$nullable[0]['name'] = lang('true');
- $nullable[1]['id'] = 'false';
+ $nullable[1]['id'] = 'false';
$nullable[1]['name'] = lang('false');
return $this->bocommon->select_list($selected,
$nullable);
Modified: branches/dev-syncromind/property/inc/class.boagreement.inc.php
===================================================================
--- branches/dev-syncromind/property/inc/class.boagreement.inc.php
2016-01-05 08:48:25 UTC (rev 14621)
+++ branches/dev-syncromind/property/inc/class.boagreement.inc.php
2016-01-05 08:54:38 UTC (rev 14622)
@@ -49,18 +49,18 @@
protected $custom;
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)
{
- $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)
{
@@ -68,29 +68,29 @@
$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->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->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->cat_id = isset($_REQUEST['cat_id']) ? $cat_id :
$this->cat_id;
if(!empty($filter))
{
@@ -117,12 +117,12 @@
// _debug_array($data);die();
- $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'];
$this->vendor_id = $data['vendor_id'];
$this->member_id = $data['member_id'];
$this->status_id = $data['status_id'];
@@ -145,7 +145,7 @@
break;
}
- $input_list = $this->so->select_vendor_list();
+ $input_list = $this->so->select_vendor_list();
$vendor_list = $this->bocommon->select_list($selected,
$input_list);
return $vendor_list;
@@ -160,7 +160,7 @@
$agreements = $this->so->read($data);
$this->total_records = $this->so->total_records;
- $this->uicols = $this->so->uicols;
+ $this->uicols = $this->so->uicols;
foreach($agreements as &$agreement)
{
@@ -185,20 +185,20 @@
{
if(!empty($params))
{
- $sort = $params['sort'];
- $order = $params['order'];
+ $sort = $params['sort'];
+ $order = $params['order'];
}
else
{
- $sort = $this->sort;
- $order = $this->order;
+ $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));
+ $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;
@@ -208,7 +208,7 @@
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;
@@ -223,10 +223,10 @@
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;
}
@@ -247,19 +247,19 @@
$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);
+ $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);
}
- $vfs =
CreateObject('phpgwapi.vfs');
- $vfs->override_acl = 1;
+ $vfs = CreateObject('phpgwapi.vfs');
+ $vfs->override_acl = 1;
$values['files'] = $vfs->ls(array(
- 'string' =>
"/property/agreement/{$data['agreement_id']}",
- 'relatives' => array(RELATIVE_NONE)));
+ 'string' =>
"/property/agreement/{$data['agreement_id']}",
+ 'relatives' => array(RELATIVE_NONE)));
$vfs->override_acl = 0;
@@ -297,9 +297,9 @@
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))
{
@@ -324,9 +324,9 @@
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['total_cost'] = $values['m_cost'] +
$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)
{
@@ -370,7 +370,7 @@
$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"
+ $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);
@@ -391,8 +391,8 @@
function read_group_activity($group_id = '', $agreement_id = '')
{
- $activity_list =
$this->so->read_group_activity($group_id, $agreement_id);
- $this->uicols = $this->so->uicols;
+ $activity_list =
$this->so->read_group_activity($group_id, $agreement_id);
+ $this->uicols = $this->so->uicols;
return $activity_list;
}
Modified: branches/dev-syncromind/property/inc/class.boalarm.inc.php
===================================================================
--- branches/dev-syncromind/property/inc/class.boalarm.inc.php 2016-01-05
08:48:25 UTC (rev 14621)
+++ branches/dev-syncromind/property/inc/class.boalarm.inc.php 2016-01-05
08:54:38 UTC (rev 14622)
@@ -44,23 +44,23 @@
{
$GLOBALS['phpgw']->asyncservice =
CreateObject('phpgwapi.asyncservice');
}
- $this->async = & $GLOBALS['phpgw']->asyncservice;
- $this->so =
CreateObject('property.soalarm');
- $this->bocommon = CreateObject('property.bocommon');
+ $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)
{
@@ -113,19 +113,19 @@
{
$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->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 = '')
{
- $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;
}
@@ -138,7 +138,7 @@
{
// $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);
+ $jobs = $this->so->read($data);
$this->total_records = $this->so->total_records;
return $jobs;
}
@@ -157,11 +157,11 @@
{
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;
}
@@ -182,10 +182,10 @@
return false;
}
- $alarm = $jobs[$id]['data']; // text,
enabled
- $alarm['id'] = $id;
- $alarm['time'] = $jobs[$id]['next'];
- $alarm['times'] = $jobs[$id]['times'];
+ $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";
@@ -205,8 +205,8 @@
$enabled = 0;
foreach($alarms as $id)
{
- $temp = explode(':', $id);
- $alarm_type = $temp[0];
+ $temp = explode(':', $id);
+ $alarm_type = $temp[0];
if(!($alarm = $this->read_alarm($alarm_type,
$id)))
{
@@ -267,8 +267,8 @@
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;
@@ -317,16 +317,16 @@
}
$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;
@@ -382,16 +382,16 @@
{
// 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'])
{
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();
@@ -413,8 +413,8 @@
$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
@@ -435,9 +435,9 @@
// 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;
+ $i = 0;
for($i = 0; $i < count($members); $i++)
{
if($members[$i]['account_id'])
@@ -449,8 +449,8 @@
}
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']);
}
}
}
@@ -466,8 +466,8 @@
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
{
@@ -477,18 +477,18 @@
// $rc=1;
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;
}
Modified: branches/dev-syncromind/property/inc/class.boasync.inc.php
===================================================================
--- branches/dev-syncromind/property/inc/class.boasync.inc.php 2016-01-05
08:48:25 UTC (rev 14621)
+++ branches/dev-syncromind/property/inc/class.boasync.inc.php 2016-01-05
08:54:38 UTC (rev 14622)
@@ -43,17 +43,17 @@
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)
{
- $this->so =
CreateObject('property.soasync');
- $this->socommon = CreateObject('property.socommon');
+ $this->so = CreateObject('property.soasync');
+ $this->socommon = CreateObject('property.socommon');
if($session)
{
@@ -61,19 +61,19 @@
$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');
+ $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)
@@ -88,12 +88,12 @@
{
$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())
Modified: branches/dev-syncromind/property/inc/class.bobudget.inc.php
===================================================================
--- branches/dev-syncromind/property/inc/class.bobudget.inc.php 2016-01-05
08:48:25 UTC (rev 14621)
+++ branches/dev-syncromind/property/inc/class.bobudget.inc.php 2016-01-05
08:54:38 UTC (rev 14622)
@@ -46,26 +46,26 @@
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)
{
- $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)
{
@@ -73,52 +73,52 @@
$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');
+ $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');
+ $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');
+ $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->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->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->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 = '';
}
}
@@ -134,13 +134,14 @@
{
$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->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'] : '';
}
@@ -158,31 +159,31 @@
$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;
+ $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;
@@ -196,18 +197,18 @@
$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
)
);
@@ -225,32 +226,32 @@
$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;
}
@@ -277,8 +278,8 @@
{
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
@@ -294,8 +295,8 @@
{
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
@@ -375,15 +376,15 @@
{
$year_list = array(array('id' => date('Y'),
'name' => date('Y')));
}
- $k = date('Y') - $year_list[0]['id'] + 5;
- $j = count($year_list);
+ $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;
@@ -393,10 +394,10 @@
{
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
{
Modified: branches/dev-syncromind/property/inc/class.bocommon.inc.php
===================================================================
--- branches/dev-syncromind/property/inc/class.bocommon.inc.php 2016-01-05
08:48:25 UTC (rev 14621)
+++ branches/dev-syncromind/property/inc/class.bocommon.inc.php 2016-01-05
08:54:38 UTC (rev 14622)
@@ -48,15 +48,15 @@
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))
{
@@ -64,9 +64,9 @@
}
$this->async = &$GLOBALS['phpgw']->asyncservice;
- $this->join = $this->socommon->join;
+ $this->join = $this->socommon->join;
$this->left_join = $this->socommon->left_join;
- $this->like = $this->socommon->like;
+ $this->like = $this->socommon->like;
$this->xsl_rootdir = PHPGW_SERVER_ROOT .
"/property/templates/{$GLOBALS['phpgw_info']['server']['template_set']}";
}
@@ -93,7 +93,7 @@
function msgbox_data($receipt)
{
- $msgbox_data_error = array();
+ $msgbox_data_error = array();
$msgbox_data_message = array();
if(isSet($receipt['error']) AND
is_array($receipt['error']))
{
@@ -138,7 +138,7 @@
{
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))
@@ -199,8 +199,8 @@
{
$all_users[] = array
(
- 'account_id' =>
$extra_user,
- 'account_firstname' =>
lang($extra_user)
+ 'account_id' => $extra_user,
+ 'account_firstname' =>
lang($extra_user)
);
}
}
@@ -218,8 +218,8 @@
{
$all_users[] = array
(
- 'user_id' =>
$user->id,
- 'name' =>
$user->__toString(),
+ 'user_id' => $user->id,
+ 'name' =>
$user->__toString(),
);
}
}
@@ -234,17 +234,17 @@
{
$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'],
);
}
}
@@ -281,9 +281,9 @@
$user_list[] = array
(
- 'id' => $user->id,
- 'name' =>
$user->firstname,
- 'selected' => $sel_user
+ 'id' => $user->id,
+ 'name' => $user->firstname,
+ 'selected' => $sel_user
);
}
}
@@ -319,9 +319,9 @@
{
$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' => ''
);
}
}
@@ -345,8 +345,8 @@
$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)
{
@@ -362,7 +362,7 @@
foreach($users as $key => $row)
{
- $account_lastname[$key] =
$row['account_lastname'];
+ $account_lastname[$key] =
$row['account_lastname'];
$account_firstname[$key] =
$row['account_firstname'];
}
@@ -381,8 +381,8 @@
$users = array_merge($users_extra, $users);
}
- $user_list = array();
- $selected_found = false;
+ $user_list = array();
+ $selected_found = false;
foreach($users as $user)
{
@@ -390,19 +390,19 @@
{
$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'],
);
}
@@ -414,8 +414,8 @@
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);
@@ -427,12 +427,12 @@
$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'
);
}
@@ -443,13 +443,13 @@
{
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)
@@ -473,8 +473,8 @@
{
$users_extra[] = array
(
- 'account_id' =>
$extra_user,
- 'account_firstname' =>
lang($extra_user)
+ 'account_id' => $extra_user,
+ 'account_firstname' =>
lang($extra_user)
);
}
}
@@ -499,12 +499,12 @@
$selected_found = false;
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)
@@ -517,9 +517,9 @@
{
$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
);
}
@@ -539,7 +539,7 @@
$GLOBALS['phpgw']->xslttpl->add_file(array('vendor_form'), $this->xsl_rootdir);
}
- $vendor['value_vendor_id'] = $data['vendor_id'];
+ $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'])
@@ -547,8 +547,8 @@
$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);
if(is_array($vendor_data))
@@ -565,11 +565,11 @@
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;
}
@@ -593,20 +593,20 @@
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(
+ $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'];
+ $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',
+ $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_contact'] = lang('contact');
$contact['lang_select_contact_help'] = lang('click this
link to select');
//_debug_array($contact);
return $contact;
@@ -623,19 +623,19 @@
$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'));
+ $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');
}
@@ -644,9 +644,9 @@
$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);
@@ -687,16 +687,16 @@
$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'] : '',
+ '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');
+ $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');
@@ -708,12 +708,12 @@
{
$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;
}
@@ -735,18 +735,18 @@
$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(
+ $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['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 =
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_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;
@@ -770,17 +770,17 @@
$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['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['lang_ecodimb'] = lang('dimb');
if($data['ecodimb'] && (!isset($data['ecodimb_descr'])
|| !$data['ecodimb_descr']))
{
- $ecodimb_object
= CreateObject('property.sogeneric');
+ $ecodimb_object =
CreateObject('property.sogeneric');
$ecodimb_object->get_location_info('dimb',
false);
- $ecodimb_data
= $ecodimb_object->read_single(array('id' => $data['ecodimb']));
- $ecodimb['value_ecodimb_descr'] =
$ecodimb_data['descr'];
+ $ecodimb_data =
$ecodimb_object->read_single(array('id' => $data['ecodimb']));
+ $ecodimb['value_ecodimb_descr'] =
$ecodimb_data['descr'];
}
$ecodimb['disabled'] = isset($data['disabled']) &&
$data['disabled'] ? true : false;
$ecodimb['required'] = isset($data['required']) &&
$data['required'] ? true : false;
@@ -790,8 +790,8 @@
function initiate_event_lookup($data)
{
- $event = array();
- $event['name'] = $data['name']; // attribute
name
+ $event = array();
+ $event['name'] = $data['name']; // attribute name
$event['event_name'] = $data['event_name']; // Human
readable description
if(isset($data['type']) && $data['type'] == 'view')
{
@@ -822,30 +822,30 @@
if(isset($data['event_id']) && $data['event_id'])
{
- $event['value'] =
$data['event_id'];
- $event_info =
execMethod('property.soevent.read_single', $data['event_id']);
- $event['descr'] =
$event_info['descr'];
- $event['enabled'] =
$event_info['enabled'] ? lang('yes') : lang('no');
- $event['lang_enabled'] = lang('enabled');
+ $event['value'] = $data['event_id'];
+ $event_info =
execMethod('property.soevent.read_single', $data['event_id']);
+ $event['descr'] = $event_info['descr'];
+ $event['enabled'] = $event_info['enabled'] ?
lang('yes') : lang('no');
+ $event['lang_enabled'] = lang('enabled');
- $job_id =
"property{$data['location']}::{$data['item_id']}::{$data['name']}";
- $job =
execMethod('phpgwapi.asyncservice.read', $job_id);
+ $job_id =
"property{$data['location']}::{$data['item_id']}::{$data['name']}";
+ $job = execMethod('phpgwapi.asyncservice.read',
$job_id);
- $event['next'] =
$GLOBALS['phpgw']->common->show_date($job[$job_id]['next'], $dateformat);
- $event['lang_next_run'] = lang('next run');
+ $event['next'] =
$GLOBALS['phpgw']->common->show_date($job[$job_id]['next'], $dateformat);
+ $event['lang_next_run'] = lang('next run');
$criteria = array
(
- 'start_date' =>
$event_info['start_date'],
- 'end_date' =>
$event_info['end_date'],
- 'location_id' =>
$event_info['location_id'],
- 'location_item_id' =>
$event_info['location_item_id']
+ 'start_date' =>
$event_info['start_date'],
+ 'end_date' => $event_info['end_date'],
+ 'location_id' =>
$event_info['location_id'],
+ 'location_item_id' =>
$event_info['location_item_id']
);
- $event['count'] = 0;
- $boevent =
CreateObject('property.boevent');
+ $event['count'] = 0;
+ $boevent = CreateObject('property.boevent');
$boevent->find_scedules($criteria);
- $schedules =
$boevent->cached_events;
+ $schedules = $boevent->cached_events;
//_debug_array($schedules);die();
foreach($schedules as $day => $set)
{
@@ -860,16 +860,16 @@
}
if($event['responsible_id'])
{
- $c =
CreateObject('phpgwapi.contacts');
+ $c = CreateObject('phpgwapi.contacts');
$qfields = array
(
- 'contact_id' =>
'contact_id',
- 'per_full_name' =>
'per_full_name',
+ 'contact_id' => 'contact_id',
+ 'per_full_name' =>
'per_full_name',
);
- $criteria
= array('contact_id' => $event['responsible_id']);
- $contacts
= $c->get_persons($qfields, 15, 0, '', '', $criteria);
- $event['responsible'] =
$contacts[0]['per_full_name'];
+ $criteria = array('contact_id' =>
$event['responsible_id']);
+ $contacts = $c->get_persons($qfields,
15, 0, '', '', $criteria);
+ $event['responsible'] =
$contacts[0]['per_full_name'];
}
unset($event_info);
@@ -880,10 +880,10 @@
$event['event_link'] =
$GLOBALS['phpgw']->link('/index.php', array
(
'menuaction' => 'property.uievent.edit',
- 'location' => $data['location'],
- 'attrib_id' => $event['name'],
- 'item_id' => isset($event['item_id']) ?
$event['item_id'] : '',
- 'id' => isset($event['value']) &&
$event['value'] ? $event['value'] : '')
+ 'location' => $data['location'],
+ 'attrib_id' => $event['name'],
+ 'item_id' => isset($event['item_id']) ?
$event['item_id'] : '',
+ 'id' => isset($event['value']) &&
$event['value'] ? $event['value'] : '')
);
$event['event_link'] =
"{menuaction:'property.uievent.edit',lookup:1,"
@@ -913,11 +913,11 @@
$alarm['header'][] = array
(
- 'lang_time' => lang('Time'),
- 'lang_text' => lang('Text'),
- 'lang_user' => lang('User'),
- 'lang_enabled' => lang('Enabled'),
- 'lang_select' => lang('Select')
+ 'lang_time' => lang('Time'),
+ 'lang_text' => lang('Text'),
+ 'lang_user' => lang('User'),
+ 'lang_enabled' => lang('Enabled'),
+ 'lang_select' => lang('Select')
);
$alarm['values'] =
$boalarm->read_alarms($data['alarm_type'], $data['id'], $data['text']);
@@ -930,40 +930,40 @@
{
$alarm['alter_alarm'][] = array
(
- 'lang_enable' => lang('Enable'),
- 'lang_disable' => lang('Disable'),
- 'lang_delete' => lang('Delete')
+ 'lang_enable' => lang('Enable'),
+ 'lang_disable' => lang('Disable'),
+ 'lang_delete' => lang('Delete')
);
for($i = 1; $i <= 31; $i++)
{
$alarm['add_alarm']['day_list'][($i -
1)]['id'] = $i;
}
- $alarm['add_alarm']['lang_day']
= lang('Day');
- $alarm['add_alarm']['lang_day_statustext']
= lang('Day');
+ $alarm['add_alarm']['lang_day'] = lang('Day');
+ $alarm['add_alarm']['lang_day_statustext'] =
lang('Day');
for($i = 1; $i <= 24; $i++)
{
$alarm['add_alarm']['hour_list'][($i -
1)]['id'] = $i;
}
- $alarm['add_alarm']['lang_hour']
= lang('Hour');
- $alarm['add_alarm']['lang_hour_statustext']
= lang('Hour');
+ $alarm['add_alarm']['lang_hour'] = lang('Hour');
+ $alarm['add_alarm']['lang_hour_statustext'] =
lang('Hour');
for($i = 1; $i <= 60; $i++)
{
$alarm['add_alarm']['minute_list'][($i
- 1)]['id'] = $i;
}
- $alarm['add_alarm']['lang_minute']
= lang('Minutes before the event');
- $alarm['add_alarm']['lang_minute_statustext']
= lang('Minutes before the event');
+ $alarm['add_alarm']['lang_minute'] =
lang('Minutes before the event');
+ $alarm['add_alarm']['lang_minute_statustext'] =
lang('Minutes before the event');
- $alarm['add_alarm']['user_list'] =
$this->get_user_list_right2('select', 4, false, $data['acl_location'], false,
$default = $this->account);
+ $alarm['add_alarm']['user_list'] =
$this->get_user_list_right2('select', 4, false, $data['acl_location'], false,
$default = $this->account);
- $alarm['add_alarm']['lang_user']
= lang('User');
- $alarm['add_alarm']['lang_user_statustext']
= lang('Select the user the alarm belongs to.');
- $alarm['add_alarm']['lang_no_user']
= lang('No user');
- $alarm['add_alarm']['lang_add']
= lang('Add');
- $alarm['add_alarm']['lang_add_alarm']
= lang('Add alarm');
- $alarm['add_alarm']['lang_add_statustext']
= lang('Add alarm for selected user');
+ $alarm['add_alarm']['lang_user'] = lang('User');
+ $alarm['add_alarm']['lang_user_statustext'] =
lang('Select the user the alarm belongs to.');
+ $alarm['add_alarm']['lang_no_user'] = lang('No
user');
+ $alarm['add_alarm']['lang_add'] = lang('Add');
+ $alarm['add_alarm']['lang_add_alarm'] =
lang('Add alarm');
+ $alarm['add_alarm']['lang_add_statustext'] =
lang('Add alarm for selected user');
}
//_debug_array($alarm['values']);
@@ -995,21 +995,21 @@
function translate_datatype($datatype)
{
$datatype_text = array(
- 'V' => 'Varchar',
- 'I' => 'Integer',
- 'C' => 'char',
- 'N' => 'Float',
- 'D' => 'Date',
- 'T' => 'Memo',
- 'R' => 'Muliple radio',
- 'CH' => 'Muliple checkbox',
- 'LB' => 'Listbox',
- 'AB' => 'Contact',
+ 'V' => 'Varchar',
+ 'I' => 'Integer',
+ 'C' => 'char',
+ 'N' => 'Float',
+ 'D' => 'Date',
+ 'T' => 'Memo',
+ 'R' => 'Muliple radio',
+ 'CH' => 'Muliple checkbox',
+ 'LB' => 'Listbox',
+ 'AB' => 'Contact',
'VENDOR' => 'Vendor',
- 'email' => 'Email',
- 'link' => 'Link',
- 'pwd' => 'Password',
- 'user' => 'phpgw user'
+ 'email' => 'Email',
+ 'link' => 'Link',
+ 'pwd' => 'Password',
+ 'user' => 'phpgw user'
);
$datatype = lang($datatype_text[$datatype]);
@@ -1020,21 +1020,21 @@
function translate_datatype_insert($datatype)
{
$datatype_text = array(
- 'V' => 'varchar',
- 'I' => 'int',
- 'C' => 'char',
- 'N' => 'decimal',
- 'D' => 'timestamp',
- 'T' => 'text',
- 'R' => 'int',
- 'CH' => 'text',
- 'LB' => 'int',
- 'AB' => 'int',
+ 'V' => 'varchar',
+ 'I' => 'int',
+ 'C' => 'char',
+ 'N' => 'decimal',
+ 'D' => 'timestamp',
+ 'T' => 'text',
+ 'R' => 'int',
+ 'CH' => 'text',
+ 'LB' => 'int',
+ 'AB' => 'int',
'VENDOR' => 'int',
- 'email' => 'varchar',
- 'link' => 'varchar',
- 'pwd' => 'varchar',
- 'user' => 'int'
+ 'email' => 'varchar',
+ 'link' => 'varchar',
+ 'pwd' => 'varchar',
+ 'user' => 'int'
);
return $datatype_text[$datatype];
@@ -1043,15 +1043,15 @@
function translate_datatype_precision($datatype)
{
$datatype_precision = array(
- 'I' => 4,
- 'R' => 4,
- 'LB' => 4,
- 'AB' => 4,
+ 'I' => 4,
+ 'R' => 4,
+ 'LB' => 4,
+ 'AB' => 4,
'VENDOR' => 4,
- 'email' => 64,
- 'link' => 255,
- 'pwd' => 32,
- 'user' => 4
+ 'email' => 64,
+ 'link' => 255,
+ 'pwd' => 32,
+ 'user' => 4
);
return (isset($datatype_precision[$datatype]) ?
$datatype_precision[$datatype] : '');
@@ -1067,21 +1067,21 @@
function translate_datatype_format($datatype)
{
$datatype_text = array(
- 'V' => 'varchar',
- 'I' => 'integer',
- 'C' => 'char',
- 'N' => 'float',
- 'D' => 'date',
- 'T' => 'memo',
- 'R' => 'radio',
- 'CH' => 'checkbox',
- 'LB' => 'listbox',
- 'AB' => 'contact',
+ 'V' => 'varchar',
+ 'I' => 'integer',
+ 'C' => 'char',
+ 'N' => 'float',
+ 'D' => 'date',
+ 'T' => 'memo',
+ 'R' => 'radio',
+ 'CH' => 'checkbox',
+ 'LB' => 'listbox',
+ 'AB' => 'contact',
'VENDOR' => 'vendor',
- 'email' => 'email',
- 'link' => 'link',
- 'pwd' => 'password',
- 'user' => 'phpgw_user'
+ 'email' => 'email',
+ 'link' => 'link',
+ 'pwd' => 'password',
+ 'user' => 'phpgw_user'
);
@@ -1106,15 +1106,15 @@
}
if(strlen($num) == 4)
- $return = $num;
+ $return = $num;
if(strlen($num) == 3)
- $return = "0$num";
+ $return = "0$num";
if(strlen($num) == 2)
- $return = "00$num";
+ $return = "00$num";
if(strlen($num) == 1)
- $return = "000$num";
+ $return = "000$num";
if(strlen($num) == 0)
- $return = "0001";
+ $return = "0001";
return strtoupper($return);
}
@@ -1143,20 +1143,20 @@
{
//_debug_array($data);
- $cols = isset($data['cols'])
? $data['cols'] : '';
- $entity_table = isset($data['entity_table'])
? $data['entity_table'] : '';
- $location_table =
isset($data['location_table']) ? $data['location_table'] : '';
- $cols_return = isset($data['cols_return'])
&& $data['cols_return'] ? $data['cols_return'] : array();
- $uicols =
isset($data['uicols']) && $data['uicols'] ? $data['uicols'] : array();
- $joinmethod =
isset($data['joinmethod']) ? $data['joinmethod'] : '';
- $paranthesis = isset($data['paranthesis'])
? $data['paranthesis'] : '';
- $lookup =
isset($data['lookup']) ? $data['lookup'] : '';
- $location_level =
isset($data['location_level']) && $data['location_level'] > 0 ?
(int)$data['location_level'] : 0;
- $no_address =
isset($data['no_address']) ? $data['no_address'] : '';
- $uicol_address =
isset($data['uicol_address']) ? $data['uicol_address'] : '';
- $force_location =
isset($data['force_location']) ? $data['force_location'] : '';
- $cols_extra = array();
- $cols_return_lookup = array();
+ $cols = isset($data['cols']) ? $data['cols'] : '';
+ $entity_table = isset($data['entity_table']) ?
$data['entity_table'] : '';
+ $location_table = isset($data['location_table']) ?
$data['location_table'] : '';
+ $cols_return = isset($data['cols_return']) &&
$data['cols_return'] ? $data['cols_return'] : array();
+ $uicols = isset($data['uicols']) && $data['uicols'] ?
$data['uicols'] : array();
+ $joinmethod = isset($data['joinmethod']) ?
$data['joinmethod'] : '';
+ $paranthesis = isset($data['paranthesis']) ?
$data['paranthesis'] : '';
+ $lookup = isset($data['lookup']) ? $data['lookup'] : '';
+ $location_level = isset($data['location_level']) &&
$data['location_level'] > 0 ? (int)$data['location_level'] : 0;
+ $no_address = isset($data['no_address']) ?
$data['no_address'] : '';
+ $uicol_address = isset($data['uicol_address']) ?
$data['uicol_address'] : '';
+ $force_location = isset($data['force_location']) ?
$data['force_location'] : '';
+ $cols_extra = array();
+ $cols_return_lookup = array();
$GLOBALS['phpgw']->config->read();
@@ -1177,9 +1177,9 @@
}
}
- $soadmin_location =
CreateObject('property.soadmin_location');
- $location_types =
$soadmin_location->select_location_type();
- $config =
$soadmin_location->read_config('');
+ $soadmin_location =
CreateObject('property.soadmin_location');
+ $location_types =
$soadmin_location->select_location_type();
+ $config = $soadmin_location->read_config('');
if($location_level || $force_location)
{
@@ -1202,13 +1202,13 @@
}
else
{
- $type_id = 0;//count($location_types);
- $no_address = true;
+ $type_id = 0;//count($location_types);
+ $no_address = true;
}
- $this->type_id = $type_id;
- $_level = 1;
+ $this->type_id = $type_id;
+ $_level = 1;
for($i = 0; $i < $type_id; $i++)
{
if($_level > 1) // very expensive
@@ -1236,17 +1236,17 @@
{
if($_level)
{
- $i
= $_level - 1;
- $uicols['input_type'][] = 'text';
- $uicols['name'][] =
'loc' . $location_types[$i]['id'];
- $uicols['descr'][] =
$location_types[$i]['name'];
- $uicols['statustext'][] =
$location_types[$i]['descr'];
- $uicols['exchange'][] = false;
- $uicols['align'][] = '';
- $uicols['datatype'][] = '';
- $uicols['formatter'][] = '';
- $uicols['classname'][] = '';
- $uicols['sortable'][] = $_level ===
1;
+ $i = $_level - 1;
+ $uicols['input_type'][] = 'text';
+ $uicols['name'][] = 'loc' .
$location_types[$i]['id'];
+ $uicols['descr'][] =
$location_types[$i]['name'];
+ $uicols['statustext'][] =
$location_types[$i]['descr'];
+ $uicols['exchange'][] = false;
+ $uicols['align'][] = '';
+ $uicols['datatype'][] = '';
+ $uicols['formatter'][] = '';
+ $uicols['classname'][] = '';
+ $uicols['sortable'][] = $_level === 1;
}
}
@@ -1260,24 +1260,24 @@
$cols_return[] = 'loc' .
$location_types[$i]['id'];
}
- $location_relation_data = array();
- $custom =
createObject('property.custom_fields');
+ $location_relation_data = array();
+ $custom = createObject('property.custom_fields');
for($i = 1; $i < ($type_id + 1); $i++)
{
$cols.= ",loc{$i}_name";
- $cols_return[] =
"loc{$i}_name";
- $cols_extra[] =
"loc{$i}_name";
- $cols_return_lookup[] = "loc{$i}_name";
- $uicols['input_type'][] = in_array($i,
$list_location_level) ? 'text' : 'hidden';
- $uicols['name'][] =
"loc{$i}_name";
- $uicols['descr'][] =
$location_types[($i - 1)]['name'];
- $uicols['statustext'][] = $location_types[$i -
1]['descr'];
- $uicols['exchange'][] = $lookup;
- $uicols['align'][] = '';
- $uicols['datatype'][] = '';
- $uicols['formatter'][] = '';
- $uicols['classname'][] = '';
- $uicols['sortable'][] = $i == 1;
+ $cols_return[] = "loc{$i}_name";
+ $cols_extra[] = "loc{$i}_name";
+ $cols_return_lookup[] = "loc{$i}_name";
+ $uicols['input_type'][] = in_array($i,
$list_location_level) ? 'text' : 'hidden';
+ $uicols['name'][] = "loc{$i}_name";
+ $uicols['descr'][] = $location_types[($i -
1)]['name'];
+ $uicols['statustext'][] = $location_types[$i -
1]['descr'];
+ $uicols['exchange'][] = $lookup;
+ $uicols['align'][] = '';
+ $uicols['datatype'][] = '';
+ $uicols['formatter'][] = '';
+ $uicols['classname'][] = '';
+ $uicols['sortable'][] = $i == 1;
$fm_location_cols_temp =
$custom->find('property', '.location.' . $i, 0, '', '', '', true);
foreach($fm_location_cols_temp as $entry)
@@ -1286,11 +1286,11 @@
{
$location_relation_data[] =
array
(
- 'level'
=> $i,
- 'name'
=> $entry['name'],
- 'descr'
=> $entry['input_text'],
- 'status_text' =>
$entry['status_text'],
- 'datatype'
=> $entry['datatype'],
+ 'level' => $i,
+ 'name' =>
$entry['name'],
+ 'descr' =>
$entry['input_text'],
+ 'status_text' =>
$entry['status_text'],
+ 'datatype' =>
$entry['datatype'],
);
}
}
@@ -1301,17 +1301,17 @@
if(!$no_address)
{
$cols.= ",$entity_table.address";
- $cols_return[] = 'address';
- $uicols['input_type'][] = 'text';
- $uicols['name'][] = 'address';
- $uicols['descr'][] =
lang('address');
- $uicols['statustext'][] = lang('address');
- $uicols['exchange'][] = false;
- $uicols['align'][] = '';
- $uicols['datatype'][] = '';
- $uicols['formatter'][] = '';
- $uicols['classname'][] = '';
- $uicols['sortable'][] = true;
+ $cols_return[] = 'address';
+ $uicols['input_type'][] = 'text';
+ $uicols['name'][] = 'address';
+ $uicols['descr'][] = lang('address');
+ $uicols['statustext'][] = lang('address');
+ $uicols['exchange'][] = false;
+ $uicols['align'][] = '';
+ $uicols['datatype'][] = '';
+ $uicols['formatter'][] = '';
+ $uicols['classname'][] = '';
+ $uicols['sortable'][] = true;
}
$config_count = count($config);
@@ -1324,62 +1324,62 @@
if($config[$i]['column_name'] ==
'street_id')
{
- $cols_return[]
= 'street_name';
- $uicols['input_type'][] =
'hidden';
- $uicols['name'][]
= 'street_name';
- $uicols['descr'][]
= lang('street name');
- $uicols['statustext'][] =
lang('street name');
- $uicols['exchange'][] =
false;
- $uicols['align'][]
= '';
- $uicols['datatype'][] = '';
- $uicols['formatter'][] = '';
- $uicols['classname'][] = '';
- $uicols['sortable'][] = true;
+ $cols_return[] = 'street_name';
+ $uicols['input_type'][] =
'hidden';
+ $uicols['name'][] =
'street_name';
+ $uicols['descr'][] =
lang('street name');
+ $uicols['statustext'][] =
lang('street name');
+ $uicols['exchange'][] = false;
+ $uicols['align'][] = '';
+ $uicols['datatype'][] = '';
+ $uicols['formatter'][] = '';
+ $uicols['classname'][] = '';
+ $uicols['sortable'][] = true;
- $cols_return[]
= 'street_number';
- $uicols['input_type'][] =
'hidden';
- $uicols['name'][]
= 'street_number';
- $uicols['descr'][]
= lang('street number');
- $uicols['statustext'][] =
lang('street number');
- $uicols['exchange'][] =
false;
- $uicols['align'][]
= '';
- $uicols['datatype'][] = '';
- $uicols['formatter'][] = '';
- $uicols['classname'][] = '';
- $uicols['sortable'][] = '';
+ $cols_return[] =
'street_number';
+ $uicols['input_type'][] =
'hidden';
+ $uicols['name'][] =
'street_number';
+ $uicols['descr'][] =
lang('street number');
+ $uicols['statustext'][] =
lang('street number');
+ $uicols['exchange'][] = false;
+ $uicols['align'][] = '';
+ $uicols['datatype'][] = '';
+ $uicols['formatter'][] = '';
+ $uicols['classname'][] = '';
+ $uicols['sortable'][] = '';
- $cols_return[]
= $config[$i]['column_name'];
- $uicols['input_type'][] =
'hidden';
- $uicols['name'][]
= $config[$i]['column_name'];
- $uicols['descr'][]
= lang($config[$i]['input_text']);
- $uicols['statustext'][] =
lang($config[$i]['input_text']);
- $uicols['exchange'][] =
false;
- $uicols['align'][]
= '';
- $uicols['datatype'][] = '';
- $uicols['formatter'][] = '';
- $uicols['classname'][] = '';
- $uicols['sortable'][] = '';
+ $cols_return[] =
$config[$i]['column_name'];
+ $uicols['input_type'][] =
'hidden';
+ $uicols['name'][] =
$config[$i]['column_name'];
+ $uicols['descr'][] =
lang($config[$i]['input_text']);
+ $uicols['statustext'][] =
lang($config[$i]['input_text']);
+ $uicols['exchange'][] = false;
+ $uicols['align'][] = '';
+ $uicols['datatype'][] = '';
+ $uicols['formatter'][] = '';
+ $uicols['classname'][] = '';
+ $uicols['sortable'][] = '';
if($lookup)
{
- $cols_extra[] =
'street_name';
- $cols_extra[] =
'street_number';
- $cols_extra[] =
$config[$i]['column_name'];
+ $cols_extra[] =
'street_name';
+ $cols_extra[] =
'street_number';
+ $cols_extra[] =
$config[$i]['column_name'];
}
}
else
{
- $cols_return[]
= $config[$i]['column_name'];
- $uicols['input_type'][] =
'text';
- $uicols['name'][]
= $config[$i]['column_name'];
- $uicols['descr'][]
= $config[$i]['input_text'];
- $uicols['statustext'][] =
$config[$i]['input_text'];
- $uicols['exchange'][] =
false;
- $uicols['align'][]
= '';
- $uicols['datatype'][] = '';
- $uicols['formatter'][] = '';
- $uicols['classname'][] = '';
- $uicols['sortable'][] = '';
+ $cols_return[] =
$config[$i]['column_name'];
+ $uicols['input_type'][] =
'text';
+ $uicols['name'][] =
$config[$i]['column_name'];
+ $uicols['descr'][] =
$config[$i]['input_text'];
+ $uicols['statustext'][] =
$config[$i]['input_text'];
+ $uicols['exchange'][] = false;
+ $uicols['align'][] = '';
+ $uicols['datatype'][] = '';
+ $uicols['formatter'][] = '';
+ $uicols['classname'][] = '';
+ $uicols['sortable'][] = '';
if($lookup)
{
@@ -1389,10 +1389,10 @@
}
}
- $this->uicols = $uicols;
- $this->cols_return = $cols_return;
- $this->cols_extra = $cols_extra;
- $this->cols_return_lookup = $cols_return_lookup;
+ $this->uicols = $uicols;
+ $this->cols_return = $cols_return;
+ $this->cols_extra = $cols_extra;
+ $this->cols_return_lookup = $cols_return_lookup;
$from = " FROM $paranthesis $entity_table ";
@@ -1413,8 +1413,8 @@
break;
}
- $parts =
$this->socommon->select_part_of_town($district_id);
- $part_of_town_list = array();
+ $parts =
$this->socommon->select_part_of_town($district_id);
+ $part_of_town_list = array();
if(is_array($parts) && (count($parts)))
{
@@ -1424,19 +1424,19 @@
{
$part_of_town_list[] = array
(
- 'id'
=> $entry['id'],
- 'name'
=> $entry['name'],
- 'district_id' =>
$entry['district_id'],
- 'selected'
=> 'selected'
+ 'id' => $entry['id'],
+ 'name' =>
$entry['name'],
+ 'district_id' =>
$entry['district_id'],
+ 'selected' => 'selected'
);
}
else
{
$part_of_town_list[] = array
(
- 'id'
=> $entry['id'],
- 'name'
=> $entry['name'],
- 'district_id' =>
$entry['district_id'],
+ 'id' => $entry['id'],
+ 'name' =>
$entry['name'],
+ 'district_id' =>
$entry['district_id'],
);
}
}
@@ -1516,8 +1516,8 @@
{
$datatypes[] = array
(
- 'id' => $key,
- 'name' => $name,
+ 'id' => $key,
+ 'name' => $name,
);
}
@@ -1526,9 +1526,9 @@
function select_nullable($selected = '')
{
- $nullable[0]['id'] = 'True';
+ $nullable[0]['id'] = 'True';
$nullable[0]['name'] = lang('true');
- $nullable[1]['id'] = 'False';
+ $nullable[1]['id'] = 'False';
$nullable[1]['name'] = lang('false');
return $this->select_list($selected, $nullable);
@@ -1547,9 +1547,9 @@
function download($list, $name, $descr, $input_type = array(),
$identificator = array(), $filename = '')
{
set_time_limit(500);
- $GLOBALS['phpgw_info']['flags']['noheader'] = true;
- $GLOBALS['phpgw_info']['flags']['nofooter'] = true;
- $GLOBALS['phpgw_info']['flags']['xslt_app'] =
false;
+ $GLOBALS['phpgw_info']['flags']['noheader'] = true;
+ $GLOBALS['phpgw_info']['flags']['nofooter'] = true;
+ $GLOBALS['phpgw_info']['flags']['xslt_app'] = false;
$export_format =
isset($GLOBALS['phpgw_info']['user']['preferences']['property']['export_format'])
&& $GLOBALS['phpgw_info']['user']['preferences']['property']['export_format']
? $GLOBALS['phpgw_info']['user']['preferences']['property']['export_format'] :
'csv';
@@ -1582,8 +1582,8 @@
phpgw::import_class('phpgwapi.phpexcel');
if($filename)
{
- $filename_arr = explode('.', str_replace('
', '_', basename($filename)));
- $filename = $filename_arr[0] .
'.xlsx';
+ $filename_arr = explode('.', str_replace(' ',
'_', basename($filename)));
+ $filename = $filename_arr[0] . '.xlsx';
}
else
{
@@ -1594,8 +1594,8 @@
//
$browser->content_header($filename,'application/vnd.ms-excel');
$browser->content_header($filename,
'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet');
- $cacheMethod =
PHPExcel_CachedObjectStorageFactory::cache_to_phpTemp;
- $cacheSettings = array('memoryCacheSize' => '32MB');
+ $cacheMethod =
PHPExcel_CachedObjectStorageFactory::cache_to_phpTemp;
+ $cacheSettings = array('memoryCacheSize' => '32MB');
PHPExcel_Settings::setCacheStorageMethod($cacheMethod,
$cacheSettings);
$objPHPExcel = new PHPExcel();
@@ -1613,8 +1613,8 @@
if($identificator)
{
- $_first_row = 2;
- $i = 0;
+ $_first_row = 2;
+ $i = 0;
foreach($identificator as $key => $value)
{
$objPHPExcel->setActiveSheetIndex(0)->setCellValueByColumnAndRow($i, 1, $value);
@@ -1628,7 +1628,7 @@
$count_uicols_name = count($name);
$text_format = array();
- $m = 0;
+ $m = 0;
for($k = 0; $k < $count_uicols_name; $k++)
{
if(!isset($input_type[$k]) || $input_type[$k]
!= 'hidden')
@@ -1660,8 +1660,8 @@
$j++;
}
- $line = $_first_row;
- $col = 'A';
+ $line = $_first_row;
+ $col = 'A';
foreach($content as $row)
{
@@ -1697,8 +1697,8 @@
{
$filename = str_replace(' ', '_',
$GLOBALS['phpgw_info']['user']['account_lid']) . '.xls';
- $workbook = CreateObject('phpgwapi.excel', "-");
- $browser = CreateObject('phpgwapi.browser');
+ $workbook = CreateObject('phpgwapi.excel', "-");
+ $browser = CreateObject('phpgwapi.browser');
$browser->content_header($filename,
'application/vnd.ms-excel');
$count_uicols_name = count($name);
@@ -1762,8 +1762,8 @@
{
if($filename)
{
- $filename_arr = explode('.', str_replace('
', '_', basename($filename)));
- $filename = $filename_arr[0] .
'.csv';
+ $filename_arr = explode('.', str_replace(' ',
'_', basename($filename)));
+ $filename = $filename_arr[0] . '.csv';
}
else
{
@@ -1832,8 +1832,8 @@
{
if($filename)
{
- $filename_arr = explode('.', str_replace('
', '_', basename($filename)));
- $filename = $filename_arr[0] .
'.ods';
+ $filename_arr = explode('.', str_replace(' ',
'_', basename($filename)));
+ $filename = $filename_arr[0] . '.ods';
}
else
{
@@ -1845,13 +1845,13 @@
$count_uicols_name = count($name);
- $ods = createObject('property.ods');
- $object = $ods->newOds(); //create a new ods file
+ $ods = createObject('property.ods');
+ $object = $ods->newOds(); //create a new ods file
if($identificator)
{
- $_first_row = 1;
- $i = 0;
+ $_first_row = 1;
+ $i = 0;
foreach($identificator as $key => $value)
{
$object->addCell(1, 0, $i, $value,
'string');
@@ -1929,14 +1929,14 @@
}
else if(substr($type, 0, 6) == 'entity')
{
- $type = explode("_", $type);
- $entity_id = $type[1];
- $cat_id = $type[2];
- $link = array
+ $type = explode("_", $type);
+ $entity_id = $type[1];
+ $cat_id = $type[2];
+ $link = array
(
'menuaction' =>
'property.uientity.view',
- 'entity_id' => $entity_id,
- 'cat_id' => $cat_id
+ 'entity_id' => $entity_id,
+ 'cat_id' => $cat_id
);
}
@@ -2101,20 +2101,20 @@
//strip prefix and leading zeros
$values['extra']['p_num'] =
execMethod('property.soentity.convert_num_to_id', array
(
- 'type' =>
$values['extra']['type'],
- 'entity_id' =>
$values['extra']['p_entity_id'],
- 'cat_id' =>
$values['extra']['p_cat_id'],
- 'num' =>
$values['extra']['p_num']
+ 'type' =>
$values['extra']['type'],
+ 'entity_id' =>
$values['extra']['p_entity_id'],
+ 'cat_id' =>
$values['extra']['p_cat_id'],
+ 'num' =>
$values['extra']['p_num']
)
);
- $p_entity_id
= $values['extra']['p_entity_id'];
- $p_cat_id
= $values['extra']['p_cat_id'];
- $p_num
= $values['extra']['p_num'];
-
$values['p'][$p_entity_id]['p_entity_id'] = $p_entity_id;
-
$values['p'][$p_entity_id]['p_cat_id'] = $p_cat_id;
-
$values['p'][$p_entity_id]['p_num'] = $p_num;
-
$values['p'][$p_entity_id]['p_cat_name'] =
phpgw::get_var("entity_cat_name_{$p_entity_id}");
+ $p_entity_id =
$values['extra']['p_entity_id'];
+ $p_cat_id =
$values['extra']['p_cat_id'];
+ $p_num =
$values['extra']['p_num'];
+
$values['p'][$p_entity_id]['p_entity_id'] = $p_entity_id;
+
$values['p'][$p_entity_id]['p_cat_id'] = $p_cat_id;
+
$values['p'][$p_entity_id]['p_num'] = $p_num;
+
$values['p'][$p_entity_id]['p_cat_name'] =
phpgw::get_var("entity_cat_name_{$p_entity_id}");
}
}
if(isset($insert_record['additional_info']) &&
is_array($insert_record['additional_info']))
@@ -2129,7 +2129,7 @@
}
}
- $values['street_name'] =
phpgw::get_var('street_name');
+ $values['street_name'] = phpgw::get_var('street_name');
$values['street_number'] =
phpgw::get_var('street_number');
if(isset($values['location']) &&
is_array($values['location']))
{
@@ -2151,10 +2151,10 @@
if(!$menu =
$GLOBALS['phpgw']->session->appsession($GLOBALS['phpgw_info']['flags']['menu_selection'],
"menu_{$app}"))
{
- $menu_gross =
execMethod("{$app}.menu.get_menu", 'horisontal');
- $selection =
explode('::', $GLOBALS['phpgw_info']['flags']['menu_selection']);
- $level = 0;
- $menu['navigation'] =
$this->get_sub_menu($menu_gross['navigation'], $selection, $level);
+ $menu_gross =
execMethod("{$app}.menu.get_menu", 'horisontal');
+ $selection = explode('::',
$GLOBALS['phpgw_info']['flags']['menu_selection']);
+ $level = 0;
+ $menu['navigation'] =
$this->get_sub_menu($menu_gross['navigation'], $selection, $level);
$GLOBALS['phpgw']->session->appsession(isset($GLOBALS['phpgw_info']['flags']['menu_selection'])
&& $GLOBALS['phpgw_info']['flags']['menu_selection'] ?
$GLOBALS['phpgw_info']['flags']['menu_selection'] :
'property_missing_selection', "menu_{$app}", $menu);
unset($menu_gross);
}
@@ -2199,8 +2199,8 @@
$data = array
(
- 'msgbox_data' =>
$GLOBALS['phpgw']->common->msgbox($msgbox_data),
- 'menu' => $this->get_menu(),
+ 'msgbox_data' =>
$GLOBALS['phpgw']->common->msgbox($msgbox_data),
+ 'menu' => $this->get_menu(),
);
$appname = lang('No access');
@@ -2309,18 +2309,18 @@
public function get_categories($data)
{
- $cats =
CreateObject('phpgwapi.categories', -1, 'property', $data['acl_location']);
- $cats->supress_info = true;
- $values =
$cats->formatted_xslt_list(array('selected' => $data['selected'],
+ $cats = CreateObject('phpgwapi.categories', -1,
'property', $data['acl_location']);
+ $cats->supress_info = true;
+ $values = $cats->formatted_xslt_list(array('selected'
=> $data['selected'],
'globals' => true, 'link_data' => array()));
- $ret = array();
+ $ret = array();
foreach($values['cat_list'] as $category)
{
$ret[] = array
(
- 'id' => $category['cat_id'],
- 'name' => $category['name'],
- 'selected' =>
$category['selected'] ? 1 : 0
+ 'id' => $category['cat_id'],
+ 'name' => $category['name'],
+ 'selected' => $category['selected'] ? 1
: 0
);
}
return $ret;
@@ -2334,14 +2334,14 @@
}
$vendor_email =
execMethod('property.sowo_hour.get_email', $vendor_id);
- $content_email = array();
@@ Diff output truncated at 153600 characters. @@
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [14622] formatting,
Sigurd Nes <=