Changeset 974538

Timestamp:

08/28/2014 10:10:18 AM (11 years ago)

Author:

v-media

Message:

Version 1.8

Location:

foodlist/trunk

Files:

• lib/Artprima/View (added)
• lib/Artprima/View/ViewInterface.php (added)
• lib/Artprima/WordPress/API/Wrapper/Generic/CustomPost.php (modified) (4 diffs)
• lib/Artprima/WordPress/API/Wrapper/Generic/Widget.php (added)
• lib/Artprima/WordPress/Helper/Settings.php (modified) (1 diff)
• lib/Foodlist/Project/WordPress/Plugin/Foodlist/Admin/Metabox/MenuItem/PriceMetabox.php (modified) (1 diff)
• lib/Foodlist/Project/WordPress/Plugin/Foodlist/Admin/Metabox/MenuItem/TagsMetabox.php (modified) (1 diff)
• lib/Foodlist/Project/WordPress/Plugin/Foodlist/Generic/Shortcode/Internal/MenuItemThumbnailUrlShortcode.php (added)
• lib/Foodlist/Project/WordPress/Plugin/Foodlist/Generic/Shortcode/PrintMenuShortcode.php (modified) (1 diff)
• lib/Foodlist/Project/WordPress/Plugin/Foodlist/Generic/View/Menu/MenuItemView.php (modified) (2 diffs)
• lib/Foodlist/Project/WordPress/Plugin/Foodlist/Manager.php (modified) (3 diffs)
• loader.php (modified) (2 diffs)
• locale/foodlist-ru_RU.mo (modified) (previous)
• plugin.php (modified) (2 diffs)

foodlist/trunk/lib/Artprima/WordPress/API/Wrapper/Generic/CustomPost.php

@@ -3 +3 @@
 namespace Artprima\WordPress\API\Wrapper\Generic;
 
+/**
+ * Class CustomPost
+ *
+ * @author Denis Voytyuk <[email protected]>
+ *
+ * @package Artprima\WordPress\API\Wrapper\Generic
+ */
 class CustomPost
 {
@@ -48 +55 @@
      * @param string $name
      * @param mixed $value
-     * @return \Artprima\WordPress\API\Wrapper\CustomPost
+     * @return \Artprima\WordPress\API\Wrapper\Generic\CustomPost
      */
     public function setArg($name, $value)
@@ -60 +67 @@
      * 
      * @param array $args
-     * @return \Artprima\WordPress\API\Wrapper\CustomPost
+     * @return \Artprima\WordPress\API\Wrapper\Generic\CustomPost
      */
     public function setArgs(array $args)
@@ -71 +78 @@
      * Sets up wordpress init hook
      * 
-     * @return \Artprima\WordPress\API\Wrapper\CustomPost
+     * @return \Artprima\WordPress\API\Wrapper\Generic\CustomPost
      */
     public function setupRegistrationHook()

foodlist/trunk/lib/Artprima/WordPress/Helper/Settings.php

@@ -18 +18 @@
     public static function getInstance($optionName)
     {
-        if (!self::$instances[$optionName]) {
+        if (empty(self::$instances[$optionName])) {
             self::$instances[$optionName] = new self($optionName);
         }

foodlist/trunk/lib/Foodlist/Project/WordPress/Plugin/Foodlist/Admin/Metabox/MenuItem/PriceMetabox.php

@@ -86 +86 @@
         //    return;
         //}
-        
+
+        if (empty($_POST['post_type'])) {
+            return;
+        }
+
         if ( $this->getScreen() != $_POST['post_type'] ) {
             return;

foodlist/trunk/lib/Foodlist/Project/WordPress/Plugin/Foodlist/Admin/Metabox/MenuItem/TagsMetabox.php

@@ -81 +81 @@
         //    return;
         //}
-        
+
+        if (empty($_POST['post_type'])) {
+            return;
+        }
+
         if ( $this->getScreen() != $_POST['post_type'] ) {
             return;

foodlist/trunk/lib/Foodlist/Project/WordPress/Plugin/Foodlist/Generic/Shortcode/PrintMenuShortcode.php

@@ -17 +17 @@
     public function handle($attrs)
     {
+        $link = '';
         //$this->controller->handleShortcode($attrs);
         

foodlist/trunk/lib/Foodlist/Project/WordPress/Plugin/Foodlist/Generic/View/Menu/MenuItemView.php

@@ -22 +22 @@
 use Foodlist\Project\WordPress\Plugin\Foodlist\Generic\Shortcode\Internal\MenuItemTagsShortcode;
 use Foodlist\Project\WordPress\Plugin\Foodlist\Generic\Shortcode\Internal\MenuItemThumbnailShortcode;
+use Foodlist\Project\WordPress\Plugin\Foodlist\Generic\Shortcode\Internal\MenuItemThumbnailUrlShortcode;
 use Foodlist\Project\WordPress\Plugin\Foodlist\Generic\Shortcode\Internal\MenuItemTitleShortcode;
 use Foodlist\Project\WordPress\Plugin\Foodlist\Manager;
@@ -39 +40 @@
             $sm->registerShortcode(new MenuItemTitleShortcode());
             $sm->registerShortcode(new MenuItemExcerptShortcode());
-            $sm->registerShortcode(new CurrencySignShortcode);
-            $sm->registerShortcode(new MenuItemPriceShortcode);
-            $sm->registerShortcode(new MenuItemThumbnailShortcode);
-            
+            $sm->registerShortcode(new CurrencySignShortcode());
+            $sm->registerShortcode(new MenuItemPriceShortcode());
+            $sm->registerShortcode(new MenuItemThumbnailShortcode());
+            $sm->registerShortcode(new MenuItemThumbnailUrlShortcode());
+
             $sm->registerShortcode(new MenuItemTagsShortcode());
             $sm->registerShortcode(new MenuItemTagIconUrlShortcode());

foodlist/trunk/lib/Foodlist/Project/WordPress/Plugin/Foodlist/Manager.php

@@ -60 +60 @@
      * Constructor
      * 
-     * Protected to avoid multiple instances
+     * Private to avoid multiple instances
      */
-    protected function __construct()
-    {
-        ;
-    }
+    protected function __construct() {}
     
     /**
@@ -111 +108 @@
     public function registerActivationHooks()
     {
-        //$scm = new \Artprima\Text\ShortcodeManager();
-        //$sc = new \Foodlist\Project\WordPress\Plugin\Foodlist\Generic\Shortcode\Internal\TestShortcode('tttt');
-        //$scm->registerShortcode($sc);
-        //$sc = new \Foodlist\Project\WordPress\Plugin\Foodlist\Generic\Shortcode\Internal\XxxShortcode('xxx');
-        //$scm->registerShortcode($sc);
-        /*
-        var_dump($scm->applyShortcodes('
-            ASda fs dfasd234234 sdfasdf asdf [tttt] [xxx]sdfasdfasdfasdf[/xxx] [/tttt]
-        '));die();
-        */
-        
-        
-        register_activation_hook('foodlist/plugin.php', array(new Controller\ActivationController($this), 'init'));
-        register_deactivation_hook('foodlist/plugin.php', array(new Controller\DeactivationController($this), 'init'));
+        $activationController = new Controller\ActivationController($this);
+        $deactivationController = new Controller\DeactivationController($this);
+
+        register_activation_hook('foodlist/plugin.php', array($activationController, 'init'));
+        register_deactivation_hook('foodlist/plugin.php', array($deactivationController, 'init'));
+
+        //dev-mode hooks
+        if (class_exists('ActivationHooks', false)) {
+            add_action('wpapdev_activation', array($activationController, 'init'));
+            add_action('wpapdev_deactivation', array($deactivationController, 'init'));
+        }
     }
     
@@ -131 +125 @@
      * 
      * @param string $url
-     * @param srting $dir
+     * @param string $dir
      * 
      * @return Manager manager instance

foodlist/trunk/loader.php

@@ -27 +27 @@
         );
     }
-    $namespaces['Foodlist'] = array(
+    $namespaces['Foodlist'] = array(
         __DIR__.'/lib',
     );
@@ -42 +42 @@
     $_loader->register();
     if (!class_exists('Artprima\Lib', false)) {
-        new Artprima\Lib; //
+        new Artprima\Lib; //
     }
     

foodlist/trunk/plugin.php

@@ -1 +1 @@
 <?php
-/**
- * @version   $Id$
- * @package   Foodlist
- * @copyright Copyright (C) 2013 Artprima / http://artprima.eu/. All rights reserved.
- */
-
 /*
 Plugin Name: Foodlist
@@ -12 +6 @@
 Author: Artprima
 Author URI: http://artprima.eu/
-Version: 1.6
+Version: 1.8
 */
 
-define('FOODLIST_VERSION', '1.6');
+define('FOODLIST_VERSION', '1.8');
 define('FOODLIST_MIN_PHP_VERSION', '5.3.3');
 define('FOODLIST_MIN_WP_VERSION', '3.4.0');