github-migration
/
comicpress-manager-1.4
1
0
Fork 0
Code Issues 2 Pull Requests 1 Packages Projects Releases Wiki Activity

Merge branch 'master' of git@github.com:johnbintz/comicpress-manager-1.4

This commit is contained in:
John Bintz 2009-08-20 19:47:04 -04:00
parent b44c6db194 d21865773b
commit 043d609702
7 changed files with 56 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
actions/comicpress_do-first-run.php
View File

@ -1,7 +1,7 @@
<?php <?php
function cpm_action_do_first_run() { function cpm_action_do_first_run() {
global $cpm_config, $blog_id; global $cpm_config, $blog_id, $wpmu_version;
$dir_list = array( $dir_list = array(
CPM_DOCUMENT_ROOT, CPM_DOCUMENT_ROOT,
@ -9,8 +9,8 @@ function cpm_action_do_first_run() {
CPM_DOCUMENT_ROOT . '/comics-rss', CPM_DOCUMENT_ROOT . '/comics-rss',
CPM_DOCUMENT_ROOT . '/comics-archive' CPM_DOCUMENT_ROOT . '/comics-archive'
); );
$is_wpmu = $wpmu_version;
//if ($is_wpmu = function_exists('get_site_option')) { $dir_list = cpm_wpmu_first_run_dir_list(); } if ($is_wpmu) { $dir_list = cpm_wpmu_first_run_dir_list(); }
$any_made = false; $any_made = false;
$all_made = true; $all_made = true;

10
actions/comicpress_update-config.php
View File

@ -1,7 +1,7 @@
<?php <?php
function cpm_action_update_config() { function cpm_action_update_config() {
global $cpm_config; global $cpm_config, $wpmu_version;
$cpm_config->is_cpm_managing_posts = true; $cpm_config->is_cpm_managing_posts = true;
@ -35,10 +35,10 @@ function cpm_action_update_config() {
} }
} }
//if (function_exists('get_site_option')) { if ($wpmu_version) {
// cpm_wpmu_save_options(); cpm_wpmu_save_options();
// $cpm_config->is_wp_options = true; $cpm_config->is_wp_options = true;
//} }
if (!$cpm_config->is_wp_options) { if (!$cpm_config->is_wp_options) {
if (!$do_write) { if (!$do_write) {

56
comicpress_manager_admin.php
View File

@ -57,7 +57,7 @@ function cpm_get_plugin_path() {
* Also read in the configuration and handle any POST actions. * Also read in the configuration and handle any POST actions.
*/ */
function cpm_add_pages() { function cpm_add_pages() {
global $plugin_page, $access_level, $pagenow, $cpm_config, $wp_version; global $plugin_page, $access_level, $pagenow, $cpm_config, $wp_version, $wpmu_version;
load_plugin_textdomain('comicpress-manager', cpm_get_plugin_path()); load_plugin_textdomain('comicpress-manager', cpm_get_plugin_path());
@ -107,7 +107,7 @@ function cpm_add_pages() {
add_menu_page($plugin_title, __("ComicPress", 'comicpress-manager'), $access_level, $filename, "cpm_manager_index_caller", get_option('siteurl') . '/' . cpm_get_plugin_path() . '/comicpress-icon.png'); add_menu_page($plugin_title, __("ComicPress", 'comicpress-manager'), $access_level, $filename, "cpm_manager_index_caller", get_option('siteurl') . '/' . cpm_get_plugin_path() . '/comicpress-icon.png');
add_submenu_page($filename, $plugin_title, __("Upload", 'comicpress-manager'), $access_level, $filename, 'cpm_manager_index_caller'); add_submenu_page($filename, $plugin_title, __("Upload", 'comicpress-manager'), $access_level, $filename, 'cpm_manager_index_caller');
//if (!function_exists('get_site_option')) { //if (!$wpmu_version) {
add_submenu_page($filename, $plugin_title, __("Import", 'comicpress-manager'), $access_level, $filename . '-import', 'cpm_manager_import_caller'); add_submenu_page($filename, $plugin_title, __("Import", 'comicpress-manager'), $access_level, $filename . '-import', 'cpm_manager_import_caller');
//} //}
@ -732,7 +732,7 @@ function cpm_wrap_content($help_content, $activity_content, $show_sidebar = true
<?php } <?php }
function cpm_manager_page_caller($page) { function cpm_manager_page_caller($page) {
global $cpm_config; global $cpm_config, $wpmu_version;
$do_first_run = false; $do_first_run = false;
if (!cpm_option('cpm-did-first-run')) { if (!cpm_option('cpm-did-first-run')) {
@ -743,18 +743,18 @@ function cpm_manager_page_caller($page) {
$do_first_run = !$all_comic_folders_found; $do_first_run = !$all_comic_folders_found;
if (!$do_first_run) { if (!$do_first_run) {
//if (!function_exists('get_site_option')) { if ($wpmu_version) {
update_option("comicpress-manager-cpm-did-first-run", 1); update_option("comicpress-manager-cpm-did-first-run", 1);
//} }
} }
} }
if ($do_first_run) { if ($do_first_run) {
include("pages/comicpress_first_run.php"); include("pages/comicpress_first_run.php");
cpm_manager_first_run(plugin_basename(__FILE__)); cpm_manager_first_run(plugin_basename(__FILE__));
//if (!function_exists('get_site_option')) { if ($wpmu_version) {
update_option("comicpress-manager-cpm-did-first-run", 1); update_option("comicpress-manager-cpm-did-first-run", 1);
//} }
} else { } else {
if ($cpm_config->did_first_run) { $page = "config"; } if ($cpm_config->did_first_run) { $page = "config"; }
include("pages/comicpress_${page}.php"); include("pages/comicpress_${page}.php");
@ -1290,7 +1290,7 @@ function cpm_obfuscate_filename($filename) {
} }
function cpm_do_gd_file_check_on_upload($check_file_path, $target_filename) { function cpm_do_gd_file_check_on_upload($check_file_path, $target_filename) {
global $cpm_config; global $cpm_config, $wpmu_version;
$file_ok = true; $file_ok = true;
$did_filecheck = false; $did_filecheck = false;
@ -1626,9 +1626,9 @@ function cpm_handle_file_uploads($files) {
} }
} }
} }
//if (function_exists('get_site_option')) { if ($wpmu_version) {
// if (cpm_wpmu_is_over_storage_limit()) { $ok_to_keep_uploading = false; break; } if (cpm_wpmu_is_over_storage_limit()) { $ok_to_keep_uploading = false; break; }
//} }
} }
if ($ok_to_keep_uploading) { if ($ok_to_keep_uploading) {
@ -1648,9 +1648,9 @@ function cpm_handle_file_uploads($files) {
} }
} }
} }
//if (function_exists('get_site_option')) { if ($wpmu_version) {
// if (cpm_wpmu_is_over_storage_limit()) { $ok_to_keep_uploading = false; } if (cpm_wpmu_is_over_storage_limit()) { $ok_to_keep_uploading = false; }
//} }
} }
if ($ok_to_keep_uploading) { if ($ok_to_keep_uploading) {
@ -1861,7 +1861,7 @@ var ajax_request_uri = "<?php echo $plugin_url_root ?>/comicpress_manager_count_
* Handle any warnings that have been invoked. * Handle any warnings that have been invoked.
*/ */
function cpm_handle_warnings() { function cpm_handle_warnings() {
global $cpm_config; global $cpm_config, $wpmu_version;
// display informative messages to the use // display informative messages to the use
// TODO: remove separate arrays and tag messages based on an enum value // TODO: remove separate arrays and tag messages based on an enum value
@ -1947,9 +1947,9 @@ function cpm_handle_warnings() {
arsort($available_backup_files); arsort($available_backup_files);
//if (function_exists('get_site_option')) { // if ($wpmu_version) {
//$cpm_config->show_config_editor = true; // $cpm_config->show_config_editor = true;
//} else { // } else {
if ($cpm_config->config_method == "comicpress-config.php") { if ($cpm_config->config_method == "comicpress-config.php") {
if (!$cpm_config->can_write_config) { if (!$cpm_config->can_write_config) {
$update_automatically = false; $update_automatically = false;
@ -1989,19 +1989,19 @@ function cpm_handle_warnings() {
<hr /> <hr />
<?php } <?php }
} }
//} // }
if ($cpm_config->show_config_editor) { if ($cpm_config->show_config_editor) {
echo cpm_manager_edit_config(); echo cpm_manager_edit_config();
} ?> } ?>
<?php //if (!function_exists('get_site_option')) { ?> <?php if ($wpmu_version) { ?>
<hr /> <hr />
<strong><?php _e('Debug info', 'comicpress-manager') ?></strong> (<em><?php _e("this data is sanitized to protect your server's configuration", 'comicpress-manager') ?></em>) <strong><?php _e('Debug info', 'comicpress-manager') ?></strong> (<em><?php _e("this data is sanitized to protect your server's configuration", 'comicpress-manager') ?></em>)
<?php echo cpm_show_debug_info(false); <?php echo cpm_show_debug_info(false);
//} }
return false; return false;
} }
@ -2042,7 +2042,7 @@ function cpm_handle_actions() {
* Show the details of the current setup in the Sidebar. * Show the details of the current setup in the Sidebar.
*/ */
function cpm_show_comicpress_details() { function cpm_show_comicpress_details() {
global $cpm_config; global $cpm_config, $wpmu_version;
$all_comic_dates_ok = true; $all_comic_dates_ok = true;
$all_comic_dates = array(); $all_comic_dates = array();
@ -2137,7 +2137,7 @@ function cpm_show_comicpress_details() {
<li><strong><?php _e('Blog category:', 'comicpress-manager') ?></strong> <a href="<?php echo get_category_link($cpm_config->properties['blogcat']) ?>" ?> <li><strong><?php _e('Blog category:', 'comicpress-manager') ?></strong> <a href="<?php echo get_category_link($cpm_config->properties['blogcat']) ?>" ?>
<?php echo $cpm_config->blog_category_info['name'] ?></a> <?php printf(__('(ID %s)', 'comicpress-manager'), $cpm_config->properties['blogcat']) ?></li> <?php echo $cpm_config->blog_category_info['name'] ?></a> <?php printf(__('(ID %s)', 'comicpress-manager'), $cpm_config->properties['blogcat']) ?></li>
<?php //if (!function_exists('get_site_option')) { ?> <?php if (!$wpmu_version) { ?>
<li><strong><?php _e("PHP Version:", 'comicpress-manager') ?></strong> <?php echo phpversion() ?> <li><strong><?php _e("PHP Version:", 'comicpress-manager') ?></strong> <?php echo phpversion() ?>
<?php if (substr(phpversion(), 0, 3) < 5.2) { ?> <?php if (substr(phpversion(), 0, 3) < 5.2) { ?>
(<a href="http://gophp5.org/hosts"><?php _e("upgrade strongly recommended", 'comicpress-manager') ?></a>) (<a href="http://gophp5.org/hosts"><?php _e("upgrade strongly recommended", 'comicpress-manager') ?></a>)
@ -2161,7 +2161,7 @@ function cpm_show_comicpress_details() {
<?php } ?> <?php } ?>
</ul> </ul>
</li> </li>
<?php //} ?> <?php } ?>
<li> <li>
<strong><a href="#" onclick="Element.show('debug-info'); $('cpm-right-column').style.minHeight = $('cpm-left-column').offsetHeight + 'px'; return false"><?php _e('Show debug info', 'comicpress-manager') ?></a></strong> (<em><?php _e("this data is sanitized to protect your server's configuration", 'comicpress-manager') ?></em>) <strong><a href="#" onclick="Element.show('debug-info'); $('cpm-right-column').style.minHeight = $('cpm-left-column').offsetHeight + 'px'; return false"><?php _e('Show debug info', 'comicpress-manager') ?></a></strong> (<em><?php _e("this data is sanitized to protect your server's configuration", 'comicpress-manager') ?></em>)
<?php echo cpm_show_debug_info() ?> <?php echo cpm_show_debug_info() ?>
@ -2296,7 +2296,7 @@ function cpm_show_debug_info($display_none = true) {
* Show the config editor. * Show the config editor.
*/ */
function cpm_manager_edit_config() { function cpm_manager_edit_config() {
global $cpm_config; global $cpm_config, $wpmu_version;
include('cp_configuration_options.php'); include('cp_configuration_options.php');
@ -2344,7 +2344,7 @@ function cpm_manager_edit_config() {
$no_wpmu = false; $no_wpmu = false;
extract($field_info); extract($field_info);
//$ok = (function_exists('get_site_option')) ? ($no_wpmu !== true) : true; // $ok = ($wpmu_version) ? ($no_wpmu !== true) : true;
$ok = true; $ok = true;
if ($ok) { if ($ok) {
$description = " <em>(" . $description . ")</em>"; $description = " <em>(" . $description . ")</em>";
@ -2413,7 +2413,7 @@ function cpm_manager_edit_config() {
} }
} }
} ?> } ?>
<?php //if (!function_exists('get_site_option')) { ?> <?php if (!$wpmu_version) { ?>
<?php <?php
$all_comic_folders_found = true; $all_comic_folders_found = true;
foreach (array(''. 'rss_', 'archive_') as $folder_name) { foreach (array(''. 'rss_', 'archive_') as $folder_name) {
@ -2437,7 +2437,7 @@ function cpm_manager_edit_config() {
</td> </td>
</tr> </tr>
<?php } ?> <?php } ?>
<?php //} ?> <?php } ?>
<tr> <tr>
<td colspan="2" align="center"> <td colspan="2" align="center">
<input class="button update-config" type="submit" value="<?php _e("Update Config", 'comicpress-manager') ?>" /> <input class="button update-config" type="submit" value="<?php _e("Update Config", 'comicpress-manager') ?>" />

27
comicpress_manager_library.php
View File

@ -65,7 +65,7 @@ function cpm_option($name) { return get_option("comicpress-manager-${name}"); }
* Calculate the document root where comics are stored. * Calculate the document root where comics are stored.
*/ */
function cpm_calculate_document_root() { function cpm_calculate_document_root() {
global $cpm_attempted_document_roots; global $cpm_attempted_document_roots, $wpmu_version;
$cpm_attempted_document_roots = array(); $cpm_attempted_document_roots = array();
$document_root = null; $document_root = null;
@ -86,9 +86,9 @@ function cpm_calculate_document_root() {
if (is_null($document_root)) { $document_root = $_SERVER['DOCUMENT_ROOT'] . $parsed_url['path']; } if (is_null($document_root)) { $document_root = $_SERVER['DOCUMENT_ROOT'] . $parsed_url['path']; }
//if (function_exists('get_site_option')) { if ($wpmu_version) {
// $document_root = cpm_wpmu_modify_path($document_root); $document_root = cpm_wpmu_modify_path($document_root);
//} }
return untrailingslashit($document_root); return untrailingslashit($document_root);
} }
@ -132,6 +132,7 @@ function cpm_generate_example_date($example_date) {
* Build the URI to a comic file. * Build the URI to a comic file.
*/ */
function cpm_build_comic_uri($filename, $base_dir = null) { function cpm_build_comic_uri($filename, $base_dir = null) {
global $wpmu_version;
if (!is_null($base_dir)) { if (!is_null($base_dir)) {
if (strlen($filename) < strlen($base_dir)) { return false; } if (strlen($filename) < strlen($base_dir)) { return false; }
} }
@ -146,7 +147,7 @@ function cpm_build_comic_uri($filename, $base_dir = null) {
$parsed_url = parse_url(get_bloginfo('url')); $parsed_url = parse_url(get_bloginfo('url'));
$path = $parsed_url['path']; $path = $parsed_url['path'];
//if (function_exists('get_site_option')) { $path = cpm_wpmu_fix_admin_uri($path); } if ($wpmu_version) { $path = cpm_wpmu_fix_folder_to_use($path); }
$count = (cpm_get_subcomic_directory() !== false) ? 3 : 2; $count = (cpm_get_subcomic_directory() !== false) ? 3 : 2;
@ -336,7 +337,7 @@ function cpm_read_comics_folder() {
* Read information about the current installation. * Read information about the current installation.
*/ */
function cpm_read_information_and_check_config() { function cpm_read_information_and_check_config() {
global $cpm_config, $cpm_attempted_document_roots, $blog_id; global $cpm_config, $cpm_attempted_document_roots, $blog_id, $wpmu_version;
$cpm_config->config_method = read_current_theme_comicpress_config(); $cpm_config->config_method = read_current_theme_comicpress_config();
$cpm_config->config_filepath = get_functions_php_filepath(); $cpm_config->config_filepath = get_functions_php_filepath();
@ -394,7 +395,7 @@ function cpm_read_information_and_check_config() {
$any_cpm_document_root_failures = false; $any_cpm_document_root_failures = false;
//if (!function_exists('get_site_option')) { if (!$wpmu_version) {
// is the site root configured properly? // is the site root configured properly?
if (!file_exists(CPM_DOCUMENT_ROOT)) { if (!file_exists(CPM_DOCUMENT_ROOT)) {
$cpm_config->errors[] = sprintf(__('The comics site root <strong>%s</strong> does not exist. Check your <a href="options-general.php">WordPress address and address settings</a>.', 'comicpress-manager'), CPM_DOCUMENT_ROOT); $cpm_config->errors[] = sprintf(__('The comics site root <strong>%s</strong> does not exist. Check your <a href="options-general.php">WordPress address and address settings</a>.', 'comicpress-manager'), CPM_DOCUMENT_ROOT);
@ -405,7 +406,7 @@ function cpm_read_information_and_check_config() {
$cpm_config->errors[] = sprintf(__('The comics site root <strong>%s</strong> does not contain a WordPress index.php file. Check your <a href="options-general.php">WordPress address and address settings</a>.', 'comicpress-manager'), CPM_DOCUMENT_ROOT); $cpm_config->errors[] = sprintf(__('The comics site root <strong>%s</strong> does not contain a WordPress index.php file. Check your <a href="options-general.php">WordPress address and address settings</a>.', 'comicpress-manager'), CPM_DOCUMENT_ROOT);
$any_cpm_document_root_failures = true; $any_cpm_document_root_failures = true;
} }
//} }
if ($any_cpm_document_root_failures) { if ($any_cpm_document_root_failures) {
$cpm_config->errors[] = print_r($cpm_attempted_document_roots, true); $cpm_config->errors[] = print_r($cpm_attempted_document_roots, true);
@ -539,12 +540,12 @@ function cpm_read_information_and_check_config() {
* Read the ComicPress config from a file. * Read the ComicPress config from a file.
*/ */
function read_current_theme_comicpress_config() { function read_current_theme_comicpress_config() {
global $cpm_config; global $cpm_config, $wpmu_version;
//if (function_exists('get_site_option')) { if ($wpmu_version) {
// cpm_wpmu_load_options(); cpm_wpmu_load_options();
// return __("WordPress Options", 'comicpress-manager'); return __("WordPress Options", 'comicpress-manager');
//} }
$current_theme_info = get_theme(get_current_theme()); $current_theme_info = get_theme(get_current_theme());

6
pages/comicpress_cpm_config.php
View File

@ -4,7 +4,7 @@
* The config editor dialog. * The config editor dialog.
*/ */
function cpm_manager_cpm_config() { function cpm_manager_cpm_config() {
global $cpm_config; global $cpm_config, $wpmu_version;
include(realpath(dirname(__FILE__)) . '/../cpm_configuration_options.php'); include(realpath(dirname(__FILE__)) . '/../cpm_configuration_options.php');
@ -18,8 +18,8 @@ function cpm_manager_cpm_config() {
<input type="hidden" name="action" value="update-cpm-config" /> <input type="hidden" name="action" value="update-cpm-config" />
<?php foreach ($configuration_options as $option) { <?php foreach ($configuration_options as $option) {
$ok = true; $ok = true;
//if (function_exists('get_site_option')) { $ok = !isset($option['strip-wpmu']); } if ($wpmu_version) { $ok = !isset($option['strip-wpmu']); }
if (is_string($option)) { $ok = true; } // if (is_string($option)) { $ok = true; }
if ($option['type'] == "categories") { if ($option['type'] == "categories") {
$ok = (count($category_checkboxes = cpm_generate_additional_categories_checkboxes($option['id'], explode(",", $result))) > 0); $ok = (count($category_checkboxes = cpm_generate_additional_categories_checkboxes($option['id'], explode(",", $result))) > 0);

4
pages/comicpress_first_run.php
View File

@ -4,11 +4,11 @@
* The main manager screen. * The main manager screen.
*/ */
function cpm_manager_first_run($target_page) { function cpm_manager_first_run($target_page) {
global $cpm_config; global $cpm_config, $wpmu_version;
$target_page = "?page=${target_page}"; $target_page = "?page=${target_page}";
//$is_wpmu = function_exists("get_site_option"); $is_wpmu = $wpmu_version;
ob_start(); ob_start();

2
readme.txt
View File

@ -2,7 +2,7 @@
Contributors: johncoswell Contributors: johncoswell
Tags: comicpress, webcomics, management, admin, posts, plugin Tags: comicpress, webcomics, management, admin, posts, plugin
Requires at least: 2.5.1 Requires at least: 2.5.1
Tested up to: 2.7.1 Tested up to: 2.8
Stable tag: 1.4.5 Stable tag: 1.4.5
Donate link: http://www.coswellproductions.com/wordpress/wordpress-plugins/ Donate link: http://www.coswellproductions.com/wordpress/wordpress-plugins/