fmsystem-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Fmsystem-commits] [14911] Syncromind: Merge 14718:14910 from trunk


From: Sigurd Nes
Subject: [Fmsystem-commits] [14911] Syncromind: Merge 14718:14910 from trunk
Date: Sat, 09 Apr 2016 11:40:38 +0000

Revision: 14911
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=14911
Author:   sigurdne
Date:     2016-04-09 11:40:37 +0000 (Sat, 09 Apr 2016)
Log Message:
-----------
Syncromind: Merge 14718:14910 from trunk

Modified Paths:
--------------
    branches/dev-syncromind/activitycalendar/inc/class.soactivity.inc.php
    branches/dev-syncromind/activitycalendar/inc/class.soarena.inc.php
    branches/dev-syncromind/activitycalendar/inc/class.socommon.inc.php
    branches/dev-syncromind/activitycalendar/inc/class.socontactperson.inc.php
    branches/dev-syncromind/activitycalendar/inc/class.sogroup.inc.php
    branches/dev-syncromind/activitycalendar/inc/class.soorganization.inc.php
    branches/dev-syncromind/activitycalendar/inc/class.uiactivities.inc.php
    branches/dev-syncromind/activitycalendar/inc/class.uiarena.inc.php
    branches/dev-syncromind/activitycalendar/inc/class.uicommon.inc.php
    branches/dev-syncromind/activitycalendar/inc/class.uidashboard.inc.php
    branches/dev-syncromind/activitycalendar/inc/class.uiimport.inc.php
    branches/dev-syncromind/activitycalendar/inc/class.uiorganization.inc.php
    branches/dev-syncromind/activitycalendar/inc/model/class.activity.inc.php
    branches/dev-syncromind/activitycalendar/inc/model/class.arena.inc.php
    branches/dev-syncromind/activitycalendar/inc/model/class.building.inc.php
    branches/dev-syncromind/activitycalendar/inc/model/class.category.inc.php
    
branches/dev-syncromind/activitycalendar/inc/model/class.contact_person.inc.php
    branches/dev-syncromind/activitycalendar/inc/model/class.group.inc.php
    branches/dev-syncromind/activitycalendar/inc/model/class.model.inc.php
    
branches/dev-syncromind/activitycalendar/inc/model/class.organization.inc.php
    branches/dev-syncromind/activitycalendar/inc/model/class.target.inc.php
    branches/dev-syncromind/activitycalendar/index.php
    
branches/dev-syncromind/activitycalendar/js/activitycalendar/activities.edit.js
    
branches/dev-syncromind/activitycalendar/js/activitycalendar/activities.index.js
    
branches/dev-syncromind/activitycalendar/js/activitycalendar/dashboard.index.js
    branches/dev-syncromind/activitycalendar/setup/default_records.inc.php
    branches/dev-syncromind/activitycalendar/setup/setup.inc.php
    branches/dev-syncromind/activitycalendar/setup/tables_current.inc.php
    branches/dev-syncromind/activitycalendar/setup/tables_update.inc.php
    branches/dev-syncromind/activitycalendar/templates/base/css/base.css
    branches/dev-syncromind/activitycalendarfrontend/inc/class.menu.inc.php
    
branches/dev-syncromind/activitycalendarfrontend/inc/class.uiactivity.inc.php
    branches/dev-syncromind/activitycalendarfrontend/index.php
    
branches/dev-syncromind/activitycalendarfrontend/js/activitycalendarfrontend/activity_edit.js
    
branches/dev-syncromind/activitycalendarfrontend/js/activitycalendarfrontend/activity_edit_step_1.js
    
branches/dev-syncromind/activitycalendarfrontend/js/activitycalendarfrontend/activity_new.js
    
branches/dev-syncromind/activitycalendarfrontend/js/activitycalendarfrontend/activity_new_org.js
    
branches/dev-syncromind/activitycalendarfrontend/js/activitycalendarfrontend/activity_new_step_1.js
    
branches/dev-syncromind/activitycalendarfrontend/js/activitycalendarfrontend/organization_edit.js
    
branches/dev-syncromind/activitycalendarfrontend/js/activitycalendarfrontend/organization_reciept.js
    
branches/dev-syncromind/activitycalendarfrontend/setup/default_records.inc.php
    branches/dev-syncromind/activitycalendarfrontend/setup/setup.inc.php
    
branches/dev-syncromind/activitycalendarfrontend/setup/tables_current.inc.php
    branches/dev-syncromind/activitycalendarfrontend/setup/tables_update.inc.php
    branches/dev-syncromind/activitycalendarfrontend/templates/base/config.tpl
    branches/dev-syncromind/activitycalendarfrontend/templates/base/css/base.css
    branches/dev-syncromind/admin/inc/class.uiaccounts.inc.php
    branches/dev-syncromind/admin/templates/base/config.tpl
    branches/dev-syncromind/booking/frontend.php
    branches/dev-syncromind/booking/help/index.php
    branches/dev-syncromind/booking/inc/class.account_helper.inc.php
    branches/dev-syncromind/booking/inc/class.account_ui_utils.inc.php
    branches/dev-syncromind/booking/inc/class.async_task.inc.php
    branches/dev-syncromind/booking/inc/class.async_task_send_reminder.inc.php
    
branches/dev-syncromind/booking/inc/class.async_task_update_reservation_state.inc.php
    branches/dev-syncromind/booking/inc/class.boaccount_code_set.inc.php
    branches/dev-syncromind/booking/inc/class.boactivity.inc.php
    branches/dev-syncromind/booking/inc/class.boagegroup.inc.php
    branches/dev-syncromind/booking/inc/class.boallocation.inc.php
    branches/dev-syncromind/booking/inc/class.boapplication.inc.php
    branches/dev-syncromind/booking/inc/class.boasync_settings.inc.php
    branches/dev-syncromind/booking/inc/class.boaudience.inc.php
    branches/dev-syncromind/booking/inc/class.bobooking.inc.php
    branches/dev-syncromind/booking/inc/class.bobuilding.inc.php
    branches/dev-syncromind/booking/inc/class.bocommon.inc.php
    branches/dev-syncromind/booking/inc/class.bocommon_authorized.inc.php
    
branches/dev-syncromind/booking/inc/class.bocommon_global_manager_authorized.inc.php
    branches/dev-syncromind/booking/inc/class.bocompleted_reservation.inc.php
    
branches/dev-syncromind/booking/inc/class.bocompleted_reservation_export.inc.php
    branches/dev-syncromind/booking/inc/class.bocontactperson.inc.php
    branches/dev-syncromind/booking/inc/class.bodocument.inc.php
    branches/dev-syncromind/booking/inc/class.bodocument_resource.inc.php
    branches/dev-syncromind/booking/inc/class.bodocument_view.inc.php
    branches/dev-syncromind/booking/inc/class.boevent.inc.php
    branches/dev-syncromind/booking/inc/class.bogroup.inc.php
    branches/dev-syncromind/booking/inc/class.bomassbooking.inc.php
    branches/dev-syncromind/booking/inc/class.boorganization.inc.php
    branches/dev-syncromind/booking/inc/class.bopermission.inc.php
    branches/dev-syncromind/booking/inc/class.bopermission_resource.inc.php
    branches/dev-syncromind/booking/inc/class.bopermission_season.inc.php
    branches/dev-syncromind/booking/inc/class.boresource.inc.php
    branches/dev-syncromind/booking/inc/class.boseason.inc.php
    branches/dev-syncromind/booking/inc/class.custom_fields.inc.php
    branches/dev-syncromind/booking/inc/class.customer_identifier.inc.php
    branches/dev-syncromind/booking/inc/class.errorstack.inc.php
    branches/dev-syncromind/booking/inc/class.export_agresso.inc.php
    branches/dev-syncromind/booking/inc/class.filestorage.inc.php
    branches/dev-syncromind/booking/inc/class.hook_helper.inc.php
    branches/dev-syncromind/booking/inc/class.menu.inc.php
    branches/dev-syncromind/booking/inc/class.ofbooking.inc.php
    branches/dev-syncromind/booking/inc/class.soactivity.inc.php
    branches/dev-syncromind/booking/inc/class.soallocation.inc.php
    branches/dev-syncromind/booking/inc/class.soapplication.inc.php
    
branches/dev-syncromind/booking/inc/class.sobilling_sequential_number_generator.inc.php
    branches/dev-syncromind/booking/inc/class.sobooking.inc.php
    branches/dev-syncromind/booking/inc/class.sobuilding.inc.php
    branches/dev-syncromind/booking/inc/class.socommon.inc.php
    branches/dev-syncromind/booking/inc/class.socompleted_reservation.inc.php
    
branches/dev-syncromind/booking/inc/class.socompleted_reservation_export.inc.php
    
branches/dev-syncromind/booking/inc/class.socompleted_reservation_export_file.inc.php
    branches/dev-syncromind/booking/inc/class.sodocument.inc.php
    branches/dev-syncromind/booking/inc/class.sodocument_view.inc.php
    branches/dev-syncromind/booking/inc/class.sodocumentation.inc.php
    branches/dev-syncromind/booking/inc/class.soevent.inc.php
    branches/dev-syncromind/booking/inc/class.sogroup.inc.php
    branches/dev-syncromind/booking/inc/class.soorganization.inc.php
    branches/dev-syncromind/booking/inc/class.sopermission.inc.php
    
branches/dev-syncromind/booking/inc/class.sopermission_permission_document_building.inc.php
    branches/dev-syncromind/booking/inc/class.sopermission_root.inc.php
    branches/dev-syncromind/booking/inc/class.soresource.inc.php
    branches/dev-syncromind/booking/inc/class.soseason.inc.php
    branches/dev-syncromind/booking/inc/class.sosystem_message.inc.php
    branches/dev-syncromind/booking/inc/class.uiaccount_code_dimension.inc.php
    branches/dev-syncromind/booking/inc/class.uiaccount_code_set.inc.php
    branches/dev-syncromind/booking/inc/class.uiactivity.inc.php
    branches/dev-syncromind/booking/inc/class.uiagegroup.inc.php
    branches/dev-syncromind/booking/inc/class.uiallocation.inc.php
    branches/dev-syncromind/booking/inc/class.uiapplication.inc.php
    branches/dev-syncromind/booking/inc/class.uiapplication_settings.inc.php
    branches/dev-syncromind/booking/inc/class.uiasync_settings.inc.php
    branches/dev-syncromind/booking/inc/class.uiaudience.inc.php
    branches/dev-syncromind/booking/inc/class.uibooking.inc.php
    branches/dev-syncromind/booking/inc/class.uibuilding.inc.php
    branches/dev-syncromind/booking/inc/class.uicommon.inc.php
    branches/dev-syncromind/booking/inc/class.uicompleted_reservation.inc.php
    
branches/dev-syncromind/booking/inc/class.uicompleted_reservation_export.inc.php
    
branches/dev-syncromind/booking/inc/class.uicompleted_reservation_export_file.inc.php
    branches/dev-syncromind/booking/inc/class.uicontactperson.inc.php
    branches/dev-syncromind/booking/inc/class.uidashboard.inc.php
    branches/dev-syncromind/booking/inc/class.uidocument.inc.php
    branches/dev-syncromind/booking/inc/class.uidocument_application.inc.php
    branches/dev-syncromind/booking/inc/class.uidocument_building.inc.php
    branches/dev-syncromind/booking/inc/class.uidocument_resource.inc.php
    branches/dev-syncromind/booking/inc/class.uidocument_view.inc.php
    branches/dev-syncromind/booking/inc/class.uidocumentation.inc.php
    branches/dev-syncromind/booking/inc/class.uievent.inc.php
    branches/dev-syncromind/booking/inc/class.uievent_mail_settings.inc.php
    branches/dev-syncromind/booking/inc/class.uigroup.inc.php
    branches/dev-syncromind/booking/inc/class.uimail_settings.inc.php
    branches/dev-syncromind/booking/inc/class.uimassbooking.inc.php
    branches/dev-syncromind/booking/inc/class.uimetasettings.inc.php
    branches/dev-syncromind/booking/inc/class.uiorganization.inc.php
    branches/dev-syncromind/booking/inc/class.uipermission.inc.php
    branches/dev-syncromind/booking/inc/class.uipermission_building.inc.php
    branches/dev-syncromind/booking/inc/class.uipermission_massbooking.inc.php
    branches/dev-syncromind/booking/inc/class.uipermission_resource.inc.php
    branches/dev-syncromind/booking/inc/class.uipermission_root.inc.php
    branches/dev-syncromind/booking/inc/class.uipermission_season.inc.php
    branches/dev-syncromind/booking/inc/class.uireports.inc.php
    branches/dev-syncromind/booking/inc/class.uiresource.inc.php
    branches/dev-syncromind/booking/inc/class.uiseason.inc.php
    branches/dev-syncromind/booking/inc/class.uisend_email.inc.php
    branches/dev-syncromind/booking/inc/class.uisettings.inc.php
    branches/dev-syncromind/booking/inc/class.uisystem_message.inc.php
    branches/dev-syncromind/booking/inc/class.unauthorized_exception.inc.php
    branches/dev-syncromind/booking/inc/schedule.php
    branches/dev-syncromind/booking/inc/vendor/symfony/validator/bootstrap.php
    
branches/dev-syncromind/booking/inc/vendor/symfony/validator/i18n/sfValidatorI18nChoiceCountry.class.php
    
branches/dev-syncromind/booking/inc/vendor/symfony/validator/i18n/sfValidatorI18nChoiceLanguage.class.php
    
branches/dev-syncromind/booking/inc/vendor/symfony/validator/sfValidatorAnd.class.php
    
branches/dev-syncromind/booking/inc/vendor/symfony/validator/sfValidatorBase.class.php
    
branches/dev-syncromind/booking/inc/vendor/symfony/validator/sfValidatorBoolean.class.php
    
branches/dev-syncromind/booking/inc/vendor/symfony/validator/sfValidatorCSRFToken.class.php
    
branches/dev-syncromind/booking/inc/vendor/symfony/validator/sfValidatorCallback.class.php
    
branches/dev-syncromind/booking/inc/vendor/symfony/validator/sfValidatorChoice.class.php
    
branches/dev-syncromind/booking/inc/vendor/symfony/validator/sfValidatorChoiceMany.class.php
    
branches/dev-syncromind/booking/inc/vendor/symfony/validator/sfValidatorDate.class.php
    
branches/dev-syncromind/booking/inc/vendor/symfony/validator/sfValidatorDateRange.class.php
    
branches/dev-syncromind/booking/inc/vendor/symfony/validator/sfValidatorDateTime.class.php
    
branches/dev-syncromind/booking/inc/vendor/symfony/validator/sfValidatorDecorator.class.php
    
branches/dev-syncromind/booking/inc/vendor/symfony/validator/sfValidatorEmail.class.php
    
branches/dev-syncromind/booking/inc/vendor/symfony/validator/sfValidatorError.class.php
    
branches/dev-syncromind/booking/inc/vendor/symfony/validator/sfValidatorErrorSchema.class.php
    
branches/dev-syncromind/booking/inc/vendor/symfony/validator/sfValidatorFile.class.php
    
branches/dev-syncromind/booking/inc/vendor/symfony/validator/sfValidatorFromDescription.class.php
    
branches/dev-syncromind/booking/inc/vendor/symfony/validator/sfValidatorInteger.class.php
    
branches/dev-syncromind/booking/inc/vendor/symfony/validator/sfValidatorNorwegianOrganizationNumber.class.php
    
branches/dev-syncromind/booking/inc/vendor/symfony/validator/sfValidatorNorwegianSSN.class.php
    
branches/dev-syncromind/booking/inc/vendor/symfony/validator/sfValidatorNumber.class.php
    
branches/dev-syncromind/booking/inc/vendor/symfony/validator/sfValidatorOr.class.php
    
branches/dev-syncromind/booking/inc/vendor/symfony/validator/sfValidatorPass.class.php
    
branches/dev-syncromind/booking/inc/vendor/symfony/validator/sfValidatorRegex.class.php
    
branches/dev-syncromind/booking/inc/vendor/symfony/validator/sfValidatorSchema.class.php
    
branches/dev-syncromind/booking/inc/vendor/symfony/validator/sfValidatorSchemaCompare.class.php
    
branches/dev-syncromind/booking/inc/vendor/symfony/validator/sfValidatorSchemaFilter.class.php
    
branches/dev-syncromind/booking/inc/vendor/symfony/validator/sfValidatorSchemaForEach.class.php
    
branches/dev-syncromind/booking/inc/vendor/symfony/validator/sfValidatorString.class.php
    
branches/dev-syncromind/booking/inc/vendor/symfony/validator/sfValidatorTime.class.php
    
branches/dev-syncromind/booking/inc/vendor/symfony/validator/sfValidatorUrl.class.php
    branches/dev-syncromind/booking/index.php
    branches/dev-syncromind/booking/js/booking/allocation.js
    branches/dev-syncromind/booking/js/booking/allocation_list.js
    branches/dev-syncromind/booking/js/booking/application.js
    branches/dev-syncromind/booking/js/booking/booking.js
    branches/dev-syncromind/booking/js/booking/common.js
    branches/dev-syncromind/booking/js/booking/completed_reservation.js
    branches/dev-syncromind/booking/js/booking/document.js
    branches/dev-syncromind/booking/js/booking/email_send.js
    branches/dev-syncromind/booking/js/booking/event.js
    branches/dev-syncromind/booking/js/booking/group_new.js
    branches/dev-syncromind/booking/js/booking/permission.js
    branches/dev-syncromind/booking/js/booking/permission_root.js
    branches/dev-syncromind/booking/js/booking/report.js
    branches/dev-syncromind/booking/js/booking/resource_new.js
    branches/dev-syncromind/booking/js/booking/schedule.js
    branches/dev-syncromind/booking/js/booking/season.js
    branches/dev-syncromind/booking/js/booking/season.wtemplate.js
    branches/dev-syncromind/booking/setup/default_records.inc.php
    branches/dev-syncromind/booking/setup/tables_current.inc.php
    branches/dev-syncromind/booking/setup/tables_update.inc.php
    branches/dev-syncromind/booking/tasks/cleanCompletedReservations.php
    branches/dev-syncromind/booking/tasks/cleanReservations.php
    branches/dev-syncromind/booking/tasks/entryPoint.php
    branches/dev-syncromind/booking/tasks/getBookingAppVersion.php
    branches/dev-syncromind/booking/tasks/randomReservations.php
    branches/dev-syncromind/booking/tasks/sendReminder.php
    branches/dev-syncromind/booking/tasks/setBookingAppVersion.php
    branches/dev-syncromind/booking/tasks/testNumberGenerator.php
    branches/dev-syncromind/booking/tasks/updateReservationState.php
    branches/dev-syncromind/booking/templates/base/allocation_edit.xsl
    branches/dev-syncromind/booking/templates/base/application.xsl
    branches/dev-syncromind/booking/templates/base/application_edit.xsl
    branches/dev-syncromind/booking/templates/base/application_new.xsl
    branches/dev-syncromind/booking/templates/base/booking.xsl
    branches/dev-syncromind/booking/templates/base/booking_edit.xsl
    
branches/dev-syncromind/booking/templates/base/completed_reservation_export_form.xsl
    branches/dev-syncromind/booking/templates/base/css/base.css
    branches/dev-syncromind/booking/templates/base/event_edit.xsl
    branches/dev-syncromind/booking/templates/base/event_new.xsl
    branches/dev-syncromind/booking/templates/base/metasettings.xsl
    branches/dev-syncromind/bookingfrontend/change.php
    branches/dev-syncromind/bookingfrontend/css/bookingfrontend.css
    branches/dev-syncromind/bookingfrontend/inc/class.bosearch.inc.php
    branches/dev-syncromind/bookingfrontend/inc/class.bouser.inc.php
    branches/dev-syncromind/bookingfrontend/inc/class.menu.inc.php
    branches/dev-syncromind/bookingfrontend/inc/class.uiallocation.inc.php
    branches/dev-syncromind/bookingfrontend/inc/class.uiapplication.inc.php
    branches/dev-syncromind/bookingfrontend/inc/class.uibooking.inc.php
    branches/dev-syncromind/bookingfrontend/inc/class.uibuilding.inc.php
    branches/dev-syncromind/bookingfrontend/inc/class.uicontactperson.inc.php
    branches/dev-syncromind/bookingfrontend/inc/class.uievent.inc.php
    branches/dev-syncromind/bookingfrontend/inc/class.uigroup.inc.php
    branches/dev-syncromind/bookingfrontend/inc/class.uiorganization.inc.php
    branches/dev-syncromind/bookingfrontend/inc/class.uiresource.inc.php
    branches/dev-syncromind/bookingfrontend/inc/class.uisearch.inc.php
    branches/dev-syncromind/bookingfrontend/inc/class.uisystem_message.inc.php
    
branches/dev-syncromind/bookingfrontend/inc/custom/default/Altinn2_Bergen_kommune.php
    
branches/dev-syncromind/bookingfrontend/inc/custom/default/Altinn_Bergen_kommune.php
    branches/dev-syncromind/bookingfrontend/inc/custom/default/MinId.php
    branches/dev-syncromind/bookingfrontend/inc/hook_config.inc.php
    branches/dev-syncromind/bookingfrontend/index.php
    branches/dev-syncromind/bookingfrontend/js/bookingfrontend/application.js
    branches/dev-syncromind/bookingfrontend/js/bookingfrontend/booking.js
    
branches/dev-syncromind/bookingfrontend/js/bookingfrontend/booking_massupdate.js
    branches/dev-syncromind/bookingfrontend/js/bookingfrontend/event.js
    branches/dev-syncromind/bookingfrontend/js/bookingfrontend/schedule.js
    branches/dev-syncromind/bookingfrontend/js/bookingfrontend/search.js
    branches/dev-syncromind/bookingfrontend/login.php
    branches/dev-syncromind/bookingfrontend/logout.php
    branches/dev-syncromind/bookingfrontend/setup/default_records.inc.php
    branches/dev-syncromind/bookingfrontend/setup/setup.inc.php
    branches/dev-syncromind/bookingfrontend/setup/tables_update.inc.php
    branches/dev-syncromind/bookingfrontend/templates/base/application_edit.xsl
    branches/dev-syncromind/bookingfrontend/templates/base/application_new.xsl
    branches/dev-syncromind/bookingfrontend/templates/base/group_edit.xsl
    branches/dev-syncromind/bookingfrontend/templates/base/organization_edit.xsl
    branches/dev-syncromind/bookingfrontend/templates/base/search.xsl
    branches/dev-syncromind/bookingfrontend/templates/fjell/access_denied.xsl
    
branches/dev-syncromind/bookingfrontend/templates/fjell/allocation_cancel.xsl
    
branches/dev-syncromind/bookingfrontend/templates/fjell/allocation_delete.xsl
    
branches/dev-syncromind/bookingfrontend/templates/fjell/allocation_delete_preview.xsl
    branches/dev-syncromind/bookingfrontend/templates/fjell/allocation_info.xsl
    branches/dev-syncromind/bookingfrontend/templates/fjell/application_new.xsl
    branches/dev-syncromind/bookingfrontend/templates/fjell/booking_cancel.xsl
    branches/dev-syncromind/bookingfrontend/templates/fjell/booking_delete.xsl
    
branches/dev-syncromind/bookingfrontend/templates/fjell/booking_delete_preview.xsl
    branches/dev-syncromind/bookingfrontend/templates/fjell/booking_edit.xsl
    
branches/dev-syncromind/bookingfrontend/templates/fjell/booking_edit_preview.xsl
    branches/dev-syncromind/bookingfrontend/templates/fjell/booking_info.xsl
    
branches/dev-syncromind/bookingfrontend/templates/fjell/booking_massupdate.xsl
    branches/dev-syncromind/bookingfrontend/templates/fjell/booking_new.xsl
    
branches/dev-syncromind/bookingfrontend/templates/fjell/booking_new_preview.xsl
    branches/dev-syncromind/bookingfrontend/templates/fjell/building.xsl
    
branches/dev-syncromind/bookingfrontend/templates/fjell/building_schedule.xsl
    branches/dev-syncromind/bookingfrontend/templates/fjell/config.tpl
    branches/dev-syncromind/bookingfrontend/templates/fjell/event_delete.xsl
    branches/dev-syncromind/bookingfrontend/templates/fjell/event_edit.xsl
    branches/dev-syncromind/bookingfrontend/templates/fjell/event_info.xsl
    branches/dev-syncromind/bookingfrontend/templates/fjell/group.xsl
    branches/dev-syncromind/bookingfrontend/templates/fjell/organization.xsl
    branches/dev-syncromind/bookingfrontend/templates/fjell/report_numbers.xsl
    branches/dev-syncromind/bookingfrontend/templates/fjell/resource.xsl
    
branches/dev-syncromind/bookingfrontend/templates/fjell/resource_schedule.xsl
    branches/dev-syncromind/bookingfrontend/templates/fjell/search.xsl
    branches/dev-syncromind/bookingfrontend/templates/fjell/system_message.xsl
    
branches/dev-syncromind/bookingfrontend/templates/stavanger/access_denied.xsl
    
branches/dev-syncromind/bookingfrontend/templates/stavanger/allocation_cancel.xsl
    
branches/dev-syncromind/bookingfrontend/templates/stavanger/allocation_delete.xsl
    
branches/dev-syncromind/bookingfrontend/templates/stavanger/allocation_delete_preview.xsl
    
branches/dev-syncromind/bookingfrontend/templates/stavanger/allocation_info.xsl
    
branches/dev-syncromind/bookingfrontend/templates/stavanger/application_new.xsl
    
branches/dev-syncromind/bookingfrontend/templates/stavanger/booking_cancel.xsl
    
branches/dev-syncromind/bookingfrontend/templates/stavanger/booking_delete.xsl
    
branches/dev-syncromind/bookingfrontend/templates/stavanger/booking_delete_preview.xsl
    branches/dev-syncromind/bookingfrontend/templates/stavanger/booking_edit.xsl
    
branches/dev-syncromind/bookingfrontend/templates/stavanger/booking_edit_preview.xsl
    branches/dev-syncromind/bookingfrontend/templates/stavanger/booking_info.xsl
    
branches/dev-syncromind/bookingfrontend/templates/stavanger/booking_massupdate.xsl
    branches/dev-syncromind/bookingfrontend/templates/stavanger/booking_new.xsl
    
branches/dev-syncromind/bookingfrontend/templates/stavanger/booking_new_preview.xsl
    branches/dev-syncromind/bookingfrontend/templates/stavanger/building.xsl
    
branches/dev-syncromind/bookingfrontend/templates/stavanger/building_schedule.xsl
    branches/dev-syncromind/bookingfrontend/templates/stavanger/config.tpl
    branches/dev-syncromind/bookingfrontend/templates/stavanger/event_delete.xsl
    branches/dev-syncromind/bookingfrontend/templates/stavanger/event_edit.xsl
    branches/dev-syncromind/bookingfrontend/templates/stavanger/event_info.xsl
    branches/dev-syncromind/bookingfrontend/templates/stavanger/group.xsl
    branches/dev-syncromind/bookingfrontend/templates/stavanger/organization.xsl
    
branches/dev-syncromind/bookingfrontend/templates/stavanger/report_numbers.xsl
    branches/dev-syncromind/bookingfrontend/templates/stavanger/resource.xsl
    
branches/dev-syncromind/bookingfrontend/templates/stavanger/resource_schedule.xsl
    branches/dev-syncromind/bookingfrontend/templates/stavanger/search.xsl
    
branches/dev-syncromind/bookingfrontend/templates/stavanger/system_message.xsl
    branches/dev-syncromind/catch/templates/base/cat_filter.xsl
    branches/dev-syncromind/catch/templates/base/cat_select.xsl
    branches/dev-syncromind/controller/inc/class.cat_hooks.inc.php
    branches/dev-syncromind/controller/inc/class.hook_helper.inc.php
    branches/dev-syncromind/controller/inc/class.menu.inc.php
    branches/dev-syncromind/controller/inc/class.socase.inc.php
    branches/dev-syncromind/controller/inc/class.socheck_item.inc.php
    branches/dev-syncromind/controller/inc/class.socheck_list.inc.php
    branches/dev-syncromind/controller/inc/class.socommon.inc.php
    branches/dev-syncromind/controller/inc/class.socontrol.inc.php
    branches/dev-syncromind/controller/inc/class.socontrol_group.inc.php
    branches/dev-syncromind/controller/inc/class.socontrol_group_list.inc.php
    branches/dev-syncromind/controller/inc/class.socontrol_item.inc.php
    branches/dev-syncromind/controller/inc/class.socontrol_item_list.inc.php
    branches/dev-syncromind/controller/inc/class.socontrol_item_option.inc.php
    branches/dev-syncromind/controller/inc/class.sodocument.inc.php
    branches/dev-syncromind/controller/inc/class.soprocedure.inc.php
    branches/dev-syncromind/controller/inc/class.uicalendar.inc.php
    branches/dev-syncromind/controller/inc/class.uicase.inc.php
    branches/dev-syncromind/controller/inc/class.uicheck_list.inc.php
    
branches/dev-syncromind/controller/inc/class.uicheck_list_for_component.inc.php
    branches/dev-syncromind/controller/inc/class.uicomponent.inc.php
    branches/dev-syncromind/controller/inc/class.uicontrol.inc.php
    branches/dev-syncromind/controller/inc/class.uicontrol_group.inc.php
    
branches/dev-syncromind/controller/inc/class.uicontrol_group_component.inc.php
    branches/dev-syncromind/controller/inc/class.uicontrol_item.inc.php
    
branches/dev-syncromind/controller/inc/class.uicontrol_register_to_component.inc.php
    
branches/dev-syncromind/controller/inc/class.uicontrol_register_to_location.inc.php
    branches/dev-syncromind/controller/inc/class.uidocument.inc.php
    branches/dev-syncromind/controller/inc/class.uilookup.inc.php
    branches/dev-syncromind/controller/inc/class.uiprocedure.inc.php
    
branches/dev-syncromind/controller/inc/component/class.check_list_status_info.inc.php
    
branches/dev-syncromind/controller/inc/component/class.check_list_status_manager.inc.php
    
branches/dev-syncromind/controller/inc/component/class.date_generator.inc.php
    
branches/dev-syncromind/controller/inc/component/class.month_calendar.inc.php
    
branches/dev-syncromind/controller/inc/component/class.status_agg_month_info.inc.php
    branches/dev-syncromind/controller/inc/component/class.year_calendar.inc.php
    
branches/dev-syncromind/controller/inc/component/class.year_calendar_agg.inc.php
    branches/dev-syncromind/controller/inc/helper/class.date_converter.inc.php
    branches/dev-syncromind/controller/inc/helper/class.location_finder.inc.php
    branches/dev-syncromind/controller/inc/hook_config.inc.php
    branches/dev-syncromind/controller/inc/model/class.check_item.inc.php
    branches/dev-syncromind/controller/inc/model/class.check_item_case.inc.php
    branches/dev-syncromind/controller/inc/model/class.check_list.inc.php
    branches/dev-syncromind/controller/inc/model/class.component.inc.php
    branches/dev-syncromind/controller/inc/model/class.control.inc.php
    branches/dev-syncromind/controller/inc/model/class.control_group.inc.php
    
branches/dev-syncromind/controller/inc/model/class.control_group_list.inc.php
    branches/dev-syncromind/controller/inc/model/class.control_item.inc.php
    branches/dev-syncromind/controller/inc/model/class.control_item_list.inc.php
    
branches/dev-syncromind/controller/inc/model/class.control_item_option.inc.php
    branches/dev-syncromind/controller/inc/model/class.control_location.inc.php
    branches/dev-syncromind/controller/inc/model/class.document.inc.php
    branches/dev-syncromind/controller/inc/model/class.model.inc.php
    branches/dev-syncromind/controller/inc/model/class.procedure.inc.php
    branches/dev-syncromind/controller/js/controller/ajax.js
    
branches/dev-syncromind/controller/js/controller/ajax_control_to_component.js
    branches/dev-syncromind/controller/js/controller/ajax_control_to_location.js
    branches/dev-syncromind/controller/js/controller/case.js
    branches/dev-syncromind/controller/js/controller/check_list.js
    branches/dev-syncromind/controller/js/controller/check_list_update_status.js
    
branches/dev-syncromind/controller/js/controller/control_group_to_component.js
    branches/dev-syncromind/controller/js/controller/custom_drag_drop.js
    branches/dev-syncromind/controller/js/controller/custom_ui.js
    branches/dev-syncromind/controller/templates/base/component.xsl
    branches/dev-syncromind/controller/templates/base/css/base.css
    branches/dev-syncromind/demo/inc/class.bodemo.inc.php
    branches/dev-syncromind/demo/inc/class.menu.inc.php
    branches/dev-syncromind/demo/inc/class.sodemo.inc.php
    branches/dev-syncromind/demo/inc/class.uidemo.inc.php
    branches/dev-syncromind/demo/inc/custom/demo_custom.php
    branches/dev-syncromind/demo/inc/hook_help.inc.php
    branches/dev-syncromind/demo/inc/hook_manual.inc.php
    branches/dev-syncromind/demo/inc/hook_preferences.inc.php
    branches/dev-syncromind/demo/inc/hook_settings.inc.php
    branches/dev-syncromind/demo/index.php
    branches/dev-syncromind/demo/js/yahoo/demo.edit.js
    branches/dev-syncromind/demo/js/yahoo/demo.index.js
    branches/dev-syncromind/demo/setup/default_records.inc.php
    branches/dev-syncromind/demo/setup/setup.inc.php
    branches/dev-syncromind/demo/setup/tables_current.inc.php
    branches/dev-syncromind/demo/setup/tables_update.inc.php
    branches/dev-syncromind/demo/templates/base/app_data.xsl
    branches/dev-syncromind/demo/templates/base/app_delete.xsl
    branches/dev-syncromind/demo/templates/base/attributes_form.xsl
    branches/dev-syncromind/demo/templates/base/attributes_view.xsl
    branches/dev-syncromind/demo/templates/base/config.tpl
    branches/dev-syncromind/demo/templates/base/demo.xsl
    branches/dev-syncromind/demo/templates/base/edit.xsl
    branches/dev-syncromind/demo/templates/base/nextmatchs.xsl
    branches/dev-syncromind/demo/templates/base/no_access.xsl
    branches/dev-syncromind/demo/templates/base/search_field.xsl
    branches/dev-syncromind/demo/templates/verdilak/app_data.xsl
    branches/dev-syncromind/email/templates/base/addressbook-js.tpl
    branches/dev-syncromind/email/templates/base/debug.tpl
    branches/dev-syncromind/email/templates/base/spell_review.tpl
    branches/dev-syncromind/frontend/help/NO/contact.odt
    branches/dev-syncromind/frontend/inc/class.bofellesdata.inc.php
    branches/dev-syncromind/frontend/inc/class.bofrontend.inc.php
    branches/dev-syncromind/frontend/inc/class.boproperty.inc.php
    branches/dev-syncromind/frontend/inc/class.borental.inc.php
    branches/dev-syncromind/frontend/inc/class.hook_helper.inc.php
    branches/dev-syncromind/frontend/inc/class.menu.inc.php
    branches/dev-syncromind/frontend/inc/class.sorental.inc.php
    branches/dev-syncromind/frontend/inc/class.uicommon.inc.php
    branches/dev-syncromind/frontend/inc/class.uicontract.inc.php
    branches/dev-syncromind/frontend/inc/class.uicontract_documents.inc.php
    branches/dev-syncromind/frontend/inc/class.uicontract_ex.inc.php
    branches/dev-syncromind/frontend/inc/class.uicontract_in.inc.php
    branches/dev-syncromind/frontend/inc/class.uicontract_internal.inc.php
    branches/dev-syncromind/frontend/inc/class.uicontroller.inc.php
    branches/dev-syncromind/frontend/inc/class.uidelegates.inc.php
    branches/dev-syncromind/frontend/inc/class.uidocumentupload.inc.php
    branches/dev-syncromind/frontend/inc/class.uidrawings.inc.php
    branches/dev-syncromind/frontend/inc/class.uientity.inc.php
    branches/dev-syncromind/frontend/inc/class.uifrontend.inc.php
    branches/dev-syncromind/frontend/inc/class.uihelpdesk.inc.php
    branches/dev-syncromind/frontend/inc/class.uimaintenance.inc.php
    branches/dev-syncromind/frontend/inc/class.uimessages.inc.php
    branches/dev-syncromind/frontend/inc/class.uipictures.inc.php
    branches/dev-syncromind/frontend/inc/class.uirefurbishment.inc.php
    branches/dev-syncromind/frontend/inc/class.uiservices.inc.php
    branches/dev-syncromind/frontend/inc/hook_config.inc.php
    branches/dev-syncromind/frontend/inc/model/class.ticket.inc.php
    branches/dev-syncromind/frontend/index.php
    branches/dev-syncromind/frontend/js/jquery/entity.list.js
    branches/dev-syncromind/frontend/js/jquery/helpdesk.list.js
    branches/dev-syncromind/frontend/js/jquery/menu.js
    branches/dev-syncromind/frontend/setup/default_records.inc.php
    branches/dev-syncromind/frontend/setup/phpgw_no.lang
    branches/dev-syncromind/frontend/setup/tables_update.inc.php
    branches/dev-syncromind/frontend/templates/base/app_data.xsl
    branches/dev-syncromind/frontend/templates/base/attributes_view.xsl
    branches/dev-syncromind/frontend/templates/base/base.css
    branches/dev-syncromind/frontend/templates/base/config.tpl
    branches/dev-syncromind/frontend/templates/base/contract.xsl
    branches/dev-syncromind/frontend/templates/base/datatable.xsl
    branches/dev-syncromind/frontend/templates/base/delegate.xsl
    branches/dev-syncromind/frontend/templates/base/demo.xsl
    branches/dev-syncromind/frontend/templates/base/document.xsl
    branches/dev-syncromind/frontend/templates/base/drawings.xsl
    branches/dev-syncromind/frontend/templates/base/entity.xsl
    branches/dev-syncromind/frontend/templates/base/entityview.xsl
    branches/dev-syncromind/frontend/templates/base/helpdesk.xsl
    branches/dev-syncromind/frontend/templates/base/maintenance.xsl
    branches/dev-syncromind/frontend/templates/base/messages.xsl
    branches/dev-syncromind/frontend/templates/base/pictures.xsl
    branches/dev-syncromind/frontend/templates/base/refurbishment.xsl
    branches/dev-syncromind/frontend/templates/base/services.xsl
    branches/dev-syncromind/frontend/templates/base/ticketview.xsl
    branches/dev-syncromind/home.php
    branches/dev-syncromind/hrm/templates/base/admin.xsl
    branches/dev-syncromind/hrm/templates/base/cat_filter.xsl
    branches/dev-syncromind/hrm/templates/base/cat_select.xsl
    branches/dev-syncromind/logistic/inc/class.menu.inc.php
    branches/dev-syncromind/logistic/inc/class.soactivity.inc.php
    branches/dev-syncromind/logistic/inc/class.socommon.inc.php
    branches/dev-syncromind/logistic/inc/class.soproject.inc.php
    branches/dev-syncromind/logistic/inc/class.sorequirement.inc.php
    
branches/dev-syncromind/logistic/inc/class.sorequirement_resource_allocation.inc.php
    branches/dev-syncromind/logistic/inc/class.sorequirement_value.inc.php
    
branches/dev-syncromind/logistic/inc/class.soresource_type_requirement.inc.php
    branches/dev-syncromind/logistic/inc/class.uiactivity.inc.php
    branches/dev-syncromind/logistic/inc/class.uiproject.inc.php
    branches/dev-syncromind/logistic/inc/class.uirequirement.inc.php
    
branches/dev-syncromind/logistic/inc/class.uirequirement_resource_allocation.inc.php
    
branches/dev-syncromind/logistic/inc/class.uiresource_type_requirement.inc.php
    branches/dev-syncromind/logistic/inc/model/class.activity.inc.php
    branches/dev-syncromind/logistic/inc/model/class.model.inc.php
    branches/dev-syncromind/logistic/inc/model/class.project.inc.php
    branches/dev-syncromind/logistic/inc/model/class.requirement.inc.php
    
branches/dev-syncromind/logistic/inc/model/class.requirement_resource_allocation.inc.php
    branches/dev-syncromind/logistic/inc/model/class.requirement_value.inc.php
    
branches/dev-syncromind/logistic/inc/model/class.resource_type_requirement.inc.php
    branches/dev-syncromind/logistic/js/logistic/activity.js
    branches/dev-syncromind/logistic/js/logistic/ajax.js
    branches/dev-syncromind/logistic/js/logistic/assign_job.js
    branches/dev-syncromind/logistic/js/logistic/project.js
    branches/dev-syncromind/logistic/js/logistic/requirement.js
    branches/dev-syncromind/logistic/js/logistic/requirement_overview.js
    branches/dev-syncromind/logistic/js/logistic/resource_allocation.js
    branches/dev-syncromind/logistic/js/logistic/resource_type_requirement.js
    branches/dev-syncromind/manual/help/EN/home.php
    branches/dev-syncromind/manual/help/EN/overview.php
    branches/dev-syncromind/manual/inc/class.bodocuments.inc.php
    branches/dev-syncromind/manual/inc/class.cat_hooks.inc.php
    branches/dev-syncromind/manual/inc/class.help.inc.php
    branches/dev-syncromind/manual/inc/class.help_helper.inc.php
    branches/dev-syncromind/manual/inc/class.menu.inc.php
    branches/dev-syncromind/manual/inc/class.uidocuments.inc.php
    branches/dev-syncromind/manual/inc/class.uimanual.inc.php
    branches/dev-syncromind/manual/inc/class.uisupport.inc.php
    branches/dev-syncromind/manual/inc/hook_help.inc.php
    branches/dev-syncromind/manual/inc/hook_sidebox_menu.inc.php
    branches/dev-syncromind/manual/index.php
    branches/dev-syncromind/manual/js/portico/documents.add.js
    branches/dev-syncromind/manual/js/portico/documents.view.js
    branches/dev-syncromind/manual/setup/default_records.inc.php
    branches/dev-syncromind/manual/setup/setup.inc.php
    branches/dev-syncromind/manual/setup/tables_update.inc.php
    branches/dev-syncromind/manual/templates/base/app_data.xsl
    branches/dev-syncromind/manual/templates/base/help.xsl
    branches/dev-syncromind/manual/templates/base/help_data.xsl
    branches/dev-syncromind/manual/templates/base/odt2html.xsl
    branches/dev-syncromind/manual/templates/base/odt2xhtml.xsl
    branches/dev-syncromind/manual/templates/base/support.xsl
    branches/dev-syncromind/manual/templates/base/sxw2xhtml.xsl
    branches/dev-syncromind/messenger/inc/class.bomessenger.inc.php
    branches/dev-syncromind/messenger/inc/class.hook_helper.inc.php
    branches/dev-syncromind/messenger/inc/class.menu.inc.php
    branches/dev-syncromind/messenger/inc/class.somessenger.inc.php
    branches/dev-syncromind/messenger/inc/class.somessenger_imap.inc.php
    branches/dev-syncromind/messenger/inc/class.somessenger_sql.inc.php
    branches/dev-syncromind/messenger/inc/class.uimessenger.inc.php
    branches/dev-syncromind/messenger/inc/hook_after_navbar.inc.php
    branches/dev-syncromind/messenger/inc/hook_config.inc.php
    branches/dev-syncromind/messenger/index.php
    branches/dev-syncromind/messenger/setup/default_records.inc.php
    branches/dev-syncromind/messenger/setup/setup.inc.php
    branches/dev-syncromind/messenger/setup/tables_baseline.inc.php
    branches/dev-syncromind/messenger/setup/tables_current.inc.php
    branches/dev-syncromind/messenger/setup/tables_update.inc.php
    branches/dev-syncromind/messenger/templates/base/app_data.xsl
    branches/dev-syncromind/messenger/templates/base/config.tpl
    branches/dev-syncromind/messenger/templates/base/form.tpl
    branches/dev-syncromind/messenger/templates/base/inbox.tpl
    branches/dev-syncromind/messenger/templates/base/messenger.xsl
    branches/dev-syncromind/mobilefrontend/controller/class.uicalendar.inc.php
    branches/dev-syncromind/mobilefrontend/controller/class.uicase.inc.php
    branches/dev-syncromind/mobilefrontend/controller/class.uicheck_list.inc.php
    
branches/dev-syncromind/mobilefrontend/controller/class.uicheck_list_for_component.inc.php
    branches/dev-syncromind/mobilefrontend/controller/class.uicomponent.inc.php
    branches/dev-syncromind/mobilefrontend/controller/class.uicontrol.inc.php
    
branches/dev-syncromind/mobilefrontend/controller/class.uicontrol_group.inc.php
    
branches/dev-syncromind/mobilefrontend/controller/class.uicontrol_group_component.inc.php
    
branches/dev-syncromind/mobilefrontend/controller/class.uicontrol_item.inc.php
    
branches/dev-syncromind/mobilefrontend/controller/class.uicontrol_register_to_component.inc.php
    
branches/dev-syncromind/mobilefrontend/controller/class.uicontrol_register_to_location.inc.php
    branches/dev-syncromind/mobilefrontend/controller/class.uidocument.inc.php
    branches/dev-syncromind/mobilefrontend/controller/class.uiprocedure.inc.php
    branches/dev-syncromind/mobilefrontend/home.php
    branches/dev-syncromind/mobilefrontend/inc/class.bocommon.inc.php
    branches/dev-syncromind/mobilefrontend/inc/class.hook_helper.inc.php
    branches/dev-syncromind/mobilefrontend/inc/class.menu.inc.php
    branches/dev-syncromind/mobilefrontend/inc/class.uifront.inc.php
    branches/dev-syncromind/mobilefrontend/index.php
    branches/dev-syncromind/mobilefrontend/login.php
    branches/dev-syncromind/mobilefrontend/logout.php
    branches/dev-syncromind/mobilefrontend/manual/class.uidocuments.inc.php
    branches/dev-syncromind/mobilefrontend/property/class.notify.inc.php
    
branches/dev-syncromind/mobilefrontend/property/class.uicondition_survey.inc.php
    branches/dev-syncromind/mobilefrontend/property/class.uidocument.inc.php
    branches/dev-syncromind/mobilefrontend/property/class.uientity.inc.php
    branches/dev-syncromind/mobilefrontend/property/class.uilocation.inc.php
    branches/dev-syncromind/mobilefrontend/property/class.uilookup.inc.php
    branches/dev-syncromind/mobilefrontend/property/class.uirequest.inc.php
    branches/dev-syncromind/mobilefrontend/property/class.uitts.inc.php
    branches/dev-syncromind/mobilefrontend/setup/setup.inc.php
    branches/dev-syncromind/mobilefrontend/setup/tables_update.inc.php
    branches/dev-syncromind/mobilefrontend/templates/base/app_data.xsl
    branches/dev-syncromind/mobilefrontend/templates/mobilefrontend/app_data.xsl
    
branches/dev-syncromind/mobilefrontend/templates/mobilefrontend/hello_world.xsl
    branches/dev-syncromind/phpgwapi/inc/class.common.inc.php
    branches/dev-syncromind/phpgwapi/inc/class.db.inc.php
    branches/dev-syncromind/phpgwapi/inc/class.db_pdo.inc.php
    branches/dev-syncromind/phpgwapi/inc/class.jquery.inc.php
    branches/dev-syncromind/phpgwapi/inc/class.log.inc.php
    branches/dev-syncromind/phpgwapi/inc/class.menu.inc.php
    branches/dev-syncromind/phpgwapi/inc/class.phpgw.inc.php
    branches/dev-syncromind/phpgwapi/inc/class.sessions.inc.php
    branches/dev-syncromind/phpgwapi/inc/class.uicommon_jquery.inc.php
    branches/dev-syncromind/phpgwapi/inc/class.xslttemplates.inc.php
    branches/dev-syncromind/phpgwapi/inc/functions.inc.php
    
branches/dev-syncromind/phpgwapi/inc/htmlpurifier/HTMLPurifier/AttrDef/CSS/Multiple.php
    
branches/dev-syncromind/phpgwapi/inc/htmlpurifier/HTMLPurifier/AttrDef/HTML/Bool.php
    
branches/dev-syncromind/phpgwapi/inc/htmlpurifier/HTMLPurifier/CSSDefinition.php
    branches/dev-syncromind/phpgwapi/inc/htmlpurifier/HTMLPurifier/Config.php
    
branches/dev-syncromind/phpgwapi/inc/htmlpurifier/HTMLPurifier/ConfigSchema/schema/HTML.CustomDoctype.txt
    
branches/dev-syncromind/phpgwapi/inc/htmlpurifier/HTMLPurifier/ConfigSchema/schema.ser
    
branches/dev-syncromind/phpgwapi/inc/htmlpurifier/HTMLPurifier/DefinitionCache/Serializer.php
    
branches/dev-syncromind/phpgwapi/inc/htmlpurifier/HTMLPurifier/Filter/YouTube.php
    
branches/dev-syncromind/phpgwapi/inc/htmlpurifier/HTMLPurifier/Injector/RemoveEmpty.php
    
branches/dev-syncromind/phpgwapi/inc/htmlpurifier/HTMLPurifier/Lexer/DOMLex.php
    
branches/dev-syncromind/phpgwapi/inc/htmlpurifier/HTMLPurifier/Lexer/PH5P.php
    branches/dev-syncromind/phpgwapi/inc/htmlpurifier/HTMLPurifier.composer.php
    branches/dev-syncromind/phpgwapi/inc/htmlpurifier/HTMLPurifier.includes.php
    branches/dev-syncromind/phpgwapi/inc/htmlpurifier/HTMLPurifier.php
    branches/dev-syncromind/phpgwapi/js/jquery/common.js
    branches/dev-syncromind/phpgwapi/js/jscalendar/lang/calendar-al.js
    branches/dev-syncromind/phpgwapi/js/jscalendar/lang/calendar-he-utf8.js
    branches/dev-syncromind/phpgwapi/js/tinybox2/style.css
    branches/dev-syncromind/phpgwapi/js/tinymce/utils/validate.js
    branches/dev-syncromind/phpgwapi/setup/phpgw_no.lang
    branches/dev-syncromind/phpgwapi/templates/activitycalendar/css/frontend.css
    branches/dev-syncromind/phpgwapi/templates/activitycalendar/head.tpl
    
branches/dev-syncromind/phpgwapi/templates/activitycalendar/images/newlayout/logo.png
    branches/dev-syncromind/phpgwapi/templates/base/css/base.css
    branches/dev-syncromind/phpgwapi/templates/base/datatable_inline.xsl
    branches/dev-syncromind/phpgwapi/templates/base/datatable_jquery.xsl
    branches/dev-syncromind/phpgwapi/templates/bkbooking/css/frontend.css
    branches/dev-syncromind/phpgwapi/templates/bkbooking/head.tpl
    
branches/dev-syncromind/phpgwapi/templates/bkbooking/images/newlayout/logo.png
    branches/dev-syncromind/phpgwapi/templates/desktop/head.tpl
    branches/dev-syncromind/phpgwapi/templates/idots/head.tpl
    branches/dev-syncromind/phpgwapi/templates/idsociety/head.tpl
    branches/dev-syncromind/phpgwapi/templates/linux-at-work.de/head.tpl
    branches/dev-syncromind/phpgwapi/templates/mobilefrontend/head.tpl
    branches/dev-syncromind/phpgwapi/templates/portico/head.inc.php
    branches/dev-syncromind/phpgwapi/templates/portico/head.tpl
    branches/dev-syncromind/phpgwapi/templates/portico/js/base.js
    branches/dev-syncromind/phpgwapi/templates/portico/navbar.inc.php
    branches/dev-syncromind/phpgwapi/templates/probusiness/head.tpl
    branches/dev-syncromind/phpgwapi/templates/pure/css/demo_mmenu.css
    branches/dev-syncromind/phpgwapi/templates/pure/head.inc.php
    branches/dev-syncromind/phpgwapi/templates/pure/head.tpl
    branches/dev-syncromind/phpgwapi/templates/pure/navbar.inc.php
    branches/dev-syncromind/phpgwapi/templates/simple/head.tpl
    branches/dev-syncromind/phpgwapi/templates/verdilak/head.tpl
    branches/dev-syncromind/preferences/inc/hook_settings.inc.php
    branches/dev-syncromind/preferences/preferences.php
    branches/dev-syncromind/preferences/templates/base/admin_acl.xsl
    branches/dev-syncromind/preferences/templates/base/cat_filter.xsl
    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.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/estimert_ferdigdato_til_leieobjekt_BBB.php
    
branches/dev-syncromind/property/inc/custom/default/hent_maaler_nr_til_besikt_rapport.php
    
branches/dev-syncromind/property/inc/custom/default/innflyttetdato_entity_2_11_BBB.php
    
branches/dev-syncromind/property/inc/custom/default/kalkuler_risiko_for_ros.php
    
branches/dev-syncromind/property/inc/custom/default/ticket_NLSH_pre_commit_validate.php
    branches/dev-syncromind/property/inc/custom/default/ticket_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_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/js/core/check.js
    branches/dev-syncromind/property/js/dateformat/dateformat.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.obligations.js
    branches/dev-syncromind/property/js/portico/condition_survey.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/investment.history.js
    branches/dev-syncromind/property/js/portico/investment.index.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/notify.js
    branches/dev-syncromind/property/js/portico/pricebook.index.js
    branches/dev-syncromind/property/js/portico/project.edit.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/setup/default_records.inc.php
    branches/dev-syncromind/property/setup/phpgw_no.lang
    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/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/budget.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/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/css/base.css
    branches/dev-syncromind/property/templates/base/custom.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/filter_member_of.xsl
    branches/dev-syncromind/property/templates/base/generic.xsl
    branches/dev-syncromind/property/templates/base/invoice.xsl
    branches/dev-syncromind/property/templates/base/invoice2.xsl
    branches/dev-syncromind/property/templates/base/location_form2.xsl
    branches/dev-syncromind/property/templates/base/lookup.entity.xsl
    branches/dev-syncromind/property/templates/base/project.xsl
    branches/dev-syncromind/property/templates/base/s_agreement.xsl
    branches/dev-syncromind/property/templates/base/tenant_claim.xsl
    branches/dev-syncromind/property/templates/base/tts.xsl
    branches/dev-syncromind/property/templates/base/user_id_select.xsl
    branches/dev-syncromind/property/templates/base/wo_hour.xsl
    branches/dev-syncromind/property/templates/base/workorder.xsl
    branches/dev-syncromind/registration/inc/class.bomanagefields.inc.php
    branches/dev-syncromind/registration/inc/class.bopending.inc.php
    branches/dev-syncromind/registration/inc/class.boreg.inc.php
    branches/dev-syncromind/registration/inc/class.hook_helper.inc.php
    branches/dev-syncromind/registration/inc/class.menu.inc.php
    branches/dev-syncromind/registration/inc/class.somanagefields.inc.php
    branches/dev-syncromind/registration/inc/class.sopending.inc.php
    branches/dev-syncromind/registration/inc/class.soreg.inc.php
    branches/dev-syncromind/registration/inc/class.uimanagefields.inc.php
    branches/dev-syncromind/registration/inc/class.uipending.inc.php
    branches/dev-syncromind/registration/inc/class.uireg.inc.php
    branches/dev-syncromind/registration/inc/hook_admin.inc.php
    branches/dev-syncromind/registration/inc/hook_config.inc.php
    branches/dev-syncromind/registration/inc/hook_logout.inc.php
    branches/dev-syncromind/registration/index.php
    branches/dev-syncromind/registration/js/portico/ajax.js
    branches/dev-syncromind/registration/js/portico/pending.index.js
    branches/dev-syncromind/registration/main.php
    branches/dev-syncromind/registration/setup/default_records.inc.php
    branches/dev-syncromind/registration/setup/setup.inc.php
    branches/dev-syncromind/registration/setup/tables_baseline.inc.php
    branches/dev-syncromind/registration/setup/tables_current.inc.php
    branches/dev-syncromind/registration/setup/tables_update.inc.php
    branches/dev-syncromind/registration/templates/base/app_data.xsl
    branches/dev-syncromind/registration/templates/base/config.tpl
    branches/dev-syncromind/registration/templates/base/confirm_email.tpl
    branches/dev-syncromind/registration/templates/base/css/base.css
    branches/dev-syncromind/registration/templates/base/error_confirm.tpl
    branches/dev-syncromind/registration/templates/base/error_general.tpl
    branches/dev-syncromind/registration/templates/base/fields.tpl
    branches/dev-syncromind/registration/templates/base/layout.tpl
    branches/dev-syncromind/registration/templates/base/lostpw_change.tpl
    branches/dev-syncromind/registration/templates/base/lostpw_email.tpl
    branches/dev-syncromind/registration/templates/base/personal_info.tpl
    branches/dev-syncromind/rental/inc/SnappyMedia.php
    branches/dev-syncromind/rental/inc/class.bofellesdata.inc.php
    branches/dev-syncromind/rental/inc/class.hook_helper.inc.php
    branches/dev-syncromind/rental/inc/class.menu.inc.php
    branches/dev-syncromind/rental/inc/class.soadjustment.inc.php
    branches/dev-syncromind/rental/inc/class.sobilling.inc.php
    branches/dev-syncromind/rental/inc/class.sobilling_info.inc.php
    branches/dev-syncromind/rental/inc/class.socommon.inc.php
    branches/dev-syncromind/rental/inc/class.socomposite.inc.php
    branches/dev-syncromind/rental/inc/class.socontract.inc.php
    branches/dev-syncromind/rental/inc/class.socontract_price_item.inc.php
    branches/dev-syncromind/rental/inc/class.sodocument.inc.php
    branches/dev-syncromind/rental/inc/class.soinvoice.inc.php
    branches/dev-syncromind/rental/inc/class.soinvoice_price_item.inc.php
    branches/dev-syncromind/rental/inc/class.sonotification.inc.php
    branches/dev-syncromind/rental/inc/class.soparty.inc.php
    branches/dev-syncromind/rental/inc/class.soprice_item.inc.php
    branches/dev-syncromind/rental/inc/class.sounit.inc.php
    branches/dev-syncromind/rental/inc/class.soworkbench_notification.inc.php
    branches/dev-syncromind/rental/inc/class.uiadjustment.inc.php
    branches/dev-syncromind/rental/inc/class.uibilling.inc.php
    branches/dev-syncromind/rental/inc/class.uicommon.inc.php
    branches/dev-syncromind/rental/inc/class.uicomposite.inc.php
    branches/dev-syncromind/rental/inc/class.uicontract.inc.php
    branches/dev-syncromind/rental/inc/class.uidelegate.inc.php
    branches/dev-syncromind/rental/inc/class.uidocument.inc.php
    branches/dev-syncromind/rental/inc/class.uifrontpage.inc.php
    branches/dev-syncromind/rental/inc/class.uiimport.inc.php
    branches/dev-syncromind/rental/inc/class.uiinvoice_price_item.inc.php
    branches/dev-syncromind/rental/inc/class.uimakepdf.inc.php
    branches/dev-syncromind/rental/inc/class.uinotification.inc.php
    branches/dev-syncromind/rental/inc/class.uiparty.inc.php
    branches/dev-syncromind/rental/inc/class.uiprice_item.inc.php
    branches/dev-syncromind/rental/inc/class.uiproperty_location.inc.php
    branches/dev-syncromind/rental/inc/class.uiresultunit.inc.php
    branches/dev-syncromind/rental/inc/class.uiunit.inc.php
    
branches/dev-syncromind/rental/inc/custom/default/NLSH_add_contract_from_composite.php
    branches/dev-syncromind/rental/inc/export/default/customer.php
    branches/dev-syncromind/rental/inc/hook_config.inc.php
    branches/dev-syncromind/rental/inc/locations/class.city_counsil_dep.inc.php
    
branches/dev-syncromind/rental/inc/locations/class.location_hierarchy.inc.php
    
branches/dev-syncromind/rental/inc/locations/class.organisational_location.inc.php
    branches/dev-syncromind/rental/inc/locations/class.result_unit.inc.php
    branches/dev-syncromind/rental/inc/model/class.adjustment.inc.php
    branches/dev-syncromind/rental/inc/model/class.agresso_cs15.inc.php
    branches/dev-syncromind/rental/inc/model/class.agresso_gl07.inc.php
    branches/dev-syncromind/rental/inc/model/class.agresso_lg04.inc.php
    branches/dev-syncromind/rental/inc/model/class.billing.inc.php
    branches/dev-syncromind/rental/inc/model/class.billing_info.inc.php
    branches/dev-syncromind/rental/inc/model/class.composite.inc.php
    branches/dev-syncromind/rental/inc/model/class.contract.inc.php
    branches/dev-syncromind/rental/inc/model/class.contract_date.inc.php
    branches/dev-syncromind/rental/inc/model/class.contract_price_item.inc.php
    branches/dev-syncromind/rental/inc/model/class.default_export.inc.php
    branches/dev-syncromind/rental/inc/model/class.document.inc.php
    branches/dev-syncromind/rental/inc/model/class.exportable.inc.php
    branches/dev-syncromind/rental/inc/model/class.invoice.inc.php
    branches/dev-syncromind/rental/inc/model/class.invoice_price_item.inc.php
    branches/dev-syncromind/rental/inc/model/class.model.inc.php
    branches/dev-syncromind/rental/inc/model/class.notification.inc.php
    branches/dev-syncromind/rental/inc/model/class.party.inc.php
    branches/dev-syncromind/rental/inc/model/class.price_item.inc.php
    branches/dev-syncromind/rental/inc/model/class.property_location.inc.php
    branches/dev-syncromind/rental/inc/model/class.unit.inc.php
    branches/dev-syncromind/rental/inc/model/class.validator.inc.php
    branches/dev-syncromind/rental/inc/plugins/fellesdata/party.edit.php
    branches/dev-syncromind/rental/index.php
    branches/dev-syncromind/rental/js/rental/billing.add.js
    branches/dev-syncromind/rental/js/rental/billing.index.js
    branches/dev-syncromind/rental/js/rental/composite.edit.js
    branches/dev-syncromind/rental/js/rental/composite.view.js
    branches/dev-syncromind/rental/js/rental/contract.edit.js
    branches/dev-syncromind/rental/js/rental/contract.index.js
    branches/dev-syncromind/rental/js/rental/frontpage.index.js
    branches/dev-syncromind/rental/js/rental/party.edit.js
    branches/dev-syncromind/rental/js/rental/party.sync.js
    branches/dev-syncromind/rental/js/rental/price_item.adjust_price.js
    branches/dev-syncromind/rental/js/rental/resultunit.edit.js
    branches/dev-syncromind/rental/setup/default_records.inc.php
    branches/dev-syncromind/rental/setup/phpgw_no.lang
    branches/dev-syncromind/rental/setup/tables_current.inc.php
    branches/dev-syncromind/rental/setup/tables_update.inc.php
    branches/dev-syncromind/rental/templates/base/billing.xsl
    branches/dev-syncromind/rental/templates/base/composite.xsl
    branches/dev-syncromind/rental/templates/base/contract.xsl
    branches/dev-syncromind/rental/templates/base/css/base.css
    branches/dev-syncromind/rental/templates/base/party.xsl
    branches/dev-syncromind/sms/addressbook.php
    branches/dev-syncromind/sms/bin/default/config_BR
    branches/dev-syncromind/sms/bin/default/config_BR_log
    branches/dev-syncromind/sms/bin/default/config_SD
    branches/dev-syncromind/sms/bin/default/config_SD_log
    branches/dev-syncromind/sms/bin/default/config_ST
    branches/dev-syncromind/sms/bin/default/config_STATUS_log
    branches/dev-syncromind/sms/bin/default/config_ST_log
    branches/dev-syncromind/sms/bin/default/config_VASK
    branches/dev-syncromind/sms/bin/default/config_VASK_log
    branches/dev-syncromind/sms/bin/default/log_firealarm.php
    branches/dev-syncromind/sms/bin/default/receipt_service_agreement.php
    branches/dev-syncromind/sms/bin/default/set_workorder_status.php
    branches/dev-syncromind/sms/inc/class.boautoreply.inc.php
    branches/dev-syncromind/sms/inc/class.bocommand.inc.php
    branches/dev-syncromind/sms/inc/class.bocommon.inc.php
    branches/dev-syncromind/sms/inc/class.bopoll.inc.php
    branches/dev-syncromind/sms/inc/class.bosms.inc.php
    branches/dev-syncromind/sms/inc/class.menu.inc.php
    branches/dev-syncromind/sms/inc/class.sms.inc.php
    branches/dev-syncromind/sms/inc/class.soautoreply.inc.php
    branches/dev-syncromind/sms/inc/class.socommand.inc.php
    branches/dev-syncromind/sms/inc/class.sopoll.inc.php
    branches/dev-syncromind/sms/inc/class.sosms.inc.php
    branches/dev-syncromind/sms/inc/class.uiautoreply.inc.php
    branches/dev-syncromind/sms/inc/class.uiboard.inc.php
    branches/dev-syncromind/sms/inc/class.uicommand.inc.php
    branches/dev-syncromind/sms/inc/class.uicustom.inc.php
    branches/dev-syncromind/sms/inc/class.uipoll.inc.php
    branches/dev-syncromind/sms/inc/class.uisms.inc.php
    branches/dev-syncromind/sms/inc/config.php
    branches/dev-syncromind/sms/inc/feedcreator.class.php
    branches/dev-syncromind/sms/inc/hook_admin.inc.php
    branches/dev-syncromind/sms/inc/hook_preferences.inc.php
    branches/dev-syncromind/sms/inc/hook_settings.inc.php
    branches/dev-syncromind/sms/inc/plugin/gateway/bergen_kommune/SmsService.php
    branches/dev-syncromind/sms/inc/plugin/gateway/bergen_kommune/get.php
    branches/dev-syncromind/sms/inc/plugin/gateway/bergen_kommune/send.php
    branches/dev-syncromind/sms/inc/plugin/gateway/carrot/SMSGatewayService.php
    branches/dev-syncromind/sms/inc/plugin/gateway/carrot/fn.php
    branches/dev-syncromind/sms/inc/plugin/gateway/carrot/get.php
    branches/dev-syncromind/sms/inc/plugin/gateway/carrot/send.php
    branches/dev-syncromind/sms/inc/plugin/gateway/clickatell/callback.php
    branches/dev-syncromind/sms/inc/plugin/gateway/clickatell/config.php
    branches/dev-syncromind/sms/inc/plugin/gateway/clickatell/fn.php
    branches/dev-syncromind/sms/inc/plugin/gateway/clickatell/manage.php
    branches/dev-syncromind/sms/inc/plugin/gateway/gnokii/fn.php
    branches/dev-syncromind/sms/inc/plugin/gateway/gnokii/get.php
    branches/dev-syncromind/sms/inc/plugin/gateway/gnokii/send.php
    branches/dev-syncromind/sms/inc/plugin/gateway/kannel/config.php
    branches/dev-syncromind/sms/inc/plugin/gateway/kannel/dlr.php
    branches/dev-syncromind/sms/inc/plugin/gateway/kannel/fn.php
    branches/dev-syncromind/sms/inc/plugin/gateway/kannel/geturl.php
    branches/dev-syncromind/sms/inc/plugin/gateway/kannel/manage.php
    branches/dev-syncromind/sms/inc/plugin/gateway/pswin/SMSReceive.php
    branches/dev-syncromind/sms/inc/plugin/gateway/pswin/SMSService.php
    branches/dev-syncromind/sms/inc/plugin/gateway/pswin/get.php
    branches/dev-syncromind/sms/inc/plugin/gateway/pswin/send.php
    branches/dev-syncromind/sms/inc/plugin/gateway/pswin/soap.php
    branches/dev-syncromind/sms/inc/plugin/gateway/template/config.php
    branches/dev-syncromind/sms/inc/plugin/gateway/template/fn.php
    branches/dev-syncromind/sms/inc/plugin/gateway/template/manage.php
    branches/dev-syncromind/sms/inc/plugin/gateway/uplink/config.php
    branches/dev-syncromind/sms/inc/plugin/gateway/uplink/fn.php
    branches/dev-syncromind/sms/inc/plugin/gateway/uplink/manage.php
    branches/dev-syncromind/sms/index.php
    branches/dev-syncromind/sms/init.php
    branches/dev-syncromind/sms/setup/bin/phpgwsmsd
    branches/dev-syncromind/sms/setup/bin/phpgwsmsd.php
    branches/dev-syncromind/sms/setup/default_records.inc.php
    branches/dev-syncromind/sms/setup/setup.inc.php
    branches/dev-syncromind/sms/setup/tables_current.inc.php
    branches/dev-syncromind/sms/setup/tables_update.inc.php
    branches/dev-syncromind/sms/templates/base/app_data.xsl
    branches/dev-syncromind/sms/templates/base/app_delete.xsl
    branches/dev-syncromind/sms/templates/base/autoreply.xsl
    branches/dev-syncromind/sms/templates/base/cat_filter.xsl
    branches/dev-syncromind/sms/templates/base/cat_select.xsl
    branches/dev-syncromind/sms/templates/base/command.xsl
    branches/dev-syncromind/sms/templates/base/config.tpl
    branches/dev-syncromind/sms/templates/base/filter_filter.xsl
    branches/dev-syncromind/sms/templates/base/menu.xsl
    branches/dev-syncromind/sms/templates/base/nextmatchs.xsl
    branches/dev-syncromind/sms/templates/base/no_access.xsl
    branches/dev-syncromind/sms/templates/base/poll.xsl
    branches/dev-syncromind/sms/templates/base/search_field.xsl
    branches/dev-syncromind/sms/templates/base/sms.xsl
    branches/dev-syncromind/sms/templates/verdilak/app_data.xsl

Added Paths:
-----------
    branches/dev-syncromind/booking/js/booking/completed_reservation_export.js
    
branches/dev-syncromind/phpgwapi/inc/htmlpurifier/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveEmpty.Predicate.txt
    branches/dev-syncromind/phpgwapi/js/contextMenu/
    branches/dev-syncromind/phpgwapi/js/contextMenu/font/
    branches/dev-syncromind/phpgwapi/js/contextMenu/font/context-menu-icons.eot
    branches/dev-syncromind/phpgwapi/js/contextMenu/font/context-menu-icons.ttf
    branches/dev-syncromind/phpgwapi/js/contextMenu/font/context-menu-icons.woff
    
branches/dev-syncromind/phpgwapi/js/contextMenu/font/context-menu-icons.woff2
    branches/dev-syncromind/phpgwapi/js/contextMenu/jquery.contextMenu.css
    branches/dev-syncromind/phpgwapi/js/contextMenu/jquery.contextMenu.js
    branches/dev-syncromind/phpgwapi/js/contextMenu/jquery.contextMenu.min.css
    
branches/dev-syncromind/phpgwapi/js/contextMenu/jquery.contextMenu.min.css.map
    branches/dev-syncromind/phpgwapi/js/contextMenu/jquery.contextMenu.min.js
    
branches/dev-syncromind/phpgwapi/js/contextMenu/jquery.contextMenu.min.js.map
    branches/dev-syncromind/phpgwapi/js/contextMenu/jquery.ui.position.js
    branches/dev-syncromind/phpgwapi/js/contextMenu/jquery.ui.position.min.js
    branches/dev-syncromind/phpgwapi/js/jszip/
    branches/dev-syncromind/phpgwapi/js/jszip/jszip.js
    branches/dev-syncromind/phpgwapi/js/jszip/jszip.min.js
    
branches/dev-syncromind/phpgwapi/templates/activitycalendar/images/newlayout/logo_bk.svg
    
branches/dev-syncromind/phpgwapi/templates/bkbooking/images/newlayout/logo_bk.svg
    branches/dev-syncromind/preferences/templates/base/css/
    branches/dev-syncromind/preferences/templates/base/css/base.css

Removed Paths:
-------------
    branches/dev-syncromind/phpgwapi/js/jscalendar/lang/calendar-hr.js

Modified: branches/dev-syncromind/activitycalendar/inc/class.soactivity.inc.php
===================================================================
--- branches/dev-syncromind/activitycalendar/inc/class.soactivity.inc.php       
2016-04-09 11:19:48 UTC (rev 14910)
+++ branches/dev-syncromind/activitycalendar/inc/class.soactivity.inc.php       
2016-04-09 11:40:37 UTC (rev 14911)
@@ -73,7 +73,7 @@
                 */
                public static function get_instance()
                {
-                       if(self::$so == null)
+                       if (self::$so == null)
                        {
                                self::$so = 
CreateObject('activitycalendar.soactivity');
                        }
@@ -94,14 +94,14 @@
                 * @param boolean $return_count
                 * @return string SQL
                 */
-               protected function get_query(string $sort_field, boolean 
$ascending, string $search_for, string $search_type, array $filters, boolean 
$return_count)
+               protected function get_query( string $sort_field, boolean 
$ascending, string $search_for, string $search_type, array $filters, boolean 
$return_count )
                {
                        $clauses = array('1=1');
 
                        //Add columns to this array to include them in the query
                        $columns = array();
 
-                       if($sort_field != null)
+                       if ($sort_field != null)
                        {
                                $dir     = $ascending ? 'ASC' : 'DESC';
                                //$order = "ORDER BY id $dir";
@@ -114,12 +114,12 @@
                          } */
                        //var_dump($search_type);
                        //var_dump($search_for);
-                       if($search_for)
+                       if ($search_for)
                        {
                                $query                   = 
$this->marshal($search_for, 'string');
                                $like_pattern    = "'%" . $search_for . "%'";
                                $like_clauses    = array();
-                               switch($search_type)
+                               switch ($search_type)
                                {
                                        case "name":
                                                $like_clauses[]  = 
"party.first_name $this->like $like_pattern";
@@ -148,7 +148,7 @@
                                }
 
 
-                               if(count($like_clauses))
+                               if (count($like_clauses))
                                {
                                        $clauses[] = '(' . join(' OR ', 
$like_clauses) . ')';
                                }
@@ -156,35 +156,35 @@
 
                        $filter_clauses = array();
 
-                       if(isset($filters[$this->get_id_field_name()]))
+                       if (isset($filters[$this->get_id_field_name()]))
                        {
                                $id                                      = 
$this->marshal($filters[$this->get_id_field_name()], 'int');
                                $filter_clauses[]        = "activity.id = 
{$id}";
                        }
-                       if(isset($filters['new_activities']))
+                       if (isset($filters['new_activities']))
                        {
-                               if(!isset($filters['activity_state']) || 
(isset($filters['activity_state']) && $filters['activity_state'] == 'all'))
+                               if (!isset($filters['activity_state']) || 
(isset($filters['activity_state']) && $filters['activity_state'] == 'all'))
                                {
                                        $filter_clauses[] = "(activity.state=1 
OR activity.state=2)";
                                }
-                               if(isset($filters['activity_state']) && 
$filters['activity_state'] != 'all')
+                               if (isset($filters['activity_state']) && 
$filters['activity_state'] != 'all')
                                {
                                        $activity_state          = 
$this->marshal($filters['activity_state'], 'int');
                                        $filter_clauses[]        = 
"activity.state = {$activity_state}";
                                }
-                               if(isset($filters['activity_org']) && 
$filters['activity_org'] != '0')
+                               if (isset($filters['activity_org']) && 
$filters['activity_org'] != '0')
                                {
                                        $activity_org            = 
$this->marshal($filters['activity_org'], 'int');
                                        $filter_clauses[]        = 
"activity.organization_id = {$activity_org}";
                                }
-                               if(isset($filters['activity_category']) && 
$filters['activity_category'] != 'all')
+                               if (isset($filters['activity_category']) && 
$filters['activity_category'] != 'all')
                                {
                                        $activity_category       = 
$this->marshal($filters['activity_category'], 'int');
                                        $filter_clauses[]        = 
"activity.category = {$activity_category}";
                                }
-                               if(isset($filters['activity_district']))
+                               if (isset($filters['activity_district']))
                                {
-                                       if($filters['activity_district'] != 
'all')
+                                       if ($filters['activity_district'] != 
'all')
                                        {
                                                $activity_district       = 
$this->marshal($filters['activity_district'], 'int');
                                                $filter_clauses[]        = 
"activity.office = '{$activity_district}'";
@@ -193,11 +193,11 @@
                                else
                                {
                                        $activity_district = 
$this->get_office_from_user($filters['user_id']);
-                                       if($activity_district && 
$activity_district != '')
+                                       if ($activity_district && 
$activity_district != '')
                                        {
-                                               if($activity_district == 1)
+                                               if ($activity_district == 1)
                                                        $activity_district_corr 
 = 2;
-                                               else if($activity_district == 2)
+                                               else if ($activity_district == 
2)
                                                        $activity_district_corr 
 = 1;
                                                else
                                                        $activity_district_corr 
 = (int)$activity_district;
@@ -205,7 +205,7 @@
                                                $filter_clauses[] = 
"activity.office = '{$activity_district_corr}'";
                                        }
                                }
-                               if(isset($filters['updated_date_hidden']) && 
$filters['updated_date_hidden'] != "")
+                               if (isset($filters['updated_date_hidden']) && 
$filters['updated_date_hidden'] != "")
                                {
                                        $ts_query                        = 
strtotime($filters['updated_date_hidden']); // target timestamp specified by 
user
                                        $filter_clauses[]        = 
"activity.last_change_date < {$ts_query}";
@@ -213,24 +213,24 @@
                        }
                        else
                        {
-                               if(isset($filters['activity_state']) && 
$filters['activity_state'] != 'all')
+                               if (isset($filters['activity_state']) && 
$filters['activity_state'] != 'all')
                                {
                                        $activity_state          = 
$this->marshal($filters['activity_state'], 'int');
                                        $filter_clauses[]        = 
"activity.state = {$activity_state}";
                                }
-                               if(isset($filters['activity_org']) && 
$filters['activity_org'] != '0')
+                               if (isset($filters['activity_org']) && 
$filters['activity_org'] != '0')
                                {
                                        $activity_org            = 
$this->marshal($filters['activity_org'], 'int');
                                        $filter_clauses[]        = 
"activity.organization_id = {$activity_org}";
                                }
-                               if(isset($filters['activity_category']) && 
$filters['activity_category'] != 'all')
+                               if (isset($filters['activity_category']) && 
$filters['activity_category'] != 'all')
                                {
                                        $activity_category       = 
$this->marshal($filters['activity_category'], 'int');
                                        $filter_clauses[]        = 
"activity.category = {$activity_category}";
                                }
-                               if(isset($filters['activity_district']))
+                               if (isset($filters['activity_district']))
                                {
-                                       if($filters['activity_district'] != 
'all')
+                                       if ($filters['activity_district'] != 
'all')
                                        {
                                                $activity_district       = 
$this->marshal($filters['activity_district'], 'int');
                                                $filter_clauses[]        = 
"activity.office = '{$activity_district}'";
@@ -239,31 +239,31 @@
                                else
                                {
                                        $activity_district = 
$this->get_office_from_user($filters['user_id']);
-                                       if($activity_district && 
$activity_district != '')
+                                       if ($activity_district && 
$activity_district != '')
                                        {
-                                               if($activity_district == 1)
+                                               if ($activity_district == 1)
                                                        $activity_district      
 = 2;
-                                               else if($activity_district == 2)
+                                               else if ($activity_district == 
2)
                                                        $activity_district      
 = 1;
 
                                                $filter_clauses[] = 
"activity.office = '{$activity_district}'";
                                        }
                                }
-                               if(isset($filters['updated_date_hidden']) && 
$filters['updated_date_hidden'] != "")
+                               if (isset($filters['updated_date_hidden']) && 
$filters['updated_date_hidden'] != "")
                                {
                                        $ts_query                        = 
strtotime($filters['updated_date_hidden']); // target timestamp specified by 
user
                                        $filter_clauses[]        = 
"activity.last_change_date < {$ts_query}";
                                }
                        }
 
-                       if(count($filter_clauses))
+                       if (count($filter_clauses))
                        {
                                $clauses[] = join(' AND ', $filter_clauses);
                        }
 
                        $condition = join(' AND ', $clauses);
 
-                       if($return_count) // We should only return a count
+                       if ($return_count) // We should only return a count
                        {
                                $cols = 'COUNT(DISTINCT(activity.id)) AS count';
                        }
@@ -311,7 +311,7 @@
                 * @param activitycalendar_activity $activity the party to be 
added
                 * @return bool true if successful, false otherwise
                 */
-               function add(&$activity)
+               function add( &$activity )
                {
                        // Insert a new activity
                        $ts_now  = strtotime('now');
@@ -319,7 +319,7 @@
                        $q               = "INSERT INTO activity_activity 
(title, create_date,secret) VALUES ('tmptitle', $ts_now, '{$secret}')";
                        $result  = $this->db->query($q, __LINE__, __FILE__);
 
-                       if(isset($result))
+                       if (isset($result))
                        {
                                // Set the new party ID
                                
$activity->set_id($this->db->get_last_insert_id('activity_activity', 'id'));
@@ -338,7 +338,7 @@
                 * @param $activity the activity to be updated
                 * @return boolean true if successful, false otherwise
                 */
-               function update($activity)
+               function update( $activity )
                {
                        $id              = intval($activity->get_id());
                        $ts_now  = strtotime('now');
@@ -373,7 +373,7 @@
                        return isset($result);
                }
 
-               function import_activity($activity)
+               function import_activity( $activity )
                {
                        $id              = intval($activity->get_id());
                        $ts_now  = strtotime('now');
@@ -429,9 +429,9 @@
                        return isset($result);
                }
 
-               public function get_id_field_name($extended_info = false)
+               public function get_id_field_name( $extended_info = false )
                {
-                       if(!$extended_info)
+                       if (!$extended_info)
                        {
                                $ret = 'id';
                        }
@@ -447,10 +447,10 @@
                        return $ret;
                }
 
-               protected function populate(int $activity_id, &$activity)
+               protected function populate( int $activity_id, &$activity )
                {
 
-                       if($activity == null)
+                       if ($activity == null)
                        {
                                $activity = new 
activitycalendar_activity((int)$activity_id);
 
@@ -475,9 +475,9 @@
                                
$activity->set_new_org($this->unmarshal($this->db->f('new_org', 'bool')));
                                
$activity->set_new_group($this->unmarshal($this->db->f('new_group', 'bool')));
 
-                               if($activity->get_group_id() && 
$activity->get_group_id() > 0)
+                               if ($activity->get_group_id() && 
$activity->get_group_id() > 0)
                                {
-                                       if($activity->get_new_group())
+                                       if ($activity->get_new_group())
                                        {
                                                $contacts = 
activitycalendar_sogroup::get_instance()->get_contacts_local($activity->get_group_id());
                                                
$activity->set_contact_persons($contacts);
@@ -492,9 +492,9 @@
                                                
$activity->set_organization_id($org_tmp);
                                        }
                                }
-                               else if($activity->get_organization_id() && 
$activity->get_organization_id() > 0)
+                               else if ($activity->get_organization_id() && 
$activity->get_organization_id() > 0)
                                {
-                                       if($activity->get_new_org())
+                                       if ($activity->get_new_org())
                                        {
                                                $contacts = 
activitycalendar_soorganization::get_instance()->get_contacts_local($activity->get_organization_id());
                                                
$activity->set_contact_persons($contacts);
@@ -510,18 +510,17 @@
                        return $activity;
                }
 
-               function get_category_name($category_id)
+               function get_category_name( $category_id )
                {
                        $result = "Ingen";
-                       if($category_id != null)
+                       $category_id = (int)$category_id;
+                       if ($category_id)
                        {
-                               $sql = "SELECT name FROM bb_activity where 
id=$category_id";
+                               $sql = "SELECT name FROM bb_activity where 
id={$category_id}";
                                $this->db->query($sql, __LINE__, __FILE__);
-                               while($this->db->next_record())
-                               {
+                               $this->db->next_record();
                                        $result = $this->db->f('name');
                                }
-                       }
                        return $result;
                }
 
@@ -530,11 +529,11 @@
                        $categories      = array();
                        $sql             = "SELECT * FROM bb_activity where 
active=1 and parent_id=1";
                        $this->db->query($sql, __LINE__, __FILE__);
-                       while($this->db->next_record())
+                       while ($this->db->next_record())
                        {
                                $category                = new 
activitycalendar_category($this->db->f('id'));
                                
$category->set_parent_id($this->db->f('parent_id'));
-                               $category->set_name($this->db->f('name'));
+                               $category->set_name($this->db->f('name', true));
                                $categories[]    = $category;
                        }
                        return $categories;
@@ -543,51 +542,43 @@
                function select_district_list()
                {
                        $this->db->query("SELECT id, descr FROM fm_district 
where id >'0' AND NOT descr LIKE '%vrige%' ORDER BY id ", __LINE__, __FILE__);
-
-                       $i = 0;
-                       while($this->db->next_record())
+                       $district = array();
+                       while ($this->db->next_record())
                        {
-                               $district[$i]['id']              = 
$this->db->f('id');
-                               $district[$i]['name']    = 
stripslashes($this->db->f('descr'));
-                               $i++;
+                               $district[] = array(
+                                       'id' => $this->db->f('id'),
+                                       'name' => $this->db->f('descr', true)
+                               );
                        }
 
                        return $district;
                }
 
-               function get_district_from_name($name)
-               {
-                       $this->db->query("SELECT part_of_town_id FROM 
fm_part_of_town where name like UPPER('%{$name}%') ", __LINE__, __FILE__);
-                       while($this->db->next_record())
+               function get_district_from_name( $name )
                        {
-                               $result = $this->db->f('part_of_town_id');
-                       }
-                       return $result;
+                       $this->db->query("SELECT id FROM fm_part_of_town where 
name like UPPER('%{$name}%') ", __LINE__, __FILE__);
+                       $this->db->next_record();
+                       return $this->db->f('id');
                }
 
-               function get_district_from_id($d_id)
-               {
-                       $this->db->query("SELECT name FROM fm_part_of_town 
where part_of_town_id={$d_id} ", __LINE__, __FILE__);
-                       while($this->db->next_record())
+               function get_district_from_id( $d_id )
                        {
-                               $result = $this->db->f('name');
-                       }
-                       return $result;
+                       $d_id = (int)$d_id;
+                       $this->db->query("SELECT name FROM fm_part_of_town 
where id={$d_id}", __LINE__, __FILE__);
+                       $this->db->next_record();
+                       return $this->db->f('name', true);
                }
 
-               function get_district_name($district_id)
+               function get_district_name( $district_id )
                {
-                       //$result = "Ingen";
                        $values = array();
-                       if($district_id != null)
+                       if ($district_id != null)
                        {
-                               $sql = "SELECT district_id, name FROM 
fm_part_of_town where part_of_town_id in ($district_id)";
+                               $sql = "SELECT district_id, name FROM 
fm_part_of_town where id in ($district_id)";
                                $this->db->query($sql, __LINE__, __FILE__);
-                               while($this->db->next_record())
+                               while ($this->db->next_record())
                                {
-                                       $name            = $this->db->f('name');
-                                       $values[]        = $name;
-                                       //$result .= $name . ',';
+                                       $values[] = $this->db->f('name', true);
                                }
                                $result = implode(", ", $values);
                                return $result;
@@ -597,47 +588,55 @@
 
                function get_districts()
                {
-                       $this->db->query("SELECT part_of_town_id, name FROM 
fm_part_of_town district_id ", __LINE__, __FILE__);
-
-                       $i = 0;
-                       while($this->db->next_record())
+                       $this->db->query("SELECT id, name FROM 
fm_part_of_town", __LINE__, __FILE__);
+                       $district = array();
+                       while ($this->db->next_record())
                        {
                                $name = $this->db->f('name');
-                               if($name != 'ØVRIGE')
+                               if ($name == 'ØVRIGE')
                                {
-                                       $district[$i]['part_of_town_id'] = 
$this->db->f('part_of_town_id');
-                                       $district[$i]['name']                   
 = stripslashes($this->db->f('name'));
-                                       $i++;
+                                       continue;
                                }
+                               $district[] = array(
+                                       'part_of_town_id' => $this->db->f('id'),
+                                       'name' => stripslashes($name)
+                               );
                        }
 
                        return $district;
                }
 
-               function get_office_from_user($user_id)
+               function get_office_from_user( $user_id )
                {
-                       if(user_id)
+                       if (user_id)
                        {
                                $user_id = (int)$user_id;
                                $q1              = "SELECT office FROM 
bb_office_user WHERE account_id={$user_id}";
                                //var_dump($q1);
                                $this->db->query($q1, __LINE__, __FILE__);
-                               while($this->db->next_record())
-                               {
-                                       $office_id = $this->db->f('office');
-                               }
+                               $this->db->next_record();
+
+                               $office_id = $this->db->f('office', true);
                        }
                        return $office_id;
                }
 
-               function get_office_name($district_id)
+               /**
+                * DEMO::This one is vulnerable to SQL-injection
+                *
+                *
+                */
+               function get_district( $id )
                {
                        $result = "Ingen";
-                       if($district_id != null)
+//                     $district_id = (int)$district_id;
+                       $table = 'fm_district';// id is integer
+//                     $table = 'fm_request_status';// id is varchar
+                       if ($id != null)
                        {
-                               $sql = "SELECT descr FROM fm_district where 
id=$district_id";
+                               $sql = "SELECT descr FROM {$table} WHERE 
id={$id}";
                                $this->db->query($sql, __LINE__, __FILE__);
-                               while($this->db->next_record())
+                               while ($this->db->next_record())
                                {
                                        $result = $this->db->f('descr');
                                }
@@ -645,32 +644,45 @@
                        return $result;
                }
 
-               function get_office_description($office_id)
+               function get_office_name( $district_id )
                {
-                       $result = "";
-                       if($office_id != null)
+                       $district_id = (int)$district_id;
+                       $result = "Ingen";
+                       if ($district_id)
                        {
-                               $sql = "SELECT description FROM bb_office where 
id=$office_id";
+                               $sql = "SELECT descr FROM fm_district where id 
= {$district_id}";
                                $this->db->query($sql, __LINE__, __FILE__);
-                               while($this->db->next_record())
-                               {
-                                       $result = $this->db->f('description');
+                               $this->db->next_record();
+                               $result = $this->db->f('descr', true);
+                       }
+                       return $result;
                                }
+
+               function get_office_description( $office_id )
+               {
+                       $result = "";
+                       $office_id = (int)$office_id;
+                       if ($office_id)
+                       {
+                               $sql = "SELECT description FROM bb_office where 
id={$office_id}";
+                               $this->db->query($sql, __LINE__, __FILE__);
+                               $this->db->next_record();
+                               $result = $this->db->f('description', true);
                        }
                        return $result;
                }
 
-               function get_target_name($target_id)
+               function get_target_name( $target_id )
                {
                        $result = "Ingen";
-                       if($target_id != null)
+                       $target_id = (int)$target_id;
+                       if ($target_id)
                        {
-                               $sql = "SELECT name FROM bb_agegroup where 
id=$target_id";
+                               $sql = "SELECT name FROM bb_agegroup where 
id={$target_id}";
                                $this->db->query($sql, __LINE__, __FILE__);
-                               while($this->db->next_record())
-                               {
-                                       $result = $this->db->f('name');
-                               }
+                               $this->db->next_record();
+
+                               $result = $this->db->f('name', true);
                        }
                        return $result;
                }
@@ -680,89 +692,89 @@
                        $targets = array();
                        $sql     = "SELECT * FROM bb_agegroup where active=1 
ORDER BY sort";
                        $this->db->query($sql, __LINE__, __FILE__);
-                       while($this->db->next_record())
+                       while ($this->db->next_record())
                        {
-                               $name = $this->db->f('name');
-                               if($name != 'Tilskuere')
+                               $name = $this->db->f('name', true);
+                               if ($name == 'Tilskuere')
                                {
+                                       continue;
+                               }
                                        $target          = new 
activitycalendar_target($this->db->f('id'));
-                                       
$target->set_description($this->db->f('description'));
-                                       $target->set_name($this->db->f('name'));
+                               
$target->set_description($this->db->f('description', true));
+                               $target->set_name($name);
                                        $targets[]       = $target;
                                }
-                       }
                        return $targets;
                }
 
-               function get_category_from_name($name)
+               function get_category_from_name( $name )
                {
-                       if($name != null)
+                       if ($name != null)
                        {
                                $sql = "select id from bb_activity where name 
like '%{$name}%'";
                                $this->db->query($sql, __LINE__, __FILE__);
-                               while($this->db->next_record())
-                               {
+                               $this->db->next_record();
                                        $result = $this->db->f('id');
                                }
-                       }
                        return $result;
                }
 
-               function get_target_from_sort_id($id)
+               function get_target_from_sort_id( $id )
                {
-                       if($id != null && is_numeric($id))
+                       $id = (int)$id;
+                       if ($id)
                        {
                                $sql = "select id from bb_agegroup where 
sort={$id} and active=1";
                                $this->db->query($sql, __LINE__, __FILE__);
-                               while($this->db->next_record())
-                               {
+                               $this->db->next_record();
+
                                        $result = $this->db->f('id');
                                }
-                       }
                        return $result;
                }
 
-               function get_orgid_from_orgno($orgno)
+               function get_orgid_from_orgno( $orgno )
                {
-                       if($orgno != null)
+                       if ($orgno != null)
                        {
                                $sql = "select id from bb_organization where 
organization_number='{$orgno}'";
                                $this->db->query($sql, __LINE__, __FILE__);
-                               while($this->db->next_record())
-                               {
+                               $this->db->next_record();
                                        $result = $this->db->f('id');
                                }
-                       }
                        return $result;
                }
 
-               function update_org_description($org_id, $description)
+               function update_org_description( $org_id, $description )
                {
-                       if($org_id != null)
+                       $description = $this->db->db_addslashes($description);
+                       $org_id = (int)$org_id;
+                       if ($org_id)
                        {
                                $sql     = "update bb_organization set 
description='{$description}' where id={$org_id}";
                                $result  = $this->db->query($sql, __LINE__, 
__FILE__);
                        }
-                       return isset($result);
+                       return ($result);
                }
 
-               function set_org_active($org_id)
+               function set_org_active( $org_id )
                {
-                       if($org_id != null)
+                       $org_id = (int)$org_id;
+                       if ($org_id)
                        {
                                $sql     = "update bb_organization set 
show_in_portal=1 where id={$org_id}";
                                $result  = $this->db->query($sql, __LINE__, 
__FILE__);
                        }
-                       return isset($result);
+                       return ($result);
                }
 
-               function get_activities($parameters = array())
+               function get_activities( $parameters = array() )
                {
                        $soap                            = 
isset($parameters['soap']) && $parameters['soap'] ? true : false;
                        $this->soap                      = $soap;
                        //fromdate -> innparam for uthenting av delta - 
timestamp
                        $whereclause_date        = "";
-                       if($parameters['fromdate'])
+                       if ($parameters['fromdate'])
                        {
                                $from_date                       = 
(int)$parameters['fromdate'];
                                $whereclause_date        = "AND 
last_change_date > {$from_date}";
@@ -770,7 +782,7 @@
                        $activities      = array();
                        $sql             = "SELECT * FROM activity_activity 
where state in (2,3,5) {$whereclause_date}";
                        $this->db->query($sql, __LINE__, __FILE__);
-                       while($this->db->next_record())
+                       while ($this->db->next_record())
                        {
                                $gr                              = 
$this->db->f('group_id');
                                $activities[]    = array
@@ -792,9 +804,9 @@
                                );
                        }
 
-                       foreach($activities as &$activity)
+                       foreach ($activities as &$activity)
                        {
-                               if($activity['group_id'] && 
!$activity['group_id'] == '' && !$activity['group_id'] == 0)
+                               if ($activity['group_id'] && 
!$activity['group_id'] == '' && !$activity['group_id'] == 0)
                                {
                                        $activity['group_info']                 
 = $this->get_group_info($activity['group_id']);
                                        $activity['organization_info']   = 
$this->get_org_info($activity['group_info']['organization_id']);
@@ -815,51 +827,48 @@
                        return $activities;
                }
 
-               function get_contact_person($org_id, $group_id, $cont_pers)
-               {
-                       if($group_id)
+               function get_contact_person( $org_id, $group_id, $cont_pers )
                        {
+                       $org_id = (int)$org_id;
                                $group_id = (int)$group_id;
-                               //              $this->db->query("SELECT * FROM 
bb_group_contact WHERE id={$cont_pers}", __LINE__, __FILE__);
-                               $this->db->query("SELECT * FROM 
bb_group_contact WHERE group_id={$group_id} LIMIT 1", __LINE__, __FILE__);
-                               while($this->db->next_record())
+                       if ($group_id)
                                {
-                                       $result = array('name'   => $this->soap 
? $this->db->f('name') : utf8_decode($this->db->f('name')),
-                                               'phone'  => 
$this->db->f('phone'), 'email'       => $this->db->f('email'));
-                               }
+                               $this->db->query("SELECT * FROM 
bb_group_contact WHERE group_id={$group_id} LIMIT 1", __LINE__, __FILE__);
+                               $this->db->next_record();
+
+                               $result = array(
+                                       'name' => $this->soap ? 
$this->db->f('name', true) : utf8_decode($this->db->f('name', true)),
+                                       'phone' => $this->db->f('phone'), 
'email' => $this->db->f('email')
+                               );
                        }
-                       else if($org_id)
+                       else if ($org_id)
                        {
-                               $org_id = (int)$org_id;
                                $this->db->query("SELECT * FROM 
bb_organization_contact WHERE organization_id={$org_id} LIMIT 1", __LINE__, 
__FILE__);
-                               while($this->db->next_record())
-                               {
-                                       $result = array('name'   => $this->soap 
? $this->db->f('name') : utf8_decode($this->db->f('name')),
+                               $this->db->next_record();
+                               $result = array(
+                                       'name' => $this->soap ? 
$this->db->f('name', true) : utf8_decode($this->db->f('name', true)),
                                                'phone'  => 
$this->db->f('phone'), 'email'       => $this->db->f('email'));
                                }
-                       }
                        return $result;
                }
 
-               function get_activity_description($org_id, $group_id)
-               {
-                       if($group_id)
+               function get_activity_description( $org_id, $group_id )
                        {
+                       $org_id = (int)$org_id;
                                $group_id = (int)$group_id;
-                               $this->db->query("SELECT * FROM bb_group WHERE 
id={$group_id}", __LINE__, __FILE__);
-                               while($this->db->next_record())
+                       if ($group_id)
                                {
-                                       $result = $this->soap ? 
$this->db->f('description') : utf8_decode($this->db->f('description'));
-                               }
+                               $this->db->query("SELECT * FROM bb_group WHERE 
id={$group_id}", __LINE__, __FILE__);
+                               $this->db->next_record();
+
+                               $result = $this->soap ? 
$this->db->f('description', true) : utf8_decode($this->db->f('description', 
true));
                        }
-                       else if($org_id)
+                       else if ($org_id)
                        {
-                               $org_id = (int)$org_id;
                                $this->db->query("SELECT * FROM bb_organization 
WHERE id={$org_id}", __LINE__, __FILE__);
-                               while($this->db->next_record())
-                               {
-                                       $result = $this->soap ? 
$this->db->f('description') : utf8_decode($this->db->f('description'));
-                               }
+                               $this->db->next_record();
+
+                               $result = $this->soap ? 
$this->db->f('description', true) : utf8_decode($this->db->f('description', 
true));
                        }
                        return $result;
                }
@@ -868,19 +877,19 @@
                {
                        $organizations = array();
                        $this->db->query("SELECT * FROM bb_organization WHERE 
show_in_portal=1", __LINE__, __FILE__);
-                       while($this->db->next_record())
+                       while ($this->db->next_record())
                        {
                                $homepage = $this->db->f('homepage');
-                               if(trim($homepage) != '' && 
!preg_match("/^http|https:\/\//", trim($homepage)))
+                               if (trim($homepage) != '' && 
!preg_match("/^http|https:\/\//", trim($homepage)))
                                {
                                        $homepage = 'http://' . $homepage;
                                }
                                $organizations[] = array
                                        (
                                        'id'                     => 
(int)$this->db->f('id'),
-                                       'name'                   => 
utf8_decode($this->db->f('name')),
-                                       'shortname'              => 
utf8_decode($this->db->f('shortname')),
-                                       'description'    => 
utf8_decode($this->db->f('description')),
+                                       'name' => 
utf8_decode($this->db->f('name', true)),
+                                       'shortname' => 
utf8_decode($this->db->f('shortname', true)),
+                                       'description' => 
utf8_decode($this->db->f('description', true)),
                                        'homepage'               => $homepage,
                                        'phone'                  => 
$this->db->f('phone'),
                                        'email'                  => 
$this->db->f('email')
@@ -890,19 +899,18 @@
                        return $organizations;
                }
 
-               function get_org_info($org_id)
+               function get_org_info( $org_id )
                {
+                       $org_id = (int)$org_id;
                        $result = array();
-                       if($org_id)
+                       if ($org_id)
                        {
-                               $org_id  = (int)$org_id;
                                $this->db->query("SELECT * FROM bb_organization 
WHERE id={$org_id}", __LINE__, __FILE__);
                                $this->db->next_record();
-                               $result  = array
-                                       (
-                                       'name'                   => 
utf8_decode($this->db->f('name')),
-                                       'shortname'              => 
utf8_decode($this->db->f('shortname')),
-                                       'description'    => 
utf8_decode($this->db->f('description')),
+                               $result = array(
+                                       'name' => 
utf8_decode($this->db->f('name', true)),
+                                       'shortname' => 
utf8_decode($this->db->f('shortname', true)),
+                                       'description' => 
utf8_decode($this->db->f('description', true)),
                                        'homepage'               => 
$this->db->f('homepage'),
                                        'phone'                  => 
$this->db->f('phone'),
                                        'email'                  => 
$this->db->f('email')
@@ -916,14 +924,14 @@
                        $groups  = array();
                        $join    = " {$this->left_join} bb_organization ON 
(bb_group.organization_id = bb_organization.id)";
                        $this->db->query("SELECT bb_group.*, 
bb_organization.homepage FROM bb_group {$join} WHERE 
bb_group.show_in_portal=1", __LINE__, __FILE__);
-                       while($this->db->next_record())
+                       while ($this->db->next_record())
                        {
                                $groups[] = array
                                        (
                                        'id'                             => 
(int)$this->db->f('id'),
-                                       'name'                           => 
utf8_decode($this->db->f('name')),
-                                       'shortname'                      => 
utf8_decode($this->db->f('shortname')),
-                                       'description'            => 
utf8_decode($this->db->f('description')),
+                                       'name' => 
utf8_decode($this->db->f('name', true)),
+                                       'shortname' => 
utf8_decode($this->db->f('shortname', true)),
+                                       'description' => 
utf8_decode($this->db->f('description', true)),
                                        'homepage'                       => 
utf8_decode($this->db->f('homepage')),
                                        'organization_id'        => 
$this->db->f('organization_id')
                                );
@@ -935,9 +943,9 @@
                 * Return incoming
                 */
 
-               function debug_xmlrpc($data = array())
+               function debug_xmlrpc( $data = array() )
                {
-                       if($data['fromdate'])
+                       if ($data['fromdate'])
                        {
                                return $data['fromdate'];
                        }
@@ -947,82 +955,78 @@
                        }
                }
 
-               function get_group_info($group_id)
+               function get_group_info( $group_id )
                {
+                       $group_id = (int)$group_id;
                        $result = array();
-                       if($group_id)
+                       if ($group_id)
                        {
-                               $group_id        = (int)$group_id;
                                $this->db->query("SELECT * FROM bb_group WHERE 
id={$group_id}", __LINE__, __FILE__);
                                $this->db->next_record();
                                $result          = array
                                        (
-                                       'name'                           => 
utf8_decode($this->db->f('name')),
-                                       'shortname'                      => 
utf8_decode($this->db->f('shortname')),
-                                       'description'            => 
utf8_decode($this->db->f('description')),
+                                       'name' => 
utf8_decode($this->db->f('name', true)),
+                                       'shortname' => 
utf8_decode($this->db->f('shortname', true)),
+                                       'description' => 
utf8_decode($this->db->f('description', true)),
                                        'organization_id'        => 
$this->db->f('organization_id')
                                );
                        }
                        return $result;
                }
 
-               function get_all_arena_info($arena_id, $int_arena_id)
+               function get_all_arena_info( $arena_id, $int_arena_id )
                {
                        $result = array();
-                       if($arena_id && is_numeric($arena_id))
-                       {
                                $arena_id        = (int)$arena_id;
+                       $int_arena_id = (int)$int_arena_id;
+                       if ($arena_id)
+                       {
                                $this->db->query("SELECT * FROM activity_arena 
WHERE id={$arena_id}", __LINE__, __FILE__);
                                $this->db->next_record();
-                               $result          = array
-                                       (
-                                       'arena_name' => $this->soap ? 
$this->db->f('arena_name') : utf8_decode($this->db->f('arena_name')),
-                                       'address'        => $this->soap ? 
$this->db->f('address') : utf8_decode($this->db->f('address'))
+                               $result = array(
+                                       'arena_name' => $this->soap ? 
$this->db->f('arena_name', true) : utf8_decode($this->db->f('arena_name', 
true)),
+                                       'address' => $this->soap ? 
$this->db->f('address', true) : utf8_decode($this->db->f('address', true))
                                );
                        }
-                       else if($int_arena_id && is_numeric($int_arena_id))
+                       else if ($int_arena_id)
                        {
-                               $int_arena_id    = (int)$int_arena_id;
                                $this->db->query("SELECT id, name, street FROM 
bb_building WHERE id={$int_arena_id}", __LINE__, __FILE__);
                                $this->db->next_record();
-                               $result                  = array
-                                       (
-                                       'arena_name' => $this->soap ? 
$this->db->f('name') : utf8_decode($this->db->f('name')),
-                                       'address'        => $this->soap ? 
$this->db->f('street') : utf8_decode($this->db->f('street'))
+                               $result = array(
+                                       'arena_name' => $this->soap ? 
$this->db->f('name', true) : utf8_decode($this->db->f('name', true)),
+                                       'address' => $this->soap ? 
$this->db->f('street', true) : utf8_decode($this->db->f('street', true))
                                );
                        }
                        return $result;
                }
 
-               function get_arena_info($arena_id)
+               function get_arena_info( $arena_id )
                {
                        $result = array();
-                       if($arena_id)
-                       {
                                $arena_id        = (int)$arena_id;
+                       if ($arena_id)
+                       {
                                $this->db->query("SELECT * FROM activity_arena 
WHERE id={$arena_id}", __LINE__, __FILE__);
                                $this->db->next_record();
-                               $result          = array
-                                       (
-                                       'arena_name' => $this->soap ? 
$this->db->f('arena_name') : utf8_decode($this->db->f('arena_name')),
-                                       'address'        => $this->soap ? 
$this->db->f('address') : utf8_decode($this->db->f('address'))
+                               $result = array(
+                                       'arena_name' => $this->soap ? 
$this->db->f('arena_name', true) : utf8_decode($this->db->f('arena_name', 
true)),
+                                       'address' => $this->soap ? 
$this->db->f('address', true) : utf8_decode($this->db->f('address', true))
                                );
                        }
                        return $result;
                }
 
-               function get_internal_arena_info($arena_id)
+               function get_internal_arena_info( $arena_id )
                {
                        $result = array();
-                       if($arena_id)
-                       {
                                $arena_id        = (int)$arena_id;
+                       if ($arena_id)
+                       {
                                $this->db->query("SELECT id, name, street FROM 
bb_building WHERE id={$arena_id}", __LINE__, __FILE__);
                                $this->db->next_record();
-                               $result          = array
-                                       (
-                                       'arena_name' => $this->soap ? 
$this->db->f('name') : utf8_decode($this->db->f('name')),
-                                       'address'        => $this->soap ? 
$this->db->f('street') : utf8_decode($this->db->f('street'))
+                               $result = array(
+                                       'arena_name' => $this->soap ? 
$this->db->f('name', true) : utf8_decode($this->db->f('name', true)),
+                                       'address' => $this->soap ? 
$this->db->f('street', true) : utf8_decode($this->db->f('street', true))
                                );
                        }
                        return $result;
@@ -1044,7 +1048,7 @@
                {
                        $sql = "SELECT * FROM bb_agegroup where active=1 AND 
NOT name like 'Tilskuer%' ORDER BY sort";
                        $this->db->query($sql, __LINE__, __FILE__);
-                       while($this->db->next_record())
+                       while ($this->db->next_record())
                        {
                                $targets[] = array(
                                        'id'     => (int)$this->db->f('id'),
@@ -1059,7 +1063,8 @@
                {
                        $sql = "SELECT * FROM bb_activity where active=1 and 
parent_id=1";
                        $this->db->query($sql, __LINE__, __FILE__);
-                       while($this->db->next_record())
+                       $categories = array();
+                       while ($this->db->next_record())
                        {
                                $categories[] = array(
                                        'id'     => (int)$this->db->f('id'),
@@ -1069,37 +1074,37 @@
                        return $categories;
                }
 
-               function update_organization($org_info)
+               function update_organization( $org_info )
                {
                        $name            = $org_info['name'];
                        $orgid           = (int)$org_info['orgid'];
                        $homepage        = $org_info['homepage'];
-                       if(!$homepage)
+                       if (!$homepage)
                        {
                                $homepage = '';
                        }
                        $phone = $org_info['phone'];
-                       if(!$phone)
+                       if (!$phone)
                        {
                                $phone = '';
                        }
                        $email = $org_info['email'];
-                       if(!$email)
+                       if (!$email)
                        {
                                $email = '';
                        }
                        $description = $org_info['description'];
-                       if(!$description)
+                       if (!$description)
                        {
                                $description = '';
                        }
                        $street = $org_info['street'];
-                       if(!$street)
+                       if (!$street)
                        {
                                $street = '';
                        }
                        $zip = $org_info['zip'];
-                       if($zip && strlen($zip) > 5)
+                       if ($zip && strlen($zip) > 5)
                        {
                                $zip_code        = substr($zip, 0, 4);
                                $city            = substr($zip, 5);
@@ -1110,7 +1115,7 @@
                                $city            = '';
                        }
                        $district = $org_info['district'];
-                       if(!$district)
+                       if (!$district)
                        {
                                $district = '';
                        }
@@ -1131,10 +1136,10 @@
                                'show_in_portal = 1'
                        );
 
-                       $result = $this->db->query('UPDATE bb_organization SET 
' . join(',', $values) . " WHERE id=$orgid", __LINE__, __FILE__);
+                       $result = $this->db->query('UPDATE bb_organization SET 
' . join(',', $values) . " WHERE id = {$orgid}", __LINE__, __FILE__);
                }
 
-               function add_organization($org_info)
+               function add_organization( $org_info )
                {
                        $name            = $org_info['name'];
                        $orgnr           = $org_info['orgnr'];
@@ -1144,7 +1149,7 @@
                        $description = $org_info['description'];
                        $street          = $org_info['street'];
                        $zip             = $org_info['zip'];
-                       if($zip && strlen($zip) > 5)
+                       if ($zip && strlen($zip) > 5)
                        {
                                $zip_code        = substr($zip, 0, 4);
                                $city            = substr($zip, 5);
@@ -1188,7 +1193,7 @@
 
                        $sql     = "INSERT INTO bb_organization ({$cols}) 
VALUES ({$vals})";
                        $result  = $this->db->query($sql, __LINE__, __FILE__);
-                       if(isset($result))
+                       if (isset($result))
                        {
                                return 
$this->db->get_last_insert_id('bb_organization', 'id');
                        }
@@ -1198,7 +1203,7 @@
                        }
                }
 
-               function add_organization_local($org_info)
+               function add_organization_local( $org_info )
                {
                        $name                    = $org_info['name'];
                        $orgnr                   = $org_info['orgnr'];
@@ -1213,7 +1218,7 @@
                        $district                = $org_info['district'];
                        $status                  = $org_info['status'];
                        $original_org_id = $org_info['original_org_id'];
-                       if(!isset($original_org_id) || $original_org_id == '')
+                       if (!isset($original_org_id) || $original_org_id == '')
                        {
                                $original_org_id = 0;
                        }
@@ -1251,7 +1256,7 @@
                        //var_dump("INSERT INTO activity_organization ({$cols}) 
VALUES ({$vals})");
                        $sql     = "INSERT INTO activity_organization ({$cols}) 
VALUES ({$vals})";
                        $result  = $this->db->query($sql, __LINE__, __FILE__);
-                       if(isset($result))
+                       if (isset($result))
                        {
                                return 
$this->db->get_last_insert_id('activity_organization', 'id');
                        }
@@ -1261,7 +1266,7 @@
                        }
                }
 
-               function add_group($group_info)
+               function add_group( $group_info )
                {
                        $name                    = $group_info['name'];
                        $orgid                   = 
$group_info['organization_id'];
@@ -1285,7 +1290,7 @@
 
                        $sql     = "INSERT INTO bb_group ({$cols}) VALUES 
({$vals})";
                        $result  = $this->db->query($sql, __LINE__, __FILE__);
-                       if(isset($result))
+                       if (isset($result))
                        {
                                return 
$this->db->get_last_insert_id('bb_group', 'id');
                        }
@@ -1295,7 +1300,7 @@
                        }
                }
 
-               function add_group_local($group_info)
+               function add_group_local( $group_info )
                {
                        $name            = $group_info['name'];
                        $orgid           = $group_info['organization_id'];
@@ -1316,7 +1321,7 @@
 
                        $sql     = "INSERT INTO activity_group ({$cols}) VALUES 
({$vals})";
                        $result  = $this->db->query($sql, __LINE__, __FILE__);
-                       if(isset($result))
+                       if (isset($result))
                        {
                                return 
$this->db->get_last_insert_id('activity_group', 'id');
                        }
@@ -1326,12 +1331,12 @@
                        }
                }
 
-               function delete_contact_persons($org_id)
+               function delete_contact_persons( $org_id )
                {
-                       if($org_id)
+                       $org_id = (int)$org_id;
+                       if ($org_id)
                        {
-                               $org     = (int)$org_id;
-                               $sql     = "DELETE FROM bb_organization_contact 
WHERE organization_id={$org}";
+                               $sql = "DELETE FROM bb_organization_contact 
WHERE organization_id={$org_id}";
                                $result  = $this->db->query($sql, __LINE__, 
__FILE__);
                                return isset($result);
                        }
@@ -1344,7 +1349,7 @@
                          } */
                }
 
-               function add_contact_person_org($contact)
+               function add_contact_person_org( $contact )
                {
                        $name    = $contact['name'];
                        $phone   = $contact['phone'];
@@ -1371,12 +1376,12 @@
                        return isset($result);
                }
 
-               function update_contact_person_org($contact)
+               function update_contact_person_org( $contact )
                {
 
                }
 
-               function add_contact_person_group($contact)
+               function add_contact_person_group( $contact )
                {
                        $name    = $contact['name'];
                        $phone   = $contact['phone'];
@@ -1400,12 +1405,12 @@
                        return isset($result);
                }
 
-               function update_contact_person_group($contact)
+               function update_contact_person_group( $contact )
                {
 
                }
 
-               function add_contact_person_local($contact)
+               function add_contact_person_local( $contact )
                {
                        $name            = $contact['name'];
                        $phone           = $contact['phone'];
@@ -1439,10 +1444,11 @@
                        return isset($result);
                }
 
-               function get_activities_for_update($org_id, $group = false)
+               function get_activities_for_update( $org_id, $group = false )
                {
+                       $org_id = (int)$org_id;
                        $activity_ids = array();
-                       if($group)
+                       if ($group)
                        {
                                $sql = "SELECT id FROM activity_activity WHERE 
new_group AND group_id={$org_id}";
                        }
@@ -1452,7 +1458,7 @@
                        }
 
                        $this->db->query($sql, __LINE__, __FILE__);
-                       while($this->db->next_record())
+                       while ($this->db->next_record())
                        {
                                $activity_ids[] = $this->db->f('id');
                        }
@@ -1460,13 +1466,14 @@
                        return $activity_ids;
                }
 
-               function get_connected_activities($org_id)
+               function get_connected_activities( $org_id )
                {
+                       $org_id = (int)$org_id;
                        $activities      = array();
                        $sql             = "SELECT * FROM activity_activity 
WHERE organization_id={$org_id}";
 
                        $this->db->query($sql, __LINE__, __FILE__);
-                       while($this->db->next_record())
+                       while ($this->db->next_record())
                        {
                                $activity = new 
activitycalendar_activity((int)$this->db->f('id'));
 
@@ -1496,14 +1503,11 @@
                        return $activities;
                }
 
-               function update_organization_connection($activity_id, 
$organization_id)
+               function update_organization_connection( $activity_id, 
$organization_id )
                {
-                       $id              = intval($activity_id);
-                       $org_id  = intval($organization_id);
-
-                       $result = $this->db->query("UPDATE activity_activity 
SET organization_id={$org_id} WHERE id={$id}", __LINE__, __FILE__);
-
-                       return isset($result);
+                       $id = (int)$activity_id;
+                       $org_id = (int)$organization_id;
+                       return $this->db->query("UPDATE activity_activity SET 
organization_id={$org_id} WHERE id={$id}", __LINE__, __FILE__);
                }
 
                function get_activities_without_groups()
@@ -1511,12 +1515,12 @@
                        $activities              = array();
                        $sql_activities  = "select a.*, o.description as 
org_desc from activity_activity a, bb_organization o where (a.group_id is null 
or a.group_id = 0) and o.id = a.organization_id";
                        $this->db->query($sql_activities, __LINE__, __FILE__);
-                       while($this->db->next_record())
+                       while ($this->db->next_record())
                        {
                                $activity_id                     = 
$this->db->f('id');
-                               $activity_title                  = 
$this->db->f('title');
+                               $activity_title = $this->db->f('title', true);
                                $activity_organization   = 
$this->db->f('organization_id');
-                               $description                     = 
$this->db->f('org_desc');
+                               $description = $this->db->f('org_desc', true);
 
                                $activities[] = array(
                                        'id'                     => 
$activity_id,
@@ -1538,18 +1542,18 @@
                        //TODO
                }
 
-               function remove_old_activities($activity_id)
+               function remove_old_activities( $activity_id )
                {
-                       //$sql = "delete from activity_activity where id in 
(1293,1294,1297,1299)"; //1293,1294,1297,1299
+                       $activity_id = (int)$activity_id;
                        $sql     = "delete from activity_activity where 
id={$activity_id}";
                        $result  = $this->db->query($sql, __LINE__, __FILE__);
 
                        return isset($result);
                }
 
-               function save_with_no_changes($activity)
+               function save_with_no_changes( $activity )
                {
-                       $id              = intval($activity->get_id());
+                       $id = (int)$activity->get_id();
                        $ts_now  = strtotime('now');
 
                        $values = "last_change_date = " . 
$this->marshal($ts_now, 'int');
@@ -1559,17 +1563,11 @@
                        return isset($result);
                }
 
-               function update_activity_group($activity_id, $group_id)
+               function update_activity_group( $activity_id, $group_id )
                {
-                       $id              = intval($activity_id);
-                       $g_id    = intval($group_id);
-
+                       $id = (int)$activity_id;
+                       $g_id = (int)$group_id;
                        $values = "group_id = " . $g_id;
-                       //var_dump("UPDATE activity_activity SET {$values} 
WHERE id={$id}");
-                       //die;
-
-                       $result = $this->db->query("UPDATE activity_activity 
SET {$values} WHERE id={$id}", __LINE__, __FILE__);
-
-                       return isset($result);
+                       return $this->db->query("UPDATE activity_activity SET 
{$values} WHERE id={$id}", __LINE__, __FILE__);
                }
        }
\ No newline at end of file

Modified: branches/dev-syncromind/activitycalendar/inc/class.soarena.inc.php
===================================================================
--- branches/dev-syncromind/activitycalendar/inc/class.soarena.inc.php  
2016-04-09 11:19:48 UTC (rev 14910)
+++ branches/dev-syncromind/activitycalendar/inc/class.soarena.inc.php  
2016-04-09 11:40:37 UTC (rev 14911)
@@ -16,7 +16,7 @@
                 */
                public static function get_instance()
                {
-                       if(self::$so == null)
+                       if (self::$so == null)
                        {
                                self::$so = 
CreateObject('activitycalendar.soarena');
                        }
@@ -35,34 +35,34 @@
                 * @param boolean $return_count
                 * @return string SQL
                 */
-               protected function get_query(string $sort_field, boolean 
$ascending, string $search_for, string $search_type, array $filters, boolean 
$return_count)
+               protected function get_query( string $sort_field, boolean 
$ascending, string $search_for, string $search_type, array $filters, boolean 
$return_count )
                {
                        $clauses = array('1=1');
 
                        //Add columns to this array to include them in the query
                        $columns = array();
 
-                       if($sort_field != null)
+                       if ($sort_field != null)
                        {
                                $dir = $ascending ? 'ASC' : 'DESC';
-                               if($sort_field == 'arena_id')
+                               if ($sort_field == 'arena_id')
                                {
                                        $sort_field = 'id';
                                }
                                $order = "ORDER BY {$this->marshal($sort_field, 
'field')} $dir";
                        }
-                       else if(!$return_count)
+                       else if (!$return_count)
                        {
                                $dir     = $ascending ? 'ASC' : 'DESC';
                                $order   = "ORDER BY arena.arena_name $dir";
                        }
 
-                       if($search_for)
+                       if ($search_for)
                        {
                                $query                   = 
$this->marshal($search_for, 'string');
                                $like_pattern    = "'%" . $search_for . "%'";
                                $like_clauses    = array();
-                               switch($search_type)
+                               switch ($search_type)
                                {
                                        case "all":
                                        default:
@@ -72,7 +72,7 @@
                                }
 
 
-                               if(count($like_clauses))
+                               if (count($like_clauses))
                                {
                                        $clauses[] = '(' . join(' OR ', 
$like_clauses) . ')';
                                }
@@ -80,39 +80,39 @@
 
                        $filter_clauses = array();
 
-                       if(isset($filters[$this->get_id_field_name()]))
+                       if (isset($filters[$this->get_id_field_name()]))
                        {
                                $id                                      = 
$this->marshal($filters[$this->get_id_field_name()], 'int');
                                $filter_clauses[]        = "arena.id = {$id}";
                        }
 
                        //filter on active/non-active
-                       if(isset($filters['active']))
+                       if (isset($filters['active']))
                        {
-                               if($filters['active'] == 'active')
+                               if ($filters['active'] == 'active')
                                {
                                        $filter_clauses[] = "arena.active = 
TRUE";
                                }
-                               else if($filters['active'] == 'inactive')
+                               else if ($filters['active'] == 'inactive')
                                {
                                        $filter_clauses[] = "NOT arena.active";
                                }
                        }
 
                        //filter on internal/not internal arena
-                       if(isset($filters['arena_type']))
+                       if (isset($filters['arena_type']))
                        {
-                               if($filters['arena_type'] == 'internal')
+                               if ($filters['arena_type'] == 'internal')
                                {
                                        $filter_clauses[] = "NOT 
arena.internal_arena_id IS NULL";
                                }
-                               else if($filters['arena_type'] == 
'not_internal')
+                               else if ($filters['arena_type'] == 
'not_internal')
                                {
                                        $filter_clauses[] = 
"arena.internal_arena_id IS NULL";
                                }
                        }
 
-                       if(count($filter_clauses))
+                       if (count($filter_clauses))
                        {
                                $clauses[] = join(' AND ', $filter_clauses);
                        }
@@ -122,7 +122,7 @@
                        //var_dump($filter_clauses);
                        //var_dump($condition);
 
-                       if($return_count) // We should only return a count
+                       if ($return_count) // We should only return a count
                        {
                                $cols = 'COUNT(DISTINCT(arena.id)) AS count';
                        }
@@ -157,10 +157,10 @@
                 *  @param activitycalendar_arena $arena
                 *  @return activitycalendar_arena $arena
                 */
-               protected function populate(int $arena_id, &$arena)
+               protected function populate( int $arena_id, &$arena )
                {
 
-                       if($arena == null)
+                       if ($arena == null)
                        {
                                $arena = new 
activitycalendar_arena((int)$arena_id);
 
@@ -181,17 +181,17 @@
                 * @param int $arena_id
                 * @return string arena name
                 */
-               function get_arena_name($arena_id)
+               function get_arena_name( $arena_id )
                {
                        $result = "Ingen";
-                       if(isset($arena_id) && $arena_id != '')
+                       $arena_id = (int)$arena_id;
+                       if ($arena_id)
                        {
                                $q1 = "SELECT arena_name FROM activity_arena 
WHERE id={$arena_id}";
                                $this->db->query($q1, __LINE__, __FILE__);
-                               while($this->db->next_record())
-                               {
-                                       $result = $this->db->f('arena_name');
-                               }
+                               $this->db->next_record();
+
+                               $result = $this->db->f('arena_name', true);
                        }
 
                        return $result;
@@ -208,10 +208,10 @@
                        $q_buildings = "SELECT id, name FROM bb_building WHERE 
active=1 ORDER BY name ASC";
                        //var_dump($q_buildings);
                        $this->db->query($q_buildings, __LINE__, __FILE__);
-                       while($this->db->next_record())
+                       while ($this->db->next_record())
                        {
                                $id                              = 
$this->db->f('id');
-                               $buildings[$id]  = $this->db->f('name');
+                               $buildings[$id] = $this->db->f('name', true);
                        }
                        return $buildings;
                }
@@ -222,14 +222,14 @@
                 * @param int $building_id
                 * @return string building name
                 */
-               function get_building_name($building_id)
-               {
-                       if(isset($building_id))
+               function get_building_name( $building_id )
                        {
                                $building_id = (int)$building_id;
+                       if ($building_id)
+                       {
                                $q1                      = "SELECT name FROM 
bb_building WHERE id={$building_id}";
                                $this->db->query($q1, __LINE__, __FILE__);
-                               while($this->db->next_record())
+                               while ($this->db->next_record())
                                {
                                        $result = $this->db->f('name');
                                }
@@ -243,13 +243,13 @@
                 * @param activitycalendar_arena $arena the party to be added
                 * @return bool true if successful, false otherwise
                 */
-               function add(&$arena)
+               function add( &$arena )
                {
                        // Insert a new arena
                        $q               = "INSERT INTO activity_arena 
(arena_name) VALUES ('test')";
                        $result  = $this->db->query($q);
 
-                       if(isset($result))
+                       if ($result)
                        {
                                // Set the new party ID
                                
$arena->set_id($this->db->get_last_insert_id('activity_arena', 'id'));
@@ -268,9 +268,9 @@
                 * @param $arena the arena to be updated
                 * @return boolean true if successful, false otherwise
                 */
-               function update($arena)
+               function update( $arena )
                {
-                       $id = intval($arena->get_id());
+                       $id = (int)$arena->get_id();
 
                        $values = array(
                                'arena_name = ' . 
$this->marshal($arena->get_arena_name(), 'string'),
@@ -282,14 +282,14 @@
                                'active = ' . 
$this->marshal(($arena->is_active() ? 'true' : 'false'), 'bool'),
                        );
 
-                       $result = $this->db->query('UPDATE activity_arena SET ' 
. join(',', $values) . " WHERE id=$id", __LINE__, __FILE__);
+                       $result = $this->db->query('UPDATE activity_arena SET ' 
. join(',', $values) . " WHERE id={$id}", __LINE__, __FILE__);
 
-                       return isset($result);
+                       return $result;
                }
 
-               public function get_id_field_name($extended_info = false)
+               public function get_id_field_name( $extended_info = false )
                {
-                       if(!$extended_info)
+                       if (!$extended_info)
                        {
                                $ret = 'id';
                        }
@@ -305,25 +305,19 @@
                        return $ret;
                }
 
-               public function get_address($search)
+               public function get_address( $search )
                {
                        $result_arr      = array();
                        $curr_index      = 0;
-                       if($search)
+                       if ($search)
                        {
                                $sql = "select * from fm_streetaddress where 
UPPER(descr) like UPPER('{$search}%')";
                                $this->db->query($sql, __LINE__, __FILE__);
-                               while($this->db->next_record())
+                               while ($this->db->next_record())
                                {
-                                       //$result_arr = $this->db->f('name');
-                                       /* if($curr_index == 0)
-                                         {
-                                         $result_arr[] = "<option 
value='0'>Velg gateadresse</option>";
-                                         }
-                                         $result_arr[] = "<option value='" . 
$this->db->f('descr') . "'>" . $this->db->f('descr') . "</option>";
-                                         $curr_index++; */
-
-                                       $result_arr[]['name'] = 
$this->db->f('descr');
+                                       $result_arr[] = array(
+                                               'name' => $this->db->f('descr', 
true)
+                                       );
                                }
                        }
                        //$result = implode(' ', $result_arr);
@@ -331,18 +325,16 @@
                        return array('ResultSet' => array('Result' => 
$result_arr));
                }
 
-               public function get_arena_id_by_name($arena_name)
+               public function get_arena_id_by_name( $arena_name )
                {
                        $result = 0;
-                       if(isset($arena_name) && $arena_name != '')
+                       if ($arena_name)
                        {
                                $q1 = "SELECT id FROM activity_arena WHERE 
UPPER(arena_name) = UPPER('{$arena_name}')";
                                $this->db->query($q1, __LINE__, __FILE__);
-                               while($this->db->next_record())
-                               {
+                               $this->db->next_record();
                                        $result = $this->db->f('id');
                                }
-                       }
                        return $result;
                }
        }
\ No newline at end of file

Modified: branches/dev-syncromind/activitycalendar/inc/class.socommon.inc.php
===================================================================
--- branches/dev-syncromind/activitycalendar/inc/class.socommon.inc.php 
2016-04-09 11:19:48 UTC (rev 14910)
+++ branches/dev-syncromind/activitycalendar/inc/class.socommon.inc.php 
2016-04-09 11:40:37 UTC (rev 14911)
@@ -22,25 +22,25 @@
                 * @param $type the type of value
                 * @return database value
                 */
-               protected function marshal($value, $type)
+               protected function marshal( $value, $type )
                {
-                       if($value === null)
+                       if ($value === null)
                        {
                                return 'NULL';
                        }
-                       else if($type == 'int')
+                       else if ($type == 'int')
                        {
-                               if($value == '')
+                               if ($value == '')
                                {
                                        return 'NULL';
                                }
                                return intval($value);
                        }
-                       else if($type == 'float')
+                       else if ($type == 'float')
                        {
                                return str_replace(',', '.', $value);
                        }
-                       else if($type == 'field')
+                       else if ($type == 'field')
                        {
                                return $this->db->db_addslashes($value);
                        }
@@ -53,21 +53,21 @@
                 * @param $type a string dictating value type
                 * @return the php value
                 */
-               protected function unmarshal($value, $type)
+               protected function unmarshal( $value, $type )
                {
-                       if($type == 'bool')
+                       if ($type == 'bool')
                        {
                                return (boolean)$value;
                        }
-                       elseif($value === null || $value == 'NULL')
+                       elseif ($value === null || $value == 'NULL')
                        {
                                return null;
                        }
-                       elseif($type == 'int')
+                       elseif ($type == 'int')
                        {
                                return intval($value);
                        }
-                       elseif($type == 'float')
+                       elseif ($type == 'float')
                        {
                                return floatval($value);
                        }
@@ -81,10 +81,10 @@
                 * @param $sql the sql query
                 * @return the count value
                 */
-               protected function get_query_count($sql)
+               protected function get_query_count( $sql )
                {
                        $result = $this->db->query($sql);
-                       if($result && $this->db->next_record())
+                       if ($result && $this->db->next_record())
                        {
                                return $this->unmarshal($this->db->f('count', 
true), 'int');
                        }
@@ -104,10 +104,10 @@
                 * @param $id int with id of object to return.
                 * @return object with the specified id, null if not found.
                 */
-               public function get_single(int $id)
+               public function get_single( int $id )
                {
                        $objects = $this->get(null, null, null, null, null, 
null, array($this->get_id_field_name() => $id));
-                       if(count($objects) > 0)
+                       if (count($objects) > 0)
                        {
                                $keys = array_keys($objects);
                                return $objects[$keys[0]];
@@ -137,7 +137,7 @@
                 * @return array of objects. May return an empty
                 * array, never null. The array keys are the respective index 
numbers.
                 */
-               public function get(int $start_index, int $num_of_objects, 
string $sort_field, boolean $ascending, string $search_for, string 
$search_type, array $filters)
+               public function get( int $start_index, int $num_of_objects, 
string $sort_field, boolean $ascending, string $search_for, string 
$search_type, array $filters )
                {
                        $results                         = array();   // Array 
to store result objects
                        $map                             = array(); // Array to 
hold number of records per target object
@@ -148,7 +148,7 @@
                        // $break_on_limit -    flag indicating whether to 
break the loop when the number of records
                        //                                              for all 
the result objects are traversed
                        $id_field_name_info      = 
$this->get_id_field_name(true);
-                       if(is_array($id_field_name_info))
+                       if (is_array($id_field_name_info))
                        {
                                $break_on_limit  = true;
                                $id_field_name   = 
$id_field_name_info['translated'];
@@ -162,7 +162,7 @@
                        // Special case: Sort on id field. Always changed to 
the id field name.
                        // $break_when_num_of_objects_reached - flag indicating 
to break the loop when the number of
                        //              results are reached and we are sure 
that the records are ordered by the id
-                       if($sort_field == null || $sort_field == 'id' || 
$sort_field == '')
+                       if ($sort_field == null || $sort_field == 'id' || 
$sort_field == '')
                        {
                                $sort_field                                     
                 = $id_field_name;
                                $break_when_num_of_objects_reached       = true;
@@ -173,7 +173,7 @@
                        }
 
                        // Only allow positive start index
-                       if($start_index < 0)
+                       if ($start_index < 0)
                        {
                                $start_index = 0;
                        }
@@ -186,31 +186,31 @@
                        $sql_parts       = explode('1=1', $sql); // Split the 
query to insert extra condition on test for break
                        $this->db->query($sql, __LINE__, __FILE__, false, true);
 
-                       while($this->db->next_record()) // Runs through all of 
the results
+                       while ($this->db->next_record()) // Runs through all of 
the results
                        {
                                $should_populate_object  = false; // Default 
value - we won't populate object
                                $result_id                               = 
$this->unmarshal($this->db->f($id_field_name), 'int'); // The id of object
-                               if(in_array($result_id, $added_object_ids)) // 
Object with this id already added
+                               if (in_array($result_id, $added_object_ids)) // 
Object with this id already added
                                {
                                        $should_populate_object = true; // We 
should populate this object as we already have it in our result array
                                }
                                else // Object isn't already added to array
                                {
-                                       if(!in_array($result_id, $object_ids)) 
// Haven't already added this id
+                                       if (!in_array($result_id, $object_ids)) 
// Haven't already added this id
                                        {
                                                $object_ids[] = $result_id; // 
We have to add the new id
                                        }
                                        // We have to check if we should 
populate this object
-                                       if(count($object_ids) > $start_index) 
// We're at index above start index
+                                       if (count($object_ids) > $start_index) 
// We're at index above start index
                                        {
-                                               if($num_of_objects == null || 
count($results) < $num_of_objects) // We haven't found all the objects we're 
looking for
+                                               if ($num_of_objects == null || 
count($results) < $num_of_objects) // We haven't found all the objects we're 
looking for
                                                {
                                                        $should_populate_object 
 = true; // We should populate this object
                                                        $added_object_ids[]     
         = $result_id; // We keep the id
                                                }
                                        }
                                }
-                               if($should_populate_object)
+                               if ($should_populate_object)
                                {
                                        $result                          = 
&$results[$result_id];
                                        $results[$result_id] = 
$this->populate($result_id, $result);
@@ -219,17 +219,17 @@
                                }
 
                                //Stop looping when array not sorted on other 
then id and wanted number of results is reached
-                               if(count($results) == $num_of_objects && 
$last_result_id != $result_id && $break_when_num_of_objects_reached)
+                               if (count($results) == $num_of_objects && 
$last_result_id != $result_id && $break_when_num_of_objects_reached)
                                {
                                        break;
                                }
                                // else stop looping when wanted number of 
results is reached all records for result objects are read
-                               else if($break_on_limit && (count($results) == 
$num_of_objects) && $last_result_id != $result_id)
+                               else if ($break_on_limit && (count($results) == 
$num_of_objects) && $last_result_id != $result_id)
                                {
                                        $id_ok = 0;
-                                       foreach($map as $_result_id => $_count)
+                                       foreach ($map as $_result_id => $_count)
                                        {
-                                               
if(!isset($check_map[$_result_id]))
+                                               if 
(!isset($check_map[$_result_id]))
                                                {
                                                        // Query the number of 
records for the specific object in question
                                                        $sql2                   
                 = "{$sql_parts[0]} 1=1 AND 
{$id_field_name_info['table']}.{$id_field_name_info['field']} = {$_result_id} 
{$sql_parts[1]}";
@@ -237,12 +237,12 @@
                                                        $db2->next_record();
                                                        $check_map[$_result_id] 
 = $db2->num_rows();
                                                }
-                                               if($check_map[$_result_id] == 
$_count)
+                                               if ($check_map[$_result_id] == 
$_count)
                                                {
                                                        $id_ok++;
                                                }
                                        }
-                                       if($id_ok == $num_of_objects)
+                                       if ($id_ok == $num_of_objects)
                                        {
                                                break;
                                        }
@@ -259,7 +259,7 @@
                 * @param $filters array with key => value of filters.
                 * @return int with object count.
                 */
-               public function get_count(string $search_for, string 
$search_type, array $filters)
+               public function get_count( string $search_for, string 
$search_type, array $filters )
                {
                        return $this->get_query_count($this->get_query(null, 
null, $search_for, $search_type, $filters, true));
                }
@@ -287,23 +287,23 @@
                 * matching objects, or the objects themself.
                 * @return string with SQL.
                 */
-               protected abstract function get_query(string $sort_field, 
boolean $ascending, string $search_for, string $search_type, array $filters, 
boolean $return_count);
+               protected abstract function get_query( string $sort_field, 
boolean $ascending, string $search_for, string $search_type, array $filters, 
boolean $return_count );
 
-               protected abstract function populate(int $object_id, &$object);
+               protected abstract function populate( int $object_id, &$object 
);
 
-               protected abstract function add(&$object);
+               protected abstract function add( &$object );
 
-               protected abstract function update($object);
+               protected abstract function update( $object );
 
                /**
                 * Store the object in the database.  If the object has no ID 
it is assumed to be new and
                 * inserted for the first time.  The object is then updated 
with the new insert id.
                 */
-               public function store(&$object)
+               public function store( &$object )
                {
-                       if($object->validates())
+                       if ($object->validates())
                        {
-                               if($object->get_id() > 0)
+                               if ($object->get_id() > 0)
                                {
                                        // We can assume this composite came 
from the database since it has an ID. Update the existing row
                                        return $this->update($object);
@@ -319,7 +319,7 @@
                        return false;
                }
 
-               protected function generate_secret($length = 10)
+               protected function generate_secret( $length = 10 )
                {
                        return substr(base64_encode(rand(1000000000, 
9999999999)), 0, $length);
                }

Modified: 
branches/dev-syncromind/activitycalendar/inc/class.socontactperson.inc.php
===================================================================
--- branches/dev-syncromind/activitycalendar/inc/class.socontactperson.inc.php  
2016-04-09 11:19:48 UTC (rev 14910)
+++ branches/dev-syncromind/activitycalendar/inc/class.socontactperson.inc.php  
2016-04-09 11:40:37 UTC (rev 14911)
@@ -15,7 +15,7 @@
                 */
                public static function get_instance()
                {
-                       if(self::$so == null)
+                       if (self::$so == null)
                        {
                                self::$so = 
CreateObject('activitycalendar.socontactperson');
                        }
@@ -36,7 +36,7 @@
                 * @param boolean $return_count
                 * @return string SQL
                 */
-               protected function get_query(string $sort_field, boolean 
$ascending, string $search_for, string $search_type, array $filters, boolean 
$return_count)
+               protected function get_query( string $sort_field, boolean 
$ascending, string $search_for, string $search_type, array $filters, boolean 
$return_count )
                {
                        $clauses = array('1=1');
                        $table   = "";
@@ -49,12 +49,12 @@
                          $order = "ORDER BY id $dir";
                          }
                         */
-                       if($search_for)
+                       if ($search_for)
                        {
                                $query                   = 
$this->marshal($search_for, 'string');
                                $like_pattern    = "'%" . $search_for . "%'";
                                $like_clauses    = array();
-                               switch($search_type)
+                               switch ($search_type)
                                {
                                        case "name":
                                                $like_clauses[]  = 
"party.first_name $this->like $like_pattern";
@@ -91,7 +91,7 @@
                                }
 
 
-                               if(count($like_clauses))
+                               if (count($like_clauses))
                                {
                                        $clauses[] = '(' . join(' OR ', 
$like_clauses) . ')';
                                }
@@ -99,29 +99,29 @@
 
                        $filter_clauses          = array();
                        $contact_person_id       = 
$this->marshal($filters['id'], 'int');
-                       if(isset($filters['org_id']))
+                       if (isset($filters['org_id']))
                        {
                                $org_id = $this->marshal($filters['org_id'], 
'int');
-                               if(isset($org_id) && $org_id > 0)
+                               if (isset($org_id) && $org_id > 0)
                                {
                                        $filter_clauses[]        = 
"organization_contact.organization_id = {$org_id}";
                                        $filter_clauses[]        = 
"organization_contact.id = {$contact_person_id}";
                                        $table                           = 
"bb_organization_contact organization_contact";
                                }
                        }
-                       if(isset($filters['organization_id']))
+                       if (isset($filters['organization_id']))
                        {
                                $org_id = 
$this->marshal($filters['organization_id'], 'int');
-                               if(isset($org_id) && $org_id > 0)
+                               if (isset($org_id) && $org_id > 0)
                                {
                                        $filter_clauses[]        = 
"organization_contact.organization_id = {$org_id}";
                                        $table                           = 
"bb_organization_contact organization_contact";
                                }
                        }
-                       else if(isset($filters['group_id']))
+                       else if (isset($filters['group_id']))
                        {
                                $group_id = 
$this->marshal($filters['group_id'], 'int');
-                               if(isset($group_id) && $group_id > 0)
+                               if (isset($group_id) && $group_id > 0)
                                {
                                        $filter_clauses[]        = 
"group_contact.group_id = {$group_id}";
                                        $filter_clauses[]        = 
"group_contact.id = {$contact_person_id}";
@@ -140,16 +140,16 @@
                          }
                         */
 
-                       if(count($filter_clauses))
+                       if (count($filter_clauses))
                        {
                                $clauses[] = join(' AND ', $filter_clauses);
                        }
 
                        $condition = join(' AND ', $clauses);
 
-                       if($table == "bb_organization_contact 
organization_contact")
+                       if ($table == "bb_organization_contact 
organization_contact")
                        {
-                               if($return_count) // We should only return a 
count
+                               if ($return_count) // We should only return a 
count
                                {
                                        $cols = 
'COUNT(DISTINCT(organization_contact.id)) AS count';
                                }
@@ -167,7 +167,7 @@
                        }
                        else
                        {
-                               if($return_count) // We should only return a 
count
+                               if ($return_count) // We should only return a 
count
                                {
                                        $cols = 
'COUNT(DISTINCT(group_contact.id)) AS count';
                                }
@@ -191,91 +191,87 @@
                        return "SELECT {$cols} FROM {$tables} WHERE 
{$condition} {$order}";
                }
 
-               function get_group_contact_name($id)
+               function get_group_contact_name( $id )
                {
                        $result = "Ingen";
-                       if(isset($id) && $id != '')
+                       $id = (int)$id;
+                       if ($id)
                        {
                                $q1 = "SELECT name, phone, email FROM 
bb_group_contact WHERE id={$id}";
                                $this->db->query($q1, __LINE__, __FILE__);
-                               while($this->db->next_record())
-                               {
-                                       $result = $this->db->f('name') . 
"<br/>" . $this->db->f('phone') . "<br/>" . $this->db->f('email');
-                               }
+                               $this->db->next_record();
+                               $result = $this->db->f('name', true) . "<br/>" 
. $this->db->f('phone') . "<br/>" . $this->db->f('email');
                        }
                        return $result;
                }
 
-               function get_group_contact_name_local($id)
+               function get_group_contact_name_local( $id )
                {
                        $result = "Ingen";
-                       if(isset($id) && $id != '')
+                       $id = (int)$id;
+                       if ($id)
                        {
                                $q1 = "SELECT name, phone, email FROM 
activity_contact_person WHERE id={$id}";
                                $this->db->query($q1, __LINE__, __FILE__);
-                               while($this->db->next_record())
-                               {
-                                       $result = $this->db->f('name') . 
"<br/>" . $this->db->f('phone') . "<br/>" . $this->db->f('email');
-                               }
+                               $this->db->next_record();
+
+                               $result = $this->db->f('name', true) . "<br/>" 
. $this->db->f('phone') . "<br/>" . $this->db->f('email');
                        }
                        return $result;
                }
 
-               function get_org_contact_name($id)
+               function get_org_contact_name( $id )
                {
                        $result = "Ingen";
-                       if(isset($id) && $id != '')
+                       $id = (int)$id;
+                       if ($id)
                        {
                                $q1 = "SELECT name, phone, email FROM 
bb_organization_contact WHERE id={$id}";
                                $this->db->query($q1, __LINE__, __FILE__);
-                               while($this->db->next_record())
-                               {
-                                       $result = $this->db->f('name') . 
"<br/>" . $this->db->f('phone') . "<br/>" . $this->db->f('email');
-                               }
+                               $this->db->next_record();
+
+                               $result = $this->db->f('name', true) . "<br/>" 
. $this->db->f('phone') . "<br/>" . $this->db->f('email');
                        }
                        return $result;
                }
 
-               function get_org_contact_name_local($id)
+               function get_org_contact_name_local( $id )
                {
                        $result = "Ingen";
-                       if(isset($id) && $id != '')
+                       $id = (int)$id;
+                       if ($id)
                        {
                                $q1 = "SELECT name, phone, email FROM 
activity_contact_person WHERE id={$id}";
                                $this->db->query($q1, __LINE__, __FILE__);
-                               while($this->db->next_record())
-                               {
-                                       $result = $this->db->f('name') . 
"<br/>" . $this->db->f('phone') . "<br/>" . $this->db->f('email');
-                               }
+                               $this->db->next_record();
+                               $result = $this->db->f('name', true) . "<br/>" 
. $this->db->f('phone') . "<br/>" . $this->db->f('email');
                        }
                        return $result;
                }
 
-               function get_mailaddress_for_group_contact($contact_person_id)
+               function get_mailaddress_for_group_contact( $contact_person_id )
                {
-                       if($contact_person_id)
+                       $contact_person_id = (int)$contact_person_id;
+                       if ($contact_person_id)
                        {
                                $q1 = "SELECT email FROM bb_group_contact WHERE 
id={$contact_person_id}";
                                $this->db->query($q1, __LINE__, __FILE__);
-                               while($this->db->next_record())
-                               {
+                               $this->db->next_record();
                                        $result = $this->db->f('email');
                                }
-                       }
                        return $result;
                }
 
-               function get_mailaddress_for_org_contact($contact_person_id)
+               function get_mailaddress_for_org_contact( $contact_person_id )
                {
-                       if($contact_person_id)
+                       $contact_person_id = (int)$contact_person_id;
+                       if ($contact_person_id)
                        {
                                $q1 = "SELECT email FROM 
bb_organization_contact WHERE id={$contact_person_id}";
                                $this->db->query($q1, __LINE__, __FILE__);
-                               while($this->db->next_record())
-                               {
+                               $this->db->next_record();
                                        $result = $this->db->f('email');
                                }
-                       }
                        return $result;
                }
 
@@ -285,7 +281,7 @@
                 * @param activitycalendar_activity $activity the party to be 
added
                 * @return bool true if successful, false otherwise
                 */
-               function add(&$contact_person)
+               function add( &$contact_person )
                {
                        return false;
                }
@@ -296,14 +292,14 @@
                 * @param $activity the activity to be updated
                 * @return boolean true if successful, false otherwise
                 */
-               function update($contact_person)
+               function update( $contact_person )
                {
                        return false;
                }
 
-               public function get_id_field_name($extended_info = false)
+               public function get_id_field_name( $extended_info = false )
                {
-                       if(!$extended_info)
+                       if (!$extended_info)
                        {
                                $ret = 'id';
                        }
@@ -319,10 +315,10 @@
                        return $ret;
                }
 
-               protected function populate(int $contact_person_id, 
&$contact_person)
+               protected function populate( int $contact_person_id, 
&$contact_person )
                {
 
-                       if($contact_person == null)
+                       if ($contact_person == null)
                        {
                                $contact_person = new 
activitycalendar_contact_person((int)$contact_person_id);
 
@@ -336,12 +332,13 @@
                        return $contact_person;
                }
 
-               function get_local_contact_persons($id, $group = false)
+               function get_local_contact_persons( $id, $group = false )
                {
                        $result = array();
-                       if(isset($id))
+                       $id = (int)$id;
+                       if ($id)
                        {
-                               if($group)
+                               if ($group)
                                {
                                        $q1 = "SELECT id, organization_id, 
group_id, name, phone, email FROM activity_contact_person WHERE 
group_id='{$id}'";
                                }
@@ -350,7 +347,7 @@
                                        $q1 = "SELECT id, organization_id, 
group_id, name, phone, email FROM activity_contact_person WHERE 
organization_id='{$id}' and group_id='0'";
                                }
                                $this->db->query($q1, __LINE__, __FILE__);
-                               while($this->db->next_record())
+                               while ($this->db->next_record())
                                {
                                        $contact_person  = new 
activitycalendar_contact_person($this->db->f('id'), 'int');
                                        
$contact_person->set_organization_id($this->unmarshal($this->db->f('organization_id'),
 'int'));
@@ -364,17 +361,18 @@
                        return $result;
                }
 
-               function get_booking_contact_persons($id, $group = false)
+               function get_booking_contact_persons( $id, $group = false )
                {
                        $result = array();
-                       if(isset($id))
+                       $id = (int)$id;
+                       if ($id)
                        {
                                $columns[]       = 'group_contact.id';
                                $columns[]       = 'group_contact.name';
                                $columns[]       = 'group_contact.phone';
                                $columns[]       = 'group_contact.email';
                                $columns[]       = 'group_contact.group_id';
-                               if($group)
+                               if ($group)
                                {
                                        $q1 = "SELECT id, group_id, name, 
phone, email FROM bb_group_contact WHERE group_id='{$id}'";
                                }
@@ -383,7 +381,7 @@
                                        $q1 = "SELECT id, organization_id, 
name, phone, email, ssn FROM bb_organization_contact WHERE 
organization_id='{$id}'";
                                }
                                $this->db->query($q1, __LINE__, __FILE__);
-                               while($this->db->next_record())
+                               while ($this->db->next_record())
                                {
                                        $contact_person  = new 
activitycalendar_contact_person($this->db->f('id'), 'int');
                                        
$contact_person->set_organization_id($this->unmarshal($this->db->f('organization_id'),
 'int'));
@@ -397,9 +395,9 @@
                        return $result;
                }
 
-               function update_local_contact_person($contact)
+               function update_local_contact_person( $contact )
                {
-                       $id                      = $contact['id'];
+                       $id = (int)$contact['id'];
                        $name            = $contact['name'];
                        $phone           = $contact['phone'];
                        $mail            = $contact['mail'];
@@ -421,7 +419,7 @@
                        return isset($result);
                }
 
-               function add_new_group_contact($contact)
+               function add_new_group_contact( $contact )
                {
                        $name            = $contact->get_name();
                        $phone           = $contact->get_phone();
@@ -443,7 +441,7 @@
                        $sql     = "INSERT INTO bb_group_contact ({$cols}) 
VALUES ({$vals})";
                        $result  = $this->db->query($sql, __LINE__, __FILE__);
 
-                       if(isset($result))
+                       if (isset($result))
                        {
                                return 
$this->db->get_last_insert_id('bb_group_contact', 'id');
                        }

Modified: branches/dev-syncromind/activitycalendar/inc/class.sogroup.inc.php
===================================================================
--- branches/dev-syncromind/activitycalendar/inc/class.sogroup.inc.php  
2016-04-09 11:19:48 UTC (rev 14910)
+++ branches/dev-syncromind/activitycalendar/inc/class.sogroup.inc.php  
2016-04-09 11:40:37 UTC (rev 14911)
@@ -15,7 +15,7 @@
                 */
                public static function get_instance()
                {
-                       if(self::$so == null)
+                       if (self::$so == null)
                        {
                                self::$so = 
CreateObject('activitycalendar.sogroup');
                        }
@@ -36,24 +36,24 @@
                 * @param boolean $return_count
                 * @return string SQL
                 */
-               protected function get_query(string $sort_field, boolean 
$ascending, string $search_for, string $search_type, array $filters, boolean 
$return_count)
+               protected function get_query( string $sort_field, boolean 
$ascending, string $search_for, string $search_type, array $filters, boolean 
$return_count )
                {
                        $clauses = array('1=1');
 
                        //Add columns to this array to include them in the query
                        $columns = array();
 
-                       if($sort_field != null)
+                       if ($sort_field != null)
                        {
                                $dir     = $ascending ? 'ASC' : 'DESC';
                                $order   = "ORDER BY bb_group.id $dir";
                        }
-                       if($search_for)
+                       if ($search_for)
                        {
                                $query                   = 
$this->marshal($search_for, 'string');
                                $like_pattern    = "'%" . $search_for . "%'";
                                $like_clauses    = array();
-                               switch($search_type)
+                               switch ($search_type)
                                {
                                        case "name":
                                                $like_clauses[]  = "group.name 
$this->like $like_pattern";
@@ -62,7 +62,7 @@
                                }
 
 
-                               if(count($like_clauses))
+                               if (count($like_clauses))
                                {
                                        $clauses[] = '(' . join(' OR ', 
$like_clauses) . ')';
                                }
@@ -71,46 +71,46 @@
                        $use_local_group         = false;
                        $filter_clauses          = array();
                        $filter_clauses[]        = "bb_group.show_in_portal=1";
-                       if(isset($filters['org_id']))
+                       if (isset($filters['org_id']))
                        {
                                $group_org_id = 
$this->marshal($filters['org_id'], 'int');
-                               if(isset($group_org_id) && $group_org_id > 0)
+                               if (isset($group_org_id) && $group_org_id > 0)
                                {
                                        $filter_clauses[] = 
"bb_group.organization_id = {$group_org_id}";
                                }
                        }
-                       if(isset($filters['changed_groups']))
+                       if (isset($filters['changed_groups']))
                        {
                                $use_local_group = true;
                                unset($filter_clauses);
-                               if(isset($filters[$this->get_id_field_name()]))
+                               if (isset($filters[$this->get_id_field_name()]))
                                {
                                        $id                                     
 = $this->marshal($filters[$this->get_id_field_name()], 'int');
                                        $filter_clauses[]        = 
"activity_group.id = {$id}";
                                }
                        }
-                       if(isset($filters['new_groups']))
+                       if (isset($filters['new_groups']))
                        {
                                $use_local_group         = true;
                                unset($filter_clauses);
                                $filter_clauses[]        = 
"(activity_group.change_type = 'new' OR activity_group.change_type = 'change') 
";
-                               if(isset($filters['group_id']))
+                               if (isset($filters['group_id']))
                                {
                                        $id                                     
 = $this->marshal($filters['group_id'], 'int');
                                        $filter_clauses[]        = 
"activity_group.id = {$id}";
                                }
                        }
 
-                       if(count($filter_clauses))
+                       if (count($filter_clauses))
                        {
                                $clauses[] = join(' AND ', $filter_clauses);
                        }
 
                        $condition = join(' AND ', $clauses);
 
-                       if($use_local_group)
+                       if ($use_local_group)
                        {
-                               if($return_count) // We should only return a 
count
+                               if ($return_count) // We should only return a 
count
                                {
                                        $cols = 
'COUNT(DISTINCT(activity_group.id)) AS count';
                                }
@@ -134,7 +134,7 @@
                        }
                        else
                        {
-                               if($return_count) // We should only return a 
count
+                               if ($return_count) // We should only return a 
count
                                {
                                        $cols = 'COUNT(DISTINCT(bb_group.id)) 
AS count';
                                }
@@ -167,7 +167,7 @@
                 * @param rental_party $party the party to be added
                 * @return bool true if successful, false otherwise
                 */
-               function add(&$group)
+               function add( &$group )
                {
                        return false;
                }
@@ -178,16 +178,18 @@
                 * @param $party the party to be updated
                 * @return boolean true if successful, false otherwise
                 */
-               function update($group)
+               function update( $group )
                {
                        return false;
                }
 
-               function update_group_description($group_id, $desc)
+               function update_group_description( $group_id, $desc )
                {
-                       $sql     = "UPDATE bb_group SET description='{$desc}' 
WHERE ID={$group_id}";
+                       $desc = $this->db->db_addslashes($desc);
+                       $group_id = (int)$group_id;
+                       $sql = "UPDATE bb_group SET description='{$desc}' WHERE 
id={$group_id}";
                        $result  = $this->db->query($sql, __LINE__, __FILE__);
-                       if(isset($result))
+                       if (isset($result))
                        {
                                return true;
                        }
@@ -197,16 +199,16 @@
                        }
                }
 
-               function update_group_contact($contact)
+               function update_group_contact( $contact )
                {
-                       $id              = intval($contact['original_id']);
-                       $name    = $contact['name'];
+                       $id = (int)$contact['original_id'];
+                       $name = $this->db->db_addslashes($contact['name']);
                        $phone   = $contact['phone'];
                        $mail    = $contact['mail'];
 
-                       $sql     = "UPDATE bb_group_contact SET NAME='{$name}', 
PHONE='{$phone}', EMAIL='{$mail}' WHERE id={$id}";
+                       $sql = "UPDATE bb_group_contact SET name='{$name}', 
phone='{$phone}', email='{$mail}' WHERE id={$id}";
                        $result  = $this->db->query($sql, __LINE__, __FILE__);
-                       if(isset($result))
+                       if (isset($result))
                        {
                                return true;
                        }
@@ -216,9 +218,9 @@
                        }
                }
 
-               function add_group_contact_local($contact)
+               function add_group_contact_local( $contact )
                {
-                       $name            = $contact['name'];
+                       $name = $this->db->db_addslashes($contact['name']);
                        $phone           = $contact['phone'];
                        $mail            = $contact['mail'];
                        $original_id = $contact['original_id'];
@@ -252,9 +254,9 @@
                        return isset($result);
                }
 
-               public function get_id_field_name($extended_info = false)
+               public function get_id_field_name( $extended_info = false )
                {
-                       if(!$extended_info)
+                       if (!$extended_info)
                        {
                                $ret = array
                                        (
@@ -275,95 +277,96 @@
                        return $ret;
                }
 
-               function get_group_name($group_id)
+               function get_group_name( $group_id )
                {
                        $result = "Ingen";
-                       if(isset($group_id))
+                       $group_id = (int)$group_id;
+                       if ($group_id)
                        {
                                $q1 = "SELECT name FROM bb_group WHERE 
id={$group_id}";
                                $this->db->query($q1, __LINE__, __FILE__);
-                               while($this->db->next_record())
-                               {
-                                       $result = $this->db->f('name');
-                               }
+                               $this->db->next_record();
+
+                               $result = $this->db->f('name', true);
                        }
 
                        return $result;
                }
 
-               function get_group_name_local($group_id)
+               function get_group_name_local( $group_id )
                {
                        $result = "Ingen";
-                       if(isset($group_id))
+                       $group_id = (int)$group_id;
+                       if ($group_id)
                        {
                                $q1 = "SELECT name FROM activity_group WHERE 
id={$group_id}";
                                $this->db->query($q1, __LINE__, __FILE__);
-                               while($this->db->next_record())
-                               {
-                                       $result = $this->db->f('name');
-                               }
+                               $this->db->next_record();
+
+                               $result = $this->db->f('name', true);
                        }
 
                        return $result;
                }
 
-               function get_orgid_from_group($group_id)
+               function get_orgid_from_group( $group_id )
                {
                        $result = 0;
-                       if(isset($group_id))
+                       $group_id = (int)$group_id;
+                       if ($group_id)
                        {
                                $q1 = "SELECT organization_id FROM bb_group 
WHERE id={$group_id}";
                                $this->db->query($q1, __LINE__, __FILE__);
-                               while($this->db->next_record())
-                               {
+                               $this->db->next_record();
+
                                        $result = 
$this->db->f('organization_id');
                                }
-                       }
 
                        return $result;
                }
 
-               function get_orgid_from_group_local($group_id)
+               function get_orgid_from_group_local( $group_id )
                {
                        $result = 0;
-                       if(isset($group_id))
+                       $group_id = (int)$group_id;
+                       if ($group_id)
                        {
                                $q1 = "SELECT organization_id FROM 
activity_group WHERE id={$group_id}";
                                $this->db->query($q1, __LINE__, __FILE__);
-                               while($this->db->next_record())
-                               {
+                               $this->db->next_record();
+
                                        $result = 
$this->db->f('organization_id');
                                }
-                       }
 
                        return $result;
                }
 
-               function get_contacts($group_id)
+               function get_contacts( $group_id )
                {
                        $contacts = array();
-                       if(isset($group_id))
+                       $group_id = (int)$group_id;
+                       if ($group_id)
                        {
                                $q1 = "SELECT id FROM bb_group_contact WHERE 
group_id={$group_id}";
                                $this->db->query($q1, __LINE__, __FILE__);
-                               while($this->db->next_record())
+                               while ($this->db->next_record())
                                {
                                        $contacts[] = $this->db->f('id');
                                }
-                               //$result = $contacts;
                        }
 
                        return $contacts;
                }
 
-               function get_contacts_as_objects($group_id)
+               function get_contacts_as_objects( $group_id )
                {
                        $contacts = array();
-                       if(isset($group_id))
+                       $group_id = (int)$group_id;
+                       if ($group_id)
                        {
                                $q1 = "SELECT * FROM bb_group_contact WHERE 
group_id={$group_id}";
                                $this->db->query($q1, __LINE__, __FILE__);
-                               while($this->db->next_record())
+                               while ($this->db->next_record())
                                {
                                        $contact_person  = new 
activitycalendar_contact_person((int)$this->db->f('id'));
                                        
$contact_person->set_organization_id($this->unmarshal($this->db->f('organization_id'),
 'int'));
@@ -373,37 +376,37 @@
                                        
$contact_person->set_email($this->unmarshal($this->db->f('email'), 'string'));
                                        $contacts[]              = 
$contact_person;
                                }
-                               //$result = $contacts;
                        }
 
                        return $contacts;
                }
 
-               function get_contacts_local($group_id)
+               function get_contacts_local( $group_id )
                {
                        $contacts = array();
-                       if(isset($group_id))
+                       $group_id = (int)$group_id;
+                       if ($group_id)
                        {
                                $q1 = "SELECT id FROM activity_contact_person 
WHERE group_id='{$group_id}'";
                                $this->db->query($q1, __LINE__, __FILE__);
-                               while($this->db->next_record())
+                               while ($this->db->next_record())
                                {
                                        $contacts[] = $this->db->f('id');
                                }
-                               //$result = $contacts;
                        }
 
                        return $contacts;
                }
 
-               function get_contacts_local_as_objects($group_id)
+               function get_contacts_local_as_objects( $group_id )
                {
                        $contacts = array();
-                       if(isset($group_id))
+                       $group_id = (int)$group_id;
+                       if ($group_id)
                        {
                                $q1 = "SELECT * FROM activity_contact_person 
WHERE group_id='{$group_id}'";
                                $this->db->query($q1, __LINE__, __FILE__);
-                               while($this->db->next_record())
+                               while ($this->db->next_record())
                                {
                                        $contact_person  = new 
activitycalendar_contact_person((int)$this->db->f('id'));
                                        
$contact_person->set_organization_id($this->unmarshal($this->db->f('organization_id'),
 'int'));
@@ -413,44 +416,43 @@
                                        
$contact_person->set_email($this->unmarshal($this->db->f('email'), 'string'));
                                        $contacts[]              = 
$contact_person;
                                }
-                               //$result = $contacts;
                        }
 
                        return $contacts;
                }
 
-               function get_description($group_id)
+               function get_description( $group_id )
                {
-                       if(isset($group_id))
+                       $group_id = (int)$group_id;
+                       if ($group_id)
                        {
                                $q1 = "SELECT description FROM bb_group WHERE 
id={$group_id}";
                                $this->db->query($q1, __LINE__, __FILE__);
-                               while($this->db->next_record())
-                               {
-                                       $desc = $this->db->f('description');
-                               }
+                               $this->db->next_record();
+
+                               $desc = $this->db->f('description', true);
                        }
                        return $desc;
                }
 
-               function get_description_local($group_id)
+               function get_description_local( $group_id )
                {
-                       if(isset($group_id))
+                       $group_id = (int)$group_id;
+                       if ($group_id)
                        {
                                $q1 = "SELECT description FROM activity_group 
WHERE id={$group_id}";
                                $this->db->query($q1, __LINE__, __FILE__);
-                               while($this->db->next_record())
-                               {
-                                       $desc = $this->db->f('description');
-                               }
+                               $this->db->next_record();
+
+                               $desc = $this->db->f('description', true);
                        }
                        return $desc;
                }
 
-               protected function populate(int $group_id, &$group)
+               protected function populate( int $group_id, &$group )
                {
 
-                       if($group == null)
+                       if ($group == null)
                        {
                                $group = new 
activitycalendar_group((int)$group_id);
 
@@ -466,7 +468,7 @@
                        return $group;
                }
 
-               function update_local($group)
+               function update_local( $group )
                {
                        $name            = $group->get_name();
                        $orgid           = $group->get_organization_id();
@@ -474,16 +476,17 @@
                        $change_type = $group->get_change_type();
                        $transferred = ($group->get_transferred() == 1 || 
$group->get_transferred() == true) ? 'true' : 'false';
 
-                       $values[]        = "NAME='{$name}'";
-                       $values[]        = "DESCRIPTION='{$description}'";
-                       $values[]        = "ORGANIZATION_ID='{$orgid}'";
-                       $values[]        = "CHANGE_TYPE='{$change_type}'";
-                       $values[]        = "TRANSFERRED={$transferred}";
+                       $values[] = "name='{$name}'";
+                       $values[] = "description='{$description}'";
+                       $values[] = "organization_id='{$orgid}'";
+                       $values[] = "change_type='{$change_type}'";
+                       $values[] = "transferred={$transferred}";
                        $vals            = implode(',', $values);
 
-                       $sql     = "UPDATE activity_group SET {$vals} WHERE 
ID={$group->get_id()}";
+                       $id = (int)$group->get_id();
+                       $sql = "UPDATE activity_group SET {$vals} WHERE 
id={$id}";
                        $result  = $this->db->query($sql, __LINE__, __FILE__);
-                       if(isset($result))
+                       if (isset($result))
                        {
                                return true;
                        }
@@ -493,7 +496,7 @@
                        }
                }
 
-               function transfer_group($group_info)
+               function transfer_group( $group_info )
                {
                        $name                    = $group_info['name'];
                        $orgid                   = 
$group_info['organization_id'];
@@ -517,7 +520,7 @@
 
                        $sql     = "INSERT INTO bb_group ({$cols}) VALUES 
({$vals})";
                        $result  = $this->db->query($sql, __LINE__, __FILE__);
-                       if(isset($result))
+                       if (isset($result))
                        {
                                return 
$this->db->get_last_insert_id('bb_group', 'id');
                        }
@@ -527,8 +530,9 @@
                        }
                }
 
-               function get_group_local($g_id)
+               function get_group_local( $g_id )
                {
+                       $g_id = (int)$g_id;
                        $columns[]       = 'activity_group.id';
                        $columns[]       = 'activity_group.name';
                        $columns[]       = 'activity_group.description';
@@ -545,10 +549,10 @@
 
                        $sql     = "SELECT {$cols} FROM {$table} WHERE 
activity_group.id={$g_id}";
                        $result  = $this->db->query($sql, __LINE__, __FILE__);
-                       while($this->db->next_record())
-                       {
-                               $group = new activitycalendar_group((int)$g_id);
+                       $this->db->next_record();
 
+                       $group = new activitycalendar_group($g_id);
+
                                
$group->set_name($this->unmarshal($this->db->f('name'), 'string'));
                                
$group->set_organization_id($this->unmarshal($this->db->f('organization_id'), 
'int'));
                                
$group->set_shortname($this->unmarshal($this->db->f('shortname'), 'string'));
@@ -560,13 +564,12 @@
 
                                return $group;
                        }
-               }
 
-               function add_new_group_from_activity($group_info)
+               function add_new_group_from_activity( $group_info )
                {
-                       $name                    = $group_info['name'];
+                       $name = $this->db->db_addslashes($group_info['name']);
                        $orgid                   = 
$group_info['organization_id'];
-                       $description     = $group_info['description'];
+                       $description = 
$this->db->db_addslashes($group_info['description']);
                        $activity_id     = 1;
                        $show_in_portal  = 1;
 
@@ -587,7 +590,7 @@
                        $sql     = "INSERT INTO bb_group ({$cols}) VALUES 
({$vals})";
                        $result  = $this->db->query($sql, __LINE__, __FILE__);
 
-                       if(isset($result))
+                       if (isset($result))
                        {
                                return 
$this->db->get_last_insert_id('bb_group', 'id');
                        }

Modified: 
branches/dev-syncromind/activitycalendar/inc/class.soorganization.inc.php
===================================================================
--- branches/dev-syncromind/activitycalendar/inc/class.soorganization.inc.php   
2016-04-09 11:19:48 UTC (rev 14910)
+++ branches/dev-syncromind/activitycalendar/inc/class.soorganization.inc.php   
2016-04-09 11:40:37 UTC (rev 14911)
@@ -20,7 +20,7 @@
                 */
                public static function get_instance()
                {
-                       if(self::$so == null)
+                       if (self::$so == null)
                        {
                                self::$so = 
CreateObject('activitycalendar.soorganization');
                        }
@@ -41,33 +41,33 @@
                 * @param boolean $return_count
                 * @return string SQL
                 */
-               protected function get_query(string $sort_field, boolean 
$ascending, string $search_for, string $search_type, array $filters, boolean 
$return_count)
+               protected function get_query( string $sort_field, boolean 
$ascending, string $search_for, string $search_type, array $filters, boolean 
$return_count )
                {
                        $clauses = array('1=1');
 
                        //Add columns to this array to include them in the query
                        $columns = array();
 
-                       if($sort_field != null && !$return_count)
+                       if ($sort_field != null && !$return_count)
                        {
-                               if($sort_field == 'identifier')
+                               if ($sort_field == 'identifier')
                                {
                                        $sort_field = 'org.id';
                                }
                                $dir     = $ascending ? 'ASC' : 'DESC';
                                $order   = "ORDER BY $sort_field $dir";
                        }
-                       else if(!$return_count)
+                       else if (!$return_count)
                        {
                                $dir     = $ascending ? 'ASC' : 'DESC';
                                $order   = "ORDER BY org.name $dir";
                        }
-                       if($search_for)
+                       if ($search_for)
                        {
                                $query                   = 
$this->marshal($search_for, 'string');
                                $like_pattern    = "'%" . $search_for . "%'";
                                $like_clauses    = array();
-                               switch($search_type)
+                               switch ($search_type)
                                {
                                        case "name":
                                                $like_clauses[]  = "org.name 
$this->like $like_pattern";
@@ -85,7 +85,7 @@
                                }
 
 
-                               if(count($like_clauses))
+                               if (count($like_clauses))
                                {
                                        $clauses[] = '(' . join(' OR ', 
$like_clauses) . ')';
                                }
@@ -97,51 +97,51 @@
 
                        $use_local_org = false;
 
-                       if(isset($filters[$this->get_id_field_name()]))
+                       if (isset($filters[$this->get_id_field_name()]))
                        {
                                $id                                      = 
$this->marshal($filters[$this->get_id_field_name()], 'int');
                                $filter_clauses[]        = "org.id = {$id}";
                        }
-                       if(isset($filters['changed_orgs']))
+                       if (isset($filters['changed_orgs']))
                        {
                                $use_local_org = true;
                                //$id = 
$this->marshal($filters[$this->get_id_field_name()],'int');
                                //$filter_clauses[] = "org.id = {$id}";
                                unset($filter_clauses);
-                               if(isset($filters[$this->get_id_field_name()]))
+                               if (isset($filters[$this->get_id_field_name()]))
                                {
                                        $id                                     
 = $this->marshal($filters[$this->get_id_field_name()], 'int');
                                        $filter_clauses[]        = "org.id = 
{$id}";
                                }
                        }
-                       if(isset($filters['new_orgs']))
+                       if (isset($filters['new_orgs']))
                        {
                                $use_local_org           = true;
                                //$id = 
$this->marshal($filters[$this->get_id_field_name()],'int');
                                //$filter_clauses[] = "org.id = {$id}";
                                unset($filter_clauses);
                                $filter_clauses[]        = "org.change_type = 
'new' OR org.change_type = 'change' ";
-                               if(isset($filters[$this->get_id_field_name()]))
+                               if (isset($filters[$this->get_id_field_name()]))
                                {
                                        $id                                     
 = $this->marshal($filters[$this->get_id_field_name()], 'int');
                                        $filter_clauses[]        = "org.id = 
{$id}";
                                }
                        }
-                       if(isset($filters['edit_from_frontend']))
+                       if (isset($filters['edit_from_frontend']))
                        {
                                $filter_clauses[] = "org.id IN (SELECT 
organization_id from activity_activity where state = 3 OR state = 4)";
                        }
 
-                       if(count($filter_clauses))
+                       if (count($filter_clauses))
                        {
                                $clauses[] = join(' AND ', $filter_clauses);
                        }
 
                        $condition = join(' AND ', $clauses);
 
-                       if($use_local_org)
+                       if ($use_local_org)
                        {
-                               if($return_count) // We should only return a 
count
+                               if ($return_count) // We should only return a 
count
                                {
                                        $cols = 'COUNT(DISTINCT(org.id)) AS 
count';
                                }
@@ -170,7 +170,7 @@
                        }
                        else
                        {
-                               if($return_count) // We should only return a 
count
+                               if ($return_count) // We should only return a 
count
                                {
                                        $cols = 'COUNT(DISTINCT(org.id)) AS 
count';
                                }
@@ -207,18 +207,18 @@
                        return "SELECT {$cols} FROM {$tables} WHERE 
{$condition} {$order}";
                }
 
-               function get_organization_name($org_id)
+               function get_organization_name( $org_id )
                {
                        $result = "Ingen";
-                       if(isset($org_id))
+                       $org_id = (int)$org_id;
+                       if ($org_id)
                        {
                                $org_id  = intval($org_id);
                                $q1              = "SELECT name FROM 
bb_organization WHERE id={$org_id}";
                                $this->db->query($q1, __LINE__, __FILE__);
-                               while($this->db->next_record())
-                               {
-                                       $result = $this->db->f('name');
-                               }
+                               $this->db->next_record();
+
+                               $result = $this->db->f('name', true);
                        }
 
                        return $result;
@@ -231,7 +231,7 @@
                        $q1              = "select bb.id as orgid, bb.name as 
orgname, bb.organization_number as orgno, bb.street as orgstreet, bb.zip_code 
as zip, bb.city from bb_organization bb where bb.show_in_portal=1 and 
bb.active=1 order by bb.name, bb.id";
 //             $q1="SELECT name FROM bb_organization WHERE id={$org_id}";
                        $this->db->query($q1, __LINE__, __FILE__);
-                       while($this->db->next_record())
+                       while ($this->db->next_record())
                        {
                                //if($org->get_name() != 
$this->db->f('orgname')) //new organization
                                //{
@@ -268,17 +268,17 @@
                        $new_orgs                = array();
                        $removed_orgs    = array();
                        $orgmappings     = array();
-                       foreach($orgs1 as $org)
+                       foreach ($orgs1 as $org)
                        {
                                $tmpName = $org['orgname'];
                                $curr_id = $org['orgid'];
-                               if(!in_array($curr_id, $removed_orgs))
+                               if (!in_array($curr_id, $removed_orgs))
                                {
-                                       foreach($orgs2 as $o2)
+                                       foreach ($orgs2 as $o2)
                                        {
                                                $removeId = $o2['orgid'];
                                                //var_dump($removeId 
.':'.$curr_id . '<br/>');
-                                               if($removeId != $curr_id && 
$o2['orgname'] == $tmpName)
+                                               if ($removeId != $curr_id && 
$o2['orgname'] == $tmpName)
                                                {
                                                        
//var_dump($removeId.'-' . $o2['orgname'].' skal fjernes <br/>');
                                                        //update previous 
instance
@@ -300,14 +300,14 @@
 
                        $this->db->transaction_begin();
                        //loop through activities and update 
organization-connection
-                       foreach($orgmappings as $key => $value)
+                       foreach ($orgmappings as $key => $value)
                        {
-                               foreach($value as $orgmapping)
+                               foreach ($value as $orgmapping)
                                {
 //                             var_dump($orgmapping.' skal flyttes til 
'.$key.'<br/>');
                                        //get activity connected to current 
orgid
                                        $activities = 
$so_activity->get_connected_activities($orgmapping);
-                                       foreach($activities as $activity)
+                                       foreach ($activities as $activity)
                                        {
                                                var_dump($activity->get_title() 
. ' flyttes fra ' . $orgmapping . ' til ' . $key . '</br>');
                                                
$so_activity->update_organization_connection($activity->get_id(), $key);
@@ -316,20 +316,20 @@
                                        
$this->set_organization_inactive($orgmapping);
                                        //get affected stuff from booking
                                        $alloc = 
$this->get_affected_allocations($orgmapping);
-                                       foreach($alloc as $a)
+                                       foreach ($alloc as $a)
                                        {
                                                var_dump('Allocation id: ' . $a 
. ' flyttes fra ' . $orgmapping . ' til ' . $key . '</br>');
                                                
$this->update_affected_allocations($a, $key);
                                        }
 
                                        $res = 
$this->get_affected_reservations($orgmapping);
-                                       foreach($res as $r)
+                                       foreach ($res as $r)
                                        {
                                                var_dump('Reservation id: ' . 
$r . ' flyttes fra ' . $orgmapping . ' til ' . $key . '</br>');
                                                
$this->update_affected_reservations($r, $key);
                                        }
                                        $event = 
$this->get_affected_events($orgmapping);
-                                       foreach($event as $e)
+                                       foreach ($event as $e)
                                        {
                                                var_dump('Event id: ' . $e . ' 
flyttes fra ' . $orgmapping . ' til ' . $key . '</br>');
                                                
$this->update_affected_events($e, $key);
@@ -338,7 +338,7 @@
                        }
 
                        //loop through organizations and update them.
-                       foreach($new_orgs as $no)
+                       foreach ($new_orgs as $no)
                        {
                                //update organization with new information
                                //_debug_array($no);
@@ -349,48 +349,47 @@
                        $this->db->transaction_commit();
                }
 
-               function get_organization_name_local($org_id)
+               function get_organization_name_local( $org_id )
                {
                        $result = "Ingen";
-                       if(isset($org_id))
+                       $org_id = (int)$org_id;
+                       if ($org_id)
                        {
                                $q1 = "SELECT name FROM activity_organization 
WHERE id={$org_id}";
                                $this->db->query($q1, __LINE__, __FILE__);
-                               while($this->db->next_record())
-                               {
-                                       $result = $this->db->f('name');
-                               }
+                               $this->db->next_record();
+
+                               $result = $this->db->f('name', true);
                        }
 
                        return $result;
                }
 
-               function get_contacts($organization_id)
+               function get_contacts( $organization_id )
                {
                        $contacts = array();
-                       if(isset($organization_id))
+                       $organization_id = (int)$organization_id;
+                       if ($organization_id)
                        {
                                $q1 = "SELECT id FROM bb_organization_contact 
WHERE organization_id={$organization_id}";
                                $this->db->query($q1, __LINE__, __FILE__);
-                               while($this->db->next_record())
+                               while ($this->db->next_record())
                                {
-                                       $cont_id         = $this->db->f('id');
-                                       $contacts[]      = $cont_id;
+                                       $contacts[] = $this->db->f('id');
                                }
-                               //$result=$contacts;
                        }
                        return $contacts;
                }
 
-               function get_contacts_as_objects($organization_id)
+               function get_contacts_as_objects( $organization_id )
                {
                        $contacts = array();
-                       if(isset($organization_id))
+                       $organization_id = (int)$organization_id;
+                       if ($organization_id)
                        {
                                $q1 = "SELECT * FROM bb_organization_contact 
WHERE organization_id={$organization_id}";
-                               //var_dump($q1);
                                $this->db->query($q1, __LINE__, __FILE__);
-                               while($this->db->next_record())
+                               while ($this->db->next_record())
                                {
                                        $contact_person  = new 
activitycalendar_contact_person((int)$this->db->f('id'));
                                        
$contact_person->set_organization_id($this->unmarshal($this->db->f('organization_id'),
 'int'));
@@ -398,38 +397,37 @@
                                        
$contact_person->set_name($this->unmarshal($this->db->f('name'), 'string'));
                                        
$contact_person->set_phone($this->unmarshal($this->db->f('phone'), 'string'));
                                        
$contact_person->set_email($this->unmarshal($this->db->f('email'), 'string'));
-                                       $contacts[]              = 
$contact_person;}
+                                       $contacts[] = $contact_person;
+                               }
                        }
                        return $contacts;
                }
 
-               function get_contacts_local($organization_id)
+               function get_contacts_local( $organization_id )
                {
                        $contacts = array();
-                       if(isset($organization_id))
+                       $organization_id = (int)$organization_id;
+                       if ($organization_id)
                        {
                                $q1 = "SELECT id FROM activity_contact_person 
WHERE organization_id='{$organization_id}'";
-                               //var_dump($q1);
                                $this->db->query($q1, __LINE__, __FILE__);
-                               while($this->db->next_record())
+                               while ($this->db->next_record())
                                {
-                                       $cont_id         = $this->db->f('id');
-                                       $contacts[]      = $cont_id;
+                                       $contacts[] = $this->db->f('id');
                                }
-                               //$result=$contacts;
                        }
                        return $contacts;
                }
 
-               function get_contacts_local_as_objects($organization_id)
+               function get_contacts_local_as_objects( $organization_id )
                {
                        $contacts = array();
-                       if(isset($organization_id))
+                       $organization_id = (int)$organization_id;
+                       if ($organization_id)
                        {
                                $q1 = "SELECT * FROM activity_contact_person 
WHERE organization_id='{$organization_id}'";
-                               //var_dump($q1);
                                $this->db->query($q1, __LINE__, __FILE__);
-                               while($this->db->next_record())
+                               while ($this->db->next_record())
                                {
                                        $contact_person  = new 
activitycalendar_contact_person((int)$this->db->f('id'));
                                        
$contact_person->set_organization_id($this->unmarshal($this->db->f('organization_id'),
 'int'));
@@ -443,56 +441,55 @@
                        return $contacts;
                }
 
-               function get_description($organization_id)
+               function get_description( $organization_id )
                {
-                       if(isset($organization_id))
+                       $organization_id = (int)$organization_id;
+                       if ($organization_id)
                        {
                                $q1 = "SELECT description FROM bb_organization 
WHERE id={$organization_id}";
                                $this->db->query($q1, __LINE__, __FILE__);
-                               while($this->db->next_record())
-                               {
-                                       $desc = $this->db->f('description');
-                               }
+                               $this->db->next_record();
+
+                               $desc = $this->db->f('description', true);
                        }
                        return $desc;
                }
 
-               function get_description_local($organization_id)
+               function get_description_local( $organization_id )
                {
-                       if(isset($organization_id))
+                       $organization_id = (int)$organization_id;
+                       if ($organization_id)
                        {
                                $q1 = "SELECT description FROM 
activity_organization WHERE id={$organization_id}";
                                $this->db->query($q1, __LINE__, __FILE__);
-                               while($this->db->next_record())
-                               {
-                                       $desc = $this->db->f('description');
-                               }
+                               $this->db->next_record();
+
+                               $desc = $this->db->f('description', true);
                        }
                        return $desc;
                }
 
-               function get_district_from_name($name)
-               {
-                       $this->db->query("SELECT part_of_town_id FROM 
fm_part_of_town where name like UPPER('%{$name}%') ", __LINE__, __FILE__);
-                       while($this->db->next_record())
+               function get_district_from_name( $name )
                        {
-                               $result = $this->db->f('part_of_town_id');
-                       }
+                       $this->db->query("SELECT id FROM fm_part_of_town where 
name like UPPER('%{$name}%') ", __LINE__, __FILE__);
+                       $this->db->next_record();
+
+                       $result = $this->db->f('id');
+
                        return $result;
                }
 
-               function get_office_from_district($district_id)
+               function get_office_from_district( $district_id )
                {
-                       if($district_id)
+                       if ($district_id)
                        {
                                $district_id = (int)$district_id;
-                               $q1                      = "SELECT 
fm_district.descr FROM fm_part_of_town,fm_district WHERE 
fm_part_of_town.part_of_town_id={$district_id} AND fm_district.id = 
fm_part_of_town.district_id";
+                               $q1 = "SELECT fm_district.descr FROM 
fm_part_of_town,fm_district WHERE fm_part_of_town.id={$district_id} AND 
fm_district.id = fm_part_of_town.district_id";
                                //var_dump($q1);
                                $this->db->query($q1, __LINE__, __FILE__);
-                               while($this->db->next_record())
-                               {
-                                       $office_name = $this->db->f('descr');
-                               }
+                               $this->db->next_record();
+
+                               $office_name = $this->db->f('descr', true);
                        }
                        return $office_name;
                }
@@ -503,7 +500,7 @@
                 * @param rental_party $party the party to be added
                 * @return bool true if successful, false otherwise
                 */
-               function add(&$organization)
+               function add( &$organization )
                {
                        return false;
                }
@@ -514,7 +511,7 @@
                 * @param $party the party to be updated
                 * @return boolean true if successful, false otherwise
                 */
-               function update_local($organization)
+               function update_local( $organization )
                {
                        $name                    = $organization->get_name();
                        $orgnr                   = 
$organization->get_organization_number();
@@ -531,25 +528,26 @@
                        $transferred     = ($organization->get_transferred() == 
1 || $organization->get_transferred() == true) ? 'true' : 'false';
                        $original_org_id = 
($organization->get_original_org_id() && $organization->get_original_org_id() 
!= '') ? $organization->get_original_org_id() : 0;
 
-                       $values[]        = "NAME='{$name}'";
-                       $values[]        = "HOMEPAGE='{$homepage}'";
-                       $values[]        = "PHONE='{$phone}'";
-                       $values[]        = "EMAIL='{$email}'";
-                       $values[]        = "DESCRIPTION='{$description}'";
-                       $values[]        = "ADDRESS='{$street}'";
-                       $values[]        = "ADDRESSNUMBER='{$streetnumber}'";
-                       $values[]        = "ZIP_CODE='{$zip_code}'";
-                       $values[]        = "CITY='{$city}'";
-                       $values[]        = "ORGNO='{$orgnr}'";
-                       $values[]        = "DISTRICT='{$district}'";
-                       $values[]        = "CHANGE_TYPE='{$change_type}'";
-                       $values[]        = "TRANSFERRED={$transferred}";
-                       $values[]        = "ORIGINAL_ORG_ID={$original_org_id}";
+                       $values[] = "name='{$name}'";
+                       $values[] = "homepage='{$homepage}'";
+                       $values[] = "phone='{$phone}'";
+                       $values[] = "email='{$email}'";
+                       $values[] = "description='{$description}'";
+                       $values[] = "address='{$street}'";
+                       $values[] = "addressnumber='{$streetnumber}'";
+                       $values[] = "zip_code='{$zip_code}'";
+                       $values[] = "city='{$city}'";
+                       $values[] = "orgno='{$orgnr}'";
+                       $values[] = "district='{$district}'";
+                       $values[] = "change_type='{$change_type}'";
+                       $values[] = "transferred={$transferred}";
+                       $values[] = "original_org_id={$original_org_id}";
                        $vals            = implode(',', $values);
 
-                       $sql     = "UPDATE activity_organization SET {$vals} 
WHERE ID={$organization->get_id()}";
+                       $id = (int)$organization->get_id();
+                       $sql = "UPDATE activity_organization SET {$vals} WHERE 
id={$id}";
                        $result  = $this->db->query($sql, __LINE__, __FILE__);
-                       if(isset($result))
+                       if (isset($result))
                        {
                                return true;
                        }
@@ -559,9 +557,9 @@
                        }
                }
 
-               public function get_id_field_name($extended_info = false)
+               public function get_id_field_name( $extended_info = false )
                {
-                       if(!$extended_info)
+                       if (!$extended_info)
                        {
                                $ret = 'id';
                        }
@@ -577,10 +575,10 @@
                        return $ret;
                }
 
-               protected function populate(int $org_id, &$organization)
+               protected function populate( int $org_id, &$organization )
                {
 
-                       if($organization == null)
+                       if ($organization == null)
                        {
                                $organization = new 
activitycalendar_organization((int)$org_id);
 
@@ -603,7 +601,7 @@
                        return $organization;
                }
 
-               function add_organization_local($organization)
+               function add_organization_local( $organization )
                {
                        $name                    = $organization->get_name();
                        $orgnr                   = 
$organization->get_organization_number();
@@ -612,7 +610,7 @@
                        $streetnumber    = $organization->get_address_number();
                        $zip_code                = 
$organization->get_zip_code();
                        $city                    = $organization->get_city();
-                       if($organization->get_original_org_id() && 
$organization->get_original_org_id() != '')
+                       if ($organization->get_original_org_id() && 
$organization->get_original_org_id() != '')
                        {
                                $original_org_id = 
$organization->get_original_org_id();
                        }
@@ -621,21 +619,21 @@
                                $original_org_id = 0;
                        }
 
-
-                       $values[]        = "NAME='{$name}'";
-                       $values[]        = "HOMEPAGE='{$homepage}'";
-                       $values[]        = "ADDRESS='{$street}'";
-                       $values[]        = "ADDRESSNUMBER='{$streetnumber}'";
-                       $values[]        = "ZIP_CODE='{$zip_code}'";
-                       $values[]        = "CITY='{$city}'";
-                       $values[]        = "ORGNO='{$orgnr}'";
-                       $values[]        = "ORIGINAL_ORG_ID={$original_org_id}";
+                       $values[] = "name='{$name}'";
+                       $values[] = "homepage='{$homepage}'";
+                       $values[] = "address='{$street}'";
+                       $values[] = "addressnumber='{$streetnumber}'";
+                       $values[] = "zip_code='{$zip_code}'";
+                       $values[] = "city='{$city}'";
+                       $values[] = "orgno='{$orgnr}'";
+                       $values[] = "original_org_id={$original_org_id}";
                        $vals            = implode(',', $values);
 
                        //var_dump("INSERT INTO activity_organization ({$cols}) 
VALUES ({$vals})");
-                       $sql     = "UPDATE activity_organization SET {$vals} 
WHERE ID={$organization->get_id()}";
+                       $id = (int)$organization->get_id();
+                       $sql = "UPDATE activity_organization SET {$vals} WHERE 
id={$id}";
                        $result  = $this->db->query($sql, __LINE__, __FILE__);
-                       if(isset($result))
+                       if (isset($result))
                        {
                                return true;
                        }
@@ -645,7 +643,7 @@
                        }
                }
 
-               function transfer_organization($org_info)
+               function transfer_organization( $org_info )
                {
                        $name                            = $org_info['name'];
                        $orgnr                           = $org_info['orgnr'];
@@ -692,7 +690,7 @@
 
                        $sql     = "INSERT INTO bb_organization ({$cols}) 
VALUES ({$vals})";
                        $result  = $this->db->query($sql, __LINE__, __FILE__);
-                       if(isset($result))
+                       if (isset($result))
                        {
                                return 
$this->db->get_last_insert_id('bb_organization', 'id');
                        }
@@ -702,12 +700,14 @@
                        }
                }
 
-               function get_organization_local($org_id)
+               function get_organization_local( $org_id )
                {
+                       $org_id = (int)$org_id;
+
                        $sql = "SELECT * FROM activity_organization WHERE 
id={$org_id}";
                        //var_dump($sql);
                        $this->db->query($sql, __LINE__, __FILE__);
-                       while($this->db->next_record())
+                       while ($this->db->next_record())
                        {
                                $organization = new 
activitycalendar_organization((int)$this->db->f('id'));
 
@@ -731,39 +731,39 @@
                        }
                }
 
-               function update_organization($org_info)
+               function update_organization( $org_info )
                {
                        $name            = $org_info['name'];
                        $orgid           = (int)$org_info['orgid'];
                        $homepage        = $org_info['homepage'];
-                       if(!$homepage)
+                       if (!$homepage)
                        {
                                $homepage = '';
                        }
                        $phone = $org_info['phone'];
-                       if(!$phone)
+                       if (!$phone)
                        {
                                $phone = '';
                        }
                        $email = $org_info['email'];
-                       if(!$email)
+                       if (!$email)
                        {
                                $email = '';
                        }
                        $description = $org_info['description'];
-                       if(!$description)
+                       if (!$description)
                        {
                                $description = '';
                        }
                        $street = $org_info['street'] . ' ' . 
$org_info['streetnumber'];
-                       if(!$street)
+                       if (!$street)
                        {
                                $street = '';
                        }
                        $zip_code        = $org_info['zip_code'];
                        $city            = $org_info['city'];
                        $district        = $org_info['district'];
-                       if(!$district)
+                       if (!$district)
                        {
                                $district = '';
                        }
@@ -787,22 +787,22 @@
                        $result = $this->db->query('UPDATE bb_organization SET 
' . join(',', $values) . " WHERE id=$orgid", __LINE__, __FILE__);
                }
 
-               function update_organization_with_new_info($organization)
+               function update_organization_with_new_info( $organization )
                {
                        $name    = $organization['orgname'];
                        $orgid   = (int)$organization['orgid'];
                        $street  = $organization['orgstreet'];
-                       if(!$street)
+                       if (!$street)
                        {
                                $street = '';
                        }
                        $zip = $organization['zip'];
-                       if(!$zip)
+                       if (!$zip)
                        {
                                $zip = '';
                        }
                        $city = $organization['city'];
-                       if(!$city)
+                       if (!$city)
                        {
                                $city = '';
                        }
@@ -816,20 +816,21 @@
                        $result  = $this->db->query('UPDATE bb_organization SET 
' . join(',', $values) . " WHERE id=$orgid", __LINE__, __FILE__);
                }
 
-               function set_organization_inactive($org_id)
+               function set_organization_inactive( $org_id )
                {
-                       $orgid = (int)$org_id;
+                       $org_id = (int)$org_id;
 
                        //var_dump("UPDATE bb_organization SET active=0, 
show_in_portal=0 WHERE id={$orgid}");
-                       $result = $this->db->query("UPDATE bb_organization SET 
active=0, show_in_portal=0 WHERE id={$orgid}", __LINE__, __FILE__);
+                       $result = $this->db->query("UPDATE bb_organization SET 
active=0, show_in_portal=0 WHERE id={$org_id}", __LINE__, __FILE__);
                }
 
-               function get_affected_allocations($org_id)
+               function get_affected_allocations( $org_id )
                {
+                       $org_id = (int)$org_id;
                        $result  = array();
                        $sql     = "select id from bb_allocation where 
organization_id={$org_id}";
                        $this->db->query($sql, __LINE__, __FILE__);
-                       while($this->db->next_record())
+                       while ($this->db->next_record())
                        {
                                $result[] = $this->db->f('id');
                        }
@@ -837,17 +838,20 @@
                        return $result;
                }
 
-               function update_affected_allocations($id, $org_id)
+               function update_affected_allocations( $id, $org_id )
                {
-                       $result = $this->db->query("update bb_allocation set 
organization_id={$org_id} where id={$id}", __LINE__, __FILE__);
+                       $id = (int)$id;
+                       $org_id = (int)$org_id;
+                       return $this->db->query("update bb_allocation set 
organization_id={$org_id} where id={$id}", __LINE__, __FILE__);
                }
 
-               function get_affected_reservations($org_id)
+               function get_affected_reservations( $org_id )
                {
+                       $org_id = (int)$org_id;
                        $result  = array();
                        $sql     = "select id from bb_completed_reservation 
where organization_id={$org_id}";
                        $this->db->query($sql, __LINE__, __FILE__);
-                       while($this->db->next_record())
+                       while ($this->db->next_record())
                        {
                                $result[] = $this->db->f('id');
                        }
@@ -855,17 +859,20 @@
                        return $result;
                }
 
-               function update_affected_reservations($id, $org_id)
+               function update_affected_reservations( $id, $org_id )
                {
-                       $result = $this->db->query("update 
bb_completed_reservation set organization_id={$org_id} where id={$id}", 
__LINE__, __FILE__);
+                       $id = (int)$id;
+                       $org_id = (int)$org_id;
+                       return $this->db->query("update 
bb_completed_reservation set organization_id={$org_id} where id={$id}", 
__LINE__, __FILE__);
                }
 
-               function get_affected_events($org_id)
+               function get_affected_events( $org_id )
                {
+                       $org_id = (int)$org_id;
                        $result  = array();
                        $sql     = "select id from bb_event where 
customer_organization_id={$org_id}";
                        $this->db->query($sql, __LINE__, __FILE__);
-                       while($this->db->next_record())
+                       while ($this->db->next_record())
                        {
                                $result[] = $this->db->f('id');
                        }
@@ -873,21 +880,25 @@
                        return $result;
                }
 
-               function update_affected_events($id, $org_id)
+               function update_affected_events( $id, $org_id )
                {
-                       $result = $this->db->query("update bb_event set 
customer_organization_id={$org_id} where id={$id}", __LINE__, __FILE__);
+                       $id = (int)$id;
+                       $org_id = (int)$org_id;
+                       return $this->db->query("update bb_event set 
customer_organization_id={$org_id} where id={$id}", __LINE__, __FILE__);
                }
 
-               function update($organization)
+               function update( $organization )
                {
                        return false;
                }
 
-               function update_org_district_local($org_id, $district_id)
+               function update_org_district_local( $org_id, $district_id )
                {
-                       $sql     = "UPDATE activity_organization SET 
district='{$district_id}' WHERE ID={$org_id}";
+                       $district_id = (int)$district_id;
+                       $org_id = (int)$org_id;
+                       $sql = "UPDATE activity_organization SET 
district='{$district_id}' WHERE id={$org_id}";
                        $result  = $this->db->query($sql, __LINE__, __FILE__);
-                       if(isset($result))
+                       if (isset($result))
                        {
                                return true;
                        }
@@ -897,54 +908,45 @@
                        }
                }
 
-               function get_organization_homepage($org_id)
+               function get_organization_homepage( $org_id )
                {
                        $result = "Ingen";
-                       if(isset($org_id))
+                       $org_id = (int)$org_id;
+                       if ($org_id)
                        {
-                               $org_id  = intval($org_id);
                                $q1              = "SELECT homepage FROM 
bb_organization WHERE id={$org_id}";
                                $this->db->query($q1, __LINE__, __FILE__);
-                               while($this->db->next_record())
-                               {
+                               $this->db->next_record();
                                        $result = $this->db->f('homepage');
                                }
-                       }
 
                        return $result;
                }
 
-               function get_organization_homepage_local($org_id)
+               function get_organization_homepage_local( $org_id )
                {
                        $result = "Ingen";
-                       if(isset($org_id))
+                       $org_id = (int)$org_id;
+                       if ($org_id)
                        {
                                $q1 = "SELECT homepage FROM 
activity_organization WHERE id={$org_id}";
                                $this->db->query($q1, __LINE__, __FILE__);
-                               while($this->db->next_record())
-                               {
+                               $this->db->next_record();
+
                                        $result = $this->db->f('homepage');
                                }
-                       }
 
                        return $result;
                }
 
                //$org->set_change_type("rejected");
-               function reject_organization($org_id)
+               function reject_organization( $org_id )
                {
-                       if(isset($org_id))
+                       $org_id = (int)$org_id;
+                       if ($org_id)
                        {
                                $query   = "UPDATE activity_organization set 
change_type='rejected' where id={$org_id}";
-                               $result  = $this->db->query($query, __LINE__, 
__FILE__);
-                               if(isset($result))
-                               {
-                                       return true;
-                               }
-                               else
-                               {
-                                       return false;
-                               }
+                               return $this->db->query($query, __LINE__, 
__FILE__);
                        }
                        return false;
                }

Modified: 
branches/dev-syncromind/activitycalendar/inc/class.uiactivities.inc.php
===================================================================
--- branches/dev-syncromind/activitycalendar/inc/class.uiactivities.inc.php     
2016-04-09 11:19:48 UTC (rev 14910)
+++ branches/dev-syncromind/activitycalendar/inc/class.uiactivities.inc.php     
2016-04-09 11:40:37 UTC (rev 14911)
@@ -78,7 +78,7 @@
 
                        $activity_district_options[] = array('id' => 'all', 
'name' => lang('all'));
                        $districts                                       = 
activitycalendar_soactivity::get_instance()->select_district_list();
-                       foreach($districts as $district)
+                       foreach ($districts as $district)
                        {
                                $activity_district_options[] = array('id' => 
$district['id'], 'name' => $district['name']);
                        }
@@ -93,7 +93,7 @@
 
                        $activity_category_options[] = array('id' => 'all', 
'name' => lang('all'));
                        $categories                                      = 
activitycalendar_soactivity::get_instance()->get_categories();
-                       foreach($categories as $category)
+                       foreach ($categories as $category)
                        {
                                $activity_category_options[] = array('id' => 
$category->get_id(), 'name' => $category->get_name());
                        }
@@ -119,7 +119,7 @@
 
                public function index()
                {
-                       if(phpgw::get_var('phpgw_return_as') == 'json')
+                       if (phpgw::get_var('phpgw_return_as') == 'json')
                        {
                                return $this->query();
                        }
@@ -194,7 +194,7 @@
 
                        $filters = $this->_get_Filters();
                        krsort($filters);
-                       foreach($filters as $filter)
+                       foreach ($filters as $filter)
                        {
                                array_unshift($data['form']['toolbar']['item'], 
$filter);
                        }
@@ -258,15 +258,15 @@
 
                        $activity = 
$this->so_activity->get_single($activity_id);
 
-                       if(empty($activity))
+                       if (empty($activity))
                        {
                                phpgwapi_cache::message_set(lang('Could not 
find specified activity.'), 'error');
                                $GLOBALS['phpgw']->redirect_link('/index.php', 
array('menuaction' => 'activitycalendar.uiactivities.index'));
                        }
 
-                       if($activity->get_group_id())
+                       if ($activity->get_group_id())
                        {
-                               if($activity->get_new_group())
+                               if ($activity->get_new_group())
                                {
                                        $description = 
activitycalendar_sogroup::get_instance()->get_description_local($activity->get_group_id());
                                }
@@ -275,9 +275,9 @@
                                        $description = 
activitycalendar_sogroup::get_instance()->get_description($activity->get_group_id());
                                }
                        }
-                       else if($activity->get_organization_id())
+                       else if ($activity->get_organization_id())
                        {
-                               if($activity->get_new_org())
+                               if ($activity->get_new_org())
                                {
                                        $description = 
activitycalendar_soorganization::get_instance()->get_description_local($activity->get_organization_id());
                                }
@@ -288,24 +288,24 @@
                        }
 
                        $state_name = '';
-                       if($activity->get_state())
+                       if ($activity->get_state())
                        {
                                $state_name = lang('state_' . 
$activity->get_state());
                        }
 
                        $category_name           = '';
                        $current_category_id = $activity->get_category();
-                       if($current_category_id)
+                       if ($current_category_id)
                        {
                                $category_name = 
$act_so->get_category_name($current_category_id);
                        }
 
                        $current_target_ids      = $activity->get_target();
                        $target_names            = array();
-                       if(count($current_target_ids))
+                       if (count($current_target_ids))
                        {
                                $current_target_id_array = explode(",", 
$current_target_ids);
-                               foreach($current_target_id_array as 
$curr_target)
+                               foreach ($current_target_id_array as 
$curr_target)
                                {
                                        $target_names[] = array('name' => 
$act_so->get_target_name($curr_target));
                                }
@@ -313,38 +313,38 @@
 
                        $current_district_ids    = $activity->get_district();
                        $district_names                  = array();
-                       if(count($current_district_ids))
+                       if (count($current_district_ids))
                        {
                                $current_district_id_array = explode(",", 
$current_district_ids);
-                               foreach($current_district_id_array as 
$curr_district)
+                               foreach ($current_district_id_array as 
$curr_district)
                                {
                                        $district_names[] = array('name' => 
$act_so->get_district_name($curr_district));
                                }
                        }
 
                        $building_name = '';
-                       if($activity->get_internal_arena())
+                       if ($activity->get_internal_arena())
                        {
                                $building_name = 
activitycalendar_soarena::get_instance()->get_building_name($activity->get_internal_arena());
                        }
 
                        $arena_name = '';
-                       if($activity->get_arena())
+                       if ($activity->get_arena())
                        {
                                $arena_name = 
activitycalendar_soarena::get_instance()->get_arena_name($activity->get_arena());
                        }
 
                        $office_name = '';
-                       if($activity->get_office())
+                       if ($activity->get_office())
                        {
                                $office_name = 
$act_so->get_office_name($activity->get_office());
                        }
 
                        $current_organization_id = 
$activity->get_organization_id();
                        $organization_name               = '';
-                       if($current_organization_id)
+                       if ($current_organization_id)
                        {
-                               if($activity->get_new_org())
+                               if ($activity->get_new_org())
                                {
                                        $organization_name = 
activitycalendar_soorganization::get_instance()->get_organization_name_local($current_organization_id);
                                }
@@ -354,9 +354,9 @@
                                }
                        }
 
-                       if($activity->get_group_id())
+                       if ($activity->get_group_id())
                        {
-                               if($activity->get_new_group())
+                               if ($activity->get_new_group())
                                {
                                        $group_name = 
activitycalendar_sogroup::get_instance()->get_group_name_local($activity->get_group_id());
                                }
@@ -368,9 +368,9 @@
 
                        $contpers_so = 
activitycalendar_socontactperson::get_instance();
 
-                       if($activity->get_group_id())
+                       if ($activity->get_group_id())
                        {
-                               if($activity->get_new_group())
+                               if ($activity->get_new_group())
                                {
                                        $contact_person_1        = 
$contpers_so->get_group_contact_name_local($activity->get_contact_person_1());
                                        $contact_person_2        = 
$contpers_so->get_group_contact_name_local($activity->get_contact_person_2());
@@ -381,9 +381,9 @@
                                        $contact_person_2        = 
$contpers_so->get_group_contact_name($activity->get_contact_person_2());
                                }
                        }
-                       else if($activity->get_organization_id())
+                       else if ($activity->get_organization_id())
                        {
-                               if($activity->get_new_org())
+                               if ($activity->get_new_org())
                                {
                                        $contact_person_1        = 
$contpers_so->get_org_contact_name_local($activity->get_contact_person_1());
                                        $contact_person_2        = 
$contpers_so->get_org_contact_name_local($activity->get_contact_person_2());
@@ -441,7 +441,7 @@
                        $districts       = $this->so_activity->get_districts();
                        $buildings       = $this->so_arena->get_buildings();
                        // Retrieve the activity object or create a new one
-                       if(isset($activity_id) && $activity_id > 0)
+                       if (isset($activity_id) && $activity_id > 0)
                        {
                                $activity = 
$this->so_activity->get_single($activity_id);
                        }
@@ -453,28 +453,28 @@
                        $new_group       = $activity->get_new_group();
                        $g_id            = phpgw::get_var('group_id');
                        $o_id            = phpgw::get_var('organization_id');
-                       if($new_group)
+                       if ($new_group)
                        {
                                $persons = 
$this->so_group->get_contacts_local($activity->get_group_id());
                                $desc    = 
$this->so_group->get_description_local($activity->get_group_id());
                        }
-                       else if(isset($g_id) && $g_id > 0)
+                       else if (isset($g_id) && $g_id > 0)
                        {
                                $persons = $this->so_group->get_contacts($g_id);
                                $desc    = 
$this->so_group->get_description($g_id);
                        }
-                       else if(isset($o_id) && $o_id > 0)
+                       else if (isset($o_id) && $o_id > 0)
                        {
                                $persons = $this->so_org->get_contacts($o_id);
                                $desc    = 
$this->so_org->get_description($o_id);
                        }
 
-                       if(strlen($desc) > 254)
+                       if (strlen($desc) > 254)
                        {
                                $desc = substr($desc, 0, 254);
                        }
                        $arenas = $this->so_arena->get(null, null, 
'arena.arena_name', true, null, null, null);
-                       if($activity->get_new_org())
+                       if ($activity->get_new_org())
                        {
                                $org_name = 
$this->so_org->get_organization_name_local($activity->get_organization_id());
                        }
@@ -483,12 +483,12 @@
                                $organizations = $this->so_org->get(null, null, 
'org.name', true, null, null, null);
                        }
 
-                       if($new_group)
+                       if ($new_group)
                        {
                                $group_array = $this->so_group->get(null, null, 
null, null, null, null, array(
                                        'group_id'       => 
$activity->get_group_id(), 'new_groups' => 'true'));
                                //var_dump($group_array);
-                               if(count($group_array) > 0)
+                               if (count($group_array) > 0)
                                {
                                        $keys                            = 
array_keys($group_array);
                                        $local_group             = 
$group_array[$keys[0]];
@@ -501,16 +501,16 @@
                                $groups = $this->so_group->get(null, null, 
null, null, null, null, null);
                        }
 
-                       if($activity->get_new_org())
+                       if ($activity->get_new_org())
                        {
                                
phpgwapi_cache::message_set(lang('org_not_transferred'), 'error');
                                $GLOBALS['phpgw']->redirect_link('/index.php', 
array('menuaction' => 'activitycalendar.uiactivities.view',
                                        'id' => $activity->get_id()));
                        }
 
-                       if($activity->get_group_id())
+                       if ($activity->get_group_id())
                        {
-                               if($activity->get_new_group())
+                               if ($activity->get_new_group())
                                {
                                        $description = 
activitycalendar_sogroup::get_instance()->get_description_local($activity->get_group_id());
                                }
@@ -519,9 +519,9 @@
                                        $description = 
activitycalendar_sogroup::get_instance()->get_description($activity->get_group_id());
                                }
                        }
-                       else if($activity->get_organization_id())
+                       else if ($activity->get_organization_id())
                        {
-                               if($activity->get_new_org())
+                               if ($activity->get_new_org())
                                {
                                        $description = 
activitycalendar_soorganization::get_instance()->get_description_local($activity->get_organization_id());
                                }
@@ -543,7 +543,7 @@
                        $category_options[]      = array('id' => '', 'name' => 
lang('Ingen kategori valgt'),
                                'selected' => 0);
                        $current_category_id = $activity->get_category();
-                       foreach($categories as $category)
+                       foreach ($categories as $category)
                        {
                                $id                                      = 
$category->get_id();
                                $selected                        = 
($current_category_id == $id) ? 1 : 0;
@@ -553,7 +553,7 @@
                        $current_target_ids              = 
$activity->get_target();
                        $current_target_id_array = explode(",", 
$current_target_ids);
                        $target_checks                   = array();
-                       foreach($targets as $t)
+                       foreach ($targets as $t)
                        {
                                $checked                 = 
(in_array($t->get_id(), $current_target_id_array)) ? 'checked' : '';
                                $target_checks[] = array('value' => 
$t->get_id(), 'label' => $t->get_name(),
@@ -563,7 +563,7 @@
                        $current_district_ids            = 
$activity->get_district();
                        $current_district_id_array       = explode(",", 
$current_district_ids);
                        $district_checks                         = array();
-                       foreach($districts as $d)
+                       foreach ($districts as $d)
                        {
                                $checked                         = 
(in_array($d['part_of_town_id'], $current_district_id_array)) ? 'checked' : '';
                                $district_checks[]       = array('value' => 
$d['part_of_town_id'], 'label' => $d['name'],
@@ -573,7 +573,7 @@
                        $building_options[]                      = array('id' 
=> '', 'name' => lang('Ingen kommunale bygg valgt'),
                                'selected' => 0);
                        $current_internal_arena_id       = 
$activity->get_internal_arena();
-                       foreach($buildings as $building_id => $building_name)
+                       foreach ($buildings as $building_id => $building_name)
                        {
                                $selected                        = 
($current_internal_arena_id == $building_id) ? 1 : 0;
                                $building_options[]      = array('id' => 
$building_id, 'name' => $building_name,
@@ -583,7 +583,7 @@
                        $arena_external_options[]        = array('id' => '', 
'name' => lang('Ingen arena valgt'),
                                'selected' => 0);
                        $current_arena_id                        = 
$activity->get_arena();
-                       foreach($arenas as $arena)
+                       foreach ($arenas as $arena)
                        {
                                $selected                                       
 = ($current_arena_id == $arena->get_id()) ? 1 : 0;
                                $arena_external_options[]        = array('id' 
=> $arena->get_id(), 'name' => $arena->get_arena_name(),
@@ -592,7 +592,7 @@
 
                        $office_options[]        = array('id' => '', 'name' => 
lang('Ingen kontor valgt'), 'selected' => 0);
                        $selected_office         = $activity->get_office();
-                       foreach($offices as $office)
+                       foreach ($offices as $office)
                        {
                                $selected                        = 
($selected_office == $office['id']) ? 1 : 0;
                                $office_options[]        = array('id' => 
$office['id'], 'name' => $office['name'],
@@ -602,7 +602,7 @@
                        $organization_options[]  = array('id' => '', 'name' => 
lang('Ingen organisasjon valgt'),
                                'selected' => 0);
                        $current_organization_id = 
$activity->get_organization_id();
-                       foreach($organizations as $organization)
+                       foreach ($organizations as $organization)
                        {
                                $selected                                = 
($current_organization_id == $organization->get_id()) ? 1 : 0;
                                $organization_options[]  = array('id' => 
$organization->get_id(), 'name' => $organization->get_name(),
@@ -611,9 +611,9 @@
 
                        $contpers_so = 
activitycalendar_socontactperson::get_instance();
 
-                       if($activity->get_group_id())
+                       if ($activity->get_group_id())
                        {
-                               if($activity->get_new_group())
+                               if ($activity->get_new_group())
                                {
                                        $contact_person_1        = 
$contpers_so->get_group_contact_name_local($activity->get_contact_person_1());
                                        $contact_person_2        = 
$contpers_so->get_group_contact_name_local($activity->get_contact_person_2());
@@ -624,9 +624,9 @@
                                        $contact_person_2        = 
$contpers_so->get_group_contact_name($activity->get_contact_person_2());
                                }
                        }
-                       else if($activity->get_organization_id())
+                       else if ($activity->get_organization_id())
                        {
-                               if($activity->get_new_org())
+                               if ($activity->get_new_org())
                                {
                                        $contact_person_1        = 
$contpers_so->get_org_contact_name_local($activity->get_contact_person_1());
                                        $contact_person_2        = 
$contpers_so->get_org_contact_name_local($activity->get_contact_person_2());
@@ -717,7 +717,7 @@
                        $result_count    = 0;
 
                        $export = phpgw::get_var('export', 'bool');
-                       if($export)
+                       if ($export)
                        {
                                $num_of_objects = null;
                        }
@@ -727,7 +727,7 @@
 
                        $email_param = phpgw::get_var('email');
                        $email           = false;
-                       if(isset($email_param))
+                       if (isset($email_param))
                        {
                                $email                   = true;
                                $num_of_objects  = null;
@@ -735,7 +735,7 @@
 
                        $uid = $GLOBALS['phpgw_info']['user']['account_id'];
 
-                       switch($query_type)
+                       switch ($query_type)
                        {
                                case 'new_activities':
                                        $filters                 = 
array('new_activities'                => 'yes', 'activity_state'              
=> phpgw::get_var('activity_state'),
@@ -757,12 +757,12 @@
                        //Create an empty row set
                        $rows            = array();
                        $mail_rows       = array();
-                       foreach($result_objects as $result)
+                       foreach ($result_objects as $result)
                        {
-                               if(isset($result))
+                               if (isset($result))
                                {
                                        // ... add a serialized result
-                                       if($export)
+                                       if ($export)
                                        {
                                                $rows[] = 
$result->serialize_for_export();
                                        }
@@ -774,17 +774,17 @@
                                }
                        }
 
-                       if($export)
+                       if ($export)
                        {
                                return $rows;
                        }
 
-                       if(!$export && !$email)
+                       if (!$export && !$email)
                        {
                                //Add action column to each row in result table
                                array_walk($rows, array($this, 'add_actions'), 
array($query_type));
                        }
-                       if($email)
+                       if ($email)
                        {
                                $this->send_email_to_selection($mail_rows);
                        }
@@ -802,7 +802,7 @@
                {
                        $activity_id = (int)phpgw::get_var('id');
                        // Retrieve the activity object or create a new one
-                       if(isset($activity_id) && $activity_id > 0)
+                       if (isset($activity_id) && $activity_id > 0)
                        {
                                $activity = 
$this->so_activity->get_single($activity_id);
                        }
@@ -814,28 +814,28 @@
                        $new_group       = $activity->get_new_group();
                        $g_id            = phpgw::get_var('group_id');
                        $o_id            = phpgw::get_var('organization_id');
-                       if($new_group)
+                       if ($new_group)
                        {
                                $persons = 
$this->so_group->get_contacts_local($activity->get_group_id());
                                $desc    = 
$this->so_group->get_description_local($activity->get_group_id());
                        }
-                       else if(isset($g_id) && $g_id > 0)
+                       else if (isset($g_id) && $g_id > 0)
                        {
                                $persons = $this->so_group->get_contacts($g_id);
                                $desc    = 
$this->so_group->get_description($g_id);
                        }
-                       else if(isset($o_id) && $o_id > 0)
+                       else if (isset($o_id) && $o_id > 0)
                        {
                                $persons = $this->so_org->get_contacts($o_id);
                                $desc    = 
$this->so_org->get_description($o_id);
                        }
 
-                       if(strlen($desc) > 254)
+                       if (strlen($desc) > 254)
                        {
                                $desc = substr($desc, 0, 254);
                        }
 
-                       if(isset($activity)) // If an activity object is created
+                       if (isset($activity)) // If an activity object is 
created
                        {
                                $old_state               = 
$activity->get_state();
                                $new_state               = 
phpgw::get_var('state');
@@ -844,7 +844,7 @@
                                
$activity->set_organization_id(phpgw::get_var('organization_id'));
                                
$activity->set_group_id(phpgw::get_var('group_id'));
                                $internal_arena  = 
phpgw::get_var('internal_arena_id');
-                               if(isset($internal_arena) && $internal_arena > 
0)
+                               if (isset($internal_arena) && $internal_arena > 
0)
                                {
                                        $activity->set_arena(0);
                                        
$activity->set_internal_arena($internal_arena);
@@ -870,33 +870,33 @@
 
                                $target_ok       = false;
                                $district_ok = false;
-                               if($new_state != 5)
+                               if ($new_state != 5)
                                {
                                        $target_ok       = true;
                                        $district_ok = true;
                                }
                                else
                                {
-                                       if($activity->get_target() && 
$activity->get_target() != '')
+                                       if ($activity->get_target() && 
$activity->get_target() != '')
                                        {
                                                $target_ok = true;
                                        }
-                                       if($activity->get_district() && 
$activity->get_district() != '')
+                                       if ($activity->get_district() && 
$activity->get_district() != '')
                                        {
                                                $district_ok = true;
                                        }
                                }
 
-                               if($target_ok && $district_ok)
+                               if ($target_ok && $district_ok)
                                {
-                                       
if($this->so_activity->store($activity)) // ... and then try to store the object
+                                       if 
($this->so_activity->store($activity)) // ... and then try to store the object
                                        {
-                                               if($new_group)
+                                               if ($new_group)
                                                {
                                                        //transfer group to 
booking
                                                        $group_array = 
$this->so_group->get(null, null, null, null, null, null, array(
                                                                'group_id'      
 => $activity->get_group_id(), 'new_groups' => 'true'));
-                                                       if(count($group_array) 
> 0)
+                                                       if (count($group_array) 
> 0)
                                                        {
                                                                $keys    = 
array_keys($group_array);
                                                                $group   = 
$group_array[$keys[0]];
@@ -911,7 +911,7 @@
                                                        $contact_1       = 
$contacts[0];
 
                                                        $new_group_id = 
$this->so_group->transfer_group($group_info);
-                                                       if($new_group_id)
+                                                       if ($new_group_id)
                                                        {
                                                                //update 
activity with new org id
                                                                //add contact 
persons to booking
@@ -930,7 +930,7 @@
                                                                //get affected 
activities and update with new org id
                                                                
$update_activities = 
$this->so_activity->get_activities_for_update($group->get_id(), true);
 
-                                                               
foreach($update_activities as $act_id)
+                                                               foreach 
($update_activities as $act_id)
                                                                {
                                                                        $act = 
$this->so_activity->get_single($act_id);
                                                                        
$act->set_organization_id($group_org_id);
@@ -961,23 +961,23 @@
                                                
phpgwapi_cache::message_set(lang('messages_form_error'), 'error');
                                        }
 
-                                       if(isset($activity_id) && $activity_id 
> 0)
+                                       if (isset($activity_id) && $activity_id 
> 0)
                                        {
                                                $activity = 
$this->so_activity->get_single($activity_id);
                                        }
 
-                                       if($old_state != $new_state && 
($new_state == 3 || $new_state == 5))
+                                       if ($old_state != $new_state && 
($new_state == 3 || $new_state == 5))
                                        {
                                                $kontor  = 
$this->so_activity->get_office_name($activity->get_office());
                                                $subject = 
lang('mail_subject_update');
                                                $body    = 
lang('mail_body_state_' . $new_state, $activity->get_title(), $kontor);
 
-                                               if($activity->get_group_id() && 
$activity->get_group_id() > 0)
+                                               if ($activity->get_group_id() 
&& $activity->get_group_id() > 0)
                                                {
                                                        
$activity->set_contact_persons(activitycalendar_socontactperson::get_instance()->get_booking_contact_persons($activity->get_group_id(),
 true));
                                                        
activitycalendar_uiactivities::send_mailnotification_to_group($activity->get_contact_person_1(),
 $subject, $body);
                                                }
-                                               else 
if($activity->get_organization_id() && $activity->get_organization_id() > 0)
+                                               else if 
($activity->get_organization_id() && $activity->get_organization_id() > 0)
                                                {
                                                        
$activity->set_contact_persons(activitycalendar_socontactperson::get_instance()->get_booking_contact_persons($activity->get_organization_id()));
                                                        
activitycalendar_uiactivities::send_mailnotification_to_organization($activity->get_contact_person_1(),
 $subject, $body);
@@ -988,12 +988,12 @@
                                }
                                else
                                {
-                                       if(!$target_ok)
+                                       if (!$target_ok)
                                        {
                                                //$error .= "<br/>" . 
lang('target_not_selected');
                                                
phpgwapi_cache::message_set(lang('target_not_selected'), 'error');
                                        }
-                                       if(!$district_ok)
+                                       if (!$district_ok)
                                        {
                                                //$error .= "<br/>" . 
lang('district_not_selected');
                                                
phpgwapi_cache::message_set(lang('district_not_selected'), 'error');
@@ -1012,7 +1012,7 @@
                 * @param $key ?
                 * @param $params [composite_id, type of query, editable]
                 */
-               public function add_actions(&$value, $key, $params)
+               public function add_actions( &$value, $key, $params )
                {
                        //Defining new columns
                        $value['ajax']           = array();
@@ -1021,7 +1021,7 @@
 
                        $query_type = $params[0];
 
-                       switch($query_type)
+                       switch ($query_type)
                        {
                                case 'all_activities':
                                        $value['ajax'][]         = false;
@@ -1055,7 +1055,7 @@
                        }
                }
 
-               function send_email_to_selection($activities)
+               function send_email_to_selection( $activities )
                {
                        $c                       = 
createobject('phpgwapi.config', 'activitycalendarfrontend');
                        $c->read();
@@ -1063,7 +1063,7 @@
                        $_subject        = lang('mail_subject_update');
 
                        $mailBaseURL = $c->config_data['mailBaseURL'];
-                       foreach($activities as $activity)
+                       foreach ($activities as $activity)
                        {
                                $subject         = "{$_subject}::" . 
$activity->get_title();
                                //$activity = 
activitycalendar_soactivity::get_instance()->get_single($activity_id);
@@ -1077,11 +1077,11 @@
                                  $office_footer = 
activitycalendar_soactivity::get_instance()->get_office_description($user_office_id);
                                 */
                                $office_id       = $activity->get_office();
-                               if($office_id == 1)
+                               if ($office_id == 1)
                                {
                                        $office_id_new = 2;
                                }
-                               else if($office_id == 2)
+                               else if ($office_id == 2)
                                {
                                        $office_id_new = 1;
                                }
@@ -1090,7 +1090,7 @@
                                        $office_id_new = (int)$office_id;
                                }
                                $office_footer = 
activitycalendar_soactivity::get_instance()->get_office_description($office_id_new);
-                               if($activity->get_state() == 2)
+                               if ($activity->get_state() == 2)
                                {
                                        $body = 
lang('mail_body_update_frontend', $activity->get_title(), $link_text, 
$office_footer, $office_name);
                                }
@@ -1103,7 +1103,7 @@
                                //var_dump($body);
                                //var_dump($activity->get_organization_id() . " 
; " . $activity->get_group_id());
 
-                               if($activity->get_group_id() && 
$activity->get_group_id() > 0)
+                               if ($activity->get_group_id() && 
$activity->get_group_id() > 0)
                                {
                                        
$activity->set_contact_persons(activitycalendar_socontactperson::get_instance()->get_booking_contact_persons($activity->get_group_id(),
 true));
                                        /* if($activity->get_contact_person_2() 
&& $activity->get_contact_person_2()->get_email())
@@ -1111,12 +1111,12 @@
                                          
activitycalendar_uiactivities::send_mailnotification_to_group($activity->get_contact_person_2(),
 $subject, $body);
                                          }
                                          else */
-                                       if($activity->get_contact_person_1() && 
$activity->get_contact_person_1()->get_email())
+                                       if ($activity->get_contact_person_1() 
&& $activity->get_contact_person_1()->get_email())
                                        {
                                                
activitycalendar_uiactivities::send_mailnotification_to_group($activity->get_contact_person_1(),
 $subject, $body);
                                        }
                                }
-                               else if($activity->get_organization_id() && 
$activity->get_organization_id() > 0)
+                               else if ($activity->get_organization_id() && 
$activity->get_organization_id() > 0)
                                {
                                        
$activity->set_contact_persons(activitycalendar_socontactperson::get_instance()->get_booking_contact_persons($activity->get_organization_id()));
                                        /* if($activity->get_contact_person_2() 
&& $activity->get_contact_person_2()->get_email())
@@ -1124,7 +1124,7 @@
                                          
activitycalendar_uiactivities::send_mailnotification_to_organization($activity->get_contact_person_2(),
 $subject, $body);
                                          }
                                          else */
-                                       if($activity->get_contact_person_1() && 
$activity->get_contact_person_1()->get_email())
+                                       if ($activity->get_contact_person_1() 
&& $activity->get_contact_person_1()->get_email())
                                        {
                                                
activitycalendar_uiactivities::send_mailnotification_to_organization($activity->get_contact_person_1(),
 $subject, $body);
                                        }
@@ -1146,7 +1146,7 @@
                        $activity        = 
activitycalendar_soactivity::get_instance()->get_single($activity_id);
 
                        $message_type = phpgw::get_var('message_type');
-                       if($message_type)
+                       if ($message_type)
                        {
                                //$subject = lang('mail_subject_update', 
$avtivity->get_id() . '-' . $activity->get_title(), $activity->get_link());
                                $subject         = lang('mail_subject_update');
@@ -1156,11 +1156,11 @@
                                $link_text       = "<a 
href='http://www.bergen.kommune.no/aktivitetsoversikt/?menuaction=activitycalendarfrontend.uiactivity.edit&amp;id={$activity->get_id()}&amp;secret={$activity->get_secret()}'>Rediger
 opplysninger for {$activity->get_title()}</a>";
                                $office_name = 
activitycalendar_soactivity::get_instance()->get_office_name($activity->get_office());
                                $office_id       = $activity->get_office();
-                               if($office_id == 1)
+                               if ($office_id == 1)
                                {
                                        $office_id_new = 2;
                                }
-                               else if($office_id == 2)
+                               else if ($office_id == 2)
                                {
                                        $office_id_new = 1;
                                }
@@ -1181,32 +1181,32 @@
 //     var_dump($body);
 //     var_dump($activity->get_organization_id() . " ; " . 
$activity->get_group_id());
 
-                       if($activity->get_group_id() && 
$activity->get_group_id() > 0)
+                       if ($activity->get_group_id() && 
$activity->get_group_id() > 0)
                        {
                                //$contact_person2 = 
activitycalendar_socontactperson::get_instance()->get_group_contact2($activity>get_group_id());
                                
$activity->set_contact_persons(activitycalendar_socontactperson::get_instance()->get_booking_contact_persons($activity->get_group_id(),
 true));
                                /* if($activity->get_contact_person_2() && 
$activity->get_contact_person_2()->get_email())
                                  
activitycalendar_uiactivities::send_mailnotification_to_group($activity->get_contact_person_2(),
 $subject, $body);
                                  else */
-                               if($activity->get_contact_person_1() && 
$activity->get_contact_person_1()->get_email())
+                               if ($activity->get_contact_person_1() && 
$activity->get_contact_person_1()->get_email())
                                {
                                        
activitycalendar_uiactivities::send_mailnotification_to_group($activity->get_contact_person_1(),
 $subject, $body);
                                }
                        }
-                       else if($activity->get_organization_id() && 
$activity->get_organization_id() > 0)
+                       else if ($activity->get_organization_id() && 
$activity->get_organization_id() > 0)
                        {
                                //$contact_person2 = 
activitycalendar_socontactperson::get_instance()->get_oup_contact2($activity>get_group_id());
                                
$activity->set_contact_persons(activitycalendar_socontactperson::get_instance()->get_booking_contact_persons($activity->get_organization_id()));
                                /* if($activity->get_contact_person_2() && 
$activity->get_contact_person_2()->get_email())
                                  
activitycalendar_uiactivities::send_mailnotification_to_organization($activity->get_contact_person_2(),
 $subject, $body);
                                  else */
-                               if($activity->get_contact_person_1() && 
$activity->get_contact_person_1()->get_email())
+                               if ($activity->get_contact_person_1() && 
$activity->get_contact_person_1()->get_email())
                                {
                                        
activitycalendar_uiactivities::send_mailnotification_to_organization($activity->get_contact_person_1(),
 $subject, $body);
                                }
                        }
 
-                       if(phpgw::get_var('phpgw_return_as') == 'json')
+                       if (phpgw::get_var('phpgw_return_as') == 'json')
                        {
                                $message['message'][] = array('msg' => 
lang('E-post sendt'));
                                return $message;
@@ -1216,11 +1216,11 @@
                                'message'        => 'E-post sendt'));
                }
 
-               function send_mailnotification_to_organization($contact_person, 
$subject, $body)
+               function send_mailnotification_to_organization( 
$contact_person, $subject, $body )
                {
 
                        //var_dump($contact_person_id . ',' . $subject . ',' . 
$body);
-                       if(!is_object($GLOBALS['phpgw']->send))
+                       if (!is_object($GLOBALS['phpgw']->send))
                        {
                                $GLOBALS['phpgw']->send = 
CreateObject('phpgwapi.send');
                        }
@@ -1229,7 +1229,7 @@
                        $from    = isset($config->config_data['email_sender']) 
&& $config->config_data['email_sender'] ? $config->config_data['email_sender'] 
: "noreply<address@hidden'phpgw_info']['server']['hostname']}>";
                        //$from = "address@hidden";
 
-                       if(strlen(trim($body)) == 0)
+                       if (strlen(trim($body)) == 0)
                        {
                                return false;
                        }
@@ -1238,9 +1238,9 @@
                        //$mailtoAddress = "address@hidden";
                        //var_dump($mailtoAddress);
                        //var_dump($mailtoAddress.';'.$from.';'.$subject);
-                       if(strlen($mailtoAddress) > 0)
+                       if (strlen($mailtoAddress) > 0)
                        {
-                               
if(!$this->validator->check_email_address($mailtoAddress))
+                               if 
(!$this->validator->check_email_address($mailtoAddress))
                                {
                                        $GLOBALS['phpgw']->log->error(array(
                                                'text'   => 
'uiactivities::send_mailnotification_to_group() : not a valid address.: %1',
@@ -1256,7 +1256,7 @@
                                _debug_array($mailtoAddress);
                                _debug_array($subject);
 
-                               if($this->debug)
+                               if ($this->debug)
                                {
                                        return false;
                                }
@@ -1265,9 +1265,9 @@
                                {
                                        $GLOBALS['phpgw']->send->msg('email', 
$mailtoAddress, $subject, $body, '', '', '', $from, '', 'html');
                                }
-                               catch(phpmailerException $e)
+                               catch (phpmailerException $e)
                                {
-                                       if($e)
+                                       if ($e)
                                        {
                                                
$GLOBALS['phpgw']->log->error(array(
                                                        'text'   => 
'uiactivities::send_mailnotification_to_organization() : error when trying to 
execute %1. Error: %2',
@@ -1281,9 +1281,9 @@
                        }
                }
 
-               function send_mailnotification_to_group($contact_person, 
$subject, $body)
+               function send_mailnotification_to_group( $contact_person, 
$subject, $body )
                {
-                       if(!is_object($GLOBALS['phpgw']->send))
+                       if (!is_object($GLOBALS['phpgw']->send))
                        {
                                $GLOBALS['phpgw']->send = 
CreateObject('phpgwapi.send');
                        }
@@ -1292,7 +1292,7 @@
                        $from    = isset($config->config_data['email_sender']) 
&& $config->config_data['email_sender'] ? $config->config_data['email_sender'] 
: "noreply<address@hidden'phpgw_info']['server']['hostname']}>";
                        //$from = "address@hidden";
 
-                       if(strlen(trim($body)) == 0)
+                       if (strlen(trim($body)) == 0)
                        {
                                return false;
                        }
@@ -1300,9 +1300,9 @@
                        $mailtoAddress = 
trim(activitycalendar_socontactperson::get_instance()->get_mailaddress_for_group_contact($contact_person->get_id()));
                        //$mailtoaddress = "address@hidden";
                        //var_dump($mailtoAddress.';'.$from.';'.$subject);
-                       if(strlen($mailtoAddress) > 0)
+                       if (strlen($mailtoAddress) > 0)
                        {
-                               
if(!$this->validator->check_email_address($mailtoAddress))
+                               if 
(!$this->validator->check_email_address($mailtoAddress))
                                {
                                        $GLOBALS['phpgw']->log->error(array(
                                                'text'   => 
'uiactivities::send_mailnotification_to_group() : not a valid address.: %1',
@@ -1319,7 +1319,7 @@
                                _debug_array($mailtoAddress);
                                _debug_array($subject);
 
-                               if($this->debug)
+                               if ($this->debug)
                                {
                                        return false;
                                }
@@ -1328,9 +1328,9 @@
                                {
                                        $GLOBALS['phpgw']->send->msg('email', 
$mailtoAddress, $subject, $body, '', '', '', $from, '', 'html');
                                }
-                               catch(phpmailerException $e)
+                               catch (phpmailerException $e)
                                {
-                                       if($e)
+                                       if ($e)
                                        {
                                                
$GLOBALS['phpgw']->log->error(array(
                                                        'text'   => 
'uiactivities::send_mailnotification_to_group() : error when trying to execute 
%1. Error: %2',
@@ -1353,20 +1353,20 @@
                        $org_id          = phpgw::get_var('orgid');
                        $group_id        = phpgw::get_var('groupid');
                        $returnHTML      = "<option value='0'>Ingen gruppe 
valgt</option>";
-                       if($org_id)
+                       if ($org_id)
                        {
                                $groups = 
activitycalendar_sogroup::get_instance()->get(null, null, null, null, null, 
null, array(
                                        'org_id' => $org_id));
-                               foreach($groups as $group)
+                               foreach ($groups as $group)
                                {
-                                       if(isset($group))
+                                       if (isset($group))
                                        {
                                                //$res_g = $group->serialize();
                                                $selected = "";
-                                               if($group_id && $group_id > 0)
+                                               if ($group_id && $group_id > 0)
                                                {
                                                        $gr_id = (int)$group_id;
-                                                       if($gr_id == 
(int)$group->get_id())
+                                                       if ($gr_id == 
(int)$group->get_id())
                                                        {
                                                                $selected_group 
= " selected='selected'";
                                                        }
@@ -1390,11 +1390,11 @@
                {
                        $activities = 
$this->so_activity->get_activities_without_groups();
 
-                       foreach($activities as $a)
+                       foreach ($activities as $a)
                        {
                                $group_info      = array();
                                $title_new       = $a['title'];
-                               if(strlen($title_new) > 50)
+                               if (strlen($title_new) > 50)
                                {
                                        $title_new = substr($title_new, 0, 49);
                                }
@@ -1407,7 +1407,7 @@
                                var_dump("lagt til gruppen " . 
$group_info['name'] . " med id " . $new_group_id . "<br/>");
                                
$this->so_activity->update_activity_group($a['id'], $new_group_id);
                                $cp                              = 
$this->so_contact->get_booking_contact_persons($a['organization']);
-                               foreach($cp as $c)
+                               foreach ($cp as $c)
                                {
                                        $c->set_group_id($new_group_id);
                                        $contact_id = 
$this->so_contact->add_new_group_contact($c);
@@ -1420,7 +1420,7 @@
                public function remove_old_activities()
                {
                        $activity_id = phpgw::get_var('act_id');
-                       if($activity_id && $activity_id > 0)
+                       if ($activity_id && $activity_id > 0)
                        {
                                $activity_del = 
$this->so_activity->get_single($activity_id);
                                
$this->so_activity->remove_old_activities($activity_id);

Modified: branches/dev-syncromind/activitycalendar/inc/class.uiarena.inc.php
===================================================================
--- branches/dev-syncromind/activitycalendar/inc/class.uiarena.inc.php  
2016-04-09 11:19:48 UTC (rev 14910)
+++ branches/dev-syncromind/activitycalendar/inc/class.uiarena.inc.php  
2016-04-09 11:40:37 UTC (rev 14911)
@@ -47,7 +47,7 @@
 
                public function index()
                {
-                       if(phpgw::get_var('phpgw_return_as') == 'json')
+                       if (phpgw::get_var('phpgw_return_as') == 'json')
                        {
                                return $this->query();
                        }
@@ -141,7 +141,7 @@
 
                        $arena = 
activitycalendar_soarena::get_instance()->get_single($arena_id);
 
-                       if(empty($arena))
+                       if (empty($arena))
                        {
                                phpgwapi_cache::message_set(lang('Could not 
find specified arena.'), 'error');
                                $GLOBALS['phpgw']->redirect_link('/index.php', 
array('menuaction' => 'activitycalendar.uiarena.index'));
@@ -174,7 +174,7 @@
                        // Get the contract part id
                        $arena_id = (int)phpgw::get_var('id');
 
-                       if(isset($arena_id) && $arena_id > 0)
+                       if (isset($arena_id) && $arena_id > 0)
                        {
                                $arena = 
activitycalendar_soarena::get_instance()->get_single($arena_id);
                        }
@@ -248,12 +248,12 @@
                        $query_type              = phpgw::get_var('type');
 
                        $export = phpgw::get_var('export', 'bool');
-                       if($export)
+                       if ($export)
                        {
                                $num_of_objects = null;
                        }
 
-                       switch($query_type)
+                       switch ($query_type)
                        {
                                case 'all_arenas':
                                        $filters                 = 
array('arena_type' => phpgw::get_var('arena_type'), 'active' => 
phpgw::get_var('active'));
@@ -264,16 +264,16 @@
                        //var_dump($result_objects);
                        //Create an empty row set
                        $rows = array();
-                       foreach($result_objects as $result)
+                       foreach ($result_objects as $result)
                        {
-                               if(isset($result))
+                               if (isset($result))
                                {
                                        // ... add a serialized result
                                        $rows[] = $result->serialize();
                                }
                        }
 
-                       if($export)
+                       if ($export)
                        {
                                return $rows;
                        }
@@ -289,7 +289,7 @@
                {
                        $arena_id = (int)phpgw::get_var('id');
                        // Retrieve the activity object or create a new one
-                       if(isset($arena_id) && $arena_id > 0)
+                       if (isset($arena_id) && $arena_id > 0)
                        {
                                $arena = 
activitycalendar_soarena::get_instance()->get_single($arena_id);
                        }
@@ -306,7 +306,7 @@
                        $arena->set_city(phpgw::get_var('city'));
                        $arena->set_active(phpgw::get_var('arena_active') == 
'yes' ? true : false);
 
-                       
if(activitycalendar_soarena::get_instance()->store($arena)) // ... and then try 
to store the object
+                       if 
(activitycalendar_soarena::get_instance()->store($arena)) // ... and then try 
to store the object
                        {
                                
phpgwapi_cache::message_set(lang('messages_saved_form'), 'message');
                        }
@@ -321,7 +321,7 @@
 
                public function download_export()
                {
-                       if(!$this->isExecutiveOfficer())
+                       if (!$this->isExecutiveOfficer())
                        {
                                $this->render('permission_denied.php');
                                return;
@@ -332,15 +332,15 @@
                        $stop = phpgw::get_var('date');
 
                        $cs15 = phpgw::get_var('generate_cs15');
-                       if($cs15 == null)
+                       if ($cs15 == null)
                        {
                                $export_format   = explode('_', 
phpgw::get_var('export_format'));
                                $file_ending     = $export_format[1];
-                               if($file_ending == 'gl07')
+                               if ($file_ending == 'gl07')
                                {
                                        $type = 'intern';
                                }
-                               else if($file_ending == 'lg04')
+                               else if ($file_ending == 'lg04')
                                {
                                        $type = 'faktura';
                                }

Modified: branches/dev-syncromind/activitycalendar/inc/class.uicommon.inc.php
===================================================================
--- branches/dev-syncromind/activitycalendar/inc/class.uicommon.inc.php 
2016-04-09 11:19:48 UTC (rev 14910)
+++ branches/dev-syncromind/activitycalendar/inc/class.uicommon.inc.php 
2016-04-09 11:40:37 UTC (rev 14911)
@@ -12,12 +12,12 @@
         *
         * @return array containg values from $array for the keys in $keys.
         */
-       function extract_values($array, $keys)
+       function extract_values( $array, $keys )
        {
                $result = array();
-               foreach($keys as $key)
+               foreach ($keys as $key)
                {
-                       if(in_array($key, array_keys($array)))
+                       if (in_array($key, array_keys($array)))
                        {
                                $result[$key] = 
phpgw::clean_value($array[$key]);
                        }
@@ -25,9 +25,9 @@
                return $result;
        }
 
-       function array_set_default(&$array, $key, $value)
+       function array_set_default( &$array, $key, $value )
        {
-               if(!isset($array[$key]))
+               if (!isset($array[$key]))
                        $array[$key] = $value;
        }
        define('MANAGER', 'MANAGER');
@@ -75,7 +75,7 @@
                 * @param $permission
                 * @return true if check is ok, false othewise
                 */
-               protected function hasPermissionOn($location = 
activitycalendar_uicommon::LOCATION_ROOT, $permission = PHPGW_ACL_PRIVATE)
+               protected function hasPermissionOn( $location = 
activitycalendar_uicommon::LOCATION_ROOT, $permission = PHPGW_ACL_PRIVATE )
                {
                        return $this->acl->check($location, $permission, 
'bkbooking');
                }
@@ -119,9 +119,9 @@
                        self::$old_exception_handler = 
set_exception_handler(array(__CLASS__, 'handle_rental_unauthorized_exception'));
                }
 
-               public static function 
handle_rental_unauthorized_exception(Exception $e)
+               public static function handle_rental_unauthorized_exception( 
Exception $e )
                {
-                       if($e instanceof rental_unauthorized_exception)
+                       if ($e instanceof rental_unauthorized_exception)
                        {
                                $message = htmlentities('HTTP/1.0 401 
Unauthorized - ' . $e->getMessage(), null, self::encoding());
                                header($message);
@@ -133,9 +133,9 @@
                        }
                }
 
-               public function check_active($url)
+               public function check_active( $url )
                {
-                       if($_SERVER['REQUEST_METHOD'] == 'POST')
+                       if ($_SERVER['REQUEST_METHOD'] == 'POST')
                        {
                                $activate = extract_values($_POST, 
array("status", "activate_id"));
                                
$this->bo->set_active(intval($activate['activate_id']), 
intval($activate['status']));
@@ -149,7 +149,7 @@
                 * @param $data the data
                 * @return YUI result { ResultSet => { totalRecords => ?, 
Result => ?}
                 */
-               public function yui_results($data, $field_total = 
'total_records', $field_results = 'results')
+               public function yui_results( $data, $field_total = 
'total_records', $field_results = 'results' )
                {
                        return array
                                (
@@ -168,9 +168,9 @@
                 * @return string formatted version of the string passed to the 
method,
                 * or the same string if the one passed is of an incorrect 
format.
                 */
-               public static function get_nicely_formatted_gab_id(string 
$gab_id)
+               public static function get_nicely_formatted_gab_id( string 
$gab_id )
                {
-                       if(strlen($gab_id) == 20)
+                       if (strlen($gab_id) == 20)
                        {
                                $gab_id = substr($gab_id, 4, 5) . ' / ' . 
substr($gab_id, 9, 4) . ' / ' . substr($gab_id, 13, 4) . ' / ' . 
substr($gab_id, 17, 3);
                        }
@@ -190,26 +190,26 @@
                 * @param $extra_cols the list of extra columns to set
                 * @return string javascript
                 */
-               public static function get_extra_column_defs($array_name, 
$extra_cols = array())
+               public static function get_extra_column_defs( $array_name, 
$extra_cols = array() )
                {
                        $result = "";
 
-                       foreach($extra_cols as $col)
+                       foreach ($extra_cols as $col)
                        {
                                $literal = '{';
                                $literal .= 'key: "' . $col['key'] . '",';
                                $literal .= 'label: "' . $col['label'] . '"';
-                               if(isset($col['formatter']))
+                               if (isset($col['formatter']))
                                {
                                        $literal .= ',formatter: ' . 
$col['formatter'];
                                }
-                               if(isset($col['parser']))
+                               if (isset($col['parser']))
                                {
                                        $literal .= ',parser: ' . 
$col['parser'];
                                }
                                $literal .= '}';
 
-                               if($col["index"])
+                               if ($col["index"])
                                {
                                        $result .= "{$array_name}.splice(" . 
$col["index"] . ", 0," . $literal . ");";
                                }
@@ -231,11 +231,11 @@
 
                        $keys = array();
 
-                       if(count($list[0]) > 0)
+                       if (count($list[0]) > 0)
                        {
-                               foreach($list[0] as $key => $value)
+                               foreach ($list[0] as $key => $value)
                                {
-                                       if(!is_array($value))
+                                       if (!is_array($value))
                                        {
                                                array_push($keys, $key);
                                        }
@@ -244,9 +244,9 @@
 
                        // Remove newlines from output
                        $count = count($list);
-                       for($i = 0; $i < $count; $i++)
+                       for ($i = 0; $i < $count; $i++)
                        {
-                               foreach($list[$i] as $key => &$data)
+                               foreach ($list[$i] as $key => &$data)
                                {
                                        $data = str_replace(array("\n", "\r\n", 
"<br>"), '', $data);
                                }
@@ -255,7 +255,7 @@
                        // Use keys as headings
                        $headings        = array();
                        $count_keys      = count($keys);
-                       for($j = 0; $j < $count_keys; $j++)
+                       for ($j = 0; $j < $count_keys; $j++)
                        {
                                array_push($headings, lang($keys[$j]));
                        }

Modified: branches/dev-syncromind/activitycalendar/inc/class.uidashboard.inc.php
===================================================================
--- branches/dev-syncromind/activitycalendar/inc/class.uidashboard.inc.php      
2016-04-09 11:19:48 UTC (rev 14910)
+++ branches/dev-syncromind/activitycalendar/inc/class.uidashboard.inc.php      
2016-04-09 11:40:37 UTC (rev 14911)
@@ -125,18 +125,18 @@
 
                        $uid             = 
$GLOBALS['phpgw_info']['user']['account_id'];
                        $user_office = 
activitycalendar_soactivity::get_instance()->get_office_from_user($uid);
-                       if($user_office && $user_office == 1)
+                       if ($user_office && $user_office == 1)
                        {
                                $user_office = 2;
                        }
-                       else if($user_office == 2)
+                       else if ($user_office == 2)
                        {
                                $user_office = 1;
                        }
 
                        $activity_district_options[] = array('id' => 'all', 
'name' => lang('all'), 'selected' => 0);
                        $districts                                       = 
activitycalendar_soactivity::get_instance()->select_district_list();
-                       foreach($districts as $district)
+                       foreach ($districts as $district)
                        {
                                $selected                                       
 = ($user_office == $district['id']) ? 1 : 0;
                                $activity_district_options[] = array('id' => 
$district['id'], 'name' => $district['name'],
@@ -145,7 +145,7 @@
 
                        $activity_category_options[] = array('id' => 'all', 
'name' => lang('all'), 'selected' => 0);
                        $categories                                      = 
activitycalendar_soactivity::get_instance()->get_categories();
-                       foreach($categories as $category)
+                       foreach ($categories as $category)
                        {
                                $activity_category_options[] = array('id' => 
$category->get_id(), 'name' => $category->get_name(),
                                        'selected' => 0);
@@ -180,7 +180,7 @@
                 */
                public function query()
                {
-                       
if($GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'] > 0)
+                       if 
($GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'] > 0)
                        {
                                $user_rows_per_page = 
$GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'];
                        }
@@ -205,7 +205,7 @@
 
                        $exp_param       = phpgw::get_var('export');
                        $export          = false;
-                       if(isset($exp_param))
+                       if (isset($exp_param))
                        {
                                $export                  = true;
                                $num_of_objects  = null;
@@ -215,7 +215,7 @@
                        $type                    = phpgw::get_var('type');
                        $changed_org     = false;
                        $changed_group   = false;
-                       switch($type)
+                       switch ($type)
                        {
                                case 'changed_organizations':
                                        $filters                 = 
array('changed_orgs' => 'true');
@@ -229,7 +229,7 @@
                                        //$filters = array('party_type' => 
phpgw::get_var('party_type'), 'active' => phpgw::get_var('active'));
                                        break;
                        }
-                       if($changed_group)
+                       if ($changed_group)
                        {
                                $result_objects  = 
activitycalendar_sogroup::get_instance()->get($start_index, $num_of_objects, 
$sort_field, $sort_ascending, $search_for, $search_type, $filters);

@@ Diff output truncated at 153600 characters. @@



reply via email to

[Prev in Thread] Current Thread [Next in Thread]