From b0ee59fe2b830806015bb4a030a5106d29cb3993 Mon Sep 17 00:00:00 2001 From: Michael M Slusarz Date: Wed, 1 Sep 2010 10:38:23 -0600 Subject: [PATCH] Ticket #9161: Horde#applicationUrl() -> Horde#url() --- agora/ban.php | 8 +- agora/config/prefs.php.dist | 2 +- agora/deleteforum.php | 6 +- agora/editforum.php | 8 +- agora/forums.php | 2 +- agora/lib/Agora.php | 16 ++-- agora/lib/Block/forums.php | 2 +- agora/lib/Block/threads.php | 2 +- agora/lib/Comments.php | 2 +- agora/lib/Messages.php | 46 +++++----- agora/messages/abuse.php | 8 +- agora/messages/delete.php | 12 +-- agora/messages/edit.php | 6 +- agora/messages/index.php | 18 ++-- agora/messages/lock.php | 8 +- agora/messages/merge.php | 8 +- agora/messages/move.php | 8 +- agora/messages/split.php | 8 +- agora/moderate.php | 2 +- agora/moderators.php | 10 +-- agora/owner.php | 2 +- agora/rss/index.php | 4 +- agora/rss/messages.php | 4 +- agora/rss/threads.php | 4 +- agora/search.php | 2 +- agora/templates/common-header.inc | 2 +- agora/threads.php | 8 +- ansel/browse.php | 6 +- ansel/disclamer.php | 4 +- ansel/faces/claim.php | 4 +- ansel/faces/custom.php | 6 +- ansel/faces/face.php | 2 +- ansel/faces/gallery.php | 2 +- ansel/faces/image.php | 2 +- ansel/faces/report.php | 4 +- ansel/faces/savecustom.php | 2 +- ansel/faces/search/image.php | 10 +-- ansel/faces/search/image_define.php | 2 +- ansel/faces/search/image_save.php | 18 ++-- ansel/faces/search/image_search.php | 4 +- ansel/faces/search/tabs.php | 10 +-- ansel/gallery.php | 36 ++++---- ansel/image.php | 10 +-- ansel/lib/Ajax/Imple/EditFaces.php | 2 +- ansel/lib/Ajax/Imple/EditGalleryFaces.php | 4 +- ansel/lib/Ajax/Imple/ImageSaveGeotag.php | 4 +- ansel/lib/Ansel.php | 40 ++++----- ansel/lib/Api.php | 2 +- ansel/lib/Block/my_galleries.php | 2 +- ansel/lib/Block/recent_comments.php | 2 +- ansel/lib/Block/recently_added.php | 2 +- ansel/lib/Faces.php | 6 +- ansel/lib/Faces/Base.php | 2 +- ansel/lib/Search/Tag.php | 2 +- ansel/lib/Tile/Gallery.php | 2 +- ansel/lib/Tile/Image.php | 2 +- ansel/lib/View/EmbeddedRenderer/Mini.php | 2 +- ansel/lib/View/Gallery.php | 4 +- ansel/lib/View/GalleryRenderer/GalleryLightbox.php | 2 +- ansel/lib/View/Image.php | 14 ++-- ansel/lib/View/List.php | 2 +- ansel/lib/View/Results.php | 4 +- ansel/lib/Widget/Actions.php | 18 ++-- ansel/lib/Widget/GalleryFaces.php | 2 +- ansel/lib/Widget/Geotag.php | 6 +- ansel/lib/Widget/ImageFaces.php | 4 +- ansel/lib/Widget/OwnerFaces.php | 2 +- ansel/lib/Widget/Tags.php | 2 +- ansel/protect.php | 4 +- ansel/report.php | 2 +- ansel/rss.php | 4 +- ansel/templates/faces/define.inc | 4 +- ansel/templates/faces/face.inc | 4 +- ansel/templates/faces/gallery.inc | 6 +- ansel/templates/faces/image.inc | 2 +- ansel/templates/faces/search.inc | 4 +- ansel/templates/gallery/gallery.inc | 2 +- ansel/templates/image/edit_image.inc | 2 +- ansel/templates/image/preview_cropimage.inc | 2 +- ansel/templates/image/preview_image.inc | 2 +- ansel/templates/image/resize_image.inc | 2 +- ansel/templates/image/upload.inc | 2 +- ansel/templates/list/header.inc | 2 +- ansel/templates/tile/face.inc | 6 +- ansel/templates/tile/image.inc | 2 +- ansel/templates/view/gallery.inc | 4 +- ansel/templates/view/gallerylightbox.inc | 4 +- ansel/templates/view/list.inc | 2 +- ansel/templates/view/results.inc | 2 +- ansel/templates/view/slideshow.inc | 2 +- ansel/templates/xppublish/javascript.inc | 4 +- ansel/templates/xppublish/list.inc | 2 +- ansel/xppublish.php | 8 +- babel/edit.php | 2 +- babel/lib/Babel.php | 12 +-- babel/stats.php | 2 +- babel/templates/index.php | 16 ++-- babel/upload.php | 2 +- babel/view.php | 20 ++--- beatnik/autogenerate.php | 6 +- beatnik/commit.php | 4 +- beatnik/delete.php | 10 +-- beatnik/editrec.php | 6 +- beatnik/lib/Beatnik.php | 8 +- beatnik/lib/Driver.php | 2 +- beatnik/listzones.php | 8 +- beatnik/templates/menu.inc | 2 +- beatnik/templates/view/header.inc | 2 +- beatnik/viewzone.php | 6 +- chora/annotate.php | 2 +- chora/lib/Chora.php | 2 +- crumb/addclient.php | 2 +- crumb/contactsearch.php | 2 +- crumb/lib/Crumb.php | 4 +- drag_n_drop_portal/lib/Block/Layout/View/js.php | 8 +- fima/account.php | 24 +++--- fima/accounts.php | 6 +- fima/ledgers/create.php | 4 +- fima/ledgers/delete.php | 10 +-- fima/ledgers/edit.php | 8 +- fima/ledgers/index.php | 4 +- fima/lib/Block/summary.php | 2 +- fima/lib/Block/tree_menu.php | 8 +- fima/lib/Fima.php | 14 ++-- fima/postings.php | 24 +++--- fima/report.php | 2 +- fima/templates/accounts/accounts.inc | 8 +- fima/templates/data/export.inc | 2 +- fima/templates/postings/header.inc | 4 +- fima/templates/postings/navbar.inc | 2 +- fima/templates/search/search.inc | 2 +- folks/account/tabs.php | 8 +- folks/config/hooks.php.dist | 2 +- folks/edit/activity.php | 6 +- folks/edit/edit.php | 2 +- folks/edit/facebook.php | 4 +- folks/edit/friends/add.php | 10 +-- folks/edit/friends/approve.php | 6 +- folks/edit/friends/blacklist.php | 8 +- folks/edit/friends/for.php | 6 +- folks/edit/friends/friends.php | 4 +- folks/edit/friends/from.php | 2 +- folks/edit/friends/groups.php | 16 ++-- folks/edit/friends/index.php | 4 +- folks/edit/friends/invite.php | 2 +- folks/edit/friends/know.php | 4 +- folks/edit/friends/of.php | 2 +- folks/edit/friends/reject.php | 6 +- folks/edit/privacy.php | 2 +- folks/edit/tabs.php | 18 ++-- folks/friends.php | 2 +- folks/lib/Block/friends.php | 2 +- folks/lib/Block/know.php | 4 +- folks/lib/Block/new.php | 2 +- folks/lib/Block/random.php | 2 +- folks/lib/Block/recent.php | 2 +- folks/lib/Folks.php | 20 ++--- folks/rss/activity.php | 2 +- folks/rss/friends.php | 2 +- folks/rss/know.php | 2 +- folks/rss/online.php | 2 +- folks/save_search.php | 4 +- folks/scripts/mail-filter.php | 2 +- folks/search.php | 2 +- folks/templates/edit/header.php | 18 ++-- folks/templates/friends/friends.php | 10 +-- folks/templates/list/search.php | 6 +- folks/templates/user/actions.php | 6 +- folks/templates/user/user.php | 4 +- folks/user.php | 2 +- framework/Core/lib/Horde.php | 98 ++++++++-------------- framework/Core/lib/Horde/Core/Perms/Ui.php | 6 +- framework/Core/lib/Horde/Core/Prefs/Ui.php | 2 +- framework/Core/package.xml | 2 +- .../lib/Horde/Kolab/FreeBusy/Imap.php | 2 +- .../Rampage/scripts/Horde/Rampage/rampage.php | 4 +- gollem/clipboard.php | 2 +- gollem/lib/Api.php | 4 +- gollem/lib/Application.php | 2 +- gollem/lib/Gollem.php | 10 +-- gollem/lib/Mime/Viewer/Images.php | 2 +- gollem/manager.php | 8 +- gollem/permissions.php | 2 +- gollem/selectlist.php | 4 +- gollem/templates/edit/edit.inc | 2 +- gollem/view.php | 2 +- hermes/deliverables.php | 6 +- hermes/entry.php | 4 +- hermes/invoicing.php | 10 +-- hermes/lib/Api.php | 2 +- hermes/lib/Application.php | 8 +- hermes/lib/Forms/Time.php | 2 +- hermes/lib/Hermes.php | 12 +-- hermes/search.php | 2 +- hermes/templates/deliverables/list.inc | 2 +- hermes/time.php | 4 +- horde/admin/groups.php | 6 +- horde/admin/perms/addchild.php | 4 +- horde/admin/perms/delete.php | 6 +- horde/admin/perms/edit.php | 4 +- horde/admin/setup/config.php | 6 +- horde/admin/setup/diff.php | 2 +- horde/admin/setup/index.php | 12 +-- horde/admin/setup/scripts.php | 4 +- horde/config/hooks.php.dist | 2 +- horde/index.php | 8 +- horde/login.php | 2 +- horde/scripts/http_login_refer.php | 2 +- horde/services/changepassword.php | 2 +- horde/services/language.php | 2 +- horde/services/portal/index.php | 8 +- horde/templates/admin/user/list.inc | 6 +- horde/templates/block/cloud.inc | 2 +- horde/templates/data/datemap.inc | 2 +- horde/templates/menu/menu.inc | 2 +- horde/templates/portal/block.inc | 2 +- hylax/folder.php | 12 +-- hylax/lib/Hylax.php | 8 +- hylax/print.php | 2 +- hylax/send.php | 6 +- hylax/view.php | 2 +- imp/compose-mimp.php | 2 +- imp/compose.php | 8 +- imp/config/prefs.php.dist | 2 +- imp/contacts.php | 2 +- imp/folders-mimp.php | 4 +- imp/folders.php | 4 +- imp/lib/Application.php | 4 +- imp/lib/Auth.php | 4 +- imp/lib/Compose.php | 2 +- imp/lib/Contents.php | 6 +- imp/lib/Crypt/Pgp.php | 4 +- imp/lib/Crypt/Smime.php | 4 +- imp/lib/IMP.php | 16 ++-- imp/lib/Imap/Tree.php | 4 +- imp/lib/Prefs/Ui.php | 8 +- imp/lib/Search.php | 4 +- imp/lib/Ui/Block.php | 8 +- imp/lib/Ui/Compose.php | 4 +- imp/lib/Ui/Mimp.php | 4 +- imp/mailbox.php | 14 ++-- imp/message.php | 4 +- imp/rss.php | 6 +- imp/saveimage.php | 2 +- imp/search-basic.php | 6 +- imp/search.php | 6 +- imp/templates/common-header.inc | 4 +- imp/templates/dimp/javascript_defs_dimp.php | 16 ++-- ingo/blacklist.php | 2 +- ingo/filters.php | 22 ++--- ingo/forward.php | 4 +- ingo/lib/Block/overview.php | 10 +-- ingo/lib/Ingo.php | 10 +-- ingo/rule.php | 18 ++-- ingo/script.php | 2 +- ingo/spam.php | 4 +- ingo/templates/blacklist/blacklist.inc | 4 +- ingo/templates/filters/header.inc | 2 +- ingo/templates/rule/footer.inc | 2 +- ingo/templates/rule/header.inc | 2 +- ingo/templates/script/activate.inc | 8 +- ingo/templates/whitelist/whitelist.inc | 4 +- ingo/vacation.php | 4 +- ingo/whitelist.php | 2 +- jeta/lib/Jeta.php | 2 +- jonah/channels/aggregate.php | 8 +- jonah/channels/delete.php | 6 +- jonah/channels/edit.php | 2 +- jonah/channels/index.php | 12 +-- jonah/delivery/html.php | 2 +- jonah/delivery/rss.php | 4 +- jonah/lib/Application.php | 2 +- jonah/lib/Block/cloud.php | 2 +- jonah/lib/Block/delivery.php | 4 +- jonah/lib/Driver.php | 6 +- jonah/lib/Forms/Feed.php | 4 +- jonah/lib/Jonah.php | 6 +- jonah/lib/News.php | 4 +- jonah/stories/delete.php | 8 +- jonah/stories/edit.php | 4 +- jonah/stories/index.php | 10 +-- jonah/stories/results.php | 10 +-- jonah/stories/share.php | 4 +- jonah/stories/view.php | 4 +- jonah/templates/common-header.inc | 2 +- kastalia/lib/Block/tree_menu.php | 2 +- kastalia/lib/Kastalia.php | 2 +- koward/lib/Koward/Controller/Application.php | 2 +- kronolith/add.php | 4 +- kronolith/attendees.php | 4 +- kronolith/calendars/create.php | 6 +- kronolith/calendars/delete.php | 12 +-- kronolith/calendars/edit.php | 10 +-- kronolith/calendars/index.php | 16 ++-- kronolith/calendars/remote_edit.php | 8 +- kronolith/calendars/remote_subscribe.php | 6 +- kronolith/calendars/remote_unsubscribe.php | 8 +- kronolith/config/prefs.php.dist | 2 +- kronolith/contacts.php | 2 +- kronolith/data.php | 2 +- kronolith/day.php | 2 +- kronolith/delete.php | 6 +- kronolith/edit.php | 4 +- kronolith/event.php | 8 +- kronolith/feed/index.php | 4 +- kronolith/lib/Application.php | 14 ++-- kronolith/lib/Block/month.php | 2 +- kronolith/lib/Block/summary.php | 2 +- kronolith/lib/Event.php | 10 +-- kronolith/lib/FreeBusy.php | 2 +- kronolith/lib/Kronolith.php | 32 +++---- kronolith/lib/View/Day.php | 6 +- kronolith/lib/View/EditEvent.php | 2 +- kronolith/lib/View/Month.php | 8 +- kronolith/lib/View/Week.php | 2 +- kronolith/lib/View/Year.php | 6 +- kronolith/month.php | 2 +- kronolith/new.php | 6 +- kronolith/perms.php | 2 +- kronolith/resources/create.php | 6 +- kronolith/resources/delete.php | 10 +-- kronolith/resources/edit.php | 10 +-- kronolith/resources/groups/create.php | 4 +- kronolith/resources/groups/delete.php | 8 +- kronolith/resources/groups/edit.php | 8 +- kronolith/resources/groups/index.php | 10 +-- kronolith/resources/index.php | 12 +-- kronolith/search.php | 2 +- kronolith/templates/attendees/attendees.inc | 2 +- kronolith/templates/chunks/calendar.php | 2 +- kronolith/templates/contacts/contacts.inc | 2 +- kronolith/templates/delete/delete.inc | 2 +- kronolith/templates/delete/one.inc | 2 +- kronolith/templates/edit/edit.inc | 2 +- kronolith/templates/javascript_defs.php | 4 +- kronolith/templates/panel.inc | 4 +- kronolith/templates/search/search.inc | 2 +- kronolith/templates/search/search_advanced.inc | 2 +- kronolith/templates/week/head.inc | 2 +- kronolith/view.php | 2 +- kronolith/week.php | 2 +- kronolith/workweek.php | 2 +- kronolith/year.php | 2 +- luxor/lib/Lang/Generic.php | 2 +- luxor/lib/Luxor.php | 4 +- luxor/search.php | 6 +- luxor/templates/menu.inc | 2 +- mnemo/lib/Application.php | 4 +- mnemo/lib/Block/summary.php | 8 +- mnemo/lib/Mnemo.php | 10 +-- mnemo/memo.php | 16 ++-- mnemo/note/pdf.php | 10 +-- mnemo/notepads/create.php | 4 +- mnemo/notepads/delete.php | 10 +-- mnemo/notepads/edit.php | 8 +- mnemo/notepads/index.php | 4 +- mnemo/notes/index.php | 2 +- mnemo/templates/common-header.inc | 2 +- mnemo/templates/data/export.inc | 2 +- mnemo/templates/data/import.inc | 2 +- mnemo/templates/list/header.inc | 4 +- mnemo/templates/list/memo_headers.inc | 6 +- mnemo/templates/list/memo_summaries.inc | 4 +- mnemo/templates/memo/memo.inc | 2 +- mnemo/templates/panel.inc | 2 +- mnemo/templates/search/search.inc | 2 +- mnemo/templates/view/memo.inc | 6 +- mnemo/view.php | 10 +-- nag/lib/Api.php | 6 +- nag/lib/Application.php | 6 +- nag/lib/Block/summary.php | 12 +-- nag/lib/Nag.php | 10 +-- nag/lib/Task.php | 4 +- nag/list.php | 2 +- nag/quick.php | 2 +- nag/task.php | 20 ++--- nag/tasklists/create.php | 4 +- nag/tasklists/delete.php | 10 +-- nag/tasklists/edit.php | 8 +- nag/tasklists/index.php | 6 +- nag/templates/common-header.inc | 2 +- nag/templates/list/header.inc | 4 +- nag/templates/list/task_headers.inc | 18 ++-- nag/templates/panel.inc | 4 +- nag/templates/view/task.inc | 4 +- nag/view.php | 14 ++-- news/add.php | 10 +-- news/admin/categories/delete.php | 2 +- news/admin/categories/edit.php | 2 +- news/admin/categories/index.php | 4 +- news/admin/sources/delete.php | 2 +- news/admin/sources/edit.php | 2 +- news/admin/sources/index.php | 6 +- news/admin/tabs.php | 4 +- news/browse.php | 2 +- news/content.php | 6 +- news/delete.php | 4 +- news/delete_file.php | 2 +- news/edit.php | 8 +- news/lib/Block/category.php | 4 +- news/lib/Block/jonah.php | 2 +- news/lib/Block/last.php | 4 +- news/lib/Block/sources.php | 2 +- news/lib/Categories.php | 2 +- news/lib/Driver/sql.php | 2 +- news/lib/News.php | 32 +++---- news/lib/View.php | 2 +- news/mail.php | 2 +- news/news.php | 4 +- news/note.php | 2 +- news/pdf.php | 2 +- news/reads.php | 2 +- news/rss/comments.php | 2 +- news/rss/index.php | 8 +- news/rss/news.php | 2 +- news/search.php | 2 +- news/templates/common-header.inc | 4 +- news/templates/edit/info.php | 6 +- news/templates/edit/row.php | 2 +- news/templates/menu.inc | 2 +- news/templates/news/blog.php | 2 +- news/templates/news/mail.php | 2 +- news/templates/news/tools.php | 4 +- operator/export.php | 2 +- operator/lib/Operator.php | 6 +- operator/search.php | 2 +- operator/viewgraph.php | 4 +- pastie/lib/Pastie.php | 2 +- pastie/paste.php | 4 +- pastie/templates/recent.inc | 2 +- pastie/view.php | 2 +- shout/dialplan.php | 2 +- shout/index.php | 4 +- shout/lib/Shout.php | 16 ++-- shout/templates/admin/accounts/edit.inc | 4 +- shout/templates/admin/accounts/list.inc | 2 +- shout/templates/admin/numbers/list.inc.php | 2 +- shout/templates/conferences/edit.inc | 2 +- shout/templates/conferences/list.inc | 4 +- shout/templates/devices/delete.inc | 2 +- shout/templates/devices/edit.inc | 2 +- shout/templates/devices/list.inc | 4 +- shout/templates/dialplan/add.inc | 2 +- shout/templates/dialplan/edit.inc | 2 +- shout/templates/extensions.inc.php | 4 +- shout/templates/recordings/add.inc | 2 +- shout/templates/recordings/list.inc | 2 +- shout/wizard.php | 2 +- skeleton/lib/Skeleton.php | 2 +- skoli/add.php | 4 +- skoli/classes/create.php | 6 +- skoli/classes/delete.php | 8 +- skoli/classes/edit.php | 8 +- skoli/classes/index.php | 6 +- skoli/data.php | 2 +- skoli/entry.php | 12 +-- skoli/lib/Block/tree_menu.php | 4 +- skoli/lib/Skoli.php | 10 +-- skoli/list.php | 2 +- skoli/templates/common-header.inc | 2 +- skoli/templates/data/export.inc | 2 +- skoli/templates/list/classes.inc | 6 +- skoli/templates/list/header.inc | 2 +- skoli/templates/list/headers.inc | 20 ++--- skoli/templates/list/students.inc | 4 +- skoli/templates/panel.inc | 2 +- skoli/templates/search/entries.inc | 4 +- skoli/templates/search/header.inc | 2 +- skoli/templates/search/headers.inc | 8 +- trean/add.php | 8 +- trean/bookmark.php | 2 +- trean/browse.php | 2 +- trean/data.php | 2 +- trean/edit.php | 20 ++--- trean/lib/Api.php | 6 +- trean/lib/Application.php | 6 +- trean/lib/Trean.php | 10 +-- trean/lib/Views/BookmarkList.php | 4 +- trean/templates/add.html.php | 2 +- trean/templates/block/1line.inc | 2 +- trean/templates/block/2line.inc | 2 +- trean/templates/block/standard.inc | 2 +- trean/templates/browse.php | 8 +- trean/templates/common-header.inc | 2 +- trean/templates/star_rating_helper.php | 2 +- turba/add.php | 6 +- turba/addressbooks/create.php | 4 +- turba/addressbooks/delete.php | 10 +-- turba/addressbooks/edit.php | 8 +- turba/addressbooks/index.php | 6 +- turba/contact.php | 6 +- turba/delete.php | 4 +- turba/deletefile.php | 6 +- turba/edit.php | 4 +- turba/lib/Application.php | 6 +- turba/lib/Driver.php | 2 +- turba/lib/Form/EditContactGroup.php | 2 +- turba/lib/Object.php | 6 +- turba/lib/Object/Group.php | 2 +- turba/lib/Turba.php | 10 +-- turba/lib/View/Browse.php | 2 +- turba/lib/View/DeleteContact.php | 2 +- turba/lib/View/Duplicates.php | 6 +- turba/lib/View/EditContact.php | 2 +- turba/lib/View/List.php | 4 +- turba/minisearch.php | 2 +- turba/search.php | 8 +- turba/templates/addressbook_list.php | 2 +- turba/templates/block/minisearch.inc | 2 +- turba/templates/browse/actions.inc | 6 +- turba/templates/browse/column_headers.inc | 2 +- turba/templates/browse/header.inc | 4 +- turba/templates/browse/row.inc | 8 +- turba/templates/data/export.inc | 2 +- turba/templates/data/import.inc | 2 +- turba/templates/list/alphaPager.inc | 4 +- turba/templates/menu.inc | 2 +- turba/templates/search/header.html.php | 2 +- turba/vcard.php | 6 +- vilma/domains/delete.php | 4 +- vilma/domains/edit.php | 2 +- vilma/domains/index.php | 6 +- vilma/lib/Vilma.php | 12 +-- vilma/users/delete.php | 8 +- vilma/users/edit.php | 4 +- vilma/users/editAlias.php | 2 +- vilma/users/index.php | 26 +++--- vilma/virtuals/delete.php | 4 +- vilma/virtuals/edit.php | 2 +- vilma/virtuals/index.php | 10 +-- whups/admin/index.php | 6 +- whups/data.php | 2 +- whups/lib/Application.php | 4 +- whups/lib/Forms/Admin/Queue.php | 6 +- whups/lib/Forms/Admin/Type.php | 12 +-- whups/lib/Mime/Viewer/Zip.php | 2 +- whups/lib/Query.php | 4 +- whups/lib/Renderer/Comment.php | 4 +- whups/lib/Whups.php | 40 ++++----- whups/mybugs.php | 8 +- whups/opensearch.php | 2 +- whups/query/index.php | 4 +- whups/query/run.php | 6 +- whups/queue/index.php | 2 +- whups/queue/rss.php | 4 +- whups/search.php | 4 +- whups/search/rss.php | 2 +- whups/templates/common-header.inc | 2 +- whups/templates/menu.inc | 2 +- whups/templates/view/results.inc | 2 +- whups/ticket/create.php | 2 +- whups/ticket/delete.php | 4 +- whups/ticket/delete_attachment.php | 4 +- whups/ticket/delete_history.php | 4 +- whups/ticket/queue.php | 2 +- whups/ticket/type.php | 2 +- whups/ticket/update.php | 2 +- wicked/diff.php | 2 +- wicked/display.php | 2 +- wicked/lib/Page.php | 2 +- wicked/lib/Page/RecentChanges.php | 2 +- wicked/lib/Text_Wiki/Render/Xhtml/Image2.php | 2 +- wicked/lib/Wicked.php | 2 +- wicked/opensearch.php | 2 +- wicked/templates/common-header.inc | 2 +- wicked/templates/display/title.inc | 2 +- 566 files changed, 1520 insertions(+), 1554 deletions(-) diff --git a/agora/ban.php b/agora/ban.php index eba6e7186..006a55f0a 100644 --- a/agora/ban.php +++ b/agora/ban.php @@ -16,13 +16,13 @@ list($forum_id, , $scope) = Agora::getAgoraId(); $forums = &Agora_Messages::singleton($scope, $forum_id); if ($forums instanceof PEAR_Error) { $notification->push($forums->message, 'horde.error'); - Horde::applicationUrl('forums.php', true)->redirect(); + Horde::url('forums.php', true)->redirect(); } /* Check permissions */ if (!$forums->hasPermission(Horde_Perms::DELETE)) { $notification->push(sprintf(_("You don't have permissions to ban users from forum %s."), $forum_id), 'horde.warning'); - Horde::applicationUrl('forums.php', true)->redirect(); + Horde::url('forums.php', true)->redirect(); } /* Ban action */ @@ -33,13 +33,13 @@ if (($action = Horde_Util::getFormData('action')) !== null) { $notification->push($result->getMessage(), 'horde.error'); } - $url = Agora::setAgoraId($forum_id, null, Horde::applicationUrl('ban.php'), $scope); + $url = Agora::setAgoraId($forum_id, null, Horde::url('ban.php'), $scope); header('Location: ' . $url); exit; } /* Get the list of banned users. */ -$delete = Horde_Util::addParameter(Horde::applicationUrl('ban.php'), +$delete = Horde_Util::addParameter(Horde::url('ban.php'), array('action' => 'delete', 'scope' => $scope, 'forum_id' => $forum_id)); diff --git a/agora/config/prefs.php.dist b/agora/config/prefs.php.dist index efe4109f6..28a2c54b1 100644 --- a/agora/config/prefs.php.dist +++ b/agora/config/prefs.php.dist @@ -75,7 +75,7 @@ if ($GLOBALS['conf']['avatar']['allow_avatars'] && $_prefs['avatar_link'] = array( 'type' => 'rawhtml', - 'url' => '

' . _("Choose from a gallery of avatars:") . '

' + 'url' => '

' . _("Choose from a gallery of avatars:") . '

' ); /* Forums */ diff --git a/agora/deleteforum.php b/agora/deleteforum.php index d4b5ada0e..81bacb9ed 100644 --- a/agora/deleteforum.php +++ b/agora/deleteforum.php @@ -21,7 +21,7 @@ $forums = &Agora_Messages::singleton($scope); /* Check permissions */ if (!$forums->hasPermission(Horde_Perms::DELETE)) { $notification->push(sprintf(_("You don't have permissions to delete forums in %s"), $registry->get('name', $scope)), 'horde.warning'); - Horde::applicationUrl('forums.php', true)->redirect(); + Horde::url('forums.php', true)->redirect(); } /* Get forum. */ @@ -29,7 +29,7 @@ list($forum_id) = Agora::getAgoraId(); $forum = $forums->getForum($forum_id); if ($forum instanceof PEAR_Error) { $notification->push($forum->message, 'horde.error'); - Horde::applicationUrl('forums.php', true)->redirect(); + Horde::url('forums.php', true)->redirect(); } /* Prepare forum. */ @@ -64,7 +64,7 @@ if ($form->validate()) { } else { $notification->push(_("Forum not deleted."), 'horde.message'); } - Horde::applicationUrl('forums.php', true)->redirect(); + Horde::url('forums.php', true)->redirect(); } /* Set up template variables. */ diff --git a/agora/editforum.php b/agora/editforum.php index 13de19684..acc012a86 100644 --- a/agora/editforum.php +++ b/agora/editforum.php @@ -25,11 +25,11 @@ $vars->set('forum_id', $forum_id); /* Check permissions */ if ($forum_id && !$registry->isAdmin(array('permission' => 'agora:admin'))) { $notification->push(sprintf(_("You don't have permissions to edit forum %s"), $registry->get('name', $scope)), 'horde.warning'); - Horde::applicationUrl('forums.php', true)->redirect(); + Horde::url('forums.php', true)->redirect(); } if (!$registry->isAdmin(array('permission' => 'agora:admin'))) { $notification->push(sprintf(_("You don't have permissions to create a new forum in %s"), $registry->get('name', $scope)), 'horde.warning'); - Horde::applicationUrl('forums.php', true)->redirect(); + Horde::url('forums.php', true)->redirect(); } $form = new ForumForm($vars, $title); @@ -37,10 +37,10 @@ if ($form->validate()) { $forum_id = $form->execute($vars); if ($forum_id instanceof PEAR_Error) { $notification->push(sprintf(_("Could not create the forum. %s"), $forum_id->message), 'horde.error'); - Horde::applicationUrl('forums.php', true)->redirect(); + Horde::url('forums.php', true)->redirect(); } $notification->push($vars->get('forum_id') ? _("Forum Modified") : _("Forum created."), 'horde.success'); - header('Location: ' . Agora::setAgoraId($forum_id, null, Horde::applicationUrl('threads.php', true))); + header('Location: ' . Agora::setAgoraId($forum_id, null, Horde::url('threads.php', true))); exit; } diff --git a/agora/forums.php b/agora/forums.php index 2181d6d9c..7fe577fff 100644 --- a/agora/forums.php +++ b/agora/forums.php @@ -20,7 +20,7 @@ $forums = Agora_Messages::singleton($scope); /* Set up actions */ if ($registry->isAdmin()) { - $url = Horde::applicationUrl('forums.php'); + $url = Horde::url('forums.php'); foreach ($registry->listApps(array('hidden', 'notoolbar', 'active')) as $app) { if ($registry->hasMethod('hasComments', $app) && $registry->callByPackage($app, 'hasComments') === true) { diff --git a/agora/lib/Agora.php b/agora/lib/Agora.php index 94c94815f..60e2a0d19 100644 --- a/agora/lib/Agora.php +++ b/agora/lib/Agora.php @@ -240,32 +240,32 @@ class Agora { $scope = Horde_Util::getGet('scope', 'agora'); /* Agora Home. */ - $url = Horde_Util::addParameter(Horde::applicationUrl('forums.php'), 'scope', $scope); + $url = Horde_Util::addParameter(Horde::url('forums.php'), 'scope', $scope); $menu->add($url, _("_Forums"), 'forums.png', $img_dir, null, null, dirname($_SERVER['PHP_SELF']) == $GLOBALS['registry']->get('webroot') && basename($_SERVER['PHP_SELF']) == 'index.php' ? 'current' : null); /* Thread list, if applicable. */ if (isset($GLOBALS['forum_id'])) { - $menu->add(Agora::setAgoraId($GLOBALS['forum_id'], null, Horde::applicationUrl('threads.php')), _("_Threads"), 'threads.png', Horde_Themes::img()); + $menu->add(Agora::setAgoraId($GLOBALS['forum_id'], null, Horde::url('threads.php')), _("_Threads"), 'threads.png', Horde_Themes::img()); if ($scope == 'agora' && $GLOBALS['registry']->getAuth()) { - $menu->add(Agora::setAgoraId($GLOBALS['forum_id'], null, Horde::applicationUrl('messages/edit.php')), _("New Thread"), 'newmessage.png', Horde_Themes::img()); + $menu->add(Agora::setAgoraId($GLOBALS['forum_id'], null, Horde::url('messages/edit.php')), _("New Thread"), 'newmessage.png', Horde_Themes::img()); } } if ($scope == 'agora' && Agora_Messages::hasPermission(Horde_Perms::DELETE, 0, $scope)) { - $menu->add(Horde::applicationUrl('editforum.php'), _("_New Forum"), 'newforum.png', $img_dir, null, null, Horde_Util::getFormData('agora') ? '__noselection' : null); + $menu->add(Horde::url('editforum.php'), _("_New Forum"), 'newforum.png', $img_dir, null, null, Horde_Util::getFormData('agora') ? '__noselection' : null); } if (Agora_Messages::hasPermission(Horde_Perms::DELETE, 0, $scope)) { - $url = Horde_Util::addParameter(Horde::applicationUrl('moderate.php'), 'scope', $scope); + $url = Horde_Util::addParameter(Horde::url('moderate.php'), 'scope', $scope); $menu->add($url, _("_Moderate"), 'moderate.png', $img_dir); } if ($GLOBALS['registry']->isAdmin()) { - $menu->add(Horde::applicationUrl('moderators.php'), _("_Moderators"), 'hot.png', $img_dir); + $menu->add(Horde::url('moderators.php'), _("_Moderators"), 'hot.png', $img_dir); } - $url = Horde_Util::addParameter(Horde::applicationUrl('search.php'), 'scope', $scope); + $url = Horde_Util::addParameter(Horde::url('search.php'), 'scope', $scope); $menu->add($url, _("_Search"), 'search.png', Horde_Themes::img(null, 'horde')); if ($returnType == 'object') { @@ -368,7 +368,7 @@ class Agora { return PEAR::raiseError(_("Malformed database entry.")); } - $avatar_path = Horde::applicationUrl('avatars/?id=' . urlencode($matches[4]) . ':' . $avatar_collection_id, true, $scopeend_sid); + $avatar_path = Horde::url('avatars/?id=' . urlencode($matches[4]) . ':' . $avatar_collection_id, true, $scopeend_sid); break; } diff --git a/agora/lib/Block/forums.php b/agora/lib/Block/forums.php index a6480d227..43818c09c 100644 --- a/agora/lib/Block/forums.php +++ b/agora/lib/Block/forums.php @@ -24,7 +24,7 @@ class Horde_Block_agora_forums extends Horde_Block protected function _title() { - return Horde::applicationUrl('forums.php', true)->link() . _("Forums") . ''; + return Horde::url('forums.php', true)->link() . _("Forums") . ''; } /** diff --git a/agora/lib/Block/threads.php b/agora/lib/Block/threads.php index 0fdae313f..c1aecb3a4 100644 --- a/agora/lib/Block/threads.php +++ b/agora/lib/Block/threads.php @@ -72,7 +72,7 @@ class Horde_Block_agora_threads extends Horde_Block } $title = sprintf(_("Threads in \"%s\""), $this->_threads->_forum['forum_name']); - $url = Horde::applicationUrl('threads.php', true); + $url = Horde::url('threads.php', true); if (!empty($scope)) { $url = Horde_Util::addParameter($url, 'scope', $scope); } diff --git a/agora/lib/Comments.php b/agora/lib/Comments.php index 9cd491805..c203b8f62 100644 --- a/agora/lib/Comments.php +++ b/agora/lib/Comments.php @@ -51,7 +51,7 @@ class Agora_ViewComments { $sort_dir = Agora::getSortDir('comments'); $html = '
' . _("Comments") . ' (' . $messages->_forum['message_count'] . ')' . '  '; if (!$GLOBALS['prefs']->isLocked('comments_view_bodies')) { - $rss = Horde_Util::addParameter(Horde::applicationUrl('rss/threads.php', true, -1), array('scope' => $scope, 'forum_id' => $forum_id)); + $rss = Horde_Util::addParameter(Horde::url('rss/threads.php', true, -1), array('scope' => $scope, 'forum_id' => $forum_id)); $html .= ''; $html .= '
'; $html .= _("View") . ' " /> diff --git a/ansel/templates/faces/face.inc b/ansel/templates/faces/face.inc index aba22c5d2..9c33bac61 100755 --- a/ansel/templates/faces/face.inc +++ b/ansel/templates/faces/face.inc @@ -6,12 +6,12 @@ <?php echo $facename?>

- add('face', $face_id)->link( + add('face', $face_id)->link( array('class' => 'small', 'title' => _("Report abuse or submit a removal request"))) . _("Report") . '
'?> add('face_id', $face_id)->link(array('title' => _("Find similar"))) . _("Similar faces") . ''; + echo Horde::url('faces/search/image_search.php')->add('face_id', $face_id)->link(array('title' => _("Find similar"))) . _("Similar faces") . ''; } ?> diff --git a/ansel/templates/faces/gallery.inc b/ansel/templates/faces/gallery.inc index cfdb56c6d..acbaf3432 100644 --- a/ansel/templates/faces/gallery.inc +++ b/ansel/templates/faces/gallery.inc @@ -35,7 +35,7 @@ var imgids = getCharset()); ?>; function proccessImageFaces(image_id, reget) { - var url = ''; + var url = ''; $('processface' + image_id).innerHTML = ''; var params = {'reload':reget, 'image': image_id}; new Ajax.Updater({success:'processface' + image_id}, @@ -48,7 +48,7 @@ function proccessImageFaces(image_id, reget) { } function deleteFace(image_id, face_id) { - var url = 'add(array('requestType' => 'EditFaces')); ?>'; + var url = 'add(array('requestType' => 'EditFaces')); ?>'; var params = {'image': image_id, face: face_id}; new Ajax.Request(url + '/action=delete', { @@ -60,7 +60,7 @@ function deleteFace(image_id, face_id) { function setFaceName(image_id, face_id) { var params = {face: face_id, 'image': image_id, facename: encodeURIComponent($F('facename' + face_id))}; - var url = 'add(array('requestType' => 'EditFaces')); ?>'; + var url = 'add(array('requestType' => 'EditFaces')); ?>'; new Ajax.Updater({success: 'face' + face_id}, url + '/action=setname', { diff --git a/ansel/templates/faces/image.inc b/ansel/templates/faces/image.inc index 216708bd1..3afdb944c 100755 --- a/ansel/templates/faces/image.inc +++ b/ansel/templates/faces/image.inc @@ -1,6 +1,6 @@ $face_name):?>
- <?php echo $face_id ?> + <?php echo $face_id ?> ' . Horde::img('save.png')?> ' . Horde::img('delete.png')?> diff --git a/ansel/templates/faces/search.inc b/ansel/templates/faces/search.inc index 9afe71475..5b31e4705 100755 --- a/ansel/templates/faces/search.inc +++ b/ansel/templates/faces/search.inc @@ -10,11 +10,11 @@
<?php echo $facename?>

- add(array('face', $face_id))->link( + add(array('face', $face_id))->link( array('class' => 'small', 'title' => _("Report abuse or submit a removal request"))) . _("Report") . ''?> - <?php echo $title ?> + <?php echo $title ?> diff --git a/ansel/templates/gallery/gallery.inc b/ansel/templates/gallery/gallery.inc index 7acf4719b..bf5ba0d7d 100644 --- a/ansel/templates/gallery/gallery.inc +++ b/ansel/templates/gallery/gallery.inc @@ -62,7 +62,7 @@ if ($prefs->isLocked('default_gallerystyle')) {  
-
+
diff --git a/ansel/templates/image/edit_image.inc b/ansel/templates/image/edit_image.inc index 5e56c0e03..dd02ad6a5 100644 --- a/ansel/templates/image/edit_image.inc +++ b/ansel/templates/image/edit_image.inc @@ -24,7 +24,7 @@ if (Ansel::isAvailable('grayscale')) { } if (Ansel::isAvailable('TextWatermark')) { $url = new Horde_Url('#'); - echo $url->link(array('target' => '_blank', 'onclick.raw' => Horde::popupJs(Horde::applicationUrl($imageurl), array('params' => array('actionID' => 'setwatermark', 'share' => $gallery->getName()), 'width' => 450, 'height' => 250, 'urlencode' => true)) . 'return false;')) . Horde::img('text.png') . ' ' . _("Watermark") . ' '; + echo $url->link(array('target' => '_blank', 'onclick.raw' => Horde::popupJs(Horde::url($imageurl), array('params' => array('actionID' => 'setwatermark', 'share' => $gallery->getName()), 'width' => 450, 'height' => 250, 'urlencode' => true)) . 'return false;')) . Horde::img('text.png') . ' ' . _("Watermark") . ' '; } $selfUrl = Horde::selfUrl(true); diff --git a/ansel/templates/image/preview_cropimage.inc b/ansel/templates/image/preview_cropimage.inc index f3fb6af41..1bc06b185 100644 --- a/ansel/templates/image/preview_cropimage.inc +++ b/ansel/templates/image/preview_cropimage.inc @@ -1,6 +1,6 @@

getCharset()) ?>

copy()->add(array_merge( array('gallery' => $gallery_id, 'image' => $image_id, diff --git a/ansel/templates/image/preview_image.inc b/ansel/templates/image/preview_image.inc index 358752f8d..10cb18d84 100644 --- a/ansel/templates/image/preview_image.inc +++ b/ansel/templates/image/preview_image.inc @@ -1,6 +1,6 @@

getCharset()) ?>

add( +$base_url = Horde::url('image.php')->add( array_merge( array('gallery' => $gallery_id, 'image' => $image_id, diff --git a/ansel/templates/image/resize_image.inc b/ansel/templates/image/resize_image.inc index 6b441c3d7..816ab75a2 100644 --- a/ansel/templates/image/resize_image.inc +++ b/ansel/templates/image/resize_image.inc @@ -55,7 +55,7 @@ if (Ansel::isAvailable('grayscale')) { } if (Ansel::isAvailable('text_watermark')) { $url = new Horde_Url('#'); - echo $url->link(array('target' => '_blank', 'onclick.raw' => Horde::popupJs(Horde::applicationUrl($imageurl), array('params' => array('actionID' => 'setwatermark', 'share' => $gallery->getName()), 'width' => 450, 'height' => 250, 'urlencode' => true)) . 'return false;')) . Horde::img('text.png') . ' ' . _("Watermark") . ' '; + echo $url->link(array('target' => '_blank', 'onclick.raw' => Horde::popupJs(Horde::url($imageurl), array('params' => array('actionID' => 'setwatermark', 'share' => $gallery->getName()), 'width' => 450, 'height' => 250, 'urlencode' => true)) . 'return false;')) . Horde::img('text.png') . ' ' . _("Watermark") . ' '; } $selfUrl = Horde::selfUrl(true); diff --git a/ansel/templates/image/upload.inc b/ansel/templates/image/upload.inc index 3b558559a..0ddf477c9 100644 --- a/ansel/templates/image/upload.inc +++ b/ansel/templates/image/upload.inc @@ -58,7 +58,7 @@ var carousel = null; function runTest() { updateCarouselSize(); - carousel = new UI.Ajax.Carousel("horizontal_carousel", {url: "add('gallery', $gallery->id) ?>", elementSize: 90}) + carousel = new UI.Ajax.Carousel("horizontal_carousel", {url: "add('gallery', $gallery->id) ?>", elementSize: 90}) .observe("request:started", function() { $('spinner').show().morph("opacity:0.8", {duration:0.5}); }) diff --git a/ansel/templates/list/header.inc b/ansel/templates/list/header.inc index 6145a2a08..44429e0c9 100644 --- a/ansel/templates/list/header.inc +++ b/ansel/templates/list/header.inc @@ -2,6 +2,6 @@ - getCharset()) . ' ' . Horde::applicationUrl($refresh_link)->link(array('title' => _("Refresh List"))) . Horde::img('reload.png', _("Refresh List")) . '' ?> + getCharset()) . ' ' . Horde::url($refresh_link)->link(array('title' => _("Refresh List"))) . Horde::img('reload.png', _("Refresh List")) . '' ?>
diff --git a/ansel/templates/tile/face.inc b/ansel/templates/tile/face.inc index 5fa4290cc..02f28a698 100755 --- a/ansel/templates/tile/face.inc +++ b/ansel/templates/tile/face.inc @@ -24,14 +24,14 @@ if (isset($face['similarity'])) { if ($face['face_name']) { echo '' . _("Others") . '
'; } elseif ($GLOBALS['conf']['report_content']['driver']) { - echo Horde::applicationUrl('faces/claim.php')->add('face', $face_id)->link(array('title' => _("Tell us who is in this photo"))) + echo Horde::url('faces/claim.php')->add('face', $face_id)->link(array('title' => _("Tell us who is in this photo"))) . _("Claim") . '
'; - echo Horde::applicationUrl('faces/report.php')->add('face', $face_id)->link(array('title' => _("Report abuse or submit a removal request"))) + echo Horde::url('faces/report.php')->add('face', $face_id)->link(array('title' => _("Report abuse or submit a removal request"))) . _("Report") . '
'; } if ($conf['faces']['search'] && Horde_Util::loadExtension('libpuzzle') !== false) { - echo Horde::applicationUrl('faces/search/image_search.php')->add('face_id', $face_id)->link(array('title' => _("Find similar"))) . _("Similar faces") . ''; + echo Horde::url('faces/search/image_search.php')->add('face_id', $face_id)->link(array('title' => _("Find similar"))) . _("Similar faces") . ''; } ?> diff --git a/ansel/templates/tile/image.inc b/ansel/templates/tile/image.inc index d4d95fd76..683f95f1e 100644 --- a/ansel/templates/tile/image.inc +++ b/ansel/templates/tile/image.inc @@ -16,7 +16,7 @@ if ($option_select): ?> copy()->add(array('actionID' => 'modify'))->link( array('target' => '_blank', - 'onclick' => Horde::popupJs(Horde::applicationUrl($image_url), array('params' => array('actionID' => 'modify', 'urlencode' => true))) + 'onclick' => Horde::popupJs(Horde::url($image_url), array('params' => array('actionID' => 'modify', 'urlencode' => true))) . 'return false;')) . _("Properties")?> | copy()->add('actionID', 'editimage')->link() . _("Edit") ?> diff --git a/ansel/templates/view/gallery.inc b/ansel/templates/view/gallery.inc index 4eca846fe..1027c1d8e 100644 --- a/ansel/templates/view/gallery.inc +++ b/ansel/templates/view/gallery.inc @@ -70,7 +70,7 @@ function copySelected() function editDates() { var haveImages = false; - var imageDateUrl = 'add(array('gallery' => $this->galleryId)) ?>'; + var imageDateUrl = 'add(array('gallery' => $this->galleryId)) ?>'; for (var i = 0; i< document.forms['gallery'].elements.length; ++i) { if (document.forms['gallery'].elements[i].checked == true && document.forms['gallery'].elements[i].type == 'checkbox') { @@ -116,7 +116,7 @@ function downloadSelected() "; } echo "\n\t"; - echo "\n\t"; + echo "\n\t"; echo "\n\t"; echo "\n\t"; echo "\n\t"; diff --git a/babel/templates/index.php b/babel/templates/index.php index e5b5f6f4a..c6bd159ac 100644 --- a/babel/templates/index.php +++ b/babel/templates/index.php @@ -18,49 +18,49 @@ $cmds = array(); $cmds['view'] = array( 'desc' => _("View"), 'text' => _("View all translations."), - 'url' => Horde::applicationUrl('view.php') + 'url' => Horde::url('view.php') ); $cmds['download'] = array( 'desc' => _("Download"), 'text' => _("Download all current PO files."), - 'url' => Horde::applicationUrl('download.php') + 'url' => Horde::url('download.php') ); $cmds['upload'] = array( 'desc' => _("Upload"), 'text' => _("Upload new PO files."), - 'url' => Horde::applicationUrl('upload.php') + 'url' => Horde::url('upload.php') ); $cmds['stats'] = array( 'desc' => _("Statistics"), 'text' => _("Get statistics about translations."), - 'url' => Horde::applicationUrl('stats.php') + 'url' => Horde::url('stats.php') ); $cmds['extract'] = array( 'desc' => _("Extract"), 'text' => _("Generate and merge PO files."), - 'url' => Horde::applicationUrl('extract.php') + 'url' => Horde::url('extract.php') ); $cmds['make'] = array( 'desc' => _("Make"), 'text' => _("Build binary MO files from the specified PO files."), - 'url' => Horde::applicationUrl('make.php') + 'url' => Horde::url('make.php') ); $cmds['commit'] = array( 'desc' => _("Commit"), 'text' => _("Commit translations to the SVN server."), - 'url' => Horde::applicationUrl('commit.php') + 'url' => Horde::url('commit.php') ); $cmds['reset'] = array( 'desc' => _("Reset"), 'text' => _("The reset procedure will delete all PO files from the server for all modules and restore from SVN server."), - 'url' => Horde::applicationUrl('reset.php') + 'url' => Horde::url('reset.php') ); diff --git a/babel/upload.php b/babel/upload.php index 2a6468c91..a9b979ca7 100644 --- a/babel/upload.php +++ b/babel/upload.php @@ -47,7 +47,7 @@ if (Horde_Util::getFormData('submitbutton') == _("Upload")) { system($cmd); // Redirect to page URL - Horde::applicationUrl('upload.php')->redirect(); + Horde::url('upload.php')->redirect(); } } } diff --git a/babel/view.php b/babel/view.php index c0125b31b..8d976408c 100644 --- a/babel/view.php +++ b/babel/view.php @@ -164,7 +164,7 @@ if (!$app) { if (Babel::hasPermission('view', 'tabs', Horde_Perms::EDIT)) { $hmenu_desc = _("Edit Header"); - $url = Horde::applicationUrl('edit.php'); + $url = Horde::url('edit.php'); $url = Horde_Util::addParameter($url, array('module' => $app, 'url' => 'view')); @@ -216,7 +216,7 @@ if (!$app) { Translate_Display::info(); $filter_html = ''; - $filter_html .= ''; + $filter_html .= ''; $filter_html .= ''; $filter_html .= Horde::img('edit.png') . ' '; $filter_html .= '' . _("Filter: ") . ''; @@ -226,7 +226,7 @@ if (!$app) { } else { $hmenu_desc = _("All"); } - $url = Horde::applicationUrl('view.php'); + $url = Horde::url('view.php'); $url = Horde_Util::addParameter($url, array('module' => $app)); $filter_html .= Horde::link($url, _("Edit Mode"), 'menuitem', null). ' ' . $hmenu_desc . ' '; $filter_html .= '| '; @@ -236,7 +236,7 @@ if (!$app) { } else { $hmenu_desc = _("Translated"); } - $url = Horde::applicationUrl('view.php'); + $url = Horde::url('view.php'); $url = Horde_Util::addParameter($url, array('module' => $app, 'filter' => 'translated')); $filter_html .= Horde::link($url, $hmenu_desc, 'menuitem', null). ' ' . $hmenu_desc . ' '; $filter_html .= '| '; @@ -247,7 +247,7 @@ if (!$app) { } else { $hmenu_desc = _("Fuzzy"); } - $url = Horde::applicationUrl('view.php'); + $url = Horde::url('view.php'); $url = Horde_Util::addParameter($url, array('module' => $app, 'filter' => 'fuzzy')); $filter_html .= Horde::link($url, $hmenu_desc, 'menuitem', null). ' ' . $hmenu_desc . ' '; $filter_html .= '| '; @@ -257,7 +257,7 @@ if (!$app) { } else { $hmenu_desc = _("Untranslated"); } - $url = Horde::applicationUrl('view.php'); + $url = Horde::url('view.php'); $url = Horde_Util::addParameter($url, array('module' => $app, 'filter' => 'untranslated')); $filter_html .= Horde::link($url, $hmenu_desc, 'menuitem', null). ' ' . $hmenu_desc . ' '; $filter_html .= '] '; @@ -345,7 +345,7 @@ if (!$app) { // Lock the current item for 5 minutes $locks->setLock($GLOBALS['registry']->getAuth(), md5($encstr), $lockscope, 300); - echo ''; + echo ''; echo ''; echo ''; echo ''; @@ -376,7 +376,7 @@ if (!$app) { $sline = $m[2]; if (Babel::hasPermission('viewsource', 'tabs', Horde_Perms::EDIT)) { - $surl = Horde::applicationUrl('viewsource.php'); + $surl = Horde::url('viewsource.php'); $surl = Horde_Util::addParameter($surl, array('module' => $app, 'file' => $sfile, 'line' => $sline)); @@ -433,7 +433,7 @@ if (!$app) { } else { if (Babel::hasPermission('view', 'tabs', Horde_Perms::EDIT)) { if (!$editmode || $cstring != $encstr) { - $surl = Horde::applicationUrl('view.php'); + $surl = Horde::url('view.php'); $surl = Horde_Util::addParameter($surl, array('module' => $app, 'cstring' => $encstr, 'editmode' => 1, 'page' => $page, 'filter' => $filter, 'search' => $search)); $surl .= "#" . md5($encstr); @@ -485,7 +485,7 @@ if (!$app) {
;"> view->api) && $option_select && $this->numTiles): ?> - + diff --git a/ansel/templates/view/gallerylightbox.inc b/ansel/templates/view/gallerylightbox.inc index 5db59cd7d..b4bcf1eaa 100644 --- a/ansel/templates/view/gallerylightbox.inc +++ b/ansel/templates/view/gallerylightbox.inc @@ -68,7 +68,7 @@ function copySelected() function editDates() { var haveImages = false; - var imageDateUrl = 'add(array('gallery' => $this->galleryId)) ?>'; + var imageDateUrl = 'add(array('gallery' => $this->galleryId)) ?>'; for (var i = 0; i< document.forms['gallery'].elements.length; ++i) { if (document.forms['gallery'].elements[i].checked == true && document.forms['gallery'].elements[i].type == 'checkbox') { @@ -133,7 +133,7 @@ function downloadSelected()
;"> view->api) && $option_select && $this->numTiles): ?> - + diff --git a/ansel/templates/view/list.inc b/ansel/templates/view/list.inc index 3012bd44c..b7c5f456f 100644 --- a/ansel/templates/view/list.inc +++ b/ansel/templates/view/list.inc @@ -2,7 +2,7 @@ _g_perPage < $this->_numGalleries) printf(_("%d to %d of %d Galleries"), $this->_start, $end, $this->_numGalleries); else printf(ngettext("%d Gallery", "%d Galleries", $this->_numGalleries), $this->_numGalleries) ?> - _params['api'])) echo Ansel::getBreadcrumbs() . ' ' . Horde::applicationUrl($refresh_link)->link(array('title' => _("Refresh List"))) . Horde::img('reload.png', _("Refresh List")) . '' ?> + _params['api'])) echo Ansel::getBreadcrumbs() . ' ' . Horde::url($refresh_link)->link(array('title' => _("Refresh List"))) . Horde::img('reload.png', _("Refresh List")) . '' ?> _params['api'])): ?>
diff --git a/ansel/templates/view/results.inc b/ansel/templates/view/results.inc index e3e781ff7..2587e06fd 100644 --- a/ansel/templates/view/results.inc +++ b/ansel/templates/view/results.inc @@ -53,7 +53,7 @@ function copySelected() } - + diff --git a/ansel/templates/view/slideshow.inc b/ansel/templates/view/slideshow.inc index d6e22239d..3c570d7d4 100644 --- a/ansel/templates/view/slideshow.inc +++ b/ansel/templates/view/slideshow.inc @@ -15,7 +15,7 @@ function stopSlideShow()
gallery->hasPermission($GLOBALS['registry']->getAuth(), Horde_Perms::EDIT)): ?> link(array('onclick.raw' => $this->_urls['prop_popup'] . ' SlideController.pause(); return false;','id' => 'image_properties_link')) . _("Properties") ?> - | _urls['edit'])->link(array('id' => 'image_edit_link')) . _("Edit") ?> + | _urls['edit'])->link(array('id' => 'image_edit_link')) . _("Edit") ?> gallery->hasPermission($GLOBALS['registry']->getAuth(), Horde_Perms::DELETE)): ?> | _urls['delete']->link(array('id' => 'image_delete_link')) . _("Delete") ?> diff --git a/ansel/templates/xppublish/javascript.inc b/ansel/templates/xppublish/javascript.inc index 45a40df34..1c4c52e97 100755 --- a/ansel/templates/xppublish/javascript.inc +++ b/ansel/templates/xppublish/javascript.inc @@ -8,7 +8,7 @@ function publish() for (i = 0; i < files.length; i++) { var postTag = xml.createNode(1, 'post', ''); - postTag.setAttribute('href', '&gallery=' + folder.gallery.value); + postTag.setAttribute('href', '&gallery=' + folder.gallery.value); postTag.setAttribute('name', 'imagefile'); var dataTag = xml.createNode(1, 'formdata', ''); @@ -31,7 +31,7 @@ function publish() var uploadTag = xml.createNode(1, 'uploadinfo', ''); var htmluiTag = xml.createNode(1, 'htmlui', ''); - htmluiTag.text = '&gallery=' + folder.gallery.value; + htmluiTag.text = '&gallery=' + folder.gallery.value; uploadTag.appendChild(htmluiTag); xml.documentElement.appendChild(uploadTag); diff --git a/ansel/templates/xppublish/list.inc b/ansel/templates/xppublish/list.inc index 1f2232ebf..9ea19fdba 100755 --- a/ansel/templates/xppublish/list.inc +++ b/ansel/templates/xppublish/list.inc @@ -1,5 +1,5 @@
- + diff --git a/ansel/xppublish.php b/ansel/xppublish.php index 5ebd4abc2..897a754d7 100644 --- a/ansel/xppublish.php +++ b/ansel/xppublish.php @@ -18,7 +18,7 @@ if (empty($cmd)) { $registry->getApp() . '-' . $conf['server']['name'], $registry->get('name'), Horde_String::convertCharset(sprintf(_("Publish your photos to %s on %s."), $registry->get('name'), $conf['server']['name']), $registry->getCharset(), $registry->getCharset(true)), - Horde::applicationUrl('xppublish.php', true, -1)->add('cmd', 'publish'), + Horde::url('xppublish.php', true, -1)->add('cmd', 'publish'), Horde::url(Horde_Themes::img('favicon.ico'), true, -1)); exit; } @@ -72,7 +72,7 @@ if ($cmd == 'publish') { $galleryId = Horde_Util::getFormData('gallery'); if ($cmd == 'list') { $PUBLISH_ONNEXT = 'folder.submit();'; - $PUBLISH_ONBACK = 'window.location.href="' . Horde::applicationUrl('xppublish.php?cmd=publish', true) . '";'; + $PUBLISH_ONBACK = 'window.location.href="' . Horde::url('xppublish.php?cmd=publish', true) . '";'; $PUBLISH_BUTTONS = 'true,true,true'; require ANSEL_TEMPLATES . '/xppublish/list.inc'; } @@ -93,7 +93,7 @@ if ($cmd == 'select') { if ($error) { echo '' . $error . '
'; echo _("Press the \"Back\" button and try again."); - $PUBLISH_ONBACK = 'window.location.href="' . Horde::applicationUrl('xppublish.php?cmd=list', true) . '";'; + $PUBLISH_ONBACK = 'window.location.href="' . Horde::url('xppublish.php?cmd=list', true) . '";'; $PUBLISH_BUTTONS = 'true,false,true'; } else { echo ''; @@ -132,7 +132,7 @@ if ($cmd == 'new') { } $PUBLISH_CMD = 'folder.gallery_name.focus(); folder.gallery_name.select();'; $PUBLISH_ONNEXT = 'folder.submit();'; - $PUBLISH_ONBACK = 'window.location.href="' . Horde::applicationUrl('xppublish.php?cmd=list', true) . '";'; + $PUBLISH_ONBACK = 'window.location.href="' . Horde::url('xppublish.php?cmd=list', true) . '";'; $PUBLISH_BUTTONS = 'true,true,true'; require ANSEL_TEMPLATES . '/xppublish/new.inc'; require ANSEL_TEMPLATES . '/xppublish/javascript.inc'; diff --git a/babel/edit.php b/babel/edit.php index 12de055f1..83a4df105 100644 --- a/babel/edit.php +++ b/babel/edit.php @@ -66,7 +66,7 @@ if ($app && Horde_Util::getFormData('submitbutton') == _("Save")) { $po->save($pofile); if (Horde_Util::getFormData('url') == 'view') { - Horde::applicationUrl('view.php')->add('module' => $app)->redirect(); + Horde::url('view.php')->add('module' => $app)->redirect(); } } } diff --git a/babel/lib/Babel.php b/babel/lib/Babel.php index 9d70eaea4..a906131aa 100644 --- a/babel/lib/Babel.php +++ b/babel/lib/Babel.php @@ -191,36 +191,36 @@ class Babel { $menu = new Horde_Menu(); - $menu->addArray(array('url' => Horde::applicationUrl('index.php'), + $menu->addArray(array('url' => Horde::url('index.php'), 'text' => _("_General"), 'icon' => 'list.png')); if (Babel::hasPermission('view')) { - $menu->addArray(array('url' => Horde::applicationUrl('view.php'), + $menu->addArray(array('url' => Horde::url('view.php'), 'text' => _("_View"), 'icon' => 'view.png')); } if (Babel::hasPermission('stats')) { - $menu->addArray(array('url' => Horde::applicationUrl('stats.php'), + $menu->addArray(array('url' => Horde::url('stats.php'), 'text' => _("_Stats"), 'icon' => 'extract.png')); } if (Babel::hasPermission('extract')) { - $menu->addArray(array('url' => Horde::applicationUrl('extract.php'), + $menu->addArray(array('url' => Horde::url('extract.php'), 'text' => _("_Extract"), 'icon' => 'extract.png')); } if (Babel::hasPermission('make')) { - $menu->addArray(array('url' => Horde::applicationUrl('make.php'), + $menu->addArray(array('url' => Horde::url('make.php'), 'text' => _("_Make"), 'icon' => 'make.png')); } if (Babel::hasPermission('upload')) { - $menu->addArray(array('url' => Horde::applicationUrl('upload.php'), + $menu->addArray(array('url' => Horde::url('upload.php'), 'text' => _("_Upload"), 'icon' => 'upload.png')); } diff --git a/babel/stats.php b/babel/stats.php index f78744788..b97664028 100644 --- a/babel/stats.php +++ b/babel/stats.php @@ -99,7 +99,7 @@ if (!$app) { echo "\n
" . Horde_Nls::$config['languages'][$key] . "" . Horde::link(Horde_Util::addParameter(Horde::applicationUrl('view.php'), array('display_language' => $key, 'module' => $_app))) . $key . '' . "" . Horde::link(Horde_Util::addParameter(Horde::url('view.php'), array('display_language' => $key, 'module' => $_app))) . $key . '' . "" . Translate_Display::create_bargraph($value[2], $value[0]) . "" . $value[2] . "" . $value [3] . "
diff --git a/kronolith/templates/javascript_defs.php b/kronolith/templates/javascript_defs.php index 07ad9e6c2..307eba10a 100644 --- a/kronolith/templates/javascript_defs.php +++ b/kronolith/templates/javascript_defs.php @@ -8,11 +8,11 @@ $currentDate = Kronolith::currentDate(); /* Variables used in core javascript files. */ $var = array( - 'calendar_info_url' => (string)Horde::applicationUrl('calendars/info.php', true), + 'calendar_info_url' => (string)Horde::url('calendars/info.php', true), 'page_title' => $GLOBALS['registry']->get('name') . ' :: ', 'pref_api_url' => (string)Horde::getServiceLink('prefsapi', 'kronolith'), 'twentyFour' => intval($GLOBALS['prefs']->getValue('twentyFour')), - 'view_url' => (string)Horde::applicationUrl('view.php'), + 'view_url' => (string)Horde::url('view.php'), ); /* Gettext strings used in core javascript files. */ diff --git a/kronolith/templates/panel.inc b/kronolith/templates/panel.inc index 7d8cf69e7..7e9c64330 100644 --- a/kronolith/templates/panel.inc +++ b/kronolith/templates/panel.inc @@ -62,8 +62,8 @@ $tagger = Kronolith::getTagger(); getAuth()): ?>

-
- isAdmin() ? _("[Manage Resource Calendars]") : _("[Resource Calendars]"))?> +
+ isAdmin() ? _("[Manage Resource Calendars]") : _("[Resource Calendars]"))?>

diff --git a/kronolith/templates/search/search.inc b/kronolith/templates/search/search.inc index 27d2a07cb..90ca0ff44 100644 --- a/kronolith/templates/search/search.inc +++ b/kronolith/templates/search/search.inc @@ -6,7 +6,7 @@

- add('search_mode', 'advanced'), _("Advanced Search"), 'smallheader', '', '', _("Ad_vanced Search")) ?> + add('search_mode', 'advanced'), _("Advanced Search"), 'smallheader', '', '', _("Ad_vanced Search")) ?>

diff --git a/kronolith/templates/search/search_advanced.inc b/kronolith/templates/search/search_advanced.inc index a6372a978..66d67282a 100644 --- a/kronolith/templates/search/search_advanced.inc +++ b/kronolith/templates/search/search_advanced.inc @@ -6,7 +6,7 @@

- add('search_mode', 'basic'), _("Basic Search"), 'smallheader', '', '', _("_Basic Search")) ?> + add('search_mode', 'basic'), _("Basic Search"), 'smallheader', '', '', _("_Basic Search")) ?>

diff --git a/kronolith/templates/week/head.inc b/kronolith/templates/week/head.inc index aae93b362..d42f1e209 100644 --- a/kronolith/templates/week/head.inc +++ b/kronolith/templates/week/head.inc @@ -22,7 +22,7 @@ if (Kronolith::getDefaultCalendar(Horde_Perms::EDIT) && (!empty($conf['hooks']['permsdenied']) || $GLOBALS['injector']->getInstance('Horde_Perms')->hasAppPermission('max_events') === true || $GLOBALS['injector']->getInstance('Horde_Perms')->hasAppPermission('max_events') > Kronolith::countEvents())) { - echo Horde::applicationUrl('new.php') + echo Horde::url('new.php') ->add(array('date' => $day->dateString(), 'url' => $this->link(0, true))) ->link(array('title' => _("Create a New Event"), diff --git a/kronolith/view.php b/kronolith/view.php index a8f64dfd1..d563c803f 100644 --- a/kronolith/view.php +++ b/kronolith/view.php @@ -12,7 +12,7 @@ require_once dirname(__FILE__) . '/lib/Application.php'; Horde_Registry::appInit('kronolith'); if (Kronolith::showAjaxView()) { - Horde::applicationUrl('', true)->redirect(); + Horde::url('', true)->redirect(); } $view = Kronolith::getView(Horde_Util::getFormData('view')); diff --git a/kronolith/week.php b/kronolith/week.php index 043ca1f2f..2eb507709 100644 --- a/kronolith/week.php +++ b/kronolith/week.php @@ -13,7 +13,7 @@ require_once dirname(__FILE__) . '/lib/Application.php'; Horde_Registry::appInit('kronolith'); if (Kronolith::showAjaxView()) { - Horde::applicationUrl('', true)->setAnchor('week:' . Kronolith::currentDate()->dateString())->redirect(); + Horde::url('', true)->setAnchor('week:' . Kronolith::currentDate()->dateString())->redirect(); } $view = Kronolith::getView('Week'); diff --git a/kronolith/workweek.php b/kronolith/workweek.php index 9fdca60e2..196e202fb 100644 --- a/kronolith/workweek.php +++ b/kronolith/workweek.php @@ -13,7 +13,7 @@ require_once dirname(__FILE__) . '/lib/Application.php'; Horde_Registry::appInit('kronolith'); if (Kronolith::showAjaxView()) { - Horde::applicationUrl('', true)->setAnchor('week:' . Kronolith::currentDate()->dateString())->redirect(); + Horde::url('', true)->setAnchor('week:' . Kronolith::currentDate()->dateString())->redirect(); exit; } diff --git a/kronolith/year.php b/kronolith/year.php index 02eefd860..92a3ea9e5 100644 --- a/kronolith/year.php +++ b/kronolith/year.php @@ -13,7 +13,7 @@ require_once dirname(__FILE__) . '/lib/Application.php'; Horde_Registry::appInit('kronolith'); if (Kronolith::showAjaxView()) { - Horde::applicationUrl('', true)->setAnchor('year:' . Kronolith::currentDate()->dateString())->redirect(); + Horde::url('', true)->setAnchor('year:' . Kronolith::currentDate()->dateString())->redirect(); exit; } diff --git a/luxor/lib/Lang/Generic.php b/luxor/lib/Lang/Generic.php index bc39e2e7f..2a6b7e23a 100644 --- a/luxor/lib/Lang/Generic.php +++ b/luxor/lib/Lang/Generic.php @@ -181,7 +181,7 @@ class Luxor_Lang_Generic extends Luxor_Lang if (!in_array($string, $this->_langmap['reserved']) && !in_array($match[0][$id], $replaced) && $idx = $index->isSymbol($string, $altsources)) { - $link = Horde::applicationUrl(Horde_Util::addParameter('symbol.php', 'i', $idx)); + $link = Horde::url(Horde_Util::addParameter('symbol.php', 'i', $idx)); $link = Horde_Util::addParameter($link, 'source', $sourceid); $match0 = str_replace($string, '' . $string . "", $match[0][$id]); $code = str_replace($match[0][$id], $match0, $code); diff --git a/luxor/lib/Luxor.php b/luxor/lib/Luxor.php index d4a58f766..b9274c69c 100644 --- a/luxor/lib/Luxor.php +++ b/luxor/lib/Luxor.php @@ -48,7 +48,7 @@ class Luxor $uri = 'source.php'; } - $url = Horde_Util::addParameter(Horde::applicationUrl($uri), $arglist); + $url = Horde_Util::addParameter(Horde::url($uri), $arglist); if (!empty($anchor)) { $url .= "#$anchor"; } @@ -451,7 +451,7 @@ class Luxor global $registry; $menu = new Horde_Menu(Horde_Menu::MASK_ALL); - $menu->add(Horde::applicationUrl('source.php'), _("_Browse"), 'luxor.png'); + $menu->add(Horde::url('source.php'), _("_Browse"), 'luxor.png'); if ($returnType == 'object') { return $menu; diff --git a/luxor/search.php b/luxor/search.php index 8dfe8bd73..20a076902 100644 --- a/luxor/search.php +++ b/luxor/search.php @@ -14,13 +14,13 @@ Horde_Registry::appInit('luxor'); $symbol = Horde_Util::getFormData('s'); if (!$symbol) { - Horde::applicationUrl('source.php', true)->redirect(); + Horde::url('source.php', true)->redirect(); } $ids = $index->searchSymbols($symbol); if (count($ids) == 1) { $id = current($ids); - Horde::applicationUrl('symbol.php', true)->add('i', $id)->redirect(); + Horde::url('symbol.php', true)->add('i', $id)->redirect(); } // If there are multiple search results, display some info for all of them. @@ -40,7 +40,7 @@ foreach ($ids as $ident) { } $name = $index->symname($ident); - echo '
' . Horde::link(Horde::applicationUrl('symbol.php?i=' . $ident), $name, 'header') . $name . '
'; + echo '
' . Horde::link(Horde::url('symbol.php?i=' . $ident), $name, 'header') . $name . '
'; $references = $index->getIndex($ident); $sorted = array(); diff --git a/luxor/templates/menu.inc b/luxor/templates/menu.inc index db81e3bc3..938268ccf 100644 --- a/luxor/templates/menu.inc +++ b/luxor/templates/menu.inc @@ -5,7 +5,7 @@ function jump() } - +'; } @@ -96,7 +96,7 @@ class Horde_Block_Mnemo_summary extends Horde_Block $html .= '
$editmode, 'module' => $app, 'filter' => $filter, diff --git a/beatnik/autogenerate.php b/beatnik/autogenerate.php index 5ba37bb28..1ac46592b 100644 --- a/beatnik/autogenerate.php +++ b/beatnik/autogenerate.php @@ -15,7 +15,7 @@ $beatnik = Horde_Registry::appInit('beatnik'); require_once BEATNIK_BASE . '/lib/Forms/Autogenerate.php'; -$viewurl = Horde::applicationUrl('viewzone.php'); +$viewurl = Horde::url('viewzone.php'); $vars = Horde_Variables::getDefaultVariables(); $form = new Autogenerate($vars); @@ -26,7 +26,7 @@ if ($form->validate($vars)) { $result = Beatnik::autogenerate($vars); } catch (Exception $e) { $notification->push($e->getMessage(), 'horde.error'); - Horde::applicationUrl('listzones.php')->redirect(); + Horde::url('listzones.php')->redirect(); } } else { $notification->push(_("Autogeneration not performed"), 'horde.warning'); @@ -39,6 +39,6 @@ $title = _("Autogenerate"); require BEATNIK_BASE . '/templates/common-header.inc'; require BEATNIK_BASE . '/templates/menu.inc'; -$form->renderActive(null, null, Horde::applicationUrl('autogenerate.php'), 'post'); +$form->renderActive(null, null, Horde::url('autogenerate.php'), 'post'); require $registry->get('templates', 'horde') . '/common-footer.inc'; diff --git a/beatnik/commit.php b/beatnik/commit.php index a115fadc8..c8bb6f5d7 100644 --- a/beatnik/commit.php +++ b/beatnik/commit.php @@ -13,10 +13,10 @@ require_once BEATNIK_BASE . '/lib/Forms/EditRecord.php'; $domains = array(); if (Horde_Util::getGet('domain') == 'current') { - $url = Horde::applicationUrl('viewzone.php'); + $url = Horde::url('viewzone.php'); $domains[] = $_SESSION['beatnik']['curdomain']; } elseif (Horde_Util::getGet('domain') == 'all') { - $url = Horde::applicationUrl('listzones.php'); + $url = Horde::url('listzones.php'); foreach (Beatnik::needCommit() as $domain) { $domains[] = $beatnik->driver->getDomain($domain); } diff --git a/beatnik/delete.php b/beatnik/delete.php index 6da1e2b20..31cacbe0f 100644 --- a/beatnik/delete.php +++ b/beatnik/delete.php @@ -25,17 +25,17 @@ if ($form->validate($vars)) { $result = $beatnik->driver->deleteRecord($info); } catch (Exception $e) { $notification->push($e->getMessage(), 'horde.error'); - Horde::applicationUrl('viewzone.php')->add($info)->redirect(); + Horde::url('viewzone.php')->add($info)->redirect(); } $notification->push(_("Record deleted"), 'horde.success'); if ($info['rectype'] == 'soa') { - Horde::applicationUrl('listzones.php')->redirect(); + Horde::url('listzones.php')->redirect(); } else { - Horde::applicationUrl('viewzone.php')->redirect(); + Horde::url('viewzone.php')->redirect(); } } else { $notification->push(_("Record not deleted"), 'horde.warning'); - Horde::applicationUrl('viewzone.php')->add($info)->redirect(); + Horde::url('viewzone.php')->add($info)->redirect(); } } elseif (!$form->isSubmitted() && $record) { foreach ($record as $field => $value) { @@ -48,6 +48,6 @@ $title = _("Delete"); require BEATNIK_BASE . '/templates/common-header.inc'; require BEATNIK_BASE . '/templates/menu.inc'; -$form->renderActive(null, null, Horde::applicationUrl('delete.php'), 'post'); +$form->renderActive(null, null, Horde::url('delete.php'), 'post'); require $registry->get('templates', 'horde') . '/common-footer.inc'; diff --git a/beatnik/editrec.php b/beatnik/editrec.php index 2b99ee6ea..6b7ec570c 100644 --- a/beatnik/editrec.php +++ b/beatnik/editrec.php @@ -12,7 +12,7 @@ $beatnik = Horde_Registry::appInit('beatnik'); require_once BEATNIK_BASE . '/lib/Forms/EditRecord.php'; $vars = Horde_Variables::getDefaultVariables(); -$url = Horde::applicationUrl('editrec.php'); +$url = Horde::url('editrec.php'); list($type, $record) = $beatnik->driver->getRecord(Horde_Util::getFormData('id')); $form = new EditRecord($vars); @@ -32,9 +32,9 @@ if ($form->validate($vars)) { $edit = $vars->get('id'); if ($info['rectype'] == 'soa' && !$edit) { // if added a soa redirect to the autogeneration page - $url = Horde::applicationUrl('autogenerate.php')->add(array('rectype' => 'soa', 'curdomain' => $info['zonename'])); + $url = Horde::url('autogenerate.php')->add(array('rectype' => 'soa', 'curdomain' => $info['zonename'])); } else { - $url = Horde::applicationUrl('viewzone.php'); + $url = Horde::url('viewzone.php'); } $url->redirect(); diff --git a/beatnik/lib/Beatnik.php b/beatnik/lib/Beatnik.php index e6995db1c..825d00e53 100644 --- a/beatnik/lib/Beatnik.php +++ b/beatnik/lib/Beatnik.php @@ -25,18 +25,18 @@ class Beatnik { $beatnikImgDir = Horde_Themes::img(); $menu = new Horde_Menu(); - $menu->add(Horde::applicationUrl('listzones.php'), _('List Domains'), 'website.png', $hordeImgDir); + $menu->add(Horde::url('listzones.php'), _('List Domains'), 'website.png', $hordeImgDir); if (!empty($_SESSION['beatnik']['curdomain'])) { - $menu->add(Horde_Util::addParameter(Horde::applicationUrl('editrec.php'), 'curdomain', $_SESSION['beatnik']['curdomain']['zonename']), ($editing) ? _("Edit Record") : _("Add Record"), 'edit.png', $hordeImgDir); + $menu->add(Horde_Util::addParameter(Horde::url('editrec.php'), 'curdomain', $_SESSION['beatnik']['curdomain']['zonename']), ($editing) ? _("Edit Record") : _("Add Record"), 'edit.png', $hordeImgDir); } else { - $menu->add(Horde::applicationUrl('editrec.php?rectype=soa'), _("Add Zone"), 'edit.png', $hordeImgDir); + $menu->add(Horde::url('editrec.php?rectype=soa'), _("Add Zone"), 'edit.png', $hordeImgDir); } $url = Horde_Util::addParameter(Horde::selfUrl(true), array('expertmode' => 'toggle')); $menu->add($url, _('Expert Mode'), 'hide_panel.png', $hordeImgDir, '', null, ($_SESSION['beatnik']['expertmode']) ? 'current' : ''); if (count(Beatnik::needCommit())) { - $url = Horde_Util::addParameter(Horde::applicationUrl('commit.php'), array('domain' => 'all')); + $url = Horde_Util::addParameter(Horde::url('commit.php'), array('domain' => 'all')); $menu->add($url, _('Commit All'), 'commit-all.png', $beatnikImgDir); } diff --git a/beatnik/lib/Driver.php b/beatnik/lib/Driver.php index 03515a87f..684a293b2 100644 --- a/beatnik/lib/Driver.php +++ b/beatnik/lib/Driver.php @@ -165,7 +165,7 @@ class Beatnik_Driver { $zonedata = $this->getRecords($_SESSION['beatnik']['curdomain']['zonename']); } catch (Exception $e) { $notification->push($e, 'horde.error'); - Horde::applicationUrl('listzones.php')->redirect); + Horde::url('listzones.php')->redirect); } if (isset($zonedata[$rectype])) { diff --git a/beatnik/listzones.php b/beatnik/listzones.php index d43fde6f8..de9979b7f 100644 --- a/beatnik/listzones.php +++ b/beatnik/listzones.php @@ -57,10 +57,10 @@ require BEATNIK_TEMPLATES . '/menu.inc'; require BEATNIK_TEMPLATES . '/listzones/header.inc'; foreach ($domains as $domain) { - $autourl = Horde_Util::addParameter(Horde::applicationUrl('autogenerate.php'), array('rectype' => 'soa', 'curdomain' => $domain['zonename'])); - $deleteurl = Horde_Util::addParameter(Horde::applicationUrl('delete.php'), array('rectype' => 'soa', 'curdomain' => $domain['zonename'])); - $viewurl = Horde_Util::addParameter(Horde::applicationUrl('viewzone.php'), 'curdomain', $domain['zonename']); - $editurl = Horde_Util::addParameter(Horde::applicationUrl('editrec.php'), array('curdomain' => $domain['zonename'], 'id' => $domain['id'], 'rectype' => 'soa')); + $autourl = Horde_Util::addParameter(Horde::url('autogenerate.php'), array('rectype' => 'soa', 'curdomain' => $domain['zonename'])); + $deleteurl = Horde_Util::addParameter(Horde::url('delete.php'), array('rectype' => 'soa', 'curdomain' => $domain['zonename'])); + $viewurl = Horde_Util::addParameter(Horde::url('viewzone.php'), 'curdomain', $domain['zonename']); + $editurl = Horde_Util::addParameter(Horde::url('editrec.php'), array('curdomain' => $domain['zonename'], 'id' => $domain['id'], 'rectype' => 'soa')); require BEATNIK_TEMPLATES . '/listzones/row.inc'; } require BEATNIK_TEMPLATES . '/listzones/footer.inc'; diff --git a/beatnik/templates/menu.inc b/beatnik/templates/menu.inc index f9bfcbf7c..b8d2d2ad8 100644 --- a/beatnik/templates/menu.inc +++ b/beatnik/templates/menu.inc @@ -17,7 +17,7 @@ $menu_view = $prefs->getValue('menu_view'); ?> - +
- link(array('class' => 'button', 'id' => 'attendees_button', 'target' => '_blank')) . _("Edit Attendees and Resources") . '' ?> + link(array('class' => 'button', 'id' => 'attendees_button', 'target' => '_blank')) . _("Edit Attendees and Resources") . '' ?>
' - . Horde::link(htmlspecialchars(Horde::applicationUrl(Horde_Util::addParameter($editurl, 'actionID', 'modify_memo'), true)), _("Edit Note")) + . Horde::link(htmlspecialchars(Horde::url(Horde_Util::addParameter($editurl, 'actionID', 'modify_memo'), true)), _("Edit Note")) . Horde::img($editImg, _("Edit Note")) . '' . Horde::linkTooltip( - htmlspecialchars(Horde::applicationUrl($viewurl, true)), + htmlspecialchars(Horde::url($viewurl, true)), '', '', '', '', $memo['body'] != $memo['desc'] ? Mnemo::getNotePreview($memo) : '') . (strlen($memo['desc']) ? htmlspecialchars($memo['desc']) : '' . _("Empty Note") . '') @@ -111,7 +111,7 @@ class Horde_Block_Mnemo_summary extends Horde_Block } return '' . '' . $html diff --git a/mnemo/lib/Mnemo.php b/mnemo/lib/Mnemo.php index 9900824f1..686f4db08 100644 --- a/mnemo/lib/Mnemo.php +++ b/mnemo/lib/Mnemo.php @@ -474,26 +474,26 @@ class Mnemo { global $conf, $registry, $print_link; $menu = new Horde_Menu(); - $menu->add(Horde::applicationUrl('list.php'), _("_List Notes"), 'mnemo.png', null, null, null, basename($_SERVER['PHP_SELF']) == 'index.php' ? 'current' : null); + $menu->add(Horde::url('list.php'), _("_List Notes"), 'mnemo.png', null, null, null, basename($_SERVER['PHP_SELF']) == 'index.php' ? 'current' : null); if (Mnemo::getDefaultNotepad(Horde_Perms::EDIT) && (!empty($conf['hooks']['permsdenied']) || $GLOBALS['injector']->getInstance('Horde_Perms')->hasAppPermission('max_notes') === true || $GLOBALS['injector']->getInstance('Horde_Perms')->hasAppPermission('max_notes') > Mnemo::countMemos())) { - $menu->add(Horde::applicationUrl(Horde_Util::addParameter('memo.php', 'actionID', 'add_memo')), _("_New Note"), 'add.png', null, null, null, Horde_Util::getFormData('memo') ? '__noselection' : null); + $menu->add(Horde::url(Horde_Util::addParameter('memo.php', 'actionID', 'add_memo')), _("_New Note"), 'add.png', null, null, null, Horde_Util::getFormData('memo') ? '__noselection' : null); } /* Search. */ - $menu->add(Horde::applicationUrl('search.php'), _("_Search"), 'search.png', Horde_Themes::img(null, 'horde')); + $menu->add(Horde::url('search.php'), _("_Search"), 'search.png', Horde_Themes::img(null, 'horde')); /* Import/Export */ if ($conf['menu']['import_export']) { - $menu->add(Horde::applicationUrl('data.php'), _("_Import/Export"), 'data.png', Horde_Themes::img(null, 'horde')); + $menu->add(Horde::url('data.php'), _("_Import/Export"), 'data.png', Horde_Themes::img(null, 'horde')); } /* Print */ if ($conf['menu']['print'] && isset($print_link)) { - $menu->add(Horde::applicationUrl($print_link), _("_Print"), 'print.png', Horde_Themes::img(null, 'horde'), '_blank', 'popup(this.href); return false;'); + $menu->add(Horde::url($print_link), _("_Print"), 'print.png', Horde_Themes::img(null, 'horde'), '_blank', 'popup(this.href); return false;'); } return $menu; diff --git a/mnemo/memo.php b/mnemo/memo.php index 0a199f72a..410f45339 100644 --- a/mnemo/memo.php +++ b/mnemo/memo.php @@ -60,7 +60,7 @@ $memo_id = Horde_Util::getFormData('memo'); $memolist_id = Horde_Util::getFormData('memolist'); $actionID = Horde_Util::getFormData('actionID'); if (is_null($actionID)) { - Horde::applicationUrl('list.php', true)->redirect(); + Horde::url('list.php', true)->redirect(); } /* Load category manager. */ @@ -77,7 +77,7 @@ case 'add_memo': $message = Horde::callHook('_perms_hook_denied', array('mnemo:max_notes'), 'horde', $message); } $notification->push($message, 'horde.error', array('content.raw')); - Horde::applicationUrl('list.php', true)->redirect(); + Horde::url('list.php', true)->redirect(); } /* Set up the note attributes. */ if (empty($memolist_id)) { @@ -102,7 +102,7 @@ case 'modify_memo': $memo = Mnemo::getMemo($memolist_id, $memo_id, $passphrase); if (!$memo || !isset($memo['memo_id'])) { $notification->push(_("Note not found."), 'horde.error'); - Horde::applicationUrl('list.php', true)->redirect(); + Horde::url('list.php', true)->redirect(); } $storage = &Mnemo_Driver::singleton($memolist_id); @@ -143,7 +143,7 @@ case 'save_memo': $memo = Mnemo::getMemo($memolist_original, $memo_id); if (!$memo || !isset($memo['memo_id'])) { $notification->push(_("Note not found."), 'horde.error'); - Horde::applicationUrl('list.php', true)->redirect(); + Horde::url('list.php', true)->redirect(); } $title = sprintf(_("Edit: %s"), $memo['desc']); $show_passphrase = showPassphrase($memo); @@ -199,7 +199,7 @@ case 'save_memo': /* Check permissions. */ if ($injector->getInstance('Horde_Perms')->hasAppPermission('max_notes') !== true && $injector->getInstance('Horde_Perms')->hasAppPermission('max_notes') <= Mnemo::countMemos()) { - Horde::applicationUrl('list.php', true)->redirect(); + Horde::url('list.php', true)->redirect(); } /* Creating a new note. */ $storage = Mnemo_Driver::singleton($notepad_target); @@ -218,7 +218,7 @@ case 'save_memo': } /* Return to the notepad view. */ - Horde::applicationUrl('list.php', true)->redirect(); + Horde::url('list.php', true)->redirect(); case 'delete_memos': /* Delete the note if we're provided with a valid note ID. */ @@ -245,10 +245,10 @@ case 'delete_memos': } /* Return to the notepad. */ - Horde::applicationUrl('list.php', true)->redirect(); + Horde::url('list.php', true)->redirect(); default: - Horde::applicationUrl('list.php', true)->redirect(); + Horde::url('list.php', true)->redirect(); } $notepads = Mnemo::listNotepads(false, Horde_Perms::EDIT); diff --git a/mnemo/note/pdf.php b/mnemo/note/pdf.php index e0673d5c4..bc3efccc4 100644 --- a/mnemo/note/pdf.php +++ b/mnemo/note/pdf.php @@ -21,7 +21,7 @@ $storage = &Mnemo_Driver::singleton(); if ($uid = Horde_Util::getFormData('uid')) { $note = $storage->getByUID($uid, $passphrase); if ($note instanceof PEAR_Error) { - Horde::applicationUrl('list.php', true)->redirect(); + Horde::url('list.php', true)->redirect(); } $note_id = $note['memo_id']; @@ -32,7 +32,7 @@ if ($uid = Horde_Util::getFormData('uid')) { $note_id = Horde_Util::getFormData('note'); $notelist_id = Horde_Util::getFormData('notepad'); if (!isset($note_id) || !$notelist_id) { - Horde::applicationUrl('list.php', true)->redirect(); + Horde::url('list.php', true)->redirect(); } /* Get the current memo. */ @@ -42,17 +42,17 @@ try { $share = $GLOBALS['mnemo_shares']->getShare($notelist_id); } catch (Horde_Share_Exception $e) { $notification->push(sprintf(_("There was an error viewing this notepad: %s"), $e->getMessage()), 'horde.error'); - Horde::applicationUrl('list.php', true)->redirect(); + Horde::url('list.php', true)->redirect(); } if (!$share->hasPermission($GLOBALS['registry']->getAuth(), Horde_Perms::READ)) { $notification->push(sprintf(_("You do not have permission to view the notepad %s."), $share->get('name')), 'horde.error'); - Horde::applicationUrl('list.php', true)->redirect(); + Horde::url('list.php', true)->redirect(); } /* If the requested note doesn't exist, display an error message. */ if (!$note || !isset($note['memo_id'])) { $notification->push(_("Note not found."), 'horde.error'); - Horde::applicationUrl('list.php', true)->redirect(); + Horde::url('list.php', true)->redirect(); } /* Let's assume that the note content can be converted to ISO-8859-1 if this diff --git a/mnemo/notepads/create.php b/mnemo/notepads/create.php index e6c2c8bcf..346048d5e 100644 --- a/mnemo/notepads/create.php +++ b/mnemo/notepads/create.php @@ -17,7 +17,7 @@ require_once MNEMO_BASE . '/lib/Forms/CreateNotepad.php'; // Exit if this isn't an authenticated user or if the user can't // create new notepads (default share is locked). if (!$GLOBALS['registry']->getAuth() || $prefs->isLocked('default_notepad')) { - Horde::applicationUrl('list.php', true)->redirect(); + Horde::url('list.php', true)->redirect(); } $vars = Horde_Variables::getDefaultVariables(); @@ -32,7 +32,7 @@ if ($form->validate($vars)) { $notification->push(sprintf(_("The notepad \"%s\" has been created."), $vars->get('name')), 'horde.success'); } - Horde::applicationUrl('notepads/', true)->redirect(); + Horde::url('notepads/', true)->redirect(); } $title = $form->getTitle(); diff --git a/mnemo/notepads/delete.php b/mnemo/notepads/delete.php index cf7ca3172..73909a531 100644 --- a/mnemo/notepads/delete.php +++ b/mnemo/notepads/delete.php @@ -16,24 +16,24 @@ require_once MNEMO_BASE . '/lib/Forms/DeleteNotepad.php'; // Exit if this isn't an authenticated user. if (!$GLOBALS['registry']->getAuth()) { - Horde::applicationUrl('list.php', true)->redirect(); + Horde::url('list.php', true)->redirect(); } $vars = Horde_Variables::getDefaultVariables(); $notepad_id = $vars->get('n'); if ($notepad_id == $GLOBALS['registry']->getAuth()) { $notification->push(_("This notepad cannot be deleted"), 'horde.warning'); - Horde::applicationUrl('notepads/', true)->redirect(); + Horde::url('notepads/', true)->redirect(); } try { $notepad = $mnemo_shares->getShare($notepad_id); } catch (Horde_Share_Exception $e) { $notification->push($e->getMessage(), 'horde.error'); - Horde::applicationUrl('notepads/', true)->redirect(); + Horde::url('notepads/', true)->redirect(); } if (!$GLOBALS['registry']->getAuth() || $notepad->get('owner') != $GLOBALS['registry']->getAuth()) { $notification->push(_("You are not allowed to delete this notepad."), 'horde.error'); - Horde::applicationUrl('notepads/', true)->redirect(); + Horde::url('notepads/', true)->redirect(); } $form = new Mnemo_DeleteNotepadForm($vars, $notepad); @@ -47,7 +47,7 @@ if ($form->validate(new Horde_Variables($_POST))) { $notification->push(sprintf(_("The notepad \"%s\" has been deleted."), $notepad->get('name')), 'horde.success'); } - Horde::applicationUrl('notepads/', true)->redirect(); + Horde::url('notepads/', true)->redirect(); } $title = $form->getTitle(); diff --git a/mnemo/notepads/edit.php b/mnemo/notepads/edit.php index 836b6c534..39ee2e926 100644 --- a/mnemo/notepads/edit.php +++ b/mnemo/notepads/edit.php @@ -16,7 +16,7 @@ require_once MNEMO_BASE . '/lib/Forms/EditNotepad.php'; // Exit if this isn't an authenticated user. if (!$GLOBALS['registry']->getAuth()) { - Horde::applicationUrl('list.php', true)->redirect(); + Horde::url('list.php', true)->redirect(); } $vars = Horde_Variables::getDefaultVariables(); @@ -24,13 +24,13 @@ try { $notepad = $mnemo_shares->getShare($vars->get('n')); } catch (Horde_Share_Exception $e) { $notification->push($e->getMessage(), 'horde.error'); - Horde::applicationUrl('notepads/', true)->redirect(); + Horde::url('notepads/', true)->redirect(); } if (!$GLOBALS['registry']->getAuth() || $notepad->get('owner') != $GLOBALS['registry']->getAuth()) { $notification->push(_("You are not allowed to change this notepad."), 'horde.error'); - Horde::applicationUrl('notepads/', true)->redirect(); + Horde::url('notepads/', true)->redirect(); } $form = new Mnemo_EditNotepadForm($vars, $notepad); @@ -48,7 +48,7 @@ if ($form->validate($vars)) { } } - Horde::applicationUrl('notepads/', true)->redirect(); + Horde::url('notepads/', true)->redirect(); } $vars->set('name', $notepad->get('name')); diff --git a/mnemo/notepads/index.php b/mnemo/notepads/index.php index 56baff62f..d53ac5e75 100644 --- a/mnemo/notepads/index.php +++ b/mnemo/notepads/index.php @@ -18,9 +18,9 @@ if (!$GLOBALS['registry']->getAuth()) { exit; } -$edit_url_base = Horde::applicationUrl('notepads/edit.php'); +$edit_url_base = Horde::url('notepads/edit.php'); $perms_url_base = Horde::url($registry->get('webroot', 'horde') . '/services/shares/edit.php?app=mnemo'); -$delete_url_base = Horde::applicationUrl('notepads/delete.php'); +$delete_url_base = Horde::url('notepads/delete.php'); $notepads = Mnemo::listNotepads(true); diff --git a/mnemo/notes/index.php b/mnemo/notes/index.php index 613b14635..44173e753 100644 --- a/mnemo/notes/index.php +++ b/mnemo/notes/index.php @@ -30,7 +30,7 @@ foreach ($memos as $memo_id => $memo) { if (count($search_results) == 1) { $note = array_shift($search_results); - Horde::applicationUrl('view.php', true) + Horde::url('view.php', true) ->add(array('memo' => $note['memo_id'], 'memolist' => $note['memolist_id'])) ->redirect(); } diff --git a/mnemo/templates/common-header.inc b/mnemo/templates/common-header.inc index 1bae2f81b..5a446f99f 100644 --- a/mnemo/templates/common-header.inc +++ b/mnemo/templates/common-header.inc @@ -28,7 +28,7 @@ $bc = $prefs->getValue('show_panel') <?php echo htmlspecialchars($page_title) ?> - +> diff --git a/mnemo/templates/data/export.inc b/mnemo/templates/data/export.inc index 914d78a53..d5f9a4c98 100644 --- a/mnemo/templates/data/export.inc +++ b/mnemo/templates/data/export.inc @@ -1,7 +1,7 @@

-"> +">
diff --git a/mnemo/templates/data/import.inc b/mnemo/templates/data/import.inc index 22bf518a9..264d95198 100644 --- a/mnemo/templates/data/import.inc +++ b/mnemo/templates/data/import.inc @@ -1,6 +1,6 @@

- +
diff --git a/mnemo/templates/list/header.inc b/mnemo/templates/list/header.inc index a2bd0c3d3..8cf6f7217 100644 --- a/mnemo/templates/list/header.inc +++ b/mnemo/templates/list/header.inc @@ -1,12 +1,12 @@
- " onclick="$('quicksearchL').hide(); $('quicksearch').show(); $('quicksearchT').focus(); return false;"> + " onclick="$('quicksearchL').hide(); $('quicksearch').show(); $('quicksearchT').focus(); return false;">
diff --git a/mnemo/templates/list/memo_headers.inc b/mnemo/templates/list/memo_headers.inc index f5ae31b09..520cde358 100644 --- a/mnemo/templates/list/memo_headers.inc +++ b/mnemo/templates/list/memo_headers.inc @@ -30,15 +30,15 @@ function doPrefsUpdate(column, sortDown)
diff --git a/mnemo/templates/memo/memo.inc b/mnemo/templates/memo/memo.inc index 4b52c4997..8d50c2567 100644 --- a/mnemo/templates/memo/memo.inc +++ b/mnemo/templates/memo/memo.inc @@ -8,7 +8,7 @@ if ($memo_id): $share = $GLOBALS['mnemo_shares']->getShare($memolist_id); if ($share->hasPermission($GLOBALS['registry']->getAuth(), Horde_Perms::DELETE)): ?> - " onclick="window.location='';" /> + " onclick="window.location='';" /> diff --git a/mnemo/templates/panel.inc b/mnemo/templates/panel.inc index 4bf38afb9..b098567f3 100644 --- a/mnemo/templates/panel.inc +++ b/mnemo/templates/panel.inc @@ -43,7 +43,7 @@ function sbarToggle() getAuth()): ?>

- +

diff --git a/mnemo/templates/search/search.inc b/mnemo/templates/search/search.inc index 7eb15a920..e51655bb1 100644 --- a/mnemo/templates/search/search.inc +++ b/mnemo/templates/search/search.inc @@ -1,4 +1,4 @@ - +

diff --git a/mnemo/templates/view/memo.inc b/mnemo/templates/view/memo.inc index 3bb3ffea4..e238a5b58 100644 --- a/mnemo/templates/view/memo.inc +++ b/mnemo/templates/view/memo.inc @@ -8,12 +8,12 @@ $share = $GLOBALS['mnemo_shares']->getShare($memolist_id);
$memo_id, 'notepad' => $memolist_id))), _("Save as PDF"), 'smallheader'); + echo Horde::widget(Horde::url(Horde_Util::addParameter('note/pdf.php', array('note' => $memo_id, 'notepad' => $memolist_id))), _("Save as PDF"), 'smallheader'); if ($share->hasPermission($GLOBALS['registry']->getAuth(), Horde_Perms::EDIT)) { - echo ' | ' . Horde::widget(Horde::applicationUrl(Horde_Util::addParameter($memourl, 'actionID', 'modify_memo')), _("Edit"), 'smallheader', '', '', _("_Edit")); + echo ' | ' . Horde::widget(Horde::url(Horde_Util::addParameter($memourl, 'actionID', 'modify_memo')), _("Edit"), 'smallheader', '', '', _("_Edit")); } if ($share->hasPermission($GLOBALS['registry']->getAuth(), Horde_Perms::DELETE)) { - echo ' | ' . Horde::widget(Horde::applicationUrl(Horde_Util::addParameter($memourl, 'actionID', 'delete_memos')), _("Delete"), 'smallheader', '', $prefs->getValue('delete_opt') ? 'return window.confirm(\'' . addslashes(_("Really delete this note?")) . '\');' : '', _("_Delete")); + echo ' | ' . Horde::widget(Horde::url(Horde_Util::addParameter($memourl, 'actionID', 'delete_memos')), _("Delete"), 'smallheader', '', $prefs->getValue('delete_opt') ? 'return window.confirm(\'' . addslashes(_("Really delete this note?")) . '\');' : '', _("_Delete")); } } ?> diff --git a/mnemo/view.php b/mnemo/view.php index 756447850..343168d79 100644 --- a/mnemo/view.php +++ b/mnemo/view.php @@ -19,7 +19,7 @@ $storage = Mnemo_Driver::singleton(); if ($uid = Horde_Util::getFormData('uid')) { $memo = $storage->getByUID($uid, $passphrase); if (is_a($memo, 'PEAR_Error')) { - Horde::applicationUrl('list.php', true)->redirect(); + Horde::url('list.php', true)->redirect(); } $memo_id = $memo['memo_id']; @@ -30,7 +30,7 @@ if ($uid = Horde_Util::getFormData('uid')) { $memo_id = Horde_Util::getFormData('memo'); $memolist_id = Horde_Util::getFormData('memolist'); if (!isset($memo_id) || !$memolist_id) { - Horde::applicationUrl('list.php', true)->redirect(); + Horde::url('list.php', true)->redirect(); } /* Get the current memo. */ @@ -40,17 +40,17 @@ try { $share = $GLOBALS['mnemo_shares']->getShare($memolist_id); } catch (Horde_Share_Exception $e) { $notification->push(sprintf(_("There was an error viewing this notepad: %s"), $e->getMessage()), 'horde.error'); - Horde::applicationUrl('list.php', true)->redirect(); + Horde::url('list.php', true)->redirect(); } if (!$share->hasPermission($GLOBALS['registry']->getAuth(), Horde_Perms::READ)) { $notification->push(sprintf(_("You do not have permission to view the notepad %s."), $share->get('name')), 'horde.error'); - Horde::applicationUrl('list.php', true)->redirect(); + Horde::url('list.php', true)->redirect(); } /* If the requested note doesn't exist, display an error message. */ if (!$memo || !isset($memo['memo_id'])) { $notification->push(_("Note not found."), 'horde.error'); - Horde::applicationUrl('list.php', true)->redirect(); + Horde::url('list.php', true)->redirect(); } /* Get the note's history. */ diff --git a/nag/lib/Api.php b/nag/lib/Api.php index 203b5dd07..a23a3c902 100644 --- a/nag/lib/Api.php +++ b/nag/lib/Api.php @@ -1356,9 +1356,9 @@ class Nag_Api extends Horde_Registry_Api 'variable_length' => false, 'params' => array('task' => $task->id, 'tasklist' => $task->tasklist), - 'link' => Horde::applicationUrl('view.php', true)->add(array('tasklist' => $task->tasklist, 'task' => $task->id)), - 'edit_link' => Horde::applicationUrl('task.php', true)->add(array('tasklist' => $task->tasklist, 'task' => $task->id, 'actionID' => 'modify_task')), - 'delete_link' => Horde::applicationUrl('task.php', true)->add(array('tasklist' => $task->tasklist, 'task' => $task->id, 'actionID' => 'delete_task')), + 'link' => Horde::url('view.php', true)->add(array('tasklist' => $task->tasklist, 'task' => $task->id)), + 'edit_link' => Horde::url('task.php', true)->add(array('tasklist' => $task->tasklist, 'task' => $task->id, 'actionID' => 'modify_task')), + 'delete_link' => Horde::url('task.php', true)->add(array('tasklist' => $task->tasklist, 'task' => $task->id, 'actionID' => 'delete_task')), 'ajax_link' => 'task:' . $task->tasklist . ':' . $task->id); } diff --git a/nag/lib/Application.php b/nag/lib/Application.php index 8f3bdfa47..b10c242b2 100644 --- a/nag/lib/Application.php +++ b/nag/lib/Application.php @@ -319,7 +319,7 @@ class Nag_Application extends Horde_Registry_Application $title = ($differential >= 60) ? sprintf(_("%s is due in %s"), $task->name, Nag::secondsToString($differential)) : sprintf(_("%s is due now."), $task->name); - $url = Horde::applicationUrl('view.php')->add(array( + $url = Horde::url('view.php')->add(array( 'task' => $task->id, 'tasklist' => $task->tasklist )); @@ -366,7 +366,7 @@ class Nag_Application extends Horde_Registry_Application break; case 'menu': - $add = Horde::applicationUrl('task.php')->add('actionID', 'add_task'); + $add = Horde::url('task.php')->add('actionID', 'add_task'); $tree->addNode( $parent . '__new', @@ -408,7 +408,7 @@ class Nag_Application extends Horde_Registry_Application false, array( 'icon' => Horde_Themes::img('search.png'), - 'url' => Horde::applicationUrl('search.php') + 'url' => Horde::url('search.php') ) ); break; diff --git a/nag/lib/Block/summary.php b/nag/lib/Block/summary.php index 3631ae7dd..0470144e1 100644 --- a/nag/lib/Block/summary.php +++ b/nag/lib/Block/summary.php @@ -17,7 +17,7 @@ class Horde_Block_nag_summary extends Horde_Block ? $this->_params['block_title'] : $registry->get('name'); - return Horde::applicationUrl($registry->getInitialPage(), true)->link() + return Horde::url($registry->getInitialPage(), true)->link() . htmlspecialchars($label) . ''; } @@ -113,7 +113,7 @@ class Horde_Block_nag_summary extends Horde_Block array('task' => $task->id, 'tasklist' => $task->tasklist)); $link = Horde::link( - htmlspecialchars(Horde::applicationUrl($viewurl, true))) + htmlspecialchars(Horde::url($viewurl, true))) . (!empty($task->name) ? htmlspecialchars($task->name) : _("[none]")) . ''; @@ -181,7 +181,7 @@ class Horde_Block_nag_summary extends Horde_Block 'url' => Horde::selfUrl(true))); $label = sprintf(_("Edit \"%s\""), $task->name); $html .= '
'; if ($task->completed) { @@ -190,7 +190,7 @@ class Horde_Block_nag_summary extends Horde_Block } else { $label = sprintf(_("Complete \"%s\""), $task->name); $html .= ''; } } @@ -217,7 +217,7 @@ class Horde_Block_nag_summary extends Horde_Block 'tasklist' => $task->tasklist)); $html .= $task->treeIcons() . Horde::link( - htmlspecialchars(Horde::applicationUrl($viewurl, true)), + htmlspecialchars(Horde::url($viewurl, true)), $task->desc) . (!empty($task->name) ? htmlspecialchars($task->name) : _("[none]")) @@ -248,7 +248,7 @@ class Horde_Block_nag_summary extends Horde_Block } return '' . '
width="2%"> -   +   width="82%"> - + width="15%"> getAuth() && (!$GLOBALS['prefs']->isLocked('categories') || !$GLOBALS['prefs']->isLocked('category_colors'))) { $categoryUrl = Horde_Util::addParameter(Horde::url($GLOBALS['registry']->get('webroot', 'horde') . '/services/prefs.php'), array('app' => 'horde', 'group' => 'categories')); diff --git a/mnemo/templates/list/memo_summaries.inc b/mnemo/templates/list/memo_summaries.inc index 095478d5d..2b2ed56ca 100644 --- a/mnemo/templates/list/memo_summaries.inc +++ b/mnemo/templates/list/memo_summaries.inc @@ -3,7 +3,7 @@ hasPermission($GLOBALS['registry']->getAuth(), Horde_Perms::EDIT)) { $label = sprintf(_("Edit \"%s\""), $memo['desc']); - echo Horde::link(Horde::applicationUrl(Horde_Util::addParameter($memourl, 'actionID', 'modify_memo')), $label) . + echo Horde::link(Horde::url(Horde_Util::addParameter($memourl, 'actionID', 'modify_memo')), $label) . Horde::img('edit.png', $label, '') . ''; } ?> @@ -12,7 +12,7 @@ if ($share->hasPermission($GLOBALS['registry']->getAuth(), Horde_Perms::EDIT)) { - ' . _("Empty Note") . '') ?> + ' . _("Empty Note") . '') ?>
' - . Horde::link(htmlspecialchars(Horde::applicationUrl(Horde_Util::addParameter($taskurl, 'actionID', 'modify_task'), true)), $label) + . Horde::link(htmlspecialchars(Horde::url(Horde_Util::addParameter($taskurl, 'actionID', 'modify_task'), true)), $label) . Horde::img('edit.png', $label) . '' - . Horde::link(htmlspecialchars(Horde::applicationUrl(Horde_Util::addParameter($taskurl, 'actionID', 'complete_task'), true)), $label) + . Horde::link(htmlspecialchars(Horde::url(Horde_Util::addParameter($taskurl, 'actionID', 'complete_task'), true)), $label) . Horde::img('unchecked.png', $label) . '
' diff --git a/nag/lib/Nag.php b/nag/lib/Nag.php index f15f34dc0..2821cb3e9 100644 --- a/nag/lib/Nag.php +++ b/nag/lib/Nag.php @@ -762,23 +762,23 @@ class Nag global $conf, $registry; $menu = new Horde_Menu(); - $menu->add(Horde::applicationUrl('list.php'), _("_List Tasks"), 'nag.png', null, null, null, basename($_SERVER['PHP_SELF']) == 'index.php' ? 'current' : null); + $menu->add(Horde::url('list.php'), _("_List Tasks"), 'nag.png', null, null, null, basename($_SERVER['PHP_SELF']) == 'index.php' ? 'current' : null); if (Nag::getDefaultTasklist(Horde_Perms::EDIT) && (!empty($conf['hooks']['permsdenied']) || $GLOBALS['injector']->getInstance('Horde_Perms')->hasAppPermission('max_tasks') === true || $GLOBALS['injector']->getInstance('Horde_Perms')->hasAppPermission('max_tasks') > Nag::countTasks())) { - $menu->add(Horde::applicationUrl('task.php')->add('actionID', 'add_task'), _("_New Task"), 'add.png', null, null, null, Horde_Util::getFormData('task') ? '__noselection' : null); + $menu->add(Horde::url('task.php')->add('actionID', 'add_task'), _("_New Task"), 'add.png', null, null, null, Horde_Util::getFormData('task') ? '__noselection' : null); if ($GLOBALS['browser']->hasFeature('dom')) { $menu->add(new Horde_Url(''), _("_Quick Add"), 'add.png', null, null, 'Nag.quickAddPanel.show(); $(\'quickText\').focus(); return false;', Horde_Util::getFormData('task') ? 'quickAdd __noselection' : 'quickAdd'); } } /* Search. */ - $menu->add(Horde::applicationUrl('search.php'), _("_Search"), 'search.png', Horde_Themes::img(null, 'horde')); + $menu->add(Horde::url('search.php'), _("_Search"), 'search.png', Horde_Themes::img(null, 'horde')); /* Import/Export. */ if ($conf['menu']['import_export']) { - $menu->add(Horde::applicationUrl('data.php'), _("_Import/Export"), 'data.png', Horde_Themes::img(null, 'horde')); + $menu->add(Horde::url('data.php'), _("_Import/Export"), 'data.png', Horde_Themes::img(null, 'horde')); } return $menu; @@ -911,7 +911,7 @@ class Nag foreach ($addresses as $lang => $twentyFour) { $GLOBALS['registry']->setLanguageEnvironment($lang); - $view_link = Horde_Util::addParameter(Horde::applicationUrl('view.php', true), + $view_link = Horde_Util::addParameter(Horde::url('view.php', true), array('tasklist' => $task->tasklist, 'task' => $task->id), null, false); diff --git a/nag/lib/Task.php b/nag/lib/Task.php index b87f31619..0a88bdf89 100644 --- a/nag/lib/Task.php +++ b/nag/lib/Task.php @@ -511,8 +511,8 @@ class Nag_Task { } if (!isset($view_url_list[$this->tasklist])) { - $view_url_list[$this->tasklist] = Horde_Util::addParameter(Horde::applicationUrl('view.php'), 'tasklist', $this->tasklist); - $task_url_list[$this->tasklist] = Horde_Util::addParameter(Horde::applicationUrl('task.php'), 'tasklist', $this->tasklist); + $view_url_list[$this->tasklist] = Horde_Util::addParameter(Horde::url('view.php'), 'tasklist', $this->tasklist); + $task_url_list[$this->tasklist] = Horde_Util::addParameter(Horde::url('task.php'), 'tasklist', $this->tasklist); } /* Obscure private tasks. */ diff --git a/nag/list.php b/nag/list.php index 763667bb6..ed09bc7e0 100644 --- a/nag/list.php +++ b/nag/list.php @@ -94,7 +94,7 @@ require NAG_TEMPLATES . '/menu.inc'; echo '
'; if (!$prefs->isLocked('show_completed')) { - $listurl = Horde::applicationUrl('list.php'); + $listurl = Horde::url('list.php'); $tabs = new Horde_Core_Ui_Tabs('show_completed', $vars); $tabs->addTab(_("_All tasks"), $listurl, Nag::VIEW_ALL); $tabs->addTab(_("Incom_plete tasks"), $listurl, Nag::VIEW_INCOMPLETE); diff --git a/nag/quick.php b/nag/quick.php index 0118416fe..03c6a5c69 100644 --- a/nag/quick.php +++ b/nag/quick.php @@ -9,5 +9,5 @@ if ($quickText = Horde_Util::getPost('quickText')) { throw new Nag_Exception($result); } $notification->push(sprintf(ngettext("Added %d task", "Added %d tasks", count($result)), count($result)), 'horde.success'); - Horde::applicationUrl('list.php', true)->redirect(); + Horde::url('list.php', true)->redirect(); } diff --git a/nag/task.php b/nag/task.php index d425706dc..250dd9c7a 100644 --- a/nag/task.php +++ b/nag/task.php @@ -46,7 +46,7 @@ function _delete($task_id, $tasklist_id) header('Location: ' . $url); exit; } - Horde::applicationUrl('list.php', true)->redirect(); + Horde::url('list.php', true)->redirect(); } require_once dirname(__FILE__) . '/lib/Application.php'; @@ -58,7 +58,7 @@ $vars = Horde_Variables::getDefaultVariables(); /* Redirect to the task list if no action has been requested. */ $actionID = $vars->get('actionID'); if (is_null($actionID)) { - Horde::applicationUrl('list.php', true)->redirect(); + Horde::url('list.php', true)->redirect(); } /* Run through the action handlers. */ @@ -74,7 +74,7 @@ case 'add_task': $message = @htmlspecialchars(sprintf(_("You are not allowed to create more than %d tasks."), $perms->hasAppPermission('max_tasks')), ENT_COMPAT, $GLOBALS['registry']->getCharset()); } $notification->push($message, 'horde.error', array('content.raw')); - Horde::applicationUrl('list.php', true)->redirect(); + Horde::url('list.php', true)->redirect(); } $vars->set('actionID', 'save_task'); @@ -111,7 +111,7 @@ case 'modify_task': } /* Return to the task list. */ - Horde::applicationUrl('list.php', true)->redirect(); + Horde::url('list.php', true)->redirect(); case 'save_task': if ($vars->get('submitbutton') == _("Delete this task")) { @@ -132,11 +132,11 @@ case 'save_task': $share = $GLOBALS['nag_shares']->getShare($info['tasklist_id']); } catch (Horde_Share_Exception $e) { $notification->push(sprintf(_("Access denied saving task: %s"), $e->getMessage()), 'horde.error'); - Horde::applicationUrl('list.php', true)->redirect(); + Horde::url('list.php', true)->redirect(); } if (!$share->hasPermission($GLOBALS['registry']->getAuth(), Horde_Perms::EDIT)) { $notification->push(sprintf(_("Access denied saving task to %s."), $share->get('name')), 'horde.error'); - Horde::applicationUrl('list.php', true)->redirect(); + Horde::url('list.php', true)->redirect(); } /* Add new category. */ @@ -165,7 +165,7 @@ case 'save_task': $perms = $GLOBALS['injector']->getInstance('Horde_Perms'); if ($perms->hasAppPermission('max_tasks') !== true && $perms->hasAppPermission('max_tasks') <= Nag::countTasks()) { - Horde::applicationUrl('list.php', true)->redirect(); + Horde::url('list.php', true)->redirect(); } /* Creating a new task. */ @@ -190,7 +190,7 @@ case 'save_task': header('Location: ' . $url); exit; } - Horde::applicationUrl('list.php', true)->redirect(); + Horde::url('list.php', true)->redirect(); } break; @@ -235,10 +235,10 @@ case 'complete_task': header('Location: ' . $url); exit; } - Horde::applicationUrl('list.php', true)->redirect(); + Horde::url('list.php', true)->redirect(); default: - Horde::applicationUrl('list.php', true)->redirect(); + Horde::url('list.php', true)->redirect(); } $title = $form->getTitle(); diff --git a/nag/tasklists/create.php b/nag/tasklists/create.php index 413f74584..e4df3f966 100644 --- a/nag/tasklists/create.php +++ b/nag/tasklists/create.php @@ -14,7 +14,7 @@ require_once NAG_BASE . '/lib/Forms/CreateTaskList.php'; // Exit if this isn't an authenticated user or if the user can't // create new task lists (default share is locked). if (!$GLOBALS['registry']->getAuth() || $prefs->isLocked('default_tasklist')) { - Horde::applicationUrl('list.php', true)->redirect(); + Horde::url('list.php', true)->redirect(); } $vars = Horde_Variables::getDefaultVariables(); @@ -29,7 +29,7 @@ if ($form->validate($vars)) { $notification->push($e, 'horde.error'); } - Horde::applicationUrl('tasklists/', true)->redirect(); + Horde::url('tasklists/', true)->redirect(); } $title = $form->getTitle(); diff --git a/nag/tasklists/delete.php b/nag/tasklists/delete.php index 4c43289f1..3776b0616 100644 --- a/nag/tasklists/delete.php +++ b/nag/tasklists/delete.php @@ -13,25 +13,25 @@ require_once NAG_BASE . '/lib/Forms/DeleteTaskList.php'; // Exit if this isn't an authenticated user. if (!$GLOBALS['registry']->getAuth()) { - Horde::applicationUrl('list.php', true)->redirect(); + Horde::url('list.php', true)->redirect(); } $vars = Horde_Variables::getDefaultVariables(); $tasklist_id = $vars->get('t'); if ($tasklist_id == $GLOBALS['registry']->getAuth()) { $notification->push(_("This task list cannot be deleted."), 'horde.warning'); - Horde::applicationUrl('tasklists/', true)->redirect(); + Horde::url('tasklists/', true)->redirect(); } try { $tasklist = $nag_shares->getShare($tasklist_id); } catch (Horde_Share_Exception $e) { $notification->push($tasklist, 'horde.error'); - Horde::applicationUrl('tasklists/', true)->redirect(); + Horde::url('tasklists/', true)->redirect(); } if ($tasklist->get('owner') != $GLOBALS['registry']->getAuth() && (!is_null($tasklist->get('owner')) || !$GLOBALS['registry']->isAdmin())) { $notification->push(_("You are not allowed to delete this task list."), 'horde.error'); - Horde::applicationUrl('tasklists/', true)->redirect(); + Horde::url('tasklists/', true)->redirect(); } $form = new Nag_DeleteTaskListForm($vars, $tasklist); @@ -45,7 +45,7 @@ if ($form->validate(new Horde_Variables($_POST))) { $notification->push($e, 'horde.error'); } - Horde::applicationUrl('tasklists/', true)->redirect(); + Horde::url('tasklists/', true)->redirect(); } $title = $form->getTitle(); diff --git a/nag/tasklists/edit.php b/nag/tasklists/edit.php index 784218568..f7aac3c8c 100644 --- a/nag/tasklists/edit.php +++ b/nag/tasklists/edit.php @@ -13,7 +13,7 @@ require_once NAG_BASE . '/lib/Forms/EditTaskList.php'; // Exit if this isn't an authenticated user. if (!$GLOBALS['registry']->getAuth()) { - Horde::applicationUrl('list.php', true)->redirect(); + Horde::url('list.php', true)->redirect(); } $vars = Horde_Variables::getDefaultVariables(); @@ -21,12 +21,12 @@ try { $tasklist = $nag_shares->getShare($vars->get('t')); } catch (Horde_Share_Exception $e) { $notification->push($e->getMessage(), 'horde.error'); - Horde::applicationUrl('tasklists/', true)->redirect(); + Horde::url('tasklists/', true)->redirect(); } if ($tasklist->get('owner') != $GLOBALS['registry']->getAuth() && (!is_null($tasklist->get('owner')) || !$GLOBALS['registry']->isAdmin())) { $notification->push(_("You are not allowed to change this task list."), 'horde.error'); - Horde::applicationUrl('tasklists/', true)->redirect(); + Horde::url('tasklists/', true)->redirect(); } $form = new Nag_EditTaskListForm($vars, $tasklist); @@ -44,7 +44,7 @@ if ($form->validate($vars)) { $notification->push($e, 'horde.error'); } - Horde::applicationUrl('tasklists/', true)->redirect(); + Horde::url('tasklists/', true)->redirect(); } $vars->set('name', $tasklist->get('name')); diff --git a/nag/tasklists/index.php b/nag/tasklists/index.php index fb50951d5..a0a081d54 100644 --- a/nag/tasklists/index.php +++ b/nag/tasklists/index.php @@ -30,10 +30,10 @@ if (!$GLOBALS['registry']->getAuth()) { exit; } -$edit_url_base = Horde::applicationUrl('tasklists/edit.php'); +$edit_url_base = Horde::url('tasklists/edit.php'); $perms_url_base = Horde::url($registry->get('webroot', 'horde') . '/services/shares/edit.php?app=nag'); -$delete_url_base = Horde::applicationUrl('tasklists/delete.php'); -$display_url_base = Horde::applicationUrl('list.php', true, -1); +$delete_url_base = Horde::url('tasklists/delete.php'); +$display_url_base = Horde::url('list.php', true, -1); $subscribe_url_base = $registry->get('webroot', 'horde'); if (isset($conf['urls']['pretty']) && $conf['urls']['pretty'] == 'rewrite') { $subscribe_url_base .= '/rpc/nag/'; diff --git a/nag/templates/common-header.inc b/nag/templates/common-header.inc index af76d1b78..e3e8118c6 100644 --- a/nag/templates/common-header.inc +++ b/nag/templates/common-header.inc @@ -25,7 +25,7 @@ $bc = $prefs->getValue('show_panel') <?php echo htmlspecialchars($page_title) ?> - + diff --git a/nag/templates/list/header.inc b/nag/templates/list/header.inc index 143a10b57..75143acd9 100644 --- a/nag/templates/list/header.inc +++ b/nag/templates/list/header.inc @@ -1,11 +1,11 @@
count() . ')' ?> - " onclick="$('quicksearchL').hide(); $('quicksearch').show(); $('quicksearchT').focus(); return false;"> + " onclick="$('quicksearchL').hide(); $('quicksearch').show(); $('quicksearchT').focus(); return false;">
diff --git a/nag/templates/list/task_headers.inc b/nag/templates/list/task_headers.inc index 51c7fa826..d3bcd131b 100644 --- a/nag/templates/list/task_headers.inc +++ b/nag/templates/list/task_headers.inc @@ -28,44 +28,44 @@ function doPrefsUpdate(column, sortDown)
width="2%"> - + width="2%"> -   +   width="2%"> -   +   > -   +   width="2%"> -   +   width="2%"> -   +   width="10%"> -   +   width="10%"> -   +   width="10%"> -   +   getAuth() && (!$GLOBALS['prefs']->isLocked('categories') || diff --git a/nag/templates/panel.inc b/nag/templates/panel.inc index e570756e1..c95534f7b 100644 --- a/nag/templates/panel.inc +++ b/nag/templates/panel.inc @@ -41,7 +41,7 @@ document.observe('dom:loaded', function() { $$('#pageControlsInner .tasklist-info').invoke('observe', 'click', function() { RedBox.loading(); var tasklist_id = this.previous().down('.checkbox').value; - new Ajax.Request('', { + new Ajax.Request('', { parameters: { t: tasklist_id }, method: 'get', onSuccess: function(transport) { @@ -68,7 +68,7 @@ document.observe('dom:loaded', function() { getAuth()): ?>

- +

diff --git a/nag/templates/view/task.inc b/nag/templates/view/task.inc index ce449dc87..cdb4a6edb 100644 --- a/nag/templates/view/task.inc +++ b/nag/templates/view/task.inc @@ -43,9 +43,9 @@ 		hasPermission($GLOBALS['registry']->getAuth(), Horde_Perms::EDIT)) { if (empty($task->completed)) { - echo Horde::link(Horde::applicationUrl(Horde_Util::addParameter($taskurl, 'actionID', 'complete_task')), _("Complete Task"), 'widget') . Horde::img('unchecked.png', _("Complete Task")) . ''; + echo Horde::link(Horde::url(Horde_Util::addParameter($taskurl, 'actionID', 'complete_task')), _("Complete Task"), 'widget') . Horde::img('unchecked.png', _("Complete Task")) . ''; } else { - echo Horde::link(Horde::applicationUrl(Horde_Util::addParameter($taskurl, 'actionID', 'complete_task')), _("Mark as incomplete"), 'widget') . Horde::img('checked.png', _("Mark as incomplete")) . ''; + echo Horde::link(Horde::url(Horde_Util::addParameter($taskurl, 'actionID', 'complete_task')), _("Mark as incomplete"), 'widget') . Horde::img('checked.png', _("Mark as incomplete")) . ''; } } else { echo Nag::formatCompletion($task->completed) . ''; diff --git a/nag/view.php b/nag/view.php index 6c850ad13..57fb9075f 100644 --- a/nag/view.php +++ b/nag/view.php @@ -15,7 +15,7 @@ if ($uid = Horde_Util::getFormData('uid')) { $storage = Nag_Driver::singleton(); $task = $storage->getByUID($uid); if ($task instanceof PEAR_Error) { - Horde::applicationUrl('list.php', true)->redirect(); + Horde::url('list.php', true)->redirect(); } $task_id = $task->id; @@ -26,7 +26,7 @@ if ($uid = Horde_Util::getFormData('uid')) { $task_id = Horde_Util::getFormData('task'); $tasklist_id = Horde_Util::getFormData('tasklist'); if (!isset($task_id) || !$tasklist_id) { - Horde::applicationUrl('list.php', true)->redirect(); + Horde::url('list.php', true)->redirect(); } /* Get the current task. */ @@ -36,7 +36,7 @@ if ($uid = Horde_Util::getFormData('uid')) { /* If the requested task doesn't exist, display an error message. */ if (!isset($task) || !isset($task->id)) { $notification->push(_("Task not found."), 'horde.error'); - Horde::applicationUrl('list.php', true)->redirect(); + Horde::url('list.php', true)->redirect(); } /* Load child tasks */ @@ -46,7 +46,7 @@ $task->loadChildren(); $share = $GLOBALS['nag_shares']->getShare($tasklist_id); if (!$share->hasPermission($GLOBALS['registry']->getAuth(), Horde_Perms::READ)) { $notification->push(_("You do not have permission to view this tasklist."), 'horde.error'); - Horde::applicationUrl('list.php', true)->redirect(); + Horde::url('list.php', true)->redirect(); } /* Get the task's history. */ @@ -103,14 +103,14 @@ try { } if ($share->hasPermission($GLOBALS['registry']->getAuth(), Horde_Perms::EDIT)) { if (!$task->completed) { - $links[] = Horde::widget(Horde::applicationUrl(Horde_Util::addParameter($taskurl, 'actionID', 'complete_task')), _("Complete"), 'smallheader', '', '', _("_Complete")); + $links[] = Horde::widget(Horde::url(Horde_Util::addParameter($taskurl, 'actionID', 'complete_task')), _("Complete"), 'smallheader', '', '', _("_Complete")); } if (!$task->private || $task->owner == $GLOBALS['registry']->getAuth()) { - $links[] = Horde::widget(Horde::applicationUrl(Horde_Util::addParameter($taskurl, 'actionID', 'modify_task')), _("Edit"), 'smallheader', '', '', _("_Edit")); + $links[] = Horde::widget(Horde::url(Horde_Util::addParameter($taskurl, 'actionID', 'modify_task')), _("Edit"), 'smallheader', '', '', _("_Edit")); } } if ($share->hasPermission($GLOBALS['registry']->getAuth(), Horde_Perms::DELETE)) { - $links[] = Horde::widget(Horde::applicationUrl(Horde_Util::addParameter($taskurl, 'actionID', 'delete_task')), _("Delete"), 'smallheader', '', $prefs->getValue('delete_opt') ? 'return window.confirm(\'' . addslashes(_("Really delete this task?")) . '\');' : '', _("_Delete")); + $links[] = Horde::widget(Horde::url(Horde_Util::addParameter($taskurl, 'actionID', 'delete_task')), _("Delete"), 'smallheader', '', $prefs->getValue('delete_opt') ? 'return window.confirm(\'' . addslashes(_("Really delete this task?")) . '\');' : '', _("_Delete")); } require NAG_TEMPLATES . '/common-header.inc'; diff --git a/news/add.php b/news/add.php index 355150c5c..c477d8bc9 100644 --- a/news/add.php +++ b/news/add.php @@ -334,7 +334,7 @@ if ($form->validate()) { $id = $news->write_db->nextID($news->prefix); if ($id instanceof PEAR_Error) { $notification->push($id); - Horde::applicationUrl('browse.php')->redirect(); + Horde::url('browse.php')->redirect(); } $query = 'INSERT INTO ' . $news->prefix @@ -394,7 +394,7 @@ if ($form->validate()) { $result = $news->write_db->query($query, $data); if ($result instanceof PEAR_Error) { $notification->push($result->getDebugInfo(), 'horde.error'); - Horde::applicationUrl('edit.php')->redirect(); + Horde::url('edit.php')->redirect(); } // Picture @@ -537,9 +537,9 @@ if ($form->validate()) { $url = $return; } elseif (in_array($info['category1'], $allowed_cats) || in_array($info['category2'], $allowed_cats)) { - $url = Horde_Util::addParameter(Horde::applicationUrl('edit.php'), 'id', $id); + $url = Horde_Util::addParameter(Horde::url('edit.php'), 'id', $id); } else { - $url = Horde::applicationUrl('browse.php'); + $url = Horde::url('browse.php'); } if ($info['status'] != News::CONFIRMED && $status_inserted == true) { @@ -600,6 +600,6 @@ require_once NEWS_TEMPLATES . '/common-header.inc'; require_once NEWS_TEMPLATES . '/menu.inc'; require_once NEWS_TEMPLATES . '/add/before.inc'; -$form->renderActive(null, null, Horde_Util::addParameter(Horde::applicationUrl('add.php'), 'id', $id, false), 'post'); +$form->renderActive(null, null, Horde_Util::addParameter(Horde::url('add.php'), 'id', $id, false), 'post'); require_once $registry->get('templates', 'horde') . '/common-footer.inc'; diff --git a/news/admin/categories/delete.php b/news/admin/categories/delete.php index aa92471c6..71bd03606 100644 --- a/news/admin/categories/delete.php +++ b/news/admin/categories/delete.php @@ -31,7 +31,7 @@ if ($form->validate()) { } else { $notification->push(_("Category was not deleted."), 'horde.warning'); } - Horde::applicationUrl('admin/categories/index.php')->redirect(); + Horde::url('admin/categories/index.php')->redirect(); } require NEWS_BASE . '/templates/common-header.inc'; diff --git a/news/admin/categories/edit.php b/news/admin/categories/edit.php index 33fdefb4e..f754326a1 100644 --- a/news/admin/categories/edit.php +++ b/news/admin/categories/edit.php @@ -44,7 +44,7 @@ if ($form->validate()) { $notification->push($result->getMessage() . ': ' . $result->getDebugInfo(), 'horde.error'); } else { $notification->push(sprintf(_("Category succesfully saved."))); - Horde::applicationUrl('admin/categories/index.php', true)->redirect(); + Horde::url('admin/categories/index.php', true)->redirect(); } } diff --git a/news/admin/categories/index.php b/news/admin/categories/index.php index f4d53f24e..3faacff44 100644 --- a/news/admin/categories/index.php +++ b/news/admin/categories/index.php @@ -23,9 +23,9 @@ if ($categories instanceof PEAR_Error) { /* Set up the template fields. */ $title = _("Category Administration"); -$edit_url = Horde::applicationUrl('admin/categories/edit.php'); +$edit_url = Horde::url('admin/categories/edit.php'); $edit_img = Horde::img('edit.png', _("Edit")); -$delete_url = Horde::applicationUrl('admin/categories/delete.php'); +$delete_url = Horde::url('admin/categories/delete.php'); $delete_img = Horde::img('delete.png', _("Delete")); foreach ($categories as $category_id => $category) { diff --git a/news/admin/sources/delete.php b/news/admin/sources/delete.php index 968db2895..a7a6d3b8e 100644 --- a/news/admin/sources/delete.php +++ b/news/admin/sources/delete.php @@ -32,7 +32,7 @@ if ($form->validate()) { } else { $notification->push(_("Source was not deleted."), 'horde.warning'); } - Horde::applicationUrl('admin/sources/index.php')->redirect(); + Horde::url('admin/sources/index.php')->redirect(); } require NEWS_BASE . '/templates/common-header.inc'; diff --git a/news/admin/sources/edit.php b/news/admin/sources/edit.php index e99fe7825..40070a01c 100644 --- a/news/admin/sources/edit.php +++ b/news/admin/sources/edit.php @@ -43,7 +43,7 @@ if ($form->validate()) { $notification->push($result->getMessage() . ': ' . $result->getDebugInfo(), 'horde.error'); } else { $notification->push(_("Source saved succesfully.")); - Horde::applicationUrl('admin/sources/index.php')->redirect(); + Horde::url('admin/sources/index.php')->redirect(); } } diff --git a/news/admin/sources/index.php b/news/admin/sources/index.php index d9c7ed9f3..f6be8513c 100644 --- a/news/admin/sources/index.php +++ b/news/admin/sources/index.php @@ -21,11 +21,11 @@ if ($sources instanceof PEAR_Error) { $sources = array(); } -$edit_url = Horde::applicationUrl('admin/sources/edit.php'); +$edit_url = Horde::url('admin/sources/edit.php'); $edit_img = Horde::img('edit.png', _("Edit")); -$delete_url = Horde::applicationUrl('admin/sources/delete.php'); +$delete_url = Horde::url('admin/sources/delete.php'); $delete_img = Horde::img('delete.png', _("Delete")); -$view_url = Horde::applicationUrl('browse.php'); +$view_url = Horde::url('browse.php'); $view_img = Horde::img('category.png', _("View items")); foreach ($sources as $source_id => $source) { diff --git a/news/admin/tabs.php b/news/admin/tabs.php index f5d715d0b..6e0f6a691 100644 --- a/news/admin/tabs.php +++ b/news/admin/tabs.php @@ -19,5 +19,5 @@ if (!$registry->isAdmin(array('permission' => 'news:admin'))) { $vars = Horde_Variables::getDefaultVariables(); $tabs = new Horde_Core_Ui_Tabs('admin', $vars); -$tabs->addTab(_("Sources"), Horde::applicationUrl('admin/sources/index.php'), 'sources'); -$tabs->addTab(_("Categories"), Horde::applicationUrl('admin/categories/index.php'), 'categories'); +$tabs->addTab(_("Sources"), Horde::url('admin/sources/index.php'), 'sources'); +$tabs->addTab(_("Categories"), Horde::url('admin/categories/index.php'), 'categories'); diff --git a/news/browse.php b/news/browse.php index deaf0891f..c634762a4 100644 --- a/news/browse.php +++ b/news/browse.php @@ -19,7 +19,7 @@ require_once dirname(__FILE__) . '/lib/base.php'; $title = _("Browse"); $page = Horde_Util::getGet('news_page', 0); $per_page = $prefs->getValue('per_page'); -$browse_url = Horde::applicationUrl('browse.php'); +$browse_url = Horde::url('browse.php'); $cid = Horde_Util::getGet('cid'); // Define creteria diff --git a/news/content.php b/news/content.php index 1378bb9a8..6e4b34b3f 100644 --- a/news/content.php +++ b/news/content.php @@ -16,13 +16,13 @@ require_once dirname(__FILE__) . '/lib/base.php'; // Default layout. $layout = new Horde_Block_Layout_View( unserialize($prefs->getValue('news_layout')), - Horde::applicationUrl('content_edit.php'), - Horde::applicationUrl('content.php')); + Horde::url('content_edit.php'), + Horde::url('content.php')); $layout_html = $layout->toHtml(); $title = $registry->get('name'); require NEWS_TEMPLATES . '/common-header.inc'; require NEWS_TEMPLATES . '/menu.inc'; -echo '
 
'; +echo '
 
'; echo $layout_html; require $registry->get('templates', 'horde') . '/common-footer.inc'; \ No newline at end of file diff --git a/news/delete.php b/news/delete.php index e8f26ff96..de1013536 100644 --- a/news/delete.php +++ b/news/delete.php @@ -17,7 +17,7 @@ require_once dirname(__FILE__) . '/lib/base.php'; if (!$registry->isAdmin(array('permission' => 'news:admin'))) { $notification->push(_("Only admin can delete a news.")); - Horde::applicationUrl('edit.php')->redirect(); + Horde::url('edit.php')->redirect(); } $vars = Horde_Variables::getDefaultVariables(); @@ -85,7 +85,7 @@ if ($form->validate()) { $notification->push(sprintf(_("News %s: %s"), $id, _("not deleted")), 'horde.warning'); } - Horde::applicationUrl('edit.php')->redirect(); + Horde::url('edit.php')->redirect(); } require NEWS_TEMPLATES . '/common-header.inc'; diff --git a/news/delete_file.php b/news/delete_file.php index 0615d8d1d..0ec4fe15f 100644 --- a/news/delete_file.php +++ b/news/delete_file.php @@ -17,7 +17,7 @@ require_once dirname(__FILE__) . '/lib/base.php'; if (!$registry->isAdmin(array('permission' => 'news:admin'))) { $notification->push(_("Only admin can delete a news.")); - Horde::applicationUrl('edit.php')->redirect(); + Horde::url('edit.php')->redirect(); } $vars = Horde_Variables::getDefaultVariables(); diff --git a/news/edit.php b/news/edit.php index 57b7deaf3..aab432bb0 100644 --- a/news/edit.php +++ b/news/edit.php @@ -19,14 +19,14 @@ require_once dirname(__FILE__) . '/lib/base.php'; $allowed_cats = $news_cat->getAllowed(Horde_Perms::DELETE); if (empty($allowed_cats)) { $notification->push(_("You have not editor permission on any category.")); - Horde::applicationUrl('add.php')->redirect(); + Horde::url('add.php')->redirect(); } $id = (int)Horde_Util::getFormData('id', 0); $page = (int)Horde_Util::getFormData('page', 0); -$browse_url = Horde_Util::addParameter(Horde::applicationUrl('edit.php'), array('page' => $page, 'id' => $id), null, false); -$edit_url = Horde::applicationUrl('add.php'); -$read_url = Horde::applicationUrl('reads.php'); +$browse_url = Horde_Util::addParameter(Horde::url('edit.php'), array('page' => $page, 'id' => $id), null, false); +$edit_url = Horde::url('add.php'); +$read_url = Horde::url('reads.php'); $has_comments = $registry->hasMethod('forums/doComments'); $actionID = Horde_Util::getFormData('actionID'); diff --git a/news/lib/Block/category.php b/news/lib/Block/category.php index 8b04ef6be..308261511 100755 --- a/news/lib/Block/category.php +++ b/news/lib/Block/category.php @@ -16,7 +16,7 @@ class Horde_Block_News_category extends Horde_Block { { require_once dirname(__FILE__) . '/../base.php'; - $url = Horde_Util::addParameter(Horde::applicationUrl('browse.php'), 'category', $this->_params['category']); + $url = Horde_Util::addParameter(Horde::url('browse.php'), 'category', $this->_params['category']); $name = $GLOBALS['news_cat']->getName($this->_params['category']); $html = Horde::link($url, sprintf(_("Last news in %s"), $name), 'header'); $html .= sprintf(_("Last news in %s"), $name) . ''; @@ -58,7 +58,7 @@ class Horde_Block_News_category extends Horde_Block { } $view = new News_View(); $view->news = $rows; - $view->moreurl = Horde_Util::addParameter(Horde::applicationUrl('browse.php'), 'category', $this->_params['category']); + $view->moreurl = Horde_Util::addParameter(Horde::url('browse.php'), 'category', $this->_params['category']); return $view->render('/block/news.php'); } diff --git a/news/lib/Block/jonah.php b/news/lib/Block/jonah.php index 05b89641f..6431993cd 100755 --- a/news/lib/Block/jonah.php +++ b/news/lib/Block/jonah.php @@ -41,7 +41,7 @@ class Horde_Block_News_jonah extends Horde_Block { . ' FROM jonah_channels WHERE channel_type = 1 ORDER BY channel_name'; $chanels = $GLOBALS['news']->db->getAll($sql); - $html .= '' + $html .= '' . 'Menu NamerenderActive($RENDERER, $vars, Horde::applicationUrl('conferences.php'), 'post'); +$Form->renderActive($RENDERER, $vars, Horde::url('conferences.php'), 'post'); diff --git a/shout/templates/conferences/list.inc b/shout/templates/conferences/list.inc index c8b7eebd1..82f3ed81b 100644 --- a/shout/templates/conferences/list.inc +++ b/shout/templates/conferences/list.inc @@ -11,7 +11,7 @@ $info) { @@ -42,7 +42,7 @@ diff --git a/shout/wizard.php b/shout/wizard.php index a0e124ec8..4999801b9 100644 --- a/shout/wizard.php +++ b/shout/wizard.php @@ -29,7 +29,7 @@ try { $menus = $shout->storage->getMenus($curaccount['code']); if (!empty($menus) && !empty($menus[Shout::MAIN_MENU])) { - Horde::applicationUrl('dialplan.php', true)->redirect(); + Horde::url('dialplan.php', true)->redirect(); } // Create the default recording for the main menu diff --git a/skeleton/lib/Skeleton.php b/skeleton/lib/Skeleton.php index f0a2ee52f..fe888dc36 100644 --- a/skeleton/lib/Skeleton.php +++ b/skeleton/lib/Skeleton.php @@ -18,7 +18,7 @@ class Skeleton static public function getMenu() { $menu = new Horde_Menu(Horde_Menu::MASK_ALL); - $menu->add(Horde::applicationUrl('list.php'), _("List"), 'user.png', Horde_Themes::img(null, 'horde')); + $menu->add(Horde::url('list.php'), _("List"), 'user.png', Horde_Themes::img(null, 'horde')); return $menu; } diff --git a/skoli/add.php b/skoli/add.php index ef695365b..7dbc748a7 100644 --- a/skoli/add.php +++ b/skoli/add.php @@ -15,7 +15,7 @@ require_once SKOLI_BASE . '/lib/Forms/Entry.php'; /* Redirect to create a new class if we don't have access to any class */ if (count(Skoli::listClasses(false, Horde_Perms::EDIT)) == 0 && $GLOBALS['registry']->getAuth()) { $notification->push(_("Please create a new Class first."), 'horde.message'); - Horde::applicationUrl('classes/create.php', true)->redirect(); + Horde::url('classes/create.php', true)->redirect(); } $vars = Horde_Variables::getDefaultVariables(); @@ -30,7 +30,7 @@ if ($form->validate($vars)) { $notification->push(sprintf(_("The new entry for \"%s\" has been added."), $result), 'horde.success'); } - Horde::applicationUrl('add.php', true) + Horde::url('add.php', true) ->add('class', $vars->get('class_id')) ->redirect(); exit; diff --git a/skoli/classes/create.php b/skoli/classes/create.php index c8019fdc8..34c8c8ae6 100644 --- a/skoli/classes/create.php +++ b/skoli/classes/create.php @@ -12,14 +12,14 @@ require_once SKOLI_BASE . '/lib/Forms/CreateClass.php'; // Exit if this isn't an authenticated user. if (!$GLOBALS['registry']->getAuth()) { - Horde::applicationUrl('list.php', true)->redirect(); + Horde::url('list.php', true)->redirect(); } // Exit if we don't have access to addressbooks. require_once SKOLI_BASE . '/lib/School.php'; if (!count(Skoli_School::listAddressBooks())) { $notification->push(_("You don't have access to any valid addressbook."), 'horde.error'); - Horde::applicationUrl('classes/', true)->redirect(); + Horde::url('classes/', true)->redirect(); } $vars = Horde_Variables::getDefaultVariables(); @@ -36,7 +36,7 @@ if ($form->validate($vars)) { $prefs->setValue('display_classes', serialize($GLOBALS['display_classes'])); } - Horde::applicationUrl('classes/', true)->redirect(); + Horde::url('classes/', true)->redirect(); } $title = $form->getTitle(); diff --git a/skoli/classes/delete.php b/skoli/classes/delete.php index 3860f1f3c..7ae1d426b 100644 --- a/skoli/classes/delete.php +++ b/skoli/classes/delete.php @@ -12,7 +12,7 @@ require_once SKOLI_BASE . '/lib/Forms/DeleteClass.php'; // Exit if this isn't an authenticated user. if (!$GLOBALS['registry']->getAuth()) { - Horde::applicationUrl('list.php', true)->redirect(); + Horde::url('list.php', true)->redirect(); } $vars = Horde_Variables::getDefaultVariables(); @@ -21,10 +21,10 @@ $class_id = $vars->get('c'); $class = $skoli_shares->getShare($class_id); if (is_a($class, 'PEAR_Error')) { $notification->push($class, 'horde.error'); - Horde::applicationUrl('classes/', true)->redirect(); + Horde::url('classes/', true)->redirect(); } elseif (!$class->hasPermission($GLOBALS['registry']->getAuth(), Horde_Perms::DELETE)) { $notification->push(_("You are not allowed to delete this class."), 'horde.error'); - Horde::applicationUrl('classes/', true)->redirect(); + Horde::url('classes/', true)->redirect(); } $form = new Skoli_DeleteClassForm($vars, $class); @@ -38,7 +38,7 @@ if ($form->validate(new Horde_Variables($_POST))) { $notification->push(sprintf(_("The class \"%s\" has been deleted."), $class->get('name')), 'horde.success'); } - Horde::applicationUrl('classes/', true)->redirect(); + Horde::url('classes/', true)->redirect(); } $title = $form->getTitle(); diff --git a/skoli/classes/edit.php b/skoli/classes/edit.php index 33b84fcc3..b4d0c999f 100644 --- a/skoli/classes/edit.php +++ b/skoli/classes/edit.php @@ -12,17 +12,17 @@ require_once SKOLI_BASE . '/lib/Forms/EditClass.php'; // Exit if this isn't an authenticated user. if (!$GLOBALS['registry']->getAuth()) { - Horde::applicationUrl('list.php', true)->redirect(); + Horde::url('list.php', true)->redirect(); } $vars = Horde_Variables::getDefaultVariables(); $class = $skoli_shares->getShare($vars->get('c')); if (is_a($class, 'PEAR_Error')) { $notification->push($class, 'horde.error'); - Horde::applicationUrl('classes/', true)->redirect(); + Horde::url('classes/', true)->redirect(); } elseif (!$class->hasPermission($GLOBALS['registry']->getAuth(), Horde_Perms::EDIT)) { $notification->push(_("You are not allowed to change this class."), 'horde.error'); - Horde::applicationUrl('classes/', true)->redirect(); + Horde::url('classes/', true)->redirect(); } $vars->set('school', $class->get('school')); if (!$vars->exists('marks')) { @@ -48,7 +48,7 @@ if ($form->validate($vars)) { } } - Horde::applicationUrl('classes/', true)->redirect(); + Horde::url('classes/', true)->redirect(); } if (!$vars->exists('name')) { diff --git a/skoli/classes/index.php b/skoli/classes/index.php index 95ef7217f..09be282f4 100644 --- a/skoli/classes/index.php +++ b/skoli/classes/index.php @@ -11,12 +11,12 @@ require_once SKOLI_BASE . '/lib/base.php'; // Exit if this isn't an authenticated user. if (!$GLOBALS['registry']->getAuth()) { - Horde::applicationUrl('list.php', true)->redirect(); + Horde::url('list.php', true)->redirect(); } -$edit_url_base = Horde::applicationUrl('classes/edit.php'); +$edit_url_base = Horde::url('classes/edit.php'); $perms_url_base = Horde::url($registry->get('webroot', 'horde') . '/services/shares/edit.php?app=skoli', true); -$delete_url_base = Horde::applicationUrl('classes/delete.php'); +$delete_url_base = Horde::url('classes/delete.php'); $classes = Skoli::listClasses(true); $sorted_classes = array(); diff --git a/skoli/data.php b/skoli/data.php index 301f53ab6..570fac76e 100644 --- a/skoli/data.php +++ b/skoli/data.php @@ -11,7 +11,7 @@ require_once dirname(__FILE__) . '/lib/base.php'; if (!$conf['menu']['export']) { - Horde::applicationUrl('list.php', true)->redirect(); + Horde::url('list.php', true)->redirect(); } $classes = Skoli::listClasses(); diff --git a/skoli/entry.php b/skoli/entry.php index 4a19a47d1..20e18e283 100644 --- a/skoli/entry.php +++ b/skoli/entry.php @@ -13,7 +13,7 @@ require_once SKOLI_BASE . '/lib/base.php'; // Exit if this isn't an authenticated user. if (!$GLOBALS['registry']->getAuth()) { - Horde::applicationUrl('list.php', true)->redirect(); + Horde::url('list.php', true)->redirect(); } $vars = Horde_Variables::getDefaultVariables(); @@ -21,14 +21,14 @@ $driver = &Skoli_Driver::singleton(); $entry = $driver->getEntry($vars->get('entry')); if (is_a($entry, 'PEAR_Error') || !count($entry)) { $notification->push(_("Entry not found."), 'horde.error'); - Horde::applicationUrl('search.php', true)->redirect(); + Horde::url('search.php', true)->redirect(); } $share = $GLOBALS['skoli_shares']->getShare($entry['class_id']); // Check permissions if (!$share->hasPermission($GLOBALS['registry']->getAuth(), Horde_Perms::READ)) { $notification->push(_("You are not allowed to view this entry."), 'horde.error'); - Horde::applicationUrl('search.php', true) + Horde::url('search.php', true) ->add('actionID', 'search') ->redirect(); } @@ -59,7 +59,7 @@ if ($viewName != 'DeleteEntry') { $notification->push(sprintf(_("Couldn't update this entry: %s"), $result->getMessage()), 'horde.error'); } else { $notification->push(sprintf(_("The entry for \"%s\" has been saved."), $studentdetails[$conf['addresses']['name_field']]), 'horde.success'); - Horde::applicationUrl('search.php', true) + Horde::url('search.php', true) ->add('actionID', 'search') ->redirect(); } @@ -74,14 +74,14 @@ if ($actionID == 'delete') { $notification->push(sprintf(_("There was an error deleting this entry: %s"), $deleted->getMessage()), 'horde.error'); } else { $notification->push(sprintf(_("The entry for \"%s\" has been deleted."), $studentdetails[$conf['addresses']['name_field']]), 'horde.success'); - Horde::applicationUrl('search.php', true) + Horde::url('search.php', true) ->add('actionID', 'search') ->redirect(); } } // Get tabs. -$url = Horde_Util::addParameter(Horde::applicationUrl('entry.php'), 'entry', $entry['object_id']); +$url = Horde_Util::addParameter(Horde::url('entry.php'), 'entry', $entry['object_id']); $tabs = new Horde_Core_Ui_Tabs('view', $vars); $tabs->addTab(_("View"), $url, array('tabname' => 'Entry', 'id' => 'tabEntry')); if ($share->hasPermission($GLOBALS['registry']->getAuth(), Horde_Perms::EDIT)) { diff --git a/skoli/lib/Block/tree_menu.php b/skoli/lib/Block/tree_menu.php index e02a78676..c86f1d345 100644 --- a/skoli/lib/Block/tree_menu.php +++ b/skoli/lib/Block/tree_menu.php @@ -14,7 +14,7 @@ class Horde_Block_skoli_tree_menu extends Horde_Block { { require_once dirname(__FILE__) . '/../base.php'; - $add = Horde::applicationUrl('add.php'); + $add = Horde::url('add.php'); $add_img = Horde_Themes::img('add.png'); $classes = Skoli::listClasses(false, Horde_Perms::EDIT); @@ -53,7 +53,7 @@ class Horde_Block_skoli_tree_menu extends Horde_Block { false, array( 'icon' => Horde_Themes::img('search.png'), - 'url' => Horde::applicationUrl('search.php') + 'url' => Horde::url('search.php') ) ); } diff --git a/skoli/lib/Skoli.php b/skoli/lib/Skoli.php index d069be148..2a6efe281 100644 --- a/skoli/lib/Skoli.php +++ b/skoli/lib/Skoli.php @@ -491,17 +491,17 @@ class Skoli { global $conf, $registry, $browser, $print_link; $menu = new Horde_Menu(Horde_Menu::MASK_ALL); - $menu->add(Horde::applicationUrl('list.php'), _("List Classes"), 'skoli.png', null, null, null, basename($_SERVER['PHP_SELF']) == 'index.php' ? 'current' : null); + $menu->add(Horde::url('list.php'), _("List Classes"), 'skoli.png', null, null, null, basename($_SERVER['PHP_SELF']) == 'index.php' ? 'current' : null); if (count(Skoli::listClasses(false, Horde_Perms::EDIT))) { - $menu->add(Horde::applicationUrl('add.php'), _("_New Entry"), 'add.png', null, null, null, Horde_Util::getFormData('entry') ? '__noselection' : null); + $menu->add(Horde::url('add.php'), _("_New Entry"), 'add.png', null, null, null, Horde_Util::getFormData('entry') ? '__noselection' : null); } /* Search. */ - $menu->add(Horde::applicationUrl('search.php'), _("_Search"), 'search.png', Horde_Themes::img(null, 'horde')); + $menu->add(Horde::url('search.php'), _("_Search"), 'search.png', Horde_Themes::img(null, 'horde')); /* Import/Export. */ if ($conf['menu']['export']) { - $menu->add(Horde::applicationUrl('data.php'), _("_Export"), 'data.png', Horde_Themes::img(null, 'horde')); + $menu->add(Horde::url('data.php'), _("_Export"), 'data.png', Horde_Themes::img(null, 'horde')); } // @TODO Implement an easy form to create timetables in e.g. Kronolith @@ -509,7 +509,7 @@ class Skoli { * Show this item only if an application provides 'calendar/show' and we have permissions to view it. $app = $registry->hasMethod('calendar/show'); if ($app !== false && $registry->get('status', $app) != 'inactive' && $registry->hasPermission($app, Horde_Perms::EDIT)) { - $menu->add(Horde::applicationUrl(Horde_Util::addParameter('timetable.php', 'actionID', 'new_timetable')), _("_New Timetable"), 'timetable.png'); + $menu->add(Horde::url(Horde_Util::addParameter('timetable.php', 'actionID', 'new_timetable')), _("_New Timetable"), 'timetable.png'); } */ diff --git a/skoli/list.php b/skoli/list.php index 09a578749..24d431471 100644 --- a/skoli/list.php +++ b/skoli/list.php @@ -54,7 +54,7 @@ if ($app == false || $registry->get('status', $app) == 'inactive' || !$registry- /* Redirect to create a new class if we don't have access to any class */ if (count(Skoli::listClasses()) == 0 && $GLOBALS['registry']->getAuth()) { $notification->push(_("Please create a new Class first."), 'horde.message'); - Horde::applicationUrl('classes/create.php', true)->redirect(); + Horde::url('classes/create.php', true)->redirect(); } switch ($actionID) { diff --git a/skoli/templates/common-header.inc b/skoli/templates/common-header.inc index 62794cda3..11adac711 100644 --- a/skoli/templates/common-header.inc +++ b/skoli/templates/common-header.inc @@ -28,7 +28,7 @@ $bc = $prefs->getValue('show_panel') <?php echo htmlspecialchars($page_title) ?> - + > diff --git a/skoli/templates/data/export.inc b/skoli/templates/data/export.inc index 103e6a1e2..3d81f29d8 100644 --- a/skoli/templates/data/export.inc +++ b/skoli/templates/data/export.inc @@ -1,4 +1,4 @@ -"> +">

diff --git a/skoli/templates/list/classes.inc b/skoli/templates/list/classes.inc index bf7aaa41f..c17987c40 100644 --- a/skoli/templates/list/classes.inc +++ b/skoli/templates/list/classes.inc @@ -3,7 +3,7 @@ '; + echo Horde::link(Horde_Util::addParameter(Horde::url('add.php'), 'class', $class['_id']), $label) . Horde::img('add.png', $label) . ''; } ?> @@ -11,7 +11,7 @@ '; + echo Horde::link(Horde_Util::addParameter(Horde::url('classes/edit.php'), 'c', $class['_id']), $label) . Horde::img('edit.png', $label) . ''; } ?> @@ -28,7 +28,7 @@ 'class' => $class['_id'], 'student' => 'all' ); - echo Horde::link(Horde_Util::addParameter(Horde::applicationUrl('search.php'), $params), $label) . htmlspecialchars($class['name']) . ''; + echo Horde::link(Horde_Util::addParameter(Horde::url('search.php'), $params), $label) . htmlspecialchars($class['name']) . ''; ?> diff --git a/skoli/templates/list/header.inc b/skoli/templates/list/header.inc index 8c10e1c47..5ad70ecc5 100644 --- a/skoli/templates/list/header.inc +++ b/skoli/templates/list/header.inc @@ -1,6 +1,6 @@
- " onclick="$('quicksearchL').hide(); $('quicksearch').show(); $('quicksearchT').focus(); return false;"> + " onclick="$('quicksearchL').hide(); $('quicksearch').show(); $('quicksearchT').focus(); return false;">

diff --git a/skoli/templates/search/header.inc b/skoli/templates/search/header.inc index 0a118a1a6..71f3659cd 100644 --- a/skoli/templates/search/header.inc +++ b/skoli/templates/search/header.inc @@ -1,7 +1,7 @@
- " onclick="$('quicksearchL').hide(); $('quicksearch').show(); $('quicksearchT').focus(); return false;"> + " onclick="$('quicksearchL').hide(); $('quicksearch').show(); $('quicksearchT').focus(); return false;">
'; $html .= Horde::link(Horde_Util::addParameter($view_url, array('actionID' => 'download_zip_all', 'news_id' => $id)), _("Compress and dowload all files at once")) . $dowload_zip . ' ' . "\n"; @@ -348,7 +348,7 @@ class News { static public function getImageUrl($id, $view = 'small', $type = 'news') { if (empty($GLOBALS['conf']['images']['direct'])) { - return Horde_Util::addParameter(Horde::applicationUrl('view.php'), + return Horde_Util::addParameter(Horde::url('view.php'), array('type' => $type, 'view' => $view, 'id' => $id), @@ -448,19 +448,19 @@ class News { $img_dir = Horde_Themes::img(null, 'horde'); if ($GLOBALS['prefs']->getValue('news_layout') != '') { - $menu->add(Horde::applicationUrl('content.php'), _("Overview"), 'layout.png', $img_dir); + $menu->add(Horde::url('content.php'), _("Overview"), 'layout.png', $img_dir); } - $menu->add(Horde::applicationUrl('browse.php'), _("Archive"), 'info.png', $img_dir); - $menu->add(Horde::applicationUrl('search.php'), _("Search"), 'search.png', $img_dir); - $menu->add(Horde::applicationUrl('add.php'), _("Add"), 'edit.png', $img_dir); + $menu->add(Horde::url('browse.php'), _("Archive"), 'info.png', $img_dir); + $menu->add(Horde::url('search.php'), _("Search"), 'search.png', $img_dir); + $menu->add(Horde::url('add.php'), _("Add"), 'edit.png', $img_dir); if ($GLOBALS['conf']['attributes']['tags']) { - $menu->add(Horde::applicationUrl('cloud.php'), _("Tag cloud"), 'colorpicker.png', $img_dir); + $menu->add(Horde::url('cloud.php'), _("Tag cloud"), 'colorpicker.png', $img_dir); } if ($GLOBALS['registry']->isAdmin(array('permission' => 'news:admin'))) { - $menu->add(Horde::applicationUrl('edit.php'), _("Editorship"), 'config.png', $img_dir); - $menu->add(Horde::applicationUrl('admin/categories/index.php'), _("Administration"), 'administration.png', $img_dir); + $menu->add(Horde::url('edit.php'), _("Editorship"), 'config.png', $img_dir); + $menu->add(Horde::url('admin/categories/index.php'), _("Administration"), 'administration.png', $img_dir); } return $menu; diff --git a/news/lib/View.php b/news/lib/View.php index 20ba0f5c5..835cfecb7 100644 --- a/news/lib/View.php +++ b/news/lib/View.php @@ -62,7 +62,7 @@ class News_View extends Horde_View { } $html = ''; - $search = Horde::applicationUrl('search.php'); + $search = Horde::url('search.php'); foreach (explode(' ', $tags) as $tag) { $html .= 'get($id); // Check if the news exists if ($row instanceof PEAR_Error) { $notification->push($row); - Horde::applicationUrl('browse.php')->redirect(); + Horde::url('browse.php')->redirect(); } // Set up the PDF object. diff --git a/news/reads.php b/news/reads.php index 81657bfe7..1d89dec57 100644 --- a/news/reads.php +++ b/news/reads.php @@ -19,7 +19,7 @@ if (!$registry->isAuthenticated()) { $id = Horde_Util::getFormData('id', 0); $actionID = Horde_Util::getFormData('actionID', false); -$url = Horde::applicationUrl('reads.php'); +$url = Horde::url('reads.php'); $sql = 'SELECT id, user, ip, readdate FROM ' . $news->prefix . '_user_reads WHERE '; if ($actionID) { diff --git a/news/rss/comments.php b/news/rss/comments.php index 9f7af6ecf..ce1103873 100644 --- a/news/rss/comments.php +++ b/news/rss/comments.php @@ -26,7 +26,7 @@ if (!$rss) { ' . str_replace('_', '-', strtolower($registry->preferredLang())) . ' ' . date('r') . ' ' . htmlspecialchars($title) . ' - ' . Horde::applicationUrl('index.php', true, -1) . ' + ' . Horde::url('index.php', true, -1) . ' ' . htmlspecialchars($registry->get('name')) . ''; foreach ($list as $comment) { diff --git a/news/rss/index.php b/news/rss/index.php index 2ae262d74..3393c5daf 100644 --- a/news/rss/index.php +++ b/news/rss/index.php @@ -21,7 +21,7 @@ if (!$rss) { $title = $registry->get('name', 'horde'); - $read_url = Horde::applicationUrl('read.php', true, -1); + $read_url = Horde::url('read.php', true, -1); $rss = 'getCharset() . '" ?> @@ -29,19 +29,19 @@ if (!$rss) { ' . str_replace('_', '-', strtolower($registry->preferredLang())) . ' ' . date('r') . ' ' . htmlspecialchars($title) . ' - ' . Horde::applicationUrl('index.php', true, -1) . ' + ' . Horde::url('index.php', true, -1) . ' ' . htmlspecialchars($registry->get('name')) . ''; $rss .= ' ' . _("Last news") . ' - ' . Horde::applicationUrl('rss/news.php', true, -1) . ' + ' . Horde::url('rss/news.php', true, -1) . ' '; $rss .= ' ' . _("Last comments") . ' - ' . Horde::applicationUrl('rss/comments.php', true, -1) . ' + ' . Horde::url('rss/comments.php', true, -1) . ' '; $rss .= ' diff --git a/news/rss/news.php b/news/rss/news.php index 3dba99040..44577ca67 100755 --- a/news/rss/news.php +++ b/news/rss/news.php @@ -63,7 +63,7 @@ if (empty($rss)) { ' . str_replace('_', '-', strtolower($registry->preferredLang())) . ' ' . date('r', $lastnewstime) . ' ' . htmlspecialchars($title) . ' - ' . Horde::applicationUrl('index.php', true, -1) . ' + ' . Horde::url('index.php', true, -1) . ' ' . htmlspecialchars($registry->get('name')) . ''; $rssfooter = ' diff --git a/news/search.php b/news/search.php index 76ff68561..01c6b6b3b 100644 --- a/news/search.php +++ b/news/search.php @@ -17,7 +17,7 @@ require_once dirname(__FILE__) . '/lib/base.php'; $title = _("Browse"); $page = Horde_Util::getGet('news_page', 0); $per_page = $prefs->getValue('per_page'); -$browse_url = Horde::applicationUrl('browse.php'); +$browse_url = Horde::url('browse.php'); $cid = Horde_Util::getGet('cid'); $vars = Horde_Variables::getDefaultVariables(); diff --git a/news/templates/common-header.inc b/news/templates/common-header.inc index 079b5151f..e8b17bcf6 100644 --- a/news/templates/common-header.inc +++ b/news/templates/common-header.inc @@ -23,8 +23,8 @@ Horde::includeScriptFiles(); ?> <?php echo htmlspecialchars($page_title) ?> -" href="" type="application/rss+xml" /> -" href="" type="application/rss+xml" /> +" href="" type="application/rss+xml" /> +" href="" type="application/rss+xml" /> diff --git a/news/templates/edit/info.php b/news/templates/edit/info.php index ef3252015..bf989d34f 100644 --- a/news/templates/edit/info.php +++ b/news/templates/edit/info.php @@ -102,13 +102,13 @@ if (sizeof($versions)>0) { } echo _(" by ") . $version['user_uid'] . _(" at ") . $version['created'] . "\n("; - $url = Horde_Util::addParameter(Horde::applicationUrl('news.php'), array('id' => $id, 'version' => $version['version'])); + $url = Horde_Util::addParameter(Horde::url('news.php'), array('id' => $id, 'version' => $version['version'])); echo Horde::link($url, _("View"), '', '_blank', '', _("View")) . _("View") . ' | '; - $url = Horde_Util::addParameter(Horde::applicationUrl('edit.php'), array('id' => $id, 'actionID' => 'renew')); + $url = Horde_Util::addParameter(Horde::url('edit.php'), array('id' => $id, 'actionID' => 'renew')); echo Horde::link(Horde_Util::addParameter($url,'version', $version['version']),_("Renew")) . _("Renew") . ' | '; - $url = Horde_Util::addParameter(Horde::applicationUrl('diff.php'), array('id' => $id, 'version' => $version['version'])); + $url = Horde_Util::addParameter(Horde::url('diff.php'), array('id' => $id, 'version' => $version['version'])); echo Horde::link('#', _("Diff"), '', '', Horde::popupJs($url, array('urlencode' => true)) . 'return false;') . _("Diff") . ' '; echo ')
' . "\n"; diff --git a/news/templates/edit/row.php b/news/templates/edit/row.php index 3b21102a4..2e0173fd9 100644 --- a/news/templates/edit/row.php +++ b/news/templates/edit/row.php @@ -19,7 +19,7 @@ if ($registry->isAdmin() || isset($allowed_cats[$row['category1']]) || isset($al $url = Horde_Util::addParameter($browse_url, array('page' => $page, 'actionID' => 'activate', 'id' => $row['id'])); echo Horde::link($url,_("Activate")) . Horde::img('tick.png', _("Activate"), '', $img_dir) . ' '; - $url = Horde_Util::addParameter(Horde::applicationUrl('delete.php'), 'id', $row['id']); + $url = Horde_Util::addParameter(Horde::url('delete.php'), 'id', $row['id']); echo Horde::link($url,_("Delete"), '', '', '', _("Delete")) . Horde::img('delete.png', _("Delete"), '', $img_dir) . '  '; if ($row['status'] == News::LOCKED) { diff --git a/news/templates/menu.inc b/news/templates/menu.inc index b3f3c7c9a..3b6beca52 100644 --- a/news/templates/menu.inc +++ b/news/templates/menu.inc @@ -1,6 +1,6 @@ 		Admin PIN
Options
Recording ID
width="2%"> -   +   width="2%"> -   +   > -   +   width="2%"> -   +   width="2%"> -   +   width="2%"> -   +   width="2%"> -   +   width="2%"> -   +   width="2%"> -   +   width="10%"> -   +   getAuth() && (!$GLOBALS['prefs']->isLocked('categories') || !$GLOBALS['prefs']->isLocked('category_colors'))) { diff --git a/skoli/templates/list/students.inc b/skoli/templates/list/students.inc index 1925d31c0..fa060f0c2 100644 --- a/skoli/templates/list/students.inc +++ b/skoli/templates/list/students.inc @@ -3,7 +3,7 @@ $class['_id'], 'student'=>$student['__key'])), $label) . Horde::img('add.png', $label) . ''; + echo Horde::link(Horde_Util::addParameter(Horde::url('add.php'), array('class'=>$class['_id'], 'student'=>$student['__key'])), $label) . Horde::img('add.png', $label) . ''; } ?> @@ -30,7 +30,7 @@ 'class' => $class['_id'], 'student' => $student['__key'] ); - echo $treeIcon . ' ' . Horde::link(Horde_Util::addParameter(Horde::applicationUrl('search.php'), $params), $label) . htmlspecialchars($student[$conf['addresses']['name_field']]) . ''; + echo $treeIcon . ' ' . Horde::link(Horde_Util::addParameter(Horde::url('search.php'), $params), $label) . htmlspecialchars($student[$conf['addresses']['name_field']]) . ''; ?> diff --git a/skoli/templates/panel.inc b/skoli/templates/panel.inc index 164d3f783..5d250c3a0 100644 --- a/skoli/templates/panel.inc +++ b/skoli/templates/panel.inc @@ -45,7 +45,7 @@ function sbarToggle() getAuth()): ?>

- +

diff --git a/skoli/templates/search/entries.inc b/skoli/templates/search/entries.inc index 97c2c07ff..f53695f05 100644 --- a/skoli/templates/search/entries.inc +++ b/skoli/templates/search/entries.inc @@ -7,7 +7,7 @@ 'view' => 'EditEntry', 'entry' => $entry['_id'] ); - echo Horde::link(Horde_Util::addParameter(Horde::applicationUrl('entry.php'), $params), $label) . Horde::img('edit.png', $label) . ''; + echo Horde::link(Horde_Util::addParameter(Horde::url('entry.php'), $params), $label) . Horde::img('edit.png', $label) . ''; } ?> @@ -18,7 +18,7 @@ 'view' => 'Entry', 'entry' => $entry['_id'] ); - echo Horde::link(Horde_Util::addParameter(Horde::applicationUrl('entry.php'), $params), _("View Entry")) . htmlspecialchars($entry['student']) . ' '; + echo Horde::link(Horde_Util::addParameter(Horde::url('entry.php'), $params), _("View Entry")) . htmlspecialchars($entry['student']) . ' '; ?> 		  width="2%"> -   +   width="2%"> -   +   width="2%"> -   +   width="2%"> -   +     diff --git a/trean/add.php b/trean/add.php index e6c143979..9b93621a0 100644 --- a/trean/add.php +++ b/trean/add.php @@ -25,7 +25,7 @@ case 'add_bookmark': $message = Horde::callHook('_perms_hook_denied', array('trean:max_bookmarks'), 'horde', $message); } $notification->push($message, 'horde.error', array('content.raw')); - Horde::applicationUrl('browse.php', true)->redirect(); + Horde::url('browse.php', true)->redirect(); } $folderId = Horde_Util::getFormData('f'); @@ -66,7 +66,7 @@ case 'add_bookmark': require TREAN_TEMPLATES . '/common-header.inc'; $notification->notify(); } else { - Horde::applicationUrl('browse.php', true) + Horde::url('browse.php', true) ->add('f', $folderId) ->redirect(); } @@ -88,7 +88,7 @@ case 'add_folder': $message = Horde::callHook('_perms_hook_denied', array('trean:max_folders'), 'horde', $message); } $notification->push($message, 'horde.error', array('content.raw')); - Horde::applicationUrl('browse.php', true) + Horde::url('browse.php', true) ->add('f', $parent_id) ->redirect(); } @@ -102,7 +102,7 @@ case 'add_folder': if (is_a($result, 'PEAR_Error')) { $notification->push(sprintf(_("There was an error adding the folder: %s"), $result->getMessage()), 'horde.error'); } else { - Horde::applicationUrl('browse.php', true) + Horde::url('browse.php', true) ->add('f', $result) ->redirect(); } diff --git a/trean/bookmark.php b/trean/bookmark.php index ee777c775..0d7da3a4f 100644 --- a/trean/bookmark.php +++ b/trean/bookmark.php @@ -44,7 +44,7 @@ if (Horde_Util::getFormData('partial')) { if (!is_null($url = Horde_Util::getFormData('nu'))) { header('Location: ' . $url); } else { - Horde::applicationUrl('browse.php', true) + Horde::url('browse.php', true) ->add('f', $bookmark->folder) ->redirect(); } diff --git a/trean/browse.php b/trean/browse.php index 0cd1494e8..1bddbaf58 100644 --- a/trean/browse.php +++ b/trean/browse.php @@ -43,7 +43,7 @@ if (empty($folderId) && $registry->getAuth()) { /* Make sure user has permission to view this folder. */ if (!$folder->hasPermission($registry->getAuth(), Horde_Perms::READ)) { $notification->push(_("You do not have permission to view this folder."), 'horde.error'); - Horde::applicationUrl('browse.php', true)->redirect(); + Horde::url('browse.php', true)->redirect(); } } diff --git a/trean/data.php b/trean/data.php index 5cd6e04a5..9258d3d0e 100644 --- a/trean/data.php +++ b/trean/data.php @@ -155,7 +155,7 @@ case 'import': $notification->push(sprintf(_("%d Folders and %d Bookmarks imported."), $folders, $bookmarks), 'horde.success'); - Horde::applicationUrl('browse.php', true) + Horde::url('browse.php', true) ->add('f', $root->getId()) ->redirect(); diff --git a/trean/edit.php b/trean/edit.php index 29632038a..7ee645389 100644 --- a/trean/edit.php +++ b/trean/edit.php @@ -19,7 +19,7 @@ $actionID = Horde_Util::getFormData('actionID'); if ($actionID == 'button') { if (Horde_Util::getFormData('new_bookmark') || !is_null(Horde_Util::getFormData('new_bookmark_x'))) { - Horde::applicationUrl('add.php', true)->add('f', $folderId)->redirect(); + Horde::url('add.php', true)->add('f', $folderId)->redirect(); } if (Horde_Util::getFormData('edit_bookmarks')) { $actionID = null; @@ -96,7 +96,7 @@ case 'save': $notification->notify(); } } else { - Horde::applicationUrl('browse.php', true) + Horde::url('browse.php', true) ->add('f', $folderId) ->redirect(); } @@ -130,7 +130,7 @@ case 'delete': } // Return to the folder listing - Horde::applicationUrl('browse.php', true)->add('f', $folderId)->redirect(); + Horde::url('browse.php', true)->add('f', $folderId)->redirect(); case 'move': $create_folder = Horde_Util::getFormData('create_folder'); @@ -179,7 +179,7 @@ case 'move': } // Return to the folder listing - Horde::applicationUrl('browse.php', true)->add('f', $folderId)->redirect(); + Horde::url('browse.php', true)->add('f', $folderId)->redirect(); case 'copy': $create_folder = Horde_Util::getFormData('create_folder'); @@ -220,7 +220,7 @@ case 'copy': } // Return to the folder listing - Horde::applicationUrl('browse.php', true)->add('f', $folderId)->redirect(); + Horde::url('browse.php', true)->add('f', $folderId)->redirect(); case 'rename': /* Rename a Bookmark Folder. */ @@ -231,7 +231,7 @@ case 'rename': if (is_a($result, 'PEAR_Error')) { $notification->push(sprintf(_("\"%s\" was not renamed: %s."), $name, $result->getMessage()), 'horde.error'); } else { - Horde::applicationUrl('browse.php', true)->add('f', $folderId)->redirect(); + Horde::url('browse.php', true)->add('f', $folderId)->redirect(); } break; @@ -253,7 +253,7 @@ case 'del_folder_confirmed': $folder = &$trean_shares->getFolder($folderId); if (is_a($folder, 'PEAR_Error')) { $notification->push($folder->getMessage(), 'horde.error'); - Horde::applicationUrl('browse.php')->redirect(); + Horde::url('browse.php')->redirect(); } $parent = $folder->getParent(); @@ -263,17 +263,17 @@ case 'del_folder_confirmed': } else { $notification->push(sprintf(_("Deleted the folder \"%s\""), $folder->get('name')), 'horde.success'); } - Horde::applicationUrl('browse.php', true)->add('f', $folderId)->redirect(); + Horde::url('browse.php', true)->add('f', $folderId)->redirect(); exit; case 'cancel': - Horde::applicationUrl('browse.php', true)->add('f', $folderId)->redirect(); + Horde::url('browse.php', true)->add('f', $folderId)->redirect(); } // Return to browse if there is nothing to edit. if (!count($bookmarks) && !count($folder)) { $notification->push(_("Nothing to edit."), 'horde.message'); - Horde::applicationUrl('browse.php', true)->add('f', $folderId)->redirect(); + Horde::url('browse.php', true)->add('f', $folderId)->redirect(); } $title = _("Edit Bookmark"); diff --git a/trean/lib/Api.php b/trean/lib/Api.php index 7e2d251a6..9e2834d37 100644 --- a/trean/lib/Api.php +++ b/trean/lib/Api.php @@ -334,15 +334,15 @@ class Trean_Api extends Horde_Registry_Api $browser = $GLOBALS['injector']->getInstance('Horde_Browser'); if ($browser->hasFeature('javascript')) { if ($browser->hasFeature('dom')) { - $addurl = Horde_Util::addParameter(Horde::applicationUrl('add.php', true, -1), 'iframe', 1); + $addurl = Horde_Util::addParameter(Horde::url('add.php', true, -1), 'iframe', 1); $url = "javascript:(function(){o=document.createElement('div');o.id='overlay';o.style.background='#000';o.style.position='absolute';o.style.top=0;o.style.left=0;o.style.width='100%';o.style.height='100%';o.style.zIndex=5000;o.style.opacity=.8;document.body.appendChild(o);i=document.createElement('iframe');i.id='frame';i.style.zIndex=5001;i.style.border='thin solid #000';i.src='$addurl'+'&title=' + encodeURIComponent(document.title) + '&url=' + encodeURIComponent(location.href);i.style.position='absolute';i.style.width='350px';i.style.height='150px';i.style.left='100px';i.style.top='100px';document.body.appendChild(i);l=document.createElement('a');l.style.position='absolute';l.style.background='#ccc';l.style.color='#000';l.style.border='thin solid #000';l.style.display='block';l.style.top='250px';l.style.left='100px';l.style.zIndex=5001;l.style.padding='5px';l.appendChild(document.createTextNode('" . _("Close") . "'));l.onclick=function(){var o=document.getElementById('overlay');o.parentNode.removeChild(o);var i=document.getElementById('frame');i.parentNode.removeChild(i);this.parentNode.removeChild(this);};document.body.appendChild(l);})()"; } else { - $addurl = Horde::applicationUrl(Horde_Util::addParameter('add.php', 'popup', 1), true, -1); + $addurl = Horde::url(Horde_Util::addParameter('add.php', 'popup', 1), true, -1); $url = "javascript:d = new Date(); w = window.open('$addurl' + '&title=' + encodeURIComponent(document.title) + '&url=' + encodeURIComponent(location.href) + '&d=' + d.getTime(), d.getTime(), 'height=200,width=400'); w.focus();"; } } else { // Fallback to a regular URL - $url = Horde::applicationUrl(Horde_Util::addParameter('add.php', $params), true); + $url = Horde::url(Horde_Util::addParameter('add.php', $params), true); } return $url; diff --git a/trean/lib/Application.php b/trean/lib/Application.php index 049785d0f..e21f7e2b2 100644 --- a/trean/lib/Application.php +++ b/trean/lib/Application.php @@ -111,7 +111,7 @@ class Trean_Application extends Horde_Registry_Application false, array( 'icon' => Horde_Themes::img('add.png'), - 'url' => Horde::applicationUrl('add.php') + 'url' => Horde::url('add.php') ) ); @@ -123,13 +123,13 @@ class Trean_Application extends Horde_Registry_Application false, array( 'icon' => Horde_Themes::img('search.png'), - 'url' => Horde::applicationUrl('search.php') + 'url' => Horde::url('search.php') ) ); $folders = Trean::listFolders(); if (!($folders instanceof PEAR_Error)) { - $browse = Horde::applicationUrl('browse.php'); + $browse = Horde::url('browse.php'); foreach ($folders as $folder) { $parent_id = $folder->getParent(); diff --git a/trean/lib/Trean.php b/trean/lib/Trean.php index 49c324147..fc85c9bf1 100644 --- a/trean/lib/Trean.php +++ b/trean/lib/Trean.php @@ -158,13 +158,13 @@ class Trean global $conf, $registry; $menu = new Horde_Menu(); - $menu->add(Horde::applicationUrl('browse.php'), _("_Browse"), 'trean.png', null, null, null, basename($_SERVER['PHP_SELF']) == 'index.php' ? 'current' : null); - $menu->add(Horde::applicationUrl('search.php'), _("_Search"), 'search.png'); - $menu->add(Horde::applicationUrl('reports.php'), _("_Reports"), 'reports.png'); + $menu->add(Horde::url('browse.php'), _("_Browse"), 'trean.png', null, null, null, basename($_SERVER['PHP_SELF']) == 'index.php' ? 'current' : null); + $menu->add(Horde::url('search.php'), _("_Search"), 'search.png'); + $menu->add(Horde::url('reports.php'), _("_Reports"), 'reports.png'); /* Import/Export. */ if ($conf['menu']['import_export']) { - $menu->add(Horde::applicationUrl('data.php'), _("_Import/Export"), 'data.png'); + $menu->add(Horde::url('data.php'), _("_Import/Export"), 'data.png'); } if ($returnType == 'object') { @@ -237,7 +237,7 @@ class Trean $vfs = $GLOBALS['injector']->getInstance('Horde_Vfs'); if ($bookmark->favicon && $vfs->exists('.horde/trean/favicons/', $bookmark->favicon)) { - return Horde_Util::addParameter(Horde::applicationUrl('favicon.php'), + return Horde_Util::addParameter(Horde::url('favicon.php'), 'bookmark_id', $bookmark->id); } } catch (Exception $e) { diff --git a/trean/lib/Views/BookmarkList.php b/trean/lib/Views/BookmarkList.php index 0e25f33bc..4d9e8da33 100644 --- a/trean/lib/Views/BookmarkList.php +++ b/trean/lib/Views/BookmarkList.php @@ -29,7 +29,7 @@ class Trean_View_BookmarkList { $this->bookmarks = $bookmarks; } $this->target = $GLOBALS['prefs']->getValue('show_in_new_window') ? '_blank' : ''; - $this->redirectUrl = Horde::applicationUrl('redirect.php'); + $this->redirectUrl = Horde::url('redirect.php'); $this->sortby = $GLOBALS['prefs']->getValue('sortby'); $this->sortdir = $GLOBALS['prefs']->getValue('sortdir'); @@ -39,7 +39,7 @@ class Trean_View_BookmarkList { function folder($bookmark) { $folder = $GLOBALS['trean_shares']->getFolder($bookmark->folder); - return Horde::link(Horde_Util::addParameter(Horde::applicationUrl('browse.php'), 'f', $bookmark->folder)) . htmlspecialchars($folder->get('name')) . ''; + return Horde::link(Horde_Util::addParameter(Horde::url('browse.php'), 'f', $bookmark->folder)) . htmlspecialchars($folder->get('name')) . ''; } function render() diff --git a/trean/templates/add.html.php b/trean/templates/add.html.php index 787525170..2424432a7 100644 --- a/trean/templates/add.html.php +++ b/trean/templates/add.html.php @@ -77,7 +77,7 @@ function addBookmark() {

' . Horde::img('add.png') . _("Add to Bookmarks") . '

'; ?> diff --git a/trean/templates/block/1line.inc b/trean/templates/block/1line.inc index b6e865fe2..93f4f5315 100644 --- a/trean/templates/block/1line.inc +++ b/trean/templates/block/1line.inc @@ -1,5 +1,5 @@ id); +$bookmark_url = Horde_Util::addParameter(Horde::url('redirect.php'), 'b', $bookmark->id); $target = $GLOBALS['prefs']->getValue('show_in_new_window') ? '_blank' : ''; if ($bookmark->http_status == 'error') { $status = 'error.png'; diff --git a/trean/templates/block/2line.inc b/trean/templates/block/2line.inc index 3929be3ad..8d236226e 100644 --- a/trean/templates/block/2line.inc +++ b/trean/templates/block/2line.inc @@ -1,5 +1,5 @@ id); +$bookmark_url = Horde_Util::addParameter(Horde::url('redirect.php'), 'b', $bookmark->id); $target = $GLOBALS['prefs']->getValue('show_in_new_window') ? '_blank' : ''; if ($bookmark->http_status == 'error') { $status = 'error.png'; diff --git a/trean/templates/block/standard.inc b/trean/templates/block/standard.inc index 05acbc509..fd7a05392 100644 --- a/trean/templates/block/standard.inc +++ b/trean/templates/block/standard.inc @@ -1,6 +1,6 @@ getValue('show_in_new_window') ? '_blank' : ''; -$bookmark_url = Horde_Util::addParameter(Horde::applicationUrl('redirect.php'), 'b', $bookmark->id); +$bookmark_url = Horde_Util::addParameter(Horde::url('redirect.php'), 'b', $bookmark->id); if ($bookmark->http_status == 'error') { $status = 'error.png'; } elseif ($bookmark->http_status == '') { diff --git a/trean/templates/browse.php b/trean/templates/browse.php index 4b77da32a..8357eb8a3 100644 --- a/trean/templates/browse.php +++ b/trean/templates/browse.php @@ -1,11 +1,11 @@ - + -
+ @@ -106,7 +106,7 @@ if (!empty($folder)): get('owner') == $GLOBALS['registry']->getAuth()): ?>

- getId()), _("Control access to this folder"), '', '_blank', 'popup(this.href); return false;') + getId()), _("Control access to this folder"), '', '_blank', 'popup(this.href); return false;') . Horde::img('perms.png') . _("Control access to this folder") . '' ?>

@@ -134,7 +134,7 @@ if (!is_a($folders, 'PEAR_Error')) { $f_id = null; } $params['class'] = ($tf->getId() == $f_id) ? 'selected' : null; - $params['url'] = Horde::applicationUrl('browse.php?f=' . $tf->getId()); + $params['url'] = Horde::url('browse.php?f=' . $tf->getId()); $level = substr_count($tfn, ':'); if ($expand == 'first') { diff --git a/trean/templates/common-header.inc b/trean/templates/common-header.inc index 435aaf9f3..bec332a6f 100644 --- a/trean/templates/common-header.inc +++ b/trean/templates/common-header.inc @@ -20,7 +20,7 @@ if (!empty($title)) { Horde::outputMetaTags(); Horde::includeScriptFiles(); -$rss = Horde::applicationUrl('rss.php', true, -1); +$rss = Horde::url('rss.php', true, -1); if (Horde_Util::getFormData('f')) { $rss = Horde_Util::addParameter($rss, 'f', Horde_Util::getFormData('f'), false); } diff --git a/trean/templates/star_rating_helper.php b/trean/templates/star_rating_helper.php index db556e827..5d0dfc5e0 100644 --- a/trean/templates/star_rating_helper.php +++ b/trean/templates/star_rating_helper.php @@ -13,7 +13,7 @@ define('_STAR_WIDTH', 25); */ function star_rating_helper($bookmark) { - $edit = Horde::applicationUrl('bookmark.php?b=' . $bookmark->id, true); + $edit = Horde::url('bookmark.php?b=' . $bookmark->id, true); return '
  1. ' . str_repeat('*', $bookmark->rating) . '
    2. diff --git a/turba/add.php b/turba/add.php index 6303d3c11..da3b00d39 100644 --- a/turba/add.php +++ b/turba/add.php @@ -27,7 +27,7 @@ if (!$addSources) { $notification->push(_("There are no writeable address books. None of the available address books are configured to allow you to add new entries to them. If you believe this is an error, please contact your system administrator."), 'horde.error'); $url = $url ? Horde::url($url, true) - : Horde::applicationUrl('index.php', true); + : Horde::url('index.php', true); $url->redirect(); } @@ -53,7 +53,7 @@ if ($source) { $notification->push($message, 'horde.error', array('content.raw')); $url = $url ? Horde::url($url, true) - : Horde::applicationUrl('index.php', true); + : Horde::url('index.php', true); $url->redirect(); } @@ -72,5 +72,5 @@ if ($form->validate()) { $title = _("New Contact"); require TURBA_TEMPLATES . '/common-header.inc'; require TURBA_TEMPLATES . '/menu.inc'; -$form->renderActive(new Horde_Form_Renderer(), $vars, Horde::applicationUrl('add.php'), 'post'); +$form->renderActive(new Horde_Form_Renderer(), $vars, Horde::url('add.php'), 'post'); require $registry->get('templates', 'horde') . '/common-footer.inc'; diff --git a/turba/addressbooks/create.php b/turba/addressbooks/create.php index 545efa864..a09047282 100644 --- a/turba/addressbooks/create.php +++ b/turba/addressbooks/create.php @@ -31,11 +31,11 @@ if ($form->validate($vars)) { $notification->push(sprintf(_("The address book \"%s\" has been created."), $vars->get('name')), 'horde.success'); } - Horde::applicationUrl('addressbooks/', true)->redirect(); + Horde::url('addressbooks/', true)->redirect(); } $title = $form->getTitle(); require TURBA_TEMPLATES . '/common-header.inc'; require TURBA_TEMPLATES . '/menu.inc'; -echo $form->renderActive($form->getRenderer(), $vars, Horde::applicationUrl('addressbooks/create.php'), 'post'); +echo $form->renderActive($form->getRenderer(), $vars, Horde::url('addressbooks/create.php'), 'post'); require $registry->get('templates', 'horde') . '/common-footer.inc'; diff --git a/turba/addressbooks/delete.php b/turba/addressbooks/delete.php index 4623435a8..7838ba50a 100644 --- a/turba/addressbooks/delete.php +++ b/turba/addressbooks/delete.php @@ -23,20 +23,20 @@ $vars = Horde_Variables::getDefaultVariables(); $addressbook_id = $vars->get('a'); if ($addressbook_id == $GLOBALS['registry']->getAuth()) { $notification->push(_("This address book cannot be deleted"), 'horde.warning'); - Horde::applicationUrl('addressbooks/', true)->redirect(); + Horde::url('addressbooks/', true)->redirect(); } try { $addressbook = $turba_shares->getShare($addressbook_id); } catch (Horde_Share_Exception $e) { $notification->push($e, 'horde.error'); - Horde::applicationUrl('addressbooks/', true)->redirect(); + Horde::url('addressbooks/', true)->redirect(); } if (!$GLOBALS['registry']->getAuth() || $addressbook->get('owner') != $GLOBALS['registry']->getAuth()) { $notification->push(_("You are not allowed to delete this addressbook."), 'horde.error'); - Horde::applicationUrl('addressbooks/', true)->redirect(); + Horde::url('addressbooks/', true)->redirect(); } $form = new Turba_Form_DeleteAddressBook($vars, $addressbook); @@ -50,11 +50,11 @@ if ($form->validate(new Horde_Variables($_POST))) { $notification->push(sprintf(_("The addressbook \"%s\" has been deleted."), $addressbook->get('name')), 'horde.success'); } - Horde::applicationUrl('addressbooks/', true)->redirect(); + Horde::url('addressbooks/', true)->redirect(); } $title = $form->getTitle(); require TURBA_TEMPLATES . '/common-header.inc'; require TURBA_TEMPLATES . '/menu.inc'; -echo $form->renderActive($form->getRenderer(), $vars, Horde::applicationUrl('addressbooks/delete.php'), 'post'); +echo $form->renderActive($form->getRenderer(), $vars, Horde::url('addressbooks/delete.php'), 'post'); require $registry->get('templates', 'horde') . '/common-footer.inc'; diff --git a/turba/addressbooks/edit.php b/turba/addressbooks/edit.php index 5ba5efada..63065c947 100644 --- a/turba/addressbooks/edit.php +++ b/turba/addressbooks/edit.php @@ -24,13 +24,13 @@ try { $addressbook = $turba_shares->getShare($vars->get('a')); } catch (Horde_Share_Exception $e) { $notification->push($e->getMessage(), 'horde.error'); - Horde::applicationUrl('addressbooks/', true)->redirect(); + Horde::url('addressbooks/', true)->redirect(); } if (!$GLOBALS['registry']->getAuth() || $addressbook->get('owner') != $GLOBALS['registry']->getAuth()) { $notification->push(_("You are not allowed to change this addressbook."), 'horde.error'); - Horde::applicationUrl('addressbooks/', true)->redirect(); + Horde::url('addressbooks/', true)->redirect(); } $form = new Turba_Form_EditAddressBook($vars, $addressbook); @@ -48,7 +48,7 @@ if ($form->validate($vars)) { } } - Horde::applicationUrl('addressbooks/', true)->redirect(); + Horde::url('addressbooks/', true)->redirect(); } $vars->set('name', $addressbook->get('name')); @@ -56,5 +56,5 @@ $vars->set('description', $addressbook->get('desc')); $title = $form->getTitle(); require TURBA_TEMPLATES . '/common-header.inc'; require TURBA_TEMPLATES . '/menu.inc'; -echo $form->renderActive($form->getRenderer(), $vars, Horde::applicationUrl('edit.php'), 'post'); +echo $form->renderActive($form->getRenderer(), $vars, Horde::url('edit.php'), 'post'); require $registry->get('templates', 'horde') . '/common-footer.inc'; diff --git a/turba/addressbooks/index.php b/turba/addressbooks/index.php index 07d31f4a7..d0080e71c 100644 --- a/turba/addressbooks/index.php +++ b/turba/addressbooks/index.php @@ -19,10 +19,10 @@ if (!$GLOBALS['registry']->getAuth() || empty($_SESSION['turba']['has_share'])) exit; } -$browse_url_base = Horde::applicationUrl($browse_source_count ? basename($prefs->getValue('initial_page')) : 'search.php'); -$edit_url_base = Horde::applicationUrl('addressbooks/edit.php'); +$browse_url_base = Horde::url($browse_source_count ? basename($prefs->getValue('initial_page')) : 'search.php'); +$edit_url_base = Horde::url('addressbooks/edit.php'); $perms_url_base = Horde::url($registry->get('webroot', 'horde') . '/services/shares/edit.php?app=turba', true); -$delete_url_base = Horde::applicationUrl('addressbooks/delete.php'); +$delete_url_base = Horde::url('addressbooks/delete.php'); // Get the shares owned by the current user, and figure out what we will // display the share name as to the user. diff --git a/turba/contact.php b/turba/contact.php index 40b2386f8..5e7a9f067 100644 --- a/turba/contact.php +++ b/turba/contact.php @@ -17,7 +17,7 @@ $vars = Horde_Variables::getDefaultVariables(); $source = $vars->get('source'); if (!isset($GLOBALS['cfgSources'][$source])) { $notification->push(_("The contact you requested does not exist.")); - Horde::applicationUrl($prefs->getValue('initial_page'), true)->redirect(); + Horde::url($prefs->getValue('initial_page'), true)->redirect(); } /* Set the contact from the key requested. */ @@ -25,7 +25,7 @@ try { $driver = $injector->getInstance('Turba_Driver')->getDriver($source); } catch (Turba_Exception $e) { $notification->push($e, 'horde.error'); - Horde::applicationUrl($prefs->getValue('initial_page'), true)->redirect(); + Horde::url($prefs->getValue('initial_page'), true)->redirect(); } $contact = null; @@ -44,7 +44,7 @@ if (!$contact) { $contact = $driver->getObject($vars->get('key')); } catch (Turba_Exception $e) { $notification->push($e, 'horde.error'); - Horde::applicationUrl($prefs->getValue('initial_page'), true)->redirect(); + Horde::url($prefs->getValue('initial_page'), true)->redirect(); } } diff --git a/turba/delete.php b/turba/delete.php index bcc32f2f6..24326bd59 100644 --- a/turba/delete.php +++ b/turba/delete.php @@ -26,7 +26,7 @@ if ($conf['documents']['type'] != 'none') { $object->deleteFiles(); } catch (Turba_Exception $e) { $notification->push($e, 'horde.error'); - Horde::applicationUrl($prefs->getValue('initial_page'), true)->redirect(); + Horde::url($prefs->getValue('initial_page'), true)->redirect(); } } @@ -34,7 +34,7 @@ try { $driver->delete($key); $url = ($url = Horde_Util::getFormData('url')) ? new Horde_Url($url) - : Horde::applicationUrl($prefs->getValue('initial_page'), true); + : Horde::url($prefs->getValue('initial_page'), true); $url->redirect(); } catch (Turba_Exception $e) { $notification->push(sprintf(_("There was an error deleting this contact: %s"), $e->getMessage()), 'horde.error'); diff --git a/turba/deletefile.php b/turba/deletefile.php index 2ca5f0d49..a67f296d1 100644 --- a/turba/deletefile.php +++ b/turba/deletefile.php @@ -20,7 +20,7 @@ if ($conf['documents']['type'] == 'none') { $source = Horde_Util::getPost('source'); if ($source === null || !isset($cfgSources[$source])) { $notification->push(_("Not found"), 'horde.error'); - Horde::applicationUrl($prefs->getValue('initial_page'), true)->redirect(); + Horde::url($prefs->getValue('initial_page'), true)->redirect(); } $driver = $injector->getInstance('Turba_Driver')->getDriver($source); @@ -29,12 +29,12 @@ try { $contact = $driver->getObject(Horde_Util::getPost('key')); } catch (Turba_Exception $e) { $notification->push($e, 'horde.error'); - Horde::applicationUrl($prefs->getValue('initial_page'), true)->redirect(); + Horde::url($prefs->getValue('initial_page'), true)->redirect(); } if (!$contact->isEditable()) { $notification->push(_("Permission denied"), 'horde.error'); - Horde::applicationUrl($prefs->getValue('initial_page'), true)->redirect(); + Horde::url($prefs->getValue('initial_page'), true)->redirect(); } $file = Horde_Util::getPost('file'); diff --git a/turba/edit.php b/turba/edit.php index d2caad524..c144ee3bf 100644 --- a/turba/edit.php +++ b/turba/edit.php @@ -20,7 +20,7 @@ $original_source = $vars->get('original_source'); $key = $vars->get('key'); $groupedit = $vars->get('actionID') == 'groupedit'; $objectkeys = $vars->get('objectkeys'); -$url = new Horde_Url(Horde_Util::getFormData('url', Horde::applicationUrl($prefs->getValue('initial_page'), true))); +$url = new Horde_Url(Horde_Util::getFormData('url', Horde::url($prefs->getValue('initial_page'), true))); /* Edit the first of a list of contacts? */ if ($groupedit && (!$key || $key == '**search')) { @@ -89,5 +89,5 @@ $title = sprintf(_("Edit \"%s\""), $contact->getValue('name')); require TURBA_TEMPLATES . '/common-header.inc'; require TURBA_TEMPLATES . '/menu.inc'; $form->setTitle($title); -$form->renderActive(new Horde_Form_Renderer(), $vars, Horde::applicationUrl('edit.php'), 'post'); +$form->renderActive(new Horde_Form_Renderer(), $vars, Horde::url('edit.php'), 'post'); require $registry->get('templates', 'horde') . '/common-footer.inc'; diff --git a/turba/lib/Application.php b/turba/lib/Application.php index 73b3bd319..4a8124e5a 100644 --- a/turba/lib/Application.php +++ b/turba/lib/Application.php @@ -469,8 +469,8 @@ class Turba_Application extends Horde_Registry_Application public function sidebarCreate(Horde_Tree_Base $tree, $parent = null, array $params = array()) { - $add = Horde::applicationUrl('add.php'); - $browse = Horde::applicationUrl('browse.php'); + $add = Horde::url('add.php'); + $browse = Horde::url('browse.php'); if ($GLOBALS['addSources']) { $newimg = Horde_Themes::img('menu/new.png'); @@ -526,7 +526,7 @@ class Turba_Application extends Horde_Registry_Application false, array( 'icon' => Horde_Themes::img('search.png'), - 'url' => Horde::applicationUrl('search.php') + 'url' => Horde::url('search.php') ) ); } diff --git a/turba/lib/Driver.php b/turba/lib/Driver.php index 2e2127f20..0fa8880eb 100644 --- a/turba/lib/Driver.php +++ b/turba/lib/Driver.php @@ -666,7 +666,7 @@ class Turba_Driver implements Countable 'recurrence' => array('type' => Horde_Date_Recurrence::RECUR_YEARLY_DATE, 'interval' => 1), 'params' => array('source' => $this->_name, 'key' => $key), - 'link' => Horde::applicationUrl('contact.php', true)->add(array('source' => $this->_name, 'key' => $key))->setRaw(true)); + 'link' => Horde::url('contact.php', true)->add(array('source' => $this->_name, 'key' => $key))->setRaw(true)); } return $t_objects; diff --git a/turba/lib/Form/EditContactGroup.php b/turba/lib/Form/EditContactGroup.php index c2248a22f..225ab85df 100644 --- a/turba/lib/Form/EditContactGroup.php +++ b/turba/lib/Form/EditContactGroup.php @@ -53,7 +53,7 @@ class Turba_Form_EditContactGroup extends Turba_Form_EditContact $this->getInfo($this->_vars, $info); - $next_page = Horde::applicationUrl('edit.php', true)->add(array( + $next_page = Horde::url('edit.php', true)->add(array( 'source' => $info['source'], 'original_source' => $info['original_source'], 'objectkeys' => $info['objectkeys'], diff --git a/turba/lib/Object.php b/turba/lib/Object.php index 7028ce2cf..a49f55d01 100644 --- a/turba/lib/Object.php +++ b/turba/lib/Object.php @@ -294,7 +294,7 @@ class Turba_Object { */ function url($view = null, $full = false) { - $url = Horde::applicationUrl('contact.php', $full)->add(array( + $url = Horde::url('contact.php', $full)->add(array( 'source' => $this->driver->getName(), 'key' => $this->getValue('__key') )); @@ -415,7 +415,7 @@ class Turba_Object { // Let's see if we can view this one, too. if ($viewer && !($viewer instanceof Horde_Mime_Viewer_Default)) { - $url = Horde::applicationUrl('view.php')->add('actionID', 'view_file'); + $url = Horde::url('view.php')->add('actionID', 'view_file'); $link = Horde::link($url, $file['name'], null, '_blank') . $file['name'] . ''; } else { $link = $file['name']; @@ -435,7 +435,7 @@ class Turba_Object { function vfsEditUrl($file) { $delform = '' . Horde_Util::formInput() . '' . diff --git a/turba/lib/Object/Group.php b/turba/lib/Object/Group.php index b0ed988b3..b627317a4 100644 --- a/turba/lib/Object/Group.php +++ b/turba/lib/Object/Group.php @@ -37,7 +37,7 @@ class Turba_Object_Group extends Turba_Object { */ function url($view = null, $full = false) { - return Horde::applicationUrl('browse.php', $full)->add(array( + return Horde::url('browse.php', $full)->add(array( 'source' => $this->getSource(), 'key' => $this->getValue('__key') )); diff --git a/turba/lib/Turba.php b/turba/lib/Turba.php index 2558dd8c2..65c20c9ee 100644 --- a/turba/lib/Turba.php +++ b/turba/lib/Turba.php @@ -615,19 +615,19 @@ class Turba { $menu = new Horde_Menu(); if (!empty($_SESSION['turba']['has_share'])) { - $menu->add(Horde::applicationUrl('addressbooks/index.php'), _("_My Address Books"), 'turba.png'); + $menu->add(Horde::url('addressbooks/index.php'), _("_My Address Books"), 'turba.png'); } if ($GLOBALS['browse_source_count']) { - $menu->add(Horde::applicationUrl('browse.php'), _("_Browse"), 'menu/browse.png', null, null, null, (($GLOBALS['prefs']->getValue('initial_page') == 'browse.php' && basename($_SERVER['PHP_SELF']) == 'index.php' && basename(dirname($_SERVER['PHP_SELF'])) != 'addressbooks') || (basename($_SERVER['PHP_SELF']) == 'browse.php' && Horde_Util::getFormData('key') != '**search')) ? 'current' : '__noselection'); + $menu->add(Horde::url('browse.php'), _("_Browse"), 'menu/browse.png', null, null, null, (($GLOBALS['prefs']->getValue('initial_page') == 'browse.php' && basename($_SERVER['PHP_SELF']) == 'index.php' && basename(dirname($_SERVER['PHP_SELF'])) != 'addressbooks') || (basename($_SERVER['PHP_SELF']) == 'browse.php' && Horde_Util::getFormData('key') != '**search')) ? 'current' : '__noselection'); } if (count($GLOBALS['addSources'])) { - $menu->add(Horde::applicationUrl('add.php'), _("_New Contact"), 'menu/new.png'); + $menu->add(Horde::url('add.php'), _("_New Contact"), 'menu/new.png'); } - $menu->add(Horde::applicationUrl('search.php'), _("_Search"), 'search.png', Horde_Themes::img(null, 'horde'), null, null, (($GLOBALS['prefs']->getValue('initial_page') == 'search.php' && basename($_SERVER['PHP_SELF']) == 'index.php' && strpos($_SERVER['PHP_SELF'], 'addressbooks/index.php') === false) || (basename($_SERVER['PHP_SELF']) == 'browse.php' && Horde_Util::getFormData('key') == '**search')) ? 'current' : null); + $menu->add(Horde::url('search.php'), _("_Search"), 'search.png', Horde_Themes::img(null, 'horde'), null, null, (($GLOBALS['prefs']->getValue('initial_page') == 'search.php' && basename($_SERVER['PHP_SELF']) == 'index.php' && strpos($_SERVER['PHP_SELF'], 'addressbooks/index.php') === false) || (basename($_SERVER['PHP_SELF']) == 'browse.php' && Horde_Util::getFormData('key') == '**search')) ? 'current' : null); /* Import/Export */ if ($GLOBALS['conf']['menu']['import_export']) { - $menu->add(Horde::applicationUrl('data.php'), _("_Import/Export"), 'data.png', Horde_Themes::img(null, 'horde')); + $menu->add(Horde::url('data.php'), _("_Import/Export"), 'data.png', Horde_Themes::img(null, 'horde')); } return $menu; diff --git a/turba/lib/View/Browse.php b/turba/lib/View/Browse.php index 386fb8f72..773bc6fbf 100644 --- a/turba/lib/View/Browse.php +++ b/turba/lib/View/Browse.php @@ -357,7 +357,7 @@ class Turba_View_Browse { // We might get here from the search page but are not allowed to browse // the current address book. if ($actionID && empty($cfgSources[$source]['browse'])) { - Horde::applicationUrl($prefs->getValue('initial_page'), true) + Horde::url($prefs->getValue('initial_page'), true) ->redirect(); } } diff --git a/turba/lib/View/DeleteContact.php b/turba/lib/View/DeleteContact.php index bf31e22eb..6e2029f5c 100644 --- a/turba/lib/View/DeleteContact.php +++ b/turba/lib/View/DeleteContact.php @@ -46,7 +46,7 @@ class Turba_View_DeleteContact { echo '