fix bugs with admin

parisholley · Apr 27, 2016 · 4529a68 · 4529a68
1 parent 321a99a
commit 4529a68
Show file tree

Hide file tree

Showing 25 changed files with 41 additions and 36 deletions.
diff --git a/docs/class-elasticsearch.Config.html b/docs/class-elasticsearch.Config.html
@@ -102,7 +102,7 @@ <h1>Class Config</h1>
 				<b>Author:</b>
 				Paris Holley <a href="&#109;&#x61;i&#108;&#x74;&#111;&#58;&#x6d;&#97;&#x69;&#x6c;&#64;&#x70;a&#114;&#x69;&#115;&#104;&#x6f;&#108;&#x6c;&#x65;&#121;&#x2e;&#x63;&#111;&#x6d;">&#x6d;&#97;&#x69;&#x6c;&#64;&#x70;a&#114;&#x69;&#115;&#104;&#x6f;&#108;&#x6c;&#x65;&#121;&#x2e;&#x63;&#111;&#x6d;</a><br>
 				<b>Version:</b>
-				4.0.0<br>
+				4.0.1<br>
 			<b>Located at</b> <a href="source-class-elasticsearch.Config.html#4-192" title="Go to source code">Config.php</a>
 		<br>
 	</div>

diff --git a/docs/class-elasticsearch.Defaults.html b/docs/class-elasticsearch.Defaults.html
@@ -102,7 +102,7 @@ <h1>Class Defaults</h1>
 				<b>Author:</b>
 				Paris Holley <a href="&#109;&#x61;i&#108;&#x74;&#111;&#58;&#x6d;&#97;&#x69;&#x6c;&#64;&#x70;a&#114;&#x69;&#115;&#104;&#x6f;&#108;&#x6c;&#x65;&#121;&#x2e;&#x63;&#111;&#x6d;">&#x6d;&#97;&#x69;&#x6c;&#64;&#x70;a&#114;&#x69;&#115;&#104;&#x6f;&#108;&#x6c;&#x65;&#121;&#x2e;&#x63;&#111;&#x6d;</a><br>
 				<b>Version:</b>
-				4.0.0<br>
+				4.0.1<br>
 			<b>Located at</b> <a href="source-class-elasticsearch.Defaults.html#4-77" title="Go to source code">Defaults.php</a>
 		<br>
 	</div>

diff --git a/docs/class-elasticsearch.Faceting.html b/docs/class-elasticsearch.Faceting.html
@@ -102,7 +102,7 @@ <h1>Class Faceting</h1>
 				<b>Author:</b>
 				Paris Holley <a href="&#109;&#x61;i&#108;&#x74;&#111;&#58;&#x6d;&#97;&#x69;&#x6c;&#64;&#x70;a&#114;&#x69;&#115;&#104;&#x6f;&#108;&#x6c;&#x65;&#121;&#x2e;&#x63;&#111;&#x6d;">&#x6d;&#97;&#x69;&#x6c;&#64;&#x70;a&#114;&#x69;&#115;&#104;&#x6f;&#108;&#x6c;&#x65;&#121;&#x2e;&#x63;&#111;&#x6d;</a><br>
 				<b>Version:</b>
-				4.0.0<br>
+				4.0.1<br>
 			<b>Located at</b> <a href="source-class-elasticsearch.Faceting.html#4-383" title="Go to source code">Faceting.php</a>
 		<br>
 	</div>

diff --git a/docs/class-elasticsearch.Indexer.html b/docs/class-elasticsearch.Indexer.html
@@ -102,7 +102,7 @@ <h1>Class Indexer</h1>
 				<b>Author:</b>
 				Paris Holley <a href="&#109;&#x61;i&#108;&#x74;&#111;&#58;&#x6d;&#97;&#x69;&#x6c;&#64;&#x70;a&#114;&#x69;&#115;&#104;&#x6f;&#108;&#x6c;&#x65;&#121;&#x2e;&#x63;&#111;&#x6d;">&#x6d;&#97;&#x69;&#x6c;&#64;&#x70;a&#114;&#x69;&#115;&#104;&#x6f;&#108;&#x6c;&#x65;&#121;&#x2e;&#x63;&#111;&#x6d;</a><br>
 				<b>Version:</b>
-				4.0.0<br>
+				4.0.1<br>
 			<b>Located at</b> <a href="source-class-elasticsearch.Indexer.html#4-357" title="Go to source code">Indexer.php</a>
 		<br>
 	</div>

diff --git a/docs/class-elasticsearch.Searcher.html b/docs/class-elasticsearch.Searcher.html
@@ -102,7 +102,7 @@ <h1>Class Searcher</h1>
 				<b>Author:</b>
 				Paris Holley <a href="&#109;&#x61;i&#108;&#x74;&#111;&#58;&#x6d;&#97;&#x69;&#x6c;&#64;&#x70;a&#114;&#x69;&#115;&#104;&#x6f;&#108;&#x6c;&#x65;&#121;&#x2e;&#x63;&#111;&#x6d;">&#x6d;&#97;&#x69;&#x6c;&#64;&#x70;a&#114;&#x69;&#115;&#104;&#x6f;&#108;&#x6c;&#x65;&#121;&#x2e;&#x63;&#111;&#x6d;</a><br>
 				<b>Version:</b>
-				4.0.0<br>
+				4.0.1<br>
 			<b>Located at</b> <a href="source-class-elasticsearch.Searcher.html#4-338" title="Go to source code">Searcher.php</a>
 		<br>
 	</div>

diff --git a/docs/class-elasticsearch.Theme.html b/docs/class-elasticsearch.Theme.html
@@ -102,7 +102,7 @@ <h1>Class Theme</h1>
 				<b>Author:</b>
 				Paris Holley <a href="&#109;&#x61;i&#108;&#x74;&#111;&#58;&#x6d;&#97;&#x69;&#x6c;&#64;&#x70;a&#114;&#x69;&#115;&#104;&#x6f;&#108;&#x6c;&#x65;&#121;&#x2e;&#x63;&#111;&#x6d;">&#x6d;&#97;&#x69;&#x6c;&#64;&#x70;a&#114;&#x69;&#115;&#104;&#x6f;&#108;&#x6c;&#x65;&#121;&#x2e;&#x63;&#111;&#x6d;</a><br>
 				<b>Version:</b>
-				4.0.0<br>
+				4.0.1<br>
 			<b>Located at</b> <a href="source-class-elasticsearch.Theme.html#4-53" title="Go to source code">Theme.php</a>
 		<br>
 	</div>

diff --git a/docs/source-class-elasticsearch.Config.html b/docs/source-class-elasticsearch.Config.html
@@ -83,7 +83,7 @@ <h3>Classes</h3>
 </span></span><span id="6" class="l"><a href="#6">  6: </a><span class="php-comment">*
 </span></span><span id="7" class="l"><a href="#7">  7: </a><span class="php-comment">* @license http://opensource.org/licenses/MIT
 </span></span><span id="8" class="l"><a href="#8">  8: </a><span class="php-comment">* @author Paris Holley &lt;mail@parisholley.com&gt;
-</span></span><span id="9" class="l"><a href="#9">  9: </a><span class="php-comment">* @version 4.0.0
+</span></span><span id="9" class="l"><a href="#9">  9: </a><span class="php-comment">* @version 4.0.1
 </span></span><span id="10" class="l"><a href="#10"> 10: </a><span class="php-comment">**/</span>
 </span><span id="11" class="l"><a href="#11"> 11: </a><span class="php-keyword1">class</span> Config{
 </span><span id="12" class="l"><a href="#12"> 12: </a>    <span class="php-keyword1">static</span> <span class="php-var">$options</span> = <span class="php-keyword1">null</span>;

diff --git a/docs/source-class-elasticsearch.Defaults.html b/docs/source-class-elasticsearch.Defaults.html
@@ -83,7 +83,7 @@ <h3>Classes</h3>
 </span></span><span id="6" class="l"><a href="#6"> 6: </a><span class="php-comment">*
 </span></span><span id="7" class="l"><a href="#7"> 7: </a><span class="php-comment">* @license http://opensource.org/licenses/MIT
 </span></span><span id="8" class="l"><a href="#8"> 8: </a><span class="php-comment">* @author Paris Holley &lt;mail@parisholley.com&gt;
-</span></span><span id="9" class="l"><a href="#9"> 9: </a><span class="php-comment">* @version 4.0.0
+</span></span><span id="9" class="l"><a href="#9"> 9: </a><span class="php-comment">* @version 4.0.1
 </span></span><span id="10" class="l"><a href="#10">10: </a><span class="php-comment">**/</span>
 </span><span id="11" class="l"><a href="#11">11: </a><span class="php-keyword1">class</span> Defaults{
 </span><span id="12" class="l"><a href="#12">12: </a>    <span class="php-comment">/**

diff --git a/docs/source-class-elasticsearch.Faceting.html b/docs/source-class-elasticsearch.Faceting.html
@@ -83,7 +83,7 @@ <h3>Classes</h3>
 </span></span><span id="6" class="l"><a href="#6">  6: </a><span class="php-comment">*
 </span></span><span id="7" class="l"><a href="#7">  7: </a><span class="php-comment">* @license http://opensource.org/licenses/MIT
 </span></span><span id="8" class="l"><a href="#8">  8: </a><span class="php-comment">* @author Paris Holley &lt;mail@parisholley.com&gt;
-</span></span><span id="9" class="l"><a href="#9">  9: </a><span class="php-comment">* @version 4.0.0
+</span></span><span id="9" class="l"><a href="#9">  9: </a><span class="php-comment">* @version 4.0.1
 </span></span><span id="10" class="l"><a href="#10"> 10: </a><span class="php-comment">**/</span>
 </span><span id="11" class="l"><a href="#11"> 11: </a><span class="php-keyword1">class</span> Faceting{
 </span><span id="12" class="l"><a href="#12"> 12: </a>    <span class="php-comment">/**

diff --git a/docs/source-class-elasticsearch.Indexer.html b/docs/source-class-elasticsearch.Indexer.html
@@ -83,7 +83,7 @@ <h3>Classes</h3>
 </span></span><span id="6" class="l"><a href="#6">  6: </a><span class="php-comment"> *
 </span></span><span id="7" class="l"><a href="#7">  7: </a><span class="php-comment"> * @license http://opensource.org/licenses/MIT
 </span></span><span id="8" class="l"><a href="#8">  8: </a><span class="php-comment"> * @author Paris Holley &lt;mail@parisholley.com&gt;
-</span></span><span id="9" class="l"><a href="#9">  9: </a><span class="php-comment"> * @version 4.0.0
+</span></span><span id="9" class="l"><a href="#9">  9: </a><span class="php-comment"> * @version 4.0.1
 </span></span><span id="10" class="l"><a href="#10"> 10: </a><span class="php-comment"> **/</span>
 </span><span id="11" class="l"><a href="#11"> 11: </a><span class="php-keyword1">class</span> Indexer
 </span><span id="12" class="l"><a href="#12"> 12: </a>{

diff --git a/docs/source-class-elasticsearch.Searcher.html b/docs/source-class-elasticsearch.Searcher.html
@@ -83,7 +83,7 @@ <h3>Classes</h3>
 </span></span><span id="6" class="l"><a href="#6">  6: </a><span class="php-comment"> *
 </span></span><span id="7" class="l"><a href="#7">  7: </a><span class="php-comment"> * @license http://opensource.org/licenses/MIT
 </span></span><span id="8" class="l"><a href="#8">  8: </a><span class="php-comment"> * @author Paris Holley &lt;mail@parisholley.com&gt;
-</span></span><span id="9" class="l"><a href="#9">  9: </a><span class="php-comment"> * @version 4.0.0
+</span></span><span id="9" class="l"><a href="#9">  9: </a><span class="php-comment"> * @version 4.0.1
 </span></span><span id="10" class="l"><a href="#10"> 10: </a><span class="php-comment"> **/</span>
 </span><span id="11" class="l"><a href="#11"> 11: </a><span class="php-keyword1">class</span> Searcher
 </span><span id="12" class="l"><a href="#12"> 12: </a>{

diff --git a/docs/source-class-elasticsearch.Theme.html b/docs/source-class-elasticsearch.Theme.html
@@ -83,7 +83,7 @@ <h3>Classes</h3>
 </span></span><span id="6" class="l"><a href="#6"> 6: </a><span class="php-comment">*
 </span></span><span id="7" class="l"><a href="#7"> 7: </a><span class="php-comment">* @license http://opensource.org/licenses/MIT
 </span></span><span id="8" class="l"><a href="#8"> 8: </a><span class="php-comment">* @author Paris Holley &lt;mail@parisholley.com&gt;
-</span></span><span id="9" class="l"><a href="#9"> 9: </a><span class="php-comment">* @version 4.0.0
+</span></span><span id="9" class="l"><a href="#9"> 9: </a><span class="php-comment">* @version 4.0.1
 </span></span><span id="10" class="l"><a href="#10">10: </a><span class="php-comment">**/</span>
 </span><span id="11" class="l"><a href="#11">11: </a><span class="php-keyword1">class</span> Theme{
 </span><span id="12" class="l"><a href="#12">12: </a>    <span class="php-keyword1">private</span> <span class="php-keyword1">static</span> <span class="php-var">$selector</span>;

diff --git a/elasticsearch.php b/elasticsearch.php
@@ -3,7 +3,7 @@
 Plugin Name: Fantastic ElasticSearch
 Plugin URI: http://wordpress.org/extend/plugins/fantastic-elasticsearch/
 Description: Improve wordpress search performance and accuracy by leveraging an ElasticSearch server.
-Version: 4.0.0
+Version: 4.0.1
 Author: Paris Holley
 Author URI: http://www.linkedin.com/in/parisholley
 Author Email: mail@parisholley.com

diff --git a/precommit.sh b/precommit.sh
@@ -1,4 +1,4 @@
-VERSION=4\\.0\\.0
+VERSION=4\\.0\\.1
 
 echo "-- Updating dependencies"
 
@@ -23,7 +23,7 @@ if [ $? -eq 0 ]; then
 
 	docker run -v $(pwd):/app herloct/php-apigen generate -s /app/src/elasticsearch/ -d /app/docs
 
-	echo "-- It is safe to commit! Make sure to commit the docs directory first."
+	echo "-- It is safe to push."
 else
 	echo "-- THE TESTS FAILED, DO NOT COMMIT!"
 fi

diff --git a/src/elasticsearch/Config.php b/src/elasticsearch/Config.php
@@ -6,7 +6,7 @@
 *
 * @license http://opensource.org/licenses/MIT
 * @author Paris Holley <mail@parisholley.com>
-* @version 4.0.0
+* @version 4.0.1
 **/
 class Config{
 	static $options = null;

diff --git a/src/elasticsearch/Defaults.php b/src/elasticsearch/Defaults.php
@@ -6,7 +6,7 @@
 *
 * @license http://opensource.org/licenses/MIT
 * @author Paris Holley <mail@parisholley.com>
-* @version 4.0.0
+* @version 4.0.1
 **/
 class Defaults{
 	/**

diff --git a/src/elasticsearch/Faceting.php b/src/elasticsearch/Faceting.php
@@ -6,7 +6,7 @@
 *
 * @license http://opensource.org/licenses/MIT
 * @author Paris Holley <mail@parisholley.com>
-* @version 4.0.0
+* @version 4.0.1
 **/
 class Faceting{
 	/**

diff --git a/src/elasticsearch/Indexer.php b/src/elasticsearch/Indexer.php
@@ -6,7 +6,7 @@
  *
  * @license http://opensource.org/licenses/MIT
  * @author Paris Holley <mail@parisholley.com>
- * @version 4.0.0
+ * @version 4.0.1
  **/
 class Indexer
 {

diff --git a/src/elasticsearch/Searcher.php b/src/elasticsearch/Searcher.php
@@ -6,7 +6,7 @@
  *
  * @license http://opensource.org/licenses/MIT
  * @author Paris Holley <mail@parisholley.com>
- * @version 4.0.0
+ * @version 4.0.1
  **/
 class Searcher
 {

diff --git a/src/elasticsearch/Theme.php b/src/elasticsearch/Theme.php
@@ -6,7 +6,7 @@
 *
 * @license http://opensource.org/licenses/MIT
 * @author Paris Holley <mail@parisholley.com>
-* @version 4.0.0
+* @version 4.0.1
 **/
 class Theme{
 	private static $selector;

diff --git a/tests/unit-tests/bootstrap.php b/tests/unit-tests/bootstrap.php
@@ -88,6 +88,10 @@ function checked(){
 		return false;
 	}
 
+	function add_option(){
+
+	}
+
 	function add_settings_field($arg1, $arg2, $callback, $arg4, $arg5, $field){
 		return call_user_func_array($callback, array($field));
 	}

diff --git a/wp/admin/hooks.php b/wp/admin/hooks.php
@@ -5,6 +5,7 @@ class Hooks
 {
 	function __construct()
 	{
+		add_action('wp_ajax_esreindex', array(&$this, 'reindex'));
 		add_action('save_post', array(&$this, 'save_post'));
 		add_action('delete_post', array(&$this, 'delete_post'));
 		add_action('trash_post', array(&$this, 'delete_post'));
@@ -51,6 +52,18 @@ function delete_post($post_id)
 
 		Indexer::delete($post);
 	}
+
+	function reindex(){
+		try{
+			echo Indexer::reindex($_POST['page']);
+		}catch(\Exception $ex){
+			header("HTTP/1.0 500 Internal Server Error");
+
+			echo $ex->getMessage();
+		}
+
+		die();
+	}
 }
 
 new Hooks();

diff --git a/wp/admin/sections/manage-index.php b/wp/admin/sections/manage-index.php
@@ -1,18 +1,6 @@
 <?php
 namespace elasticsearch;
 
-add_action('wp_ajax_esreindex', function(){
-	try{
-		echo Indexer::reindex($_POST['page']);
-	}catch(\Exception $ex){
-		header("HTTP/1.0 500 Internal Server Error");
-
-		echo $ex->getMessage();
-	}
-
-	die();
-});
-
 add_action('admin_head-toplevel_page_elastic_search', function(){
 	wp_enqueue_script('es-indexing', plugins_url( '/manage-index.js', __FILE__ ), array('jquery'));
 

diff --git a/wp/admin/sections/server-settings.php b/wp/admin/sections/server-settings.php
@@ -16,7 +16,7 @@
 		try{
 			$index = $client->getIndex($new['server_index']);
 
-			$status = $index->getStatus()->getResponse()->getData();
+			$status = $index->getStats()->getData();
 		} catch(\Elastica\Exception\ResponseException $ex){
 			// This kind usually means there was an issue with the index not existing, so we'll associate the message to that field.
 			$field = $NHP_Options->sections['server']['fields']['server_index'];

diff --git a/wp/lib/nhp/options/options.php b/wp/lib/nhp/options/options.php
@@ -75,10 +75,10 @@ function __construct($sections = array(), $args = array(), $extra_tabs = array()
 		$this->extra_tabs = apply_filters('nhp-opts-extra-tabs-'.$this->args['opt_name'], $extra_tabs);
 
 		//set option with defaults
-		add_action('init', array(&$this, '_set_default_options'));
+		$this->_set_default_options();
 
 		//options page
-		add_action('admin_menu', array(&$this, '_options_page'));
+		$this->_options_page();
 
 		//register setting
 		add_action('admin_init', array(&$this, '_register_setting'));