[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [13931] Merge 13880:13930 from trunk
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [13931] Merge 13880:13930 from trunk |
|
Date: |
Wed, 16 Sep 2015 11:19:06 +0000 |
Revision: 13931
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=13931
Author: sigurdne
Date: 2015-09-16 11:19:05 +0000 (Wed, 16 Sep 2015)
Log Message:
-----------
Merge 13880:13930 from trunk
Modified Paths:
--------------
branches/Version-1_0-branch/addressbook/admin.php
branches/Version-1_0-branch/addressbook/csv_import.php
branches/Version-1_0-branch/addressbook/inc/class.addressbook_importer.inc.php
branches/Version-1_0-branch/addressbook/inc/class.boXport.inc.php
branches/Version-1_0-branch/addressbook/inc/class.boaddressbook.inc.php
branches/Version-1_0-branch/addressbook/inc/class.boaddressbook_prefs.inc.php
branches/Version-1_0-branch/addressbook/inc/class.bocatalog_contact_addr_type.inc.php
branches/Version-1_0-branch/addressbook/inc/class.bocatalog_contact_comm_descr.inc.php
branches/Version-1_0-branch/addressbook/inc/class.bocatalog_contact_comm_type.inc.php
branches/Version-1_0-branch/addressbook/inc/class.bocatalog_contact_note_type.inc.php
branches/Version-1_0-branch/addressbook/inc/class.ipc_addressbook.inc.php
branches/Version-1_0-branch/addressbook/inc/class.pdb.inc.php
branches/Version-1_0-branch/addressbook/inc/class.remote.inc.php
branches/Version-1_0-branch/addressbook/inc/class.soaddressbook.inc.php
branches/Version-1_0-branch/addressbook/inc/class.socatalog_contact_addr_type.inc.php
branches/Version-1_0-branch/addressbook/inc/class.socatalog_contact_comm_descr.inc.php
branches/Version-1_0-branch/addressbook/inc/class.socatalog_contact_comm_type.inc.php
branches/Version-1_0-branch/addressbook/inc/class.socatalog_contact_note_type.inc.php
branches/Version-1_0-branch/addressbook/inc/class.uiXport.inc.php
branches/Version-1_0-branch/addressbook/inc/class.uiaddressbook.inc.php
branches/Version-1_0-branch/addressbook/inc/class.uiaddressbook_prefs.inc.php
branches/Version-1_0-branch/addressbook/inc/class.uicategorize_contacts.inc.php
branches/Version-1_0-branch/addressbook/inc/class.uifields.inc.php
branches/Version-1_0-branch/addressbook/inc/class.uivcard.inc.php
branches/Version-1_0-branch/addressbook/inc/class.widget_lists.inc.php
branches/Version-1_0-branch/addressbook/inc/export/Multiple_VCard
branches/Version-1_0-branch/addressbook/inc/export/Netscape_LDIF
branches/Version-1_0-branch/addressbook/inc/export/OpenOffice_-_calc
branches/Version-1_0-branch/addressbook/inc/export/OpenOffice_-_writer
branches/Version-1_0-branch/addressbook/inc/export/Outlook_CSV_-_Deutsch
branches/Version-1_0-branch/addressbook/inc/export/Outlook_CSV_-_Dutch
branches/Version-1_0-branch/addressbook/inc/export/Outlook_CSV_-_English
branches/Version-1_0-branch/addressbook/inc/export/Outlook_CSV_-_Espa?\195?\177ol
branches/Version-1_0-branch/addressbook/inc/export/Outlook_CSV_-_Fran?\195?\167ais
branches/Version-1_0-branch/addressbook/inc/export/Palm_PDB
branches/Version-1_0-branch/addressbook/inc/export/phpgw_LDIF
branches/Version-1_0-branch/addressbook/inc/export/phpgw_SQL
branches/Version-1_0-branch/addressbook/inc/functions.inc.php
branches/Version-1_0-branch/addressbook/inc/hook_add_def_pref.inc.php
branches/Version-1_0-branch/addressbook/inc/hook_addressbook_add_def_acl.inc.php
branches/Version-1_0-branch/addressbook/inc/hook_admin.inc.php
branches/Version-1_0-branch/addressbook/inc/hook_config_validate.inc.php
branches/Version-1_0-branch/addressbook/inc/hook_help.inc.php
branches/Version-1_0-branch/addressbook/inc/hook_home.inc.php
branches/Version-1_0-branch/addressbook/inc/hook_manual.inc.php
branches/Version-1_0-branch/addressbook/inc/hook_notifywindow.inc.php
branches/Version-1_0-branch/addressbook/inc/hook_preferences.inc.php
branches/Version-1_0-branch/addressbook/inc/hook_sidebox_menu.inc.php
branches/Version-1_0-branch/addressbook/inc/import/Import_Multiple_VCard
branches/Version-1_0-branch/addressbook/inc/import/Import_from_Netscape
branches/Version-1_0-branch/addressbook/inc/import/Import_from_Outlook_-_Deutsch
branches/Version-1_0-branch/addressbook/inc/import/Import_from_Outlook_-_Dutch
branches/Version-1_0-branch/addressbook/inc/import/Import_from_Outlook_-_English
branches/Version-1_0-branch/addressbook/inc/import/Import_from_Outlook_-_Espa?\195?\177ol
branches/Version-1_0-branch/addressbook/inc/import/Import_from_Outlook_-_Fran?\195?\167ais
branches/Version-1_0-branch/admin/inc/class.boaccess_history.inc.php
branches/Version-1_0-branch/admin/inc/class.boapplications.inc.php
branches/Version-1_0-branch/admin/inc/class.bolog.inc.php
branches/Version-1_0-branch/admin/inc/class.boserver.inc.php
branches/Version-1_0-branch/admin/inc/class.soaccess_history.inc.php
branches/Version-1_0-branch/admin/inc/class.soapplications.inc.php
branches/Version-1_0-branch/admin/inc/class.solog.inc.php
branches/Version-1_0-branch/admin/inc/class.soserver.inc.php
branches/Version-1_0-branch/admin/inc/class.uiconfig.inc.php
branches/Version-1_0-branch/admin/inc/class.uimenuclass.inc.php
branches/Version-1_0-branch/admin/inc/class.uiserver.inc.php
branches/Version-1_0-branch/calendar/inc/class.boalarm.inc.php
branches/Version-1_0-branch/calendar/inc/class.bocalendar.inc.php
branches/Version-1_0-branch/calendar/inc/class.boholiday.inc.php
branches/Version-1_0-branch/calendar/inc/class.boicalendar.inc.php
branches/Version-1_0-branch/calendar/inc/class.calendar_holiday.inc.php
branches/Version-1_0-branch/calendar/inc/class.holidaycalc_JP.inc.php
branches/Version-1_0-branch/calendar/inc/class.holidaycalc_US.inc.php
branches/Version-1_0-branch/calendar/inc/class.socalendar_sql.inc.php
branches/Version-1_0-branch/calendar/inc/class.soholiday.inc.php
branches/Version-1_0-branch/calendar/inc/class.uicalendar.inc.php
branches/Version-1_0-branch/calendar/inc/class.uiholiday.inc.php
branches/Version-1_0-branch/calendar/inc/class.uiicalendar.inc.php
branches/Version-1_0-branch/calendar/inc/hook_add_def_pref.inc.php
branches/Version-1_0-branch/calendar/inc/hook_admin.inc.php
branches/Version-1_0-branch/calendar/inc/hook_help.inc.php
branches/Version-1_0-branch/calendar/inc/hook_home.inc.php
branches/Version-1_0-branch/calendar/inc/hook_home_day.inc.php
branches/Version-1_0-branch/calendar/inc/hook_home_month.inc.php
branches/Version-1_0-branch/calendar/inc/hook_home_planner.inc.php
branches/Version-1_0-branch/calendar/inc/hook_home_week.inc.php
branches/Version-1_0-branch/calendar/inc/hook_home_weeknew.inc.php
branches/Version-1_0-branch/calendar/inc/hook_home_year.inc.php
branches/Version-1_0-branch/calendar/inc/hook_manual.inc.php
branches/Version-1_0-branch/calendar/inc/hook_preferences.inc.php
branches/Version-1_0-branch/calendar/inc/hook_sidebox_menu.inc.php
branches/Version-1_0-branch/controller/inc/class.uicheck_list.inc.php
branches/Version-1_0-branch/demo/inc/class.sodemo.inc.php
branches/Version-1_0-branch/email/addressbook-js.php
branches/Version-1_0-branch/email/addressbook.php
branches/Version-1_0-branch/email/attach_file.php
branches/Version-1_0-branch/email/compose.php
branches/Version-1_0-branch/email/inc/class.boaction.inc.php
branches/Version-1_0-branch/email/inc/class.boattach_file.inc.php
branches/Version-1_0-branch/email/inc/class.bocompose.inc.php
branches/Version-1_0-branch/email/inc/class.bofilters.inc.php
branches/Version-1_0-branch/email/inc/class.bofolder.inc.php
branches/Version-1_0-branch/email/inc/class.boindex.inc.php
branches/Version-1_0-branch/email/inc/class.bojsaddressbook.inc.php
branches/Version-1_0-branch/email/inc/class.bomessage.inc.php
branches/Version-1_0-branch/email/inc/class.bopreferences.inc.php
branches/Version-1_0-branch/email/inc/class.bosend.inc.php
branches/Version-1_0-branch/email/inc/class.html_widgets.inc.php
branches/Version-1_0-branch/email/inc/class.mail_dcom_base.inc.php
branches/Version-1_0-branch/email/inc/class.mail_dcom_base_sock.inc.php
branches/Version-1_0-branch/email/inc/class.mail_dcom_imap_sock.inc.php
branches/Version-1_0-branch/email/inc/class.mail_dcom_nntp.inc.php
branches/Version-1_0-branch/email/inc/class.mail_dcom_nntp_sock.inc.php
branches/Version-1_0-branch/email/inc/class.mail_dcom_pop3_sock.inc.php
branches/Version-1_0-branch/email/inc/class.mail_filters.inc.php
branches/Version-1_0-branch/email/inc/class.mail_msg.inc.php
branches/Version-1_0-branch/email/inc/class.mail_msg_base.inc.php
branches/Version-1_0-branch/email/inc/class.mail_msg_display.inc.php
branches/Version-1_0-branch/email/inc/class.mail_send.inc.php
branches/Version-1_0-branch/email/inc/class.so_mail_msg.inc.php
branches/Version-1_0-branch/email/inc/class.spell.inc.php
branches/Version-1_0-branch/email/inc/class.spell_struct.inc.php
branches/Version-1_0-branch/email/inc/class.spell_svc_none.inc.php
branches/Version-1_0-branch/email/inc/class.spell_svc_php.inc.php
branches/Version-1_0-branch/email/inc/class.svc_debug.inc.php
branches/Version-1_0-branch/email/inc/class.svc_nextmatches.inc.php
branches/Version-1_0-branch/email/inc/class.ui_mail_debug.inc.php
branches/Version-1_0-branch/email/inc/class.uiattach_file.inc.php
branches/Version-1_0-branch/email/inc/class.uicompose.inc.php
branches/Version-1_0-branch/email/inc/class.uifilters.inc.php
branches/Version-1_0-branch/email/inc/class.uifolder.inc.php
branches/Version-1_0-branch/email/inc/class.uiindex.inc.php
branches/Version-1_0-branch/email/inc/class.uijsaddressbook.inc.php
branches/Version-1_0-branch/email/inc/class.uimessage.inc.php
branches/Version-1_0-branch/email/inc/class.uipreferences.inc.php
branches/Version-1_0-branch/email/inc/functions.inc.php
branches/Version-1_0-branch/email/inc/hook_admin.inc.php
branches/Version-1_0-branch/email/inc/hook_email_add_def_pref.inc.php
branches/Version-1_0-branch/email/inc/hook_home.inc.php
branches/Version-1_0-branch/email/inc/hook_login.inc.php
branches/Version-1_0-branch/email/inc/hook_manual.inc.php
branches/Version-1_0-branch/email/inc/hook_notifywindow.inc.php
branches/Version-1_0-branch/email/inc/hook_notifywindow_simple.inc.php
branches/Version-1_0-branch/email/inc/hook_preferences.inc.php
branches/Version-1_0-branch/email/view_image.php
branches/Version-1_0-branch/emailadmin/inc/class.ajaxemailadmin.inc.php
branches/Version-1_0-branch/emailadmin/inc/class.cyrusimap.inc.php
branches/Version-1_0-branch/emailadmin/inc/class.dbmaildbmailuser.inc.php
branches/Version-1_0-branch/emailadmin/inc/class.dbmailqmailuser.inc.php
branches/Version-1_0-branch/emailadmin/inc/class.defaultimap.inc.php
branches/Version-1_0-branch/emailadmin/inc/class.defaultpop.inc.php
branches/Version-1_0-branch/emailadmin/inc/class.defaultsmtp.inc.php
branches/Version-1_0-branch/emailadmin/inc/class.ea_identity.inc.php
branches/Version-1_0-branch/emailadmin/inc/class.ea_preferences.inc.php
branches/Version-1_0-branch/emailadmin/inc/class.emailadmin_bo.inc.php
branches/Version-1_0-branch/emailadmin/inc/class.emailadmin_so.inc.php
branches/Version-1_0-branch/emailadmin/inc/class.emailadmin_ui.inc.php
branches/Version-1_0-branch/emailadmin/inc/class.imap_client.inc.php
branches/Version-1_0-branch/emailadmin/inc/class.postfixdbmailuser.inc.php
branches/Version-1_0-branch/emailadmin/inc/class.uiuserdata.inc.php
branches/Version-1_0-branch/emailadmin/inc/hook_admin.inc.php
branches/Version-1_0-branch/emailadmin/index.php
branches/Version-1_0-branch/felamimail/inc/class.Script.inc.php
branches/Version-1_0-branch/felamimail/inc/class.ajax_contacts.inc.php
branches/Version-1_0-branch/felamimail/inc/class.ajaxfelamimail.inc.php
branches/Version-1_0-branch/felamimail/inc/class.bocaching.inc.php
branches/Version-1_0-branch/felamimail/inc/class.bocompose.inc.php
branches/Version-1_0-branch/felamimail/inc/class.bofelamimail.inc.php
branches/Version-1_0-branch/felamimail/inc/class.bofilter.inc.php
branches/Version-1_0-branch/felamimail/inc/class.bopreferences.inc.php
branches/Version-1_0-branch/felamimail/inc/class.bosieve.inc.php
branches/Version-1_0-branch/felamimail/inc/class.felamimail_bosignatures.inc.php
branches/Version-1_0-branch/felamimail/inc/class.felamimail_signatures.inc.php
branches/Version-1_0-branch/felamimail/inc/class.htmlfilter.inc.php
branches/Version-1_0-branch/felamimail/inc/class.kses.inc.php
branches/Version-1_0-branch/felamimail/inc/class.socaching.inc.php
branches/Version-1_0-branch/felamimail/inc/class.sofelamimail.inc.php
branches/Version-1_0-branch/felamimail/inc/class.sofilter.inc.php
branches/Version-1_0-branch/felamimail/inc/class.sopreferences.inc.php
branches/Version-1_0-branch/felamimail/inc/class.transformdate.inc.php
branches/Version-1_0-branch/felamimail/inc/class.uibaseclass.inc.php
branches/Version-1_0-branch/felamimail/inc/class.uicompose.inc.php
branches/Version-1_0-branch/felamimail/inc/class.uidisplay.inc.php
branches/Version-1_0-branch/felamimail/inc/class.uifelamimail.inc.php
branches/Version-1_0-branch/felamimail/inc/class.uifilter.inc.php
branches/Version-1_0-branch/felamimail/inc/class.uipreferences.inc.php
branches/Version-1_0-branch/felamimail/inc/class.uisieve.inc.php
branches/Version-1_0-branch/felamimail/inc/class.uiwidgets.inc.php
branches/Version-1_0-branch/felamimail/inc/hook_admin.inc.php
branches/Version-1_0-branch/felamimail/inc/hook_home.inc.php
branches/Version-1_0-branch/felamimail/inc/hook_notifywindow.inc.php
branches/Version-1_0-branch/felamimail/inc/hook_preferences.inc.php
branches/Version-1_0-branch/felamimail/inc/hook_settings.inc.php
branches/Version-1_0-branch/felamimail/inc/hook_sidebox_menu.inc.php
branches/Version-1_0-branch/felamimail/inc/xajax.inc.php
branches/Version-1_0-branch/felamimail/inc/xajaxResponse.inc.php
branches/Version-1_0-branch/filemanager/inc/class.attached_files.inc.php
branches/Version-1_0-branch/filemanager/inc/class.bofilemanager.inc.php
branches/Version-1_0-branch/filemanager/inc/class.menu.inc.php
branches/Version-1_0-branch/filemanager/inc/class.uiaction_base.inc.php
branches/Version-1_0-branch/filemanager/inc/class.uiaction_edit.inc.php
branches/Version-1_0-branch/filemanager/inc/class.uiactions.inc.php
branches/Version-1_0-branch/filemanager/inc/class.uifilemanager.inc.php
branches/Version-1_0-branch/filemanager/inc/hook_add_def_pref.inc.php
branches/Version-1_0-branch/folders/inc/class.bofolders.inc.php
branches/Version-1_0-branch/folders/inc/class.layersmenu.inc.php
branches/Version-1_0-branch/folders/inc/class.treemenu.inc.php
branches/Version-1_0-branch/folders/inc/class.uifolders.inc.php
branches/Version-1_0-branch/folders/phplayersmenu/lib/layersmenu-common.inc.php
branches/Version-1_0-branch/ftp/inc/functions.inc.php
branches/Version-1_0-branch/help.php
branches/Version-1_0-branch/helpdesk/inc/class.botts.inc.php
branches/Version-1_0-branch/home.php
branches/Version-1_0-branch/hrm/inc/class.bocategory.inc.php
branches/Version-1_0-branch/hrm/inc/class.bocommon.inc.php
branches/Version-1_0-branch/hrm/inc/class.boplace.inc.php
branches/Version-1_0-branch/hrm/inc/class.bouser.inc.php
branches/Version-1_0-branch/hrm/inc/class.menu.inc.php
branches/Version-1_0-branch/hrm/inc/class.socommon.inc.php
branches/Version-1_0-branch/hrm/inc/class.soplace.inc.php
branches/Version-1_0-branch/hrm/inc/class.uicategory.inc.php
branches/Version-1_0-branch/hrm/inc/class.uiplace.inc.php
branches/Version-1_0-branch/hrm/inc/class.uiuser.inc.php
branches/Version-1_0-branch/ipc_test_suite/inc/class.ipc_test_suite.inc.php
branches/Version-1_0-branch/ipc_test_suite/inc/class.ipc_test_suite_addressbook.inc.php
branches/Version-1_0-branch/ipc_test_suite/inc/class.ipc_test_suite_bookmarks.inc.php
branches/Version-1_0-branch/ipc_test_suite/inc/class.ipc_test_suite_calendar.inc.php
branches/Version-1_0-branch/ipc_test_suite/inc/class.ipc_test_suite_email.inc.php
branches/Version-1_0-branch/ipc_test_suite/inc/class.ipc_test_suite_notes.inc.php
branches/Version-1_0-branch/ipc_test_suite/inc/class.ipc_test_suite_todo.inc.php
branches/Version-1_0-branch/ipc_test_suite/inc/class.ipc_test_suite_ui.inc.php
branches/Version-1_0-branch/ipc_test_suite/setup/setup.inc.php
branches/Version-1_0-branch/ipc_test_suite/sources/api/class.ipc_.inc.php
branches/Version-1_0-branch/ipc_test_suite/sources/api/class.ipc_manager.inc.php
branches/Version-1_0-branch/ipc_test_suite/sources/api/class.vcard.inc.php
branches/Version-1_0-branch/ipc_test_suite/sources/app/class.ipc_addressbook.inc.php
branches/Version-1_0-branch/ipc_test_suite/sources/app/class.ipc_calendar.inc.php
branches/Version-1_0-branch/ipc_test_suite/sources/app/class.ipc_notes.inc.php
branches/Version-1_0-branch/mailpipe.php
branches/Version-1_0-branch/manual/inc/class.help.inc.php
branches/Version-1_0-branch/manual/inc/class.help_helper.inc.php
branches/Version-1_0-branch/messenger/inc/class.bomessenger.inc.php
branches/Version-1_0-branch/messenger/inc/class.somessenger.inc.php
branches/Version-1_0-branch/messenger/inc/class.somessenger_imap.inc.php
branches/Version-1_0-branch/messenger/inc/class.somessenger_sql.inc.php
branches/Version-1_0-branch/mobilefrontend/home.php
branches/Version-1_0-branch/notes/inc/class.bonotes.inc.php
branches/Version-1_0-branch/notes/inc/class.ipc_notes.inc.php
branches/Version-1_0-branch/notes/inc/class.sonotes.inc.php
branches/Version-1_0-branch/notes/inc/hook_admin.inc.php
branches/Version-1_0-branch/notes/inc/hook_deleteaccount.inc.php
branches/Version-1_0-branch/notes/inc/hook_help.inc.php
branches/Version-1_0-branch/notes/inc/hook_preferences.inc.php
branches/Version-1_0-branch/notify_simple.php
branches/Version-1_0-branch/phpgwapi/inc/class.Mail_mimeDecode.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.Services_JSON.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.Template.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.Template_experimental.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.arrayfunctions.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.bojsaddressbook.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.calendar_holidays.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.clientsniffer.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.contact_accounts.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.contact_addr.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.contact_addr_type.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.contact_categories.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.contact_central.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.contact_comm.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.contact_comm_descr.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.contact_comm_type.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.contact_note.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.contact_note_type.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.contact_org.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.contact_org_person.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.contact_others.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.contact_person.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.contact_types.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.contacts_sql.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.crypto.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.csstooltip.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.data_cleaner.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.error.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.gdbutton.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.gdgraph.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.gdimage.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.html2text.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.http.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.http_dav_client.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.http_svn_client.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.interserver.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.ipc_manager.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.jscalendar.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.listbox.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.log_message.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.login.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.mail_handlers.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.matrixview.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.menutree.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.net_http_client.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.network.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.nextmatchs_xslt.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.ping.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.portalbox.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.resultbox.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.rssparser.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.schema_proc.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.schema_proc_array.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.schema_proc_mssql.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.schema_proc_oracle.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.schema_proc_pgsql.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.schema_proc_sapdb.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.send.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.service_contacts.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.service_notes.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.service_schedule.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.setup_html.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.sql_builder.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.sql_entity.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.template_portico.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.ui_tools.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.uijsaddressbook.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.validator.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.vcard.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.vfs_dav.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.vfs_shared.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.xml.inc.php
branches/Version-1_0-branch/phpgwapi/inc/functions.inc.php
branches/Version-1_0-branch/phpgwapi/inc/mapping/class.mapping_.inc.php
branches/Version-1_0-branch/phpgwapi/inc/mapping/class.mapping_ldap.inc.php
branches/Version-1_0-branch/phpgwapi/inc/mapping/class.mapping_sql.inc.php
branches/Version-1_0-branch/phpgwapi/inc/sso/create_account.php
branches/Version-1_0-branch/phpgwapi/inc/sso/include_login.inc.php
branches/Version-1_0-branch/phpgwapi/js/fckeditor/editor/filemanager/browser/default/connectors/php/connector.php
branches/Version-1_0-branch/phpgwapi/setup/setup.inc.php
branches/Version-1_0-branch/phpgwapi/setup/tables_current.inc.php
branches/Version-1_0-branch/phpgwapi/setup/tables_update.inc.php
branches/Version-1_0-branch/property/inc/class.bodocument.inc.php
branches/Version-1_0-branch/property/inc/class.db_oci8.inc.php
branches/Version-1_0-branch/property/inc/class.historylog.inc.php
branches/Version-1_0-branch/property/inc/class.sotts.inc.php
branches/Version-1_0-branch/property/tutorials/property/examples/install.apache.sh
branches/Version-1_0-branch/redirect.php
branches/Version-1_0-branch/registration/inc/class.bomanagefields.inc.php
branches/Version-1_0-branch/registration/inc/class.boreg.inc.php
branches/Version-1_0-branch/registration/inc/class.somanagefields.inc.php
branches/Version-1_0-branch/registration/inc/class.uimanagefields.inc.php
branches/Version-1_0-branch/registration/inc/class.uireg.inc.php
branches/Version-1_0-branch/registration/inc/hook_admin.inc.php
branches/Version-1_0-branch/registration/main.php
branches/Version-1_0-branch/registration/templates/base/css/base.css
branches/Version-1_0-branch/sms/bin/default/config_BR
branches/Version-1_0-branch/sms/bin/default/config_BR_log
branches/Version-1_0-branch/sms/bin/default/config_SD
branches/Version-1_0-branch/sms/bin/default/config_SD_log
branches/Version-1_0-branch/sms/bin/default/config_ST
branches/Version-1_0-branch/sms/bin/default/config_ST_log
branches/Version-1_0-branch/sms/bin/default/config_VASK_log
branches/Version-1_0-branch/sms/inc/class.uipoll.inc.php
branches/Version-1_0-branch/sms/inc/feedcreator.class.php
branches/Version-1_0-branch/sms/inc/plugin/gateway/clickatell/callback.php
branches/Version-1_0-branch/sms/inc/plugin/gateway/clickatell/config.php
branches/Version-1_0-branch/sms/inc/plugin/gateway/clickatell/fn.php
branches/Version-1_0-branch/sms/inc/plugin/gateway/clickatell/manage.php
branches/Version-1_0-branch/sms/inc/plugin/gateway/kannel/config.php
branches/Version-1_0-branch/sms/inc/plugin/gateway/kannel/dlr.php
branches/Version-1_0-branch/sms/inc/plugin/gateway/kannel/fn.php
branches/Version-1_0-branch/sms/inc/plugin/gateway/kannel/geturl.php
branches/Version-1_0-branch/sms/inc/plugin/gateway/kannel/manage.php
branches/Version-1_0-branch/sms/inc/plugin/gateway/uplink/config.php
branches/Version-1_0-branch/sms/inc/plugin/gateway/uplink/fn.php
branches/Version-1_0-branch/sms/inc/plugin/gateway/uplink/manage.php
branches/Version-1_0-branch/soap/inc/class.soap_server.inc.php.wip
branches/Version-1_0-branch/soap/inc/class.test_methods.inc.php
branches/Version-1_0-branch/soap/interop_harness.php
branches/Version-1_0-branch/soap/soaplib.soapinterop.php
branches/Version-1_0-branch/soap/test_client.php
branches/Version-1_0-branch/soap/test_methods.php
branches/Version-1_0-branch/soap/test_methods_wsdl.php
branches/Version-1_0-branch/soap/test_server.php
branches/Version-1_0-branch/soap/vars.php
branches/Version-1_0-branch/soap/wsdl_harness.php
branches/Version-1_0-branch/soap.php
branches/Version-1_0-branch/todo/inc/class.botodo.inc.php
branches/Version-1_0-branch/todo/inc/class.sotodo.inc.php
branches/Version-1_0-branch/todo/inc/class.uipreferences.inc.php
branches/Version-1_0-branch/todo/inc/class.uitodo.inc.php
branches/Version-1_0-branch/todo/inc/hook_home.inc.php
branches/Version-1_0-branch/todo/inc/hook_manual.inc.php
branches/Version-1_0-branch/xmlrpc/server.php
branches/Version-1_0-branch/xmlrpc.php
Property Changed:
----------------
branches/Version-1_0-branch/
Property changes on: branches/Version-1_0-branch
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/dev-syncromind:13653
/branches/stavangerkommune:12743-12875,12986
/trunk:6439-6441,6443,6445-6447,6449-6464,6466-6468,6470-6474,6476-6477,6479-6480,6483-6488,6490-6491,6493-6494,6496-6501,6503-6504,6506,6508,6510-6511,6513,6515-6516,6518,6520-6524,6526-6528,6533-6534,6536-6541,6543-6565,6567,6569,6571-6576,6578,6580-6586,6588-6596,6598-6600,6602-6604,6606-6607,6609-6611,6613-6625,6629-6639,6641-6643,6645-6646,6648,6650-6654,6656-6659,6661-6663,6665-6666,6668-6669,6672-6673,6675,6677-6678,6680,6682-6686,6688-6717,6719,6721-6722,6724-6728,6730,6732-6734,6736-6739,6741,6743,6745-6746,6748-6756,6758-6762,6764,6766-6788,6790,6792-6798,6800-6814,6816-6819,6821-6822,6824-6826,6828-6837,6839,6841,6843-6849,6851,6853-6869,6871-6874,6876-6877,6879,6881,6883,6885-6886,6888-6893,6895-6897,6899-6901,6903,6905-6907,6909,6911-6929,6931-6936,6938-6947,6949,6951,6953,6955-6956,6958-6959,6961-6968,6970-6971,6973-6974,6976-6978,6980,6982-7017,7019-7025,7027-7035,7037-7039,7041-7045,7047-7055,7057,7059-7065,7067-7069,7071,7073,7075-7076,7078,7080-7081,7083,7085,7087,7089-7097,7099-7102,7104-7105,7107-7111,7113-7120,7122-7124,7126-7129,7131,7133-7141,7143,7145-7146,7148-7150,7152-7153,7155-7158,7160-7164,7166-7167,7169-7170,7172,7174,7176,7178,7180-7181,7183,7185,7187-7188,7190,7192-7196,7198-7199,7201-7203,7205,7207,7209-7210,7212,7214,7216-7217,7219-7222,7224-7226,7228-7229,7231,7233-7234,7236-7238,7240-7241,7243-7244,7246,7248,7250,7252-7256,7258-7259,7261-7264,7266-7273,7275-7279,7281-7332,7334-7338,7340-7348,7350,7352-7353,7355-7361,7363-7366,7368-7370,7372,7374,7376,7378,7380-7386,7388-7400,7402,7404-7433,7435-7439,7441-7446,7448-7458,7460-7469,7471-7483,7485-7487,7489-7490,7492,7494,7496-7497,7499,7501-7502,7504,7506-7507,7509-7511,7513-7517,7519-7521,7523,7525,7527-7529,7531,7533,7535-7538,7540-7542,7544-7549,7551-7552,7554-7561,7563,7565,7567-7573,7575-7578,7580-7584,7586-7591,7593-7624,7627-7636,7638-7656,7658-7718,7720-7732,7734,7736,7738-7750,7754-7759,7761-7767,7769-7780,7782,7784-7809,7811-7812,7814-7835,7837-7847,7849-7887,7889-7895,7897,7899,7901,7903-7905,7907-7921,7923-7925,7927-7933,7935,7937-7952,7954-7968,7970-7974,7976,7978-7979,7981-7982,7984-7988,7990-7992,7994-8041,8043-8066,8068-8087,8089,8091-8108,8110-8124,8126-8129,8131,8133-8150,8152-8154,8156-8162,8164-8167,8169-8170,8172-8179,8181,8183-8196,8198-8207,8209-8211,8213-8214,8216-8217,8219-8220,8222,8224-8225,8227-8247,8249,8251,8253-8282,8284-8352,8354-8368,8370-8396,8398-8430,8432,8434-8440,8442-8445,8447-8453,8455-8456,8458,8460,8462-8464,8466-8473,8475-8479,8481,8483-8501,8503-8523,8525,8527-8531,8533,8535-8536,8538-8550,8552-8554,8556-8557,8559-8579,8581-8587,8589,8591-8592,8594-8595,8597-8601,8603-8610,8612-8613,8615,8617,8619-8645,8647-8650,8652-8661,8663-8666,8668-8669,8671-8683,8685-8691,8693-8730,8732-8737,8739,8741-8767,8769,8771-8772,8774,8776-8797,8799-8812,8814-8819,8821,8823-8833,8835-8837,8839,8841,8843-8849,8852-8858,8860-8867,8869-8870,8872,8874-8877,8879,8881,8883-8888,8890,8892-8901,8903-8911,8913-8917,8920-8923,8925-8933,8935-8938,8940-8943,8945,8947-8948,8950,8952-8953,8955-8962,8964,8966,8968-8970,8972-8975,8977-8983,8985-8993,8995-9001,9003,9005,9007,9009,9011-9019,9021-9023,9025,9027-9028,9030-9044,9046-9047,9049-9050,9052-9056,9058-9059,9061,9063-9064,9066-9068,9071-9092,9094-9112,9114-9117,9119,9121-9160,9162-9166,9169-9207,9209-9211,9213-9215,9217,9219,9221-9253,9255,9257,9259-9260,9262,9264-9269,9271-9273,9275,9277-9278,9280,9282-9283,9285-9289,9291-9299,9301-9310,9312-9313,9315-9320,9322-9324,9326-9338,9340-9342,9344,9346-9348,9350-9358,9360-9362,9364-9366,9368-9374,9376-9382,9384,9386,9388-9390,9392-9396,9398-9402,9404-9410,9412,9414,9416-9417,9419-9425,9427,9429-9430,9432,9434-9463,9465-9502,9504-9506,9508-9521,9523-9526,9528,9530-9537,9539,9541-9551,9553,9555-9556,9558-9578,9580-9581,9583,9585,9587,9589,9591-9624,9626-9655,9657-9700,9702-9726,9728-9729,9731-9749,9751,9753-9754,9756-9832,9834-9836,9838-9839,9841-9846,9848-9850,9852-9858,9860-9863,9865,9867,9869-9871,9873-9893,9895,9897-9912,9914-9919,9921-9928,9930-9952,9954,9956,9958-9963,9965-9993,9995-9997,9999-10001,10003-10004,10006-10007,10009-10012,10014-10031,10033-10073,10075-10107,10109-10165,10167-10210,10222-10226,10228-10311,10313-10378,10380,10382,10384-10393,10395-10478,10480-10482,10484-10494,10496-10503,10505,10507,10509-10521,10523,10525-10528,10530-10540,10542-10543,10545-10568,10570-10584,10586-10590,10592-10594,10596,10598-10599,10601-10611,10613,10615,10617-10626,10628-10636,10638,10640-10654,10656-10658,10660,10662-10672,10674,10676-10682,10684,10686,10688-10690,10692-10694,10696-10697,10699-10701,10703,10705-10706,10708-10724,10726-10731,10734,10736-10748,10750-10796,10798-10939,10941,10943,10945,10947-10953,10955,10957-10961,10963,10965-10966,10968-11001,11003-11030,11032-11034,11036,11038,11040,11042-11053,11055-11059,11061-11062,11064-11068,11070-11073,11075-11077,11079-11083,11085,11087-11088,11090-11093,11095-11108,11110-11111,11113,11115-11116,11118-11120,11122,11124-11129,11131-11132,11134,11136,11138,11140-11151,11153-11161,11163-11185,11187-11189,11191-11229,11231,11233,11235-11264,11266-11267,11269-11278,11280-11282,11284-11291,11293-11295,11297,11299-11302,11304,11306,11309,11311,11313-11316,11318-11323,11325-11332,11334,11336-11344,11346,11348-11354,11356,11358-11360,11363-11386,11388-11389,11391-11392,11394,11396-11403,11405-11406,11408,11410,11412,11415,11417,11419-11420,11422,11424-11429,11431-11442,11444-11445,11447-11460,11462-11464,11466-11470,11472-11475,11477-11478,11480-11487,11489-11492,11494,11496,11498,11500-11502,11504-11506,11508,11510-11511,11513,11515,11517-11523,11525-11526,11528-11531,11533,11535-11538,11540-11546,11548-11560,11563-11572,11574,11576,11578,11580-11581,11583,11585,11587,11589-11592,11594-11595,11597,11599,11601,11603,11605-11607,11609-11611,11613,11615-11619,11621-11622,11624-11630,11632,11634-11635,11637,11639-11640,11642,11644-11655,11657-11659,11661-11675,11677-11679,11681-11684,11686,11688,11690-11691,11693-11706,11708-11709,11711-11714,11716-11718,11720-11728,11730,11732,11734-11739,11741-11757,11759-11760,11762-11766,11768,11770-11771,11773,11775,11777,11779-11780,11782,11784,11786,11788,11790,11792-11793,11795,11797,11799,11801,11803-11804,11806-11807,11809,11811-11814,11816-11820,11822,11824-11826,11828,11830,11832,11834,11836-11837,11839,11841,11843,11845-11847,11849-11852,11854-11856,11858-11860,11862-11863,11865,11867,11869-11870,11872,11874,11876-11879,11881-11891,11893,11895,11897-11899,11901,11903,11905-11906,11908-11917,11919,11921,11923-11925,11927-11931,11933-11954,11956-11962,11964-11969,11971-11973,11975-11976,11978,11980,11982,11984,11986-11991,11993,11995,11997-12000,12002,12004-12006,12008,12010-12011,12013,12015,12017-12018,12020-12021,12023,12025,12027-12028,12030,12032-12036,12038,12040-12042,12044-12045,12047,12049-12052,12054,12056-12063,12065-12073,12075-12086,12088-12092,12094-12095,12097,12099-12102,12104,12106-12107,12109-12182,12184-12201,12203-12210,12212-12231,12233-12239,12241-12248,12250-12328,12330-12363,12365-12384,12386-12397,12399-12401,12403-12434,12436-12455,12457,12459-12461,12463-12465,12467,12469-12477,12479-12518,12520-12527,12529-12532,12534-12595,12597-12601,12603-12655,12657-12670,12672-12683,12685-12686,12688-12707,12709-12730,12732-12750,12752-12755,12757,12759-12761,12763-12819,12821,12823,12825-12890,12892-12896,12898,12900-12913,12915-13060,13062-13142,13144,13146-13331,13333-13338,13340-13347,13349-13365,13367-13381,13383,13385,13387-13391,13393-13401,13403,13405-13416,13418-13431,13433-13434,13436,13438-13440,13442-13480,13482-13506,13509-13540,13545-13551,13553,13555-13564,13566-13570,13572,13574-13590,13601,13603-13701,13703-13709,13711-13713,13715,13717,13719-13723,13725,13727-13728,13730-13732,13734-13735,13737-13744,13746,13748-13772,13774-13775,13777-13781,13783-13797,13799,13801-13806,13808-13810,13812,13814-13835,13837-13840,13842,13844-13855,13857-13879
+ /branches/dev-syncromind:13653
/branches/stavangerkommune:12743-12875,12986
/trunk:6439-6441,6443,6445-6447,6449-6464,6466-6468,6470-6474,6476-6477,6479-6480,6483-6488,6490-6491,6493-6494,6496-6501,6503-6504,6506,6508,6510-6511,6513,6515-6516,6518,6520-6524,6526-6528,6533-6534,6536-6541,6543-6565,6567,6569,6571-6576,6578,6580-6586,6588-6596,6598-6600,6602-6604,6606-6607,6609-6611,6613-6625,6629-6639,6641-6643,6645-6646,6648,6650-6654,6656-6659,6661-6663,6665-6666,6668-6669,6672-6673,6675,6677-6678,6680,6682-6686,6688-6717,6719,6721-6722,6724-6728,6730,6732-6734,6736-6739,6741,6743,6745-6746,6748-6756,6758-6762,6764,6766-6788,6790,6792-6798,6800-6814,6816-6819,6821-6822,6824-6826,6828-6837,6839,6841,6843-6849,6851,6853-6869,6871-6874,6876-6877,6879,6881,6883,6885-6886,6888-6893,6895-6897,6899-6901,6903,6905-6907,6909,6911-6929,6931-6936,6938-6947,6949,6951,6953,6955-6956,6958-6959,6961-6968,6970-6971,6973-6974,6976-6978,6980,6982-7017,7019-7025,7027-7035,7037-7039,7041-7045,7047-7055,7057,7059-7065,7067-7069,7071,7073,7075-7076,7078,7080-7081,7083,7085,7087,7089-7097,7099-7102,7104-7105,7107-7111,7113-7120,7122-7124,7126-7129,7131,7133-7141,7143,7145-7146,7148-7150,7152-7153,7155-7158,7160-7164,7166-7167,7169-7170,7172,7174,7176,7178,7180-7181,7183,7185,7187-7188,7190,7192-7196,7198-7199,7201-7203,7205,7207,7209-7210,7212,7214,7216-7217,7219-7222,7224-7226,7228-7229,7231,7233-7234,7236-7238,7240-7241,7243-7244,7246,7248,7250,7252-7256,7258-7259,7261-7264,7266-7273,7275-7279,7281-7332,7334-7338,7340-7348,7350,7352-7353,7355-7361,7363-7366,7368-7370,7372,7374,7376,7378,7380-7386,7388-7400,7402,7404-7433,7435-7439,7441-7446,7448-7458,7460-7469,7471-7483,7485-7487,7489-7490,7492,7494,7496-7497,7499,7501-7502,7504,7506-7507,7509-7511,7513-7517,7519-7521,7523,7525,7527-7529,7531,7533,7535-7538,7540-7542,7544-7549,7551-7552,7554-7561,7563,7565,7567-7573,7575-7578,7580-7584,7586-7591,7593-7624,7627-7636,7638-7656,7658-7718,7720-7732,7734,7736,7738-7750,7754-7759,7761-7767,7769-7780,7782,7784-7809,7811-7812,7814-7835,7837-7847,7849-7887,7889-7895,7897,7899,7901,7903-7905,7907-7921,7923-7925,7927-7933,7935,7937-7952,7954-7968,7970-7974,7976,7978-7979,7981-7982,7984-7988,7990-7992,7994-8041,8043-8066,8068-8087,8089,8091-8108,8110-8124,8126-8129,8131,8133-8150,8152-8154,8156-8162,8164-8167,8169-8170,8172-8179,8181,8183-8196,8198-8207,8209-8211,8213-8214,8216-8217,8219-8220,8222,8224-8225,8227-8247,8249,8251,8253-8282,8284-8352,8354-8368,8370-8396,8398-8430,8432,8434-8440,8442-8445,8447-8453,8455-8456,8458,8460,8462-8464,8466-8473,8475-8479,8481,8483-8501,8503-8523,8525,8527-8531,8533,8535-8536,8538-8550,8552-8554,8556-8557,8559-8579,8581-8587,8589,8591-8592,8594-8595,8597-8601,8603-8610,8612-8613,8615,8617,8619-8645,8647-8650,8652-8661,8663-8666,8668-8669,8671-8683,8685-8691,8693-8730,8732-8737,8739,8741-8767,8769,8771-8772,8774,8776-8797,8799-8812,8814-8819,8821,8823-8833,8835-8837,8839,8841,8843-8849,8852-8858,8860-8867,8869-8870,8872,8874-8877,8879,8881,8883-8888,8890,8892-8901,8903-8911,8913-8917,8920-8923,8925-8933,8935-8938,8940-8943,8945,8947-8948,8950,8952-8953,8955-8962,8964,8966,8968-8970,8972-8975,8977-8983,8985-8993,8995-9001,9003,9005,9007,9009,9011-9019,9021-9023,9025,9027-9028,9030-9044,9046-9047,9049-9050,9052-9056,9058-9059,9061,9063-9064,9066-9068,9071-9092,9094-9112,9114-9117,9119,9121-9160,9162-9166,9169-9207,9209-9211,9213-9215,9217,9219,9221-9253,9255,9257,9259-9260,9262,9264-9269,9271-9273,9275,9277-9278,9280,9282-9283,9285-9289,9291-9299,9301-9310,9312-9313,9315-9320,9322-9324,9326-9338,9340-9342,9344,9346-9348,9350-9358,9360-9362,9364-9366,9368-9374,9376-9382,9384,9386,9388-9390,9392-9396,9398-9402,9404-9410,9412,9414,9416-9417,9419-9425,9427,9429-9430,9432,9434-9463,9465-9502,9504-9506,9508-9521,9523-9526,9528,9530-9537,9539,9541-9551,9553,9555-9556,9558-9578,9580-9581,9583,9585,9587,9589,9591-9624,9626-9655,9657-9700,9702-9726,9728-9729,9731-9749,9751,9753-9754,9756-9832,9834-9836,9838-9839,9841-9846,9848-9850,9852-9858,9860-9863,9865,9867,9869-9871,9873-9893,9895,9897-9912,9914-9919,9921-9928,9930-9952,9954,9956,9958-9963,9965-9993,9995-9997,9999-10001,10003-10004,10006-10007,10009-10012,10014-10031,10033-10073,10075-10107,10109-10165,10167-10210,10222-10226,10228-10311,10313-10378,10380,10382,10384-10393,10395-10478,10480-10482,10484-10494,10496-10503,10505,10507,10509-10521,10523,10525-10528,10530-10540,10542-10543,10545-10568,10570-10584,10586-10590,10592-10594,10596,10598-10599,10601-10611,10613,10615,10617-10626,10628-10636,10638,10640-10654,10656-10658,10660,10662-10672,10674,10676-10682,10684,10686,10688-10690,10692-10694,10696-10697,10699-10701,10703,10705-10706,10708-10724,10726-10731,10734,10736-10748,10750-10796,10798-10939,10941,10943,10945,10947-10953,10955,10957-10961,10963,10965-10966,10968-11001,11003-11030,11032-11034,11036,11038,11040,11042-11053,11055-11059,11061-11062,11064-11068,11070-11073,11075-11077,11079-11083,11085,11087-11088,11090-11093,11095-11108,11110-11111,11113,11115-11116,11118-11120,11122,11124-11129,11131-11132,11134,11136,11138,11140-11151,11153-11161,11163-11185,11187-11189,11191-11229,11231,11233,11235-11264,11266-11267,11269-11278,11280-11282,11284-11291,11293-11295,11297,11299-11302,11304,11306,11309,11311,11313-11316,11318-11323,11325-11332,11334,11336-11344,11346,11348-11354,11356,11358-11360,11363-11386,11388-11389,11391-11392,11394,11396-11403,11405-11406,11408,11410,11412,11415,11417,11419-11420,11422,11424-11429,11431-11442,11444-11445,11447-11460,11462-11464,11466-11470,11472-11475,11477-11478,11480-11487,11489-11492,11494,11496,11498,11500-11502,11504-11506,11508,11510-11511,11513,11515,11517-11523,11525-11526,11528-11531,11533,11535-11538,11540-11546,11548-11560,11563-11572,11574,11576,11578,11580-11581,11583,11585,11587,11589-11592,11594-11595,11597,11599,11601,11603,11605-11607,11609-11611,11613,11615-11619,11621-11622,11624-11630,11632,11634-11635,11637,11639-11640,11642,11644-11655,11657-11659,11661-11675,11677-11679,11681-11684,11686,11688,11690-11691,11693-11706,11708-11709,11711-11714,11716-11718,11720-11728,11730,11732,11734-11739,11741-11757,11759-11760,11762-11766,11768,11770-11771,11773,11775,11777,11779-11780,11782,11784,11786,11788,11790,11792-11793,11795,11797,11799,11801,11803-11804,11806-11807,11809,11811-11814,11816-11820,11822,11824-11826,11828,11830,11832,11834,11836-11837,11839,11841,11843,11845-11847,11849-11852,11854-11856,11858-11860,11862-11863,11865,11867,11869-11870,11872,11874,11876-11879,11881-11891,11893,11895,11897-11899,11901,11903,11905-11906,11908-11917,11919,11921,11923-11925,11927-11931,11933-11954,11956-11962,11964-11969,11971-11973,11975-11976,11978,11980,11982,11984,11986-11991,11993,11995,11997-12000,12002,12004-12006,12008,12010-12011,12013,12015,12017-12018,12020-12021,12023,12025,12027-12028,12030,12032-12036,12038,12040-12042,12044-12045,12047,12049-12052,12054,12056-12063,12065-12073,12075-12086,12088-12092,12094-12095,12097,12099-12102,12104,12106-12107,12109-12182,12184-12201,12203-12210,12212-12231,12233-12239,12241-12248,12250-12328,12330-12363,12365-12384,12386-12397,12399-12401,12403-12434,12436-12455,12457,12459-12461,12463-12465,12467,12469-12477,12479-12518,12520-12527,12529-12532,12534-12595,12597-12601,12603-12655,12657-12670,12672-12683,12685-12686,12688-12707,12709-12730,12732-12750,12752-12755,12757,12759-12761,12763-12819,12821,12823,12825-12890,12892-12896,12898,12900-12913,12915-13060,13062-13142,13144,13146-13331,13333-13338,13340-13347,13349-13365,13367-13381,13383,13385,13387-13391,13393-13401,13403,13405-13416,13418-13431,13433-13434,13436,13438-13440,13442-13480,13482-13506,13509-13540,13545-13551,13553,13555-13564,13566-13570,13572,13574-13590,13601,13603-13701,13703-13709,13711-13713,13715,13717,13719-13723,13725,13727-13728,13730-13732,13734-13735,13737-13744,13746,13748-13772,13774-13775,13777-13781,13783-13797,13799,13801-13806,13808-13810,13812,13814-13835,13837-13840,13842,13844-13855,13857-13879,13881-13930
Modified: branches/Version-1_0-branch/addressbook/admin.php
===================================================================
--- branches/Version-1_0-branch/addressbook/admin.php 2015-09-16 00:23:53 UTC
(rev 13930)
+++ branches/Version-1_0-branch/addressbook/admin.php 2015-09-16 11:19:05 UTC
(rev 13931)
@@ -66,4 +66,3 @@
$t->pparse('out','admin');
$phpgw->common->phpgw_footer();
-?>
Modified: branches/Version-1_0-branch/addressbook/csv_import.php
===================================================================
--- branches/Version-1_0-branch/addressbook/csv_import.php 2015-09-16
00:23:53 UTC (rev 13930)
+++ branches/Version-1_0-branch/addressbook/csv_import.php 2015-09-16
11:19:05 UTC (rev 13931)
@@ -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/Version-1_0-branch/addressbook/inc/class.addressbook_importer.inc.php
===================================================================
---
branches/Version-1_0-branch/addressbook/inc/class.addressbook_importer.inc.php
2015-09-16 00:23:53 UTC (rev 13930)
+++
branches/Version-1_0-branch/addressbook/inc/class.addressbook_importer.inc.php
2015-09-16 11:19:05 UTC (rev 13931)
@@ -21,7 +21,7 @@
{
var $record;
- function addressbook_importer()
+ function __construct()
{
}
@@ -47,4 +47,3 @@
$this->record['notes'][$args][$element] = $value;
}
}
-?>
Modified: branches/Version-1_0-branch/addressbook/inc/class.boXport.inc.php
===================================================================
--- branches/Version-1_0-branch/addressbook/inc/class.boXport.inc.php
2015-09-16 00:23:53 UTC (rev 13930)
+++ branches/Version-1_0-branch/addressbook/inc/class.boXport.inc.php
2015-09-16 11:19:05 UTC (rev 13931)
@@ -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/Version-1_0-branch/addressbook/inc/class.boaddressbook.inc.php
===================================================================
--- branches/Version-1_0-branch/addressbook/inc/class.boaddressbook.inc.php
2015-09-16 00:23:53 UTC (rev 13930)
+++ branches/Version-1_0-branch/addressbook/inc/class.boaddressbook.inc.php
2015-09-16 11:19:05 UTC (rev 13931)
@@ -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/Version-1_0-branch/addressbook/inc/class.boaddressbook_prefs.inc.php
===================================================================
---
branches/Version-1_0-branch/addressbook/inc/class.boaddressbook_prefs.inc.php
2015-09-16 00:23:53 UTC (rev 13930)
+++
branches/Version-1_0-branch/addressbook/inc/class.boaddressbook_prefs.inc.php
2015-09-16 11:19:05 UTC (rev 13931)
@@ -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/Version-1_0-branch/addressbook/inc/class.bocatalog_contact_addr_type.inc.php
===================================================================
---
branches/Version-1_0-branch/addressbook/inc/class.bocatalog_contact_addr_type.inc.php
2015-09-16 00:23:53 UTC (rev 13930)
+++
branches/Version-1_0-branch/addressbook/inc/class.bocatalog_contact_addr_type.inc.php
2015-09-16 11:19:05 UTC (rev 13931)
@@ -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/Version-1_0-branch/addressbook/inc/class.bocatalog_contact_comm_descr.inc.php
===================================================================
---
branches/Version-1_0-branch/addressbook/inc/class.bocatalog_contact_comm_descr.inc.php
2015-09-16 00:23:53 UTC (rev 13930)
+++
branches/Version-1_0-branch/addressbook/inc/class.bocatalog_contact_comm_descr.inc.php
2015-09-16 11:19:05 UTC (rev 13931)
@@ -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/Version-1_0-branch/addressbook/inc/class.bocatalog_contact_comm_type.inc.php
===================================================================
---
branches/Version-1_0-branch/addressbook/inc/class.bocatalog_contact_comm_type.inc.php
2015-09-16 00:23:53 UTC (rev 13930)
+++
branches/Version-1_0-branch/addressbook/inc/class.bocatalog_contact_comm_type.inc.php
2015-09-16 11:19:05 UTC (rev 13931)
@@ -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/Version-1_0-branch/addressbook/inc/class.bocatalog_contact_note_type.inc.php
===================================================================
---
branches/Version-1_0-branch/addressbook/inc/class.bocatalog_contact_note_type.inc.php
2015-09-16 00:23:53 UTC (rev 13930)
+++
branches/Version-1_0-branch/addressbook/inc/class.bocatalog_contact_note_type.inc.php
2015-09-16 11:19:05 UTC (rev 13931)
@@ -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/Version-1_0-branch/addressbook/inc/class.ipc_addressbook.inc.php
===================================================================
--- branches/Version-1_0-branch/addressbook/inc/class.ipc_addressbook.inc.php
2015-09-16 00:23:53 UTC (rev 13930)
+++ branches/Version-1_0-branch/addressbook/inc/class.ipc_addressbook.inc.php
2015-09-16 11:19:05 UTC (rev 13931)
@@ -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/Version-1_0-branch/addressbook/inc/class.pdb.inc.php
===================================================================
--- branches/Version-1_0-branch/addressbook/inc/class.pdb.inc.php
2015-09-16 00:23:53 UTC (rev 13930)
+++ branches/Version-1_0-branch/addressbook/inc/class.pdb.inc.php
2015-09-16 11:19:05 UTC (rev 13931)
@@ -282,4 +282,3 @@
exit;
}
}
-?>
Modified: branches/Version-1_0-branch/addressbook/inc/class.remote.inc.php
===================================================================
--- branches/Version-1_0-branch/addressbook/inc/class.remote.inc.php
2015-09-16 00:23:53 UTC (rev 13930)
+++ branches/Version-1_0-branch/addressbook/inc/class.remote.inc.php
2015-09-16 11:19:05 UTC (rev 13931)
@@ -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/Version-1_0-branch/addressbook/inc/class.soaddressbook.inc.php
===================================================================
--- branches/Version-1_0-branch/addressbook/inc/class.soaddressbook.inc.php
2015-09-16 00:23:53 UTC (rev 13930)
+++ branches/Version-1_0-branch/addressbook/inc/class.soaddressbook.inc.php
2015-09-16 11:19:05 UTC (rev 13931)
@@ -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/Version-1_0-branch/addressbook/inc/class.socatalog_contact_addr_type.inc.php
===================================================================
---
branches/Version-1_0-branch/addressbook/inc/class.socatalog_contact_addr_type.inc.php
2015-09-16 00:23:53 UTC (rev 13930)
+++
branches/Version-1_0-branch/addressbook/inc/class.socatalog_contact_addr_type.inc.php
2015-09-16 11:19:05 UTC (rev 13931)
@@ -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/Version-1_0-branch/addressbook/inc/class.socatalog_contact_comm_descr.inc.php
===================================================================
---
branches/Version-1_0-branch/addressbook/inc/class.socatalog_contact_comm_descr.inc.php
2015-09-16 00:23:53 UTC (rev 13930)
+++
branches/Version-1_0-branch/addressbook/inc/class.socatalog_contact_comm_descr.inc.php
2015-09-16 11:19:05 UTC (rev 13931)
@@ -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/Version-1_0-branch/addressbook/inc/class.socatalog_contact_comm_type.inc.php
===================================================================
---
branches/Version-1_0-branch/addressbook/inc/class.socatalog_contact_comm_type.inc.php
2015-09-16 00:23:53 UTC (rev 13930)
+++
branches/Version-1_0-branch/addressbook/inc/class.socatalog_contact_comm_type.inc.php
2015-09-16 11:19:05 UTC (rev 13931)
@@ -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/Version-1_0-branch/addressbook/inc/class.socatalog_contact_note_type.inc.php
===================================================================
---
branches/Version-1_0-branch/addressbook/inc/class.socatalog_contact_note_type.inc.php
2015-09-16 00:23:53 UTC (rev 13930)
+++
branches/Version-1_0-branch/addressbook/inc/class.socatalog_contact_note_type.inc.php
2015-09-16 11:19:05 UTC (rev 13931)
@@ -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/Version-1_0-branch/addressbook/inc/class.uiXport.inc.php
===================================================================
--- branches/Version-1_0-branch/addressbook/inc/class.uiXport.inc.php
2015-09-16 00:23:53 UTC (rev 13930)
+++ branches/Version-1_0-branch/addressbook/inc/class.uiXport.inc.php
2015-09-16 11:19:05 UTC (rev 13931)
@@ -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/Version-1_0-branch/addressbook/inc/class.uiaddressbook.inc.php
===================================================================
--- branches/Version-1_0-branch/addressbook/inc/class.uiaddressbook.inc.php
2015-09-16 00:23:53 UTC (rev 13930)
+++ branches/Version-1_0-branch/addressbook/inc/class.uiaddressbook.inc.php
2015-09-16 11:19:05 UTC (rev 13931)
@@ -3550,5 +3550,4 @@
'nonavbar' => $this->nonavbar
));
}
-}
-?>
+}
\ No newline at end of file
Modified:
branches/Version-1_0-branch/addressbook/inc/class.uiaddressbook_prefs.inc.php
===================================================================
---
branches/Version-1_0-branch/addressbook/inc/class.uiaddressbook_prefs.inc.php
2015-09-16 00:23:53 UTC (rev 13930)
+++
branches/Version-1_0-branch/addressbook/inc/class.uiaddressbook_prefs.inc.php
2015-09-16 11:19:05 UTC (rev 13931)
@@ -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/Version-1_0-branch/addressbook/inc/class.uicategorize_contacts.inc.php
===================================================================
---
branches/Version-1_0-branch/addressbook/inc/class.uicategorize_contacts.inc.php
2015-09-16 00:23:53 UTC (rev 13930)
+++
branches/Version-1_0-branch/addressbook/inc/class.uicategorize_contacts.inc.php
2015-09-16 11:19:05 UTC (rev 13931)
@@ -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/Version-1_0-branch/addressbook/inc/class.uifields.inc.php
===================================================================
--- branches/Version-1_0-branch/addressbook/inc/class.uifields.inc.php
2015-09-16 00:23:53 UTC (rev 13930)
+++ branches/Version-1_0-branch/addressbook/inc/class.uifields.inc.php
2015-09-16 11:19:05 UTC (rev 13931)
@@ -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/Version-1_0-branch/addressbook/inc/class.uivcard.inc.php
===================================================================
--- branches/Version-1_0-branch/addressbook/inc/class.uivcard.inc.php
2015-09-16 00:23:53 UTC (rev 13930)
+++ branches/Version-1_0-branch/addressbook/inc/class.uivcard.inc.php
2015-09-16 11:19:05 UTC (rev 13931)
@@ -32,7 +32,7 @@
'address3' => 'address3'
);
- function uivcard()
+ function __construct()
{
$this->template = $GLOBALS['phpgw']->template;
$this->contacts = CreateObject('phpgwapi.contacts');
Modified: branches/Version-1_0-branch/addressbook/inc/class.widget_lists.inc.php
===================================================================
--- branches/Version-1_0-branch/addressbook/inc/class.widget_lists.inc.php
2015-09-16 00:23:53 UTC (rev 13930)
+++ branches/Version-1_0-branch/addressbook/inc/class.widget_lists.inc.php
2015-09-16 11:19:05 UTC (rev 13931)
@@ -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/Version-1_0-branch/addressbook/inc/export/Multiple_VCard
===================================================================
--- branches/Version-1_0-branch/addressbook/inc/export/Multiple_VCard
2015-09-16 00:23:53 UTC (rev 13930)
+++ branches/Version-1_0-branch/addressbook/inc/export/Multiple_VCard
2015-09-16 11:19:05 UTC (rev 13931)
@@ -182,4 +182,3 @@
return $buffer;
}
}
-?>
Modified: branches/Version-1_0-branch/addressbook/inc/export/Netscape_LDIF
===================================================================
--- branches/Version-1_0-branch/addressbook/inc/export/Netscape_LDIF
2015-09-16 00:23:53 UTC (rev 13930)
+++ branches/Version-1_0-branch/addressbook/inc/export/Netscape_LDIF
2015-09-16 11:19:05 UTC (rev 13931)
@@ -202,4 +202,3 @@
return $buffer;
}
}
-?>
Modified: branches/Version-1_0-branch/addressbook/inc/export/OpenOffice_-_calc
===================================================================
--- branches/Version-1_0-branch/addressbook/inc/export/OpenOffice_-_calc
2015-09-16 00:23:53 UTC (rev 13930)
+++ branches/Version-1_0-branch/addressbook/inc/export/OpenOffice_-_calc
2015-09-16 11:19:05 UTC (rev 13931)
@@ -496,4 +496,3 @@
}
-?>
Modified: branches/Version-1_0-branch/addressbook/inc/export/OpenOffice_-_writer
===================================================================
--- branches/Version-1_0-branch/addressbook/inc/export/OpenOffice_-_writer
2015-09-16 00:23:53 UTC (rev 13930)
+++ branches/Version-1_0-branch/addressbook/inc/export/OpenOffice_-_writer
2015-09-16 11:19:05 UTC (rev 13931)
@@ -471,4 +471,3 @@
}
-?>
Modified:
branches/Version-1_0-branch/addressbook/inc/export/Outlook_CSV_-_Deutsch
===================================================================
--- branches/Version-1_0-branch/addressbook/inc/export/Outlook_CSV_-_Deutsch
2015-09-16 00:23:53 UTC (rev 13930)
+++ branches/Version-1_0-branch/addressbook/inc/export/Outlook_CSV_-_Deutsch
2015-09-16 11:19:05 UTC (rev 13931)
@@ -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/Version-1_0-branch/addressbook/inc/export/Outlook_CSV_-_Dutch
===================================================================
--- branches/Version-1_0-branch/addressbook/inc/export/Outlook_CSV_-_Dutch
2015-09-16 00:23:53 UTC (rev 13930)
+++ branches/Version-1_0-branch/addressbook/inc/export/Outlook_CSV_-_Dutch
2015-09-16 11:19:05 UTC (rev 13931)
@@ -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/Version-1_0-branch/addressbook/inc/export/Outlook_CSV_-_English
===================================================================
--- branches/Version-1_0-branch/addressbook/inc/export/Outlook_CSV_-_English
2015-09-16 00:23:53 UTC (rev 13930)
+++ branches/Version-1_0-branch/addressbook/inc/export/Outlook_CSV_-_English
2015-09-16 11:19:05 UTC (rev 13931)
@@ -211,4 +211,3 @@
return $buffer;
}
}
-?>
Modified:
branches/Version-1_0-branch/addressbook/inc/export/Outlook_CSV_-_Espa?\195?\177ol
===================================================================
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [13931] Merge 13880:13930 from trunk,
Sigurd Nes <=