Fix bug

alexandrdrvn · alexandrdrvn · commit 05c06c0c0292 · 2019-08-06T09:31:36.000+03:00
diff --git a/index.php b/index.php
diff --git a/model/blog/category.php b/model/blog/category.php
@@ -1,6 +1,6 @@
 <?php
 
-class ModelBlogCategory extends Model {
+class VF_ModelBlogCategory extends VF_Model {
 
 	public function getCategory( $category_id ) {
 		global $wpdb;
diff --git a/model/blog/post.php b/model/blog/post.php
@@ -1,6 +1,6 @@
 <?php
 
-class ModelBlogPost extends Model
+class VF_ModelBlogPost extends VF_Model
 {
 
 	public function getPost($post_id)
diff --git a/model/common/page.php b/model/common/page.php
@@ -1,6 +1,6 @@
 <?php
 
-class ModelCommonPage extends Model
+class VF_ModelCommonPage extends VF_Model
 {
     public function getPage($page_id)
     {
diff --git a/model/common/token.php b/model/common/token.php
@@ -2,7 +2,7 @@
 
 use \Firebase\JWT\JWT;
 
-class ModelCommonToken extends Model {
+class VF_ModelCommonToken extends VF_Model {
 	public function getToken( $args ) {
 
 		$secret_key = 'bananas';
diff --git a/model/startup/startup.php b/model/startup/startup.php
@@ -1,8 +1,8 @@
 <?php
 
-class ModelStartupStartup extends Model
+class VF_ModelStartupStartup extends VF_Model
 {
-    public function getResolvers() {
+    public function getVF_Resolvers() {
         $rawMapping = file_get_contents(VF_DIR_PLUGIN.'mapping.json');
         $mapping = json_decode( $rawMapping, true );
         $result = array();
diff --git a/model/store/category.php b/model/store/category.php
@@ -1,6 +1,6 @@
 <?php
 
-class ModelStoreCategory extends Model {
+class VF_ModelStoreCategory extends VF_Model {
 
 	public function getCategory( $category_id ) {
 		global $wpdb;
diff --git a/model/store/compare.php b/model/store/compare.php
@@ -1,6 +1,6 @@
 <?php
 
-class ModelStoreCompare extends Model {
+class VF_ModelStoreCompare extends VF_Model {
 	public function getCompare() {
 		$result = array();
 
diff --git a/model/store/option.php b/model/store/option.php
@@ -1,6 +1,6 @@
 <?php
 
-class ModelStoreOption extends Model
+class VF_ModelStoreOption extends VF_Model
 {
     public function getOptionLabel($name) {
         global $wpdb;
diff --git a/model/store/product.php b/model/store/product.php
@@ -1,6 +1,6 @@
 <?php
 
-class ModelStoreProduct extends Model
+class VF_ModelStoreProduct extends VF_Model
 {
     public function getProductRelated($product_id)
     {
diff --git a/model/store/wishlist.php b/model/store/wishlist.php
@@ -1,6 +1,6 @@
 <?php
 
-class ModelStoreWishlist extends Model {
+class VF_ModelStoreWishlist extends VF_Model {
 	public function getWishlist() {
 		$result = array();
 
diff --git a/plugin.php b/plugin.php
@@ -14,19 +14,19 @@
 add_action( 'admin_menu', 'add_plugin_page' );
 function add_plugin_page() {
 	$codename         = 'd_vuefront';
-	$page_hook_suffix = add_options_page( __( 'Settings', $codename ) . ' Vuefront', 'Vuefront', 'manage_options', 'd_vuefront', 'vuefront_options_page_output' );
-	add_action( 'admin_print_scripts-' . $page_hook_suffix, 'my_plugin_admin_scripts' );
+	$page_hook_suffix = add_options_page( __( 'Settings', $codename ) . ' Vuefront', 'Vuefront', 'manage_options', 'd_vuefront', 'VF_vuefront_options_page_output' );
+	add_action( 'admin_print_scripts-' . $page_hook_suffix, 'VF_my_plugin_admin_scripts' );
 }
 
-function my_plugin_admin_scripts() {
+function VF_my_plugin_admin_scripts() {
 	wp_enqueue_style( 'vuefront-style', plugins_url( 'd_vuefront/view/stylesheet/admin.css' ) );
 	wp_enqueue_style( 'bootstrap-style', plugins_url( 'd_vuefront/view/stylesheet/bootstrap.min.css' ) );
 	wp_enqueue_script( 'jquery' );
 	wp_enqueue_script( 'clipboard' );
 	wp_enqueue_script( 'bootstrap-script', plugins_url( 'd_vuefront/view/javascript/bootstrap.min.js' ) );
 }
 
-function vuefront_options_page_output() {
+function VF_vuefront_options_page_output() {
 	$codename = 'd_vuefront';
 
 	$data                                 = array();
@@ -47,24 +47,24 @@ function vuefront_options_page_output() {
 	require_once 'view/template/setting.tpl';
 }
 
-function my_plugin_action_links( $links ) {
+function VF_my_plugin_action_links( $links ) {
 	$links = array_merge( array(
 		'<a href="' . esc_url( admin_url( 'options-general.php?page=d_vuefront' ) ) . '">' . __( 'Settings' ) . '</a>'
 	), $links );
 
 	return $links;
 }
 
-add_action( 'plugin_action_links_' . plugin_basename( __FILE__ ), 'my_plugin_action_links' );
+add_action( 'plugin_action_links_' . plugin_basename( __FILE__ ), 'VF_my_plugin_action_links' );
 
-add_action( 'plugins_loaded', 'true_load_plugin_textdomain' );
+add_action( 'plugins_loaded', 'VF_true_load_plugin_textdomain' );
 
-function true_load_plugin_textdomain() {
+function VF_true_load_plugin_textdomain() {
 	load_plugin_textdomain( 'd_vuefront', false, dirname( plugin_basename( __FILE__ ) ) . '/languages/' );
 }
 
-function restApi( WP_REST_Request $request ) {
-	$registry = start();
+function VF_RestApi( WP_REST_Request $request ) {
+	$registry = VF_Start();
 
 	$registry->set( 'request', $request );
 
@@ -74,14 +74,14 @@ function restApi( WP_REST_Request $request ) {
 }
 
 add_action( 'determine_current_user', function ( $user ) {
-	$registry = start();
+	$registry = VF_Start();
 
 	return $registry->get( 'load' )->resolver( 'startup/startup/determine_current_user', $user );
 }, 10 );
 
 add_action( 'rest_api_init', function () {
 	register_rest_route( 'vuefront/v1', '/graphql', array(
 		'methods'  => 'POST',
-		'callback' => 'restApi',
+		'callback' => 'VF_RestApi',
 	) );
 } );
diff --git a/resolver/blog/category.php b/resolver/blog/category.php
@@ -1,6 +1,6 @@
 <?php
 
-class ResolverBlogCategory extends Resolver
+class VF_ResolverBlogCategory extends VF_Resolver
 {
     public function get($data) {
 	    $this->load->model('blog/category');
diff --git a/resolver/blog/post.php b/resolver/blog/post.php
@@ -1,6 +1,6 @@
 <?php
 
-class ResolverBlogPost extends Resolver
+class VF_ResolverBlogPost extends VF_Resolver
 {
     public function get($args)
     {
diff --git a/resolver/blog/review.php b/resolver/blog/review.php
@@ -1,6 +1,6 @@
 <?php
 
-class ResolverBlogReview extends Resolver
+class VF_ResolverBlogReview extends VF_Resolver
 {
     public function add($args) {
         $time = current_time( 'mysql' );
diff --git a/resolver/common/account.php b/resolver/common/account.php
@@ -1,6 +1,6 @@
 <?php
 
-class ResolverCommonAccount extends Resolver {
+class VF_ResolverCommonAccount extends VF_Resolver {
 	public function login( $args ) {
 
 		try {
diff --git a/resolver/common/contact.php b/resolver/common/contact.php
@@ -1,6 +1,6 @@
 <?php
 
-class ResolverCommonContact extends Resolver
+class VF_ResolverCommonContact extends VF_Resolver
 {
     private $codename = "d_vuefront";
 
diff --git a/resolver/common/country.php b/resolver/common/country.php
@@ -1,6 +1,6 @@
 <?php
 
-class ResolverCommonCountry extends Resolver
+class VF_ResolverCommonCountry extends VF_Resolver
 {
     private $codename = "d_vuefront";
 
diff --git a/resolver/common/file.php b/resolver/common/file.php
@@ -1,6 +1,6 @@
 <?php
 
-class ResolverCommonContact extends Resolver
+class VF_ResolverCommonContact extends VF_Resolver
 {
     private $codename = "d_vuefront";
 
diff --git a/resolver/common/home.php b/resolver/common/home.php
@@ -1,6 +1,6 @@
 <?php
 
-class ResolverCommonHome extends Resolver
+class VF_ResolverCommonHome extends VF_Resolver
 {
     public function get() {
         return array(
diff --git a/resolver/common/language.php b/resolver/common/language.php
@@ -1,6 +1,6 @@
 <?php
 
-class ResolverCommonLanguage extends Resolver
+class VF_ResolverCommonLanguage extends VF_Resolver
 {
     private $codename = "d_vuefront";
 
diff --git a/resolver/common/page.php b/resolver/common/page.php
@@ -1,6 +1,6 @@
 <?php
 
-class ResolverCommonPage extends Resolver
+class VF_ResolverCommonPage extends VF_Resolver
 {
     public function get($args) {
         $this->load->model('common/page');
diff --git a/resolver/common/token.php b/resolver/common/token.php
@@ -1,6 +1,6 @@
 <?php
 
-class ResolverCommonToken extends Resolver {
+class VF_ResolverCommonToken extends VF_Resolver {
 	public function get() {
 		$this->load->model('common/token');
 		$token_info = $this->model_common_token->getToken();
diff --git a/resolver/common/zone.php b/resolver/common/zone.php
@@ -1,6 +1,6 @@
 <?php
 
-class ResolverCommonZone extends Resolver
+class VF_ResolverCommonZone extends VF_Resolver
 {
     private $codename = "d_vuefront";
 
diff --git a/resolver/startup/startup.php b/resolver/startup/startup.php
@@ -3,7 +3,7 @@
 use GraphQL\GraphQL;
 use GraphQL\Utils\BuildSchema;
 
-class ResolverStartupStartup extends Resolver {
+class VF_ResolverStartupStartup extends VF_Resolver {
 	public function index() {
 
 //		if ( is_plugin_active( 'd_vuefront/plugin.php' ) ) {
@@ -21,7 +21,7 @@ public function index() {
 		$this->load->model( 'startup/startup' );
 
 		try {
-			$resolvers = $this->model_startup_startup->getResolvers();
+			$resolvers = $this->model_startup_startup->getVF_Resolvers();
 			$schema    = BuildSchema::build( file_get_contents( VF_DIR_PLUGIN . 'schema.graphql' ) );
 			$rawInput  = file_get_contents( 'php://input' );
 			$input     = json_decode( $rawInput, true );
diff --git a/resolver/store/cart.php b/resolver/store/cart.php
@@ -1,6 +1,6 @@
 <?php
 
-class ResolverStoreCart extends Resolver
+class VF_ResolverStoreCart extends VF_Resolver
 {
     public function add($args) {
         $this->load->model('store/product');
diff --git a/resolver/store/category.php b/resolver/store/category.php
@@ -1,6 +1,6 @@
 <?php
 
-class ResolverStoreCategory extends Resolver {
+class VF_ResolverStoreCategory extends VF_Resolver {
     public function get($args) {
     	$this->load->model('store/category');
 
diff --git a/resolver/store/checkout.php b/resolver/store/checkout.php
@@ -1,6 +1,6 @@
 <?php
 
-class ResolverStoreCheckout extends Resolver
+class VF_ResolverStoreCheckout extends VF_Resolver
 {
     public function link() {
         return array(
diff --git a/resolver/store/compare.php b/resolver/store/compare.php
@@ -1,6 +1,6 @@
 <?php 
 
-class ResolverStoreCompare extends Resolver {
+class VF_ResolverStoreCompare extends VF_Resolver {
     public function add($args) {
         $this->load->model('store/compare');
 
diff --git a/resolver/store/currency.php b/resolver/store/currency.php
@@ -1,6 +1,6 @@
 <?php
 
-class ResolverStoreCurrency extends Resolver
+class VF_ResolverStoreCurrency extends VF_Resolver
 {
     private $codename = "d_vuefront";
 
diff --git a/resolver/store/product.php b/resolver/store/product.php
@@ -1,6 +1,6 @@
 <?php
 
-class ResolverStoreProduct extends Resolver
+class VF_ResolverStoreProduct extends VF_Resolver
 {
     public function __construct($registry)
     {
diff --git a/resolver/store/review.php b/resolver/store/review.php
@@ -1,6 +1,6 @@
 <?php
 
-class ResolverStoreReview extends Resolver
+class VF_ResolverStoreReview extends VF_Resolver
 {
     public function add($args) {
         $time = current_time('mysql');
diff --git a/resolver/store/wishlist.php b/resolver/store/wishlist.php
@@ -1,6 +1,6 @@
 <?php 
 
-class ResolverStoreWishlist extends Resolver {
+class VF_ResolverStoreWishlist extends VF_Resolver {
     public function add($args) {
         $this->load->model('store/wishlist');
 
diff --git a/system/engine/action.php b/system/engine/action.php
@@ -1,6 +1,6 @@
 <?php
 
-class Action {
+class VF_Action {
 	private $id;
 	private $route;
 	private $method = 'index';
@@ -34,7 +34,7 @@ public function execute($registry, array $args = array()) {
 		}
 
 		$file  = VF_DIR_PLUGIN . 'resolver/' . $this->route . '.php';	
-		$class = 'Resolver' . preg_replace('/[^a-zA-Z0-9]/', '', $this->route);
+		$class = 'VF_Resolver' . preg_replace('/[^a-zA-Z0-9]/', '', $this->route);
 		
 		if (is_file($file)) {
 			include_once($file);
diff --git a/system/engine/actionType.php b/system/engine/actionType.php
diff --git a/system/engine/loader.php b/system/engine/loader.php
diff --git a/system/engine/model.php b/system/engine/model.php
diff --git a/system/engine/proxy.php b/system/engine/proxy.php
diff --git a/system/engine/registry.php b/system/engine/registry.php
diff --git a/system/engine/resolver.php b/system/engine/resolver.php
diff --git a/system/engine/type.php b/system/engine/type.php
diff --git a/system/helpers/load.php b/system/helpers/load.php
diff --git a/system/helpers/mutations.php b/system/helpers/mutations.php
diff --git a/system/helpers/queries.php b/system/helpers/queries.php
diff --git a/system/library/request.php b/system/library/request.php
diff --git a/system/startup.php b/system/startup.php

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`<?php`
`2`	`2`
`3`		`-class ModelBlogPost extends Model`
	`3`	`+class VF_ModelBlogPost extends VF_Model`
`4`	`4`	`{`
`5`	`5`
`6`	`6`	`public function getPost($post_id)`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`<?php`
`2`	`2`
`3`		`-class ModelCommonPage extends Model`
	`3`	`+class VF_ModelCommonPage extends VF_Model`
`4`	`4`	`{`
`5`	`5`	`public function getPage($page_id)`
`6`	`6`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`<?php`
`2`	`2`
`3`		`-class ModelStoreOption extends Model`
	`3`	`+class VF_ModelStoreOption extends VF_Model`
`4`	`4`	`{`
`5`	`5`	`public function getOptionLabel($name) {`
`6`	`6`	`global $wpdb;`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`<?php`
`2`	`2`
`3`		`-class ModelStoreProduct extends Model`
	`3`	`+class VF_ModelStoreProduct extends VF_Model`
`4`	`4`	`{`
`5`	`5`	`public function getProductRelated($product_id)`
`6`	`6`	`{`