| @@ -1,11 +1,10 @@ | ||
| 1 | 1 | <?php |
| 2 | - | |
| 3 | 2 | /** |
| 4 | 3 | * Plugin Name: User Access Manager |
| 5 | 4 | * Plugin URI: http://www.gm-alex.de/projects/wordpress/plugins/user-access-manager/ |
| 6 | 5 | * Author URI: http://www.gm-alex.de/ |
| 7 | - * Version: 1.0 | |
| 6 | + * Version: 1.2.6.9 | |
| 8 | 7 | * Author: Alexander Schneider |
| 9 | 8 | * Description: Manage the access to your posts, pages, categories and files. |
| 10 | 9 | * |
| 11 | 10 | * user-access-manager.php |
| @@ -14,9 +13,9 @@ | ||
| 14 | 13 | * |
| 15 | 14 | * @category UserAccessManager |
| 16 | 15 | * @package UserAccessManager |
| 17 | 16 | * @author Alexander Schneider <alexanderschneider85@gmail.com> |
| 18 | - * @copyright 2008-2010 Alexander Schneider | |
| 17 | + * @copyright 2008-2013 Alexander Schneider | |
| 19 | 18 | * @license http://www.gnu.org/licenses/gpl-2.0.html GNU General Public License, version 2 |
| 20 | 19 | * @version SVN: $Id$ |
| 21 | 20 | * @link http://wordpress.org/extend/plugins/user-access-manager/ |
| 22 | 21 | */ |
| @@ -21,36 +20,66 @@ | ||
| 21 | 20 | * @link http://wordpress.org/extend/plugins/user-access-manager/ |
| 22 | 21 | */ |
| 23 | 22 | |
| 24 | 23 | //Paths |
| 25 | -load_plugin_textdomain( | |
| 26 | - 'user-access-manager', | |
| 27 | - false, | |
| 28 | - 'user-access-manager/lang' | |
| 29 | -); | |
| 24 | +load_plugin_textdomain('user-access-manager', false, 'user-access-manager/lang'); | |
| 25 | +define('UAM_URLPATH', plugins_url('', __FILE__).'/'); | |
| 30 | 26 | |
| 31 | -define( | |
| 32 | - 'UAM_URLPATH', | |
| 33 | - WP_PLUGIN_URL.'/user-access-manager/' | |
| 34 | -); | |
| 35 | - | |
| 36 | 27 | if (defined('UAM_LOCAL_DEBUG')) { |
| 37 | - //ONLY FOR MY LOCAL DEBUG | |
| 38 | - define( | |
| 39 | - 'UAM_REALPATH', | |
| 40 | - '/'.plugin_basename(dirname(__FILE__)).'/' | |
| 41 | - ); | |
| 28 | + define('UAM_REALPATH', plugin_basename(dirname(__FILE__)).'/'); //ONLY FOR MY LOCAL DEBUG | |
| 42 | 29 | } else { |
| 43 | - define( | |
| 44 | - 'UAM_REALPATH', | |
| 45 | - WP_PLUGIN_DIR.'/'.plugin_basename(dirname(__FILE__)).'/' | |
| 46 | - ); | |
| 30 | + define('UAM_REALPATH', WP_PLUGIN_DIR.'/'.plugin_basename(dirname(__FILE__)).'/'); | |
| 47 | 31 | } |
| 48 | 32 | |
| 33 | + | |
| 49 | 34 | //Defines |
| 50 | 35 | require_once 'includes/database.define.php'; |
| 51 | 36 | require_once 'includes/language.define.php'; |
| 52 | 37 | |
| 38 | + | |
| 39 | +//Check requirements | |
| 40 | +$blStop = false; | |
| 41 | + | |
| 42 | +//Check php version | |
| 43 | +$sPhpVersion = phpversion(); | |
| 44 | + | |
| 45 | +if (version_compare($sPhpVersion, "5.0") === -1) { | |
| 46 | + add_action( | |
| 47 | + 'admin_notices', | |
| 48 | + create_function( | |
| 49 | + '', | |
| 50 | + 'echo \'<div id="message" class="error"><p><strong>'. | |
| 51 | + sprintf(TXT_UAM_PHP_VERSION_TO_LOW, $sPhpVersion). | |
| 52 | + '</strong></p></div>\';' | |
| 53 | + ) | |
| 54 | + ); | |
| 55 | + | |
| 56 | + $blStop = true; | |
| 57 | +} | |
| 58 | + | |
| 59 | +//Check wordpress version | |
| 60 | +global $wp_version; | |
| 61 | + | |
| 62 | +if (version_compare($wp_version, "3.0") === -1) { | |
| 63 | + add_action( | |
| 64 | + 'admin_notices', | |
| 65 | + create_function( | |
| 66 | + '', | |
| 67 | + 'echo \'<div id="message" class="error"><p><strong>'. | |
| 68 | + sprintf(TXT_UAM_WORDPRESS_VERSION_TO_LOW, $wp_version). | |
| 69 | + '</strong></p></div>\';' | |
| 70 | + ) | |
| 71 | + ); | |
| 72 | + | |
| 73 | + $blStop = true; | |
| 74 | +} | |
| 75 | + | |
| 76 | +//If we have a error stop plugin. | |
| 77 | +if ($blStop) { | |
| 78 | + return; | |
| 79 | +} | |
| 80 | + | |
| 81 | + | |
| 53 | 82 | //Classes |
| 54 | 83 | require_once 'class/UserAccessManager.class.php'; |
| 55 | 84 | require_once 'class/UamUserGroup.class.php'; |
| 56 | 85 | require_once 'class/UamAccessHandler.class.php'; |
| @@ -55,9 +84,9 @@ | ||
| 55 | 84 | require_once 'class/UamUserGroup.class.php'; |
| 56 | 85 | require_once 'class/UamAccessHandler.class.php'; |
| 57 | 86 | |
| 58 | 87 | if (class_exists("UserAccessManager")) { |
| 59 | - $userAccessManager = new UserAccessManager(); | |
| 88 | + $oUserAccessManager = new UserAccessManager(); | |
| 60 | 89 | } |
| 61 | 90 | |
| 62 | 91 | //Initialize the admin panel |
| 63 | 92 | if (!function_exists("userAccessManagerAP")) { |
| @@ -67,82 +96,114 @@ | ||
| 67 | 96 | * @return null; |
| 68 | 97 | */ |
| 69 | 98 | function userAccessManagerAP() |
| 70 | 99 | { |
| 71 | - global $userAccessManager, | |
| 72 | - $uamUserGroup, | |
| 73 | - $uamAccessHandler, | |
| 74 | - $current_user; | |
| 75 | - | |
| 76 | - if (!isset($userAccessManager)) { | |
| 100 | + global $oUserAccessManager; | |
| 101 | + $oCurrentUser = $oUserAccessManager->getCurrentUser(); | |
| 102 | + | |
| 103 | + if (!isset($oUserAccessManager)) { | |
| 77 | 104 | return; |
| 78 | 105 | } |
| 79 | - | |
| 80 | - $userAccessManager->atAdminPanel = true; | |
| 81 | - $uamOptions = $userAccessManager->getAdminOptions(); | |
| 82 | - $userAccessManager->update(); | |
| 83 | - | |
| 106 | + | |
| 107 | + $oUserAccessManager->setAtAdminPanel(); | |
| 108 | + $aUamOptions = $oUserAccessManager->getAdminOptions(); | |
| 109 | + | |
| 110 | + if ($oUserAccessManager->isDatabaseUpdateNecessary()) { | |
| 111 | + $sLink = 'admin.php?page=uam_setup'; | |
| 112 | + | |
| 113 | + add_action( | |
| 114 | + 'admin_notices', | |
| 115 | + create_function( | |
| 116 | + '', | |
| 117 | + 'echo \'<div id="message" class="error"><p><strong>'. | |
| 118 | + sprintf(TXT_UAM_NEED_DATABASE_UPDATE, $sLink). | |
| 119 | + '</strong></p></div>\';' | |
| 120 | + ) | |
| 121 | + ); | |
| 122 | + } | |
| 123 | + | |
| 84 | 124 | get_currentuserinfo(); |
| 85 | - $curUserdata = get_userdata($current_user->ID); | |
| 86 | - | |
| 87 | - if ($userAccessManager->getAccessHandler()->checkUserAccess() | |
| 88 | - || $uamOptions['authors_can_add_posts_to_groups'] == 'true' | |
| 125 | + $oCurUserData = wp_get_current_user(); | |
| 126 | + $oUamAccessHandler = $oUserAccessManager->getAccessHandler(); | |
| 127 | + $aTaxonomies = get_taxonomies(array('public' => true, '_builtin' => false)); | |
| 128 | + | |
| 129 | + if ($oUamAccessHandler->checkUserAccess() | |
| 130 | + || $aUamOptions['authors_can_add_posts_to_groups'] == 'true' | |
| 89 | 131 | ) { |
| 90 | 132 | //Admin actions |
| 91 | 133 | if (function_exists('add_action')) { |
| 92 | - add_action('admin_print_styles', array(&$userAccessManager, 'addStyles')); | |
| 93 | - add_action('wp_print_scripts', array(&$userAccessManager, 'addScripts')); | |
| 94 | - | |
| 95 | - add_action('manage_posts_custom_column', array(&$userAccessManager, 'addPostColumn'), 10, 2); | |
| 96 | - add_action('manage_pages_custom_column', array(&$userAccessManager, 'addPostColumn'), 10, 2); | |
| 97 | - add_action('save_post', array(&$userAccessManager, 'savePostData')); | |
| 98 | - | |
| 99 | - add_action('manage_media_custom_column', array(&$userAccessManager, 'addPostColumn'), 10, 2); | |
| 100 | - | |
| 134 | + add_action('admin_print_styles', array($oUserAccessManager, 'addStyles')); | |
| 135 | + add_action('wp_print_scripts', array($oUserAccessManager, 'addScripts')); | |
| 136 | + | |
| 137 | + add_action('manage_posts_custom_column', array($oUserAccessManager, 'addPostColumn'), 10, 2); | |
| 138 | + add_action('manage_pages_custom_column', array($oUserAccessManager, 'addPostColumn'), 10, 2); | |
| 139 | + add_action('save_post', array($oUserAccessManager, 'savePostData')); | |
| 140 | + | |
| 141 | + add_action('manage_media_custom_column', array($oUserAccessManager, 'addPostColumn'), 10, 2); | |
| 142 | + | |
| 101 | 143 | //Actions are only called when the attachment content is modified so we can't use it. |
| 102 | - //add_action('add_attachment', array(&$userAccessManager, 'savePostData')); | |
| 103 | - //add_action('edit_attachment', array(&$userAccessManager, 'savePostData')); | |
| 104 | - | |
| 105 | - add_action('edit_user_profile', array(&$userAccessManager, 'showUserProfile')); | |
| 106 | - add_action('profile_update', array(&$userAccessManager, 'saveUserData')); | |
| 107 | - | |
| 108 | - add_action('edit_category_form', array(&$userAccessManager, 'showCategoryEditForm')); | |
| 109 | - add_action('create_category', array(&$userAccessManager, 'saveCategoryData')); | |
| 110 | - add_action('edit_category', array(&$userAccessManager, 'saveCategoryData')); | |
| 144 | + //add_action('add_attachment', array($oUserAccessManager, 'savePostData')); | |
| 145 | + //add_action('edit_attachment', array($oUserAccessManager, 'savePostData')); | |
| 146 | + | |
| 147 | + add_action('edit_user_profile', array($oUserAccessManager, 'showUserProfile')); | |
| 148 | + add_action('profile_update', array($oUserAccessManager, 'saveUserData')); | |
| 149 | + | |
| 150 | + add_action('edit_category_form', array($oUserAccessManager, 'showCategoryEditForm')); | |
| 151 | + add_action('create_category', array($oUserAccessManager, 'saveCategoryData')); | |
| 152 | + add_action('edit_category', array($oUserAccessManager, 'saveCategoryData')); | |
| 153 | + | |
| 154 | + add_action('bulk_edit_custom_box', array($oUserAccessManager, 'addBulkAction')); | |
| 155 | + | |
| 156 | + | |
| 157 | + //Taxonomies | |
| 158 | + foreach ($aTaxonomies as $sTaxonomy) { | |
| 159 | + add_filter('manage_edit-'.$sTaxonomy.'_columns', array($oUserAccessManager, 'addCategoryColumnsHeader')); | |
| 160 | + add_action('manage_'.$sTaxonomy.'_custom_column', array($oUserAccessManager, 'addCategoryColumn'), 10, 3); | |
| 161 | + add_action($sTaxonomy.'_add_form_fields', array($oUserAccessManager, 'showCategoryEditForm')); | |
| 162 | + add_action($sTaxonomy.'_edit_form_fields', array($oUserAccessManager, 'showCategoryEditForm')); | |
| 163 | + add_action('create_'.$sTaxonomy, array($oUserAccessManager, 'saveCategoryData')); | |
| 164 | + add_action('edit_'.$sTaxonomy, array($oUserAccessManager, 'saveCategoryData')); | |
| 165 | + } | |
| 111 | 166 | } |
| 112 | - | |
| 167 | + | |
| 113 | 168 | //Admin filters |
| 114 | 169 | if (function_exists('add_filter')) { |
| 115 | 170 | //The filter we use instead of add|edit_attachment action, reason see top |
| 116 | - add_filter('attachment_fields_to_save', array(&$userAccessManager, 'saveAttachmentData')); | |
| 117 | - | |
| 118 | - add_filter('manage_posts_columns', array(&$userAccessManager, 'addPostColumnsHeader')); | |
| 119 | - add_filter('manage_pages_columns', array(&$userAccessManager, 'addPostColumnsHeader')); | |
| 120 | - | |
| 121 | - add_filter('manage_users_columns', array(&$userAccessManager, 'addUserColumnsHeader'), 10); | |
| 122 | - add_filter('manage_users_custom_column', array(&$userAccessManager, 'addUserColumn'), 10, 3); | |
| 123 | - | |
| 124 | - add_filter('manage_edit-category_columns', array(&$userAccessManager, 'addCategoryColumnsHeader')); | |
| 125 | - add_filter('manage_category_custom_column', array(&$userAccessManager, 'addCategoryColumn'), 10, 3); | |
| 171 | + add_filter('attachment_fields_to_save', array($oUserAccessManager, 'saveAttachmentData')); | |
| 172 | + | |
| 173 | + add_filter('manage_posts_columns', array($oUserAccessManager, 'addPostColumnsHeader')); | |
| 174 | + add_filter('manage_pages_columns', array($oUserAccessManager, 'addPostColumnsHeader')); | |
| 175 | + | |
| 176 | + add_filter('manage_users_columns', array($oUserAccessManager, 'addUserColumnsHeader'), 10); | |
| 177 | + add_filter('manage_users_custom_column', array($oUserAccessManager, 'addUserColumn'), 10, 3); | |
| 178 | + | |
| 179 | + add_filter('manage_edit-category_columns', array($oUserAccessManager, 'addCategoryColumnsHeader')); | |
| 180 | + add_filter('manage_category_custom_column', array($oUserAccessManager, 'addCategoryColumn'), 10, 3); | |
| 126 | 181 | } |
| 127 | - | |
| 128 | - if ($uamOptions['lock_file'] == 'true') { | |
| 129 | - add_action('media_meta', array(&$userAccessManager, 'showMediaFile'), 10, 2); | |
| 130 | - add_filter('manage_media_columns', array(&$userAccessManager, 'addPostColumnsHeader')); | |
| 182 | + | |
| 183 | + if ($aUamOptions['lock_file'] == 'true') { | |
| 184 | + add_action('media_meta', array($oUserAccessManager, 'showMediaFile'), 10, 2); | |
| 185 | + add_filter('manage_media_columns', array($oUserAccessManager, 'addPostColumnsHeader')); | |
| 131 | 186 | } |
| 132 | 187 | } |
| 133 | - | |
| 134 | - //Clean up at deleting should be always done. | |
| 188 | + | |
| 189 | + //Clean up at deleting should always be done. | |
| 135 | 190 | if (function_exists('add_action')) { |
| 136 | - add_action('update_option_permalink_structure', array(&$userAccessManager, 'updatePermalink')); | |
| 137 | - add_action('wp_dashboard_setup', array(&$userAccessManager, 'setupAdminDashboard')); | |
| 138 | - add_action('delete_post', array(&$userAccessManager, 'removePostData')); | |
| 139 | - add_action('delete_attachment', array(&$userAccessManager, 'removePostData')); | |
| 140 | - add_action('delete_user', array(&$userAccessManager, 'removeUserData')); | |
| 141 | - add_action('delete_category', array(&$userAccessManager, 'removeCategoryData'), 10, 2); | |
| 191 | + add_action('update_option_permalink_structure', array($oUserAccessManager, 'updatePermalink')); | |
| 192 | + add_action('wp_dashboard_setup', array($oUserAccessManager, 'setupAdminDashboard')); | |
| 193 | + add_action('delete_post', array($oUserAccessManager, 'removePostData')); | |
| 194 | + add_action('delete_attachment', array($oUserAccessManager, 'removePostData')); | |
| 195 | + add_action('delete_user', array($oUserAccessManager, 'removeUserData')); | |
| 196 | + add_action('delete_category', array($oUserAccessManager, 'removeCategoryData'), 10, 2); | |
| 197 | + | |
| 198 | + // taxonomies | |
| 199 | + | |
| 200 | + foreach ($aTaxonomies as $sTaxonomy) { | |
| 201 | + add_action('delete_'.$sTaxonomy, array($oUserAccessManager, 'removeCategoryData')); | |
| 202 | + } | |
| 142 | 203 | } |
| 143 | 204 | |
| 144 | - $userAccessManager->noRightsToEditContent(); | |
| 205 | + $oUserAccessManager->noRightsToEditContent(); | |
| 145 | 206 | } |
| 146 | 207 | } |
| 147 | 208 | |
| 148 | 209 | if (!function_exists("userAccessManagerAPMenu")) { |
| @@ -152,19 +213,35 @@ | ||
| 152 | 213 | * @return null; |
| 153 | 214 | */ |
| 154 | 215 | function userAccessManagerAPMenu() |
| 155 | 216 | { |
| 156 | - global $userAccessManager, | |
| 157 | - $current_user; | |
| 217 | + global $oUserAccessManager; | |
| 218 | + $oCurrentUser = $oUserAccessManager->getCurrentUser(); | |
| 158 | 219 | |
| 159 | - if (!isset($userAccessManager)) { | |
| 220 | + if (!isset($oUserAccessManager)) { | |
| 160 | 221 | return; |
| 161 | 222 | } |
| 162 | 223 | |
| 163 | - $uamOptions = $userAccessManager->getAdminOptions(); | |
| 164 | - $curUserdata = get_userdata($current_user->ID); | |
| 224 | + $aUamOptions = $oUserAccessManager->getAdminOptions(); | |
| 165 | 225 | |
| 166 | - if ($userAccessManager->getAccessHandler()->checkUserAccess()) { | |
| 226 | + if (ini_get('safe_mode') | |
| 227 | + && $aUamOptions['download_type'] == 'fopen' | |
| 228 | + ) { | |
| 229 | + add_action( | |
| 230 | + 'admin_notices', | |
| 231 | + create_function( | |
| 232 | + '', | |
| 233 | + 'echo \'<div id="message" class="error"><p><strong>'. | |
| 234 | + TXT_UAM_FOPEN_WITHOUT_SAVEMODE_OFF. | |
| 235 | + '</strong></p></div>\';' | |
| 236 | + ) | |
| 237 | + ); | |
| 238 | + } | |
| 239 | + | |
| 240 | + $oCurUserData = get_userdata($oCurrentUser->ID); | |
| 241 | + $oUamAccessHandler = $oUserAccessManager->getAccessHandler(); | |
| 242 | + | |
| 243 | + if ($oUamAccessHandler->checkUserAccess()) { | |
| 167 | 244 | //TODO |
| 168 | 245 | /** |
| 169 | 246 | * --- BOF --- |
| 170 | 247 | * Not the best way to handle full user access capabilities seems |
| @@ -172,17 +249,19 @@ | ||
| 172 | 249 | */ |
| 173 | 250 | |
| 174 | 251 | //Admin main menu |
| 175 | 252 | if (function_exists('add_menu_page')) { |
| 176 | - add_menu_page('User Access Manager', 'UAM', 'read', 'uam_usergroup', array(&$userAccessManager, 'printAdminPage'), 'div'); | |
| 253 | + add_menu_page('User Access Manager', 'UAM', 'manage_options', 'uam_usergroup', array($oUserAccessManager, 'printAdminPage'), 'div'); | |
| 177 | 254 | } |
| 178 | 255 | |
| 179 | 256 | //Admin sub menus |
| 180 | 257 | if (function_exists('add_submenu_page')) { |
| 181 | - add_submenu_page('uam_usergroup', TXT_MANAGE_GROUP, TXT_MANAGE_GROUP, 'read', 'uam_usergroup', array(&$userAccessManager, 'printAdminPage')); | |
| 182 | - add_submenu_page('uam_usergroup', TXT_SETTINGS, TXT_SETTINGS, 'read', 'uam_settings', array(&$userAccessManager, 'printAdminPage')); | |
| 183 | - add_submenu_page('uam_usergroup', TXT_SETUP, TXT_SETUP, 'read', 'uam_setup', array(&$userAccessManager, 'printAdminPage')); | |
| 184 | - add_submenu_page('uam_usergroup', TXT_ABOUT, TXT_ABOUT, 'read', 'uam_about', array(&$userAccessManager, 'printAdminPage')); | |
| 258 | + add_submenu_page('uam_usergroup', TXT_UAM_MANAGE_GROUP, TXT_UAM_MANAGE_GROUP, 'read', 'uam_usergroup', array($oUserAccessManager, 'printAdminPage')); | |
| 259 | + add_submenu_page('uam_usergroup', TXT_UAM_SETTINGS, TXT_UAM_SETTINGS, 'read', 'uam_settings', array($oUserAccessManager, 'printAdminPage')); | |
| 260 | + add_submenu_page('uam_usergroup', TXT_UAM_SETUP, TXT_UAM_SETUP, 'read', 'uam_setup', array($oUserAccessManager, 'printAdminPage')); | |
| 261 | + add_submenu_page('uam_usergroup', TXT_UAM_ABOUT, TXT_UAM_ABOUT, 'read', 'uam_about', array($oUserAccessManager, 'printAdminPage')); | |
| 262 | + | |
| 263 | + do_action('uam_add_submenu'); | |
| 185 | 264 | } |
| 186 | 265 | /** |
| 187 | 266 | * --- EOF --- |
| 188 | 267 | */ |
| @@ -187,50 +266,63 @@ | ||
| 187 | 266 | * --- EOF --- |
| 188 | 267 | */ |
| 189 | 268 | } |
| 190 | 269 | |
| 191 | - if ($userAccessManager->getAccessHandler()->checkUserAccess() | |
| 192 | - || $uamOptions['authors_can_add_posts_to_groups'] == 'true' | |
| 270 | + if ($oUamAccessHandler->checkUserAccess() | |
| 271 | + || $aUamOptions['authors_can_add_posts_to_groups'] == 'true' | |
| 193 | 272 | ) { |
| 194 | 273 | //Admin meta boxes |
| 195 | 274 | if (function_exists('add_meta_box')) { |
| 196 | - add_meta_box('uma_post_access', 'Access', array(&$userAccessManager, 'editPostContent'), 'post', 'side'); | |
| 197 | - add_meta_box('uma_post_access', 'Access', array(&$userAccessManager, 'editPostContent'), 'page', 'side'); | |
| 275 | + $aPostableTypes = $oUamAccessHandler->getPostableTypes(); | |
| 276 | + | |
| 277 | + foreach ($aPostableTypes as $sPostableType) { | |
| 278 | + add_meta_box('uma_post_access', 'Access', array($oUserAccessManager, 'editPostContent'), $sPostableType, 'side'); | |
| 279 | + } | |
| 280 | + | |
| 281 | + /*add_meta_box('uma_post_access', 'Access', array($oUserAccessManager, 'editPostContent'), 'post', 'side'); | |
| 282 | + add_meta_box('uma_post_access', 'Access', array($oUserAccessManager, 'editPostContent'), 'page', 'side');*/ | |
| 198 | 283 | } |
| 199 | 284 | } |
| 200 | 285 | } |
| 201 | 286 | } |
| 202 | 287 | |
| 203 | -if (isset($userAccessManager)) { | |
| 288 | +if (!function_exists("userAccessManagerUninstall")) { | |
| 289 | + function userAccessManagerUninstall() { | |
| 290 | + $oUserAccessManager = new UserAccessManager(); | |
| 291 | + $oUserAccessManager->uninstall(); | |
| 292 | + } | |
| 293 | +} | |
| 294 | + | |
| 295 | +if (isset($oUserAccessManager)) { | |
| 204 | 296 | //install |
| 205 | 297 | if (function_exists('register_activation_hook')) { |
| 206 | - register_activation_hook(__FILE__, array(&$userAccessManager, 'install')); | |
| 298 | + register_activation_hook(__FILE__, array($oUserAccessManager, 'install')); | |
| 207 | 299 | } |
| 208 | 300 | |
| 209 | 301 | //uninstall |
| 210 | 302 | if (function_exists('register_uninstall_hook')) { |
| 211 | - register_uninstall_hook(__FILE__, array(&$userAccessManager, 'uninstall')); | |
| 303 | + register_uninstall_hook(__FILE__, 'userAccessManagerUninstall'); | |
| 212 | 304 | } elseif (function_exists('register_deactivation_hook')) { |
| 213 | 305 | //Fallback |
| 214 | - register_deactivation_hook(__FILE__, array(&$userAccessManager, 'uninstall')); | |
| 306 | + register_deactivation_hook(__FILE__, array($oUserAccessManager, 'uninstall')); | |
| 215 | 307 | } |
| 216 | 308 | |
| 217 | 309 | //deactivation |
| 218 | 310 | if (function_exists('register_deactivation_hook')) { |
| 219 | - register_deactivation_hook(__FILE__, array(&$userAccessManager, 'deactivate')); | |
| 311 | + register_deactivation_hook(__FILE__, array($oUserAccessManager, 'deactivate')); | |
| 220 | 312 | } |
| 221 | 313 | |
| 222 | 314 | //Redirect |
| 223 | - $uamOptions = $userAccessManager->getAdminOptions(); | |
| 315 | + $aUamOptions = $oUserAccessManager->getAdminOptions(); | |
| 224 | 316 | |
| 225 | - if ($uamOptions['redirect'] != 'false' || isset($_GET['getfile'])) { | |
| 226 | - add_action('template_redirect', array(&$userAccessManager, 'redirect')); | |
| 317 | + if ($aUamOptions['redirect'] != 'false' || isset($_GET['uamgetfile'])) { | |
| 318 | + add_filter('wp_headers', array($oUserAccessManager, 'redirect'), 10, 2); | |
| 227 | 319 | } |
| 228 | 320 | |
| 229 | 321 | //Actions |
| 230 | 322 | if (function_exists('add_action')) { |
| 231 | - add_action('wp_print_scripts', array(&$userAccessManager, 'addScripts')); | |
| 232 | - add_action('wp_print_styles', array(&$userAccessManager, 'addStyles')); | |
| 323 | + add_action('wp_print_scripts', array($oUserAccessManager, 'addScripts')); | |
| 324 | + add_action('wp_print_styles', array($oUserAccessManager, 'addStyles')); | |
| 233 | 325 | add_action('admin_init', 'userAccessManagerAP'); |
| 234 | 326 | add_action('admin_menu', 'userAccessManagerAPMenu'); |
| 235 | 327 | } |
| 236 | 328 | |
| @@ -235,17 +327,27 @@ | ||
| 235 | 327 | } |
| 236 | 328 | |
| 237 | 329 | //Filters |
| 238 | 330 | if (function_exists('add_filter')) { |
| 239 | - add_filter('wp_get_attachment_thumb_url', array(&$userAccessManager, 'getFileUrl'), 10, 2); | |
| 240 | - add_filter('wp_get_attachment_url', array(&$userAccessManager, 'getFileUrl'), 10, 2); | |
| 241 | - add_filter('the_posts', array(&$userAccessManager, 'showPost')); | |
| 242 | - add_filter('wp_get_nav_menu_items', array(&$userAccessManager, 'showCustomMenu')); | |
| 243 | - add_filter('comments_array', array(&$userAccessManager, 'showComment')); | |
| 244 | - add_filter('get_pages', array(&$userAccessManager, 'showPage')); | |
| 245 | - add_filter('get_terms', array(&$userAccessManager, 'showCategory'), 10, 2); | |
| 246 | - add_filter('get_next_post_where', array(&$userAccessManager, 'showNextPreviousPost')); | |
| 247 | - add_filter('get_previous_post_where', array(&$userAccessManager, 'showNextPreviousPost')); | |
| 248 | - //add_filter('the_title', array(&$userAccessManager, 'showTitle'), 10, 2); | |
| 249 | - add_filter('edit_post_link', array(&$userAccessManager, 'showGroupMembership'), 10, 2); | |
| 331 | + add_filter('wp_get_attachment_thumb_url', array($oUserAccessManager, 'getFileUrl'), 10, 2); | |
| 332 | + add_filter('wp_get_attachment_url', array($oUserAccessManager, 'getFileUrl'), 10, 2); | |
| 333 | + add_filter('the_posts', array($oUserAccessManager, 'showPost')); | |
| 334 | + add_filter('posts_where_paged', array($oUserAccessManager, 'showPostSql')); | |
| 335 | + add_filter('wp_get_nav_menu_items', array($oUserAccessManager, 'showCustomMenu')); | |
| 336 | + add_filter('comments_array', array($oUserAccessManager, 'showComment')); | |
| 337 | + add_filter('the_comments', array($oUserAccessManager, 'showComment')); | |
| 338 | + add_filter('get_pages', array($oUserAccessManager, 'showPage')); | |
| 339 | + add_filter('get_terms', array($oUserAccessManager, 'showTerms'), 10, 2); | |
| 340 | + add_filter('get_next_post_where', array($oUserAccessManager, 'showNextPreviousPost')); | |
| 341 | + add_filter('get_previous_post_where', array($oUserAccessManager, 'showNextPreviousPost')); | |
| 342 | + add_filter('post_link', array($oUserAccessManager, 'cachePostLinks'), 10, 2); | |
| 343 | + add_filter('edit_post_link', array($oUserAccessManager, 'showGroupMembership'), 10, 2); | |
| 344 | + add_filter('parse_query', array($oUserAccessManager, 'parseQuery')); | |
| 345 | + add_filter('getarchives_where', array($oUserAccessManager, 'showPostSql')); | |
| 346 | + add_filter('wpseo_sitemap_entry', array($oUserAccessManager, 'wp_seo_url'), 1, 3); // Yaost Sitemap Plugin | |
| 250 | 347 | } |
| 348 | +} | |
| 349 | + | |
| 350 | +//Add the cli interface to the known commands | |
| 351 | +if (defined('WP_CLI') && WP_CLI) { | |
| 352 | + include __DIR__.'/includes/wp-cli.php'; | |
| 251 | 353 | } |