[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [13933] Syncromind: Merge 13881:13931 from trunk
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [13933] Syncromind: Merge 13881:13931 from trunk |
|
Date: |
Wed, 16 Sep 2015 11:34:02 +0000 |
Revision: 13933
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=13933
Author: sigurdne
Date: 2015-09-16 11:34:02 +0000 (Wed, 16 Sep 2015)
Log Message:
-----------
Syncromind: Merge 13881:13931 from trunk
Modified Paths:
--------------
branches/dev-syncromind/addressbook/admin.php
branches/dev-syncromind/addressbook/csv_import.php
branches/dev-syncromind/addressbook/inc/class.addressbook_importer.inc.php
branches/dev-syncromind/addressbook/inc/class.boXport.inc.php
branches/dev-syncromind/addressbook/inc/class.boaddressbook.inc.php
branches/dev-syncromind/addressbook/inc/class.boaddressbook_prefs.inc.php
branches/dev-syncromind/addressbook/inc/class.bocatalog_contact_addr_type.inc.php
branches/dev-syncromind/addressbook/inc/class.bocatalog_contact_comm_descr.inc.php
branches/dev-syncromind/addressbook/inc/class.bocatalog_contact_comm_type.inc.php
branches/dev-syncromind/addressbook/inc/class.bocatalog_contact_note_type.inc.php
branches/dev-syncromind/addressbook/inc/class.ipc_addressbook.inc.php
branches/dev-syncromind/addressbook/inc/class.pdb.inc.php
branches/dev-syncromind/addressbook/inc/class.remote.inc.php
branches/dev-syncromind/addressbook/inc/class.soaddressbook.inc.php
branches/dev-syncromind/addressbook/inc/class.socatalog_contact_addr_type.inc.php
branches/dev-syncromind/addressbook/inc/class.socatalog_contact_comm_descr.inc.php
branches/dev-syncromind/addressbook/inc/class.socatalog_contact_comm_type.inc.php
branches/dev-syncromind/addressbook/inc/class.socatalog_contact_note_type.inc.php
branches/dev-syncromind/addressbook/inc/class.uiXport.inc.php
branches/dev-syncromind/addressbook/inc/class.uiaddressbook.inc.php
branches/dev-syncromind/addressbook/inc/class.uiaddressbook_prefs.inc.php
branches/dev-syncromind/addressbook/inc/class.uicategorize_contacts.inc.php
branches/dev-syncromind/addressbook/inc/class.uifields.inc.php
branches/dev-syncromind/addressbook/inc/class.uivcard.inc.php
branches/dev-syncromind/addressbook/inc/class.widget_lists.inc.php
branches/dev-syncromind/addressbook/inc/export/Multiple_VCard
branches/dev-syncromind/addressbook/inc/export/Netscape_LDIF
branches/dev-syncromind/addressbook/inc/export/OpenOffice_-_calc
branches/dev-syncromind/addressbook/inc/export/OpenOffice_-_writer
branches/dev-syncromind/addressbook/inc/export/Outlook_CSV_-_Deutsch
branches/dev-syncromind/addressbook/inc/export/Outlook_CSV_-_Dutch
branches/dev-syncromind/addressbook/inc/export/Outlook_CSV_-_English
branches/dev-syncromind/addressbook/inc/export/Outlook_CSV_-_Espa?\195?\177ol
branches/dev-syncromind/addressbook/inc/export/Outlook_CSV_-_Fran?\195?\167ais
branches/dev-syncromind/addressbook/inc/export/Palm_PDB
branches/dev-syncromind/addressbook/inc/export/phpgw_LDIF
branches/dev-syncromind/addressbook/inc/export/phpgw_SQL
branches/dev-syncromind/addressbook/inc/functions.inc.php
branches/dev-syncromind/addressbook/inc/hook_add_def_pref.inc.php
branches/dev-syncromind/addressbook/inc/hook_addressbook_add_def_acl.inc.php
branches/dev-syncromind/addressbook/inc/hook_admin.inc.php
branches/dev-syncromind/addressbook/inc/hook_config_validate.inc.php
branches/dev-syncromind/addressbook/inc/hook_help.inc.php
branches/dev-syncromind/addressbook/inc/hook_home.inc.php
branches/dev-syncromind/addressbook/inc/hook_manual.inc.php
branches/dev-syncromind/addressbook/inc/hook_notifywindow.inc.php
branches/dev-syncromind/addressbook/inc/hook_preferences.inc.php
branches/dev-syncromind/addressbook/inc/hook_sidebox_menu.inc.php
branches/dev-syncromind/addressbook/inc/import/Import_Multiple_VCard
branches/dev-syncromind/addressbook/inc/import/Import_from_Netscape
branches/dev-syncromind/addressbook/inc/import/Import_from_Outlook_-_Deutsch
branches/dev-syncromind/addressbook/inc/import/Import_from_Outlook_-_Dutch
branches/dev-syncromind/addressbook/inc/import/Import_from_Outlook_-_English
branches/dev-syncromind/addressbook/inc/import/Import_from_Outlook_-_Espa?\195?\177ol
branches/dev-syncromind/addressbook/inc/import/Import_from_Outlook_-_Fran?\195?\167ais
branches/dev-syncromind/admin/inc/class.boaccess_history.inc.php
branches/dev-syncromind/admin/inc/class.boapplications.inc.php
branches/dev-syncromind/admin/inc/class.bolog.inc.php
branches/dev-syncromind/admin/inc/class.boserver.inc.php
branches/dev-syncromind/admin/inc/class.soaccess_history.inc.php
branches/dev-syncromind/admin/inc/class.soapplications.inc.php
branches/dev-syncromind/admin/inc/class.solog.inc.php
branches/dev-syncromind/admin/inc/class.soserver.inc.php
branches/dev-syncromind/admin/inc/class.uiconfig.inc.php
branches/dev-syncromind/admin/inc/class.uimenuclass.inc.php
branches/dev-syncromind/admin/inc/class.uiserver.inc.php
branches/dev-syncromind/booking/inc/class.socompleted_reservation_export_file.inc.php
branches/dev-syncromind/booking/setup/tables_update.inc.php
branches/dev-syncromind/calendar/inc/class.boalarm.inc.php
branches/dev-syncromind/calendar/inc/class.bocalendar.inc.php
branches/dev-syncromind/calendar/inc/class.boholiday.inc.php
branches/dev-syncromind/calendar/inc/class.boicalendar.inc.php
branches/dev-syncromind/calendar/inc/class.calendar_holiday.inc.php
branches/dev-syncromind/calendar/inc/class.holidaycalc_JP.inc.php
branches/dev-syncromind/calendar/inc/class.holidaycalc_US.inc.php
branches/dev-syncromind/calendar/inc/class.socalendar_sql.inc.php
branches/dev-syncromind/calendar/inc/class.soholiday.inc.php
branches/dev-syncromind/calendar/inc/class.uicalendar.inc.php
branches/dev-syncromind/calendar/inc/class.uiholiday.inc.php
branches/dev-syncromind/calendar/inc/class.uiicalendar.inc.php
branches/dev-syncromind/calendar/inc/hook_add_def_pref.inc.php
branches/dev-syncromind/calendar/inc/hook_admin.inc.php
branches/dev-syncromind/calendar/inc/hook_help.inc.php
branches/dev-syncromind/calendar/inc/hook_home.inc.php
branches/dev-syncromind/calendar/inc/hook_home_day.inc.php
branches/dev-syncromind/calendar/inc/hook_home_month.inc.php
branches/dev-syncromind/calendar/inc/hook_home_planner.inc.php
branches/dev-syncromind/calendar/inc/hook_home_week.inc.php
branches/dev-syncromind/calendar/inc/hook_home_weeknew.inc.php
branches/dev-syncromind/calendar/inc/hook_home_year.inc.php
branches/dev-syncromind/calendar/inc/hook_manual.inc.php
branches/dev-syncromind/calendar/inc/hook_preferences.inc.php
branches/dev-syncromind/calendar/inc/hook_sidebox_menu.inc.php
branches/dev-syncromind/controller/inc/class.uicheck_list.inc.php
branches/dev-syncromind/demo/inc/class.sodemo.inc.php
branches/dev-syncromind/email/addressbook-js.php
branches/dev-syncromind/email/addressbook.php
branches/dev-syncromind/email/attach_file.php
branches/dev-syncromind/email/compose.php
branches/dev-syncromind/email/inc/class.boaction.inc.php
branches/dev-syncromind/email/inc/class.boattach_file.inc.php
branches/dev-syncromind/email/inc/class.bocompose.inc.php
branches/dev-syncromind/email/inc/class.bofilters.inc.php
branches/dev-syncromind/email/inc/class.bofolder.inc.php
branches/dev-syncromind/email/inc/class.boindex.inc.php
branches/dev-syncromind/email/inc/class.bojsaddressbook.inc.php
branches/dev-syncromind/email/inc/class.bomessage.inc.php
branches/dev-syncromind/email/inc/class.bopreferences.inc.php
branches/dev-syncromind/email/inc/class.bosend.inc.php
branches/dev-syncromind/email/inc/class.html_widgets.inc.php
branches/dev-syncromind/email/inc/class.mail_dcom_base.inc.php
branches/dev-syncromind/email/inc/class.mail_dcom_base_sock.inc.php
branches/dev-syncromind/email/inc/class.mail_dcom_imap_sock.inc.php
branches/dev-syncromind/email/inc/class.mail_dcom_nntp.inc.php
branches/dev-syncromind/email/inc/class.mail_dcom_nntp_sock.inc.php
branches/dev-syncromind/email/inc/class.mail_dcom_pop3_sock.inc.php
branches/dev-syncromind/email/inc/class.mail_filters.inc.php
branches/dev-syncromind/email/inc/class.mail_msg.inc.php
branches/dev-syncromind/email/inc/class.mail_msg_base.inc.php
branches/dev-syncromind/email/inc/class.mail_msg_display.inc.php
branches/dev-syncromind/email/inc/class.mail_send.inc.php
branches/dev-syncromind/email/inc/class.so_mail_msg.inc.php
branches/dev-syncromind/email/inc/class.spell.inc.php
branches/dev-syncromind/email/inc/class.spell_struct.inc.php
branches/dev-syncromind/email/inc/class.spell_svc_none.inc.php
branches/dev-syncromind/email/inc/class.spell_svc_php.inc.php
branches/dev-syncromind/email/inc/class.svc_debug.inc.php
branches/dev-syncromind/email/inc/class.svc_nextmatches.inc.php
branches/dev-syncromind/email/inc/class.ui_mail_debug.inc.php
branches/dev-syncromind/email/inc/class.uiattach_file.inc.php
branches/dev-syncromind/email/inc/class.uicompose.inc.php
branches/dev-syncromind/email/inc/class.uifilters.inc.php
branches/dev-syncromind/email/inc/class.uifolder.inc.php
branches/dev-syncromind/email/inc/class.uiindex.inc.php
branches/dev-syncromind/email/inc/class.uijsaddressbook.inc.php
branches/dev-syncromind/email/inc/class.uimessage.inc.php
branches/dev-syncromind/email/inc/class.uipreferences.inc.php
branches/dev-syncromind/email/inc/functions.inc.php
branches/dev-syncromind/email/inc/hook_admin.inc.php
branches/dev-syncromind/email/inc/hook_email_add_def_pref.inc.php
branches/dev-syncromind/email/inc/hook_home.inc.php
branches/dev-syncromind/email/inc/hook_login.inc.php
branches/dev-syncromind/email/inc/hook_manual.inc.php
branches/dev-syncromind/email/inc/hook_notifywindow.inc.php
branches/dev-syncromind/email/inc/hook_notifywindow_simple.inc.php
branches/dev-syncromind/email/inc/hook_preferences.inc.php
branches/dev-syncromind/email/view_image.php
branches/dev-syncromind/emailadmin/inc/class.ajaxemailadmin.inc.php
branches/dev-syncromind/emailadmin/inc/class.cyrusimap.inc.php
branches/dev-syncromind/emailadmin/inc/class.dbmaildbmailuser.inc.php
branches/dev-syncromind/emailadmin/inc/class.dbmailqmailuser.inc.php
branches/dev-syncromind/emailadmin/inc/class.defaultimap.inc.php
branches/dev-syncromind/emailadmin/inc/class.defaultpop.inc.php
branches/dev-syncromind/emailadmin/inc/class.defaultsmtp.inc.php
branches/dev-syncromind/emailadmin/inc/class.ea_identity.inc.php
branches/dev-syncromind/emailadmin/inc/class.ea_preferences.inc.php
branches/dev-syncromind/emailadmin/inc/class.emailadmin_bo.inc.php
branches/dev-syncromind/emailadmin/inc/class.emailadmin_so.inc.php
branches/dev-syncromind/emailadmin/inc/class.emailadmin_ui.inc.php
branches/dev-syncromind/emailadmin/inc/class.imap_client.inc.php
branches/dev-syncromind/emailadmin/inc/class.postfixdbmailuser.inc.php
branches/dev-syncromind/emailadmin/inc/class.uiuserdata.inc.php
branches/dev-syncromind/emailadmin/inc/hook_admin.inc.php
branches/dev-syncromind/emailadmin/index.php
branches/dev-syncromind/felamimail/inc/class.Script.inc.php
branches/dev-syncromind/felamimail/inc/class.ajax_contacts.inc.php
branches/dev-syncromind/felamimail/inc/class.ajaxfelamimail.inc.php
branches/dev-syncromind/felamimail/inc/class.bocaching.inc.php
branches/dev-syncromind/felamimail/inc/class.bocompose.inc.php
branches/dev-syncromind/felamimail/inc/class.bofelamimail.inc.php
branches/dev-syncromind/felamimail/inc/class.bofilter.inc.php
branches/dev-syncromind/felamimail/inc/class.bopreferences.inc.php
branches/dev-syncromind/felamimail/inc/class.bosieve.inc.php
branches/dev-syncromind/felamimail/inc/class.felamimail_bosignatures.inc.php
branches/dev-syncromind/felamimail/inc/class.felamimail_signatures.inc.php
branches/dev-syncromind/felamimail/inc/class.htmlfilter.inc.php
branches/dev-syncromind/felamimail/inc/class.kses.inc.php
branches/dev-syncromind/felamimail/inc/class.socaching.inc.php
branches/dev-syncromind/felamimail/inc/class.sofelamimail.inc.php
branches/dev-syncromind/felamimail/inc/class.sofilter.inc.php
branches/dev-syncromind/felamimail/inc/class.sopreferences.inc.php
branches/dev-syncromind/felamimail/inc/class.transformdate.inc.php
branches/dev-syncromind/felamimail/inc/class.uibaseclass.inc.php
branches/dev-syncromind/felamimail/inc/class.uicompose.inc.php
branches/dev-syncromind/felamimail/inc/class.uidisplay.inc.php
branches/dev-syncromind/felamimail/inc/class.uifelamimail.inc.php
branches/dev-syncromind/felamimail/inc/class.uifilter.inc.php
branches/dev-syncromind/felamimail/inc/class.uipreferences.inc.php
branches/dev-syncromind/felamimail/inc/class.uisieve.inc.php
branches/dev-syncromind/felamimail/inc/class.uiwidgets.inc.php
branches/dev-syncromind/felamimail/inc/hook_admin.inc.php
branches/dev-syncromind/felamimail/inc/hook_home.inc.php
branches/dev-syncromind/felamimail/inc/hook_notifywindow.inc.php
branches/dev-syncromind/felamimail/inc/hook_preferences.inc.php
branches/dev-syncromind/felamimail/inc/hook_settings.inc.php
branches/dev-syncromind/felamimail/inc/hook_sidebox_menu.inc.php
branches/dev-syncromind/felamimail/inc/xajax.inc.php
branches/dev-syncromind/felamimail/inc/xajaxResponse.inc.php
branches/dev-syncromind/filemanager/inc/class.attached_files.inc.php
branches/dev-syncromind/filemanager/inc/class.bofilemanager.inc.php
branches/dev-syncromind/filemanager/inc/class.menu.inc.php
branches/dev-syncromind/filemanager/inc/class.uiaction_base.inc.php
branches/dev-syncromind/filemanager/inc/class.uiaction_edit.inc.php
branches/dev-syncromind/filemanager/inc/class.uiactions.inc.php
branches/dev-syncromind/filemanager/inc/class.uifilemanager.inc.php
branches/dev-syncromind/filemanager/inc/hook_add_def_pref.inc.php
branches/dev-syncromind/folders/inc/class.bofolders.inc.php
branches/dev-syncromind/folders/inc/class.layersmenu.inc.php
branches/dev-syncromind/folders/inc/class.treemenu.inc.php
branches/dev-syncromind/folders/inc/class.uifolders.inc.php
branches/dev-syncromind/folders/phplayersmenu/lib/layersmenu-common.inc.php
branches/dev-syncromind/ftp/inc/functions.inc.php
branches/dev-syncromind/help.php
branches/dev-syncromind/helpdesk/inc/class.botts.inc.php
branches/dev-syncromind/home.php
branches/dev-syncromind/hrm/inc/class.bocategory.inc.php
branches/dev-syncromind/hrm/inc/class.bocommon.inc.php
branches/dev-syncromind/hrm/inc/class.boplace.inc.php
branches/dev-syncromind/hrm/inc/class.bouser.inc.php
branches/dev-syncromind/hrm/inc/class.menu.inc.php
branches/dev-syncromind/hrm/inc/class.socommon.inc.php
branches/dev-syncromind/hrm/inc/class.soplace.inc.php
branches/dev-syncromind/hrm/inc/class.uicategory.inc.php
branches/dev-syncromind/hrm/inc/class.uiplace.inc.php
branches/dev-syncromind/hrm/inc/class.uiuser.inc.php
branches/dev-syncromind/ipc_test_suite/inc/class.ipc_test_suite.inc.php
branches/dev-syncromind/ipc_test_suite/inc/class.ipc_test_suite_addressbook.inc.php
branches/dev-syncromind/ipc_test_suite/inc/class.ipc_test_suite_bookmarks.inc.php
branches/dev-syncromind/ipc_test_suite/inc/class.ipc_test_suite_calendar.inc.php
branches/dev-syncromind/ipc_test_suite/inc/class.ipc_test_suite_email.inc.php
branches/dev-syncromind/ipc_test_suite/inc/class.ipc_test_suite_notes.inc.php
branches/dev-syncromind/ipc_test_suite/inc/class.ipc_test_suite_todo.inc.php
branches/dev-syncromind/ipc_test_suite/inc/class.ipc_test_suite_ui.inc.php
branches/dev-syncromind/ipc_test_suite/setup/setup.inc.php
branches/dev-syncromind/ipc_test_suite/sources/api/class.ipc_.inc.php
branches/dev-syncromind/ipc_test_suite/sources/api/class.ipc_manager.inc.php
branches/dev-syncromind/ipc_test_suite/sources/api/class.vcard.inc.php
branches/dev-syncromind/ipc_test_suite/sources/app/class.ipc_addressbook.inc.php
branches/dev-syncromind/ipc_test_suite/sources/app/class.ipc_calendar.inc.php
branches/dev-syncromind/ipc_test_suite/sources/app/class.ipc_notes.inc.php
branches/dev-syncromind/mailpipe.php
branches/dev-syncromind/manual/inc/class.help.inc.php
branches/dev-syncromind/manual/inc/class.help_helper.inc.php
branches/dev-syncromind/messenger/inc/class.bomessenger.inc.php
branches/dev-syncromind/messenger/inc/class.somessenger.inc.php
branches/dev-syncromind/messenger/inc/class.somessenger_imap.inc.php
branches/dev-syncromind/messenger/inc/class.somessenger_sql.inc.php
branches/dev-syncromind/mobilefrontend/home.php
branches/dev-syncromind/notes/inc/class.bonotes.inc.php
branches/dev-syncromind/notes/inc/class.ipc_notes.inc.php
branches/dev-syncromind/notes/inc/class.sonotes.inc.php
branches/dev-syncromind/notes/inc/hook_admin.inc.php
branches/dev-syncromind/notes/inc/hook_deleteaccount.inc.php
branches/dev-syncromind/notes/inc/hook_help.inc.php
branches/dev-syncromind/notes/inc/hook_preferences.inc.php
branches/dev-syncromind/notify_simple.php
branches/dev-syncromind/phpgwapi/inc/class.Mail_mimeDecode.inc.php
branches/dev-syncromind/phpgwapi/inc/class.Services_JSON.inc.php
branches/dev-syncromind/phpgwapi/inc/class.Template.inc.php
branches/dev-syncromind/phpgwapi/inc/class.Template_experimental.inc.php
branches/dev-syncromind/phpgwapi/inc/class.arrayfunctions.inc.php
branches/dev-syncromind/phpgwapi/inc/class.bojsaddressbook.inc.php
branches/dev-syncromind/phpgwapi/inc/class.calendar_holidays.inc.php
branches/dev-syncromind/phpgwapi/inc/class.clientsniffer.inc.php
branches/dev-syncromind/phpgwapi/inc/class.contact_accounts.inc.php
branches/dev-syncromind/phpgwapi/inc/class.contact_addr.inc.php
branches/dev-syncromind/phpgwapi/inc/class.contact_addr_type.inc.php
branches/dev-syncromind/phpgwapi/inc/class.contact_categories.inc.php
branches/dev-syncromind/phpgwapi/inc/class.contact_central.inc.php
branches/dev-syncromind/phpgwapi/inc/class.contact_comm.inc.php
branches/dev-syncromind/phpgwapi/inc/class.contact_comm_descr.inc.php
branches/dev-syncromind/phpgwapi/inc/class.contact_comm_type.inc.php
branches/dev-syncromind/phpgwapi/inc/class.contact_note.inc.php
branches/dev-syncromind/phpgwapi/inc/class.contact_note_type.inc.php
branches/dev-syncromind/phpgwapi/inc/class.contact_org.inc.php
branches/dev-syncromind/phpgwapi/inc/class.contact_org_person.inc.php
branches/dev-syncromind/phpgwapi/inc/class.contact_others.inc.php
branches/dev-syncromind/phpgwapi/inc/class.contact_person.inc.php
branches/dev-syncromind/phpgwapi/inc/class.contact_types.inc.php
branches/dev-syncromind/phpgwapi/inc/class.contacts_sql.inc.php
branches/dev-syncromind/phpgwapi/inc/class.crypto.inc.php
branches/dev-syncromind/phpgwapi/inc/class.csstooltip.inc.php
branches/dev-syncromind/phpgwapi/inc/class.data_cleaner.inc.php
branches/dev-syncromind/phpgwapi/inc/class.error.inc.php
branches/dev-syncromind/phpgwapi/inc/class.gdbutton.inc.php
branches/dev-syncromind/phpgwapi/inc/class.gdgraph.inc.php
branches/dev-syncromind/phpgwapi/inc/class.gdimage.inc.php
branches/dev-syncromind/phpgwapi/inc/class.html2text.inc.php
branches/dev-syncromind/phpgwapi/inc/class.http.inc.php
branches/dev-syncromind/phpgwapi/inc/class.http_dav_client.inc.php
branches/dev-syncromind/phpgwapi/inc/class.http_svn_client.inc.php
branches/dev-syncromind/phpgwapi/inc/class.interserver.inc.php
branches/dev-syncromind/phpgwapi/inc/class.ipc_manager.inc.php
branches/dev-syncromind/phpgwapi/inc/class.jscalendar.inc.php
branches/dev-syncromind/phpgwapi/inc/class.listbox.inc.php
branches/dev-syncromind/phpgwapi/inc/class.log_message.inc.php
branches/dev-syncromind/phpgwapi/inc/class.login.inc.php
branches/dev-syncromind/phpgwapi/inc/class.mail_handlers.inc.php
branches/dev-syncromind/phpgwapi/inc/class.matrixview.inc.php
branches/dev-syncromind/phpgwapi/inc/class.menutree.inc.php
branches/dev-syncromind/phpgwapi/inc/class.net_http_client.inc.php
branches/dev-syncromind/phpgwapi/inc/class.network.inc.php
branches/dev-syncromind/phpgwapi/inc/class.nextmatchs_xslt.inc.php
branches/dev-syncromind/phpgwapi/inc/class.ping.inc.php
branches/dev-syncromind/phpgwapi/inc/class.portalbox.inc.php
branches/dev-syncromind/phpgwapi/inc/class.resultbox.inc.php
branches/dev-syncromind/phpgwapi/inc/class.rssparser.inc.php
branches/dev-syncromind/phpgwapi/inc/class.schema_proc.inc.php
branches/dev-syncromind/phpgwapi/inc/class.schema_proc_array.inc.php
branches/dev-syncromind/phpgwapi/inc/class.schema_proc_mssql.inc.php
branches/dev-syncromind/phpgwapi/inc/class.schema_proc_oracle.inc.php
branches/dev-syncromind/phpgwapi/inc/class.schema_proc_pgsql.inc.php
branches/dev-syncromind/phpgwapi/inc/class.schema_proc_sapdb.inc.php
branches/dev-syncromind/phpgwapi/inc/class.send.inc.php
branches/dev-syncromind/phpgwapi/inc/class.service_contacts.inc.php
branches/dev-syncromind/phpgwapi/inc/class.service_notes.inc.php
branches/dev-syncromind/phpgwapi/inc/class.service_schedule.inc.php
branches/dev-syncromind/phpgwapi/inc/class.setup_html.inc.php
branches/dev-syncromind/phpgwapi/inc/class.sql_builder.inc.php
branches/dev-syncromind/phpgwapi/inc/class.sql_entity.inc.php
branches/dev-syncromind/phpgwapi/inc/class.template_portico.inc.php
branches/dev-syncromind/phpgwapi/inc/class.ui_tools.inc.php
branches/dev-syncromind/phpgwapi/inc/class.uijsaddressbook.inc.php
branches/dev-syncromind/phpgwapi/inc/class.validator.inc.php
branches/dev-syncromind/phpgwapi/inc/class.vcard.inc.php
branches/dev-syncromind/phpgwapi/inc/class.vfs_dav.inc.php
branches/dev-syncromind/phpgwapi/inc/class.vfs_shared.inc.php
branches/dev-syncromind/phpgwapi/inc/class.xml.inc.php
branches/dev-syncromind/phpgwapi/inc/functions.inc.php
branches/dev-syncromind/phpgwapi/inc/mapping/class.mapping_.inc.php
branches/dev-syncromind/phpgwapi/inc/mapping/class.mapping_ldap.inc.php
branches/dev-syncromind/phpgwapi/inc/mapping/class.mapping_sql.inc.php
branches/dev-syncromind/phpgwapi/inc/sso/create_account.php
branches/dev-syncromind/phpgwapi/inc/sso/include_login.inc.php
branches/dev-syncromind/phpgwapi/js/fckeditor/editor/filemanager/browser/default/connectors/php/connector.php
branches/dev-syncromind/phpgwapi/setup/setup.inc.php
branches/dev-syncromind/phpgwapi/setup/tables_current.inc.php
branches/dev-syncromind/phpgwapi/setup/tables_update.inc.php
branches/dev-syncromind/property/inc/class.bodocument.inc.php
branches/dev-syncromind/property/inc/class.db_oci8.inc.php
branches/dev-syncromind/property/inc/class.sotts.inc.php
branches/dev-syncromind/property/tutorials/property/examples/install.apache.sh
branches/dev-syncromind/redirect.php
branches/dev-syncromind/registration/inc/class.bomanagefields.inc.php
branches/dev-syncromind/registration/inc/class.boreg.inc.php
branches/dev-syncromind/registration/inc/class.somanagefields.inc.php
branches/dev-syncromind/registration/inc/class.uimanagefields.inc.php
branches/dev-syncromind/registration/inc/class.uireg.inc.php
branches/dev-syncromind/registration/inc/hook_admin.inc.php
branches/dev-syncromind/registration/main.php
branches/dev-syncromind/registration/templates/base/css/base.css
branches/dev-syncromind/sms/bin/default/config_BR
branches/dev-syncromind/sms/bin/default/config_BR_log
branches/dev-syncromind/sms/bin/default/config_SD
branches/dev-syncromind/sms/bin/default/config_SD_log
branches/dev-syncromind/sms/bin/default/config_ST
branches/dev-syncromind/sms/bin/default/config_ST_log
branches/dev-syncromind/sms/bin/default/config_VASK_log
branches/dev-syncromind/sms/inc/class.uipoll.inc.php
branches/dev-syncromind/sms/inc/feedcreator.class.php
branches/dev-syncromind/sms/inc/plugin/gateway/clickatell/callback.php
branches/dev-syncromind/sms/inc/plugin/gateway/clickatell/config.php
branches/dev-syncromind/sms/inc/plugin/gateway/clickatell/fn.php
branches/dev-syncromind/sms/inc/plugin/gateway/clickatell/manage.php
branches/dev-syncromind/sms/inc/plugin/gateway/kannel/config.php
branches/dev-syncromind/sms/inc/plugin/gateway/kannel/dlr.php
branches/dev-syncromind/sms/inc/plugin/gateway/kannel/fn.php
branches/dev-syncromind/sms/inc/plugin/gateway/kannel/geturl.php
branches/dev-syncromind/sms/inc/plugin/gateway/kannel/manage.php
branches/dev-syncromind/sms/inc/plugin/gateway/uplink/config.php
branches/dev-syncromind/sms/inc/plugin/gateway/uplink/fn.php
branches/dev-syncromind/sms/inc/plugin/gateway/uplink/manage.php
branches/dev-syncromind/soap/inc/class.soap_server.inc.php.wip
branches/dev-syncromind/soap/inc/class.test_methods.inc.php
branches/dev-syncromind/soap/interop_harness.php
branches/dev-syncromind/soap/soaplib.soapinterop.php
branches/dev-syncromind/soap/test_client.php
branches/dev-syncromind/soap/test_methods.php
branches/dev-syncromind/soap/test_methods_wsdl.php
branches/dev-syncromind/soap/test_server.php
branches/dev-syncromind/soap/vars.php
branches/dev-syncromind/soap/wsdl_harness.php
branches/dev-syncromind/soap.php
branches/dev-syncromind/todo/inc/class.botodo.inc.php
branches/dev-syncromind/todo/inc/class.sotodo.inc.php
branches/dev-syncromind/todo/inc/class.uipreferences.inc.php
branches/dev-syncromind/todo/inc/class.uitodo.inc.php
branches/dev-syncromind/todo/inc/hook_home.inc.php
branches/dev-syncromind/todo/inc/hook_manual.inc.php
branches/dev-syncromind/xmlrpc/server.php
branches/dev-syncromind/xmlrpc.php
Property Changed:
----------------
branches/dev-syncromind/
branches/dev-syncromind/booking/
branches/dev-syncromind/controller/
Property changes on: branches/dev-syncromind
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/stavangerkommune:12743-12875,12986
/trunk:12111-12211,12213-12246,12250-12363,12366-12405,12407-12435,12437-12462,12464-12527,12530-12602,12604-12670,12672-12683,12686-12750,12753-12785,12787-12974,12987,12989-13177,13179-13344,13346-13399,13401-13432,13434-13481,13483-13506,13542-13602,13604-13653,13656-13668,13670-13689,13691-13726,13731-13773,13775,13778-13791,13793-13800,13802-13811,13816-13880
+ /branches/stavangerkommune:12743-12875,12986
/trunk:12111-12211,12213-12246,12250-12363,12366-12405,12407-12435,12437-12462,12464-12527,12530-12602,12604-12670,12672-12683,12686-12750,12753-12785,12787-12974,12987,12989-13177,13179-13344,13346-13399,13401-13432,13434-13481,13483-13506,13542-13602,13604-13653,13656-13668,13670-13689,13691-13726,13731-13773,13775,13778-13791,13793-13800,13802-13811,13816-13880,13882-13931
Modified: branches/dev-syncromind/addressbook/admin.php
===================================================================
--- branches/dev-syncromind/addressbook/admin.php 2015-09-16 11:27:01 UTC
(rev 13932)
+++ branches/dev-syncromind/addressbook/admin.php 2015-09-16 11:34:02 UTC
(rev 13933)
@@ -66,4 +66,3 @@
$t->pparse('out','admin');
$phpgw->common->phpgw_footer();
-?>
Modified: branches/dev-syncromind/addressbook/csv_import.php
===================================================================
--- branches/dev-syncromind/addressbook/csv_import.php 2015-09-16 11:27:01 UTC
(rev 13932)
+++ branches/dev-syncromind/addressbook/csv_import.php 2015-09-16 11:34:02 UTC
(rev 13933)
@@ -299,14 +299,14 @@
$trans_csv =
$_POST['trans'][$csv_idx];
while(list($pattern,$replace) =
each($trans_csv))
{
- if(ereg((string)
$pattern,$val))
+
if(preg_match("/$pattern/",$val))
{
// echo
"<p>csv_idx='$csv_idx',info='$addr',trans_csv=".dump_array($trans_csv).",ereg_replace('$pattern','$replace','$val')
= ";
- $val =
ereg_replace((string) $pattern,str_replace($VPre,'\\',$replace),(string) $val);
+ $val =
preg_replace("/$pattern/",str_replace($VPre,'\\',$replace),(string) $val);
// echo
"'$val'</p>";
$reg =
$CPreReg.'([a-zA-Z_0-9]+)'.$CPosReg;
-
while(ereg($reg,$val,$vars))
+
while(preg_match("/$reg/",$val,$vars))
{ //
expand all CSV fields
$val =
str_replace($CPre . $vars[1] . $CPos, $val[0] == '@' ? "'"
. addslashes($fields[index($vars[1], $csv_fields)])
Modified:
branches/dev-syncromind/addressbook/inc/class.addressbook_importer.inc.php
===================================================================
--- branches/dev-syncromind/addressbook/inc/class.addressbook_importer.inc.php
2015-09-16 11:27:01 UTC (rev 13932)
+++ branches/dev-syncromind/addressbook/inc/class.addressbook_importer.inc.php
2015-09-16 11:34:02 UTC (rev 13933)
@@ -21,7 +21,7 @@
{
var $record;
- function addressbook_importer()
+ function __construct()
{
}
@@ -47,4 +47,3 @@
$this->record['notes'][$args][$element] = $value;
}
}
-?>
Modified: branches/dev-syncromind/addressbook/inc/class.boXport.inc.php
===================================================================
--- branches/dev-syncromind/addressbook/inc/class.boXport.inc.php
2015-09-16 11:27:01 UTC (rev 13932)
+++ branches/dev-syncromind/addressbook/inc/class.boXport.inc.php
2015-09-16 11:34:02 UTC (rev 13933)
@@ -32,7 +32,7 @@
var $use_session = False;
- function boXport($session=False)
+ function __construct($session=False)
{
$this->contacts = $GLOBALS['phpgw']->contacts;
$this->so = CreateObject('addressbook.soaddressbook');
@@ -243,8 +243,8 @@
{
if ( substr($col,0,6) == 'extra_' )
{
- $field =
ereg_replace('extra_','',$col);
- $field = ereg_replace('
','_',$field);
+ $field =
preg_replace('/extra_/','',$col);
+ $field =
preg_replace('/ /','_',$field);
$customfields[$field] =
ucfirst($field);
}
}
@@ -283,5 +283,4 @@
return $buffer;
}
- }
-?>
+ }
\ No newline at end of file
Modified: branches/dev-syncromind/addressbook/inc/class.boaddressbook.inc.php
===================================================================
--- branches/dev-syncromind/addressbook/inc/class.boaddressbook.inc.php
2015-09-16 11:27:01 UTC (rev 13932)
+++ branches/dev-syncromind/addressbook/inc/class.boaddressbook.inc.php
2015-09-16 11:34:02 UTC (rev 13933)
@@ -46,7 +46,7 @@
'add_vcard' => true // call from
addressbook.uivcard.in to import a vcard
);
- function boaddressbook($session=True)
+ function __construct($session=True)
{
$this->so = CreateObject('addressbook.soaddressbook');
$this->rights = $this->so->rights;
Modified:
branches/dev-syncromind/addressbook/inc/class.boaddressbook_prefs.inc.php
===================================================================
--- branches/dev-syncromind/addressbook/inc/class.boaddressbook_prefs.inc.php
2015-09-16 11:27:01 UTC (rev 13932)
+++ branches/dev-syncromind/addressbook/inc/class.boaddressbook_prefs.inc.php
2015-09-16 11:34:02 UTC (rev 13933)
@@ -29,7 +29,7 @@
var $org_columns_forced=false;
var $default_category_forced=false;
var $public=array('read_preferences' => True);
- function boaddressbook_prefs()
+ function __construct()
{
$this->preferences=CreateObject('phpgwapi.preferences');
}
Modified:
branches/dev-syncromind/addressbook/inc/class.bocatalog_contact_addr_type.inc.php
===================================================================
---
branches/dev-syncromind/addressbook/inc/class.bocatalog_contact_addr_type.inc.php
2015-09-16 11:27:01 UTC (rev 13932)
+++
branches/dev-syncromind/addressbook/inc/class.bocatalog_contact_addr_type.inc.php
2015-09-16 11:34:02 UTC (rev 13933)
@@ -1,7 +1,7 @@
<?php
class bocatalog_contact_addr_type
{
- function bocatalog_contact_addr_type()
+ function __construct()
{
$this->so =
CreateObject('addressbook.socatalog_contact_addr_type');
}
@@ -30,5 +30,4 @@
{
return $this->so->get_record($key);
}
- }
-?>
+ }
\ No newline at end of file
Modified:
branches/dev-syncromind/addressbook/inc/class.bocatalog_contact_comm_descr.inc.php
===================================================================
---
branches/dev-syncromind/addressbook/inc/class.bocatalog_contact_comm_descr.inc.php
2015-09-16 11:27:01 UTC (rev 13932)
+++
branches/dev-syncromind/addressbook/inc/class.bocatalog_contact_comm_descr.inc.php
2015-09-16 11:34:02 UTC (rev 13933)
@@ -1,7 +1,7 @@
<?php
class bocatalog_contact_comm_descr
{
- function bocatalog_contact_comm_descr()
+ function __construct()
{
$this->so =
CreateObject('addressbook.socatalog_contact_comm_descr');
}
@@ -87,5 +87,4 @@
}
}
}
- }
-?>
+ }
\ No newline at end of file
Modified:
branches/dev-syncromind/addressbook/inc/class.bocatalog_contact_comm_type.inc.php
===================================================================
---
branches/dev-syncromind/addressbook/inc/class.bocatalog_contact_comm_type.inc.php
2015-09-16 11:27:01 UTC (rev 13932)
+++
branches/dev-syncromind/addressbook/inc/class.bocatalog_contact_comm_type.inc.php
2015-09-16 11:34:02 UTC (rev 13933)
@@ -1,7 +1,7 @@
<?php
class bocatalog_contact_comm_type
{
- function bocatalog_contact_comm_type()
+ function __construct()
{
$this->so =
CreateObject('addressbook.socatalog_contact_comm_type');
}
@@ -30,5 +30,4 @@
{
return $this->so->get_record($key);
}
- }
-?>
+ }
\ No newline at end of file
Modified:
branches/dev-syncromind/addressbook/inc/class.bocatalog_contact_note_type.inc.php
===================================================================
---
branches/dev-syncromind/addressbook/inc/class.bocatalog_contact_note_type.inc.php
2015-09-16 11:27:01 UTC (rev 13932)
+++
branches/dev-syncromind/addressbook/inc/class.bocatalog_contact_note_type.inc.php
2015-09-16 11:34:02 UTC (rev 13933)
@@ -1,7 +1,7 @@
<?php
class bocatalog_contact_note_type
{
- function bocatalog_contact_note_type()
+ function __construct()
{
$this->so =
CreateObject('addressbook.socatalog_contact_note_type');
}
@@ -31,4 +31,3 @@
return $this->so->get_record($key);
}
}
-?>
Modified: branches/dev-syncromind/addressbook/inc/class.ipc_addressbook.inc.php
===================================================================
--- branches/dev-syncromind/addressbook/inc/class.ipc_addressbook.inc.php
2015-09-16 11:27:01 UTC (rev 13932)
+++ branches/dev-syncromind/addressbook/inc/class.ipc_addressbook.inc.php
2015-09-16 11:34:02 UTC (rev 13933)
@@ -37,7 +37,7 @@
*
* @access public
*/
- function ipc_addressbook()
+ function __construct()
{
$this->contacts = CreateObject('phpgwapi.contacts');
$this->vcard = CreateObject('phpgwapi.vcard');
@@ -58,7 +58,7 @@
if($type != 'text/x-vcard')
return false;
- $data = ereg_replace("\n\n", "\r\n", $data);
+ $data = str_replace("\n\n", "\r\n", $data);
$data_lines = explode("\r\n", $data);
$buffer = array();
@@ -334,7 +334,7 @@
return false;
}
- $data = ereg_replace("\n\n", "\r\n", $data);
+ $data = str_replace("\n\n", "\r\n", $data);
$data_lines = explode("\r\n", $data);
$buffer = array();
@@ -392,4 +392,3 @@
}
}
-?>
Modified: branches/dev-syncromind/addressbook/inc/class.pdb.inc.php
===================================================================
--- branches/dev-syncromind/addressbook/inc/class.pdb.inc.php 2015-09-16
11:27:01 UTC (rev 13932)
+++ branches/dev-syncromind/addressbook/inc/class.pdb.inc.php 2015-09-16
11:34:02 UTC (rev 13933)
@@ -282,4 +282,3 @@
exit;
}
}
-?>
Modified: branches/dev-syncromind/addressbook/inc/class.remote.inc.php
===================================================================
--- branches/dev-syncromind/addressbook/inc/class.remote.inc.php
2015-09-16 11:27:01 UTC (rev 13932)
+++ branches/dev-syncromind/addressbook/inc/class.remote.inc.php
2015-09-16 11:34:02 UTC (rev 13933)
@@ -30,7 +30,7 @@
var $ldap = 0;
- function remote($serverid='BigFoot')
+ function __construct($serverid='BigFoot')
{
$GLOBALS['phpgw']->db->query("SELECT * FROM
phpgw_addressbook_servers",__LINE__,__FILE__);
while ($GLOBALS['phpgw']->db->next_record())
@@ -133,5 +133,4 @@
return $in;
}
}
- }
-?>
+ }
\ No newline at end of file
Modified: branches/dev-syncromind/addressbook/inc/class.soaddressbook.inc.php
===================================================================
--- branches/dev-syncromind/addressbook/inc/class.soaddressbook.inc.php
2015-09-16 11:27:01 UTC (rev 13932)
+++ branches/dev-syncromind/addressbook/inc/class.soaddressbook.inc.php
2015-09-16 11:34:02 UTC (rev 13933)
@@ -62,7 +62,7 @@
*
* @param bool $useacl respect the access controls - should be
true unless you know what you are doing
*/
- function soaddressbook($useacl = true)
+ function __construct($useacl = true)
{
$this->contacts = CreateObject('phpgwapi.contacts');
Modified:
branches/dev-syncromind/addressbook/inc/class.socatalog_contact_addr_type.inc.php
===================================================================
---
branches/dev-syncromind/addressbook/inc/class.socatalog_contact_addr_type.inc.php
2015-09-16 11:27:01 UTC (rev 13932)
+++
branches/dev-syncromind/addressbook/inc/class.socatalog_contact_addr_type.inc.php
2015-09-16 11:34:02 UTC (rev 13933)
@@ -1,15 +1,11 @@
<?php
class socatalog_contact_addr_type
{
- function socatalog_contact_addr_type()
+ function __construct()
{
$this->db = &$GLOBALS['phpgw']->db;
}
- function _constructor()
- {
- }
-
function select_catalog()
{
$addr_type = CreateObject('phpgwapi.contact_addr_type');
@@ -57,4 +53,3 @@
return $return_fields;
}
}
-?>
Modified:
branches/dev-syncromind/addressbook/inc/class.socatalog_contact_comm_descr.inc.php
===================================================================
---
branches/dev-syncromind/addressbook/inc/class.socatalog_contact_comm_descr.inc.php
2015-09-16 11:27:01 UTC (rev 13932)
+++
branches/dev-syncromind/addressbook/inc/class.socatalog_contact_comm_descr.inc.php
2015-09-16 11:34:02 UTC (rev 13933)
@@ -1,15 +1,12 @@
<?php
class socatalog_contact_comm_descr
{
- function socatalog_contact_comm_descr()
+ function __construct()
{
$this->db = &$GLOBALS['phpgw']->db;
}
- function _constructor()
- {
- }
-
+
function select_catalog()
{
$comm_type =
CreateObject('phpgwapi.contact_comm_descr');
@@ -72,4 +69,3 @@
return $return_fields;
}
}
-?>
Modified:
branches/dev-syncromind/addressbook/inc/class.socatalog_contact_comm_type.inc.php
===================================================================
---
branches/dev-syncromind/addressbook/inc/class.socatalog_contact_comm_type.inc.php
2015-09-16 11:27:01 UTC (rev 13932)
+++
branches/dev-syncromind/addressbook/inc/class.socatalog_contact_comm_type.inc.php
2015-09-16 11:34:02 UTC (rev 13933)
@@ -1,15 +1,11 @@
<?php
class socatalog_contact_comm_type
{
- function socatalog_contact_comm_type()
+ function __construct()
{
$this->db = &$GLOBALS['phpgw']->db;
}
- function _constructor()
- {
- }
-
function select_catalog()
{
$comm_type = CreateObject('phpgwapi.contact_comm_type');
@@ -57,4 +53,3 @@
return $return_fields;
}
}
-?>
Modified:
branches/dev-syncromind/addressbook/inc/class.socatalog_contact_note_type.inc.php
===================================================================
---
branches/dev-syncromind/addressbook/inc/class.socatalog_contact_note_type.inc.php
2015-09-16 11:27:01 UTC (rev 13932)
+++
branches/dev-syncromind/addressbook/inc/class.socatalog_contact_note_type.inc.php
2015-09-16 11:34:02 UTC (rev 13933)
@@ -1,15 +1,12 @@
<?php
class socatalog_contact_note_type
{
- function socatalog_contact_note_type()
+ function __construct()
{
$this->db = &$GLOBALS['phpgw']->db;
}
- function _constructor()
- {
- }
-
+
function select_catalog()
{
$comm_type = CreateObject('phpgwapi.contact_note_type');
@@ -57,4 +54,3 @@
return $return_fields;
}
}
-?>
Modified: branches/dev-syncromind/addressbook/inc/class.uiXport.inc.php
===================================================================
--- branches/dev-syncromind/addressbook/inc/class.uiXport.inc.php
2015-09-16 11:27:01 UTC (rev 13932)
+++ branches/dev-syncromind/addressbook/inc/class.uiXport.inc.php
2015-09-16 11:34:02 UTC (rev 13933)
@@ -30,7 +30,7 @@
var $filter;
var $cat_id;
- function uiXport()
+ function __construct()
{
$this->template = $GLOBALS['phpgw']->template;
$this->cat = CreateObject('phpgwapi.categories');
@@ -130,7 +130,7 @@
sort($myfilearray);
for ($i=0;$i<count($myfilearray);$i++)
{
- $fname = ereg_replace('_','
',$myfilearray[$i]);
+ $fname = preg_replace('/_/','
',$myfilearray[$i]);
$conv .= '<OPTION VALUE="' .
$myfilearray[$i].'">' . $fname . '</OPTION>';
}
@@ -249,7 +249,7 @@
sort($myfilearray);
for ($i=0;$i<count($myfilearray);$i++)
{
- $fname = ereg_replace('_','
',$myfilearray[$i]);
+ $fname = preg_replace('/_/','
',$myfilearray[$i]);
$conv .= ' <option
value="'.$myfilearray[$i].'">'.$fname.'</option>'."\n";
}
@@ -278,4 +278,3 @@
}
}
}
-?>
Modified: branches/dev-syncromind/addressbook/inc/class.uiaddressbook.inc.php
===================================================================
--- branches/dev-syncromind/addressbook/inc/class.uiaddressbook.inc.php
2015-09-16 11:27:01 UTC (rev 13932)
+++ branches/dev-syncromind/addressbook/inc/class.uiaddressbook.inc.php
2015-09-16 11:34:02 UTC (rev 13933)
@@ -3550,5 +3550,4 @@
'nonavbar' => $this->nonavbar
));
}
-}
-?>
+}
\ No newline at end of file
Modified:
branches/dev-syncromind/addressbook/inc/class.uiaddressbook_prefs.inc.php
===================================================================
--- branches/dev-syncromind/addressbook/inc/class.uiaddressbook_prefs.inc.php
2015-09-16 11:27:01 UTC (rev 13932)
+++ branches/dev-syncromind/addressbook/inc/class.uiaddressbook_prefs.inc.php
2015-09-16 11:34:02 UTC (rev 13933)
@@ -75,7 +75,7 @@
var $lang_fields;
var $bo;
var $submit;
- function uiaddressbook_prefs()
+ function __construct()
{
$this->template = $GLOBALS['phpgw']->template;
if(!$this->session_data_saved())
@@ -963,4 +963,3 @@
}
-?>
Modified:
branches/dev-syncromind/addressbook/inc/class.uicategorize_contacts.inc.php
===================================================================
--- branches/dev-syncromind/addressbook/inc/class.uicategorize_contacts.inc.php
2015-09-16 11:27:01 UTC (rev 13932)
+++ branches/dev-syncromind/addressbook/inc/class.uicategorize_contacts.inc.php
2015-09-16 11:34:02 UTC (rev 13933)
@@ -24,7 +24,7 @@
'java_script' => True
);
- function uicategorize_contacts()
+ function __construct()
{
$this->template = &$GLOBALS['phpgw']->template;
$this->lists = CreateObject('addressbook.widget_lists',
'Categories', 'categorize_contacts_form');
@@ -183,4 +183,3 @@
$this->selected_cat = phpgw::get_var('all_cats');
}
}
-?>
Modified: branches/dev-syncromind/addressbook/inc/class.uifields.inc.php
===================================================================
--- branches/dev-syncromind/addressbook/inc/class.uifields.inc.php
2015-09-16 11:27:01 UTC (rev 13932)
+++ branches/dev-syncromind/addressbook/inc/class.uifields.inc.php
2015-09-16 11:34:02 UTC (rev 13933)
@@ -23,7 +23,7 @@
'delete' => true
);
- function uifields()
+ function __construct()
{
if ( !isset($GLOBALS['phpgw']->template) ||
!is_object($GLOBALS['phpgw']->template) )
{
@@ -510,7 +510,7 @@
}
if($new)
{
- $tmp =
strtolower(ereg_replace(' ','_',$new));
+ $tmp =
strtolower(preg_replace('/ /','_',$new));
$this->config->config_data['custom_fields'][$tmp] = $new;
}
break;
@@ -533,7 +533,7 @@
}
if($new)
{
- $tmp =
strtolower(ereg_replace(' ','_',$new));
+ $tmp =
strtolower(preg_replace('/ /','_',$new));
$this->config->config_data['custom_org_fields'][$tmp] = $new;
}
break;
@@ -556,7 +556,7 @@
}
if($new)
{
- $tmp =
strtolower(ereg_replace(' ','_',$new));
+ $tmp =
strtolower(preg_replace('/ /','_',$new));
$this->config->config_data['custom_fields'][$tmp] = $new;
}
if(!is_array($this->config->config_data['custom_org_fields']))
@@ -571,7 +571,7 @@
}
if($new)
{
- $tmp =
strtolower(ereg_replace(' ','_',$new));
+ $tmp =
strtolower(preg_replace('/ /','_',$new));
$this->config->config_data['custom_org_fields'][$tmp] = $new;
}
break;
Modified: branches/dev-syncromind/addressbook/inc/class.uivcard.inc.php
===================================================================
--- branches/dev-syncromind/addressbook/inc/class.uivcard.inc.php
2015-09-16 11:27:01 UTC (rev 13932)
+++ branches/dev-syncromind/addressbook/inc/class.uivcard.inc.php
2015-09-16 11:34:02 UTC (rev 13933)
@@ -32,7 +32,7 @@
'address3' => 'address3'
);
- function uivcard()
+ function __construct()
{
$this->template = $GLOBALS['phpgw']->template;
$this->contacts = CreateObject('phpgwapi.contacts');
Modified: branches/dev-syncromind/addressbook/inc/class.widget_lists.inc.php
===================================================================
--- branches/dev-syncromind/addressbook/inc/class.widget_lists.inc.php
2015-09-16 11:27:01 UTC (rev 13932)
+++ branches/dev-syncromind/addressbook/inc/class.widget_lists.inc.php
2015-09-16 11:34:02 UTC (rev 13933)
@@ -29,7 +29,7 @@
* @param array $form_name The name form where it will be this
widget
* @param string $use_combos Use True if you want to have combos
in your widget
*/
- function widget_lists($title, $form_name, $use_combos=True,
$use_filter=False)
+ function __construct($title, $form_name, $use_combos=True,
$use_filter=False)
{
$this->template = &$GLOBALS['phpgw']->template;
$this->title = $title;
@@ -371,4 +371,3 @@
return $tmp;
}
}
-?>
Modified: branches/dev-syncromind/addressbook/inc/export/Multiple_VCard
===================================================================
--- branches/dev-syncromind/addressbook/inc/export/Multiple_VCard
2015-09-16 11:27:01 UTC (rev 13932)
+++ branches/dev-syncromind/addressbook/inc/export/Multiple_VCard
2015-09-16 11:34:02 UTC (rev 13933)
@@ -182,4 +182,3 @@
return $buffer;
}
}
-?>
Modified: branches/dev-syncromind/addressbook/inc/export/Netscape_LDIF
===================================================================
--- branches/dev-syncromind/addressbook/inc/export/Netscape_LDIF
2015-09-16 11:27:01 UTC (rev 13932)
+++ branches/dev-syncromind/addressbook/inc/export/Netscape_LDIF
2015-09-16 11:34:02 UTC (rev 13933)
@@ -202,4 +202,3 @@
return $buffer;
}
}
-?>
Modified: branches/dev-syncromind/addressbook/inc/export/OpenOffice_-_calc
===================================================================
--- branches/dev-syncromind/addressbook/inc/export/OpenOffice_-_calc
2015-09-16 11:27:01 UTC (rev 13932)
+++ branches/dev-syncromind/addressbook/inc/export/OpenOffice_-_calc
2015-09-16 11:34:02 UTC (rev 13933)
@@ -496,4 +496,3 @@
}
-?>
Modified: branches/dev-syncromind/addressbook/inc/export/OpenOffice_-_writer
===================================================================
--- branches/dev-syncromind/addressbook/inc/export/OpenOffice_-_writer
2015-09-16 11:27:01 UTC (rev 13932)
+++ branches/dev-syncromind/addressbook/inc/export/OpenOffice_-_writer
2015-09-16 11:34:02 UTC (rev 13933)
@@ -471,4 +471,3 @@
}
-?>
Modified: branches/dev-syncromind/addressbook/inc/export/Outlook_CSV_-_Deutsch
===================================================================
--- branches/dev-syncromind/addressbook/inc/export/Outlook_CSV_-_Deutsch
2015-09-16 11:27:01 UTC (rev 13932)
+++ branches/dev-syncromind/addressbook/inc/export/Outlook_CSV_-_Deutsch
2015-09-16 11:34:02 UTC (rev 13933)
@@ -37,27 +37,27 @@
'suffix' => 'Suffix',
'org_name' => 'Firma',
'department' => 'Abteilung',
- 'work_add1' => 'Stra\xDFe gesch\xE4ftlich',
- 'work_add2' => 'Stra\xDFe gesch\xE4ftlich
2',
- 'work_add3' => 'Stra\xDFe gesch\xE4ftlich
3',
- 'work_city' => 'Ort gesch\xE4ftlich',
- 'work_state' => 'Region gesch\xE4ftlich',
- 'work_postal_code' => 'Postleitzahl
gesch\xE4ftlich',
- 'work_country' => 'Land gesch\xE4ftlich',
- 'home_add1' => 'Stra\xDFe privat',
+ 'work_add1' => 'Straße geschäftlich',
+ 'work_add2' => 'Straße geschäftlich 2',
+ 'work_add3' => 'Straße geschäftlich 3',
+ 'work_city' => 'Ort geschäftlich',
+ 'work_state' => 'Region geschäftlich',
+ 'work_postal_code' => 'Postleitzahl geschäftlich',
+ 'work_country' => 'Land geschäftlich',
+ 'home_add1' => 'Straße privat',
'home_city' => 'Ort privat',
'home_state' => 'Region privat',
'home_postal_code' => 'Postleitzahl privat',
'home_country' => 'Land privat',
- 'tel_fax' => 'Fax gesch\xE4ftlich',
- 'tel_work' => 'Telefon gesch\xE4ftlich',
+ 'tel_fax' => 'Fax geschäftlich',
+ 'tel_work' => 'Telefon geschäftlich',
'tel_msg' => 'Telefon Assistent',
'tel_car' => 'Autotelefon',
'tel_isdn' => 'ISDN',
'tel_home' => 'Telefon privat',
'tel_cell' => 'Mobiltelefon',
'tel_pager' => 'Pager',
- 'ophone' => 'Telefon gesch\xE4ftlich 2',
+ 'ophone' => 'Telefon geschäftlich 2',
'bday' => 'Geburtstag',
'email' => 'E-Mail-Adresse',
'email_home' => 'E-Mail 2: Adresse',
@@ -208,4 +208,3 @@
return $buffer;
}
}
-?>
Modified: branches/dev-syncromind/addressbook/inc/export/Outlook_CSV_-_Dutch
===================================================================
--- branches/dev-syncromind/addressbook/inc/export/Outlook_CSV_-_Dutch
2015-09-16 11:27:01 UTC (rev 13932)
+++ branches/dev-syncromind/addressbook/inc/export/Outlook_CSV_-_Dutch
2015-09-16 11:34:02 UTC (rev 13933)
@@ -4,7 +4,7 @@
// importeren bestand en de waarden van de array zullen gebruikt worden
// bij het aanmaken van het uitvoerbestand.
//
-// Een uit Outlook ge\xEBxporteerd bestand ziet er uit als volgt:
+// Een uit Outlook geëxporteerd bestand ziet er uit als volgt:
//
// Titel<tab>Voornaam<tab>Middelste naam<tab>Achternaam<tab>...
// <tab>Jan<tab><tab>Janssens<tab>...
@@ -13,9 +13,9 @@
// Dit is wat opgezocht zal worden voor de sleutel.
//
// De array hoeft in geen specifieke volgorde te staan en alle velden die
-// niet gedefini\xEBerd zijn, zullen ook niet worden omgezet.
+// niet gedefiniëerd zijn, zullen ook niet worden omgezet.
// Als de waarde gelijk is aan '+', zal ze worden toegevoegd aan het vorige
-// veld en alle tekst na de '+' zal worden toegevoegd v\xF3\xF3r de waarde.
+// veld en alle tekst na de '+' zal worden toegevoegd vóór de waarde.
// Zo zal bijvoorbeeld het volgende een komma en een spatie toevoegen tussen
// Achternaam en Voornaam en het resultaat bewaren in Volledige naam:
//
@@ -123,4 +123,3 @@
return lang('Successfully imported x records into your
addressbook.',$num);
}
}
-?>
Modified: branches/dev-syncromind/addressbook/inc/export/Outlook_CSV_-_English
===================================================================
--- branches/dev-syncromind/addressbook/inc/export/Outlook_CSV_-_English
2015-09-16 11:27:01 UTC (rev 13932)
+++ branches/dev-syncromind/addressbook/inc/export/Outlook_CSV_-_English
2015-09-16 11:34:02 UTC (rev 13933)
@@ -211,4 +211,3 @@
return $buffer;
}
}
-?>
Modified:
branches/dev-syncromind/addressbook/inc/export/Outlook_CSV_-_Espa?\195?\177ol
===================================================================
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [13933] Syncromind: Merge 13881:13931 from trunk,
Sigurd Nes <=