Changeset 2309465

Timestamp:

05/21/2020 12:30:05 PM (4 years ago)

Author:

wolly

Message:

Released version 2.0, code rewritten and added new styles

Location:

wpit-funny-name-generator

Files:

• tags/2.0 (added)
• tags/2.0/assets (added)
• tags/2.0/assets/css (added)
• tags/2.0/assets/css/funny_name.css (added)
• tags/2.0/inc (added)
• tags/2.0/inc/class-funny-option-panel.php (added)
• tags/2.0/inc/class-jedi.php (added)
• tags/2.0/inc/class-mad-max.php (added)
• tags/2.0/inc/class-ninja.php (added)
• tags/2.0/inc/class-unicorn.php (added)
• tags/2.0/inc/class-utility.php (added)
• tags/2.0/language (added)
• tags/2.0/readme.txt (added)
• tags/2.0/wol-wrapper-functions.php (added)
• tags/2.0/wpit-funny-name-generator.php (added)
• trunk/assets/css/funny_name.css (modified) (2 diffs)
• trunk/inc/class-funny-option-panel.php (added)
• trunk/inc/class-jedi.php (added)
• trunk/inc/class-mad-max.php (added)
• trunk/inc/class-ninja.php (added)
• trunk/inc/class-unicorn.php (added)
• trunk/inc/class-utility.php (added)
• trunk/inc/class-wpit-funny-opiton-panel.php (deleted)
• trunk/inc/class-wpit-jedi.php (deleted)
• trunk/inc/class-wpit-mad-max.php (deleted)
• trunk/inc/class-wpit-ninja.php (deleted)
• trunk/inc/class-wpit-unicorn.php (deleted)
• trunk/readme.txt (modified) (5 diffs)
• trunk/wol-wrapper-functions.php (added)
• trunk/wpit-funny-name-generator.php (modified) (4 diffs)

wpit-funny-name-generator/trunk/assets/css/funny_name.css

@@ +1 @@
+
+
+
+
+
+
 .submit-name{
     
     margin-top: 25px;
-}
-.row.month{
-    
-    margin-top: 1em;
 }
 
@@ -57 +59 @@
   flex-wrap: wrap;
   width: 100%;
+
 }
 

wpit-funny-name-generator/trunk/readme.txt

@@ -5 +5 @@
 Requires at least: 4.0
 Tested up to: 5.4
-Stable tag: 1.2
+Stable tag: 
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
@@ -37 +37 @@
 
 == Installation ==
-Upload Wpit Funny Name Generator folder to the /wp-content/plugins/ directory
-Activate the plugin through the \'Plugins\' menu in WordPress
-Insert the right shortcode in a page or post.
+Install Wpit Funny Name Generator via the plugin directory, or upload the files manually to your server, then activate it.
 
 
@@ -60 +58 @@
 In order to generate Unicorn name use [unicorn_calc] shortcode
 
+
+
+
+
+
+
+
 = Do the plugin store data= =
 No data will be stored.
@@ -70 +75 @@
 
 == Changelog ==
+
+
+
+
+
 = 1.2 =
 
@@ -83 +93 @@
 
 * First release
+
+

wpit-funny-name-generator/trunk/wpit-funny-name-generator.php

@@ -3 +3 @@
  * @package wpit funny name generator
  * @author Paolo Valenti
- * @version 1.2 added unicorn generator
+ * @version 
  */
 /*
@@ -10 +10 @@
 Description: This plugin generate Jedi, Mad Max, Ninja names and unicorn name
 Author: Wolly
-Version: 1.2
+Version: 
 Author URI: https://paolovalenti.info
 Text Domain: wpit-funny-name-generator
@@ -33 +33 @@
 */
 
-define ( 'WPIT_WPITFNG_PLUGIN_PATH', plugin_dir_path( __FILE__ ) );
-define ( 'WPIT_WPITFNG_PLUGIN_URL', plugin_dir_url( __FILE__ ) );
-define ( 'WPIT_WPITFNG_PLUGIN_SLUG', basename( dirname( __FILE__ ) ) );
-define ( 'WPIT_WPITFNG_PLUGIN_VERSION', '1.2' );
-define ( 'WPIT_WPITFNG_PLUGIN_VERSION_NAME', 'wpit-wpitfng-version' );
-
-
+// Exit if accessed directly
+if ( ! defined( 'ABSPATH' ) ) {
+    exit;
+}   
 
 // Create text domain for localization purpose, po files must be in languages directory
@@ -51 +48 @@
 add_action('plugins_loaded', 'wpit_funny_name_generator_text_domain');
 
-include_once 'inc/class-wpit-jedi.php';
-include_once 'inc/class-wpit-mad-max.php';
-include_once 'inc/class-wpit-ninja.php';
-include_once 'inc/class-wpit-unicorn.php';
-
-include_once 'inc/class-wpit-funny-opiton-panel.php';
-
-
-class Wpit_Funny_Name_Generator {
-
-    //A static member variable representing the class instance
-    private static $_instance = null;
-
-
-
-    /**
-     * Wpit_Funny_Name_Generator::__construct()
-     * Locked down the constructor, therefore the class cannot be externally instantiated
-     *
-     * @param array $args various params some overidden by default
-     *
-     * @return
-     */
-
-    private function __construct() {
-
-        //check for plugin update (put in construct)
-        add_action( 'init', array( $this, 'update_check' ) );
-        add_action(
-                'wp_enqueue_scripts',
-                array(
-                    $this,
-                    'enqueue_styles',
-                )
+if ( ! class_exists( 'Wpit_Funny_Name_Generator' ) ){
+    
+    class Wpit_Funny_Name_Generator {
+    
+        //A static member variable representing the class instance
+        private static $instance;
+    
+        /**
+         * The version number of Wol_Iab.
+         *
+         * @access private
+         * @since  1.0
+         * @var    $version
+         */
+        private $version = '2.0';
+        
+        /**
+         * option
+         * 
+         * @var mixed
+         * @access public
+         */
+        public $option;
+        
+        /**
+         * jedi
+         * 
+         * @var mixed
+         * @access public
+         */
+        public $jedi;
+        
+        /**
+         * mad_max
+         * 
+         * @var mixed
+         * @access public
+         */
+        public $mad_max;
+        
+        /**
+         * ninja
+         * 
+         * @var mixed
+         * @access public
+         */
+        public $ninja;
+        
+        /**
+         * unicorn
+         * 
+         * @var mixed
+         * @access public
+         */
+        public $unicorn;
+        
+        public $utility;
+    
+        
+        public static function instance() {
+            if ( ! isset( self::$instance ) && ! ( self::$instance instanceof Wpit_Funny_Name_Generator ) ) {
+                self::$instance = new Wpit_Funny_Name_Generator();
+
+                if ( version_compare( PHP_VERSION, '5.6', '<' ) ) {
+
+                    add_action(
+                        'admin_notices',
+                        array(
+                            'Wol_Iab',
+                            'below_php_version_notice',
+                        )
+                    );
+
+                    return self::$instance;
+                }
+
+                self::$instance->setup_constants();
+
+                self::$instance->includes();
+                
+                add_action(
+                    'plugins_loaded',
+                    array(
+                        self::$instance,
+                        'setup_objects',
+                    ),
+                    - 1
+                );
+
+                add_action(
+                    'init',
+                    array(
+                        self::$instance,
+                        'init_settings',
+                    )
+                );
+
+            }
+
+            return self::$instance;
+        }   
+        
+        /**
+         * Throw error on object clone
+         *
+         * The whole idea of the singleton design pattern is that there is a single
+         * object therefore, we don't want the object to be cloned.
+         *
+         * @return void
+         * @since  1.0
+         * @access protected
+         */
+        public function __clone() {
+            // Cloning instances of the class is forbidden
+            _doing_it_wrong( __FUNCTION__, esc_html__( 'Cheatin&#8217; huh?', 'Wol_Iab' ), '1.0' );
+        }
+
+        /**
+         * Disable unserializing of the class
+         *
+         * @return void
+         * @since  1.0
+         * @access protected
+         */
+        public function __wakeup() {
+            // Unserializing instances of the class is forbidden
+            _doing_it_wrong( __FUNCTION__, esc_html__( 'Cheatin&#8217; huh?', 'Wol_Iab' ), '1.0' );
+        }
+
+        /**
+         * Show a warning to sites running PHP < 5.6
+         *
+         * @static
+         * @access private
+         * @return void
+         * @since  1.0
+         */
+        public static function below_php_version_notice() {
+            echo '<div class="error"><p>' . esc_html__( 'Your version of PHP is below the minimum version of PHP required by Wol_Iab. Please contact your host and request that your version be upgraded to 5.6 or later.', 'Wol_Iab' ) . '</p></div>';
+        }
+
+        /**
+         * Setup plugin constants
+         *
+         * @access private
+         * @return void
+         * @since  1.0
+         */
+        private function setup_constants() {
+            
+            if ( ! defined( 'WPIT_WPITFNG_PLUGIN_VERSION' ) ) {
+                define( 'WPIT_WPITFNG_PLUGIN_VERSION', $this->version );
+            }
+            
+            if ( ! defined( 'WPIT_WPITFNG_PLUGIN_VERSION_NAME' ) ) {
+                define ( 'WPIT_WPITFNG_PLUGIN_VERSION_NAME', 'wpit-wpitfng-version' );
+            }
+
+            
+            // Plugin Folder Path
+            if ( ! defined( 'WPIT_WPITFNG_PLUGIN_PATH' ) ) {
+                define( 'WPIT_WPITFNG_PLUGIN_PATH', plugin_dir_path( __FILE__ ) );
+            }
+
+            // Plugin Folder URL
+            if ( ! defined( 'WPIT_WPITFNG_PLUGIN_URL' ) ) {
+                define( 'WPIT_WPITFNG_PLUGIN_URL', plugin_dir_url( __FILE__ ) );
+            }
+            
+            // Plugin Folder URL
+            if ( ! defined( 'WPIT_WPITFNG_PLUGIN_SLUG' ) ) {
+                define ( 'WPIT_WPITFNG_PLUGIN_SLUG', basename( dirname( __FILE__ ) ) );
+            }
+
+        }
+        
+        /**
+         * includes function.
+         * 
+         * @access private
+         * @return void
+         */
+        private function includes() {
+            
+            if ( is_admin(  ) ){
+                
+                require_once WPIT_WPITFNG_PLUGIN_PATH . 'class-funny-option-panel.php';
+                
+            } else {
+                require_once WPIT_WPITFNG_PLUGIN_PATH . 'wol-wrapper-functions.php';
+                require_once WPIT_WPITFNG_PLUGIN_PATH . 'inc/class-jedi.php';
+                require_once WPIT_WPITFNG_PLUGIN_PATH . 'inc/class-jedi.php';
+                require_once WPIT_WPITFNG_PLUGIN_PATH . 'inc/class-mad-max.php';
+                require_once WPIT_WPITFNG_PLUGIN_PATH . 'inc/class-ninja.php';
+                require_once WPIT_WPITFNG_PLUGIN_PATH . 'inc/class-unicorn.php';
+                require_once WPIT_WPITFNG_PLUGIN_PATH . 'inc/class-utility.php';
+                
+            }
+        }
+        
+        /**
+         * Setup all objects
+         *
+         * @access public
+         * @return void
+         * @since  1.6.2
+         */
+        public function setup_objects() {
+            
+            // Instantiate in admin only
+            if ( is_admin() ) {
+
+                self::$instance->option     = new Wol_Funny_Name_Options_Page();                
+
+            } else {
+
+                // Frontend only used class
+                self::$instance->jedi       = new Wol_Jedy();
+                self::$instance->mad_max    = new Wol_Mad_Max();
+                self::$instance->ninja      = new Wol_Ninja();
+                self::$instance->unicorn    = new WOl_Unicorn();
+                self::$instance->utility    = new Wol_Fng_Utility();
+                
+                
+
+            }
+            
+            self::$instance->update_check();
+            
+            add_action(
+                    'wp_enqueue_scripts',
+                    array(
+                        $this,
+                        'enqueue_styles',
+                    )
+                );
+        }
+        
+        public function init_settings() {
+            wp_cache_add_non_persistent_groups( array( 'funny-name-session' ) );
+        }
+
+        /**
+        * update_UTILITY_check function.
+        *
+        * @access public
+        * @return void
+        */
+        public function update_check() {
+        // Do checks only in backend
+           if ( is_admin() ) {
+    
+    
+               if ( version_compare( get_site_option( WPIT_WPITFNG_PLUGIN_VERSION_NAME ), WPIT_WPITFNG_PLUGIN_VERSION , "<" ) ) {
+    
+                self::$instance->do_update();
+    
+                }
+    
+            } //end if only in the admin
+        }
+    
+        /**
+        * do_update function.
+        *
+        * @access private
+        *
+        */
+        public function do_update(){
+    
+           //DO NOTHING, BY NOW, MAYBE IN THE FUTURE
+    
+           //Update option
+    
+           update_option( WPIT_WPITFNG_PLUGIN_VERSION_NAME , WPIT_WPITFNG_PLUGIN_VERSION );
+        }
+        
+        public function enqueue_styles(){
+            
+            wp_register_style(
+                    'wol_funny_name_css',
+                    WPIT_WPITFNG_PLUGIN_URL . 'assets/css/funny_name.css',
+                    array(),
+                    '1.0.0'
+                );
+            wp_enqueue_style( 'wol_funny_name_css' );
+            
+            
+            wp_register_script(
+                'font-awesome-5',
+                'https://kit.fontawesome.com/dc9cba53cf.js',
+                array(),
+                '1.0.0',
+                true
             );
-
-
-
-
-    }
-
-    /**
-     * Wpit_Funny_Name_Generator::__clone()
-     * Prevent any object or instance of that class to be cloned
-     *
-     * @return
-     */
-    public function __clone() {
-        trigger_error( "Cannot clone instance of Singleton pattern ...", E_USER_ERROR );
-    }
-
-    /**
-     * Wpit_Funny_Name_Generator::__wakeup()
-     * Prevent any object or instance to be deserialized
-     *
-     * @return
-     */
-    public function __wakeup() {
-        trigger_error( 'Cannot deserialize instance of Singleton pattern ...', E_USER_ERROR );
-    }
-
-    /**
-     * Wpit_Funny_Name_Generator::getInstance()
-     * Have a single globally accessible static method
-     *
-     * @param mixed $args
-     *
-     * @return
-     */
-    public static function getInstance( $args = array() ) {
-        if ( ! is_object( self::$_instance ) )
-            self::$_instance = new self( $args );
-
-        return self::$_instance;
-
-
-    }
-
-
-
-
-
-    /**
-    * update_UTILITY_check function.
-    *
-    * @access public
-    * @return void
-    */
-    public function update_check() {
-    // Do checks only in backend
-       if ( is_admin() ) {
-
-
-           if ( version_compare( get_site_option( WPIT_WPITFNG_PLUGIN_VERSION_NAME ), WPIT_WPITFNG_PLUGIN_VERSION , "<" ) ) {
-
-            $this->do_update();
-
-            }
-
-        } //end if only in the admin
-    }
-
-    /**
-    * do_update function.
-    *
-    * @access private
-    *
-    */
-    public function do_update(){
-
-       //DO NOTHING, BY NOW, MAYBE IN THE FUTURE
-
-       //Update option
-
-       update_option( WPIT_WPITFNG_PLUGIN_VERSION_NAME , WPIT_WPITFNG_PLUGIN_VERSION );
-    }
-    
-    public function enqueue_styles(){
-        
-        wp_register_style(
-                'wol_funny_name_css',
-                WPIT_WPITFNG_PLUGIN_URL . 'assets/css/funny_name.css',
-                array(),
-                '1.0.0'
-            );
-            wp_enqueue_style( 'wol_funny_name_css' );
-
-    }
-
-
-}// chiudo la classe
-
-//istanzio la classe
-
-$wpit_funny_name_generator = Wpit_Funny_Name_Generator::getInstance();
+            wp_enqueue_script( 'font-awesome-5' );
+            
+            
+    
+        }
+    
+    
+    }// chiudo la classe
+
+} // ! class exists
+
+
+/**
+ * The main function responsible for returning the one true Wol_Iab
+ * Instance to functions everywhere.
+ *
+ * Use this function like you would a global variable, except without needing
+ * to declare the global.
+ *
+ * Example: <?php $Wol_Iab = Wol_Iab(); ?>
+ *
+ * @return Wol_Iab The one true Wol_Iab Instance
+ * @since 1.0
+ */
+function funnyname() {
+    return Wpit_Funny_Name_Generator::instance();
+}
+
+funnyname();