Menu
▾
▴
[xoops-svn] SF.net SVN: xoops-svn:[11876] XoopsCore/branches/2.6.x/2.6.0_xortify/htdocs /modules/xortify
|
From: <wis...@us...> - 2013-08-05 01:24:59
|
Revision: 11876
http://sourceforge.net/p/xoops/svn/11876
Author: wishcraft
Date: 2013-08-05 01:24:55 +0000 (Mon, 05 Aug 2013)
Log Message:
-----------
Xortify Server 4.14 for XOOPS 2.6 - Production Copy
Modified Paths:
--------------
XoopsCore/branches/2.6.x/2.6.0_xortify/htdocs/modules/xortify/class/auth/auth_minimumcloud.php
XoopsCore/branches/2.6.x/2.6.0_xortify/htdocs/modules/xortify/class/curl.php
XoopsCore/branches/2.6.x/2.6.0_xortify/htdocs/modules/xortify/class/curlserialised.php
XoopsCore/branches/2.6.x/2.6.0_xortify/htdocs/modules/xortify/class/curlxml.php
XoopsCore/branches/2.6.x/2.6.0_xortify/htdocs/modules/xortify/class/json.php
XoopsCore/branches/2.6.x/2.6.0_xortify/htdocs/modules/xortify/class/minimumcloud.php
XoopsCore/branches/2.6.x/2.6.0_xortify/htdocs/modules/xortify/class/rest_curl.php
XoopsCore/branches/2.6.x/2.6.0_xortify/htdocs/modules/xortify/class/rest_curlserialised.php
XoopsCore/branches/2.6.x/2.6.0_xortify/htdocs/modules/xortify/class/rest_curlxml.php
XoopsCore/branches/2.6.x/2.6.0_xortify/htdocs/modules/xortify/class/rest_json.php
XoopsCore/branches/2.6.x/2.6.0_xortify/htdocs/modules/xortify/class/rest_wgetserialised.php
XoopsCore/branches/2.6.x/2.6.0_xortify/htdocs/modules/xortify/class/rest_wgetxml.php
XoopsCore/branches/2.6.x/2.6.0_xortify/htdocs/modules/xortify/class/soap.php
XoopsCore/branches/2.6.x/2.6.0_xortify/htdocs/modules/xortify/class/wgetserialised.php
XoopsCore/branches/2.6.x/2.6.0_xortify/htdocs/modules/xortify/class/wgetxml.php
XoopsCore/branches/2.6.x/2.6.0_xortify/htdocs/modules/xortify/cron/serverup.php
XoopsCore/branches/2.6.x/2.6.0_xortify/htdocs/modules/xortify/include/functions.php
XoopsCore/branches/2.6.x/2.6.0_xortify/htdocs/modules/xortify/include/instance.php
XoopsCore/branches/2.6.x/2.6.0_xortify/htdocs/modules/xortify/language/english/modinfo.php
XoopsCore/branches/2.6.x/2.6.0_xortify/htdocs/modules/xortify/xoops_version.php
Modified: XoopsCore/branches/2.6.x/2.6.0_xortify/htdocs/modules/xortify/class/auth/auth_minimumcloud.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_xortify/htdocs/modules/xortify/class/auth/auth_minimumcloud.php 2013-08-04 21:22:07 UTC (rev 11875)
+++ XoopsCore/branches/2.6.x/2.6.0_xortify/htdocs/modules/xortify/class/auth/auth_minimumcloud.php 2013-08-05 01:24:55 UTC (rev 11876)
@@ -243,13 +243,13 @@
if (XOOPS_MINIMUMCLOUD_LIB=='PHPCURL') {
$rnd = rand(-100000, 100000000);
$this->XortifyAuthMinimumCloud($GLOBALS['xoopsDB']);
- curl_setopt($this->curl_client, CURLOPT_URL, sprintf(XORTIFY_REST_API, 'server_create_user', http_query_build(array("username"=> $this->minimumcloud_xoops_username, "password"=> $this->minimumcloud_xoops_password, "user" => array('user_viewemail' =>$user_viewemail, 'uname' => $uname, 'email' => $email, 'url' => $url, 'actkey' => $actkey, 'pass' => $pass, 'timezone_offset' => $timezone_offset, 'user_mailok' => $user_mailok, "time" => time(), "passhash" => sha1((time()-$rnd).$uname.$pass), "rand"=>$rnd), "siteinfo" => $siteinfo))));
+ curl_setopt($this->curl_client, CURLOPT_URL, sprintf(XORTIFY_REST_API, 'xoops_create_user', http_query_build(array("username"=> $this->minimumcloud_xoops_username, "password"=> $this->minimumcloud_xoops_password, "user" => array('user_viewemail' =>$user_viewemail, 'uname' => $uname, 'email' => $email, 'url' => $url, 'actkey' => $actkey, 'pass' => $pass, 'timezone_offset' => $timezone_offset, 'user_mailok' => $user_mailok, "time" => time(), "passhash" => sha1((time()-$rnd).$uname.$pass), "rand"=>$rnd), "siteinfo" => $siteinfo))));
$data = curl_exec($this->curl_client);
curl_close($this->curl_client);
$result = $this->obj2array(minimumcloud_decode($data));
} else {
$rnd = rand(-100000, 100000000);
- $data = file_get_contents(sprintf(XORTIFY_REST_API, 'server_create_user', http_build_query(array("username"=> $this->minimumcloud_xoops_username, "password"=> $this->minimumcloud_xoops_password, "user" => array('user_viewemail' =>$user_viewemail, 'uname' => $uname, 'email' => $email, 'url' => $url, 'actkey' => $actkey, 'pass' => $pass, 'timezone_offset' => $timezone_offset, 'user_mailok' => $user_mailok, "time" => time(), "passhash" => sha1((time()-$rnd).$uname.$pass), "rand"=>$rnd), "siteinfo" => $siteinfo))));
+ $data = file_get_contents(sprintf(XORTIFY_REST_API, 'xoops_create_user', http_build_query(array("username"=> $this->minimumcloud_xoops_username, "password"=> $this->minimumcloud_xoops_password, "user" => array('user_viewemail' =>$user_viewemail, 'uname' => $uname, 'email' => $email, 'url' => $url, 'actkey' => $actkey, 'pass' => $pass, 'timezone_offset' => $timezone_offset, 'user_mailok' => $user_mailok, "time" => time(), "passhash" => sha1((time()-$rnd).$uname.$pass), "rand"=>$rnd), "siteinfo" => $siteinfo))));
$result = $this->obj2array(minimumcloud_decode($data));
}
if ($result['ERRNUM']==1){
Modified: XoopsCore/branches/2.6.x/2.6.0_xortify/htdocs/modules/xortify/class/curl.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_xortify/htdocs/modules/xortify/class/curl.php 2013-08-04 21:22:07 UTC (rev 11875)
+++ XoopsCore/branches/2.6.x/2.6.0_xortify/htdocs/modules/xortify/class/curl.php 2013-08-05 01:24:55 UTC (rev 11876)
@@ -109,7 +109,8 @@
* Constructor
*/
function CURLXortifyExchange () {
-
+ error_reporting(0);
+
$this->curl_xoops_username = $GLOBALS['xoops']->getModuleConfig('xortify_username', 'xortify');
$this->curl_xoops_password = md5($GLOBALS['xoops']->getModuleConfig('xortify_password', 'xortify'));
$this->refresh = $GLOBALS['xoops']->getModuleConfig('xortify_records', 'xortify');
Modified: XoopsCore/branches/2.6.x/2.6.0_xortify/htdocs/modules/xortify/class/curlserialised.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_xortify/htdocs/modules/xortify/class/curlserialised.php 2013-08-04 21:22:07 UTC (rev 11875)
+++ XoopsCore/branches/2.6.x/2.6.0_xortify/htdocs/modules/xortify/class/curlserialised.php 2013-08-05 01:24:55 UTC (rev 11876)
@@ -98,7 +98,8 @@
* Constructor
*/
function CURLSERIALISEDXortifyExchange () {
-
+ error_reporting(0);
+
$this->serial_xoops_username = $GLOBALS['xoops']->getModuleConfig('xortify_username', 'xortify');
$this->serial_xoops_password = md5($GLOBALS['xoops']->getModuleConfig('xortify_password', 'xortify'));
$this->refresh = $GLOBALS['xoops']->getModuleConfig('xortify_records', 'xortify');
Modified: XoopsCore/branches/2.6.x/2.6.0_xortify/htdocs/modules/xortify/class/curlxml.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_xortify/htdocs/modules/xortify/class/curlxml.php 2013-08-04 21:22:07 UTC (rev 11875)
+++ XoopsCore/branches/2.6.x/2.6.0_xortify/htdocs/modules/xortify/class/curlxml.php 2013-08-05 01:24:55 UTC (rev 11876)
@@ -96,6 +96,7 @@
*/
function CURLXMLXortifyExchange ()
{
+ error_reporting(0);
$this->xml_xoops_username = $GLOBALS['xoops']->getModuleConfig('xortify_username', 'xortify');
$this->xml_xoops_password = md5($GLOBALS['xoops']->getModuleConfig('xortify_password', 'xortify'));
Modified: XoopsCore/branches/2.6.x/2.6.0_xortify/htdocs/modules/xortify/class/json.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_xortify/htdocs/modules/xortify/class/json.php 2013-08-04 21:22:07 UTC (rev 11875)
+++ XoopsCore/branches/2.6.x/2.6.0_xortify/htdocs/modules/xortify/class/json.php 2013-08-05 01:24:55 UTC (rev 11876)
@@ -97,7 +97,8 @@
*/
function JSONXortifyExchange ()
{
-
+ error_reporting(0);
+
$this->json_xoops_username = $GLOBALS['xoops']->getModuleConfig('xortify_username', 'xortify');
$this->json_xoops_password = md5($GLOBALS['xoops']->getModuleConfig('xortify_password', 'xortify'));
$this->refresh = $GLOBALS['xoops']->getModuleConfig('xortify_records', 'xortify');
Modified: XoopsCore/branches/2.6.x/2.6.0_xortify/htdocs/modules/xortify/class/minimumcloud.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_xortify/htdocs/modules/xortify/class/minimumcloud.php 2013-08-04 21:22:07 UTC (rev 11875)
+++ XoopsCore/branches/2.6.x/2.6.0_xortify/htdocs/modules/xortify/class/minimumcloud.php 2013-08-05 01:24:55 UTC (rev 11876)
@@ -112,7 +112,8 @@
*/
function MinimumcloudXortifyExchange ($url)
{
-
+ error_reporting(0);
+
$this->minimumcloud_xoops_username = $GLOBALS['xoops']->getModuleConfig('xortify_username', 'xortify');
$this->minimumcloud_xoops_password = md5($GLOBALS['xoops']->getModuleConfig('xortify_password', 'xortify'));
$this->refresh = $GLOBALS['xoops']->getModuleConfig('xortify_records', 'xortify');
Modified: XoopsCore/branches/2.6.x/2.6.0_xortify/htdocs/modules/xortify/class/rest_curl.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_xortify/htdocs/modules/xortify/class/rest_curl.php 2013-08-04 21:22:07 UTC (rev 11875)
+++ XoopsCore/branches/2.6.x/2.6.0_xortify/htdocs/modules/xortify/class/rest_curl.php 2013-08-05 01:24:55 UTC (rev 11876)
@@ -110,6 +110,8 @@
*/
function REST_CURLXortifyExchange ($url) {
+ error_reporting(0);
+
$this->curl_xoops_username = $GLOBALS['xoops']->getModuleConfig('xortify_username', 'xortify');
$this->curl_xoops_password = md5($GLOBALS['xoops']->getModuleConfig('xortify_password', 'xortify'));
$this->refresh = $GLOBALS['xoops']->getModuleConfig('xortify_records', 'xortify');
@@ -140,7 +142,7 @@
switch (XOOPS_CURL_LIB){
case "PHPCURL":
try {
- curl_setopt($ch, CURLOPT_USERAGENT, $_SERVER['HTTP_USER_AGENT']);
+
curl_setopt($this->curl_client, CURLOPT_URL, sprintf(XORTIFY_REST_API, 'training', http_build_query(array( "username" => $this->curl_xoops_username,
"password" => $this->curl_xoops_password,
'op' => ($ham==true?'ham':'spam'),
@@ -168,7 +170,7 @@
switch (XOOPS_CURL_LIB){
case "PHPCURL":
try {
- curl_setopt($ch, CURLOPT_USERAGENT, $_SERVER['HTTP_USER_AGENT']);
+
curl_setopt($this->curl_client, CURLOPT_URL, sprintf(XORTIFY_REST_API, 'spamcheck', http_build_query(array( "username" => $this->curl_xoops_username,
"password" => $this->curl_xoops_password, "poll" => XOOPS_URL.'/modules/xortify/poll/',
'content' => $content,
@@ -202,7 +204,7 @@
try {
xoops_load('XoopsUserUtility');
$uu = new XoopsUserUtility();
- curl_setopt($ch, CURLOPT_USERAGENT, $_SERVER['HTTP_USER_AGENT']);
+
curl_setopt($this->curl_client, CURLOPT_URL, sprintf(XORTIFY_REST_API, 'spoof'.$type, http_build_query(array( "username" => $this->curl_xoops_username,
"password" => $this->curl_xoops_password, "uri" => (isset($_SERVER['HTTPS'])?'https://':'http://').$_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI'],
'ip' => $uu->getIP(true),
@@ -229,7 +231,7 @@
switch (XOOPS_CURL_LIB){
case "PHPCURL":
try {
- curl_setopt($ch, CURLOPT_USERAGENT, $_SERVER['HTTP_USER_AGENT']);
+
curl_setopt($this->curl_client, CURLOPT_URL, sprintf(XORTIFY_REST_API, 'servers', http_build_query(array( "username" => $this->curl_xoops_username,
"password" => $this->curl_xoops_password, "poll" => XOOPS_URL.'/modules/xortify/poll/',
'token' => $GLOBALS['xoopsSecurity']->createToken(3600, 'poll_token'),
Modified: XoopsCore/branches/2.6.x/2.6.0_xortify/htdocs/modules/xortify/class/rest_curlserialised.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_xortify/htdocs/modules/xortify/class/rest_curlserialised.php 2013-08-04 21:22:07 UTC (rev 11875)
+++ XoopsCore/branches/2.6.x/2.6.0_xortify/htdocs/modules/xortify/class/rest_curlserialised.php 2013-08-05 01:24:55 UTC (rev 11876)
@@ -99,6 +99,7 @@
*/
function REST_CURLSERIALISEDXortifyExchange ($url) {
+ error_reporting(0);
$this->serial_xoops_username = $GLOBALS['xoops']->getModuleConfig('xortify_username', 'xortify');
$this->serial_xoops_password = md5($GLOBALS['xoops']->getModuleConfig('xortify_password', 'xortify'));
@@ -130,7 +131,7 @@
switch (XOOPS_CURLSERIAL_LIB){
case "PHPCURLSERIAL":
try {
- curl_setopt($ch, CURLOPT_USERAGENT, $_SERVER['HTTP_USER_AGENT']);
+
curl_setopt($this->curl_client, CURLOPT_URL, sprintf(XORTIFY_REST_API, 'training', http_build_query(array( "username" => $this->curl_xoops_username,
"password" => $this->curl_xoops_password,
'op' => ($ham==true?'ham':'spam'),
@@ -147,6 +148,36 @@
}
/*
+ * Get a Spoof/Trick form from the cloud
+ *
+ * @param string $type
+ * @return array
+ */
+ function getSpoof($type = 'comment') {
+ if (!empty($this->curl_client))
+ switch (XOOPS_CURLSERIAL_LIB){
+ case "PHPCURLSERIAL":
+ try {
+ xoops_load('XoopsUserUtility');
+ $uu = new XoopsUserUtility();
+
+ curl_setopt($this->curl_client, CURLOPT_URL, sprintf(XORTIFY_REST_API, 'spoof'.$type, http_build_query(array( "username" => $this->curl_xoops_username,
+ "password" => $this->curl_xoops_password, "uri" => (isset($_SERVER['HTTPS'])?'https://':'http://').$_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI'],
+ 'ip' => $uu->getIP(true),
+ 'language' => $GLOBALS['xoops']->getConfig('language'),
+ 'subject' => ''
+ ))));
+ $data = curl_exec($this->curl_client);
+ curl_close($this->curl_client);
+ $result = (unserialize($data));
+ }
+ catch (Exception $e) { trigger_error($e); }
+ break;
+ }
+ return $result;
+ }
+
+ /*
* Checks is content is spam
*
* @param string $content
@@ -180,35 +211,6 @@
}
- /*
- * Get a Spoof/Trick form from the cloud
- *
- * @param string $type
- * @return array
- */
- function getSpoof($type = 'comment') {
- if (!empty($this->curl_client))
- switch (XOOPS_CURLSERIAL_LIB){
- case "PHPCURLSERIAL":
- try {
- xoops_load('XoopsUserUtility');
- $uu = new XoopsUserUtility();
- curl_setopt($ch, CURLOPT_USERAGENT, $_SERVER['HTTP_USER_AGENT']);
- curl_setopt($this->curl_client, CURLOPT_URL, sprintf(XORTIFY_REST_API, 'spoof'.$type, http_build_query(array( "username" => $this->curl_xoops_username,
- "password" => $this->curl_xoops_password, "uri" => (isset($_SERVER['HTTPS'])?'https://':'http://').$_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI'],
- 'ip' => $uu->getIP(true),
- 'language' => $GLOBALS['xoops']->getConfig('language'),
- 'subject' => ''
- ))));
- $data = curl_exec($this->curl_client);
- curl_close($this->curl_client);
- $result = (unserialize($data));
- }
- catch (Exception $e) { trigger_error($e); }
- break;
- }
- return $result;
- }
/*
* Get a list of Services/Servers on the Xortify Cloud
Modified: XoopsCore/branches/2.6.x/2.6.0_xortify/htdocs/modules/xortify/class/rest_curlxml.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_xortify/htdocs/modules/xortify/class/rest_curlxml.php 2013-08-04 21:22:07 UTC (rev 11875)
+++ XoopsCore/branches/2.6.x/2.6.0_xortify/htdocs/modules/xortify/class/rest_curlxml.php 2013-08-05 01:24:55 UTC (rev 11876)
@@ -93,6 +93,7 @@
* Constructor
*/
function REST_CURLXMLXortifyExchange ($url) {
+ error_reporting(0);
$this->xml_xoops_username = $GLOBALS['xoops']->getModuleConfig('xortify_username', 'xortify');
$this->xml_xoops_password = md5($GLOBALS['xoops']->getModuleConfig('xortify_password', 'xortify'));
@@ -124,7 +125,7 @@
switch (XOOPS_CURLXML_LIB){
case "PHPCURLXML":
try {
- curl_setopt($ch, CURLOPT_USERAGENT, $_SERVER['HTTP_USER_AGENT']);
+
curl_setopt($this->curl_client, CURLOPT_URL, sprintf(XORTIFY_REST_API, 'training', http_build_query(array( "username" => $this->curl_xoops_username,
"password" => $this->curl_xoops_password,
'op' => ($ham==true?'ham':'spam'),
@@ -152,7 +153,7 @@
switch (XOOPS_CURLXML_LIB){
case "PHPCURLXML":
try {
- curl_setopt($ch, CURLOPT_USERAGENT, $_SERVER['HTTP_USER_AGENT']);
+
curl_setopt($this->curl_client, CURLOPT_URL, sprintf(XORTIFY_REST_API, 'spamcheck', http_build_query(array( "username" => $this->xml_xoops_username,
"password" => $this->xml_xoops_password,
"poll" => XOOPS_URL.'/modules/xortify/poll/',
@@ -187,7 +188,7 @@
try {
xoops_load('XoopsUserUtility');
$uu = new XoopsUserUtility();
- curl_setopt($ch, CURLOPT_USERAGENT, $_SERVER['HTTP_USER_AGENT']);
+
curl_setopt($this->curl_client, CURLOPT_URL, sprintf(XORTIFY_REST_API, 'spoof'.$type, http_build_query(array( "username" => $this->curl_xoops_username,
"password" => $this->curl_xoops_password, "uri" => (isset($_SERVER['HTTPS'])?'https://':'http://').$_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI'],
'ip' => $uu->getIP(true),
@@ -214,7 +215,7 @@
switch (XOOPS_CURLXML_LIB){
case "PHPCURLXML":
try {
- curl_setopt($ch, CURLOPT_USERAGENT, $_SERVER['HTTP_USER_AGENT']);
+
curl_setopt($this->curl_client, CURLOPT_URL, sprintf(XORTIFY_REST_API, 'servers', http_build_query(array( "username" => $this->xml_xoops_username,
"password" => $this->xml_xoops_password, "poll" => XOOPS_URL.'/modules/xortify/poll/',
'token' => $GLOBALS['xoopsSecurity']->createToken(3600, 'poll_token'),
Modified: XoopsCore/branches/2.6.x/2.6.0_xortify/htdocs/modules/xortify/class/rest_json.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_xortify/htdocs/modules/xortify/class/rest_json.php 2013-08-04 21:22:07 UTC (rev 11875)
+++ XoopsCore/branches/2.6.x/2.6.0_xortify/htdocs/modules/xortify/class/rest_json.php 2013-08-05 01:24:55 UTC (rev 11876)
@@ -96,7 +96,8 @@
* Constructor
*/
function REST_JSONXortifyExchange ($url) {
-
+ error_reporting(0);
+
$this->json_xoops_username = $GLOBALS['xoops']->getModuleConfig('xortify_username', 'xortify');
$this->json_xoops_password = md5($GLOBALS['xoops']->getModuleConfig('xortify_password', 'xortify'));
$this->refresh = $GLOBALS['xoops']->getModuleConfig('xortify_records', 'xortify');
Modified: XoopsCore/branches/2.6.x/2.6.0_xortify/htdocs/modules/xortify/class/rest_wgetserialised.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_xortify/htdocs/modules/xortify/class/rest_wgetserialised.php 2013-08-04 21:22:07 UTC (rev 11875)
+++ XoopsCore/branches/2.6.x/2.6.0_xortify/htdocs/modules/xortify/class/rest_wgetserialised.php 2013-08-05 01:24:55 UTC (rev 11876)
@@ -81,7 +81,8 @@
* Constructor
*/
function REST_WGETSERIALISEDXortifyExchange () {
-
+ error_reporting(0);
+
$this->serial_xoops_username = $GLOBALS['xoops']->getModuleConfig('xortify_username', 'xortify');
$this->serial_xoops_password = md5($GLOBALS['xoops']->getModuleConfig('xortify_password', 'xortify'));
$this->refresh = $GLOBALS['xoops']->getModuleConfig('xortify_records', 'xortify');
Modified: XoopsCore/branches/2.6.x/2.6.0_xortify/htdocs/modules/xortify/class/rest_wgetxml.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_xortify/htdocs/modules/xortify/class/rest_wgetxml.php 2013-08-04 21:22:07 UTC (rev 11875)
+++ XoopsCore/branches/2.6.x/2.6.0_xortify/htdocs/modules/xortify/class/rest_wgetxml.php 2013-08-05 01:24:55 UTC (rev 11876)
@@ -83,7 +83,8 @@
* Constructor
*/
function WGETXMLXortifyExchange () {
-
+ error_reporting(0);
+
$this->xml_xoops_username = $GLOBALS['xoops']->getModuleConfig('xortify_username', 'xortify');
$this->xml_xoops_password = md5($GLOBALS['xoops']->getModuleConfig('xortify_password', 'xortify'));
$this->refresh = $GLOBALS['xoops']->getModuleConfig('xortify_records', 'xortify');
Modified: XoopsCore/branches/2.6.x/2.6.0_xortify/htdocs/modules/xortify/class/soap.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_xortify/htdocs/modules/xortify/class/soap.php 2013-08-04 21:22:07 UTC (rev 11875)
+++ XoopsCore/branches/2.6.x/2.6.0_xortify/htdocs/modules/xortify/class/soap.php 2013-08-05 01:24:55 UTC (rev 11876)
@@ -80,7 +80,8 @@
* Constructor
*/
function SOAPXortifyExchange () {
-
+ error_reporting(0);
+
$this->soap_xoops_username = $GLOBALS['xoops']->getModuleConfig('xortify_username', 'xortify');
$this->soap_xoops_password = md5($GLOBALS['xoops']->getModuleConfig('xortify_password', 'xortify'));
$this->refresh = $GLOBALS['xoops']->getModuleConfig('xortify_records', 'xortify');
Modified: XoopsCore/branches/2.6.x/2.6.0_xortify/htdocs/modules/xortify/class/wgetserialised.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_xortify/htdocs/modules/xortify/class/wgetserialised.php 2013-08-04 21:22:07 UTC (rev 11875)
+++ XoopsCore/branches/2.6.x/2.6.0_xortify/htdocs/modules/xortify/class/wgetserialised.php 2013-08-05 01:24:55 UTC (rev 11876)
@@ -83,7 +83,8 @@
* Constructor
*/
function WGETSERIALISEDXortifyExchange () {
-
+ error_reporting(0);
+
$this->serial_xoops_username = $GLOBALS['xoops']->getModuleConfig('xortify_username', 'xortify');
$this->serial_xoops_password = md5($GLOBALS['xoops']->getModuleConfig('xortify_password', 'xortify'));
$this->refresh = $GLOBALS['xoops']->getModuleConfig('xortify_records', 'xortify');
Modified: XoopsCore/branches/2.6.x/2.6.0_xortify/htdocs/modules/xortify/class/wgetxml.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_xortify/htdocs/modules/xortify/class/wgetxml.php 2013-08-04 21:22:07 UTC (rev 11875)
+++ XoopsCore/branches/2.6.x/2.6.0_xortify/htdocs/modules/xortify/class/wgetxml.php 2013-08-05 01:24:55 UTC (rev 11876)
@@ -83,7 +83,8 @@
* Constructor
*/
function WGETXMLXortifyExchange () {
-
+ error_reporting(0);
+
$module_handler = $GLOBALS['xoops']->getHandler('module');
$config_handler = $GLOBALS['xoops']->getHandler('config');
if (!isset($GLOBALS['xortify'][XORTIFY_INSTANCE_KEY]['module'])) $GLOBALS['xortify'][XORTIFY_INSTANCE_KEY]['module'] = $module_handler->getByDirname('xortify');
Modified: XoopsCore/branches/2.6.x/2.6.0_xortify/htdocs/modules/xortify/cron/serverup.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_xortify/htdocs/modules/xortify/cron/serverup.php 2013-08-04 21:22:07 UTC (rev 11875)
+++ XoopsCore/branches/2.6.x/2.6.0_xortify/htdocs/modules/xortify/cron/serverup.php 2013-08-05 01:24:55 UTC (rev 11876)
@@ -115,7 +115,7 @@
define("JSON", 'json/');
define("SERIAL", 'serial/');
define("XML", 'xml/');
- define("REST", 'rest/');
+ define("REST", 'api/');
include_once $xoops->path('class/cache/xoopscache.php');
Modified: XoopsCore/branches/2.6.x/2.6.0_xortify/htdocs/modules/xortify/include/functions.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_xortify/htdocs/modules/xortify/include/functions.php 2013-08-04 21:22:07 UTC (rev 11875)
+++ XoopsCore/branches/2.6.x/2.6.0_xortify/htdocs/modules/xortify/include/functions.php 2013-08-05 01:24:55 UTC (rev 11876)
@@ -243,7 +243,7 @@
define('XORTIFY_USER_AGENT', sprintf(_MI_XOR_USER_AGENT, _MI_XOR_NAME, _MI_XOR_VERSION, _MI_XOR_RUNTIME, _MI_XOR_MODE));
if (!defined('XORTIFY_PROVIDER_URI'))
- define('XORTIFY_PROVIDER_URI', 'http://xortify.com/provider.html');
+ define('XORTIFY_PROVIDER_URI', 'http://xortify.com/provider.php');
xoops_load('cache');
$GLOBALS['xoopsCache'] = new XoopsCache();
@@ -252,12 +252,13 @@
trigger_error('Could not intialise CURL file: '.$url);
return false;
}
- $cookies = XOOPS_VAR_PATH.'/cache/xoops_cache/authcurl_'.md5(XORTIFY_CURLSERIAL_API).'.cookie';
+ $cookies = XOOPS_VAR_PATH.'/cache/xoops_cache/provider_'.md5(XORTIFY_PROVIDER_URI).'.cookie';
curl_setopt($ch, CURLOPT_HEADER, 0);
- curl_setopt($ch, CURLOPT_POST, 0);
- curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, $GLOBALS['xoops']->getModuleConfig('curl_connecttimeout', 'xortify'));
- curl_setopt($ch, CURLOPT_TIMEOUT, $GLOBALS['xoops']->getModuleConfig('curl_timeout', 'xortify'));
+ curl_setopt($ch, CURLOPT_POST, 1);
+ curl_setopt($ch, CURLOPT_POSTFIELDS, "xoops_url=" . XOOPS_URL);
+ curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, 60);
+ curl_setopt($ch, CURLOPT_TIMEOUT, 60);
curl_setopt($ch, CURLOPT_COOKIEJAR, $cookies);
curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
curl_setopt($ch, CURLOPT_USERAGENT, XORTIFY_USER_AGENT);
@@ -269,8 +270,8 @@
echo "</div></td></tr>";
echo "</table>";
- echo "<div align=\"center\"><a href=\"http://www.xoops.org\" target=\"_blank\"><img src=\"" . XOOPS_URL . "/media/xoops/images/xoopsmicrobutton.gif\" alt='XOOPS' title='XOOPS'></a></div>";
- echo sprintf("<div class='center smallsmall italic pad5'><strong>%s</strong> is maintained by the <a rel='external' href='http://www.xoops.org/' title='Visit XOOPS Community'>XOOPS Community</a> and <a rel='external' href='http://labs.coop/' title='Visit Chronolabs Co-op'>Chronolabs Co-op</a><br/>%s</div>", $GLOBALS['xortify'][XORTIFY_INSTANCE_KEY]['module']->getVar("name"), $data['provider']);
+ echo sprintf("<div class='center smallsmall italic pad5' style=\"margin-top:26px\"><strong>%s</strong>%s</div>", $GLOBALS['xortify'][XORTIFY_INSTANCE_KEY]['module']->getVar("name"), $data['provider']);
+ echo "<div align=\"center\" style=\"margin-top:10px\"><a href=\"http://www.xoops.org\" target=\"_blank\"><img src=\"" . XOOPS_URL . "/media/xoops/images/xoopsmicrobutton.gif\" alt='XOOPS' title='XOOPS'></a></div>";
}
}
Modified: XoopsCore/branches/2.6.x/2.6.0_xortify/htdocs/modules/xortify/include/instance.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_xortify/htdocs/modules/xortify/include/instance.php 2013-08-04 21:22:07 UTC (rev 11875)
+++ XoopsCore/branches/2.6.x/2.6.0_xortify/htdocs/modules/xortify/include/instance.php 2013-08-05 01:24:55 UTC (rev 11876)
@@ -1,40 +1,78 @@
<?php
+
+
/*
+
* Prevents Spam, Harvesting, Human Rights Abuse, Captcha Abuse etc.
+
* basic statistic of them in XOOPS Copyright (C) 2012 Simon Roberts
+
* Contact: wishcraft - si...@la...
+
*
+
* This program is free software: you can redistribute it and/or modify
+
* it under the terms of the GNU General Public License as published by
+
* the Free Software Foundation, either version 3 of the License, or
+
* (at your option) any later version.
+
*
+
* This program is distributed in the hope that it will be useful,
+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+
* GNU General Public License for more details.
+
*
+
* You should have received a copy of the GNU General Public License
+
* along with this program. If not, see <http://www.gnu.org/licenses/>.
+
* See /docs/license.pdf for full license.
+
*
+
* Shouts:- Mamba (www.xoops.org), flipse (www.nlxoops.nl)
+
* Many thanks for your additional work with version 1.01
+
*
+
* @Version: 3.10 Final (Stable)
+
* @copyright: Chronolabs Cooperative 2013 \xA9 Simon Roberts (www.simonaroberts.com)
+
* @download: http://sourceforge.net/projects/xortify
+
* @file: forms.objects.php
+
* @description: Form object loader for Xortify
+
* @date: 09/09/2012 19:34 AEST
+
* @license: GNU3 (http://web.labs.coop/public/legal/general-public-licence/13,3.html)
+
* @package xortify
+
* @subpackage functions
+
* @author Simon A. Roberts - wishcraft (si...@la...)
+
*
+
*/
- define('XORTIFY_INSTANCE_KEY', '00000-00000-00000-00000-00000');
+
+ define('XORTIFY_INSTANCE_KEY', '94F32-Bf38D-5B630-87Ac2-bEFb5');
+
+
?>
\ No newline at end of file
Modified: XoopsCore/branches/2.6.x/2.6.0_xortify/htdocs/modules/xortify/language/english/modinfo.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_xortify/htdocs/modules/xortify/language/english/modinfo.php 2013-08-04 21:22:07 UTC (rev 11875)
+++ XoopsCore/branches/2.6.x/2.6.0_xortify/htdocs/modules/xortify/language/english/modinfo.php 2013-08-05 01:24:55 UTC (rev 11876)
@@ -224,7 +224,7 @@
//Version 4.02
define('_MI_XOR_NAME', 'Xortify');
- define('_MI_XOR_VERSION', '4.12');
+ define('_MI_XOR_VERSION', '4.14');
define('_MI_XOR_MODE_CLIENT', 'Client');
define('_MI_XOR_MODE_SERVER', 'Server');
define('_MI_XOR_USER_AGENT', '%s/%s %s Sector Network Security (%s)');
Modified: XoopsCore/branches/2.6.x/2.6.0_xortify/htdocs/modules/xortify/xoops_version.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_xortify/htdocs/modules/xortify/xoops_version.php 2013-08-04 21:22:07 UTC (rev 11875)
+++ XoopsCore/branches/2.6.x/2.6.0_xortify/htdocs/modules/xortify/xoops_version.php 2013-08-05 01:24:55 UTC (rev 11876)
@@ -35,7 +35,7 @@
*
*/
-
+error_reporting(0);
if (!defined('XOOPS_ROOT_PATH')) {
die('XOOPS root path not defined');
}
@@ -255,7 +255,7 @@
$modversion['config'][$i]['description'] = '_XOR_MI_URIREST_DESC';
$modversion['config'][$i]['formtype'] = 'text';
$modversion['config'][$i]['valuetype'] = 'text';
-$modversion['config'][$i]['default'] = 'http://xortify.com/rest/';
+$modversion['config'][$i]['default'] = 'http://xortify.com/api/';
$i++;
$modversion['config'][$i]['name'] = 'xortify_urisoap';
|
