Menu
▾
▴
[Xoops-svn] SF.net SVN: xoops-svn:[13199] XoopsModules/fontier+/trunk/modules/fontier
|
From: <wis...@us...> - 2016-01-27 16:30:38
|
Revision: 13199
http://sourceforge.net/p/xoops/svn/13199
Author: wishcraft
Date: 2016-01-27 16:30:35 +0000 (Wed, 27 Jan 2016)
Log Message:
-----------
Back after a coffee and a break and Elpiniki Iosif got to use ebay.com.au for a bit\!
Modified Paths:
--------------
XoopsModules/fontier+/trunk/modules/fontier/.htaccess
XoopsModules/fontier+/trunk/modules/fontier/header.php
XoopsModules/fontier+/trunk/modules/fontier/sql/mysql.sql
Modified: XoopsModules/fontier+/trunk/modules/fontier/.htaccess
===================================================================
--- XoopsModules/fontier+/trunk/modules/fontier/.htaccess 2016-01-27 12:45:42 UTC (rev 13198)
+++ XoopsModules/fontier+/trunk/modules/fontier/.htaccess 2016-01-27 16:30:35 UTC (rev 13199)
@@ -1,6 +1,4 @@
php_value memory_limit 360M
-php_value upload_max_filesize 999999M
-php_value post_max_size 999999M
php_value error_reporting 0
php_value display_errors 0
@@ -8,40 +6,19 @@
RewriteCond %{REQUEST_FILENAME} !-f
RewriteCond %{REQUEST_FILENAME} !-d
-RewriteRule ^([a-z0-9]{2})/(.*?)/callback.api$ callback.php?version=$1&mode=$2 [L,NC,QSA]
+RewriteRule ^bin/(.*?)/(font).ufo/(.*?)$ $2.php?mode=ufo&clause=$1&path=$3 [L,NC,QSA]
+RewriteRule ^bin/(.*?)/(font).(.*?)?(.*?)$ $2.php?mode=$3&clause=$1&$4 [L,NC,QSA]
+RewriteRule ^bin/(.*?)/(font).(.*?)$ $2.php?mode=$3&clause=$1 [L,NC,QSA]
+RewriteRule ^css/(.*?)/(.*?).(css)?(.*?)$ $3.php?clause=$1&$4 [L,NC,QSA]
+RewriteRule ^css/(.*?)/(.*?).(css)$ $3.php?clause=$1 [L,NC,QSA]
+RewriteRule ^api/(.*?)/(callback).api?(.*?)$ $2.php?mode=$1&$3 [L,NC,QSA]
+RewriteRule ^api/(.*?)/(callback).api$ $2.php?mode=$1 [L,NC,QSA]
+RewriteRule ^(download)/([0-9]+)$ $1.php?mode=$1&clause=$2 [L,NC,QSA]
+RewriteRule ^([0-9a-z]+)/upload.html$ index.php?mode=upload&clause=$1 [L,NC,QSA]
+RewriteRule ^([0-9a-z]+)/surveys.html$ index.php?mode=surveys&clause=$1 [L,NC,QSA]
+RewriteRule ^([0-9a-z]+)/survey.html$ index.php?mode=survey&clause=$1 [L,NC,QSA]
+RewriteRule ^([0-9a-z]+)/(.*?)/font.html$ index.php?mode=font&clause=$1&name=$2 [L,NC,QSA]
+RewriteRule ^([0-9a-z]+)/node.html$ index.php?mode=node&clause=$1 [L,NC,QSA]
+RewriteRule ^(keys|fixes|typal)/nodes.html$ index.php?mode=nodes&clause=$1 [L,NC,QSA]
+RewriteRule ^index.html$ index.php?mode=index [L,NC,QSA]
-RewriteRule ^([a-z0-9]{2})/(font)/(.*?)/(preview)/image.(gif|jpg|png)$ index.php?version=$1&mode=$2&clause=$3&state=$5&output=$4 [L]
-RewriteRule ^([a-z0-9]{2})/survey/(preview)/(.*?)/image.(jpg|png|gif)$ survey-$2.php?version=$1&mode=$4&key=$3&output=$2 [L]
-RewriteRule ^([a-z0-9]{2})/(font)/(.*?)/(preview)/(gif|jpg|png).api$ index.php?version=$1&mode=$2&clause=$3&state=$5&output=$4 [L]
-RewriteRule ^([a-z0-9]{2})/survey/(preview)/(.*?)/(jpg|png|gif).api$ survey-$2.php?version=$1&mode=$4&key=$3&output=$2 [L]
-RewriteRule ^([a-z0-9]{2})/(font)/(.*?)/(glyph)/([0-9]+)/image.(gif|jpg|png)$ index.php?version=$1&mode=$2&clause=$3&state=$6&output=$4&char=$5 [L]
-RewriteRule ^([a-z0-9]{2})/(font)/(.*?)/(glyph)/([0-9]+)/(gif|jpg|png).api$ index.php?version=$1&mode=$2&clause=$3&state=$6&output=$4&char=$5 [L]
-RewriteRule ^([a-z0-9]{2})/(font)/(.*?)/(ufo).api$ index.php?version=$1&mode=$2&clause=$3&output=$4 [L]
-RewriteRule ^([a-z0-9]{2})/(font)/(.*?)/(ufo).api/(.*?)$ index.php?version=$1&mode=$2&clause=$3&state=$5&output=$4 [L]
-RewriteRule ^([a-z0-9]{2})/(font)/(.*?)/(.*?).api$ index.php?version=$1&mode=$2&clause=$3&state=$5&output=$4 [L]
-
-
-RewriteRule ^([a-z0-9]{2})/survey/page-([0-9]+)/(.*?)/(.*?).api$ survey-page-$2.php?version=$1&mode=$2&key=$3&output=$4& [L]
-RewriteRule ^([a-z0-9]{2})/survey/(.*?)/(.*?)/(.*?).api?(.*?)$ survey-$2.php?version=$1&mode=$2&key=$3&output=$4&$5 [L]
-RewriteRule ^([a-z0-9]{2})/survey/(.*?)/(.*?)/(.*?).api$ survey-$2.php?version=$1&mode=$2&key=$3&output=$4 [L]
-RewriteRule ^([a-z0-9]{2})/survey/(.*?)/(.*?).api$ survey-$2.php?version=$1&key=$2&output=$3& [L]
-
-RewriteRule ^([a-z0-9]{2})/(.*?)/upload.api$ upload.php?version=$1&field=$2 [L]
-RewriteRule ^([a-z0-9]{2})/(.*?)/releases.api$ releases.php?version=$1&field=$2 [L]
-RewriteRule ^([a-z0-9]{2})/(uploads|releases)/(.*?)/(.*?).api?(.*?)$ index.php?version=$1&mode=$2&clause=$3&state=&output=$4&$5 [L]
-RewriteRule ^([a-z0-9]{2})/(uploads|releases)/(.*?)/(.*?).api$ index.php?version=$1&mode=$2&clause=$3&state=&output=$4 [L]
-RewriteRule ^([a-z0-9]{2})/(uploads|releases)/(forms).api$ index.php?version=$1&mode=$2&clause=&state=&output=$3 [L]
-
-RewriteRule ^([a-z0-9]{2})/(fonts|nodes|random|data|callbacks|downloads)/(.*?)/(.*?)/(.*?)/(.*?).api?(.*?)$ index.php?version=$1&mode=$2&clause=$3&state=$4&output=$5&name=$6&$7 [L]
-RewriteRule ^([a-z0-9]{2})/(fonts|nodes|random|data|callbacks|downloads)/(.*?)/(.*?)/(.*?).api?(.*?)$ index.php?version=$1&mode=$2&clause=$3&state=$4&output=$5&$6 [L]
-RewriteRule ^([a-z0-9]{2})/(fonts|nodes|random|data|callbacks|downloads|fonthit|archive)/(.*?)/(.*?).api?(.*?)$ index.php?version=$1&mode=$2&clause=$3&state=&output=$4&$5 [L]
-RewriteRule ^([a-z0-9]{2})/(fonts|nodes|random|data|callbacks|downloads)/(.*?).api?(.*?)$ index.php?version=$1&mode=$2&clause=&state=&output=$3&$4 [L]
-
-RewriteRule ^([a-z0-9]{2})/(fonts|nodes|random|data|callbacks|downloads)/(.*?)/(.*?)/(.*?)/(.*?).api$ index.php?version=$1&mode=$2&clause=$3&state=$4&output=$5&name=$6 [L]
-RewriteRule ^([a-z0-9]{2})/(fonts|nodes|random|data|callbacks|downloads)/(.*?)/(.*?)/(.*?).api$ index.php?version=$1&mode=$2&clause=$3&state=$4&output=$5 [L]
-RewriteRule ^([a-z0-9]{2})/(fonts|nodes|random|data|callbacks|downloads|fonthit|archive)/(.*?)/(.*?).api$ index.php?version=$1&mode=$2&clause=$3&state=&output=$4 [L]
-RewriteRule ^([a-z0-9]{2})/(fonts|nodes|random|data|callbacks|downloads)/(.*?).api$ index.php?version=$1&mode=$2&clause=&state=&output=$3& [L]
-
-RewriteRule ^font-download-example.zip$ examples/sample-font-api2-download.zip [L]
-RewriteRule ^callback-example.php$ examples/callback-example.php.txt [L]
-RewriteRule ^(.*?).(css|txt|php|jpg|png|gif|ico)$ $1.$2 [L]
\ No newline at end of file
Modified: XoopsModules/fontier+/trunk/modules/fontier/header.php
===================================================================
--- XoopsModules/fontier+/trunk/modules/fontier/header.php 2016-01-27 12:45:42 UTC (rev 13198)
+++ XoopsModules/fontier+/trunk/modules/fontier/header.php 2016-01-27 16:30:35 UTC (rev 13199)
@@ -1,6 +1,6 @@
<?php
/**
- * Chronolabs Fonting Repository Services REST API API
+ * Chronolabs Fonting Repository Services REST FONTIER FONTIER
*
* You may not change or alter any portion of this comment or credits
* of supporting developers from this source code or any supporting source code
@@ -14,15 +14,18 @@
* @package fonts
* @since 2.1.9
* @author Simon Roberts <wis...@us...>
-* @subpackage api
-* @description Fonting Repository Services REST API
-* @link http://sourceforge.net/projects/chronolabsapis
+* @subpackage FONTIER
+* @description Fonting Repository Services REST FONTIER
+* @link http://sourceforge.net/projects/chronolabsFONTIERs
* @link http://cipher.labs.coop
*/
error_reporting(E_ERROR);
ini_set('display_errors', true);
+ global $source, $ipid, $fontnames, $salter;
+ $fontnames = array();
+
/**
* Opens Access Origin Via networking Route NPN
*/
@@ -35,18 +38,8 @@
ini_set("zlib.output_compression", 'Off');
ini_set("zlib.output_compression_level", -1);
- /**
- *
- * @var constants
- */
- define("API_FILE_IO_PEERS", __DIR__ . DIRECTORY_SEPARATOR . 'data' . DIRECTORY_SEPARATOR . 'peers.diz');
- define("API_FILE_IO_DOMAINS", __DIR__ . DIRECTORY_SEPARATOR . 'data' . DIRECTORY_SEPARATOR . 'domains.diz');
- define("API_FILE_IO_FOOTER", __DIR__ . DIRECTORY_SEPARATOR . 'data' . DIRECTORY_SEPARATOR . 'api-%s.html');
+ require_once XOOPS_PATH.'/modules/fontier/include/functions.php';
- require_once __DIR__.'/class/fontages.php';
- require_once __DIR__.'/functions.php';
- require_once __DIR__.'/apiconfig.php';
-
$parts = explode(".", microtime(true));
mt_srand(mt_rand(-microtime(true), microtime(true))/$parts[1]);
mt_srand(mt_rand(-microtime(true), microtime(true))/$parts[1]);
@@ -55,33 +48,19 @@
$salter = ((float)(mt_rand(0,1)==1?'':'-').$parts[1].'.'.$parts[0]) / sqrt((float)$parts[1].'.'.intval(cosh($parts[0])))*tanh($parts[1]) * mt_rand(1, intval($parts[0] / $parts[1]));
header('Blowfish-salt: '. $salter);
- global $domain, $protocol, $business, $entity, $contact, $referee, $peerings, $source, $ipid, $fontnames;
- $fontnames = array();
-
define('FONTS_CACHE', DIRECTORY_SEPARATOR . 'tmp' . DIRECTORY_SEPARATOR . 'fonts' . DIRECTORY_SEPARATOR . 'cache');
if (!is_dir(FONTS_CACHE))
mkdirSecure(FONTS_CACHE, 0777, true);
-
/**
- * Global API Configurations and Setting from file Constants!
- */
- $domain = getDomainSupportism('domain', $_SERVER["HTTP_HOST"]);
- $protocol = getDomainSupportism('protocol', $_SERVER["HTTP_HOST"]);
- $business = getDomainSupportism('business', $_SERVER["HTTP_HOST"]);
- $entity = getDomainSupportism('entity', $_SERVER["HTTP_HOST"]);
- $contact = getDomainSupportism('contact', $_SERVER["HTTP_HOST"]);
- $referee = getDomainSupportism('referee', $_SERVER["HTTP_HOST"]);
-
- /**
- * URI Path Finding of API URL Source Locality
+ * URI Path Finding of FONTIER URL Source Locality
* @var unknown_type
*/
$pu = parse_url($_SERVER['REQUEST_URI']);
$source = (isset($_SERVER['HTTPS'])?'https://':'http://').strtolower($_SERVER['HTTP_HOST']);
/**
- * URI Path Finding of API URL Source Locality
+ * URI Path Finding of FONTIER URL Source Locality
* @var unknown_type
*/
$ipid = getIPIdentity(whitelistGetIP(true));
\ No newline at end of file
Modified: XoopsModules/fontier+/trunk/modules/fontier/sql/mysql.sql
===================================================================
--- XoopsModules/fontier+/trunk/modules/fontier/sql/mysql.sql 2016-01-27 12:45:42 UTC (rev 13198)
+++ XoopsModules/fontier+/trunk/modules/fontier/sql/mysql.sql 2016-01-27 16:30:35 UTC (rev 13199)
@@ -122,6 +122,19 @@
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+CREATE TABLE `fontier_fonts_downloads` (
+ `id` mediumint(18) ZEROFILL NOT NULL AUTO_INCREMENT ,
+ `font-id` varchar(32) NOT NULL DEFAULT '',
+ `type` varchar(20) NOT NULL DEFAULT '',
+ `file` varchar(200) NOT NULL DEFAULT '',
+ `url` varchar(300) NOT NULL DEFAULT '',
+ `created` int(12) NOT NULL DEFAULT '0',
+ `last` int(12) NOT NULL DEFAULT '0',
+ `hits` mediumint(32) NOT NULL DEFAULT '0',
+ PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+
CREATE TABLE `fontier_fonts_files` (
`id` mediumint(24) NOT NULL AUTO_INCREMENT,
`font_id` varchar(32) NOT NULL DEFAULT '',
|
