From 4ff61fa6a8c012053659b1723b7dea9d38cd654e Mon Sep 17 00:00:00 2001 From: cash Date: Thu, 3 Feb 2011 12:10:45 +0000 Subject: changed elgg_get_plugin_path() to elgg_get_plugins_path() git-svn-id: http://code.elgg.org/elgg/trunk@8001 36083f99-b078-4883-b0ff-0f9b5a30f544 --- engine/classes/ElggPlugin.php | 2 +- engine/classes/ElggPluginPackage.php | 2 +- engine/lib/configuration.php | 2 +- engine/lib/plugins.php | 6 +++--- mod/blog/start.php | 4 ++-- mod/categories/start.php | 2 +- mod/defaultwidgets/start.php | 2 +- mod/developers/start.php | 2 +- mod/diagnostics/start.php | 2 +- mod/file/actions/file/download.php | 2 +- mod/file/start.php | 6 +++--- mod/groups/icon.php | 2 +- mod/groups/start.php | 10 +++++----- mod/invitefriends/start.php | 2 +- mod/messageboard/start.php | 4 ++-- mod/messages/start.php | 6 +++--- mod/notifications/start.php | 4 ++-- mod/pages/start.php | 6 +++--- mod/reportedcontent/start.php | 2 +- mod/sitepages/start.php | 2 +- mod/thewire/start.php | 2 +- mod/twitterservice/start.php | 2 +- views/default/admin/components/plugin.php | 2 +- 23 files changed, 38 insertions(+), 38 deletions(-) diff --git a/engine/classes/ElggPlugin.php b/engine/classes/ElggPlugin.php index b6cb792fb..5782ac4dd 100644 --- a/engine/classes/ElggPlugin.php +++ b/engine/classes/ElggPlugin.php @@ -50,7 +50,7 @@ class ElggPlugin extends ElggObject { parent::__construct($plugin); $this->path = get_config('plugins_path') . $this->getID(); } else { - $plugin_path = elgg_get_plugin_path(); + $plugin_path = elgg_get_plugins_path(); // not a full path, so assume an id // use the default path diff --git a/engine/classes/ElggPluginPackage.php b/engine/classes/ElggPluginPackage.php index 74c8bd020..d7392132c 100644 --- a/engine/classes/ElggPluginPackage.php +++ b/engine/classes/ElggPluginPackage.php @@ -93,7 +93,7 @@ class ElggPluginPackage { * @throws PluginException */ public function __construct($plugin, $validate = true) { - $plugin_path = elgg_get_plugin_path(); + $plugin_path = elgg_get_plugins_path(); // @todo wanted to avoid another is_dir() call here. // should do some profiling to see how much it affects if (strpos($plugin, $plugin_path) === 0 || is_dir($plugin)) { diff --git a/engine/lib/configuration.php b/engine/lib/configuration.php index 3459c52a3..192959896 100644 --- a/engine/lib/configuration.php +++ b/engine/lib/configuration.php @@ -45,7 +45,7 @@ function elgg_get_site_url($site_guid = 0) { * @return string * @since 1.8.0 */ -function elgg_get_plugin_path() { +function elgg_get_plugins_path() { global $CONFIG; return $CONFIG->pluginspath; } diff --git a/engine/lib/plugins.php b/engine/lib/plugins.php index c5a34bc81..783827d27 100644 --- a/engine/lib/plugins.php +++ b/engine/lib/plugins.php @@ -57,7 +57,7 @@ define('ELGG_PLUGIN_INTERNAL_PREFIX', 'elgg:internal:'); */ function elgg_get_plugin_ids_in_dir($dir = null) { if (!$dir) { - $dir = elgg_get_plugin_path(); + $dir = elgg_get_plugins_path(); } $plugin_idss = array(); @@ -88,7 +88,7 @@ function elgg_get_plugin_ids_in_dir($dir = null) { */ function elgg_generate_plugin_entities() { $site = get_config('site'); - $dir = elgg_get_plugin_path(); + $dir = elgg_get_plugins_path(); $options = array( 'type' => 'object', @@ -254,7 +254,7 @@ function elgg_get_max_plugin_priority() { function elgg_load_plugins() { global $CONFIG; - $plugins_path = elgg_get_plugin_path(); + $plugins_path = elgg_get_plugins_path(); $start_flags = ELGG_PLUGIN_INCLUDE_START | ELGG_PLUGIN_REGISTER_VIEWS | ELGG_PLUGIN_REGISTER_LANGUAGES diff --git a/mod/blog/start.php b/mod/blog/start.php index afedfc4d7..104897bfd 100644 --- a/mod/blog/start.php +++ b/mod/blog/start.php @@ -19,7 +19,7 @@ elgg_register_event_handler('init', 'system', 'blog_init'); */ function blog_init() { - elgg_register_library('elgg:blog', elgg_get_plugin_path() . 'blog/lib/blog.php'); + elgg_register_library('elgg:blog', elgg_get_plugins_path() . 'blog/lib/blog.php'); // add a site navigation item $item = new ElggMenuItem('blog', elgg_echo('blog:blogs'), 'pg/blog/all'); @@ -59,7 +59,7 @@ function blog_init() { elgg_register_widget_type('blog', elgg_echo('blog'), elgg_echo('blog:widget:description'), 'profile'); // register actions - $action_path = elgg_get_plugin_path() . 'blog/actions/blog'; + $action_path = elgg_get_plugins_path() . 'blog/actions/blog'; elgg_register_action('blog/save', "$action_path/save.php"); elgg_register_action('blog/auto_save_revision', "$action_path/auto_save_revision.php"); elgg_register_action('blog/delete', "$action_path/delete.php"); diff --git a/mod/categories/start.php b/mod/categories/start.php index a904f19ae..aa460677a 100644 --- a/mod/categories/start.php +++ b/mod/categories/start.php @@ -14,7 +14,7 @@ function categories_init() { elgg_extend_view('css/screen', 'categories/css'); - $action_base = elgg_get_plugin_path() . 'categories/actions'; + $action_base = elgg_get_plugins_path() . 'categories/actions'; elgg_register_action('settings/categories/save', "$action_base/save.php", 'admin'); register_page_handler('categories', 'categories_page_handler'); diff --git a/mod/defaultwidgets/start.php b/mod/defaultwidgets/start.php index acc8951d3..653ac6fce 100644 --- a/mod/defaultwidgets/start.php +++ b/mod/defaultwidgets/start.php @@ -29,7 +29,7 @@ function defaultwidgets_init() { elgg_register_event_handler('validate', 'user', 'defaultwidgets_reset_access'); } - $action_dir = elgg_get_plugin_path() . 'defaultwidgets/actions'; + $action_dir = elgg_get_plugins_path() . 'defaultwidgets/actions'; elgg_register_action("defaultwidgets/update", "$action_dir/update.php", 'admin'); elgg_register_plugin_hook_handler('permissions_check', 'user', 'defaultwidgets_can_edit'); diff --git a/mod/developers/start.php b/mod/developers/start.php index 04c83bdde..2be3bb0f6 100644 --- a/mod/developers/start.php +++ b/mod/developers/start.php @@ -8,7 +8,7 @@ elgg_register_event_handler('init', 'system', 'developers_init'); function developers_init() { elgg_register_event_handler('pagesetup', 'system', 'developers_setup_menu'); - $action_base = elgg_get_plugin_path() . 'developers/actions/developers'; + $action_base = elgg_get_plugins_path() . 'developers/actions/developers'; elgg_register_action('developers/settings', "$action_base/settings.php", 'admin'); } diff --git a/mod/diagnostics/start.php b/mod/diagnostics/start.php index 27893f4ed..a756c8168 100644 --- a/mod/diagnostics/start.php +++ b/mod/diagnostics/start.php @@ -19,7 +19,7 @@ function diagnostics_init() { elgg_add_admin_menu_item('diagnostics', elgg_echo('diagnostics'), 'utilities'); // Register some actions - $file = elgg_get_plugin_path() . "diagnostics/actions/download.php"; + $file = elgg_get_plugins_path() . "diagnostics/actions/download.php"; elgg_register_action("diagnostics/download", $file, 'admin'); } diff --git a/mod/file/actions/file/download.php b/mod/file/actions/file/download.php index 6768bd4b1..d6abb8398 100644 --- a/mod/file/actions/file/download.php +++ b/mod/file/actions/file/download.php @@ -6,6 +6,6 @@ */ // @todo this is here for backwards compatibility (first version of embed plugin?) -$download_page_handler = elgg_get_plugin_path() . 'file/download.php'; +$download_page_handler = elgg_get_plugins_path() . 'file/download.php'; include $download_page_handler; diff --git a/mod/file/start.php b/mod/file/start.php index f60de52ec..4eb67cd32 100644 --- a/mod/file/start.php +++ b/mod/file/start.php @@ -13,7 +13,7 @@ elgg_register_event_handler('init', 'system', 'file_init'); function file_init() { // register a library of helper functions - elgg_register_library('elgg:file', elgg_get_plugin_path() . 'file/lib/file.php'); + elgg_register_library('elgg:file', elgg_get_plugins_path() . 'file/lib/file.php'); // Site navigation $item = new ElggMenuItem('file', elgg_echo('file'), 'pg/file/all'); @@ -50,7 +50,7 @@ function file_init() { elgg_register_plugin_hook_handler('register', 'menu:owner_block', 'file_owner_block_menu'); // Register actions - $action_path = elgg_get_plugin_path() . 'file/actions/file'; + $action_path = elgg_get_plugins_path() . 'file/actions/file'; elgg_register_action("file/upload", "$action_path/upload.php"); elgg_register_action("file/delete", "$action_path/delete.php"); // temporary - see #2010 @@ -85,7 +85,7 @@ function file_page_handler($page) { $page[0] = 'all'; } - $file_dir = elgg_get_plugin_path() . 'file'; + $file_dir = elgg_get_plugins_path() . 'file'; $page_type = $page[0]; switch ($page_type) { diff --git a/mod/groups/icon.php b/mod/groups/icon.php index 59247e9f8..c72b5f308 100644 --- a/mod/groups/icon.php +++ b/mod/groups/icon.php @@ -28,7 +28,7 @@ if ($filehandler->open("read")) { } if (!$success) { - $location = elgg_get_plugin_path() . "groups/graphics/default{$size}.jpg"; + $location = elgg_get_plugins_path() . "groups/graphics/default{$size}.jpg"; $contents = @file_get_contents($location); } diff --git a/mod/groups/start.php b/mod/groups/start.php index cb062bd46..58c47c305 100644 --- a/mod/groups/start.php +++ b/mod/groups/start.php @@ -15,7 +15,7 @@ elgg_register_event_handler('init', 'system', 'groups_fields_setup', 10000); */ function groups_init() { - elgg_register_library('elgg:groups', elgg_get_plugin_path() . 'groups/lib/groups.php'); + elgg_register_library('elgg:groups', elgg_get_plugins_path() . 'groups/lib/groups.php'); // register group entities for search register_entity_type('group', ''); @@ -34,7 +34,7 @@ function groups_init() { register_page_handler('groupicon', 'groups_icon_handler'); // Register some actions - $action_base = elgg_get_plugin_path() . 'groups/actions'; + $action_base = elgg_get_plugins_path() . 'groups/actions'; elgg_register_action("groups/edit", "$action_base/edit.php"); elgg_register_action("groups/delete", "$action_base/delete.php"); elgg_register_action("groups/join", "$action_base/join.php"); @@ -245,7 +245,7 @@ function groups_icon_handler($page) { set_input('size', $page[1]); } // Include the standard profile index - $plugin_dir = elgg_get_plugin_path(); + $plugin_dir = elgg_get_plugins_path(); include("$plugin_dir/groups/icon.php"); } @@ -503,14 +503,14 @@ elgg_register_event_handler('init', 'system', 'discussion_init'); */ function discussion_init() { - elgg_register_library('elgg:discussion', elgg_get_plugin_path() . 'groups/lib/discussion.php'); + elgg_register_library('elgg:discussion', elgg_get_plugins_path() . 'groups/lib/discussion.php'); register_page_handler('discussion', 'discussion_page_handler'); register_entity_url_handler('discussion_override_topic_url', 'object', 'groupforumtopic'); //register_extender_url_handler('group_topicpost_url', 'annotation', 'group_topic_post'); - $action_base = elgg_get_plugin_path() . 'groups/actions/discussion'; + $action_base = elgg_get_plugins_path() . 'groups/actions/discussion'; elgg_register_action('discussion/save', "$action_base/save.php"); elgg_register_action('discussion/delete', "$action_base/delete.php"); diff --git a/mod/invitefriends/start.php b/mod/invitefriends/start.php index bd470f144..f3e4a0baa 100644 --- a/mod/invitefriends/start.php +++ b/mod/invitefriends/start.php @@ -10,7 +10,7 @@ elgg_register_event_handler('init', 'system', 'invitefriends_init'); function invitefriends_init() { register_page_handler('invite', 'invitefriends_page_handler'); - elgg_register_action('invitefriends/invite', elgg_get_plugin_path() . 'invitefriends/actions/invite.php'); + elgg_register_action('invitefriends/invite', elgg_get_plugins_path() . 'invitefriends/actions/invite.php'); $params = array( 'name' => 'invite', diff --git a/mod/messageboard/start.php b/mod/messageboard/start.php index 21b640c83..0e587f914 100644 --- a/mod/messageboard/start.php +++ b/mod/messageboard/start.php @@ -23,7 +23,7 @@ function messageboard_init() { elgg_register_widget_type('messageboard', elgg_echo("messageboard:board"), elgg_echo("messageboard:desc"), "profile"); // Register actions - $action_path = elgg_get_plugin_path() . 'messageboard/actions'; + $action_path = elgg_get_plugins_path() . 'messageboard/actions'; elgg_register_action("messageboard/add", "$action_path/add.php"); elgg_register_action("messageboard/delete", "$action_path/delete.php"); } @@ -41,7 +41,7 @@ function messageboard_page_handler($page) { } // Include the standard messageboard index - include(elgg_get_plugin_path() . "messageboard/index.php"); + include(elgg_get_plugins_path() . "messageboard/index.php"); } /** diff --git a/mod/messages/start.php b/mod/messages/start.php index ccb92d94f..a36bbc621 100644 --- a/mod/messages/start.php +++ b/mod/messages/start.php @@ -12,7 +12,7 @@ elgg_register_event_handler('init', 'system', 'messages_init'); function messages_init() { // register a library of helper functions - elgg_register_library('elgg:messages', elgg_get_plugin_path() . 'messages/lib/messages.php'); + elgg_register_library('elgg:messages', elgg_get_plugins_path() . 'messages/lib/messages.php'); // add page menu items if (isloggedin()) { @@ -59,7 +59,7 @@ function messages_init() { elgg_register_plugin_hook_handler('container_permissions_check', 'object', 'messages_can_edit_container'); // Register actions - $action_path = elgg_get_plugin_path() . 'messages/actions/messages'; + $action_path = elgg_get_plugins_path() . 'messages/actions/messages'; elgg_register_action("messages/send", "$action_path/send.php"); elgg_register_action("messages/delete", "$action_path/delete.php"); elgg_register_action("messages/process", "$action_path/process.php"); @@ -92,7 +92,7 @@ function messages_page_handler($page) { $page[1] = get_loggedin_user()->username; } - $base_dir = elgg_get_plugin_path() . 'messages'; + $base_dir = elgg_get_plugins_path() . 'messages'; switch ($page[0]) { case 'inbox': diff --git a/mod/notifications/start.php b/mod/notifications/start.php index 6f489f94d..00e981f7b 100644 --- a/mod/notifications/start.php +++ b/mod/notifications/start.php @@ -27,7 +27,7 @@ function notifications_plugin_init() { elgg_register_event_handler('create', 'friend', 'notifications_update_friend_notify'); elgg_register_plugin_hook_handler('access:collections:add-user', 'collection', 'notifications_update_collection_notify'); - $actions_base = elgg_get_plugin_path() . 'notifications/actions'; + $actions_base = elgg_get_plugins_path() . 'notifications/actions'; elgg_register_action("notificationsettings/save", "$actions_base/save.php"); elgg_register_action("notificationsettings/groupsave", "$actions_base/groupsave.php"); } @@ -44,7 +44,7 @@ function notifications_page_handler($page) { $page[0] = 'personal'; } - $base = elgg_get_plugin_path() . 'notifications'; + $base = elgg_get_plugins_path() . 'notifications'; switch ($page[0]) { case 'group': diff --git a/mod/pages/start.php b/mod/pages/start.php index 678449dc1..efbf243d6 100644 --- a/mod/pages/start.php +++ b/mod/pages/start.php @@ -14,7 +14,7 @@ elgg_register_event_handler('init', 'system', 'pages_init'); function pages_init() { // register a library of helper functions - elgg_register_library('elgg:pages', elgg_get_plugin_path() . 'pages/lib/pages.php'); + elgg_register_library('elgg:pages', elgg_get_plugins_path() . 'pages/lib/pages.php'); $item = new ElggMenuItem('pages', elgg_echo('pages'), 'pg/pages/all'); elgg_register_menu_item('site', $item); @@ -28,7 +28,7 @@ function pages_init() { register_extender_url_handler('pages_revision_url', 'annotation', 'page'); // Register some actions - $action_base = elgg_get_plugin_path() . 'pages/actions/pages'; + $action_base = elgg_get_plugins_path() . 'pages/actions/pages'; elgg_register_action("pages/edit", "$action_base/edit.php"); elgg_register_action("pages/editwelcome", "$action_base/editwelcome.php"); elgg_register_action("pages/delete", "$action_base/delete.php"); @@ -105,7 +105,7 @@ function pages_page_handler($page) { elgg_push_breadcrumb(elgg_echo('pages'), 'pg/pages/all'); - $base_dir = elgg_get_plugin_path() . 'pages'; + $base_dir = elgg_get_plugins_path() . 'pages'; $page_type = $page[0]; switch ($page_type) { diff --git a/mod/reportedcontent/start.php b/mod/reportedcontent/start.php index 4cb5bea12..360e868f7 100644 --- a/mod/reportedcontent/start.php +++ b/mod/reportedcontent/start.php @@ -36,7 +36,7 @@ function reportedcontent_init() { 'admin'); // Register actions - $action_path = elgg_get_plugin_path() . "reportedcontent/actions"; + $action_path = elgg_get_plugins_path() . "reportedcontent/actions"; elgg_register_action('reportedcontent/add', "$action_path/add.php"); elgg_register_action('reportedcontent/delete', "$action_path/delete.php", 'admin'); elgg_register_action('reportedcontent/archive', "$action_path/archive.php", 'admin'); diff --git a/mod/sitepages/start.php b/mod/sitepages/start.php index 5f2a7dc6b..e2c8065db 100644 --- a/mod/sitepages/start.php +++ b/mod/sitepages/start.php @@ -51,7 +51,7 @@ function sitepages_init() { // hook into the walled garden pages elgg_register_plugin_hook_handler('public_pages', 'walled_garden', 'sitepages_public_pages'); - $action_path = elgg_get_plugin_path() . 'sitepages/actions'; + $action_path = elgg_get_plugins_path() . 'sitepages/actions'; elgg_register_action('settings/sitepages/save', "$action_path/edit_settings.php"); } diff --git a/mod/thewire/start.php b/mod/thewire/start.php index 6aba3aff6..1c984d792 100644 --- a/mod/thewire/start.php +++ b/mod/thewire/start.php @@ -90,7 +90,7 @@ function rest_wire_post($username, $text) { // Listen to notification events and supply a more useful message for SMS' elgg_register_plugin_hook_handler('notify:entity:message', 'object', 'thewire_notify_message'); - $action_path = elgg_get_plugin_path() . 'thewire/actions'; + $action_path = elgg_get_plugins_path() . 'thewire/actions'; elgg_register_action("thewire/add", "$action_path/add.php"); elgg_register_action("thewire/delete", "$action_path/delete.php"); } diff --git a/mod/twitterservice/start.php b/mod/twitterservice/start.php index 2b6e7895f..14885ffc1 100644 --- a/mod/twitterservice/start.php +++ b/mod/twitterservice/start.php @@ -27,7 +27,7 @@ function twitterservice_init() { elgg_delete_admin_notice($notice_id); // require libraries - $base = elgg_get_plugin_path() . 'twitterservice'; + $base = elgg_get_plugins_path() . 'twitterservice'; require_once "$base/vendors/twitteroauth/twitterOAuth.php"; require_once "$base/twitterservice_lib.php"; diff --git a/views/default/admin/components/plugin.php b/views/default/admin/components/plugin.php index a64fa7216..ff1abee1e 100644 --- a/views/default/admin/components/plugin.php +++ b/views/default/admin/components/plugin.php @@ -127,7 +127,7 @@ if ($categories) { $screenshot_html = ''; $screenshots = $plugin->manifest->getScreenshots(); if ($screenshots) { - $base_url = elgg_get_plugin_path() . $plugin->getID() . '/'; + $base_url = elgg_get_plugins_path() . $plugin->getID() . '/'; $limit = 4; foreach ($screenshots as $screenshot) { if ($limit <= 0) { -- cgit v1.2.3