Skip to content

Feature/http support and simplified category selector #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
nathanmentley wants to merge 8 commits into
base: master
Choose a base branch
from
Open

Feature/http support and simplified category selector #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
7e99f0e
Adding support to select http or https for the api url. The settings …
nathanmentley Feb 7, 2018
f63f4ca
version inc
nathanmentley Feb 7, 2018
6593337
When we were making api calls from the settings page we were using th…
nathanmentley Feb 7, 2018
0e6e20a
fix thumbnail regression
nathanmentley Feb 9, 2018
10d55e9
fixed some sloppyness that the more strict php 7.2 was having issues …
nathanmentley Mar 2, 2018
671637c
paging fixes
nathanmentley Mar 6, 2018
ea00ed7
version inc
nathanmentley Mar 6, 2018
c5c4637
logging api responses. Honoring the log if WP_DEBUG_LOG is set.
nathanmentley Mar 19, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
*.swp
314 changes: 154 additions & 160 deletions admin.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,168 +14,162 @@
* @package NetxWPPlugin
*/
class netxMediaManagerPluginAdmin {
public static function init() {
new netxMediaManagerPluginAdmin();
}

/**
* Add sub page to the Settings Menu
*/
public function __construct() {
add_options_page('NetX Settings', 'NetX', 'administrator', __FILE__, array($this, 'settingsPage'));
add_action('admin_init', array($this, 'registerSettings'));
}

/**
* Register plugin settings
*/
public function registerSettings() {
register_setting('netx_options', 'netx_options', array($this, 'netxValidateOptions'));

add_settings_section('main_section', 'DAM Settings', array($this, 'mainSection'), __FILE__);

add_settings_field('netx_username', 'NetX Username', array($this, 'netxUsername'), __FILE__, 'main_section');
add_settings_field('netx_password', 'NetX Password', array($this, 'netxPassword'), __FILE__, 'main_section');
add_settings_field('netx_uri', 'NetX URI', array($this, 'netxURI'), __FILE__, 'main_section');
add_settings_field('netx_paging_size', 'NetX Media Page Size', array($this, 'netxPageSize'), __FILE__, 'main_section');


add_settings_field('netx_base_category_id', 'NetX Base Category', array($this, 'netxCategory'), __FILE__, 'main_section');
add_settings_field('netx_base_category_path', '', array($this, 'netxCategoryPath'), __FILE__, 'main_section');

add_settings_field('netx_access_token', 'NetX API Token', array($this, 'netxApiToken'), __FILE__, 'main_section');
}

/**
* Settings main section callback
*/
public function mainSection() {
echo '<hr />';
}

/**
* Create NetX username field
*/
public function netxUsername() {
$options = get_option('netx_options');
echo '<input type="text" name="netx_options[netx_username]" value="' . $options['netx_username'] . '" />';
}

/**
* Create NetX password field
*/
public function netxPassword() {
$options = get_option('netx_options');
echo '<input type="password" name="netx_options[netx_password]" value="' . $options['netx_password'] . '" />';
}

public function netxApiToken() {
$options = get_option('netx_options');
echo '<input type="text" name="netx_options[netx_access_token]" value="' . $options['netx_access_token'] . '" />';
}

/**
* Create NetX URI field
*/
public function netxURI() {
$options = get_option('netx_options');
echo '<p>NetX Uri should not include protocol or any trailing path. The uri should only include domain name. Example: "<i>subdomain.netx.net</i>"</p>';
echo '<input type="text" name="netx_options[netx_uri]" value="' . $options['netx_uri'] . '" />';
}

/**
* Create NetX Page Size field
*/
public function netxPageSize() {
$options = get_option('netx_options');
echo '<input type="number" name="netx_options[netx_paging_size]" value="' . $options['netx_paging_size'] . '" />';
}

/**
* Create NetX Category dropdown
*/
public function netxCategory() {
$options = get_option('netx_options');
if (
(strlen($options['netx_username']) > 0) &&
(strlen($options['netx_password']) > 0) &&
(strlen($options['netx_uri']) > 0)) {

try {
$netx = new netxRestWrapper();
$catList = $netx->getCategoryPathList();
echo '<select name="netx_options[netx_base_category_id]">';

foreach ($catList as $catPath => $catID) {
$optBaseID = $options['netx_base_category_id'];
$catSelected = (($optBaseID == $catID) ? ' selected="selected"' : '');
echo '<option value="' . $catID . '"' . $catSelected . '>' . $catPath . '</option>';
}

echo '</select>';
} catch(Exception $e) {
echo('<p style="color: red;"><b>Could not connect to NetX. Check username, password, and uri.</b></p>');
}
}
}

/**
* Create NetX Category Path hidden field
*/
public function netxCategoryPath(){
$options = get_option('netx_options');
echo '<input type="hidden" name="netx_options[netx_base_category_path]" value="' . $options['netx_base_category_path'] . '" />';
}

/**
* Validate options field input
*/
public function netxValidateOptions($input) {
try {
$tmpURI = preg_replace('/^https?:\/+/i', '', $input['netx_uri']);
$input['netx_uri'] = $tmpURI;

if ($input['netx_base_category_id']) {
$input['netx_base_category_path'] = self::getCategoryPath($input['netx_base_category_id']);
}
} catch (Exception $e) {
error_log("netxValidateOptions: " . $e->getMessage());
}

return $input;
}

/**
* Settings page
*/
public function settingsPage() {
public static function init() {
new netxMediaManagerPluginAdmin();
}

/**
* Add sub page to the Settings Menu
*/
public function __construct() {
add_options_page('NetX Settings', 'NetX', 'administrator', __FILE__, array($this, 'settingsPage'));
add_action('admin_init', array($this, 'registerSettings'));
}

/**
* Register plugin settings
*/
public function registerSettings() {
register_setting('netx_options', 'netx_options', array($this, 'netxValidateOptions'));

add_settings_section('main_section', 'DAM Settings', array($this, 'mainSection'), __FILE__);

add_settings_field('netx_username', 'NetX Username', array($this, 'netxUsername'), __FILE__, 'main_section');
add_settings_field('netx_password', 'NetX Password', array($this, 'netxPassword'), __FILE__, 'main_section');
add_settings_field('netx_uri', 'NetX URI', array($this, 'netxURI'), __FILE__, 'main_section');
add_settings_field('netx_uri_protocal', 'NetX URI Protocal', array($this, 'netxURIProtocal'), __FILE__, 'main_section');
add_settings_field('netx_paging_size', 'NetX Media Page Size', array($this, 'netxPageSize'), __FILE__, 'main_section');


add_settings_field('netx_base_category_id', 'NetX Folder', array($this, 'netxCategory'), __FILE__, 'main_section');
add_settings_field('netx_base_category_path', '', array($this, 'netxCategoryPath'), __FILE__, 'main_section');

add_settings_field('netx_access_token', 'NetX API Token', array($this, 'netxApiToken'), __FILE__, 'main_section');
}

/**
* Settings main section callback
*/
public function mainSection() {
echo '<hr />';
}

/**
* Create NetX username field
*/
public function netxUsername() {
$options = get_option('netx_options');
echo '<input type="text" name="netx_options[netx_username]" value="' . $options['netx_username'] . '" />';
}

/**
* Create NetX password field
*/
public function netxPassword() {
$options = get_option('netx_options');
echo '<input type="password" name="netx_options[netx_password]" value="' . $options['netx_password'] . '" />';
}

public function netxApiToken() {
$options = get_option('netx_options');
echo '<input type="text" name="netx_options[netx_access_token]" value="' . $options['netx_access_token'] . '" />';
}

/**
* Create NetX URI field
*/
public function netxURI() {
$options = get_option('netx_options');
echo '<p>NetX Uri should not include protocol or any trailing path. The uri should only include domain name. Example: "<i>subdomain.netx.net</i>"</p>';
echo '<input type="text" name="netx_options[netx_uri]" value="' . $options['netx_uri'] . '" />';
}

/**
* Create NetX URI Protocl field
*/
public function netxURIProtocal() {
$options = get_option('netx_options');
echo '<p>Should the netx api be contacted over Https? (HTTPS is strongly recommended)</p>';
echo '<select name="netx_options[netx_uri_protocal]">';
echo '<option value="http"' . ($options['netx_uri_protocal'] === "http" ? ' selected="selected"' : '') . '>http</option>';
echo '<option value="https"' . ($options['netx_uri_protocal'] !== "http" ? ' selected="selected"' : '') . '>https</option>';
echo '</select>';
}

/**
* Create NetX Page Size field
*/
public function netxPageSize() {
$options = get_option('netx_options');
echo '<input type="number" name="netx_options[netx_paging_size]" value="' . $options['netx_paging_size'] . '" />';
}

/**
* Create NetX Category dropdown
*/
public function netxCategory() {
$options = get_option('netx_options');
echo '<input type="number" name="netx_options[netx_base_category_id]" value="' . $options['netx_base_category_id'] . '" />';
}

/**
* Create NetX Category Path hidden field
*/
public function netxCategoryPath(){
$options = get_option('netx_options');
echo '<p>Current Folder Path: ' . $options['netx_base_category_path'] . '</p>';
echo '<input type="hidden" name="netx_options[netx_base_category_path]" value="' . $options['netx_base_category_path'] . '" />';
}

/**
* Validate options field input
*/
public function netxValidateOptions($input) {
try {
$tmpURI = preg_replace('/^https?:\/+/i', '', $input['netx_uri']);
$input['netx_uri'] = $tmpURI;

if ($input['netx_base_category_id']) {
$input['netx_base_category_path'] = self::getCategoryPath($input['netx_base_category_id'], $input);
}
} catch (Exception $e) {
error_log("netxValidateOptions: " . $e->getMessage());
}

return $input;
}

/**
* Settings page
*/
public function settingsPage() {
?>
<div class="wrap">
<div class="icon32" id="icon-options-general"><br></div>
<h2>NetX Settings</h2>
This is where you manage NetX settings for the media library
<form action="options.php" method="post">
<?php settings_fields('netx_options'); ?>
<?php do_settings_sections(__FILE__); ?>
<p class="submit">
<input name="Submit" type="submit" class="button-primary" value="<?php esc_attr_e('Save Changes'); ?>" />
</p>
</form>
</div>
<div class="wrap">
<div class="icon32" id="icon-options-general"><br></div>
<h2>NetX Settings</h2>
This is where you manage NetX settings for the media library
<form action="options.php" method="post">
<?php settings_fields('netx_options'); ?>
<?php do_settings_sections(__FILE__); ?>
<p class="submit">
<input name="Submit" type="submit" class="button-primary" value="<?php esc_attr_e('Save Changes'); ?>" />
</p>
</form>
</div>
<?php
}
/**
* Runs when netx_base_category_id option is changed, so that we
* can look up the path for that category and save it in options
* as well.
*/
public function getCategoryPath($newCatID) {
$netx = new netxRestWrapper();
$catList = $netx->getCategoryPathList();
$trans = array_flip($catList);
$path = $trans[$newCatID];
return $path;
}
}
/**
* Runs when netx_base_category_id option is changed, so that we
* can look up the path for that category and save it in options
* as well.
*/
public function getCategoryPath($newCatID, $options = null) {
$netx = new netxRestWrapper($options);
$catList = $netx->getCategoryPathList();
$trans = array_flip($catList);
$path = $trans[$newCatID];
return $path;
}
}

// Admin menu/options pages
Expand Down
Loading