[Xoops-svn] SF.net SVN: xoops-svn:[13225] *.xoops.org (Subdomain APIs & Sites)/fonts. xoops.org/modules/convert

[<wis...@us...>]

Revision: 13225
          http://sourceforge.net/p/xoops/svn/13225
Author:   wishcraft
Date:     2016-12-15 05:09:10 +0000 (Thu, 15 Dec 2016)
Log Message:
-----------
convert version 1.05 -- CSS inclusion

Modified Paths:
--------------
    *.xoops.org (Subdomain APIs & Sites)/fonts.xoops.org/modules/convert/font.php
    *.xoops.org (Subdomain APIs & Sites)/fonts.xoops.org/modules/convert/language/english/modinfo.php
    *.xoops.org (Subdomain APIs & Sites)/fonts.xoops.org/modules/convert/templates/convert_fonts.html

Modified: *.xoops.org (Subdomain APIs & Sites)/fonts.xoops.org/modules/convert/font.php
===================================================================
--- *.xoops.org (Subdomain APIs & Sites)/fonts.xoops.org/modules/convert/font.php	2016-12-15 03:38:38 UTC (rev 13224)
+++ *.xoops.org (Subdomain APIs & Sites)/fonts.xoops.org/modules/convert/font.php	2016-12-15 05:09:10 UTC (rev 13225)
@@ -60,6 +60,19 @@
 	$GLOBALS['xoTheme']->addStylesheet(XOOPS_URL . "/modules/' . basename(__DIR__) . '/language/" . $GLOBALS['xoopsConfig']['language'] . "/style.css");
 	$upload = $uploadsHandler->get($font->getVar('uploadid'));
 	
+	if (strlen($font->getVar('identity')))
+	{
+		
+		xoops_load("XoopsCache");
+		if (!$cssdata = XoopsCache::read($cache = "convert_css_".md5($font->getVar('identity'))))
+		{
+			$cssdata = array();
+			$cssdata['url']="http://fonts.labs.coop/v2/font/".$font->getVar('identity')."/css.api";
+			$cssdata['code'] = getURIData($cssdata['url'], 65, 65);
+			XoopsCache::write($cache, $cssdata, 3600 * 24 * 7 * 4 * 48);
+		}
+		$GLOBALS['xoopsTpl']->assign('cssdata', $cssdata,0);
+	}
 	$GLOBALS['xoopsTpl']->assign('xoops_meta_description', $keywords = 'Font: '.$font->getVar('name') . ' ~ Licensing Name: ' ._MD_CONVERT_LICENSE_NAME. ' ~ Licensing Code: ' . _MD_CONVERT_LICENSE_CODE . ' ~ Licensed Name: ' . $upload->getVar('name') . ' ~ Licensed Organisation: ' . $upload->getVar('company') . ' ~ Download Size: '.number_format($font->getvar('zip-bytes'),0).' bytes ~ Number of Files: '.number_format($font->getvar('zip-files'),0));
 	$GLOBALS['xoopsTpl']->assign('xoops_meta_keywords', implode(',',explode('-',sef($keywords))));
 	$GLOBALS['xoopsTpl']->assign('xoops_pagetitle', 'Font: ' . $font->getVar('name') . ' by ' . $upload->getVar('name') . ' ('.$upload->getVar('company').')');

Modified: *.xoops.org (Subdomain APIs & Sites)/fonts.xoops.org/modules/convert/language/english/modinfo.php
===================================================================
--- *.xoops.org (Subdomain APIs & Sites)/fonts.xoops.org/modules/convert/language/english/modinfo.php	2016-12-15 03:38:38 UTC (rev 13224)
+++ *.xoops.org (Subdomain APIs & Sites)/fonts.xoops.org/modules/convert/language/english/modinfo.php	2016-12-15 05:09:10 UTC (rev 13225)
@@ -32,9 +32,9 @@
 define('_MD_CONVERT_RELEASE_TWEET','Zero-day Font: %s (%s Mb) %s via @%s');
 
 // Path information
-define('_MD_CONVERT_PATH_UPLOADS',DIRECTORY_SEPARATOR . 'tmp' . DIRECTORY_SEPARATOR . 'fonts4xoops');
-define('_MD_CONVERT_PATH_CACHE',XOOPS_VAR_PATH . DIRECTORY_SEPARATOR . 'caches' . DIRECTORY_SEPARATOR . 'fonts4xoops');
-define('_MD_CONVERT_PATH_REPOSITORY',XOOPS_VAR_PATH . DIRECTORY_SEPARATOR . 'fonts4xoops' . DIRECTORY_SEPARATOR . 'respository');
+define('_MD_CONVERT_PATH_UPLOADS',DIRECTORY_SEPARATOR . 'tmp' . DIRECTORY_SEPARATOR . 'fonts4web');
+define('_MD_CONVERT_PATH_CACHE',XOOPS_VAR_PATH . DIRECTORY_SEPARATOR . 'caches' . DIRECTORY_SEPARATOR . 'fonts4web');
+define('_MD_CONVERT_PATH_REPOSITORY',XOOPS_VAR_PATH . DIRECTORY_SEPARATOR . 'fonts4web' . DIRECTORY_SEPARATOR . 'respository');
 
 // Admin Dashboard
 define('_MD_CONVERT_ADMIN_STATISTICS','Font Conversion Statistics');
@@ -53,7 +53,7 @@
 
 // Module definition headers for xoops_version.php
 define('_MD_CONVERT_MODULE_NAME','Font Coverter');
-define('_MD_CONVERT_MODULE_VERSION','1.01');
+define('_MD_CONVERT_MODULE_VERSION','1.05');
 define('_MD_CONVERT_MODULE_RELEASEDATE','');
 define('_MD_CONVERT_MODULE_STATUS','release');
 define('_MD_CONVERT_MODULE_DESCRIPTION','Font convert is a module which converts and packages web fonts!');

Modified: *.xoops.org (Subdomain APIs & Sites)/fonts.xoops.org/modules/convert/templates/convert_fonts.html
===================================================================
--- *.xoops.org (Subdomain APIs & Sites)/fonts.xoops.org/modules/convert/templates/convert_fonts.html	2016-12-15 03:38:38 UTC (rev 13224)
+++ *.xoops.org (Subdomain APIs & Sites)/fonts.xoops.org/modules/convert/templates/convert_fonts.html	2016-12-15 05:09:10 UTC (rev 13225)
@@ -11,7 +11,24 @@
 </p>
 <div style="clear:both;">&nbsp;</div>
 <div style="clear: both; height: auto; margin-top: 7px;"><h2>Preview of font: <{$font.name}></h2><center><img src="<{$preview}>" width="98%" /></center></div>
+<{if isset($cssdata)}>
 <div style="clear:both;">&nbsp;</div>
+<div style="clear: both; height: auto; margin-top: 13px;"><h2>CSS for Fonts API Inclusion</h2>
+	<h3>Method One with CSS</h3>
+	<p>You can include the following statement in a css call to pull the font from the API Repository:-<br />
+		<pre>
+			@import url("<{$cssdata.url}>");
+		</pre>
+	</p>
+	<h3>Method Two with CSS</h3>
+	<p>You can include the following statement in a css call to pull the font from the API Repository:-<br />
+		<pre>
+			<{$cssdata.code}>
+		</pre>
+	</p>
+</div>
+<{/if}>
+<div style="clear:both;">&nbsp;</div>
 <div style="clear: both; height: auto; margin-top: 13px;"><h2>Files in pack with <{$font.name}></h2>
 	<table>
  	<thead>