FIX: TemplateGlobalProvider does not work with shortcut namespaces, a…

…nd fixed package name
milkyway-multimedia · Jul 29, 2015 · d1ec0ad · d1ec0ad
1 parent 384c675
commit d1ec0ad
Show file tree

Hide file tree

Showing 22 changed files with 96 additions and 78 deletions.
diff --git a/code/Collector.php b/code/Collector.php
@@ -3,7 +3,7 @@
  * Milkyway Multimedia
  * Collector.php
  *
- * @package reggardocolaianni.com
+ * @package milkyway-multimedia/ss-social-feed
  * @author Mellisa Hankins <mell@milkywaymultimedia.com.au>
  */
 class Collector {

diff --git a/code/Contracts/Provider.php b/code/Contracts/Provider.php
@@ -3,7 +3,7 @@
  * Milkyway Multimedia
  * Provider.php
  *
- * @package reggardocolaianni.com
+ * @package milkyway-multimedia/ss-social-feed
  * @author Mellisa Hankins <mell@milkywaymultimedia.com.au>
  */
 interface Provider {

diff --git a/code/Contracts/TextParser.php b/code/Contracts/TextParser.php
@@ -3,7 +3,7 @@
  * Milkyway Multimedia
  * PostParser.php
  *
- * @package reggardocolaianni.com
+ * @package milkyway-multimedia/ss-social-feed
  * @author Mellisa Hankins <mell@milkywaymultimedia.com.au>
  */
 

diff --git a/code/Control/RemoveMultipleFbRoots.php b/code/Control/RemoveMultipleFbRoots.php
@@ -20,7 +20,8 @@ public function preRequest(SS_HTTPRequest $request, Session $session, DataModel
 	}
 
 	public function postRequest(SS_HTTPRequest $request, SS_HTTPResponse $response, DataModel $model) {
-		if(singleton('env')->get('include_facebook_root_div'))
-			$response->setBody(str_replace('<body>', '<body><div id="fb-root"></div>', $response->getBody()));
+		if(singleton('env')->get('include_facebook_root_div')) {
+			$response->setBody(str_replace('</body>', '<div id="fb-root"></div></body>', $response->getBody()));
+		}
 	}
 }
diff --git a/code/Parsers/DefaultParser.php b/code/Parsers/DefaultParser.php
@@ -5,7 +5,7 @@
  * Milkyway Multimedia
  * AutolinkParser.php
  *
- * @package reggardocolaianni.com
+ * @package milkyway-multimedia/ss-social-feed
  * @author Mellisa Hankins <mell@milkywaymultimedia.com.au>
  */
 

diff --git a/code/Profiles/SocialFeed_Facebook.php b/code/Profiles/SocialFeed_Facebook.php
@@ -4,7 +4,7 @@
  * Milkyway Multimedia
  * SocialFeed_Facebook.php
  *
- * @package reggardocolaianni.com
+ * @package milkyway-multimedia/ss-social-feed
  * @author Mellisa Hankins <mell@milkywaymultimedia.com.au>
  */
 class SocialFeed_Facebook extends SocialFeed_Profile

diff --git a/code/Profiles/SocialFeed_GooglePlaces.php b/code/Profiles/SocialFeed_GooglePlaces.php
@@ -4,7 +4,7 @@
  * Milkyway Multimedia
  * SocialFeed_GooglePlaces.php
  *
- * @package reggardocolaianni.com
+ * @package milkyway-multimedia/ss-social-feed
  * @author Mellisa Hankins <mell@milkywaymultimedia.com.au>
  */
 class SocialFeed_GooglePlaces extends SocialFeed_Profile {

diff --git a/code/Profiles/SocialFeed_GooglePlus.php b/code/Profiles/SocialFeed_GooglePlus.php
@@ -4,7 +4,7 @@
  * Milkyway Multimedia
  * SocialFeed_GooglePlus.php
  *
- * @package reggardocolaianni.com
+ * @package milkyway-multimedia/ss-social-feed
  * @author Mellisa Hankins <mell@milkywaymultimedia.com.au>
  */
 class SocialFeed_GooglePlus extends SocialFeed_Profile {

diff --git a/code/Profiles/SocialFeed_Page.php b/code/Profiles/SocialFeed_Page.php
@@ -4,7 +4,7 @@
  * Milkyway Multimedia
  * SocialFeed_Page.php
  *
- * @package reggardocolaianni.com
+ * @package milkyway-multimedia/ss-social-feed
  * @author Mellisa Hankins <mell@milkywaymultimedia.com.au>
  */
 

diff --git a/code/Profiles/SocialFeed_Profile.php b/code/Profiles/SocialFeed_Profile.php
@@ -4,7 +4,7 @@
  * Milkyway Multimedia
  * SocialFeed_Profile.php
  *
- * @package reggardocolaianni.com
+ * @package milkyway-multimedia/ss-social-feed
  * @author Mellisa Hankins <mell@milkywaymultimedia.com.au>
  */
 

diff --git a/code/Profiles/SocialFeed_Twitter.php b/code/Profiles/SocialFeed_Twitter.php
@@ -4,7 +4,7 @@
  * Milkyway Multimedia
  * SocialFeed_Twitter.php
  *
- * @package reggardocolaianni.com
+ * @package milkyway-multimedia/ss-social-feed
  * @author Mellisa Hankins <mell@milkywaymultimedia.com.au>
  */
 class SocialFeed_Twitter extends SocialFeed_Profile {

diff --git a/code/Profiles/SocialFeed_Youtube.php b/code/Profiles/SocialFeed_Youtube.php
@@ -4,7 +4,7 @@
  * Milkyway Multimedia
  * SocialFeed_GooglePlus.php
  *
- * @package reggardocolaianni.com
+ * @package milkyway-multimedia/ss-social-feed
  * @author Mellisa Hankins <mell@milkywaymultimedia.com.au>
  */
 class SocialFeed_Youtube extends SocialFeed_Profile {

diff --git a/code/Providers/Facebook.php b/code/Providers/Facebook.php
@@ -6,7 +6,7 @@
  * Milkyway Multimedia
  * Facebook.php
  *
- * @package reggardocolaianni.com
+ * @package milkyway-multimedia/ss-social-feed
  * @author  Mellisa Hankins <mell@milkywaymultimedia.com.au>
  */
 class Facebook extends Oauth implements \Flushable

diff --git a/code/Providers/GooglePlaces.php b/code/Providers/GooglePlaces.php
@@ -6,7 +6,7 @@
  * Milkyway Multimedia
  * GooglePlaces.php
  *
- * @package reggardocolaianni.com
+ * @package milkyway-multimedia/ss-social-feed
  * @author Mellisa Hankins <mell@milkywaymultimedia.com.au>
  */
 class GooglePlaces extends HTTP {

diff --git a/code/Providers/GooglePlus.php b/code/Providers/GooglePlus.php
@@ -6,7 +6,7 @@
  * Milkyway Multimedia
  * GooglePlus.php
  *
- * @package reggardocolaianni.com
+ * @package milkyway-multimedia/ss-social-feed
  * @author Mellisa Hankins <mell@milkywaymultimedia.com.au>
  */
 class GooglePlus extends HTTP {

diff --git a/code/Providers/Model/HTTP.php b/code/Providers/Model/HTTP.php
@@ -8,7 +8,7 @@
  * Milkyway Multimedia
  * HTTP.php
  *
- * @package reggardocolaianni.com
+ * @package milkyway-multimedia/ss-social-feed
  * @author Mellisa Hankins <mell@milkywaymultimedia.com.au>
  */
 abstract class HTTP implements Provider {

diff --git a/code/Providers/Model/Internal.php b/code/Providers/Model/Internal.php
@@ -3,7 +3,7 @@
  * Milkyway Multimedia
  * Db.php
  *
- * @package reggardocolaianni.com
+ * @package milkyway-multimedia/ss-social-feed
  * @author Mellisa Hankins <mell@milkywaymultimedia.com.au>
  */
 

diff --git a/code/Providers/Model/Oauth.php b/code/Providers/Model/Oauth.php
@@ -6,7 +6,7 @@
  * Milkyway Multimedia
  * HTTPProvider.php
  *
- * @package reggardocolaianni.com
+ * @package milkyway-multimedia/ss-social-feed
  * @author Mellisa Hankins <mell@milkywaymultimedia.com.au>
  */
 abstract class Oauth extends HTTP {

diff --git a/code/Providers/SS_Page.php b/code/Providers/SS_Page.php
@@ -3,7 +3,7 @@
  * Milkyway Multimedia
  * SS_Blog.php
  *
- * @package reggardocolaianni.com
+ * @package milkyway-multimedia/ss-social-feed
  * @author Mellisa Hankins <mell@milkywaymultimedia.com.au>
  */
 

diff --git a/code/Providers/Twitter.php b/code/Providers/Twitter.php
@@ -6,7 +6,7 @@
  * Milkyway Multimedia
  * Twitter.php
  *
- * @package reggardocolaianni.com
+ * @package milkyway-multimedia/ss-social-feed
  * @author Mellisa Hankins <mell@milkywaymultimedia.com.au>
  */
 class Twitter extends Oauth {

diff --git a/code/Utilities.php b/code/Utilities.php
@@ -1,6 +1,5 @@
 <?php namespace Milkyway\SS\SocialFeed;
 
-use TemplateGlobalProvider;
 use Milkyway\SS\Director;
 use SocialFeed_Facebook;
 use SocialFeed_Profile;
@@ -12,54 +11,68 @@
  * Milkyway Multimedia
  * Utilities.php
  *
- * @package reggardocolaianni.com
+ * @package milkyway-multimedia/ss-social-feed
  * @author Mellisa Hankins <mell@milkywaymultimedia.com.au>
  */
-class Utilities implements TemplateGlobalProvider {
-    public static function require_facebook_script($facebook = null, $parent = null) {
-            if(!$facebook)
-                $facebook = singleton('SocialFeed_Facebook');
+class Utilities implements \TemplateGlobalProvider
+{
+    public static function require_facebook_script($facebook = null, $parent = null)
+    {
+        if (!$facebook) {
+            $facebook = singleton('SocialFeed_Facebook');
+        }
 
-            $appId = $facebook->setting('AppID', $parent);
+        $appId = $facebook->setting('AppID', $parent);
 
-            if(!$appId && $facebook = SocialFeed_Facebook::get()->first())
-                $appId = $facebook->setting('AppID', $parent);
+        if (!$appId && $facebook = SocialFeed_Facebook::get()->first()) {
+            $appId = $facebook->setting('AppID', $parent);
+        }
 
-            if($appId)
-                singleton('assets')->defer(sprintf(Director::protocol() . 'connect.facebook.net/%s/all.js#xfbml=1&appId=%s', i18n::get_locale(), $appId));
+        if ($appId) {
+            singleton('assets')->defer(sprintf(Director::protocol() . 'connect.facebook.net/%s/all.js#xfbml=1&appId=%s',
+                i18n::get_locale(), $appId));
+        }
 
         singleton('env')->set('include_facebook_root_div', true);
     }
 
-    public static function require_twitter_script() {
-	    singleton('assets')->defer(Director::protocol() . 'platform.twitter.com/widgets.js');
+    public static function require_twitter_script()
+    {
+        singleton('assets')->defer(Director::protocol() . 'platform.twitter.com/widgets.js');
     }
 
-    public static function require_google_plus_script() {
-        singleton('assets')->customScript("window.___gcfg = {lang: '" . str_replace('_', '-', i18n::get_locale()) . "'};", 'GooglePlus-Locale');
-	    singleton('assets')->defer(Director::protocol() . 'apis.google.com/js/plusone.js', true);
+    public static function require_google_plus_script()
+    {
+        singleton('assets')->customScript("window.___gcfg = {lang: '" . str_replace('_', '-',
+                i18n::get_locale()) . "'};", 'GooglePlus-Locale');
+        singleton('assets')->defer(Director::protocol() . 'apis.google.com/js/plusone.js', true);
     }
 
-    public static function require_google_platform_script() {
+    public static function require_google_platform_script()
+    {
         singleton('assets')->defer(Director::protocol() . 'apis.google.com/js/platform.js', true);
     }
 
     private static $_addThis_included;
 
-    public static function addThisJS($profileID = '', $parent = null, $config = []) {
-        if(!self::$_addThis_included) {
-            if(!$profileID) {
-                if($profile = SocialFeed_Profile::get()->first())
+    public static function addThisJS($profileID = '', $parent = null, $config = [])
+    {
+        if (!self::$_addThis_included) {
+            if (!$profileID) {
+                if ($profile = SocialFeed_Profile::get()->first()) {
                     $profileID = $profile->setting('AddThis', $parent);
+                }
 
-                if(!$profileID)
+                if (!$profileID) {
                     $profileID = singleton('SocialFeed_Profile')->setting('AddThis', $parent);
+                }
 
-                if(!$profileID)
+                if (!$profileID) {
                     return;
+                }
             }
 
-            if(!count($config)) {
+            if (!count($config)) {
                 $config = array(
                     'data_track_addressbar' => false,
                     'ui_cobrand' => SiteConfig::current_site_config()->Title,
@@ -74,54 +87,58 @@ public static function addThisJS($profileID = '', $parent = null, $config = [])
         </script>
             ', 'AddThis-Configuration');
 
-	        singleton('assets')->defer('http://s7.addthis.com/js/300/addthis_widget.js#pubid=' . $profileID, true);
+            singleton('assets')->defer('http://s7.addthis.com/js/300/addthis_widget.js#pubid=' . $profileID, true);
         }
     }
 
-	public static function facebookLink($parent = null)
-	{
-		if($id = singleton('SocialFeed_Facebook')->setting('Username', $parent))
-			return Controller::join_links(singleton('SocialFeed_Facebook')->config()->url, $id);
+    public static function facebookLink($parent = null)
+    {
+        if ($id = singleton('SocialFeed_Facebook')->setting('Username', $parent)) {
+            return Controller::join_links(singleton('SocialFeed_Facebook')->config()->url, $id);
+        }
 
-		return '';
-	}
+        return '';
+    }
 
-	public static function twitterLink($parent = null)
-	{
-		if($id = singleton('SocialFeed_Twitter')->setting('Username', $parent))
-			return Controller::join_links(singleton('SocialFeed_Twitter')->config()->url, $id);
+    public static function twitterLink($parent = null)
+    {
+        if ($id = singleton('SocialFeed_Twitter')->setting('Username', $parent)) {
+            return Controller::join_links(singleton('SocialFeed_Twitter')->config()->url, $id);
+        }
 
-		return '';
-	}
+        return '';
+    }
 
-	public static function googlePlusLink($parent = null)
-	{
-		if($id = singleton('SocialFeed_GooglePlus')->setting('Username', $parent))
-			return Controller::join_links(singleton('SocialFeed_GooglePlus')->config()->url, $id);
+    public static function googlePlusLink($parent = null)
+    {
+        if ($id = singleton('SocialFeed_GooglePlus')->setting('Username', $parent)) {
+            return Controller::join_links(singleton('SocialFeed_GooglePlus')->config()->url, $id);
+        }
 
-		return '';
-	}
+        return '';
+    }
 
-	public static function instagramLink()
-	{
-		if($id = SiteConfig::current_site_config()->Instagram_Username)
-			return Controller::join_links('http://instagram.com', $id);
+    public static function instagramLink()
+    {
+        if ($id = SiteConfig::current_site_config()->Instagram_Username) {
+            return Controller::join_links('http://instagram.com', $id);
+        }
 
-		return '';
-	}
+        return '';
+    }
 
-    public static function get_template_global_variables() {
+    public static function get_template_global_variables()
+    {
         return array(
             'require_facebook_script',
             'require_twitter_script',
             'require_google_plus_script',
             'require_google_platform_script',
             'addThisJS',
-
-	        'facebookLink',
-	        'twitterLink',
-	        'googlePlusLink',
-	        'instagramLink',
+            'facebookLink',
+            'twitterLink',
+            'googlePlusLink',
+            'instagramLink',
         );
     }
 } 
diff --git a/templates/Includes/social-plugins/AddThis_ShareModule.ss b/templates/Includes/social-plugins/AddThis_ShareModule.ss
@@ -1,9 +1,9 @@
-<div class="addthis_toolbox addthis_default_style" data-addthis-url="<% if $addThisUrl %>$addThisUrl<% else_if $Top.Link %>{$absoluteBaseURL}{$Top.Link.Trim('/','l')}<% else %>$absoluteBaseURL<% end_if %>"<% if $addThisTitle %> data-addthis-title="$addThisTitle"<% end_if %>>
+<span class="addthis_toolbox addthis_default_style" data-addthis-url="<% if $addThisUrl %>$addThisUrl<% else_if $Top.Link %>{$absoluteBaseURL}{$Top.Link.Trim('/','l')}<% else %>$absoluteBaseURL<% end_if %>"<% if $addThisTitle %> data-addthis-title="$addThisTitle"<% end_if %>>
 	<a class="addthis_button_facebook"></a>
 	<a class="addthis_button_twitter"></a>
 	<a class="addthis_button_pinterest_share"></a>
 	<a class="addthis_button_email"></a>
 	<a class="addthis_button_compact"></a><% if $addThisCounter %> <a class="addthis_counter addthis_bubble_style"></a><% end_if %>
-</div>
+</span>
 
 $addThisJS($addThisProfileID)