Merge pull request #18 from codebard/2.2.1

2.2.1

Author: codebard

index.php

@@ -52,9 +52,9 @@ private function __construct()
 		require_once($this->internal['plugin_path'].'plugin/includes/default_internal_vars.php');
 		require_once($this->internal['plugin_path'].'plugin/includes/hardcoded_vars.php');
 
-		if(isset($_REQUEST[$this->internal['prefix'].'action']))
+		if(isset($_REQUEST[$this->internal['prefix'].'action'] ))
 		{
-			$this->internal['requested_action'] = $_REQUEST[$this->internal['prefix'].'action'];
+			$this->internal['requested_action'] = filter_var( $_REQUEST[$this->internal['prefix'].'action'], FILTER_SANITIZE_STRING);
 		}
 		else
 		{
@@ -685,7 +685,7 @@ public function do_admin_page_tabs_c()
 
 		if(isset($_REQUEST[$this->internal['prefix'].'tab']))
 		{
-			$tab=$_REQUEST[$this->internal['prefix'].'tab'];
+			$tab = filter_var( $_REQUEST[$this->internal['prefix'].'tab'], FILTER_SANITIZE_STRING ) ;
 		}
 
 		if(!isset($tab))
@@ -805,7 +805,7 @@ public function do_settings_pages_c($v1)
 
 		if(isset($_REQUEST[$this->internal['prefix'] . 'tab']))
 		{
-			$tab = sanitize_text_field($_REQUEST[$this->internal['prefix'].'tab']);
+			$tab = filter_var( $_REQUEST[$this->internal['prefix'].'tab'], FILTER_SANITIZE_STRING );
 		}
 		else
 		{
@@ -854,7 +854,7 @@ public function do_admin_settings_form_header_c()
 
 		if(isset($_REQUEST[$this->internal['prefix'] . 'tab']))
 		{
-			$tab = sanitize_text_field( $_REQUEST[$this->internal['prefix'] . 'tab'] );
+			$tab = filter_var( $_REQUEST[$this->internal['prefix'] . 'tab'], FILTER_SANITIZE_STRING );
 
 		}
 		else
@@ -883,7 +883,7 @@ public function do_admin_settings_form_footer_c()
 
 		if(isset($_REQUEST['tab']))
 		{
-			$tab=$_REQUEST['tab'];
+			$tab = filter_var( $_REQUEST['tab'], FILTER_SANITIZE_STRING );
 
 		}
 		else

plugin/plugin.php

@@ -208,7 +208,7 @@ public function enqueue_admin_styles_p()
 	{
 		$current_screen=get_current_screen();
 
-		if($current_screen->base=='toplevel_page_settings_'.$this->internal['id'] OR ( isset( $_REQUEST['page']) AND $_REQUEST['page']== 'cb_p6_install_pw' ) )
+		if($current_screen->base=='toplevel_page_settings_'.$this->internal['id'] OR ( isset( $_REQUEST['page']) AND $_REQUEST['page'] == 'cb_p6_install_pw' ) )
 		{
 			wp_enqueue_style( $this->internal['id'].'-css-admin', $this->internal['plugin_url'].'plugin/includes/css/admin.css' );
 
@@ -1341,10 +1341,10 @@ public function admin_message_page_p() {
 			$content = $this->lang['admin_message_default_content'];
 
 			if ( isset( $_REQUEST['cb_p6_admin_message_title'] ) ) {
-				$heading = $this->lang[ $_REQUEST['cb_p6_admin_message_title'] ];
+				$heading = $this->lang[ filter_var( $_REQUEST['cb_p6_admin_message_title'], FILTER_SANITIZE_STRING) ];
 			}
 			if ( isset( $_REQUEST['cb_p6_admin_message_content'] ) ) {
-				$content = $this->lang[ $_REQUEST['cb_p6_admin_message_content'] ];
+				$content = $this->lang[ filter_var( $_REQUEST['cb_p6_admin_message_content'], FILTER_SANITIZE_STRING) ];
 			}
 
 			echo '<div id="cb_p6_admin_message_page"><h1 style="margin-top: 0px;">' . $heading . '</h1><div id="cb_p6_admin_message_content">' . $content . '</div></div>';