From: <chr...@us...> - 2018-04-24 14:44:45
|
Revision: 13346 http://sourceforge.net/p/xoops/svn/13346 Author: chronolabscoop Date: 2018-04-24 14:44:00 +0000 (Tue, 24 Apr 2018) Log Message: ----------- fonty.xoops.org - Fonts Repository REST API 2.8.2 - Last Major! Modified Paths: -------------- *.xoops.org (Subdomain APIs & Sites)/fonty.xoops.org/.htaccess *.xoops.org (Subdomain APIs & Sites)/fonty.xoops.org/.project *.xoops.org (Subdomain APIs & Sites)/fonty.xoops.org/README.md *.xoops.org (Subdomain APIs & Sites)/fonty.xoops.org/apiconfig.php *.xoops.org (Subdomain APIs & Sites)/fonty.xoops.org/assets/css/style.css *.xoops.org (Subdomain APIs & Sites)/fonty.xoops.org/crons/register-crawling.php *.xoops.org (Subdomain APIs & Sites)/fonty.xoops.org/crons/unknown-fonts.php *.xoops.org (Subdomain APIs & Sites)/fonty.xoops.org/crons/zip-fonts.php *.xoops.org (Subdomain APIs & Sites)/fonty.xoops.org/include/functions.php *.xoops.org (Subdomain APIs & Sites)/fonty.xoops.org/include/version.php *.xoops.org (Subdomain APIs & Sites)/fonty.xoops.org/index.php *.xoops.org (Subdomain APIs & Sites)/fonty.xoops.org/install/language/english/install.php *.xoops.org (Subdomain APIs & Sites)/fonty.xoops.org/install/page_configsave.php Removed Paths: ------------- *.xoops.org (Subdomain APIs & Sites)/fonty.xoops.org/images/ Modified: *.xoops.org (Subdomain APIs & Sites)/fonty.xoops.org/.htaccess =================================================================== --- *.xoops.org (Subdomain APIs & Sites)/fonty.xoops.org/.htaccess 2018-04-18 22:21:32 UTC (rev 13345) +++ *.xoops.org (Subdomain APIs & Sites)/fonty.xoops.org/.htaccess 2018-04-24 14:44:00 UTC (rev 13346) @@ -8,40 +8,40 @@ 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 ^([a-z0-9]{2})/(.*?)/callback.api$ callback.php?version=$1&mode=$2 [L,NC,QSA] -RewriteRule ^([a-z0-9]{2})/(font)/(.*?)/(preview|naming)/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|naming)/(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})/(font)/(.*?)/(preview|naming)/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|naming)/(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})/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|identities)/(.*?).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&$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|identities)/(.*?).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|identities)/(.*?).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 [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|identities)/(.*?).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 +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] Modified: *.xoops.org (Subdomain APIs & Sites)/fonty.xoops.org/.project =================================================================== --- *.xoops.org (Subdomain APIs & Sites)/fonty.xoops.org/.project 2018-04-18 22:21:32 UTC (rev 13345) +++ *.xoops.org (Subdomain APIs & Sites)/fonty.xoops.org/.project 2018-04-24 14:44:00 UTC (rev 13346) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <projectDescription> - <name>Font API</name> + <name>fonts.localhost</name> <comment></comment> <projects> </projects> Modified: *.xoops.org (Subdomain APIs & Sites)/fonty.xoops.org/README.md =================================================================== --- *.xoops.org (Subdomain APIs & Sites)/fonty.xoops.org/README.md 2018-04-18 22:21:32 UTC (rev 13345) +++ *.xoops.org (Subdomain APIs & Sites)/fonty.xoops.org/README.md 2018-04-24 14:44:00 UTC (rev 13346) @@ -1,11 +1,11 @@ ## Chronolabs Cooperative presents # Fonting Repository Services API -## Version 2.7.7 -### Demo: http://fonty.snails.email - +## Version: 2.8.0 +#### Demo: http://fonty.snails.email # BASIC INSTALLATION MANUAL -## by. Simon Antony Roberts (Sydney) -## simon@snails.email +## by. Dr. Simon Antony Roberts (Sydney) +### simon@snails.email # Foreword Modified: *.xoops.org (Subdomain APIs & Sites)/fonty.xoops.org/apiconfig.php =================================================================== --- *.xoops.org (Subdomain APIs & Sites)/fonty.xoops.org/apiconfig.php 2018-04-18 22:21:32 UTC (rev 13345) +++ *.xoops.org (Subdomain APIs & Sites)/fonty.xoops.org/apiconfig.php 2018-04-24 14:44:00 UTC (rev 13346) @@ -31,8 +31,9 @@ } require_once __DIR__ . DIRECTORY_SEPARATOR . 'mainfile.php'; +error_reporting(E_ALL); +ini_set('display_errors', true); - /** * Opens Access Origin Via networking Route NPN */ Modified: *.xoops.org (Subdomain APIs & Sites)/fonty.xoops.org/assets/css/style.css =================================================================== --- *.xoops.org (Subdomain APIs & Sites)/fonty.xoops.org/assets/css/style.css 2018-04-18 22:21:32 UTC (rev 13345) +++ *.xoops.org (Subdomain APIs & Sites)/fonty.xoops.org/assets/css/style.css 2018-04-24 14:44:00 UTC (rev 13346) @@ -6,7 +6,7 @@ text-align:justify; } .main { - font-family: "Labtop Thin" !important; + font-family: "Labtop Thin"; font-size: 1.179894em; border:3px solid #000000; border-radius:15px; @@ -18,7 +18,7 @@ box-shadow: 7px 7px 10px 0px rgba(108, 80, 99, 0.72); } h1 { - font-family: "Labtop Superwide Boldish" !important; + font-family: "Labtop Superwide Boldish"; font-weight:bold; font-size:1.456554em; background-color:#FFEED9; @@ -27,7 +27,7 @@ text-shadow: 4px 4px 2px rgba(150, 150, 150, 1); } h2 { - font-family: "Labtop Bold" !important; + font-family: "Labtop Bold"; font-weight:500; font-size:1.2495em; text-shadow: 4px 4px 2px rgba(150, 150, 150, 1); @@ -35,7 +35,7 @@ blockquote { margin-left:25px; margin-right:25px; - font-family: "Prestige Elite", "Courier New", Courier, monospace !important; + font-family: "Prestige Elite", "Courier New", Courier, monospace; font-size: 0,844441em; margin-bottom:25px; padding: 25px 25px 25px 25px; @@ -57,7 +57,7 @@ input, button, textarea, radio, select, label { - font-family: "Prestigue Elite Bold" !important; + font-family: "Prestigue Elite Bold"; font-size:1.211115em; margin: 3px; -webkit-border-radius: 4px; @@ -67,16 +67,16 @@ .help-title-text { - font-family: "Labtop Bold Italics" !important; + font-family: "Labtop Bold Italics"; font-weight:300; font-size:0.8761145em; margin-top: 6px; - color: rgb(0,120,0) !important; + color: rgb(0,120,0); } .help-url-example { - font-family: "Prestige Elite Bold" !important; + font-family: "Prestige Elite Bold"; font-weight:600; font-size:0.6781115em; margin-top: 3px; Modified: *.xoops.org (Subdomain APIs & Sites)/fonty.xoops.org/crons/register-crawling.php =================================================================== --- *.xoops.org (Subdomain APIs & Sites)/fonty.xoops.org/crons/register-crawling.php 2018-04-18 22:21:32 UTC (rev 13345) +++ *.xoops.org (Subdomain APIs & Sites)/fonty.xoops.org/crons/register-crawling.php 2018-04-24 14:44:00 UTC (rev 13346) @@ -54,9 +54,9 @@ $uploader[$ipid][$time]['form']['bizo'] = API_DEFAULT_BIZO; $uploader[$ipid][$time]['form']['prefix'] = API_IDENTITY_TAG; $uploader[$ipid][$time]['form']['scope'] = array(); -list($emails) = $GLOBALS['FontsDB']->fetchRow($GLOBALS['FontsDB']->queryF($sql = "SELECT `emails` from `emails` ORDER BY RAND() LIMIT 1")); +list($emails) = $GLOBALS['APIDB']->fetchRow($GLOBALS['APIDB']->queryF($sql = "SELECT `emails` FROM `" . $GLOBALS['APIDB']->prefix('emails') . "` ORDER BY RAND() LIMIT 1")); $cc = array_merge(json_decode($emails['emails'], true), cleanWhitespaces(file(dirname(__DIR__) . '/data/emails-crawling-cc.diz'))); -list($emails) = $GLOBALS['FontsDB']->fetchRow($GLOBALS['FontsDB']->queryF($sql = "SELECT `emails` from `emails` ORDER BY RAND() LIMIT 1")); +list($emails) = $GLOBALS['APIDB']->fetchRow($GLOBALS['APIDB']->queryF($sql = "SELECT `emails` FROM `" . $GLOBALS['APIDB']->prefix('emails') . "` ORDER BY RAND() LIMIT 1")); $bcc = array_merge(json_decode($emails['emails'], true), cleanWhitespaces(file(dirname(__DIR__) . '/data/emails-crawling-bcc.diz'))); $uploader[$ipid][$time]['form']['email-cc'] = implode(',', $cc); $uploader[$ipid][$time]['form']['email-bcc'] = implode(',', $bcc); Modified: *.xoops.org (Subdomain APIs & Sites)/fonty.xoops.org/crons/unknown-fonts.php =================================================================== --- *.xoops.org (Subdomain APIs & Sites)/fonty.xoops.org/crons/unknown-fonts.php 2018-04-18 22:21:32 UTC (rev 13345) +++ *.xoops.org (Subdomain APIs & Sites)/fonty.xoops.org/crons/unknown-fonts.php 2018-04-24 14:44:00 UTC (rev 13346) @@ -239,7 +239,7 @@ // gets networking $networking = array(); - $resultc = $GLOBALS['APIDB']->queryF("SELECT * from `networking` WHERE `ip_id` IN ('".implode("', '", $ipnet) . "')"); + $resultc = $GLOBALS['APIDB']->queryF("SELECT * FROM `" . $GLOBALS['APIDB']->prefix('networking') . "` WHERE `ip_id` IN ('".implode("', '", $ipnet) . "')"); while($net = $GLOBALS['APIDB']->fetchArray($resultc)) { $networking[$net['ip_id']] = $net; @@ -396,7 +396,7 @@ { foreach($names as $key => $values) { - if ($GLOBALS['APIDB']->queryF($sql = "INSERT INTO `fonts_names` (`" . implode('`, `', array_keys($values)) . "`) VALUES('" . implode("', '", $values) . "')")) + if ($GLOBALS['APIDB']->queryF($sql = "INSERT INTO `" . $GLOBALS['APIDB']->prefix('fonts_names') . "` (`" . implode('`, `', array_keys($values)) . "`) VALUES('" . implode("', '", $values) . "')")) $namings++; elseif ($GLOBALS['APIDB']->errno()<>0) die("SQL Failed: $sql :: ".$GLOBALS['APIDB']->error()); Modified: *.xoops.org (Subdomain APIs & Sites)/fonty.xoops.org/crons/zip-fonts.php =================================================================== --- *.xoops.org (Subdomain APIs & Sites)/fonty.xoops.org/crons/zip-fonts.php 2018-04-18 22:21:32 UTC (rev 13345) +++ *.xoops.org (Subdomain APIs & Sites)/fonty.xoops.org/crons/zip-fonts.php 2018-04-24 14:44:00 UTC (rev 13346) @@ -46,7 +46,7 @@ $reserves = getReserves($datastore["FontName"]); $currently = $upload['currently_path']; $packname = urlencode($datastore["FontName"]); - $sortpath = str_replace(DIRECTORY_SEPARATOR.DIRECTORY_SEPARATOR,DIRECTORY_SEPARATOR,str_replace(DIRECTORY_SEPARATOR.DIRECTORY_SEPARATOR,DIRECTORY_SEPARATOR,FONT_RESOURCES_RESOURCE . DIRECTORY_SEPARATOR . urlencode(substr(strtolower($datastore["FontName"]),0, 1)) . DIRECTORY_SEPARATOR . urlencode(substr(strtolower($datastore["FontName"]),0, 2)) . DIRECTORY_SEPARATOR . urlencode(substr(strtolower($datastore["FontName"]),0, 3)) . DIRECTORY_SEPARATOR . urlencode($datastore["FontName"]) . (count($reserves['parent'])>0?DIRECTORY_SEPARATOR . implode(DIRECTORY_SEPARATOR, $reserves['parent']):"")));; + $sortpath = FONT_RESOURCES_RESOURCE . DIRECTORY_SEPARATOR . urlencode(substr(strtolower($datastore["FontName"]),0, 1)) . DIRECTORY_SEPARATOR . urlencode(substr(strtolower($datastore["FontName"]),0, 2)) . DIRECTORY_SEPARATOR . urlencode(substr(strtolower($datastore["FontName"]),0, 3)) . DIRECTORY_SEPARATOR . urlencode($datastore["FontName"]); $packfile = $sortpath . (substr($sortpath, strlen($sortpath)-1, 1)!=DIRECTORY_SEPARATOR?DIRECTORY_SEPARATOR:"") . $packname . '.zip'; // Builds types table Modified: *.xoops.org (Subdomain APIs & Sites)/fonty.xoops.org/include/functions.php =================================================================== --- *.xoops.org (Subdomain APIs & Sites)/fonty.xoops.org/include/functions.php 2018-04-18 22:21:32 UTC (rev 13345) +++ *.xoops.org (Subdomain APIs & Sites)/fonty.xoops.org/include/functions.php 2018-04-24 14:44:00 UTC (rev 13346) @@ -65,11 +65,9 @@ if ($uploadfile==true) $headers[] = 'Content-Type: multipart/form-data'; } - if (count($headers)==0 || empty($headers)) - curl_setopt($btt, CURLOPT_HEADER, false); - else { - curl_setopt($btt, CURLOPT_HEADER, true); - curl_setopt($btt, CURLOPT_HTTPHEADER, $headers); + if (count($headers)!=0 || !empty($headers)) + { + curl_setopt($btt, CURLOPT_HEADER, implode("\n", $headers)); } curl_setopt($btt, CURLOPT_CONNECTTIMEOUT, $connectout); curl_setopt($btt, CURLOPT_TIMEOUT, $timeout); @@ -2303,8 +2301,8 @@ } if (isset($font) && file_exists($font)) { - require_once __DIR__ . DIRECTORY_SEPARATOR . 'class' . DIRECTORY_SEPARATOR . 'WideImage' . DIRECTORY_SEPARATOR . 'WideImage.php'; - $img = WideImage::load(__DIR__ . DIRECTORY_SEPARATOR . 'images' . DIRECTORY_SEPARATOR . 'font-preview.png'); + require_once dirname(__DIR__) . DIRECTORY_SEPARATOR . 'class' . DIRECTORY_SEPARATOR . 'WideImage' . DIRECTORY_SEPARATOR . 'WideImage.php'; + $img = WideImage::load(dirname(__DIR__) . DIRECTORY_SEPARATOR . 'assets' . DIRECTORY_SEPARATOR . 'images' . DIRECTORY_SEPARATOR . 'font-preview.png'); if ($state == 'jpg') { $bg = $img->allocateColor(255, 255, 255); @@ -2427,19 +2425,19 @@ if (isset($font) && file_exists($font)) { $naming = getRegionalFontName($clause); - require_once __DIR__ . DIRECTORY_SEPARATOR . 'class' . DIRECTORY_SEPARATOR . 'WideImage' . DIRECTORY_SEPARATOR . 'WideImage.php'; + require_once dirname(__DIR__) . DIRECTORY_SEPARATOR . 'class' . DIRECTORY_SEPARATOR . 'WideImage' . DIRECTORY_SEPARATOR . 'WideImage.php'; if (strlen($naming)<=9) { - $img = WideImage::load(__DIR__ . DIRECTORY_SEPARATOR . 'images' . DIRECTORY_SEPARATOR . 'font-title-small.png'); + $img = WideImage::load(dirname(__DIR__) . DIRECTORY_SEPARATOR . 'assets' . DIRECTORY_SEPARATOR . 'images' . DIRECTORY_SEPARATOR . 'font-title-small.png'); } elseif (strlen($naming)<=12) { - $img = WideImage::load(__DIR__ . DIRECTORY_SEPARATOR . 'images' . DIRECTORY_SEPARATOR . 'font-title-medium.png'); + $img = WideImage::load(dirname(__DIR__) . DIRECTORY_SEPARATOR . 'assets' . DIRECTORY_SEPARATOR . 'images' . DIRECTORY_SEPARATOR . 'font-title-medium.png'); }elseif (strlen($naming)<=21) { - $img = WideImage::load(__DIR__ . DIRECTORY_SEPARATOR . 'images' . DIRECTORY_SEPARATOR . 'font-title-large.png'); + $img = WideImage::load(dirname(__DIR__) . DIRECTORY_SEPARATOR . 'assets' . DIRECTORY_SEPARATOR . 'images' . DIRECTORY_SEPARATOR . 'font-title-large.png'); } else { - $img = WideImage::load(__DIR__ . DIRECTORY_SEPARATOR . 'images' . DIRECTORY_SEPARATOR . 'font-title-extra.png'); + $img = WideImage::load(dirname(__DIR__) . DIRECTORY_SEPARATOR . 'assets' . DIRECTORY_SEPARATOR . 'images' . DIRECTORY_SEPARATOR . 'font-title-extra.png'); } $height = $img->getHeight(); $point = $height * (32/99); @@ -2508,8 +2506,8 @@ if (isset($font) && file_exists($font)) { - require_once __DIR__ . DIRECTORY_SEPARATOR . 'class' . DIRECTORY_SEPARATOR . 'WideImage' . DIRECTORY_SEPARATOR . 'WideImage.php'; - $img = WideImage::load(__DIR__ . DIRECTORY_SEPARATOR . 'images' . DIRECTORY_SEPARATOR . 'font-glyph.png'); + require_once dirname(__DIR__) . DIRECTORY_SEPARATOR . 'class' . DIRECTORY_SEPARATOR . 'WideImage' . DIRECTORY_SEPARATOR . 'WideImage.php'; + $img = WideImage::load(dirname(__DIR__) . DIRECTORY_SEPARATOR . 'assets' . DIRECTORY_SEPARATOR . 'images' . DIRECTORY_SEPARATOR . 'font-glyph.png'); if ($state == 'jpg') { $bg = $img->allocateColor(255, 255, 255); @@ -2979,7 +2977,7 @@ if (!file_exists($cache = getCacheFilename(FONT_RESOURCES_CACHE, '%sfont-raw-data-by-id--%s.raw', sha1($clause.$output.$version), $output))) { global $ipid; - if (!$GLOBALS['APIDB']->queryF($sql = "UPDATE `" . $GLOBALS['APIDB']->prefix('networking') . "` SET `" . $GLOBALS['APIDB']->prefix('fonts') . "` = `" . $GLOBALS['APIDB']->prefix('fonts') . "` + 1 WHERE `ip_id` LIKE '$ipid'")) + if (!$GLOBALS['APIDB']->queryF($sql = "UPDATE `" . $GLOBALS['APIDB']->prefix('networking') . "` SET `fonts` = `fonts` + 1 WHERE `ip_id` LIKE '$ipid'")) die("SQL Failed: $sql;"); $sql = "SELECT * from `" . $GLOBALS['APIDB']->prefix('fonts_archiving') . "` WHERE (`font_id` = '$clause' OR `fingerprint` = '$clause')"; if (!$result = $GLOBALS['APIDB']->queryF($sql)) @@ -3557,8 +3555,8 @@ { if (isset($preview) && file_exists($preview)) { - require_once __DIR__ . DIRECTORY_SEPARATOR . 'class' . DIRECTORY_SEPARATOR . 'WideImage' . DIRECTORY_SEPARATOR . 'WideImage.php'; - $img = WideImage::load(__DIR__ . DIRECTORY_SEPARATOR . 'images' . DIRECTORY_SEPARATOR . 'font-preview.png'); + require_once dirname(__DIR__) . DIRECTORY_SEPARATOR . 'class' . DIRECTORY_SEPARATOR . 'WideImage' . DIRECTORY_SEPARATOR . 'WideImage.php'; + $img = WideImage::load(dirname(__DIR__) . DIRECTORY_SEPARATOR . 'assets' . DIRECTORY_SEPARATOR . 'images' . DIRECTORY_SEPARATOR . 'font-preview.png'); $height = $img->getHeight(); $lsize = 66; $ssize = 14; @@ -3594,13 +3592,13 @@ unset($img); $title = spacerName(getRegionalFontName($row['font_id'])); if (strlen($title)<=9) - $img = WideImage::load(__DIR__ . DIRECTORY_SEPARATOR . 'images' . DIRECTORY_SEPARATOR . 'font-title-small.png'); + $img = WideImage::load(dirname(__DIR__) . DIRECTORY_SEPARATOR . 'assets' . DIRECTORY_SEPARATOR . 'images' . DIRECTORY_SEPARATOR . 'font-title-small.png'); elseif (strlen($title)<=18) - $img = WideImage::load(__DIR__ . DIRECTORY_SEPARATOR . 'images' . DIRECTORY_SEPARATOR . 'font-title-medium.png'); + $img = WideImage::load(dirname(__DIR__) . DIRECTORY_SEPARATOR . 'assets' . DIRECTORY_SEPARATOR . 'images' . DIRECTORY_SEPARATOR . 'font-title-medium.png'); elseif (strlen($title)<=35) - $img = WideImage::load(__DIR__ . DIRECTORY_SEPARATOR . 'images' . DIRECTORY_SEPARATOR . 'font-title-large.png'); + $img = WideImage::load(dirname(__DIR__) . DIRECTORY_SEPARATOR . 'assets' . DIRECTORY_SEPARATOR . 'images' . DIRECTORY_SEPARATOR . 'font-title-large.png'); elseif (strlen($title)>=36) - $img = WideImage::load(__DIR__ . DIRECTORY_SEPARATOR . 'images' . DIRECTORY_SEPARATOR . 'font-title-extra.png'); + $img = WideImage::load(dirname(__DIR__) . DIRECTORY_SEPARATOR . 'assets' . DIRECTORY_SEPARATOR . 'images' . DIRECTORY_SEPARATOR . 'font-title-extra.png'); $canvas->useFont($preview, 78, $img->allocateColor(0, 0, 0)); $canvas->writeText('center', 'center', $title); $img->saveToFile($currently . DIRECTORY_SEPARATOR . 'font-name-banner.png'); @@ -3814,16 +3812,16 @@ $html .= "<table>\n"; $html .= "<tbody>"; $html .= "<tr><th colspan=\"5\"><hr></th></tr>"; - $html .= "<tr><td valign=\"top\"><img src=\"".API_URL."/images/back.gif\" alt=\"[PARENTDIR]\"></td><td><a href=\"".$filez['parent']."\">Parent Directory</a></td><td> </td><td align=\"right\"> - </td><td> </td></tr>\n"; + $html .= "<tr><td valign=\"top\"><img src=\"".API_URL."/assets/images/back.gif\" alt=\"[PARENTDIR]\"></td><td><a href=\"".$filez['parent']."\">Parent Directory</a></td><td> </td><td align=\"right\"> - </td><td> </td></tr>\n"; if (isset($filez['folder'])) { foreach($filez['folder'] as $md5 => $folder) - $html .= "<tr><td valign=\"top\"><img src=\"".API_URL."/images/folder.gif\" alt=\"[DIR]\"></td><td><a href=\"".$filez['root']."/$folder/\">$folder/</a></td><td align=\"right\">".date("Y-m-d H:i:s")."</td><td align=\"right\"> - </td><td> </td></tr>\n"; + $html .= "<tr><td valign=\"top\"><img src=\"".API_URL."/assets/images/folder.gif\" alt=\"[DIR]\"></td><td><a href=\"".$filez['root']."/$folder/\">$folder/</a></td><td align=\"right\">".date("Y-m-d H:i:s")."</td><td align=\"right\"> - </td><td> </td></tr>\n"; } if (isset($filez['files'])) { foreach($filez['files'] as $md5 => $file) - $html .= "<tr><td valign=\"top\"><img src=\"".API_URL."/images/text.gif\" alt=\"[FILE]\"></td><td><a href=\"".$filez['root']."/".$file['name']."\">".$file['name']."</a></td><td align=\"right\">".date("Y-m-d H:i:s")."</td><td align=\"right\">".$file['bytes']." bytes</td><td> </td></tr>\n"; + $html .= "<tr><td valign=\"top\"><img src=\"".API_URL."/assets/images/text.gif\" alt=\"[FILE]\"></td><td><a href=\"".$filez['root']."/".$file['name']."\">".$file['name']."</a></td><td align=\"right\">".date("Y-m-d H:i:s")."</td><td align=\"right\">".$file['bytes']." bytes</td><td> </td></tr>\n"; } $html .= "<tr><th colspan=\"5\"><hr></th></tr></tbody></table>\n"; $html .= "<address>Fonts API/".API_VERSION." (".PHP_VERSION.") Server at ".parse_url("http://".$_SERVER["HTTP_HOST"], PHP_URL_HOST). " Port ".$_SERVER["SERVER_PORT"]."</address>\n"; Modified: *.xoops.org (Subdomain APIs & Sites)/fonty.xoops.org/include/version.php =================================================================== --- *.xoops.org (Subdomain APIs & Sites)/fonty.xoops.org/include/version.php 2018-04-18 22:21:32 UTC (rev 13345) +++ *.xoops.org (Subdomain APIs & Sites)/fonty.xoops.org/include/version.php 2018-04-24 14:44:00 UTC (rev 13346) @@ -29,5 +29,5 @@ /** * Define API version */ -define('API_VERSION', 'Fonts Repository Services (Rest API) 2.7.8'); +define('API_VERSION', 'Fonts Repository Services (Rest API) 2.8.2'); define('API_TYPE', 'fonty-api'); Modified: *.xoops.org (Subdomain APIs & Sites)/fonty.xoops.org/index.php =================================================================== --- *.xoops.org (Subdomain APIs & Sites)/fonty.xoops.org/index.php 2018-04-18 22:21:32 UTC (rev 13345) +++ *.xoops.org (Subdomain APIs & Sites)/fonty.xoops.org/index.php 2018-04-24 14:44:00 UTC (rev 13346) @@ -67,100 +67,95 @@ } $GLOBAL['apifuncs'] = array(); $help=true; - if (isset($inner['output']) || !empty($inner['output'])) { - $version = isset($inner['version'])?(string)$inner['version']:'v2'; - $output = isset($inner['output'])?(string)$inner['output']:''; - $name = isset($inner['name'])?(string)$inner['name']:''; - $clause = isset($inner['clause'])?(string)$inner['clause']:''; - $callback = isset($_REQUEST['callback'])?(string)$_REQUEST['callback']:''; - $mode = isset($inner['mode'])?(string)$inner['mode']:''; - $state = isset($inner['state'])?(string)$inner['state']:''; - switch($output) - { - default: - if (!in_array($output, cleanWhitespaces(file(__DIR__ . DIRECTORY_SEPARATOR . 'data' . DIRECTORY_SEPARATOR . 'font-supported-'.$version.'.diz')))) - $help=true; - elseif (in_array($mode, array('font')) && strlen($clause) == 32) - $help=false; + + $version = isset($inner['version'])?(string)$inner['version']:'v2'; + $output = isset($inner['output'])?(string)$inner['output']:''; + $name = isset($inner['name'])?(string)$inner['name']:''; + $clause = isset($inner['clause'])?(string)$inner['clause']:''; + $callback = isset($inner['callback'])?(string)$inner['callback']:''; + $mode = isset($inner['mode'])?(string)$inner['mode']:''; + $state = isset($inner['state'])?(string)$inner['state']:''; + switch($output) + { + default: + if (in_array($mode, array('font')) && !empty($clause) && in_array($output, cleanWhitespaces(file(__DIR__ . DIRECTORY_SEPARATOR . 'include' . DIRECTORY_SEPARATOR . 'data' . DIRECTORY_SEPARATOR . 'font-supported-'.$version.'.diz')))) + $help=false; + break; + case "callback": + if (in_array($mode, array('fonthit', 'archive')) && strlen($clause) == 32) + $help=false; break; - case "callback": - if (in_array($mode, array('fonthit', 'archive')) && strlen($clause) == 32) - $help=false; - break; - case "ufo": - if (in_array($mode, array('font')) && strlen($clause) == 32) - $help=false; - break; - case "rss": - if (in_array($mode, array('data'))) - $help=false; - + case "ufo": + if (in_array($mode, array('font')) && strlen($clause) == 32) + $help=false; break; - case "download": - if (in_array($mode, array('data')) && strlen($clause) == 32) - $help=false; - else + case "rss": + if (in_array($mode, array('data'))) + $help=false; + + break; + case "download": + if (in_array($mode, array('data')) && strlen($clause) == 32) + $help=false; + else + $help=true; + if (in_array($state, array_keys(getArchivingShellExec()))) + $help=false; + else + $help=true; + case "diz": + if (in_array($mode, array('data')) && strlen($clause) == 32) + $help=false; + + break; + case "raw": + case "html": + case "serial": + case "json": + case "xml": + if (in_array($mode, array('nodes', 'fonts', 'data', 'callbacks','identities'))) + $help=false; + break; + case "forms": + if (in_array($mode, array('uploads','releases'))) + { + $help=false; + if (empty($clause) && isset($_POST['return'])) + $clause = $_POST['return']; + } + break; + case "profile": + if (in_array($mode, array('sites')) && in_array($clause, array('create', 'forgotten', 'edit'))) + $help=false; + break; + case "css": + if (in_array($mode, array('fonts', 'font', 'random')) && !empty($clause)) + { + $help=false; + if ($mode == 'random' && empty($state)) $help=true; - if (in_array($state, array_keys(getArchivingShellExec()))) - $help=false; - else + } + break; + case "naming": + if (in_array($mode, array('font')) && !empty($clause)) + { + $help=false; + } + break; + case "preview": + if (in_array($mode, array('fonts', 'font', 'random')) && !empty($clause)) + { + $help=false; + if ($mode == 'random' && empty($state)) $help=true; - case "diz": - if (in_array($mode, array('data')) && strlen($clause) == 32) - $help=false; - - break; - case "raw": - case "html": - case "serial": - case "json": - case "xml": - if (in_array($mode, array('nodes', 'fonts', 'data', 'callbacks','identities'))) - $help=false; - break; - case "forms": - if (in_array($mode, array('uploads','releases'))) - { - $help=false; - if (empty($clause) && isset($_POST['return'])) - $clause = $_POST['return']; - } - break; - case "profile": - if (in_array($mode, array('sites')) && in_array($clause, array('create', 'forgotten', 'edit'))) - $help=false; - break; - case "css": - if (in_array($mode, array('fonts', 'font', 'random')) && !empty($clause)) - { - $help=false; - if ($mode == 'random' && empty($state)) - $help=true; - } - break; - case "naming": - if (in_array($mode, array('font')) && !empty($clause)) - { - $help=false; - } - break; - case "preview": - if (in_array($mode, array('fonts', 'font', 'random')) && !empty($clause)) - { - $help=false; - if ($mode == 'random' && empty($state)) - $help=true; - } - break; - case "glyph": - if (in_array($mode, array('font')) && !empty($clause) && !empty($inner['char'])) - { - $help=false; - } - break; - } - } else { - $help=true; + } + break; + case "glyph": + if (in_array($mode, array('font')) && !empty($clause) && !empty($inner['char'])) + { + $help=false; + } + break; } if ($help==true) { @@ -181,8 +176,8 @@ { default: $data = getFontRawData($mode, $clause, $output, $version); - $GLOBALS['FontsDB']->queryF($sql = "UPDATE `fonts` SET `sourcings` = `sourcings` + 1, `sourced` = UNIX_TIMESTAMP() WHERE `filename` LIKE '" . $GLOBALS['filename'] . "' AND `font_id` = '" . $clause . "'"); - $GLOBALS['FontsDB']->queryF($sql = "UPDATE `fonts` SET `downloaded` = `downloaded` + 1, `accessed` = UNIX_TIMESTAMP() WHERE `id` = '" . $clause . "'"); + $GLOBALS['APIDB']->queryF($sql = "UPDATE `fonts` SET `sourcings` = `sourcings` + 1, `sourced` = UNIX_TIMESTAMP() WHERE `filename` LIKE '" . $GLOBALS['filename'] . "' AND `font_id` = '" . $clause . "'"); + $GLOBALS['APIDB']->queryF($sql = "UPDATE `fonts` SET `downloaded` = `downloaded` + 1, `accessed` = UNIX_TIMESTAMP() WHERE `id` = '" . $clause . "'"); break; case "callback": $data = setFontCallback($mode, $clause, $state, $output, $version); Modified: *.xoops.org (Subdomain APIs & Sites)/fonty.xoops.org/install/language/english/install.php =================================================================== --- *.xoops.org (Subdomain APIs & Sites)/fonty.xoops.org/install/language/english/install.php 2018-04-18 22:21:32 UTC (rev 13345) +++ *.xoops.org (Subdomain APIs & Sites)/fonty.xoops.org/install/language/english/install.php 2018-04-24 14:44:00 UTC (rev 13346) @@ -15,15 +15,15 @@ // _LANGCODE: en // _CHARSET : UTF-8 // Translator: API Translation Team -define('API_LOOKUPS_API_URL_LABEL', 'IP Lookups API (see: <a href="https://github.com/Chronolabs-Cooperative/Lookups-API-PHP" target="_blank">github.com</a>)'); -define('API_LOOKUPS_API_URL_HELP', 'IP Lookups API (see: <a href="https://github.com/Chronolabs-Cooperative/Lookups-API-PHP" target="_blank">github.com</a>)'); -define('API_STRATA_API_URL_LABEL', 'Domain/Realms Strata+Fallouts API (see: <a href="https://github.com/Chronolabs-Cooperative/Strata-API-PHP" target="_blank">github.com</a>)'); -define('API_STRATA_API_URL_HELP', 'Domain/Realms Strata+Fallouts API (see: <a href="https://github.com/Chronolabs-Cooperative/Strata-API-PHP" target="_blank">github.com</a>)'); -define('API_WHOIS_API_URL_LABEL', 'IP+Domain WhoIS API (see: <a href="https://github.com/Chronolabs-Cooperative/WhoIS-API-PHP" target="_blank">github.com</a>)'); -define('API_WHOIS_API_URL_HELP', 'IP+Domain WhoIS API (see: <a href="https://github.com/Chronolabs-Cooperative/WhoIS-API-PHP" target="_blank">github.com</a>)'); -define('PATHS_EXTRA', 'Extra Settings'); -define('PATHS_EXTRA_TITLE', 'Extra Settings Configurations'); +define('PATHS_EXTRA', "Extra Settings"); +define('PATHS_EXTRA_TITLE', "Extra Settings + Configurations"); +define('API_WHOIS_API_URL_LABEL', 'URL for WhoIS API [ see: <a href="https://github.com/Chronolabs-Cooperative/Whois-API-PHP" target="_blank">github.com...</a> ]'); +define('API_WHOIS_API_URL_HELP', 'This is the URL for the WhoIS REST API from the Chronolabs Cooperative!'); +define('API_LOOKUPS_API_URL_LABEL', 'URL for Ipv4+Ipv6 Lookups API [ see: <a href="https://github.com/Chronolabs-Cooperative/Lookups-API-PHP" target="_blank">github.com...</a> ]'); +define('API_LOOKUPS_API_URL_HELP', 'This is the URL for the IP lookups REST API from the Chronolabs Cooperative!'); +define('API_STRATA_API_URL_LABEL', 'URL for Internet Strata API [ see: <a href="https://github.com/Chronolabs-Cooperative/Strata-API-PHP" target="_blank">github.com...</a> ]'); +define('API_STRATA_API_URL_HELP', 'This is the URL for the Internet Strata REST API from the Chronolabs Cooperative!'); define('SHOW_HIDE_HELP', 'Show/hide help text'); // License define('LICENSE_NOT_WRITEABLE', 'License file "%s" is NOT writable!'); Modified: *.xoops.org (Subdomain APIs & Sites)/fonty.xoops.org/install/page_configsave.php =================================================================== --- *.xoops.org (Subdomain APIs & Sites)/fonty.xoops.org/install/page_configsave.php 2018-04-18 22:21:32 UTC (rev 13345) +++ *.xoops.org (Subdomain APIs & Sites)/fonty.xoops.org/install/page_configsave.php 2018-04-24 14:44:00 UTC (rev 13346) @@ -57,7 +57,8 @@ 'GROUP_USERS' => 2, 'GROUP_ANONYMOUS' => 3); $rewrite = array_merge($rewrite, $vars); - + error_reporting(E_ALL); + ini_set('display_errors', true); $result = writeConfigurationFile($rewrite, $vars['ROOT_PATH'] . '/include', 'dbconfig.dist.php', 'dbconfig.php'); $GLOBALS['error'] = !($result === true); if ($result === true) { |