[Fmsystem-commits] [14719] backport trunk from dev-syncromind

[Sigurd Nes]

Revision: 14719
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=14719
Author:   sigurdne
Date:     2016-02-10 19:45:46 +0000 (Wed, 10 Feb 2016)
Log Message:
-----------
backport trunk from dev-syncromind

Modified Paths:
--------------
    trunk/about.php
    trunk/activitycalendar/inc/class.menu.inc.php
    trunk/activitycalendar/inc/class.soactivity.inc.php
    trunk/activitycalendar/inc/class.soarena.inc.php
    trunk/activitycalendar/inc/class.socommon.inc.php
    trunk/activitycalendar/inc/class.socontactperson.inc.php
    trunk/activitycalendar/inc/class.sogroup.inc.php
    trunk/activitycalendar/inc/class.soorganization.inc.php
    trunk/activitycalendar/inc/class.uiactivities.inc.php
    trunk/activitycalendar/inc/class.uiarena.inc.php
    trunk/activitycalendar/inc/class.uicommon.inc.php
    trunk/activitycalendar/inc/class.uidashboard.inc.php
    trunk/activitycalendar/inc/class.uiimport.inc.php
    trunk/activitycalendar/inc/class.uiorganization.inc.php
    trunk/activitycalendar/inc/model/class.activity.inc.php
    trunk/activitycalendar/inc/model/class.arena.inc.php
    trunk/activitycalendar/inc/model/class.building.inc.php
    trunk/activitycalendar/inc/model/class.category.inc.php
    trunk/activitycalendar/inc/model/class.contact_person.inc.php
    trunk/activitycalendar/inc/model/class.group.inc.php
    trunk/activitycalendar/inc/model/class.model.inc.php
    trunk/activitycalendar/inc/model/class.organization.inc.php
    trunk/activitycalendar/inc/model/class.target.inc.php
    trunk/activitycalendar/index.php
    trunk/activitycalendar/setup/setup.inc.php
    trunk/activitycalendar/setup/tables_update.inc.php
    trunk/activitycalendar/templates/base/css/base.css
    trunk/activitycalendarfrontend/inc/class.menu.inc.php
    trunk/activitycalendarfrontend/inc/class.uiactivity.inc.php
    trunk/activitycalendarfrontend/index.php
    trunk/activitycalendarfrontend/setup/setup.inc.php
    trunk/activitycalendarfrontend/templates/base/activity_tmp.xml
    trunk/activitycalendarfrontend/templates/base/config.tpl
    trunk/activitycalendarfrontend/templates/base/css/base.css
    trunk/addressbook/templates/base/body_detail.tpl
    trunk/addressbook/templates/base/config.tpl
    trunk/addressbook/templates/base/form.tpl
    trunk/addressbook/templates/base/principal_tabs.tpl
    trunk/admin/inc/class.bo_custom.inc.php
    trunk/admin/inc/class.ui_custom.inc.php
    trunk/admin/inc/class.uiaccounts.inc.php
    trunk/admin/inc/class.uiasyncservice.inc.php
    trunk/admin/templates/base/accesslog.tpl
    trunk/admin/templates/base/cats.xsl
    trunk/admin/templates/base/config.tpl
    trunk/admin/templates/base/custom.xsl
    trunk/admin/templates/base/errorlog_view.tpl
    trunk/admin/templates/base/select_location.xsl
    trunk/bim/inc/class.bimExceptions.inc.php
    trunk/bim/inc/class.bimitem.inc.php
    trunk/bim/inc/class.bimmodel.inc.php
    trunk/bim/inc/class.bimmodelinformation.inc.php
    trunk/bim/inc/class.bimobject.inc.php
    trunk/bim/inc/class.boattribute.inc.php
    trunk/bim/inc/class.boattribute_owner.inc.php
    trunk/bim/inc/class.bobimitem.inc.php
    trunk/bim/inc/class.bobimmodel.inc.php
    trunk/bim/inc/class.bogroup.inc.php
    trunk/bim/inc/class.boitem.inc.php
    trunk/bim/inc/class.menu.inc.php
    trunk/bim/inc/class.restrequest.inc.php
    trunk/bim/inc/class.sobim.inc.php
    trunk/bim/inc/class.sobim_converter.inc.php
    trunk/bim/inc/class.sobim_repository.inc.php
    trunk/bim/inc/class.sobimitem.inc.php
    trunk/bim/inc/class.sobimmodel.inc.php
    trunk/bim/inc/class.sobimmodelinformation.inc.php
    trunk/bim/inc/class.sobimtype.inc.php
    trunk/bim/inc/class.soitem.inc.php
    trunk/bim/inc/class.soitem_group.inc.php
    trunk/bim/inc/class.sovfs.inc.php
    trunk/bim/inc/class.uibim.inc.php
    trunk/bim/inc/class.uibimitem.inc.php
    trunk/bim/inc/class.uiifc.inc.php
    trunk/bim/inc/class.uiitem.inc.php
    trunk/bim/index.php
    trunk/bim/setup/setup.inc.php
    trunk/bim/setup/tables_current.inc.php
    trunk/bim/setup/tables_update.inc.php
    trunk/bim/templates/base/app_data.xsl
    trunk/bim/templates/base/bim_modelinformation.xsl
    trunk/bim/templates/base/bim_showSingleItem.xsl
    trunk/bim/templates/base/bim_upload_ifc.xsl
    trunk/bim/templates/base/bim_upload_ifc_result.xsl
    trunk/bim/templates/base/config.tpl
    trunk/bim/templates/base/css/bim.css
    trunk/bim/tests/BIM/PropertyBimTestSuite.php
    trunk/bim/tests/BIM/TestBObimitem.php
    trunk/bim/tests/BIM/TestBObimmodel.php
    trunk/bim/tests/BIM/TestBimCommon.php
    trunk/bim/tests/BIM/TestBimmodelinformation_solo.php
    trunk/bim/tests/BIM/TestSObim_converter_solo.php
    trunk/bim/tests/BIM/TestSObim_solo.php
    trunk/bim/tests/BIM/TestSObimitem.php
    trunk/bim/tests/BIM/TestSObimmodel.php
    trunk/bim/tests/BIM/TestSObimmodelinformation.php
    trunk/bim/tests/BIM/TestSObimrest_solo.php
    trunk/bim/tests/BIM/TestSObimtype.php
    trunk/bim/tests/BIM/TestSOvfs.php
    trunk/bim/tests/BIM/TestUIbim.php
    trunk/booking/frontend.php
    trunk/booking/inc/class.account_helper.inc.php
    trunk/booking/inc/class.account_ui_utils.inc.php
    trunk/booking/inc/class.async_task.inc.php
    trunk/booking/inc/class.async_task_send_reminder.inc.php
    trunk/booking/inc/class.async_task_update_reservation_state.inc.php
    trunk/booking/inc/class.boaccount_code_set.inc.php
    trunk/booking/inc/class.boactivity.inc.php
    trunk/booking/inc/class.boagegroup.inc.php
    trunk/booking/inc/class.boallocation.inc.php
    trunk/booking/inc/class.boapplication.inc.php
    trunk/booking/inc/class.boasync_settings.inc.php
    trunk/booking/inc/class.boaudience.inc.php
    trunk/booking/inc/class.bobooking.inc.php
    trunk/booking/inc/class.bobuilding.inc.php
    trunk/booking/inc/class.bocommon.inc.php
    trunk/booking/inc/class.bocommon_authorized.inc.php
    trunk/booking/inc/class.bocommon_global_manager_authorized.inc.php
    trunk/booking/inc/class.bocompleted_reservation.inc.php
    trunk/booking/inc/class.bocompleted_reservation_export.inc.php
    trunk/booking/inc/class.bocompleted_reservation_export_file.inc.php
    trunk/booking/inc/class.bocontactperson.inc.php
    trunk/booking/inc/class.bodocument.inc.php
    trunk/booking/inc/class.bodocument_building.inc.php
    trunk/booking/inc/class.bodocument_resource.inc.php
    trunk/booking/inc/class.bodocument_view.inc.php
    trunk/booking/inc/class.bodocumentation.inc.php
    trunk/booking/inc/class.boevent.inc.php
    trunk/booking/inc/class.bogroup.inc.php
    trunk/booking/inc/class.bomassbooking.inc.php
    trunk/booking/inc/class.boorganization.inc.php
    trunk/booking/inc/class.bopermission.inc.php
    trunk/booking/inc/class.bopermission_building.inc.php
    trunk/booking/inc/class.bopermission_document_building.inc.php
    trunk/booking/inc/class.bopermission_document_resource.inc.php
    trunk/booking/inc/class.bopermission_massbooking.inc.php
    trunk/booking/inc/class.bopermission_root.inc.php
    trunk/booking/inc/class.bopermission_season.inc.php
    trunk/booking/inc/class.boresource.inc.php
    trunk/booking/inc/class.boseason.inc.php
    trunk/booking/inc/class.bosystem_message.inc.php
    trunk/booking/inc/class.customer_identifier.inc.php
    trunk/booking/inc/class.errorstack.inc.php
    trunk/booking/inc/class.export_agresso.inc.php
    trunk/booking/inc/class.filestorage.inc.php
    trunk/booking/inc/class.menu.inc.php
    trunk/booking/inc/class.ofbooking.inc.php
    trunk/booking/inc/class.soaccount_code_set.inc.php
    trunk/booking/inc/class.soactivity.inc.php
    trunk/booking/inc/class.soagegroup.inc.php
    trunk/booking/inc/class.soallocation.inc.php
    trunk/booking/inc/class.soapplication.inc.php
    trunk/booking/inc/class.soaudience.inc.php
    trunk/booking/inc/class.sobilling_sequential_number_generator.inc.php
    trunk/booking/inc/class.sobooking.inc.php
    trunk/booking/inc/class.sobuilding.inc.php
    trunk/booking/inc/class.socommon.inc.php
    trunk/booking/inc/class.socompleted_reservation.inc.php
    trunk/booking/inc/class.socompleted_reservation_export.inc.php
    trunk/booking/inc/class.socompleted_reservation_export_file.inc.php
    trunk/booking/inc/class.socontact_organization.inc.php
    trunk/booking/inc/class.socontactperson.inc.php
    trunk/booking/inc/class.sodocument.inc.php
    trunk/booking/inc/class.sodocument_building.inc.php
    trunk/booking/inc/class.sodocument_resource.inc.php
    trunk/booking/inc/class.sodocument_view.inc.php
    trunk/booking/inc/class.sodocumentation.inc.php
    trunk/booking/inc/class.soevent.inc.php
    trunk/booking/inc/class.sogroup.inc.php
    trunk/booking/inc/class.somassbooking.inc.php
    trunk/booking/inc/class.soorganization.inc.php
    trunk/booking/inc/class.sopermission.inc.php
    trunk/booking/inc/class.sopermission_account_code_set.inc.php
    trunk/booking/inc/class.sopermission_activity.inc.php
    trunk/booking/inc/class.sopermission_agegroup.inc.php
    trunk/booking/inc/class.sopermission_allocation.inc.php
    trunk/booking/inc/class.sopermission_audience.inc.php
    trunk/booking/inc/class.sopermission_booking.inc.php
    trunk/booking/inc/class.sopermission_building.inc.php
    trunk/booking/inc/class.sopermission_document_building.inc.php
    trunk/booking/inc/class.sopermission_document_resource.inc.php
    trunk/booking/inc/class.sopermission_event.inc.php
    trunk/booking/inc/class.sopermission_group.inc.php
    trunk/booking/inc/class.sopermission_massbooking.inc.php
    trunk/booking/inc/class.sopermission_organization.inc.php
    trunk/booking/inc/class.sopermission_permission.inc.php
    trunk/booking/inc/class.sopermission_permission_building.inc.php
    trunk/booking/inc/class.sopermission_permission_document_building.inc.php
    trunk/booking/inc/class.sopermission_permission_document_resource.inc.php
    trunk/booking/inc/class.sopermission_permission_resource.inc.php
    trunk/booking/inc/class.sopermission_permission_root.inc.php
    trunk/booking/inc/class.sopermission_permission_season.inc.php
    trunk/booking/inc/class.sopermission_resource.inc.php
    trunk/booking/inc/class.sopermission_root.inc.php
    trunk/booking/inc/class.sopermission_season.inc.php
    trunk/booking/inc/class.soresource.inc.php
    trunk/booking/inc/class.soseason.inc.php
    trunk/booking/inc/class.sosystem_message.inc.php
    trunk/booking/inc/class.uiaccount_code_dimension.inc.php
    trunk/booking/inc/class.uiaccount_code_set.inc.php
    trunk/booking/inc/class.uiactivity.inc.php
    trunk/booking/inc/class.uiagegroup.inc.php
    trunk/booking/inc/class.uiallocation.inc.php
    trunk/booking/inc/class.uiapplication.inc.php
    trunk/booking/inc/class.uiapplication_settings.inc.php
    trunk/booking/inc/class.uiasync_settings.inc.php
    trunk/booking/inc/class.uiaudience.inc.php
    trunk/booking/inc/class.uibooking.inc.php
    trunk/booking/inc/class.uibuilding.inc.php
    trunk/booking/inc/class.uicommon.inc.php
    trunk/booking/inc/class.uicompleted_reservation.inc.php
    trunk/booking/inc/class.uicompleted_reservation_export.inc.php
    trunk/booking/inc/class.uicompleted_reservation_export_file.inc.php
    trunk/booking/inc/class.uicontactperson.inc.php
    trunk/booking/inc/class.uidashboard.inc.php
    trunk/booking/inc/class.uidocument.inc.php
    trunk/booking/inc/class.uidocument_building.inc.php
    trunk/booking/inc/class.uidocument_resource.inc.php
    trunk/booking/inc/class.uidocument_view.inc.php
    trunk/booking/inc/class.uidocumentation.inc.php
    trunk/booking/inc/class.uievent.inc.php
    trunk/booking/inc/class.uievent_mail_settings.inc.php
    trunk/booking/inc/class.uigroup.inc.php
    trunk/booking/inc/class.uimail_settings.inc.php
    trunk/booking/inc/class.uimassbooking.inc.php
    trunk/booking/inc/class.uimetasettings.inc.php
    trunk/booking/inc/class.uiorganization.inc.php
    trunk/booking/inc/class.uipermission.inc.php
    trunk/booking/inc/class.uipermission_building.inc.php
    trunk/booking/inc/class.uipermission_massbooking.inc.php
    trunk/booking/inc/class.uipermission_resource.inc.php
    trunk/booking/inc/class.uipermission_root.inc.php
    trunk/booking/inc/class.uipermission_season.inc.php
    trunk/booking/inc/class.uireports.inc.php
    trunk/booking/inc/class.uiresource.inc.php
    trunk/booking/inc/class.uiseason.inc.php
    trunk/booking/inc/class.uisend_email.inc.php
    trunk/booking/inc/class.uisettings.inc.php
    trunk/booking/inc/class.uisystem_message.inc.php
    trunk/booking/inc/class.unauthorized_exception.inc.php
    trunk/booking/inc/schedule.php
    trunk/booking/index.php
    trunk/booking/js/booking/allocation.js
    trunk/booking/js/booking/allocation_list.js
    trunk/booking/js/booking/application.js
    trunk/booking/js/booking/booking.js
    trunk/booking/js/booking/common.js
    trunk/booking/js/booking/completed_reservation.js
    trunk/booking/js/booking/document.js
    trunk/booking/js/booking/email_send.js
    trunk/booking/js/booking/event.js
    trunk/booking/js/booking/group_new.js
    trunk/booking/js/booking/permission.js
    trunk/booking/js/booking/permission_root.js
    trunk/booking/js/booking/resource_new.js
    trunk/booking/js/booking/schedule.js
    trunk/booking/js/booking/season.js
    trunk/booking/setup/phpgw_no.lang
    trunk/booking/setup/setup.inc.php
    trunk/booking/setup/tables_current.inc.php
    trunk/booking/setup/tables_update.inc.php
    trunk/booking/tasks/cleanCompletedReservations.php
    trunk/booking/tasks/cleanReservations.php
    trunk/booking/tasks/entryPoint.php
    trunk/booking/tasks/getBookingAppVersion.php
    trunk/booking/tasks/randomReservations.php
    trunk/booking/tasks/sendReminder.php
    trunk/booking/tasks/setBookingAppVersion.php
    trunk/booking/tasks/testNumberGenerator.php
    trunk/booking/tasks/updateReservationState.php
    trunk/booking/templates/base/account_code_dimension.xsl
    trunk/booking/templates/base/account_code_set.xsl
    trunk/booking/templates/base/account_code_set_form.xsl
    trunk/booking/templates/base/activities.xsl
    trunk/booking/templates/base/activity_edit.xsl
    trunk/booking/templates/base/activity_new.xsl
    trunk/booking/templates/base/agegroup_edit.xsl
    trunk/booking/templates/base/agegroup_new.xsl
    trunk/booking/templates/base/allocation.xsl
    trunk/booking/templates/base/allocation_delete.xsl
    trunk/booking/templates/base/allocation_delete_preview.xsl
    trunk/booking/templates/base/allocation_edit.xsl
    trunk/booking/templates/base/allocation_info.xsl
    trunk/booking/templates/base/allocation_new.xsl
    trunk/booking/templates/base/allocation_new_preview.xsl
    trunk/booking/templates/base/application.xsl
    trunk/booking/templates/base/application_edit.xsl
    trunk/booking/templates/base/application_new.xsl
    trunk/booking/templates/base/application_settings.xsl
    trunk/booking/templates/base/async_settings_form.xsl
    trunk/booking/templates/base/audience_edit.xsl
    trunk/booking/templates/base/audience_new.xsl
    trunk/booking/templates/base/booking.xsl
    trunk/booking/templates/base/booking_delete.xsl
    trunk/booking/templates/base/booking_delete_preview.xsl
    trunk/booking/templates/base/booking_edit.xsl
    trunk/booking/templates/base/booking_info.xsl
    trunk/booking/templates/base/booking_new.xsl
    trunk/booking/templates/base/booking_new_preview.xsl
    trunk/booking/templates/base/building.xsl
    trunk/booking/templates/base/building_form.xsl
    trunk/booking/templates/base/building_schedule.xsl
    trunk/booking/templates/base/completed_reservation.xsl
    trunk/booking/templates/base/completed_reservation_edit.xsl
    trunk/booking/templates/base/completed_reservation_export.xsl
    trunk/booking/templates/base/completed_reservation_export_file.xsl
    trunk/booking/templates/base/completed_reservation_export_form.xsl
    trunk/booking/templates/base/config.tpl
    trunk/booking/templates/base/contactperson.xsl
    trunk/booking/templates/base/contactperson_edit.xsl
    trunk/booking/templates/base/contactperson_fields.xsl
    trunk/booking/templates/base/css/base.css
    trunk/booking/templates/base/customer_identifier.xsl
    trunk/booking/templates/base/document_form.xsl
    trunk/booking/templates/base/documentation_form.xsl
    trunk/booking/templates/base/email_index.xsl
    trunk/booking/templates/base/email_preview.xsl
    trunk/booking/templates/base/email_receipt.xsl
    trunk/booking/templates/base/equipment.xsl
    trunk/booking/templates/base/equipment_edit.xsl
    trunk/booking/templates/base/equipment_new.xsl
    trunk/booking/templates/base/event_edit.xsl
    trunk/booking/templates/base/event_info.xsl
    trunk/booking/templates/base/event_mail_settings.xsl
    trunk/booking/templates/base/event_new.xsl
    trunk/booking/templates/base/group.xsl
    trunk/booking/templates/base/group_edit.xsl
    trunk/booking/templates/base/helpers.xsl
    trunk/booking/templates/base/mail_settings.xsl
    trunk/booking/templates/base/massbooking_schedule.xsl
    trunk/booking/templates/base/metasettings.xsl
    trunk/booking/templates/base/organization.xsl
    trunk/booking/templates/base/organization_edit.xsl
    trunk/booking/templates/base/permission_form.xsl
    trunk/booking/templates/base/permission_root_form.xsl
    trunk/booking/templates/base/report_freetime.xsl
    trunk/booking/templates/base/report_index.xsl
    trunk/booking/templates/base/report_participants.xsl
    trunk/booking/templates/base/resource.xsl
    trunk/booking/templates/base/resource_form.xsl
    trunk/booking/templates/base/resource_schedule.xsl
    trunk/booking/templates/base/season.xsl
    trunk/booking/templates/base/season_boundaries.xsl
    trunk/booking/templates/base/season_edit.xsl
    trunk/booking/templates/base/season_generate.xsl
    trunk/booking/templates/base/season_new.xsl
    trunk/booking/templates/base/season_wtemplate.xsl
    trunk/booking/templates/base/settings.xsl
    trunk/booking/templates/base/system_message.xsl
    trunk/booking/templates/base/system_message_edit.xsl
    trunk/bookingfrontend/change.php
    trunk/bookingfrontend/inc/class.bobuilding.inc.php
    trunk/bookingfrontend/inc/class.bosearch.inc.php
    trunk/bookingfrontend/inc/class.bouser.inc.php
    trunk/bookingfrontend/inc/class.menu.inc.php
    trunk/bookingfrontend/inc/class.uiallocation.inc.php
    trunk/bookingfrontend/inc/class.uiapplication.inc.php
    trunk/bookingfrontend/inc/class.uibooking.inc.php
    trunk/bookingfrontend/inc/class.uibuilding.inc.php
    trunk/bookingfrontend/inc/class.uicontactperson.inc.php
    trunk/bookingfrontend/inc/class.uidocument_building.inc.php
    trunk/bookingfrontend/inc/class.uidocument_resource.inc.php
    trunk/bookingfrontend/inc/class.uidocumentation.inc.php
    trunk/bookingfrontend/inc/class.uievent.inc.php
    trunk/bookingfrontend/inc/class.uigroup.inc.php
    trunk/bookingfrontend/inc/class.uiorganization.inc.php
    trunk/bookingfrontend/inc/class.uiresource.inc.php
    trunk/bookingfrontend/inc/class.uisearch.inc.php
    trunk/bookingfrontend/inc/class.uisystem_message.inc.php
    trunk/bookingfrontend/inc/custom/default/Altinn2_Bergen_kommune.php
    trunk/bookingfrontend/inc/custom/default/Altinn_Bergen_kommune.php
    trunk/bookingfrontend/inc/custom/default/MinId.php
    trunk/bookingfrontend/inc/hook_config.inc.php
    trunk/bookingfrontend/index.php
    trunk/bookingfrontend/js/bookingfrontend/booking.js
    trunk/bookingfrontend/js/bookingfrontend/booking_massupdate.js
    trunk/bookingfrontend/login.php
    trunk/bookingfrontend/logout.php
    trunk/bookingfrontend/setup/phpgw_no.lang
    trunk/bookingfrontend/setup/setup.inc.php
    trunk/bookingfrontend/templates/base/access_denied.xsl
    trunk/bookingfrontend/templates/base/allocation_cancel.xsl
    trunk/bookingfrontend/templates/base/allocation_delete.xsl
    trunk/bookingfrontend/templates/base/allocation_delete_preview.xsl
    trunk/bookingfrontend/templates/base/allocation_info.xsl
    trunk/bookingfrontend/templates/base/booking_cancel.xsl
    trunk/bookingfrontend/templates/base/booking_delete.xsl
    trunk/bookingfrontend/templates/base/booking_delete_preview.xsl
    trunk/bookingfrontend/templates/base/booking_edit.xsl
    trunk/bookingfrontend/templates/base/booking_edit_preview.xsl
    trunk/bookingfrontend/templates/base/booking_info.xsl
    trunk/bookingfrontend/templates/base/booking_massupdate.xsl
    trunk/bookingfrontend/templates/base/booking_new.xsl
    trunk/bookingfrontend/templates/base/booking_new_preview.xsl
    trunk/bookingfrontend/templates/base/building.xsl
    trunk/bookingfrontend/templates/base/building_schedule.xsl
    trunk/bookingfrontend/templates/base/config.tpl
    trunk/bookingfrontend/templates/base/event_info.xsl
    trunk/bookingfrontend/templates/base/group.xsl
    trunk/bookingfrontend/templates/base/organization.xsl
    trunk/bookingfrontend/templates/base/report_numbers.xsl
    trunk/bookingfrontend/templates/base/resource.xsl
    trunk/bookingfrontend/templates/base/resource_schedule.xsl
    trunk/bookingfrontend/templates/base/search.xsl
    trunk/bookingfrontend/templates/base/system_message.xsl
    trunk/bookingfrontend/templates/fjell/application_new.xsl
    trunk/bookingfrontend/templates/fjell/booking_edit.xsl
    trunk/bookingfrontend/templates/fjell/booking_new.xsl
    trunk/bookingfrontend/templates/fjell/event_edit.xsl
    trunk/bookingfrontend/templates/stavanger/application_new.xsl
    trunk/bookingfrontend/templates/stavanger/booking_edit.xsl
    trunk/bookingfrontend/templates/stavanger/booking_new.xsl
    trunk/bookingfrontend/templates/stavanger/event_edit.xsl
    trunk/calendar/templates/base/config.tpl
    trunk/catch/templates/base/config.tpl
    trunk/controller/inc/class.cat_hooks.inc.php
    trunk/controller/inc/class.hook_helper.inc.php
    trunk/controller/inc/class.menu.inc.php
    trunk/controller/inc/class.socase.inc.php
    trunk/controller/inc/class.socheck_item.inc.php
    trunk/controller/inc/class.socheck_list.inc.php
    trunk/controller/inc/class.socommon.inc.php
    trunk/controller/inc/class.socontrol.inc.php
    trunk/controller/inc/class.socontrol_group.inc.php
    trunk/controller/inc/class.socontrol_group_list.inc.php
    trunk/controller/inc/class.socontrol_item.inc.php
    trunk/controller/inc/class.socontrol_item_list.inc.php
    trunk/controller/inc/class.socontrol_item_option.inc.php
    trunk/controller/inc/class.sodocument.inc.php
    trunk/controller/inc/class.soprocedure.inc.php
    trunk/controller/inc/class.uicalendar.inc.php
    trunk/controller/inc/class.uicase.inc.php
    trunk/controller/inc/class.uicheck_list.inc.php
    trunk/controller/inc/class.uicheck_list_for_component.inc.php
    trunk/controller/inc/class.uicomponent.inc.php
    trunk/controller/inc/class.uicontrol.inc.php
    trunk/controller/inc/class.uicontrol_group.inc.php
    trunk/controller/inc/class.uicontrol_group_component.inc.php
    trunk/controller/inc/class.uicontrol_item.inc.php
    trunk/controller/inc/class.uicontrol_register_to_component.inc.php
    trunk/controller/inc/class.uicontrol_register_to_location.inc.php
    trunk/controller/inc/class.uidocument.inc.php
    trunk/controller/inc/class.uilookup.inc.php
    trunk/controller/inc/class.uiprocedure.inc.php
    trunk/controller/inc/component/class.check_list_status_info.inc.php
    trunk/controller/inc/component/class.date_generator.inc.php
    trunk/controller/inc/component/class.status_agg_month_info.inc.php
    trunk/controller/inc/component/class.year_calendar.inc.php
    trunk/controller/inc/component/class.year_calendar_agg.inc.php
    trunk/controller/inc/helper/class.date_converter.inc.php
    trunk/controller/inc/helper/class.location_finder.inc.php
    trunk/controller/inc/hook_config.inc.php
    trunk/controller/inc/hook_settings.inc.php
    trunk/controller/inc/model/class.check_item.inc.php
    trunk/controller/inc/model/class.check_item_case.inc.php
    trunk/controller/inc/model/class.check_list.inc.php
    trunk/controller/inc/model/class.component.inc.php
    trunk/controller/inc/model/class.control.inc.php
    trunk/controller/inc/model/class.control_group.inc.php
    trunk/controller/inc/model/class.control_group_list.inc.php
    trunk/controller/inc/model/class.control_item.inc.php
    trunk/controller/inc/model/class.control_item_list.inc.php
    trunk/controller/inc/model/class.control_item_option.inc.php
    trunk/controller/inc/model/class.control_location.inc.php
    trunk/controller/inc/model/class.document.inc.php
    trunk/controller/inc/model/class.model.inc.php
    trunk/controller/inc/model/class.procedure.inc.php
    trunk/controller/js/controller/ajax.js
    trunk/controller/js/controller/ajax_control_to_component.js
    trunk/controller/js/controller/ajax_control_to_location.js
    trunk/controller/js/controller/case.js
    trunk/controller/js/controller/check_list.js
    trunk/controller/js/controller/check_list_update_status.js
    trunk/controller/js/controller/control_group_to_component.js
    trunk/controller/js/controller/custom_drag_drop.js
    trunk/controller/js/controller/custom_ui.js
    trunk/controller/templates/base/add_component_to_control.xsl
    trunk/controller/templates/base/add_component_to_control_group.xsl
    trunk/controller/templates/base/check_list/add_check_list.xsl
    trunk/controller/templates/base/check_list/edit_check_list.xsl
    trunk/controller/templates/base/check_list/view_control_info.xsl
    trunk/controller/templates/base/component.xsl
    trunk/controller/templates/base/config.tpl
    trunk/controller/templates/base/control/control.xsl
    trunk/controller/templates/base/control/control_tabs.xsl
    trunk/controller/templates/base/control_group/control_group.xsl
    trunk/controller/templates/base/control_group/control_group_items.xsl
    trunk/controller/templates/base/control_group/control_group_tabs.xsl
    trunk/controller/templates/base/control_group/control_groups.xsl
    trunk/controller/templates/base/control_item/choose_control_items.xsl
    trunk/controller/templates/base/control_item/control_item.xsl
    trunk/controller/templates/base/control_item/control_item_option.xsl
    trunk/controller/templates/base/control_item/sort_check_list.xsl
    
trunk/controller/templates/base/control_location/register_control_to_component.xsl
    
trunk/controller/templates/base/control_location/register_control_to_location.xsl
    
trunk/controller/templates/base/control_location/view_locations_for_control.xsl
    trunk/controller/templates/base/procedure/procedure_item.xsl
    trunk/controller/templates/base/procedure/procedure_tabs.xsl
    trunk/controller/templates/base/view_component_for_control.xsl
    trunk/controller/templates/base/view_component_for_control_group.xsl
    trunk/demo/templates/base/config.tpl
    trunk/email/templates/base/config.tpl
    trunk/emailadmin/templates/base/config.tpl
    trunk/felamimail/templates/base/config.tpl
    trunk/frontend/inc/class.uicontract.inc.php
    trunk/frontend/inc/class.uicontract_documents.inc.php
    trunk/frontend/inc/class.uicontract_internal.inc.php
    trunk/frontend/inc/class.uicontroller.inc.php
    trunk/frontend/inc/class.uidelegates.inc.php
    trunk/frontend/inc/class.uidocumentupload.inc.php
    trunk/frontend/inc/class.uidrawings.inc.php
    trunk/frontend/inc/class.uientity.inc.php
    trunk/frontend/inc/class.uifrontend.inc.php
    trunk/frontend/inc/class.uihelpdesk.inc.php
    trunk/frontend/inc/class.uimaintenance.inc.php
    trunk/frontend/inc/class.uimessages.inc.php
    trunk/frontend/inc/class.uipictures.inc.php
    trunk/frontend/inc/class.uirefurbishment.inc.php
    trunk/frontend/inc/class.uiservices.inc.php
    trunk/frontend/templates/base/attributes_view.xsl
    trunk/frontend/templates/base/base.css
    trunk/frontend/templates/base/config.tpl
    trunk/frontend/templates/base/contract.xsl
    trunk/frontend/templates/base/controller.xsl
    trunk/frontend/templates/base/delegate.xsl
    trunk/frontend/templates/base/document.xsl
    trunk/frontend/templates/base/documentupload.xsl
    trunk/frontend/templates/base/drawings.xsl
    trunk/frontend/templates/base/entity.xsl
    trunk/frontend/templates/base/entityview.xsl
    trunk/frontend/templates/base/frontend.xsl
    trunk/frontend/templates/base/helpdesk.xsl
    trunk/frontend/templates/base/maintenance.xsl
    trunk/frontend/templates/base/messages.xsl
    trunk/frontend/templates/base/pictures.xsl
    trunk/frontend/templates/base/refurbishment.xsl
    trunk/frontend/templates/base/services.xsl
    trunk/frontend/templates/base/ticketview.xsl
    trunk/helpdesk/templates/base/config.tpl
    trunk/hrm/templates/base/config.tpl
    trunk/hrm/templates/base/job.xsl
    trunk/logistic/inc/class.soactivity.inc.php
    trunk/logistic/inc/class.uiactivity.inc.php
    trunk/logistic/inc/class.uiproject.inc.php
    trunk/logistic/inc/class.uirequirement.inc.php
    trunk/logistic/inc/class.uirequirement_resource_allocation.inc.php
    trunk/logistic/inc/class.uiresource_type_requirement.inc.php
    trunk/logistic/js/logistic/activity.js
    trunk/logistic/js/logistic/requirement_overview.js
    trunk/logistic/js/logistic/resource_allocation.js
    trunk/logistic/templates/base/activity/activity_tabs.xsl
    trunk/logistic/templates/base/activity/add_activity_item.xsl
    trunk/logistic/templates/base/activity/view_activity_item.xsl
    trunk/logistic/templates/base/allocation/book_resources.xsl
    trunk/logistic/templates/base/config.tpl
    trunk/logistic/templates/base/css/base.css
    trunk/logistic/templates/base/project/project_item.xsl
    trunk/logistic/templates/base/project/project_type_item.xsl
    trunk/logistic/templates/base/project/resource_type_requirement_item.xsl
    trunk/logistic/templates/base/requirement/requirement_item.xsl
    trunk/logistic/templates/base/requirement/requirement_overview.xsl
    trunk/logistic/templates/base/requirement/requirement_tabs.xsl
    trunk/logistic/templates/base/requirement/requirement_values.xsl
    trunk/manual/inc/class.uidocuments.inc.php
    trunk/manual/js/portico/documents.add.js
    trunk/manual/js/portico/documents.view.js
    trunk/manual/templates/base/config.tpl
    trunk/manual/templates/base/documents_add.xsl
    trunk/manual/templates/base/help.tpl
    trunk/messenger/inc/class.uimessenger.inc.php
    trunk/messenger/templates/base/config.tpl
    trunk/mobilefrontend/templates/base/config.tpl
    trunk/phpgwapi/inc/class.categories.inc.php
    trunk/phpgwapi/inc/class.common.inc.php
    trunk/phpgwapi/inc/class.contacts_sql.inc.php
    trunk/phpgwapi/inc/class.css.inc.php
    trunk/phpgwapi/inc/class.custom_fields.inc.php
    trunk/phpgwapi/inc/class.custom_functions.inc.php
    trunk/phpgwapi/inc/class.db.inc.php
    trunk/phpgwapi/inc/class.db_pdo.inc.php
    trunk/phpgwapi/inc/class.jasper_wrapper.inc.php
    trunk/phpgwapi/inc/class.jqcal.inc.php
    trunk/phpgwapi/inc/class.jquery.inc.php
    trunk/phpgwapi/inc/class.js.inc.php
    trunk/phpgwapi/inc/class.jscal.inc.php
    trunk/phpgwapi/inc/class.menu.inc.php
    trunk/phpgwapi/inc/class.phpgw.inc.php
    trunk/phpgwapi/inc/class.schema_proc.inc.php
    trunk/phpgwapi/inc/class.schema_proc_pgsql.inc.php
    trunk/phpgwapi/inc/class.uicommon.inc.php
    trunk/phpgwapi/inc/class.uicommon_jquery.inc.php
    trunk/phpgwapi/inc/class.vfs_shared.inc.php
    trunk/phpgwapi/inc/class.xslttemplates.inc.php
    trunk/phpgwapi/inc/sso/include_login.inc.php
    trunk/phpgwapi/js/DataTables/Contributing.md
    trunk/phpgwapi/js/DataTables/extensions/AutoFill/examples/index.html
    trunk/phpgwapi/js/DataTables/extensions/AutoFill/js/dataTables.autoFill.js
    
trunk/phpgwapi/js/DataTables/extensions/AutoFill/js/dataTables.autoFill.min.js
    trunk/phpgwapi/js/DataTables/extensions/ColReorder/examples/index.html
    
trunk/phpgwapi/js/DataTables/extensions/ColReorder/js/dataTables.colReorder.js
    
trunk/phpgwapi/js/DataTables/extensions/ColReorder/js/dataTables.colReorder.min.js
    
trunk/phpgwapi/js/DataTables/extensions/ColVis/css/dataTables.colvis.jqueryui.css
    trunk/phpgwapi/js/DataTables/extensions/ColVis/examples/button_order.html
    trunk/phpgwapi/js/DataTables/extensions/ColVis/examples/exclude_columns.html
    trunk/phpgwapi/js/DataTables/extensions/ColVis/examples/group_columns.html
    trunk/phpgwapi/js/DataTables/extensions/ColVis/examples/index.html
    trunk/phpgwapi/js/DataTables/extensions/ColVis/examples/jqueryui.html
    trunk/phpgwapi/js/DataTables/extensions/ColVis/examples/mouseover.html
    trunk/phpgwapi/js/DataTables/extensions/ColVis/examples/new_init.html
    trunk/phpgwapi/js/DataTables/extensions/ColVis/examples/restore.html
    trunk/phpgwapi/js/DataTables/extensions/ColVis/examples/simple.html
    trunk/phpgwapi/js/DataTables/extensions/ColVis/examples/text.html
    trunk/phpgwapi/js/DataTables/extensions/ColVis/examples/title_callback.html
    trunk/phpgwapi/js/DataTables/extensions/ColVis/examples/two_tables.html
    
trunk/phpgwapi/js/DataTables/extensions/ColVis/examples/two_tables_identical.html
    trunk/phpgwapi/js/DataTables/extensions/ColVis/js/dataTables.colVis.js
    trunk/phpgwapi/js/DataTables/extensions/ColVis/js/dataTables.colVis.min.js
    trunk/phpgwapi/js/DataTables/extensions/FixedColumns/examples/index.html
    
trunk/phpgwapi/js/DataTables/extensions/FixedColumns/js/dataTables.fixedColumns.js
    
trunk/phpgwapi/js/DataTables/extensions/FixedColumns/js/dataTables.fixedColumns.min.js
    trunk/phpgwapi/js/DataTables/extensions/FixedHeader/examples/index.html
    
trunk/phpgwapi/js/DataTables/extensions/FixedHeader/js/dataTables.fixedHeader.js
    
trunk/phpgwapi/js/DataTables/extensions/FixedHeader/js/dataTables.fixedHeader.min.js
    trunk/phpgwapi/js/DataTables/extensions/KeyTable/examples/index.html
    trunk/phpgwapi/js/DataTables/extensions/KeyTable/js/dataTables.keyTable.js
    
trunk/phpgwapi/js/DataTables/extensions/KeyTable/js/dataTables.keyTable.min.js
    trunk/phpgwapi/js/DataTables/extensions/Responsive/Readme.md
    
trunk/phpgwapi/js/DataTables/extensions/Responsive/examples/child-rows/column-control.html
    
trunk/phpgwapi/js/DataTables/extensions/Responsive/examples/child-rows/custom-renderer.html
    
trunk/phpgwapi/js/DataTables/extensions/Responsive/examples/child-rows/disable-child-rows.html
    
trunk/phpgwapi/js/DataTables/extensions/Responsive/examples/child-rows/index.html
    
trunk/phpgwapi/js/DataTables/extensions/Responsive/examples/child-rows/right-column.html
    
trunk/phpgwapi/js/DataTables/extensions/Responsive/examples/child-rows/whole-row-control.html
    trunk/phpgwapi/js/DataTables/extensions/Responsive/examples/index.html
    
trunk/phpgwapi/js/DataTables/extensions/Responsive/examples/initialisation/ajax.html
    
trunk/phpgwapi/js/DataTables/extensions/Responsive/examples/initialisation/className.html
    
trunk/phpgwapi/js/DataTables/extensions/Responsive/examples/initialisation/default.html
    
trunk/phpgwapi/js/DataTables/extensions/Responsive/examples/initialisation/index.html
    
trunk/phpgwapi/js/DataTables/extensions/Responsive/examples/initialisation/new.html
    
trunk/phpgwapi/js/DataTables/extensions/Responsive/examples/initialisation/option.html
    
trunk/phpgwapi/js/DataTables/extensions/Responsive/examples/styling/bootstrap.html
    
trunk/phpgwapi/js/DataTables/extensions/Responsive/examples/styling/foundation.html
    
trunk/phpgwapi/js/DataTables/extensions/Responsive/examples/styling/index.html
    
trunk/phpgwapi/js/DataTables/extensions/Responsive/js/dataTables.responsive.js
    
trunk/phpgwapi/js/DataTables/extensions/Responsive/js/dataTables.responsive.min.js
    trunk/phpgwapi/js/DataTables/extensions/Scroller/examples/index.html
    trunk/phpgwapi/js/DataTables/extensions/Scroller/js/dataTables.scroller.js
    
trunk/phpgwapi/js/DataTables/extensions/Scroller/js/dataTables.scroller.min.js
    
trunk/phpgwapi/js/DataTables/extensions/TableTools/css/dataTables.tableTools.css
    
trunk/phpgwapi/js/DataTables/extensions/TableTools/css/dataTables.tableTools.min.css
    trunk/phpgwapi/js/DataTables/extensions/TableTools/examples/ajax.html
    
trunk/phpgwapi/js/DataTables/extensions/TableTools/examples/alter_buttons.html
    trunk/phpgwapi/js/DataTables/extensions/TableTools/examples/bootstrap.html
    trunk/phpgwapi/js/DataTables/extensions/TableTools/examples/button_text.html
    trunk/phpgwapi/js/DataTables/extensions/TableTools/examples/collection.html
    trunk/phpgwapi/js/DataTables/extensions/TableTools/examples/defaults.html
    trunk/phpgwapi/js/DataTables/extensions/TableTools/examples/index.html
    trunk/phpgwapi/js/DataTables/extensions/TableTools/examples/jqueryui.html
    
trunk/phpgwapi/js/DataTables/extensions/TableTools/examples/multi_instance.html
    
trunk/phpgwapi/js/DataTables/extensions/TableTools/examples/multiple_tables.html
    trunk/phpgwapi/js/DataTables/extensions/TableTools/examples/new_init.html
    trunk/phpgwapi/js/DataTables/extensions/TableTools/examples/pdf_message.html
    trunk/phpgwapi/js/DataTables/extensions/TableTools/examples/plug-in.html
    
trunk/phpgwapi/js/DataTables/extensions/TableTools/examples/select_column.html
    
trunk/phpgwapi/js/DataTables/extensions/TableTools/examples/select_multi.html
    trunk/phpgwapi/js/DataTables/extensions/TableTools/examples/select_os.html
    
trunk/phpgwapi/js/DataTables/extensions/TableTools/examples/select_single.html
    trunk/phpgwapi/js/DataTables/extensions/TableTools/examples/simple.html
    trunk/phpgwapi/js/DataTables/extensions/TableTools/examples/swf_path.html
    
trunk/phpgwapi/js/DataTables/extensions/TableTools/js/dataTables.tableTools.js
    
trunk/phpgwapi/js/DataTables/extensions/TableTools/js/dataTables.tableTools.min.js
    trunk/phpgwapi/js/DataTables/extensions/TableTools/swf/copy_csv_xls.swf
    trunk/phpgwapi/js/DataTables/extensions/TableTools/swf/copy_csv_xls_pdf.swf
    trunk/phpgwapi/js/DataTables/license.txt
    trunk/phpgwapi/js/DataTables/media/css/jquery.dataTables.css
    trunk/phpgwapi/js/DataTables/media/css/jquery.dataTables.min.css
    trunk/phpgwapi/js/DataTables/media/css/jquery.dataTables_themeroller.css
    trunk/phpgwapi/js/DataTables/media/js/jquery.dataTables.js
    trunk/phpgwapi/js/DataTables/media/js/jquery.dataTables.min.js
    trunk/phpgwapi/js/DataTables/media/js/jquery.js
    trunk/phpgwapi/js/ckeditor/adapters/jquery.js
    trunk/phpgwapi/js/ckeditor/ckeditor.js
    trunk/phpgwapi/js/ckeditor/config.js
    trunk/phpgwapi/js/ckeditor/contents.css
    trunk/phpgwapi/js/ckeditor/lang/af.js
    trunk/phpgwapi/js/ckeditor/lang/ar.js
    trunk/phpgwapi/js/ckeditor/lang/bg.js
    trunk/phpgwapi/js/ckeditor/lang/bn.js
    trunk/phpgwapi/js/ckeditor/lang/bs.js
    trunk/phpgwapi/js/ckeditor/lang/ca.js
    trunk/phpgwapi/js/ckeditor/lang/cs.js
    trunk/phpgwapi/js/ckeditor/lang/cy.js
    trunk/phpgwapi/js/ckeditor/lang/da.js
    trunk/phpgwapi/js/ckeditor/lang/de.js
    trunk/phpgwapi/js/ckeditor/lang/el.js
    trunk/phpgwapi/js/ckeditor/lang/en-au.js
    trunk/phpgwapi/js/ckeditor/lang/en-ca.js
    trunk/phpgwapi/js/ckeditor/lang/en-gb.js
    trunk/phpgwapi/js/ckeditor/lang/en.js
    trunk/phpgwapi/js/ckeditor/lang/eo.js
    trunk/phpgwapi/js/ckeditor/lang/es.js
    trunk/phpgwapi/js/ckeditor/lang/et.js
    trunk/phpgwapi/js/ckeditor/lang/eu.js
    trunk/phpgwapi/js/ckeditor/lang/fa.js
    trunk/phpgwapi/js/ckeditor/lang/fi.js
    trunk/phpgwapi/js/ckeditor/lang/fo.js
    trunk/phpgwapi/js/ckeditor/lang/fr-ca.js
    trunk/phpgwapi/js/ckeditor/lang/fr.js
    trunk/phpgwapi/js/ckeditor/lang/gl.js
    trunk/phpgwapi/js/ckeditor/lang/gu.js
    trunk/phpgwapi/js/ckeditor/lang/he.js
    trunk/phpgwapi/js/ckeditor/lang/hi.js
    trunk/phpgwapi/js/ckeditor/lang/hr.js
    trunk/phpgwapi/js/ckeditor/lang/hu.js
    trunk/phpgwapi/js/ckeditor/lang/is.js
    trunk/phpgwapi/js/ckeditor/lang/it.js
    trunk/phpgwapi/js/ckeditor/lang/ja.js
    trunk/phpgwapi/js/ckeditor/lang/km.js
    trunk/phpgwapi/js/ckeditor/lang/ko.js
    trunk/phpgwapi/js/ckeditor/lang/lt.js
    trunk/phpgwapi/js/ckeditor/lang/lv.js
    trunk/phpgwapi/js/ckeditor/lang/mn.js
    trunk/phpgwapi/js/ckeditor/lang/ms.js
    trunk/phpgwapi/js/ckeditor/lang/nb.js
    trunk/phpgwapi/js/ckeditor/lang/nl.js
    trunk/phpgwapi/js/ckeditor/lang/no.js
    trunk/phpgwapi/js/ckeditor/lang/pl.js
    trunk/phpgwapi/js/ckeditor/lang/pt-br.js
    trunk/phpgwapi/js/ckeditor/lang/pt.js
    trunk/phpgwapi/js/ckeditor/lang/ro.js
    trunk/phpgwapi/js/ckeditor/lang/ru.js
    trunk/phpgwapi/js/ckeditor/lang/sk.js
    trunk/phpgwapi/js/ckeditor/lang/sl.js
    trunk/phpgwapi/js/ckeditor/lang/sr-latn.js
    trunk/phpgwapi/js/ckeditor/lang/sr.js
    trunk/phpgwapi/js/ckeditor/lang/sv.js
    trunk/phpgwapi/js/ckeditor/lang/th.js
    trunk/phpgwapi/js/ckeditor/lang/tr.js
    trunk/phpgwapi/js/ckeditor/lang/uk.js
    trunk/phpgwapi/js/ckeditor/lang/vi.js
    trunk/phpgwapi/js/ckeditor/lang/zh-cn.js
    trunk/phpgwapi/js/ckeditor/lang/zh.js
    trunk/phpgwapi/js/ckeditor/plugins/a11yhelp/dialogs/a11yhelp.js
    trunk/phpgwapi/js/ckeditor/plugins/about/dialogs/about.js
    trunk/phpgwapi/js/ckeditor/plugins/about/dialogs/logo_ckeditor.png
    trunk/phpgwapi/js/ckeditor/plugins/clipboard/dialogs/paste.js
    trunk/phpgwapi/js/ckeditor/plugins/dialog/dialogDefinition.js
    trunk/phpgwapi/js/ckeditor/plugins/image/dialogs/image.js
    trunk/phpgwapi/js/ckeditor/plugins/link/dialogs/anchor.js
    trunk/phpgwapi/js/ckeditor/plugins/link/dialogs/link.js
    trunk/phpgwapi/js/ckeditor/plugins/pastefromword/filter/default.js
    trunk/phpgwapi/js/ckeditor/plugins/scayt/dialogs/options.js
    trunk/phpgwapi/js/ckeditor/plugins/scayt/dialogs/toolbar.css
    trunk/phpgwapi/js/ckeditor/plugins/specialchar/dialogs/specialchar.js
    trunk/phpgwapi/js/ckeditor/plugins/table/dialogs/table.js
    trunk/phpgwapi/js/ckeditor/plugins/tabletools/dialogs/tableCell.js
    trunk/phpgwapi/js/ckeditor/plugins/wsc/dialogs/ciframe.html
    trunk/phpgwapi/js/ckeditor/plugins/wsc/dialogs/tmpFrameset.html
    trunk/phpgwapi/js/ckeditor/plugins/wsc/dialogs/wsc.css
    trunk/phpgwapi/js/ckeditor/plugins/wsc/dialogs/wsc.js
    trunk/phpgwapi/js/form-validator/README.md
    trunk/phpgwapi/js/form-validator/date.dev.js
    trunk/phpgwapi/js/form-validator/date.js
    trunk/phpgwapi/js/form-validator/file.dev.js
    trunk/phpgwapi/js/form-validator/file.js
    trunk/phpgwapi/js/form-validator/html5.dev.js
    trunk/phpgwapi/js/form-validator/html5.js
    trunk/phpgwapi/js/form-validator/jquery.form-validator.js
    trunk/phpgwapi/js/form-validator/jquery.form-validator.min.js
    trunk/phpgwapi/js/form-validator/jsconf.dev.js
    trunk/phpgwapi/js/form-validator/jsconf.js
    trunk/phpgwapi/js/form-validator/location.dev.js
    trunk/phpgwapi/js/form-validator/location.js
    trunk/phpgwapi/js/form-validator/security.dev.js
    trunk/phpgwapi/js/form-validator/security.js
    trunk/phpgwapi/js/form-validator/sweden.dev.js
    trunk/phpgwapi/js/form-validator/sweden.js
    trunk/phpgwapi/js/form-validator/uk.dev.js
    trunk/phpgwapi/js/form-validator/uk.js
    trunk/phpgwapi/js/jquery/common.js
    trunk/phpgwapi/js/jquery/css/ui-lightness/jquery-ui-1.10.4.custom.css
    trunk/phpgwapi/js/jquery/css/ui-lightness/jquery-ui-1.8.19.custom.css
    trunk/phpgwapi/js/jquery/tabs/css/style.css
    trunk/phpgwapi/js/jquery/tabs/jquery.responsiveTabs.js
    trunk/phpgwapi/js/jquery/tabs/jquery.responsiveTabs.min.js
    trunk/phpgwapi/js/jquery/treeview/jstree.js
    trunk/phpgwapi/js/jquery/treeview/jstree.min.js
    trunk/phpgwapi/js/jquery/treeview/themes/default/style.css
    trunk/phpgwapi/js/jquery/treeview/themes/default/style.min.css
    trunk/phpgwapi/js/jquery/treeview/themes/default-dark/style.css
    trunk/phpgwapi/js/jquery/treeview/themes/default-dark/style.min.css
    trunk/phpgwapi/js/jquery/validator/date.js
    trunk/phpgwapi/js/jquery/validator/file.js
    trunk/phpgwapi/js/jquery/validator/html5.js
    trunk/phpgwapi/js/jquery/validator/jquery.form-validator.min.js
    trunk/phpgwapi/js/jquery/validator/location.js
    trunk/phpgwapi/js/jquery/validator/security.js
    trunk/phpgwapi/js/jquery/validator/sweden.js
    trunk/phpgwapi/js/jquery/validator/uk.js
    trunk/phpgwapi/js/layout/jquery.layout.js
    trunk/phpgwapi/js/layout/jquery.layout.min.js
    trunk/phpgwapi/setup/phpgw_en.lang
    trunk/phpgwapi/setup/phpgw_no.lang
    trunk/phpgwapi/setup/setup.inc.php
    trunk/phpgwapi/templates/activitycalendar/footer.tpl
    trunk/phpgwapi/templates/activitycalendar/head.inc.php
    trunk/phpgwapi/templates/activitycalendar/navbar.inc.php
    trunk/phpgwapi/templates/base/attributes_form.xsl
    trunk/phpgwapi/templates/base/attributes_view.xsl
    trunk/phpgwapi/templates/base/categories.xsl
    trunk/phpgwapi/templates/base/config.tpl
    trunk/phpgwapi/templates/base/css/base.css
    trunk/phpgwapi/templates/base/css/tabs.css
    trunk/phpgwapi/templates/base/datatable_inline.xsl
    trunk/phpgwapi/templates/base/datatable_jquery.xsl
    trunk/phpgwapi/templates/bkbooking/css/frontend.css
    trunk/phpgwapi/templates/bkbooking/footer.tpl
    trunk/phpgwapi/templates/bkbooking/head.inc.php
    trunk/phpgwapi/templates/bkbooking/navbar.inc.php
    trunk/phpgwapi/templates/idots/footer.tpl
    trunk/phpgwapi/templates/idots/head.inc.php
    trunk/phpgwapi/templates/idsociety/footer.tpl
    trunk/phpgwapi/templates/idsociety/head.inc.php
    trunk/phpgwapi/templates/linux-at-work.de/footer.tpl
    trunk/phpgwapi/templates/mobilefrontend/footer.tpl
    trunk/phpgwapi/templates/mobilefrontend/head.inc.php
    trunk/phpgwapi/templates/mobilefrontend/navbar.inc.php
    trunk/phpgwapi/templates/portico/css/base.css
    trunk/phpgwapi/templates/portico/footer.tpl
    trunk/phpgwapi/templates/portico/head.inc.php
    trunk/phpgwapi/templates/portico/head.tpl
    trunk/phpgwapi/templates/portico/js/base.js
    trunk/phpgwapi/templates/portico/navbar.inc.php
    trunk/phpgwapi/templates/portico/navbar.tpl
    trunk/phpgwapi/templates/probusiness/css/styles.css
    trunk/phpgwapi/templates/probusiness/footer.tpl
    trunk/phpgwapi/templates/probusiness/head.inc.php
    trunk/phpgwapi/templates/pure/css/side-menu.css
    trunk/phpgwapi/templates/pure/footer.tpl
    trunk/phpgwapi/templates/pure/head.inc.php
    trunk/phpgwapi/templates/pure/head.tpl
    trunk/phpgwapi/templates/pure/navbar.inc.php
    trunk/phpgwapi/templates/pure/navbar.tpl
    trunk/phpgwapi/templates/simple/footer.tpl
    trunk/phpgwapi/templates/simple/head.inc.php
    trunk/phpgwapi/templates/verdilak/footer.tpl
    trunk/phpgwapi/templates/verdilak/head.inc.php
    trunk/preferences/inc/class.boadmin_acl.inc.php
    trunk/preferences/index.php
    trunk/preferences/preferences.php
    trunk/preferences/templates/base/admin_acl.xsl
    trunk/preferences/templates/base/index.tpl
    trunk/preferences/templates/base/preferences.tpl
    trunk/property/help/EN/agreements.php
    trunk/property/help/EN/document.php
    trunk/property/help/EN/entities.php
    trunk/property/help/EN/helpdesk.php
    trunk/property/help/EN/invoice.php
    trunk/property/help/EN/location.php
    trunk/property/help/EN/overview.php
    trunk/property/help/EN/project.php
    trunk/property/help/EN/property.php
    trunk/property/help/EN/requirement.php
    trunk/property/help/index.php
    trunk/property/inc/class.XmlToArray.inc.php
    trunk/property/inc/class.boXport.inc.php
    trunk/property/inc/class.boadmin.inc.php
    trunk/property/inc/class.boadmin_entity.inc.php
    trunk/property/inc/class.boadmin_location.inc.php
    trunk/property/inc/class.boagreement.inc.php
    trunk/property/inc/class.boalarm.inc.php
    trunk/property/inc/class.boasync.inc.php
    trunk/property/inc/class.bobudget.inc.php
    trunk/property/inc/class.bocommon.inc.php
    trunk/property/inc/class.bocondition_survey.inc.php
    trunk/property/inc/class.bocustom.inc.php
    trunk/property/inc/class.bodimb_role_user.inc.php
    trunk/property/inc/class.bodocument.inc.php
    trunk/property/inc/class.boentity.inc.php
    trunk/property/inc/class.boevent.inc.php
    trunk/property/inc/class.bofiles.inc.php
    trunk/property/inc/class.bogab.inc.php
    trunk/property/inc/class.bogallery.inc.php
    trunk/property/inc/class.bogeneric.inc.php
    trunk/property/inc/class.boifc.inc.php
    trunk/property/inc/class.boinvestment.inc.php
    trunk/property/inc/class.boinvoice.inc.php
    trunk/property/inc/class.bojasper.inc.php
    trunk/property/inc/class.bolocation.inc.php
    trunk/property/inc/class.bolookup.inc.php
    trunk/property/inc/class.bomigrate.inc.php
    trunk/property/inc/class.bopricebook.inc.php
    trunk/property/inc/class.boproject.inc.php
    trunk/property/inc/class.borequest.inc.php
    trunk/property/inc/class.boresponsible.inc.php
    trunk/property/inc/class.bos_agreement.inc.php
    trunk/property/inc/class.botemplate.inc.php
    trunk/property/inc/class.botenant_claim.inc.php
    trunk/property/inc/class.botts.inc.php
    trunk/property/inc/class.bowo_hour.inc.php
    trunk/property/inc/class.boworkorder.inc.php
    trunk/property/inc/class.cat_hooks.inc.php
    trunk/property/inc/class.custom_fields.inc.php
    trunk/property/inc/class.custom_functions.inc.php
    trunk/property/inc/class.db_mssql.inc.php
    trunk/property/inc/class.db_oci8.inc.php
    trunk/property/inc/class.fileuploader.inc.php
    trunk/property/inc/class.historylog.inc.php
    trunk/property/inc/class.hook_helper.inc.php
    trunk/property/inc/class.import.inc.php
    trunk/property/inc/class.interlink.inc.php
    trunk/property/inc/class.menu.inc.php
    trunk/property/inc/class.notify.inc.php
    trunk/property/inc/class.ods.inc.php
    trunk/property/inc/class.soXport.inc.php
    trunk/property/inc/class.soadmin.inc.php
    trunk/property/inc/class.soadmin_entity.inc.php
    trunk/property/inc/class.soadmin_location.inc.php
    trunk/property/inc/class.soagreement.inc.php
    trunk/property/inc/class.soalarm.inc.php
    trunk/property/inc/class.soasync.inc.php
    trunk/property/inc/class.sobudget.inc.php
    trunk/property/inc/class.socommon.inc.php
    trunk/property/inc/class.socommon_core.inc.php
    trunk/property/inc/class.socondition_survey.inc.php
    trunk/property/inc/class.socustom.inc.php
    trunk/property/inc/class.sodimb_role_user.inc.php
    trunk/property/inc/class.sodocument.inc.php
    trunk/property/inc/class.soentity.inc.php
    trunk/property/inc/class.soevent.inc.php
    trunk/property/inc/class.soexportentity.inc.php
    trunk/property/inc/class.sogab.inc.php
    trunk/property/inc/class.sogallery.inc.php
    trunk/property/inc/class.sogeneric.inc.php
    trunk/property/inc/class.soinvestment.inc.php
    trunk/property/inc/class.soinvoice.inc.php
    trunk/property/inc/class.sojasper.inc.php
    trunk/property/inc/class.solocation.inc.php
    trunk/property/inc/class.solookup.inc.php
    trunk/property/inc/class.sopending_action.inc.php
    trunk/property/inc/class.sopricebook.inc.php
    trunk/property/inc/class.soproject.inc.php
    trunk/property/inc/class.sorequest.inc.php
    trunk/property/inc/class.soresponsible.inc.php
    trunk/property/inc/class.sos_agreement.inc.php
    trunk/property/inc/class.sotemplate.inc.php
    trunk/property/inc/class.sotenant_claim.inc.php
    trunk/property/inc/class.sotts.inc.php
    trunk/property/inc/class.sowo_hour.inc.php
    trunk/property/inc/class.soworkorder.inc.php
    trunk/property/inc/class.test.inc.php
    trunk/property/inc/class.uiXport.inc.php
    trunk/property/inc/class.uiadmin.inc.php
    trunk/property/inc/class.uiadmin_entity.inc.php
    trunk/property/inc/class.uiadmin_location.inc.php
    trunk/property/inc/class.uiagreement.inc.php
    trunk/property/inc/class.uialarm.inc.php
    trunk/property/inc/class.uiasync.inc.php
    trunk/property/inc/class.uibudget.inc.php
    trunk/property/inc/class.uicondition_survey.inc.php
    trunk/property/inc/class.uicustom.inc.php
    trunk/property/inc/class.uidebug_json.inc.php
    trunk/property/inc/class.uidimb_role_user.inc.php
    trunk/property/inc/class.uidocument.inc.php
    trunk/property/inc/class.uidocument2.inc.php
    trunk/property/inc/class.uientity.inc.php
    trunk/property/inc/class.uievent.inc.php
    trunk/property/inc/class.uigab.inc.php
    trunk/property/inc/class.uigallery.inc.php
    trunk/property/inc/class.uigeneric.inc.php
    trunk/property/inc/class.uiifc.inc.php
    trunk/property/inc/class.uiimport.inc.php
    trunk/property/inc/class.uiinvestment.inc.php
    trunk/property/inc/class.uiinvoice.inc.php
    trunk/property/inc/class.uiinvoice2.inc.php
    trunk/property/inc/class.uijasper.inc.php
    trunk/property/inc/class.uilocation.inc.php
    trunk/property/inc/class.uilookup.inc.php
    trunk/property/inc/class.uimigrate.inc.php
    trunk/property/inc/class.uipricebook.inc.php
    trunk/property/inc/class.uiproject.inc.php
    trunk/property/inc/class.uirequest.inc.php
    trunk/property/inc/class.uiresponsible.inc.php
    trunk/property/inc/class.uis_agreement.inc.php
    trunk/property/inc/class.uitemplate.inc.php
    trunk/property/inc/class.uitenant_claim.inc.php
    trunk/property/inc/class.uitts.inc.php
    trunk/property/inc/class.uiwo_hour.inc.php
    trunk/property/inc/class.uiworkorder.inc.php
    trunk/property/inc/cron/class.cron_parent.inc.php
    trunk/property/inc/cron/cron.php
    trunk/property/inc/cron/default/Import_fra_agresso_X205.php
    trunk/property/inc/cron/default/catch_ppc.php
    trunk/property/inc/cron/default/forward_mail_as_sms.php
    trunk/property/inc/cron/default/import_from_scanner.php
    
trunk/property/inc/cron/default/import_oppdatering_av_bestilling_fra_agresso_bkb.php
    trunk/property/inc/cron/default/lag_lang_filer.php
    trunk/property/inc/cron/default/oppdater_antall_leieobjekt.php
    trunk/property/inc/cron/default/oppdater_utgaatt_objekt.php
    trunk/property/inc/cron/default/organize_drawing.php
    trunk/property/inc/cron/default/organize_energy_pdf_bbb.php
    trunk/property/inc/cron/default/reset_workorder_cached_budget.php
    trunk/property/inc/cron/default/synkroniser_avdelinger_med_fellesdata.php
    trunk/property/inc/cron/default/synkroniser_med_boei.php
    trunk/property/inc/cron/default/update_googlemap.php
    trunk/property/inc/cron/default/update_phpgw.php
    trunk/property/inc/cron/default/update_workorder_status.php
    trunk/property/inc/custom/default/BkBygg_editer_system_oversikt.js
    trunk/property/inc/custom/default/BkBygg_editer_system_oversikt.php
    trunk/property/inc/custom/default/EBF_update_ticket_on_project_change.php
    trunk/property/inc/custom/default/LRS_oppdater_el_anlegg.php
    trunk/property/inc/custom/default/catch_ticket_export.php
    trunk/property/inc/custom/default/estimert_ferdigdato_til_leieobjekt_BBB.php
    trunk/property/inc/custom/default/hent_maaler_nr_til_besikt_rapport.php
    trunk/property/inc/custom/default/innflyttetdato_entity_2_11_BBB.php
    trunk/property/inc/custom/default/kalkuler_risiko_for_ros.php
    trunk/property/inc/custom/default/ticket_NLSH_pre_commit_validate.php
    trunk/property/inc/custom/default/ticket_NLSH_validate.js
    trunk/property/inc/custom/default/ticket_redirect_based_on_status.php
    
trunk/property/inc/custom/default/varsle_prosjektoordinator_ved_avsluttet_relatert_melding_BBB.php
    trunk/property/inc/export/default/Agresso_Bergen_Kostfordeling
    trunk/property/inc/export/default/Agresso_X114
    trunk/property/inc/export/default/El_anlegg_LRS
    trunk/property/inc/hook_config.inc.php
    trunk/property/inc/hook_help.inc.php
    trunk/property/inc/hook_manual.inc.php
    trunk/property/inc/hook_settings.inc.php
    trunk/property/inc/hook_sidebox_menu.inc.php
    trunk/property/inc/import/default/Import_fra_Service_EBF
    trunk/property/inc/import/default/cvs_import_fiktiv_faktura_nlsh
    trunk/property/inc/import/default/cvs_import_kunstoversikt_bilde_bkb
    trunk/property/inc/import/default/cvs_import_kunstoversikt_bkb
    trunk/property/inc/import/default/cvs_import_romdata_bkb
    trunk/property/inc/import/import_update_generic.php
    trunk/property/inc/ods/ods.php
    trunk/property/inc/soap_client/bra5/soap.php
    trunk/property/inc/soap_client/braarkiv/services.php
    trunk/property/inc/soap_client/braarkiv/soap.php
    trunk/property/index.php
    trunk/property/js/core/check.js
    trunk/property/js/dateformat/dateformat.js
    trunk/property/js/jquery/gallery.index.js
    trunk/property/js/jquery/jquery.colorbox.js
    trunk/property/js/jquery/jquery.min.js
    trunk/property/js/overlib/overlib.js
    trunk/property/js/portico/ajax_dimb_role_user.js
    trunk/property/js/portico/ajax_invoice.js
    trunk/property/js/portico/ajax_project_edit.js
    trunk/property/js/portico/ajax_workorder_edit.js
    trunk/property/js/portico/condition_survey.js
    trunk/property/js/portico/condition_survey_edit.js
    trunk/property/login.php
    trunk/property/setup/default_records.inc.php
    trunk/property/setup/phpgw_no.lang
    trunk/property/setup/setup.inc.php
    trunk/property/setup/tables_current.inc.php
    trunk/property/setup/tables_update.inc.php
    trunk/property/templates/base/abook_form.xsl
    trunk/property/templates/base/abook_view.xsl
    trunk/property/templates/base/admin.xsl
    trunk/property/templates/base/admin_entity.xsl
    trunk/property/templates/base/admin_location.xsl
    trunk/property/templates/base/agreement.xsl
    trunk/property/templates/base/alarm.xsl
    trunk/property/templates/base/alarm_form.xsl
    trunk/property/templates/base/alarm_view.xsl
    trunk/property/templates/base/app_data.xsl
    trunk/property/templates/base/app_delete.xsl
    trunk/property/templates/base/async.xsl
    trunk/property/templates/base/attrib_history.xsl
    trunk/property/templates/base/attributes_form.xsl
    trunk/property/templates/base/attributes_view.xsl
    trunk/property/templates/base/b_account_form.xsl
    trunk/property/templates/base/b_account_view.xsl
    trunk/property/templates/base/branch_select.xsl
    trunk/property/templates/base/budget.xsl
    trunk/property/templates/base/building_part_select.xsl
    trunk/property/templates/base/calendar_info.xsl
    trunk/property/templates/base/cat_filter.xsl
    trunk/property/templates/base/cat_select.xsl
    trunk/property/templates/base/cat_sub_select.xsl
    trunk/property/templates/base/chapter_filter.xsl
    trunk/property/templates/base/chapter_select.xsl
    trunk/property/templates/base/choice.xsl
    trunk/property/templates/base/columns.xsl
    trunk/property/templates/base/condition_survey.xsl
    trunk/property/templates/base/condition_survey_import.xsl
    trunk/property/templates/base/condition_survey_summation.xsl
    trunk/property/templates/base/config.tpl
    trunk/property/templates/base/confirm_custom.xsl
    trunk/property/templates/base/contact_form.xsl
    trunk/property/templates/base/contact_view.xsl
    trunk/property/templates/base/css/base.css
    trunk/property/templates/base/css/login.css
    trunk/property/templates/base/css/property.css
    trunk/property/templates/base/custom.xsl
    trunk/property/templates/base/date_search.xsl
    trunk/property/templates/base/dim_d_select.xsl
    trunk/property/templates/base/dimb_role_user.xsl
    trunk/property/templates/base/document.xsl
    trunk/property/templates/base/ecodimb_form.xsl
    trunk/property/templates/base/ecodimb_view.xsl
    trunk/property/templates/base/entity.xsl
    trunk/property/templates/base/event.xsl
    trunk/property/templates/base/event_form.xsl
    trunk/property/templates/base/event_view.xsl
    trunk/property/templates/base/files.xsl
    trunk/property/templates/base/fileuploader.xsl
    trunk/property/templates/base/filter_district.xsl
    trunk/property/templates/base/filter_filter.xsl
    trunk/property/templates/base/filter_location.xsl
    trunk/property/templates/base/filter_member_of.xsl
    trunk/property/templates/base/filter_part_of_town.xsl
    trunk/property/templates/base/filter_permission.xsl
    trunk/property/templates/base/filter_select.xsl
    trunk/property/templates/base/filter_submodule.xsl
    trunk/property/templates/base/filter_vendor.xsl
    trunk/property/templates/base/gab.xsl
    trunk/property/templates/base/generic.xsl
    trunk/property/templates/base/group_filter.xsl
    trunk/property/templates/base/group_select.xsl
    trunk/property/templates/base/grouping_select.xsl
    trunk/property/templates/base/help_data.xsl
    trunk/property/templates/base/hour_data_view.xsl
    trunk/property/templates/base/ifc.xsl
    trunk/property/templates/base/import.xsl
    trunk/property/templates/base/investment.xsl
    trunk/property/templates/base/invoice.xsl
    trunk/property/templates/base/invoice2.xsl
    trunk/property/templates/base/invoice_reporting.xsl
    trunk/property/templates/base/jasper.xsl
    trunk/property/templates/base/location.xsl
    trunk/property/templates/base/location_form.xsl
    trunk/property/templates/base/location_form2.xsl
    trunk/property/templates/base/location_view.xsl
    trunk/property/templates/base/location_view2.xsl
    trunk/property/templates/base/login.tpl
    trunk/property/templates/base/menu.xsl
    trunk/property/templates/base/migrate.xsl
    trunk/property/templates/base/nextmatchs.xsl
    trunk/property/templates/base/no_access.xsl
    trunk/property/templates/base/owner_filter.xsl
    trunk/property/templates/base/owner_select.xsl
    trunk/property/templates/base/preference_acl.tpl
    trunk/property/templates/base/preference_acl_row.tpl
    trunk/property/templates/base/pricebook.xsl
    trunk/property/templates/base/project.xsl
    trunk/property/templates/base/project_group_form.xsl
    trunk/property/templates/base/project_group_view.xsl
    trunk/property/templates/base/receipt.xsl
    trunk/property/templates/base/request.xsl
    trunk/property/templates/base/responsible.xsl
    trunk/property/templates/base/s_agreement.xsl
    trunk/property/templates/base/search_field.xsl
    trunk/property/templates/base/search_field_grouped.xsl
    trunk/property/templates/base/select_district.xsl
    trunk/property/templates/base/select_location.xsl
    trunk/property/templates/base/select_multi_user.xsl
    trunk/property/templates/base/select_part_of_town.xsl
    trunk/property/templates/base/select_permission.xsl
    trunk/property/templates/base/select_submodule.xsl
    trunk/property/templates/base/select_vendor.xsl
    trunk/property/templates/base/status_filter.xsl
    trunk/property/templates/base/status_select.xsl
    trunk/property/templates/base/table_header.xsl
    trunk/property/templates/base/template.xsl
    trunk/property/templates/base/tenant_claim.xsl
    trunk/property/templates/base/tenant_form.xsl
    trunk/property/templates/base/tenant_view.xsl
    trunk/property/templates/base/tolerance_select.xsl
    trunk/property/templates/base/tts.xsl
    trunk/property/templates/base/unit_select.xsl
    trunk/property/templates/base/user_id_filter.xsl
    trunk/property/templates/base/user_id_select.xsl
    trunk/property/templates/base/user_lid_filter.xsl
    trunk/property/templates/base/user_lid_select.xsl
    trunk/property/templates/base/values.xsl
    trunk/property/templates/base/vendor_form.xsl
    trunk/property/templates/base/vendor_view.xsl
    trunk/property/templates/base/wo_hour.xsl
    trunk/property/templates/base/wo_hour_cat_filter.xsl
    trunk/property/templates/base/wo_hour_cat_select.xsl
    trunk/property/templates/base/workorder.xsl
    trunk/property/templates/default/preference_acl.tpl
    trunk/property/templates/default/preference_acl_row.tpl
    trunk/property/templates/verdilak/app_data.xsl
    trunk/property/test_wiki.php
    trunk/registration/inc/class.bopending.inc.php
    trunk/registration/inc/class.boreg.inc.php
    trunk/registration/inc/class.sopending.inc.php
    trunk/registration/inc/class.uipending.inc.php
    trunk/registration/inc/class.uireg.inc.php
    trunk/registration/templates/base/config.tpl
    trunk/registration/templates/base/layout.tpl
    trunk/registration/templates/base/loginid_select.tpl
    trunk/registration/templates/base/user_edit.xsl
    trunk/rental/inc/SnappyMedia.php
    trunk/rental/inc/SnappyPdf.php
    trunk/rental/inc/class.bofellesdata.inc.php
    trunk/rental/inc/class.hook_helper.inc.php
    trunk/rental/inc/class.menu.inc.php
    trunk/rental/inc/class.soadjustment.inc.php
    trunk/rental/inc/class.sobilling.inc.php
    trunk/rental/inc/class.sobilling_info.inc.php
    trunk/rental/inc/class.socommon.inc.php
    trunk/rental/inc/class.socomposite.inc.php
    trunk/rental/inc/class.socontract.inc.php
    trunk/rental/inc/class.sodocument.inc.php
    trunk/rental/inc/class.soinvoice.inc.php
    trunk/rental/inc/class.soinvoice_price_item.inc.php
    trunk/rental/inc/class.sonotification.inc.php
    trunk/rental/inc/class.soparty.inc.php
    trunk/rental/inc/class.soprice_item.inc.php
    trunk/rental/inc/class.sounit.inc.php
    trunk/rental/inc/class.soworkbench_notification.inc.php
    trunk/rental/inc/class.uiadjustment.inc.php
    trunk/rental/inc/class.uibilling.inc.php
    trunk/rental/inc/class.uicommon.inc.php
    trunk/rental/inc/class.uicomposite.inc.php
    trunk/rental/inc/class.uicontract.inc.php
    trunk/rental/inc/class.uidelegate.inc.php
    trunk/rental/inc/class.uidocument.inc.php
    trunk/rental/inc/class.uifrontpage.inc.php
    trunk/rental/inc/class.uiimport.inc.php
    trunk/rental/inc/class.uiinvoice_price_item.inc.php
    trunk/rental/inc/class.uimakepdf.inc.php
    trunk/rental/inc/class.uinotification.inc.php
    trunk/rental/inc/class.uiparty.inc.php
    trunk/rental/inc/class.uiprice_item.inc.php
    trunk/rental/inc/class.uiproperty_location.inc.php
    trunk/rental/inc/class.uiresultunit.inc.php
    trunk/rental/inc/class.uiunit.inc.php
    trunk/rental/inc/custom/default/NLSH_add_contract_from_composite.php
    trunk/rental/inc/export/default/customer.php
    trunk/rental/inc/export/nordlandssykehuset/customer.php
    trunk/rental/inc/hook_config.inc.php
    trunk/rental/inc/hook_settings.inc.php
    trunk/rental/inc/locations/class.city_counsil_dep.inc.php
    trunk/rental/inc/locations/class.location_hierarchy.inc.php
    trunk/rental/inc/locations/class.organisational_location.inc.php
    trunk/rental/inc/locations/class.result_unit.inc.php
    trunk/rental/inc/model/class.adjustment.inc.php
    trunk/rental/inc/model/class.agresso_cs15.inc.php
    trunk/rental/inc/model/class.agresso_gl07.inc.php
    trunk/rental/inc/model/class.agresso_lg04.inc.php
    trunk/rental/inc/model/class.billing.inc.php
    trunk/rental/inc/model/class.billing_info.inc.php
    trunk/rental/inc/model/class.composite.inc.php
    trunk/rental/inc/model/class.contract.inc.php
    trunk/rental/inc/model/class.contract_date.inc.php
    trunk/rental/inc/model/class.contract_price_item.inc.php
    trunk/rental/inc/model/class.default_export.inc.php
    trunk/rental/inc/model/class.document.inc.php
    trunk/rental/inc/model/class.exportable.inc.php
    trunk/rental/inc/model/class.invoice.inc.php
    trunk/rental/inc/model/class.invoice_price_item.inc.php
    trunk/rental/inc/model/class.model.inc.php
    trunk/rental/inc/model/class.notification.inc.php
    trunk/rental/inc/model/class.party.inc.php
    trunk/rental/inc/model/class.price_item.inc.php
    trunk/rental/inc/model/class.property_location.inc.php
    trunk/rental/inc/model/class.unit.inc.php
    trunk/rental/inc/model/class.validator.inc.php
    trunk/rental/inc/plugins/fellesdata/party.edit.php
    trunk/rental/index.php
    trunk/rental/js/rental/contract.edit.js
    trunk/rental/setup/DEV_NLSH/phpgw_no.lang
    trunk/rental/templates/base/config.tpl
    trunk/rental/templates/base/css/base.css
    trunk/sms/templates/base/config.tpl

Added Paths:
-----------
    trunk/activitycalendar/js/activitycalendar/activities.edit.js
    trunk/activitycalendar/js/activitycalendar/activities.index.js
    trunk/activitycalendar/js/activitycalendar/dashboard.index.js
    trunk/activitycalendar/templates/base/activity.xsl
    trunk/activitycalendar/templates/base/app_data.xsl
    trunk/activitycalendar/templates/base/arena.xsl
    trunk/activitycalendar/templates/base/dashboard.xsl
    trunk/activitycalendar/templates/base/organization.xsl
    trunk/activitycalendarfrontend/js/activitycalendarfrontend/
    trunk/activitycalendarfrontend/js/activitycalendarfrontend/activity_edit.js
    
trunk/activitycalendarfrontend/js/activitycalendarfrontend/activity_edit_step_1.js
    trunk/activitycalendarfrontend/js/activitycalendarfrontend/activity_new.js
    
trunk/activitycalendarfrontend/js/activitycalendarfrontend/activity_new_org.js
    
trunk/activitycalendarfrontend/js/activitycalendarfrontend/activity_new_step_1.js
    
trunk/activitycalendarfrontend/js/activitycalendarfrontend/organization_edit.js
    
trunk/activitycalendarfrontend/js/activitycalendarfrontend/organization_reciept.js
    trunk/activitycalendarfrontend/setup/tables_update.inc.php
    trunk/activitycalendarfrontend/templates/base/activity.xsl
    trunk/activitycalendarfrontend/templates/base/activity_edit.xsl
    trunk/activitycalendarfrontend/templates/base/activity_edit_step_1.xsl
    trunk/activitycalendarfrontend/templates/base/activity_new.xsl
    trunk/activitycalendarfrontend/templates/base/activity_new_org.xsl
    trunk/activitycalendarfrontend/templates/base/activity_new_step_1.xsl
    trunk/activitycalendarfrontend/templates/base/app_data.xsl
    trunk/activitycalendarfrontend/templates/base/css/style.css
    trunk/activitycalendarfrontend/templates/base/images/
    trunk/activitycalendarfrontend/templates/base/images/hjelp.gif
    trunk/activitycalendarfrontend/templates/base/organization_edit.xsl
    trunk/activitycalendarfrontend/templates/base/organization_reciept.xsl
    trunk/booking/inc/class.bodocument_application.inc.php
    trunk/booking/inc/class.bopermission_document_application.inc.php
    trunk/booking/inc/class.custom_fields.inc.php
    trunk/booking/inc/class.hook_helper.inc.php
    trunk/booking/inc/class.sodocument_application.inc.php
    trunk/booking/inc/class.sopermission_document_application.inc.php
    trunk/booking/inc/class.sopermission_permission_document_application.inc.php
    trunk/booking/inc/class.uidocument_application.inc.php
    trunk/booking/jasper/templates/participants_per_activity.jrxml
    trunk/booking/jasper/templates/participants_per_audience.jrxml
    trunk/booking/jasper/templates/participants_per_resource.jrxml
    trunk/booking/js/booking/report.js
    trunk/booking/js/booking/season.wtemplate.js
    trunk/booking/templates/base/report_new.xsl
    trunk/booking/templates/base/season_wtemplate_allocation.xsl
    trunk/bookingfrontend/css/
    trunk/bookingfrontend/css/bookingfrontend.css
    trunk/bookingfrontend/inc/class.uidocument_application.inc.php
    trunk/bookingfrontend/js/bookingfrontend/application.js
    trunk/bookingfrontend/js/bookingfrontend/event.js
    trunk/bookingfrontend/js/bookingfrontend/schedule.js
    trunk/bookingfrontend/js/bookingfrontend/search.js
    trunk/bookingfrontend/setup/tables_update.inc.php
    trunk/bookingfrontend/templates/base/application.xsl
    trunk/bookingfrontend/templates/base/application_edit.xsl
    trunk/bookingfrontend/templates/base/application_new.xsl
    trunk/bookingfrontend/templates/base/booking.xsl
    trunk/bookingfrontend/templates/base/event_delete.xsl
    trunk/bookingfrontend/templates/base/event_edit.xsl
    trunk/bookingfrontend/templates/base/group_edit.xsl
    trunk/bookingfrontend/templates/base/organization_edit.xsl
    trunk/bookingfrontend/templates/base/search_details.xsl
    trunk/frontend/inc/class.uicommon.inc.php
    trunk/frontend/js/jquery/entity.list.js
    trunk/frontend/js/jquery/helpdesk.list.js
    trunk/mobilefrontend/property/class.notify.inc.php
    trunk/phpgwapi/js/DataTables/extensions/AutoFill/License.txt
    trunk/phpgwapi/js/DataTables/extensions/AutoFill/Readme.md
    trunk/phpgwapi/js/DataTables/extensions/AutoFill/css/autoFill.bootstrap.css
    
trunk/phpgwapi/js/DataTables/extensions/AutoFill/css/autoFill.bootstrap.min.css
    trunk/phpgwapi/js/DataTables/extensions/AutoFill/css/autoFill.dataTables.css
    
trunk/phpgwapi/js/DataTables/extensions/AutoFill/css/autoFill.dataTables.min.css
    trunk/phpgwapi/js/DataTables/extensions/AutoFill/css/autoFill.foundation.css
    
trunk/phpgwapi/js/DataTables/extensions/AutoFill/css/autoFill.foundation.min.css
    trunk/phpgwapi/js/DataTables/extensions/AutoFill/css/autoFill.jqueryui.css
    
trunk/phpgwapi/js/DataTables/extensions/AutoFill/css/autoFill.jqueryui.min.css
    trunk/phpgwapi/js/DataTables/extensions/AutoFill/examples/initialisation/
    
trunk/phpgwapi/js/DataTables/extensions/AutoFill/examples/initialisation/alwaysAsk.html
    
trunk/phpgwapi/js/DataTables/extensions/AutoFill/examples/initialisation/columns.html
    
trunk/phpgwapi/js/DataTables/extensions/AutoFill/examples/initialisation/events.html
    
trunk/phpgwapi/js/DataTables/extensions/AutoFill/examples/initialisation/fills.html
    
trunk/phpgwapi/js/DataTables/extensions/AutoFill/examples/initialisation/focus.html
    
trunk/phpgwapi/js/DataTables/extensions/AutoFill/examples/initialisation/index.html
    
trunk/phpgwapi/js/DataTables/extensions/AutoFill/examples/initialisation/keyTable.html
    
trunk/phpgwapi/js/DataTables/extensions/AutoFill/examples/initialisation/plugins.html
    
trunk/phpgwapi/js/DataTables/extensions/AutoFill/examples/initialisation/scrolling.html
    
trunk/phpgwapi/js/DataTables/extensions/AutoFill/examples/initialisation/simple.html
    trunk/phpgwapi/js/DataTables/extensions/AutoFill/examples/styling/
    
trunk/phpgwapi/js/DataTables/extensions/AutoFill/examples/styling/bootstrap.html
    
trunk/phpgwapi/js/DataTables/extensions/AutoFill/examples/styling/foundation.html
    trunk/phpgwapi/js/DataTables/extensions/AutoFill/examples/styling/index.html
    
trunk/phpgwapi/js/DataTables/extensions/AutoFill/examples/styling/jqueryui.html
    trunk/phpgwapi/js/DataTables/extensions/AutoFill/js/autoFill.bootstrap.js
    
trunk/phpgwapi/js/DataTables/extensions/AutoFill/js/autoFill.bootstrap.min.js
    trunk/phpgwapi/js/DataTables/extensions/AutoFill/js/autoFill.foundation.js
    
trunk/phpgwapi/js/DataTables/extensions/AutoFill/js/autoFill.foundation.min.js
    trunk/phpgwapi/js/DataTables/extensions/AutoFill/js/autoFill.jqueryui.js
    trunk/phpgwapi/js/DataTables/extensions/AutoFill/js/autoFill.jqueryui.min.js
    trunk/phpgwapi/js/DataTables/extensions/Buttons/
    trunk/phpgwapi/js/DataTables/extensions/Buttons/License.txt
    trunk/phpgwapi/js/DataTables/extensions/Buttons/Readme.md
    trunk/phpgwapi/js/DataTables/extensions/Buttons/css/
    trunk/phpgwapi/js/DataTables/extensions/Buttons/css/buttons.bootstrap.css
    
trunk/phpgwapi/js/DataTables/extensions/Buttons/css/buttons.bootstrap.min.css
    trunk/phpgwapi/js/DataTables/extensions/Buttons/css/buttons.dataTables.css
    
trunk/phpgwapi/js/DataTables/extensions/Buttons/css/buttons.dataTables.min.css
    trunk/phpgwapi/js/DataTables/extensions/Buttons/css/buttons.foundation.css
    
trunk/phpgwapi/js/DataTables/extensions/Buttons/css/buttons.foundation.min.css
    trunk/phpgwapi/js/DataTables/extensions/Buttons/css/buttons.jqueryui.css
    trunk/phpgwapi/js/DataTables/extensions/Buttons/css/buttons.jqueryui.min.css
    trunk/phpgwapi/js/DataTables/extensions/Buttons/css/common.scss
    trunk/phpgwapi/js/DataTables/extensions/Buttons/css/mixins.scss
    trunk/phpgwapi/js/DataTables/extensions/Buttons/examples/
    trunk/phpgwapi/js/DataTables/extensions/Buttons/examples/api/
    trunk/phpgwapi/js/DataTables/extensions/Buttons/examples/api/addRemove.html
    trunk/phpgwapi/js/DataTables/extensions/Buttons/examples/api/enable.html
    trunk/phpgwapi/js/DataTables/extensions/Buttons/examples/api/group.html
    trunk/phpgwapi/js/DataTables/extensions/Buttons/examples/api/index.html
    trunk/phpgwapi/js/DataTables/extensions/Buttons/examples/api/text.html
    trunk/phpgwapi/js/DataTables/extensions/Buttons/examples/column_visibility/
    
trunk/phpgwapi/js/DataTables/extensions/Buttons/examples/column_visibility/columnGroups.html
    
trunk/phpgwapi/js/DataTables/extensions/Buttons/examples/column_visibility/columns.html
    
trunk/phpgwapi/js/DataTables/extensions/Buttons/examples/column_visibility/columnsToggle.html
    
trunk/phpgwapi/js/DataTables/extensions/Buttons/examples/column_visibility/index.html
    
trunk/phpgwapi/js/DataTables/extensions/Buttons/examples/column_visibility/layout.html
    
trunk/phpgwapi/js/DataTables/extensions/Buttons/examples/column_visibility/restore.html
    
trunk/phpgwapi/js/DataTables/extensions/Buttons/examples/column_visibility/simple.html
    
trunk/phpgwapi/js/DataTables/extensions/Buttons/examples/column_visibility/stateSave.html
    
trunk/phpgwapi/js/DataTables/extensions/Buttons/examples/column_visibility/text.html
    trunk/phpgwapi/js/DataTables/extensions/Buttons/examples/flash/
    trunk/phpgwapi/js/DataTables/extensions/Buttons/examples/flash/copyi18n.html
    trunk/phpgwapi/js/DataTables/extensions/Buttons/examples/flash/filename.html
    trunk/phpgwapi/js/DataTables/extensions/Buttons/examples/flash/hidden.html
    trunk/phpgwapi/js/DataTables/extensions/Buttons/examples/flash/index.html
    
trunk/phpgwapi/js/DataTables/extensions/Buttons/examples/flash/pdfMessage.html
    trunk/phpgwapi/js/DataTables/extensions/Buttons/examples/flash/pdfPage.html
    trunk/phpgwapi/js/DataTables/extensions/Buttons/examples/flash/simple.html
    trunk/phpgwapi/js/DataTables/extensions/Buttons/examples/flash/swfPath.html
    trunk/phpgwapi/js/DataTables/extensions/Buttons/examples/flash/tsv.html
    trunk/phpgwapi/js/DataTables/extensions/Buttons/examples/html5/
    trunk/phpgwapi/js/DataTables/extensions/Buttons/examples/html5/columns.html
    trunk/phpgwapi/js/DataTables/extensions/Buttons/examples/html5/copyi18n.html
    trunk/phpgwapi/js/DataTables/extensions/Buttons/examples/html5/filename.html
    trunk/phpgwapi/js/DataTables/extensions/Buttons/examples/html5/index.html
    
trunk/phpgwapi/js/DataTables/extensions/Buttons/examples/html5/outputFormat-function.html
    
trunk/phpgwapi/js/DataTables/extensions/Buttons/examples/html5/outputFormat-orthogonal.html
    trunk/phpgwapi/js/DataTables/extensions/Buttons/examples/html5/pdfImage.html
    
trunk/phpgwapi/js/DataTables/extensions/Buttons/examples/html5/pdfMessage.html
    trunk/phpgwapi/js/DataTables/extensions/Buttons/examples/html5/pdfOpen.html
    trunk/phpgwapi/js/DataTables/extensions/Buttons/examples/html5/pdfPage.html
    trunk/phpgwapi/js/DataTables/extensions/Buttons/examples/html5/simple.html
    trunk/phpgwapi/js/DataTables/extensions/Buttons/examples/html5/tsv.html
    trunk/phpgwapi/js/DataTables/extensions/Buttons/examples/index.html
    trunk/phpgwapi/js/DataTables/extensions/Buttons/examples/initialisation/
    
trunk/phpgwapi/js/DataTables/extensions/Buttons/examples/initialisation/className.html
    
trunk/phpgwapi/js/DataTables/extensions/Buttons/examples/initialisation/collections-sub.html
    
trunk/phpgwapi/js/DataTables/extensions/Buttons/examples/initialisation/collections.html
    
trunk/phpgwapi/js/DataTables/extensions/Buttons/examples/initialisation/custom.html
    
trunk/phpgwapi/js/DataTables/extensions/Buttons/examples/initialisation/export.html
    
trunk/phpgwapi/js/DataTables/extensions/Buttons/examples/initialisation/index.html
    
trunk/phpgwapi/js/DataTables/extensions/Buttons/examples/initialisation/keys.html
    
trunk/phpgwapi/js/DataTables/extensions/Buttons/examples/initialisation/multiple.html
    
trunk/phpgwapi/js/DataTables/extensions/Buttons/examples/initialisation/new.html
    
trunk/phpgwapi/js/DataTables/extensions/Buttons/examples/initialisation/pageLength.html
    
trunk/phpgwapi/js/DataTables/extensions/Buttons/examples/initialisation/plugins.html
    
trunk/phpgwapi/js/DataTables/extensions/Buttons/examples/initialisation/simple.html
    trunk/phpgwapi/js/DataTables/extensions/Buttons/examples/print/
    
trunk/phpgwapi/js/DataTables/extensions/Buttons/examples/print/autoPrint.html
    trunk/phpgwapi/js/DataTables/extensions/Buttons/examples/print/columns.html
    
trunk/phpgwapi/js/DataTables/extensions/Buttons/examples/print/customisation.html
    trunk/phpgwapi/js/DataTables/extensions/Buttons/examples/print/index.html
    trunk/phpgwapi/js/DataTables/extensions/Buttons/examples/print/message.html
    trunk/phpgwapi/js/DataTables/extensions/Buttons/examples/print/select.html
    trunk/phpgwapi/js/DataTables/extensions/Buttons/examples/print/simple.html
    trunk/phpgwapi/js/DataTables/extensions/Buttons/examples/styling/
    
trunk/phpgwapi/js/DataTables/extensions/Buttons/examples/styling/bootstrap.html
    
trunk/phpgwapi/js/DataTables/extensions/Buttons/examples/styling/foundation.html
    trunk/phpgwapi/js/DataTables/extensions/Buttons/examples/styling/icons.html
    trunk/phpgwapi/js/DataTables/extensions/Buttons/examples/styling/index.html
    
trunk/phpgwapi/js/DataTables/extensions/Buttons/examples/styling/jqueryui.html
    trunk/phpgwapi/js/DataTables/extensions/Buttons/js/
    trunk/phpgwapi/js/DataTables/extensions/Buttons/js/buttons.bootstrap.js
    trunk/phpgwapi/js/DataTables/extensions/Buttons/js/buttons.bootstrap.min.js
    trunk/phpgwapi/js/DataTables/extensions/Buttons/js/buttons.colVis.js
    trunk/phpgwapi/js/DataTables/extensions/Buttons/js/buttons.colVis.min.js
    trunk/phpgwapi/js/DataTables/extensions/Buttons/js/buttons.flash.js
    trunk/phpgwapi/js/DataTables/extensions/Buttons/js/buttons.flash.min.js
    trunk/phpgwapi/js/DataTables/extensions/Buttons/js/buttons.foundation.js
    trunk/phpgwapi/js/DataTables/extensions/Buttons/js/buttons.foundation.min.js
    trunk/phpgwapi/js/DataTables/extensions/Buttons/js/buttons.html5.js
    trunk/phpgwapi/js/DataTables/extensions/Buttons/js/buttons.html5.min.js
    trunk/phpgwapi/js/DataTables/extensions/Buttons/js/buttons.jqueryui.js
    trunk/phpgwapi/js/DataTables/extensions/Buttons/js/buttons.jqueryui.min.js
    trunk/phpgwapi/js/DataTables/extensions/Buttons/js/buttons.print.js
    trunk/phpgwapi/js/DataTables/extensions/Buttons/js/buttons.print.min.js
    trunk/phpgwapi/js/DataTables/extensions/Buttons/js/dataTables.buttons.js
    trunk/phpgwapi/js/DataTables/extensions/Buttons/js/dataTables.buttons.min.js
    trunk/phpgwapi/js/DataTables/extensions/Buttons/swf/
    trunk/phpgwapi/js/DataTables/extensions/Buttons/swf/flashExport.swf
    trunk/phpgwapi/js/DataTables/extensions/ColReorder/License.txt
    trunk/phpgwapi/js/DataTables/extensions/ColReorder/Readme.md
    
trunk/phpgwapi/js/DataTables/extensions/ColReorder/css/colReorder.bootstrap.css
    
trunk/phpgwapi/js/DataTables/extensions/ColReorder/css/colReorder.bootstrap.min.css
    
trunk/phpgwapi/js/DataTables/extensions/ColReorder/css/colReorder.dataTables.css
    
trunk/phpgwapi/js/DataTables/extensions/ColReorder/css/colReorder.dataTables.min.css
    
trunk/phpgwapi/js/DataTables/extensions/ColReorder/css/colReorder.foundation.css
    
trunk/phpgwapi/js/DataTables/extensions/ColReorder/css/colReorder.foundation.min.css
    
trunk/phpgwapi/js/DataTables/extensions/ColReorder/css/colReorder.jqueryui.css
    
trunk/phpgwapi/js/DataTables/extensions/ColReorder/css/colReorder.jqueryui.min.css
    trunk/phpgwapi/js/DataTables/extensions/ColReorder/examples/initialisation/
    
trunk/phpgwapi/js/DataTables/extensions/ColReorder/examples/initialisation/col_filter.html
    
trunk/phpgwapi/js/DataTables/extensions/ColReorder/examples/initialisation/new_init.html
    
trunk/phpgwapi/js/DataTables/extensions/ColReorder/examples/initialisation/predefined.html
    
trunk/phpgwapi/js/DataTables/extensions/ColReorder/examples/initialisation/realtime.html
    
trunk/phpgwapi/js/DataTables/extensions/ColReorder/examples/initialisation/reset.html
    
trunk/phpgwapi/js/DataTables/extensions/ColReorder/examples/initialisation/scrolling.html
    
trunk/phpgwapi/js/DataTables/extensions/ColReorder/examples/initialisation/simple.html
    trunk/phpgwapi/js/DataTables/extensions/ColReorder/examples/integration/
    
trunk/phpgwapi/js/DataTables/extensions/ColReorder/examples/integration/colvis.html
    
trunk/phpgwapi/js/DataTables/extensions/ColReorder/examples/integration/fixedcolumns.html
    
trunk/phpgwapi/js/DataTables/extensions/ColReorder/examples/integration/fixedheader.html
    
trunk/phpgwapi/js/DataTables/extensions/ColReorder/examples/integration/server_side.html
    
trunk/phpgwapi/js/DataTables/extensions/ColReorder/examples/integration/state_save.html
    trunk/phpgwapi/js/DataTables/extensions/ColReorder/examples/styling/
    
trunk/phpgwapi/js/DataTables/extensions/ColReorder/examples/styling/alt_insert.html
    
trunk/phpgwapi/js/DataTables/extensions/ColReorder/examples/styling/bootstrap.html
    
trunk/phpgwapi/js/DataTables/extensions/ColReorder/examples/styling/foundation.html
    
trunk/phpgwapi/js/DataTables/extensions/ColReorder/examples/styling/jqueryui.html
    trunk/phpgwapi/js/DataTables/extensions/ColVis/License.txt
    trunk/phpgwapi/js/DataTables/extensions/ColVis/Readme.md
    trunk/phpgwapi/js/DataTables/extensions/FixedColumns/License.txt
    trunk/phpgwapi/js/DataTables/extensions/FixedColumns/Readme.md
    
trunk/phpgwapi/js/DataTables/extensions/FixedColumns/css/fixedColumns.bootstrap.css
    
trunk/phpgwapi/js/DataTables/extensions/FixedColumns/css/fixedColumns.bootstrap.min.css
    
trunk/phpgwapi/js/DataTables/extensions/FixedColumns/css/fixedColumns.dataTables.css
    
trunk/phpgwapi/js/DataTables/extensions/FixedColumns/css/fixedColumns.dataTables.min.css
    
trunk/phpgwapi/js/DataTables/extensions/FixedColumns/css/fixedColumns.foundation.css
    
trunk/phpgwapi/js/DataTables/extensions/FixedColumns/css/fixedColumns.foundation.min.css
    
trunk/phpgwapi/js/DataTables/extensions/FixedColumns/css/fixedColumns.jqueryui.css
    
trunk/phpgwapi/js/DataTables/extensions/FixedColumns/css/fixedColumns.jqueryui.min.css
    
trunk/phpgwapi/js/DataTables/extensions/FixedColumns/examples/initialisation/
    
trunk/phpgwapi/js/DataTables/extensions/FixedColumns/examples/initialisation/colvis.html
    
trunk/phpgwapi/js/DataTables/extensions/FixedColumns/examples/initialisation/css_size.html
    
trunk/phpgwapi/js/DataTables/extensions/FixedColumns/examples/initialisation/index_column.html
    
trunk/phpgwapi/js/DataTables/extensions/FixedColumns/examples/initialisation/left_right_columns.html
    
trunk/phpgwapi/js/DataTables/extensions/FixedColumns/examples/initialisation/right_column.html
    
trunk/phpgwapi/js/DataTables/extensions/FixedColumns/examples/initialisation/server-side-processing.html
    
trunk/phpgwapi/js/DataTables/extensions/FixedColumns/examples/initialisation/simple.html
    
trunk/phpgwapi/js/DataTables/extensions/FixedColumns/examples/initialisation/size_fixed.html
    
trunk/phpgwapi/js/DataTables/extensions/FixedColumns/examples/initialisation/size_fluid.html
    
trunk/phpgwapi/js/DataTables/extensions/FixedColumns/examples/initialisation/two_columns.html
    trunk/phpgwapi/js/DataTables/extensions/FixedColumns/examples/styling/
    
trunk/phpgwapi/js/DataTables/extensions/FixedColumns/examples/styling/bootstrap.html
    
trunk/phpgwapi/js/DataTables/extensions/FixedColumns/examples/styling/col_filter.html
    
trunk/phpgwapi/js/DataTables/extensions/FixedColumns/examples/styling/colvis.html
    
trunk/phpgwapi/js/DataTables/extensions/FixedColumns/examples/styling/foundation.html
    
trunk/phpgwapi/js/DataTables/extensions/FixedColumns/examples/styling/jqueryui.html
    
trunk/phpgwapi/js/DataTables/extensions/FixedColumns/examples/styling/rowspan.html
    
trunk/phpgwapi/js/DataTables/extensions/FixedColumns/examples/styling/server-side-processing.html
    trunk/phpgwapi/js/DataTables/extensions/FixedHeader/License.txt
    trunk/phpgwapi/js/DataTables/extensions/FixedHeader/Readme.md
    
trunk/phpgwapi/js/DataTables/extensions/FixedHeader/css/fixedHeader.bootstrap.css
    
trunk/phpgwapi/js/DataTables/extensions/FixedHeader/css/fixedHeader.bootstrap.min.css
    
trunk/phpgwapi/js/DataTables/extensions/FixedHeader/css/fixedHeader.dataTables.css
    
trunk/phpgwapi/js/DataTables/extensions/FixedHeader/css/fixedHeader.dataTables.min.css
    
trunk/phpgwapi/js/DataTables/extensions/FixedHeader/css/fixedHeader.foundation.css
    
trunk/phpgwapi/js/DataTables/extensions/FixedHeader/css/fixedHeader.foundation.min.css
    
trunk/phpgwapi/js/DataTables/extensions/FixedHeader/css/fixedHeader.jqueryui.css
    
trunk/phpgwapi/js/DataTables/extensions/FixedHeader/css/fixedHeader.jqueryui.min.css
    trunk/phpgwapi/js/DataTables/extensions/FixedHeader/examples/integration/
    
trunk/phpgwapi/js/DataTables/extensions/FixedHeader/examples/integration/colreorder.html
    
trunk/phpgwapi/js/DataTables/extensions/FixedHeader/examples/integration/index.html
    
trunk/phpgwapi/js/DataTables/extensions/FixedHeader/examples/integration/responsive.html
    trunk/phpgwapi/js/DataTables/extensions/FixedHeader/examples/options/
    
trunk/phpgwapi/js/DataTables/extensions/FixedHeader/examples/options/enable-disable.html
    
trunk/phpgwapi/js/DataTables/extensions/FixedHeader/examples/options/header_footer.html
    
trunk/phpgwapi/js/DataTables/extensions/FixedHeader/examples/options/horizontal-scroll.html
    
trunk/phpgwapi/js/DataTables/extensions/FixedHeader/examples/options/index.html
    
trunk/phpgwapi/js/DataTables/extensions/FixedHeader/examples/options/new.html
    
trunk/phpgwapi/js/DataTables/extensions/FixedHeader/examples/options/offset.html
    
trunk/phpgwapi/js/DataTables/extensions/FixedHeader/examples/options/show-hide.html
    
trunk/phpgwapi/js/DataTables/extensions/FixedHeader/examples/options/simple.html
    
trunk/phpgwapi/js/DataTables/extensions/FixedHeader/examples/options/two_tables.html
    trunk/phpgwapi/js/DataTables/extensions/FixedHeader/examples/styling/
    
trunk/phpgwapi/js/DataTables/extensions/FixedHeader/examples/styling/bootstrap.html
    
trunk/phpgwapi/js/DataTables/extensions/FixedHeader/examples/styling/foundation.html
    
trunk/phpgwapi/js/DataTables/extensions/FixedHeader/examples/styling/index.html
    
trunk/phpgwapi/js/DataTables/extensions/FixedHeader/examples/styling/jqueryui.html
    trunk/phpgwapi/js/DataTables/extensions/KeyTable/License.txt
    trunk/phpgwapi/js/DataTables/extensions/KeyTable/Readme.md
    trunk/phpgwapi/js/DataTables/extensions/KeyTable/css/keyTable.bootstrap.css
    
trunk/phpgwapi/js/DataTables/extensions/KeyTable/css/keyTable.bootstrap.min.css
    trunk/phpgwapi/js/DataTables/extensions/KeyTable/css/keyTable.dataTables.css
    
trunk/phpgwapi/js/DataTables/extensions/KeyTable/css/keyTable.dataTables.min.css
    trunk/phpgwapi/js/DataTables/extensions/KeyTable/css/keyTable.foundation.css
    
trunk/phpgwapi/js/DataTables/extensions/KeyTable/css/keyTable.foundation.min.css
    trunk/phpgwapi/js/DataTables/extensions/KeyTable/css/keyTable.jqueryui.css
    
trunk/phpgwapi/js/DataTables/extensions/KeyTable/css/keyTable.jqueryui.min.css
    trunk/phpgwapi/js/DataTables/extensions/KeyTable/examples/initialisation/
    
trunk/phpgwapi/js/DataTables/extensions/KeyTable/examples/initialisation/events.html
    
trunk/phpgwapi/js/DataTables/extensions/KeyTable/examples/initialisation/index.html
    
trunk/phpgwapi/js/DataTables/extensions/KeyTable/examples/initialisation/scrolling.html
    
trunk/phpgwapi/js/DataTables/extensions/KeyTable/examples/initialisation/server-side.html
    
trunk/phpgwapi/js/DataTables/extensions/KeyTable/examples/initialisation/simple.html
    
trunk/phpgwapi/js/DataTables/extensions/KeyTable/examples/initialisation/stateSave.html
    trunk/phpgwapi/js/DataTables/extensions/KeyTable/examples/styling/
    
trunk/phpgwapi/js/DataTables/extensions/KeyTable/examples/styling/bootstrap.html
    
trunk/phpgwapi/js/DataTables/extensions/KeyTable/examples/styling/focusStyle.html
    
trunk/phpgwapi/js/DataTables/extensions/KeyTable/examples/styling/foundation.html
    trunk/phpgwapi/js/DataTables/extensions/KeyTable/examples/styling/index.html
    
trunk/phpgwapi/js/DataTables/extensions/KeyTable/examples/styling/jqueryui.html
    trunk/phpgwapi/js/DataTables/extensions/Responsive/License.txt
    
trunk/phpgwapi/js/DataTables/extensions/Responsive/css/responsive.bootstrap.css
    
trunk/phpgwapi/js/DataTables/extensions/Responsive/css/responsive.bootstrap.min.css
    
trunk/phpgwapi/js/DataTables/extensions/Responsive/css/responsive.dataTables.css
    
trunk/phpgwapi/js/DataTables/extensions/Responsive/css/responsive.dataTables.min.css
    
trunk/phpgwapi/js/DataTables/extensions/Responsive/css/responsive.foundation.css
    
trunk/phpgwapi/js/DataTables/extensions/Responsive/css/responsive.foundation.min.css
    
trunk/phpgwapi/js/DataTables/extensions/Responsive/css/responsive.jqueryui.css
    
trunk/phpgwapi/js/DataTables/extensions/Responsive/css/responsive.jqueryui.min.css
    trunk/phpgwapi/js/DataTables/extensions/Responsive/examples/column-control/
    
trunk/phpgwapi/js/DataTables/extensions/Responsive/examples/column-control/auto.html
    
trunk/phpgwapi/js/DataTables/extensions/Responsive/examples/column-control/classes.html
    
trunk/phpgwapi/js/DataTables/extensions/Responsive/examples/column-control/colreorder.html
    
trunk/phpgwapi/js/DataTables/extensions/Responsive/examples/column-control/column-visibility.html
    
trunk/phpgwapi/js/DataTables/extensions/Responsive/examples/column-control/columnPriority.html
    
trunk/phpgwapi/js/DataTables/extensions/Responsive/examples/column-control/fixedHeader.html
    
trunk/phpgwapi/js/DataTables/extensions/Responsive/examples/column-control/index.html
    
trunk/phpgwapi/js/DataTables/extensions/Responsive/examples/column-control/init-classes.html
    trunk/phpgwapi/js/DataTables/extensions/Responsive/examples/display-types/
    
trunk/phpgwapi/js/DataTables/extensions/Responsive/examples/display-types/bootstrap-modal.html
    
trunk/phpgwapi/js/DataTables/extensions/Responsive/examples/display-types/foundation-modal.html
    
trunk/phpgwapi/js/DataTables/extensions/Responsive/examples/display-types/immediateShow.html
    
trunk/phpgwapi/js/DataTables/extensions/Responsive/examples/display-types/index.html
    
trunk/phpgwapi/js/DataTables/extensions/Responsive/examples/display-types/jqueryui-modal.html
    
trunk/phpgwapi/js/DataTables/extensions/Responsive/examples/display-types/modal.html
    
trunk/phpgwapi/js/DataTables/extensions/Responsive/examples/styling/compact.html
    
trunk/phpgwapi/js/DataTables/extensions/Responsive/examples/styling/jqueryui.html
    
trunk/phpgwapi/js/DataTables/extensions/Responsive/examples/styling/scrolling.html
    
trunk/phpgwapi/js/DataTables/extensions/Responsive/js/responsive.bootstrap.js
    
trunk/phpgwapi/js/DataTables/extensions/Responsive/js/responsive.bootstrap.min.js
    
trunk/phpgwapi/js/DataTables/extensions/Responsive/js/responsive.foundation.js
    
trunk/phpgwapi/js/DataTables/extensions/Responsive/js/responsive.foundation.min.js
    trunk/phpgwapi/js/DataTables/extensions/Responsive/js/responsive.jqueryui.js
    
trunk/phpgwapi/js/DataTables/extensions/Responsive/js/responsive.jqueryui.min.js
    trunk/phpgwapi/js/DataTables/extensions/RowReorder/
    trunk/phpgwapi/js/DataTables/extensions/RowReorder/License.txt
    trunk/phpgwapi/js/DataTables/extensions/RowReorder/Readme.md
    trunk/phpgwapi/js/DataTables/extensions/RowReorder/css/
    
trunk/phpgwapi/js/DataTables/extensions/RowReorder/css/rowReorder.bootstrap.css
    
trunk/phpgwapi/js/DataTables/extensions/RowReorder/css/rowReorder.bootstrap.min.css
    
trunk/phpgwapi/js/DataTables/extensions/RowReorder/css/rowReorder.dataTables.css
    
trunk/phpgwapi/js/DataTables/extensions/RowReorder/css/rowReorder.dataTables.min.css
    
trunk/phpgwapi/js/DataTables/extensions/RowReorder/css/rowReorder.foundation.css
    
trunk/phpgwapi/js/DataTables/extensions/RowReorder/css/rowReorder.foundation.min.css
    
trunk/phpgwapi/js/DataTables/extensions/RowReorder/css/rowReorder.jqueryui.css
    
trunk/phpgwapi/js/DataTables/extensions/RowReorder/css/rowReorder.jqueryui.min.css
    trunk/phpgwapi/js/DataTables/extensions/RowReorder/examples/
    trunk/phpgwapi/js/DataTables/extensions/RowReorder/examples/index.html
    trunk/phpgwapi/js/DataTables/extensions/RowReorder/examples/initialisation/
    
trunk/phpgwapi/js/DataTables/extensions/RowReorder/examples/initialisation/defaults.html
    
trunk/phpgwapi/js/DataTables/extensions/RowReorder/examples/initialisation/events.html
    
trunk/phpgwapi/js/DataTables/extensions/RowReorder/examples/initialisation/index.html
    
trunk/phpgwapi/js/DataTables/extensions/RowReorder/examples/initialisation/responsive.html
    
trunk/phpgwapi/js/DataTables/extensions/RowReorder/examples/initialisation/restrictedOrdering.html
    
trunk/phpgwapi/js/DataTables/extensions/RowReorder/examples/initialisation/selector.html
    
trunk/phpgwapi/js/DataTables/extensions/RowReorder/examples/initialisation/simple.html
    trunk/phpgwapi/js/DataTables/extensions/RowReorder/examples/styling/
    
trunk/phpgwapi/js/DataTables/extensions/RowReorder/examples/styling/bootstrap.html
    
trunk/phpgwapi/js/DataTables/extensions/RowReorder/examples/styling/foundation.html
    
trunk/phpgwapi/js/DataTables/extensions/RowReorder/examples/styling/index.html
    
trunk/phpgwapi/js/DataTables/extensions/RowReorder/examples/styling/jqueryui.html
    
trunk/phpgwapi/js/DataTables/extensions/RowReorder/examples/styling/reorderClass.html
    
trunk/phpgwapi/js/DataTables/extensions/RowReorder/examples/styling/snapX.html
    trunk/phpgwapi/js/DataTables/extensions/RowReorder/js/
    
trunk/phpgwapi/js/DataTables/extensions/RowReorder/js/dataTables.rowReorder.js
    
trunk/phpgwapi/js/DataTables/extensions/RowReorder/js/dataTables.rowReorder.min.js
    trunk/phpgwapi/js/DataTables/extensions/Scroller/License.txt
    trunk/phpgwapi/js/DataTables/extensions/Scroller/Readme.md
    trunk/phpgwapi/js/DataTables/extensions/Scroller/css/scroller.bootstrap.css
    
trunk/phpgwapi/js/DataTables/extensions/Scroller/css/scroller.bootstrap.min.css
    trunk/phpgwapi/js/DataTables/extensions/Scroller/css/scroller.dataTables.css
    
trunk/phpgwapi/js/DataTables/extensions/Scroller/css/scroller.dataTables.min.css
    trunk/phpgwapi/js/DataTables/extensions/Scroller/css/scroller.foundation.css
    
trunk/phpgwapi/js/DataTables/extensions/Scroller/css/scroller.foundation.min.css
    trunk/phpgwapi/js/DataTables/extensions/Scroller/css/scroller.jqueryui.css
    
trunk/phpgwapi/js/DataTables/extensions/Scroller/css/scroller.jqueryui.min.css
    trunk/phpgwapi/js/DataTables/extensions/Scroller/examples/initialisation/
    
trunk/phpgwapi/js/DataTables/extensions/Scroller/examples/initialisation/api_scrolling.html
    
trunk/phpgwapi/js/DataTables/extensions/Scroller/examples/initialisation/fixedColumns.html
    
trunk/phpgwapi/js/DataTables/extensions/Scroller/examples/initialisation/large_js_source.html
    
trunk/phpgwapi/js/DataTables/extensions/Scroller/examples/initialisation/server-side_processing.html
    
trunk/phpgwapi/js/DataTables/extensions/Scroller/examples/initialisation/simple.html
    
trunk/phpgwapi/js/DataTables/extensions/Scroller/examples/initialisation/state_saving.html
    trunk/phpgwapi/js/DataTables/extensions/Scroller/examples/styling/
    
trunk/phpgwapi/js/DataTables/extensions/Scroller/examples/styling/bootstrap.html
    
trunk/phpgwapi/js/DataTables/extensions/Scroller/examples/styling/foundation.html
    
trunk/phpgwapi/js/DataTables/extensions/Scroller/examples/styling/jqueryui.html
    trunk/phpgwapi/js/DataTables/extensions/Select/
    trunk/phpgwapi/js/DataTables/extensions/Select/License.txt
    trunk/phpgwapi/js/DataTables/extensions/Select/Readme.md
    trunk/phpgwapi/js/DataTables/extensions/Select/css/
    trunk/phpgwapi/js/DataTables/extensions/Select/css/select.bootstrap.css
    trunk/phpgwapi/js/DataTables/extensions/Select/css/select.bootstrap.min.css
    trunk/phpgwapi/js/DataTables/extensions/Select/css/select.dataTables.css
    trunk/phpgwapi/js/DataTables/extensions/Select/css/select.dataTables.min.css
    trunk/phpgwapi/js/DataTables/extensions/Select/css/select.foundation.css
    trunk/phpgwapi/js/DataTables/extensions/Select/css/select.foundation.min.css
    trunk/phpgwapi/js/DataTables/extensions/Select/css/select.jqueryui.css
    trunk/phpgwapi/js/DataTables/extensions/Select/css/select.jqueryui.min.css
    trunk/phpgwapi/js/DataTables/extensions/Select/examples/
    trunk/phpgwapi/js/DataTables/extensions/Select/examples/api/
    trunk/phpgwapi/js/DataTables/extensions/Select/examples/api/events.html
    trunk/phpgwapi/js/DataTables/extensions/Select/examples/api/get.html
    trunk/phpgwapi/js/DataTables/extensions/Select/examples/api/index.html
    trunk/phpgwapi/js/DataTables/extensions/Select/examples/api/select.html
    trunk/phpgwapi/js/DataTables/extensions/Select/examples/index.html
    trunk/phpgwapi/js/DataTables/extensions/Select/examples/initialisation/
    
trunk/phpgwapi/js/DataTables/extensions/Select/examples/initialisation/blurable.html
    
trunk/phpgwapi/js/DataTables/extensions/Select/examples/initialisation/buttons.html
    
trunk/phpgwapi/js/DataTables/extensions/Select/examples/initialisation/cells.html
    
trunk/phpgwapi/js/DataTables/extensions/Select/examples/initialisation/checkbox.html
    
trunk/phpgwapi/js/DataTables/extensions/Select/examples/initialisation/deferRender.html
    
trunk/phpgwapi/js/DataTables/extensions/Select/examples/initialisation/i18n.html
    
trunk/phpgwapi/js/DataTables/extensions/Select/examples/initialisation/index.html
    
trunk/phpgwapi/js/DataTables/extensions/Select/examples/initialisation/multi.html
    
trunk/phpgwapi/js/DataTables/extensions/Select/examples/initialisation/reload.html
    
trunk/phpgwapi/js/DataTables/extensions/Select/examples/initialisation/simple.html
    
trunk/phpgwapi/js/DataTables/extensions/Select/examples/initialisation/single.html
    trunk/phpgwapi/js/DataTables/extensions/Select/examples/styling/
    
trunk/phpgwapi/js/DataTables/extensions/Select/examples/styling/bootstrap.html
    
trunk/phpgwapi/js/DataTables/extensions/Select/examples/styling/foundation.html
    trunk/phpgwapi/js/DataTables/extensions/Select/examples/styling/index.html
    
trunk/phpgwapi/js/DataTables/extensions/Select/examples/styling/jqueryui.html
    trunk/phpgwapi/js/DataTables/extensions/Select/js/
    trunk/phpgwapi/js/DataTables/extensions/Select/js/dataTables.select.js
    trunk/phpgwapi/js/DataTables/extensions/Select/js/dataTables.select.min.js
    trunk/phpgwapi/js/DataTables/extensions/TableTools/Readme.md
    trunk/phpgwapi/js/DataTables/media/css/dataTables.bootstrap.css
    trunk/phpgwapi/js/DataTables/media/css/dataTables.bootstrap.min.css
    trunk/phpgwapi/js/DataTables/media/css/dataTables.foundation.css
    trunk/phpgwapi/js/DataTables/media/css/dataTables.foundation.min.css
    trunk/phpgwapi/js/DataTables/media/css/dataTables.jqueryui.css
    trunk/phpgwapi/js/DataTables/media/css/dataTables.jqueryui.min.css
    trunk/phpgwapi/js/DataTables/media/js/dataTables.bootstrap.js
    trunk/phpgwapi/js/DataTables/media/js/dataTables.bootstrap.min.js
    trunk/phpgwapi/js/DataTables/media/js/dataTables.foundation.js
    trunk/phpgwapi/js/DataTables/media/js/dataTables.foundation.min.js
    trunk/phpgwapi/js/DataTables/media/js/dataTables.jqueryui.js
    trunk/phpgwapi/js/DataTables/media/js/dataTables.jqueryui.min.js
    trunk/phpgwapi/js/ckeditor/CHANGES.md
    trunk/phpgwapi/js/ckeditor/LICENSE.md
    trunk/phpgwapi/js/ckeditor/README.md
    trunk/phpgwapi/js/ckeditor/build-config.js
    trunk/phpgwapi/js/ckeditor/lang/id.js
    trunk/phpgwapi/js/ckeditor/lang/ka.js
    trunk/phpgwapi/js/ckeditor/lang/ku.js
    trunk/phpgwapi/js/ckeditor/lang/mk.js
    trunk/phpgwapi/js/ckeditor/lang/si.js
    trunk/phpgwapi/js/ckeditor/lang/sq.js
    trunk/phpgwapi/js/ckeditor/lang/tt.js
    trunk/phpgwapi/js/ckeditor/lang/ug.js
    trunk/phpgwapi/js/ckeditor/plugins/a11yhelp/dialogs/lang/
    
trunk/phpgwapi/js/ckeditor/plugins/a11yhelp/dialogs/lang/_translationstatus.txt
    trunk/phpgwapi/js/ckeditor/plugins/a11yhelp/dialogs/lang/af.js
    trunk/phpgwapi/js/ckeditor/plugins/a11yhelp/dialogs/lang/ar.js
    trunk/phpgwapi/js/ckeditor/plugins/a11yhelp/dialogs/lang/bg.js
    trunk/phpgwapi/js/ckeditor/plugins/a11yhelp/dialogs/lang/ca.js
    trunk/phpgwapi/js/ckeditor/plugins/a11yhelp/dialogs/lang/cs.js
    trunk/phpgwapi/js/ckeditor/plugins/a11yhelp/dialogs/lang/cy.js
    trunk/phpgwapi/js/ckeditor/plugins/a11yhelp/dialogs/lang/da.js
    trunk/phpgwapi/js/ckeditor/plugins/a11yhelp/dialogs/lang/de.js
    trunk/phpgwapi/js/ckeditor/plugins/a11yhelp/dialogs/lang/el.js
    trunk/phpgwapi/js/ckeditor/plugins/a11yhelp/dialogs/lang/en-gb.js
    trunk/phpgwapi/js/ckeditor/plugins/a11yhelp/dialogs/lang/en.js
    trunk/phpgwapi/js/ckeditor/plugins/a11yhelp/dialogs/lang/eo.js
    trunk/phpgwapi/js/ckeditor/plugins/a11yhelp/dialogs/lang/es.js
    trunk/phpgwapi/js/ckeditor/plugins/a11yhelp/dialogs/lang/et.js
    trunk/phpgwapi/js/ckeditor/plugins/a11yhelp/dialogs/lang/fa.js
    trunk/phpgwapi/js/ckeditor/plugins/a11yhelp/dialogs/lang/fi.js
    trunk/phpgwapi/js/ckeditor/plugins/a11yhelp/dialogs/lang/fr-ca.js
    trunk/phpgwapi/js/ckeditor/plugins/a11yhelp/dialogs/lang/fr.js
    trunk/phpgwapi/js/ckeditor/plugins/a11yhelp/dialogs/lang/gl.js
    trunk/phpgwapi/js/ckeditor/plugins/a11yhelp/dialogs/lang/gu.js
    trunk/phpgwapi/js/ckeditor/plugins/a11yhelp/dialogs/lang/he.js
    trunk/phpgwapi/js/ckeditor/plugins/a11yhelp/dialogs/lang/hi.js
    trunk/phpgwapi/js/ckeditor/plugins/a11yhelp/dialogs/lang/hr.js
    trunk/phpgwapi/js/ckeditor/plugins/a11yhelp/dialogs/lang/hu.js
    trunk/phpgwapi/js/ckeditor/plugins/a11yhelp/dialogs/lang/id.js
    trunk/phpgwapi/js/ckeditor/plugins/a11yhelp/dialogs/lang/it.js
    trunk/phpgwapi/js/ckeditor/plugins/a11yhelp/dialogs/lang/ja.js
    trunk/phpgwapi/js/ckeditor/plugins/a11yhelp/dialogs/lang/km.js
    trunk/phpgwapi/js/ckeditor/plugins/a11yhelp/dialogs/lang/ko.js
    trunk/phpgwapi/js/ckeditor/plugins/a11yhelp/dialogs/lang/ku.js
    trunk/phpgwapi/js/ckeditor/plugins/a11yhelp/dialogs/lang/lt.js
    trunk/phpgwapi/js/ckeditor/plugins/a11yhelp/dialogs/lang/lv.js
    trunk/phpgwapi/js/ckeditor/plugins/a11yhelp/dialogs/lang/mk.js
    trunk/phpgwapi/js/ckeditor/plugins/a11yhelp/dialogs/lang/mn.js
    trunk/phpgwapi/js/ckeditor/plugins/a11yhelp/dialogs/lang/nb.js
    trunk/phpgwapi/js/ckeditor/plugins/a11yhelp/dialogs/lang/nl.js
    trunk/phpgwapi/js/ckeditor/plugins/a11yhelp/dialogs/lang/no.js
    trunk/phpgwapi/js/ckeditor/plugins/a11yhelp/dialogs/lang/pl.js
    trunk/phpgwapi/js/ckeditor/plugins/a11yhelp/dialogs/lang/pt-br.js
    trunk/phpgwapi/js/ckeditor/plugins/a11yhelp/dialogs/lang/pt.js
    trunk/phpgwapi/js/ckeditor/plugins/a11yhelp/dialogs/lang/ro.js
    trunk/phpgwapi/js/ckeditor/plugins/a11yhelp/dialogs/lang/ru.js
    trunk/phpgwapi/js/ckeditor/plugins/a11yhelp/dialogs/lang/si.js
    trunk/phpgwapi/js/ckeditor/plugins/a11yhelp/dialogs/lang/sk.js
    trunk/phpgwapi/js/ckeditor/plugins/a11yhelp/dialogs/lang/sl.js
    trunk/phpgwapi/js/ckeditor/plugins/a11yhelp/dialogs/lang/sq.js
    trunk/phpgwapi/js/ckeditor/plugins/a11yhelp/dialogs/lang/sr-latn.js
    trunk/phpgwapi/js/ckeditor/plugins/a11yhelp/dialogs/lang/sr.js
    trunk/phpgwapi/js/ckeditor/plugins/a11yhelp/dialogs/lang/sv.js
    trunk/phpgwapi/js/ckeditor/plugins/a11yhelp/dialogs/lang/th.js
    trunk/phpgwapi/js/ckeditor/plugins/a11yhelp/dialogs/lang/tr.js
    trunk/phpgwapi/js/ckeditor/plugins/a11yhelp/dialogs/lang/tt.js
    trunk/phpgwapi/js/ckeditor/plugins/a11yhelp/dialogs/lang/ug.js
    trunk/phpgwapi/js/ckeditor/plugins/a11yhelp/dialogs/lang/uk.js
    trunk/phpgwapi/js/ckeditor/plugins/a11yhelp/dialogs/lang/vi.js
    trunk/phpgwapi/js/ckeditor/plugins/a11yhelp/dialogs/lang/zh-cn.js
    trunk/phpgwapi/js/ckeditor/plugins/a11yhelp/dialogs/lang/zh.js
    trunk/phpgwapi/js/ckeditor/plugins/about/dialogs/hidpi/
    trunk/phpgwapi/js/ckeditor/plugins/about/dialogs/hidpi/logo_ckeditor.png
    trunk/phpgwapi/js/ckeditor/plugins/icons.png
    trunk/phpgwapi/js/ckeditor/plugins/icons_hidpi.png
    trunk/phpgwapi/js/ckeditor/plugins/image/images/
    trunk/phpgwapi/js/ckeditor/plugins/image/images/noimage.png
    trunk/phpgwapi/js/ckeditor/plugins/link/images/anchor.png
    trunk/phpgwapi/js/ckeditor/plugins/link/images/hidpi/
    trunk/phpgwapi/js/ckeditor/plugins/link/images/hidpi/anchor.png
    trunk/phpgwapi/js/ckeditor/plugins/magicline/
    trunk/phpgwapi/js/ckeditor/plugins/magicline/images/
    trunk/phpgwapi/js/ckeditor/plugins/magicline/images/hidpi/
    trunk/phpgwapi/js/ckeditor/plugins/magicline/images/hidpi/icon-rtl.png
    trunk/phpgwapi/js/ckeditor/plugins/magicline/images/hidpi/icon.png
    trunk/phpgwapi/js/ckeditor/plugins/magicline/images/icon-rtl.png
    trunk/phpgwapi/js/ckeditor/plugins/magicline/images/icon.png
    trunk/phpgwapi/js/ckeditor/plugins/scayt/LICENSE.md
    trunk/phpgwapi/js/ckeditor/plugins/scayt/README.md
    trunk/phpgwapi/js/ckeditor/plugins/specialchar/dialogs/lang/
    
trunk/phpgwapi/js/ckeditor/plugins/specialchar/dialogs/lang/_translationstatus.txt
    trunk/phpgwapi/js/ckeditor/plugins/specialchar/dialogs/lang/af.js
    trunk/phpgwapi/js/ckeditor/plugins/specialchar/dialogs/lang/ar.js
    trunk/phpgwapi/js/ckeditor/plugins/specialchar/dialogs/lang/bg.js
    trunk/phpgwapi/js/ckeditor/plugins/specialchar/dialogs/lang/ca.js
    trunk/phpgwapi/js/ckeditor/plugins/specialchar/dialogs/lang/cs.js
    trunk/phpgwapi/js/ckeditor/plugins/specialchar/dialogs/lang/cy.js
    trunk/phpgwapi/js/ckeditor/plugins/specialchar/dialogs/lang/da.js
    trunk/phpgwapi/js/ckeditor/plugins/specialchar/dialogs/lang/de.js
    trunk/phpgwapi/js/ckeditor/plugins/specialchar/dialogs/lang/el.js
    trunk/phpgwapi/js/ckeditor/plugins/specialchar/dialogs/lang/en-gb.js
    trunk/phpgwapi/js/ckeditor/plugins/specialchar/dialogs/lang/en.js
    trunk/phpgwapi/js/ckeditor/plugins/specialchar/dialogs/lang/eo.js
    trunk/phpgwapi/js/ckeditor/plugins/specialchar/dialogs/lang/es.js
    trunk/phpgwapi/js/ckeditor/plugins/specialchar/dialogs/lang/et.js
    trunk/phpgwapi/js/ckeditor/plugins/specialchar/dialogs/lang/fa.js
    trunk/phpgwapi/js/ckeditor/plugins/specialchar/dialogs/lang/fi.js
    trunk/phpgwapi/js/ckeditor/plugins/specialchar/dialogs/lang/fr-ca.js
    trunk/phpgwapi/js/ckeditor/plugins/specialchar/dialogs/lang/fr.js
    trunk/phpgwapi/js/ckeditor/plugins/specialchar/dialogs/lang/gl.js
    trunk/phpgwapi/js/ckeditor/plugins/specialchar/dialogs/lang/he.js
    trunk/phpgwapi/js/ckeditor/plugins/specialchar/dialogs/lang/hr.js
    trunk/phpgwapi/js/ckeditor/plugins/specialchar/dialogs/lang/hu.js
    trunk/phpgwapi/js/ckeditor/plugins/specialchar/dialogs/lang/id.js
    trunk/phpgwapi/js/ckeditor/plugins/specialchar/dialogs/lang/it.js
    trunk/phpgwapi/js/ckeditor/plugins/specialchar/dialogs/lang/ja.js
    trunk/phpgwapi/js/ckeditor/plugins/specialchar/dialogs/lang/km.js
    trunk/phpgwapi/js/ckeditor/plugins/specialchar/dialogs/lang/ku.js
    trunk/phpgwapi/js/ckeditor/plugins/specialchar/dialogs/lang/lt.js
    trunk/phpgwapi/js/ckeditor/plugins/specialchar/dialogs/lang/lv.js
    trunk/phpgwapi/js/ckeditor/plugins/specialchar/dialogs/lang/nb.js
    trunk/phpgwapi/js/ckeditor/plugins/specialchar/dialogs/lang/nl.js
    trunk/phpgwapi/js/ckeditor/plugins/specialchar/dialogs/lang/no.js
    trunk/phpgwapi/js/ckeditor/plugins/specialchar/dialogs/lang/pl.js
    trunk/phpgwapi/js/ckeditor/plugins/specialchar/dialogs/lang/pt-br.js
    trunk/phpgwapi/js/ckeditor/plugins/specialchar/dialogs/lang/pt.js
    trunk/phpgwapi/js/ckeditor/plugins/specialchar/dialogs/lang/ru.js
    trunk/phpgwapi/js/ckeditor/plugins/specialchar/dialogs/lang/si.js
    trunk/phpgwapi/js/ckeditor/plugins/specialchar/dialogs/lang/sk.js
    trunk/phpgwapi/js/ckeditor/plugins/specialchar/dialogs/lang/sl.js
    trunk/phpgwapi/js/ckeditor/plugins/specialchar/dialogs/lang/sq.js
    trunk/phpgwapi/js/ckeditor/plugins/specialchar/dialogs/lang/sv.js
    trunk/phpgwapi/js/ckeditor/plugins/specialchar/dialogs/lang/th.js
    trunk/phpgwapi/js/ckeditor/plugins/specialchar/dialogs/lang/tr.js
    trunk/phpgwapi/js/ckeditor/plugins/specialchar/dialogs/lang/tt.js
    trunk/phpgwapi/js/ckeditor/plugins/specialchar/dialogs/lang/ug.js
    trunk/phpgwapi/js/ckeditor/plugins/specialchar/dialogs/lang/uk.js
    trunk/phpgwapi/js/ckeditor/plugins/specialchar/dialogs/lang/vi.js
    trunk/phpgwapi/js/ckeditor/plugins/specialchar/dialogs/lang/zh-cn.js
    trunk/phpgwapi/js/ckeditor/plugins/specialchar/dialogs/lang/zh.js
    trunk/phpgwapi/js/ckeditor/plugins/wsc/LICENSE.md
    trunk/phpgwapi/js/ckeditor/plugins/wsc/README.md
    trunk/phpgwapi/js/ckeditor/plugins/wsc/dialogs/wsc_ie.js
    trunk/phpgwapi/js/ckeditor/skins/moono/
    trunk/phpgwapi/js/ckeditor/skins/moono/dialog.css
    trunk/phpgwapi/js/ckeditor/skins/moono/dialog_ie.css
    trunk/phpgwapi/js/ckeditor/skins/moono/dialog_ie7.css
    trunk/phpgwapi/js/ckeditor/skins/moono/dialog_ie8.css
    trunk/phpgwapi/js/ckeditor/skins/moono/dialog_iequirks.css
    trunk/phpgwapi/js/ckeditor/skins/moono/editor.css
    trunk/phpgwapi/js/ckeditor/skins/moono/editor_gecko.css
    trunk/phpgwapi/js/ckeditor/skins/moono/editor_ie.css
    trunk/phpgwapi/js/ckeditor/skins/moono/editor_ie7.css
    trunk/phpgwapi/js/ckeditor/skins/moono/editor_ie8.css
    trunk/phpgwapi/js/ckeditor/skins/moono/editor_iequirks.css
    trunk/phpgwapi/js/ckeditor/skins/moono/icons.png
    trunk/phpgwapi/js/ckeditor/skins/moono/icons_hidpi.png
    trunk/phpgwapi/js/ckeditor/skins/moono/images/
    trunk/phpgwapi/js/ckeditor/skins/moono/images/arrow.png
    trunk/phpgwapi/js/ckeditor/skins/moono/images/close.png
    trunk/phpgwapi/js/ckeditor/skins/moono/images/hidpi/
    trunk/phpgwapi/js/ckeditor/skins/moono/images/hidpi/close.png
    trunk/phpgwapi/js/ckeditor/skins/moono/images/hidpi/lock-open.png
    trunk/phpgwapi/js/ckeditor/skins/moono/images/hidpi/lock.png
    trunk/phpgwapi/js/ckeditor/skins/moono/images/hidpi/refresh.png
    trunk/phpgwapi/js/ckeditor/skins/moono/images/lock-open.png
    trunk/phpgwapi/js/ckeditor/skins/moono/images/lock.png
    trunk/phpgwapi/js/ckeditor/skins/moono/images/refresh.png
    trunk/phpgwapi/js/ckeditor/skins/moono/readme.md
    trunk/phpgwapi/js/ckeditor/styles.js
    trunk/phpgwapi/js/form-validator/brazil.dev.js
    trunk/phpgwapi/js/form-validator/brazil.js
    trunk/phpgwapi/js/form-validator/lang/
    trunk/phpgwapi/js/form-validator/lang/cz.dev.js
    trunk/phpgwapi/js/form-validator/lang/cz.js
    trunk/phpgwapi/js/form-validator/lang/de.dev.js
    trunk/phpgwapi/js/form-validator/lang/de.js
    trunk/phpgwapi/js/form-validator/lang/es.dev.js
    trunk/phpgwapi/js/form-validator/lang/es.js
    trunk/phpgwapi/js/form-validator/lang/fr.dev.js
    trunk/phpgwapi/js/form-validator/lang/fr.js
    trunk/phpgwapi/js/form-validator/lang/it.dev.js
    trunk/phpgwapi/js/form-validator/lang/it.js
    trunk/phpgwapi/js/form-validator/lang/no.dev.js
    trunk/phpgwapi/js/form-validator/lang/no.js
    trunk/phpgwapi/js/form-validator/lang/pl.dev.js
    trunk/phpgwapi/js/form-validator/lang/pl.js
    trunk/phpgwapi/js/form-validator/lang/pt.dev.js
    trunk/phpgwapi/js/form-validator/lang/pt.js
    trunk/phpgwapi/js/form-validator/lang/ro.dev.js
    trunk/phpgwapi/js/form-validator/lang/ro.js
    trunk/phpgwapi/js/form-validator/lang/ru.dev.js
    trunk/phpgwapi/js/form-validator/lang/ru.js
    trunk/phpgwapi/js/form-validator/lang/sv.dev.js
    trunk/phpgwapi/js/form-validator/lang/sv.js
    trunk/phpgwapi/js/form-validator/sanitize.dev.js
    trunk/phpgwapi/js/form-validator/sanitize.js
    trunk/phpgwapi/js/form-validator/theme-default.css
    trunk/phpgwapi/js/form-validator/theme-default.min.css
    trunk/phpgwapi/js/form-validator/toggleDisabled.dev.js
    trunk/phpgwapi/js/form-validator/toggleDisabled.js
    trunk/phpgwapi/js/jquery/css/humanity/
    trunk/phpgwapi/js/jquery/css/humanity/images/
    trunk/phpgwapi/js/jquery/css/humanity/images/animated-overlay.gif
    trunk/phpgwapi/js/jquery/css/humanity/images/ui-bg_flat_75_aaaaaa_40x100.png
    
trunk/phpgwapi/js/jquery/css/humanity/images/ui-bg_glass_100_f5f0e5_1x400.png
    trunk/phpgwapi/js/jquery/css/humanity/images/ui-bg_glass_25_cb842e_1x400.png
    trunk/phpgwapi/js/jquery/css/humanity/images/ui-bg_glass_70_ede4d4_1x400.png
    
trunk/phpgwapi/js/jquery/css/humanity/images/ui-bg_highlight-hard_100_f4f0ec_1x100.png
    
trunk/phpgwapi/js/jquery/css/humanity/images/ui-bg_highlight-hard_65_fee4bd_1x100.png
    
trunk/phpgwapi/js/jquery/css/humanity/images/ui-bg_highlight-hard_75_f5f5b5_1x100.png
    
trunk/phpgwapi/js/jquery/css/humanity/images/ui-bg_inset-soft_100_f4f0ec_1x100.png
    trunk/phpgwapi/js/jquery/css/humanity/images/ui-icons_c47a23_256x240.png
    trunk/phpgwapi/js/jquery/css/humanity/images/ui-icons_cb672b_256x240.png
    trunk/phpgwapi/js/jquery/css/humanity/images/ui-icons_f08000_256x240.png
    trunk/phpgwapi/js/jquery/css/humanity/images/ui-icons_f35f07_256x240.png
    trunk/phpgwapi/js/jquery/css/humanity/images/ui-icons_ff7519_256x240.png
    trunk/phpgwapi/js/jquery/css/humanity/images/ui-icons_ffffff_256x240.png
    trunk/phpgwapi/js/jquery/css/humanity/jquery-ui-1.10.4.custom xx.css
    trunk/phpgwapi/js/jquery/css/humanity/jquery-ui-1.10.4.custom xx.min.css
    trunk/phpgwapi/js/jquery/css/humanity/jquery-ui-1.10.4.custom.css
    trunk/phpgwapi/js/jquery/css/humanity/jquery-ui-1.10.4.custom.min.css
    trunk/phpgwapi/js/jquery/css/humanity/jquery.ui.theme.css
    trunk/phpgwapi/js/jquery/css/ui-lightness/images/ui-anim_basic_16x16.gif
    trunk/phpgwapi/js/jquery/js/jquery-1.11.3.min.js
    trunk/phpgwapi/js/jquery/js/jquery-2.1.4.min.js
    trunk/phpgwapi/js/jquery/js/jquery-ui-1.11.4.js
    trunk/phpgwapi/js/jquery/js/jquery-ui-1.11.4.min.js
    trunk/phpgwapi/js/jquery/mmenu/
    trunk/phpgwapi/js/jquery/mmenu/3rdparty/
    trunk/phpgwapi/js/jquery/mmenu/3rdparty/addons/
    trunk/phpgwapi/js/jquery/mmenu/3rdparty/addons/js/
    
trunk/phpgwapi/js/jquery/mmenu/3rdparty/addons/js/jquery.mmenu.currentitem.min.js
    
trunk/phpgwapi/js/jquery/mmenu/3rdparty/addons/js/jquery.mmenu.dragclose.min.js
    trunk/phpgwapi/js/jquery/mmenu/3rdparty/extensions/
    trunk/phpgwapi/js/jquery/mmenu/3rdparty/extensions/css/
    
trunk/phpgwapi/js/jquery/mmenu/3rdparty/extensions/css/jquery.mmenu.leftsubpanels.css
    
trunk/phpgwapi/js/jquery/mmenu/3rdparty/extensions/css/jquery.mmenu.panelshadow.css
    trunk/phpgwapi/js/jquery/mmenu/addons/
    trunk/phpgwapi/js/jquery/mmenu/addons/css/
    trunk/phpgwapi/js/jquery/mmenu/addons/css/jquery.mmenu.autoheight.css
    trunk/phpgwapi/js/jquery/mmenu/addons/css/jquery.mmenu.counters.css
    trunk/phpgwapi/js/jquery/mmenu/addons/css/jquery.mmenu.dividers.css
    trunk/phpgwapi/js/jquery/mmenu/addons/css/jquery.mmenu.dragopen.css
    trunk/phpgwapi/js/jquery/mmenu/addons/css/jquery.mmenu.iconpanels.css
    trunk/phpgwapi/js/jquery/mmenu/addons/css/jquery.mmenu.navbars.css
    trunk/phpgwapi/js/jquery/mmenu/addons/css/jquery.mmenu.offcanvas.css
    trunk/phpgwapi/js/jquery/mmenu/addons/css/jquery.mmenu.searchfield.css
    trunk/phpgwapi/js/jquery/mmenu/addons/css/jquery.mmenu.sectionindexer.css
    trunk/phpgwapi/js/jquery/mmenu/addons/css/jquery.mmenu.toggles.css
    trunk/phpgwapi/js/jquery/mmenu/addons/js/
    trunk/phpgwapi/js/jquery/mmenu/addons/js/jquery.mmenu.autoheight.min.js
    trunk/phpgwapi/js/jquery/mmenu/addons/js/jquery.mmenu.backbutton.min.js
    trunk/phpgwapi/js/jquery/mmenu/addons/js/jquery.mmenu.counters.min.js
    trunk/phpgwapi/js/jquery/mmenu/addons/js/jquery.mmenu.dividers.min.js
    trunk/phpgwapi/js/jquery/mmenu/addons/js/jquery.mmenu.dragopen.min.js
    trunk/phpgwapi/js/jquery/mmenu/addons/js/jquery.mmenu.fixedelements.min.js
    trunk/phpgwapi/js/jquery/mmenu/addons/js/jquery.mmenu.iconpanels.min.js
    trunk/phpgwapi/js/jquery/mmenu/addons/js/jquery.mmenu.navbars.min.js
    trunk/phpgwapi/js/jquery/mmenu/addons/js/jquery.mmenu.offcanvas.min.js
    trunk/phpgwapi/js/jquery/mmenu/addons/js/jquery.mmenu.searchfield.min.js
    trunk/phpgwapi/js/jquery/mmenu/addons/js/jquery.mmenu.sectionindexer.min.js
    trunk/phpgwapi/js/jquery/mmenu/addons/js/jquery.mmenu.toggles.min.js
    trunk/phpgwapi/js/jquery/mmenu/core/
    trunk/phpgwapi/js/jquery/mmenu/core/css/
    trunk/phpgwapi/js/jquery/mmenu/core/css/jquery.mmenu.all.css
    trunk/phpgwapi/js/jquery/mmenu/core/css/jquery.mmenu.css
    trunk/phpgwapi/js/jquery/mmenu/core/css/jquery.mmenu.oncanvas.css
    trunk/phpgwapi/js/jquery/mmenu/core/js/
    trunk/phpgwapi/js/jquery/mmenu/core/js/jquery.mmenu.min.all.js
    trunk/phpgwapi/js/jquery/mmenu/core/js/jquery.mmenu.min.js
    trunk/phpgwapi/js/jquery/mmenu/core/js/jquery.mmenu.oncanvas.min.js
    trunk/phpgwapi/js/jquery/mmenu/core/js/umd/
    trunk/phpgwapi/js/jquery/mmenu/core/js/umd/jquery.mmenu.umd.all.js
    trunk/phpgwapi/js/jquery/mmenu/core/js/umd/jquery.mmenu.umd.js
    trunk/phpgwapi/js/jquery/mmenu/extensions/
    trunk/phpgwapi/js/jquery/mmenu/extensions/css/
    trunk/phpgwapi/js/jquery/mmenu/extensions/css/jquery.mmenu.borderstyle.css
    trunk/phpgwapi/js/jquery/mmenu/extensions/css/jquery.mmenu.effects.css
    trunk/phpgwapi/js/jquery/mmenu/extensions/css/jquery.mmenu.fullscreen.css
    trunk/phpgwapi/js/jquery/mmenu/extensions/css/jquery.mmenu.iconbar.css
    trunk/phpgwapi/js/jquery/mmenu/extensions/css/jquery.mmenu.multiline.css
    trunk/phpgwapi/js/jquery/mmenu/extensions/css/jquery.mmenu.pagedim.css
    trunk/phpgwapi/js/jquery/mmenu/extensions/css/jquery.mmenu.pageshadow.css
    trunk/phpgwapi/js/jquery/mmenu/extensions/css/jquery.mmenu.positioning.css
    trunk/phpgwapi/js/jquery/mmenu/extensions/css/jquery.mmenu.themes.css
    trunk/phpgwapi/js/jquery/mmenu/extensions/css/jquery.mmenu.tileview.css
    trunk/phpgwapi/js/jquery/mmenu/extensions/css/jquery.mmenu.widescreen.css
    trunk/phpgwapi/js/jquery/mmenu/wrappers/
    trunk/phpgwapi/js/jquery/mmenu/wrappers/js/
    trunk/phpgwapi/js/jquery/mmenu/wrappers/js/jquery.mmenu.jquerymobile.min.js
    trunk/phpgwapi/js/jquery/mmenu/wrappers/js/jquery.mmenu.olark.min.js
    trunk/phpgwapi/js/jquery/mmenu/wrappers/js/jquery.mmenu.turbolinks.min.js
    trunk/phpgwapi/js/jquery/mmenu/wrappers/js/jquery.mmenu.wordpress.min.js
    trunk/phpgwapi/js/jquery/validator/README.md
    trunk/phpgwapi/js/jquery/validator/brazil.js
    trunk/phpgwapi/js/jquery/validator/jquery.form-validator.js
    trunk/phpgwapi/js/jquery/validator/jsconf.js
    trunk/phpgwapi/js/jquery/validator/lang/
    trunk/phpgwapi/js/jquery/validator/lang/cz.js
    trunk/phpgwapi/js/jquery/validator/lang/de.js
    trunk/phpgwapi/js/jquery/validator/lang/es.js
    trunk/phpgwapi/js/jquery/validator/lang/fr.js
    trunk/phpgwapi/js/jquery/validator/lang/it.js
    trunk/phpgwapi/js/jquery/validator/lang/no.dev.js
    trunk/phpgwapi/js/jquery/validator/lang/no.js
    trunk/phpgwapi/js/jquery/validator/lang/pl.js
    trunk/phpgwapi/js/jquery/validator/lang/pt.js
    trunk/phpgwapi/js/jquery/validator/lang/ro.js
    trunk/phpgwapi/js/jquery/validator/lang/ru.js
    trunk/phpgwapi/js/jquery/validator/lang/sv.js
    trunk/phpgwapi/js/jquery/validator/sanitize.js
    trunk/phpgwapi/js/jquery/validator/theme-default.css
    trunk/phpgwapi/js/jquery/validator/toggleDisabled.js
    trunk/phpgwapi/js/yui3-gallery/gallery-sm-menu/
    trunk/phpgwapi/js/yui3-gallery/gallery-sm-menu/assets/
    
trunk/phpgwapi/js/yui3-gallery/gallery-sm-menu/assets/gallery-sm-menu-core.css
    trunk/phpgwapi/js/yui3-gallery/gallery-sm-menu/assets/skins/
    trunk/phpgwapi/js/yui3-gallery/gallery-sm-menu/assets/skins/sam/
    
trunk/phpgwapi/js/yui3-gallery/gallery-sm-menu/assets/skins/sam/gallery-sm-menu-skin.css
    
trunk/phpgwapi/js/yui3-gallery/gallery-sm-menu/assets/skins/sam/gallery-sm-menu.css
    trunk/phpgwapi/js/yui3-gallery/gallery-sm-menu/gallery-sm-menu-coverage.js
    trunk/phpgwapi/js/yui3-gallery/gallery-sm-menu/gallery-sm-menu-debug.js
    trunk/phpgwapi/js/yui3-gallery/gallery-sm-menu/gallery-sm-menu-min.js
    trunk/phpgwapi/js/yui3-gallery/gallery-sm-menu/gallery-sm-menu.js
    trunk/phpgwapi/js/yui3-gallery/gallery-sm-menu-base/
    
trunk/phpgwapi/js/yui3-gallery/gallery-sm-menu-base/gallery-sm-menu-base-coverage.js
    
trunk/phpgwapi/js/yui3-gallery/gallery-sm-menu-base/gallery-sm-menu-base-debug.js
    
trunk/phpgwapi/js/yui3-gallery/gallery-sm-menu-base/gallery-sm-menu-base-min.js
    trunk/phpgwapi/js/yui3-gallery/gallery-sm-menu-base/gallery-sm-menu-base.js
    trunk/phpgwapi/js/yui3-gallery/gallery-sm-menu-item/
    
trunk/phpgwapi/js/yui3-gallery/gallery-sm-menu-item/gallery-sm-menu-item-coverage.js
    
trunk/phpgwapi/js/yui3-gallery/gallery-sm-menu-item/gallery-sm-menu-item-debug.js
    
trunk/phpgwapi/js/yui3-gallery/gallery-sm-menu-item/gallery-sm-menu-item-min.js
    trunk/phpgwapi/js/yui3-gallery/gallery-sm-menu-item/gallery-sm-menu-item.js
    trunk/phpgwapi/js/yui3-gallery/gallery-sm-menu-plugin/
    
trunk/phpgwapi/js/yui3-gallery/gallery-sm-menu-plugin/gallery-sm-menu-plugin-coverage.js
    
trunk/phpgwapi/js/yui3-gallery/gallery-sm-menu-plugin/gallery-sm-menu-plugin-debug.js
    
trunk/phpgwapi/js/yui3-gallery/gallery-sm-menu-plugin/gallery-sm-menu-plugin-min.js
    
trunk/phpgwapi/js/yui3-gallery/gallery-sm-menu-plugin/gallery-sm-menu-plugin.js
    trunk/phpgwapi/js/yui3-gallery/gallery-sm-menu-templates/
    
trunk/phpgwapi/js/yui3-gallery/gallery-sm-menu-templates/gallery-sm-menu-templates-coverage.js
    
trunk/phpgwapi/js/yui3-gallery/gallery-sm-menu-templates/gallery-sm-menu-templates-debug.js
    
trunk/phpgwapi/js/yui3-gallery/gallery-sm-menu-templates/gallery-sm-menu-templates-min.js
    
trunk/phpgwapi/js/yui3-gallery/gallery-sm-menu-templates/gallery-sm-menu-templates.js
    trunk/phpgwapi/templates/base/conditional_function.xsl
    trunk/phpgwapi/templates/portico/js/ajax_jsmenu.js
    trunk/phpgwapi/templates/pure/css/demo_mmenu.css
    trunk/phpgwapi/templates/pure/css/global.css
    trunk/phpgwapi/templates/pure/css/pure-extension.css
    trunk/phpgwapi/templates/pure/images/info.png
    trunk/phpgwapi/templates/pure/images/loader.gif
    trunk/phpgwapi/templates/pure/images/loading_overlay.gif
    trunk/phpgwapi/templates/pure/images/pathwaysep.png
    trunk/phpgwapi/templates/pure/js/mmenu.js
    trunk/phpgwapi/templates/pure/themes/
    trunk/phpgwapi/templates/pure/themes/blue.css
    trunk/phpgwapi/templates/pure/themes/grey.css
    trunk/phpsysinfo/plugins/BAT/class.bat.inc.php
    trunk/phpsysinfo/plugins/BAT/js/bat.js
    trunk/phpsysinfo/plugins/BAT/lang/cz.xml
    trunk/phpsysinfo/plugins/BAT/lang/en.xml
    trunk/phpsysinfo/plugins/BAT/lang/fr.xml
    trunk/phpsysinfo/plugins/BAT/lang/pl.xml
    trunk/phpsysinfo/plugins/BAT/lang/ru.xml
    trunk/phpsysinfo/plugins/MDStatus/class.mdstatus.inc.php
    trunk/phpsysinfo/plugins/MDStatus/css/mdstatus.css
    trunk/phpsysinfo/plugins/MDStatus/gfx/error.png
    trunk/phpsysinfo/plugins/MDStatus/gfx/harddrivefail.png
    trunk/phpsysinfo/plugins/MDStatus/gfx/harddriveok.png
    trunk/phpsysinfo/plugins/MDStatus/gfx/harddrivespare.png
    trunk/phpsysinfo/plugins/MDStatus/js/mdstatus.js
    trunk/phpsysinfo/plugins/MDStatus/lang/cz.xml
    trunk/phpsysinfo/plugins/MDStatus/lang/de.xml
    trunk/phpsysinfo/plugins/MDStatus/lang/en.xml
    trunk/phpsysinfo/plugins/MDStatus/lang/fr.xml
    trunk/phpsysinfo/plugins/MDStatus/lang/gr.xml
    trunk/phpsysinfo/plugins/MDStatus/lang/ru.xml
    trunk/phpsysinfo/plugins/PS/class.ps.inc.php
    trunk/phpsysinfo/plugins/PS/js/ps.js
    trunk/phpsysinfo/plugins/PS/lang/cz.xml
    trunk/phpsysinfo/plugins/PS/lang/de.xml
    trunk/phpsysinfo/plugins/PS/lang/en.xml
    trunk/phpsysinfo/plugins/PS/lang/fr.xml
    trunk/phpsysinfo/plugins/PS/lang/gr.xml
    trunk/phpsysinfo/plugins/PS/lang/pl.xml
    trunk/phpsysinfo/plugins/PS/lang/ru.xml
    trunk/phpsysinfo/plugins/PSStatus/class.psstatus.inc.php
    trunk/phpsysinfo/plugins/PSStatus/css/psstatus.css
    trunk/phpsysinfo/plugins/PSStatus/gfx/offline.png
    trunk/phpsysinfo/plugins/PSStatus/gfx/online.png
    trunk/phpsysinfo/plugins/PSStatus/js/psstatus.js
    trunk/phpsysinfo/plugins/PSStatus/lang/cz.xml
    trunk/phpsysinfo/plugins/PSStatus/lang/de.xml
    trunk/phpsysinfo/plugins/PSStatus/lang/en.xml
    trunk/phpsysinfo/plugins/PSStatus/lang/fr.xml
    trunk/phpsysinfo/plugins/PSStatus/lang/gr.xml
    trunk/phpsysinfo/plugins/PSStatus/lang/pl.xml
    trunk/phpsysinfo/plugins/PSStatus/lang/ru.xml
    trunk/phpsysinfo/plugins/Quotas/class.quotas.inc.php
    trunk/phpsysinfo/plugins/Quotas/css/quotas.css
    trunk/phpsysinfo/plugins/Quotas/js/quotas.js
    trunk/phpsysinfo/plugins/Quotas/lang/cz.xml
    trunk/phpsysinfo/plugins/Quotas/lang/de.xml
    trunk/phpsysinfo/plugins/Quotas/lang/en.xml
    trunk/phpsysinfo/plugins/Quotas/lang/fr.xml
    trunk/phpsysinfo/plugins/Quotas/lang/pl.xml
    trunk/phpsysinfo/plugins/Quotas/lang/ru.xml
    trunk/phpsysinfo/plugins/SMART/class.smart.inc.php
    trunk/phpsysinfo/plugins/SMART/css/smart.css
    trunk/phpsysinfo/plugins/SMART/js/smart.js
    trunk/phpsysinfo/plugins/SMART/lang/cz.xml
    trunk/phpsysinfo/plugins/SMART/lang/en.xml
    trunk/phpsysinfo/plugins/SMART/lang/fr.xml
    trunk/phpsysinfo/plugins/SMART/lang/gr.xml
    trunk/phpsysinfo/plugins/SMART/lang/pl.xml
    trunk/phpsysinfo/plugins/SMART/lang/ru.xml
    trunk/property/js/portico/admin_entity.edit_category.js
    trunk/property/js/portico/agreement.edit.js
    trunk/property/js/portico/budget.basis.js
    trunk/property/js/portico/budget.index.js
    trunk/property/js/portico/budget.obligations.js
    trunk/property/js/portico/custom.edit.js
    trunk/property/js/portico/entity.edit.js
    trunk/property/js/portico/entity.edit_inventory.js
    trunk/property/js/portico/event.index.js
    trunk/property/js/portico/gab.index.js
    trunk/property/js/portico/investment.history.js
    trunk/property/js/portico/investment.index.js
    trunk/property/js/portico/invoice.consume.js
    trunk/property/js/portico/invoice.index.js
    trunk/property/js/portico/invoice.list_sub.js
    trunk/property/js/portico/invoice2.index.js
    trunk/property/js/portico/location.edit.js
    trunk/property/js/portico/location.responsiblility_role.js
    trunk/property/js/portico/notify.js
    trunk/property/js/portico/pricebook.index.js
    trunk/property/js/portico/project.bulk_update_status.js
    trunk/property/js/portico/project.edit.js
    trunk/property/js/portico/project.index.js
    trunk/property/js/portico/request.edit.js
    trunk/property/js/portico/request.index.js
    trunk/property/js/portico/s_agreement.edit.js
    trunk/property/js/portico/tenant_claim.edit.js
    trunk/property/js/portico/tts.add.js
    trunk/property/js/portico/tts.index.js
    trunk/property/js/portico/tts.view.js
    trunk/property/js/portico/uialarm.index.js
    trunk/property/js/portico/wo_hour.deviation.js
    trunk/property/js/portico/wo_hour.index.js
    trunk/property/js/portico/wo_hour.prizebook.js
    trunk/property/js/portico/wo_hour.template.js
    trunk/property/js/portico/workorder.edit.js
    trunk/property/js/portico/workorder.index.js
    trunk/property/templates/base/invoice_list_sub.xsl
    trunk/property/templates/base/lookup.entity.xsl
    trunk/property/templates/base/wo_hour.index.xsl
    trunk/registration/js/portico/pending.index.js
    trunk/rental/js/rental/adjustment.index.js
    trunk/rental/js/rental/billing.add.js
    trunk/rental/js/rental/billing.index.js
    trunk/rental/js/rental/composite.edit.js
    trunk/rental/js/rental/composite.view.js
    trunk/rental/js/rental/contract.index.js
    trunk/rental/js/rental/contract.view.js
    trunk/rental/js/rental/frontpage.index.js
    trunk/rental/js/rental/party.edit.js
    trunk/rental/js/rental/party.sync.js
    trunk/rental/js/rental/price_item.adjust_price.js
    trunk/rental/js/rental/price_item.index.js
    trunk/rental/js/rental/resultunit.edit.js
    trunk/rental/templates/base/adjustment.xsl
    trunk/rental/templates/base/billing.xsl
    trunk/rental/templates/base/composite.xsl
    trunk/rental/templates/base/contract.xsl
    trunk/rental/templates/base/frontpage.xsl
    trunk/rental/templates/base/party.xsl
    trunk/rental/templates/base/price_item.xsl
    trunk/rental/templates/base/resultunit.xsl

Removed Paths:
-------------
    trunk/activitycalendar/js/activitycalendar/common.js
    trunk/activitycalendar/js/activitycalendar/jquery.js
    trunk/activitycalendar/templates/base/activity.php
    trunk/activitycalendar/templates/base/activity_import.php
    trunk/activitycalendar/templates/base/activity_list.php
    trunk/activitycalendar/templates/base/activity_list_partial.php
    trunk/activitycalendar/templates/base/arena.php
    trunk/activitycalendar/templates/base/arena_list.php
    trunk/activitycalendar/templates/base/arena_list_partial.php
    trunk/activitycalendar/templates/base/common.php
    trunk/activitycalendar/templates/base/dashboard.php
    trunk/activitycalendar/templates/base/group.php
    trunk/activitycalendar/templates/base/organization.php
    trunk/activitycalendar/templates/base/organization_list.php
    trunk/activitycalendar/templates/base/organization_list_changed.php
    trunk/activitycalendar/templates/base/organization_list_partial.php
    trunk/activitycalendarfrontend/templates/base/activity.php
    trunk/activitycalendarfrontend/templates/base/activity_edit.php
    trunk/activitycalendarfrontend/templates/base/activity_edit_step_1.php
    trunk/activitycalendarfrontend/templates/base/activity_new.php
    trunk/activitycalendarfrontend/templates/base/activity_new_org.php
    trunk/activitycalendarfrontend/templates/base/activity_new_step_1.php
    trunk/activitycalendarfrontend/templates/base/organization_edit.php
    trunk/activitycalendarfrontend/templates/base/organization_reciept.php
    trunk/bim/js/
    trunk/bim/templates/base/bim_showitems.xsl
    trunk/bim/templates/base/bim_showmodels.xsl
    trunk/booking/js/booking/datatable.js
    trunk/booking/templates/base/contactperson_magic.xsl
    trunk/booking/templates/base/dashboard.xsl
    trunk/booking/templates/base/datatable.xsl
    trunk/booking/templates/base/yui_booking_i18n.xsl
    trunk/controller/js/yahoo/
    trunk/controller/templates/base/yui_booking_i18n.xsl
    trunk/frontend/js/yahoo/
    trunk/messenger/js/
    trunk/phpgwapi/inc/class.yui.inc.php
    trunk/phpgwapi/inc/class.yuical.inc.php
    trunk/phpgwapi/js/DataTables/bower.json
    trunk/phpgwapi/js/DataTables/composer.json
    trunk/phpgwapi/js/DataTables/dataTables.jquery.json
    trunk/phpgwapi/js/DataTables/extensions/AutoFill/Readme.txt
    trunk/phpgwapi/js/DataTables/extensions/AutoFill/css/dataTables.autoFill.css
    
trunk/phpgwapi/js/DataTables/extensions/AutoFill/css/dataTables.autoFill.min.css
    trunk/phpgwapi/js/DataTables/extensions/AutoFill/examples/columns.html
    
trunk/phpgwapi/js/DataTables/extensions/AutoFill/examples/complete-callback.html
    trunk/phpgwapi/js/DataTables/extensions/AutoFill/examples/fill-both.html
    
trunk/phpgwapi/js/DataTables/extensions/AutoFill/examples/fill-horizontal.html
    trunk/phpgwapi/js/DataTables/extensions/AutoFill/examples/scrolling.html
    trunk/phpgwapi/js/DataTables/extensions/AutoFill/examples/simple.html
    trunk/phpgwapi/js/DataTables/extensions/AutoFill/examples/step-callback.html
    trunk/phpgwapi/js/DataTables/extensions/AutoFill/images/
    trunk/phpgwapi/js/DataTables/extensions/ColReorder/Readme.txt
    
trunk/phpgwapi/js/DataTables/extensions/ColReorder/css/dataTables.colReorder.css
    
trunk/phpgwapi/js/DataTables/extensions/ColReorder/css/dataTables.colReorder.min.css
    trunk/phpgwapi/js/DataTables/extensions/ColReorder/examples/alt_insert.html
    trunk/phpgwapi/js/DataTables/extensions/ColReorder/examples/col_filter.html
    trunk/phpgwapi/js/DataTables/extensions/ColReorder/examples/colvis.html
    
trunk/phpgwapi/js/DataTables/extensions/ColReorder/examples/fixedcolumns.html
    trunk/phpgwapi/js/DataTables/extensions/ColReorder/examples/fixedheader.html
    trunk/phpgwapi/js/DataTables/extensions/ColReorder/examples/jqueryui.html
    trunk/phpgwapi/js/DataTables/extensions/ColReorder/examples/new_init.html
    trunk/phpgwapi/js/DataTables/extensions/ColReorder/examples/predefined.html
    trunk/phpgwapi/js/DataTables/extensions/ColReorder/examples/realtime.html
    trunk/phpgwapi/js/DataTables/extensions/ColReorder/examples/reset.html
    trunk/phpgwapi/js/DataTables/extensions/ColReorder/examples/scrolling.html
    trunk/phpgwapi/js/DataTables/extensions/ColReorder/examples/server_side.html
    trunk/phpgwapi/js/DataTables/extensions/ColReorder/examples/simple.html
    trunk/phpgwapi/js/DataTables/extensions/ColReorder/examples/state_save.html
    trunk/phpgwapi/js/DataTables/extensions/ColReorder/images/
    trunk/phpgwapi/js/DataTables/extensions/ColVis/Readme.txt
    trunk/phpgwapi/js/DataTables/extensions/FixedColumns/Readme.txt
    
trunk/phpgwapi/js/DataTables/extensions/FixedColumns/css/dataTables.fixedColumns.css
    
trunk/phpgwapi/js/DataTables/extensions/FixedColumns/css/dataTables.fixedColumns.min.css
    trunk/phpgwapi/js/DataTables/extensions/FixedColumns/examples/bootstrap.html
    
trunk/phpgwapi/js/DataTables/extensions/FixedColumns/examples/col_filter.html
    trunk/phpgwapi/js/DataTables/extensions/FixedColumns/examples/colvis.html
    trunk/phpgwapi/js/DataTables/extensions/FixedColumns/examples/css_size.html
    
trunk/phpgwapi/js/DataTables/extensions/FixedColumns/examples/index_column.html
    
trunk/phpgwapi/js/DataTables/extensions/FixedColumns/examples/left_right_columns.html
    
trunk/phpgwapi/js/DataTables/extensions/FixedColumns/examples/right_column.html
    trunk/phpgwapi/js/DataTables/extensions/FixedColumns/examples/rowspan.html
    
trunk/phpgwapi/js/DataTables/extensions/FixedColumns/examples/server-side-processing.html
    trunk/phpgwapi/js/DataTables/extensions/FixedColumns/examples/simple.html
    
trunk/phpgwapi/js/DataTables/extensions/FixedColumns/examples/size_fixed.html
    
trunk/phpgwapi/js/DataTables/extensions/FixedColumns/examples/size_fluid.html
    
trunk/phpgwapi/js/DataTables/extensions/FixedColumns/examples/two_columns.html
    trunk/phpgwapi/js/DataTables/extensions/FixedHeader/Readme.txt
    
trunk/phpgwapi/js/DataTables/extensions/FixedHeader/css/dataTables.fixedHeader.css
    
trunk/phpgwapi/js/DataTables/extensions/FixedHeader/css/dataTables.fixedHeader.min.css
    
trunk/phpgwapi/js/DataTables/extensions/FixedHeader/examples/header_footer.html
    trunk/phpgwapi/js/DataTables/extensions/FixedHeader/examples/simple.html
    
trunk/phpgwapi/js/DataTables/extensions/FixedHeader/examples/top_left_right.html
    trunk/phpgwapi/js/DataTables/extensions/FixedHeader/examples/two_tables.html
    trunk/phpgwapi/js/DataTables/extensions/FixedHeader/examples/zIndexes.html
    trunk/phpgwapi/js/DataTables/extensions/KeyTable/Readme.txt
    trunk/phpgwapi/js/DataTables/extensions/KeyTable/css/dataTables.keyTable.css
    
trunk/phpgwapi/js/DataTables/extensions/KeyTable/css/dataTables.keyTable.min.css
    trunk/phpgwapi/js/DataTables/extensions/KeyTable/examples/events.html
    trunk/phpgwapi/js/DataTables/extensions/KeyTable/examples/html.html
    trunk/phpgwapi/js/DataTables/extensions/KeyTable/examples/scrolling.html
    trunk/phpgwapi/js/DataTables/extensions/KeyTable/examples/simple.html
    
trunk/phpgwapi/js/DataTables/extensions/Responsive/css/dataTables.responsive.css
    
trunk/phpgwapi/js/DataTables/extensions/Responsive/css/dataTables.responsive.scss
    trunk/phpgwapi/js/DataTables/extensions/Responsive/examples/display-control/
    trunk/phpgwapi/js/DataTables/extensions/Scroller/Readme.txt
    trunk/phpgwapi/js/DataTables/extensions/Scroller/css/dataTables.scroller.css
    
trunk/phpgwapi/js/DataTables/extensions/Scroller/css/dataTables.scroller.min.css
    trunk/phpgwapi/js/DataTables/extensions/Scroller/examples/api_scrolling.html
    
trunk/phpgwapi/js/DataTables/extensions/Scroller/examples/large_js_source.html
    
trunk/phpgwapi/js/DataTables/extensions/Scroller/examples/server-side_processing.html
    trunk/phpgwapi/js/DataTables/extensions/Scroller/examples/simple.html
    trunk/phpgwapi/js/DataTables/extensions/Scroller/examples/state_saving.html
    trunk/phpgwapi/js/DataTables/extensions/Scroller/images/
    trunk/phpgwapi/js/DataTables/extensions/TableTools/Readme.txt
    trunk/phpgwapi/js/DataTables/extensions/TableTools/images/background.png
    trunk/phpgwapi/js/DataTables/media/images/back_disabled.png
    trunk/phpgwapi/js/DataTables/media/images/back_enabled.png
    trunk/phpgwapi/js/DataTables/media/images/back_enabled_hover.png
    trunk/phpgwapi/js/DataTables/media/images/forward_disabled.png
    trunk/phpgwapi/js/DataTables/media/images/forward_enabled.png
    trunk/phpgwapi/js/DataTables/media/images/forward_enabled_hover.png
    trunk/phpgwapi/js/DataTables/media/js/jquery.dataTables.columnFilter.js
    trunk/phpgwapi/js/DataTables/package.json
    trunk/phpgwapi/js/ckeditor/.htaccess
    trunk/phpgwapi/js/ckeditor/CHANGES.html
    trunk/phpgwapi/js/ckeditor/INSTALL.html
    trunk/phpgwapi/js/ckeditor/LICENSE.html
    trunk/phpgwapi/js/ckeditor/_samples/
    trunk/phpgwapi/js/ckeditor/ckeditor.pack
    trunk/phpgwapi/js/ckeditor/ckeditor.php
    trunk/phpgwapi/js/ckeditor/ckeditor_basic.js
    trunk/phpgwapi/js/ckeditor/ckeditor_basic_source.js
    trunk/phpgwapi/js/ckeditor/ckeditor_php4.php
    trunk/phpgwapi/js/ckeditor/ckeditor_php5.php
    trunk/phpgwapi/js/ckeditor/ckeditor_source.js
    trunk/phpgwapi/js/ckeditor/images/
    trunk/phpgwapi/js/ckeditor/lang/_languages.js
    trunk/phpgwapi/js/ckeditor/lang/_translationstatus.txt
    trunk/phpgwapi/js/ckeditor/plugins/a11yhelp/lang/
    trunk/phpgwapi/js/ckeditor/plugins/colordialog/
    trunk/phpgwapi/js/ckeditor/plugins/div/
    trunk/phpgwapi/js/ckeditor/plugins/find/
    trunk/phpgwapi/js/ckeditor/plugins/flash/
    trunk/phpgwapi/js/ckeditor/plugins/forms/
    trunk/phpgwapi/js/ckeditor/plugins/iframedialog/
    trunk/phpgwapi/js/ckeditor/plugins/link/images/anchor.gif
    trunk/phpgwapi/js/ckeditor/plugins/pagebreak/
    trunk/phpgwapi/js/ckeditor/plugins/pastetext/
    trunk/phpgwapi/js/ckeditor/plugins/showblocks/
    trunk/phpgwapi/js/ckeditor/plugins/smiley/
    trunk/phpgwapi/js/ckeditor/plugins/styles/
    trunk/phpgwapi/js/ckeditor/plugins/templates/
    trunk/phpgwapi/js/ckeditor/plugins/uicolor/
    trunk/phpgwapi/js/ckeditor/skins/kama/
    trunk/phpgwapi/js/ckeditor/skins/office2003/
    trunk/phpgwapi/js/ckeditor/skins/v2/
    trunk/phpgwapi/js/ckeditor/themes/
    trunk/phpgwapi/js/form-validator/form-test.html
    trunk/phpgwapi/js/form-validator/qunit.html
    trunk/phpgwapi/js/yahoo/animation/animation-debug.js
    trunk/phpgwapi/js/yahoo/animation/animation-min.js
    trunk/phpgwapi/js/yahoo/animation/animation.js
    trunk/phpgwapi/js/yahoo/assets/skins/
    trunk/phpgwapi/js/yahoo/autocomplete/
    trunk/phpgwapi/js/yahoo/base/
    trunk/phpgwapi/js/yahoo/button/
    trunk/phpgwapi/js/yahoo/calendar/assets/
    trunk/phpgwapi/js/yahoo/calendar/calendar-debug.js
    trunk/phpgwapi/js/yahoo/calendar/calendar-min.js
    trunk/phpgwapi/js/yahoo/calendar/calendar.js
    trunk/phpgwapi/js/yahoo/carousel/
    trunk/phpgwapi/js/yahoo/charts/
    trunk/phpgwapi/js/yahoo/colorpicker/
    trunk/phpgwapi/js/yahoo/common.js
    trunk/phpgwapi/js/yahoo/connection/connection-debug.js
    trunk/phpgwapi/js/yahoo/connection/connection-min.js
    trunk/phpgwapi/js/yahoo/connection/connection.js
    trunk/phpgwapi/js/yahoo/connection/connection.swf
    trunk/phpgwapi/js/yahoo/connection/connection_core-debug.js
    trunk/phpgwapi/js/yahoo/connection/connection_core-min.js
    trunk/phpgwapi/js/yahoo/connection/connection_core.js
    trunk/phpgwapi/js/yahoo/container/
    trunk/phpgwapi/js/yahoo/cookie/
    trunk/phpgwapi/js/yahoo/datasource/
    trunk/phpgwapi/js/yahoo/datatable/
    trunk/phpgwapi/js/yahoo/datatable.js
    trunk/phpgwapi/js/yahoo/datemath/
    trunk/phpgwapi/js/yahoo/dom/dom-debug.js
    trunk/phpgwapi/js/yahoo/dom/dom-min.js
    trunk/phpgwapi/js/yahoo/dom/dom.js
    trunk/phpgwapi/js/yahoo/dragdrop/dragdrop-debug.js
    trunk/phpgwapi/js/yahoo/dragdrop/dragdrop-min.js
    trunk/phpgwapi/js/yahoo/dragdrop/dragdrop.js
    trunk/phpgwapi/js/yahoo/editor/
    trunk/phpgwapi/js/yahoo/element/
    trunk/phpgwapi/js/yahoo/element-delegate/
    trunk/phpgwapi/js/yahoo/event/event-debug.js
    trunk/phpgwapi/js/yahoo/event/event-min.js
    trunk/phpgwapi/js/yahoo/event/event.js
    trunk/phpgwapi/js/yahoo/event-delegate/
    trunk/phpgwapi/js/yahoo/event-mouseenter/
    trunk/phpgwapi/js/yahoo/event-simulate/
    trunk/phpgwapi/js/yahoo/examples/
    trunk/phpgwapi/js/yahoo/fonts/
    trunk/phpgwapi/js/yahoo/get/
    trunk/phpgwapi/js/yahoo/grids/
    trunk/phpgwapi/js/yahoo/history/
    trunk/phpgwapi/js/yahoo/imagecropper/
    trunk/phpgwapi/js/yahoo/imageloader/
    trunk/phpgwapi/js/yahoo/json/
    trunk/phpgwapi/js/yahoo/layout/
    trunk/phpgwapi/js/yahoo/logger/
    trunk/phpgwapi/js/yahoo/menu/
    trunk/phpgwapi/js/yahoo/paginator/
    trunk/phpgwapi/js/yahoo/profiler/
    trunk/phpgwapi/js/yahoo/profilerviewer/
    trunk/phpgwapi/js/yahoo/progressbar/
    trunk/phpgwapi/js/yahoo/reset/
    trunk/phpgwapi/js/yahoo/reset-fonts/
    trunk/phpgwapi/js/yahoo/reset-fonts-grids/
    trunk/phpgwapi/js/yahoo/resize/
    trunk/phpgwapi/js/yahoo/selector/
    trunk/phpgwapi/js/yahoo/slider/assets/
    trunk/phpgwapi/js/yahoo/slider/slider-debug.js
    trunk/phpgwapi/js/yahoo/slider/slider-min.js
    trunk/phpgwapi/js/yahoo/slider/slider.js
    trunk/phpgwapi/js/yahoo/storage/
    trunk/phpgwapi/js/yahoo/stylesheet/
    trunk/phpgwapi/js/yahoo/swf/
    trunk/phpgwapi/js/yahoo/swfdetect/
    trunk/phpgwapi/js/yahoo/swfstore/
    trunk/phpgwapi/js/yahoo/tabview/
    trunk/phpgwapi/js/yahoo/treeview/assets/
    trunk/phpgwapi/js/yahoo/treeview/treeview-debug.js
    trunk/phpgwapi/js/yahoo/treeview/treeview-min.js
    trunk/phpgwapi/js/yahoo/treeview/treeview.js
    trunk/phpgwapi/js/yahoo/uploader/
    trunk/phpgwapi/js/yahoo/utilities/
    trunk/phpgwapi/js/yahoo/yahoo/
    trunk/phpgwapi/js/yahoo/yahoo-dom-event/
    trunk/phpgwapi/js/yahoo/yuiloader/
    trunk/phpgwapi/js/yahoo/yuiloader-dom-event/
    trunk/phpgwapi/js/yahoo/yuitest/
    trunk/phpgwapi/templates/base/datatable_common.xsl
    trunk/phpgwapi/templates/base/yui_phpgw_i18n.xsl
    trunk/property/inc/class.uicommon.inc.php
    trunk/property/inc/class.uigeneric_test.inc.php
    trunk/property/js/newdesign/
    trunk/property/js/yahoo/
    trunk/property/templates/base/event_schedule.xsl
    trunk/property/templates/base/event_schedule_week.xsl
    trunk/property/templates/base/lookup.xsl
    trunk/property/templates/base/yui_property_i18n.xsl
    trunk/property/test_menu.php
    trunk/registration/js/yahoo/
    trunk/registration/templates/base/pending_users.xsl
    trunk/registration/templates/base/yui_phpgw_i18n.xsl
    trunk/rental/js/rental/common.js
    trunk/rental/templates/base/adjustment.php
    trunk/rental/templates/base/adjustment_list.php
    trunk/rental/templates/base/adjustment_list_partial.php
    trunk/rental/templates/base/admin_price_item.php
    trunk/rental/templates/base/admin_price_item_list.php
    trunk/rental/templates/base/admin_price_item_manual_adjustment.php
    trunk/rental/templates/base/billing.php
    trunk/rental/templates/base/billing_list_partial.php
    trunk/rental/templates/base/billing_step0.php
    trunk/rental/templates/base/billing_step1.php
    trunk/rental/templates/base/billing_step2.php
    trunk/rental/templates/base/common.php
    trunk/rental/templates/base/composite.php
    trunk/rental/templates/base/composite_list.php
    trunk/rental/templates/base/composite_list_partial.php
    trunk/rental/templates/base/contract.php
    trunk/rental/templates/base/contract_list.php
    trunk/rental/templates/base/contract_list_partial.php
    trunk/rental/templates/base/contract_warnings_partial.php
    trunk/rental/templates/base/contracts_for_regulation_list.php
    trunk/rental/templates/base/delegate_list.php
    trunk/rental/templates/base/document_list_partial.php
    trunk/rental/templates/base/facilit_import.php
    trunk/rental/templates/base/facilit_import_adjustment.php
    trunk/rental/templates/base/form_buttons.php
    trunk/rental/templates/base/frontpage.php
    trunk/rental/templates/base/invoice_list_partial.php
    trunk/rental/templates/base/invoice_price_item_list_partial.php
    trunk/rental/templates/base/notification_list.php
    trunk/rental/templates/base/orphan_unit_list.php
    trunk/rental/templates/base/party.php
    trunk/rental/templates/base/party_list.php
    trunk/rental/templates/base/party_list_partial.php
    trunk/rental/templates/base/permission_denied.php
    trunk/rental/templates/base/price_item_partial.php
    trunk/rental/templates/base/property_location_partial.php
    trunk/rental/templates/base/resultunit.php
    trunk/rental/templates/base/resultunit_list.php
    trunk/rental/templates/base/resultunit_list_partial.php
    trunk/rental/templates/base/sync_party_list.php
    trunk/rental/templates/base/sync_party_list_identifier.php
    trunk/rental/templates/base/sync_party_list_org_id.php
    trunk/rental/templates/base/sync_party_list_res_unit.php
    trunk/rental/templates/base/total_price_partial.php
    trunk/rental/templates/base/unit_list_partial.php

Modified: trunk/about.php
===================================================================
--- trunk/about.php     2016-02-10 10:51:51 UTC (rev 14718)
+++ trunk/about.php     2016-02-10 19:45:46 UTC (rev 14719)
@@ -153,4 +153,5 @@
        $GLOBALS['phpgw_info']['flags']['app_header'] = lang('About %1',$title);
        $GLOBALS['phpgw']->common->phpgw_header(true);
        $GLOBALS['phpgw']->template->pparse('out','phpgw_about');
-       $GLOBALS['phpgw']->common->phpgw_footer();
\ No newline at end of file
+       $GLOBALS['phpgw']->common->phpgw_footer();
+?>

Modified: trunk/activitycalendar/inc/class.menu.inc.php
===================================================================
--- trunk/activitycalendar/inc/class.menu.inc.php       2016-02-10 10:51:51 UTC 
(rev 14718)
+++ trunk/activitycalendar/inc/class.menu.inc.php       2016-02-10 19:45:46 UTC 
(rev 14719)
@@ -1,6 +1,8 @@
 <?php
+
        class activitycalendar_menu
        {
+
                function get_menu()
                {
                        $incoming_app = 
$GLOBALS['phpgw_info']['flags']['currentapp'];
@@ -12,7 +14,7 @@
                                'activitycalendar' => array
                                (
                                        'text'  => lang('Activitycalendar'),
-                                       'url'   => 
$GLOBALS['phpgw']->link('/index.php', array('menuaction'=> 
'activitycalendar.uidashboard.index') ),
+                                       'url'    => 
$GLOBALS['phpgw']->link('/index.php', array('menuaction' => 
'activitycalendar.uidashboard.index')),
                     'image'    => array('property', 'location'),
                                        'order' => 10,
                                        'group' => 'office'
@@ -24,31 +26,31 @@
                                'dashboard' => array
                                (
                                        'text'  => lang('dashboard'),
-                                       'url'   => 
$GLOBALS['phpgw']->link('/index.php', array('menuaction'=> 
'activitycalendar.uidashboard.index') ),
+                                       'url'    => 
$GLOBALS['phpgw']->link('/index.php', array('menuaction' => 
'activitycalendar.uidashboard.index')),
                     'image'    => array('property', 'location_tenant'),
                                ),
                                'activities' => array
                                (
                                        'text'  => lang('Activities'),
-                                       'url'   => 
$GLOBALS['phpgw']->link('/index.php', array('menuaction'=> 
'activitycalendar.uiactivities.index') ),
+                                       'url'    => 
$GLOBALS['phpgw']->link('/index.php', array('menuaction' => 
'activitycalendar.uiactivities.index')),
                     'image'    => array('property', 'location_tenant'),
                                ),
                                'arena' => array
                                (
                                        'text'  => lang('Arena'),
-                                       'url'   => 
$GLOBALS['phpgw']->link('/index.php', array('menuaction'=> 
'activitycalendar.uiarena.index') ),
+                                       'url'    => 
$GLOBALS['phpgw']->link('/index.php', array('menuaction' => 
'activitycalendar.uiarena.index')),
                                  'image'       => array('property', 
'location_1'),
                                ),
                                'organizationList' => array
                                (
                                        'text'  => lang('OrganizationList'),
-                                       'url'   => 
$GLOBALS['phpgw']->link('/index.php', array('menuaction'=> 
'activitycalendar.uiorganization.index') ),
+                                       'url'            => 
$GLOBALS['phpgw']->link('/index.php', array('menuaction' => 
'activitycalendar.uiorganization.index')),
                            'image'     => array('property', 'location_tenant'),
                                        'children'      => array(
                                                                
'changed_organizations' => array
                                                                (
                                                                        'text'  
=> lang('changed_org_group'),
-                                                                       'url'   
=> $GLOBALS['phpgw']->link('/index.php', array('menuaction' => 
'activitycalendar.uiorganization.changed_organizations') ),
+                                                       'url'    => 
$GLOBALS['phpgw']->link('/index.php', array('menuaction' => 
'activitycalendar.uiorganization.changed_organizations')),
                                                                        'image' 
=> array('property', 'location_tenant')
                                                                )
                                                        )

Modified: trunk/activitycalendar/inc/class.soactivity.inc.php
===================================================================
--- trunk/activitycalendar/inc/class.soactivity.inc.php 2016-02-10 10:51:51 UTC 
(rev 14718)
+++ trunk/activitycalendar/inc/class.soactivity.inc.php 2016-02-10 19:45:46 UTC 
(rev 14719)
@@ -1,18 +1,18 @@
 <?php
-phpgw::import_class('activitycalendar.socommon');
-phpgw::import_class('activitycalendar.soorganization');
-phpgw::import_class('activitycalendar.sogroup');
+       phpgw::import_class('activitycalendar.socommon');
+       phpgw::import_class('activitycalendar.soorganization');
+       phpgw::import_class('activitycalendar.sogroup');
 //phpgw::import_class('activitycalendar.socontactperson');
 
-include_class('activitycalendar', 'activity', 'inc/model/');
-include_class('activitycalendar', 'target', 'inc/model/');
-include_class('activitycalendar', 'category', 'inc/model/');
+       include_class('activitycalendar', 'activity', 'inc/model/');
+       include_class('activitycalendar', 'target', 'inc/model/');
+       include_class('activitycalendar', 'category', 'inc/model/');
 
-class activitycalendar_soactivity extends activitycalendar_socommon
-{
+       class activitycalendar_soactivity extends activitycalendar_socommon
+       {
+
        protected static $so;
        protected $soap = false;
-
        public $soap_functions = array
                (
                        'get_activities' => array
@@ -21,7 +21,6 @@
                                'out' => array('array')
                        )
                );
-
        public $xmlrpc_methods = array
        (
                array
@@ -60,7 +59,6 @@
                        'decription' => 'Return incoming params'
                )
        );
-
        var $public_functions = array
                (
                        'get_activities'                => true,
@@ -75,7 +73,8 @@
         */
        public static function get_instance()
        {
-               if (self::$so == null) {
+                       if(self::$so == null)
+                       {
                        self::$so = CreateObject('activitycalendar.soactivity');
                }
                return self::$so;
@@ -102,24 +101,26 @@
                //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";
                        $order = "ORDER BY $sort_field $dir";
                }
-               /*else
+                       /* else
                {
                        $dir = $ascending ? 'ASC' : 'DESC';
                        $order = "ORDER BY id $dir";
-               }*/
+                         } */
                //var_dump($search_type);
                //var_dump($search_for);
                if($search_for)
                {
-                       $query = $this->marshal($search_for,'string');
-                       $like_pattern = "'%".$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";
                                        $like_clauses[] = "party.last_name 
$this->like $like_pattern";
@@ -155,31 +156,37 @@
 
                $filter_clauses = array();
 
-               if(isset($filters[$this->get_id_field_name()])){
-                       $id = 
$this->marshal($filters[$this->get_id_field_name()],'int');
+                       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['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'){
-                               $activity_state = 
$this->marshal($filters['activity_state'],'int');
+                               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'){
-                               $activity_org = 
$this->marshal($filters['activity_org'],'int');
+                               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'){
-                               $activity_category = 
$this->marshal($filters['activity_category'],'int');
+                               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')
                                {
-                                       $activity_district = 
$this->marshal($filters['activity_district'],'int');
+                                               $activity_district       = 
$this->marshal($filters['activity_district'], 'int');
                                        $filter_clauses[] = "activity.office = 
'{$activity_district}'";
                                }
                        }
@@ -190,7 +197,7 @@
                                {
                                     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;
@@ -206,22 +213,26 @@
                }
                else
                {
-                       if(isset($filters['activity_state']) && 
$filters['activity_state'] != 'all'){
-                               $activity_state = 
$this->marshal($filters['activity_state'],'int');
+                               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'){
-                               $activity_org = 
$this->marshal($filters['activity_org'],'int');
+                               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'){
-                               $activity_category = 
$this->marshal($filters['activity_category'],'int');
+                               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')
                                {
-                                       $activity_district = 
$this->marshal($filters['activity_district'],'int');
+                                               $activity_district       = 
$this->marshal($filters['activity_district'], 'int');
                                        $filter_clauses[] = "activity.office = 
'{$activity_district}'";
                                }
                        }
@@ -232,7 +243,7 @@
                                {
                                     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}'";
@@ -283,20 +294,17 @@
                        $columns[] = 'activity.new_org';
                        $columns[] = 'activity.new_group';
 
-                       $cols = implode(',',$columns);
+                               $cols = implode(',', $columns);
                }
 
                $tables = "activity_activity activity";
 
                //$join_contracts = "   {$this->left_join} 
rental_contract_party c_p ON (c_p.party_id = party.id)
                //{$this->left_join} rental_contract contract ON (contract.id = 
c_p.contract_id)";
-
                //var_dump("SELECT {$cols} FROM {$tables} WHERE {$condition} 
{$order}");
                return "SELECT {$cols} FROM {$tables} WHERE {$condition} 
{$order}";
        }
 
-
-
        /**
         * Function for adding a new activity to the database. Updates the 
activity object.
         *
@@ -308,10 +316,11 @@
                // Insert a new activity
                $ts_now = strtotime('now');
                $secret = $this->generate_secret();
-               $q ="INSERT INTO activity_activity (title, create_date,secret) 
VALUES ('tmptitle', $ts_now, '{$secret}')";
-               $result = $this->db->query($q, __LINE__,__FILE__);
+                       $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'));
                        // Forward this request to the update method
@@ -336,7 +345,7 @@
 
                $values = array(
                        'title = '     . $this->marshal($activity->get_title(), 
'string'),
-                       'organization_id = '. 
$this->marshal($activity->get_organization_id(), 'int'),
+                               'organization_id = ' . 
$this->marshal($activity->get_organization_id(), 'int'),
                        'group_id = '     . 
$this->marshal($activity->get_group_id(), 'int'),
                        'district =  '     . 
$this->marshal($activity->get_district(), 'string'),
                        'office =  '     . 
$this->marshal($activity->get_office(), 'int'),
@@ -352,14 +361,14 @@
                        'contact_person_2 = '          . 
$this->marshal($activity->get_contact_person_2(), 'int'),
                        'contact_person_2_address = '          . 
$this->marshal($activity->get_contact_person_2_address(), 'string'),
                        'contact_person_2_zip = '          . 
$this->marshal($activity->get_contact_person_2_zip(), 'string'),
-                       'special_adaptation = '                 
.($activity->get_special_adaptation() ? "true" : "false"),
-                       'frontend = '                   
.($activity->get_frontend() ? "true" : "false"),
-                       'new_org = '                    
.($activity->get_new_org() ? "true" : "false"),
-                       'new_group = '                  
.($activity->get_new_group() ? "true" : "false")
+                               'special_adaptation = ' . 
($activity->get_special_adaptation() ? "true" : "false"),
+                               'frontend = ' . ($activity->get_frontend() ? 
"true" : "false"),
+                               'new_org = ' . ($activity->get_new_org() ? 
"true" : "false"),
+                               'new_group = ' . ($activity->get_new_group() ? 
"true" : "false")
                );
 
                //var_dump('UPDATE activity_activity SET ' . join(',', $values) 
. " WHERE id=$id");
-               $result = $this->db->query('UPDATE activity_activity SET ' . 
join(',', $values) . " WHERE id=$id", __LINE__,__FILE__);
+                       $result = $this->db->query('UPDATE activity_activity 
SET ' . join(',', $values) . " WHERE id=$id", __LINE__, __FILE__);
 
                return isset($result);
        }
@@ -411,11 +420,11 @@
                        $this->marshal($activity->get_contact_person_2(), 
'int'),
                        
$this->marshal($activity->get_contact_person_2_address(), 'string'),
                        $this->marshal($activity->get_contact_person_2_zip(), 
'string'),
-                       $this->marshal($this->generate_secret(),'string'),
+                               $this->marshal($this->generate_secret(), 
'string'),
                        ($activity->get_special_adaptation() ? "true" : "false")
                );
 
-               $result = $this->db->query('INSERT INTO activity_activity (' . 
join(',', $columns) . ') VALUES (' . join(',', $values) . ')', 
__LINE__,__FILE__);
+                       $result = $this->db->query('INSERT INTO 
activity_activity (' . join(',', $columns) . ') VALUES (' . join(',', $values) 
. ')', __LINE__, __FILE__);
 
                return isset($result);
        }
@@ -441,8 +450,9 @@
        protected function populate(int $activity_id, &$activity)
        {
 
-               if($activity == null) {
-                       $activity = new activitycalendar_activity((int) 
$activity_id);
+                       if($activity == null)
+                       {
+                               $activity = new 
activitycalendar_activity((int)$activity_id);
 
                        
$activity->set_title($this->unmarshal($this->db->f('title'), 'string'));
                        
$activity->set_organization_id($this->unmarshal($this->db->f('organization_id'),
 'int'));
@@ -495,7 +505,6 @@
                                        
$activity->set_contact_persons($contacts);
                                }
                        }
-
                }
 
                return $activity;
@@ -508,7 +517,8 @@
                {
                        $sql = "SELECT name FROM bb_activity where 
id=$category_id";
                        $this->db->query($sql, __LINE__, __FILE__);
-                       while($this->db->next_record()){
+                               while($this->db->next_record())
+                               {
                                $result = $this->db->f('name');
                        }
        }
@@ -520,7 +530,8 @@
                $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'));
@@ -534,7 +545,7 @@
                $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())
+                       while($this->db->next_record())
                {
                        $district[$i]['id'] = $this->db->f('id');
                        $district[$i]['name'] = 
stripslashes($this->db->f('descr'));
@@ -547,7 +558,8 @@
        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()){
+                       while($this->db->next_record())
+                       {
                        $result = $this->db->f('part_of_town_id');
                }
                return $result;
@@ -556,13 +568,13 @@
        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()){
+                       while($this->db->next_record())
+                       {
                        $result = $this->db->f('name');
                }
                return $result;
        }
 
-
        function get_district_name($district_id)
        {
                //$result = "Ingen";
@@ -571,12 +583,13 @@
                {
                        $sql = "SELECT district_id, name FROM fm_part_of_town 
where part_of_town_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 . ',';
                        }
-                       $result = implode(", ",$values);
+                               $result = implode(", ", $values);
                        return $result;
        }
        return "";
@@ -587,7 +600,7 @@
                $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())
+                       while($this->db->next_record())
                {
                        $name = $this->db->f('name');
                        if($name != 'ØVRIGE')
@@ -601,16 +614,16 @@
                return $district;
        }
 
-
        function get_office_from_user($user_id)
        {
                if(user_id)
                {
                        $user_id = (int)$user_id;
-                       $q1="SELECT office FROM bb_office_user WHERE 
account_id={$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()){
+                               while($this->db->next_record())
+                               {
                                $office_id = $this->db->f('office');
                        }
                }
@@ -624,7 +637,8 @@
                {
                        $sql = "SELECT descr FROM fm_district where 
id=$district_id";
                        $this->db->query($sql, __LINE__, __FILE__);
-                       while($this->db->next_record()){
+                               while($this->db->next_record())
+                               {
                                $result = $this->db->f('descr');
                        }
        }
@@ -638,7 +652,8 @@
             {
                $sql = "SELECT description FROM bb_office where id=$office_id";
                $this->db->query($sql, __LINE__, __FILE__);
-               while($this->db->next_record()){
+                               while($this->db->next_record())
+                               {
                     $result = $this->db->f('description');
                }
             }
@@ -652,7 +667,8 @@
                {
                        $sql = "SELECT name FROM bb_agegroup where 
id=$target_id";
                        $this->db->query($sql, __LINE__, __FILE__);
-                       while($this->db->next_record()){
+                               while($this->db->next_record())
+                               {
                                $result = $this->db->f('name');
                        }
        }
@@ -664,7 +680,8 @@
                $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')
                        {
@@ -683,7 +700,8 @@
        {
                        $sql = "select id from bb_activity where name like 
'%{$name}%'";
                $this->db->query($sql, __LINE__, __FILE__);
-                       while($this->db->next_record()){
+                               while($this->db->next_record())
+                               {
                                $result = $this->db->f('id');
                        }
        }
@@ -696,7 +714,8 @@
        {
                        $sql = "select id from bb_agegroup where sort={$id} and 
active=1";
                $this->db->query($sql, __LINE__, __FILE__);
-                       while($this->db->next_record()){
+                               while($this->db->next_record())
+                               {
                                $result = $this->db->f('id');
                        }
        }
@@ -709,7 +728,8 @@
        {
                        $sql = "select id from bb_organization where 
organization_number='{$orgno}'";
                $this->db->query($sql, __LINE__, __FILE__);
-                       while($this->db->next_record()){
+                               while($this->db->next_record())
+                               {
                                $result = $this->db->f('id');
                        }
        }
@@ -750,13 +770,13 @@
                $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
+                               $activities[]    = array
                        (
-                               'id'                            => (int) 
$this->db->f('id'),
-                               'title'                         => $soap ? 
$this->db->f('title',true) : utf8_decode($this->db->f('title',true)),
+                                       'id'                             => 
(int)$this->db->f('id'),
+                                       'title'                          => 
$soap ? $this->db->f('title', true) : utf8_decode($this->db->f('title', true)),
                                'organization_id'       => 
$this->db->f('organization_id'),
                                'group_id'                      => 
$this->db->f('group_id'),
                                'district'                      => 
$this->db->f('district'),
@@ -765,14 +785,14 @@
                                'target'                        => 
$this->db->f('target'),
                                'arena'                         => 
$this->db->f('arena'),
                            'internal_arena'    => 
$this->db->f('internal_arena'),
-                               'time'                          => $soap ? 
$this->db->f('time',true) : utf8_decode($this->db->f('time',true)),
+                                       'time'                           => 
$soap ? $this->db->f('time', true) : utf8_decode($this->db->f('time', true)),
                                'contact_person_1'      => 
$this->db->f('contact_person_1'),
                                'contact_person_2'      => 
$this->db->f('contact_person_2'),
-                               'special_adaptation'=> 
$this->db->f('special_adaptation'),
+                                       'special_adaptation' => 
$this->db->f('special_adaptation'),
                        );
                }
 
-               foreach ($activities as &$activity)
+                       foreach($activities as &$activity)
                {
                                if($activity['group_id'] && 
!$activity['group_id'] == '' && !$activity['group_id'] == 0)
                                {
@@ -786,10 +806,10 @@
                                }
                                $activity['district_name']              = $soap 
? $this->get_district_name($activity['district']) : 
utf8_decode($this->get_district_name($activity['district']));
                                $activity['category_name']              = $soap 
? $this->get_category_name($activity['category']) : 
utf8_decode($this->get_category_name($activity['category']));
-                               $activity['description']                = 
$this->get_activity_description($activity['organization_id'],$activity['group_id']);
+                               $activity['description']                 = 
$this->get_activity_description($activity['organization_id'], 
$activity['group_id']);
                                $activity['arena_info']                 = 
$this->get_all_arena_info($activity['arena'], $activity['internal_arena']);
-                               $activity['internal_arena_info']= 
$this->get_internal_arena_info($activity['internal_arena']);
-                               $activity['contact_person']             = 
$this->get_contact_person($activity['organization_id'],$activity['group_id'],$activity['contact_person_1']);
+                               $activity['internal_arena_info'] = 
$this->get_internal_arena_info($activity['internal_arena']);
+                               $activity['contact_person']              = 
$this->get_contact_person($activity['organization_id'], $activity['group_id'], 
$activity['contact_person_1']);
                }
 //_debug_array($activities);
                return $activities;
@@ -802,16 +822,20 @@
                        $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()){
-                               $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'));
+                               while($this->db->next_record())
+                               {
+                                       $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'));
                        }
                }
                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')),'phone' => 
$this->db->f('phone'),'email' => $this->db->f('email'));
+                               while($this->db->next_record())
+                               {
+                                       $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'));
                        }
                }
                return $result;
@@ -823,7 +847,8 @@
                {
                        $group_id = (int)$group_id;
                        $this->db->query("SELECT * FROM bb_group WHERE 
id={$group_id}", __LINE__, __FILE__);
-                       while($this->db->next_record()){
+                               while($this->db->next_record())
+                               {
                                $result = $this->soap ? 
$this->db->f('description') : utf8_decode($this->db->f('description'));
                        }
                }
@@ -831,14 +856,14 @@
                {
                        $org_id = (int)$org_id;
                        $this->db->query("SELECT * FROM bb_organization WHERE 
id={$org_id}", __LINE__, __FILE__);
-                       while($this->db->next_record()){
+                               while($this->db->next_record())
+                               {
                                $result = $this->soap ? 
$this->db->f('description') : utf8_decode($this->db->f('description'));
                        }
                }
                return $result;
        }
 
-
        function get_organizations()
        {
                $organizations = array();
@@ -846,13 +871,13 @@
                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;
+                                       $homepage = 'http://' . $homepage;
                        }
                        $organizations[] = array
                        (
-                               'id'                    => (int) 
$this->db->f('id'),
+                                       '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')),
@@ -895,7 +920,7 @@
                {
                        $groups[] = array
                        (
-                               'id'                            => (int) 
$this->db->f('id'),
+                                       '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')),
@@ -906,11 +931,10 @@
 //     _debug_array($groups);
                return $groups;
        }
-
-
        /*
        * Return incoming
        */
+
        function debug_xmlrpc($data = array())
        {
                if($data['fromdate'])
@@ -923,7 +947,6 @@
                }
        }
 
-
        function get_group_info($group_id)
        {
                $result = array();
@@ -939,7 +962,6 @@
                                'description'           => 
utf8_decode($this->db->f('description')),
                                'organization_id'       => 
$this->db->f('organization_id')
                        );
-
                }
                return $result;
        }
@@ -1022,11 +1044,12 @@
        {
                $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'),
-                                       'name'                          => 
utf8_decode($this->db->f('name',true)),
-                                       'sort'                          => 
(int) $this->db->f('sort'),
+                                       'id'     => (int)$this->db->f('id'),
+                                       'name'   => 
utf8_decode($this->db->f('name', true)),
+                                       'sort'   => (int)$this->db->f('sort'),
                        );
                }
                return $targets;
@@ -1036,14 +1059,16 @@
        {
                $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())
+                       {
                        $categories[] = array(
-                                       'id'                            => 
(int) $this->db->f('id'),
-                                       'name'                          => 
utf8_decode($this->db->f('name',true)),
+                                       'id'     => (int)$this->db->f('id'),
+                                       'name'   => 
utf8_decode($this->db->f('name', true)),
                        );
                }
                return $categories;
        }
+
        function update_organization($org_info)
        {
                $name = $org_info['name'];
@@ -1076,7 +1101,7 @@
                $zip = $org_info['zip'];
                if($zip && strlen($zip) > 5)
                {
-                       $zip_code = substr($zip,0,4);
+                               $zip_code        = substr($zip, 0, 4);
                        $city = substr($zip, 5);
                }
                else
@@ -1106,8 +1131,9 @@
                        '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)
        {
                $name = $org_info['name'];
@@ -1120,7 +1146,7 @@
                $zip = $org_info['zip'];
                if($zip && strlen($zip) > 5)
                {
-                       $zip_code = substr($zip,0,4);
+                               $zip_code        = substr($zip, 0, 4);
                        $city = substr($zip, 5);
                }
                else
@@ -1144,7 +1170,7 @@
                $columns[] = 'organization_number';
                $columns[] = 'activity_id';
                $columns[] = 'show_in_portal';
-               $cols = implode(',',$columns);
+                       $cols            = implode(',', $columns);
 
                $values[] = "'{$name}'";
                $values[] = "'{$homepage}'";
@@ -1158,7 +1184,7 @@
                $values[] = "'{$orgnr}'";
                $values[] = $this->marshal($activity_id, 'int');
                $values[] = $show_in_portal;
-               $vals = implode(',',$values);
+                       $vals            = implode(',', $values);
 
                $sql = "INSERT INTO bb_organization ({$cols}) VALUES ({$vals})";
        $result = $this->db->query($sql, __LINE__, __FILE__);
@@ -1205,7 +1231,7 @@
                $columns[] = 'district';
                $columns[] = 'change_type';
                $columns[] = 'original_org_id';
-               $cols = implode(',',$columns);
+                       $cols            = implode(',', $columns);
 
                $values[] = "'{$name}'";
                $values[] = "'{$homepage}'";
@@ -1220,7 +1246,7 @@
                $values[] = "'{$district}'";
                $values[] = "'{$status}'";
                $values[] = $original_org_id;
-               $vals = implode(',',$values);
+                       $vals            = implode(',', $values);
 
                //var_dump("INSERT INTO activity_organization ({$cols}) VALUES 
({$vals})");
                $sql = "INSERT INTO activity_organization ({$cols}) VALUES 
({$vals})";
@@ -1248,14 +1274,14 @@
                $columns[] = 'organization_id';
                $columns[] = 'activity_id';
                $columns[] = 'show_in_portal';
-               $cols = implode(',',$columns);
+                       $cols            = implode(',', $columns);
 
                $values[] = "'{$name}'";
                $values[] = "'{$description}'";
                $values[] = "'{$orgid}'";
                $values[] = $this->marshal($activity_id, 'int');
                $values[] = $show_in_portal;
-               $vals = implode(',',$values);
+                       $vals            = implode(',', $values);
 
                $sql = "INSERT INTO bb_group ({$cols}) VALUES ({$vals})";
        $result = $this->db->query($sql, __LINE__, __FILE__);
@@ -1280,13 +1306,13 @@
                $columns[] = 'description';
                $columns[] = 'organization_id';
                $columns[] = 'change_type';
-               $cols = implode(',',$columns);
+                       $cols            = implode(',', $columns);
 
                $values[] = "'{$name}'";
                $values[] = "'{$description}'";
                $values[] = "'{$orgid}'";
                $values[] = "'{$status}'";
-               $vals = implode(',',$values);
+                       $vals            = implode(',', $values);
 
                $sql = "INSERT INTO activity_group ({$cols}) VALUES ({$vals})";
        $result = $this->db->query($sql, __LINE__, __FILE__);
@@ -1309,13 +1335,13 @@
                        $result = $this->db->query($sql, __LINE__, __FILE__);
                        return isset($result);
                }
-/*             else if($group_id)
+                       /*              else if($group_id)
                {
                        $group = (int)$group_id;
                        $sql = "DELETE FROM bb_group_contact WHERE 
group_id={$group}";
                        $result = $this->db->query($sql, __LINE__, __FILE__);
                        return isset($result);
-               }*/
+                         } */
        }
 
        function add_contact_person_org($contact)
@@ -1331,14 +1357,14 @@
                $columns[] = 'phone';
                $columns[] = 'email';
                $columns[] = 'organization_id';
-               $cols = implode(',',$columns);
+                       $cols            = implode(',', $columns);
 
                $values[] = "'{$name}'";
                $values[] = "'{$ssn}'";
                $values[] = "'{$phone}'";
                $values[] = "'{$mail}'";
                $values[] = $org_id;
-               $vals = implode(',',$values);
+                       $vals            = implode(',', $values);
 
                $sql = "INSERT INTO bb_organization_contact ({$cols}) VALUES 
({$vals})";
        $result = $this->db->query($sql, __LINE__, __FILE__);
@@ -1361,13 +1387,13 @@
                $columns[] = 'phone';
                $columns[] = 'email';
                $columns[] = 'group_id';
-               $cols = implode(',',$columns);
+                       $cols            = implode(',', $columns);
 
                $values[] = "'{$name}'";
                $values[] = "'{$phone}'";
                $values[] = "'{$mail}'";
                $values[] = $org_id;
-               $vals = implode(',',$values);
+                       $vals            = implode(',', $values);
 
                $sql = "INSERT INTO bb_group_contact ({$cols}) VALUES 
({$vals})";
        $result = $this->db->query($sql, __LINE__, __FILE__);
@@ -1395,7 +1421,7 @@
                $columns[] = 'address';
                $columns[] = 'zipcode';
                $columns[] = 'city';
-               $cols = implode(',',$columns);
+                       $cols            = implode(',', $columns);
 
                $values[] = "'{$name}'";
                $values[] = "'{$phone}'";
@@ -1405,7 +1431,7 @@
                $values[] = "''";
                $values[] = "''";
                $values[] = "''";
-               $vals = implode(',',$values);
+                       $vals            = implode(',', $values);
 
                //var_dump("INSERT INTO activity_contact_person ({$cols}) 
VALUES ({$vals})");
                $sql = "INSERT INTO activity_contact_person ({$cols}) VALUES 
({$vals})";
@@ -1426,7 +1452,7 @@
                }
 
                $this->db->query($sql, __LINE__, __FILE__);
-               while ($this->db->next_record())
+                       while($this->db->next_record())
                {
                    $activity_ids[] = $this->db->f('id');
                }
@@ -1440,9 +1466,9 @@
                $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'));
+                               $activity = new 
activitycalendar_activity((int)$this->db->f('id'));
 
                        
$activity->set_title($this->unmarshal($this->db->f('title'), 'string'));
                        
$activity->set_organization_id($this->unmarshal($this->db->f('organization_id'),
 'int'));
@@ -1475,7 +1501,7 @@
                $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__);
+                       $result = $this->db->query("UPDATE activity_activity 
SET organization_id={$org_id} WHERE id={$id}", __LINE__, __FILE__);
 
                return isset($result);
        }
@@ -1493,26 +1519,25 @@
                 $description = $this->db->f('org_desc');
 
                 $activities[] = array(
-                    'id'=>$activity_id,
-                    'title'=>$activity_title,
-                    'organization'=>$activity_organization,
-                    'description'=>$description
+                                       'id'                     => 
$activity_id,
+                                       'title'                  => 
$activity_title,
+                                       'organization'   => 
$activity_organization,
+                                       'description'    => $description
                 );
             }
             return $activities;
         }
-
         /*
          * Function to be run once.
          * Generates new groups based on activity where group is not 
registered.
          * Adds new group to booking
          */
+
         function generate_groups()
         {
             //TODO
         }
 
-
         function remove_old_activities($activity_id)
         {
             //$sql = "delete from activity_activity where id in 
(1293,1294,1297,1299)"; //1293,1294,1297,1299
@@ -1529,7 +1554,7 @@
 
             $values = "last_change_date = " . $this->marshal($ts_now, 'int');
 
-            $result = $this->db->query("UPDATE activity_activity SET {$values} 
WHERE id={$id}", __LINE__,__FILE__);
+                       $result = $this->db->query("UPDATE activity_activity 
SET {$values} WHERE id={$id}", __LINE__, __FILE__);
 
             return isset($result);
         }
@@ -1543,8 +1568,8 @@
             //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__);
+                       $result = $this->db->query("UPDATE activity_activity 
SET {$values} WHERE id={$id}", __LINE__, __FILE__);
 
             return isset($result);
         }
-}
+       }
\ No newline at end of file

Modified: trunk/activitycalendar/inc/class.soarena.inc.php
===================================================================
--- trunk/activitycalendar/inc/class.soarena.inc.php    2016-02-10 10:51:51 UTC 
(rev 14718)
+++ trunk/activitycalendar/inc/class.soarena.inc.php    2016-02-10 19:45:46 UTC 
(rev 14719)
@@ -1,12 +1,12 @@
 <?php
+       phpgw::import_class('activitycalendar.socommon');
 
-phpgw::import_class('activitycalendar.socommon');
+       include_class('activitycalendar', 'arena', 'inc/model/');
+       include_class('activitycalendar', 'building', 'inc/model/');
 
-include_class('activitycalendar', 'arena', 'inc/model/');
-include_class('activitycalendar', 'building', 'inc/model/');
+       class activitycalendar_soarena extends activitycalendar_socommon
+       {
 
-class activitycalendar_soarena extends activitycalendar_socommon
-{
        protected static $so;
 
        /**
@@ -16,7 +16,8 @@
         */
        public static function get_instance()
        {
-               if (self::$so == null) {
+                       if(self::$so == null)
+                       {
                        self::$so = CreateObject('activitycalendar.soarena');
                }
                return self::$so;
@@ -41,13 +42,14 @@
                //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')
                        {
-                               $sort_field='id';
+                                       $sort_field = 'id';
                        }
-                       $order = "ORDER BY 
{$this->marshal($sort_field,'field')} $dir";
+                               $order = "ORDER BY {$this->marshal($sort_field, 
'field')} $dir";
                }
                else if(!$return_count)
                {
@@ -57,10 +59,11 @@
                
                if($search_for)
                {
-                       $query = $this->marshal($search_for,'string');
-                       $like_pattern = "'%".$search_for."%'";
+                               $query                   = 
$this->marshal($search_for, 'string');
+                               $like_pattern    = "'%" . $search_for . "%'";
                        $like_clauses = array();
-                       switch($search_type){
+                               switch($search_type)
+                               {
                                case "all":
                                default:
                                        $like_clauses[] = "arena.arena_name 
$this->like $like_pattern";
@@ -77,8 +80,9 @@
 
                $filter_clauses = array();
                
-               if(isset($filters[$this->get_id_field_name()])){
-                       $id = 
$this->marshal($filters[$this->get_id_field_name()],'int');
+                       if(isset($filters[$this->get_id_field_name()]))
+                       {
+                               $id                                      = 
$this->marshal($filters[$this->get_id_field_name()], 'int');
                        $filter_clauses[] = "arena.id = {$id}";
                }
                
@@ -133,7 +137,7 @@
                        $columns[] = 'arena.internal_arena_id';
                        $columns[] = 'arena.active';
                        
-                       $cols = implode(',',$columns);
+                               $cols = implode(',', $columns);
                }
 
                $tables = "activity_arena arena";
@@ -156,8 +160,9 @@
        protected function populate(int $arena_id, &$arena)
        {
 
-               if($arena == null) {
-                       $arena = new activitycalendar_arena((int) $arena_id);
+                       if($arena == null)
+                       {
+                               $arena = new 
activitycalendar_arena((int)$arena_id);
 
                        
$arena->set_arena_name($this->unmarshal($this->db->f('arena_name'), 'string'));
                        
$arena->set_address($this->unmarshal($this->db->f('address'), 'string'));
@@ -179,10 +184,12 @@
        function get_arena_name($arena_id)
        {
                $result = "Ingen";
-       if(isset($arena_id) && $arena_id != ''){
-               $q1="SELECT arena_name FROM activity_arena WHERE 
id={$arena_id}";
+                       if(isset($arena_id) && $arena_id != '')
+                       {
+                               $q1 = "SELECT arena_name FROM activity_arena 
WHERE id={$arena_id}";
                        $this->db->query($q1, __LINE__, __FILE__);
-                       while($this->db->next_record()){
+                               while($this->db->next_record())
+                               {
                                $result = $this->db->f('arena_name');
                        }
        }
@@ -198,10 +205,11 @@
        function get_buildings()
        {
                $buildings = array();
-       $q_buildings="SELECT id, name FROM bb_building WHERE active=1 ORDER BY 
name ASC";
+                       $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');
                }
@@ -214,20 +222,21 @@
         * @param int $building_id
         * @return string building name
         */
-       function get_building_name($building_id){
+               function get_building_name($building_id)
+               {
                if(isset($building_id))
                {
                        $building_id = (int)$building_id;
-                       $q1="SELECT name FROM bb_building WHERE 
id={$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');
                        }
                }
                return $result;
        }
        
-       
        /**
         * Function for adding a new arena to the database. Updates the arena 
object.
         *
@@ -237,10 +246,11 @@
        function add(&$arena)
        {
                // Insert a new arena
-               $q ="INSERT INTO activity_arena (arena_name) VALUES ('test')";
+                       $q               = "INSERT INTO activity_arena 
(arena_name) VALUES ('test')";
                $result = $this->db->query($q);
 
-               if(isset($result)) {
+                       if(isset($result))
+                       {
                        // Set the new party ID
                        
$arena->set_id($this->db->get_last_insert_id('activity_arena', 'id'));
                        // Forward this request to the update method
@@ -272,7 +282,7 @@
                        '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);
        }
@@ -298,35 +308,41 @@
        public function get_address($search)
        {
                $result_arr = array();
-           $curr_index=0;
+                       $curr_index      = 0;
                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){
+                                       /* 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++;
+                                         $curr_index++; */
+
+                                       $result_arr[]['name'] = 
$this->db->f('descr');
                        }
                }
-               $result = implode(' ' , $result_arr);
-               return $result;
+                       //$result = implode(' ', $result_arr);
+                       //return $result;
+                       return array('ResultSet' => array('Result' => 
$result_arr));
        }
        
        public function get_arena_id_by_name($arena_name)
        {
                $result = 0;
-               if(isset($arena_name) && $arena_name != ''){
-               $q1="SELECT id FROM activity_arena WHERE UPPER(arena_name) = 
UPPER('{$arena_name}')";
+                       if(isset($arena_name) && $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()){
+                               while($this->db->next_record())
+                               {
                                $result = $this->db->f('id');
                        }
        }
        return $result;
        }
-}
-?>
\ No newline at end of file
+       }
\ No newline at end of file

Modified: trunk/activitycalendar/inc/class.socommon.inc.php
===================================================================
--- trunk/activitycalendar/inc/class.socommon.inc.php   2016-02-10 10:51:51 UTC 
(rev 14718)
+++ trunk/activitycalendar/inc/class.socommon.inc.php   2016-02-10 19:45:46 UTC 
(rev 14719)
@@ -1,6 +1,8 @@
 <?php
-abstract class activitycalendar_socommon
-{
+
+       abstract class activitycalendar_socommon
+       {
+
        protected $db;
        protected $like;
        protected $join;
@@ -116,7 +118,8 @@
        /**
         * Method for retrieving the db-object (security "forgotten")
         */
-       public function get_db(){
+               public function get_db()
+               {
                return $this->db;
        }
 
@@ -141,7 +144,6 @@
                $check_map = array();           // Array to hold the actual 
number of record read per target object
                $object_ids = array();          // All of the object ids 
encountered
                $added_object_ids = array();// All of the added objects ids
-               
                // Retrieve information about the table name and the name and 
alias of id column
                // $break_on_limit -    flag indicating whether to break the 
loop when the number of records 
                //                                              for all the 
result objects are traversed
@@ -181,10 +183,10 @@
                $db2 = clone($this->db);
 
                $sql = $this->get_query($sort_field, $ascending, $search_for, 
$search_type, $filters, false);
-               $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);
+                       $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
@@ -211,9 +213,9 @@
                        if($should_populate_object)
                        {       
                                $result = &$results[$result_id];
-                               $results[$result_id] = 
$this->populate($result_id,$result);
+                                       $results[$result_id] = 
$this->populate($result_id, $result);
                                $last_result_id = $result_id;
-                               $map[$result_id] = (int)$map[$result_id] +1;
+                                       $map[$result_id]         = 
(int)$map[$result_id] + 1;
                        }
                        
                        //Stop looping when array not sorted on other then id 
and wanted number of results is reached
@@ -225,17 +227,17 @@
                        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]))
                                        {
                                                // 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]}";
-                                               $db2->query($sql2,__LINE__, 
__FILE__);
+                                                       $db2->query($sql2, 
__LINE__, __FILE__);
                                                $db2->next_record();
                                                $check_map[$_result_id] = 
$db2->num_rows();
                                        }
-                                       if(     $check_map[$_result_id] == 
$_count )
+                                               if($check_map[$_result_id] == 
$_count)
                                        {
                                                $id_ok++;
                                        }
@@ -299,8 +301,10 @@
        */
        public function store(&$object)
        {
-               if ($object->validates()) {
-                       if ($object->get_id() > 0) {
+                       if($object->validates())
+                       {
+                               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);
                        }
@@ -317,7 +321,6 @@
        
        protected function generate_secret($length = 10)
        {
-               return substr(base64_encode(rand(1000000000,9999999999)),0, 
$length);
+                       return substr(base64_encode(rand(1000000000, 
9999999999)), 0, $length);
+               }
        }
-}
-?>
\ No newline at end of file

Modified: trunk/activitycalendar/inc/class.socontactperson.inc.php
===================================================================
--- trunk/activitycalendar/inc/class.socontactperson.inc.php    2016-02-10 
10:51:51 UTC (rev 14718)
+++ trunk/activitycalendar/inc/class.socontactperson.inc.php    2016-02-10 
19:45:46 UTC (rev 14719)
@@ -1,10 +1,11 @@
 <?php
-phpgw::import_class('activitycalendar.socommon');
+       phpgw::import_class('activitycalendar.socommon');
 
-include_class('activitycalendar', 'contact_person', 'inc/model/');
+       include_class('activitycalendar', 'contact_person', 'inc/model/');
 
-class activitycalendar_socontactperson extends activitycalendar_socommon
-{
+       class activitycalendar_socontactperson extends activitycalendar_socommon
+       {
+
        protected static $so;
 
        /**
@@ -14,7 +15,8 @@
         */
        public static function get_instance()
        {
-               if (self::$so == null) {
+                       if(self::$so == null)
+                       {
                        self::$so = 
CreateObject('activitycalendar.socontactperson');
                }
                return self::$so;
@@ -42,17 +44,18 @@
                //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";
                }
                */
                if($search_for)
                {
-                       $query = $this->marshal($search_for,'string');
-                       $like_pattern = "'%".$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";
                                        $like_clauses[] = "party.last_name 
$this->like $like_pattern";
@@ -95,31 +98,29 @@
                }
                
                $filter_clauses = array();
-               $contact_person_id = $this->marshal($filters['id'],'int');
+                       $contact_person_id       = 
$this->marshal($filters['id'], 'int');
                if(isset($filters['org_id']))
                {
-                       $org_id = $this->marshal($filters['org_id'],'int');
+                               $org_id = $this->marshal($filters['org_id'], 
'int');
                        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']))
                {
-                       $org_id = 
$this->marshal($filters['organization_id'],'int');
+                               $org_id = 
$this->marshal($filters['organization_id'], 'int');
                        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']))
                {
-                       $group_id = $this->marshal($filters['group_id'],'int');
+                               $group_id = 
$this->marshal($filters['group_id'], 'int');
                        if(isset($group_id) && $group_id > 0)
                        {
                                $filter_clauses[] = "group_contact.group_id = 
{$group_id}";
@@ -127,7 +128,7 @@
                                $table = "bb_group_contact group_contact";
                        }
                }
-/*
+                       /*
                // All parties with contracts of type X
                if(isset($filters['party_type']))
                {
@@ -137,7 +138,7 @@
                                $filter_clauses[] = "contract.location_id = 
{$party_type}";
                        }
                }
-*/             
+                        */
                
                if(count($filter_clauses))
                {
@@ -161,7 +162,7 @@
                                $columns[] = 'organization_contact.email';
                                $columns[] = 
'organization_contact.organization_id';
                                
-                               $cols = implode(',',$columns);
+                                       $cols = implode(',', $columns);
                        }
                }
                else
@@ -178,7 +179,7 @@
                                $columns[] = 'group_contact.email';
                                $columns[] = 'group_contact.group_id';
                                
-                               $cols = implode(',',$columns);
+                                       $cols = implode(',', $columns);
                        }
                }
 
@@ -186,19 +187,19 @@
 
                //$join_contracts = "   {$this->left_join} 
rental_contract_party c_p ON (c_p.party_id = party.id)
                //{$this->left_join} rental_contract contract ON (contract.id = 
c_p.contract_id)";
-               
                //var_dump("SELECT {$cols} FROM {$tables} WHERE {$condition} 
{$order}");
                return "SELECT {$cols} FROM {$tables} WHERE {$condition} 
{$order}";
        }
 
-
        function get_group_contact_name($id)
        {
                $result = "Ingen";
-       if(isset($id) && $id != ''){
-               $q1="SELECT name, phone, email FROM bb_group_contact WHERE 
id={$id}";
+                       if(isset($id) && $id != '')
+                       {
+                               $q1 = "SELECT name, phone, email FROM 
bb_group_contact WHERE id={$id}";
                        $this->db->query($q1, __LINE__, __FILE__);
-                       while($this->db->next_record()){
+                               while($this->db->next_record())
+                               {
                                $result = $this->db->f('name') . "<br/>" . 
$this->db->f('phone') . "<br/>" . $this->db->f('email');
                        }
        }
@@ -208,10 +209,12 @@
        function get_group_contact_name_local($id)
        {
                $result = "Ingen";
-       if(isset($id) && $id != ''){
-               $q1="SELECT name, phone, email FROM activity_contact_person 
WHERE id={$id}";
+                       if(isset($id) && $id != '')
+                       {
+                               $q1 = "SELECT name, phone, email FROM 
activity_contact_person WHERE id={$id}";
                        $this->db->query($q1, __LINE__, __FILE__);
-                       while($this->db->next_record()){
+                               while($this->db->next_record())
+                               {
                                $result = $this->db->f('name') . "<br/>" . 
$this->db->f('phone') . "<br/>" . $this->db->f('email');
                        }
        }
@@ -221,10 +224,12 @@
        function get_org_contact_name($id)
        {
                $result = "Ingen";
-       if(isset($id) && $id != ''){
-               $q1="SELECT name, phone, email FROM bb_organization_contact 
WHERE id={$id}";
+                       if(isset($id) && $id != '')
+                       {
+                               $q1 = "SELECT name, phone, email FROM 
bb_organization_contact WHERE id={$id}";
                        $this->db->query($q1, __LINE__, __FILE__);
-                       while($this->db->next_record()){
+                               while($this->db->next_record())
+                               {
                                $result = $this->db->f('name') . "<br/>" . 
$this->db->f('phone') . "<br/>" . $this->db->f('email');
                        }
        }
@@ -234,23 +239,26 @@
        function get_org_contact_name_local($id)
        {
                $result = "Ingen";
-       if(isset($id) && $id != ''){
-               $q1="SELECT name, phone, email FROM activity_contact_person 
WHERE id={$id}";
+                       if(isset($id) && $id != '')
+                       {
+                               $q1 = "SELECT name, phone, email FROM 
activity_contact_person WHERE id={$id}";
                        $this->db->query($q1, __LINE__, __FILE__);
-                       while($this->db->next_record()){
+                               while($this->db->next_record())
+                               {
                                $result = $this->db->f('name') . "<br/>" . 
$this->db->f('phone') . "<br/>" . $this->db->f('email');
                        }
        }
                return $result;
        }
        
-       
        function get_mailaddress_for_group_contact($contact_person_id)
        {
-               if($contact_person_id){
-               $q1="SELECT email FROM bb_group_contact WHERE 
id={$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()){
+                               while($this->db->next_record())
+                               {
                                $result = $this->db->f('email');
                        }
        }
@@ -259,17 +267,18 @@
        
        function get_mailaddress_for_org_contact($contact_person_id)
        {
-               if($contact_person_id){
-               $q1="SELECT email FROM bb_organization_contact WHERE 
id={$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()){
+                               while($this->db->next_record())
+                               {
                                $result = $this->db->f('email');
                        }
        }
                return $result;
        }
        
-
        /**
         * Function for adding a new activity to the database. Updates the 
activity object.
         *
@@ -313,8 +322,9 @@
        protected function populate(int $contact_person_id, &$contact_person)
        {
 
-               if($contact_person == null) {
-                       $contact_person = new 
activitycalendar_contact_person((int) $contact_person_id);
+                       if($contact_person == null)
+                       {
+                               $contact_person = new 
activitycalendar_contact_person((int)$contact_person_id);
 
                        
$contact_person->set_organization_id($this->unmarshal($this->db->f('organization_id'),
 'int'));
                        
$contact_person->set_group_id($this->unmarshal($this->db->f('group_id'), 
'int'));
@@ -326,20 +336,22 @@
                return $contact_person;
        }
        
-       function get_local_contact_persons($id, $group=false)
+               function get_local_contact_persons($id, $group = false)
        {
                $result = array();
-       if(isset($id)){
+                       if(isset($id))
+                       {
                if($group)
                {
-                       $q1="SELECT id, organization_id, group_id, name, phone, 
email FROM activity_contact_person WHERE group_id='{$id}'";
+                                       $q1 = "SELECT id, organization_id, 
group_id, name, phone, email FROM activity_contact_person WHERE 
group_id='{$id}'";
                }
                else
                {
-                       $q1="SELECT id, organization_id, group_id, name, phone, 
email FROM activity_contact_person WHERE organization_id='{$id}' and 
group_id='0'";
+                                       $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'));
                                
$contact_person->set_group_id($this->unmarshal($this->db->f('group_id'), 
'int'));
@@ -352,10 +364,11 @@
                return $result;
        }
        
-       function get_booking_contact_persons($id, $group=false)
+               function get_booking_contact_persons($id, $group = false)
        {
                $result = array();
-       if(isset($id)){
+                       if(isset($id))
+                       {
                $columns[] = 'group_contact.id';
                                $columns[] = 'group_contact.name';
                                $columns[] = 'group_contact.phone';
@@ -363,14 +376,15 @@
                                $columns[] = 'group_contact.group_id';
                if($group)
                {
-                       $q1="SELECT id, group_id, name, phone, email FROM 
bb_group_contact WHERE group_id='{$id}'";
+                                       $q1 = "SELECT id, group_id, name, 
phone, email FROM bb_group_contact WHERE group_id='{$id}'";
                }
                else
                {
-                       $q1="SELECT id, organization_id, name, phone, email, 
ssn FROM bb_organization_contact WHERE organization_id='{$id}'";
+                                       $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'));
                                
$contact_person->set_group_id($this->unmarshal($this->db->f('group_id'), 
'int'));
@@ -400,7 +414,7 @@
                $columns[] = "address=''";
                $columns[] = "zipcode=''"; 
                $columns[] = "city=''";
-               $cols = implode(',',$columns);
+                       $cols            = implode(',', $columns);
 
                $sql = "UPDATE activity_contact_person SET {$cols} WHERE 
id={$id}";
        $result = $this->db->query($sql, __LINE__, __FILE__);
@@ -418,13 +432,13 @@
             $columns[] = 'phone';
             $columns[] = 'email';
             $columns[] = 'group_id';
-            $cols = implode(',',$columns);
+                       $cols            = implode(',', $columns);
 
             $values[] = "'{$name}'";
             $values[] = "'{$phone}'";
             $values[] = "'{$mail}'";
             $values[] = $group_id;
-            $vals = implode(',',$values);
+                       $vals            = implode(',', $values);
 
             $sql = "INSERT INTO bb_group_contact ({$cols}) VALUES ({$vals})";
             $result = $this->db->query($sql, __LINE__, __FILE__);
@@ -438,4 +452,4 @@
                 return 0;
             }
        }
-}
\ No newline at end of file
+       }
\ No newline at end of file

Modified: trunk/activitycalendar/inc/class.sogroup.inc.php
===================================================================
--- trunk/activitycalendar/inc/class.sogroup.inc.php    2016-02-10 10:51:51 UTC 
(rev 14718)
+++ trunk/activitycalendar/inc/class.sogroup.inc.php    2016-02-10 19:45:46 UTC 
(rev 14719)
@@ -1,11 +1,11 @@
 <?php
+       phpgw::import_class('activitycalendar.socommon');
 
-phpgw::import_class('activitycalendar.socommon');
+       include_class('activitycalendar', 'group', 'inc/model/');
 
-include_class('activitycalendar', 'group', 'inc/model/');
+       class activitycalendar_sogroup extends activitycalendar_socommon
+       {
 
-class activitycalendar_sogroup extends activitycalendar_socommon
-{
        protected static $so;
 
        /**
@@ -15,7 +15,8 @@
         */
        public static function get_instance()
        {
-               if (self::$so == null) {
+                       if(self::$so == null)
+                       {
                        self::$so = CreateObject('activitycalendar.sogroup');
                }
                return self::$so;
@@ -42,16 +43,18 @@
                //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)
                {
-                       $query = $this->marshal($search_for,'string');
-                       $like_pattern = "'%".$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";
                                        $like_clauses[] = "group.shortname 
$this->like $like_pattern";
@@ -70,26 +73,30 @@
                $filter_clauses[] = "bb_group.show_in_portal=1"; 
                if(isset($filters['org_id']))
                {
-                       $group_org_id = 
$this->marshal($filters['org_id'],'int');
+                               $group_org_id = 
$this->marshal($filters['org_id'], 'int');
                        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()])){
-                               $id = 
$this->marshal($filters[$this->get_id_field_name()],'int');
+                               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'])){
-                               $id = 
$this->marshal($filters['group_id'],'int');
+                               if(isset($filters['group_id']))
+                               {
+                                       $id                                     
 = $this->marshal($filters['group_id'], 'int');
                                $filter_clauses[] = "activity_group.id = {$id}";
                        }
                }
@@ -120,7 +127,7 @@
                                $dir = $ascending ? 'ASC' : 'DESC';
                                $order = "ORDER BY activity_group.id $dir";
                                
-                               $cols = implode(',',$columns);
+                                       $cols = implode(',', $columns);
                        }
        
                        $tables = "activity_group";
@@ -142,7 +149,7 @@
                                $columns[] = 'bb_group.shortname';
                                $columns[] = 'bb_group.show_in_portal';
                                
-                               $cols = implode(',',$columns);
+                                       $cols = implode(',', $columns);
                        }
        
                        $tables = "bb_group";
@@ -150,13 +157,10 @@
                
                //$join_contracts = "   {$this->left_join} 
rental_contract_party c_p ON (c_p.party_id = party.id)
                //{$this->left_join} rental_contract contract ON (contract.id = 
c_p.contract_id)";
-               
                //var_dump("SELECT {$cols} FROM {$tables} WHERE {$condition} 
{$order}");
                return "SELECT {$cols} FROM {$tables} WHERE {$condition} 
{$order}";
        }
 
-
-
        /**
         * Function for adding a new party to the database. Updates the party 
object.
         *
@@ -195,10 +199,10 @@
        
        function update_group_contact($contact)
        {
-           $id=intval($contact['original_id']);
-           $name=$contact['name'];
-           $phone=$contact['phone'];
-           $mail=$contact['mail'];
+                       $id              = intval($contact['original_id']);
+                       $name    = $contact['name'];
+                       $phone   = $contact['phone'];
+                       $mail    = $contact['mail'];
            
            $sql = "UPDATE bb_group_contact SET NAME='{$name}', 
PHONE='{$phone}', EMAIL='{$mail}' WHERE id={$id}";
            $result = $this->db->query($sql, __LINE__, __FILE__);
@@ -229,7 +233,7 @@
                $columns[] = 'zipcode'; 
                $columns[] = 'city';
                $columns[] = 'original_id';
-               $cols = implode(',',$columns);
+                       $cols            = implode(',', $columns);
                
                $values[] = "'{$name}'";
                $values[] = "'{$phone}'";
@@ -240,7 +244,7 @@
                $values[] = "''";
                $values[] = "''";
                $values[] = $original_id;
-               $vals = implode(',',$values);
+                       $vals            = implode(',', $values);
                
                //var_dump("INSERT INTO activity_contact_person ({$cols}) 
VALUES ({$vals})");
                $sql = "INSERT INTO activity_contact_person ({$cols}) VALUES 
({$vals})";
@@ -274,10 +278,12 @@
        function get_group_name($group_id)
        {
                $result = "Ingen";
-       if(isset($group_id)){
-               $q1="SELECT name FROM bb_group WHERE id={$group_id}";
+                       if(isset($group_id))
+                       {
+                               $q1 = "SELECT name FROM bb_group WHERE 
id={$group_id}";
                        $this->db->query($q1, __LINE__, __FILE__);
-                       while($this->db->next_record()){
+                               while($this->db->next_record())
+                               {
                                $result = $this->db->f('name');
                        }
        }
@@ -288,10 +294,12 @@
        function get_group_name_local($group_id)
        {
                $result = "Ingen";
-       if(isset($group_id)){
-               $q1="SELECT name FROM activity_group WHERE id={$group_id}";
+                       if(isset($group_id))
+                       {
+                               $q1 = "SELECT name FROM activity_group WHERE 
id={$group_id}";
                        $this->db->query($q1, __LINE__, __FILE__);
-                       while($this->db->next_record()){
+                               while($this->db->next_record())
+                               {
                                $result = $this->db->f('name');
                        }
        }
@@ -302,10 +310,12 @@
        function get_orgid_from_group($group_id)
        {
                $result = 0;
-       if(isset($group_id)){
-               $q1="SELECT organization_id FROM bb_group WHERE id={$group_id}";
+                       if(isset($group_id))
+                       {
+                               $q1 = "SELECT organization_id FROM bb_group 
WHERE id={$group_id}";
                        $this->db->query($q1, __LINE__, __FILE__);
-                       while($this->db->next_record()){
+                               while($this->db->next_record())
+                               {
                                $result = $this->db->f('organization_id');
                        }
        }
@@ -316,10 +326,12 @@
        function get_orgid_from_group_local($group_id)
        {
                $result = 0;
-       if(isset($group_id)){
-               $q1="SELECT organization_id FROM activity_group WHERE 
id={$group_id}";
+                       if(isset($group_id))
+                       {
+                               $q1 = "SELECT organization_id FROM 
activity_group WHERE id={$group_id}";
                        $this->db->query($q1, __LINE__, __FILE__);
-                       while($this->db->next_record()){
+                               while($this->db->next_record())
+                               {
                                $result = $this->db->f('organization_id');
                        }
        }
@@ -330,10 +342,12 @@
        function get_contacts($group_id)
        {
                $contacts = array();
-       if(isset($group_id)){
-               $q1="SELECT id FROM bb_group_contact WHERE 
group_id={$group_id}";
+                       if(isset($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;
@@ -345,11 +359,13 @@
        function get_contacts_as_objects($group_id)
        {
                $contacts = array();
-       if(isset($group_id)){
-               $q1="SELECT * FROM bb_group_contact WHERE group_id={$group_id}";
+                       if(isset($group_id))
+                       {
+                               $q1 = "SELECT * FROM bb_group_contact WHERE 
group_id={$group_id}";
                        $this->db->query($q1, __LINE__, __FILE__);
-                       while($this->db->next_record()){
-                               $contact_person = new 
activitycalendar_contact_person((int) $this->db->f('id'));
+                               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'));
                                
$contact_person->set_group_id($this->unmarshal($this->db->f('group_id'), 
'int'));
                                
$contact_person->set_name($this->unmarshal($this->db->f('name'), 'string'));
@@ -366,10 +382,12 @@
        function get_contacts_local($group_id)
        {
                $contacts = array();
-       if(isset($group_id)){
-               $q1="SELECT id FROM activity_contact_person WHERE 
group_id='{$group_id}'";
+                       if(isset($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;
@@ -381,11 +399,13 @@
        function get_contacts_local_as_objects($group_id)
        {
                $contacts = array();
-       if(isset($group_id)){
-               $q1="SELECT * FROM activity_contact_person WHERE 
group_id='{$group_id}'";
+                       if(isset($group_id))
+                       {
+                               $q1 = "SELECT * FROM activity_contact_person 
WHERE group_id='{$group_id}'";
                        $this->db->query($q1, __LINE__, __FILE__);
-                       while($this->db->next_record()){
-                               $contact_person = new 
activitycalendar_contact_person((int) $this->db->f('id'));
+                               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'));
                                
$contact_person->set_group_id($this->unmarshal($this->db->f('group_id'), 
'int'));
                                
$contact_person->set_name($this->unmarshal($this->db->f('name'), 'string'));
@@ -401,10 +421,12 @@
        
        function get_description($group_id)
        {
-       if(isset($group_id)){
-               $q1="SELECT description FROM bb_group WHERE id={$group_id}";
+                       if(isset($group_id))
+                       {
+                               $q1 = "SELECT description FROM bb_group WHERE 
id={$group_id}";
                        $this->db->query($q1, __LINE__, __FILE__);
-                       while($this->db->next_record()){
+                               while($this->db->next_record())
+                               {
                                $desc = $this->db->f('description');
                        }
        }
@@ -413,10 +435,12 @@
        
        function get_description_local($group_id)
        {
-       if(isset($group_id)){
-               $q1="SELECT description FROM activity_group WHERE 
id={$group_id}";
+                       if(isset($group_id))
+                       {
+                               $q1 = "SELECT description FROM activity_group 
WHERE id={$group_id}";
                        $this->db->query($q1, __LINE__, __FILE__);
-                       while($this->db->next_record()){
+                               while($this->db->next_record())
+                               {
                                $desc = $this->db->f('description');
                        }
        }
@@ -426,8 +450,9 @@
        protected function populate(int $group_id, &$group)
        {
 
-               if($group == null) {
-                       $group = new activitycalendar_group((int) $group_id);
+                       if($group == null)
+                       {
+                               $group = new 
activitycalendar_group((int)$group_id);
 
                        $group->set_name($this->unmarshal($this->db->f('name'), 
'string'));
                        
$group->set_organization_id($this->unmarshal($this->db->f('organization_id'), 
'int'));
@@ -447,14 +472,14 @@
                $orgid = $group->get_organization_id();
                $description = $group->get_description();
                $change_type = $group->get_change_type();
-               $transferred = ($group->get_transferred() == 1 || 
$group->get_transferred() == true)?'true':'false';
+                       $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}";
-               $vals = implode(',',$values);
+                       $vals            = implode(',', $values);
                
                $sql = "UPDATE activity_group SET {$vals} WHERE 
ID={$group->get_id()}";
        $result = $this->db->query($sql, __LINE__, __FILE__);
@@ -481,14 +506,14 @@
                $columns[] = 'organization_id';
                $columns[] = 'activity_id';
                $columns[] = 'show_in_portal';
-               $cols = implode(',',$columns);
+                       $cols            = implode(',', $columns);
                
                $values[] = "'{$name}'";
                $values[] = "'{$description}'";
                $values[] = "'{$orgid}'";
                $values[] = $activity_id;
                $values[] = $show_in_portal;
-               $vals = implode(',',$values);
+                       $vals            = implode(',', $values);
                
                $sql = "INSERT INTO bb_group ({$cols}) VALUES ({$vals})";
        $result = $this->db->query($sql, __LINE__, __FILE__);
@@ -515,14 +540,14 @@
                $dir = $ascending ? 'ASC' : 'DESC';
                $order = "ORDER BY activity_group.id $dir";
                
-               $cols = implode(',',$columns);
+                       $cols    = implode(',', $columns);
                $table = "activity_group";
                
                $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);
+                               $group = new activitycalendar_group((int)$g_id);
 
                        $group->set_name($this->unmarshal($this->db->f('name'), 
'string'));
                        
$group->set_organization_id($this->unmarshal($this->db->f('organization_id'), 
'int'));
@@ -535,7 +560,6 @@
                        
                        return $group;
                }
-               
        }
         
         function add_new_group_from_activity($group_info)
@@ -551,14 +575,14 @@
             $columns[] = 'organization_id';
             $columns[] = 'activity_id';
             $columns[] = 'show_in_portal';
-            $cols = implode(',',$columns);
+                       $cols            = implode(',', $columns);
 
             $values[] = $this->marshal($name, 'string');
             $values[] = $this->marshal($description, 'string');
             $values[] = "'{$orgid}'";
             $values[] = $this->marshal($activity_id, 'int');
             $values[] = $show_in_portal;
-            $vals = implode(',',$values);
+                       $vals            = implode(',', $values);
 
             $sql = "INSERT INTO bb_group ({$cols}) VALUES ({$vals})";
             $result = $this->db->query($sql, __LINE__, __FILE__);
@@ -572,5 +596,4 @@
                 return 0;
             }
        }
-}
-?>
+       }
\ No newline at end of file

Modified: trunk/activitycalendar/inc/class.soorganization.inc.php
===================================================================
--- trunk/activitycalendar/inc/class.soorganization.inc.php     2016-02-10 
10:51:51 UTC (rev 14718)
+++ trunk/activitycalendar/inc/class.soorganization.inc.php     2016-02-10 
19:45:46 UTC (rev 14719)
@@ -1,14 +1,13 @@
 <?php
+       phpgw::import_class('activitycalendar.socommon');
 
-phpgw::import_class('activitycalendar.socommon');
+       include_class('activitycalendar', 'organization', 'inc/model/');
+       include_class('activitycalendar', 'contact_person', 'inc/model/');
 
-include_class('activitycalendar', 'organization', 'inc/model/');
-include_class('activitycalendar', 'contact_person', 'inc/model/');
+       class activitycalendar_soorganization extends activitycalendar_socommon
+       {
 
-class activitycalendar_soorganization extends activitycalendar_socommon
-{
        protected static $so;
-
        var $public_functions = array
        (
                'fix_duplicates'                => true,
@@ -21,7 +20,8 @@
         */
        public static function get_instance()
        {
-               if (self::$so == null) {
+                       if(self::$so == null)
+                       {
                        self::$so = 
CreateObject('activitycalendar.soorganization');
                }
                return self::$so;
@@ -48,7 +48,8 @@
                //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')
                        {
                                $sort_field = 'org.id';
@@ -63,10 +64,11 @@
                }
                if($search_for)
                {
-                       $query = $this->marshal($search_for,'string');
-                       $like_pattern = "'%".$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";
                                        $like_clauses[] = "org.shortname 
$this->like $like_pattern";
@@ -95,28 +97,33 @@
 
                $use_local_org = false;
 
-               if(isset($filters[$this->get_id_field_name()])){
-                       $id = 
$this->marshal($filters[$this->get_id_field_name()],'int');
+                       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()])){
-                               $id = 
$this->marshal($filters[$this->get_id_field_name()],'int');
+                               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()])){
-                               $id = 
$this->marshal($filters[$this->get_id_field_name()],'int');
+                               if(isset($filters[$this->get_id_field_name()]))
+                               {
+                                       $id                                     
 = $this->marshal($filters[$this->get_id_field_name()], 'int');
                                $filter_clauses[] = "org.id = {$id}";
                        }
                }
@@ -156,7 +163,7 @@
                                $columns[] = 'org.original_org_id';
                                $columns[] = 'org.orgno AS organization_number';
 
-                               $cols = implode(',',$columns);
+                                       $cols = implode(',', $columns);
                        }
 
                        $tables = "activity_organization org";
@@ -190,7 +197,7 @@
                                $columns[] = 'org.shortname';
                                $columns[] = 'org.show_in_portal';
 
-                               $cols = implode(',',$columns);
+                                       $cols = implode(',', $columns);
                        }
 
                        $tables = "bb_organization org";
@@ -203,11 +210,13 @@
        function get_organization_name($org_id)
        {
                $result = "Ingen";
-       if(isset($org_id)){
+                       if(isset($org_id))
+                       {
                $org_id = intval($org_id);
-           $q1="SELECT name FROM bb_organization WHERE id={$org_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())
+                               {
                                $result = $this->db->f('name');
                        }
        }
@@ -219,18 +228,19 @@
        {
                $result = array();
                //$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, cp.* from bb_organization bb, bb_organization_contact cp where 
cp.organization_id=bb.id and bb.show_in_portal=1 and bb.active=1 order by 
bb.name, bb.id";
-               $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 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
                        //{
-/*                             $org = new activitycalendar_organization();
+                               /*                              $org = new 
activitycalendar_organization();
                                $org->set_id($this->db->f('orgid'));
                                $org->set_name($this->db->f('orgname'));
                                $org->set_address($this->db->f('orgstreet').', 
'.$this->db->f('zip').' '.$this->db->f('city'));
                                
$org->set_organization_number($this->db->f('orgno'));
-*/
+                                */
                                $result[$this->db->f('orgid')] = array(
                                        'orgid' => $this->db->f('orgid'),
                                        'orgname' => $this->db->f('orgname'),
@@ -299,29 +309,29 @@
                                $activities = 
$so_activity->get_connected_activities($orgmapping);
                                foreach($activities as $activity)
                                {
-                                       var_dump($activity->get_title().' 
flyttes fra '.$orgmapping.' til '.$key.'</br>');
+                                               var_dump($activity->get_title() 
. ' flyttes fra ' . $orgmapping . ' til ' . $key . '</br>');
                                        
$so_activity->update_organization_connection($activity->get_id(), $key);
                                }
-                               var_dump("Oppdaterer organisasjon 
".$orgmapping.', settes til inaktiv.<br/>');
+                                       var_dump("Oppdaterer organisasjon " . 
$orgmapping . ', settes til inaktiv.<br/>');
                                $this->set_organization_inactive($orgmapping);
                                //get affected stuff from booking
                                $alloc = 
$this->get_affected_allocations($orgmapping);
                                foreach($alloc as $a)
                                {
-                                       var_dump('Allocation id: '.$a.' flyttes 
fra '.$orgmapping.' til '.$key.'</br>');
+                                               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)
                                {
-                                       var_dump('Reservation id: '.$r.' 
flyttes fra '.$orgmapping.' til '.$key.'</br>');
+                                               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)
                                {
-                                       var_dump('Event id: '.$e.' flyttes fra 
'.$orgmapping.' til '.$key.'</br>');
+                                               var_dump('Event id: ' . $e . ' 
flyttes fra ' . $orgmapping . ' til ' . $key . '</br>');
                                        $this->update_affected_events($e, $key);
                                }
                        }
@@ -332,7 +342,7 @@
                {
                        //update organization with new information
                        //_debug_array($no);
-                       var_dump("Oppdaterer organisasjon 
".$no['orgid'].','.$no['orgname'].' med ny adresse.<br/>');
+                               var_dump("Oppdaterer organisasjon " . 
$no['orgid'] . ',' . $no['orgname'] . ' med ny adresse.<br/>');
                        $this->update_organization_with_new_info($no);
                }
 
@@ -342,10 +352,12 @@
        function get_organization_name_local($org_id)
        {
                $result = "Ingen";
-       if(isset($org_id)){
-               $q1="SELECT name FROM activity_organization WHERE id={$org_id}";
+                       if(isset($org_id))
+                       {
+                               $q1 = "SELECT name FROM activity_organization 
WHERE id={$org_id}";
                        $this->db->query($q1, __LINE__, __FILE__);
-                       while($this->db->next_record()){
+                               while($this->db->next_record())
+                               {
                                $result = $this->db->f('name');
                        }
        }
@@ -356,10 +368,12 @@
        function get_contacts($organization_id)
        {
                $contacts = array();
-       if(isset($organization_id)){
-               $q1="SELECT id FROM bb_organization_contact WHERE 
organization_id={$organization_id}";
+                       if(isset($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;
                        }
@@ -371,31 +385,34 @@
        function get_contacts_as_objects($organization_id)
        {
                $contacts = array();
-       if(isset($organization_id)){
-               $q1="SELECT * FROM bb_organization_contact WHERE 
organization_id={$organization_id}";
+                       if(isset($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()){
-                               $contact_person = new 
activitycalendar_contact_person((int) $this->db->f('id'));
+                               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'));
                                
$contact_person->set_group_id($this->unmarshal($this->db->f('group_id'), 
'int'));
                                
$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)
        {
                $contacts = array();
-       if(isset($organization_id)){
-               $q1="SELECT id FROM activity_contact_person WHERE 
organization_id='{$organization_id}'";
+                       if(isset($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;
                        }
@@ -407,12 +424,14 @@
        function get_contacts_local_as_objects($organization_id)
        {
                $contacts = array();
-       if(isset($organization_id)){
-               $q1="SELECT * FROM activity_contact_person WHERE 
organization_id='{$organization_id}'";
+                       if(isset($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()){
-                               $contact_person = new 
activitycalendar_contact_person((int) $this->db->f('id'));
+                               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'));
                                
$contact_person->set_group_id($this->unmarshal($this->db->f('group_id'), 
'int'));
                                
$contact_person->set_name($this->unmarshal($this->db->f('name'), 'string'));
@@ -426,10 +445,12 @@
 
        function get_description($organization_id)
        {
-       if(isset($organization_id)){
-               $q1="SELECT description FROM bb_organization WHERE 
id={$organization_id}";
+                       if(isset($organization_id))
+                       {
+                               $q1 = "SELECT description FROM bb_organization 
WHERE id={$organization_id}";
                        $this->db->query($q1, __LINE__, __FILE__);
-                       while($this->db->next_record()){
+                               while($this->db->next_record())
+                               {
                                $desc = $this->db->f('description');
                        }
        }
@@ -438,21 +459,23 @@
 
        function get_description_local($organization_id)
        {
-       if(isset($organization_id)){
-               $q1="SELECT description FROM activity_organization WHERE 
id={$organization_id}";
+                       if(isset($organization_id))
+                       {
+                               $q1 = "SELECT description FROM 
activity_organization WHERE id={$organization_id}";
                        $this->db->query($q1, __LINE__, __FILE__);
-                       while($this->db->next_record()){
+                               while($this->db->next_record())
+                               {
                                $desc = $this->db->f('description');
                        }
        }
                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()){
+                       while($this->db->next_record())
+                       {
                        $result = $this->db->f('part_of_town_id');
                }
                return $result;
@@ -463,10 +486,11 @@
                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.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()){
+                               while($this->db->next_record())
+                               {
                                $office_name = $this->db->f('descr');
                        }
                }
@@ -504,8 +528,8 @@
                $city = $organization->get_city();
                $district = $organization->get_district();
                $change_type = $organization->get_change_type();
-               $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;
+                       $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}'";
@@ -521,7 +545,7 @@
                $values[] = "CHANGE_TYPE='{$change_type}'";
                $values[] = "TRANSFERRED={$transferred}";
                $values[] = "ORIGINAL_ORG_ID={$original_org_id}";
-               $vals = implode(',',$values);
+                       $vals            = implode(',', $values);
 
                $sql = "UPDATE activity_organization SET {$vals} WHERE 
ID={$organization->get_id()}";
        $result = $this->db->query($sql, __LINE__, __FILE__);
@@ -556,8 +580,9 @@
        protected function populate(int $org_id, &$organization)
        {
 
-               if($organization == null) {
-                       $organization = new activitycalendar_organization((int) 
$org_id);
+                       if($organization == null)
+                       {
+                               $organization = new 
activitycalendar_organization((int)$org_id);
 
                        
$organization->set_name($this->unmarshal($this->db->f('name'), 'string'));
                        
$organization->set_organization_number($this->unmarshal($this->db->f('organization_number'),
 'int'));
@@ -605,7 +630,7 @@
                $values[] = "CITY='{$city}'";
                $values[] = "ORGNO='{$orgnr}'";
                $values[] = "ORIGINAL_ORG_ID={$original_org_id}";
-               $vals = implode(',',$values);
+                       $vals            = implode(',', $values);
 
                //var_dump("INSERT INTO activity_organization ({$cols}) VALUES 
({$vals})");
                $sql = "UPDATE activity_organization SET {$vals} WHERE 
ID={$organization->get_id()}";
@@ -648,7 +673,7 @@
                $columns[] = 'activity_id';
                $columns[] = 'customer_internal';
                $columns[] = 'show_in_portal';
-               $cols = implode(',',$columns);
+                       $cols            = implode(',', $columns);
 
                $values[] = "'{$name}'";
                $values[] = "'{$homepage}'";
@@ -663,7 +688,7 @@
                $values[] = $this->marshal($activity_id, 'int');
                $values[] = $customer_internal;
                $values[] = $show_in_portal;
-               $vals = implode(',',$values);
+                       $vals            = implode(',', $values);
 
                $sql = "INSERT INTO bb_organization ({$cols}) VALUES ({$vals})";
        $result = $this->db->query($sql, __LINE__, __FILE__);
@@ -684,7 +709,7 @@
                $this->db->query($sql, __LINE__, __FILE__);
                while($this->db->next_record())
                {
-                       $organization = new activitycalendar_organization((int) 
$this->db->f('id'));
+                               $organization = new 
activitycalendar_organization((int)$this->db->f('id'));
 
                        
$organization->set_name($this->unmarshal($this->db->f('name'), 'string'));
                        
$organization->set_organization_number($this->unmarshal($this->db->f('organization_number'),
 'int'));
@@ -759,7 +784,7 @@
                        '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 update_organization_with_new_info($organization)
@@ -788,7 +813,7 @@
                        'city = ' . $this->marshal($city, 'string')
                );
                //var_dump("UPDATE bb_organization SET " . join(',', $values) . 
" WHERE id=$orgid");
-               $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 set_organization_inactive($org_id)
@@ -796,7 +821,7 @@
                $orgid = (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={$orgid}", __LINE__, __FILE__);
        }
 
        function get_affected_allocations($org_id)
@@ -804,7 +829,8 @@
                $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');
                }
 
@@ -821,7 +847,8 @@
                $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');
                }
 
@@ -838,7 +865,8 @@
                $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');
                }
 
@@ -872,9 +900,10 @@
        function get_organization_homepage($org_id)
        {
                $result = "Ingen";
-               if(isset($org_id)){
+                       if(isset($org_id))
+                       {
                        $org_id = intval($org_id);
-                       $q1="SELECT homepage FROM bb_organization WHERE 
id={$org_id}";
+                               $q1              = "SELECT homepage FROM 
bb_organization WHERE id={$org_id}";
                        $this->db->query($q1, __LINE__, __FILE__);
                        while($this->db->next_record())
                        {
@@ -888,8 +917,9 @@
        function get_organization_homepage_local($org_id)
        {
                $result = "Ingen";
-               if(isset($org_id)){
-                       $q1="SELECT homepage FROM activity_organization WHERE 
id={$org_id}";
+                       if(isset($org_id))
+                       {
+                               $q1 = "SELECT homepage FROM 
activity_organization WHERE id={$org_id}";
                        $this->db->query($q1, __LINE__, __FILE__);
                        while($this->db->next_record())
                        {
@@ -918,5 +948,4 @@
                }
                return false;
        }
-}
-?>
+       }
\ No newline at end of file

Modified: trunk/activitycalendar/inc/class.uiactivities.inc.php
===================================================================
--- trunk/activitycalendar/inc/class.uiactivities.inc.php       2016-02-10 
10:51:51 UTC (rev 14718)
+++ trunk/activitycalendar/inc/class.uiactivities.inc.php       2016-02-10 
19:45:46 UTC (rev 14719)
@@ -1,14 +1,15 @@
 <?php
-phpgw::import_class('activitycalendar.uicommon');
-phpgw::import_class('activitycalendar.soactivity');
-phpgw::import_class('activitycalendar.soarena');
-phpgw::import_class('activitycalendar.soorganization');
-phpgw::import_class('activitycalendar.sogroup');
+       phpgw::import_class('activitycalendar.uicommon');
+       phpgw::import_class('activitycalendar.soactivity');
+       phpgw::import_class('activitycalendar.soarena');
+       phpgw::import_class('activitycalendar.soorganization');
+       phpgw::import_class('activitycalendar.sogroup');
 
-include_class('activitycalendar', 'activity', 'inc/model/');
+       include_class('activitycalendar', 'activity', 'inc/model/');
 
-class activitycalendar_uiactivities extends activitycalendar_uicommon
-{
+       class activitycalendar_uiactivities extends activitycalendar_uicommon
+       {
+
     protected $so_org;
     protected $so_group;
     protected $so_contact;
@@ -17,7 +18,6 @@
        private $validator;
        private $config_booking;
        private $debug;
-
        public $public_functions = array
     (
         'index'                     => true,
@@ -26,6 +26,7 @@
         'view'                      => true,
         'add'                       => true,
         'edit'                      => true,
+                       'save'                                           => 
true,
         'download'                  => true,
         'send_mail'                 => true,
         'get_organization_groups'   => true,
@@ -44,15 +45,68 @@
         $this->so_activity = activitycalendar_soactivity::get_instance();
         $this->so_arena = activitycalendar_soarena::get_instance();
         self::set_active_menu('activitycalendar::activities');
-        $config        = CreateObject('phpgwapi.config','activitycalendar');
+                       $config                                  = 
CreateObject('phpgwapi.config', 'activitycalendar');
         $config->read();
-        $this->config_booking  = CreateObject('phpgwapi.config','booking');
+                       $this->config_booking    = 
CreateObject('phpgwapi.config', 'booking');
         $this->config_booking->read();
 
                $this->validator = 
CreateObject('phpgwapi.EmailAddressValidator');
 
                $this->debug = false;
+               }
 
+               private function _get_filters()
+               {
+                       $filters = array();
+
+                       $activity_state_options = array
+                               (
+                               array('id' => 'all', 'name' => lang('all')),
+                               array('id' => '1', 'name' => lang('new')),
+                               array('id' => '2', 'name' => lang('change')),
+                               array('id' => '3', 'name' => lang('published')),
+                               array('id' => '5', 'name' => lang('rejected'))
+                       );
+
+                       $filters[] = array
+                               (
+                               'type'   => 'filter',
+                               'name'   => 'activity_state',
+                               'text'   => lang('activity_state'),
+                               'list'   => $activity_state_options
+                       );
+
+                       $activity_district_options[] = array('id' => 'all', 
'name' => lang('all'));
+                       $districts                                       = 
activitycalendar_soactivity::get_instance()->select_district_list();
+                       foreach($districts as $district)
+                       {
+                               $activity_district_options[] = array('id' => 
$district['id'], 'name' => $district['name']);
+                       }
+
+                       $filters[] = array
+                               (
+                               'type'   => 'filter',
+                               'name'   => 'activity_district',
+                               'text'   => lang('office'),
+                               'list'   => $activity_district_options
+                       );
+
+                       $activity_category_options[] = array('id' => 'all', 
'name' => lang('all'));
+                       $categories                                      = 
activitycalendar_soactivity::get_instance()->get_categories();
+                       foreach($categories as $category)
+                       {
+                               $activity_category_options[] = array('id' => 
$category->get_id(), 'name' => $category->get_name());
+                       }
+
+                       $filters[] = array
+                               (
+                               'type'   => 'filter',
+                               'name'   => 'activity_category',
+                               'text'   => lang('Category'),
+                               'list'   => $activity_category_options
+                       );
+
+                       return $filters;
     }
 
     /**
@@ -65,9 +119,129 @@
 
     public function index()
     {
-        //$message = phpgw::get_var('message');
-        $this->render('activity_list.php');
+                       if(phpgw::get_var('phpgw_return_as') == 'json')
+                       {
+                               return $this->query();
+                       }
 
+                       $appname = lang('activities');
+
+                       $function_msg    = lang('list %1', $appname);
+                       $type                    = 'all_activities';
+
+                       $data = array(
+                               'datatable_name' => $function_msg,
+                               'form'                   => array(
+                                       'toolbar' => array(
+                                               'item' => array(
+                                                       array
+                                                               (
+                                                               'type'   => 
'date-picker',
+                                                               'id'     => 
'date_change',
+                                                               'name'   => 
'date_change',
+                                                               'value'  => '',
+                                                               'text'   => 
lang('date')
+                                                       ),
+                                                       array(
+                                                               'type'   => 
'link',
+                                                               'value'  => 
lang('new'),
+                                                               'href'   => 
self::link(array(
+                                                                       
'menuaction' => 'activitycalendar.uiactivities.add'
+                                                               )),
+                                                               'class'  => 
'new_item'
+                                                       )
+                                               )
+                                       )
+                               ),
+                               'datatable'              => array(
+                                       'source'                 => 
self::link(array(
+                                               'menuaction'             => 
'activitycalendar.uiactivities.index',
+                                               'type'                          
 => $type,
+                                               'phpgw_return_as'        => 
'json'
+                                       )),
+                                       'download'               => 
self::link(array('menuaction' => 'activitycalendar.uiactivities.download',
+                                               'type'           => $type,
+                                               'export'         => true,
+                                               'allrows'        => true
+                                       )),
+                                       'allrows'                => true,
+                                       'editor_action'  => '',
+                                       'field'                  => array(
+                                               array('key' => 'id', 'label' => 
lang('id'), 'sortable' => true, 'hidden' => false),
+                                               array('key' => 'title', 'label' 
=> lang('title'), 'sortable' => true, 'hidden' => false),
+                                               array('key' => 'state', 'label' 
=> lang('status'), 'sortable' => true, 'hidden' => false),
+                                               array('key' => 
'organization_id', 'label' => lang('organization'), 'sortable' => true,
+                                                       'hidden' => false),
+                                               array('key' => 'group_id', 
'label' => lang('group'), 'sortable' => true, 'hidden' => false),
+                                               array('key' => 'district', 
'label' => lang('district'), 'sortable' => true,
+                                                       'hidden' => false),
+                                               array('key' => 'office', 
'label' => lang('office'), 'sortable' => true, 'hidden' => false),
+                                               array('key' => 'category', 
'label' => lang('category'), 'sortable' => true,
+                                                       'hidden' => false),
+                                               array('key' => 'description', 
'label' => lang('description'), 'sortable' => true,
+                                                       'hidden' => false),
+                                               array('key' => 'arena', 'label' 
=> lang('arena'), 'sortable' => true, 'hidden' => false),
+                                               array('key' => 'time', 'label' 
=> lang('time'), 'sortable' => true, 'hidden' => false),
+                                               array('key' => 
'contact_person_1', 'label' => lang('contact_person_1'), 'sortable' => true,
+                                                       'hidden' => false),
+                                               array('key' => 
'contact_person_2', 'label' => lang('contact_person_2'), 'sortable' => true,
+                                                       'hidden' => false),
+                                               array('key' => 
'last_change_date', 'label' => lang('last_change_date'), 'sortable' => true,
+                                                       'hidden' => false)
+                                       )
+                               )
+                       );
+
+                       $filters = $this->_get_Filters();
+                       krsort($filters);
+                       foreach($filters as $filter)
+                       {
+                               array_unshift($data['form']['toolbar']['item'], 
$filter);
+                       }
+
+                       $data['datatable']['actions'][] = array
+                               (
+                               'my_name'        => 'show',
+                               'text'           => lang('show'),
+                               'action'         => self::link(array(
+                                       'menuaction' => 
'activitycalendar.uiactivities.view'
+                               )),
+                               'parameters' => json_encode(array('parameter' 
=> array(array('name' => 'id',
+                                                       'source' => 'id'))))
+                       );
+
+                       $data['datatable']['actions'][] = array
+                               (
+                               'my_name'        => 'edit',
+                               'text'           => lang('edit'),
+                               'action'         => self::link(array(
+                                       'menuaction' => 
'activitycalendar.uiactivities.edit'
+                               )),
+                               'parameters' => json_encode(array('parameter' 
=> array(array('name' => 'id',
+                                                       'source' => 'id'))))
+                       );
+
+                       $data['datatable']['actions'][] = array
+                               (
+                               'my_name'                => 'send_mail',
+                               'text'                   => lang('send_mail'),
+                               'type'                   => 'custom',
+                               'custom_code'    => "
+                                               var oArgs = " . 
json_encode(array(
+                                       'menuaction'             => 
'activitycalendar.uiactivities.send_mail',
+                                       'message_type'           => 'update',
+                                       'phpgw_return_as'        => 'json'
+                               )) . ";
+                                               var parameters = " . 
json_encode(array('parameter' => array(array('name' => 'activity_id',
+                                                       'source' => 'id')))) . 
";
+                                               sendMail(oArgs, parameters);
+                                       "
+                       );
+
+                       
$GLOBALS['phpgw']->jqcal->add_listener('filter_date_change');
+
+                       self::add_javascript('activitycalendar', 
'activitycalendar', 'activities.index.js');
+                       self::render_template_xsl('datatable_jquery', $data);
     }
 
     /**
@@ -75,44 +249,192 @@
      */
     public function view()
     {
-        $errorMsgs = array();
-        $infoMsgs = array();
 
-        $activity = $this->so_activity->get_single((int)phpgw::get_var('id'));
-        $cancel_link = self::link(array('menuaction' => 
'activitycalendar.uiactivities.index'));
-        $saved_OK = phpgw::get_var('saved_ok');
-        if($saved_OK)
+                       $act_so = activitycalendar_soactivity::get_instance();
+
+                       $GLOBALS['phpgw_info']['flags']['app_header'] .= '::' . 
lang('view');
+                       // Get the contract part id
+                       $activity_id = (int)phpgw::get_var('id');
+
+                       $activity = 
$this->so_activity->get_single($activity_id);
+
+                       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_new_group())
+                               {
+                                       $description = 
activitycalendar_sogroup::get_instance()->get_description_local($activity->get_group_id());
+                               }
+                               else
+                               {
+                                       $description = 
activitycalendar_sogroup::get_instance()->get_description($activity->get_group_id());
+                               }
+                       }
+                       else if($activity->get_organization_id())
+                       {
+                               if($activity->get_new_org())
+                               {
+                                       $description = 
activitycalendar_soorganization::get_instance()->get_description_local($activity->get_organization_id());
+                               }
+                               else
+                               {
+                                       $description = 
activitycalendar_soorganization::get_instance()->get_description($activity->get_organization_id());
+                               }
+                       }
+
+                       $state_name = '';
+                       if($activity->get_state())
         {
-                $message = lang('activity_saved_form');
+                               $state_name = lang('state_' . 
$activity->get_state());
         }
 
-        if($activity == null) // Not found
+                       $category_name           = '';
+                       $current_category_id = $activity->get_category();
+                       if($current_category_id)
         {
-                $errorMsgs[] = lang('Could not find specified activity.');
+                               $category_name = 
$act_so->get_category_name($current_category_id);
         }
 
-        if(isset($_POST['edit_activity'])) // The user has pressed the save 
button
+                       $current_target_ids      = $activity->get_target();
+                       $target_names            = array();
+                       if(count($current_target_ids))
         {
-                $GLOBALS['phpgw']->redirect_link('/index.php', 
array('menuaction' => 'activitycalendar.uiactivities.edit','id' => 
phpgw::get_var('id')));
+                               $current_target_id_array = explode(",", 
$current_target_ids);
+                               foreach($current_target_id_array as 
$curr_target)
+                               {
+                                       $target_names[] = array('name' => 
$act_so->get_target_name($curr_target));
+                               }
         }
 
+                       $current_district_ids    = $activity->get_district();
+                       $district_names                  = array();
+                       if(count($current_district_ids))
+                       {
+                               $current_district_id_array = explode(",", 
$current_district_ids);
+                               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())
+                       {
+                               $building_name = 
activitycalendar_soarena::get_instance()->get_building_name($activity->get_internal_arena());
+                       }
+
+                       $arena_name = '';
+                       if($activity->get_arena())
+                       {
+                               $arena_name = 
activitycalendar_soarena::get_instance()->get_arena_name($activity->get_arena());
+                       }
+
+                       $office_name = '';
+                       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($activity->get_new_org())
+                               {
+                                       $organization_name = 
activitycalendar_soorganization::get_instance()->get_organization_name_local($current_organization_id);
+                               }
+                               else
+                               {
+                                       $organization_name = 
activitycalendar_soorganization::get_instance()->get_organization_name($current_organization_id);
+                               }
+                       }
+
+                       if($activity->get_group_id())
+                       {
+                               if($activity->get_new_group())
+                               {
+                                       $group_name = 
activitycalendar_sogroup::get_instance()->get_group_name_local($activity->get_group_id());
+                               }
+                               else
+                               {
+                                       $group_name = 
activitycalendar_sogroup::get_instance()->get_group_name($activity->get_group_id());
+                               }
+                       }
+
+                       $contpers_so = 
activitycalendar_socontactperson::get_instance();
+
+                       if($activity->get_group_id())
+                       {
+                               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());
+                               }
+                               else
+                               {
+                                       $contact_person_1        = 
$contpers_so->get_group_contact_name($activity->get_contact_person_1());
+                                       $contact_person_2        = 
$contpers_so->get_group_contact_name($activity->get_contact_person_2());
+                               }
+                       }
+                       else if($activity->get_organization_id())
+                       {
+                               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());
+                               }
+                               else
+                               {
+                                       $contact_person_1        = 
$contpers_so->get_org_contact_name($activity->get_contact_person_1());
+                                       $contact_person_2        = 
$contpers_so->get_org_contact_name($activity->get_contact_person_2());
+                               }
+                       }
+
+                       $tabs                            = array();
+                       $tabs['activity']        = array('label' => 
lang('activity'), 'link' => '#activity');
+                       $active_tab                      = 'activity';
+
         $data = array
         (
-            'activity' => $activity,
-            'cancel_link' => $cancel_link,
-            'message' => $message,
-            'errorMsgs' => $errorMsgs,
-            'infoMsgs' => $infoMsgs
+                               'tabs'                   => 
phpgwapi_jquery::tabview_generate($tabs, $active_tab),
+                               'cancel_url'     => 
$GLOBALS['phpgw']->link('/index.php', array('menuaction' => 
'activitycalendar.uiactivities.index')),
+                               'edit_url'               => 
$GLOBALS['phpgw']->link('/index.php', array('menuaction' => 
'activitycalendar.uiactivities.edit',
+                                       'id' => $activity->get_id())),
+                               'lang_edit'              => lang('edit'),
+                               'lang_cancel'    => lang('cancel'),
+                               'value_title'            => 
$activity->get_title(),
+                               'value_description'      => $description,
+                               'value_time'             => 
$activity->get_time(),
+                               'contact_person_1'                       => 
$contact_person_1,
+                               'contact_person_2'                       => 
$contact_person_2,
+                               'contact_person_2_address'       => 
$activity->get_contact_person_2_address(),
+                               'contact_person_2_zip'           => 
$activity->get_contact_person_2_zip(),
+                               'state_name'                             => 
$state_name,
+                               'category_name'                          => 
$category_name,
+                               'list_target_names'                      => 
$target_names,
+                               'list_district_names'            => 
$district_names,
+                               'special_adaptation_checked' => 
($activity->get_special_adaptation() ? 1 : 0),
+                               'building_name'                          => 
$building_name,
+                               'arena_name'                             => 
$arena_name,
+                               'office_name'                            => 
$office_name,
+                               'organization_name'                      => 
$organization_name,
+                               'group_name'                             => 
$group_name
         );
-        $this->render('activity.php', $data);
+
+                       self::render_template_xsl(array('activity'), 
array('view' => $data));
     }
 
     public function edit()
     {
-        $GLOBALS['phpgw_info']['flags']['app_header'] .= '::'.lang('edit');
+                       $GLOBALS['phpgw_info']['flags']['app_header'] .= '::' . 
lang('edit');
         // Get the contract part id
         $activity_id = (int)phpgw::get_var('id');
-        $cancel_link = self::link(array('menuaction' => 
'activitycalendar.uiactivities.index'));
+
         $categories = $this->so_activity->get_categories();
         $targets = $this->so_activity->get_targets();
         $offices = $this->so_activity->select_district_list();
@@ -127,6 +449,7 @@
         {
             $activity = new activitycalendar_activity();
         }
+
         $new_group = $activity->get_new_group();
         $g_id = phpgw::get_var('group_id');
         $o_id = phpgw::get_var('organization_id');
@@ -148,7 +471,7 @@
 
         if(strlen($desc) > 254)
         {
-            $desc = substr($desc,0,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())
@@ -159,14 +482,18 @@
         {
             $organizations = $this->so_org->get(null, null, 'org.name', true, 
null, null, null);
         }
+
         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'));
+                               $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]];
-            //$group_name = $local_group->get_name();
+                                       $local_group_name        = 
$local_group->get_name();
+                                       $local_group_id          = 
$local_group->get_id();
         }
         }
         else
@@ -174,8 +501,340 @@
             $groups = $this->so_group->get(null, null, null, null, null, null, 
null);
         }
 
-        if(isset($_POST['save_activity'])) // The user has pressed the save 
button
+                       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_new_group())
+                               {
+                                       $description = 
activitycalendar_sogroup::get_instance()->get_description_local($activity->get_group_id());
+                               }
+                               else
+                               {
+                                       $description = 
activitycalendar_sogroup::get_instance()->get_description($activity->get_group_id());
+                               }
+                       }
+                       else if($activity->get_organization_id())
+                       {
+                               if($activity->get_new_org())
+                               {
+                                       $description = 
activitycalendar_soorganization::get_instance()->get_description_local($activity->get_organization_id());
+                               }
+                               else
+                               {
+                                       $description = 
activitycalendar_soorganization::get_instance()->get_description($activity->get_organization_id());
+                               }
+                       }
+
+                       $selected_state  = $activity->get_state();
+                       $state_options   = array
+                               (
+                               array('id' => '1', 'name' => lang('new'), 
'selected' => (($selected_state == 1) ? 1 : 0)),
+                               array('id' => '2', 'name' => lang('change'), 
'selected' => (($selected_state == 2) ? 1 : 0)),
+                               array('id' => '3', 'name' => lang('published'), 
'selected' => (($selected_state == 3) ? 1 : 0)),
+                               array('id' => '5', 'name' => lang('rejected'), 
'selected' => (($selected_state == 4) ? 1 : 0))
+                       );
+
+                       $category_options[]      = array('id' => '', 'name' => 
lang('Ingen kategori valgt'),
+                               'selected' => 0);
+                       $current_category_id = $activity->get_category();
+                       foreach($categories as $category)
+                       {
+                               $id                                      = 
$category->get_id();
+                               $selected                        = 
($current_category_id == $id) ? 1 : 0;
+                               $category_options[]      = array('id' => $id, 
'name' => $category->get_name(), 'selected' => $selected);
+                       }
+
+                       $current_target_ids              = 
$activity->get_target();
+                       $current_target_id_array = explode(",", 
$current_target_ids);
+                       $target_checks                   = array();
+                       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(),
+                                       'checked' => $checked, 'name' => 
'target[]');
+                       }
+
+                       $current_district_ids            = 
$activity->get_district();
+                       $current_district_id_array       = explode(",", 
$current_district_ids);
+                       $district_checks                         = array();
+                       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'],
+                                       'checked' => $checked, 'name' => 
'district[]');
+                       }
+
+                       $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)
+                       {
+                               $selected                        = 
($current_internal_arena_id == $building_id) ? 1 : 0;
+                               $building_options[]      = array('id' => 
$building_id, 'name' => $building_name,
+                                       'selected' => $selected);
+                       }
+
+                       $arena_external_options[]        = array('id' => '', 
'name' => lang('Ingen arena valgt'),
+                               'selected' => 0);
+                       $current_arena_id                        = 
$activity->get_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(),
+                                       'selected' => $selected);
+                       }
+
+                       $office_options[]        = array('id' => '', 'name' => 
lang('Ingen kontor valgt'), 'selected' => 0);
+                       $selected_office         = $activity->get_office();
+                       foreach($offices as $office)
+                       {
+                               $selected                        = 
($selected_office == $office['id']) ? 1 : 0;
+                               $office_options[]        = array('id' => 
$office['id'], 'name' => $office['name'],
+                                       'selected' => $selected);
+                       }
+
+                       $organization_options[]  = array('id' => '', 'name' => 
lang('Ingen organisasjon valgt'),
+                               'selected' => 0);
+                       $current_organization_id = 
$activity->get_organization_id();
+                       foreach($organizations as $organization)
+                       {
+                               $selected                                = 
($current_organization_id == $organization->get_id()) ? 1 : 0;
+                               $organization_options[]  = array('id' => 
$organization->get_id(), 'name' => $organization->get_name(),
+                                       'selected' => $selected);
+                       }
+
+                       $contpers_so = 
activitycalendar_socontactperson::get_instance();
+
+                       if($activity->get_group_id())
+                       {
+                               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());
+                               }
+                               else
+                               {
+                                       $contact_person_1        = 
$contpers_so->get_group_contact_name($activity->get_contact_person_1());
+                                       $contact_person_2        = 
$contpers_so->get_group_contact_name($activity->get_contact_person_2());
+                               }
+                       }
+                       else if($activity->get_organization_id())
+                       {
+                               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());
+                               }
+                               else
+                               {
+                                       $contact_person_1        = 
$contpers_so->get_org_contact_name($activity->get_contact_person_1());
+                                       $contact_person_2        = 
$contpers_so->get_org_contact_name($activity->get_contact_person_2());
+                               }
+                       }
+
+                       $tabs                            = array();
+                       $tabs['activity']        = array('label' => 
lang('activity'), 'link' => '#activity');
+                       $active_tab                      = 'activity';
+
+                       $data = array
+                               (
+                               'tabs'                   => 
phpgwapi_jquery::tabview_generate($tabs, $active_tab),
+                               'form_action'    => 
$GLOBALS['phpgw']->link('/index.php', array('menuaction' => 
'activitycalendar.uiactivities.save')),
+                               'cancel_url'     => 
$GLOBALS['phpgw']->link('/index.php', array('menuaction' => 
'activitycalendar.uiactivities.index')),
+                               'lang_save'              => lang('save'),
+                               'lang_cancel'    => lang('cancel'),
+                               'activity_id'                                   
 => $activity->get_id(),
+                               'value_title'                                   
 => $activity->get_title(),
+                               'value_description'                             
 => $description,
+                               'list_state_options'                     => 
array('options' => $state_options),
+                               'list_category_options'                  => 
array('options' => $category_options),
+                               'list_target_checks'                     => 
array('choice' => $target_checks),
+                               'list_district_checks'                   => 
array('choice' => $district_checks),
+                               'special_adaptation_checked'     => 
($activity->get_special_adaptation() ? 1 : 0),
+                               'list_building_options'                  => 
array('options' => $building_options),
+                               'list_arena_external_options'    => 
array('options' => $arena_external_options),
+                               'value_time'                                    
 => $activity->get_time(),
+                               'list_office_options'                    => 
array('options' => $office_options),
+                               'list_organization_options'              => 
array('options' => $organization_options),
+                               'organization_selected'                  => 
($current_organization_id ? 1 : 0),
+                               'organization_url'                              
 => $GLOBALS['phpgw']->link('/index.php', array('menuaction' => 
'booking.uiorganization.show',
+                                       'id' => $current_organization_id)),
+                               'new_group'                                     
         => ($new_group ? 1 : 0),
+                               'local_group_name'                              
 => $local_group_name,
+                               'local_group_id'                                
 => $local_group_id,
+                               'group_selected'                                
 => ($activity->get_group_id() ? 1 : 0),
+                               'group_selected_id'                             
 => $activity->get_group_id(),
+                               'group_url'                                     
         => $GLOBALS['phpgw']->link('/index.php', array('menuaction' => 
'booking.uigroup.show',
+                                       'id' => $activity->get_group_id())),
+                               'contact_person_1'                       => 
$contact_person_1,
+                               'contact_person_2'                       => 
$contact_person_2,
+                               'contact_person_2_address'       => 
$activity->get_contact_person_2_address(),
+                               'contact_person_2_zip'           => 
$activity->get_contact_person_2_zip(),
+                               'validator' => 
phpgwapi_jquery::formvalidator_generate(array('location', 'date',
+                                       'security', 'file'))
+                       );
+
+                       phpgwapi_jquery::load_widget('autocomplete');
+
+                       $_autocomplete = <<<JS
+
+                               $(document).ready(function () 
+                               {
+                                       var oArgs = 
{menuaction:'activitycalendarfrontend.uiactivity.get_address_search'};
+                                       var strURL = phpGWLink('index.php', 
oArgs);
+                                       
JqueryPortico.autocompleteHelper(strURL, 'contact_person_2_address', '', 
'contact_person_2_address_container');
+                               });
+JS;
+                       $GLOBALS['phpgw']->js->add_code('', $_autocomplete);
+
+                       self::add_javascript('activitycalendar', 
'activitycalendar', 'activities.edit.js');
+                       self::render_template_xsl(array('activity'), 
array('edit' => $data));
+               }
+
+               public function query()
         {
+                       $search  = phpgw::get_var('search');
+                       $order   = phpgw::get_var('order');
+                       $draw    = phpgw::get_var('draw', 'int');
+                       $columns = phpgw::get_var('columns');
+
+                       $start_index     = phpgw::get_var('start', 'int', 
'REQUEST', 0);
+                       $num_of_objects  = (phpgw::get_var('length', 'int') <= 
0) ? $this->user_rows_per_page : phpgw::get_var('length', 'int');
+                       $sort_field              = 
($columns[$order[0]['column']]['data']) ? $columns[$order[0]['column']]['data'] 
: 'id';
+                       $sort_ascending  = ($order[0]['dir'] == 'desc') ? false 
: true;
+                       // Form variables
+                       $search_for              = $search['value'];
+                       $search_type     = phpgw::get_var('search_option');
+
+                       // Create an empty result set
+                       $result_objects  = array();
+                       $result_count    = 0;
+
+                       $export = phpgw::get_var('export', 'bool');
+                       if($export)
+                       {
+                               $num_of_objects = null;
+                       }
+
+                       //Retrieve the type of query and perform type specific 
logic
+                       $query_type = phpgw::get_var('type');
+
+                       $email_param = phpgw::get_var('email');
+                       $email           = false;
+                       if(isset($email_param))
+                       {
+                               $email                   = true;
+                               $num_of_objects  = null;
+                       }
+
+                       $uid = $GLOBALS['phpgw_info']['user']['account_id'];
+
+                       switch($query_type)
+                       {
+                               case 'new_activities':
+                                       $filters                 = 
array('new_activities'                => 'yes', 'activity_state'              
=> phpgw::get_var('activity_state'),
+                                               'activity_category'             
 => phpgw::get_var('activity_category'), 'activity_district'             => 
phpgw::get_var('activity_district'),
+                                               'user_id'                       
         => $uid, 'updated_date_hidden'  => phpgw::get_var('date_change'));
+                                       $result_objects  = 
activitycalendar_soactivity::get_instance()->get($start_index, $num_of_objects, 
$sort_field, $sort_ascending, $search_for, $search_type, $filters);
+                                       $result_count    = 
activitycalendar_soactivity::get_instance()->get_count($search_for, 
$search_type, $filters);
+                                       break;
+                               case 'all_activities':
+                               default:
+                                       $filters                 = 
array('activity_state'                => phpgw::get_var('activity_state'), 
'activity_category'                => phpgw::get_var('activity_category'),
+                                               'activity_district'             
 => phpgw::get_var('activity_district'), 'user_id'                              
 => $uid,
+                                               'updated_date_hidden'    => 
phpgw::get_var('date_change'));
+                                       $result_objects  = 
activitycalendar_soactivity::get_instance()->get($start_index, $num_of_objects, 
$sort_field, $sort_ascending, $search_for, $search_type, $filters);
+                                       $result_count    = 
activitycalendar_soactivity::get_instance()->get_count($search_for, 
$search_type, $filters);
+                                       break;
+                       }
+
+                       //Create an empty row set
+                       $rows            = array();
+                       $mail_rows       = array();
+                       foreach($result_objects as $result)
+                       {
+                               if(isset($result))
+                               {
+                                       // ... add a serialized result
+                                       if($export)
+                                       {
+                                               $rows[] = 
$result->serialize_for_export();
+                                       }
+                                       else
+                                       {
+                                               $rows[] = $result->serialize();
+                                       }
+                                       $mail_rows[] = $result;
+                               }
+                       }
+
+                       if($export)
+                       {
+                               return $rows;
+                       }
+
+                       if(!$export && !$email)
+                       {
+                               //Add action column to each row in result table
+                               array_walk($rows, array($this, 'add_actions'), 
array($query_type));
+                       }
+                       if($email)
+                       {
+                               $this->send_email_to_selection($mail_rows);
+                       }
+                       else
+                       {
+                               $result_data                                    
 = array('results' => $rows);
+                               $result_data['total_records']    = 
$result_count;
+                               $result_data['draw']                     = 
$draw;
+
+                               return $this->jquery_results($result_data);
+                       }
+               }
+
+               public function save()
+               {
+                       $activity_id = (int)phpgw::get_var('id');
+                       // Retrieve the activity object or create a new one
+                       if(isset($activity_id) && $activity_id > 0)
+                       {
+                               $activity = 
$this->so_activity->get_single($activity_id);
+                       }
+                       else
+                       {
+                               $activity = new activitycalendar_activity();
+                       }
+
+                       $new_group       = $activity->get_new_group();
+                       $g_id            = phpgw::get_var('group_id');
+                       $o_id            = phpgw::get_var('organization_id');
+                       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)
+                       {
+                               $persons = $this->so_group->get_contacts($g_id);
+                               $desc    = 
$this->so_group->get_description($g_id);
+                       }
+                       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)
+                       {
+                               $desc = substr($desc, 0, 254);
+                       }
+
             if(isset($activity)) // If an activity object is created
             {
                 $old_state = $activity->get_state();
@@ -235,8 +894,10 @@
                         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){
+                                                       $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)
+                                                       {
                                 $keys = array_keys($group_array);
                                 $group = $group_array[$keys[0]];
                             }
@@ -285,17 +946,19 @@
 
                                 $this->so_group->update_local($group);
                                 $message = lang('messages_saved_form');
-                                //var_dump($new_group_id);
+
                                 $contact_persons = 
$this->so_contact->get_booking_contact_persons($new_group_id, true);
-                                //var_dump(2);
+
                                 $cp1 = $contact_persons[0];
                             }
                         }
-                        $message = lang('messages_saved_form');
+                                               //$message = 
lang('messages_saved_form');
+                                               
phpgwapi_cache::message_set(lang('messages_saved_form'), 'message');
                     }
                     else
                     {
-                        $error = lang('messages_form_error');
+                                               //$error = 
lang('messages_form_error');
+                                               
phpgwapi_cache::message_set(lang('messages_form_error'), 'error');
                     }
 
                                                                                
if(isset($activity_id) && $activity_id > 0)
@@ -312,170 +975,36 @@
                         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);
+                                                       
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);
+                                                       
activitycalendar_uiactivities::send_mailnotification_to_organization($activity->get_contact_person_1(),
 $subject, $body);
                         }
                     }
-                    $GLOBALS['phpgw']->redirect_link('/index.php', 
array('menuaction' => 'activitycalendar.uiactivities.view', 'id' => 
$activity->get_id(), 'saved_ok' => 'yes'));
+                                       
$GLOBALS['phpgw']->redirect_link('/index.php', array('menuaction' => 
'activitycalendar.uiactivities.view',
+                                               'id'             => 
$activity->get_id()));
                 }
                 else
                 {
                     if(!$target_ok)
                     {
-                        $error .= "<br/>" . lang('target_not_selected');
+                                               //$error .= "<br/>" . 
lang('target_not_selected');
+                                               
phpgwapi_cache::message_set(lang('target_not_selected'), 'error');
                     }
                     if(!$district_ok)
                     {
-                        $error .= "<br/>" . lang('district_not_selected');
-                    }
-                    return $this->render('activity.php', array
-                            (
-                                'activity'     => $activity,
-                                'organizations' => $organizations,
-                                'org_name' => $org_name,
-                                'groups' => $groups,
-                                'local_group' => $local_group,
-                                'arenas' => $arenas,
-                                'buildings' => $buildings,
-                                'categories' => $categories,
-                                'targets' => $targets,
-                                'districts' => $districts,
-                                'offices' => $offices,
-                                'editable' => true,
-                                'cancel_link' => $cancel_link,
-                                'message' => isset($message) ? $message : 
phpgw::get_var('message'),
-                                'error' => isset($error) ? $error : 
phpgw::get_var('error')
-                            )
-                    );
+                                               //$error .= "<br/>" . 
lang('district_not_selected');
+                                               
phpgwapi_cache::message_set(lang('district_not_selected'), 'error');
                 }
             }
         }
-        $editable = true;
-        if($activity->get_new_org())
-        {
-            $error = lang('org_not_transferred');
-            $editable = false;
-        }
-        //var_dump($local_group);
 
-        return $this->render('activity.php', array
-                (
-                    'activity'         => $activity,
-                    'organizations' => $organizations,
-                    'org_name' => $org_name,
-                    'groups' => $groups,
-                    'local_group' => $local_group,
-                    'arenas' => $arenas,
-                    'buildings' => $buildings,
-                    'categories' => $categories,
-                    'targets' => $targets,
-                    'districts' => $districts,
-                    'offices' => $offices,
-                    'editable' => $editable,
-                    'cancel_link' => $cancel_link,
-                    'message' => isset($message) ? $message : 
phpgw::get_var('message'),
-                    'error' => isset($error) ? $error : phpgw::get_var('error')
-                )
-        );
+                       $GLOBALS['phpgw']->redirect_link('/index.php', 
array('menuaction' => 'activitycalendar.uiactivities.edit',
+                               'id' => $activity->get_id()));
     }
 
-    public function query()
-    {
-        
if($GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'] > 0)
-        {
-            $user_rows_per_page = 
$GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'];
-        }
-        else
-               {
-            $user_rows_per_page = 10;
-        }
-        // YUI variables for paging and sorting
-        $start_index   = phpgw::get_var('startIndex', 'int');
-        $num_of_objects        = phpgw::get_var('results', 'int', 'GET', 
$user_rows_per_page);
-        $sort_field            = phpgw::get_var('sort');
-        $sort_ascending        = phpgw::get_var('dir') == 'desc' ? false : 
true;
-        // Form variables
-        $search_for    = phpgw::get_var('query');
-        $search_type   = phpgw::get_var('search_option');
-        // Create an empty result set
-        $result_objects = array();
-        $result_count = 0;
-        //Retrieve the type of query and perform type specific logic
-        $query_type = phpgw::get_var('type');
-
-        $exp_param     = phpgw::get_var('export');
-        $export = false;
-        if(isset($exp_param)){
-            $export=true;
-            $num_of_objects = null;
-        }
-
-        $email_param = phpgw::get_var('email');
-        $email = false;
-        if(isset($email_param)){
-            $email=true;
-            $num_of_objects = null;
-        }
-
-        $uid = $GLOBALS['phpgw_info']['user']['account_id'];
-
-        switch($query_type)
-        {
-            case 'new_activities':
-                $filters = array('new_activities' => 'yes', 'activity_state' 
=> phpgw::get_var('activity_state'), 'activity_category' => 
phpgw::get_var('activity_category'), 'activity_district' => 
phpgw::get_var('activity_district'), 'user_id' => $uid, 'updated_date_hidden' 
=> phpgw::get_var('date_change_hidden'));
-                $result_objects = 
activitycalendar_soactivity::get_instance()->get($start_index, $num_of_objects, 
$sort_field, $sort_ascending, $search_for, $search_type, $filters);
-                $object_count = 
activitycalendar_soactivity::get_instance()->get_count($search_for, 
$search_type, $filters);
-                break;
-            case 'all_activities':
-            default:
-                $filters = array('activity_state' => 
phpgw::get_var('activity_state'), 'activity_category' => 
phpgw::get_var('activity_category'), 'activity_district' => 
phpgw::get_var('activity_district'), 'user_id' => $uid, 'updated_date_hidden' 
=> phpgw::get_var('date_change_hidden'));
-                $result_objects = 
activitycalendar_soactivity::get_instance()->get($start_index, $num_of_objects, 
$sort_field, $sort_ascending, $search_for, $search_type, $filters);
-                $object_count = 
activitycalendar_soactivity::get_instance()->get_count($search_for, 
$search_type, $filters);
-                break;
-        }
-
-        //Create an empty row set
-        $rows = array();
-        $mail_rows = array();
-        foreach($result_objects as $result) {
-//          var_dump($result);
-            if(isset($result))
-            {
-                            // ... add a serialized result
-                if($export)
-                {
-                    $rows[] = $result->serialize_for_export();
-                }
-                else
-                {
-                    $rows[] = $result->serialize();
-                }
-                $mail_rows[] = $result;
-            }
-        }
-
-        // ... add result data
-        $result_data = array('results' => $rows, 'total_records' => 
$object_count);
-
-        if(!$export && !$email){
-            //Add action column to each row in result table
-            array_walk($result_data['results'], array($this, 'add_actions'), 
array($query_type));
-        }
-        if($email)
-        {
-            //var_dump($mail_rows);
-            $this->send_email_to_selection($mail_rows);
-        }
-        else
-        {
-            return $this->yui_results($result_data, 'total_records', 
'results');
-        }
-    }
-
     /**
      * Add action links and labels for the context menu of the list items
      *
@@ -496,25 +1025,31 @@
         {
             case 'all_activities':
                 $value['ajax'][] = false;
-                $value['actions'][] = 
html_entity_decode(self::link(array('menuaction' => 
'activitycalendar.uiactivities.edit', 'id' => $value['id'])));
+                                       $value['actions'][]      = 
html_entity_decode(self::link(array('menuaction' => 
'activitycalendar.uiactivities.edit',
+                                               'id'             => 
$value['id'])));
                 $value['labels'][] = lang('edit');
                 $value['ajax'][] = false;
-                $value['actions'][] = 
html_entity_decode(self::link(array('menuaction' => 
'activitycalendar.uiactivities.view', 'id' => $value['id'])));
+                                       $value['actions'][]      = 
html_entity_decode(self::link(array('menuaction' => 
'activitycalendar.uiactivities.view',
+                                               'id'             => 
$value['id'])));
                 $value['labels'][] = lang('show');
                 $value['ajax'][] = true;
-                $value['actions'][] = 
html_entity_decode(self::link(array('menuaction' => 
'activitycalendar.uiactivities.send_mail', 'activity_id' => 
$value['id'],'message_type' => 'update')));
+                                       $value['actions'][]      = 
html_entity_decode(self::link(array('menuaction'      => 
'activitycalendar.uiactivities.send_mail',
+                                               'activity_id'    => 
$value['id'], 'message_type'         => 'update')));
                 $value['labels'][] = lang('send_mail');
                 break;
 
             case 'new_activities':
                 $value['ajax'][] = false;
-                $value['actions'][] = 
html_entity_decode(self::link(array('menuaction' => 
'activitycalendar.uiactivities.edit', 'id' => $value['id'])));
+                                       $value['actions'][]      = 
html_entity_decode(self::link(array('menuaction' => 
'activitycalendar.uiactivities.edit',
+                                               'id'             => 
$value['id'])));
                 $value['labels'][] = lang('edit');
                 $value['ajax'][] = false;
-                $value['actions'][] = 
html_entity_decode(self::link(array('menuaction' => 
'activitycalendar.uiactivities.view', 'id' => $value['id'])));
+                                       $value['actions'][]      = 
html_entity_decode(self::link(array('menuaction' => 
'activitycalendar.uiactivities.view',
+                                               'id'             => 
$value['id'])));
                 $value['labels'][] = lang('show');
                 $value['ajax'][] = true;
-                $value['actions'][] = 
html_entity_decode(self::link(array('menuaction' => 
'activitycalendar.uiactivities.send_mail', 'activity_id' => 
$value['id'],'message_type' => 'update')));
+                                       $value['actions'][]      = 
html_entity_decode(self::link(array('menuaction'      => 
'activitycalendar.uiactivities.send_mail',
+                                               'activity_id'    => 
$value['id'], 'message_type'         => 'update')));
                 $value['labels'][] = lang('send_mail');
                 break;
         }
@@ -522,7 +1057,7 @@
 
     function send_email_to_selection($activities)
     {
-        $c = createobject('phpgwapi.config','activitycalendarfrontend');
+                       $c                       = 
createobject('phpgwapi.config', 'activitycalendarfrontend');
         $c->read();
         $config = $c->config_data;
                $_subject = lang('mail_subject_update');
@@ -530,7 +1065,7 @@
         $mailBaseURL = $c->config_data['mailBaseURL'];
        foreach($activities as $activity)
        {
-                       $subject = "{$_subject}::" .$activity->get_title();
+                               $subject         = "{$_subject}::" . 
$activity->get_title();
                        //$activity = 
activitycalendar_soactivity::get_instance()->get_single($activity_id);
             //$link_text = "<a 
href='http://www.bergen.kommune.no/aktivby/registreringsskjema/ny/?menuaction=activitycalendarfrontend.uiactivity.edit&amp;id={$activity->get_id()}&amp;secret={$activity->get_secret()}'>Rediger
 opplysninger for {$activity->get_title()}</a>";
             //$link_text = "<a 
href='{$mailBaseURL}?menuaction=activitycalendarfrontend.uiactivity.edit&amp;id={$activity->get_id()}&amp;secret={$activity->get_secret()}'>Rediger
 opplysninger for {$activity->get_title()}</a>";
@@ -571,11 +1106,11 @@
             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())
+                                       /* 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*/
+                                         else */
                 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);
@@ -584,11 +1119,11 @@
             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())
+                                       /* 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*/
+                                         else */
                 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);
@@ -596,13 +1131,13 @@
             }
         }
 
-               $GLOBALS['phpgw']->redirect_link('/index.php', 
array('menuaction' => 'activitycalendar.uiactivities.index', 'message' => 
'E-post sendt'));
-
+                       $GLOBALS['phpgw']->redirect_link('/index.php', 
array('menuaction' => 'activitycalendar.uiactivities.index',
+                               'message'        => 'E-post sendt'));
     }
 
     public function send_mail()
     {
-        $c = createobject('phpgwapi.config','activitycalendarfrontend');
+                       $c               = createobject('phpgwapi.config', 
'activitycalendarfrontend');
         $c->read();
         $config = $c->config_data;
 
@@ -622,11 +1157,17 @@
             $office_name = 
activitycalendar_soactivity::get_instance()->get_office_name($activity->get_office());
             $office_id = $activity->get_office();
             if($office_id == 1)
+                               {
                 $office_id_new = 2;
+                               }
             else if($office_id == 2)
+                               {
                 $office_id_new = 1;
+                               }
             else
+                               {
                 $office_id_new = (int)$office_id;
+                               }
             $office_footer = 
activitycalendar_soactivity::get_instance()->get_office_description($office_id_new);
             $body = lang('mail_body_update', $activity->get_title(), 
$link_text, $office_footer, $office_name);
        }
@@ -644,7 +1185,7 @@
        {
             //$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())
+                               /* 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())
@@ -656,7 +1197,7 @@
        {
             //$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())
+                               /* 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())
@@ -665,15 +1206,21 @@
                        }
        }
 
-       $GLOBALS['phpgw']->redirect_link('/index.php', array('menuaction' => 
'activitycalendar.uiactivities.index', 'message' => 'E-post sendt'));
+                       if(phpgw::get_var('phpgw_return_as') == 'json')
+                       {
+                               $message['message'][] = array('msg' => 
lang('E-post sendt'));
+                               return $message;
+                       }
 
+                       $GLOBALS['phpgw']->redirect_link('/index.php', 
array('menuaction' => 'activitycalendar.uiactivities.index',
+                               'message'        => 'E-post sendt'));
     }
 
     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');
         }
@@ -682,19 +1229,18 @@
         $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;
         }
 
         $mailtoAddress = 
trim(activitycalendar_socontactperson::get_instance()->get_mailaddress_for_org_contact($contact_person->get_id()));
         //$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',
@@ -719,7 +1265,7 @@
             {
                 $GLOBALS['phpgw']->send->msg('email', $mailtoAddress, 
$subject, $body, '', '', '', $from, '', 'html');
             }
-            catch (phpmailerException $e)
+                               catch(phpmailerException $e)
             {
                 if($e)
                 {
@@ -737,7 +1283,7 @@
 
     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');
         }
@@ -746,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;
         }
@@ -754,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',
@@ -782,7 +1328,7 @@
             {
                 $GLOBALS['phpgw']->send->msg('email', $mailtoAddress, 
$subject, $body, '', '', '', $from, '', 'html');
             }
-            catch (phpmailerException $e)
+                               catch(phpmailerException $e)
             {
                 if($e)
                 {
@@ -809,8 +1355,9 @@
         $returnHTML = "<option value='0'>Ingen gruppe valgt</option>";
         if($org_id)
         {
-            $groups = activitycalendar_sogroup::get_instance()->get(null, 
null, null, null, null, null, array('org_id' => $org_id));
-            foreach ($groups as $group)
+                               $groups = 
activitycalendar_sogroup::get_instance()->get(null, null, null, null, null, 
null, array(
+                                       'org_id' => $org_id));
+                               foreach($groups as $group)
             {
                 if(isset($group))
                 {
@@ -828,10 +1375,10 @@
                             $selected_group = "";
                         }
                     }
-                    $group_html[] = "<option value='" . $group->get_id() . 
"'". $selected_group . ">" . $group->get_name() . "</option>";
+                                               $group_html[] = "<option 
value='" . $group->get_id() . "'" . $selected_group . ">" . $group->get_name() 
. "</option>";
                 }
             }
-            $html = implode(' ' , $group_html);
+                               $html            = implode(' ', $group_html);
             $returnHTML = $returnHTML . ' ' . $html;
         }
 
@@ -843,13 +1390,13 @@
     {
         $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)
             {
-                $title_new = substr($title_new,0,49);
+                                       $title_new = substr($title_new, 0, 49);
             }
             $group_info['name'] = $title_new;
             $group_info['organization_id'] =  $a['organization'];
@@ -860,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);
@@ -880,7 +1427,6 @@
 
                                echo "<h2>Aktiviteten '" . 
$activity_del->get_title() . "' ble slettet fra systemet.</h2>";
                                echo "<a href='#' 
onclick='history.go(-1);'>Tilbake til forrige side</a>";
-
                        }
                        else
                        {
@@ -888,4 +1434,4 @@
                                echo "<a href='#' 
onclick='history.go(-1);'>Tilbake til forrige side</a>";
                        }
                }
-}
\ No newline at end of file
+       }
\ No newline at end of file

Modified: trunk/activitycalendar/inc/class.uiarena.inc.php
===================================================================
--- trunk/activitycalendar/inc/class.uiarena.inc.php    2016-02-10 10:51:51 UTC 
(rev 14718)
+++ trunk/activitycalendar/inc/class.uiarena.inc.php    2016-02-10 19:45:46 UTC 
(rev 14719)
@@ -1,17 +1,19 @@
 <?php
-phpgw::import_class('activitycalendar.uicommon');
-phpgw::import_class('activitycalendar.soarena');
+       phpgw::import_class('activitycalendar.uicommon');
+       phpgw::import_class('activitycalendar.soarena');
 
-include_class('activitycalendar', 'arena', 'inc/model/');
+       include_class('activitycalendar', 'arena', 'inc/model/');
 
-class activitycalendar_uiarena extends activitycalendar_uicommon
-{
+       class activitycalendar_uiarena extends activitycalendar_uicommon
+       {
+
        public $public_functions = array
        (
                'index'                 => true,
                'query'                     => true,
                'view'                      => true,
                'add'                           => true,
+                       'save'                           => true,
                'edit'                          => true,
                'download'                      => true,
                'get_address_search'    => true
@@ -21,7 +23,7 @@
        {
                parent::__construct();
                self::set_active_menu('activitycalendar::arena');
-               $config = CreateObject('phpgwapi.config','activitycalendar');
+                       $config = CreateObject('phpgwapi.config', 
'activitycalendar');
                $config->read();
        }
        
@@ -38,21 +40,94 @@
         */
        public function get_address_search()
        {
-               $search_string = phpgw::get_var('search');
+                       $search_string = phpgw::get_var('query');
                //var_dump($search_string);
                return 
activitycalendar_soarena::get_instance()->get_address($search_string);
        }
        
        public function index()
        {
-               // No messages so far
-               $errorMsgs = array();
-               $warningMsgs = array();
-               $infoMsgs = array();
+                       if(phpgw::get_var('phpgw_return_as') == 'json')
+                       {
+                               return $this->query();
+                       }
 
+                       $appname = lang('arenas');
+
+                       $function_msg    = lang('list %1', $appname);
+                       $type                    = 'all_arenas';
+
+                       $data = array(
+                               'datatable_name' => $function_msg,
+                               'form'                   => array(
+                                       'toolbar' => array(
+                                               'item' => array(
+                                                       array(
+                                                               'type'   => 
'filter',
+                                                               'name'   => 
'active',
+                                                               'text'   => 
lang('marked_as'),
+                                                               'list'   => 
array
+                                                                       (
+                                                                       
array('id' => 'all', 'name' => lang('all')),
+                                                                       
array('id' => 'active', 'name' => lang('active')),
+                                                                       
array('id' => 'inactive', 'name' => lang('inactive'))
+                                                               )
+                                                       ),
+                                                       array(
+                                                               'type'   => 
'link',
+                                                               'value'  => 
lang('new'),
+                                                               'href'   => 
self::link(array(
+                                                                       
'menuaction' => 'activitycalendar.uiarena.add'
+                                                               )),
+                                                               'class'  => 
'new_item'
+                                                       )
+                                               )
+                                       )
+                               ),
+                               'datatable'              => array(
+                                       'source'                 => 
self::link(array(
+                                               'menuaction'             => 
'activitycalendar.uiarena.index',
+                                               'type'                          
 => $type,
+                                               'phpgw_return_as'        => 
'json'
+                                       )),
+                                       'download'               => 
self::link(array('menuaction' => 'activitycalendar.uiarena.download',
+                                               'type'           => $type,
+                                               'export'         => true,
+                                               'allrows'        => true
+                                       )),
+                                       'allrows'                => true,
+                                       'editor_action'  => '',
+                                       'field'                  => array(
+                                               array('key' => 'id', 'label' => 
lang('id'), 'sortable' => true, 'hidden' => false),
+                                               array('key' => 'arena_name', 
'label' => lang('name'), 'sortable' => true, 'hidden' => false),
+                                               array('key' => 'address', 
'label' => lang('address'), 'sortable' => true, 'hidden' => false)
+                                       )
+                               )
+                       );
                
-               $data = array();
-               $this->render('arena_list.php');
+                       $data['datatable']['actions'][] = array
+                               (
+                               'my_name'        => 'show',
+                               'text'           => lang('show'),
+                               'action'         => self::link(array(
+                                       'menuaction' => 
'activitycalendar.uiarena.view'
+                               )),
+                               'parameters' => json_encode(array('parameter' 
=> array(array('name' => 'id',
+                                                       'source' => 'id'))))
+                       );
+
+                       $data['datatable']['actions'][] = array
+                               (
+                               'my_name'        => 'edit',
+                               'text'           => lang('edit'),
+                               'action'         => self::link(array(
+                                       'menuaction' => 
'activitycalendar.uiarena.edit'
+                               )),
+                               'parameters' => json_encode(array('parameter' 
=> array(array('name' => 'id',
+                                                       'source' => 'id'))))
+                       );
+
+                       self::render_template_xsl('datatable_jquery', $data);
        }
        
        /**
@@ -60,48 +135,45 @@
         */
        public function view()
        {
+                       $GLOBALS['phpgw_info']['flags']['app_header'] .= '::' . 
lang('view');
+                       // Get the contract part id
+                       $arena_id = (int)phpgw::get_var('id');
 
-               $errorMsgs = array();
-               $infoMsgs = array();
-               $saved_OK = phpgw::get_var('saved_ok');
-               if($saved_OK)
-               {
-                       $message = lang('arena_saved_form');
-               }
-               $arena = 
activitycalendar_soarena::get_instance()->get_single((int)phpgw::get_var('id'));
-               $cancel_link = self::link(array('menuaction' => 
'activitycalendar.uiarena.index'));
+                       $arena = 
activitycalendar_soarena::get_instance()->get_single($arena_id);
                
-               if(isset($_POST['edit_arena'])) // The user has pressed the 
save button
+                       if(empty($arena))
                {
-                       $GLOBALS['phpgw']->redirect_link('/index.php', 
array('menuaction' => 'activitycalendar.uiarena.edit','id' => 
phpgw::get_var('id')));
+                               phpgwapi_cache::message_set(lang('Could not 
find specified arena.'), 'error');
+                               $GLOBALS['phpgw']->redirect_link('/index.php', 
array('menuaction' => 'activitycalendar.uiarena.index'));
                }
                
-               if($arena == null) // Not found
-               {
-                       $errorMsgs[] = lang('Could not find specified arena.');
-               }
+                       $tabs                    = array();
+                       $tabs['arena']   = array('label' => lang('arena'), 
'link' => '#arena');
+                       $active_tab              = 'arena';
+
                $data = array
                (
-                       'arena' => $arena,
-                       'cancel_link' => $cancel_link,
-                       'message' => $message,
-                       'errorMsgs' => $errorMsgs,
-                       'infoMsgs' => $infoMsgs
+                               'tabs'                   => 
phpgwapi_jquery::tabview_generate($tabs, $active_tab),
+                               'edit_url'               => 
$GLOBALS['phpgw']->link('/index.php', array('menuaction' => 
'activitycalendar.uiarena.edit',
+                                       'id' => $arena->get_id())),
+                               'cancel_url'     => 
$GLOBALS['phpgw']->link('/index.php', array('menuaction' => 
'activitycalendar.uiarena.index')),
+                               'lang_edit'              => lang('edit'),
+                               'lang_cancel'    => lang('cancel'),
+                               'arena_name'     => $arena->get_arena_name(),
+                               'address'                => 
$arena->get_address(),
+                               'address_no'     => $arena->get_addressnumber(),
+                               'active_value'   => ($arena->is_active() ? 
lang('active_arena') : lang('inactive_arena'))
                );
-               $this->render('arena.php', $data);
+
+                       self::render_template_xsl(array('arena'), array('view' 
=> $data));
        }
        
        public function edit()
        {
-               $GLOBALS['phpgw_info']['flags']['app_header'] .= 
'::'.lang('edit');
+                       $GLOBALS['phpgw_info']['flags']['app_header'] .= '::' . 
lang('edit');
                // Get the contract part id
                $arena_id = (int)phpgw::get_var('id');
-               $cancel_link = self::link(array('menuaction' => 
'activitycalendar.uiarena.index'));
                
-               $buildings = 
activitycalendar_soarena::get_instance()->get_buildings();
-               //var_dump($buildings);
-               
-               // Retrieve the arena object or create a new one
                if(isset($arena_id) && $arena_id > 0)
                {       
                        $arena = 
activitycalendar_soarena::get_instance()->get_single($arena_id); 
@@ -111,93 +183,89 @@
                        $arena = new activitycalendar_arena();
                }
                
-               if(isset($_POST['save_arena'])) // The user has pressed the 
save button
-               {
-                       if(isset($arena)) // If a arena object is created
-                       {
-                               // ... set all parameters
-                               
$arena->set_internal_arena_id(phpgw::get_var('internal_arena_id'));
-                               
$arena->set_arena_name(phpgw::get_var('arena_name'));
-                               $arena->set_address(phpgw::get_var('address'));
-                               
$arena->set_addressnumber(phpgw::get_var('address_no'));
-                               
$arena->set_zip_code(phpgw::get_var('zip_code'));
-                               $arena->set_city(phpgw::get_var('city'));
-                               
$arena->set_active(phpgw::get_var('arena_active') == 'yes' ? true : false);
+                       $is_active               = $arena->is_active();
+                       $active_options  = array
+                               (
+                               array('id' => 'yes', 'name' => lang('active'), 
'selected' => (($is_active) ? 1 : 0)),

@@ Diff output truncated at 153600 characters. @@