Menu
▾
▴
xoops-cvs2 — All SVN commits will be posted to this ML
You can subscribe to this list here.
| 2002 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(361) |
Oct
(65) |
Nov
|
Dec
|
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2003 |
Jan
(798) |
Feb
(694) |
Mar
(586) |
Apr
(145) |
May
(24) |
Jun
(24) |
Jul
(56) |
Aug
(11) |
Sep
(138) |
Oct
(107) |
Nov
(58) |
Dec
(39) |
| 2004 |
Jan
(157) |
Feb
(24) |
Mar
(13) |
Apr
(14) |
May
(73) |
Jun
(106) |
Jul
(217) |
Aug
(91) |
Sep
(116) |
Oct
(357) |
Nov
(27) |
Dec
(272) |
| 2005 |
Jan
(97) |
Feb
(40) |
Mar
(167) |
Apr
(365) |
May
(344) |
Jun
(357) |
Jul
(407) |
Aug
(529) |
Sep
(204) |
Oct
(52) |
Nov
(80) |
Dec
(1) |
| 2006 |
Jan
(2) |
Feb
(1) |
Mar
(11) |
Apr
(112) |
May
(121) |
Jun
(86) |
Jul
(51) |
Aug
(48) |
Sep
(107) |
Oct
(20) |
Nov
(50) |
Dec
(11) |
| 2007 |
Jan
(7) |
Feb
(11) |
Mar
(8) |
Apr
(11) |
May
(2) |
Jun
(25) |
Jul
(67) |
Aug
(134) |
Sep
(54) |
Oct
(69) |
Nov
(10) |
Dec
(74) |
| 2008 |
Jan
(73) |
Feb
(81) |
Mar
(64) |
Apr
(98) |
May
(157) |
Jun
(68) |
Jul
(80) |
Aug
(108) |
Sep
(176) |
Oct
(107) |
Nov
(265) |
Dec
(60) |
| 2009 |
Jan
(149) |
Feb
(140) |
Mar
(195) |
Apr
(141) |
May
(53) |
Jun
(45) |
Jul
(98) |
Aug
(153) |
Sep
(160) |
Oct
(138) |
Nov
(139) |
Dec
(104) |
| 2010 |
Jan
(188) |
Feb
(259) |
Mar
(133) |
Apr
(104) |
May
(42) |
Jun
(121) |
Jul
(38) |
Aug
(223) |
Sep
(259) |
Oct
(255) |
Nov
(106) |
Dec
(157) |
| 2011 |
Jan
(202) |
Feb
(110) |
Mar
(261) |
Apr
(272) |
May
(218) |
Jun
(108) |
Jul
(141) |
Aug
(205) |
Sep
(326) |
Oct
(279) |
Nov
(368) |
Dec
(238) |
| 2012 |
Jan
(239) |
Feb
(3) |
Mar
|
Apr
(1) |
May
(2) |
Jun
|
Jul
(3) |
Aug
(6) |
Sep
(5) |
Oct
|
Nov
|
Dec
|
| 2013 |
Jan
(1) |
Feb
(3) |
Mar
(9) |
Apr
(10) |
May
|
Jun
(1) |
Jul
(3) |
Aug
(1) |
Sep
(2) |
Oct
(1) |
Nov
|
Dec
|
| 2014 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(1) |
Jul
|
Aug
|
Sep
(1) |
Oct
|
Nov
|
Dec
|
| 2015 |
Jan
(1) |
Feb
|
Mar
|
Apr
(2) |
May
|
Jun
|
Jul
|
Aug
(1) |
Sep
(1) |
Oct
(1) |
Nov
(1) |
Dec
(1) |
| 2016 |
Jan
|
Feb
(1) |
Mar
|
Apr
(2) |
May
|
Jun
|
Jul
(1) |
Aug
|
Sep
|
Oct
|
Nov
(1) |
Dec
|
| 2017 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(1) |
Jul
(1) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <zo...@us...> - 2011-12-17 19:48:04
|
Revision: 8516
http://xoops.svn.sourceforge.net/xoops/?rev=8516&view=rev
Author: zoullou
Date: 2011-12-17 19:47:55 +0000 (Sat, 17 Dec 2011)
Log Message:
-----------
First new Ajax/flash multi file uploader commit to community test
Have to add language constant to finalize this Job
Modified Paths:
--------------
XoopsModules/extgallery/branches/zoullou/modules/extgallery/admin/photo.php
XoopsModules/extgallery/branches/zoullou/modules/extgallery/class/photoHandler.php
XoopsModules/extgallery/branches/zoullou/modules/extgallery/public-upload-extended.php
Added Paths:
-----------
XoopsModules/extgallery/branches/zoullou/modules/extgallery/include/SWFUpload/
XoopsModules/extgallery/branches/zoullou/modules/extgallery/include/SWFUpload/css/
XoopsModules/extgallery/branches/zoullou/modules/extgallery/include/SWFUpload/css/default.css
XoopsModules/extgallery/branches/zoullou/modules/extgallery/include/SWFUpload/css/index.html
XoopsModules/extgallery/branches/zoullou/modules/extgallery/include/SWFUpload/images/
XoopsModules/extgallery/branches/zoullou/modules/extgallery/include/SWFUpload/images/SmallSpyGlassWithTransperancy_17x18.png
XoopsModules/extgallery/branches/zoullou/modules/extgallery/include/SWFUpload/images/error.gif
XoopsModules/extgallery/branches/zoullou/modules/extgallery/include/SWFUpload/images/index.html
XoopsModules/extgallery/branches/zoullou/modules/extgallery/include/SWFUpload/images/toobig.gif
XoopsModules/extgallery/branches/zoullou/modules/extgallery/include/SWFUpload/images/uploadlimit.gif
XoopsModules/extgallery/branches/zoullou/modules/extgallery/include/SWFUpload/images/zerobyte.gif
XoopsModules/extgallery/branches/zoullou/modules/extgallery/include/SWFUpload/index.html
XoopsModules/extgallery/branches/zoullou/modules/extgallery/include/SWFUpload/js/
XoopsModules/extgallery/branches/zoullou/modules/extgallery/include/SWFUpload/js/handlers.js
XoopsModules/extgallery/branches/zoullou/modules/extgallery/include/SWFUpload/js/index.html
XoopsModules/extgallery/branches/zoullou/modules/extgallery/include/SWFUpload/js/loader.js.php
XoopsModules/extgallery/branches/zoullou/modules/extgallery/include/SWFUpload/js/swfupload.cookies.js
XoopsModules/extgallery/branches/zoullou/modules/extgallery/include/SWFUpload/js/swfupload.js
XoopsModules/extgallery/branches/zoullou/modules/extgallery/include/SWFUpload/js/swfupload.proxy.js
XoopsModules/extgallery/branches/zoullou/modules/extgallery/include/SWFUpload/js/swfupload.queue.js
XoopsModules/extgallery/branches/zoullou/modules/extgallery/include/SWFUpload/js/swfupload.speed.js
XoopsModules/extgallery/branches/zoullou/modules/extgallery/include/SWFUpload/js/swfupload.swf
XoopsModules/extgallery/branches/zoullou/modules/extgallery/include/SWFUpload/js/swfupload_fp9.swf
XoopsModules/extgallery/branches/zoullou/modules/extgallery/public-post-extended.php
XoopsModules/extgallery/branches/zoullou/modules/extgallery/templates/extgallery_public-upload-SWFUpload.html
Removed Paths:
-------------
XoopsModules/extgallery/branches/zoullou/modules/extgallery/images/watermark-border-test-c765d.jpg
XoopsModules/extgallery/branches/zoullou/modules/extgallery/include/applet/
XoopsModules/extgallery/branches/zoullou/modules/extgallery/public-post-applet.php
XoopsModules/extgallery/branches/zoullou/modules/extgallery/templates/extgallery_public-upload-applet.html
XoopsModules/extgallery/branches/zoullou/modules/extgallery/templates/extgallery_public-upload-applet.html.sav
Modified: XoopsModules/extgallery/branches/zoullou/modules/extgallery/admin/photo.php
===================================================================
--- XoopsModules/extgallery/branches/zoullou/modules/extgallery/admin/photo.php 2011-12-17 17:16:08 UTC (rev 8515)
+++ XoopsModules/extgallery/branches/zoullou/modules/extgallery/admin/photo.php 2011-12-17 19:47:55 UTC (rev 8516)
@@ -46,8 +46,9 @@
case 'add_photo':
$photoHandler = xoops_getmodulehandler('publicphoto', 'extgallery');
- $result = $photoHandler->postPhotoTraitement('photo_file', false);
-
+ $postPhotoTraitement = $photoHandler->postPhotoTraitement('photo_file', false);
+ $result = $postPhotoTraitement['ret'];
+
if($result == 2) {
redirect_header("photo.php", 3, _AM_EXTGALLERY_NOT_AN_ALBUM);
exit;
Modified: XoopsModules/extgallery/branches/zoullou/modules/extgallery/class/photoHandler.php
===================================================================
--- XoopsModules/extgallery/branches/zoullou/modules/extgallery/class/photoHandler.php 2011-12-17 17:16:08 UTC (rev 8515)
+++ XoopsModules/extgallery/branches/zoullou/modules/extgallery/class/photoHandler.php 2011-12-17 19:47:55 UTC (rev 8516)
@@ -73,9 +73,7 @@
$this->ExtgalleryPersistableObjectHandler($db, 'extgallery_'.$type.'photo', 'Extgallery'.ucfirst($type).'photo', 'photo_id');
}
- function createPhoto($data) {
- $photo = $this->create();
- $photo->setVars($data);
+ function createPhoto($photo) {
return $this->insert($photo, true);
}
@@ -586,7 +584,7 @@
if ( isset($_POST['photo_extra']) ) { $photoExtra = $_POST['photo_extra']; }
if ( isset($_POST['tag']) ) { $photoTag = $_POST["tag"]; }
- $photoStatus = $this->addLocalPhoto($catId,$this->photoUploader->getSavedFilename(), $photoTitle, $photoDesc , $photoExtra , $photoTag);
+ $addLocalPhotoRet = $this->addLocalPhoto($catId,$this->photoUploader->getSavedFilename(), $photoTitle, $photoDesc , $photoExtra , $photoTag);
$cat = $catHandler->getCat($catId);
$cat->setVar('cat_isalbum',1);
$catHandler->insert($cat);
@@ -597,7 +595,13 @@
'X_ITEM_NBPHOTO'=>1
);
- if($photoStatus == 1) {
+ // Create return array
+ $ret = array(
+ 'ret'=>0,
+ 'obj'=>$addLocalPhotoRet['obj']
+ );
+
+ if($addLocalPhotoRet['ret'] == 1) {
$extraTags['X_ITEM_URL'] = XOOPS_URL."/modules/extgallery/public-album.php?id=".$cat->getVar('cat_id');
$notification_handler->triggerEvent('global', 0, 'new_photo',$extraTags);
$notification_handler->triggerEvent('album', $cat->getVar('cat_id'), 'new_photo_album',$extraTags);
@@ -616,12 +620,14 @@
$criteria->add(new Criteria('nright',$cat->getVar('nright'),'>='));
$catHandler->updateFieldValue('cat_nb_photo', 'cat_nb_photo + 1', $criteria);
- return 0;
+ return $ret;
} else {
$extraTags['X_ITEM_URL'] = XOOPS_URL."/modules/extgallery/admin/photo.php";
$notification_handler->triggerEvent('global', 0, 'new_photo_pending',$extraTags);
- return 1;
+ $ret['ret'] = 1;
+
+ return $ret;
}
}
@@ -680,15 +686,24 @@
// Deleting working photo
unlink($this->_getUploadPhotoPath().$photoName);
- $this->createPhoto($data);
+ $photo = $this->create();
+ $photo->setVars($data);
+ $this->createPhoto($photo);
+ $photo->cleanVars();
+ // Create return array
+ $ret = array(
+ 'ret'=> $data['photo_approved'],
+ 'obj'=>$photo
+ );
+
if ($xoopsModuleConfig['usetag'] == 1|| (is_dir('../tag') or is_dir('../../tag'))){
$newid = $this->db->getInsertId();
- $tag_handler = xoops_getmodulehandler('tag', 'tag');
- $tag_handler->updateByItem($photoTag, $newid , 'extgallery', 0);
+ $tag_handler = xoops_getmodulehandler('tag', 'tag');
+ $tag_handler->updateByItem($photoTag, $newid , 'extgallery', 0);
}
- return $data['photo_approved'];
+ return $ret;
}
function getSearchedPhoto($queryArray, $condition, $limit, $start, $userId) {
Deleted: XoopsModules/extgallery/branches/zoullou/modules/extgallery/images/watermark-border-test-c765d.jpg
===================================================================
(Binary files differ)
Added: XoopsModules/extgallery/branches/zoullou/modules/extgallery/include/SWFUpload/css/default.css
===================================================================
--- XoopsModules/extgallery/branches/zoullou/modules/extgallery/include/SWFUpload/css/default.css (rev 0)
+++ XoopsModules/extgallery/branches/zoullou/modules/extgallery/include/SWFUpload/css/default.css 2011-12-17 19:47:55 UTC (rev 8516)
@@ -0,0 +1,174 @@
+/* -----------------------------------------------
+ www.swfupload.org
+ Description: Common Screen Stylesheet for SWFUpload Demos
+ Updated on: May 1, 2008
+----------------------------------------------- */
+
+
+/* -- Form Styles ------------------------------- */
+#SWFUpload form {
+ margin: 0;
+ padding: 0;
+}
+
+
+
+#SWFUpload div.fieldset {
+ border: 1px solid #afe14c;
+ margin: 10px 0;
+ padding: 20px 10px;
+}
+#SWFUpload div.fieldset span.legend {
+ position: relative;
+ background-color: #FFF;
+ padding: 3px;
+ top: -30px;
+ font: 700 14px Arial, Helvetica, sans-serif;
+ color: #73b304;
+}
+
+#SWFUpload div.flash {
+ width: 375px;
+ margin: 10px 5px;
+ border-color: #D9E4FF;
+
+ -moz-border-radius-topleft : 5px;
+ -webkit-border-top-left-radius : 5px;
+ -moz-border-radius-topright : 5px;
+ -webkit-border-top-right-radius : 5px;
+ -moz-border-radius-bottomleft : 5px;
+ -webkit-border-bottom-left-radius : 5px;
+ -moz-border-radius-bottomright : 5px;
+ -webkit-border-bottom-right-radius : 5px;
+
+}
+
+#SWFUpload button,
+input,
+select,
+textarea {
+ border-width: 1px;
+ margin-bottom: 10px;
+ padding: 2px 3px;
+}
+
+
+
+#SWFUpload input[disabled]{ border: 1px solid #ccc } /* FF 2 Fix */
+
+
+#SWFUpload label {
+ width: 150px;
+ text-align: right;
+ display:block;
+ margin-right: 5px;
+}
+
+#SWFUpload #btnSubmit { margin: 0 0 0 155px ; }
+
+/* -- Table Styles ------------------------------- */
+#SWFUpload td {
+ font: 10pt Helvetica, Arial, sans-serif;
+ vertical-align: top;
+}
+
+#SWFUpload .progressWrapper {
+ width: 357px;
+ overflow: hidden;
+}
+
+#SWFUpload .progressContainer {
+ margin: 5px;
+ padding: 4px;
+ border: solid 1px #E8E8E8;
+ background-color: #F7F7F7;
+ overflow: hidden;
+}
+/* Message */
+#SWFUpload .message {
+ margin: 1em 0;
+ padding: 10px 20px;
+ border: solid 1px #FFDD99;
+ background-color: #FFFFCC;
+ overflow: hidden;
+}
+/* Error */
+#SWFUpload .red {
+ border: solid 1px #B50000;
+ background-color: #FFEBEB;
+}
+
+/* Current */
+#SWFUpload .green {
+ border: solid 1px #DDF0DD;
+ background-color: #EBFFEB;
+}
+
+/* Complete */
+#SWFUpload .blue {
+ border: solid 1px #CEE2F2;
+ background-color: #F0F5FF;
+}
+
+#SWFUpload .progressName {
+ font-size: 8pt;
+ font-weight: 700;
+ color: #555;
+ width: 323px;
+ height: 14px;
+ text-align: left;
+ white-space: nowrap;
+ overflow: hidden;
+}
+
+#SWFUpload .progressBarInProgress,
+.progressBarComplete,
+.progressBarError {
+ font-size: 0;
+ width: 0%;
+ height: 2px;
+ background-color: blue;
+ margin-top: 2px;
+}
+
+#SWFUpload .progressBarComplete {
+ width: 100%;
+ background-color: green;
+ visibility: hidden;
+}
+
+#SWFUpload .progressBarError {
+ width: 100%;
+ background-color: red;
+ visibility: hidden;
+}
+
+#SWFUpload .progressBarStatus {
+ margin-top: 2px;
+ width: 337px;
+ font-size: 7pt;
+ font-family: Arial;
+ text-align: left;
+ white-space: nowrap;
+}
+
+#SWFUpload a.progressCancel {
+ font-size: 0;
+ display: block;
+ height: 14px;
+ width: 14px;
+ background-image: url(../images/cancelbutton.gif);
+ background-repeat: no-repeat;
+ background-position: -14px 0px;
+ float: right;
+}
+
+#SWFUpload a.progressCancel:hover {
+ background-position: 0px 0px;
+}
+
+
+/* -- SWFUpload Object Styles ------------------------------- */
+#SWFUpload .swfupload {
+ vertical-align: top;
+}
Added: XoopsModules/extgallery/branches/zoullou/modules/extgallery/include/SWFUpload/css/index.html
===================================================================
--- XoopsModules/extgallery/branches/zoullou/modules/extgallery/include/SWFUpload/css/index.html (rev 0)
+++ XoopsModules/extgallery/branches/zoullou/modules/extgallery/include/SWFUpload/css/index.html 2011-12-17 19:47:55 UTC (rev 8516)
@@ -0,0 +1 @@
+ <script>history.go(-1);</script>
\ No newline at end of file
Added: XoopsModules/extgallery/branches/zoullou/modules/extgallery/include/SWFUpload/images/SmallSpyGlassWithTransperancy_17x18.png
===================================================================
(Binary files differ)
Property changes on: XoopsModules/extgallery/branches/zoullou/modules/extgallery/include/SWFUpload/images/SmallSpyGlassWithTransperancy_17x18.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/extgallery/branches/zoullou/modules/extgallery/include/SWFUpload/images/error.gif
===================================================================
(Binary files differ)
Property changes on: XoopsModules/extgallery/branches/zoullou/modules/extgallery/include/SWFUpload/images/error.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/extgallery/branches/zoullou/modules/extgallery/include/SWFUpload/images/index.html
===================================================================
--- XoopsModules/extgallery/branches/zoullou/modules/extgallery/include/SWFUpload/images/index.html (rev 0)
+++ XoopsModules/extgallery/branches/zoullou/modules/extgallery/include/SWFUpload/images/index.html 2011-12-17 19:47:55 UTC (rev 8516)
@@ -0,0 +1 @@
+ <script>history.go(-1);</script>
\ No newline at end of file
Added: XoopsModules/extgallery/branches/zoullou/modules/extgallery/include/SWFUpload/images/toobig.gif
===================================================================
(Binary files differ)
Property changes on: XoopsModules/extgallery/branches/zoullou/modules/extgallery/include/SWFUpload/images/toobig.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/extgallery/branches/zoullou/modules/extgallery/include/SWFUpload/images/uploadlimit.gif
===================================================================
(Binary files differ)
Property changes on: XoopsModules/extgallery/branches/zoullou/modules/extgallery/include/SWFUpload/images/uploadlimit.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/extgallery/branches/zoullou/modules/extgallery/include/SWFUpload/images/zerobyte.gif
===================================================================
(Binary files differ)
Property changes on: XoopsModules/extgallery/branches/zoullou/modules/extgallery/include/SWFUpload/images/zerobyte.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/extgallery/branches/zoullou/modules/extgallery/include/SWFUpload/index.html
===================================================================
--- XoopsModules/extgallery/branches/zoullou/modules/extgallery/include/SWFUpload/index.html (rev 0)
+++ XoopsModules/extgallery/branches/zoullou/modules/extgallery/include/SWFUpload/index.html 2011-12-17 19:47:55 UTC (rev 8516)
@@ -0,0 +1 @@
+ <script>history.go(-1);</script>
\ No newline at end of file
Added: XoopsModules/extgallery/branches/zoullou/modules/extgallery/include/SWFUpload/js/handlers.js
===================================================================
--- XoopsModules/extgallery/branches/zoullou/modules/extgallery/include/SWFUpload/js/handlers.js (rev 0)
+++ XoopsModules/extgallery/branches/zoullou/modules/extgallery/include/SWFUpload/js/handlers.js 2011-12-17 19:47:55 UTC (rev 8516)
@@ -0,0 +1,570 @@
+function preLoad() {
+ if (!this.support.loading) {
+ alert("You need the Flash Player 9.028 or above to use SWFUpload.");
+ return false;
+ }
+}
+function loadFailed() {
+ alert("Something went wrong while loading SWFUpload. If this were a real application we'd clean up and then give you an alternative");
+}
+
+function fileQueued(file) {
+ try {
+ var progress = new FileProgress(file, this.customSettings.progressTarget);
+ progress.setStatus("Pending...");
+ progress.toggleCancel(true, this);
+
+ } catch (ex) {
+ this.debug("fileQueued");
+ this.debug(ex);
+ }
+
+}
+
+function fileQueueError(file, errorCode, message) {
+ try {
+ var imageName = "error.gif";
+ var errorName = "";
+ if (errorCode === SWFUpload.errorCode_QUEUE_LIMIT_EXCEEDED) {
+ errorName = "You have attempted to queue too many files.";
+ }
+
+ if (errorName !== "") {
+ alert(errorName);
+ return;
+ }
+
+ switch (errorCode) {
+ case SWFUpload.QUEUE_ERROR.ZERO_BYTE_FILE:
+ imageName = "zerobyte.gif";
+ break;
+ case SWFUpload.QUEUE_ERROR.FILE_EXCEEDS_SIZE_LIMIT:
+ imageName = "toobig.gif";
+ break;
+ case SWFUpload.QUEUE_ERROR.ZERO_BYTE_FILE:
+ case SWFUpload.QUEUE_ERROR.INVALID_FILETYPE:
+ default:
+ alert(message);
+ break;
+ }
+
+ addImage("images/" + imageName);
+
+ } catch (ex) {
+ this.debug(ex);
+ }
+
+}
+
+function uploadStart(file) {
+ try {
+ /* I don't want to do any file validation or anything, I'll just update the UI and
+ return true to indicate that the upload should start.
+ It's important to update the UI here because in Linux no uploadProgress events are called. The best
+ we can do is say we are uploading.
+ */
+ var progress = new FileProgress(file, this.customSettings.progressTarget);
+ progress.setStatus("Uploading...");
+ progress.toggleCancel(true, this);
+ }
+ catch (ex) {}
+
+ return true;
+}
+
+// function fileDialogComplete(numFilesSelected, numFilesQueued) {
+ // try {
+ // if (numFilesQueued > 0) {
+ // this.startUpload(this.getFile(0).ID);
+ // }
+ // } catch (ex) {
+ // this.debug(ex);
+ // }
+// }
+
+function uploadProgress(file, bytesLoaded) {
+
+ try {
+ var percent = Math.ceil((bytesLoaded / file.size) * 100);
+
+ var progress = new FileProgress(file, this.customSettings.upload_target);
+ progress.setProgress(percent);
+ progress.setStatus("Uploading...");
+ progress.toggleCancel(true, this);
+ } catch (ex) {
+ this.debug(ex);
+ }
+}
+
+function uploadSuccess(file, serverData) {
+ try {
+ // var progress = new FileProgress(file, this.customSettings.upload_target);
+ var progress = new FileProgress(file, this.customSettings.progressTarget);
+
+ if (serverData.substring(0, 7) === "FILEID:") {
+ addImage("hook-thumb.php?id=" + serverData.substring(7));
+
+ progress.setComplete();
+ progress.setStatus("Upload Complete.");
+ progress.toggleCancel(false);
+ } else {
+ addImage("images/error.gif");
+ progress.setStatus("Error.");
+ progress.toggleCancel(false);
+ alert(serverData);
+
+ }
+
+
+ } catch (ex) {
+ this.debug(ex);
+ }
+}
+
+function uploadComplete(file) {
+ try {
+ /* I want the next upload to continue automatically so I'll call startUpload here */
+ if (this.getStats().files_queued > 0) {
+ this.startUpload(this.getFile(0).ID);
+ }
+ } catch (ex) {
+ this.debug(ex);
+ }
+}
+
+function uploadError(file, errorCode, message) {
+ try {
+ var progress = new FileProgress(file, this.customSettings.progressTarget);
+ progress.setError();
+ progress.toggleCancel(false);
+
+ switch (errorCode) {
+ case SWFUpload.UPLOAD_ERROR.HTTP_ERROR:
+ progress.setStatus("Upload Error: " + message);
+ this.debug("Error Code: HTTP Error, File name: " + file.name + ", Message: " + message);
+ break;
+ case SWFUpload.UPLOAD_ERROR.UPLOAD_FAILED:
+ progress.setStatus("Upload Failed.");
+ this.debug("Error Code: Upload Failed, File name: " + file.name + ", File size: " + file.size + ", Message: " + message);
+ break;
+ case SWFUpload.UPLOAD_ERROR.IO_ERROR:
+ progress.setStatus("Server (IO) Error");
+ this.debug("Error Code: IO Error, File name: " + file.name + ", Message: " + message);
+ break;
+ case SWFUpload.UPLOAD_ERROR.SECURITY_ERROR:
+ progress.setStatus("Security Error");
+ this.debug("Error Code: Security Error, File name: " + file.name + ", Message: " + message);
+ break;
+ case SWFUpload.UPLOAD_ERROR.UPLOAD_LIMIT_EXCEEDED:
+ progress.setStatus("Upload limit exceeded.");
+ this.debug("Error Code: Upload Limit Exceeded, File name: " + file.name + ", File size: " + file.size + ", Message: " + message);
+ break;
+ case SWFUpload.UPLOAD_ERROR.FILE_VALIDATION_FAILED:
+ progress.setStatus("Failed Validation. Upload skipped.");
+ this.debug("Error Code: File Validation Failed, File name: " + file.name + ", File size: " + file.size + ", Message: " + message);
+ break;
+ case SWFUpload.UPLOAD_ERROR.FILE_CANCELLED:
+ progress.setStatus("Cancelled");
+ progress.setCancelled();
+ break;
+ case SWFUpload.UPLOAD_ERROR.UPLOAD_STOPPED:
+ progress.setStatus("Stopped");
+ break;
+ default:
+ progress.setStatus("Unhandled Error: " + errorCode);
+ this.debug("Error Code: " + errorCode + ", File name: " + file.name + ", File size: " + file.size + ", Message: " + message);
+ break;
+ }
+ } catch (ex) {
+ this.debug(ex);
+ }
+}
+
+// function uploadError(file, errorCode, message) {
+ // var imageName = "error.gif";
+ // var progress;
+ // try {
+ // switch (errorCode) {
+ // case SWFUpload.UPLOAD_ERROR.FILE_CANCELLED:
+ // try {
+ // progress = new FileProgress(file, this.customSettings.upload_target);
+ // progress.setCancelled();
+ // progress.setStatus("Cancelled");
+ // progress.toggleCancel(false);
+ // }
+ // catch (ex1) {
+ // this.debug(ex1);
+ // }
+ // break;
+ // case SWFUpload.UPLOAD_ERROR.UPLOAD_STOPPED:
+ // try {
+ // progress = new FileProgress(file, this.customSettings.upload_target);
+ // progress.setCancelled();
+ // progress.setStatus("Stopped");
+ // progress.toggleCancel(true);
+ // }
+ // catch (ex2) {
+ // this.debug(ex2);
+ // }
+ // case SWFUpload.UPLOAD_ERROR.UPLOAD_LIMIT_EXCEEDED:
+ // imageName = "uploadlimit.gif";
+ // break;
+ // default:
+ // alert(message);
+ // break;
+ // }
+
+ // addImage("images/" + imageName);
+
+ // } catch (ex3) {
+ // this.debug(ex3);
+ // }
+
+// }
+
+
+function addImage(src) {
+ var newImg = document.createElement("img");
+ newImg.style.margin = "5px";
+
+ document.getElementById("thumbnails").appendChild(newImg);
+ if (newImg.filters) {
+ try {
+ newImg.filters.item("DXImageTransform.Microsoft.Alpha").opacity = 0;
+ } catch (e) {
+ // If it is not set initially, the browser will throw an error. This will set it if it is not set yet.
+ newImg.style.filter = 'progid:DXImageTransform.Microsoft.Alpha(opacity=' + 0 + ')';
+ }
+ } else {
+ newImg.style.opacity = 0;
+ }
+
+ newImg.onload = function () {
+ fadeIn(newImg, 0);
+ };
+ newImg.src = src;
+}
+
+function fadeIn(element, opacity) {
+ var reduceOpacityBy = 5;
+ var rate = 30; // 15 fps
+
+
+ if (opacity < 100) {
+ opacity += reduceOpacityBy;
+ if (opacity > 100) {
+ opacity = 100;
+ }
+
+ if (element.filters) {
+ try {
+ element.filters.item("DXImageTransform.Microsoft.Alpha").opacity = opacity;
+ } catch (e) {
+ // If it is not set initially, the browser will throw an error. This will set it if it is not set yet.
+ element.style.filter = 'progid:DXImageTransform.Microsoft.Alpha(opacity=' + opacity + ')';
+ }
+ } else {
+ element.style.opacity = opacity / 100;
+ }
+ }
+
+ if (opacity < 100) {
+ setTimeout(function () {
+ fadeIn(element, opacity);
+ }, rate);
+ }
+}
+
+/*
+ A simple class for displaying file information and progress
+ Note: This is a demonstration only and not part of SWFUpload.
+ Note: Some have had problems adapting this class in IE7. It may not be suitable for your application.
+*/
+
+// Constructor
+// file is a SWFUpload file object
+// targetID is the HTML element id attribute that the FileProgress HTML structure will be added to.
+// Instantiating a new FileProgress object with an existing file will reuse/update the existing DOM elements
+function FileProgress(file, targetID) {
+ this.fileProgressID = file.id;
+
+ this.opacity = 100;
+ this.height = 0;
+
+
+ this.fileProgressWrapper = document.getElementById(this.fileProgressID);
+ if (!this.fileProgressWrapper) {
+ this.fileProgressWrapper = document.createElement("div");
+ this.fileProgressWrapper.className = "progressWrapper";
+ this.fileProgressWrapper.id = this.fileProgressID;
+
+ this.fileProgressElement = document.createElement("div");
+ this.fileProgressElement.className = "progressContainer";
+
+ var progressCancel = document.createElement("a");
+ progressCancel.className = "progressCancel";
+ progressCancel.href = "#";
+ progressCancel.style.visibility = "hidden";
+ progressCancel.appendChild(document.createTextNode(" "));
+
+ var progressText = document.createElement("div");
+ progressText.className = "progressName";
+ progressText.appendChild(document.createTextNode(file.name));
+
+ var progressBar = document.createElement("div");
+ progressBar.className = "progressBarInProgress";
+
+ var progressStatus = document.createElement("div");
+ progressStatus.className = "progressBarStatus";
+ progressStatus.innerHTML = " ";
+
+ this.fileProgressElement.appendChild(progressCancel);
+ this.fileProgressElement.appendChild(progressText);
+ this.fileProgressElement.appendChild(progressStatus);
+ this.fileProgressElement.appendChild(progressBar);
+
+ this.fileProgressWrapper.appendChild(this.fileProgressElement);
+
+ document.getElementById(targetID).appendChild(this.fileProgressWrapper);
+ } else {
+ this.fileProgressElement = this.fileProgressWrapper.firstChild;
+ this.reset();
+ }
+
+ this.height = this.fileProgressWrapper.offsetHeight;
+ this.setTimer(null);
+
+
+}
+
+FileProgress.prototype.setTimer = function (timer) {
+ this.fileProgressElement["FP_TIMER"] = timer;
+};
+FileProgress.prototype.getTimer = function (timer) {
+ return this.fileProgressElement["FP_TIMER"] || null;
+};
+
+FileProgress.prototype.reset = function () {
+ this.fileProgressElement.className = "progressContainer";
+
+ this.fileProgressElement.childNodes[2].innerHTML = " ";
+ this.fileProgressElement.childNodes[2].className = "progressBarStatus";
+
+ this.fileProgressElement.childNodes[3].className = "progressBarInProgress";
+ this.fileProgressElement.childNodes[3].style.width = "0%";
+
+ this.appear();
+};
+
+FileProgress.prototype.setProgress = function (percentage) {
+ this.fileProgressElement.className = "progressContainer green";
+ this.fileProgressElement.childNodes[3].className = "progressBarInProgress";
+ this.fileProgressElement.childNodes[3].style.width = percentage + "%";
+
+ this.appear();
+};
+FileProgress.prototype.setComplete = function () {
+ this.fileProgressElement.className = "progressContainer blue";
+ this.fileProgressElement.childNodes[3].className = "progressBarComplete";
+ this.fileProgressElement.childNodes[3].style.width = "";
+
+ var oSelf = this;
+ this.setTimer(setTimeout(function () {
+ oSelf.disappear();
+ }, 10000));
+};
+FileProgress.prototype.setError = function () {
+ this.fileProgressElement.className = "progressContainer red";
+ this.fileProgressElement.childNodes[3].className = "progressBarError";
+ this.fileProgressElement.childNodes[3].style.width = "";
+
+ var oSelf = this;
+ this.setTimer(setTimeout(function () {
+ oSelf.disappear();
+ }, 5000));
+};
+FileProgress.prototype.setCancelled = function () {
+ this.fileProgressElement.className = "progressContainer";
+ this.fileProgressElement.childNodes[3].className = "progressBarError";
+ this.fileProgressElement.childNodes[3].style.width = "";
+
+ var oSelf = this;
+ this.setTimer(setTimeout(function () {
+ oSelf.disappear();
+ }, 2000));
+};
+FileProgress.prototype.setStatus = function (status) {
+ this.fileProgressElement.childNodes[2].innerHTML = status;
+};
+
+// Show/Hide the cancel button
+FileProgress.prototype.toggleCancel = function (show, swfUploadInstance) {
+ this.fileProgressElement.childNodes[0].style.visibility = show ? "visible" : "hidden";
+ if (swfUploadInstance) {
+ var fileID = this.fileProgressID;
+ this.fileProgressElement.childNodes[0].onclick = function () {
+ swfUploadInstance.cancelUpload(fileID);
+ return false;
+ };
+ }
+};
+
+FileProgress.prototype.appear = function () {
+ if (this.getTimer() !== null) {
+ clearTimeout(this.getTimer());
+ this.setTimer(null);
+ }
+
+ if (this.fileProgressWrapper.filters) {
+ try {
+ this.fileProgressWrapper.filters.item("DXImageTransform.Microsoft.Alpha").opacity = 100;
+ } catch (e) {
+ // If it is not set initially, the browser will throw an error. This will set it if it is not set yet.
+ this.fileProgressWrapper.style.filter = "progid:DXImageTransform.Microsoft.Alpha(opacity=100)";
+ }
+ } else {
+ this.fileProgressWrapper.style.opacity = 1;
+ }
+
+ this.fileProgressWrapper.style.height = "";
+
+ this.height = this.fileProgressWrapper.offsetHeight;
+ this.opacity = 100;
+ this.fileProgressWrapper.style.display = "";
+
+};
+
+// Fades out and clips away the FileProgress box.
+FileProgress.prototype.disappear = function () {
+
+ var reduceOpacityBy = 15;
+ var reduceHeightBy = 4;
+ var rate = 30; // 15 fps
+
+ if (this.opacity > 0) {
+ this.opacity -= reduceOpacityBy;
+ if (this.opacity < 0) {
+ this.opacity = 0;
+ }
+
+ if (this.fileProgressWrapper.filters) {
+ try {
+ this.fileProgressWrapper.filters.item("DXImageTransform.Microsoft.Alpha").opacity = this.opacity;
+ } catch (e) {
+ // If it is not set initially, the browser will throw an error. This will set it if it is not set yet.
+ this.fileProgressWrapper.style.filter = "progid:DXImageTransform.Microsoft.Alpha(opacity=" + this.opacity + ")";
+ }
+ } else {
+ this.fileProgressWrapper.style.opacity = this.opacity / 100;
+ }
+ }
+
+ if (this.height > 0) {
+ this.height -= reduceHeightBy;
+ if (this.height < 0) {
+ this.height = 0;
+ }
+
+ this.fileProgressWrapper.style.height = this.height + "px";
+ }
+
+ if (this.height > 0 || this.opacity > 0) {
+ var oSelf = this;
+ this.setTimer(setTimeout(function () {
+ oSelf.disappear();
+ }, rate));
+ } else {
+ this.fileProgressWrapper.style.display = "none";
+ this.setTimer(null);
+ }
+};
+
+// /* ******************************************
+ // * FileProgress Object
+ // * Control object for displaying file info
+ // * ****************************************** */
+
+// function FileProgress(file, targetID) {
+ // this.fileProgressID = "divFileProgress";
+
+ // this.fileProgressWrapper = document.getElementById(this.fileProgressID);
+ // if (!this.fileProgressWrapper) {
+ // this.fileProgressWrapper = document.createElement("div");
+ // this.fileProgressWrapper.className = "progressWrapper";
+ // this.fileProgressWrapper.id = this.fileProgressID;
+
+ // this.fileProgressElement = document.createElement("div");
+ // this.fileProgressElement.className = "progressContainer";
+
+ // var progressCancel = document.createElement("a");
+ // progressCancel.className = "progressCancel";
+ // progressCancel.href = "#";
+ // progressCancel.style.visibility = "hidden";
+ // progressCancel.appendChild(document.createTextNode(" "));
+
+ // var progressText = document.createElement("div");
+ // progressText.className = "progressName";
+ // progressText.appendChild(document.createTextNode(file.name));
+
+ // var progressBar = document.createElement("div");
+ // progressBar.className = "progressBarInProgress";
+
+ // var progressStatus = document.createElement("div");
+ // progressStatus.className = "progressBarStatus";
+ // progressStatus.innerHTML = " ";
+
+ // this.fileProgressElement.appendChild(progressCancel);
+ // this.fileProgressElement.appendChild(progressText);
+ // this.fileProgressElement.appendChild(progressStatus);
+ // this.fileProgressElement.appendChild(progressBar);
+
+ // this.fileProgressWrapper.appendChild(this.fileProgressElement);
+
+ // document.getElementById(targetID).appendChild(this.fileProgressWrapper);
+ // fadeIn(this.fileProgressWrapper, 0);
+
+ // } else {
+ // this.fileProgressElement = this.fileProgressWrapper.firstChild;
+ // this.fileProgressElement.childNodes[1].firstChild.nodeValue = file.name;
+ // }
+
+ // this.height = this.fileProgressWrapper.offsetHeight;
+
+// }
+// FileProgress.prototype.setProgress = function (percentage) {
+ // this.fileProgressElement.className = "progressContainer green";
+ // this.fileProgressElement.childNodes[3].className = "progressBarInProgress";
+ // this.fileProgressElement.childNodes[3].style.width = percentage + "%";
+// };
+// FileProgress.prototype.setComplete = function () {
+ // this.fileProgressElement.className = "progressContainer blue";
+ // this.fileProgressElement.childNodes[3].className = "progressBarComplete";
+ // this.fileProgressElement.childNodes[3].style.width = "";
+
+// };
+// FileProgress.prototype.setError = function () {
+ // this.fileProgressElement.className = "progressContainer red";
+ // this.fileProgressElement.childNodes[3].className = "progressBarError";
+ // this.fileProgressElement.childNodes[3].style.width = "";
+
+// };
+// FileProgress.prototype.setCancelled = function () {
+ // this.fileProgressElement.className = "progressContainer";
+ // this.fileProgressElement.childNodes[3].className = "progressBarError";
+ // this.fileProgressElement.childNodes[3].style.width = "";
+
+// };
+// FileProgress.prototype.setStatus = function (status) {
+ // this.fileProgressElement.childNodes[2].innerHTML = status;
+// };
+
+// FileProgress.prototype.toggleCancel = function (show, swfuploadInstance) {
+ // this.fileProgressElement.childNodes[0].style.visibility = show ? "visible" : "hidden";
+ // if (swfuploadInstance) {
+ // var fileID = this.fileProgressID;
+ // this.fileProgressElement.childNodes[0].onclick = function () {
+ // swfuploadInstance.cancelUpload(fileID);
+ // return false;
+ // };
+ // }
+// };
\ No newline at end of file
Added: XoopsModules/extgallery/branches/zoullou/modules/extgallery/include/SWFUpload/js/index.html
===================================================================
--- XoopsModules/extgallery/branches/zoullou/modules/extgallery/include/SWFUpload/js/index.html (rev 0)
+++ XoopsModules/extgallery/branches/zoullou/modules/extgallery/include/SWFUpload/js/index.html 2011-12-17 19:47:55 UTC (rev 8516)
@@ -0,0 +1 @@
+ <script>history.go(-1);</script>
\ No newline at end of file
Added: XoopsModules/extgallery/branches/zoullou/modules/extgallery/include/SWFUpload/js/loader.js.php
===================================================================
--- XoopsModules/extgallery/branches/zoullou/modules/extgallery/include/SWFUpload/js/loader.js.php (rev 0)
+++ XoopsModules/extgallery/branches/zoullou/modules/extgallery/include/SWFUpload/js/loader.js.php 2011-12-17 19:47:55 UTC (rev 8516)
@@ -0,0 +1,69 @@
+<?php require '../../../../../mainfile.php';?>
+
+var swfu;
+var phpSessid;
+var categorieField;
+
+function eXtGalleryCategoryChange() {
+ categorieField = document.getElementById('cat_id').options[document.getElementById('cat_id').selectedIndex].value;
+ swfu.setPostParams({"PHPSESSID": phpSessid,"cat_id": categorieField});
+}
+
+window.onload = function () {
+
+ categorieField = document.getElementById('cat_id').options[document.getElementById('cat_id').selectedIndex].value;
+ phpSessid = "<?php echo session_id(); ?>";
+
+ var settings = {
+ // Backend Settings
+ upload_url: "<?php echo XOOPS_URL;?>/modules/extgallery/public-post-extended.php",
+ post_params: {"PHPSESSID": phpSessid,"cat_id": categorieField},
+
+ // File Upload Settings
+ file_size_limit : "10 MB",
+ file_types : "*.jpg;*.png;*.gif",
+ file_types_description : "Allowed Files",
+ file_upload_limit : 0,
+ custom_settings : {
+ progressTarget : "fsUploadProgress",
+ upload_target : "divFileProgressContainer",
+ cancelButtonId : "btnCancel"
+ },
+
+ // Event Handler Settings - these functions as defined in Handlers.js
+ // The handlers are not part of SWFUpload but are part of my website and control how
+ // my website reacts to the SWFUpload events.
+ swfupload_preload_handler : preLoad,
+ swfupload_load_failed_handler : loadFailed,
+ file_queued_handler : fileQueued,
+ file_queue_error_handler : fileQueueError,
+ //file_dialog_complete_handler : fileDialogComplete,
+ upload_start_handler : uploadStart,
+ upload_progress_handler : uploadProgress,
+ upload_error_handler : uploadError,
+ upload_success_handler : uploadSuccess,
+ upload_complete_handler : uploadComplete,
+
+ // Button Settings
+ button_image_url : "images/SmallSpyGlassWithTransperancy_17x18.png",
+ button_placeholder_id : "spanButtonPlaceholder",
+ button_width: 180,
+ button_height: 18,
+ button_text : '<span class="button">Select Images <span class="buttonSmall">(10 MB Max)</span></span>',
+ button_text_style : '.button { font-family: Helvetica, Arial, sans-serif; font-size: 12pt; } .buttonSmall { font-size: 10pt; }',
+ button_text_top_padding: 0,
+ button_text_left_padding: 18,
+ button_window_mode: SWFUpload.WINDOW_MODE.TRANSPARENT,
+ button_cursor: SWFUpload.CURSOR.HAND,
+
+ // Flash Settings
+ flash_url : "<?php echo XOOPS_URL;?>/modules/extgallery/include/SWFUpload/js/swfupload.swf",
+ flash9_url : "<?php echo XOOPS_URL;?>/modules/extgallery/include/SWFUpload/js/swfupload_FP9.swf",
+
+ // Debug Settings
+ debug: false
+ };
+
+ swfu = new SWFUpload(settings);
+
+};
\ No newline at end of file
Added: XoopsModules/extgallery/branches/zoullou/modules/extgallery/include/SWFUpload/js/swfupload.cookies.js
===================================================================
--- XoopsModules/extgallery/branches/zoullou/modules/extgallery/include/SWFUpload/js/swfupload.cookies.js (rev 0)
+++ XoopsModules/extgallery/branches/zoullou/modules/extgallery/include/SWFUpload/js/swfupload.cookies.js 2011-12-17 19:47:55 UTC (rev 8516)
@@ -0,0 +1,53 @@
+/*
+ Cookie Plug-in
+
+ This plug in automatically gets all the cookies for this site and adds them to the post_params.
+ Cookies are loaded only on initialization. The refreshCookies function can be called to update the post_params.
+ The cookies will override any other post params with the same name.
+*/
+
+var SWFUpload;
+if (typeof(SWFUpload) === "function") {
+ SWFUpload.prototype.initSettings = function (oldInitSettings) {
+ return function (userSettings) {
+ if (typeof(oldInitSettings) === "function") {
+ oldInitSettings.call(this, userSettings);
+ }
+
+ this.refreshCookies(false); // The false parameter must be sent since SWFUpload has not initialzed at this point
+ };
+ }(SWFUpload.prototype.initSettings);
+
+ // refreshes the post_params and updates SWFUpload. The sendToFlash parameters is optional and defaults to True
+ SWFUpload.prototype.refreshCookies = function (sendToFlash) {
+ if (sendToFlash === undefined) {
+ sendToFlash = true;
+ }
+ sendToFlash = !!sendToFlash;
+
+ // Get the post_params object
+ var postParams = this.settings.post_params;
+
+ // Get the cookies
+ var i, cookieArray = document.cookie.split(';'), caLength = cookieArray.length, c, eqIndex, name, value;
+ for (i = 0; i < caLength; i++) {
+ c = cookieArray[i];
+
+ // Left Trim spaces
+ while (c.charAt(0) === " ") {
+ c = c.substring(1, c.length);
+ }
+ eqIndex = c.indexOf("=");
+ if (eqIndex > 0) {
+ name = c.substring(0, eqIndex);
+ value = c.substring(eqIndex + 1);
+ postParams[name] = value;
+ }
+ }
+
+ if (sendToFlash) {
+ this.setPostParams(postParams);
+ }
+ };
+
+}
Added: XoopsModules/extgallery/branches/zoullou/modules/extgallery/include/SWFUpload/js/swfupload.js
===================================================================
--- XoopsModules/extgallery/branches/zoullou/modules/extgallery/include/SWFUpload/js/swfupload.js (rev 0)
+++ XoopsModules/extgallery/branches/zoullou/modules/extgallery/include/SWFUpload/js/swfupload.js 2011-12-17 19:47:55 UTC (rev 8516)
@@ -0,0 +1,1132 @@
+/**
+ * SWFUpload: http://www.swfupload.org, http://swfupload.googlecode.com
+ *
+ * mmSWFUpload 1.0: Flash upload dialog - http://profandesign.se/swfupload/, http://www.vinterwebb.se/
+ *
+ * SWFUpload is (c) 2006-2007 Lars Huring, Olov Nilz\xE9n and Mammon Media and is released under the MIT License:
+ * http://www.opensource.org/licenses/mit-license.php
+ *
+ * SWFUpload 2 is (c) 2007-2008 Jake Roberts and is released under the MIT License:
+ * http://www.opensource.org/licenses/mit-license.php
+ *
+ * SWFObject v2.2 <http://code.google.com/p/swfobject/>
+ * is released under the MIT License <http://www.opensource.org/licenses/mit-license.php>
+ */
+
+
+
+/* ******************* */
+/* Constructor & Init */
+/* ******************* */
+var SWFUpload;
+var swfobject;
+
+if (SWFUpload == undefined) {
+ SWFUpload = function (settings) {
+ this.initSWFUpload(settings);
+ };
+}
+
+SWFUpload.prototype.initSWFUpload = function (userSettings) {
+ try {
+ this.customSettings = {}; // A container where developers can place their own settings associated with this instance.
+ this.settings = {};
+ this.eventQueue = [];
+ this.movieName = "SWFUpload_" + SWFUpload.movieCount++;
+ this.movieElement = null;
+
+
+ // Setup global control tracking
+ SWFUpload.instances[this.movieName] = this;
+
+ // Load the settings. Load the Flash movie.
+ this.initSettings(userSettings);
+ this.loadSupport();
+ if (this.swfuploadPreload()) {
+ this.loadFlash();
+ }
+
+ this.displayDebugInfo();
+ } catch (ex) {
+ delete SWFUpload.instances[this.movieName];
+ throw ex;
+ }
+};
+
+/* *************** */
+/* Static Members */
+/* *************** */
+SWFUpload.instances = {};
+SWFUpload.movieCount = 0;
+SWFUpload.version = "2.5.0 2010-01-15 Beta 2";
+SWFUpload.QUEUE_ERROR = {
+ QUEUE_LIMIT_EXCEEDED : -100,
+ FILE_EXCEEDS_SIZE_LIMIT : -110,
+ ZERO_BYTE_FILE : -120,
+ INVALID_FILETYPE : -130
+};
+SWFUpload.UPLOAD_ERROR = {
+ HTTP_ERROR : -200,
+ MISSING_UPLOAD_URL : -210,
+ IO_ERROR : -220,
+ SECURITY_ERROR : -230,
+ UPLOAD_LIMIT_EXCEEDED : -240,
+ UPLOAD_FAILED : -250,
+ SPECIFIED_FILE_ID_NOT_FOUND : -260,
+ FILE_VALIDATION_FAILED : -270,
+ FILE_CANCELLED : -280,
+ UPLOAD_STOPPED : -290,
+ RESIZE : -300
+};
+SWFUpload.FILE_STATUS = {
+ QUEUED : -1,
+ IN_PROGRESS : -2,
+ ERROR : -3,
+ COMPLETE : -4,
+ CANCELLED : -5
+};
+SWFUpload.UPLOAD_TYPE = {
+ NORMAL : -1,
+ RESIZED : -2
+};
+
+SWFUpload.BUTTON_ACTION = {
+ SELECT_FILE : -100,
+ SELECT_FILES : -110,
+ START_UPLOAD : -120,
+ JAVASCRIPT : -130, // DEPRECATED
+ NONE : -130
+};
+SWFUpload.CURSOR = {
+ ARROW : -1,
+ HAND : -2
+};
+SWFUpload.WINDOW_MODE = {
+ WINDOW : "window",
+ TRANSPARENT : "transparent",
+ OPAQUE : "opaque"
+};
+
+SWFUpload.RESIZE_ENCODING = {
+ JPEG : -1,
+ PNG : -2
+};
+
+// Private: takes a URL, determines if it is relative and converts to an absolute URL
+// using the current site. Only processes the URL if it can, otherwise returns the URL untouched
+SWFUpload.completeURL = function (url) {
+ try {
+ var path = "", indexSlash = -1;
+ if (typeof(url) !== "string" || url.match(/^https?:\/\//i) || url.match(/^\//) || url === "") {
+ return url;
+ }
+
+ indexSlash = window.location.pathname.lastIndexOf("/");
+ if (indexSlash <= 0) {
+ path = "/";
+ } else {
+ path = window.location.pathname.substr(0, indexSlash) + "/";
+ }
+
+ return path + url;
+ } catch (ex) {
+ return url;
+ }
+};
+
+// Public: assign a new function to onload to use swfobject's domLoad functionality
+SWFUpload.onload = function () {};
+
+
+/* ******************** */
+/* Instance Members */
+/* ******************** */
+
+// Private: initSettings ensures that all the
+// settings are set, getting a default value if one was not assigned.
+SWFUpload.prototype.initSettings = function (userSettings) {
+ this.ensureDefault = function (settingName, defaultValue) {
+ var setting = userSettings[settingName];
+ if (setting != undefined) {
+ this.settings[settingName] = setting;
+ } else {
+ this.settings[settingName] = defaultValue;
+ }
+ };
+
+ // Upload backend settings
+ this.ensureDefault("upload_url", "");
+ this.ensureDefault("preserve_relative_urls", false);
+ this.ensureDefault("file_post_name", "Filedata");
+ this.ensureDefault("post_params", {});
+ this.ensureDefault("use_query_string", false);
+ this.ensureDefault("requeue_on_error", false);
+ this.ensureDefault("http_success", []);
+ this.ensureDefault("assume_success_timeout", 0);
+
+ // File Settings
+ this.ensureDefault("file_types", "*.*");
+ this.ensureDefault("file_types_description", "All Files");
+ this.ensureDefault("file_size_limit", 0); // Default zero means "unlimited"
+ this.ensureDefault("file_upload_limit", 0);
+ this.ensureDefault("file_queue_limit", 0);
+
+ // Flash Settings
+ this.ensureDefault("flash_url", "swfupload.swf");
+ this.ensureDefault("flash9_url", "swfupload_fp9.swf");
+ this.ensureDefault("prevent_swf_caching", true);
+
+ // Button Settings
+ this.ensureDefault("button_image_url", "");
+ this.ensureDefault("button_width", 1);
+ this.ensureDefault("button_height", 1);
+ this.ensureDefault("button_text", "");
+ this.ensureDefault("button_text_style", "color: #000000; font-size: 16pt;");
+ this.ensureDefault("button_text_top_padding", 0);
+ this.ensureDefault("button_text_left_padding", 0);
+ this.ensureDefault("button_action", SWFUpload.BUTTON_ACTION.SELECT_FILES);
+ this.ensureDefault("button_disabled", false);
+ this.ensureDefault("button_placeholder_id", "");
+ this.ensureDefault("button_placeholder", null);
+ this.ensureDefault("button_cursor", SWFUpload.CURSOR.ARROW);
+ this.ensureDefault("button_window_mode", SWFUpload.WINDOW_MODE.WINDOW);
+
+ // Debug Settings
+ this.ensureDefault("debug", false);
+ this.settings.debug_enabled = this.settings.debug; // Here to maintain v2 API
+
+ // Event Handlers
+ this.settings.return_upload_start_handler = this.returnUploadStart;
+ this.ensureDefault("swfupload_preload_handler", null);
+ this.ensureDefault("swfupload_load_failed_handler", null);
+ this.ensureDefault("swfupload_loaded_handler", null);
+ this.ensureDefault("file_dialog_start_handler", null);
+ this.ensureDefault("file_queued_handler", null);
+ this.ensureDefault("file_queue_error_handler", null);
+ this.ensureDefault("file_dialog_complete_handler", null);
+
+ this.ensureDefault("upload_resize_start_handler", null);
+ this.ensureDefault("upload_start_handler", null);
+ this.ensureDefault("upload_progress_handler", null);
+ this.ensureDefault("upload_error_handler", null);
+ this.ensureDefault("upload_success_handler", null);
+ this.ensureDefault("upload_complete_handler", null);
+
+ this.ensureDefault("mouse_click_handler", null);
+ this.ensureDefault("mouse_out_handler", null);
+ this.ensureDefault("mouse_over_handler", null);
+
+ this.ensureDefault("debug_handler", this.debugMessage);
+
+ this.ensureDefault("custom_settings", {});
+
+ // Other settings
+ this.customSettings = this.settings.custom_settings;
+
+ // Update the flash url if needed
+ if (!!this.settings.prevent_swf_caching) {
+ this.settings.flash_url = this.settings.flash_url + (this.settings.flash_url.indexOf("?") < 0 ? "?" : "&") + "preventswfcaching=" + new Date().getTime();
+ this.settings.flash9_url = this.settings.flash9_url + (this.settings.flash9_url.indexOf("?") < 0 ? "?" : "&") + "preventswfcaching=" + new Date().getTime();
+ }
+
+ if (!this.settings.preserve_relative_urls) {
+ this.settings.upload_url = SWFUpload.completeURL(this.settings.upload_url);
+ this.settings.button_image_url = SWFUpload.completeURL(this.settings.button_image_url);
+ }
+
+ delete this.ensureDefault;
+};
+
+// Initializes the supported functionality based the Flash Player version, state, and event that occur during initialization
+SWFUpload.prototype.loadSupport = function () {
+ this.support = {
+ loading : swfobject.hasFlashPlayerVersion("9.0.28"),
+ imageResize : swfobject.hasFlashPlayerVersion("10.0.0")
+ };
+
+};
+
+// Private: loadFlash replaces the button_placeholder element with the flash movie.
+SWFUpload.prototype.loadFlash = function () {
+ var targetElement, tempParent, wrapperType, flashHTML, els;
+
+ if (!this.support.loading) {
+ this.queueEvent("swfupload_load_failed_handler", ["Flash Player doesn't support SWFUpload"]);
+ return;
+ }
+
+ // Make sure an element with the ID we are going to use doesn't already exist
+ if (document.getElementById(this.movieName) !== null) {
+ this.support.loading = false;
+ this.queueEvent("swfupload_load_failed_handler", ["Element ID already in use"]);
+ return;
+ }
+
+ // Get the element where we will be placing the flash movie
+ targetElement = document.getElementById(this.settings.button_placeholder_id) || this.settings.button_placeholder;
+
+ if (targetElement == undefined) {
+ this.support.loading = false;
+ this.queueEvent("swfupload_load_failed_handler", ["button place holder not found"]);
+ return;
+ }
+
+ wrapperType = (targetElement.currentStyle && targetElement.currentStyle["display"] || window.getComputedStyle && document.defaultView.getComputedStyle(targetElement, null).getPropertyValue("display")) !== "block" ? "span" : "div";
+
+ // Append the container and load the flash
+ tempParent = document.createElement(wrapperType);
+
+ flashHTML = this.getFlashHTML();
+
+ try {
+ tempParent.innerHTML = flashHTML; // Using innerHTML is non-standard but the only sensible way to dynamically add Flash in IE (and maybe other browsers)
+ } catch (ex) {
+ this.support.loading = false;
+ this.queueEvent("swfupload_load_failed_handler", ["Exception loading Flash HTML into placeholder"]);
+ return;
+ }
+
+ // Try to get the movie element immediately
+ els = tempParent.getElementsByTagName("object");
+ if (!els || els.length > 1 || els.length === 0) {
+ this.support.loading = false;
+ this.queueEvent("swfupload_load_failed_handler", ["Unable to find movie after adding to DOM"]);
+ return;
+ } else if (els.length === 1) {
+ this.movieElement = els[0];
+ }
+
+ targetElement.parentNode.replaceChild(tempParent.firstChild, targetElement);
+
+ // Fix IE Flash/Form bug
+ if (window[this.movieName] == undefined) {
+ window[this.movieName] = this.getMovieElement();
+ }
+};
+
+// Private: getFlashHTML generates the object tag needed to embed the flash in to the document
+SWFUpload.prototype.getFlashHTML = function (flashVersion) {
+ // Flash Satay object syntax: http://www.alistapart.com/articles/flashsatay
+ return ['<object id="', this.movieName, '" type="application/x-shockwave-flash" data="', (this.support.imageResize ? this.settings.flash_url : this.settings.flash9_url), '" width="', this.settings.button_width, '" height="', this.settings.button_height, '" class="swfupload">',
+ '<param name="wmode" value="', this.settings.button_window_mode, '" />',
+ '<param name="movie" value="', (this.support.imageResize ? this.settings.flash_url : this.settings.flash9_url), '" />',
+ '<param name="quality" value="high" />',
+ '<param name="allowScriptAccess" value="always" />',
+ '<param name="flashvars" value="' + this.getFlashVars() + '" />',
+ '</object>'].join("");
+};
+
+// Private: getFlashVars builds the parameter string that will be passed
+// to flash in the flashvars param.
+SWFUpload.prototype.getFlashVars = function () {
+ // Build a string from the post param object
+ var httpSuccessString, paramString;
+
+ paramString = this.buildParamString();
+ httpSuccessString = this.settings.http_success.join(",");
+
+ // Build the parameter string
+ return ["movieName=", encodeURIComponent(this.movieName),
+ "&uploadURL=", encodeURIComponent(this.settings.upload_url),
+ "&useQueryString=", encodeURIComponent(this.settings.use_query_string),
+ "&requeueOnError=", encodeURIComponent(this.settings.requeue_on_error),
+ "&httpSuccess=", encodeURIComponent(httpSuccessString),
+ "&assumeSuccessTimeout=", encodeURIComponent(this.settings.assume_success_timeout),
+ "&params=", encodeURIComponent(paramString),
+ "&filePostName=", encodeURIComponent(this.settings.file_post_name),
+ "&fileTypes=", encodeURIComponent(this.settings.file_types),
+ "&fileTypesDescription=", encodeURIComponent(this.settings.file_types_description),
+ "&fileSizeLimit=", encodeURIComponent(this.settings.file_size_limit),
+ "&fileUploadLimit=", encodeURIComponent(this.settings.file_upload_limit),
+ "&fileQueueLimit=", encodeURIComponent(this.settings.file_queue_limit),
+ "&debugEnabled=", encodeURIComponent(this.settings.debug_enabled),
+ "&buttonImageURL=", encodeURIComponent(this.settings.button_image_url),
+ "&buttonWidth=", encodeURIComponent(this.settings.button_width),
+ "&buttonHeight=", encodeURIComponent(this.settings.button_height),
+ "&buttonText=", encodeURIComponent(this.settings.button_text),
+ "&buttonTextTopPadding=", encodeURIComponent(this.settings.button_text_top_padding),
+ "&buttonTextLeftPadding=", encodeURIComponent(this.settings.button_text_left_padding),
+ "&buttonTextStyle=", encodeURIComponent(this.settings.button_text_style),
+ "&buttonAction=", encodeURIComponent(this.settings.button_action),
+ "&buttonDisabled=", encodeURIComponent(this.settings.button_disabled),
+ "&buttonCursor=", encodeURIComponent(this.settings.button_cursor)
+ ].join("");
+};
+
+// Public: get retrieves the DOM reference to the Flash element added by SWFUpload
+// The element is cached after the first lookup
+SWFUpload.prototype.getMovieElement = function () {
+ if (this.movieElement == undefined) {
+ this.movieElement = document.getElementById(this.movieName);
+ }
+
+ if (this.movieElement === null) {
+ throw "Could not find Flash element";
+ }
+
+ return this.movieElement;
+};
+
+// Private: buildParamString takes the name/value pairs in the post_params setting object
+// and joins them up in to a string formatted "name=value&name=value"
+SWFUpload.prototype.buildParamString = function () {
+ var name, postParams, paramStringPairs = [];
+
+ postParams = this.settings.post_params;
+
+ if (typeof(postParams) === "object") {
+ for (name in postParams) {
+ if (postParams.hasOwnProperty(name)) {
+ paramStringPairs.push(encodeURIComponent(name.toString()) + "=" + encodeURIComponent(postParams[name].toString()));
+ }
+ }
+ }
+
+ return paramStringPairs.join("&");
+};
+
+// Public: Used to remove a SWFUpload instance from the page. This method strives to remove
+// all references to the SWF, and other objects so memory is properly freed.
+// Returns true if everything was destroyed. Returns a false if a failure occurs leaving SWFUpload in an inconsistant state.
+// Credits: Major improvements provided by steffen
+SWFUpload.prototype.destroy = function () {
+ var movieElement;
+
+ try {
+ // Make sure Flash is done before we try to remove it
+ this.cancelUpload(null, false);
+
+ movieElement = this.cleanUp();
+
+ // Remove the SWFUpload DOM nodes
+ if (movieElement) {
+ // Remove the Movie Element from the page
+ try {
+ movieElement.parentNode.removeChild(movieElement);
+ } catch (ex) {}
+ }
+
+ // Remove IE form fix reference
+ window[this.movieName] = null;
+
+ // Destroy other references
+ SWFUpload.instances[this.movieName] = null;
+ delete SWFUpload.instances[this.movieName];
+
+ this.movieElement = null;
+ this.settings = null;
+ this.customSettings = null;
+ this.eventQueue = null;
+ this.movieName = null;
+
+
+ return true;
+ } catch (ex2) {
+ return false;
+ }
+};
+
+
+// Public: displayDebugInfo prints out settings and configuration
+// information about this SWFUpload instance.
+// This function (and any references to it) can be deleted when placing
+// SWFUpload in production.
+SWFUpload.prototype.displayDebugInfo = function () {
+ this.debug(
+ [
+ "---SWFUpload Instance Info---\n",
+ "Version: ", SWFUpload.version, "\n",
+ "Movie Name: ", this.movieName, "\n",
+ "Settings:\n",
+ "\t", "upload_url: ", this.settings.upload_url, "\n",
+ "\t", "flash_url: ", this.settings.flash_url, "\n",
+ "\t", "flash9_url: ", this.settings.flash9_url, "\n",
+ "\t", "use_query_string: ", this.settings.use_query_string.toString(), "\n",
+ "\t", "requeue_on_error: ", this.settings.requeue_on_error.toString(), "\n",
+ "\t", "http_success: ", this.settings.http_success.join(", "), "\n",
+ "\t", "assume_success_timeout: ", this.settings.assume_success_timeout, "\n",
+ "\t", "file_post_name: ", this.settings.file_post_name, "\n",
+ "\t", "post_params: ", this.settings.post_params.toString(), "\n",
+ "\t", "file_types: ", this.settings.file_types, "\n",
+ "\t", "file_types_description: ", this.settings.file_types_description, "\n",
+ "\t", "file_size_limit: ", this.settings.file_size_limit, "\n",
+ "\t", "file_upload_limit: ", this.settings.file_upload_limit, "\n",
+ "\t", "file_queue_limit: ", this.settings.file_queue_limit, "\n",
+ "\t", "debug: ", this.settings.debug.toString(), "\n",
+
+ "\t", "prevent_swf_caching: ", this.settings.prevent_swf_caching.toString(), "\n",
+
+ "\t", "button_placeholder_id: ", this.settings.button_placeholder_id.toString(), "\n",
+ "\t", "button_placeholder: ", (this.settings.button_placeholder ? "Set" : "Not Set"), "\n",
+ "\t", "button_image_url: ", this.settings.button_image_url.toString(), "\n",
+ "\t", "button_width: ", this.settings.button_width.toString(), "\n",
+ "\t", "button_height: ", this.settings.button_height.toString(), "\n",
+ "\t", "button_text: ", this.settings.button_text.toString(), "\n",
+ "\t", "button_text_style: ", this.settings.button_text_style.toString(), "\n",
+ "\t", "button_text_top_padding: ", this.settings.button_text_top_padding.toString(), "\n",
+ "\t", "button_text_left_padding: ", this.settings.button_text_left_padding.toString(), "\n",
+ "\t", "button_action: ", this.settings.button_action.toString(), "\n",
+ "\t", "button_cursor: ", this.settings.button_cursor.toString(), "\n",
+ "\t", "button_disabled: ", this.settings.button_disabled.toString(), "\n",
+
+ "\t", "custom_settings: ", this.settings.custom_settings.toString(), "\n",
+ "Event Handlers:\n",
+ "\t", "swfupload_preload_handler assigned: ", (typeof this.settings.swfupload_preload_handler === "function").toString(), "\n",
+ "\t", "swfupload_load_failed_handler assigned: ", (typeof this.settings.swfupload_load_failed_handler === "function").toString(), "\n",
+ "\t", "swfupload_loaded_handler assigned: ", (typeof this.settings.swfupload_loaded_handler === "function").toString(), "\n",
+ "\t", "mouse_click_handler assigned: ", (typeof this.settings.mouse_click_handler === "function").toString(), "\n",
+ "\t", "mouse_over_handler assigned: ", (typeof this.settings.mouse_over_handler === "function").toString(), "\n",
+ "\t", "mouse_out_handler assigned: ", (typeof this.settings.mouse_out_handler === "function").toString(), "\n",
+ "\t", "file_dialog_start_handler assigned: ", (typeof this.settings.file_dialog_start_handler === "function").toString(), "\n",
+ "\t", "file_queued_handler assigned: ", (typeof this.settings.file_queued_handler === "function").toString(), "\n",
+ "\t", "file...
[truncated message content] |
|
From: <kr...@us...> - 2011-12-17 17:16:14
|
Revision: 8515
http://xoops.svn.sourceforge.net/xoops/?rev=8515&view=rev
Author: kris_fr
Date: 2011-12-17 17:16:08 +0000 (Sat, 17 Dec 2011)
Log Message:
-----------
reverting totaly Xortify! - Xoops 2.6.0
Removed Paths:
-------------
XoopsCore/branches/2.6.x/2.6.0/htdocs/Frameworks/moduleclasses/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <zo...@us...> - 2011-12-17 13:57:21
|
Revision: 8514
http://xoops.svn.sourceforge.net/xoops/?rev=8514&view=rev
Author: zoullou
Date: 2011-12-17 13:57:15 +0000 (Sat, 17 Dec 2011)
Log Message:
-----------
Create branch from trunk
Added Paths:
-----------
XoopsModules/extgallery/branches/zoullou/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <zo...@us...> - 2011-12-17 13:48:05
|
Revision: 8513
http://xoops.svn.sourceforge.net/xoops/?rev=8513&view=rev
Author: zoullou
Date: 2011-12-17 13:47:59 +0000 (Sat, 17 Dec 2011)
Log Message:
-----------
Delete branch, wiil recreate from trunk
Removed Paths:
-------------
XoopsModules/extgallery/branches/zoullou/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <zo...@us...> - 2011-12-17 12:35:31
|
Revision: 8512
http://xoops.svn.sourceforge.net/xoops/?rev=8512&view=rev
Author: zoullou
Date: 2011-12-17 12:35:21 +0000 (Sat, 17 Dec 2011)
Log Message:
-----------
First new Ajax/flash multi file uploader commit to community test
Have to add language constant to finalize this Job
Modified Paths:
--------------
XoopsModules/extgallery/branches/zoullou/modules/extgallery/class/photoHandler.php
XoopsModules/extgallery/branches/zoullou/modules/extgallery/public-upload-extended.php
XoopsModules/extgallery/branches/zoullou/modules/extgallery/xoops_version.php
Added Paths:
-----------
XoopsModules/extgallery/branches/zoullou/modules/extgallery/include/SWFUpload/
XoopsModules/extgallery/branches/zoullou/modules/extgallery/include/SWFUpload/css/
XoopsModules/extgallery/branches/zoullou/modules/extgallery/include/SWFUpload/css/default.css
XoopsModules/extgallery/branches/zoullou/modules/extgallery/include/SWFUpload/css/index.html
XoopsModules/extgallery/branches/zoullou/modules/extgallery/include/SWFUpload/images/
XoopsModules/extgallery/branches/zoullou/modules/extgallery/include/SWFUpload/images/SmallSpyGlassWithTransperancy_17x18.png
XoopsModules/extgallery/branches/zoullou/modules/extgallery/include/SWFUpload/images/error.gif
XoopsModules/extgallery/branches/zoullou/modules/extgallery/include/SWFUpload/images/index.html
XoopsModules/extgallery/branches/zoullou/modules/extgallery/include/SWFUpload/images/toobig.gif
XoopsModules/extgallery/branches/zoullou/modules/extgallery/include/SWFUpload/images/uploadlimit.gif
XoopsModules/extgallery/branches/zoullou/modules/extgallery/include/SWFUpload/images/zerobyte.gif
XoopsModules/extgallery/branches/zoullou/modules/extgallery/include/SWFUpload/index.html
XoopsModules/extgallery/branches/zoullou/modules/extgallery/include/SWFUpload/js/
XoopsModules/extgallery/branches/zoullou/modules/extgallery/include/SWFUpload/js/handlers.js
XoopsModules/extgallery/branches/zoullou/modules/extgallery/include/SWFUpload/js/index.html
XoopsModules/extgallery/branches/zoullou/modules/extgallery/include/SWFUpload/js/loader.js.php
XoopsModules/extgallery/branches/zoullou/modules/extgallery/include/SWFUpload/js/swfupload.cookies.js
XoopsModules/extgallery/branches/zoullou/modules/extgallery/include/SWFUpload/js/swfupload.js
XoopsModules/extgallery/branches/zoullou/modules/extgallery/include/SWFUpload/js/swfupload.proxy.js
XoopsModules/extgallery/branches/zoullou/modules/extgallery/include/SWFUpload/js/swfupload.queue.js
XoopsModules/extgallery/branches/zoullou/modules/extgallery/include/SWFUpload/js/swfupload.speed.js
XoopsModules/extgallery/branches/zoullou/modules/extgallery/include/SWFUpload/js/swfupload.swf
XoopsModules/extgallery/branches/zoullou/modules/extgallery/include/SWFUpload/js/swfupload_fp9.swf
XoopsModules/extgallery/branches/zoullou/modules/extgallery/public-post-swfupload.php
XoopsModules/extgallery/branches/zoullou/modules/extgallery/templates/extgallery_public-upload-SWFUpload.html
Removed Paths:
-------------
XoopsModules/extgallery/branches/zoullou/modules/extgallery/public-post-applet.php
XoopsModules/extgallery/branches/zoullou/modules/extgallery/templates/extgallery_public-upload-applet.html
XoopsModules/extgallery/branches/zoullou/modules/extgallery/templates/extgallery_public-upload-applet.html.sav
Modified: XoopsModules/extgallery/branches/zoullou/modules/extgallery/class/photoHandler.php
===================================================================
--- XoopsModules/extgallery/branches/zoullou/modules/extgallery/class/photoHandler.php 2011-12-16 22:13:12 UTC (rev 8511)
+++ XoopsModules/extgallery/branches/zoullou/modules/extgallery/class/photoHandler.php 2011-12-17 12:35:21 UTC (rev 8512)
@@ -73,9 +73,7 @@
$this->ExtgalleryPersistableObjectHandler($db, 'extgallery_'.$type.'photo', 'Extgallery'.ucfirst($type).'photo', 'photo_id');
}
- function createPhoto($data) {
- $photo = $this->create();
- $photo->setVars($data);
+ function createPhoto($photo) {
return $this->insert($photo, true);
}
@@ -586,7 +584,7 @@
if ( isset($_POST['photo_extra']) ) { $photoExtra = $_POST['photo_extra']; }
if ( isset($_POST['tag']) ) { $photoTag = $_POST["tag"]; }
- $photoStatus = $this->addLocalPhoto($catId,$this->photoUploader->getSavedFilename(), $photoTitle, $photoDesc , $photoExtra , $photoTag);
+ $addLocalPhotoRet = $this->addLocalPhoto($catId,$this->photoUploader->getSavedFilename(), $photoTitle, $photoDesc , $photoExtra , $photoTag);
$cat = $catHandler->getCat($catId);
$cat->setVar('cat_isalbum',1);
$catHandler->insert($cat);
@@ -596,8 +594,14 @@
'X_ITEM_CAT'=>$cat->getVar('cat_name'),
'X_ITEM_NBPHOTO'=>1
);
+
+ // Create return array
+ $ret = array(
+ 'ret'=>0,
+ 'obj'=>$addLocalPhotoRet['obj']
+ );
- if($photoStatus == 1) {
+ if($addLocalPhotoRet['ret'] == 1) {
$extraTags['X_ITEM_URL'] = XOOPS_URL."/modules/extgallery/public-album.php?id=".$cat->getVar('cat_id');
$notification_handler->triggerEvent('global', 0, 'new_photo',$extraTags);
$notification_handler->triggerEvent('album', $cat->getVar('cat_id'), 'new_photo_album',$extraTags);
@@ -616,12 +620,13 @@
$criteria->add(new Criteria('nright',$cat->getVar('nright'),'>='));
$catHandler->updateFieldValue('cat_nb_photo', 'cat_nb_photo + 1', $criteria);
- return 0;
+ return $ret;
} else {
$extraTags['X_ITEM_URL'] = XOOPS_URL."/modules/extgallery/admin/photo.php";
$notification_handler->triggerEvent('global', 0, 'new_photo_pending',$extraTags);
- return 1;
+ $ret['ret'] = 1;
+ return $ret;
}
}
@@ -680,15 +685,24 @@
// Deleting working photo
unlink($this->_getUploadPhotoPath().$photoName);
- $this->createPhoto($data);
+ $photo = $this->create();
+ $photo->setVars($data);
+ $this->createPhoto($photo);
+ $photo->cleanVars();
+ // Create return array
+ $ret = array(
+ 'ret'=> $data['photo_approved'],
+ 'obj'=>$photo
+ );
+
if (($xoopsModuleConfig['usetag'] == 1) and (is_dir('../tag'))){
$newid = $this->db->getInsertId();
$tag_handler = xoops_getmodulehandler('tag', 'tag');
$tag_handler->updateByItem($photoTag, $newid , 'extgallery', 0);
}
- return $data['photo_approved'];
+ return $ret;
}
function getSearchedPhoto($queryArray, $condition, $limit, $start, $userId) {
Added: XoopsModules/extgallery/branches/zoullou/modules/extgallery/include/SWFUpload/css/default.css
===================================================================
--- XoopsModules/extgallery/branches/zoullou/modules/extgallery/include/SWFUpload/css/default.css (rev 0)
+++ XoopsModules/extgallery/branches/zoullou/modules/extgallery/include/SWFUpload/css/default.css 2011-12-17 12:35:21 UTC (rev 8512)
@@ -0,0 +1,174 @@
+/* -----------------------------------------------
+ www.swfupload.org
+ Description: Common Screen Stylesheet for SWFUpload Demos
+ Updated on: May 1, 2008
+----------------------------------------------- */
+
+
+/* -- Form Styles ------------------------------- */
+#SWFUpload form {
+ margin: 0;
+ padding: 0;
+}
+
+
+
+#SWFUpload div.fieldset {
+ border: 1px solid #afe14c;
+ margin: 10px 0;
+ padding: 20px 10px;
+}
+#SWFUpload div.fieldset span.legend {
+ position: relative;
+ background-color: #FFF;
+ padding: 3px;
+ top: -30px;
+ font: 700 14px Arial, Helvetica, sans-serif;
+ color: #73b304;
+}
+
+#SWFUpload div.flash {
+ width: 375px;
+ margin: 10px 5px;
+ border-color: #D9E4FF;
+
+ -moz-border-radius-topleft : 5px;
+ -webkit-border-top-left-radius : 5px;
+ -moz-border-radius-topright : 5px;
+ -webkit-border-top-right-radius : 5px;
+ -moz-border-radius-bottomleft : 5px;
+ -webkit-border-bottom-left-radius : 5px;
+ -moz-border-radius-bottomright : 5px;
+ -webkit-border-bottom-right-radius : 5px;
+
+}
+
+#SWFUpload button,
+input,
+select,
+textarea {
+ border-width: 1px;
+ margin-bottom: 10px;
+ padding: 2px 3px;
+}
+
+
+
+#SWFUpload input[disabled]{ border: 1px solid #ccc } /* FF 2 Fix */
+
+
+#SWFUpload label {
+ width: 150px;
+ text-align: right;
+ display:block;
+ margin-right: 5px;
+}
+
+#SWFUpload #btnSubmit { margin: 0 0 0 155px ; }
+
+/* -- Table Styles ------------------------------- */
+#SWFUpload td {
+ font: 10pt Helvetica, Arial, sans-serif;
+ vertical-align: top;
+}
+
+#SWFUpload .progressWrapper {
+ width: 357px;
+ overflow: hidden;
+}
+
+#SWFUpload .progressContainer {
+ margin: 5px;
+ padding: 4px;
+ border: solid 1px #E8E8E8;
+ background-color: #F7F7F7;
+ overflow: hidden;
+}
+/* Message */
+#SWFUpload .message {
+ margin: 1em 0;
+ padding: 10px 20px;
+ border: solid 1px #FFDD99;
+ background-color: #FFFFCC;
+ overflow: hidden;
+}
+/* Error */
+#SWFUpload .red {
+ border: solid 1px #B50000;
+ background-color: #FFEBEB;
+}
+
+/* Current */
+#SWFUpload .green {
+ border: solid 1px #DDF0DD;
+ background-color: #EBFFEB;
+}
+
+/* Complete */
+#SWFUpload .blue {
+ border: solid 1px #CEE2F2;
+ background-color: #F0F5FF;
+}
+
+#SWFUpload .progressName {
+ font-size: 8pt;
+ font-weight: 700;
+ color: #555;
+ width: 323px;
+ height: 14px;
+ text-align: left;
+ white-space: nowrap;
+ overflow: hidden;
+}
+
+#SWFUpload .progressBarInProgress,
+.progressBarComplete,
+.progressBarError {
+ font-size: 0;
+ width: 0%;
+ height: 2px;
+ background-color: blue;
+ margin-top: 2px;
+}
+
+#SWFUpload .progressBarComplete {
+ width: 100%;
+ background-color: green;
+ visibility: hidden;
+}
+
+#SWFUpload .progressBarError {
+ width: 100%;
+ background-color: red;
+ visibility: hidden;
+}
+
+#SWFUpload .progressBarStatus {
+ margin-top: 2px;
+ width: 337px;
+ font-size: 7pt;
+ font-family: Arial;
+ text-align: left;
+ white-space: nowrap;
+}
+
+#SWFUpload a.progressCancel {
+ font-size: 0;
+ display: block;
+ height: 14px;
+ width: 14px;
+ background-image: url(../images/cancelbutton.gif);
+ background-repeat: no-repeat;
+ background-position: -14px 0px;
+ float: right;
+}
+
+#SWFUpload a.progressCancel:hover {
+ background-position: 0px 0px;
+}
+
+
+/* -- SWFUpload Object Styles ------------------------------- */
+#SWFUpload .swfupload {
+ vertical-align: top;
+}
Added: XoopsModules/extgallery/branches/zoullou/modules/extgallery/include/SWFUpload/css/index.html
===================================================================
--- XoopsModules/extgallery/branches/zoullou/modules/extgallery/include/SWFUpload/css/index.html (rev 0)
+++ XoopsModules/extgallery/branches/zoullou/modules/extgallery/include/SWFUpload/css/index.html 2011-12-17 12:35:21 UTC (rev 8512)
@@ -0,0 +1 @@
+ <script>history.go(-1);</script>
\ No newline at end of file
Added: XoopsModules/extgallery/branches/zoullou/modules/extgallery/include/SWFUpload/images/SmallSpyGlassWithTransperancy_17x18.png
===================================================================
(Binary files differ)
Property changes on: XoopsModules/extgallery/branches/zoullou/modules/extgallery/include/SWFUpload/images/SmallSpyGlassWithTransperancy_17x18.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/extgallery/branches/zoullou/modules/extgallery/include/SWFUpload/images/error.gif
===================================================================
(Binary files differ)
Property changes on: XoopsModules/extgallery/branches/zoullou/modules/extgallery/include/SWFUpload/images/error.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/extgallery/branches/zoullou/modules/extgallery/include/SWFUpload/images/index.html
===================================================================
--- XoopsModules/extgallery/branches/zoullou/modules/extgallery/include/SWFUpload/images/index.html (rev 0)
+++ XoopsModules/extgallery/branches/zoullou/modules/extgallery/include/SWFUpload/images/index.html 2011-12-17 12:35:21 UTC (rev 8512)
@@ -0,0 +1 @@
+ <script>history.go(-1);</script>
\ No newline at end of file
Added: XoopsModules/extgallery/branches/zoullou/modules/extgallery/include/SWFUpload/images/toobig.gif
===================================================================
(Binary files differ)
Property changes on: XoopsModules/extgallery/branches/zoullou/modules/extgallery/include/SWFUpload/images/toobig.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/extgallery/branches/zoullou/modules/extgallery/include/SWFUpload/images/uploadlimit.gif
===================================================================
(Binary files differ)
Property changes on: XoopsModules/extgallery/branches/zoullou/modules/extgallery/include/SWFUpload/images/uploadlimit.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/extgallery/branches/zoullou/modules/extgallery/include/SWFUpload/images/zerobyte.gif
===================================================================
(Binary files differ)
Property changes on: XoopsModules/extgallery/branches/zoullou/modules/extgallery/include/SWFUpload/images/zerobyte.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/extgallery/branches/zoullou/modules/extgallery/include/SWFUpload/index.html
===================================================================
--- XoopsModules/extgallery/branches/zoullou/modules/extgallery/include/SWFUpload/index.html (rev 0)
+++ XoopsModules/extgallery/branches/zoullou/modules/extgallery/include/SWFUpload/index.html 2011-12-17 12:35:21 UTC (rev 8512)
@@ -0,0 +1 @@
+ <script>history.go(-1);</script>
\ No newline at end of file
Added: XoopsModules/extgallery/branches/zoullou/modules/extgallery/include/SWFUpload/js/handlers.js
===================================================================
--- XoopsModules/extgallery/branches/zoullou/modules/extgallery/include/SWFUpload/js/handlers.js (rev 0)
+++ XoopsModules/extgallery/branches/zoullou/modules/extgallery/include/SWFUpload/js/handlers.js 2011-12-17 12:35:21 UTC (rev 8512)
@@ -0,0 +1,570 @@
+function preLoad() {
+ if (!this.support.loading) {
+ alert("You need the Flash Player 9.028 or above to use SWFUpload.");
+ return false;
+ }
+}
+function loadFailed() {
+ alert("Something went wrong while loading SWFUpload. If this were a real application we'd clean up and then give you an alternative");
+}
+
+function fileQueued(file) {
+ try {
+ var progress = new FileProgress(file, this.customSettings.progressTarget);
+ progress.setStatus("Pending...");
+ progress.toggleCancel(true, this);
+
+ } catch (ex) {
+ this.debug("fileQueued");
+ this.debug(ex);
+ }
+
+}
+
+function fileQueueError(file, errorCode, message) {
+ try {
+ var imageName = "error.gif";
+ var errorName = "";
+ if (errorCode === SWFUpload.errorCode_QUEUE_LIMIT_EXCEEDED) {
+ errorName = "You have attempted to queue too many files.";
+ }
+
+ if (errorName !== "") {
+ alert(errorName);
+ return;
+ }
+
+ switch (errorCode) {
+ case SWFUpload.QUEUE_ERROR.ZERO_BYTE_FILE:
+ imageName = "zerobyte.gif";
+ break;
+ case SWFUpload.QUEUE_ERROR.FILE_EXCEEDS_SIZE_LIMIT:
+ imageName = "toobig.gif";
+ break;
+ case SWFUpload.QUEUE_ERROR.ZERO_BYTE_FILE:
+ case SWFUpload.QUEUE_ERROR.INVALID_FILETYPE:
+ default:
+ alert(message);
+ break;
+ }
+
+ addImage("images/" + imageName);
+
+ } catch (ex) {
+ this.debug(ex);
+ }
+
+}
+
+function uploadStart(file) {
+ try {
+ /* I don't want to do any file validation or anything, I'll just update the UI and
+ return true to indicate that the upload should start.
+ It's important to update the UI here because in Linux no uploadProgress events are called. The best
+ we can do is say we are uploading.
+ */
+ var progress = new FileProgress(file, this.customSettings.progressTarget);
+ progress.setStatus("Uploading...");
+ progress.toggleCancel(true, this);
+ }
+ catch (ex) {}
+
+ return true;
+}
+
+// function fileDialogComplete(numFilesSelected, numFilesQueued) {
+ // try {
+ // if (numFilesQueued > 0) {
+ // this.startUpload(this.getFile(0).ID);
+ // }
+ // } catch (ex) {
+ // this.debug(ex);
+ // }
+// }
+
+function uploadProgress(file, bytesLoaded) {
+
+ try {
+ var percent = Math.ceil((bytesLoaded / file.size) * 100);
+
+ var progress = new FileProgress(file, this.customSettings.upload_target);
+ progress.setProgress(percent);
+ progress.setStatus("Uploading...");
+ progress.toggleCancel(true, this);
+ } catch (ex) {
+ this.debug(ex);
+ }
+}
+
+function uploadSuccess(file, serverData) {
+ try {
+ // var progress = new FileProgress(file, this.customSettings.upload_target);
+ var progress = new FileProgress(file, this.customSettings.progressTarget);
+
+ if (serverData.substring(0, 7) === "FILEID:") {
+ addImage("hook-thumb.php?id=" + serverData.substring(7));
+
+ progress.setComplete();
+ progress.setStatus("Upload Complete.");
+ progress.toggleCancel(false);
+ } else {
+ addImage("images/error.gif");
+ progress.setStatus("Error.");
+ progress.toggleCancel(false);
+ alert(serverData);
+
+ }
+
+
+ } catch (ex) {
+ this.debug(ex);
+ }
+}
+
+function uploadComplete(file) {
+ try {
+ /* I want the next upload to continue automatically so I'll call startUpload here */
+ if (this.getStats().files_queued > 0) {
+ this.startUpload(this.getFile(0).ID);
+ }
+ } catch (ex) {
+ this.debug(ex);
+ }
+}
+
+function uploadError(file, errorCode, message) {
+ try {
+ var progress = new FileProgress(file, this.customSettings.progressTarget);
+ progress.setError();
+ progress.toggleCancel(false);
+
+ switch (errorCode) {
+ case SWFUpload.UPLOAD_ERROR.HTTP_ERROR:
+ progress.setStatus("Upload Error: " + message);
+ this.debug("Error Code: HTTP Error, File name: " + file.name + ", Message: " + message);
+ break;
+ case SWFUpload.UPLOAD_ERROR.UPLOAD_FAILED:
+ progress.setStatus("Upload Failed.");
+ this.debug("Error Code: Upload Failed, File name: " + file.name + ", File size: " + file.size + ", Message: " + message);
+ break;
+ case SWFUpload.UPLOAD_ERROR.IO_ERROR:
+ progress.setStatus("Server (IO) Error");
+ this.debug("Error Code: IO Error, File name: " + file.name + ", Message: " + message);
+ break;
+ case SWFUpload.UPLOAD_ERROR.SECURITY_ERROR:
+ progress.setStatus("Security Error");
+ this.debug("Error Code: Security Error, File name: " + file.name + ", Message: " + message);
+ break;
+ case SWFUpload.UPLOAD_ERROR.UPLOAD_LIMIT_EXCEEDED:
+ progress.setStatus("Upload limit exceeded.");
+ this.debug("Error Code: Upload Limit Exceeded, File name: " + file.name + ", File size: " + file.size + ", Message: " + message);
+ break;
+ case SWFUpload.UPLOAD_ERROR.FILE_VALIDATION_FAILED:
+ progress.setStatus("Failed Validation. Upload skipped.");
+ this.debug("Error Code: File Validation Failed, File name: " + file.name + ", File size: " + file.size + ", Message: " + message);
+ break;
+ case SWFUpload.UPLOAD_ERROR.FILE_CANCELLED:
+ progress.setStatus("Cancelled");
+ progress.setCancelled();
+ break;
+ case SWFUpload.UPLOAD_ERROR.UPLOAD_STOPPED:
+ progress.setStatus("Stopped");
+ break;
+ default:
+ progress.setStatus("Unhandled Error: " + errorCode);
+ this.debug("Error Code: " + errorCode + ", File name: " + file.name + ", File size: " + file.size + ", Message: " + message);
+ break;
+ }
+ } catch (ex) {
+ this.debug(ex);
+ }
+}
+
+// function uploadError(file, errorCode, message) {
+ // var imageName = "error.gif";
+ // var progress;
+ // try {
+ // switch (errorCode) {
+ // case SWFUpload.UPLOAD_ERROR.FILE_CANCELLED:
+ // try {
+ // progress = new FileProgress(file, this.customSettings.upload_target);
+ // progress.setCancelled();
+ // progress.setStatus("Cancelled");
+ // progress.toggleCancel(false);
+ // }
+ // catch (ex1) {
+ // this.debug(ex1);
+ // }
+ // break;
+ // case SWFUpload.UPLOAD_ERROR.UPLOAD_STOPPED:
+ // try {
+ // progress = new FileProgress(file, this.customSettings.upload_target);
+ // progress.setCancelled();
+ // progress.setStatus("Stopped");
+ // progress.toggleCancel(true);
+ // }
+ // catch (ex2) {
+ // this.debug(ex2);
+ // }
+ // case SWFUpload.UPLOAD_ERROR.UPLOAD_LIMIT_EXCEEDED:
+ // imageName = "uploadlimit.gif";
+ // break;
+ // default:
+ // alert(message);
+ // break;
+ // }
+
+ // addImage("images/" + imageName);
+
+ // } catch (ex3) {
+ // this.debug(ex3);
+ // }
+
+// }
+
+
+function addImage(src) {
+ var newImg = document.createElement("img");
+ newImg.style.margin = "5px";
+
+ document.getElementById("thumbnails").appendChild(newImg);
+ if (newImg.filters) {
+ try {
+ newImg.filters.item("DXImageTransform.Microsoft.Alpha").opacity = 0;
+ } catch (e) {
+ // If it is not set initially, the browser will throw an error. This will set it if it is not set yet.
+ newImg.style.filter = 'progid:DXImageTransform.Microsoft.Alpha(opacity=' + 0 + ')';
+ }
+ } else {
+ newImg.style.opacity = 0;
+ }
+
+ newImg.onload = function () {
+ fadeIn(newImg, 0);
+ };
+ newImg.src = src;
+}
+
+function fadeIn(element, opacity) {
+ var reduceOpacityBy = 5;
+ var rate = 30; // 15 fps
+
+
+ if (opacity < 100) {
+ opacity += reduceOpacityBy;
+ if (opacity > 100) {
+ opacity = 100;
+ }
+
+ if (element.filters) {
+ try {
+ element.filters.item("DXImageTransform.Microsoft.Alpha").opacity = opacity;
+ } catch (e) {
+ // If it is not set initially, the browser will throw an error. This will set it if it is not set yet.
+ element.style.filter = 'progid:DXImageTransform.Microsoft.Alpha(opacity=' + opacity + ')';
+ }
+ } else {
+ element.style.opacity = opacity / 100;
+ }
+ }
+
+ if (opacity < 100) {
+ setTimeout(function () {
+ fadeIn(element, opacity);
+ }, rate);
+ }
+}
+
+/*
+ A simple class for displaying file information and progress
+ Note: This is a demonstration only and not part of SWFUpload.
+ Note: Some have had problems adapting this class in IE7. It may not be suitable for your application.
+*/
+
+// Constructor
+// file is a SWFUpload file object
+// targetID is the HTML element id attribute that the FileProgress HTML structure will be added to.
+// Instantiating a new FileProgress object with an existing file will reuse/update the existing DOM elements
+function FileProgress(file, targetID) {
+ this.fileProgressID = file.id;
+
+ this.opacity = 100;
+ this.height = 0;
+
+
+ this.fileProgressWrapper = document.getElementById(this.fileProgressID);
+ if (!this.fileProgressWrapper) {
+ this.fileProgressWrapper = document.createElement("div");
+ this.fileProgressWrapper.className = "progressWrapper";
+ this.fileProgressWrapper.id = this.fileProgressID;
+
+ this.fileProgressElement = document.createElement("div");
+ this.fileProgressElement.className = "progressContainer";
+
+ var progressCancel = document.createElement("a");
+ progressCancel.className = "progressCancel";
+ progressCancel.href = "#";
+ progressCancel.style.visibility = "hidden";
+ progressCancel.appendChild(document.createTextNode(" "));
+
+ var progressText = document.createElement("div");
+ progressText.className = "progressName";
+ progressText.appendChild(document.createTextNode(file.name));
+
+ var progressBar = document.createElement("div");
+ progressBar.className = "progressBarInProgress";
+
+ var progressStatus = document.createElement("div");
+ progressStatus.className = "progressBarStatus";
+ progressStatus.innerHTML = " ";
+
+ this.fileProgressElement.appendChild(progressCancel);
+ this.fileProgressElement.appendChild(progressText);
+ this.fileProgressElement.appendChild(progressStatus);
+ this.fileProgressElement.appendChild(progressBar);
+
+ this.fileProgressWrapper.appendChild(this.fileProgressElement);
+
+ document.getElementById(targetID).appendChild(this.fileProgressWrapper);
+ } else {
+ this.fileProgressElement = this.fileProgressWrapper.firstChild;
+ this.reset();
+ }
+
+ this.height = this.fileProgressWrapper.offsetHeight;
+ this.setTimer(null);
+
+
+}
+
+FileProgress.prototype.setTimer = function (timer) {
+ this.fileProgressElement["FP_TIMER"] = timer;
+};
+FileProgress.prototype.getTimer = function (timer) {
+ return this.fileProgressElement["FP_TIMER"] || null;
+};
+
+FileProgress.prototype.reset = function () {
+ this.fileProgressElement.className = "progressContainer";
+
+ this.fileProgressElement.childNodes[2].innerHTML = " ";
+ this.fileProgressElement.childNodes[2].className = "progressBarStatus";
+
+ this.fileProgressElement.childNodes[3].className = "progressBarInProgress";
+ this.fileProgressElement.childNodes[3].style.width = "0%";
+
+ this.appear();
+};
+
+FileProgress.prototype.setProgress = function (percentage) {
+ this.fileProgressElement.className = "progressContainer green";
+ this.fileProgressElement.childNodes[3].className = "progressBarInProgress";
+ this.fileProgressElement.childNodes[3].style.width = percentage + "%";
+
+ this.appear();
+};
+FileProgress.prototype.setComplete = function () {
+ this.fileProgressElement.className = "progressContainer blue";
+ this.fileProgressElement.childNodes[3].className = "progressBarComplete";
+ this.fileProgressElement.childNodes[3].style.width = "";
+
+ var oSelf = this;
+ this.setTimer(setTimeout(function () {
+ oSelf.disappear();
+ }, 10000));
+};
+FileProgress.prototype.setError = function () {
+ this.fileProgressElement.className = "progressContainer red";
+ this.fileProgressElement.childNodes[3].className = "progressBarError";
+ this.fileProgressElement.childNodes[3].style.width = "";
+
+ var oSelf = this;
+ this.setTimer(setTimeout(function () {
+ oSelf.disappear();
+ }, 5000));
+};
+FileProgress.prototype.setCancelled = function () {
+ this.fileProgressElement.className = "progressContainer";
+ this.fileProgressElement.childNodes[3].className = "progressBarError";
+ this.fileProgressElement.childNodes[3].style.width = "";
+
+ var oSelf = this;
+ this.setTimer(setTimeout(function () {
+ oSelf.disappear();
+ }, 2000));
+};
+FileProgress.prototype.setStatus = function (status) {
+ this.fileProgressElement.childNodes[2].innerHTML = status;
+};
+
+// Show/Hide the cancel button
+FileProgress.prototype.toggleCancel = function (show, swfUploadInstance) {
+ this.fileProgressElement.childNodes[0].style.visibility = show ? "visible" : "hidden";
+ if (swfUploadInstance) {
+ var fileID = this.fileProgressID;
+ this.fileProgressElement.childNodes[0].onclick = function () {
+ swfUploadInstance.cancelUpload(fileID);
+ return false;
+ };
+ }
+};
+
+FileProgress.prototype.appear = function () {
+ if (this.getTimer() !== null) {
+ clearTimeout(this.getTimer());
+ this.setTimer(null);
+ }
+
+ if (this.fileProgressWrapper.filters) {
+ try {
+ this.fileProgressWrapper.filters.item("DXImageTransform.Microsoft.Alpha").opacity = 100;
+ } catch (e) {
+ // If it is not set initially, the browser will throw an error. This will set it if it is not set yet.
+ this.fileProgressWrapper.style.filter = "progid:DXImageTransform.Microsoft.Alpha(opacity=100)";
+ }
+ } else {
+ this.fileProgressWrapper.style.opacity = 1;
+ }
+
+ this.fileProgressWrapper.style.height = "";
+
+ this.height = this.fileProgressWrapper.offsetHeight;
+ this.opacity = 100;
+ this.fileProgressWrapper.style.display = "";
+
+};
+
+// Fades out and clips away the FileProgress box.
+FileProgress.prototype.disappear = function () {
+
+ var reduceOpacityBy = 15;
+ var reduceHeightBy = 4;
+ var rate = 30; // 15 fps
+
+ if (this.opacity > 0) {
+ this.opacity -= reduceOpacityBy;
+ if (this.opacity < 0) {
+ this.opacity = 0;
+ }
+
+ if (this.fileProgressWrapper.filters) {
+ try {
+ this.fileProgressWrapper.filters.item("DXImageTransform.Microsoft.Alpha").opacity = this.opacity;
+ } catch (e) {
+ // If it is not set initially, the browser will throw an error. This will set it if it is not set yet.
+ this.fileProgressWrapper.style.filter = "progid:DXImageTransform.Microsoft.Alpha(opacity=" + this.opacity + ")";
+ }
+ } else {
+ this.fileProgressWrapper.style.opacity = this.opacity / 100;
+ }
+ }
+
+ if (this.height > 0) {
+ this.height -= reduceHeightBy;
+ if (this.height < 0) {
+ this.height = 0;
+ }
+
+ this.fileProgressWrapper.style.height = this.height + "px";
+ }
+
+ if (this.height > 0 || this.opacity > 0) {
+ var oSelf = this;
+ this.setTimer(setTimeout(function () {
+ oSelf.disappear();
+ }, rate));
+ } else {
+ this.fileProgressWrapper.style.display = "none";
+ this.setTimer(null);
+ }
+};
+
+// /* ******************************************
+ // * FileProgress Object
+ // * Control object for displaying file info
+ // * ****************************************** */
+
+// function FileProgress(file, targetID) {
+ // this.fileProgressID = "divFileProgress";
+
+ // this.fileProgressWrapper = document.getElementById(this.fileProgressID);
+ // if (!this.fileProgressWrapper) {
+ // this.fileProgressWrapper = document.createElement("div");
+ // this.fileProgressWrapper.className = "progressWrapper";
+ // this.fileProgressWrapper.id = this.fileProgressID;
+
+ // this.fileProgressElement = document.createElement("div");
+ // this.fileProgressElement.className = "progressContainer";
+
+ // var progressCancel = document.createElement("a");
+ // progressCancel.className = "progressCancel";
+ // progressCancel.href = "#";
+ // progressCancel.style.visibility = "hidden";
+ // progressCancel.appendChild(document.createTextNode(" "));
+
+ // var progressText = document.createElement("div");
+ // progressText.className = "progressName";
+ // progressText.appendChild(document.createTextNode(file.name));
+
+ // var progressBar = document.createElement("div");
+ // progressBar.className = "progressBarInProgress";
+
+ // var progressStatus = document.createElement("div");
+ // progressStatus.className = "progressBarStatus";
+ // progressStatus.innerHTML = " ";
+
+ // this.fileProgressElement.appendChild(progressCancel);
+ // this.fileProgressElement.appendChild(progressText);
+ // this.fileProgressElement.appendChild(progressStatus);
+ // this.fileProgressElement.appendChild(progressBar);
+
+ // this.fileProgressWrapper.appendChild(this.fileProgressElement);
+
+ // document.getElementById(targetID).appendChild(this.fileProgressWrapper);
+ // fadeIn(this.fileProgressWrapper, 0);
+
+ // } else {
+ // this.fileProgressElement = this.fileProgressWrapper.firstChild;
+ // this.fileProgressElement.childNodes[1].firstChild.nodeValue = file.name;
+ // }
+
+ // this.height = this.fileProgressWrapper.offsetHeight;
+
+// }
+// FileProgress.prototype.setProgress = function (percentage) {
+ // this.fileProgressElement.className = "progressContainer green";
+ // this.fileProgressElement.childNodes[3].className = "progressBarInProgress";
+ // this.fileProgressElement.childNodes[3].style.width = percentage + "%";
+// };
+// FileProgress.prototype.setComplete = function () {
+ // this.fileProgressElement.className = "progressContainer blue";
+ // this.fileProgressElement.childNodes[3].className = "progressBarComplete";
+ // this.fileProgressElement.childNodes[3].style.width = "";
+
+// };
+// FileProgress.prototype.setError = function () {
+ // this.fileProgressElement.className = "progressContainer red";
+ // this.fileProgressElement.childNodes[3].className = "progressBarError";
+ // this.fileProgressElement.childNodes[3].style.width = "";
+
+// };
+// FileProgress.prototype.setCancelled = function () {
+ // this.fileProgressElement.className = "progressContainer";
+ // this.fileProgressElement.childNodes[3].className = "progressBarError";
+ // this.fileProgressElement.childNodes[3].style.width = "";
+
+// };
+// FileProgress.prototype.setStatus = function (status) {
+ // this.fileProgressElement.childNodes[2].innerHTML = status;
+// };
+
+// FileProgress.prototype.toggleCancel = function (show, swfuploadInstance) {
+ // this.fileProgressElement.childNodes[0].style.visibility = show ? "visible" : "hidden";
+ // if (swfuploadInstance) {
+ // var fileID = this.fileProgressID;
+ // this.fileProgressElement.childNodes[0].onclick = function () {
+ // swfuploadInstance.cancelUpload(fileID);
+ // return false;
+ // };
+ // }
+// };
\ No newline at end of file
Added: XoopsModules/extgallery/branches/zoullou/modules/extgallery/include/SWFUpload/js/index.html
===================================================================
--- XoopsModules/extgallery/branches/zoullou/modules/extgallery/include/SWFUpload/js/index.html (rev 0)
+++ XoopsModules/extgallery/branches/zoullou/modules/extgallery/include/SWFUpload/js/index.html 2011-12-17 12:35:21 UTC (rev 8512)
@@ -0,0 +1 @@
+ <script>history.go(-1);</script>
\ No newline at end of file
Added: XoopsModules/extgallery/branches/zoullou/modules/extgallery/include/SWFUpload/js/loader.js.php
===================================================================
--- XoopsModules/extgallery/branches/zoullou/modules/extgallery/include/SWFUpload/js/loader.js.php (rev 0)
+++ XoopsModules/extgallery/branches/zoullou/modules/extgallery/include/SWFUpload/js/loader.js.php 2011-12-17 12:35:21 UTC (rev 8512)
@@ -0,0 +1,69 @@
+<?php require '../../../../../mainfile.php';?>
+
+var swfu;
+var phpSessid;
+var categorieField;
+
+function eXtGalleryCategoryChange() {
+ categorieField = document.getElementById('cat_id').options[document.getElementById('cat_id').selectedIndex].value;
+ swfu.setPostParams({"PHPSESSID": phpSessid,"cat_id": categorieField});
+}
+
+window.onload = function () {
+
+ categorieField = document.getElementById('cat_id').options[document.getElementById('cat_id').selectedIndex].value;
+ phpSessid = "<?php echo session_id(); ?>";
+
+ var settings = {
+ // Backend Settings
+ upload_url: "<?php echo XOOPS_URL;?>/modules/extgallery/public-post-swfupload.php",
+ post_params: {"PHPSESSID": phpSessid,"cat_id": categorieField},
+
+ // File Upload Settings
+ file_size_limit : "10 MB",
+ file_types : "*.jpg;*.png;*.gif",
+ file_types_description : "Allowed Files",
+ file_upload_limit : 0,
+ custom_settings : {
+ progressTarget : "fsUploadProgress",
+ upload_target : "divFileProgressContainer",
+ cancelButtonId : "btnCancel"
+ },
+
+ // Event Handler Settings - these functions as defined in Handlers.js
+ // The handlers are not part of SWFUpload but are part of my website and control how
+ // my website reacts to the SWFUpload events.
+ swfupload_preload_handler : preLoad,
+ swfupload_load_failed_handler : loadFailed,
+ file_queued_handler : fileQueued,
+ file_queue_error_handler : fileQueueError,
+ //file_dialog_complete_handler : fileDialogComplete,
+ upload_start_handler : uploadStart,
+ upload_progress_handler : uploadProgress,
+ upload_error_handler : uploadError,
+ upload_success_handler : uploadSuccess,
+ upload_complete_handler : uploadComplete,
+
+ // Button Settings
+ button_image_url : "images/SmallSpyGlassWithTransperancy_17x18.png",
+ button_placeholder_id : "spanButtonPlaceholder",
+ button_width: 180,
+ button_height: 18,
+ button_text : '<span class="button">Select Images <span class="buttonSmall">(10 MB Max)</span></span>',
+ button_text_style : '.button { font-family: Helvetica, Arial, sans-serif; font-size: 12pt; } .buttonSmall { font-size: 10pt; }',
+ button_text_top_padding: 0,
+ button_text_left_padding: 18,
+ button_window_mode: SWFUpload.WINDOW_MODE.TRANSPARENT,
+ button_cursor: SWFUpload.CURSOR.HAND,
+
+ // Flash Settings
+ flash_url : "<?php echo XOOPS_URL;?>/modules/extgallery/include/SWFUpload/js/swfupload.swf",
+ flash9_url : "<?php echo XOOPS_URL;?>/modules/extgallery/include/SWFUpload/js/swfupload_FP9.swf",
+
+ // Debug Settings
+ debug: false
+ };
+
+ swfu = new SWFUpload(settings);
+
+};
\ No newline at end of file
Added: XoopsModules/extgallery/branches/zoullou/modules/extgallery/include/SWFUpload/js/swfupload.cookies.js
===================================================================
--- XoopsModules/extgallery/branches/zoullou/modules/extgallery/include/SWFUpload/js/swfupload.cookies.js (rev 0)
+++ XoopsModules/extgallery/branches/zoullou/modules/extgallery/include/SWFUpload/js/swfupload.cookies.js 2011-12-17 12:35:21 UTC (rev 8512)
@@ -0,0 +1,53 @@
+/*
+ Cookie Plug-in
+
+ This plug in automatically gets all the cookies for this site and adds them to the post_params.
+ Cookies are loaded only on initialization. The refreshCookies function can be called to update the post_params.
+ The cookies will override any other post params with the same name.
+*/
+
+var SWFUpload;
+if (typeof(SWFUpload) === "function") {
+ SWFUpload.prototype.initSettings = function (oldInitSettings) {
+ return function (userSettings) {
+ if (typeof(oldInitSettings) === "function") {
+ oldInitSettings.call(this, userSettings);
+ }
+
+ this.refreshCookies(false); // The false parameter must be sent since SWFUpload has not initialzed at this point
+ };
+ }(SWFUpload.prototype.initSettings);
+
+ // refreshes the post_params and updates SWFUpload. The sendToFlash parameters is optional and defaults to True
+ SWFUpload.prototype.refreshCookies = function (sendToFlash) {
+ if (sendToFlash === undefined) {
+ sendToFlash = true;
+ }
+ sendToFlash = !!sendToFlash;
+
+ // Get the post_params object
+ var postParams = this.settings.post_params;
+
+ // Get the cookies
+ var i, cookieArray = document.cookie.split(';'), caLength = cookieArray.length, c, eqIndex, name, value;
+ for (i = 0; i < caLength; i++) {
+ c = cookieArray[i];
+
+ // Left Trim spaces
+ while (c.charAt(0) === " ") {
+ c = c.substring(1, c.length);
+ }
+ eqIndex = c.indexOf("=");
+ if (eqIndex > 0) {
+ name = c.substring(0, eqIndex);
+ value = c.substring(eqIndex + 1);
+ postParams[name] = value;
+ }
+ }
+
+ if (sendToFlash) {
+ this.setPostParams(postParams);
+ }
+ };
+
+}
Added: XoopsModules/extgallery/branches/zoullou/modules/extgallery/include/SWFUpload/js/swfupload.js
===================================================================
--- XoopsModules/extgallery/branches/zoullou/modules/extgallery/include/SWFUpload/js/swfupload.js (rev 0)
+++ XoopsModules/extgallery/branches/zoullou/modules/extgallery/include/SWFUpload/js/swfupload.js 2011-12-17 12:35:21 UTC (rev 8512)
@@ -0,0 +1,1132 @@
+/**
+ * SWFUpload: http://www.swfupload.org, http://swfupload.googlecode.com
+ *
+ * mmSWFUpload 1.0: Flash upload dialog - http://profandesign.se/swfupload/, http://www.vinterwebb.se/
+ *
+ * SWFUpload is (c) 2006-2007 Lars Huring, Olov Nilz\xE9n and Mammon Media and is released under the MIT License:
+ * http://www.opensource.org/licenses/mit-license.php
+ *
+ * SWFUpload 2 is (c) 2007-2008 Jake Roberts and is released under the MIT License:
+ * http://www.opensource.org/licenses/mit-license.php
+ *
+ * SWFObject v2.2 <http://code.google.com/p/swfobject/>
+ * is released under the MIT License <http://www.opensource.org/licenses/mit-license.php>
+ */
+
+
+
+/* ******************* */
+/* Constructor & Init */
+/* ******************* */
+var SWFUpload;
+var swfobject;
+
+if (SWFUpload == undefined) {
+ SWFUpload = function (settings) {
+ this.initSWFUpload(settings);
+ };
+}
+
+SWFUpload.prototype.initSWFUpload = function (userSettings) {
+ try {
+ this.customSettings = {}; // A container where developers can place their own settings associated with this instance.
+ this.settings = {};
+ this.eventQueue = [];
+ this.movieName = "SWFUpload_" + SWFUpload.movieCount++;
+ this.movieElement = null;
+
+
+ // Setup global control tracking
+ SWFUpload.instances[this.movieName] = this;
+
+ // Load the settings. Load the Flash movie.
+ this.initSettings(userSettings);
+ this.loadSupport();
+ if (this.swfuploadPreload()) {
+ this.loadFlash();
+ }
+
+ this.displayDebugInfo();
+ } catch (ex) {
+ delete SWFUpload.instances[this.movieName];
+ throw ex;
+ }
+};
+
+/* *************** */
+/* Static Members */
+/* *************** */
+SWFUpload.instances = {};
+SWFUpload.movieCount = 0;
+SWFUpload.version = "2.5.0 2010-01-15 Beta 2";
+SWFUpload.QUEUE_ERROR = {
+ QUEUE_LIMIT_EXCEEDED : -100,
+ FILE_EXCEEDS_SIZE_LIMIT : -110,
+ ZERO_BYTE_FILE : -120,
+ INVALID_FILETYPE : -130
+};
+SWFUpload.UPLOAD_ERROR = {
+ HTTP_ERROR : -200,
+ MISSING_UPLOAD_URL : -210,
+ IO_ERROR : -220,
+ SECURITY_ERROR : -230,
+ UPLOAD_LIMIT_EXCEEDED : -240,
+ UPLOAD_FAILED : -250,
+ SPECIFIED_FILE_ID_NOT_FOUND : -260,
+ FILE_VALIDATION_FAILED : -270,
+ FILE_CANCELLED : -280,
+ UPLOAD_STOPPED : -290,
+ RESIZE : -300
+};
+SWFUpload.FILE_STATUS = {
+ QUEUED : -1,
+ IN_PROGRESS : -2,
+ ERROR : -3,
+ COMPLETE : -4,
+ CANCELLED : -5
+};
+SWFUpload.UPLOAD_TYPE = {
+ NORMAL : -1,
+ RESIZED : -2
+};
+
+SWFUpload.BUTTON_ACTION = {
+ SELECT_FILE : -100,
+ SELECT_FILES : -110,
+ START_UPLOAD : -120,
+ JAVASCRIPT : -130, // DEPRECATED
+ NONE : -130
+};
+SWFUpload.CURSOR = {
+ ARROW : -1,
+ HAND : -2
+};
+SWFUpload.WINDOW_MODE = {
+ WINDOW : "window",
+ TRANSPARENT : "transparent",
+ OPAQUE : "opaque"
+};
+
+SWFUpload.RESIZE_ENCODING = {
+ JPEG : -1,
+ PNG : -2
+};
+
+// Private: takes a URL, determines if it is relative and converts to an absolute URL
+// using the current site. Only processes the URL if it can, otherwise returns the URL untouched
+SWFUpload.completeURL = function (url) {
+ try {
+ var path = "", indexSlash = -1;
+ if (typeof(url) !== "string" || url.match(/^https?:\/\//i) || url.match(/^\//) || url === "") {
+ return url;
+ }
+
+ indexSlash = window.location.pathname.lastIndexOf("/");
+ if (indexSlash <= 0) {
+ path = "/";
+ } else {
+ path = window.location.pathname.substr(0, indexSlash) + "/";
+ }
+
+ return path + url;
+ } catch (ex) {
+ return url;
+ }
+};
+
+// Public: assign a new function to onload to use swfobject's domLoad functionality
+SWFUpload.onload = function () {};
+
+
+/* ******************** */
+/* Instance Members */
+/* ******************** */
+
+// Private: initSettings ensures that all the
+// settings are set, getting a default value if one was not assigned.
+SWFUpload.prototype.initSettings = function (userSettings) {
+ this.ensureDefault = function (settingName, defaultValue) {
+ var setting = userSettings[settingName];
+ if (setting != undefined) {
+ this.settings[settingName] = setting;
+ } else {
+ this.settings[settingName] = defaultValue;
+ }
+ };
+
+ // Upload backend settings
+ this.ensureDefault("upload_url", "");
+ this.ensureDefault("preserve_relative_urls", false);
+ this.ensureDefault("file_post_name", "Filedata");
+ this.ensureDefault("post_params", {});
+ this.ensureDefault("use_query_string", false);
+ this.ensureDefault("requeue_on_error", false);
+ this.ensureDefault("http_success", []);
+ this.ensureDefault("assume_success_timeout", 0);
+
+ // File Settings
+ this.ensureDefault("file_types", "*.*");
+ this.ensureDefault("file_types_description", "All Files");
+ this.ensureDefault("file_size_limit", 0); // Default zero means "unlimited"
+ this.ensureDefault("file_upload_limit", 0);
+ this.ensureDefault("file_queue_limit", 0);
+
+ // Flash Settings
+ this.ensureDefault("flash_url", "swfupload.swf");
+ this.ensureDefault("flash9_url", "swfupload_fp9.swf");
+ this.ensureDefault("prevent_swf_caching", true);
+
+ // Button Settings
+ this.ensureDefault("button_image_url", "");
+ this.ensureDefault("button_width", 1);
+ this.ensureDefault("button_height", 1);
+ this.ensureDefault("button_text", "");
+ this.ensureDefault("button_text_style", "color: #000000; font-size: 16pt;");
+ this.ensureDefault("button_text_top_padding", 0);
+ this.ensureDefault("button_text_left_padding", 0);
+ this.ensureDefault("button_action", SWFUpload.BUTTON_ACTION.SELECT_FILES);
+ this.ensureDefault("button_disabled", false);
+ this.ensureDefault("button_placeholder_id", "");
+ this.ensureDefault("button_placeholder", null);
+ this.ensureDefault("button_cursor", SWFUpload.CURSOR.ARROW);
+ this.ensureDefault("button_window_mode", SWFUpload.WINDOW_MODE.WINDOW);
+
+ // Debug Settings
+ this.ensureDefault("debug", false);
+ this.settings.debug_enabled = this.settings.debug; // Here to maintain v2 API
+
+ // Event Handlers
+ this.settings.return_upload_start_handler = this.returnUploadStart;
+ this.ensureDefault("swfupload_preload_handler", null);
+ this.ensureDefault("swfupload_load_failed_handler", null);
+ this.ensureDefault("swfupload_loaded_handler", null);
+ this.ensureDefault("file_dialog_start_handler", null);
+ this.ensureDefault("file_queued_handler", null);
+ this.ensureDefault("file_queue_error_handler", null);
+ this.ensureDefault("file_dialog_complete_handler", null);
+
+ this.ensureDefault("upload_resize_start_handler", null);
+ this.ensureDefault("upload_start_handler", null);
+ this.ensureDefault("upload_progress_handler", null);
+ this.ensureDefault("upload_error_handler", null);
+ this.ensureDefault("upload_success_handler", null);
+ this.ensureDefault("upload_complete_handler", null);
+
+ this.ensureDefault("mouse_click_handler", null);
+ this.ensureDefault("mouse_out_handler", null);
+ this.ensureDefault("mouse_over_handler", null);
+
+ this.ensureDefault("debug_handler", this.debugMessage);
+
+ this.ensureDefault("custom_settings", {});
+
+ // Other settings
+ this.customSettings = this.settings.custom_settings;
+
+ // Update the flash url if needed
+ if (!!this.settings.prevent_swf_caching) {
+ this.settings.flash_url = this.settings.flash_url + (this.settings.flash_url.indexOf("?") < 0 ? "?" : "&") + "preventswfcaching=" + new Date().getTime();
+ this.settings.flash9_url = this.settings.flash9_url + (this.settings.flash9_url.indexOf("?") < 0 ? "?" : "&") + "preventswfcaching=" + new Date().getTime();
+ }
+
+ if (!this.settings.preserve_relative_urls) {
+ this.settings.upload_url = SWFUpload.completeURL(this.settings.upload_url);
+ this.settings.button_image_url = SWFUpload.completeURL(this.settings.button_image_url);
+ }
+
+ delete this.ensureDefault;
+};
+
+// Initializes the supported functionality based the Flash Player version, state, and event that occur during initialization
+SWFUpload.prototype.loadSupport = function () {
+ this.support = {
+ loading : swfobject.hasFlashPlayerVersion("9.0.28"),
+ imageResize : swfobject.hasFlashPlayerVersion("10.0.0")
+ };
+
+};
+
+// Private: loadFlash replaces the button_placeholder element with the flash movie.
+SWFUpload.prototype.loadFlash = function () {
+ var targetElement, tempParent, wrapperType, flashHTML, els;
+
+ if (!this.support.loading) {
+ this.queueEvent("swfupload_load_failed_handler", ["Flash Player doesn't support SWFUpload"]);
+ return;
+ }
+
+ // Make sure an element with the ID we are going to use doesn't already exist
+ if (document.getElementById(this.movieName) !== null) {
+ this.support.loading = false;
+ this.queueEvent("swfupload_load_failed_handler", ["Element ID already in use"]);
+ return;
+ }
+
+ // Get the element where we will be placing the flash movie
+ targetElement = document.getElementById(this.settings.button_placeholder_id) || this.settings.button_placeholder;
+
+ if (targetElement == undefined) {
+ this.support.loading = false;
+ this.queueEvent("swfupload_load_failed_handler", ["button place holder not found"]);
+ return;
+ }
+
+ wrapperType = (targetElement.currentStyle && targetElement.currentStyle["display"] || window.getComputedStyle && document.defaultView.getComputedStyle(targetElement, null).getPropertyValue("display")) !== "block" ? "span" : "div";
+
+ // Append the container and load the flash
+ tempParent = document.createElement(wrapperType);
+
+ flashHTML = this.getFlashHTML();
+
+ try {
+ tempParent.innerHTML = flashHTML; // Using innerHTML is non-standard but the only sensible way to dynamically add Flash in IE (and maybe other browsers)
+ } catch (ex) {
+ this.support.loading = false;
+ this.queueEvent("swfupload_load_failed_handler", ["Exception loading Flash HTML into placeholder"]);
+ return;
+ }
+
+ // Try to get the movie element immediately
+ els = tempParent.getElementsByTagName("object");
+ if (!els || els.length > 1 || els.length === 0) {
+ this.support.loading = false;
+ this.queueEvent("swfupload_load_failed_handler", ["Unable to find movie after adding to DOM"]);
+ return;
+ } else if (els.length === 1) {
+ this.movieElement = els[0];
+ }
+
+ targetElement.parentNode.replaceChild(tempParent.firstChild, targetElement);
+
+ // Fix IE Flash/Form bug
+ if (window[this.movieName] == undefined) {
+ window[this.movieName] = this.getMovieElement();
+ }
+};
+
+// Private: getFlashHTML generates the object tag needed to embed the flash in to the document
+SWFUpload.prototype.getFlashHTML = function (flashVersion) {
+ // Flash Satay object syntax: http://www.alistapart.com/articles/flashsatay
+ return ['<object id="', this.movieName, '" type="application/x-shockwave-flash" data="', (this.support.imageResize ? this.settings.flash_url : this.settings.flash9_url), '" width="', this.settings.button_width, '" height="', this.settings.button_height, '" class="swfupload">',
+ '<param name="wmode" value="', this.settings.button_window_mode, '" />',
+ '<param name="movie" value="', (this.support.imageResize ? this.settings.flash_url : this.settings.flash9_url), '" />',
+ '<param name="quality" value="high" />',
+ '<param name="allowScriptAccess" value="always" />',
+ '<param name="flashvars" value="' + this.getFlashVars() + '" />',
+ '</object>'].join("");
+};
+
+// Private: getFlashVars builds the parameter string that will be passed
+// to flash in the flashvars param.
+SWFUpload.prototype.getFlashVars = function () {
+ // Build a string from the post param object
+ var httpSuccessString, paramString;
+
+ paramString = this.buildParamString();
+ httpSuccessString = this.settings.http_success.join(",");
+
+ // Build the parameter string
+ return ["movieName=", encodeURIComponent(this.movieName),
+ "&uploadURL=", encodeURIComponent(this.settings.upload_url),
+ "&useQueryString=", encodeURIComponent(this.settings.use_query_string),
+ "&requeueOnError=", encodeURIComponent(this.settings.requeue_on_error),
+ "&httpSuccess=", encodeURIComponent(httpSuccessString),
+ "&assumeSuccessTimeout=", encodeURIComponent(this.settings.assume_success_timeout),
+ "&params=", encodeURIComponent(paramString),
+ "&filePostName=", encodeURIComponent(this.settings.file_post_name),
+ "&fileTypes=", encodeURIComponent(this.settings.file_types),
+ "&fileTypesDescription=", encodeURIComponent(this.settings.file_types_description),
+ "&fileSizeLimit=", encodeURIComponent(this.settings.file_size_limit),
+ "&fileUploadLimit=", encodeURIComponent(this.settings.file_upload_limit),
+ "&fileQueueLimit=", encodeURIComponent(this.settings.file_queue_limit),
+ "&debugEnabled=", encodeURIComponent(this.settings.debug_enabled),
+ "&buttonImageURL=", encodeURIComponent(this.settings.button_image_url),
+ "&buttonWidth=", encodeURIComponent(this.settings.button_width),
+ "&buttonHeight=", encodeURIComponent(this.settings.button_height),
+ "&buttonText=", encodeURIComponent(this.settings.button_text),
+ "&buttonTextTopPadding=", encodeURIComponent(this.settings.button_text_top_padding),
+ "&buttonTextLeftPadding=", encodeURIComponent(this.settings.button_text_left_padding),
+ "&buttonTextStyle=", encodeURIComponent(this.settings.button_text_style),
+ "&buttonAction=", encodeURIComponent(this.settings.button_action),
+ "&buttonDisabled=", encodeURIComponent(this.settings.button_disabled),
+ "&buttonCursor=", encodeURIComponent(this.settings.button_cursor)
+ ].join("");
+};
+
+// Public: get retrieves the DOM reference to the Flash element added by SWFUpload
+// The element is cached after the first lookup
+SWFUpload.prototype.getMovieElement = function () {
+ if (this.movieElement == undefined) {
+ this.movieElement = document.getElementById(this.movieName);
+ }
+
+ if (this.movieElement === null) {
+ throw "Could not find Flash element";
+ }
+
+ return this.movieElement;
+};
+
+// Private: buildParamString takes the name/value pairs in the post_params setting object
+// and joins them up in to a string formatted "name=value&name=value"
+SWFUpload.prototype.buildParamString = function () {
+ var name, postParams, paramStringPairs = [];
+
+ postParams = this.settings.post_params;
+
+ if (typeof(postParams) === "object") {
+ for (name in postParams) {
+ if (postParams.hasOwnProperty(name)) {
+ paramStringPairs.push(encodeURIComponent(name.toString()) + "=" + encodeURIComponent(postParams[name].toString()));
+ }
+ }
+ }
+
+ return paramStringPairs.join("&");
+};
+
+// Public: Used to remove a SWFUpload instance from the page. This method strives to remove
+// all references to the SWF, and other objects so memory is properly freed.
+// Returns true if everything was destroyed. Returns a false if a failure occurs leaving SWFUpload in an inconsistant state.
+// Credits: Major improvements provided by steffen
+SWFUpload.prototype.destroy = function () {
+ var movieElement;
+
+ try {
+ // Make sure Flash is done before we try to remove it
+ this.cancelUpload(null, false);
+
+ movieElement = this.cleanUp();
+
+ // Remove the SWFUpload DOM nodes
+ if (movieElement) {
+ // Remove the Movie Element from the page
+ try {
+ movieElement.parentNode.removeChild(movieElement);
+ } catch (ex) {}
+ }
+
+ // Remove IE form fix reference
+ window[this.movieName] = null;
+
+ // Destroy other references
+ SWFUpload.instances[this.movieName] = null;
+ delete SWFUpload.instances[this.movieName];
+
+ this.movieElement = null;
+ this.settings = null;
+ this.customSettings = null;
+ this.eventQueue = null;
+ this.movieName = null;
+
+
+ return true;
+ } catch (ex2) {
+ return false;
+ }
+};
+
+
+// Public: displayDebugInfo prints out settings and configuration
+// information about this SWFUpload instance.
+// This function (and any references to it) can be deleted when placing
+// SWFUpload in production.
+SWFUpload.prototype.displayDebugInfo = function () {
+ this.debug(
+ [
+ "---SWFUpload Instance Info---\n",
+ "Version: ", SWFUpload.version, "\n",
+ "Movie Name: ", this.movieName, "\n",
+ "Settings:\n",
+ "\t", "upload_url: ", this.settings.upload_url, "\n",
+ "\t", "flash_url: ", this.settings.flash_url, "\n",
+ "\t", "flash9_url: ", this.settings.flash9_url, "\n",
+ "\t", "use_query_string: ", this.settings.use_query_string.toString(), "\n",
+ "\t", "requeue_on_error: ", this.settings.requeue_on_error.toString(), "\n",
+ "\t", "http_success: ", this.settings.http_success.join(", "), "\n",
+ "\t", "assume_success_timeout: ", this.settings.assume_success_timeout, "\n",
+ "\t", "file_post_name: ", this.settings.file_post_name, "\n",
+ "\t", "post_params: ", this.settings.post_params.toString(), "\n",
+ "\t", "file_types: ", this.settings.file_types, "\n",
+ "\t", "file_types_description: ", this.settings.file_types_description, "\n",
+ "\t", "file_size_limit: ", this.settings.file_size_limit, "\n",
+ "\t", "file_upload_limit: ", this.settings.file_upload_limit, "\n",
+ "\t", "file_queue_limit: ", this.settings.file_queue_limit, "\n",
+ "\t", "debug: ", this.settings.debug.toString(), "\n",
+
+ "\t", "prevent_swf_caching: ", this.settings.prevent_swf_caching.toString(), "\n",
+
+ "\t", "button_placeholder_id: ", this.settings.button_placeholder_id.toString(), "\n",
+ "\t", "button_placeholder: ", (this.settings.button_placeholder ? "Set" : "Not Set"), "\n",
+ "\t", "button_image_url: ", this.settings.button_image_url.toString(), "\n",
+ "\t", "button_width: ", this.settings.button_width.toString(), "\n",
+ "\t", "button_height: ", this.settings.button_height.toString(), "\n",
+ "\t", "button_text: ", this.settings.button_text.toString(), "\n",
+ "\t", "button_text_style: ", this.settings.button_text_style.toString(), "\n",
+ "\t", "button_text_top_padding: ", this.settings.button_text_top_padding.toString(), "\n",
+ "\t", "button_text_left_padding: ", this.settings.button_text_left_padding.toString(), "\n",
+ "\t", "button_action: ", this.settings.button_action.toString(), "\n",
+ "\t", "button_cursor: ", this.settings.button_cursor.toString(), "\n",
+ "\t", "button_disabled: ", this.settings.button_disabled.toString(), "\n",
+
+ "\t", "custom_settings: ", this.settings.custom_settings.toString(), "\n",
+ "Event Handlers:\n",
+ "\t", "swfupload_preload_handler assigned: ", (typeof this.settings.swfupload_preload_handler === "function").toString(), "\n",
+ "\t", "swfupload_load_failed_handler assigned: ", (typeof this.settings.swfupload_load_failed_handler === "function").toString(), "\n",
+ "\t", "swfupload_loaded_handler assigned: ", (typeof this.settings.swfupload_loaded_handler === "function").toString(), "\n",
+ "\t", "mouse_click_handler assigned: ", (typeof this.settings.mouse_click_handler === "function").toString(), "\n",
+ "\t", "mouse_over_handler assigned: ", (typeof this.settings.mouse_over_handler === "function").toString(), "\n",
+ "\t", "mouse_out_handler assigned: ", (typeof this.settings.mouse_out_handler === "function").toString(), "\n",
+ "\t", "file_dialog_start_handler assigned: ", (typeof this.settings.file_dialog_start_handler === "function").toString(), "\n",
+ "\t", "file_queued_handler assigned: ", (typeof this.settings.file_queued_handler === "function").toString(), "\n",
+ "\t", "file_queue_error_handler assigned: ", (typeof this.settings.file_queue_error_handler === "function").toString(), "\n",
+ "\t", "upload_resize_start_handler assigned: ", (typeof this.settings.upload_resize_start_handler === "function").toString(), "\n",
+ "\t", "upload_start_handler assigned: ", (typeof this.settings.upload_start_handler === "function").toString(), "\n",
+ "\t", "upload_progress_handler assigned: ", (typeof this.settings.upload_progress_handler === "function").toString(), "\n",
+ "\t", "upload_error_handler assigned: ", (typeof this.settings.upload_error_handler === "function").toString(), "\n",
+ "\t", "upload_success_handler assigned: ", (typeof this.settings.upload_success_handler === "function").toString(), "\n",
+ "\t", "upload_complete_handler assigned: ", (typeof this.settings.upload_complete_handler === "function").toString(), "\n",
+ "\t", "debug_handler assigned: ", (typeof this.settings.debug_handler === "function").toString(), "\n",
+
+ "Support:\n",
+ "\t", "Load: ", (this.support.loading ? "Yes" : "No"), "\n",
+ "\t", "Image Resize: ", (this.support.imageResize ? "Yes" : "No"), "\n"
+
+ ].join("")
+ );
+};
+
+/* Note: addSetting and getSetting are no longer used by SWFUplo...
[truncated message content] |
|
From: <ren...@us...> - 2011-12-16 22:13:25
|
Revision: 8511
http://xoops.svn.sourceforge.net/xoops/?rev=8511&view=rev
Author: renetjuh
Date: 2011-12-16 22:13:12 +0000 (Fri, 16 Dec 2011)
Log Message:
-----------
Added Paths:
-----------
XoopsLanguages/dutch/core/2.5.4/
XoopsLanguages/dutch/core/2.5.4/docs/
XoopsLanguages/dutch/core/2.5.4/docs/install.html
XoopsLanguages/dutch/core/2.5.4/extras/
XoopsLanguages/dutch/core/2.5.4/extras/modules/
XoopsLanguages/dutch/core/2.5.4/extras/modules/system/
XoopsLanguages/dutch/core/2.5.4/extras/modules/system/language/
XoopsLanguages/dutch/core/2.5.4/extras/modules/system/language/nederlands/
XoopsLanguages/dutch/core/2.5.4/extras/modules/system/language/nederlands/admin/
XoopsLanguages/dutch/core/2.5.4/extras/modules/system/language/nederlands/admin/filemanager.php
XoopsLanguages/dutch/core/2.5.4/files.txt
XoopsLanguages/dutch/core/2.5.4/htdocs/
XoopsLanguages/dutch/core/2.5.4/htdocs/class/
XoopsLanguages/dutch/core/2.5.4/htdocs/class/mail/
XoopsLanguages/dutch/core/2.5.4/htdocs/class/mail/phpmailer/
XoopsLanguages/dutch/core/2.5.4/htdocs/class/mail/phpmailer/language/
XoopsLanguages/dutch/core/2.5.4/htdocs/class/mail/phpmailer/language/phpmailer.lang-nl.php
XoopsLanguages/dutch/core/2.5.4/htdocs/class/xoopseditor/
XoopsLanguages/dutch/core/2.5.4/htdocs/class/xoopseditor/dhtmltextarea/
XoopsLanguages/dutch/core/2.5.4/htdocs/class/xoopseditor/dhtmltextarea/language/
XoopsLanguages/dutch/core/2.5.4/htdocs/class/xoopseditor/dhtmltextarea/language/nederlands.php
XoopsLanguages/dutch/core/2.5.4/htdocs/class/xoopseditor/index.html
XoopsLanguages/dutch/core/2.5.4/htdocs/class/xoopseditor/readme.txt
XoopsLanguages/dutch/core/2.5.4/htdocs/class/xoopseditor/textarea/
XoopsLanguages/dutch/core/2.5.4/htdocs/class/xoopseditor/textarea/language/
XoopsLanguages/dutch/core/2.5.4/htdocs/class/xoopseditor/textarea/language/nederlands.php
XoopsLanguages/dutch/core/2.5.4/htdocs/class/xoopseditor/tinymce/
XoopsLanguages/dutch/core/2.5.4/htdocs/class/xoopseditor/tinymce/language/
XoopsLanguages/dutch/core/2.5.4/htdocs/class/xoopseditor/tinymce/language/nederlands.php
XoopsLanguages/dutch/core/2.5.4/htdocs/class/xoopseditor/tinymce/tinymce/
XoopsLanguages/dutch/core/2.5.4/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/
XoopsLanguages/dutch/core/2.5.4/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/
XoopsLanguages/dutch/core/2.5.4/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/langs/
XoopsLanguages/dutch/core/2.5.4/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/langs/nl.js
XoopsLanguages/dutch/core/2.5.4/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/
XoopsLanguages/dutch/core/2.5.4/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/xoopscode/
XoopsLanguages/dutch/core/2.5.4/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/xoopscode/langs/
XoopsLanguages/dutch/core/2.5.4/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/xoopscode/langs/nl.js
XoopsLanguages/dutch/core/2.5.4/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/xoopscode/langs/nl_dlg.js
XoopsLanguages/dutch/core/2.5.4/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/xoopsemotions/
XoopsLanguages/dutch/core/2.5.4/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/xoopsemotions/langs/
XoopsLanguages/dutch/core/2.5.4/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/xoopsemotions/langs/nl.js
XoopsLanguages/dutch/core/2.5.4/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/xoopsemotions/langs/nl_dlg.js
XoopsLanguages/dutch/core/2.5.4/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/xoopsimagemanager/
XoopsLanguages/dutch/core/2.5.4/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/xoopsimagemanager/langs/
XoopsLanguages/dutch/core/2.5.4/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/xoopsimagemanager/langs/nl.js
XoopsLanguages/dutch/core/2.5.4/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/xoopsimagemanager/langs/nl_dlg.js
XoopsLanguages/dutch/core/2.5.4/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/xoopsmlcontent/
XoopsLanguages/dutch/core/2.5.4/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/xoopsmlcontent/langs/
XoopsLanguages/dutch/core/2.5.4/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/xoopsmlcontent/langs/nl.js
XoopsLanguages/dutch/core/2.5.4/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/xoopsmlcontent/langs/nl_dlg.js
XoopsLanguages/dutch/core/2.5.4/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/xoopsquote/
XoopsLanguages/dutch/core/2.5.4/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/xoopsquote/langs/
XoopsLanguages/dutch/core/2.5.4/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/xoopsquote/langs/nl.js
XoopsLanguages/dutch/core/2.5.4/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/xoopsquote/langs/nl_dlg.js
XoopsLanguages/dutch/core/2.5.4/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/themes/
XoopsLanguages/dutch/core/2.5.4/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/themes/advanced/
XoopsLanguages/dutch/core/2.5.4/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/themes/advanced/langs/
XoopsLanguages/dutch/core/2.5.4/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/themes/advanced/langs/nl.js
XoopsLanguages/dutch/core/2.5.4/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/themes/advanced/langs/nl_dlg.js
XoopsLanguages/dutch/core/2.5.4/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/themes/simple/
XoopsLanguages/dutch/core/2.5.4/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/themes/simple/langs/
XoopsLanguages/dutch/core/2.5.4/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/themes/simple/langs/nl.js
XoopsLanguages/dutch/core/2.5.4/htdocs/frameworks/
XoopsLanguages/dutch/core/2.5.4/htdocs/frameworks/moduleclasses/
XoopsLanguages/dutch/core/2.5.4/htdocs/frameworks/moduleclasses/moduleadmin/
XoopsLanguages/dutch/core/2.5.4/htdocs/frameworks/moduleclasses/moduleadmin/language/
XoopsLanguages/dutch/core/2.5.4/htdocs/frameworks/moduleclasses/moduleadmin/language/nederlands/
XoopsLanguages/dutch/core/2.5.4/htdocs/frameworks/moduleclasses/moduleadmin/language/nederlands/index.html
XoopsLanguages/dutch/core/2.5.4/htdocs/frameworks/moduleclasses/moduleadmin/language/nederlands/main.php
XoopsLanguages/dutch/core/2.5.4/htdocs/install/
XoopsLanguages/dutch/core/2.5.4/htdocs/install/language/
XoopsLanguages/dutch/core/2.5.4/htdocs/install/language/nederlands/
XoopsLanguages/dutch/core/2.5.4/htdocs/install/language/nederlands/Thumbs.db
XoopsLanguages/dutch/core/2.5.4/htdocs/install/language/nederlands/finish.php
XoopsLanguages/dutch/core/2.5.4/htdocs/install/language/nederlands/index.html
XoopsLanguages/dutch/core/2.5.4/htdocs/install/language/nederlands/install.php
XoopsLanguages/dutch/core/2.5.4/htdocs/install/language/nederlands/install2.php
XoopsLanguages/dutch/core/2.5.4/htdocs/install/language/nederlands/mysql.lang.data.sql
XoopsLanguages/dutch/core/2.5.4/htdocs/install/language/nederlands/style.css
XoopsLanguages/dutch/core/2.5.4/htdocs/install/language/nederlands/support.php
XoopsLanguages/dutch/core/2.5.4/htdocs/install/language/nederlands/support.png
XoopsLanguages/dutch/core/2.5.4/htdocs/install/language/nederlands/welcome.php
XoopsLanguages/dutch/core/2.5.4/htdocs/language/
XoopsLanguages/dutch/core/2.5.4/htdocs/language/nederlands/
XoopsLanguages/dutch/core/2.5.4/htdocs/language/nederlands/admin.php
XoopsLanguages/dutch/core/2.5.4/htdocs/language/nederlands/auth.php
XoopsLanguages/dutch/core/2.5.4/htdocs/language/nederlands/backend.php
XoopsLanguages/dutch/core/2.5.4/htdocs/language/nederlands/banners.php
XoopsLanguages/dutch/core/2.5.4/htdocs/language/nederlands/calendar.php
XoopsLanguages/dutch/core/2.5.4/htdocs/language/nederlands/captcha.php
XoopsLanguages/dutch/core/2.5.4/htdocs/language/nederlands/comment.php
XoopsLanguages/dutch/core/2.5.4/htdocs/language/nederlands/countries.php
XoopsLanguages/dutch/core/2.5.4/htdocs/language/nederlands/errors.php
XoopsLanguages/dutch/core/2.5.4/htdocs/language/nederlands/findusers.php
XoopsLanguages/dutch/core/2.5.4/htdocs/language/nederlands/formdhtmltextarea.php
XoopsLanguages/dutch/core/2.5.4/htdocs/language/nederlands/global.php
XoopsLanguages/dutch/core/2.5.4/htdocs/language/nederlands/index.html
XoopsLanguages/dutch/core/2.5.4/htdocs/language/nederlands/locale.php
XoopsLanguages/dutch/core/2.5.4/htdocs/language/nederlands/logger.php
XoopsLanguages/dutch/core/2.5.4/htdocs/language/nederlands/mail.php
XoopsLanguages/dutch/core/2.5.4/htdocs/language/nederlands/mail_template/
XoopsLanguages/dutch/core/2.5.4/htdocs/language/nederlands/mail_template/activated.tpl
XoopsLanguages/dutch/core/2.5.4/htdocs/language/nederlands/mail_template/adminactivate.tpl
XoopsLanguages/dutch/core/2.5.4/htdocs/language/nederlands/mail_template/comment_notify.tpl
XoopsLanguages/dutch/core/2.5.4/htdocs/language/nederlands/mail_template/commentsubmit_notify.tpl
XoopsLanguages/dutch/core/2.5.4/htdocs/language/nederlands/mail_template/default_notify.tpl
XoopsLanguages/dutch/core/2.5.4/htdocs/language/nederlands/mail_template/index.html
XoopsLanguages/dutch/core/2.5.4/htdocs/language/nederlands/mail_template/lostpass1.tpl
XoopsLanguages/dutch/core/2.5.4/htdocs/language/nederlands/mail_template/lostpass2.tpl
XoopsLanguages/dutch/core/2.5.4/htdocs/language/nederlands/mail_template/register.tpl
XoopsLanguages/dutch/core/2.5.4/htdocs/language/nederlands/mail_template/tellfriend.tpl
XoopsLanguages/dutch/core/2.5.4/htdocs/language/nederlands/mail_template/welcome.tpl
XoopsLanguages/dutch/core/2.5.4/htdocs/language/nederlands/misc.php
XoopsLanguages/dutch/core/2.5.4/htdocs/language/nederlands/notification.php
XoopsLanguages/dutch/core/2.5.4/htdocs/language/nederlands/pmsg.php
XoopsLanguages/dutch/core/2.5.4/htdocs/language/nederlands/search.php
XoopsLanguages/dutch/core/2.5.4/htdocs/language/nederlands/style.css
XoopsLanguages/dutch/core/2.5.4/htdocs/language/nederlands/timezone.php
XoopsLanguages/dutch/core/2.5.4/htdocs/language/nederlands/uploader.php
XoopsLanguages/dutch/core/2.5.4/htdocs/language/nederlands/user.php
XoopsLanguages/dutch/core/2.5.4/htdocs/language/nederlands/xoopsmailerlocal.php
XoopsLanguages/dutch/core/2.5.4/htdocs/modules/
XoopsLanguages/dutch/core/2.5.4/htdocs/modules/index.html
XoopsLanguages/dutch/core/2.5.4/htdocs/modules/pm/
XoopsLanguages/dutch/core/2.5.4/htdocs/modules/pm/language/
XoopsLanguages/dutch/core/2.5.4/htdocs/modules/pm/language/nederlands/
XoopsLanguages/dutch/core/2.5.4/htdocs/modules/pm/language/nederlands/admin.php
XoopsLanguages/dutch/core/2.5.4/htdocs/modules/pm/language/nederlands/help/
XoopsLanguages/dutch/core/2.5.4/htdocs/modules/pm/language/nederlands/help/help.html
XoopsLanguages/dutch/core/2.5.4/htdocs/modules/pm/language/nederlands/help/index.html
XoopsLanguages/dutch/core/2.5.4/htdocs/modules/pm/language/nederlands/index.html
XoopsLanguages/dutch/core/2.5.4/htdocs/modules/pm/language/nederlands/main.php
XoopsLanguages/dutch/core/2.5.4/htdocs/modules/pm/language/nederlands/modinfo.php
XoopsLanguages/dutch/core/2.5.4/htdocs/modules/profile/
XoopsLanguages/dutch/core/2.5.4/htdocs/modules/profile/language/
XoopsLanguages/dutch/core/2.5.4/htdocs/modules/profile/language/nederlands/
XoopsLanguages/dutch/core/2.5.4/htdocs/modules/profile/language/nederlands/admin.php
XoopsLanguages/dutch/core/2.5.4/htdocs/modules/profile/language/nederlands/help/
XoopsLanguages/dutch/core/2.5.4/htdocs/modules/profile/language/nederlands/help/help.html
XoopsLanguages/dutch/core/2.5.4/htdocs/modules/profile/language/nederlands/help/index.html
XoopsLanguages/dutch/core/2.5.4/htdocs/modules/profile/language/nederlands/index.html
XoopsLanguages/dutch/core/2.5.4/htdocs/modules/profile/language/nederlands/mail_template/
XoopsLanguages/dutch/core/2.5.4/htdocs/modules/profile/language/nederlands/mail_template/emailchanged.tpl
XoopsLanguages/dutch/core/2.5.4/htdocs/modules/profile/language/nederlands/mail_template/index.html
XoopsLanguages/dutch/core/2.5.4/htdocs/modules/profile/language/nederlands/main.php
XoopsLanguages/dutch/core/2.5.4/htdocs/modules/profile/language/nederlands/modinfo.php
XoopsLanguages/dutch/core/2.5.4/htdocs/modules/protector/
XoopsLanguages/dutch/core/2.5.4/htdocs/modules/protector/language/
XoopsLanguages/dutch/core/2.5.4/htdocs/modules/protector/language/nederlands/
XoopsLanguages/dutch/core/2.5.4/htdocs/modules/protector/language/nederlands/help/
XoopsLanguages/dutch/core/2.5.4/htdocs/modules/protector/language/nederlands/help/help.html
XoopsLanguages/dutch/core/2.5.4/htdocs/modules/protector/language/nederlands/help/index.html
XoopsLanguages/dutch/core/2.5.4/htdocs/modules/system/
XoopsLanguages/dutch/core/2.5.4/htdocs/modules/system/language/
XoopsLanguages/dutch/core/2.5.4/htdocs/modules/system/language/nederlands/
XoopsLanguages/dutch/core/2.5.4/htdocs/modules/system/language/nederlands/admin/
XoopsLanguages/dutch/core/2.5.4/htdocs/modules/system/language/nederlands/admin/avatars.php
XoopsLanguages/dutch/core/2.5.4/htdocs/modules/system/language/nederlands/admin/banners.php
XoopsLanguages/dutch/core/2.5.4/htdocs/modules/system/language/nederlands/admin/blocksadmin.php
XoopsLanguages/dutch/core/2.5.4/htdocs/modules/system/language/nederlands/admin/comments.php
XoopsLanguages/dutch/core/2.5.4/htdocs/modules/system/language/nederlands/admin/groups.php
XoopsLanguages/dutch/core/2.5.4/htdocs/modules/system/language/nederlands/admin/images.php
XoopsLanguages/dutch/core/2.5.4/htdocs/modules/system/language/nederlands/admin/index.html
XoopsLanguages/dutch/core/2.5.4/htdocs/modules/system/language/nederlands/admin/mailusers.php
XoopsLanguages/dutch/core/2.5.4/htdocs/modules/system/language/nederlands/admin/maintenance.php
XoopsLanguages/dutch/core/2.5.4/htdocs/modules/system/language/nederlands/admin/modulesadmin.php
XoopsLanguages/dutch/core/2.5.4/htdocs/modules/system/language/nederlands/admin/preferences.php
XoopsLanguages/dutch/core/2.5.4/htdocs/modules/system/language/nederlands/admin/smilies.php
XoopsLanguages/dutch/core/2.5.4/htdocs/modules/system/language/nederlands/admin/tplsets.php
XoopsLanguages/dutch/core/2.5.4/htdocs/modules/system/language/nederlands/admin/userrank.php
XoopsLanguages/dutch/core/2.5.4/htdocs/modules/system/language/nederlands/admin/users.php
XoopsLanguages/dutch/core/2.5.4/htdocs/modules/system/language/nederlands/admin.php
XoopsLanguages/dutch/core/2.5.4/htdocs/modules/system/language/nederlands/blocks.php
XoopsLanguages/dutch/core/2.5.4/htdocs/modules/system/language/nederlands/cpanel.php
XoopsLanguages/dutch/core/2.5.4/htdocs/modules/system/language/nederlands/help/
XoopsLanguages/dutch/core/2.5.4/htdocs/modules/system/language/nederlands/help/avatars.html
XoopsLanguages/dutch/core/2.5.4/htdocs/modules/system/language/nederlands/help/banners.html
XoopsLanguages/dutch/core/2.5.4/htdocs/modules/system/language/nederlands/help/blocksadmin.html
XoopsLanguages/dutch/core/2.5.4/htdocs/modules/system/language/nederlands/help/comments.html
XoopsLanguages/dutch/core/2.5.4/htdocs/modules/system/language/nederlands/help/groups.html
XoopsLanguages/dutch/core/2.5.4/htdocs/modules/system/language/nederlands/help/help_center.html
XoopsLanguages/dutch/core/2.5.4/htdocs/modules/system/language/nederlands/help/images.html
XoopsLanguages/dutch/core/2.5.4/htdocs/modules/system/language/nederlands/help/index.html
XoopsLanguages/dutch/core/2.5.4/htdocs/modules/system/language/nederlands/help/mailusers.html
XoopsLanguages/dutch/core/2.5.4/htdocs/modules/system/language/nederlands/help/maintenance.html
XoopsLanguages/dutch/core/2.5.4/htdocs/modules/system/language/nederlands/help/module_index.html
XoopsLanguages/dutch/core/2.5.4/htdocs/modules/system/language/nederlands/help/modulesadmin.html
XoopsLanguages/dutch/core/2.5.4/htdocs/modules/system/language/nederlands/help/preferences.html
XoopsLanguages/dutch/core/2.5.4/htdocs/modules/system/language/nederlands/help/smilies.html
XoopsLanguages/dutch/core/2.5.4/htdocs/modules/system/language/nederlands/help/tplsets.html
XoopsLanguages/dutch/core/2.5.4/htdocs/modules/system/language/nederlands/help/userrank.html
XoopsLanguages/dutch/core/2.5.4/htdocs/modules/system/language/nederlands/help/users.html
XoopsLanguages/dutch/core/2.5.4/htdocs/modules/system/language/nederlands/images/
XoopsLanguages/dutch/core/2.5.4/htdocs/modules/system/language/nederlands/images/Thumbs.db
XoopsLanguages/dutch/core/2.5.4/htdocs/modules/system/language/nederlands/images/index.html
XoopsLanguages/dutch/core/2.5.4/htdocs/modules/system/language/nederlands/images/lightbox-blank.gif
XoopsLanguages/dutch/core/2.5.4/htdocs/modules/system/language/nederlands/images/lightbox-btn-close.gif
XoopsLanguages/dutch/core/2.5.4/htdocs/modules/system/language/nederlands/images/lightbox-btn-next.gif
XoopsLanguages/dutch/core/2.5.4/htdocs/modules/system/language/nederlands/images/lightbox-btn-prev.gif
XoopsLanguages/dutch/core/2.5.4/htdocs/modules/system/language/nederlands/images/lightbox-ico-loading.gif
XoopsLanguages/dutch/core/2.5.4/htdocs/modules/system/language/nederlands/index.html
XoopsLanguages/dutch/core/2.5.4/htdocs/modules/system/language/nederlands/modinfo.php
XoopsLanguages/dutch/core/2.5.4/htdocs/modules/system/themes/
XoopsLanguages/dutch/core/2.5.4/htdocs/modules/system/themes/default/
XoopsLanguages/dutch/core/2.5.4/htdocs/modules/system/themes/default/language/
XoopsLanguages/dutch/core/2.5.4/htdocs/modules/system/themes/default/language/nederlands/
XoopsLanguages/dutch/core/2.5.4/htdocs/modules/system/themes/default/language/nederlands/admin.php
XoopsLanguages/dutch/core/2.5.4/htdocs/modules/system/themes/default/language/nederlands/index.html
XoopsLanguages/dutch/core/2.5.4/htdocs/modules/system/themes/default/language/nederlands/localsupport.php
XoopsLanguages/dutch/core/2.5.4/htdocs/modules/system/themes/zetadigme/
XoopsLanguages/dutch/core/2.5.4/htdocs/modules/system/themes/zetadigme/language/
XoopsLanguages/dutch/core/2.5.4/htdocs/modules/system/themes/zetadigme/language/nederlands/
XoopsLanguages/dutch/core/2.5.4/htdocs/modules/system/themes/zetadigme/language/nederlands/admin.php
XoopsLanguages/dutch/core/2.5.4/htdocs/modules/system/themes/zetadigme/language/nederlands/index.html
XoopsLanguages/dutch/core/2.5.4/htdocs/modules/system/themes/zetadigme/language/nederlands/localsupport.php
XoopsLanguages/dutch/core/2.5.4/htdocs/themes/
XoopsLanguages/dutch/core/2.5.4/htdocs/themes/suico/
XoopsLanguages/dutch/core/2.5.4/htdocs/themes/suico/language/
XoopsLanguages/dutch/core/2.5.4/htdocs/themes/suico/language/nederlands/
XoopsLanguages/dutch/core/2.5.4/htdocs/themes/suico/language/nederlands/index.html
XoopsLanguages/dutch/core/2.5.4/htdocs/themes/suico/language/nederlands/main.php
XoopsLanguages/dutch/core/2.5.4/htdocs/themes/suico/language/nederlands/script.js
XoopsLanguages/dutch/core/2.5.4/htdocs/themes/suico/language/nederlands/style.css
XoopsLanguages/dutch/core/2.5.4/htdocs/themes/zetagenesis/
XoopsLanguages/dutch/core/2.5.4/htdocs/themes/zetagenesis/language/
XoopsLanguages/dutch/core/2.5.4/htdocs/themes/zetagenesis/language/nederlands/
XoopsLanguages/dutch/core/2.5.4/htdocs/themes/zetagenesis/language/nederlands/index.html
XoopsLanguages/dutch/core/2.5.4/htdocs/themes/zetagenesis/language/nederlands/main.php
XoopsLanguages/dutch/core/2.5.4/htdocs/themes/zetagenesis/language/nederlands/script.js
XoopsLanguages/dutch/core/2.5.4/htdocs/themes/zetagenesis/language/nederlands/style.css
XoopsLanguages/dutch/core/2.5.4/htdocs/xoops_data/
XoopsLanguages/dutch/core/2.5.4/htdocs/xoops_data/readme.txt
XoopsLanguages/dutch/core/2.5.4/htdocs/xoops_lib/
XoopsLanguages/dutch/core/2.5.4/htdocs/xoops_lib/modules/
XoopsLanguages/dutch/core/2.5.4/htdocs/xoops_lib/modules/protector/
XoopsLanguages/dutch/core/2.5.4/htdocs/xoops_lib/modules/protector/language/
XoopsLanguages/dutch/core/2.5.4/htdocs/xoops_lib/modules/protector/language/nederlands/
XoopsLanguages/dutch/core/2.5.4/htdocs/xoops_lib/modules/protector/language/nederlands/admin.php
XoopsLanguages/dutch/core/2.5.4/htdocs/xoops_lib/modules/protector/language/nederlands/index.html
XoopsLanguages/dutch/core/2.5.4/htdocs/xoops_lib/modules/protector/language/nederlands/main.php
XoopsLanguages/dutch/core/2.5.4/htdocs/xoops_lib/modules/protector/language/nederlands/modinfo.php
XoopsLanguages/dutch/core/2.5.4/htdocs/xoops_lib/readme.txt
XoopsLanguages/dutch/core/2.5.4/upgrade/
XoopsLanguages/dutch/core/2.5.4/upgrade/cnt-2.2.x-to-2.3.0/
XoopsLanguages/dutch/core/2.5.4/upgrade/cnt-2.2.x-to-2.3.0/language/
XoopsLanguages/dutch/core/2.5.4/upgrade/cnt-2.2.x-to-2.3.0/language/nederlands.php
XoopsLanguages/dutch/core/2.5.4/upgrade/language/
XoopsLanguages/dutch/core/2.5.4/upgrade/language/nederlands/
XoopsLanguages/dutch/core/2.5.4/upgrade/language/nederlands/index.html
XoopsLanguages/dutch/core/2.5.4/upgrade/language/nederlands/style.css
XoopsLanguages/dutch/core/2.5.4/upgrade/language/nederlands/upgrade.php
XoopsLanguages/dutch/core/2.5.4/upgrade/upd-2.0.18-to-2.3.0/
XoopsLanguages/dutch/core/2.5.4/upgrade/upd-2.0.18-to-2.3.0/language/
XoopsLanguages/dutch/core/2.5.4/upgrade/upd-2.0.18-to-2.3.0/language/nederlands.php
Property changes on: XoopsLanguages/dutch/core/2.5.4
___________________________________________________________________
Added: bugtraq:number
+ true
Property changes on: XoopsLanguages/dutch/core/2.5.4/docs
___________________________________________________________________
Added: bugtraq:number
+ true
Added: XoopsLanguages/dutch/core/2.5.4/docs/install.html
===================================================================
--- XoopsLanguages/dutch/core/2.5.4/docs/install.html (rev 0)
+++ XoopsLanguages/dutch/core/2.5.4/docs/install.html 2011-12-16 22:13:12 UTC (rev 8511)
@@ -0,0 +1,147 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//NL">
+<!--
+/**
+ * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license http://www.fsf.org/copyleft/gpl.html GNU public license
+ * _LANGCODE: nl
+ * _CHARSET : UTF-8
+ * Vertaald door Renetjuh
+ * (Ver)taalfouten of suggesties?
+ * AUB hier melden: http://www.xoops.nl
+**/
+ -->
+<html>
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+ <title>XOOPS Installatie handleiding</title>
+ <meta name="keywords" content="XOOPS" />
+ <meta name="description" content="XOOPS installatie handleiding" />
+ <style type="text/css">
+ body {
+ font-family: Lucida Grande, Verdana, Geneva, Sans-serif;
+ margin: 0;
+ padding: 0;
+ font-size: 13px;
+ color: #333;
+ background-color: #fff;
+ }
+
+ a {
+ color: #3D9DD3;
+ background-color: transparent;
+ text-decoration: none;
+ font-weight: normal;
+ }
+
+ a:visited {
+ color: #3D9DD3;
+ background-color: transparent;
+ text-decoration: none;
+ }
+
+ a:hover {
+ color: #3D9DD3;
+ text-decoration: none;
+ background-color: transparent;
+ }
+
+ .page {
+ background-color: #fff;
+ margin: 10px 30px 0;
+ padding: 0;
+ }
+
+ .page h1 {
+ background-color: transparent;
+ border-bottom: 1px solid #999;
+ color: #000;
+ font-size: 18px;
+ font-weight: bold;
+ margin: 28px 0 16px 0;
+ padding: 5px 0 6px 0;
+ }
+
+ .page h2 {
+ background-color: transparent;
+ color: #000;
+ font-size: 16px;
+ font-weight: bold;
+ margin: 28px 0 16px 0;
+ padding: 5px 0 6px 0;
+ }
+
+ .page h3 {
+ background-color: transparent;
+ color: #000;
+ font-size: 14px;
+ font-weight: bold;
+ }
+
+ .page ul {
+ margin: 20px 0 15px 0;
+ }
+
+ .page li {
+ margin-bottom: 9px;
+ }
+
+ .page li p {
+ margin-left: 0;
+ margin-right: 0;
+ }
+
+ p { }
+
+ </style>
+</head>
+<body>
+
+<div class="page">
+<h1>XOOPS Installeren</h1>
+
+<h2>Eerste installatie</h2>
+<h3>Voorwoord:</h3>
+<p>
+ <acronym title="eXtensible Object-Oriented Portal System">XOOPS</acronym> is een Open-Source Object-Georiënteerd Web Content Management Systeem geschreven in PHP. Dit maakt het tot een ideale tool voor het ontwikkelen van kleine tot grote, dynamische community websites, intranet portalen, bedrijfs portalen, weblogs en meer.
+</p>
+
+<p>
+ XOOPS is vrijgegeven onder de voorwaarden van de
+ <a href="http://www.gnu.org/copyleft/gpl.html" target="_blank">GNU General Public License (GPL)</a>
+ en mag vrij gebruikt en gewijzigd worden .
+ Het staat vrij de code te delen zolang u de distributie voorwaarden van de GPL respecteert.
+</p>
+
+ <h2>Systeemvereisten:</h2>
+<ul>
+ <li>Webserver (<a href="http://www.apache.org/" target="_blank">Apache</a>, IIS, Roxen, enz)</li>
+ <li><a href="http://www.php.net/" target="_blank">PHP</a> 5.1.0 of hoger</li>
+ <li><a href="http://www.mysql.com/" target="_blank">MySQL</a> 5.1 of hoger</li>
+</ul>
+
+<h2>Voor de installatie</h2>
+<ol>
+ <li>Zorg voor een web-server met PHP en een (MySQL) database server.</li>
+ <li>Maak een nieuwe database aan voor de XOOPS website.</li>
+ <li>Maak een gebruikers account voor deze database en geef de gebruiker lees/schrijfrechten voor de zojuist gemaakte database.</li>
+ <li>Zorg ervoor dat de map <em>/uploads</em> en het bestand <em>mainfile.php</em> door de server beschrijfbaar zijn (Linux: CHMOD 777, Windows: het vinkje bij alleen-lezen weghalen)</li>
+ <li>Om veiligheidsredenen is het sterk aan te raden de volgende twee mappen buiten de <a href="http://phpsec.org/projects/guide/3.html" target="_blank">hoofdmap</a> te plaatsen: <em>/xoops_lib</em> (voor XOOPS gemeenschappelijke bibliotheken) en <em>/xoops_data/</em> (voor tijdelijke XOOPS gegevens en instellingen), tevens is het aan te raden de mapnamen te wijzigen.</li>
+ <li>Zorg ervoor dat de map <em>/xoops_data/</em> en de onderliggende mappen <em>/xoops_data/configs/</em>, <em>/xoops_data/caches/</em>, <em>/xoops_data/caches/xoops_cache/</em>, <em>/xoops_data/caches/smarty_cache/</em> en <em>/xoops_data/caches/smarty_compile/</em> door de server beschrijfbaar zijn. Of maak deze mappen zelf aan als ze niet aanwezig zouden zijn.</li>
+ <li>Zorg er voor dat cookie en JavaScript ondersteuning in uw browser is ingeschakeld.</li>
+</ol>
+
+
+<h2>Lokale Installatie</h2>
+<p>Zorg ervoor dat uw test server installatie voldoet aan de voorgaande benodigdheden voor het draaien van XOOPS.
+ Nadat u dit gecontroleerd heeft, kopieert u de bestanden in de map htdocs van het XOOPS-archief naar de web hoofdmap van uw (test) web omgeving. Als de bestanden zijn gekopieerd kunt u de XOOPS installatie wizard starten door naar "http://uw-domein.ext", of naar "http://localhost/" (als uw computer niet aan een domein gelinkt is) te surfen in uw webbrowser.</p>
+
+<h2>Installatie op een hosting platform</h2>
+ <p>Als u werkt binnen een gehoste web omgeving, pak dan het XOOPS-archief lokaal uit, of op de server als u telnet of SSH toegang heeft. Als dit gedaan is, moeten alle Xoops bestanden uit de htdocs-map naar uw web hoofdmap gekopieerd of verplaatst worden (Uw provider/isp geeft deze locatie meestal aan bij de instellingen of help). Als de bestanden zijn gekopieerd kunt u de XOOPS installatie wizard starten door naar "http://uw-domein.ext" te surfen in uw webbrowser.</p>
+
+
+<h2>Voortzetten van de installatie</h2>
+<p>Volg de stap-voor-stap instructies van de installatie wizard.</p>
+
+</div>
+</body>
+</html>
\ No newline at end of file
Property changes on: XoopsLanguages/dutch/core/2.5.4/extras
___________________________________________________________________
Added: bugtraq:number
+ true
Property changes on: XoopsLanguages/dutch/core/2.5.4/extras/modules
___________________________________________________________________
Added: bugtraq:number
+ true
Property changes on: XoopsLanguages/dutch/core/2.5.4/extras/modules/system
___________________________________________________________________
Added: bugtraq:number
+ true
Property changes on: XoopsLanguages/dutch/core/2.5.4/extras/modules/system/language
___________________________________________________________________
Added: bugtraq:number
+ true
Property changes on: XoopsLanguages/dutch/core/2.5.4/extras/modules/system/language/nederlands
___________________________________________________________________
Added: bugtraq:number
+ true
Property changes on: XoopsLanguages/dutch/core/2.5.4/extras/modules/system/language/nederlands/admin
___________________________________________________________________
Added: bugtraq:number
+ true
Added: XoopsLanguages/dutch/core/2.5.4/extras/modules/system/language/nederlands/admin/filemanager.php
===================================================================
--- XoopsLanguages/dutch/core/2.5.4/extras/modules/system/language/nederlands/admin/filemanager.php (rev 0)
+++ XoopsLanguages/dutch/core/2.5.4/extras/modules/system/language/nederlands/admin/filemanager.php 2011-12-16 22:13:12 UTC (rev 8511)
@@ -0,0 +1,65 @@
+<?php
+/**
+ * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license http://www.fsf.org/copyleft/gpl.html GNU public license
+ * _LANGCODE: nl
+ * _CHARSET : UTF-8
+ * Vertaald door Renetjuh
+ * (Ver)taalfouten of suggesties?
+ * AUB hier melden: http://www.xoops.nl
+**/
+
+ //Navigatie
+define('_AM_SYSTEM_FILEMANAGER_NAV_MANAGER','Bestandenbeheer');
+define('_AM_SYSTEM_FILEMANAGER_NAV_MAIN','Bestandenbeheer');
+
+//Tips
+define('_AM_SYSTEM_FILEMANAGER_NAV_TIPS','
+<ul>
+<li>Wijzig bestandenpermissies, inhoud of verwijder niet gebruikte bestanden uit Xoops</li>
+</ul>
+');
+
+// Main
+define('_AM_SYSTEM_FILEMANAGER_DIRECTORY','Folder');
+define('_AM_SYSTEM_FILEMANAGER_FILES','Bestanden');
+define('_AM_SYSTEM_FILEMANAGER_GENERATE','Gegenereerde toeslag');
+define('_AM_SYSTEM_FILEMANAGER_SELECT_THEME','Thema selecteren');
+define('_AM_SYSTEM_FILEMANAGER_FORCE_GENERATED','Aanmaken forceren');
+define('_AM_SYSTEM_FILEMANAGER_NAV_FILE_GENERATED','Bestanden aangemaakt');
+define('_AM_SYSTEM_FILEMANAGER_NOT_CREATED','Geen bestanden aangemaakt');
+define('_AM_SYSTEM_FILEMANAGER_HOME','Start');
+define('_AM_SYSTEM_FILEMANAGER_SAVE','Opslaan');
+define('_AM_SYSTEM_FILEMANAGER_CANCEL','Annuleren');
+define('_AM_SYSTEM_FILEMANAGER_RESTORE','Herstellen');
+define('_AM_SYSTEM_FILEMANAGER_REFRESH','Vernieuwen');
+define('_AM_SYSTEM_FILEMANAGER_UPLOAD','Bestanden uploaden');
+define('_AM_SYSTEM_FILEMANAGER_UPLOAD_CHOOSE','Bestand kiezen om te uploaden');
+define('_AM_SYSTEM_FILEMANAGER_ADDDIR','Folder toevoegen');
+define('_AM_SYSTEM_FILEMANAGER_ADDDIR_NAME','Kies de naam van de folder');
+define('_AM_SYSTEM_FILEMANAGER_ADDFILE','Nieuw bestand toevoegen');
+define('_AM_SYSTEM_FILEMANAGER_DELDIR','Folder verwijderen');
+
+define('_AM_SYSTEM_FILEMANAGER_RESTORE_ERROR_FILE_EXISTS','FOUT : Bestand bestaat niet');
+define('_AM_SYSTEM_FILEMANAGER_RESTORE_ERROR_FILE_DELETE','FOUT : Bestand niet verwijderd');
+define('_AM_SYSTEM_FILEMANAGER_RESTORE_ERROR_FILE_RENAME','FOUT : Bestand niet hernoemd');
+define('_AM_SYSTEM_FILEMANAGER_BACK','Terug');
+define('_AM_SYSTEM_FILEMANAGER_DELETE','Verwijderen');
+define('_AM_SYSTEM_FILEMANAGER_ERROR','FOUT');
+define('_AM_SYSTEM_FILEMANAGER_EDIT','Bewerken van :');
+define('_AM_SYSTEM_FILEMANAGER_EMPTY_FILE','Bestand is leeg');
+define('_AM_SYSTEM_FILEMANAGER_DELDIR_NOTOK','FOUT : Folder niet verwijderd');
+define('_AM_SYSTEM_FILEMANAGER_DELDIR_OK','Folder succesvol verwijderd');
+
+// Berichten
+define('_AM_SYSTEM_FILEMANAGER_UPLOAD_FILE','Bestanden succesvol verzonden');
+define('_AM_SYSTEM_FILEMANAGER_EXTRACT_FILE','Bestanden succesvol afgeleid');
+define('_AM_SYSTEM_FILEMANAGER_EXTRACT_ERROR','Bestanden konden niet worden afgeleid ');
+define('_AM_SYSTEM_FILEMANAGER_DELETE_FILE','Bestanden succesvol verwijderd');
+define('_AM_SYSTEM_FILEMANAGER_DIR_SUCCESS','Folder succesvol aangemaakt');
+define('_AM_SYSTEM_FILEMANAGER_DIR_ERROR','Folder kan niet worden aangemaakt');
+define('_AM_SYSTEM_FILEMANAGER_DIR_RYSDEL','Zeker weten dat u deze folder wilt verwijderen?');
+define('_AM_SYSTEM_FILEMANAGER_FILE_SUCCESS','Bestand succesvol verwijderd');
+define('_AM_SYSTEM_FILEMANAGER_SUREDEL', 'Zeker weten dat u dit bestand %s wilt verwijderen?');
+define('_AM_SYSTEM_FILEMANAGER_DIR_SUREDEL', 'Zeker weten dat u deze folder %s wilt verwijderen ?<br />Waarschuwing : Alle subfolders en bestanden worden ook verwijderd.');
+?>
Added: XoopsLanguages/dutch/core/2.5.4/files.txt
===================================================================
--- XoopsLanguages/dutch/core/2.5.4/files.txt (rev 0)
+++ XoopsLanguages/dutch/core/2.5.4/files.txt 2011-12-16 22:13:12 UTC (rev 8511)
@@ -0,0 +1,136 @@
+/docs/install.html
+/extras/modules/system/language/nederlands/admin/filemanager.php
+/htdocs/class/mail/phpmailer/language/phpmailer.lang-nl.php
+/htdocs/class/xoopseditor/readme.txt
+/htdocs/class/xoopseditor/dhtmltextarea/language/nederlands.php
+/htdocs/class/xoopseditor/textarea/language/nederlands.php
+/htdocs/class/xoopseditor/tinymce/language/nederlands.php
+/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/langs/nl.js
+/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/xoopscode/langs/nl.js
+/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/xoopscode/langs/nl_dlg.js
+/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/xoopsemotions/langs/nl.js
+/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/xoopsemotions/langs/nl_dlg.js
+/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/xoopsimagemanager/langs/nl.js
+/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/xoopsimagemanager/langs/nl_dlg.js
+/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/xoopsmlcontent/langs/nl.js
+/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/xoopsmlcontent/langs/nl_dlg.js
+/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/xoopsquote/langs/nl.js
+/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/xoopsquote/langs/nl_dlg.js
+/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/themes/advanced/langs/nl.js
+/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/themes/advanced/langs/nl_dlg.js
+/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/themes/simple/lang/nl.js
+/htdocs/frameworks/modulesclasses/mpduleadmin/language/nederlands/main.php
+/htdocs/install/language/nederlands/finish.php
+/htdocs/install/language/nederlands/install.php
+/htdocs/install/language/nederlands/install2.php
+/htdocs/install/language/nederlands/mysql.lang.data.sql
+/htdocs/install/language/nederlands/style.css
+/htdocs/install/language/nederlands/support.php
+/htdocs/install/language/nederlands/support.png
+/htdocs/install/language/nederlands/welcome.php
+/htdocs/language/nederlands/mail_template/activated.tpl
+/htdocs/language/nederlands/mail_template/adminactivate.tpl
+/htdocs/language/nederlands/mail_template/comment_notify.tpl
+/htdocs/language/nederlands/mail_template/commentsubmit_notify.tpl
+/htdocs/language/nederlands/mail_template/default_notify.tpl
+/htdocs/language/nederlands/mail_template/lostpass1.tpl
+/htdocs/language/nederlands/mail_template/lostpass2.tpl
+/htdocs/language/nederlands/mail_template/register.tpl
+/htdocs/language/nederlands/mail_template/tellfriend.tpl
+/htdocs/language/nederlands/mail_template/welcome.tpl
+/htdocs/language/nederlands/admin.php
+/htdocs/language/nederlands/auth.php
+/htdocs/language/nederlands/backend.php
+/htdocs/language/nederlands/banners.php
+/htdocs/language/nederlands/calendar.php
+/htdocs/language/nederlands/captcha.php
+/htdocs/language/nederlands/comment.php
+/htdocs/language/nederlands/countries.php
+/htdocs/language/nederlands/errors.php
+/htdocs/language/nederlands/findusers.php
+/htdocs/language/nederlands/formdhtmltextarea.php
+/htdocs/language/nederlands/global.php
+/htdocs/language/nederlands/locale.php
+/htdocs/language/nederlands/logger.php
+/htdocs/language/nederlands/mail.php
+/htdocs/language/nederlands/misc.php
+/htdocs/language/nederlands/notification.php
+/htdocs/language/nederlands/pmsg.php
+/htdocs/language/nederlands/search.php
+/htdocs/language/nederlands/style.css
+/htdocs/language/nederlands/timezone.php
+/htdocs/language/nederlands/uploader.php
+/htdocs/language/nederlands/user.php
+/htdocs/language/nederlands/xoopsmailerlocal.php
+/htdocs/modules/pm/language/nederlands/admin.php
+/htdocs/modules/pm/language/nederlands/main.php
+/htdocs/modules/pm/language/nederlands/modinfo.php
+/htdocs/modules/pm/language/nederlands/help/help.html
+/htdocs/modules/profile/language/nederlands/mail_template/emailchanged.tpl
+/htdocs/modules/profile/language/nederlands/admin.php
+/htdocs/modules/profile/language/nederlands/main.php
+/htdocs/modules/profile/language/nederlands/modinfo.php
+/htdocs/modules/profile/language/nederlands/help.html
+/htdocs/modules/system/language/nederlands/admin.php
+/htdocs/modules/system/language/nederlands/blocks.php
+/htdocs/modules/system/language/nederlands/cpanel.php
+/htdocs/modules/system/language/nederlands/modinfo.php
+/htdocs/modules/system/language/nederlands/admin/avatars.php
+/htdocs/modules/system/language/nederlands/admin/banners.php
+/htdocs/modules/system/language/nederlands/admin/blocksadmin.php
+/htdocs/modules/system/language/nederlands/admin/comments.php
+/htdocs/modules/system/language/nederlands/admin/groups.php
+/htdocs/modules/system/language/nederlands/admin/images.php
+/htdocs/modules/system/language/nederlands/admin/mailusers.php
+/htdocs/modules/system/language/nederlands/admin/maintenance.php
+/htdocs/modules/system/language/nederlands/admin/modulesadmin.php
+/htdocs/modules/system/language/nederlands/admin/preferences.php
+/htdocs/modules/system/language/nederlands/admin/smilies.php
+/htdocs/modules/system/language/nederlands/admin/tplsets.php
+/htdocs/modules/system/language/nederlands/admin/userrank.php
+/htdocs/modules/system/language/nederlands/admin/users.php
+/htdocs/modules/system/language/nederlands/help/avatars.html
+/htdocs/modules/system/language/nederlands/help/banners.html
+/htdocs/modules/system/language/nederlands/help/blocksadmin.html
+/htdocs/modules/system/language/nederlands/help/comments.html
+/htdocs/modules/system/language/nederlands/help/groups.html
+/htdocs/modules/system/language/nederlands/help/hlp_center.html
+/htdocs/modules/system/language/nederlands/help/images.html
+/htdocs/modules/system/language/nederlands/help/mailusers.html
+/htdocs/modules/system/language/nederlands/help/maintenance.html
+/htdocs/modules/system/language/nederlands/help/modules_index.html
+/htdocs/modules/system/language/nederlands/help/modulesadmin.html
+/htdocs/modules/system/language/nederlands/help/preferences.html
+/htdocs/modules/system/language/nederlands/help/smilies.html
+/htdocs/modules/system/language/nederlands/help/tplsets.html
+/htdocs/modules/system/language/nederlands/help/userrank.html
+/htdocs/modules/system/language/nederlands/help/users.html
+/htdocs/modules/system/language/nederlands/images/lightbox-blank.gif
+/htdocs/modules/system/language/nederlands/images/lightbox-btn-close.gif
+/htdocs/modules/system/language/nederlands/images/lightbox-btn-next.gif
+/htdocs/modules/system/language/nederlands/images/lightbox-btn-prev.gif
+/htdocs/modules/system/language/nederlands/images/lightbox-ico-loading.gif
+/htdocs/modules/system/themes/default/language/nederlands/admin.php
+/htdocs/modules/system/themes/default/language/nederlands/localsupport.php
+/htdocs/modules/system/themes/zetadigme/language/nederlands/admin.php
+/htdocs/modules/system/themes/zetadigme/language/nederlands/localsupport.php
+/htdocs/themes/zetagenesis/language/nederlands/main.php
+/htdocs/themes/zetagenesis/language/nederlands/script.js
+/htdocs/themes/zetagenesis/language/nederlands/style.css
+/htdocs/xoops_data/readme.txt
+/htdocs/xoops_lib/readme.txt
+/upgrade/cnt-2.2.x-to-2.3.0/language/nederlands.php
+/upgrade/language/nederlands/style.css
+/upgrade/language/nederlands/upgrade.php
+/upgrade/upd-2.0.18-to-2.3.0/language/nederlands.php
+
+Creditstekst
+/**
+ * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license http://www.fsf.org/copyleft/gpl.html GNU public license
+ * _LANGCODE: nl
+ * _CHARSET : UTF-8
+ * Vertaald door Renetjuh
+ * (Ver)taalfouten of suggesties?
+ * AUB hier melden: http://www.xoops.nl
+**/
Property changes on: XoopsLanguages/dutch/core/2.5.4/htdocs
___________________________________________________________________
Added: bugtraq:number
+ true
Property changes on: XoopsLanguages/dutch/core/2.5.4/htdocs/class
___________________________________________________________________
Added: bugtraq:number
+ true
Property changes on: XoopsLanguages/dutch/core/2.5.4/htdocs/class/mail
___________________________________________________________________
Added: bugtraq:number
+ true
Property changes on: XoopsLanguages/dutch/core/2.5.4/htdocs/class/mail/phpmailer
___________________________________________________________________
Added: bugtraq:number
+ true
Property changes on: XoopsLanguages/dutch/core/2.5.4/htdocs/class/mail/phpmailer/language
___________________________________________________________________
Added: bugtraq:number
+ true
Added: XoopsLanguages/dutch/core/2.5.4/htdocs/class/mail/phpmailer/language/phpmailer.lang-nl.php
===================================================================
--- XoopsLanguages/dutch/core/2.5.4/htdocs/class/mail/phpmailer/language/phpmailer.lang-nl.php (rev 0)
+++ XoopsLanguages/dutch/core/2.5.4/htdocs/class/mail/phpmailer/language/phpmailer.lang-nl.php 2011-12-16 22:13:12 UTC (rev 8511)
@@ -0,0 +1,28 @@
+<?php
+/**
+ * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license http://www.fsf.org/copyleft/gpl.html GNU public license
+ * _LANGCODE: nl
+ * _CHARSET : UTF-8
+ * Vertaald door Renetjuh
+ * (Ver)taalfouten of suggesties?
+ * AUB hier melden: http://www.xoops.nl
+**/
+
+$PHPMAILER_LANG = array();
+
+$PHPMAILER_LANG["provide_address"] = 'Er moet tenmiste één ' .
+ 'ontvanger e-mailadres opgegeven worden.';
+$PHPMAILER_LANG["mailer_not_supported"] = ' mailer wordt niet ondersteund.';
+$PHPMAILER_LANG["execute"] = 'Kon niet uitvoeren: ';
+$PHPMAILER_LANG["instantiate"] = 'Kon mail functie niet initialiseren.';
+$PHPMAILER_LANG["authenticate"] = 'SMTP Fout: authenticatie mislukt.';
+$PHPMAILER_LANG["from_failed"] = 'De volgende afzender adressen zijn mislukt: ';
+$PHPMAILER_LANG["recipients_failed"] = 'SMTP Fout: De volgende ' .
+ 'ontvangers zijn mislukt: ';
+$PHPMAILER_LANG["data_not_accepted"] = 'SMTP Fout: Data niet geaccepteerd.';
+$PHPMAILER_LANG["connect_host"] = 'SMTP Fout: Kon niet verbinden met SMTP host.';
+$PHPMAILER_LANG["file_access"] = 'Kreeg geen toegang tot bestand: ';
+$PHPMAILER_LANG["file_open"] = 'Bestandsfout: Kon bestand niet openen: ';
+$PHPMAILER_LANG["encoding"] = 'Onbekende codering: ';
+?>
\ No newline at end of file
Property changes on: XoopsLanguages/dutch/core/2.5.4/htdocs/class/xoopseditor
___________________________________________________________________
Added: bugtraq:number
+ true
Property changes on: XoopsLanguages/dutch/core/2.5.4/htdocs/class/xoopseditor/dhtmltextarea
___________________________________________________________________
Added: bugtraq:number
+ true
Property changes on: XoopsLanguages/dutch/core/2.5.4/htdocs/class/xoopseditor/dhtmltextarea/language
___________________________________________________________________
Added: bugtraq:number
+ true
Added: XoopsLanguages/dutch/core/2.5.4/htdocs/class/xoopseditor/dhtmltextarea/language/nederlands.php
===================================================================
--- XoopsLanguages/dutch/core/2.5.4/htdocs/class/xoopseditor/dhtmltextarea/language/nederlands.php (rev 0)
+++ XoopsLanguages/dutch/core/2.5.4/htdocs/class/xoopseditor/dhtmltextarea/language/nederlands.php 2011-12-16 22:13:12 UTC (rev 8511)
@@ -0,0 +1,14 @@
+<?php
+/**
+ * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license http://www.fsf.org/copyleft/gpl.html GNU public license
+ * _LANGCODE: nl
+ * _CHARSET : UTF-8
+ * Vertaald door Renetjuh
+ * (Ver)taalfouten of suggesties?
+ * AUB hier melden: http://www.xoops.nl
+**/
+
+define( '_XOOPS_EDITOR_DHTMLTEXTAREA', 'DHTML editor met XOOPS Code' );
+
+?>
Added: XoopsLanguages/dutch/core/2.5.4/htdocs/class/xoopseditor/index.html
===================================================================
--- XoopsLanguages/dutch/core/2.5.4/htdocs/class/xoopseditor/index.html (rev 0)
+++ XoopsLanguages/dutch/core/2.5.4/htdocs/class/xoopseditor/index.html 2011-12-16 22:13:12 UTC (rev 8511)
@@ -0,0 +1 @@
+ <script>history.go(-1);</script>
\ No newline at end of file
Added: XoopsLanguages/dutch/core/2.5.4/htdocs/class/xoopseditor/readme.txt
===================================================================
--- XoopsLanguages/dutch/core/2.5.4/htdocs/class/xoopseditor/readme.txt (rev 0)
+++ XoopsLanguages/dutch/core/2.5.4/htdocs/class/xoopseditor/readme.txt 2011-12-16 22:13:12 UTC (rev 8511)
@@ -0,0 +1,37 @@
+/**
+ * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license http://www.fsf.org/copyleft/gpl.html GNU public license
+ * _LANGCODE: nl
+ * _CHARSET : UTF-8
+ * Vertaald door Renetjuh
+ * (Ver)taalfouten of suggesties?
+ * AUB hier melden: http://www.xoops.nl
+**/
+
+Xoopseditor bevat een collectie van editors die te gebruiken zijn in XOOPS
+
+Handleiding:
+
+1 Controleer het bestand xoops_version.php in de map /xoopseditor/ om er zeker van te zijn dat deze nieuwer is dan de huidige die in gebruik is.
+
+2 Verplaats /xoopseditor/ naar /XOOPS/class/ => /XOOPS/class/xoopseditor/:
+ XOOPS/class/xoopseditor/dhtmlext
+ XOOPS/class/xoopseditor/dhtmltextarea
+ XOOPS/class/xoopseditor/fckeditor
+ XOOPS/class/xoopseditor/koivi
+ XOOPS/class/xoopseditor/textarea
+ XOOPS/class/xoopseditor/tinymce
+
+3 Configureer voorkeuren indien van toepassing
+3.1 ./dhtmlext(alle editors)/language/: Maak een eigen taalbestand gebaseerd op english.php
+3.3 ./dhtmlext(alle editors)/editor_registry.php: Instellingen voor de editor: Volgorde - Volgorde van weergave in het geval editor selectie wordt gebruikt, 0 voor uitgeschakeld, nohtml - werkt voor niet-html sntax
+3.3 ./FCKeditor/module/: Kopieer de bestanden naar de modules mappen in het geval module specifieke machtigingen en editor-opties zijn verplicht
+3.3.1 ./FCKeditor/module/fckeditor.config.js: Voor editor opties hoeven deze instellingen niet aangepast te worden
+3.3.2 ./FCKeditor/module/fckeditor.connector.php: Specificeer de map voor bestandsbrowsing (en uploadruimte) => XOOPS/uploads/XOOPS_FCK_FOLDER/, de map dient handmatig aangemaakt te worden
+3.3.3 ./FCKeditor/module/fckeditor.upload.php: Machtigingen opgeven voor uploaden en opslag
+3.4 XOOPS/uploads/fckeditor/: het cre\xEBren van de map, als FCKeditor is ingeschakeld, gebruikt voor uploads van waar de upload map is niet opgegeven
+3.5 ./tinymce/tinymce/jscripts/: Haal de lokale taalbestanden van http://tinymce.moxiecode.com/language.php
+
+4 Controleer bestandsnamen: Voor een systeem wat een hoofdlettergevoelig is dient u ervoor te zorgen dat de bestandsnamen letterlijk worden overgenomen. Dat willen zeggen, "FCKeditor" is dan niet gelijk aan "fckeditor"
+
+5 Controleer /xoopseditor/sampleform.inc.php voor de ontwikkelingshandleiding
\ No newline at end of file
Property changes on: XoopsLanguages/dutch/core/2.5.4/htdocs/class/xoopseditor/textarea
___________________________________________________________________
Added: bugtraq:number
+ true
Property changes on: XoopsLanguages/dutch/core/2.5.4/htdocs/class/xoopseditor/textarea/language
___________________________________________________________________
Added: bugtraq:number
+ true
Added: XoopsLanguages/dutch/core/2.5.4/htdocs/class/xoopseditor/textarea/language/nederlands.php
===================================================================
--- XoopsLanguages/dutch/core/2.5.4/htdocs/class/xoopseditor/textarea/language/nederlands.php (rev 0)
+++ XoopsLanguages/dutch/core/2.5.4/htdocs/class/xoopseditor/textarea/language/nederlands.php 2011-12-16 22:13:12 UTC (rev 8511)
@@ -0,0 +1,14 @@
+<?php
+/**
+ * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license http://www.fsf.org/copyleft/gpl.html GNU public license
+ * _LANGCODE: nl
+ * _CHARSET : UTF-8
+ * Vertaald door Renetjuh
+ * (Ver)taalfouten of suggesties?
+ * AUB hier melden: http://www.xoops.nl
+**/
+
+define("_XOOPS_EDITOR_TEXTAREA", "Platte tekst");
+
+?>
Property changes on: XoopsLanguages/dutch/core/2.5.4/htdocs/class/xoopseditor/tinymce
___________________________________________________________________
Added: bugtraq:number
+ true
Property changes on: XoopsLanguages/dutch/core/2.5.4/htdocs/class/xoopseditor/tinymce/language
___________________________________________________________________
Added: bugtraq:number
+ true
Added: XoopsLanguages/dutch/core/2.5.4/htdocs/class/xoopseditor/tinymce/language/nederlands.php
===================================================================
--- XoopsLanguages/dutch/core/2.5.4/htdocs/class/xoopseditor/tinymce/language/nederlands.php (rev 0)
+++ XoopsLanguages/dutch/core/2.5.4/htdocs/class/xoopseditor/tinymce/language/nederlands.php 2011-12-16 22:13:12 UTC (rev 8511)
@@ -0,0 +1,21 @@
+<?php
+/**
+ * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license http://www.fsf.org/copyleft/gpl.html GNU public license
+ * _LANGCODE: nl
+ * _CHARSET : UTF-8
+ * Vertaald door Renetjuh
+ * (Ver)taalfouten of suggesties?
+ * AUB hier melden: http://www.xoops.nl
+**/
+
+// Name of the editor
+define("_XOOPS_EDITOR_TINYMCE", "TinyMCE");
+
+// The value must be the same as /tinymce/jscripts/langs/your_language_code, for example, "en" for English, "fr" for French
+// For details, check http://tinymce.moxiecode.com/download_i18n.php
+define("_XOOPS_EDITOR_TINYMCE_LANGUAGE", "nl");
+
+// FONT LIST, FORMAT: "Name=value1,value2;Name=value"
+define("_XOOPS_EDITOR_TINYMCE_FONTS", "Arial=arial,helvetica,sans-serif;Courier New=courier new,courier,monospace;Georgia=georgia,times new roman,times,serif;Tahoma=tahoma,arial,helvetica,sans-serif;Times New Roman=times new roman,times,serif;Verdana=verdana,arial,helvetica,sans-serif;Impact=impact;WingDings=wingdings");
+?>
\ No newline at end of file
Property changes on: XoopsLanguages/dutch/core/2.5.4/htdocs/class/xoopseditor/tinymce/tinymce
___________________________________________________________________
Added: bugtraq:number
+ true
Property changes on: XoopsLanguages/dutch/core/2.5.4/htdocs/class/xoopseditor/tinymce/tinymce/jscripts
___________________________________________________________________
Added: bugtraq:number
+ true
Property changes on: XoopsLanguages/dutch/core/2.5.4/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce
___________________________________________________________________
Added: bugtraq:number
+ true
Property changes on: XoopsLanguages/dutch/core/2.5.4/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/langs
___________________________________________________________________
Added: bugtraq:number
+ true
Added: XoopsLanguages/dutch/core/2.5.4/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/langs/nl.js
===================================================================
--- XoopsLanguages/dutch/core/2.5.4/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/langs/nl.js (rev 0)
+++ XoopsLanguages/dutch/core/2.5.4/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/langs/nl.js 2011-12-16 22:13:12 UTC (rev 8511)
@@ -0,0 +1,166 @@
+tinyMCE.addI18n({nl:{
+common:{
+edit_confirm:"Weet u zeker dat u tekst in WYSIWYG mode wilt bewerken in dit tekstveld?",
+apply:"Toepassen",
+insert:"Invoegen",
+update:"Bijwerken",
+cancel:"Annuleren",
+close:"Sluiten",
+browse:"Bladeren",
+class_name:"Klasse",
+not_set:"- Standaard -",
+clipboard_msg:"Kopieren/knippen/plakken is niet beschikbaar in Mozilla en Firefox.\nWilt u meer informatie over deze beperking?",
+clipboard_no_support:"Kopieren/knippen/plakken wordt niet ondersteund door uw browser, gebruik hiervoor de sneltoetsen.",
+popup_blocked:"U zult uw popup-blocker tijdelijk moeten uitschakelen voor deze website om gebruik te kunnen maken van alle functies van deze teksteditor.",
+invalid_data:"Fout: Er zijn ongeldige waardes ingevoerd, deze zijn rood gemarkeerd.",
+more_colors:"Meer kleuren"
+},
+contextmenu:{
+align:"Uitlijning",
+left:"Links",
+center:"Centreren",
+right:"Rechts",
+full:"Uitvullen"
+},
+insertdatetime:{
+date_fmt:"%d-%m-%Y",
+time_fmt:"%H:%M:%S",
+insertdate_desc:"Datum invoegen",
+inserttime_desc:"Tijd invoegen",
+months_long:"Januari,Februari,Maart,April,Mei,Juni,Juli,Augustus,September,Oktober,November,December",
+months_short:"Jan,Feb,Mar,Apr,Mei,Jun,Jul,Aug,Sep,Okt,Nov,Dec",
+day_long:"Zondag,Maandag,Dinsdag,Woensdag,Donderdag,Vrijdag,Zaterdag,Zondag",
+day_short:"zo,ma,di,wo,do,vr,za,zo"
+},
+print:{
+print_desc:"Afdrukken"
+},
+preview:{
+preview_desc:"Voorbeeld"
+},
+directionality:{
+ltr_desc:"Van links naar rechts",
+rtl_desc:"Van rechts naar links"
+},
+layer:{
+insertlayer_desc:"Nieuwe laag invoegen",
+forward_desc:"Volgende laag",
+backward_desc:"Vorige laag",
+absolute_desc:"Absoluut positioneren inschakelen",
+content:"Nieuwe laag..."
+},
+save:{
+save_desc:"Opslaan",
+cancel_desc:"Alle wijzigingen annuleren"
+},
+nonbreaking:{
+nonbreaking_desc:"Open ruimte invoegen"
+},
+iespell:{
+iespell_desc:"Spellingcontrole",
+download:"ieSpell niet gevonden. Wilt u deze nu installeren?"
+},
+advhr:{
+advhr_desc:"Scheidingslijn"
+},
+emotions:{
+emotions_desc:"Emoties"
+},
+searchreplace:{
+search_desc:"Zoeken",
+replace_desc:"Zoeken/Vervangen"
+},
+advimage:{
+image_desc:"Afbeelding invoegen/bewerken"
+},
+advlink:{
+link_desc:"Link invoegen/bewerken"
+},
+xhtmlxtras:{
+cite_desc:"Citaat",
+abbr_desc:"Afkorting",
+acronym_desc:"Synoniem",
+del_desc:"Verwijderd",
+ins_desc:"Ingevoegd",
+attribs_desc:"Attributen invoegen/bewerken"
+},
+style:{
+desc:"CSS Stijl bewerken"
+},
+paste:{
+paste_text_desc:"Als platte tekst plakken",
+paste_word_desc:"Vanuit Word plakken",
+selectall_desc:"Alles selecteren"
+},
+paste_dlg:{
+text_title:"Gebruik Ctrl+V om tekst in het venster te plakken.",
+text_linebreaks:"Regelafbreking bewaren",
+word_title:"Gebruik Ctrl+V om tekst in het venster te plakken."
+},
+table:{
+desc:"Nieuwe tabel invoegen",
+row_before_desc:"Rij boven invoegen",
+row_after_desc:"Rij onder invoegen",
+delete_row_desc:"Rij verwijderen",
+col_before_desc:"Kolom links invoegen",
+col_after_desc:"Kolom rechts invoegen",
+delete_col_desc:"Kolom verwijderen",
+split_cells_desc:"Cellen splitsen",
+merge_cells_desc:"Cellen samenvoegen",
+row_desc:"Rij-eigenschappen",
+cell_desc:"Cel-eigenschappen",
+props_desc:"Tabeleigenschappen",
+paste_row_before_desc:"Rij boven plakken",
+paste_row_after_desc:"Rij onder plakken",
+cut_row_desc:"Rij knippen",
+copy_row_desc:"Rij kopi\u00EBren",
+del:"Tabel verwijderen",
+row:"Rij",
+col:"Kolom",
+cell:"Cel"
+},
+autosave:{
+unload_msg:"De wijzigingen zullen verloren gaan als u nu deze pagina verlaat."
+},
+fullscreen:{
+desc:"Volledig scherm"
+},
+media:{
+desc:"Media invoegen/bewerken",
+edit:"Media bewerken"
+},
+fullpage:{
+desc:"Documenteigenschappen"
+},
+template:{
+desc:"Voorgedefinieerd sjabloon invoegen"
+},
+visualchars:{
+desc:"Zichtbare symbolen"
+},
+spellchecker:{
+desc:"Spellingcontrole",
+menu:"Instellingen spellingcontrole",
+ignore_word:"Woord negeren",
+ignore_words:"Alles negeren",
+langs:"Talen",
+wait:"Een ogenblik geduld\u2026",
+sug:"Suggesties",
+no_sug:"Geen suggesties",
+no_mpell:"Geen spelfouten gevonden."
+},
+pagebreak:{
+desc:"Pagina-einde invoegen"
+},
+advlist:{
+types:"Types",
+def:"Standaard",
+lower_alpha:"Lower alpha",
+lower_greek:"Lower greek",
+lower_roman:"Lower roman",
+upper_alpha:"Upper alpha",
+upper_roman:"Upper roman",
+circle:"Cirkel",
+disc:"Schijf",
+square:"Vierkant"
+}}});
\ No newline at end of file
Property changes on: XoopsLanguages/dutch/core/2.5.4/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins
___________________________________________________________________
Added: bugtraq:number
+ true
Property changes on: XoopsLanguages/dutch/core/2.5.4/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/xoopscode
___________________________________________________________________
Added: bugtraq:number
+ true
Property changes on: XoopsLanguages/dutch/core/2.5.4/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/xoopscode/langs
___________________________________________________________________
Added: bugtraq:number
+ true
Added: XoopsLanguages/dutch/core/2.5.4/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/xoopscode/langs/nl.js
===================================================================
--- XoopsLanguages/dutch/core/2.5.4/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/xoopscode/langs/nl.js (rev 0)
+++ XoopsLanguages/dutch/core/2.5.4/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/xoopscode/langs/nl.js 2011-12-16 22:13:12 UTC (rev 8511)
@@ -0,0 +1,3 @@
+tinyMCE.addI18n('nl.xoopscode',{
+ code_desc:"Code Plaatsen"
+});
Added: XoopsLanguages/dutch/core/2.5.4/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/x...
[truncated message content] |
|
From: <zo...@us...> - 2011-12-16 18:08:54
|
Revision: 8510
http://xoops.svn.sourceforge.net/xoops/?rev=8510&view=rev
Author: zoullou
Date: 2011-12-16 18:08:48 +0000 (Fri, 16 Dec 2011)
Log Message:
-----------
Create zoullou's branche from 1.0.9 release
Added Paths:
-----------
XoopsModules/extgallery/branches/zoullou/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <zo...@us...> - 2011-12-16 18:07:21
|
Revision: 8509
http://xoops.svn.sourceforge.net/xoops/?rev=8509&view=rev
Author: zoullou
Date: 2011-12-16 18:07:14 +0000 (Fri, 16 Dec 2011)
Log Message:
-----------
Fix SVN manip error
Removed Paths:
-------------
XoopsModules/extgallery/branches/zoullou/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <zo...@us...> - 2011-12-16 17:58:31
|
Revision: 8508
http://xoops.svn.sourceforge.net/xoops/?rev=8508&view=rev
Author: zoullou
Date: 2011-12-16 17:58:25 +0000 (Fri, 16 Dec 2011)
Log Message:
-----------
Create zoullou branche
Added Paths:
-----------
XoopsModules/extgallery/branches/zoullou/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <wis...@us...> - 2011-12-15 23:35:24
|
Revision: 8507
http://xoops.svn.sourceforge.net/xoops/?rev=8507&view=rev
Author: wishcraft
Date: 2011-12-15 23:35:14 +0000 (Thu, 15 Dec 2011)
Log Message:
-----------
Xortify 3.02 Stable - Cloud Security for XOOPS 2.6 - bundle (node xortify.com to be moved to hosted at xoops.org) - recupsoft bug fixes
Modified Paths:
--------------
XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/include/post.loader.mainfile.php
Modified: XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/include/post.loader.mainfile.php
===================================================================
--- XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/include/post.loader.mainfile.php 2011-12-15 23:35:08 UTC (rev 8506)
+++ XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/include/post.loader.mainfile.php 2011-12-15 23:35:14 UTC (rev 8507)
@@ -10,7 +10,7 @@
include_once (XOOPS_ROOT_PATH.'/modules/xortify/providers/providers.php');
- require_once( XOOPS_ROOT_PATH.'/modules/xortify/class/'.$GLOBALS['xortify_api'].'.php' );
+ require_once( XOOPS_ROOT_PATH.'/modules/xortify/class/'.$GLOBALS['xortifyModuleConfig']['xortify_api'].'.php' );
$check = new Providers('postcheck');
?>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <wis...@us...> - 2011-12-15 23:35:15
|
Revision: 8506
http://xoops.svn.sourceforge.net/xoops/?rev=8506&view=rev
Author: wishcraft
Date: 2011-12-15 23:35:08 +0000 (Thu, 15 Dec 2011)
Log Message:
-----------
Xortify 2.99 - STABLE - Bug Fixes for recupsoft
Modified Paths:
--------------
XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/include/post.loader.mainfile.php
XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/preloads/core.php
Modified: XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/include/post.loader.mainfile.php
===================================================================
--- XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/include/post.loader.mainfile.php 2011-12-15 21:03:56 UTC (rev 8505)
+++ XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/include/post.loader.mainfile.php 2011-12-15 23:35:08 UTC (rev 8506)
@@ -10,7 +10,7 @@
include_once (XOOPS_ROOT_PATH.'/modules/xortify/providers/providers.php');
- require_once( XOOPS_ROOT_PATH.'/modules/xortify/class/'.$GLOBALS['xortify_api'].'.php' );
+ require_once( XOOPS_ROOT_PATH.'/modules/xortify/class/'.$GLOBALS['xortifyModuleConfig']['xortify_api'].'.php' );
$check = new Providers('postcheck');
?>
\ No newline at end of file
Modified: XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/preloads/core.php
===================================================================
--- XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/preloads/core.php 2011-12-15 21:03:56 UTC (rev 8505)
+++ XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/preloads/core.php 2011-12-15 23:35:08 UTC (rev 8506)
@@ -16,7 +16,6 @@
function eventCoreIncludeCommonStart($args)
{
-
include_once XOOPS_ROOT_PATH.'/class/cache/xoopscache.php';
$result = XoopsCache::read('xortify_core_include_common_start');
if ((isset($result['time'])?(float)$result['time']:0)<=microtime(true)) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <wis...@us...> - 2011-12-15 21:04:02
|
Revision: 8505
http://xoops.svn.sourceforge.net/xoops/?rev=8505&view=rev
Author: wishcraft
Date: 2011-12-15 21:03:56 +0000 (Thu, 15 Dec 2011)
Log Message:
-----------
Xortify 2.99 - STABLE - Bug Fixes for recupsoft
Modified Paths:
--------------
XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/class/auth/auth_curlserialised.php
XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/preloads/core.php
Modified: XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/class/auth/auth_curlserialised.php
===================================================================
--- XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/class/auth/auth_curlserialised.php 2011-12-15 21:00:09 UTC (rev 8504)
+++ XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/class/auth/auth_curlserialised.php 2011-12-15 21:03:56 UTC (rev 8505)
@@ -11,7 +11,7 @@
define('XORTIFY_CURLSERIAL_API', $GLOBALS['xortifyModuleConfig']['xortify_uriserial']);
define('XORTIFY_USER_AGENT', 'Mozilla/5.0 (X11; U; Linux i686; pl-PL; rv:1.9.0.2) XOOPS/20100101 XoopsAuth/1.xx (php)');
-include_once XOOPS_ROOT_PATH . '/modules/xortify/class/auth/auth_curlserilaised_provisionning.php';
+include_once XOOPS_ROOT_PATH . '/modules/xortify/class/auth/auth_curlserialised_provisionning.php';
class XortifyAuthCurlserialised extends XortifyAuth {
Modified: XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/preloads/core.php
===================================================================
--- XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/preloads/core.php 2011-12-15 21:00:09 UTC (rev 8504)
+++ XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/preloads/core.php 2011-12-15 21:03:56 UTC (rev 8505)
@@ -81,9 +81,9 @@
function eventCoreHeaderAddmeta($args)
{
-
- if ($GLOBALS['xortify_pass'] == true) {
- $GLOBALS['xoops']->theme->addScript('', array('type'=>'text/javascript'), "var _gaq = _gaq || [];
+ if (isset($GLOBALS['xortify_pass'])) {
+ if ($GLOBALS['xortify_pass'] == true) {
+ $GLOBALS['xoops']->theme->addScript('', array('type'=>'text/javascript'), "var _gaq = _gaq || [];
_gaq.push(['_setAccount', 'UA-27726722-1']);
_gaq.push(['_setDomainName', '".$_SERVER["HTTP_HOST"]."']);
_gaq.push(['_setAllowLinker', true]);
@@ -94,6 +94,7 @@
ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
})();");
+ }
}
include_once XOOPS_ROOT_PATH.'/class/cache/xoopscache.php';
$result = XoopsCache::read('xortify_core_header_add_meta');
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <wis...@us...> - 2011-12-15 21:00:19
|
Revision: 8504
http://xoops.svn.sourceforge.net/xoops/?rev=8504&view=rev
Author: wishcraft
Date: 2011-12-15 21:00:09 +0000 (Thu, 15 Dec 2011)
Log Message:
-----------
Xortify 3.02 Stable - Cloud Security for XOOPS 2.6 - bundle (node xortify.com to be moved to hosted at xoops.org) - recupsoft bug fixes
Modified Paths:
--------------
XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/admin/index.php
XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/class/auth/auth_curlserialised.php
XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/class/auth/authfactory.php
XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/cron/serverup.php
XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/language/english/admin.php
XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/preloads/core.php
Modified: XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/admin/index.php
===================================================================
--- XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/admin/index.php 2011-12-15 20:28:09 UTC (rev 8503)
+++ XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/admin/index.php 2011-12-15 21:00:09 UTC (rev 8504)
@@ -29,7 +29,7 @@
include_once $GLOBALS['xoops']->path('class'.DS.'pagenav.php');
include_once $GLOBALS['xoops']->path('class'.DS.'xoopslists.php');
include_once $GLOBALS['xoops']->path('class'.DS.'xoopsmailer.php');
- include_once $GLOBALS['xoops']->path('class'.DS.'xoopstree.php');
+ include_once $GLOBALS['xoops']->path('class'.DS.'tree.php');
include_once $GLOBALS['xoops']->path('class'.DS.'xoopsformloader.php');
include_once $GLOBALS['xoops']->path('modules'.DS.'xortify'.DS.'class'.DS.'auth'.DS.'authfactory.php');
include_once $GLOBALS['xoops']->path('modules'.DS.'xortify'.DS.'include'.DS.'functions.php');
@@ -63,7 +63,7 @@
$GLOBALS['xoops']->header();
$GLOBALS['xoops']->tpl->assign('pathImageIcon', $GLOBALS['xortifyImageIcon']);
- $GLOBALS['xoops']->tpl->assign('pathImageAdmin', $GLOBALS['xortifyImageAdin']);
+ $GLOBALS['xoops']->tpl->assign('pathImageAdmin', $GLOBALS['xortifyImageAdmin']);
$op = isset($_REQUEST['op'])?$_REQUEST['op']:"dashboard";
$fct = isset($_REQUEST['fct'])?$_REQUEST['fct']:"";
Modified: XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/class/auth/auth_curlserialised.php
===================================================================
--- XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/class/auth/auth_curlserialised.php 2011-12-15 20:28:09 UTC (rev 8503)
+++ XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/class/auth/auth_curlserialised.php 2011-12-15 21:00:09 UTC (rev 8504)
@@ -11,7 +11,7 @@
define('XORTIFY_CURLSERIAL_API', $GLOBALS['xortifyModuleConfig']['xortify_uriserial']);
define('XORTIFY_USER_AGENT', 'Mozilla/5.0 (X11; U; Linux i686; pl-PL; rv:1.9.0.2) XOOPS/20100101 XoopsAuth/1.xx (php)');
-include_once XOOPS_ROOT_PATH . '/modules/xortify/class/auth/auth_curlserilaised_provisionning.php';
+include_once XOOPS_ROOT_PATH . '/modules/xortify/class/auth/auth_curlserialised_provisionning.php';
class XortifyAuthCurlserialised extends XortifyAuth {
Modified: XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/class/auth/authfactory.php
===================================================================
--- XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/class/auth/authfactory.php 2011-12-15 20:28:09 UTC (rev 8503)
+++ XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/class/auth/authfactory.php 2011-12-15 21:00:09 UTC (rev 8504)
@@ -8,40 +8,40 @@
* @licence GPL 2.0 - see docs/LICENCE.txt
*/
-
-class XortifyAuthFactory
-{
-
- /**
- * Get a reference to the only instance of authentication class
- *
- * if the class has not been instantiated yet, this will also take
- * care of that
- *
- * @static
- * @return object Reference to the only instance of authentication class
- */
- function &getAuthConnection($uname, $xortify_auth_method = 'soap')
+if (!class_exists('XortifyAuthFactory')) {
+ class XortifyAuthFactory
{
-
- static $auth_instance;
- if (!isset($auth_instance)) {
- require_once XOOPS_ROOT_PATH.'/modules/xortify/class/auth/auth.php';
- // Verify if uname allow to bypass LDAP auth
- $file = XOOPS_ROOT_PATH . '/modules/xortify/class/auth/auth_' . $xortify_auth_method . '.php';
- require_once $file;
- $class = 'XortifyAuth' . ucfirst($xortify_auth_method);
- switch ($xortify_auth_method) {
- case 'soap';
- $dao = null;
- break;
-
+
+ /**
+ * Get a reference to the only instance of authentication class
+ *
+ * if the class has not been instantiated yet, this will also take
+ * care of that
+ *
+ * @static
+ * @return object Reference to the only instance of authentication class
+ */
+ function &getAuthConnection($uname, $xortify_auth_method = 'soap')
+ {
+
+ static $auth_instance;
+ if (!isset($auth_instance)) {
+ require_once XOOPS_ROOT_PATH.'/modules/xortify/class/auth/auth.php';
+ // Verify if uname allow to bypass LDAP auth
+ $file = XOOPS_ROOT_PATH . '/modules/xortify/class/auth/auth_' . $xortify_auth_method . '.php';
+ require_once $file;
+ $class = 'XortifyAuth' . ucfirst($xortify_auth_method);
+ switch ($xortify_auth_method) {
+ case 'soap';
+ $dao = null;
+ break;
+
+ }
+ $auth_instance = new $class($dao);
}
- $auth_instance = new $class($dao);
+ return $auth_instance;
}
- return $auth_instance;
+
}
-
}
-
?>
Modified: XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/cron/serverup.php
===================================================================
--- XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/cron/serverup.php 2011-12-15 20:28:09 UTC (rev 8503)
+++ XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/cron/serverup.php 2011-12-15 21:00:09 UTC (rev 8504)
@@ -244,6 +244,8 @@
$xoops->logger->stopTime('XOOPS Boot');
$xoops->logger->startTime('Module init');
+ } else {
+ $xoops = Xoops::getInstance();
}
$module_handler =& $xoops->getHandler('module');
Modified: XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/language/english/admin.php
===================================================================
--- XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/language/english/admin.php 2011-12-15 20:28:09 UTC (rev 8503)
+++ XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/language/english/admin.php 2011-12-15 21:00:09 UTC (rev 8504)
@@ -57,7 +57,6 @@
define('_XOR_ADMIN_ERROR_OCCURED', 'Error Occured Communicating with cloud');
define('_XOR_ADMIN_ERROR_URL', 'URL/URI Being Contacted');
define('_XOR_ADMIN_ERROR_PROTOCOL', 'Protocol Being Used');
- define('_XOR_ADMIN_NONETWORKCOMM_DISCLAIMER', 'The current URI is unaccessable on the selected protocol. This could mean you are either missing a required PHP Extension or have a firewall blocking port 80 to the Xortify Cloud.<br/><br/><strong>You can try changing the protocol selected in preferences to see if this may elivate the communication fawl of your hosting services.</strong>');
define('_XOR_ADMIN_SIGNUP_XORTIFY_H2', 'Signup to the XOOPS fortification cloud');
define('_XOR_ADMIN_SIGNUP_XORTIFY_P', 'Here you can signup to the XOOPS fortification cloud called Xortify, the main node for this cloud is featured at http://xortify.com but there can be other nodes, this will prevent spam signup, website harvesting, and general hacking of your site.<br/><br/>It will also share the IP\'s of Bad IP Highlighted by Protector with other people running Xortify.');
define('_XOR_ADMIN_SIGNUP_XORTIFY_FORM_TD2', 'Sign-up this Website\'s User Account on the Xortify Cloud.');
Modified: XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/preloads/core.php
===================================================================
--- XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/preloads/core.php 2011-12-15 20:28:09 UTC (rev 8503)
+++ XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/preloads/core.php 2011-12-15 21:00:09 UTC (rev 8504)
@@ -14,8 +14,22 @@
class XortifyCorePreload extends XoopsPreloadItem
{
+ function init() {
+ $xoops = Xoops::getInstance();
+ $module_handler = $xoops->getHandler('module');
+ $config_handler = $xoops->getHandler('config');
+ $GLOBALS['xortifyModule'] = $module_handler->getByDirname('xortify');
+ if (is_object($GLOBALS['xortifyModule'])) {
+ $GLOBALS['xortifyModuleConfig'] = $config_handler->getConfigList($GLOBALS['xortifyModule']->getVar('mid'));
+ } else {
+ $GLOBALS['xortifyModuleConfig']['fault_delay'] = 600;
+ }
+ XoopsLoad::load('xoopscache');
+ }
+
function eventCoreIncludeCommonStart($args)
{
+ XortifyCorePreload::init();
$result = XoopsCache::read('xortify_core_include_common_start');
if ((isset($result['time'])?(float)$result['time']:0)<=microtime(true)) {
XoopsCache::write('xortify_core_include_common_start', array('time'=>microtime(true)), $GLOBALS['xortifyModuleConfig']['fault_delay']);
@@ -47,8 +61,7 @@
$result = XoopsCache::read('xortify_core_include_common_end');
if ((isset($result['time'])?(float)$result['time']:0)<=microtime(true)) {
XoopsCache::write('xortify_core_include_common_end', array('time'=>microtime(true)+$GLOBALS['xortifyModuleConfig']['fault_delay']), $GLOBALS['xortifyModuleConfig']['fault_delay']);
- if (XortifyCorePreload::hasAPIUserPass())
- if (XortifyCorePreload::isActive()) {
+ if (XortifyCorePreload::hasAPIUserPass()) {
include_once XOOPS_ROOT_PATH . ( '/modules/xortify/include/post.loader.mainfile.php' );
}
XoopsCache::write('xortify_core_include_common_end', array('time'=>microtime(true)), -1);
@@ -61,8 +74,7 @@
$result = XoopsCache::read('xortify_core_header_cache_end');
if ((isset($result['time'])?(float)$result['time']:0)<=microtime(true)) {
XoopsCache::write('xortify_core_header_cache_end', array('time'=>microtime(true)+$GLOBALS['xortifyModuleConfig']['fault_delay']), $GLOBALS['xortifyModuleConfig']['fault_delay']);
- if (XortifyCorePreload::hasAPIUserPass())
- if (XortifyCorePreload::isActive()) {
+ if (XortifyCorePreload::hasAPIUserPass()) {
include_once XOOPS_ROOT_PATH . ( '/modules/xortify/include/post.header.endcache.php' );
}
XoopsCache::write('xortify_core_header_cache_end', array('time'=>microtime(true)), -1);
@@ -71,8 +83,9 @@
function eventCoreHeaderAddmeta($args)
{
- if ($GLOBALS['xortify_pass'] == true) {
- $GLOBALS['xoops']->theme->addScript('', array('type'=>'text/javascript'), "var _gaq = _gaq || [];
+ if (isset($GLOBALS['xortify_pass'])) {
+ if ($GLOBALS['xortify_pass'] == true) {
+ $GLOBALS['xoops']->theme->addScript('', array('type'=>'text/javascript'), "var _gaq = _gaq || [];
_gaq.push(['_setAccount', 'UA-27726722-1']);
_gaq.push(['_setDomainName', '".$_SERVER["HTTP_HOST"]."']);
_gaq.push(['_setAllowLinker', true]);
@@ -83,25 +96,18 @@
ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
})();");
+ }
}
$result = XoopsCache::read('xortify_core_header_add_meta');
if ((isset($result['time'])?(float)$result['time']:0)<=microtime(true)) {
XoopsCache::write('xortify_core_header_add_meta', array('time'=>microtime(true)+$GLOBALS['xortifyModuleConfig']['fault_delay']), $GLOBALS['xortifyModuleConfig']['fault_delay']);
- if (XortifyCorePreload::hasAPIUserPass())
- if (XortifyCorePreload::isActive()) {
+ if (XortifyCorePreload::hasAPIUserPass()) {
include_once XOOPS_ROOT_PATH . ( '/modules/xortify/include/post.header.addmeta.php' );
}
XoopsCache::write('xortify_core_header_add_meta', array('time'=>microtime(true)), -1);
}
}
- function isActive()
- {
- $xoops = Xoops::getInstance();
- $module_handler = $xoops->getHandler('module');
- $module = $module_handler->getByDirname('xortify');
- return ($module && $module->getVar('isactive')) ? ($module->getVar('version')<240) ? false : true : false;
- }
-
+
function hasAPIUserPass()
{
if ($GLOBALS['xortifyModuleConfig']['xortify_username']!=''&&$GLOBALS['xortifyModuleConfig']['xortify_password']!='')
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <wis...@us...> - 2011-12-15 20:28:20
|
Revision: 8503
http://xoops.svn.sourceforge.net/xoops/?rev=8503&view=rev
Author: wishcraft
Date: 2011-12-15 20:28:09 +0000 (Thu, 15 Dec 2011)
Log Message:
-----------
Xortify 2.99 - STABLE - Bug Fixes for recupsoft
Modified Paths:
--------------
XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/class/auth/authfactory.php
XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/language/english/admin.php
XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/preloads/core.php
XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/providers/providers.php
Modified: XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/class/auth/authfactory.php
===================================================================
--- XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/class/auth/authfactory.php 2011-12-15 19:14:24 UTC (rev 8502)
+++ XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/class/auth/authfactory.php 2011-12-15 20:28:09 UTC (rev 8503)
@@ -8,40 +8,40 @@
* @licence GPL 2.0 - see docs/LICENCE.txt
*/
-
-class XortifyAuthFactory
-{
-
- /**
- * Get a reference to the only instance of authentication class
- *
- * if the class has not been instantiated yet, this will also take
- * care of that
- *
- * @static
- * @return object Reference to the only instance of authentication class
- */
- function &getAuthConnection($uname, $xortify_auth_method = 'soap')
+if (!class_exists('XortifyAuthFactory')) {
+ class XortifyAuthFactory
{
-
- static $auth_instance;
- if (!isset($auth_instance)) {
- require_once XOOPS_ROOT_PATH.'/modules/xortify/class/auth/auth.php';
- // Verify if uname allow to bypass LDAP auth
- $file = XOOPS_ROOT_PATH . '/modules/xortify/class/auth/auth_' . $xortify_auth_method . '.php';
- require_once $file;
- $class = 'XortifyAuth' . ucfirst($xortify_auth_method);
- switch ($xortify_auth_method) {
- case 'soap';
- $dao = null;
- break;
-
+
+ /**
+ * Get a reference to the only instance of authentication class
+ *
+ * if the class has not been instantiated yet, this will also take
+ * care of that
+ *
+ * @static
+ * @return object Reference to the only instance of authentication class
+ */
+ function &getAuthConnection($uname, $xortify_auth_method = 'soap')
+ {
+
+ static $auth_instance;
+ if (!isset($auth_instance)) {
+ require_once XOOPS_ROOT_PATH.'/modules/xortify/class/auth/auth.php';
+ // Verify if uname allow to bypass LDAP auth
+ $file = XOOPS_ROOT_PATH . '/modules/xortify/class/auth/auth_' . $xortify_auth_method . '.php';
+ require_once $file;
+ $class = 'XortifyAuth' . ucfirst($xortify_auth_method);
+ switch ($xortify_auth_method) {
+ case 'soap';
+ $dao = null;
+ break;
+
+ }
+ $auth_instance = new $class($dao);
}
- $auth_instance = new $class($dao);
+ return $auth_instance;
}
- return $auth_instance;
+
}
-
}
-
?>
Modified: XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/language/english/admin.php
===================================================================
--- XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/language/english/admin.php 2011-12-15 19:14:24 UTC (rev 8502)
+++ XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/language/english/admin.php 2011-12-15 20:28:09 UTC (rev 8503)
@@ -55,13 +55,12 @@
//About
define('_XOR_ADMIN_ABOUT_MAKEDONATE', 'Make donation to Chronolabs co-op');
- //Version 2.99
+ //Version 2.99.1
define('_XOR_ADMIN_MAKEDONATE', 'Make Donation to Further Xortify!');
define('_XOR_ADMIN_NONETWORKCOMM_DISCLAIMER', 'The current URI is unaccessable on the selected protocol. This could mean you are either missing a required PHP Extension or have a firewall blocking port 80 to the Xortify Cloud.<br/><br/><strong>You can try changing the protocol selected in preferences to see if this may elivate the communication fawl of your hosting services.</strong>');
define('_XOR_ADMIN_ERROR_OCCURED', 'Error Occured Communicating with cloud');
define('_XOR_ADMIN_ERROR_URL', 'URL/URI Being Contacted');
define('_XOR_ADMIN_ERROR_PROTOCOL', 'Protocol Being Used');
- define('_XOR_ADMIN_NONETWORKCOMM_DISCLAIMER', 'The current URI is unaccessable on the selected protocol. This could mean you are either missing a required PHP Extension or have a firewall blocking port 80 to the Xortify Cloud.<br/><br/><strong>You can try changing the protocol selected in preferences to see if this may elivate the communication fawl of your hosting services.</strong>');
define('_XOR_ADMIN_SIGNUP_XORTIFY_H2', 'Signup to the XOOPS fortification cloud');
define('_XOR_ADMIN_SIGNUP_XORTIFY_P', 'Here you can signup to the XOOPS fortification cloud called Xortify, the main node for this cloud is featured at http://xortify.com but there can be other nodes, this will prevent spam signup, website harvesting, and general hacking of your site.<br/><br/>It will also share the IP\'s of Bad IP Highlighted by Protector with other people running Xortify.');
define('_XOR_ADMIN_SIGNUP_XORTIFY_FORM_TD2', 'Sign-up this Website\'s User Account on the Xortify Cloud.');
Modified: XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/preloads/core.php
===================================================================
--- XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/preloads/core.php 2011-12-15 19:14:24 UTC (rev 8502)
+++ XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/preloads/core.php 2011-12-15 20:28:09 UTC (rev 8503)
@@ -28,6 +28,12 @@
function eventCoreIncludeCommonEnd($args)
{
+ $module_handler = xoops_gethandler('module');
+ $config_handler = xoops_gethandler('config');
+ $GLOBALS['xortifyModule'] = $module_handler->getByDirname('xortify');
+ if (is_object($GLOBALS['xortifyModule'])) {
+ $GLOBALS['xortifyModuleConfig'] = $config_handler->getConfigList($GLOBALS['xortifyModule']->getVar('mid'));
+ }
include_once XOOPS_ROOT_PATH.'/class/cache/xoopscache.php';
$result = XoopsCache::read('xortify_core_include_common_end_cron');
@@ -51,8 +57,7 @@
$result = XoopsCache::read('xortify_core_include_common_end');
if ((isset($result['time'])?(float)$result['time']:0)<=microtime(true)) {
XoopsCache::write('xortify_core_include_common_end', array('time'=>microtime(true)+$GLOBALS['xortifyModuleConfig']['fault_delay']), $GLOBALS['xortifyModuleConfig']['fault_delay']);
- if (XortifyCorePreload::hasAPIUserPass())
- if (XortifyCorePreload::isActive()) {
+ if (XortifyCorePreload::hasAPIUserPass()) {
include_once XOOPS_ROOT_PATH . ( '/modules/xortify/include/post.loader.mainfile.php' );
}
XoopsCache::write('xortify_core_include_common_end', array('time'=>microtime(true)), -1);
@@ -67,8 +72,7 @@
$result = XoopsCache::read('xortify_core_header_cache_end');
if ((isset($result['time'])?(float)$result['time']:0)<=microtime(true)) {
XoopsCache::write('xortify_core_header_cache_end', array('time'=>microtime(true)+$GLOBALS['xortifyModuleConfig']['fault_delay']), $GLOBALS['xortifyModuleConfig']['fault_delay']);
- if (XortifyCorePreload::hasAPIUserPass())
- if (XortifyCorePreload::isActive()) {
+ if (XortifyCorePreload::hasAPIUserPass()) {
include_once XOOPS_ROOT_PATH . ( '/modules/xortify/include/post.header.endcache.php' );
}
XoopsCache::write('xortify_core_header_cache_end', array('time'=>microtime(true)), -1);
@@ -95,8 +99,7 @@
$result = XoopsCache::read('xortify_core_header_add_meta');
if ((isset($result['time'])?(float)$result['time']:0)<=microtime(true)) {
XoopsCache::write('xortify_core_header_add_meta', array('time'=>microtime(true)+$GLOBALS['xortifyModuleConfig']['fault_delay']), $GLOBALS['xortifyModuleConfig']['fault_delay']);
- if (XortifyCorePreload::hasAPIUserPass())
- if (XortifyCorePreload::isActive()) {
+ if (XortifyCorePreload::hasAPIUserPass()) {
include_once XOOPS_ROOT_PATH . ( '/modules/xortify/include/post.header.addmeta.php' );
}
XoopsCache::write('xortify_core_header_add_meta', array('time'=>microtime(true)), -1);
Modified: XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/providers/providers.php
===================================================================
--- XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/providers/providers.php 2011-12-15 19:14:24 UTC (rev 8502)
+++ XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/providers/providers.php 2011-12-15 20:28:09 UTC (rev 8503)
@@ -65,12 +65,7 @@
$GLOBALS['xortifyModuleConfig']['fault_delay'] = 120;
}
}
-
- function __destruct() {
- unset($GLOBALS['xortifyModule']);
- unset($GLOBALS['xortifyModuleConfig']);
- }
-
+
function Providers($check = 'precheck')
{
$this->init($check);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <be...@us...> - 2011-12-15 19:14:30
|
Revision: 8502
http://xoops.svn.sourceforge.net/xoops/?rev=8502&view=rev
Author: beckmi
Date: 2011-12-15 19:14:24 +0000 (Thu, 15 Dec 2011)
Log Message:
-----------
reverting Xortify
Removed Paths:
-------------
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <wis...@us...> - 2011-12-15 10:31:40
|
Revision: 8501
http://xoops.svn.sourceforge.net/xoops/?rev=8501&view=rev
Author: wishcraft
Date: 2011-12-15 10:31:30 +0000 (Thu, 15 Dec 2011)
Log Message:
-----------
Xortify 3.02 Stable - Cloud Security for XOOPS 2.6 - bundle (node xortify.com to be moved to hosted at xoops.org)
Modified Paths:
--------------
XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/admin/index.php
XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/class/auth/auth_curl.php
XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/class/auth/auth_curlserialised.php
XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/class/auth/auth_curlxml.php
XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/class/auth/auth_json.php
XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/class/auth/auth_soap.php
XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/class/auth/auth_wgetserialised.php
XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/class/auth/auth_wgetxml.php
XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/class/curl.php
XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/class/curlserialised.php
XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/class/curlxml.php
XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/class/json.php
XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/class/soap.php
XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/class/wgetserialised.php
XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/class/wgetxml.php
XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/include/pre.loader.mainfile.php
XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/preloads/core.php
XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/providers/projecthoneypot.org/post.loader.php
XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/providers/protector/footer.post.loader.php
XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/providers/protector/header.post.loader.php
XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/providers/providers.php
XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/providers/spiders/post.loader.php
XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/providers/stopforumspam.com/post.loader.php
XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/providers/xortify/footer.post.loader.php
XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/providers/xortify/header.post.loader.php
XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/providers/xortify/post.loader.php
XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/xoops_version.php
Modified: XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/admin/index.php
===================================================================
--- XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/admin/index.php 2011-12-15 10:31:25 UTC (rev 8500)
+++ XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/admin/index.php 2011-12-15 10:31:30 UTC (rev 8501)
@@ -25,16 +25,15 @@
$GLOBALS['xortifyModule'] = $module_handler->getByDirname('xortify');
$GLOBALS['xortifyModuleConfig'] = $config_handler->getConfigList($GLOBALS['xortifyModule']->getVar('mid'));
- XoopsLoad::load('pagenav');
- XoopsLoad::load('xoopslists');
- XoopsLoad::load('xoopsformloader');
-
+ include_once $GLOBALS['xoops']->path('class'.DS.'cache'.DS.'xoopscache.php');
+ include_once $GLOBALS['xoops']->path('class'.DS.'pagenav.php');
+ include_once $GLOBALS['xoops']->path('class'.DS.'xoopslists.php');
include_once $GLOBALS['xoops']->path('class'.DS.'xoopsmailer.php');
include_once $GLOBALS['xoops']->path('class'.DS.'xoopstree.php');
+ include_once $GLOBALS['xoops']->path('class'.DS.'xoopsformloader.php');
+ include_once $GLOBALS['xoops']->path('modules'.DS.'xortify'.DS.'class'.DS.'auth'.DS.'authfactory.php');
include_once $GLOBALS['xoops']->path('modules'.DS.'xortify'.DS.'include'.DS.'functions.php');
include_once $GLOBALS['xoops']->path('modules'.DS.'xortify'.DS.'include'.DS.'forms.xortify.php');
- include_once $GLOBALS['xoops']->path('modules'.DS.'xortify'.DS.'include'.DS.'forms.objects.php');
- include_once $GLOBALS['xoops']->path('modules'.DS.'xortify'.DS.'class'.DS.'auth'.DS.'authfactory.php');
if ( file_exists($GLOBALS['xoops']->path('/Frameworks/moduleclasses/moduleadmin/moduleadmin.php'))){
include_once $GLOBALS['xoops']->path('/Frameworks/moduleclasses/moduleadmin/moduleadmin.php');
@@ -191,15 +190,20 @@
break;
default:
case "signup":
+
echo xortify_adminMenu(4);
$GLOBALS['xoops'] = Xoops::getInstance();
+
$xortifyAuth =& XortifyAuthFactory::getAuthConnection(false, $GLOBALS['xortifyModuleConfig']['protocol']);
+
$disclaimer = $xortifyAuth->network_disclaimer();
+
if (strlen(trim($disclaimer))==0)
{
$disclaimer = _XOR_ADMIN_NONETWORKCOMM_DISCLAIMER;
}
if ($disclaimer != _XOR_ADMIN_NONETWORKCOMM_DISCLAIMER) {
+
$uname = new XoopsFormText('', "uname", 35, 128, (isset($_POST['uname'])?$_POST['uname']:''));
$pass = new XoopsFormPassword('', "pass", 35, 128, (isset($_POST['pass'])?$_POST['pass']:''));
$vpass = new XoopsFormPassword('', "vpass", 35, 128, (isset($_POST['vpass'])?$_POST['vpass']:''));
@@ -218,7 +222,7 @@
$GLOBALS['xoops']->tpl->assign('pass',$pass->render());
$GLOBALS['xoops']->tpl->assign('vpass',$vpass->render());
$GLOBALS['xoops']->tpl->assign('email',$email->render());
- $GLOBALS['xoops']->tpl->assign('url',$url->render());
+ $GLOBALS['xoops']->tpl->assign('yoururl',$url->render());
$GLOBALS['xoops']->tpl->assign('viewemail',$viewemail->render());
$GLOBALS['xoops']->tpl->assign('timezone',$timezone->render());
$GLOBALS['xoops']->tpl->assign('disclaimer',$disclaim->render());
@@ -228,10 +232,12 @@
$GLOBALS['xoops']->tpl->assign('fct',$fct->render());
$GLOBALS['xoops']->tpl->assign('submit',$submit->render());
$GLOBALS['xoops']->tpl->display('admin:xortify|xortify_cpanel_signup_form.html');
+
xortify_footer_adminMenu();
$GLOBALS['xoops']->footer();
exit;
} else {
+
$GLOBALS['xoops']->tpl->assign('protocol', $GLOBALS['xortifyModuleConfig']['protocol']);
switch($GLOBALS['xortifyModuleConfig']['protocol']) {
case 'curlserialised':
@@ -252,6 +258,7 @@
}
$GLOBALS['xoops']->tpl->assign('error', $disclaimer);
$GLOBALS['xoops']->tpl->display('admin:xortify|xortify_cpanel_signup_nocommunication.html');
+
}
break;
}
Modified: XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/class/auth/auth_curl.php
===================================================================
--- XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/class/auth/auth_curl.php 2011-12-15 10:31:25 UTC (rev 8500)
+++ XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/class/auth/auth_curl.php 2011-12-15 10:31:30 UTC (rev 8501)
@@ -27,7 +27,7 @@
}
-define('XORTIFY_CURL_API', $GLOBALS['xoopsModuleConfig']['xortify_uricurl']);
+define('XORTIFY_CURL_API', $GLOBALS['xortifyModuleConfig']['xortify_uricurl']);
define('XORTIFY_USER_AGENT', 'Mozilla/5.0 (X11; U; Linux i686; pl-PL; rv:1.9.0.2) XOOPS/20100101 XoopsAuth/1.xx (php)');
include_once XOOPS_ROOT_PATH . '/modules/xortify/class/auth/auth_curl_provisionning.php';
Modified: XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/class/auth/auth_curlserialised.php
===================================================================
--- XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/class/auth/auth_curlserialised.php 2011-12-15 10:31:25 UTC (rev 8500)
+++ XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/class/auth/auth_curlserialised.php 2011-12-15 10:31:30 UTC (rev 8501)
@@ -9,7 +9,7 @@
*/
-define('XORTIFY_CURLSERIAL_API', $GLOBALS['xoopsModuleConfig']['xortify_uriserial']);
+define('XORTIFY_CURLSERIAL_API', $GLOBALS['xortifyModuleConfig']['xortify_uriserial']);
define('XORTIFY_USER_AGENT', 'Mozilla/5.0 (X11; U; Linux i686; pl-PL; rv:1.9.0.2) XOOPS/20100101 XoopsAuth/1.xx (php)');
include_once XOOPS_ROOT_PATH . '/modules/xortify/class/auth/auth_curlserilaised_provisionning.php';
Modified: XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/class/auth/auth_curlxml.php
===================================================================
--- XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/class/auth/auth_curlxml.php 2011-12-15 10:31:25 UTC (rev 8500)
+++ XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/class/auth/auth_curlxml.php 2011-12-15 10:31:30 UTC (rev 8501)
@@ -9,7 +9,7 @@
*/
-define('XORTIFY_CURLXML_API', $GLOBALS['xoopsModuleConfig']['xortify_urixml']);
+define('XORTIFY_CURLXML_API', $GLOBALS['xortifyModuleConfig']['xortify_urixml']);
define('XORTIFY_USER_AGENT', 'Mozilla/5.0 (X11; U; Linux i686; pl-PL; rv:1.9.0.2) XOOPS/20100101 XoopsAuth/1.xx (php)');
include_once XOOPS_ROOT_PATH . '/modules/xortify/class/auth/auth_curlxml_provisionning.php';
Modified: XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/class/auth/auth_json.php
===================================================================
--- XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/class/auth/auth_json.php 2011-12-15 10:31:25 UTC (rev 8500)
+++ XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/class/auth/auth_json.php 2011-12-15 10:31:30 UTC (rev 8501)
@@ -27,7 +27,7 @@
}
}
-define('XORTIFY_JSON_API', $GLOBALS['xoopsModuleConfig']['xortify_urijson']);
+define('XORTIFY_JSON_API', $GLOBALS['xortifyModuleConfig']['xortify_urijson']);
include_once XOOPS_ROOT_PATH . '/modules/xortify/class/auth/auth_json_provisionning.php';
class XortifyAuthJson extends XortifyAuth {
Modified: XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/class/auth/auth_soap.php
===================================================================
--- XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/class/auth/auth_soap.php 2011-12-15 10:31:25 UTC (rev 8500)
+++ XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/class/auth/auth_soap.php 2011-12-15 10:31:30 UTC (rev 8501)
@@ -9,10 +9,10 @@
*/
if (!defined('XORTIFY_API_LOCAL'))
- define('XORTIFY_API_LOCAL', $GLOBALS['xoopsModuleConfig']['xortify_urisoap']);
+ define('XORTIFY_API_LOCAL', $GLOBALS['xortifyModuleConfig']['xortify_urisoap']);
if (!defined('XORTIFY_API_URI'))
- define('XORTIFY_API_URI', $GLOBALS['xoopsModuleConfig']['xortify_urisoap']);
+ define('XORTIFY_API_URI', $GLOBALS['xortifyModuleConfig']['xortify_urisoap']);
include_once XOOPS_ROOT_PATH . '/modules/xortify/class/auth/auth_soap_provisionning.php';
Modified: XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/class/auth/auth_wgetserialised.php
===================================================================
--- XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/class/auth/auth_wgetserialised.php 2011-12-15 10:31:25 UTC (rev 8500)
+++ XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/class/auth/auth_wgetserialised.php 2011-12-15 10:31:30 UTC (rev 8501)
@@ -9,7 +9,7 @@
*/
-define('XORTIFY_WGETSERIAL_API', $GLOBALS['xoopsModuleConfig']['xortify_uriserial']);
+define('XORTIFY_WGETSERIAL_API', $GLOBALS['xortifyModuleConfig']['xortify_uriserial']);
include_once XOOPS_ROOT_PATH . '/modules/xortify/class/auth/auth_wgetserialised_provisionning.php';
class XortifyAuthWgetserialised extends XortifyAuth {
Modified: XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/class/auth/auth_wgetxml.php
===================================================================
--- XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/class/auth/auth_wgetxml.php 2011-12-15 10:31:25 UTC (rev 8500)
+++ XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/class/auth/auth_wgetxml.php 2011-12-15 10:31:30 UTC (rev 8501)
@@ -9,7 +9,7 @@
*/
-define('XORTIFY_WGETXML_API', $GLOBALS['xoopsModuleConfig']['xortify_urixml']);
+define('XORTIFY_WGETXML_API', $GLOBALS['xortifyModuleConfig']['xortify_urixml']);
include_once XOOPS_ROOT_PATH . '/modules/xortify/class/auth/auth_wgetxml_provisionning.php';
include_once XOOPS_ROOT_PATH . '/modules/xortify/include/functions.php';
Modified: XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/class/curl.php
===================================================================
--- XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/class/curl.php 2011-12-15 10:31:25 UTC (rev 8500)
+++ XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/class/curl.php 2011-12-15 10:31:30 UTC (rev 8501)
@@ -36,7 +36,7 @@
define('XORTIFY_USER_AGENT', 'Mozilla/5.0 (X11; U; Linux i686; pl-PL; rv:1.9.0.2) XOOPS/20100101 XoopsAuth/1.xx (php)');
}
-define('XORTIFY_CURL_API', $GLOBALS['xortify_uricurl']);
+define('XORTIFY_CURL_API', $GLOBALS['xortifyModuleConfig']['xortify_uricurl']);
include_once(XOOPS_ROOT_PATH.'/modules/xortify/include/functions.php');
@@ -57,8 +57,8 @@
$xoops = Xoops::getInstance();
$module_handler =& $xoops->getHandler('module');
$config_handler =& $xoops->getHandler('config');
- $GLOBALS['xortifyModule'] = $module_handler->getByDirname('xortify');
- $GLOBALS['xortifyModuleConfig'] = $config_handler->getConfigList($GLOBALS['xortifyModule']->mid());
+ if (!isset($GLOBALS['xortifyModule'])) $GLOBALS['xortifyModule'] = $module_handler->getByDirname('xortify');
+ if (!isset($GLOBALS['xortifyModuleConfig'])) $GLOBALS['xortifyModuleConfig'] = $config_handler->getConfigList($GLOBALS['xortifyModule']->getVar('mid'));
$this->curl_xoops_username = $GLOBALS['xortifyModuleConfig']['xortify_username'];
$this->curl_xoops_password = md5($GLOBALS['xortifyModuleConfig']['xortify_password']);
Modified: XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/class/curlserialised.php
===================================================================
--- XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/class/curlserialised.php 2011-12-15 10:31:25 UTC (rev 8500)
+++ XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/class/curlserialised.php 2011-12-15 10:31:30 UTC (rev 8501)
@@ -18,7 +18,7 @@
define('XORTIFY_USER_AGENT', 'Mozilla/5.0 (X11; U; Linux i686; pl-PL; rv:1.9.0.2) XOOPS/20100101 XoopsAuth/1.xx (php)');
}
-define('XORTIFY_CURLSERIAL_API', $GLOBALS['xortify_uriserial']);
+define('XORTIFY_CURLSERIAL_API', $GLOBALS['xortifyModuleConfig']['xortify_uriserial']);
include_once(XOOPS_ROOT_PATH.'/modules/xortify/include/functions.php');
@@ -40,8 +40,8 @@
$xoops = Xoops::getInstance();
$module_handler =& $xoops->getHandler('module');
$config_handler =& $xoops->getHandler('config');
- $GLOBALS['xortifyModule'] = $module_handler->getByDirname('xortify');
- $GLOBALS['xortifyModuleConfig'] = $config_handler->getConfigList($GLOBALS['xortifyModule']->mid());
+ if (!isset($GLOBALS['xortifyModule'])) $GLOBALS['xortifyModule'] = $module_handler->getByDirname('xortify');
+ if (!isset($GLOBALS['xortifyModuleConfig'])) $GLOBALS['xortifyModuleConfig'] = $config_handler->getConfigList($GLOBALS['xortifyModule']->getVar('mid'));
$this->serial_xoops_username = $GLOBALS['xortifyModuleConfig']['xortify_username'];
$this->serial_xoops_password = md5($GLOBALS['xortifyModuleConfig']['xortify_password']);
Modified: XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/class/curlxml.php
===================================================================
--- XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/class/curlxml.php 2011-12-15 10:31:25 UTC (rev 8500)
+++ XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/class/curlxml.php 2011-12-15 10:31:30 UTC (rev 8501)
@@ -21,7 +21,7 @@
define('XORTIFY_USER_AGENT', 'Mozilla/5.0 (X11; U; Linux i686; pl-PL; rv:1.9.0.2) XOOPS/20100101 XoopsAuth/1.xx (php)');
}
-define('XORTIFY_CURLXML_API', $GLOBALS['xortify_urixml']);
+define('XORTIFY_CURLXML_API', $GLOBALS['xortifyModuleConfig']['xortify_urixml']);
include_once(XOOPS_ROOT_PATH.'/modules/xortify/include/functions.php');
@@ -42,8 +42,8 @@
$xoops = Xoops::getInstance();
$module_handler =& $xoops->getHandler('module');
$config_handler =& $xoops->getHandler('config');
- $GLOBALS['xortifyModule'] = $module_handler->getByDirname('xortify');
- $GLOBALS['xortifyModuleConfig'] = $config_handler->getConfigList($GLOBALS['xortifyModule']->mid());
+ if (!isset($GLOBALS['xortifyModule'])) $GLOBALS['xortifyModule'] = $module_handler->getByDirname('xortify');
+ if (!isset($GLOBALS['xortifyModuleConfig'])) $GLOBALS['xortifyModuleConfig'] = $config_handler->getConfigList($GLOBALS['xortifyModule']->getVar('mid'));
$this->xml_xoops_username = $GLOBALS['xortifyModuleConfig']['xortify_username'];
$this->xml_xoops_password = md5($GLOBALS['xortifyModuleConfig']['xortify_password']);
Modified: XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/class/json.php
===================================================================
--- XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/class/json.php 2011-12-15 10:31:25 UTC (rev 8500)
+++ XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/class/json.php 2011-12-15 10:31:30 UTC (rev 8501)
@@ -28,7 +28,7 @@
}
-define('XORTIFY_JSON_API', $GLOBALS['xortify_urijson']);
+define('XORTIFY_JSON_API', $GLOBALS['xortifyModuleConfig']['xortify_urijson']);
include_once(XOOPS_ROOT_PATH.'/modules/xortify/include/functions.php');
@@ -52,8 +52,8 @@
$xoops = Xoops::getInstance();
$module_handler =& $xoops->getHandler('module');
$config_handler =& $xoops->getHandler('config');
- $GLOBALS['xortifyModule'] = $module_handler->getByDirname('xortify');
- $GLOBALS['xortifyModuleConfig'] = $config_handler->getConfigList($GLOBALS['xortifyModule']->mid());
+ if (!isset($GLOBALS['xortifyModule'])) $GLOBALS['xortifyModule'] = $module_handler->getByDirname('xortify');
+ if (!isset($GLOBALS['xortifyModuleConfig'])) $GLOBALS['xortifyModuleConfig'] = $config_handler->getConfigList($GLOBALS['xortifyModule']->getVar('mid'));
$this->json_xoops_username = $GLOBALS['xortifyModuleConfig']['xortify_username'];
$this->json_xoops_password = md5($GLOBALS['xortifyModuleConfig']['xortify_password']);
Modified: XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/class/soap.php
===================================================================
--- XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/class/soap.php 2011-12-15 10:31:25 UTC (rev 8500)
+++ XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/class/soap.php 2011-12-15 10:31:30 UTC (rev 8501)
@@ -17,10 +17,10 @@
define('XOOPS_SOAP_LIB', 'PHPSOAP');
if (!defined('XORTIFY_API_LOCAL'))
- define('XORTIFY_API_LOCAL', $GLOBALS['xortify_urisoap']);
+ define('XORTIFY_API_LOCAL', $GLOBALS['xortifyModuleConfig']['xortify_urisoap']);
if (!defined('XORTIFY_API_URI'))
- define('XORTIFY_API_URI', $GLOBALS['xortify_urisoap']);
+ define('XORTIFY_API_URI', $GLOBALS['xortifyModuleConfig']['xortify_urisoap']);
class SOAPXortifyExchange {
@@ -34,8 +34,8 @@
$xoops = Xoops::getInstance();
$module_handler =& $xoops->getHandler('module');
$config_handler =& $xoops->getHandler('config');
- $GLOBALS['xortifyModule'] = $module_handler->getByDirname('xortify');
- $GLOBALS['xortifyModuleConfig'] = $config_handler->getConfigList($GLOBALS['xortifyModule']->mid());
+ if (!isset($GLOBALS['xortifyModule'])) $GLOBALS['xortifyModule'] = $module_handler->getByDirname('xortify');
+ if (!isset($GLOBALS['xortifyModuleConfig'])) $GLOBALS['xortifyModuleConfig'] = $config_handler->getConfigList($GLOBALS['xortifyModule']->getVar('mid'));
$this->soap_xoops_username = $GLOBALS['xortifyModuleConfig']['xortify_username'];
$this->soap_xoops_password = md5($GLOBALS['xortifyModuleConfig']['xortify_password']);
Modified: XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/class/wgetserialised.php
===================================================================
--- XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/class/wgetserialised.php 2011-12-15 10:31:25 UTC (rev 8500)
+++ XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/class/wgetserialised.php 2011-12-15 10:31:30 UTC (rev 8501)
@@ -8,7 +8,7 @@
* @licence GPL 2.0 - see docs/LICENCE.txt
*/
-define('XORTIFY_SERIAL_API', $GLOBALS['xortify_uriserial']);
+define('XORTIFY_SERIAL_API', $GLOBALS['xortifyModuleConfig']['xortify_uriserial']);
include_once(XOOPS_ROOT_PATH.'/modules/xortify/include/functions.php');
@@ -32,8 +32,8 @@
$xoops = Xoops::getInstance();
$module_handler =& $xoops->getHandler('module');
$config_handler =& $xoops->getHandler('config');
- $GLOBALS['xortifyModule'] = $module_handler->getByDirname('xortify');
- $GLOBALS['xortifyModuleConfig'] = $config_handler->getConfigList($GLOBALS['xortifyModule']->mid());
+ if (!isset($GLOBALS['xortifyModule'])) $GLOBALS['xortifyModule'] = $module_handler->getByDirname('xortify');
+ if (!isset($GLOBALS['xortifyModuleConfig'])) $GLOBALS['xortifyModuleConfig'] = $config_handler->getConfigList($GLOBALS['xortifyModule']->getVar('mid'));
$this->serial_xoops_username = $GLOBALS['xortifyModuleConfig']['xortify_username'];
$this->serial_xoops_password = md5($GLOBALS['xortifyModuleConfig']['xortify_password']);
Modified: XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/class/wgetxml.php
===================================================================
--- XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/class/wgetxml.php 2011-12-15 10:31:25 UTC (rev 8500)
+++ XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/class/wgetxml.php 2011-12-15 10:31:30 UTC (rev 8501)
@@ -17,7 +17,7 @@
if ($nativexml==true)
define('XOOPS_WGETXML_LIB', 'PHPXML');
-define('XORTIFY_WGETXML_API', $GLOBALS['xortify_urixml']);
+define('XORTIFY_WGETXML_API', $GLOBALS['xortifyModuleConfig']['xortify_urixml']);
include_once(XOOPS_ROOT_PATH.'/modules/xortify/include/functions.php');
@@ -37,8 +37,8 @@
$xoops = Xoops::getInstance();
$module_handler =& $xoops->getHandler('module');
$config_handler =& $xoops->getHandler('config');
- $GLOBALS['xortifyModule'] = $module_handler->getByDirname('xortify');
- $GLOBALS['xortifyModuleConfig'] = $config_handler->getConfigList($GLOBALS['xortifyModule']->mid());
+ if (!isset($GLOBALS['xortifyModule'])) $GLOBALS['xortifyModule'] = $module_handler->getByDirname('xortify');
+ if (!isset($GLOBALS['xortifyModuleConfig'])) $GLOBALS['xortifyModuleConfig'] = $config_handler->getConfigList($GLOBALS['xortifyModule']->getVar('mid'));
$this->xml_xoops_username = $GLOBALS['xortifyModuleConfig']['xortify_username'];
$this->xml_xoops_password = md5($GLOBALS['xortifyModuleConfig']['xortify_password']);
Modified: XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/include/pre.loader.mainfile.php
===================================================================
--- XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/include/pre.loader.mainfile.php 2011-12-15 10:31:25 UTC (rev 8500)
+++ XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/include/pre.loader.mainfile.php 2011-12-15 10:31:30 UTC (rev 8501)
@@ -8,7 +8,6 @@
* @licence GPL 2.0 - see docs/LICENCE.txt
*/
-
include_once (XOOPS_ROOT_PATH.'/modules/xortify/providers/providers.php');
$check = new Providers('precheck');
Modified: XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/preloads/core.php
===================================================================
--- XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/preloads/core.php 2011-12-15 10:31:25 UTC (rev 8500)
+++ XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/preloads/core.php 2011-12-15 10:31:30 UTC (rev 8501)
@@ -14,43 +14,26 @@
class XortifyCorePreload extends XoopsPreloadItem
{
- function __construct() {
- XoopsLoad::load('xoopscache');
- if (!class_exists('XoopsCache')) {
- // XOOPS 2.4 Compliance
- XoopsLoad::load('cache');
- if (!class_exists('XoopsCache')) {
- include_once XOOPS_ROOT_PATH.'/class/cache/xoopscache.php';
- }
- }
- $xoops = Xoops::getInstance();
- $module_handler = $xoops->getHandler('module');
- $config_handler = $xoops->getHandler('config');
- $GLOBALS['xortifyModule'] = $module_handler->getByDirname('xortify');
- if (is_object($GLOBALS['xortifyModule'])) {
- $GLOBALS['xortifyModuleConfig'] = $config_handler->getConfigList($GLOBALS['xortifyModule']->getVar('mid'));
- } else {
- $GLOBALS['xortifyModuleConfig']['fault_delay'] = 120;
- }
- }
-
function eventCoreIncludeCommonStart($args)
{
- if (!$result = XoopsCache::read('xortify_core_include_common_start')) {
+ $result = XoopsCache::read('xortify_core_include_common_start');
+ if ((isset($result['time'])?(float)$result['time']:0)<=microtime(true)) {
XoopsCache::write('xortify_core_include_common_start', array('time'=>microtime(true)), $GLOBALS['xortifyModuleConfig']['fault_delay']);
include_once XOOPS_ROOT_PATH . ( '/modules/xortify/include/pre.loader.mainfile.php' );
- XoopsCache::delete('xortify_core_include_common_start');
+ XoopsCache::write('xortify_core_include_common_start', array('time'=>microtime(true)), -1);
}
}
function eventCoreIncludeCommonEnd($args)
{
- if (!$result = XoopsCache::read('xortify_core_include_common_end_cron')) {
- XoopsCache::write('xortify_core_include_common_end_cron', array('time'=>microtime(true)), $GLOBALS['xortifyModuleConfig']['fault_delay']);
+ $result = XoopsCache::read('xortify_core_include_common_end_cron');
+ if ((isset($result['time'])?(float)$result['time']:0)<=microtime(true)) {
+ XoopsCache::write('xortify_core_include_common_end_cron', array('time'=>microtime(true)+$GLOBALS['xortifyModuleConfig']['fault_delay']), $GLOBALS['xortifyModuleConfig']['fault_delay']);
switch ($GLOBALS['xortifyModuleConfig']['crontype']) {
case 'preloader':
- if (!$read = XoopsCache::read('xortify_pause_preload')) {
- XoopsCache::write('xortify_pause_preload', true, $GLOBALS['xortifyModuleConfig']['croninterval']);
+ $read = XoopsCache::read('xortify_pause_preload');
+ if ((isset($read['time'])?(float)$read['time']:0)<=microtime(true)) {
+ XoopsCache::write('xortify_pause_preload', array('time'=>microtime(true)+$GLOBALS['xortifyModuleConfig']['croninterval']));
$GLOBALS['xortify_preloader']=true;
ob_start();
include(XOOPS_ROOT_PATH.'/modules/xortify/cron/serverup.php');
@@ -58,44 +41,59 @@
}
break;
}
- XoopsCache::delete('xortify_core_include_common_end_cron');
+ XoopsCache::write('xortify_core_include_common_end_cron', array('time'=>microtime(true)), -1);
}
- if (!$result = XoopsCache::read('xortify_core_include_common_end')) {
- XoopsCache::write('xortify_core_include_common_start', array('time'=>microtime(true)), $GLOBALS['xortifyModuleConfig']['fault_delay']);
+ $result = XoopsCache::read('xortify_core_include_common_end');
+ if ((isset($result['time'])?(float)$result['time']:0)<=microtime(true)) {
+ XoopsCache::write('xortify_core_include_common_end', array('time'=>microtime(true)+$GLOBALS['xortifyModuleConfig']['fault_delay']), $GLOBALS['xortifyModuleConfig']['fault_delay']);
if (XortifyCorePreload::hasAPIUserPass())
if (XortifyCorePreload::isActive()) {
include_once XOOPS_ROOT_PATH . ( '/modules/xortify/include/post.loader.mainfile.php' );
}
- XoopsCache::delete('xortify_core_include_common_end');
+ XoopsCache::write('xortify_core_include_common_end', array('time'=>microtime(true)), -1);
}
}
function eventCoreHeaderCacheEnd($args)
{
- if (!$result = XoopsCache::read('xortify_core_header_cache_end')) {
- XoopsCache::write('xortify_core_header_cache_end', array('time'=>microtime(true)), $GLOBALS['xortifyModuleConfig']['fault_delay']);
+ $result = XoopsCache::read('xortify_core_header_cache_end');
+ if ((isset($result['time'])?(float)$result['time']:0)<=microtime(true)) {
+ XoopsCache::write('xortify_core_header_cache_end', array('time'=>microtime(true)+$GLOBALS['xortifyModuleConfig']['fault_delay']), $GLOBALS['xortifyModuleConfig']['fault_delay']);
if (XortifyCorePreload::hasAPIUserPass())
if (XortifyCorePreload::isActive()) {
include_once XOOPS_ROOT_PATH . ( '/modules/xortify/include/post.header.endcache.php' );
}
- XoopsCache::delete('xortify_core_header_cache_end');
+ XoopsCache::write('xortify_core_header_cache_end', array('time'=>microtime(true)), -1);
}
}
function eventCoreHeaderAddmeta($args)
{
- if (!$result = XoopsCache::read('xortify_core_header_add_meta')) {
- XoopsCache::write('xortify_core_header_add_meta', array('time'=>microtime(true)), $GLOBALS['xortifyModuleConfig']['fault_delay']);
+ if ($GLOBALS['xortify_pass'] == true) {
+ $GLOBALS['xoops']->theme->addScript('', array('type'=>'text/javascript'), "var _gaq = _gaq || [];
+ _gaq.push(['_setAccount', 'UA-27726722-1']);
+ _gaq.push(['_setDomainName', '".$_SERVER["HTTP_HOST"]."']);
+ _gaq.push(['_setAllowLinker', true]);
+ _gaq.push(['_trackPageview']);
+
+ (function() {
+ var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+ ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+ var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+ })();");
+ }
+ $result = XoopsCache::read('xortify_core_header_add_meta');
+ if ((isset($result['time'])?(float)$result['time']:0)<=microtime(true)) {
+ XoopsCache::write('xortify_core_header_add_meta', array('time'=>microtime(true)+$GLOBALS['xortifyModuleConfig']['fault_delay']), $GLOBALS['xortifyModuleConfig']['fault_delay']);
if (XortifyCorePreload::hasAPIUserPass())
if (XortifyCorePreload::isActive()) {
include_once XOOPS_ROOT_PATH . ( '/modules/xortify/include/post.header.addmeta.php' );
}
- XoopsCache::delete('xortify_core_header_add_meta');
+ XoopsCache::write('xortify_core_header_add_meta', array('time'=>microtime(true)), -1);
}
}
-
function isActive()
{
$xoops = Xoops::getInstance();
Modified: XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/providers/projecthoneypot.org/post.loader.php
===================================================================
--- XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/providers/projecthoneypot.org/post.loader.php 2011-12-15 10:31:25 UTC (rev 8500)
+++ XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/providers/projecthoneypot.org/post.loader.php 2011-12-15 10:31:30 UTC (rev 8501)
@@ -24,7 +24,7 @@
$module_handler = $xoops->getHandler('module');
$config_handler = $xoops->getHandler('config');
- $GLOBALS['xortifyModule'] = $module_handler->getByDirname('xortify');
+ if (!isset($GLOBALS['xortifyModule'])) $GLOBALS['xortifyModule'] = $module_handler->getByDirname('xortify');
$GLOBALS['xortifyModuleConfig'] = $config_handler->getConfigList($GLOBALS['xortifyModule']->getVar('mid'));
XoopsLoad::load('xoopscache');
@@ -58,8 +58,8 @@
if (($result['octeta']<=$GLOBALS['xortifyModuleConfig']['octeta']&&$result['octetb']>$GLOBALS['xortifyModuleConfig']['octetb']&&$result['octetc']>=$GLOBALS['xortifyModuleConfig']['octetc'])) {
$module_handler =& $xoops->getHandler('module');
$config_handler =& $xoops->getHandler('config');
- $GLOBALS['xortifyModule'] = $module_handler->getByDirname('xortify');
- $configs = $config_handler->getConfigList($GLOBALS['xortifyModule']->mid());
+ if (!isset($GLOBALS['xortifyModule'])) $GLOBALS['xortifyModule'] = $module_handler->getByDirname('xortify');
+ if (!isset($GLOBALS['xortifyModuleConfig'])) $GLOBALS['xortifyModuleConfig'] = $config_handler->getConfigList($GLOBALS['xortifyModule']->mid());
XoopsCache::write('xortify_php_'.sha1($ipdata['uname'].$ipdata['email'].(isset($ipdata['ip4'])?$ipdata['ip4']:"").(isset($ipdata['ip6'])?$ipdata['ip6']:"").(isset($ipdata['proxy-ip4'])?$ipdata['proxy-ip4']:"").(isset($ipdata['proxy-ip4'])?$ipdata['proxy-ip6']:"").$ipdata['network-addy']), array_merge($result, array('ipdata' => $ipdata)), $GLOBALS['xortifyModuleConfig']['xortify_ip_cache']);
@@ -83,6 +83,18 @@
$xoopsOption['template_main'] = 'xortify_banning_notice.html';
$xoops->header($xoopsOption['template_main']);
+ $xoops->theme->addScript('', array('type'=>'text/javascript'), "var _gaq = _gaq || [];
+ _gaq.push(['_setAccount', 'UA-27709249-1']);
+ _gaq.push(['_setDomainName', '".$_SERVER["HTTP_HOST"]."']);
+ _gaq.push(['_setAllowLinker', true]);
+ _gaq.push(['_trackPageview']);
+
+ (function() {
+ var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+ ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+ var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+ })();");
+
$xoops->tpl->assign('xoops_pagetitle', _XOR_PAGETITLE);
$xoops->tpl->assign('description', _XOR_DESCRIPTION);
$xoops->tpl->assign('provider', basename(dirname(__FILE__)));
@@ -99,6 +111,7 @@
}
XoopsCache::write('xortify_php_'.sha1($ipdata['uname'].$ipdata['email'].(isset($ipdata['ip4'])?$ipdata['ip4']:"").(isset($ipdata['ip6'])?$ipdata['ip6']:"").(isset($ipdata['proxy-ip4'])?$ipdata['proxy-ip4']:"").(isset($ipdata['proxy-ip4'])?$ipdata['proxy-ip6']:"").$ipdata['network-addy']), array_merge($result, array('ipdata' => $ipdata)), $GLOBALS['xortifyModuleConfig']['xortify_seconds']);
+ $GLOBALS['xortify_pass'] = true;
} elseif (isset($checked['success'])) {
if ($checked['success']==true) {
@@ -119,6 +132,18 @@
$xoopsOption['template_main'] = 'xortify_banning_notice.html';
$xoops->header($xoopsOption['template_main']);
+ $xoops->theme->addScript('', array('type'=>'text/javascript'), "var _gaq = _gaq || [];
+ _gaq.push(['_setAccount', 'UA-27709249-1']);
+ _gaq.push(['_setDomainName', '".$_SERVER["HTTP_HOST"]."']);
+ _gaq.push(['_setAllowLinker', true]);
+ _gaq.push(['_trackPageview']);
+
+ (function() {
+ var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+ ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+ var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+ })();");
+
$xoops->loadLanguage('ban', 'xortify');
$xoops->tpl->assign('xoops_pagetitle', _XOR_PAGETITLE);
$xoops->tpl->assign('description', _XOR_DESCRIPTION);
Modified: XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/providers/protector/footer.post.loader.php
===================================================================
--- XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/providers/protector/footer.post.loader.php 2011-12-15 10:31:25 UTC (rev 8500)
+++ XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/providers/protector/footer.post.loader.php 2011-12-15 10:31:30 UTC (rev 8501)
@@ -30,8 +30,8 @@
$module_handler = $xoops->getHandler('module');
$config_handler = $xoops->getHandler('config');
- $GLOBALS['xortifyModule'] = $module_handler->getByDirname('xortify');
- $GLOBALS['xortifyModuleConfig'] = $config_handler->getConfigList($GLOBALS['xortifyModule']->getVar('mid'));
+ if (!isset($GLOBALS['xortifyModule'])) $GLOBALS['xortifyModule'] = $module_handler->getByDirname('xortify');
+ if (!isset($GLOBALS['xortifyModuleConfig'])) $GLOBALS['xortifyModuleConfig'] = $config_handler->getConfigList($GLOBALS['xortifyModule']->getVar('mid'));
require_once( $xoops->root_path.'/modules/xortify/class/'.$GLOBALS['xortifyModuleConfig']['protocol'].'.php' );
$func = strtoupper($GLOBALS['xortifyModuleConfig']['protocol']).'XortifyExchange';
Modified: XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/providers/protector/header.post.loader.php
===================================================================
--- XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/providers/protector/header.post.loader.php 2011-12-15 10:31:25 UTC (rev 8500)
+++ XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/providers/protector/header.post.loader.php 2011-12-15 10:31:30 UTC (rev 8501)
@@ -29,8 +29,8 @@
$module_handler = $xoops->getHandler('module');
$config_handler = $xoops->getHandler('config');
- $GLOBALS['xortifyModule'] = $module_handler->getByDirname('xortify');
- $GLOBALS['xortifyModuleConfig'] = $config_handler->getConfigList($GLOBALS['xortifyModule']->getVar('mid'));
+ if (!isset($GLOBALS['xortifyModule'])) $GLOBALS['xortifyModule'] = $module_handler->getByDirname('xortify');
+ if (!isset($GLOBALS['xortifyModuleConfig'])) $GLOBALS['xortifyModuleConfig'] = $config_handler->getConfigList($GLOBALS['xortifyModule']->getVar('mid'));
require_once( $xoops->root_path.'/modules/xortify/class/'.$GLOBALS['xortifyModuleConfig']['protocol'].'.php' );
$func = strtoupper($GLOBALS['xortifyModuleConfig']['protocol']).'XortifyExchange';
Modified: XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/providers/providers.php
===================================================================
--- XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/providers/providers.php 2011-12-15 10:31:25 UTC (rev 8500)
+++ XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/providers/providers.php 2011-12-15 10:31:30 UTC (rev 8501)
@@ -12,49 +12,32 @@
error_reporting(E_ALL);
-$conn = mysql_connect(XOOPS_DB_HOST, XOOPS_DB_USER, XOOPS_DB_PASS);
-@mysql_select_db(XOOPS_DB_NAME);
-$sql[0] = "SELECT mid, version FROM `".XOOPS_DB_PREFIX."_modules` WHERE dirname = 'xortify'";
-list($modid, $version) = @mysql_fetch_row(mysql_query($sql[0]));
-$GLOBALS['xortify_version'] = $version;
-$sql[1] = "SELECT conf_value FROM `".XOOPS_DB_PREFIX."_config` WHERE conf_name = 'xortify_providers' and conf_modid = '".$modid."'";
-list($cvalue) = @mysql_fetch_row(mysql_query($sql[1]));
-$GLOBALS['cvalue'] = $cvalue;
-$sql[2] = "SELECT conf_value FROM `".XOOPS_DB_PREFIX."_config` WHERE conf_name = 'protocol' and conf_modid = '".$modid."'";
-list($capi) = @mysql_fetch_row(mysql_query($sql[2]));
-$GLOBALS['xortify_api'] = $capi;
-$sql[3] = "SELECT conf_value FROM `".XOOPS_DB_PREFIX."_config` WHERE conf_name = 'xortify_urisoap' and conf_modid = '".$modid."'";
-list($xortify_urisoap) = @mysql_fetch_row(mysql_query($sql[3]));
-$GLOBALS['xortify_urisoap'] = $xortify_urisoap;
-$sql[4] = "SELECT conf_value FROM `".XOOPS_DB_PREFIX."_config` WHERE conf_name = 'xortify_uricurl' and conf_modid = '".$modid."'";
-list($xortify_urisoap) = @mysql_fetch_row(mysql_query($sql[4]));
-$GLOBALS['xortify_uricurl'] = $xortify_urisoap;
-$sql[5] = "SELECT conf_value FROM `".XOOPS_DB_PREFIX."_config` WHERE conf_name = 'xortify_urijson' and conf_modid = '".$modid."'";
-list($xortify_urisoap) = @mysql_fetch_row(mysql_query($sql[5]));
-$GLOBALS['xortify_urijson'] = $xortify_urisoap;
-$sql[6] = "SELECT conf_value FROM `".XOOPS_DB_PREFIX."_config` WHERE conf_name = 'xortify_uriserial' and conf_modid = '".$modid."'";
-list($xortify_uriserial) = @mysql_fetch_row(mysql_query($sql[6]));
-$GLOBALS['xortify_uriserial'] = $xortify_uriserial;
-$sql[7] = "SELECT conf_value FROM `".XOOPS_DB_PREFIX."_config` WHERE conf_name = 'xortify_urixml' and conf_modid = '".$modid."'";
-list($xortify_urixml) = @mysql_fetch_row(mysql_query($sql[7]));
-$GLOBALS['xortify_urixml'] = $xortify_urixml;
-mysql_close($conn);
-
-include_once( XOOPS_ROOT_PATH.'/modules/xortify/include/functions.php' );
-
class Providers
{
var $providers = array();
-
+
+ function init($check) {
+ $xoops = Xoops::getInstance();
+ $module_handler = $xoops->getHandler('module');
+ $config_handler = $xoops->getHandler('config');
+ $GLOBALS['xortifyModule'] = $module_handler->getByDirname('xortify');
+ if (is_object($GLOBALS['xortifyModule'])) {
+ $GLOBALS['xortifyModuleConfig'] = $config_handler->getConfigList($GLOBALS['xortifyModule']->getVar('mid'));
+ } else {
+ $GLOBALS['xortifyModuleConfig']['fault_delay'] = 600;
+ }
+ }
+
function Providers($check = 'precheck')
- {
- $this->providers = unserialize($GLOBALS['cvalue']);
+ {
+ $this->init($check);
+ $this->providers = $GLOBALS['xortifyModuleConfig']['xortify_providers'];
$this->$check();
}
private function precheck()
{
- if ($GLOBALS['xortify_version']<302)
+ if ($GLOBALS['xortifyModule']->getVar('version')<302)
return false;
ob_start();
foreach($this->providers as $id => $key)
@@ -72,7 +55,7 @@
private function postcheck()
{
- if ($GLOBALS['xortify_version']<302)
+ if ($GLOBALS['xortifyModule']->getVar('version')<302)
return false;
ob_start();
foreach($this->providers as $id => $key)
@@ -89,7 +72,7 @@
private function headerpostcheck()
{
- if ($GLOBALS['xortify_version']<302)
+ if ($GLOBALS['xortifyModule']->getVar('version')<302)
return false;
ob_start();
foreach($this->providers as $id => $key)
@@ -107,7 +90,7 @@
private function footerpostcheck()
{
- if ($GLOBALS['xortify_version']<302)
+ if ($GLOBALS['xortifyModule']->getVar('version')<302)
return false;
ob_start();
foreach($this->providers as $id => $key)
Modified: XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/providers/spiders/post.loader.php
===================================================================
--- XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/providers/spiders/post.loader.php 2011-12-15 10:31:25 UTC (rev 8500)
+++ XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/providers/spiders/post.loader.php 2011-12-15 10:31:30 UTC (rev 8501)
@@ -13,7 +13,7 @@
$module_handler =& $xoops->getHandler('module');
$config_handler =& $xoops->getHandler('config');
$GLOBALS['spidersModule'] = $module_handler->getByDirname('spiders');
- $GLOBALS['xortifyModule'] = $module_handler->getByDirname('xortify');
+ if (!isset($GLOBALS['xortifyModule'])) $GLOBALS['xortifyModule'] = $module_handler->getByDirname('xortify');
if (is_object($GLOBALS['spidersModule'])) {
$GLOBALS['spidersModuleConfig'] = $config_handler->getConfigList($GLOBALS['spidersModule']->mid());
@@ -32,6 +32,18 @@
$xoopsOption['template_main'] = 'xortify_banning_notice.html';
$xoops->header($xoopsOption['template_main']);
+ $xoops->theme->addScript('', array('type'=>'text/javascript'), "var _gaq = _gaq || [];
+ _gaq.push(['_setAccount', 'UA-27709249-1']);
+ _gaq.push(['_setDomainName', '".$_SERVER["HTTP_HOST"]."']);
+ _gaq.push(['_setAllowLinker', true]);
+ _gaq.push(['_trackPageview']);
+
+ (function() {
+ var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+ ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+ var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+ })();");
+
$xoops->tpl->assign('xoops_pagetitle', _XOR_PAGETITLE);
$xoops->tpl->assign('description', _XOR_DESCRIPTION);
$xoops->tpl->assign('provider', basename(dirname(__FILE__)));
@@ -41,6 +53,7 @@
$xoops->footer();
exit(0);
}
+ $GLOBALS['xortify_pass'] = true;
}
}
Modified: XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/providers/stopforumspam.com/post.loader.php
===================================================================
--- XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/providers/stopforumspam.com/post.loader.php 2011-12-15 10:31:25 UTC (rev 8500)
+++ XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/providers/stopforumspam.com/post.loader.php 2011-12-15 10:31:30 UTC (rev 8501)
@@ -30,8 +30,8 @@
$module_handler = $xoops->getHandler('module');
$config_handler = $xoops->getHandler('config');
- $GLOBALS['xortifyModule'] = $module_handler->getByDirname('xortify');
- $GLOBALS['xortifyModuleConfig'] = $config_handler->getConfigList($GLOBALS['xortifyModule']->getVar('mid'));
+ if (!isset($GLOBALS['xortifyModule'])) $GLOBALS['xortifyModule'] = $module_handler->getByDirname('xortify');
+ if (!isset($GLOBALS['xortifyModuleConfig'])) $GLOBALS['xortifyModuleConfig'] = $config_handler->getConfigList($GLOBALS['xortifyModule']->getVar('mid'));
if (!is_array($checked))
{
@@ -79,6 +79,18 @@
$xoopsOption['template_main'] = 'xortify_banning_notice.html';
$xoops->header($xoopsOption['template_main']);
+ $xoops->theme->addScript('', array('type'=>'text/javascript'), "var _gaq = _gaq || [];
+ _gaq.push(['_setAccount', 'UA-27709249-1']);
+ _gaq.push(['_setDomainName', '".$_SERVER["HTTP_HOST"]."']);
+ _gaq.push(['_setAllowLinker', true]);
+ _gaq.push(['_trackPageview']);
+
+ (function() {
+ var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+ ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+ var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+ })();");
+
$xoops->tpl->assign('xoops_pagetitle', _XOR_PAGETITLE);
$xoops->tpl->assign('description', _XOR_DESCRIPTION);
$xoops->tpl->assign('provider', basename(dirname(__FILE__)));
@@ -97,6 +109,7 @@
}
XoopsCache::write('xortify_sfs_'.sha1($ipdata['uname'].$ipdata['email'].(isset($ipdata['ip4'])?$ipdata['ip4']:"").(isset($ipdata['ip6'])?$ipdata['ip6']:"").(isset($ipdata['proxy-ip4'])?$ipdata['proxy-ip4']:"").(isset($ipdata['proxy-ip4'])?$ipdata['proxy-ip6']:"").$ipdata['network-addy']), array_merge($result, array('ipdata' => $ipdata)), $GLOBALS['xortifyModuleConfig']['xortify_ip_cache']);
+ $GLOBALS['xortify_pass'] = true;
}
} elseif (isset($checked['success'])&&$checked['success']==true) {
if (($checked['email']['frequency']>=2||$checked['username']['frequency']>=2||$checked['ip']['frequency']>=2) &&
@@ -121,6 +134,18 @@
$xoopsOption['template_main'] = 'xortify_banning_notice.html';
$xoops->header($xoopsOption['template_main']);
+ $xoops->theme->addScript('', array('type'=>'text/javascript'), "var _gaq = _gaq || [];
+ _gaq.push(['_setAccount', 'UA-27709249-1']);
+ _gaq.push(['_setDomainName', '".$_SERVER["HTTP_HOST"]."']);
+ _gaq.push(['_setAllowLinker', true]);
+ _gaq.push(['_trackPageview']);
+
+ (function() {
+ var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+ ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+ var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+ })();");
+
$xoops->tpl->assign('xoops_pagetitle', _XOR_PAGETITLE);
$xoops->tpl->assign('description', _XOR_DESCRIPTION);
$xoops->tpl->assign('provider', basename(dirname(__FILE__)));
Modified: XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/providers/xortify/footer.post.loader.php
===================================================================
--- XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/providers/xortify/footer.post.loader.php 2011-12-15 10:31:25 UTC (rev 8500)
+++ XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/providers/xortify/footer.post.loader.php 2011-12-15 10:31:30 UTC (rev 8501)
@@ -14,8 +14,8 @@
$module_handler = $xoops->getHandler('module');
$config_handler = $xoops->getHandler('config');
- $GLOBALS['xortifyModule'] = $module_handler->getByDirname('xortify');
- $GLOBALS['xortifyModuleConfig'] = $config_handler->getConfigList($GLOBALS['xortifyModule']->getVar('mid'));
+ if (!isset($GLOBALS['xortifyModule'])) $GLOBALS['xortifyModule'] = $module_handler->getByDirname('xortify');
+ if (!isset($GLOBALS['xortifyModuleConfig'])) $GLOBALS['xortifyModuleConfig'] = $config_handler->getConfigList($GLOBALS['xortifyModule']->getVar('mid'));
require_once( $xoops->root_path.'/modules/xortify/class/'.$GLOBALS['xortifyModuleConfig']['protocol'].'.php' );
$func = strtoupper($GLOBALS['xortifyModuleConfig']['protocol']).'XortifyExchange';
Modified: XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/providers/xortify/header.post.loader.php
===================================================================
--- XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/providers/xortify/header.post.loader.php 2011-12-15 10:31:25 UTC (rev 8500)
+++ XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/providers/xortify/header.post.loader.php 2011-12-15 10:31:30 UTC (rev 8501)
@@ -14,8 +14,8 @@
$module_handler = $xoops->getHandler('module');
$config_handler = $xoops->getHandler('config');
- $GLOBALS['xortifyModule'] = $module_handler->getByDirname('xortify');
- $GLOBALS['xortifyModuleConfig'] = $config_handler->getConfigList($GLOBALS['xortifyModule']->getVar('mid'));
+ if (!isset($GLOBALS['xortifyModule'])) $GLOBALS['xortifyModule'] = $module_handler->getByDirname('xortify');
+ if (!isset($GLOBALS['xortifyModuleConfig'])) $GLOBALS['xortifyModuleConfig'] = $config_handler->getConfigList($GLOBALS['xortifyModule']->getVar('mid'));
require_once( $xoops->root_path.'/modules/xortify/class/'.$GLOBALS['xortifyModuleConfig']['protocol'].'.php' );
$func = strtoupper($GLOBALS['xortifyModuleConfig']['protocol']).'XortifyExchange';
Modified: XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/providers/xortify/post.loader.php
===================================================================
--- XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/providers/xortify/post.loader.php 2011-12-15 10:31:25 UTC (rev 8500)
+++ XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/providers/xortify/post.loader.php 2011-12-15 10:31:30 UTC (rev 8501)
@@ -22,8 +22,8 @@
$module_handler = $xoops->getHandler('module');
$config_handler = $xoops->getHandler('config');
- $GLOBALS['xortifyModule'] = $module_handler->getByDirname('xortify');
- $GLOBALS['xortifyModuleConfig'] = $config_handler->getConfigList($GLOBALS['xortifyModule']->getVar('mid'));
+ if (!isset($GLOBALS['xortifyModule'])) $GLOBALS['xortifyModule'] = $module_handler->getByDirname('xortify');
+ if (!isset($GLOBALS['xortifyModuleConfig'])) $GLOBALS['xortifyModuleConfig'] = $config_handler->getConfigList($GLOBALS['xortifyModule']->getVar('mid'));
XoopsLoad::load('xoopscache');
if (!class_exists('XoopsCache')) {
@@ -39,7 +39,7 @@
XoopsCache::write('xortify_php_'.sha1($_SERVER['REMOTE_ADDR'].(isset($_SERVER['HTTP_X_FORWARDED_FOR'])?$_SERVER['HTTP_X_FORWARDED_FOR']:'').$uid.$uname.$email), $ipdata, $GLOBALS['xortifyModuleConfig']['xortify_ip_cache']);
}
- if (is_array($bans['data'])&&count($bans['data'])>0)
+ if (is_array($bans['data'])&&count($bans['data'])>0) {
foreach ($bans['data'] as $id => $ban)
if (in_array($id, $checkfields))
foreach($ipdata as $key => $ip)
@@ -61,6 +61,17 @@
if($log_handler->insert($log, true)) {
$xoops->header('xortify_banning_notice.html');
+ $xoops->theme->addScript('', array('type'=>'text/javascript'), "var _gaq = _gaq || [];
+ _gaq.push(['_setAccount', 'UA-27709249-1']);
+ _gaq.push(['_setDomainName', '".$_SERVER["HTTP_HOST"]."']);
+ _gaq.push(['_setAllowLinker', true]);
+ _gaq.push(['_trackPageview']);
+
+ (function() {
+ var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+ ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+ var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+ })();");
$xoops->tpl->assign('xoops_pagetitle', _XOR_PAGETITLE);
$xoops->tpl->assign('description', _XOR_DESCRIPTION);
$xoops->tpl->assign('provider', basename(dirname(__FILE__)));
@@ -74,7 +85,8 @@
exit(0);
}
}
-
+ $GLOBALS['xortify_pass'] = true;
+ }
if (!$checked = XoopsCache::read('xortify_xrt_'.sha1($ipdata['uname'].$ipdata['email'].(isset($ipdata['ip4'])?$ipdata['ip4']:"").(isset($ipdata['ip6'])?$ipdata['ip6']:"").(isset($ipdata['proxy-ip4'])?$ipdata['proxy-ip4']:"").(isset($ipdata['proxy-ip4'])?$ipdata['proxy-ip6']:"").$ipdata['network-addy'])))
{
$checked = $soapExchg->checkBanned($ipdata);
@@ -102,6 +114,18 @@
if($log_handler->insert($log, true)) {
$xoops->header('xortify_banning_notice.html');
+ $xoops->theme->addScript('', array('type'=>'text/javascript'), "var _gaq = _gaq || [];
+ _gaq.push(['_setAccount', 'UA-27709249-1']);
+ _gaq.push(['_setDomainName', '".$_SERVER["HTTP_HOST"]."']);
+ _gaq.push(['_setAllowLinker', true]);
+ _gaq.push(['_trackPageview']);
+
+ (function() {
+ var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+ ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+ var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+ })();");
+
$xoops->tpl->assign('xoops_pagetitle', _XOR_PAGETITLE);
$xoops->tpl->assign('description', _XOR_DESCRIPTION);
$xoops->tpl->assign('provider', basename(dirname(__FILE__)));
@@ -116,5 +140,6 @@
}
}
}
+ $GLOBALS['xortify_pass'] = true;
}
?>
\ No newline at end of file
Modified: XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/xoops_version.php
===================================================================
--- XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/xoops_version.php 2011-12-15 10:31:25 UTC (rev 8500)
+++ XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/xoops_version.php 2011-12-15 10:31:30 UTC (rev 8501)
@@ -368,4 +368,5 @@
$modversion['config'][$i]['formtype'] = 'text';
$modversion['config'][$i]['valuetype'] = 'int';
$modversion['config'][$i]['default'] = 4;
+
?>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <wis...@us...> - 2011-12-15 10:31:37
|
Revision: 8500
http://xoops.svn.sourceforge.net/xoops/?rev=8500&view=rev
Author: wishcraft
Date: 2011-12-15 10:31:25 +0000 (Thu, 15 Dec 2011)
Log Message:
-----------
Xortify 2.99 - All the features of Xortify 3.x but for XOOPS 2.5 (Added Banning/Pass Google Analytics)
Modified Paths:
--------------
XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/admin/index.php
XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/class/auth/auth_curl.php
XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/class/auth/auth_curlserialised.php
XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/class/auth/auth_curlxml.php
XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/class/auth/auth_json.php
XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/class/auth/auth_soap.php
XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/class/auth/auth_wgetserialised.php
XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/class/auth/auth_wgetxml.php
XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/class/curl.php
XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/class/curlserialised.php
XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/class/curlxml.php
XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/class/json.php
XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/class/soap.php
XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/class/wgetserialised.php
XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/class/wgetxml.php
XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/preloads/core.php
XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/providers/projecthoneypot.org/post.loader.php
XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/providers/protector/footer.post.loader.php
XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/providers/protector/header.post.loader.php
XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/providers/providers.php
XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/providers/spiders/post.loader.php
XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/providers/stopforumspam.com/post.loader.php
XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/providers/xortify/footer.post.loader.php
XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/providers/xortify/header.post.loader.php
XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/providers/xortify/post.loader.php
XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/xoops_version.php
Modified: XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/admin/index.php
===================================================================
--- XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/admin/index.php 2011-12-15 10:29:52 UTC (rev 8499)
+++ XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/admin/index.php 2011-12-15 10:31:25 UTC (rev 8500)
@@ -10,7 +10,7 @@
include('../../../include/cp_header.php');
-
+
if (!defined('_CHARSET'))
define ("_CHARSET","UTF-8");
if (!defined('_CHARSET_ISO'))
@@ -20,18 +20,21 @@
$module_handler = xoops_gethandler('module');
$config_handler = xoops_gethandler('config');
- $GLOBALS['xortifyModule'] = $module_handler->getByDirname('xortify');
- $GLOBALS['xortifyModuleConfig'] = $config_handler->getConfigList($GLOBALS['xortifyModule']->getVar('mid'));
-
- xoops_load('pagenav');
- xoops_load('xoopslists');
- xoops_load('xoopsformloader');
+ if (!isset($GLOBALS['xortifyModule'])) $GLOBALS['xortifyModule'] = $module_handler->getByDirname('xortify');
+ if (!isset($GLOBALS['xortifyModuleConfig'])) $GLOBALS['xortifyModuleConfig'] = $config_handler->getConfigList($GLOBALS['xortifyModule']->getVar('mid'));
+ include_once $GLOBALS['xoops']->path('class'.DS.'cache'.DS.'xoopscache.php');
+ include_once $GLOBALS['xoops']->path('class'.DS.'pagenav.php');
+ include_once $GLOBALS['xoops']->path('class'.DS.'xoopslists.php');
include_once $GLOBALS['xoops']->path('class'.DS.'xoopsmailer.php');
include_once $GLOBALS['xoops']->path('class'.DS.'xoopstree.php');
+ include_once $GLOBALS['xoops']->path('class'.DS.'xoopsformloader.php');
+ include_once $GLOBALS['xoops']->path('modules'.DS.'xortify'.DS.'class'.DS.'auth'.DS.'authfactory.php');
include_once $GLOBALS['xoops']->path('modules'.DS.'xortify'.DS.'include'.DS.'functions.php');
include_once $GLOBALS['xoops']->path('modules'.DS.'xortify'.DS.'include'.DS.'forms.xortify.php');
+ xoops_loadLanguage('admin', 'xortify');
+
if ( file_exists($GLOBALS['xoops']->path('/Frameworks/moduleclasses/moduleadmin/moduleadmin.php'))){
include_once $GLOBALS['xoops']->path('/Frameworks/moduleclasses/moduleadmin/moduleadmin.php');
//return true;
@@ -42,8 +45,6 @@
$GLOBALS['xortifyImageIcon'] = XOOPS_URL .'/'. $GLOBALS['xortifyModule']->getInfo('icons16');
$GLOBALS['xortifyImageAdmin'] = XOOPS_URL .'/'. $GLOBALS['xortifyModule']->getInfo('icons32');
- $myts =& MyTextSanitizer::getInstance();
-
if ($GLOBALS['xoopsUser']) {
$moduleperm_handler =& xoops_gethandler('groupperm');
if (!$moduleperm_handler->checkRight('module_admin', $GLOBALS['xortifyModule']->getVar( 'mid' ), $GLOBALS['xoopsUser']->getGroups())) {
@@ -93,7 +94,7 @@
if ($validate!=false)
$stop .= "User details didn't validate with Xortify.com<br/>$validate";
- xoops_load("captcha");
+ XoopsLoad::load("captcha");
$xoopsCaptcha = XoopsCaptcha::getInstance();
if (! $xoopsCaptcha->verify() ) {
$stop .= $xoopsCaptcha->getMessage();
@@ -256,8 +257,7 @@
}
break;
case "log":
-
- xoops_loadLanguage('admin', 'xortify');
+
xortify_adminMenu(3);
include_once $GLOBALS['xoops']->path( "/class/pagenav.php" );
@@ -292,14 +292,9 @@
$GLOBALS['xoopsTpl']->display('db:xortify_cpanel_log.html');
break;
case "list":
- xoops_loadLanguage('admin', 'xortify');
+
xortify_adminMenu(2);
- xoops_load("xoopscache");
- if (!class_exists('XoopsCache'))
- xoops_load("cache");
- xoops_load("pagenav");
-
if (!$bans = XoopsCache::read('xortify_bans_cache')) {
require_once( XOOPS_ROOT_PATH.'/modules/xortify/class/'.$GLOBALS['xortifyModuleConfig']['protocol'].'.php' );
$func = strtoupper($GLOBALS['xortifyModuleConfig']['protocol']).'XortifyExchange';
@@ -377,16 +372,7 @@
$indexAdmin->addInfoBoxLine(_XOR_ADMIN_COUNTS, "<label>"._XOR_ADMIN_THEREARE_SPIDERS."</label>", $log_handler->getCountByField('provider','spiders'), 'Green');
$indexAdmin->addInfoBoxLine(_XOR_ADMIN_COUNTS, "<label>"._XOR_ADMIN_THEREARE_STOPFORUMSPAMCOM."</label>", $log_handler->getCountByField('provider','stopforumspam.com'), 'Green');
$indexAdmin->addInfoBoxLine(_XOR_ADMIN_COUNTS, "<label>"._XOR_ADMIN_THEREARE_XORTIFY."</label>", $log_handler->getCountByField('provider','xortify'), 'Green');
-
- xoops_load('xoopscache');
- if (!class_exists('XoopsCache')) {
- // XOOPS 2.4 Compliance
- xoops_load('cache');
- if (!class_exists('XoopsCache')) {
- include_once XOOPS_ROOT_PATH.DS.'class'.DS.'cache'.DS.'xoopscache.php';
- }
- }
-
+
if ($bans = XoopsCache::read('xortify_bans_cache')) {
$indexAdmin->addInfoBoxLine(_XOR_ADMIN_COUNTS, "<label>"._XOR_ADMIN_THEREARE_CLOUDEDBANS."</label>", count($bans), 'Green');
}
Modified: XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/class/auth/auth_curl.php
===================================================================
--- XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/class/auth/auth_curl.php 2011-12-15 10:29:52 UTC (rev 8499)
+++ XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/class/auth/auth_curl.php 2011-12-15 10:31:25 UTC (rev 8500)
@@ -27,7 +27,7 @@
}
-define('XORTIFY_CURL_API', $GLOBALS['xoopsModuleConfig']['xortify_uricurl']);
+define('XORTIFY_CURL_API', $GLOBALS['xortifyModuleConfig']['xortify_uricurl']);
define('XORTIFY_USER_AGENT', 'Mozilla/5.0 (X11; U; Linux i686; pl-PL; rv:1.9.0.2) XOOPS/20100101 XoopsAuth/1.xx (php)');
include_once XOOPS_ROOT_PATH . '/modules/xortify/class/auth/auth_curl_provisionning.php';
Modified: XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/class/auth/auth_curlserialised.php
===================================================================
--- XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/class/auth/auth_curlserialised.php 2011-12-15 10:29:52 UTC (rev 8499)
+++ XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/class/auth/auth_curlserialised.php 2011-12-15 10:31:25 UTC (rev 8500)
@@ -9,7 +9,7 @@
*/
-define('XORTIFY_CURLSERIAL_API', $GLOBALS['xoopsModuleConfig']['xortify_uriserial']);
+define('XORTIFY_CURLSERIAL_API', $GLOBALS['xortifyModuleConfig']['xortify_uriserial']);
define('XORTIFY_USER_AGENT', 'Mozilla/5.0 (X11; U; Linux i686; pl-PL; rv:1.9.0.2) XOOPS/20100101 XoopsAuth/1.xx (php)');
include_once XOOPS_ROOT_PATH . '/modules/xortify/class/auth/auth_curlserilaised_provisionning.php';
Modified: XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/class/auth/auth_curlxml.php
===================================================================
--- XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/class/auth/auth_curlxml.php 2011-12-15 10:29:52 UTC (rev 8499)
+++ XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/class/auth/auth_curlxml.php 2011-12-15 10:31:25 UTC (rev 8500)
@@ -9,7 +9,7 @@
*/
-define('XORTIFY_CURLXML_API', $GLOBALS['xoopsModuleConfig']['xortify_urixml']);
+define('XORTIFY_CURLXML_API', $GLOBALS['xortifyModuleConfig']['xortify_urixml']);
define('XORTIFY_USER_AGENT', 'Mozilla/5.0 (X11; U; Linux i686; pl-PL; rv:1.9.0.2) XOOPS/20100101 XoopsAuth/1.xx (php)');
include_once XOOPS_ROOT_PATH . '/modules/xortify/class/auth/auth_curlxml_provisionning.php';
Modified: XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/class/auth/auth_json.php
===================================================================
--- XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/class/auth/auth_json.php 2011-12-15 10:29:52 UTC (rev 8499)
+++ XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/class/auth/auth_json.php 2011-12-15 10:31:25 UTC (rev 8500)
@@ -27,7 +27,7 @@
}
}
-define('XORTIFY_JSON_API', $GLOBALS['xoopsModuleConfig']['xortify_urijson']);
+define('XORTIFY_JSON_API', $GLOBALS['xortifyModuleConfig']['xortify_urijson']);
include_once XOOPS_ROOT_PATH . '/modules/xortify/class/auth/auth_json_provisionning.php';
class XortifyAuthJson extends XortifyAuth {
Modified: XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/class/auth/auth_soap.php
===================================================================
--- XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/class/auth/auth_soap.php 2011-12-15 10:29:52 UTC (rev 8499)
+++ XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/class/auth/auth_soap.php 2011-12-15 10:31:25 UTC (rev 8500)
@@ -9,10 +9,10 @@
*/
if (!defined('XORTIFY_API_LOCAL'))
- define('XORTIFY_API_LOCAL', $GLOBALS['xoopsModuleConfig']['xortify_urisoap']);
+ define('XORTIFY_API_LOCAL', $GLOBALS['xortifyModuleConfig']['xortify_urisoap']);
if (!defined('XORTIFY_API_URI'))
- define('XORTIFY_API_URI', $GLOBALS['xoopsModuleConfig']['xortify_urisoap']);
+ define('XORTIFY_API_URI', $GLOBALS['xortifyModuleConfig']['xortify_urisoap']);
include_once XOOPS_ROOT_PATH . '/modules/xortify/class/auth/auth_soap_provisionning.php';
Modified: XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/class/auth/auth_wgetserialised.php
===================================================================
--- XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/class/auth/auth_wgetserialised.php 2011-12-15 10:29:52 UTC (rev 8499)
+++ XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/class/auth/auth_wgetserialised.php 2011-12-15 10:31:25 UTC (rev 8500)
@@ -9,7 +9,7 @@
*/
-define('XORTIFY_WGETSERIAL_API', $GLOBALS['xoopsModuleConfig']['xortify_uriserial']);
+define('XORTIFY_WGETSERIAL_API', $GLOBALS['xortifyModuleConfig']['xortify_uriserial']);
include_once XOOPS_ROOT_PATH . '/modules/xortify/class/auth/auth_wgetserialised_provisionning.php';
class XortifyAuthWgetserialised extends XortifyAuth {
Modified: XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/class/auth/auth_wgetxml.php
===================================================================
--- XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/class/auth/auth_wgetxml.php 2011-12-15 10:29:52 UTC (rev 8499)
+++ XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/class/auth/auth_wgetxml.php 2011-12-15 10:31:25 UTC (rev 8500)
@@ -9,7 +9,7 @@
*/
-define('XORTIFY_WGETXML_API', $GLOBALS['xoopsModuleConfig']['xortify_urixml']);
+define('XORTIFY_WGETXML_API', $GLOBALS['xortifyModuleConfig']['xortify_urixml']);
include_once XOOPS_ROOT_PATH . '/modules/xortify/class/auth/auth_wgetxml_provisionning.php';
include_once XOOPS_ROOT_PATH . '/modules/xortify/include/functions.php';
Modified: XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/class/curl.php
===================================================================
--- XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/class/curl.php 2011-12-15 10:29:52 UTC (rev 8499)
+++ XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/class/curl.php 2011-12-15 10:31:25 UTC (rev 8500)
@@ -36,7 +36,7 @@
define('XORTIFY_USER_AGENT', 'Mozilla/5.0 (X11; U; Linux i686; pl-PL; rv:1.9.0.2) XOOPS/20100101 XoopsAuth/1.xx (php)');
}
-define('XORTIFY_CURL_API', $GLOBALS['xortify_uricurl']);
+define('XORTIFY_CURL_API', $GLOBALS['xortifyModuleConfig']['xortify_uricurl']);
include_once(XOOPS_ROOT_PATH.'/modules/xortify/include/functions.php');
@@ -56,8 +56,8 @@
$module_handler =& xoops_gethandler('module');
$config_handler =& xoops_gethandler('config');
- $GLOBALS['xortifyModule'] = $module_handler->getByDirname('xortify');
- $GLOBALS['xortifyModuleConfig'] = $config_handler->getConfigList($GLOBALS['xortifyModule']->mid());
+ if (!isset($GLOBALS['xortifyModule'])) $GLOBALS['xortifyModule'] = $module_handler->getByDirname('xortify');
+ if (!isset($GLOBALS['xortifyModuleConfig'])) $GLOBALS['xortifyModuleConfig'] = $config_handler->getConfigList($GLOBALS['xortifyModule']->mid());
$this->curl_xoops_username = $GLOBALS['xortifyModuleConfig']['xortify_username'];
$this->curl_xoops_password = md5($GLOBALS['xortifyModuleConfig']['xortify_password']);
Modified: XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/class/curlserialised.php
===================================================================
--- XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/class/curlserialised.php 2011-12-15 10:29:52 UTC (rev 8499)
+++ XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/class/curlserialised.php 2011-12-15 10:31:25 UTC (rev 8500)
@@ -18,7 +18,7 @@
define('XORTIFY_USER_AGENT', 'Mozilla/5.0 (X11; U; Linux i686; pl-PL; rv:1.9.0.2) XOOPS/20100101 XoopsAuth/1.xx (php)');
}
-define('XORTIFY_CURLSERIAL_API', $GLOBALS['xortify_uriserial']);
+define('XORTIFY_CURLSERIAL_API', $GLOBALS['xortifyModuleConfig']['xortify_uriserial']);
include_once(XOOPS_ROOT_PATH.'/modules/xortify/include/functions.php');
@@ -39,8 +39,8 @@
$module_handler =& xoops_gethandler('module');
$config_handler =& xoops_gethandler('config');
- $GLOBALS['xortifyModule'] = $module_handler->getByDirname('xortify');
- $GLOBALS['xortifyModuleConfig'] = $config_handler->getConfigList($GLOBALS['xortifyModule']->mid());
+ if (!isset($GLOBALS['xortifyModule'])) $GLOBALS['xortifyModule'] = $module_handler->getByDirname('xortify');
+ if (!isset($GLOBALS['xortifyModuleConfig'])) $GLOBALS['xortifyModuleConfig'] = $config_handler->getConfigList($GLOBALS['xortifyModule']->mid());
$this->serial_xoops_username = $GLOBALS['xortifyModuleConfig']['xortify_username'];
$this->serial_xoops_password = md5($GLOBALS['xortifyModuleConfig']['xortify_password']);
Modified: XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/class/curlxml.php
===================================================================
--- XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/class/curlxml.php 2011-12-15 10:29:52 UTC (rev 8499)
+++ XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/class/curlxml.php 2011-12-15 10:31:25 UTC (rev 8500)
@@ -21,7 +21,7 @@
define('XORTIFY_USER_AGENT', 'Mozilla/5.0 (X11; U; Linux i686; pl-PL; rv:1.9.0.2) XOOPS/20100101 XoopsAuth/1.xx (php)');
}
-define('XORTIFY_CURLXML_API', $GLOBALS['xortify_urixml']);
+define('XORTIFY_CURLXML_API', $GLOBALS['xortifyModuleConfig']['xortify_urixml']);
include_once(XOOPS_ROOT_PATH.'/modules/xortify/include/functions.php');
@@ -41,8 +41,8 @@
$module_handler =& xoops_gethandler('module');
$config_handler =& xoops_gethandler('config');
- $GLOBALS['xortifyModule'] = $module_handler->getByDirname('xortify');
- $GLOBALS['xortifyModuleConfig'] = $config_handler->getConfigList($GLOBALS['xortifyModule']->mid());
+ if (!isset($GLOBALS['xortifyModule'])) $GLOBALS['xortifyModule'] = $module_handler->getByDirname('xortify');
+ if (!isset($GLOBALS['xortifyModuleConfig'])) $GLOBALS['xortifyModuleConfig'] = $config_handler->getConfigList($GLOBALS['xortifyModule']->mid());
$this->xml_xoops_username = $GLOBALS['xortifyModuleConfig']['xortify_username'];
$this->xml_xoops_password = md5($GLOBALS['xortifyModuleConfig']['xortify_password']);
Modified: XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/class/json.php
===================================================================
--- XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/class/json.php 2011-12-15 10:29:52 UTC (rev 8499)
+++ XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/class/json.php 2011-12-15 10:31:25 UTC (rev 8500)
@@ -28,7 +28,7 @@
}
-define('XORTIFY_JSON_API', $GLOBALS['xortify_urijson']);
+define('XORTIFY_JSON_API', $GLOBALS['xortifyModuleConfig']['xortify_urijson']);
include_once(XOOPS_ROOT_PATH.'/modules/xortify/include/functions.php');
@@ -51,8 +51,8 @@
$module_handler =& xoops_gethandler('module');
$config_handler =& xoops_gethandler('config');
- $GLOBALS['xortifyModule'] = $module_handler->getByDirname('xortify');
- $GLOBALS['xortifyModuleConfig'] = $config_handler->getConfigList($GLOBALS['xortifyModule']->mid());
+ if (!isset($GLOBALS['xortifyModule'])) $GLOBALS['xortifyModule'] = $module_handler->getByDirname('xortify');
+ if (!isset($GLOBALS['xortifyModuleConfig'])) $GLOBALS['xortifyModuleConfig'] = $config_handler->getConfigList($GLOBALS['xortifyModule']->mid());
$this->json_xoops_username = $GLOBALS['xortifyModuleConfig']['xortify_username'];
$this->json_xoops_password = md5($GLOBALS['xortifyModuleConfig']['xortify_password']);
Modified: XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/class/soap.php
===================================================================
--- XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/class/soap.php 2011-12-15 10:29:52 UTC (rev 8499)
+++ XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/class/soap.php 2011-12-15 10:31:25 UTC (rev 8500)
@@ -17,10 +17,10 @@
define('XOOPS_SOAP_LIB', 'PHPSOAP');
if (!defined('XORTIFY_API_LOCAL'))
- define('XORTIFY_API_LOCAL', $GLOBALS['xortify_urisoap']);
+ define('XORTIFY_API_LOCAL', $GLOBALS['xortifyModuleConfig']['xortify_urisoap']);
if (!defined('XORTIFY_API_URI'))
- define('XORTIFY_API_URI', $GLOBALS['xortify_urisoap']);
+ define('XORTIFY_API_URI', $GLOBALS['xortifyModuleConfig']['xortify_urisoap']);
class SOAPXortifyExchange {
@@ -33,8 +33,8 @@
$module_handler =& xoops_gethandler('module');
$config_handler =& xoops_gethandler('config');
- $GLOBALS['xortifyModule'] = $module_handler->getByDirname('xortify');
- $GLOBALS['xortifyModuleConfig'] = $config_handler->getConfigList($GLOBALS['xortifyModule']->mid());
+ if (!isset($GLOBALS['xortifyModule'])) $GLOBALS['xortifyModule'] = $module_handler->getByDirname('xortify');
+ if (!isset($GLOBALS['xortifyModuleConfig'])) $GLOBALS['xortifyModuleConfig'] = $config_handler->getConfigList($GLOBALS['xortifyModule']->mid());
$this->soap_xoops_username = $GLOBALS['xortifyModuleConfig']['xortify_username'];
$this->soap_xoops_password = md5($GLOBALS['xortifyModuleConfig']['xortify_password']);
Modified: XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/class/wgetserialised.php
===================================================================
--- XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/class/wgetserialised.php 2011-12-15 10:29:52 UTC (rev 8499)
+++ XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/class/wgetserialised.php 2011-12-15 10:31:25 UTC (rev 8500)
@@ -8,7 +8,7 @@
* @licence GPL 2.0 - see docs/LICENCE.txt
*/
-define('XORTIFY_SERIAL_API', $GLOBALS['xortify_uriserial']);
+define('XORTIFY_SERIAL_API', $GLOBALS['xortifyModuleConfig']['xortify_uriserial']);
include_once(XOOPS_ROOT_PATH.'/modules/xortify/include/functions.php');
@@ -31,8 +31,8 @@
$module_handler =& xoops_gethandler('module');
$config_handler =& xoops_gethandler('config');
- $GLOBALS['xortifyModule'] = $module_handler->getByDirname('xortify');
- $GLOBALS['xortifyModuleConfig'] = $config_handler->getConfigList($GLOBALS['xortifyModule']->mid());
+ if (!isset($GLOBALS['xortifyModule'])) $GLOBALS['xortifyModule'] = $module_handler->getByDirname('xortify');
+ if (!isset($GLOBALS['xortifyModuleConfig'])) $GLOBALS['xortifyModuleConfig'] = $config_handler->getConfigList($GLOBALS['xortifyModule']->mid());
$this->serial_xoops_username = $GLOBALS['xortifyModuleConfig']['xortify_username'];
$this->serial_xoops_password = md5($GLOBALS['xortifyModuleConfig']['xortify_password']);
Modified: XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/class/wgetxml.php
===================================================================
--- XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/class/wgetxml.php 2011-12-15 10:29:52 UTC (rev 8499)
+++ XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/class/wgetxml.php 2011-12-15 10:31:25 UTC (rev 8500)
@@ -17,7 +17,7 @@
if ($nativexml==true)
define('XOOPS_WGETXML_LIB', 'PHPXML');
-define('XORTIFY_WGETXML_API', $GLOBALS['xortify_urixml']);
+define('XORTIFY_WGETXML_API', $GLOBALS['xortifyModuleConfig']['xortify_urixml']);
include_once(XOOPS_ROOT_PATH.'/modules/xortify/include/functions.php');
@@ -36,8 +36,8 @@
$module_handler =& xoops_gethandler('module');
$config_handler =& xoops_gethandler('config');
- $GLOBALS['xortifyModule'] = $module_handler->getByDirname('xortify');
- $GLOBALS['xortifyModuleConfig'] = $config_handler->getConfigList($GLOBALS['xortifyModule']->mid());
+ if (!isset($GLOBALS['xortifyModule'])) $GLOBALS['xortifyModule'] = $module_handler->getByDirname('xortify');
+ if (!isset($GLOBALS['xortifyModuleConfig'])) $GLOBALS['xortifyModuleConfig'] = $config_handler->getConfigList($GLOBALS['xortifyModule']->mid());
$this->xml_xoops_username = $GLOBALS['xortifyModuleConfig']['xortify_username'];
$this->xml_xoops_password = md5($GLOBALS['xortifyModuleConfig']['xortify_password']);
Modified: XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/preloads/core.php
===================================================================
--- XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/preloads/core.php 2011-12-15 10:29:52 UTC (rev 8499)
+++ XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/preloads/core.php 2011-12-15 10:31:25 UTC (rev 8500)
@@ -11,47 +11,33 @@
defined('XOOPS_ROOT_PATH') or die('Restricted access');
-
class XortifyCorePreload extends XoopsPreloadItem
{
- function __construct() {
- xoops_load('xoopscache');
- if (!class_exists('XoopsCache')) {
- // XOOPS 2.4 Compliance
- xoops_load('cache');
- if (!class_exists('XoopsCache')) {
- include_once XOOPS_ROOT_PATH.'/class/cache/xoopscache.php';
- }
- }
- $xoops = Xoops::getInstance();
- $module_handler = $xoops_getHandler('module');
- $config_handler = $xoops_gethandler('config');
- $GLOBALS['xortifyModule'] = $module_handler->getByDirname('xortify');
- if (is_object($GLOBALS['xortifyModule'])) {
- $GLOBALS['xortifyModuleConfig'] = $config_handler->getConfigList($GLOBALS['xortifyModule']->getVar('mid'));
- } else {
- $GLOBALS['xortifyModuleConfig']['fault_delay'] = 120;
- }
- }
-
function eventCoreIncludeCommonStart($args)
{
- if (!$result = XoopsCache::read('xortify_core_include_common_start')) {
- XoopsCache::write('xortify_core_include_common_start', array('time'=>microtime(true)), $GLOBALS['xortifyModuleConfig']['fault_delay']);
+
+ include_once XOOPS_ROOT_PATH.'/class/cache/xoopscache.php';
+ $result = XoopsCache::read('xortify_core_include_common_start');
+ if ((isset($result['time'])?(float)$result['time']:0)<=microtime(true)) {
+ XoopsCache::write('xortify_core_include_common_start', array('time'=>microtime(true)+600), 600);
include_once XOOPS_ROOT_PATH . ( '/modules/xortify/include/pre.loader.mainfile.php' );
- XoopsCache::delete('xortify_core_include_common_start');
+ XoopsCache::write('xortify_core_include_common_start', array('time'=>microtime(true)), -1);
}
}
function eventCoreIncludeCommonEnd($args)
{
- if (!$result = XoopsCache::read('xortify_core_include_common_end_cron')) {
- XoopsCache::write('xortify_core_include_common_end_cron', array('time'=>microtime(true)), $GLOBALS['xortifyModuleConfig']['fault_delay']);
+
+ include_once XOOPS_ROOT_PATH.'/class/cache/xoopscache.php';
+ $result = XoopsCache::read('xortify_core_include_common_end_cron');
+ if ((isset($result['time'])?(float)$result['time']:0)<=microtime(true)) {
+ XoopsCache::write('xortify_core_include_common_end_cron', array('time'=>microtime(true)+$GLOBALS['xortifyModuleConfig']['fault_delay']), $GLOBALS['xortifyModuleConfig']['fault_delay']);
switch ($GLOBALS['xortifyModuleConfig']['crontype']) {
case 'preloader':
- if (!$read = XoopsCache::read('xortify_pause_preload')) {
- XoopsCache::write('xortify_pause_preload', true, $GLOBALS['xortifyModuleConfig']['croninterval']);
+ $read = XoopsCache::read('xortify_pause_preload');
+ if ((isset($read['time'])?(float)$read['time']:0)<=microtime(true)) {
+ XoopsCache::write('xortify_pause_preload', array('time'=>microtime(true)+$GLOBALS['xortifyModuleConfig']['croninterval']));
$GLOBALS['xortify_preloader']=true;
ob_start();
include(XOOPS_ROOT_PATH.'/modules/xortify/cron/serverup.php');
@@ -59,36 +45,41 @@
}
break;
}
- XoopsCache::delete('xortify_core_include_common_end_cron');
+ XoopsCache::write('xortify_core_include_common_end_cron', array('time'=>microtime(true)), -1);
}
-
- if (!$result = XoopsCache::read('xortify_core_include_common_end')) {
- XoopsCache::write('xortify_core_include_common_start', array('time'=>microtime(true)), $GLOBALS['xortifyModuleConfig']['fault_delay']);
+
+ $result = XoopsCache::read('xortify_core_include_common_end');
+ if ((isset($result['time'])?(float)$result['time']:0)<=microtime(true)) {
+ XoopsCache::write('xortify_core_include_common_end', array('time'=>microtime(true)+$GLOBALS['xortifyModuleConfig']['fault_delay']), $GLOBALS['xortifyModuleConfig']['fault_delay']);
if (XortifyCorePreload::hasAPIUserPass())
if (XortifyCorePreload::isActive()) {
include_once XOOPS_ROOT_PATH . ( '/modules/xortify/include/post.loader.mainfile.php' );
}
- XoopsCache::delete('xortify_core_include_common_end');
+ XoopsCache::write('xortify_core_include_common_end', array('time'=>microtime(true)), -1);
}
}
function eventCoreHeaderCacheEnd($args)
{
- if (!$result = XoopsCache::read('xortify_core_header_cache_end')) {
- XoopsCache::write('xortify_core_header_cache_end', array('time'=>microtime(true)), $GLOBALS['xortifyModuleConfig']['fault_delay']);
+
+ include_once XOOPS_ROOT_PATH.'/class/cache/xoopscache.php';
+ $result = XoopsCache::read('xortify_core_header_cache_end');
+ if ((isset($result['time'])?(float)$result['time']:0)<=microtime(true)) {
+ XoopsCache::write('xortify_core_header_cache_end', array('time'=>microtime(true)+$GLOBALS['xortifyModuleConfig']['fault_delay']), $GLOBALS['xortifyModuleConfig']['fault_delay']);
if (XortifyCorePreload::hasAPIUserPass())
if (XortifyCorePreload::isActive()) {
include_once XOOPS_ROOT_PATH . ( '/modules/xortify/include/post.header.endcache.php' );
}
- XoopsCache::delete('xortify_core_header_cache_end');
+ XoopsCache::write('xortify_core_header_cache_end', array('time'=>microtime(true)), -1);
}
}
function eventCoreHeaderAddmeta($args)
{
+
if ($GLOBALS['xortify_pass'] == true) {
- $GLOBALS['xoTheme']->addScript('', array('type'=>'text/javascript'), "var _gaq = _gaq || [];
+ $GLOBALS['xoops']->theme->addScript('', array('type'=>'text/javascript'), "var _gaq = _gaq || [];
_gaq.push(['_setAccount', 'UA-27726722-1']);
_gaq.push(['_setDomainName', '".$_SERVER["HTTP_HOST"]."']);
_gaq.push(['_setAllowLinker', true]);
@@ -100,23 +91,17 @@
var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
})();");
}
- if (!$result = XoopsCache::read('xortify_core_header_add_meta')) {
- XoopsCache::write('xortify_core_header_add_meta', array('time'=>microtime(true)), $GLOBALS['xortifyModuleConfig']['fault_delay']);
+ include_once XOOPS_ROOT_PATH.'/class/cache/xoopscache.php';
+ $result = XoopsCache::read('xortify_core_header_add_meta');
+ if ((isset($result['time'])?(float)$result['time']:0)<=microtime(true)) {
+ XoopsCache::write('xortify_core_header_add_meta', array('time'=>microtime(true)+$GLOBALS['xortifyModuleConfig']['fault_delay']), $GLOBALS['xortifyModuleConfig']['fault_delay']);
if (XortifyCorePreload::hasAPIUserPass())
if (XortifyCorePreload::isActive()) {
include_once XOOPS_ROOT_PATH . ( '/modules/xortify/include/post.header.addmeta.php' );
}
- XoopsCache::delete('xortify_core_header_add_meta');
+ XoopsCache::write('xortify_core_header_add_meta', array('time'=>microtime(true)), -1);
}
}
-
- function isActive()
- {
- $xoops = Xoops::getInstance();
- $module_handler = $xoops_gethandler('module');
- $module = $module_handler->getByDirname('xortify');
- return ($module && $module->getVar('isactive')) ? ($module->getVar('version')<240) ? false : true : false;
- }
function hasAPIUserPass()
{
Modified: XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/providers/projecthoneypot.org/post.loader.php
===================================================================
--- XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/providers/projecthoneypot.org/post.loader.php 2011-12-15 10:29:52 UTC (rev 8499)
+++ XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/providers/projecthoneypot.org/post.loader.php 2011-12-15 10:31:25 UTC (rev 8500)
@@ -22,8 +22,8 @@
$module_handler = xoops_gethandler('module');
$config_handler = xoops_gethandler('config');
- $GLOBALS['xortifyModule'] = $module_handler->getByDirname('xortify');
- $GLOBALS['xortifyModuleConfig'] = $config_handler->getConfigList($GLOBALS['xortifyModule']->getVar('mid'));
+ if (!isset($GLOBALS['xortifyModule'])) $GLOBALS['xortifyModule'] = $module_handler->getByDirname('xortify');
+ if (!isset($GLOBALS['xortifyModuleConfig'])) $GLOBALS['xortifyModuleConfig'] = $config_handler->getConfigList($GLOBALS['xortifyModule']->getVar('mid'));
xoops_load('xoopscache');
if (!class_exists('XoopsCache')) {
@@ -56,7 +56,7 @@
if (($result['octeta']<=$GLOBALS['xortifyModuleConfig']['octeta']&&$result['octetb']>$GLOBALS['xortifyModuleConfig']['octetb']&&$result['octetc']>=$GLOBALS['xortifyModuleConfig']['octetc'])) {
$module_handler =& xoops_gethandler('module');
$config_handler =& xoops_gethandler('config');
- $GLOBALS['xortifyModule'] = $module_handler->getByDirname('xortify');
+ if (!isset($GLOBALS['xortifyModule'])) $GLOBALS['xortifyModule'] = $module_handler->getByDirname('xortify');
$configs = $config_handler->getConfigList($GLOBALS['xortifyModule']->mid());
XoopsCache::write('xortify_php_'.sha1($ipdata['uname'].$ipdata['email'].(isset($ipdata['ip4'])?$ipdata['ip4']:"").(isset($ipdata['ip6'])?$ipdata['ip6']:"").(isset($ipdata['proxy-ip4'])?$ipdata['proxy-ip4']:"").(isset($ipdata['proxy-ip4'])?$ipdata['proxy-ip6']:"").$ipdata['network-addy']), array_merge($result, array('ipdata' => $ipdata)), $GLOBALS['xortifyModuleConfig']['xortify_ip_cache']);
Modified: XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/providers/protector/footer.post.loader.php
===================================================================
--- XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/providers/protector/footer.post.loader.php 2011-12-15 10:29:52 UTC (rev 8499)
+++ XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/providers/protector/footer.post.loader.php 2011-12-15 10:31:25 UTC (rev 8500)
@@ -27,8 +27,8 @@
$module_handler = xoops_gethandler('module');
$config_handler = xoops_gethandler('config');
- $GLOBALS['xortifyModule'] = $module_handler->getByDirname('xortify');
- $GLOBALS['xortifyModuleConfig'] = $config_handler->getConfigList($GLOBALS['xortifyModule']->getVar('mid'));
+ if (!isset($GLOBALS['xortifyModule'])) $GLOBALS['xortifyModule'] = $module_handler->getByDirname('xortify');
+ if (!isset($GLOBALS['xortifyModuleConfig'])) $GLOBALS['xortifyModuleConfig'] = $config_handler->getConfigList($GLOBALS['xortifyModule']->getVar('mid'));
require_once( XOOPS_ROOT_PATH.'/modules/xortify/class/'.$GLOBALS['xortifyModuleConfig']['protocol'].'.php' );
$func = strtoupper($GLOBALS['xortifyModuleConfig']['protocol']).'XortifyExchange';
Modified: XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/providers/protector/header.post.loader.php
===================================================================
--- XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/providers/protector/header.post.loader.php 2011-12-15 10:29:52 UTC (rev 8499)
+++ XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/providers/protector/header.post.loader.php 2011-12-15 10:31:25 UTC (rev 8500)
@@ -27,8 +27,8 @@
$module_handler = xoops_gethandler('module');
$config_handler = xoops_gethandler('config');
- $GLOBALS['xortifyModule'] = $module_handler->getByDirname('xortify');
- $GLOBALS['xortifyModuleConfig'] = $config_handler->getConfigList($GLOBALS['xortifyModule']->getVar('mid'));
+ if (!isset($GLOBALS['xortifyModule'])) $GLOBALS['xortifyModule'] = $module_handler->getByDirname('xortify');
+ if (!isset($GLOBALS['xortifyModuleConfig'])) $GLOBALS['xortifyModuleConfig'] = $config_handler->getConfigList($GLOBALS['xortifyModule']->getVar('mid'));
require_once( XOOPS_ROOT_PATH.'/modules/xortify/class/'.$GLOBALS['xortifyModuleConfig']['protocol'].'.php' );
$func = strtoupper($GLOBALS['xortifyModuleConfig']['protocol']).'XortifyExchange';
Modified: XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/providers/providers.php
===================================================================
--- XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/providers/providers.php 2011-12-15 10:29:52 UTC (rev 8499)
+++ XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/providers/providers.php 2011-12-15 10:31:25 UTC (rev 8500)
@@ -10,51 +10,77 @@
if (!defined('XOOPS_ROOT_PATH')) die ('Restricted Access');
-error_reporting(0);
+error_reporting(E_ALL);
-$conn = mysql_connect(XOOPS_DB_HOST, XOOPS_DB_USER, XOOPS_DB_PASS);
-@mysql_select_db(XOOPS_DB_NAME);
-$sql[0] = "SELECT mid, version FROM `".XOOPS_DB_PREFIX."_modules` WHERE dirname = 'xortify'";
-list($modid, $version) = @mysql_fetch_row(mysql_query($sql[0]));
-$GLOBALS['xortify_version'] = $version;
-$sql[1] = "SELECT conf_value FROM `".XOOPS_DB_PREFIX."_config` WHERE conf_name = 'xortify_providers' and conf_modid = '".$modid."'";
-list($cvalue) = @mysql_fetch_row(mysql_query($sql[1]));
-$GLOBALS['cvalue'] = $cvalue;
-$sql[2] = "SELECT conf_value FROM `".XOOPS_DB_PREFIX."_config` WHERE conf_name = 'protocol' and conf_modid = '".$modid."'";
-list($capi) = @mysql_fetch_row(mysql_query($sql[2]));
-$GLOBALS['xortify_api'] = $capi;
-$sql[3] = "SELECT conf_value FROM `".XOOPS_DB_PREFIX."_config` WHERE conf_name = 'xortify_urisoap' and conf_modid = '".$modid."'";
-list($xortify_urisoap) = @mysql_fetch_row(mysql_query($sql[3]));
-$GLOBALS['xortify_urisoap'] = $xortify_urisoap;
-$sql[4] = "SELECT conf_value FROM `".XOOPS_DB_PREFIX."_config` WHERE conf_name = 'xortify_uricurl' and conf_modid = '".$modid."'";
-list($xortify_urisoap) = @mysql_fetch_row(mysql_query($sql[4]));
-$GLOBALS['xortify_uricurl'] = $xortify_urisoap;
-$sql[5] = "SELECT conf_value FROM `".XOOPS_DB_PREFIX."_config` WHERE conf_name = 'xortify_urijson' and conf_modid = '".$modid."'";
-list($xortify_urisoap) = @mysql_fetch_row(mysql_query($sql[5]));
-$GLOBALS['xortify_urijson'] = $xortify_urisoap;
-$sql[6] = "SELECT conf_value FROM `".XOOPS_DB_PREFIX."_config` WHERE conf_name = 'xortify_uriserial' and conf_modid = '".$modid."'";
-list($xortify_uriserial) = @mysql_fetch_row(mysql_query($sql[6]));
-$GLOBALS['xortify_uriserial'] = $xortify_uriserial;
-$sql[7] = "SELECT conf_value FROM `".XOOPS_DB_PREFIX."_config` WHERE conf_name = 'xortify_urixml' and conf_modid = '".$modid."'";
-list($xortify_urixml) = @mysql_fetch_row(mysql_query($sql[7]));
-$GLOBALS['xortify_urixml'] = $xortify_urixml;
-mysql_close($conn);
-
include_once( XOOPS_ROOT_PATH.'/modules/xortify/include/functions.php' );
class Providers
{
var $providers = array();
+ function init($check) {
+ defined('DS') or define('DS', DIRECTORY_SEPARATOR);
+ defined('NWLINE')or define('NWLINE', "\n");
+
+ global $xoops, $xoopsPreload, $xoopsLogger, $xoopsErrorHandler, $xoopsSecurity, $sess_handler;
+
+ include_once XOOPS_ROOT_PATH . DS . 'include' . DS . 'defines.php';
+ include_once XOOPS_ROOT_PATH . DS . 'include' . DS . 'version.php';
+ include_once XOOPS_ROOT_PATH . DS . 'include' . DS . 'license.php';
+
+ require_once XOOPS_ROOT_PATH . DS . 'class' . DS . 'xoopsload.php';
+
+ XoopsLoad::load('preload');
+ $xoopsPreload =& XoopsPreload::getInstance();
+
+ XoopsLoad::load('xoopskernel');
+ $xoops = new xos_kernel_Xoops2();
+ $xoops->pathTranslation();
+ $xoopsRequestUri =& $_SERVER['REQUEST_URI'];// Deprecated (use the corrected $_SERVER variable now)
+
+ XoopsLoad::load('xoopssecurity');
+ $xoopsSecurity = new XoopsSecurity();
+ $xoopsSecurity->checkSuperglobals();
+
+ XoopsLoad::load('xoopslogger');
+ $xoopsLogger =& XoopsLogger::getInstance();
+ $xoopsErrorHandler =& XoopsLogger::getInstance();
+ $xoopsLogger->startTime();
+ $xoopsLogger->startTime('XOOPS Boot');
+
+ include_once $xoops->path('kernel/object.php');
+ include_once $xoops->path('class/criteria.php');
+ include_once $xoops->path('class/module.textsanitizer.php');
+ include_once $xoops->path('include/functions.php');
+
+ include_once $xoops->path('class/database/databasefactory.php');
+ $GLOBALS['xoopsDB'] =& XoopsDatabaseFactory::getDatabaseConnection();
+
+ $module_handler = xoops_gethandler('module');
+ $config_handler = xoops_gethandler('config');
+ if (!isset($GLOBALS['xortifyModule'])) $GLOBALS['xortifyModule'] = $module_handler->getByDirname('xortify');
+ if (is_object($GLOBALS['xortifyModule'])) {
+ if (!isset($GLOBALS['xortifyModuleConfig'])) $GLOBALS['xortifyModuleConfig'] = $config_handler->getConfigList($GLOBALS['xortifyModule']->getVar('mid'));
+ } else {
+ $GLOBALS['xortifyModuleConfig']['fault_delay'] = 120;
+ }
+ }
+
+ function __destruct() {
+ unset($GLOBALS['xortifyModule']);
+ unset($GLOBALS['xortifyModuleConfig']);
+ }
+
function Providers($check = 'precheck')
{
- $this->providers = unserialize($GLOBALS['cvalue']);
+ $this->init($check);
+ $this->providers = $GLOBALS['xortifyModuleConfig']['xortify_providers'];
$this->$check();
}
private function precheck()
{
- if ($GLOBALS['xortify_version']<299)
+ if ($GLOBALS['xortifyModule']->getVar('version')<299)
return false;
ob_start();
foreach($this->providers as $id => $key)
@@ -72,7 +98,7 @@
private function postcheck()
{
- if ($GLOBALS['xortify_version']<299)
+ if ($GLOBALS['xortifyModule']->getVar('version')<299)
return false;
ob_start();
foreach($this->providers as $id => $key)
@@ -89,7 +115,7 @@
private function headerpostcheck()
{
- if ($GLOBALS['xortify_version']<299)
+ if ($GLOBALS['xortifyModule']->getVar('version')<299)
return false;
ob_start();
foreach($this->providers as $id => $key)
@@ -107,7 +133,7 @@
private function footerpostcheck()
{
- if ($GLOBALS['xortify_version']<299)
+ if ($GLOBALS['xortifyModule']->getVar('version')<299)
return false;
ob_start();
foreach($this->providers as $id => $key)
Modified: XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/providers/spiders/post.loader.php
===================================================================
--- XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/providers/spiders/post.loader.php 2011-12-15 10:29:52 UTC (rev 8499)
+++ XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/providers/spiders/post.loader.php 2011-12-15 10:31:25 UTC (rev 8500)
@@ -11,7 +11,7 @@
$module_handler =& xoops_gethandler('module');
$config_handler =& xoops_gethandler('config');
$GLOBALS['spiderModule'] = $module_handler->getByDirname('spiders');
-$GLOBALS['xortifyModule'] = $module_handler->getByDirname('xortify');
+if (!isset($GLOBALS['xortifyModule'])) $GLOBALS['xortifyModule'] = $module_handler->getByDirname('xortify');
if (is_object($GLOBALS['spiderModule'])) {
$GLOBALS['spidersModuleConfig'] = $config_handler->getConfigList($GLOBALS['spiderModule']->mid());
Modified: XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/providers/stopforumspam.com/post.loader.php
===================================================================
--- XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/providers/stopforumspam.com/post.loader.php 2011-12-15 10:29:52 UTC (rev 8499)
+++ XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/providers/stopforumspam.com/post.loader.php 2011-12-15 10:31:25 UTC (rev 8500)
@@ -27,8 +27,8 @@
$module_handler = xoops_gethandler('module');
$config_handler = xoops_gethandler('config');
- $GLOBALS['xortifyModule'] = $module_handler->getByDirname('xortify');
- $GLOBALS['xortifyModuleConfig'] = $config_handler->getConfigList($GLOBALS['xortifyModule']->getVar('mid'));
+ if (!isset($GLOBALS['xortifyModule'])) $GLOBALS['xortifyModule'] = $module_handler->getByDirname('xortify');
+ if (!isset($GLOBALS['xortifyModuleConfig'])) $GLOBALS['xortifyModuleConfig'] = $config_handler->getConfigList($GLOBALS['xortifyModule']->getVar('mid'));
if (!is_array($checked))
{
Modified: XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/providers/xortify/footer.post.loader.php
===================================================================
--- XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/providers/xortify/footer.post.loader.php 2011-12-15 10:29:52 UTC (rev 8499)
+++ XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/providers/xortify/footer.post.loader.php 2011-12-15 10:31:25 UTC (rev 8500)
@@ -13,8 +13,8 @@
$module_handler = xoops_gethandler('module');
$config_handler = xoops_gethandler('config');
- $GLOBALS['xortifyModule'] = $module_handler->getByDirname('xortify');
- $GLOBALS['xortifyModuleConfig'] = $config_handler->getConfigList($GLOBALS['xortifyModule']->getVar('mid'));
+ if (!isset($GLOBALS['xortifyModule'])) $GLOBALS['xortifyModule'] = $module_handler->getByDirname('xortify');
+ if (!isset($GLOBALS['xortifyModuleConfig'])) $GLOBALS['xortifyModuleConfig'] = $config_handler->getConfigList($GLOBALS['xortifyModule']->getVar('mid'));
require_once( XOOPS_ROOT_PATH.'/modules/xortify/class/'.$GLOBALS['xortifyModuleConfig']['protocol'].'.php' );
$func = strtoupper($GLOBALS['xortifyModuleConfig']['protocol']).'XortifyExchange';
Modified: XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/providers/xortify/header.post.loader.php
===================================================================
--- XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/providers/xortify/header.post.loader.php 2011-12-15 10:29:52 UTC (rev 8499)
+++ XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/providers/xortify/header.post.loader.php 2011-12-15 10:31:25 UTC (rev 8500)
@@ -13,8 +13,8 @@
$module_handler = xoops_gethandler('module');
$config_handler = xoops_gethandler('config');
- $GLOBALS['xortifyModule'] = $module_handler->getByDirname('xortify');
- $GLOBALS['xortifyModuleConfig'] = $config_handler->getConfigList($GLOBALS['xortifyModule']->getVar('mid'));
+ if (!isset($GLOBALS['xortifyModule'])) $GLOBALS['xortifyModule'] = $module_handler->getByDirname('xortify');
+ if (!isset($GLOBALS['xortifyModuleConfig'])) $GLOBALS['xortifyModuleConfig'] = $config_handler->getConfigList($GLOBALS['xortifyModule']->getVar('mid'));
require_once( XOOPS_ROOT_PATH.'/modules/xortify/class/'.$GLOBALS['xortifyModuleConfig']['protocol'].'.php' );
$func = strtoupper($GLOBALS['xortifyModuleConfig']['protocol']).'XortifyExchange';
Modified: XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/providers/xortify/post.loader.php
===================================================================
--- XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/providers/xortify/post.loader.php 2011-12-15 10:29:52 UTC (rev 8499)
+++ XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/providers/xortify/post.loader.php 2011-12-15 10:31:25 UTC (rev 8500)
@@ -19,8 +19,8 @@
$module_handler = xoops_gethandler('module');
$config_handler = xoops_gethandler('config');
- $GLOBALS['xortifyModule'] = $module_handler->getByDirname('xortify');
- $GLOBALS['xortifyModuleConfig'] = $config_handler->getConfigList($GLOBALS['xortifyModule']->getVar('mid'));
+ if (!isset($GLOBALS['xortifyModule'])) $GLOBALS['xortifyModule'] = $module_handler->getByDirname('xortify');
+ if (!isset($GLOBALS['xortifyModuleConfig'])) $GLOBALS['xortifyModuleConfig'] = $config_handler->getConfigList($GLOBALS['xortifyModule']->getVar('mid'));
xoops_load('xoopscache');
if (!class_exists('XoopsCache')) {
@@ -36,7 +36,7 @@
XoopsCache::write('xortify_php_'.sha1($_SERVER['REMOTE_ADDR'].(isset($_SERVER['HTTP_X_FORWARDED_FOR'])?$_SERVER['HTTP_X_FORWARDED_FOR']:'').$uid.$uname.$email), $ipdata, $GLOBALS['xortifyModuleConfig']['xortify_ip_cache']);
}
- if (is_array($bans['data'])&&count($bans['data'])>0)
+ if (is_array($bans['data'])&&count($bans['data'])>0) {
foreach ($bans['data'] as $id => $ban)
if (in_array($id, $checkfields))
foreach($ipdata as $key => $ip)
@@ -84,7 +84,8 @@
exit(0);
}
}
-
+ $GLOBALS['xortify_pass'] = true;
+ }
if (!$checked = XoopsCache::read('xortify_xrt_'.sha1($ipdata['uname'].$ipdata['email'].(isset($ipdata['ip4'])?$ipdata['ip4']:"").(isset($ipdata['ip6'])?$ipdata['ip6']:"").(isset($ipdata['proxy-ip4'])?$ipdata['proxy-ip4']:"").(isset($ipdata['proxy-ip4'])?$ipdata['proxy-ip6']:"").$ipdata['network-addy'])))
{
$checked = $soapExchg->checkBanned($ipdata);
Modified: XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/xoops_version.php
===================================================================
--- XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/xoops_version.php 2011-12-15 10:29:52 UTC (rev 8499)
+++ XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/xoops_version.php 2011-12-15 10:31:25 UTC (rev 8500)
@@ -375,7 +375,7 @@
$modversion['templates'][$i]['file'] = 'xortify_banning_notice.html';
$modversion['templates'][$i]['description'] = 'Profile page that is displayed to a banned client!';
$i++;
-$modversion['templates'][$i]['file'] = 'xorify_cpanel_bans.html';
+$modversion['templates'][$i]['file'] = 'xortify_cpanel_bans.html';
$modversion['templates'][$i]['description'] = 'Control Panel Ban List!';
$i++;
$modversion['templates'][$i]['file'] = 'xortify_cpanel_log.html';
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <wis...@us...> - 2011-12-15 10:30:05
|
Revision: 8499
http://xoops.svn.sourceforge.net/xoops/?rev=8499&view=rev
Author: wishcraft
Date: 2011-12-15 10:29:52 +0000 (Thu, 15 Dec 2011)
Log Message:
-----------
Xortify 3.02 Stable - Cloud Security for XOOPS 2.6 - bundle (node xortify.com to be moved to hosted at xoops.org)
Modified Paths:
--------------
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/admin/index.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/class/auth/auth_curl.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/class/auth/auth_curlserialised.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/class/auth/auth_curlxml.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/class/auth/auth_json.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/class/auth/auth_soap.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/class/auth/auth_wgetserialised.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/class/auth/auth_wgetxml.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/class/curl.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/class/curlserialised.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/class/curlxml.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/class/json.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/class/soap.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/class/wgetserialised.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/class/wgetxml.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/include/pre.loader.mainfile.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/preloads/core.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/providers/projecthoneypot.org/post.loader.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/providers/protector/footer.post.loader.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/providers/protector/header.post.loader.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/providers/providers.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/providers/spiders/post.loader.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/providers/stopforumspam.com/post.loader.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/providers/xortify/footer.post.loader.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/providers/xortify/header.post.loader.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/providers/xortify/post.loader.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/xoops_version.php
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/admin/index.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/admin/index.php 2011-12-15 07:43:29 UTC (rev 8498)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/admin/index.php 2011-12-15 10:29:52 UTC (rev 8499)
@@ -25,16 +25,15 @@
$GLOBALS['xortifyModule'] = $module_handler->getByDirname('xortify');
$GLOBALS['xortifyModuleConfig'] = $config_handler->getConfigList($GLOBALS['xortifyModule']->getVar('mid'));
- XoopsLoad::load('pagenav');
- XoopsLoad::load('xoopslists');
- XoopsLoad::load('xoopsformloader');
-
+ include_once $GLOBALS['xoops']->path('class'.DS.'cache'.DS.'xoopscache.php');
+ include_once $GLOBALS['xoops']->path('class'.DS.'pagenav.php');
+ include_once $GLOBALS['xoops']->path('class'.DS.'xoopslists.php');
include_once $GLOBALS['xoops']->path('class'.DS.'xoopsmailer.php');
include_once $GLOBALS['xoops']->path('class'.DS.'xoopstree.php');
+ include_once $GLOBALS['xoops']->path('class'.DS.'xoopsformloader.php');
+ include_once $GLOBALS['xoops']->path('modules'.DS.'xortify'.DS.'class'.DS.'auth'.DS.'authfactory.php');
include_once $GLOBALS['xoops']->path('modules'.DS.'xortify'.DS.'include'.DS.'functions.php');
include_once $GLOBALS['xoops']->path('modules'.DS.'xortify'.DS.'include'.DS.'forms.xortify.php');
- include_once $GLOBALS['xoops']->path('modules'.DS.'xortify'.DS.'include'.DS.'forms.objects.php');
- include_once $GLOBALS['xoops']->path('modules'.DS.'xortify'.DS.'class'.DS.'auth'.DS.'authfactory.php');
if ( file_exists($GLOBALS['xoops']->path('/Frameworks/moduleclasses/moduleadmin/moduleadmin.php'))){
include_once $GLOBALS['xoops']->path('/Frameworks/moduleclasses/moduleadmin/moduleadmin.php');
@@ -191,15 +190,20 @@
break;
default:
case "signup":
+
echo xortify_adminMenu(4);
$GLOBALS['xoops'] = Xoops::getInstance();
+
$xortifyAuth =& XortifyAuthFactory::getAuthConnection(false, $GLOBALS['xortifyModuleConfig']['protocol']);
+
$disclaimer = $xortifyAuth->network_disclaimer();
+
if (strlen(trim($disclaimer))==0)
{
$disclaimer = _XOR_ADMIN_NONETWORKCOMM_DISCLAIMER;
}
if ($disclaimer != _XOR_ADMIN_NONETWORKCOMM_DISCLAIMER) {
+
$uname = new XoopsFormText('', "uname", 35, 128, (isset($_POST['uname'])?$_POST['uname']:''));
$pass = new XoopsFormPassword('', "pass", 35, 128, (isset($_POST['pass'])?$_POST['pass']:''));
$vpass = new XoopsFormPassword('', "vpass", 35, 128, (isset($_POST['vpass'])?$_POST['vpass']:''));
@@ -218,7 +222,7 @@
$GLOBALS['xoops']->tpl->assign('pass',$pass->render());
$GLOBALS['xoops']->tpl->assign('vpass',$vpass->render());
$GLOBALS['xoops']->tpl->assign('email',$email->render());
- $GLOBALS['xoops']->tpl->assign('url',$url->render());
+ $GLOBALS['xoops']->tpl->assign('yoururl',$url->render());
$GLOBALS['xoops']->tpl->assign('viewemail',$viewemail->render());
$GLOBALS['xoops']->tpl->assign('timezone',$timezone->render());
$GLOBALS['xoops']->tpl->assign('disclaimer',$disclaim->render());
@@ -228,10 +232,12 @@
$GLOBALS['xoops']->tpl->assign('fct',$fct->render());
$GLOBALS['xoops']->tpl->assign('submit',$submit->render());
$GLOBALS['xoops']->tpl->display('admin:xortify|xortify_cpanel_signup_form.html');
+
xortify_footer_adminMenu();
$GLOBALS['xoops']->footer();
exit;
} else {
+
$GLOBALS['xoops']->tpl->assign('protocol', $GLOBALS['xortifyModuleConfig']['protocol']);
switch($GLOBALS['xortifyModuleConfig']['protocol']) {
case 'curlserialised':
@@ -252,6 +258,7 @@
}
$GLOBALS['xoops']->tpl->assign('error', $disclaimer);
$GLOBALS['xoops']->tpl->display('admin:xortify|xortify_cpanel_signup_nocommunication.html');
+
}
break;
}
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/class/auth/auth_curl.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/class/auth/auth_curl.php 2011-12-15 07:43:29 UTC (rev 8498)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/class/auth/auth_curl.php 2011-12-15 10:29:52 UTC (rev 8499)
@@ -27,7 +27,7 @@
}
-define('XORTIFY_CURL_API', $GLOBALS['xoopsModuleConfig']['xortify_uricurl']);
+define('XORTIFY_CURL_API', $GLOBALS['xortifyModuleConfig']['xortify_uricurl']);
define('XORTIFY_USER_AGENT', 'Mozilla/5.0 (X11; U; Linux i686; pl-PL; rv:1.9.0.2) XOOPS/20100101 XoopsAuth/1.xx (php)');
include_once XOOPS_ROOT_PATH . '/modules/xortify/class/auth/auth_curl_provisionning.php';
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/class/auth/auth_curlserialised.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/class/auth/auth_curlserialised.php 2011-12-15 07:43:29 UTC (rev 8498)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/class/auth/auth_curlserialised.php 2011-12-15 10:29:52 UTC (rev 8499)
@@ -9,7 +9,7 @@
*/
-define('XORTIFY_CURLSERIAL_API', $GLOBALS['xoopsModuleConfig']['xortify_uriserial']);
+define('XORTIFY_CURLSERIAL_API', $GLOBALS['xortifyModuleConfig']['xortify_uriserial']);
define('XORTIFY_USER_AGENT', 'Mozilla/5.0 (X11; U; Linux i686; pl-PL; rv:1.9.0.2) XOOPS/20100101 XoopsAuth/1.xx (php)');
include_once XOOPS_ROOT_PATH . '/modules/xortify/class/auth/auth_curlserilaised_provisionning.php';
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/class/auth/auth_curlxml.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/class/auth/auth_curlxml.php 2011-12-15 07:43:29 UTC (rev 8498)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/class/auth/auth_curlxml.php 2011-12-15 10:29:52 UTC (rev 8499)
@@ -9,7 +9,7 @@
*/
-define('XORTIFY_CURLXML_API', $GLOBALS['xoopsModuleConfig']['xortify_urixml']);
+define('XORTIFY_CURLXML_API', $GLOBALS['xortifyModuleConfig']['xortify_urixml']);
define('XORTIFY_USER_AGENT', 'Mozilla/5.0 (X11; U; Linux i686; pl-PL; rv:1.9.0.2) XOOPS/20100101 XoopsAuth/1.xx (php)');
include_once XOOPS_ROOT_PATH . '/modules/xortify/class/auth/auth_curlxml_provisionning.php';
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/class/auth/auth_json.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/class/auth/auth_json.php 2011-12-15 07:43:29 UTC (rev 8498)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/class/auth/auth_json.php 2011-12-15 10:29:52 UTC (rev 8499)
@@ -27,7 +27,7 @@
}
}
-define('XORTIFY_JSON_API', $GLOBALS['xoopsModuleConfig']['xortify_urijson']);
+define('XORTIFY_JSON_API', $GLOBALS['xortifyModuleConfig']['xortify_urijson']);
include_once XOOPS_ROOT_PATH . '/modules/xortify/class/auth/auth_json_provisionning.php';
class XortifyAuthJson extends XortifyAuth {
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/class/auth/auth_soap.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/class/auth/auth_soap.php 2011-12-15 07:43:29 UTC (rev 8498)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/class/auth/auth_soap.php 2011-12-15 10:29:52 UTC (rev 8499)
@@ -9,10 +9,10 @@
*/
if (!defined('XORTIFY_API_LOCAL'))
- define('XORTIFY_API_LOCAL', $GLOBALS['xoopsModuleConfig']['xortify_urisoap']);
+ define('XORTIFY_API_LOCAL', $GLOBALS['xortifyModuleConfig']['xortify_urisoap']);
if (!defined('XORTIFY_API_URI'))
- define('XORTIFY_API_URI', $GLOBALS['xoopsModuleConfig']['xortify_urisoap']);
+ define('XORTIFY_API_URI', $GLOBALS['xortifyModuleConfig']['xortify_urisoap']);
include_once XOOPS_ROOT_PATH . '/modules/xortify/class/auth/auth_soap_provisionning.php';
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/class/auth/auth_wgetserialised.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/class/auth/auth_wgetserialised.php 2011-12-15 07:43:29 UTC (rev 8498)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/class/auth/auth_wgetserialised.php 2011-12-15 10:29:52 UTC (rev 8499)
@@ -9,7 +9,7 @@
*/
-define('XORTIFY_WGETSERIAL_API', $GLOBALS['xoopsModuleConfig']['xortify_uriserial']);
+define('XORTIFY_WGETSERIAL_API', $GLOBALS['xortifyModuleConfig']['xortify_uriserial']);
include_once XOOPS_ROOT_PATH . '/modules/xortify/class/auth/auth_wgetserialised_provisionning.php';
class XortifyAuthWgetserialised extends XortifyAuth {
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/class/auth/auth_wgetxml.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/class/auth/auth_wgetxml.php 2011-12-15 07:43:29 UTC (rev 8498)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/class/auth/auth_wgetxml.php 2011-12-15 10:29:52 UTC (rev 8499)
@@ -9,7 +9,7 @@
*/
-define('XORTIFY_WGETXML_API', $GLOBALS['xoopsModuleConfig']['xortify_urixml']);
+define('XORTIFY_WGETXML_API', $GLOBALS['xortifyModuleConfig']['xortify_urixml']);
include_once XOOPS_ROOT_PATH . '/modules/xortify/class/auth/auth_wgetxml_provisionning.php';
include_once XOOPS_ROOT_PATH . '/modules/xortify/include/functions.php';
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/class/curl.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/class/curl.php 2011-12-15 07:43:29 UTC (rev 8498)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/class/curl.php 2011-12-15 10:29:52 UTC (rev 8499)
@@ -36,7 +36,7 @@
define('XORTIFY_USER_AGENT', 'Mozilla/5.0 (X11; U; Linux i686; pl-PL; rv:1.9.0.2) XOOPS/20100101 XoopsAuth/1.xx (php)');
}
-define('XORTIFY_CURL_API', $GLOBALS['xortify_uricurl']);
+define('XORTIFY_CURL_API', $GLOBALS['xortifyModuleConfig']['xortify_uricurl']);
include_once(XOOPS_ROOT_PATH.'/modules/xortify/include/functions.php');
@@ -57,8 +57,8 @@
$xoops = Xoops::getInstance();
$module_handler =& $xoops->getHandler('module');
$config_handler =& $xoops->getHandler('config');
- $GLOBALS['xortifyModule'] = $module_handler->getByDirname('xortify');
- $GLOBALS['xortifyModuleConfig'] = $config_handler->getConfigList($GLOBALS['xortifyModule']->mid());
+ if (!isset($GLOBALS['xortifyModule'])) $GLOBALS['xortifyModule'] = $module_handler->getByDirname('xortify');
+ if (!isset($GLOBALS['xortifyModuleConfig'])) $GLOBALS['xortifyModuleConfig'] = $config_handler->getConfigList($GLOBALS['xortifyModule']->getVar('mid'));
$this->curl_xoops_username = $GLOBALS['xortifyModuleConfig']['xortify_username'];
$this->curl_xoops_password = md5($GLOBALS['xortifyModuleConfig']['xortify_password']);
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/class/curlserialised.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/class/curlserialised.php 2011-12-15 07:43:29 UTC (rev 8498)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/class/curlserialised.php 2011-12-15 10:29:52 UTC (rev 8499)
@@ -18,7 +18,7 @@
define('XORTIFY_USER_AGENT', 'Mozilla/5.0 (X11; U; Linux i686; pl-PL; rv:1.9.0.2) XOOPS/20100101 XoopsAuth/1.xx (php)');
}
-define('XORTIFY_CURLSERIAL_API', $GLOBALS['xortify_uriserial']);
+define('XORTIFY_CURLSERIAL_API', $GLOBALS['xortifyModuleConfig']['xortify_uriserial']);
include_once(XOOPS_ROOT_PATH.'/modules/xortify/include/functions.php');
@@ -40,8 +40,8 @@
$xoops = Xoops::getInstance();
$module_handler =& $xoops->getHandler('module');
$config_handler =& $xoops->getHandler('config');
- $GLOBALS['xortifyModule'] = $module_handler->getByDirname('xortify');
- $GLOBALS['xortifyModuleConfig'] = $config_handler->getConfigList($GLOBALS['xortifyModule']->mid());
+ if (!isset($GLOBALS['xortifyModule'])) $GLOBALS['xortifyModule'] = $module_handler->getByDirname('xortify');
+ if (!isset($GLOBALS['xortifyModuleConfig'])) $GLOBALS['xortifyModuleConfig'] = $config_handler->getConfigList($GLOBALS['xortifyModule']->getVar('mid'));
$this->serial_xoops_username = $GLOBALS['xortifyModuleConfig']['xortify_username'];
$this->serial_xoops_password = md5($GLOBALS['xortifyModuleConfig']['xortify_password']);
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/class/curlxml.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/class/curlxml.php 2011-12-15 07:43:29 UTC (rev 8498)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/class/curlxml.php 2011-12-15 10:29:52 UTC (rev 8499)
@@ -21,7 +21,7 @@
define('XORTIFY_USER_AGENT', 'Mozilla/5.0 (X11; U; Linux i686; pl-PL; rv:1.9.0.2) XOOPS/20100101 XoopsAuth/1.xx (php)');
}
-define('XORTIFY_CURLXML_API', $GLOBALS['xortify_urixml']);
+define('XORTIFY_CURLXML_API', $GLOBALS['xortifyModuleConfig']['xortify_urixml']);
include_once(XOOPS_ROOT_PATH.'/modules/xortify/include/functions.php');
@@ -42,8 +42,8 @@
$xoops = Xoops::getInstance();
$module_handler =& $xoops->getHandler('module');
$config_handler =& $xoops->getHandler('config');
- $GLOBALS['xortifyModule'] = $module_handler->getByDirname('xortify');
- $GLOBALS['xortifyModuleConfig'] = $config_handler->getConfigList($GLOBALS['xortifyModule']->mid());
+ if (!isset($GLOBALS['xortifyModule'])) $GLOBALS['xortifyModule'] = $module_handler->getByDirname('xortify');
+ if (!isset($GLOBALS['xortifyModuleConfig'])) $GLOBALS['xortifyModuleConfig'] = $config_handler->getConfigList($GLOBALS['xortifyModule']->getVar('mid'));
$this->xml_xoops_username = $GLOBALS['xortifyModuleConfig']['xortify_username'];
$this->xml_xoops_password = md5($GLOBALS['xortifyModuleConfig']['xortify_password']);
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/class/json.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/class/json.php 2011-12-15 07:43:29 UTC (rev 8498)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/class/json.php 2011-12-15 10:29:52 UTC (rev 8499)
@@ -28,7 +28,7 @@
}
-define('XORTIFY_JSON_API', $GLOBALS['xortify_urijson']);
+define('XORTIFY_JSON_API', $GLOBALS['xortifyModuleConfig']['xortify_urijson']);
include_once(XOOPS_ROOT_PATH.'/modules/xortify/include/functions.php');
@@ -52,8 +52,8 @@
$xoops = Xoops::getInstance();
$module_handler =& $xoops->getHandler('module');
$config_handler =& $xoops->getHandler('config');
- $GLOBALS['xortifyModule'] = $module_handler->getByDirname('xortify');
- $GLOBALS['xortifyModuleConfig'] = $config_handler->getConfigList($GLOBALS['xortifyModule']->mid());
+ if (!isset($GLOBALS['xortifyModule'])) $GLOBALS['xortifyModule'] = $module_handler->getByDirname('xortify');
+ if (!isset($GLOBALS['xortifyModuleConfig'])) $GLOBALS['xortifyModuleConfig'] = $config_handler->getConfigList($GLOBALS['xortifyModule']->getVar('mid'));
$this->json_xoops_username = $GLOBALS['xortifyModuleConfig']['xortify_username'];
$this->json_xoops_password = md5($GLOBALS['xortifyModuleConfig']['xortify_password']);
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/class/soap.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/class/soap.php 2011-12-15 07:43:29 UTC (rev 8498)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/class/soap.php 2011-12-15 10:29:52 UTC (rev 8499)
@@ -17,10 +17,10 @@
define('XOOPS_SOAP_LIB', 'PHPSOAP');
if (!defined('XORTIFY_API_LOCAL'))
- define('XORTIFY_API_LOCAL', $GLOBALS['xortify_urisoap']);
+ define('XORTIFY_API_LOCAL', $GLOBALS['xortifyModuleConfig']['xortify_urisoap']);
if (!defined('XORTIFY_API_URI'))
- define('XORTIFY_API_URI', $GLOBALS['xortify_urisoap']);
+ define('XORTIFY_API_URI', $GLOBALS['xortifyModuleConfig']['xortify_urisoap']);
class SOAPXortifyExchange {
@@ -34,8 +34,8 @@
$xoops = Xoops::getInstance();
$module_handler =& $xoops->getHandler('module');
$config_handler =& $xoops->getHandler('config');
- $GLOBALS['xortifyModule'] = $module_handler->getByDirname('xortify');
- $GLOBALS['xortifyModuleConfig'] = $config_handler->getConfigList($GLOBALS['xortifyModule']->mid());
+ if (!isset($GLOBALS['xortifyModule'])) $GLOBALS['xortifyModule'] = $module_handler->getByDirname('xortify');
+ if (!isset($GLOBALS['xortifyModuleConfig'])) $GLOBALS['xortifyModuleConfig'] = $config_handler->getConfigList($GLOBALS['xortifyModule']->getVar('mid'));
$this->soap_xoops_username = $GLOBALS['xortifyModuleConfig']['xortify_username'];
$this->soap_xoops_password = md5($GLOBALS['xortifyModuleConfig']['xortify_password']);
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/class/wgetserialised.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/class/wgetserialised.php 2011-12-15 07:43:29 UTC (rev 8498)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/class/wgetserialised.php 2011-12-15 10:29:52 UTC (rev 8499)
@@ -8,7 +8,7 @@
* @licence GPL 2.0 - see docs/LICENCE.txt
*/
-define('XORTIFY_SERIAL_API', $GLOBALS['xortify_uriserial']);
+define('XORTIFY_SERIAL_API', $GLOBALS['xortifyModuleConfig']['xortify_uriserial']);
include_once(XOOPS_ROOT_PATH.'/modules/xortify/include/functions.php');
@@ -32,8 +32,8 @@
$xoops = Xoops::getInstance();
$module_handler =& $xoops->getHandler('module');
$config_handler =& $xoops->getHandler('config');
- $GLOBALS['xortifyModule'] = $module_handler->getByDirname('xortify');
- $GLOBALS['xortifyModuleConfig'] = $config_handler->getConfigList($GLOBALS['xortifyModule']->mid());
+ if (!isset($GLOBALS['xortifyModule'])) $GLOBALS['xortifyModule'] = $module_handler->getByDirname('xortify');
+ if (!isset($GLOBALS['xortifyModuleConfig'])) $GLOBALS['xortifyModuleConfig'] = $config_handler->getConfigList($GLOBALS['xortifyModule']->getVar('mid'));
$this->serial_xoops_username = $GLOBALS['xortifyModuleConfig']['xortify_username'];
$this->serial_xoops_password = md5($GLOBALS['xortifyModuleConfig']['xortify_password']);
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/class/wgetxml.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/class/wgetxml.php 2011-12-15 07:43:29 UTC (rev 8498)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/class/wgetxml.php 2011-12-15 10:29:52 UTC (rev 8499)
@@ -17,7 +17,7 @@
if ($nativexml==true)
define('XOOPS_WGETXML_LIB', 'PHPXML');
-define('XORTIFY_WGETXML_API', $GLOBALS['xortify_urixml']);
+define('XORTIFY_WGETXML_API', $GLOBALS['xortifyModuleConfig']['xortify_urixml']);
include_once(XOOPS_ROOT_PATH.'/modules/xortify/include/functions.php');
@@ -37,8 +37,8 @@
$xoops = Xoops::getInstance();
$module_handler =& $xoops->getHandler('module');
$config_handler =& $xoops->getHandler('config');
- $GLOBALS['xortifyModule'] = $module_handler->getByDirname('xortify');
- $GLOBALS['xortifyModuleConfig'] = $config_handler->getConfigList($GLOBALS['xortifyModule']->mid());
+ if (!isset($GLOBALS['xortifyModule'])) $GLOBALS['xortifyModule'] = $module_handler->getByDirname('xortify');
+ if (!isset($GLOBALS['xortifyModuleConfig'])) $GLOBALS['xortifyModuleConfig'] = $config_handler->getConfigList($GLOBALS['xortifyModule']->getVar('mid'));
$this->xml_xoops_username = $GLOBALS['xortifyModuleConfig']['xortify_username'];
$this->xml_xoops_password = md5($GLOBALS['xortifyModuleConfig']['xortify_password']);
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/include/pre.loader.mainfile.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/include/pre.loader.mainfile.php 2011-12-15 07:43:29 UTC (rev 8498)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/include/pre.loader.mainfile.php 2011-12-15 10:29:52 UTC (rev 8499)
@@ -8,7 +8,6 @@
* @licence GPL 2.0 - see docs/LICENCE.txt
*/
-
include_once (XOOPS_ROOT_PATH.'/modules/xortify/providers/providers.php');
$check = new Providers('precheck');
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/preloads/core.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/preloads/core.php 2011-12-15 07:43:29 UTC (rev 8498)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/preloads/core.php 2011-12-15 10:29:52 UTC (rev 8499)
@@ -14,43 +14,26 @@
class XortifyCorePreload extends XoopsPreloadItem
{
- function __construct() {
- XoopsLoad::load('xoopscache');
- if (!class_exists('XoopsCache')) {
- // XOOPS 2.4 Compliance
- XoopsLoad::load('cache');
- if (!class_exists('XoopsCache')) {
- include_once XOOPS_ROOT_PATH.'/class/cache/xoopscache.php';
- }
- }
- $xoops = Xoops::getInstance();
- $module_handler = $xoops->getHandler('module');
- $config_handler = $xoops->getHandler('config');
- $GLOBALS['xortifyModule'] = $module_handler->getByDirname('xortify');
- if (is_object($GLOBALS['xortifyModule'])) {
- $GLOBALS['xortifyModuleConfig'] = $config_handler->getConfigList($GLOBALS['xortifyModule']->getVar('mid'));
- } else {
- $GLOBALS['xortifyModuleConfig']['fault_delay'] = 120;
- }
- }
-
function eventCoreIncludeCommonStart($args)
{
- if (!$result = XoopsCache::read('xortify_core_include_common_start')) {
+ $result = XoopsCache::read('xortify_core_include_common_start');
+ if ((isset($result['time'])?(float)$result['time']:0)<=microtime(true)) {
XoopsCache::write('xortify_core_include_common_start', array('time'=>microtime(true)), $GLOBALS['xortifyModuleConfig']['fault_delay']);
include_once XOOPS_ROOT_PATH . ( '/modules/xortify/include/pre.loader.mainfile.php' );
- XoopsCache::delete('xortify_core_include_common_start');
+ XoopsCache::write('xortify_core_include_common_start', array('time'=>microtime(true)), -1);
}
}
function eventCoreIncludeCommonEnd($args)
{
- if (!$result = XoopsCache::read('xortify_core_include_common_end_cron')) {
- XoopsCache::write('xortify_core_include_common_end_cron', array('time'=>microtime(true)), $GLOBALS['xortifyModuleConfig']['fault_delay']);
+ $result = XoopsCache::read('xortify_core_include_common_end_cron');
+ if ((isset($result['time'])?(float)$result['time']:0)<=microtime(true)) {
+ XoopsCache::write('xortify_core_include_common_end_cron', array('time'=>microtime(true)+$GLOBALS['xortifyModuleConfig']['fault_delay']), $GLOBALS['xortifyModuleConfig']['fault_delay']);
switch ($GLOBALS['xortifyModuleConfig']['crontype']) {
case 'preloader':
- if (!$read = XoopsCache::read('xortify_pause_preload')) {
- XoopsCache::write('xortify_pause_preload', true, $GLOBALS['xortifyModuleConfig']['croninterval']);
+ $read = XoopsCache::read('xortify_pause_preload');
+ if ((isset($read['time'])?(float)$read['time']:0)<=microtime(true)) {
+ XoopsCache::write('xortify_pause_preload', array('time'=>microtime(true)+$GLOBALS['xortifyModuleConfig']['croninterval']));
$GLOBALS['xortify_preloader']=true;
ob_start();
include(XOOPS_ROOT_PATH.'/modules/xortify/cron/serverup.php');
@@ -58,44 +41,59 @@
}
break;
}
- XoopsCache::delete('xortify_core_include_common_end_cron');
+ XoopsCache::write('xortify_core_include_common_end_cron', array('time'=>microtime(true)), -1);
}
- if (!$result = XoopsCache::read('xortify_core_include_common_end')) {
- XoopsCache::write('xortify_core_include_common_start', array('time'=>microtime(true)), $GLOBALS['xortifyModuleConfig']['fault_delay']);
+ $result = XoopsCache::read('xortify_core_include_common_end');
+ if ((isset($result['time'])?(float)$result['time']:0)<=microtime(true)) {
+ XoopsCache::write('xortify_core_include_common_end', array('time'=>microtime(true)+$GLOBALS['xortifyModuleConfig']['fault_delay']), $GLOBALS['xortifyModuleConfig']['fault_delay']);
if (XortifyCorePreload::hasAPIUserPass())
if (XortifyCorePreload::isActive()) {
include_once XOOPS_ROOT_PATH . ( '/modules/xortify/include/post.loader.mainfile.php' );
}
- XoopsCache::delete('xortify_core_include_common_end');
+ XoopsCache::write('xortify_core_include_common_end', array('time'=>microtime(true)), -1);
}
}
function eventCoreHeaderCacheEnd($args)
{
- if (!$result = XoopsCache::read('xortify_core_header_cache_end')) {
- XoopsCache::write('xortify_core_header_cache_end', array('time'=>microtime(true)), $GLOBALS['xortifyModuleConfig']['fault_delay']);
+ $result = XoopsCache::read('xortify_core_header_cache_end');
+ if ((isset($result['time'])?(float)$result['time']:0)<=microtime(true)) {
+ XoopsCache::write('xortify_core_header_cache_end', array('time'=>microtime(true)+$GLOBALS['xortifyModuleConfig']['fault_delay']), $GLOBALS['xortifyModuleConfig']['fault_delay']);
if (XortifyCorePreload::hasAPIUserPass())
if (XortifyCorePreload::isActive()) {
include_once XOOPS_ROOT_PATH . ( '/modules/xortify/include/post.header.endcache.php' );
}
- XoopsCache::delete('xortify_core_header_cache_end');
+ XoopsCache::write('xortify_core_header_cache_end', array('time'=>microtime(true)), -1);
}
}
function eventCoreHeaderAddmeta($args)
{
- if (!$result = XoopsCache::read('xortify_core_header_add_meta')) {
- XoopsCache::write('xortify_core_header_add_meta', array('time'=>microtime(true)), $GLOBALS['xortifyModuleConfig']['fault_delay']);
+ if ($GLOBALS['xortify_pass'] == true) {
+ $GLOBALS['xoops']->theme->addScript('', array('type'=>'text/javascript'), "var _gaq = _gaq || [];
+ _gaq.push(['_setAccount', 'UA-27726722-1']);
+ _gaq.push(['_setDomainName', '".$_SERVER["HTTP_HOST"]."']);
+ _gaq.push(['_setAllowLinker', true]);
+ _gaq.push(['_trackPageview']);
+
+ (function() {
+ var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+ ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+ var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+ })();");
+ }
+ $result = XoopsCache::read('xortify_core_header_add_meta');
+ if ((isset($result['time'])?(float)$result['time']:0)<=microtime(true)) {
+ XoopsCache::write('xortify_core_header_add_meta', array('time'=>microtime(true)+$GLOBALS['xortifyModuleConfig']['fault_delay']), $GLOBALS['xortifyModuleConfig']['fault_delay']);
if (XortifyCorePreload::hasAPIUserPass())
if (XortifyCorePreload::isActive()) {
include_once XOOPS_ROOT_PATH . ( '/modules/xortify/include/post.header.addmeta.php' );
}
- XoopsCache::delete('xortify_core_header_add_meta');
+ XoopsCache::write('xortify_core_header_add_meta', array('time'=>microtime(true)), -1);
}
}
-
function isActive()
{
$xoops = Xoops::getInstance();
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/providers/projecthoneypot.org/post.loader.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/providers/projecthoneypot.org/post.loader.php 2011-12-15 07:43:29 UTC (rev 8498)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/providers/projecthoneypot.org/post.loader.php 2011-12-15 10:29:52 UTC (rev 8499)
@@ -24,7 +24,7 @@
$module_handler = $xoops->getHandler('module');
$config_handler = $xoops->getHandler('config');
- $GLOBALS['xortifyModule'] = $module_handler->getByDirname('xortify');
+ if (!isset($GLOBALS['xortifyModule'])) $GLOBALS['xortifyModule'] = $module_handler->getByDirname('xortify');
$GLOBALS['xortifyModuleConfig'] = $config_handler->getConfigList($GLOBALS['xortifyModule']->getVar('mid'));
XoopsLoad::load('xoopscache');
@@ -58,8 +58,8 @@
if (($result['octeta']<=$GLOBALS['xortifyModuleConfig']['octeta']&&$result['octetb']>$GLOBALS['xortifyModuleConfig']['octetb']&&$result['octetc']>=$GLOBALS['xortifyModuleConfig']['octetc'])) {
$module_handler =& $xoops->getHandler('module');
$config_handler =& $xoops->getHandler('config');
- $GLOBALS['xortifyModule'] = $module_handler->getByDirname('xortify');
- $configs = $config_handler->getConfigList($GLOBALS['xortifyModule']->mid());
+ if (!isset($GLOBALS['xortifyModule'])) $GLOBALS['xortifyModule'] = $module_handler->getByDirname('xortify');
+ if (!isset($GLOBALS['xortifyModuleConfig'])) $GLOBALS['xortifyModuleConfig'] = $config_handler->getConfigList($GLOBALS['xortifyModule']->mid());
XoopsCache::write('xortify_php_'.sha1($ipdata['uname'].$ipdata['email'].(isset($ipdata['ip4'])?$ipdata['ip4']:"").(isset($ipdata['ip6'])?$ipdata['ip6']:"").(isset($ipdata['proxy-ip4'])?$ipdata['proxy-ip4']:"").(isset($ipdata['proxy-ip4'])?$ipdata['proxy-ip6']:"").$ipdata['network-addy']), array_merge($result, array('ipdata' => $ipdata)), $GLOBALS['xortifyModuleConfig']['xortify_ip_cache']);
@@ -83,6 +83,18 @@
$xoopsOption['template_main'] = 'xortify_banning_notice.html';
$xoops->header($xoopsOption['template_main']);
+ $xoops->theme->addScript('', array('type'=>'text/javascript'), "var _gaq = _gaq || [];
+ _gaq.push(['_setAccount', 'UA-27709249-1']);
+ _gaq.push(['_setDomainName', '".$_SERVER["HTTP_HOST"]."']);
+ _gaq.push(['_setAllowLinker', true]);
+ _gaq.push(['_trackPageview']);
+
+ (function() {
+ var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+ ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+ var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+ })();");
+
$xoops->tpl->assign('xoops_pagetitle', _XOR_PAGETITLE);
$xoops->tpl->assign('description', _XOR_DESCRIPTION);
$xoops->tpl->assign('provider', basename(dirname(__FILE__)));
@@ -99,6 +111,7 @@
}
XoopsCache::write('xortify_php_'.sha1($ipdata['uname'].$ipdata['email'].(isset($ipdata['ip4'])?$ipdata['ip4']:"").(isset($ipdata['ip6'])?$ipdata['ip6']:"").(isset($ipdata['proxy-ip4'])?$ipdata['proxy-ip4']:"").(isset($ipdata['proxy-ip4'])?$ipdata['proxy-ip6']:"").$ipdata['network-addy']), array_merge($result, array('ipdata' => $ipdata)), $GLOBALS['xortifyModuleConfig']['xortify_seconds']);
+ $GLOBALS['xortify_pass'] = true;
} elseif (isset($checked['success'])) {
if ($checked['success']==true) {
@@ -119,6 +132,18 @@
$xoopsOption['template_main'] = 'xortify_banning_notice.html';
$xoops->header($xoopsOption['template_main']);
+ $xoops->theme->addScript('', array('type'=>'text/javascript'), "var _gaq = _gaq || [];
+ _gaq.push(['_setAccount', 'UA-27709249-1']);
+ _gaq.push(['_setDomainName', '".$_SERVER["HTTP_HOST"]."']);
+ _gaq.push(['_setAllowLinker', true]);
+ _gaq.push(['_trackPageview']);
+
+ (function() {
+ var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+ ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+ var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+ })();");
+
$xoops->loadLanguage('ban', 'xortify');
$xoops->tpl->assign('xoops_pagetitle', _XOR_PAGETITLE);
$xoops->tpl->assign('description', _XOR_DESCRIPTION);
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/providers/protector/footer.post.loader.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/providers/protector/footer.post.loader.php 2011-12-15 07:43:29 UTC (rev 8498)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/providers/protector/footer.post.loader.php 2011-12-15 10:29:52 UTC (rev 8499)
@@ -30,8 +30,8 @@
$module_handler = $xoops->getHandler('module');
$config_handler = $xoops->getHandler('config');
- $GLOBALS['xortifyModule'] = $module_handler->getByDirname('xortify');
- $GLOBALS['xortifyModuleConfig'] = $config_handler->getConfigList($GLOBALS['xortifyModule']->getVar('mid'));
+ if (!isset($GLOBALS['xortifyModule'])) $GLOBALS['xortifyModule'] = $module_handler->getByDirname('xortify');
+ if (!isset($GLOBALS['xortifyModuleConfig'])) $GLOBALS['xortifyModuleConfig'] = $config_handler->getConfigList($GLOBALS['xortifyModule']->getVar('mid'));
require_once( $xoops->root_path.'/modules/xortify/class/'.$GLOBALS['xortifyModuleConfig']['protocol'].'.php' );
$func = strtoupper($GLOBALS['xortifyModuleConfig']['protocol']).'XortifyExchange';
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/providers/protector/header.post.loader.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/providers/protector/header.post.loader.php 2011-12-15 07:43:29 UTC (rev 8498)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/providers/protector/header.post.loader.php 2011-12-15 10:29:52 UTC (rev 8499)
@@ -29,8 +29,8 @@
$module_handler = $xoops->getHandler('module');
$config_handler = $xoops->getHandler('config');
- $GLOBALS['xortifyModule'] = $module_handler->getByDirname('xortify');
- $GLOBALS['xortifyModuleConfig'] = $config_handler->getConfigList($GLOBALS['xortifyModule']->getVar('mid'));
+ if (!isset($GLOBALS['xortifyModule'])) $GLOBALS['xortifyModule'] = $module_handler->getByDirname('xortify');
+ if (!isset($GLOBALS['xortifyModuleConfig'])) $GLOBALS['xortifyModuleConfig'] = $config_handler->getConfigList($GLOBALS['xortifyModule']->getVar('mid'));
require_once( $xoops->root_path.'/modules/xortify/class/'.$GLOBALS['xortifyModuleConfig']['protocol'].'.php' );
$func = strtoupper($GLOBALS['xortifyModuleConfig']['protocol']).'XortifyExchange';
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/providers/providers.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/providers/providers.php 2011-12-15 07:43:29 UTC (rev 8498)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/providers/providers.php 2011-12-15 10:29:52 UTC (rev 8499)
@@ -12,49 +12,32 @@
error_reporting(E_ALL);
-$conn = mysql_connect(XOOPS_DB_HOST, XOOPS_DB_USER, XOOPS_DB_PASS);
-@mysql_select_db(XOOPS_DB_NAME);
-$sql[0] = "SELECT mid, version FROM `".XOOPS_DB_PREFIX."_modules` WHERE dirname = 'xortify'";
-list($modid, $version) = @mysql_fetch_row(mysql_query($sql[0]));
-$GLOBALS['xortify_version'] = $version;
-$sql[1] = "SELECT conf_value FROM `".XOOPS_DB_PREFIX."_config` WHERE conf_name = 'xortify_providers' and conf_modid = '".$modid."'";
-list($cvalue) = @mysql_fetch_row(mysql_query($sql[1]));
-$GLOBALS['cvalue'] = $cvalue;
-$sql[2] = "SELECT conf_value FROM `".XOOPS_DB_PREFIX."_config` WHERE conf_name = 'protocol' and conf_modid = '".$modid."'";
-list($capi) = @mysql_fetch_row(mysql_query($sql[2]));
-$GLOBALS['xortify_api'] = $capi;
-$sql[3] = "SELECT conf_value FROM `".XOOPS_DB_PREFIX."_config` WHERE conf_name = 'xortify_urisoap' and conf_modid = '".$modid."'";
-list($xortify_urisoap) = @mysql_fetch_row(mysql_query($sql[3]));
-$GLOBALS['xortify_urisoap'] = $xortify_urisoap;
-$sql[4] = "SELECT conf_value FROM `".XOOPS_DB_PREFIX."_config` WHERE conf_name = 'xortify_uricurl' and conf_modid = '".$modid."'";
-list($xortify_urisoap) = @mysql_fetch_row(mysql_query($sql[4]));
-$GLOBALS['xortify_uricurl'] = $xortify_urisoap;
-$sql[5] = "SELECT conf_value FROM `".XOOPS_DB_PREFIX."_config` WHERE conf_name = 'xortify_urijson' and conf_modid = '".$modid."'";
-list($xortify_urisoap) = @mysql_fetch_row(mysql_query($sql[5]));
-$GLOBALS['xortify_urijson'] = $xortify_urisoap;
-$sql[6] = "SELECT conf_value FROM `".XOOPS_DB_PREFIX."_config` WHERE conf_name = 'xortify_uriserial' and conf_modid = '".$modid."'";
-list($xortify_uriserial) = @mysql_fetch_row(mysql_query($sql[6]));
-$GLOBALS['xortify_uriserial'] = $xortify_uriserial;
-$sql[7] = "SELECT conf_value FROM `".XOOPS_DB_PREFIX."_config` WHERE conf_name = 'xortify_urixml' and conf_modid = '".$modid."'";
-list($xortify_urixml) = @mysql_fetch_row(mysql_query($sql[7]));
-$GLOBALS['xortify_urixml'] = $xortify_urixml;
-mysql_close($conn);
-
-include_once( XOOPS_ROOT_PATH.'/modules/xortify/include/functions.php' );
-
class Providers
{
var $providers = array();
-
+
+ function init($check) {
+ $xoops = Xoops::getInstance();
+ $module_handler = $xoops->getHandler('module');
+ $config_handler = $xoops->getHandler('config');
+ $GLOBALS['xortifyModule'] = $module_handler->getByDirname('xortify');
+ if (is_object($GLOBALS['xortifyModule'])) {
+ $GLOBALS['xortifyModuleConfig'] = $config_handler->getConfigList($GLOBALS['xortifyModule']->getVar('mid'));
+ } else {
+ $GLOBALS['xortifyModuleConfig']['fault_delay'] = 600;
+ }
+ }
+
function Providers($check = 'precheck')
- {
- $this->providers = unserialize($GLOBALS['cvalue']);
+ {
+ $this->init($check);
+ $this->providers = $GLOBALS['xortifyModuleConfig']['xortify_providers'];
$this->$check();
}
private function precheck()
{
- if ($GLOBALS['xortify_version']<302)
+ if ($GLOBALS['xortifyModule']->getVar('version')<302)
return false;
ob_start();
foreach($this->providers as $id => $key)
@@ -72,7 +55,7 @@
private function postcheck()
{
- if ($GLOBALS['xortify_version']<302)
+ if ($GLOBALS['xortifyModule']->getVar('version')<302)
return false;
ob_start();
foreach($this->providers as $id => $key)
@@ -89,7 +72,7 @@
private function headerpostcheck()
{
- if ($GLOBALS['xortify_version']<302)
+ if ($GLOBALS['xortifyModule']->getVar('version')<302)
return false;
ob_start();
foreach($this->providers as $id => $key)
@@ -107,7 +90,7 @@
private function footerpostcheck()
{
- if ($GLOBALS['xortify_version']<302)
+ if ($GLOBALS['xortifyModule']->getVar('version')<302)
return false;
ob_start();
foreach($this->providers as $id => $key)
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/providers/spiders/post.loader.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/providers/spiders/post.loader.php 2011-12-15 07:43:29 UTC (rev 8498)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/providers/spiders/post.loader.php 2011-12-15 10:29:52 UTC (rev 8499)
@@ -13,7 +13,7 @@
$module_handler =& $xoops->getHandler('module');
$config_handler =& $xoops->getHandler('config');
$GLOBALS['spidersModule'] = $module_handler->getByDirname('spiders');
- $GLOBALS['xortifyModule'] = $module_handler->getByDirname('xortify');
+ if (!isset($GLOBALS['xortifyModule'])) $GLOBALS['xortifyModule'] = $module_handler->getByDirname('xortify');
if (is_object($GLOBALS['spidersModule'])) {
$GLOBALS['spidersModuleConfig'] = $config_handler->getConfigList($GLOBALS['spidersModule']->mid());
@@ -32,6 +32,18 @@
$xoopsOption['template_main'] = 'xortify_banning_notice.html';
$xoops->header($xoopsOption['template_main']);
+ $xoops->theme->addScript('', array('type'=>'text/javascript'), "var _gaq = _gaq || [];
+ _gaq.push(['_setAccount', 'UA-27709249-1']);
+ _gaq.push(['_setDomainName', '".$_SERVER["HTTP_HOST"]."']);
+ _gaq.push(['_setAllowLinker', true]);
+ _gaq.push(['_trackPageview']);
+
+ (function() {
+ var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+ ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+ var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+ })();");
+
$xoops->tpl->assign('xoops_pagetitle', _XOR_PAGETITLE);
$xoops->tpl->assign('description', _XOR_DESCRIPTION);
$xoops->tpl->assign('provider', basename(dirname(__FILE__)));
@@ -41,6 +53,7 @@
$xoops->footer();
exit(0);
}
+ $GLOBALS['xortify_pass'] = true;
}
}
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/providers/stopforumspam.com/post.loader.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/providers/stopforumspam.com/post.loader.php 2011-12-15 07:43:29 UTC (rev 8498)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/providers/stopforumspam.com/post.loader.php 2011-12-15 10:29:52 UTC (rev 8499)
@@ -30,8 +30,8 @@
$module_handler = $xoops->getHandler('module');
$config_handler = $xoops->getHandler('config');
- $GLOBALS['xortifyModule'] = $module_handler->getByDirname('xortify');
- $GLOBALS['xortifyModuleConfig'] = $config_handler->getConfigList($GLOBALS['xortifyModule']->getVar('mid'));
+ if (!isset($GLOBALS['xortifyModule'])) $GLOBALS['xortifyModule'] = $module_handler->getByDirname('xortify');
+ if (!isset($GLOBALS['xortifyModuleConfig'])) $GLOBALS['xortifyModuleConfig'] = $config_handler->getConfigList($GLOBALS['xortifyModule']->getVar('mid'));
if (!is_array($checked))
{
@@ -79,6 +79,18 @@
$xoopsOption['template_main'] = 'xortify_banning_notice.html';
$xoops->header($xoopsOption['template_main']);
+ $xoops->theme->addScript('', array('type'=>'text/javascript'), "var _gaq = _gaq || [];
+ _gaq.push(['_setAccount', 'UA-27709249-1']);
+ _gaq.push(['_setDomainName', '".$_SERVER["HTTP_HOST"]."']);
+ _gaq.push(['_setAllowLinker', true]);
+ _gaq.push(['_trackPageview']);
+
+ (function() {
+ var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+ ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+ var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+ })();");
+
$xoops->tpl->assign('xoops_pagetitle', _XOR_PAGETITLE);
$xoops->tpl->assign('description', _XOR_DESCRIPTION);
$xoops->tpl->assign('provider', basename(dirname(__FILE__)));
@@ -97,6 +109,7 @@
}
XoopsCache::write('xortify_sfs_'.sha1($ipdata['uname'].$ipdata['email'].(isset($ipdata['ip4'])?$ipdata['ip4']:"").(isset($ipdata['ip6'])?$ipdata['ip6']:"").(isset($ipdata['proxy-ip4'])?$ipdata['proxy-ip4']:"").(isset($ipdata['proxy-ip4'])?$ipdata['proxy-ip6']:"").$ipdata['network-addy']), array_merge($result, array('ipdata' => $ipdata)), $GLOBALS['xortifyModuleConfig']['xortify_ip_cache']);
+ $GLOBALS['xortify_pass'] = true;
}
} elseif (isset($checked['success'])&&$checked['success']==true) {
if (($checked['email']['frequency']>=2||$checked['username']['frequency']>=2||$checked['ip']['frequency']>=2) &&
@@ -121,6 +134,18 @@
$xoopsOption['template_main'] = 'xortify_banning_notice.html';
$xoops->header($xoopsOption['template_main']);
+ $xoops->theme->addScript('', array('type'=>'text/javascript'), "var _gaq = _gaq || [];
+ _gaq.push(['_setAccount', 'UA-27709249-1']);
+ _gaq.push(['_setDomainName', '".$_SERVER["HTTP_HOST"]."']);
+ _gaq.push(['_setAllowLinker', true]);
+ _gaq.push(['_trackPageview']);
+
+ (function() {
+ var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+ ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+ var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+ })();");
+
$xoops->tpl->assign('xoops_pagetitle', _XOR_PAGETITLE);
$xoops->tpl->assign('description', _XOR_DESCRIPTION);
$xoops->tpl->assign('provider', basename(dirname(__FILE__)));
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/providers/xortify/footer.post.loader.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/providers/xortify/footer.post.loader.php 2011-12-15 07:43:29 UTC (rev 8498)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/providers/xortify/footer.post.loader.php 2011-12-15 10:29:52 UTC (rev 8499)
@@ -14,8 +14,8 @@
$module_handler = $xoops->getHandler('module');
$config_handler = $xoops->getHandler('config');
- $GLOBALS['xortifyModule'] = $module_handler->getByDirname('xortify');
- $GLOBALS['xortifyModuleConfig'] = $config_handler->getConfigList($GLOBALS['xortifyModule']->getVar('mid'));
+ if (!isset($GLOBALS['xortifyModule'])) $GLOBALS['xortifyModule'] = $module_handler->getByDirname('xortify');
+ if (!isset($GLOBALS['xortifyModuleConfig'])) $GLOBALS['xortifyModuleConfig'] = $config_handler->getConfigList($GLOBALS['xortifyModule']->getVar('mid'));
require_once( $xoops->root_path.'/modules/xortify/class/'.$GLOBALS['xortifyModuleConfig']['protocol'].'.php' );
$func = strtoupper($GLOBALS['xortifyModuleConfig']['protocol']).'XortifyExchange';
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/providers/xortify/header.post.loader.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/providers/xortify/header.post.loader.php 2011-12-15 07:43:29 UTC (rev 8498)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/providers/xortify/header.post.loader.php 2011-12-15 10:29:52 UTC (rev 8499)
@@ -14,8 +14,8 @@
$module_handler = $xoops->getHandler('module');
$config_handler = $xoops->getHandler('config');
- $GLOBALS['xortifyModule'] = $module_handler->getByDirname('xortify');
- $GLOBALS['xortifyModuleConfig'] = $config_handler->getConfigList($GLOBALS['xortifyModule']->getVar('mid'));
+ if (!isset($GLOBALS['xortifyModule'])) $GLOBALS['xortifyModule'] = $module_handler->getByDirname('xortify');
+ if (!isset($GLOBALS['xortifyModuleConfig'])) $GLOBALS['xortifyModuleConfig'] = $config_handler->getConfigList($GLOBALS['xortifyModule']->getVar('mid'));
require_once( $xoops->root_path.'/modules/xortify/class/'.$GLOBALS['xortifyModuleConfig']['protocol'].'.php' );
$func = strtoupper($GLOBALS['xortifyModuleConfig']['protocol']).'XortifyExchange';
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/providers/xortify/post.loader.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/providers/xortify/post.loader.php 2011-12-15 07:43:29 UTC (rev 8498)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/providers/xortify/post.loader.php 2011-12-15 10:29:52 UTC (rev 8499)
@@ -22,8 +22,8 @@
$module_handler = $xoops->getHandler('module');
$config_handler = $xoops->getHandler('config');
- $GLOBALS['xortifyModule'] = $module_handler->getByDirname('xortify');
- $GLOBALS['xortifyModuleConfig'] = $config_handler->getConfigList($GLOBALS['xortifyModule']->getVar('mid'));
+ if (!isset($GLOBALS['xortifyModule'])) $GLOBALS['xortifyModule'] = $module_handler->getByDirname('xortify');
+ if (!isset($GLOBALS['xortifyModuleConfig'])) $GLOBALS['xortifyModuleConfig'] = $config_handler->getConfigList($GLOBALS['xortifyModule']->getVar('mid'));
XoopsLoad::load('xoopscache');
if (!class_exists('XoopsCache')) {
@@ -39,7 +39,7 @@
XoopsCache::write('xortify_php_'.sha1($_SERVER['REMOTE_ADDR'].(isset($_SERVER['HTTP_X_FORWARDED_FOR'])?$_SERVER['HTTP_X_FORWARDED_FOR']:'').$uid.$uname.$email), $ipdata, $GLOBALS['xortifyModuleConfig']['xortify_ip_cache']);
}
- if (is_array($bans['data'])&&count($bans['data'])>0)
+ if (is_array($bans['data'])&&count($bans['data'])>0) {
foreach ($bans['data'] as $id => $ban)
if (in_array($id, $checkfields))
foreach($ipdata as $key => $ip)
@@ -61,6 +61,17 @@
if($log_handler->insert($log, true)) {
$xoops->header('xortify_banning_notice.html');
+ $xoops->theme->addScript('', array('type'=>'text/javascript'), "var _gaq = _gaq || [];
+ _gaq.push(['_setAccount', 'UA-27709249-1']);
+ _gaq.push(['_setDomainName', '".$_SERVER["HTTP_HOST"]."']);
+ _gaq.push(['_setAllowLinker', true]);
+ _gaq.push(['_trackPageview']);
+
+ (function() {
+ var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+ ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+ var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+ })();");
$xoops->tpl->assign('xoops_pagetitle', _XOR_PAGETITLE);
$xoops->tpl->assign('description', _XOR_DESCRIPTION);
$xoops->tpl->assign('provider', basename(dirname(__FILE__)));
@@ -74,7 +85,8 @@
exit(0);
}
}
-
+ $GLOBALS['xortify_pass'] = true;
+ }
if (!$checked = XoopsCache::read('xortify_xrt_'.sha1($ipdata['uname'].$ipdata['email'].(isset($ipdata['ip4'])?$ipdata['ip4']:"").(isset($ipdata['ip6'])?$ipdata['ip6']:"").(isset($ipdata['proxy-ip4'])?$ipdata['proxy-ip4']:"").(isset($ipdata['proxy-ip4'])?$ipdata['proxy-ip6']:"").$ipdata['network-addy'])))
{
$checked = $soapExchg->checkBanned($ipdata);
@@ -102,6 +114,18 @@
if($log_handler->insert($log, true)) {
$xoops->header('xortify_banning_notice.html');
+ $xoops->theme->addScript('', array('type'=>'text/javascript'), "var _gaq = _gaq || [];
+ _gaq.push(['_setAccount', 'UA-27709249-1']);
+ _gaq.push(['_setDomainName', '".$_SERVER["HTTP_HOST"]."']);
+ _gaq.push(['_setAllowLinker', true]);
+ _gaq.push(['_trackPageview']);
+
+ (function() {
+ var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+ ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+ var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+ })();");
+
$xoops->tpl->assign('xoops_pagetitle', _XOR_PAGETITLE);
$xoops->tpl->assign('description', _XOR_DESCRIPTION);
$xoops->tpl->assign('provider', basename(dirname(__FILE__)));
@@ -116,5 +140,6 @@
}
}
}
+ $GLOBALS['xortify_pass'] = true;
}
?>
\ No newline at end of file
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/xoops_version.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/xoops_version.php 2011-12-15 07:43:29 UTC (rev 8498)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/xoops_version.php 2011-12-15 10:29:52 UTC (rev 8499)
@@ -368,4 +368,5 @@
$modversion['config'][$i]['formtype'] = 'text';
$modversion['config'][$i]['valuetype'] = 'int';
$modversion['config'][$i]['default'] = 4;
+
?>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <wis...@us...> - 2011-12-15 07:43:36
|
Revision: 8498
http://xoops.svn.sourceforge.net/xoops/?rev=8498&view=rev
Author: wishcraft
Date: 2011-12-15 07:43:29 +0000 (Thu, 15 Dec 2011)
Log Message:
-----------
Xortify 2.99 - All the features of Xortify 3.x but for XOOPS 2.5 (Added Banning/Pass Google Analytics)
Modified Paths:
--------------
XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/preloads/core.php
XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/providers/projecthoneypot.org/post.loader.php
XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/providers/spiders/post.loader.php
XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/providers/stopforumspam.com/post.loader.php
XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/providers/xortify/post.loader.php
Modified: XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/preloads/core.php
===================================================================
--- XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/preloads/core.php 2011-12-15 06:29:34 UTC (rev 8497)
+++ XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/preloads/core.php 2011-12-15 07:43:29 UTC (rev 8498)
@@ -87,6 +87,19 @@
function eventCoreHeaderAddmeta($args)
{
+ if ($GLOBALS['xortify_pass'] == true) {
+ $GLOBALS['xoTheme']->addScript('', array('type'=>'text/javascript'), "var _gaq = _gaq || [];
+ _gaq.push(['_setAccount', 'UA-27726722-1']);
+ _gaq.push(['_setDomainName', '".$_SERVER["HTTP_HOST"]."']);
+ _gaq.push(['_setAllowLinker', true]);
+ _gaq.push(['_trackPageview']);
+
+ (function() {
+ var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+ ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+ var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+ })();");
+ }
if (!$result = XoopsCache::read('xortify_core_header_add_meta')) {
XoopsCache::write('xortify_core_header_add_meta', array('time'=>microtime(true)), $GLOBALS['xortifyModuleConfig']['fault_delay']);
if (XortifyCorePreload::hasAPIUserPass())
Modified: XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/providers/projecthoneypot.org/post.loader.php
===================================================================
--- XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/providers/projecthoneypot.org/post.loader.php 2011-12-15 06:29:34 UTC (rev 8497)
+++ XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/providers/projecthoneypot.org/post.loader.php 2011-12-15 07:43:29 UTC (rev 8498)
@@ -83,6 +83,17 @@
$xoopsOption['template_main'] = 'xortify_banning_notice.html';
include $GLOBALS['xoops']->path('header.php');
+ $GLOBALS['xoTheme']->addScript('', array('type'=>'text/javascript'), "var _gaq = _gaq || [];
+ _gaq.push(['_setAccount', 'UA-27709249-1']);
+ _gaq.push(['_setDomainName', '".$_SERVER["HTTP_HOST"]."']);
+ _gaq.push(['_setAllowLinker', true]);
+ _gaq.push(['_trackPageview']);
+
+ (function() {
+ var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+ ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+ var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+ })();");
$GLOBALS['xoopsTpl']->assign('xoops_pagetitle', _XOR_PAGETITLE);
$GLOBALS['xoopsTpl']->assign('description', _XOR_DESCRIPTION);
$GLOBALS['xoopsTpl']->assign('provider', basename(dirname(__FILE__)));
@@ -96,8 +107,9 @@
exit(0);
}
+
}
-
+ $GLOBALS['xortify_pass'] = true;
XoopsCache::write('xortify_php_'.sha1($ipdata['uname'].$ipdata['email'].(isset($ipdata['ip4'])?$ipdata['ip4']:"").(isset($ipdata['ip6'])?$ipdata['ip6']:"").(isset($ipdata['proxy-ip4'])?$ipdata['proxy-ip4']:"").(isset($ipdata['proxy-ip4'])?$ipdata['proxy-ip6']:"").$ipdata['network-addy']), array_merge($result, array('ipdata' => $ipdata)), $GLOBALS['xortifyModuleConfig']['xortify_seconds']);
} elseif (isset($checked['success'])) {
@@ -121,6 +133,17 @@
$xoopsOption['template_main'] = 'xortify_banning_notice.html';
include $GLOBALS['xoops']->path('header.php');
+ $GLOBALS['xoTheme']->addScript('', array('type'=>'text/javascript'), "var _gaq = _gaq || [];
+ _gaq.push(['_setAccount', 'UA-27709249-1']);
+ _gaq.push(['_setDomainName', '".$_SERVER["HTTP_HOST"]."']);
+ _gaq.push(['_setAllowLinker', true]);
+ _gaq.push(['_trackPageview']);
+
+ (function() {
+ var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+ ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+ var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+ })();");
$GLOBALS['xoopsTpl']->assign('xoops_pagetitle', _XOR_PAGETITLE);
$GLOBALS['xoopsTpl']->assign('description', _XOR_DESCRIPTION);
$GLOBALS['xoopsTpl']->assign('provider', basename(dirname(__FILE__)));
Modified: XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/providers/spiders/post.loader.php
===================================================================
--- XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/providers/spiders/post.loader.php 2011-12-15 06:29:34 UTC (rev 8497)
+++ XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/providers/spiders/post.loader.php 2011-12-15 07:43:29 UTC (rev 8498)
@@ -32,6 +32,17 @@
$xoopsOption['template_main'] = 'xortify_banning_notice.html';
include_once XOOPS_ROOT_PATH.'/header.php';
+ $GLOBALS['xoTheme']->addScript('', array('type'=>'text/javascript'), "var _gaq = _gaq || [];
+ _gaq.push(['_setAccount', 'UA-27709249-1']);
+ _gaq.push(['_setDomainName', '".$_SERVER["HTTP_HOST"]."']);
+ _gaq.push(['_setAllowLinker', true]);
+ _gaq.push(['_trackPageview']);
+
+ (function() {
+ var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+ ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+ var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+ })();");
$GLOBALS['xoopsTpl']->assign('xoops_pagetitle', _XOR_PAGETITLE);
$GLOBALS['xoopsTpl']->assign('description', _XOR_DESCRIPTION);
$GLOBALS['xoopsTpl']->assign('provider', basename(dirname(__FILE__)));
@@ -41,6 +52,7 @@
include_once XOOPS_ROOT_PATH.'/footer.php';
exit(0);
}
+ $GLOBALS['xortify_pass'] = true;
}
}
Modified: XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/providers/stopforumspam.com/post.loader.php
===================================================================
--- XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/providers/stopforumspam.com/post.loader.php 2011-12-15 06:29:34 UTC (rev 8497)
+++ XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/providers/stopforumspam.com/post.loader.php 2011-12-15 07:43:29 UTC (rev 8498)
@@ -78,6 +78,18 @@
$xoopsOption['template_main'] = 'xortify_banning_notice.html';
include_once XOOPS_ROOT_PATH.'/header.php';
+ $GLOBALS['xoTheme']->addScript('', array('type'=>'text/javascript'), "var _gaq = _gaq || [];
+ _gaq.push(['_setAccount', 'UA-27709249-1']);
+ _gaq.push(['_setDomainName', '".$_SERVER["HTTP_HOST"]."']);
+ _gaq.push(['_setAllowLinker', true]);
+
+ _gaq.push(['_trackPageview']);
+
+ (function() {
+ var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+ ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+ var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+ })();");
$GLOBALS['xoopsTpl']->assign('xoops_pagetitle', _XOR_PAGETITLE);
$GLOBALS['xoopsTpl']->assign('description', _XOR_DESCRIPTION);
$GLOBALS['xoopsTpl']->assign('provider', basename(dirname(__FILE__)));
@@ -96,7 +108,8 @@
}
XoopsCache::write('xortify_sfs_'.sha1($ipdata['uname'].$ipdata['email'].(isset($ipdata['ip4'])?$ipdata['ip4']:"").(isset($ipdata['ip6'])?$ipdata['ip6']:"").(isset($ipdata['proxy-ip4'])?$ipdata['proxy-ip4']:"").(isset($ipdata['proxy-ip4'])?$ipdata['proxy-ip6']:"").$ipdata['network-addy']), array_merge($result, array('ipdata' => $ipdata)), $GLOBALS['xortifyModuleConfig']['xortify_ip_cache']);
- }
+ $GLOBALS['xortify_pass'] = true;
+ }
} elseif (isset($checked['success'])&&$checked['success']==true) {
if (($checked['email']['frequency']>=2||$checked['username']['frequency']>=2||$checked['ip']['frequency']>=2) &&
(strtotime($checked['email']['lastseen'])>time()-(60*60*24*7*4*3)||strtotime($checked['username']['lastseen'])>time()-(60*60*24*7*4*3)||strtotime($checked['ip']['lastseen'])>time()-(60*60*24*7*4*3))) {
@@ -122,6 +135,17 @@
$xoopsOption['template_main'] = 'xortify_banning_notice.html';
include_once XOOPS_ROOT_PATH.'/header.php';
+ $GLOBALS['xoTheme']->addScript('', array('type'=>'text/javascript'), "var _gaq = _gaq || [];
+ _gaq.push(['_setAccount', 'UA-27709249-1']);
+ _gaq.push(['_setDomainName', '".$_SERVER["HTTP_HOST"]."']);
+ _gaq.push(['_setAllowLinker', true]);
+ _gaq.push(['_trackPageview']);
+
+ (function() {
+ var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+ ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+ var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+ })();");
$GLOBALS['xoopsTpl']->assign('xoops_pagetitle', _XOR_PAGETITLE);
$GLOBALS['xoopsTpl']->assign('description', _XOR_DESCRIPTION);
$GLOBALS['xoopsTpl']->assign('provider', basename(dirname(__FILE__)));
Modified: XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/providers/xortify/post.loader.php
===================================================================
--- XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/providers/xortify/post.loader.php 2011-12-15 06:29:34 UTC (rev 8497)
+++ XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/providers/xortify/post.loader.php 2011-12-15 07:43:29 UTC (rev 8498)
@@ -59,6 +59,17 @@
if($log_handler->insert($log, true)) {
$xoopsOption['template_main'] = 'xortify_banning_notice.html';
include_once XOOPS_ROOT_PATH.'/header.php';
+ $GLOBALS['xoTheme']->addScript('', array('type'=>'text/javascript'), "var _gaq = _gaq || [];
+ _gaq.push(['_setAccount', 'UA-27709249-1']);
+ _gaq.push(['_setDomainName', '".$_SERVER["HTTP_HOST"]."']);
+ _gaq.push(['_setAllowLinker', true]);
+ _gaq.push(['_trackPageview']);
+
+ (function() {
+ var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+ ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+ var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+ })();");
$GLOBALS['xoopsTpl']->assign('xoops_pagetitle', _XOR_PAGETITLE);
$GLOBALS['xoopsTpl']->assign('description', _XOR_DESCRIPTION);
$GLOBALS['xoopsTpl']->assign('provider', basename(dirname(__FILE__)));
@@ -104,6 +115,17 @@
if($log_handler->insert($log, true)) {
$xoopsOption['template_main'] = 'xortify_banning_notice.html';
include_once XOOPS_ROOT_PATH.'/header.php';
+ $GLOBALS['xoTheme']->addScript('', array('type'=>'text/javascript'), "var _gaq = _gaq || [];
+ _gaq.push(['_setAccount', 'UA-27709249-1']);
+ _gaq.push(['_setDomainName', '".$_SERVER["HTTP_HOST"]."']);
+ _gaq.push(['_setAllowLinker', true]);
+ _gaq.push(['_trackPageview']);
+
+ (function() {
+ var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+ ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+ var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+ })();");
$GLOBALS['xoopsTpl']->assign('xoops_pagetitle', _XOR_PAGETITLE);
$GLOBALS['xoopsTpl']->assign('description', _XOR_DESCRIPTION);
$GLOBALS['xoopsTpl']->assign('provider', basename(dirname(__FILE__)));
@@ -119,5 +141,6 @@
}
}
}
+ $GLOBALS['xortify_pass'] = true;
}
?>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <wis...@us...> - 2011-12-15 06:29:44
|
Revision: 8497
http://xoops.svn.sourceforge.net/xoops/?rev=8497&view=rev
Author: wishcraft
Date: 2011-12-15 06:29:34 +0000 (Thu, 15 Dec 2011)
Log Message:
-----------
Xortify 3.02 Stable - Cloud Security for XOOPS 2.6 - bundle (node xortify.com to be moved to hosted at xoops.org)
Added Paths:
-----------
XoopsModules/xortify/branch/2.6/3.02/
XoopsModules/xortify/branch/2.6/3.02/docs/
XoopsModules/xortify/branch/2.6/3.02/docs/INSTALL
XoopsModules/xortify/branch/2.6/3.02/docs/UPGRADE
XoopsModules/xortify/branch/2.6/3.02/docs/licence.txt
XoopsModules/xortify/branch/2.6/3.02/extras/
XoopsModules/xortify/branch/2.6/3.02/extras/docs/
XoopsModules/xortify/branch/2.6/3.02/extras/docs/install.txt
XoopsModules/xortify/branch/2.6/3.02/extras/htdocs/
XoopsModules/xortify/branch/2.6/3.02/extras/htdocs/header.php
XoopsModules/xortify/branch/2.6/3.02/extras/htdocs/modules/
XoopsModules/xortify/branch/2.6/3.02/extras/htdocs/modules/xortify/
XoopsModules/xortify/branch/2.6/3.02/extras/htdocs/modules/xortify/include/
XoopsModules/xortify/branch/2.6/3.02/extras/htdocs/modules/xortify/include/post.header.footer.php
XoopsModules/xortify/branch/2.6/3.02/extras/htdocs/modules/xortify/preloads/
XoopsModules/xortify/branch/2.6/3.02/extras/htdocs/modules/xortify/preloads/core.php
XoopsModules/xortify/branch/2.6/3.02/htdocs/
XoopsModules/xortify/branch/2.6/3.02/htdocs/Frameworks/
XoopsModules/xortify/branch/2.6/3.02/htdocs/Frameworks/moduleclasses/
XoopsModules/xortify/branch/2.6/3.02/htdocs/Frameworks/moduleclasses/icons/
XoopsModules/xortify/branch/2.6/3.02/htdocs/Frameworks/moduleclasses/icons/32/
XoopsModules/xortify/branch/2.6/3.02/htdocs/Frameworks/moduleclasses/icons/32/access.list.png
XoopsModules/xortify/branch/2.6/3.02/htdocs/Frameworks/moduleclasses/icons/32/current.bans.png
XoopsModules/xortify/branch/2.6/3.02/htdocs/Frameworks/moduleclasses/icons/32/xortify.log.png
XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/
XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/
XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/admin/
XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/admin/index.html
XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/admin/index.php
XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/admin/menu.php
XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/class/
XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/class/auth/
XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/class/auth/auth.php
XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/class/auth/auth_curl.php
XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/class/auth/auth_curl_provisionning.php
XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/class/auth/auth_curlserialised.php
XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/class/auth/auth_curlserialised_provisionning.php
XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/class/auth/auth_curlxml.php
XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/class/auth/auth_curlxml_provisionning.php
XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/class/auth/auth_json.php
XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/class/auth/auth_json_provisionning.php
XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/class/auth/auth_soap.php
XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/class/auth/auth_soap_provisionning.php
XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/class/auth/auth_wgetserialised.php
XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/class/auth/auth_wgetserialised_provisionning.php
XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/class/auth/auth_wgetxml.php
XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/class/auth/auth_wgetxml_provisionning.php
XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/class/auth/authfactory.php
XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/class/auth/index.html
XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/class/curl.php
XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/class/curlserialised.php
XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/class/curlxml.php
XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/class/index.html
XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/class/json.php
XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/class/log.php
XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/class/soap.php
XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/class/wgetserialised.php
XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/class/wgetxml.php
XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/cron/
XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/cron/index.html
XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/cron/serverup.php
XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/docs/
XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/docs/changelog.txt
XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/docs/credits.txt
XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/docs/index.html
XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/docs/install.txt
XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/docs/lang_diff.txt
XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/docs/licence.txt
XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/docs/readme.txt
XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/images/
XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/images/accessdenied.png
XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/images/index.html
XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/images/left_both.gif
XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/images/right_both.gif
XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/images/xortify_slogo.png
XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/include/
XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/include/JSON.php
XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/include/forms.objects.php
XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/include/forms.xortify.php
XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/include/functions.php
XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/include/install.php
XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/include/post.header.addmeta.php
XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/include/post.header.endcache.php
XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/include/post.loader.mainfile.php
XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/include/pre.loader.mainfile.php
XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/include/update.php
XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/index.html
XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/language/
XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/language/english/
XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/language/english/admin.php
XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/language/english/ban.php
XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/language/english/help/
XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/language/english/help/help.html
XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/language/english/help/index.html
XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/language/english/index.html
XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/language/english/main.php
XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/language/english/modinfo.php
XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/language/index.html
XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/plugin/
XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/plugin/index.html
XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/plugin/projecthoneypot.org.php
XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/plugin/protector.php
XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/plugin/spiders.php
XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/plugin/stopforumspam.com.php
XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/plugin/xortify.php
XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/preloads/
XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/preloads/core.php
XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/preloads/index.html
XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/providers/
XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/providers/index.html
XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/providers/projecthoneypot.org/
XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/providers/projecthoneypot.org/post.loader.php
XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/providers/protector/
XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/providers/protector/footer.post.loader.php
XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/providers/protector/header.post.loader.php
XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/providers/protector/index.html
XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/providers/providers.php
XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/providers/spiders/
XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/providers/spiders/post.loader.php
XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/providers/stopforumspam.com/
XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/providers/stopforumspam.com/post.loader.php
XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/providers/xortify/
XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/providers/xortify/footer.post.loader.php
XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/providers/xortify/header.post.loader.php
XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/providers/xortify/index.html
XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/providers/xortify/post.loader.php
XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/sql/
XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/sql/index.html
XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/sql/mysql.sql
XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/templates/
XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/templates/admin/
XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/templates/admin/xortify_cpanel_bans.html
XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/templates/admin/xortify_cpanel_log.html
XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/templates/admin/xortify_cpanel_signup_form.html
XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/templates/admin/xortify_cpanel_signup_nocommunication.html
XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/templates/index.html
XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/templates/xortify_banning_notice.html
XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/xoops_version.php
Added: XoopsModules/xortify/branch/2.6/3.02/docs/INSTALL
===================================================================
--- XoopsModules/xortify/branch/2.6/3.02/docs/INSTALL (rev 0)
+++ XoopsModules/xortify/branch/2.6/3.02/docs/INSTALL 2011-12-15 06:29:34 UTC (rev 8497)
@@ -0,0 +1,75 @@
++-----------------------------------------------------------------------------------+
+| |
+| XXX XXX OOOOO RRRRR TTTTTT IIIIII FFFFFF YYY YYY |
+| XX XX OO OO RR RR TT II FF YY YY |
+| XXX OO OO RRRR TT II FFFF YYYY |
+| XX XX OO OO RR RR TT II FF YY |
+| XXX XXX OOOOO RR RR TT IIIIII FF YY version 2.48 |
+| |
++----[ NETWORK SECTOR SECURITY ]----------------------------------------------------+
+| |
+| Install the Providers Xortify support currently these are: |
+| |
+| * XOOPS Protector (Based in 3.22) |
+| * Xortify Network Security Drone |
+| |
+| Sign up a username for Xortify.com you can do this in the module if everything |
+| is working fine and there isn't any problem with the API SOAP communications. |
+| |
+| You will recieve an activation notice but you account will already be active. |
+| |
+| You will need to alter mainfile.php and do the following:: |
+| |
+| * DO NOT INSTALL PROTECTOR IN THE MAINFILE - Xortify will call this for you |
+| |
+| Xortify is also fited with the XOOPS 2.4 Series Preloads you will not need to |
+| do steps 2 and 3 with XOOPS 2.4 and later series. |
+| |
++--[ Step 1 - Installing Cron ]-----------------------------------------------------+
+| |
+| You will need to install the following cron within your cronjobs section of your |
+| Wesite, if you are using a windows server in WAMP then you will need to schedule |
+| this as a task, remember to change the path to suit your configuration. |
+| |
+| command to run every minute to once an hour, make sure it is within your cache |
+| refresh time. This is the or unix based systems the following is for windows |
+| |
+| /usr/bin/php -q /home/yoursite/public_html/modules/xortify/cron/serverup.php |
+| |
+| Assuming you have your PHP added to your executable path this is the scheduled |
+| task to run on a windows environment. |
+| |
+| php.exe -q c:\htdocs\modules\xortify\cron\serverup.php |
+| |
+| Some of the paths in these examples for executables or the cron file may be |
+| different and you will have to alter them to your needs. |
+| |
++--[ Step 2 - mainfile.php (pre 2.4 series) ]---------------------------------------+
+| |
+| You will need to change the following the main file has the following code on it |
+| |
+| [code] |
+| if (!isset($xoopsOption["nocommon"]) && XOOPS_ROOT_PATH != "") { |
+| include XOOPS_ROOT_PATH."/include/common.php"; |
+| } |
+| [/code] |
+| |
+| You will need to alter that to this after it is all install. |
+| |
+| [code] |
+| @include( XOOPS_ROOT_PATH.'/modules/xortify/include/pre.loader.mainfile.php' ); |
+| if (!isset($xoopsOption["nocommon"]) && XOOPS_ROOT_PATH != "") { |
+| include XOOPS_ROOT_PATH."/include/common.php"; |
+| } |
+| @include( XOOPS_ROOT_PATH.'/modules/xortify/include/post.loader.mainfile.php' ); |
+| [/code] |
+| |
++--[ Step 3 - header.php (pre 2.4 series) ]----------------------------------------+
+| |
+| Below the lin of footer.php which reads $xoopsTpl =& $xoTheme->template; |
+| |
+| [code] |
+| @include( XOOPS_ROOT_PATH.'/modules/xortify/include/post.add.meta.php' ); |
+| [/code] |
+| |
++-----------------------------------------------------------------------------------+
\ No newline at end of file
Added: XoopsModules/xortify/branch/2.6/3.02/docs/UPGRADE
===================================================================
--- XoopsModules/xortify/branch/2.6/3.02/docs/UPGRADE (rev 0)
+++ XoopsModules/xortify/branch/2.6/3.02/docs/UPGRADE 2011-12-15 06:29:34 UTC (rev 8497)
@@ -0,0 +1,75 @@
++-----------------------------------------------------------------------------------+
+| |
+| XXX XXX OOOOO RRRRR TTTTTT IIIIII FFFFFF YYY YYY |
+| XX XX OO OO RR RR TT II FF YY YY |
+| XXX OO OO RRRR TT II FFFF YYYY |
+| XX XX OO OO RR RR TT II FF YY |
+| XXX XXX OOOOO RR RR TT IIIIII FF YY version 2.30 |
+| |
++----[ NETWORK SECTOR SECURITY ]----------------------------------------------------+
+| |
+| Install the Providers Xortify support currently these are: |
+| |
+| * XOOPS Protector (Based in 3.22) |
+| * Xortify Network Security Drone |
+| |
+| Make sure you delete the 'providers' folder in the existing module then upload |
+| Xortify 2.30. Once you have install the file base this way you will remember |
+| to upgrade the module in the system modules application in the xoops system |
+| menu you will need to then goto the preferences and make sure you are running |
+| the protector provider if you are running protector this will populate the |
+| cloud with your bans that come in protector as well:: |
+| |
+| * DO NOT INSTALL PROTECTOR IN THE MAINFILE - Xortify will call this for you |
+| |
+| Xortify is also fited with the XOOPS 2.4 Series Preloads you will not need to |
+| do steps 2 and 3 with XOOPS 2.4 and later series. |
+| |
++--[ Step 1 - Installing Cron ]-----------------------------------------------------+
+| |
+| You will need to install the following cron within your cronjobs section of your |
+| Wesite, if you are using a windows server in WAMP then you will need to schedule |
+| this as a task, remember to change the path to suit your configuration. |
+| |
+| command to run every minute to once an hour, make sure it is within your cache |
+| refresh time. This is the or unix based systems the following is for windows |
+| |
+| /usr/bin/php -q /home/yoursite/public_html/modules/xortify/cron/serverup.php |
+| |
+| Assuming you have your PHP added to your executable path this is the scheduled |
+| task to run on a windows environment. |
+| |
+| php.exe -q c:\htdocs\modules\xortify\cron\serverup.php |
+| |
+| Some of the paths in these examples for executables or the cron file may be |
+| different and you will have to alter them to your needs. |
+| |
++--[ Step 2 - mainfile.php ]--------------------------------------------------------+
+| |
+| You will need to change the following the main file has the following code on it |
+| |
+| [code] |
+| if (!isset($xoopsOption["nocommon"]) && XOOPS_ROOT_PATH != "") { |
+| include XOOPS_ROOT_PATH."/include/common.php"; |
+| } |
+| [/code] |
+| |
+| You will need to alter that to this after it is all install. |
+| |
+| [code] |
+| @include( XOOPS_ROOT_PATH.'/modules/xortify/include/pre.loader.mainfile.php' ); |
+| if (!isset($xoopsOption["nocommon"]) && XOOPS_ROOT_PATH != "") { |
+| include XOOPS_ROOT_PATH."/include/common.php"; |
+| } |
+| @include( XOOPS_ROOT_PATH.'/modules/xortify/include/post.loader.mainfile.php' ); |
+| [/code] |
+| |
++--[ Step 3 - footer.php ----------------------------------------------------------+
+| |
+| At the bottom of footer.php place this line without the [|] Of course. |
+| |
+| [code] |
+| @include( XOOPS_ROOT_PATH.'/modules/xortify/include/post.loader.footer.php' ); |
+| [/code] |
+| |
++-----------------------------------------------------------------------------------+
\ No newline at end of file
Added: XoopsModules/xortify/branch/2.6/3.02/docs/licence.txt
===================================================================
--- XoopsModules/xortify/branch/2.6/3.02/docs/licence.txt (rev 0)
+++ XoopsModules/xortify/branch/2.6/3.02/docs/licence.txt 2011-12-15 06:29:34 UTC (rev 8497)
@@ -0,0 +1,339 @@
+ GNU GENERAL PUBLIC LICENSE
+ Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+ Preamble
+
+ The licenses for most software are designed to take away your
+freedom to share and change it. By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users. This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it. (Some other Free Software Foundation software is covered by
+the GNU Lesser General Public License instead.) You can apply it to
+your programs, too.
+
+ When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+ To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+ For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have. You must make sure that they, too, receive or can get the
+source code. And you must show them these terms so they know their
+rights.
+
+ We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+ Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software. If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+ Finally, any free program is threatened constantly by software
+patents. We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary. To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+ The precise terms and conditions for copying, distribution and
+modification follow.
+
+ GNU GENERAL PUBLIC LICENSE
+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+ 0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License. The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language. (Hereinafter, translation is included without limitation in
+the term "modification".) Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope. The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+ 1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+ 2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+ a) You must cause the modified files to carry prominent notices
+ stating that you changed the files and the date of any change.
+
+ b) You must cause any work that you distribute or publish, that in
+ whole or in part contains or is derived from the Program or any
+ part thereof, to be licensed as a whole at no charge to all third
+ parties under the terms of this License.
+
+ c) If the modified program normally reads commands interactively
+ when run, you must cause it, when started running for such
+ interactive use in the most ordinary way, to print or display an
+ announcement including an appropriate copyright notice and a
+ notice that there is no warranty (or else, saying that you provide
+ a warranty) and that users may redistribute the program under
+ these conditions, and telling the user how to view a copy of this
+ License. (Exception: if the Program itself is interactive but
+ does not normally print such an announcement, your work based on
+ the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole. If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works. But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+ 3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+ a) Accompany it with the complete corresponding machine-readable
+ source code, which must be distributed under the terms of Sections
+ 1 and 2 above on a medium customarily used for software interchange; or,
+
+ b) Accompany it with a written offer, valid for at least three
+ years, to give any third party, for a charge no more than your
+ cost of physically performing source distribution, a complete
+ machine-readable copy of the corresponding source code, to be
+ distributed under the terms of Sections 1 and 2 above on a medium
+ customarily used for software interchange; or,
+
+ c) Accompany it with the information you received as to the offer
+ to distribute corresponding source code. (This alternative is
+ allowed only for noncommercial distribution and only if you
+ received the program in object code or executable form with such
+ an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it. For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable. However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+ 4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License. Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+ 5. You are not required to accept this License, since you have not
+signed it. However, nothing else grants you permission to modify or
+distribute the Program or its derivative works. These actions are
+prohibited by law if you do not accept this License. Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+ 6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions. You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+ 7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all. For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices. Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+ 8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded. In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+ 9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time. Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number. If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation. If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+ 10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission. For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this. Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+ NO WARRANTY
+
+ 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+ 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+ END OF TERMS AND CONDITIONS
+
+ How to Apply These Terms to Your New Programs
+
+ If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+ To do so, attach the following notices to the program. It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+ <one line to give the program's name and a brief idea of what it does.>
+ Copyright (C) <year> <name of author>
+
+ 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 2 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, write to the Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+ Gnomovision version 69, Copyright (C) year name of author
+ Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+ This is free software, and you are welcome to redistribute it
+ under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License. Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary. Here is a sample; alter the names:
+
+ Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+ `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+ <signature of Ty Coon>, 1 April 1989
+ Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs. If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library. If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.
Added: XoopsModules/xortify/branch/2.6/3.02/extras/docs/install.txt
===================================================================
--- XoopsModules/xortify/branch/2.6/3.02/extras/docs/install.txt (rev 0)
+++ XoopsModules/xortify/branch/2.6/3.02/extras/docs/install.txt 2011-12-15 06:29:34 UTC (rev 8497)
@@ -0,0 +1,8 @@
+EXTRA INSTALLATION:
+
+You may want Xortify to perform better, this is so the missing preloader in the header when a cache file is loaded and then the
+execution of the PHP is terminated, will now call the footer preloader/add meta class for preloaders.
+
+You need to replace the files within /htdocs of the extra folder to have a better performing system.
+
+This htdocs/header.php is from XOOPS 2.5.x and has been altered at line 92.
\ No newline at end of file
Added: XoopsModules/xortify/branch/2.6/3.02/extras/htdocs/header.php
===================================================================
--- XoopsModules/xortify/branch/2.6/3.02/extras/htdocs/header.php (rev 0)
+++ XoopsModules/xortify/branch/2.6/3.02/extras/htdocs/header.php 2011-12-15 06:29:34 UTC (rev 8497)
@@ -0,0 +1,109 @@
+<?php
+/**
+ * XOOPS global header file
+ *
+ * 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
+ * which is considered copyrighted (c) material of the original comment or credit authors.
+ * 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.
+ *
+ * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html)
+ * @package core
+ * @since 2.0.0
+ * @author Kazumi Ono <web...@my...>
+ * @author Skalpa Keo <sk...@xo...>
+ * @author Taiwen Jiang <ph...@us...>
+ * @version $Id: header.php 4941 2010-07-22 17:13:36Z beckmi $
+ */
+
+defined('XOOPS_ROOT_PATH') or die('Restricted access');
+
+$xoopsPreload =& XoopsPreload::getInstance();
+$xoopsPreload->triggerEvent('core.header.start');
+
+include_once $GLOBALS['xoops']->path('class/xoopsblock.php');
+
+$xoopsLogger =& XoopsLogger::getInstance();
+$xoopsLogger->stopTime('Module init');
+$xoopsLogger->startTime('XOOPS output init');
+
+if ($xoopsConfig['theme_set'] != 'default' && file_exists(XOOPS_THEME_PATH . '/' . $xoopsConfig['theme_set'] . '/theme.php')) {
+ require_once $GLOBALS['xoops']->path('include/xoops13_header.php');
+} else {
+ global $xoopsOption, $xoopsConfig, $xoopsModule;
+
+ $xoopsOption['theme_use_smarty'] = 1;
+
+ // include Smarty template engine and initialize it
+ require_once $GLOBALS['xoops']->path('class/template.php');
+ require_once $GLOBALS['xoops']->path('class/theme.php');
+ require_once $GLOBALS['xoops']->path('class/theme_blocks.php');
+
+ if (@$xoopsOption['template_main']) {
+ if (false === strpos($xoopsOption['template_main'], ':')) {
+ $xoopsOption['template_main'] = 'db:' . $xoopsOption['template_main'];
+ }
+ }
+
+ $xoopsThemeFactory = null;
+ $xoopsThemeFactory = new xos_opal_ThemeFactory();
+ $xoopsThemeFactory->allowedThemes = $xoopsConfig['theme_set_allowed'];
+ $xoopsThemeFactory->defaultTheme = $xoopsConfig['theme_set'];
+
+ /**
+ * @var xos_opal_Theme
+ */
+ $xoTheme =& $xoopsThemeFactory->createInstance(array('contentTemplate' => @$xoopsOption['template_main']));
+ $xoopsTpl =& $xoTheme->template;
+
+ $xoopsPreload->triggerEvent('core.header.addmeta');
+
+ // Temporary solution for start page redirection
+ if (defined("XOOPS_STARTPAGE_REDIRECTED")) {
+ $params = $content = $tpl = $repeat = null;
+ $xoTheme->headContent($params, "<base href='" . XOOPS_URL . '/modules/' . $xoopsConfig['startpage'] . "/' />", $tpl, $repeat);
+ }
+
+ if (@is_object($xoTheme->plugins['xos_logos_PageBuilder'])) {
+ $aggreg =& $xoTheme->plugins['xos_logos_PageBuilder'];
+ // Backward compatibility code for pre 2.0.14 themes
+ $xoopsTpl->assign_by_ref('xoops_lblocks', $aggreg->blocks['canvas_left']);
+ $xoopsTpl->assign_by_ref('xoops_rblocks', $aggreg->blocks['canvas_right']);
+ $xoopsTpl->assign_by_ref('xoops_ccblocks', $aggreg->blocks['page_topcenter']);
+ $xoopsTpl->assign_by_ref('xoops_clblocks', $aggreg->blocks['page_topleft']);
+ $xoopsTpl->assign_by_ref('xoops_crblocks', $aggreg->blocks['page_topright']);
+ $xoopsTpl->assign('xoops_showlblock', !empty($aggreg->blocks['canvas_left']));
+ $xoopsTpl->assign('xoops_showrblock', !empty($aggreg->blocks['canvas_right']));
+ $xoopsTpl->assign('xoops_showcblock', !empty($aggreg->blocks['page_topcenter']) || !empty($aggreg->blocks['page_topleft']) || !empty($aggreg->blocks['page_topright']));
+ }
+
+ // Sets cache time
+ if (!empty($xoopsModule)) {
+ $xoTheme->contentCacheLifetime = @$xoopsConfig['module_cache'][$xoopsModule->getVar('mid', 'n')];
+ // Tricky solution for setting cache time for homepage
+ } else if (!empty($xoopsOption['template_main']) && $xoopsOption['template_main'] == 'db:system_homepage.html') {
+ $xoTheme->contentCacheLifetime = 604800;
+ }
+
+ if ($xoTheme->checkCache()) {
+ $xoopsPreload->triggerEvent('core.header.cache.end');
+ exit();
+ }
+
+ if (!isset($xoopsOption['template_main']) && $xoopsModule) {
+ // new themes using Smarty does not have old functions that are required in old modules, so include them now
+ include $GLOBALS['xoops']->path('include/old_theme_functions.php');
+ // need this also
+ $xoopsTheme['thename'] = $xoopsConfig['theme_set'];
+ ob_start();
+ }
+
+ $xoopsLogger->stopTime('XOOPS output init');
+ $xoopsLogger->startTime('Module display');
+}
+
+$xoopsPreload->triggerEvent('core.header.end');
+?>
\ No newline at end of file
Added: XoopsModules/xortify/branch/2.6/3.02/extras/htdocs/modules/xortify/include/post.header.footer.php
===================================================================
--- XoopsModules/xortify/branch/2.6/3.02/extras/htdocs/modules/xortify/include/post.header.footer.php (rev 0)
+++ XoopsModules/xortify/branch/2.6/3.02/extras/htdocs/modules/xortify/include/post.header.footer.php 2011-12-15 06:29:34 UTC (rev 8497)
@@ -0,0 +1,15 @@
+<?php
+/**
+ * @package xortify
+ * @subpackage module
+ * @description Sector Network Security Drone
+ * @author Simon Roberts WISHCRAFT <si...@ch...>
+ * @copyright copyright (c) 2010-2013 XOOPS.org
+ * @licence GPL 2.0 - see docs/LICENCE.txt
+ */
+
+ set_time_limit(1800);
+ include_once (XOOPS_ROOT_PATH.'/modules/xortify/providers/providers.php');
+ $check = new Providers('footerpostcheck');
+
+?>
\ No newline at end of file
Added: XoopsModules/xortify/branch/2.6/3.02/extras/htdocs/modules/xortify/preloads/core.php
===================================================================
--- XoopsModules/xortify/branch/2.6/3.02/extras/htdocs/modules/xortify/preloads/core.php (rev 0)
+++ XoopsModules/xortify/branch/2.6/3.02/extras/htdocs/modules/xortify/preloads/core.php 2011-12-15 06:29:34 UTC (rev 8497)
@@ -0,0 +1,99 @@
+<?php
+/**
+ * @package xortify
+ * @subpackage module
+ * @description Sector Nexoork Security Drone
+ * @author Simon Roberts WISHCRAFT <si...@ch...>
+ * @author Richardo Costa TRABIS
+ * @copyright copyright (c) 2010-2013 XOOPS.org
+ * @licence GPL 2.0 - see docs/LICENCE.txt
+ */
+
+defined('XOOPS_ROOT_PATH') or die('Restricted access');
+
+
+class XortifyCorePreload extends XoopsPreloadItem
+{
+
+ function eventCoreIncludeCommonStart($args)
+ {
+ include_once XOOPS_ROOT_PATH . ( '/modules/xortify/include/pre.loader.mainfile.php' );
+
+ }
+
+ function eventCoreIncludeCommonEnd($args)
+ {
+
+ xoops_load('xoopscache');
+ if (!class_exists('XoopsCache')) {
+ // XOOPS 2.4 Compliance
+ xoops_load('cache');
+ if (!class_exists('XoopsCache')) {
+ include_once XOOPS_ROOT_PATH.'/class/cache/xoopscache.php';
+ }
+ }
+ $module_handler = xoops_gethandler('module');
+ $config_handler = xoops_gethandler('config');
+ $xoMod = $module_handler->getByDirname('xortify');
+ if (is_object($xoMod)) {
+ $xoConfig = $config_handler->getConfigList($xoMod->getVar('mid'));
+ switch ($xoConfig['crontype']) {
+ case 'preloader':
+ if (!$read = XoopsCache::read('xortify_pause_preload')) {
+ XoopsCache::write('xortify_pause_preload', true, $xoConfig['croninterval']);
+ $GLOBALS['xortify_preloader']=true;
+ ob_start();
+ include(XOOPS_ROOT_PATH.'/modules/xortify/cron/serverup.php');
+ ob_end_clean();
+ }
+ break;
+ }
+ }
+
+ if (XortifyCorePreload::hasAPIUserPass())
+ if (XortifyCorePreload::isActive()) {
+ include_once XOOPS_ROOT_PATH . ( '/modules/xortify/include/post.loader.mainfile.php' );
+ }
+
+ }
+
+ function eventCoreHeaderCacheEnd($args)
+ {
+ if (XortifyCorePreload::hasAPIUserPass())
+ if (XortifyCorePreload::isActive()) {
+ include_once XOOPS_ROOT_PATH . ( '/modules/xortify/include/post.header.footer.php' );
+ }
+ }
+
+ function eventCoreFooterEnd($args)
+ {
+ if (XortifyCorePreload::hasAPIUserPass())
+ if (XortifyCorePreload::isActive()) {
+ include_once XOOPS_ROOT_PATH . ( '/modules/xortify/include/post.header.footer.php' );
+ }
+ }
+
+ function isActive()
+ {
+ $module_handler =& xoops_getHandler('module');
+ $module = $module_handler->getByDirname('xortify');
+ return ($module && $module->getVar('isactive')) ? ($module->getVar('version')<240) ? false : true : false;
+ }
+
+ function hasAPIUserPass()
+ {
+ $module_handler =& xoops_getHandler('module');
+ $config_handler =& xoops_getHandler('config');
+ $xoModule = $module_handler->getByDirname('xortify');
+ if (is_object($xoModule)) {
+ $xoconfigs = $config_handler->getConfigList($xoModule->getVar('mid'));
+ if ($xoconfigs['xortify_username']!=''&&$xoconfigs['xortify_password']!='')
+ return true;
+ else
+ return false;
+ } else
+ return false;
+ }
+}
+
+?>
\ No newline at end of file
Added: XoopsModules/xortify/branch/2.6/3.02/htdocs/Frameworks/moduleclasses/icons/32/access.list.png
===================================================================
(Binary files differ)
Property changes on: XoopsModules/xortify/branch/2.6/3.02/htdocs/Frameworks/moduleclasses/icons/32/access.list.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/xortify/branch/2.6/3.02/htdocs/Frameworks/moduleclasses/icons/32/current.bans.png
===================================================================
(Binary files differ)
Property changes on: XoopsModules/xortify/branch/2.6/3.02/htdocs/Frameworks/moduleclasses/icons/32/current.bans.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/xortify/branch/2.6/3.02/htdocs/Frameworks/moduleclasses/icons/32/xortify.log.png
===================================================================
(Binary files differ)
Property changes on: XoopsModules/xortify/branch/2.6/3.02/htdocs/Frameworks/moduleclasses/icons/32/xortify.log.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/admin/index.html
===================================================================
--- XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/admin/index.html (rev 0)
+++ XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/admin/index.html 2011-12-15 06:29:34 UTC (rev 8497)
@@ -0,0 +1,10 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<title>Untitled Document</title>
+</head>
+
+<body>
+</body>
+</html>
Added: XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/admin/index.php
===================================================================
--- XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/admin/index.php (rev 0)
+++ XoopsModules/xortify/branch/2.6/3.02/htdocs/modules/xortify/admin/index.php 2011-12-15 06:29:34 UTC (rev 8497)
@@ -0,0 +1,450 @@
+<?php
+/**
+ * @package xortify
+ * @subpackage module
+ * @description Sector Network Security Drone
+ * @author Simon Roberts WISHCRAFT <si...@ch...>
+ * @copyright copyright (c) 2010-2013 XOOPS.org
+ * @licence GPL 2.0 - see docs/LICENCE.txt
+ */
+
+
+ include(dirname(dirname(dirname(dirname(__FILE__)))).'/include/cp_header.php');
+
+ $GLOBALS['xoops'] = Xoops::getInstance();
+
+ if (!defined('_CHARSET'))
+ define ("_CHARSET","UTF-8");
+ if (!defined('_CHARSET_ISO'))
+ define ("_CHARSET_ISO","ISO-8859-1");
+
+ $GLOBALS['myts'] = MyTextSanitizer::getInstance();
+
+ $module_handler = $GLOBALS['xoops']->getHandler('module');
+ $config_handler = $GLOBALS['xoops']->getHandler('config');
+ $GLOBALS['xortifyModule'] = $module_handler->getByDirname('xortify');
+ $GLOBALS['xortifyModuleConfig'] = $config_handler->getConfigList($GLOBALS['xortifyModule']->getVar('mid'));
+
+ XoopsLoad::load('pagenav');
+ XoopsLoad::load('xoopslists');
+ XoopsLoad::load('xoopsformloader');
+
+ include_once $GLOBALS['xoops']->path('class'.DS.'xoopsmailer.php');
+ include_once $GLOBALS['xoops']->path('class'.DS.'xoopstree.php');
+ include_once $GLOBALS['xoops']->path('modules'.DS.'xortify'.DS.'include'.DS.'functions.php');
+ include_once $GLOBALS['xoops']->path('modules'.DS.'xortify'.DS.'include'.DS.'forms.xortify.php');
+ include_once $GLOBALS['xoops']->path('modules'.DS.'xortify'.DS.'include'.DS.'forms.objects.php');
+ include_once $GLOBALS['xoops']->path('modules'.DS.'xortify'.DS.'class'.DS.'auth'.DS.'authfactory.php');
+
+ if ( file_exists($GLOBALS['xoops']->path('/Frameworks/moduleclasses/moduleadmin/moduleadmin.php'))){
+ include_once $GLOBALS['xoops']->path('/Frameworks/moduleclasses/moduleadmin/moduleadmin.php');
+ //return true;
+ }else{
+ echo $GLOBALS['xoops']->error("Error: You don't use the Frameworks \"admin module\". Please install this Frameworks");
+ //return false;
+ }
+ $GLOBALS['xortifyImageIcon'] = XOOPS_URL .'/'. $GLOBALS['xortifyModule']->getInfo('icons16');
+ $GLOBALS['xortifyImageAdmin'] = XOOPS_URL .'/'. $GLOBALS['xortifyModule']->getInfo('icons32');
+
+ $myts =& MyTextSanitizer::getInstance();
+
+ if ($GLOBALS['xoopsUser']) {
+ $moduleperm_handler =& $GLOBALS['xoops']->getHandler('groupperm');
+ if (!$moduleperm_handler->checkRight('module_admin', $GLOBALS['xortifyModule']->getVar( 'mid' ), $GLOBALS['xoopsUser']->getGroups())) {
+ $GLOBALS['xoops']->redirect(XOOPS_URL, 1, _NOPERM);
+ exit();
+ }
+ } else {
+ $GLOBALS['xoops']->redirect(XOOPS_URL . "/user.php", 1, _NOPERM);
+ exit();
+ }
+
+ $GLOBALS['xoops']->loadLanguage('admin', 'xortify');
+ $GLOBALS['xoops']->loadLanguage('modinfo', 'xortify');
+
+ $GLOBALS['xoops']->header();
+ $GLOBALS['xoops']->tpl->assign('pathImageIcon', $GLOBALS['xortifyImageIcon']);
+ $GLOBALS['xoops']->tpl->assign('pathImageAdmin', $GLOBALS['xortifyImageAdin']);
+
+ $op = isset($_REQUEST['op'])?$_REQUEST['op']:"dashboard";
+ $fct = isset($_REQUEST['fct'])?$_REQUEST['fct']:"";
+
+ switch($op) {
+ case "signup":
+
+ switch ($fct)
+ {
+ case "save":
+
+ $xortifyAuth =& XortifyAuthFactory::getAuthConnection(false, $GLOBALS['xortifyModuleConfig']['protocol']);
+ $myts =& MyTextSanitizer::getInstance();
+ $uname = isset($_POST['uname']) ? $myts->stripSlashesGPC(trim($_POST['uname'])) : '';
+ $email = isset($_POST['email']) ? $myts->stripSlashesGPC(trim($_POST['email'])) : '';
+ $...
[truncated message content] |
|
From: <wis...@us...> - 2011-12-15 06:25:45
|
Revision: 8496
http://xoops.svn.sourceforge.net/xoops/?rev=8496&view=rev
Author: wishcraft
Date: 2011-12-15 06:25:33 +0000 (Thu, 15 Dec 2011)
Log Message:
-----------
Xortify 3.02 Stable - Cloud Security for XOOPS 2.6 - bundle (node xortify.com to be moved to hosted at xoops.org)
Modified Paths:
--------------
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/admin/index.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/class/auth/auth_curl.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/class/auth/auth_curlserialised.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/class/auth/auth_curlxml.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/class/curl.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/class/curlserialised.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/class/curlxml.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/cron/serverup.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/language/english/admin.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/language/english/modinfo.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/templates/admin/xortify_cpanel_signup_form.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/xoops_version.php
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/admin/index.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/admin/index.php 2011-12-15 06:23:04 UTC (rev 8495)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/admin/index.php 2011-12-15 06:25:33 UTC (rev 8496)
@@ -11,7 +11,7 @@
include(dirname(dirname(dirname(dirname(__FILE__)))).'/include/cp_header.php');
- $xoops = Xoops::getInstance();
+ $GLOBALS['xoops'] = Xoops::getInstance();
if (!defined('_CHARSET'))
define ("_CHARSET","UTF-8");
@@ -20,8 +20,8 @@
$GLOBALS['myts'] = MyTextSanitizer::getInstance();
- $module_handler = $xoops->getHandler('module');
- $config_handler = $xoops->getHandler('config');
+ $module_handler = $GLOBALS['xoops']->getHandler('module');
+ $config_handler = $GLOBALS['xoops']->getHandler('config');
$GLOBALS['xortifyModule'] = $module_handler->getByDirname('xortify');
$GLOBALS['xortifyModuleConfig'] = $config_handler->getConfigList($GLOBALS['xortifyModule']->getVar('mid'));
@@ -40,7 +40,7 @@
include_once $GLOBALS['xoops']->path('/Frameworks/moduleclasses/moduleadmin/moduleadmin.php');
//return true;
}else{
- echo $xoops->error("Error: You don't use the Frameworks \"admin module\". Please install this Frameworks");
+ echo $GLOBALS['xoops']->error("Error: You don't use the Frameworks \"admin module\". Please install this Frameworks");
//return false;
}
$GLOBALS['xortifyImageIcon'] = XOOPS_URL .'/'. $GLOBALS['xortifyModule']->getInfo('icons16');
@@ -49,22 +49,22 @@
$myts =& MyTextSanitizer::getInstance();
if ($GLOBALS['xoopsUser']) {
- $moduleperm_handler =& $xoops->getHandler('groupperm');
+ $moduleperm_handler =& $GLOBALS['xoops']->getHandler('groupperm');
if (!$moduleperm_handler->checkRight('module_admin', $GLOBALS['xortifyModule']->getVar( 'mid' ), $GLOBALS['xoopsUser']->getGroups())) {
- $xoops->redirect(XOOPS_URL, 1, _NOPERM);
+ $GLOBALS['xoops']->redirect(XOOPS_URL, 1, _NOPERM);
exit();
}
} else {
- $xoops->redirect(XOOPS_URL . "/user.php", 1, _NOPERM);
+ $GLOBALS['xoops']->redirect(XOOPS_URL . "/user.php", 1, _NOPERM);
exit();
}
- $xoops->loadLanguage('admin', 'xortify');
- $xoops->loadLanguage('modinfo', 'xortify');
+ $GLOBALS['xoops']->loadLanguage('admin', 'xortify');
+ $GLOBALS['xoops']->loadLanguage('modinfo', 'xortify');
- $xoops->header();
- $xoops->tpl->assign('pathImageIcon', $GLOBALS['xortifyImageIcon']);
- $xoops->tpl->assign('pathImageAdmin', $GLOBALS['xortifyImageAdin']);
+ $GLOBALS['xoops']->header();
+ $GLOBALS['xoops']->tpl->assign('pathImageIcon', $GLOBALS['xortifyImageIcon']);
+ $GLOBALS['xoops']->tpl->assign('pathImageAdmin', $GLOBALS['xortifyImageAdin']);
$op = isset($_REQUEST['op'])?$_REQUEST['op']:"dashboard";
$fct = isset($_REQUEST['fct'])?$_REQUEST['fct']:"";
@@ -130,7 +130,7 @@
$GLOBALS['xoops']->tpl->assign('pass',$pass->render());
$GLOBALS['xoops']->tpl->assign('vpass',$vpass->render());
$GLOBALS['xoops']->tpl->assign('email',$email->render());
- $GLOBALS['xoops']->tpl->assign('url',$url->render());
+ $GLOBALS['xoops']->tpl->assign('yoururl',$url->render());
$GLOBALS['xoops']->tpl->assign('viewemail',$viewemail->render());
$GLOBALS['xoops']->tpl->assign('timezone',$timezone->render());
$GLOBALS['xoops']->tpl->assign('disclaimer',$disclaim->render());
@@ -139,7 +139,10 @@
$GLOBALS['xoops']->tpl->assign('op',$op->render());
$GLOBALS['xoops']->tpl->assign('fct',$fct->render());
$GLOBALS['xoops']->tpl->assign('submit',$submit->render());
- $xoops->tpl->display('admin:xortify|xortify_cpanel_signup_form.html');
+ $GLOBALS['xoops']->tpl->display('admin:xortify|xortify_cpanel_signup_form.html');
+ xortify_footer_adminMenu();
+ $GLOBALS['xoops']->footer();
+ exit;
} else {
$GLOBALS['xoops']->tpl->assign('protocol', $GLOBALS['xortifyModuleConfig']['protocol']);
switch($GLOBALS['xortifyModuleConfig']['protocol']) {
@@ -160,14 +163,14 @@
break;
}
$GLOBALS['xoops']->tpl->assign('error', $disclaimer);
- $xoops->tpl->display('admin:xortify|xortify_cpanel_signup_nocommunication.html');
+ $GLOBALS['xoops']->tpl->display('admin:xortify|xortify_cpanel_signup_nocommunication.html');
}
} else {
@$xortifyAuth->create_user( $_POST['viewemail'], $uname, $email, $url, $actkey,
$pass, $_POST['timezone'], $_POST['mailok'], $xortifyAuth->check_siteinfo(array()));
- $moduleHandler =& $xoops->getHandler('module');
- $configHandler =& $xoops->getHandler('config');
+ $moduleHandler =& $GLOBALS['xoops']->getHandler('module');
+ $configHandler =& $GLOBALS['xoops']->getHandler('config');
$GLOBALS['xortifyModule'] = $moduleHandler->getByDirname('xortify');
$configs = $configHandler->getConfigs(new Criteria('conf_modid', $GLOBALS['xortifyModule']->mid()) );
foreach($configs as $id => $config)
@@ -182,7 +185,7 @@
break;
}
- $xoops->redirect("index.php", 4, _XOR_USERCREATED_PLEASEACTIVATE);
+ $GLOBALS['xoops']->redirect("index.php", 4, _XOR_USERCREATED_PLEASEACTIVATE);
exit(0);
}
break;
@@ -201,7 +204,7 @@
$pass = new XoopsFormPassword('', "pass", 35, 128, (isset($_POST['pass'])?$_POST['pass']:''));
$vpass = new XoopsFormPassword('', "vpass", 35, 128, (isset($_POST['vpass'])?$_POST['vpass']:''));
$email = new XoopsFormText('', "email", 35, 128, (isset($_POST['email'])?$_POST['email']:''));
- $url = new XoopsFormText('', "url", 35, 128, (isset($_POST['url'])?$_POST['url']:''));
+ $url = new XoopsFormText('', "yoururl", 35, 128, (isset($_POST['url'])?$_POST['url']:''));
$viewemail = new XoopsFormRadioYN('', "viewemail", (isset($_POST['viewemail'])?$_POST['viewemail']:false));
$timezone = new XoopsFormSelectTimezone('', "timezone", (isset($_POST['timezone'])?$_POST['timezone']:''));
$myts =& MyTextSanitizer::getInstance();
@@ -224,7 +227,10 @@
$GLOBALS['xoops']->tpl->assign('op',$op->render());
$GLOBALS['xoops']->tpl->assign('fct',$fct->render());
$GLOBALS['xoops']->tpl->assign('submit',$submit->render());
- $xoops->tpl->display('admin:xortify|xortify_cpanel_signup_form.html');
+ $GLOBALS['xoops']->tpl->display('admin:xortify|xortify_cpanel_signup_form.html');
+ xortify_footer_adminMenu();
+ $GLOBALS['xoops']->footer();
+ exit;
} else {
$GLOBALS['xoops']->tpl->assign('protocol', $GLOBALS['xortifyModuleConfig']['protocol']);
switch($GLOBALS['xortifyModuleConfig']['protocol']) {
@@ -245,7 +251,7 @@
break;
}
$GLOBALS['xoops']->tpl->assign('error', $disclaimer);
- $xoops->tpl->display('admin:xortify|xortify_cpanel_signup_nocommunication.html');
+ $GLOBALS['xoops']->tpl->display('admin:xortify|xortify_cpanel_signup_nocommunication.html');
}
break;
}
@@ -255,7 +261,7 @@
include_once $GLOBALS['xoops']->path( "/class/pagenav.php" );
- $log_handler =& $xoops->getModuleHandler('log', 'xortify');
+ $log_handler =& $GLOBALS['xoops']->getModuleHandler('log', 'xortify');
$ttl = $log_handler->getCount(NULL);
$limit = !empty($_POST['limit'])?intval($_POST['limit']):30;
@@ -264,11 +270,11 @@
$sort = !empty($_POST['sort'])?''.$_POST['sort'].'':'date';
$pagenav = new XoopsPageNav($ttl, $limit, $start, 'start', 'limit='.$limit.'&sort='.$sort.'&order='.$order.'&op='.$op);
- $xoops->tpl->assign('pagenav', $pagenav->renderNav());
+ $GLOBALS['xoops']->tpl->assign('pagenav', $pagenav->renderNav());
foreach (array( 'action','provider','date','uname','email','ip4','ip6','proxy-ip4',
'proxy-ip6','network-addy','agent') as $id => $key) {
- $xoops->tpl->assign(strtolower(str_replace('-','_',$key).'_th'), '<a href="'.$_SERVER['PHP_SELF'].'?start='.$start.'&limit='.$limit.'&sort='.str_replace('_','-',$key).'&order='.((str_replace('_','-',$key)==$sort)?($order=='DESC'?'ASC':'DESC'):$order).'&op='.$op.'">'.(defined('_XOR_AM_TH_'.strtoupper(str_replace('-','_',$key)))?constant('_XOR_AM_TH_'.strtoupper(str_replace('-','_',$key))):'_XOR_AM_TH_'.strtoupper(str_replace('-','_',$key))).'</a>');
+ $GLOBALS['xoops']->tpl->assign(strtolower(str_replace('-','_',$key).'_th'), '<a href="'.$_SERVER['PHP_SELF'].'?start='.$start.'&limit='.$limit.'&sort='.str_replace('_','-',$key).'&order='.((str_replace('_','-',$key)==$sort)?($order=='DESC'?'ASC':'DESC'):$order).'&op='.$op.'">'.(defined('_XOR_AM_TH_'.strtoupper(str_replace('-','_',$key)))?constant('_XOR_AM_TH_'.strtoupper(str_replace('-','_',$key))):'_XOR_AM_TH_'.strtoupper(str_replace('-','_',$key))).'</a>');
}
$criteria = new Criteria('1','1');
@@ -279,9 +285,9 @@
$logs = $log_handler->getObjects($criteria, true);
foreach($logs as $id => $log) {
- $xoops->tpl->append('log', $log->toArray());
+ $GLOBALS['xoops']->tpl->append('log', $log->toArray());
}
- $xoops->tpl->display('admin:xortify|xortify_cpanel_log.html');
+ $GLOBALS['xoops']->tpl->display('admin:xortify|xortify_cpanel_log.html');
break;
case "list":
@@ -319,7 +325,7 @@
$start = !empty($_REQUEST['start'])?intval($_REQUEST['start']):0;
$pagenav = new XoopsPageNav($bans['bans'], $limit, $start, 'start', 'limit='.$limit.'&op='.$op);
- $xoops->tpl->assign('pagenav', $pagenav->renderNav());
+ $GLOBALS['xoops']->tpl->assign('pagenav', $pagenav->renderNav());
$i=0;
$num=0;
foreach($bans['data'] as $key => $data) {
@@ -348,14 +354,14 @@
$proxyiptype = '';
}
- $xoops->tpl->append('bans', array('iptype' => $iptype, 'ipaddy' => $ipaddy,
+ $GLOBALS['xoops']->tpl->append('bans', array('iptype' => $iptype, 'ipaddy' => $ipaddy,
'proxyiptype' => $proxyiptype, 'ip' => $proxyip,
'netaddy' => $data['network-addy']?$data['network-addy']:' ',
'macaddy' => $data['mac-addy']?$data['mac-addy']:' ',
'long' => $data['long']?$data['long']:' '));
}
}
- $xoops->tpl->display('admin:xortify|xortify_cpanel_bans.html');
+ $GLOBALS['xoops']->tpl->display('admin:xortify|xortify_cpanel_bans.html');
}
@@ -365,7 +371,7 @@
echo xortify_adminMenu(1);
- $log_handler = $xoops->getModuleHandler('log', 'xortify');
+ $log_handler = $GLOBALS['xoops']->getModuleHandler('log', 'xortify');
$indexAdmin = new ModuleAdmin();
@@ -440,5 +446,5 @@
}
xortify_footer_adminMenu();
- $xoops->footer();
+ $GLOBALS['xoops']->footer();
?>
\ No newline at end of file
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/class/auth/auth_curl.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/class/auth/auth_curl.php 2011-12-15 06:23:04 UTC (rev 8495)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/class/auth/auth_curl.php 2011-12-15 06:25:33 UTC (rev 8496)
@@ -50,6 +50,8 @@
curl_setopt($ch, CURLOPT_HEADER, 0);
curl_setopt($ch, CURLOPT_POST, 1);
+ curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, $GLOBALS['xortifyModuleConfig']['curl_connecttimeout']);
+ curl_setopt($ch, CURLOPT_TIMEOUT, $GLOBALS['xortifyModuleConfig']['curl_timeout']);
curl_setopt($ch, CURLOPT_COOKIEJAR, $cookies);
curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
curl_setopt($ch, CURLOPT_USERAGENT, XORTIFY_USER_AGENT);
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/class/auth/auth_curlserialised.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/class/auth/auth_curlserialised.php 2011-12-15 06:23:04 UTC (rev 8495)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/class/auth/auth_curlserialised.php 2011-12-15 06:25:33 UTC (rev 8496)
@@ -32,6 +32,8 @@
curl_setopt($ch, CURLOPT_HEADER, 0);
curl_setopt($ch, CURLOPT_POST, 1);
+ curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, $GLOBALS['xortifyModuleConfig']['curl_connecttimeout']);
+ curl_setopt($ch, CURLOPT_TIMEOUT, $GLOBALS['xortifyModuleConfig']['curl_timeout']);
curl_setopt($ch, CURLOPT_COOKIEJAR, $cookies);
curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
curl_setopt($ch, CURLOPT_USERAGENT, XORTIFY_USER_AGENT);
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/class/auth/auth_curlxml.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/class/auth/auth_curlxml.php 2011-12-15 06:23:04 UTC (rev 8495)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/class/auth/auth_curlxml.php 2011-12-15 06:25:33 UTC (rev 8496)
@@ -33,6 +33,8 @@
curl_setopt($ch, CURLOPT_HEADER, 0);
curl_setopt($ch, CURLOPT_POST, 1);
+ curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, $GLOBALS['xortifyModuleConfig']['curl_connecttimeout']);
+ curl_setopt($ch, CURLOPT_TIMEOUT, $GLOBALS['xortifyModuleConfig']['curl_timeout']);
curl_setopt($ch, CURLOPT_COOKIEJAR, $cookies);
curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
curl_setopt($ch, CURLOPT_USERAGENT, XORTIFY_USER_AGENT);
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/class/curl.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/class/curl.php 2011-12-15 06:23:04 UTC (rev 8495)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/class/curl.php 2011-12-15 06:25:33 UTC (rev 8496)
@@ -72,6 +72,8 @@
curl_setopt($ch, CURLOPT_HEADER, 0);
curl_setopt($ch, CURLOPT_POST, 1);
+ curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, $GLOBALS['xortifyModuleConfig']['curl_connecttimeout']);
+ curl_setopt($ch, CURLOPT_TIMEOUT, $GLOBALS['xortifyModuleConfig']['curl_timeout']);
curl_setopt($ch, CURLOPT_COOKIEJAR, $cookies);
curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
curl_setopt($ch, CURLOPT_USERAGENT, XORTIFY_USER_AGENT);
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/class/curlserialised.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/class/curlserialised.php 2011-12-15 06:23:04 UTC (rev 8495)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/class/curlserialised.php 2011-12-15 06:25:33 UTC (rev 8496)
@@ -55,6 +55,8 @@
curl_setopt($ch, CURLOPT_HEADER, 0);
curl_setopt($ch, CURLOPT_POST, 1);
+ curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, $GLOBALS['xortifyModuleConfig']['curl_connecttimeout']);
+ curl_setopt($ch, CURLOPT_TIMEOUT, $GLOBALS['xortifyModuleConfig']['curl_timeout']);
curl_setopt($ch, CURLOPT_COOKIEJAR, $cookies);
curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
curl_setopt($ch, CURLOPT_USERAGENT, XORTIFY_USER_AGENT);
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/class/curlxml.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/class/curlxml.php 2011-12-15 06:23:04 UTC (rev 8495)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/class/curlxml.php 2011-12-15 06:25:33 UTC (rev 8496)
@@ -57,6 +57,8 @@
curl_setopt($ch, CURLOPT_HEADER, 0);
curl_setopt($ch, CURLOPT_POST, 1);
+ curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, $GLOBALS['xortifyModuleConfig']['curl_connecttimeout']);
+ curl_setopt($ch, CURLOPT_TIMEOUT, $GLOBALS['xortifyModuleConfig']['curl_timeout']);
curl_setopt($ch, CURLOPT_COOKIEJAR, $cookies);
curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
curl_setopt($ch, CURLOPT_USERAGENT, XORTIFY_USER_AGENT);
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/cron/serverup.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/cron/serverup.php 2011-12-15 06:23:04 UTC (rev 8495)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/cron/serverup.php 2011-12-15 06:25:33 UTC (rev 8496)
@@ -23,6 +23,8 @@
curl_setopt($ch, CURLOPT_HEADER, 0);
curl_setopt($ch, CURLOPT_COOKIEJAR, $cookies);
curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
+ curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, $GLOBALS['xortifyModuleConfig']['curl_connecttimeout']);
+ curl_setopt($ch, CURLOPT_TIMEOUT, $GLOBALS['xortifyModuleConfig']['curl_timeout']);
curl_setopt($ch, CURLOPT_USERAGENT, XORTIFY_USER_AGENT);
$ret = curl_exec($ch);
curl_close($ch);
@@ -245,9 +247,11 @@
}
$module_handler =& $xoops->getHandler('module');
+ $config_handler =& $xoops->getHandler('config');
$configitem_handler =& $xoops->getHandler('configitem');
$GLOBALS['xortifyModule'] = $module_handler->getByDirname('xortify');
if (is_object($GLOBALS['xortifyModule'])) {
+ $GLOBALS['xortifyModuleConfig'] = $config_handler->getconfigList($GLOBALS['xortifyModule']->getVar('mid'));
$source = xortify_getURLData(SERVER1, $nativecurl);
if (strpos(strtolower($source), strtolower(SEARCHFOR))>0) {
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/language/english/admin.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/language/english/admin.php 2011-12-15 06:23:04 UTC (rev 8495)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/language/english/admin.php 2011-12-15 06:25:33 UTC (rev 8496)
@@ -58,4 +58,8 @@
define('_XOR_ADMIN_ERROR_URL', 'URL/URI Being Contacted');
define('_XOR_ADMIN_ERROR_PROTOCOL', 'Protocol Being Used');
define('_XOR_ADMIN_NONETWORKCOMM_DISCLAIMER', 'The current URI is unaccessable on the selected protocol. This could mean you are either missing a required PHP Extension or have a firewall blocking port 80 to the Xortify Cloud.<br/><br/><strong>You can try changing the protocol selected in preferences to see if this may elivate the communication fawl of your hosting services.</strong>');
+ define('_XOR_ADMIN_SIGNUP_XORTIFY_H2', 'Signup to the XOOPS fortification cloud');
+ define('_XOR_ADMIN_SIGNUP_XORTIFY_P', 'Here you can signup to the XOOPS fortification cloud called Xortify, the main node for this cloud is featured at http://xortify.com but there can be other nodes, this will prevent spam signup, website harvesting, and general hacking of your site.<br/><br/>It will also share the IP\'s of Bad IP Highlighted by Protector with other people running Xortify.');
+ define('_XOR_ADMIN_SIGNUP_XORTIFY_FORM_TD2', 'Sign-up this Website\'s User Account on the Xortify Cloud.');
+
?>
\ No newline at end of file
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/language/english/modinfo.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/language/english/modinfo.php 2011-12-15 06:23:04 UTC (rev 8495)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/language/english/modinfo.php 2011-12-15 06:25:33 UTC (rev 8496)
@@ -182,4 +182,8 @@
// Version 3.02
define('_XOR_MI_FAULT_DELAY', 'Number of second to delay function on fault!');
define('_XOR_MI_FAULT_DELAY_DESC', 'If a fault occurs in the preloader, xortify will delay this function before calling it again this many seconds (Default 10 minutes)');
+ define('_XOR_MI_CURL_TIMOUT', 'Total amount of seconds a CURL Waits for a Response');
+ define('_XOR_MI_CURL_TIMOUT_DESC', 'This is the total amount of seconds a CURL waits for a response after resolving the DNS.');
+ define('_XOR_MI_CURL_CONNECTTIMOUT', 'Total amount of seconds a CURL Waits for DNS to resolve');
+ define('_XOR_MI_CURL_CONNECTTIMOUT_DESC', 'This is the total amount of seconds a CURL waits for a DNS Lookup to resolve.');
?>
\ No newline at end of file
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/templates/admin/xortify_cpanel_signup_form.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/templates/admin/xortify_cpanel_signup_form.html 2011-12-15 06:23:04 UTC (rev 8495)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/templates/admin/xortify_cpanel_signup_form.html 2011-12-15 06:25:33 UTC (rev 8496)
@@ -2,50 +2,50 @@
<p><{$smarty.const._XOR_ADMIN_SIGNUP_XORTIFY_P}></p>
<form method="POST" action="<{$smarty.server.request_uri}>">
<table>
- <tr class="head">;
+ <tr class="head">
<td colspan="2"><{$smarty.const._XOR_ADMIN_SIGNUP_XORTIFY_FORM_TD2}></td>
</tr>
- <tr class="even">;
+ <tr class="even">
<td><{$smarty.const._XOR_FRM_UNAME}></td>
<td><{$uname}></td>
</tr>
- <tr class="odd">;
+ <tr class="odd">
<td><{$smarty.const._XOR_FRM_PASS}></td>
<td><{$pass}></td>
</tr>
- <tr class="even">;
+ <tr class="even">
<td><{$smarty.const._XOR_FRM_VPASS}></td>
<td><{$vpass}></td>
</tr>
- <tr class="odd">;
+ <tr class="odd">
<td><{$smarty.const._XOR_FRM_EMAIL}></td>
<td><{$email}></td>
</tr>
- <tr class="even">;
+ <tr class="even">
<td><{$smarty.const._XOR_FRM_URL}></td>
- <td><{$url}></td>
+ <td><{$yoururl}></td>
</tr>
- <tr class="odd">;
+ <tr class="odd">
<td><{$smarty.const._XOR_FRM_VIEWEMAIL}></td>
<td><{$viewemail}></td>
</tr>
- <tr class="even">;
+ <tr class="even">
<td><{$smarty.const._XOR_FRM_TIMEZONE}></td>
<td><{$timezone}></td>
</tr>
- <tr class="odd">;
+ <tr class="odd">
<td><{$smarty.const._XOR_FRM_DISCLAIMER}></td>
<td><{$disclaimer}></td>
</tr>
- <tr class="even">;
+ <tr class="even">
<td><{$smarty.const._XOR_FRM_DISCLAIMER_AGREE}></td>
<td><{$agree}></td>
</tr>
- <tr class="odd">;
+ <tr class="odd">
<td><{$smarty.const._XOR_FRM_PUZZEL}></td>
<td><{$captcha}></td>
</tr>
- <tr class="foot">;
+ <tr class="foot">
<td colspan="2"><{$submit}></td>
</tr>
<{$op}>
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/xoops_version.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/xoops_version.php 2011-12-15 06:23:04 UTC (rev 8495)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/xoops_version.php 2011-12-15 06:25:33 UTC (rev 8496)
@@ -348,9 +348,24 @@
$i++;
$modversion['config'][$i]['name'] = 'fault_delay';
$modversion['config'][$i]['title'] = '_XOR_MI_FAULT_DELAY';
-$modversion['config'][$i]['description'] = '_XOR_MI_SFS_FAULT_DELAY_DESC';
+$modversion['config'][$i]['description'] = '_XOR_MI_FAULT_DELAY_DESC';
$modversion['config'][$i]['formtype'] = 'text';
$modversion['config'][$i]['valuetype'] = 'int';
$modversion['config'][$i]['default'] = (60*10);
+$i++;
+$modversion['config'][$i]['name'] = 'curl_timeout';
+$modversion['config'][$i]['title'] = '_XOR_MI_CURL_TIMOUT';
+$modversion['config'][$i]['description'] = '_XOR_MI_CURL_TIMOUT_DESC';
+$modversion['config'][$i]['formtype'] = 'text';
+$modversion['config'][$i]['valuetype'] = 'int';
+$modversion['config'][$i]['default'] = 6;
+
+$i++;
+$modversion['config'][$i]['name'] = 'curl_connecttimeout';
+$modversion['config'][$i]['title'] = '_XOR_MI_CURL_CONNECTTIMOUT';
+$modversion['config'][$i]['description'] = '_XOR_MI_CURL_CONNECTTIMOUT_DESC';
+$modversion['config'][$i]['formtype'] = 'text';
+$modversion['config'][$i]['valuetype'] = 'int';
+$modversion['config'][$i]['default'] = 4;
?>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <wis...@us...> - 2011-12-15 06:23:14
|
Revision: 8495
http://xoops.svn.sourceforge.net/xoops/?rev=8495&view=rev
Author: wishcraft
Date: 2011-12-15 06:23:04 +0000 (Thu, 15 Dec 2011)
Log Message:
-----------
Xortify 2.99 - All the features of Xortify 3.x but for XOOPS 2.5
Added Paths:
-----------
XoopsModules/xortify/releases/2.99/
XoopsModules/xortify/releases/2.99/docs/
XoopsModules/xortify/releases/2.99/docs/INSTALL
XoopsModules/xortify/releases/2.99/docs/UPGRADE
XoopsModules/xortify/releases/2.99/docs/licence.txt
XoopsModules/xortify/releases/2.99/extras/
XoopsModules/xortify/releases/2.99/extras/docs/
XoopsModules/xortify/releases/2.99/extras/docs/install.txt
XoopsModules/xortify/releases/2.99/extras/htdocs/
XoopsModules/xortify/releases/2.99/extras/htdocs/header.php
XoopsModules/xortify/releases/2.99/extras/htdocs/modules/
XoopsModules/xortify/releases/2.99/extras/htdocs/modules/xortify/
XoopsModules/xortify/releases/2.99/extras/htdocs/modules/xortify/include/
XoopsModules/xortify/releases/2.99/extras/htdocs/modules/xortify/include/post.header.footer.php
XoopsModules/xortify/releases/2.99/extras/htdocs/modules/xortify/preloads/
XoopsModules/xortify/releases/2.99/extras/htdocs/modules/xortify/preloads/core.php
XoopsModules/xortify/releases/2.99/htdocs/
XoopsModules/xortify/releases/2.99/htdocs/Frameworks/
XoopsModules/xortify/releases/2.99/htdocs/Frameworks/moduleclasses/
XoopsModules/xortify/releases/2.99/htdocs/Frameworks/moduleclasses/icons/
XoopsModules/xortify/releases/2.99/htdocs/Frameworks/moduleclasses/icons/32/
XoopsModules/xortify/releases/2.99/htdocs/Frameworks/moduleclasses/icons/32/access.list.png
XoopsModules/xortify/releases/2.99/htdocs/Frameworks/moduleclasses/icons/32/current.bans.png
XoopsModules/xortify/releases/2.99/htdocs/Frameworks/moduleclasses/icons/32/xortify.log.png
XoopsModules/xortify/releases/2.99/htdocs/modules/
XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/
XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/admin/
XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/admin/index.html
XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/admin/index.php
XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/admin/menu.php
XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/class/
XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/class/auth/
XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/class/auth/auth.php
XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/class/auth/auth_curl.php
XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/class/auth/auth_curl_provisionning.php
XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/class/auth/auth_curlserialised.php
XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/class/auth/auth_curlserialised_provisionning.php
XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/class/auth/auth_curlxml.php
XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/class/auth/auth_curlxml_provisionning.php
XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/class/auth/auth_json.php
XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/class/auth/auth_json_provisionning.php
XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/class/auth/auth_soap.php
XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/class/auth/auth_soap_provisionning.php
XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/class/auth/auth_wgetserialised.php
XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/class/auth/auth_wgetserialised_provisionning.php
XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/class/auth/auth_wgetxml.php
XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/class/auth/auth_wgetxml_provisionning.php
XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/class/auth/authfactory.php
XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/class/auth/index.html
XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/class/curl.php
XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/class/curlserialised.php
XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/class/curlxml.php
XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/class/index.html
XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/class/json.php
XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/class/log.php
XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/class/soap.php
XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/class/wgetserialised.php
XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/class/wgetxml.php
XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/cron/
XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/cron/index.html
XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/cron/serverup.php
XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/docs/
XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/docs/changelog.txt
XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/docs/credits.txt
XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/docs/index.html
XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/docs/install.txt
XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/docs/lang_diff.txt
XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/docs/licence.txt
XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/docs/readme.txt
XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/images/
XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/images/accessdenied.png
XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/images/index.html
XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/images/left_both.gif
XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/images/right_both.gif
XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/images/xortify_slogo.png
XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/include/
XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/include/JSON.php
XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/include/forms.objects.php
XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/include/forms.xortify.php
XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/include/functions.php
XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/include/install.php
XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/include/post.header.addmeta.php
XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/include/post.header.endcache.php
XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/include/post.loader.mainfile.php
XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/include/pre.loader.mainfile.php
XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/include/update.php
XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/index.html
XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/language/
XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/language/english/
XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/language/english/admin.php
XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/language/english/ban.php
XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/language/english/help/
XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/language/english/help/help.html
XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/language/english/help/index.html
XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/language/english/index.html
XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/language/english/main.php
XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/language/english/modinfo.php
XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/language/index.html
XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/plugin/
XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/plugin/index.html
XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/plugin/projecthoneypot.org.php
XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/plugin/protector.php
XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/plugin/spiders.php
XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/plugin/stopforumspam.com.php
XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/plugin/xortify.php
XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/preloads/
XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/preloads/core.php
XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/preloads/index.html
XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/providers/
XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/providers/index.html
XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/providers/projecthoneypot.org/
XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/providers/projecthoneypot.org/post.loader.php
XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/providers/protector/
XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/providers/protector/footer.post.loader.php
XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/providers/protector/header.post.loader.php
XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/providers/protector/index.html
XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/providers/providers.php
XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/providers/spiders/
XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/providers/spiders/post.loader.php
XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/providers/stopforumspam.com/
XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/providers/stopforumspam.com/post.loader.php
XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/providers/xortify/
XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/providers/xortify/footer.post.loader.php
XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/providers/xortify/header.post.loader.php
XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/providers/xortify/index.html
XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/providers/xortify/post.loader.php
XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/sql/
XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/sql/index.html
XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/sql/mysql.sql
XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/templates/
XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/templates/index.html
XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/templates/xortify_banning_notice.html
XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/templates/xortify_cpanel_bans.html
XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/templates/xortify_cpanel_log.html
XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/templates/xortify_cpanel_signup_form.html
XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/templates/xortify_cpanel_signup_nocommunication.html
XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/xoops_version.php
Added: XoopsModules/xortify/releases/2.99/docs/INSTALL
===================================================================
--- XoopsModules/xortify/releases/2.99/docs/INSTALL (rev 0)
+++ XoopsModules/xortify/releases/2.99/docs/INSTALL 2011-12-15 06:23:04 UTC (rev 8495)
@@ -0,0 +1,75 @@
++-----------------------------------------------------------------------------------+
+| |
+| XXX XXX OOOOO RRRRR TTTTTT IIIIII FFFFFF YYY YYY |
+| XX XX OO OO RR RR TT II FF YY YY |
+| XXX OO OO RRRR TT II FFFF YYYY |
+| XX XX OO OO RR RR TT II FF YY |
+| XXX XXX OOOOO RR RR TT IIIIII FF YY version 2.48 |
+| |
++----[ NETWORK SECTOR SECURITY ]----------------------------------------------------+
+| |
+| Install the Providers Xortify support currently these are: |
+| |
+| * XOOPS Protector (Based in 3.22) |
+| * Xortify Network Security Drone |
+| |
+| Sign up a username for Xortify.com you can do this in the module if everything |
+| is working fine and there isn't any problem with the API SOAP communications. |
+| |
+| You will recieve an activation notice but you account will already be active. |
+| |
+| You will need to alter mainfile.php and do the following:: |
+| |
+| * DO NOT INSTALL PROTECTOR IN THE MAINFILE - Xortify will call this for you |
+| |
+| Xortify is also fited with the XOOPS 2.4 Series Preloads you will not need to |
+| do steps 2 and 3 with XOOPS 2.4 and later series. |
+| |
++--[ Step 1 - Installing Cron ]-----------------------------------------------------+
+| |
+| You will need to install the following cron within your cronjobs section of your |
+| Wesite, if you are using a windows server in WAMP then you will need to schedule |
+| this as a task, remember to change the path to suit your configuration. |
+| |
+| command to run every minute to once an hour, make sure it is within your cache |
+| refresh time. This is the or unix based systems the following is for windows |
+| |
+| /usr/bin/php -q /home/yoursite/public_html/modules/xortify/cron/serverup.php |
+| |
+| Assuming you have your PHP added to your executable path this is the scheduled |
+| task to run on a windows environment. |
+| |
+| php.exe -q c:\htdocs\modules\xortify\cron\serverup.php |
+| |
+| Some of the paths in these examples for executables or the cron file may be |
+| different and you will have to alter them to your needs. |
+| |
++--[ Step 2 - mainfile.php (pre 2.4 series) ]---------------------------------------+
+| |
+| You will need to change the following the main file has the following code on it |
+| |
+| [code] |
+| if (!isset($xoopsOption["nocommon"]) && XOOPS_ROOT_PATH != "") { |
+| include XOOPS_ROOT_PATH."/include/common.php"; |
+| } |
+| [/code] |
+| |
+| You will need to alter that to this after it is all install. |
+| |
+| [code] |
+| @include( XOOPS_ROOT_PATH.'/modules/xortify/include/pre.loader.mainfile.php' ); |
+| if (!isset($xoopsOption["nocommon"]) && XOOPS_ROOT_PATH != "") { |
+| include XOOPS_ROOT_PATH."/include/common.php"; |
+| } |
+| @include( XOOPS_ROOT_PATH.'/modules/xortify/include/post.loader.mainfile.php' ); |
+| [/code] |
+| |
++--[ Step 3 - header.php (pre 2.4 series) ]----------------------------------------+
+| |
+| Below the lin of footer.php which reads $xoopsTpl =& $xoTheme->template; |
+| |
+| [code] |
+| @include( XOOPS_ROOT_PATH.'/modules/xortify/include/post.add.meta.php' ); |
+| [/code] |
+| |
++-----------------------------------------------------------------------------------+
\ No newline at end of file
Added: XoopsModules/xortify/releases/2.99/docs/UPGRADE
===================================================================
--- XoopsModules/xortify/releases/2.99/docs/UPGRADE (rev 0)
+++ XoopsModules/xortify/releases/2.99/docs/UPGRADE 2011-12-15 06:23:04 UTC (rev 8495)
@@ -0,0 +1,75 @@
++-----------------------------------------------------------------------------------+
+| |
+| XXX XXX OOOOO RRRRR TTTTTT IIIIII FFFFFF YYY YYY |
+| XX XX OO OO RR RR TT II FF YY YY |
+| XXX OO OO RRRR TT II FFFF YYYY |
+| XX XX OO OO RR RR TT II FF YY |
+| XXX XXX OOOOO RR RR TT IIIIII FF YY version 2.30 |
+| |
++----[ NETWORK SECTOR SECURITY ]----------------------------------------------------+
+| |
+| Install the Providers Xortify support currently these are: |
+| |
+| * XOOPS Protector (Based in 3.22) |
+| * Xortify Network Security Drone |
+| |
+| Make sure you delete the 'providers' folder in the existing module then upload |
+| Xortify 2.30. Once you have install the file base this way you will remember |
+| to upgrade the module in the system modules application in the xoops system |
+| menu you will need to then goto the preferences and make sure you are running |
+| the protector provider if you are running protector this will populate the |
+| cloud with your bans that come in protector as well:: |
+| |
+| * DO NOT INSTALL PROTECTOR IN THE MAINFILE - Xortify will call this for you |
+| |
+| Xortify is also fited with the XOOPS 2.4 Series Preloads you will not need to |
+| do steps 2 and 3 with XOOPS 2.4 and later series. |
+| |
++--[ Step 1 - Installing Cron ]-----------------------------------------------------+
+| |
+| You will need to install the following cron within your cronjobs section of your |
+| Wesite, if you are using a windows server in WAMP then you will need to schedule |
+| this as a task, remember to change the path to suit your configuration. |
+| |
+| command to run every minute to once an hour, make sure it is within your cache |
+| refresh time. This is the or unix based systems the following is for windows |
+| |
+| /usr/bin/php -q /home/yoursite/public_html/modules/xortify/cron/serverup.php |
+| |
+| Assuming you have your PHP added to your executable path this is the scheduled |
+| task to run on a windows environment. |
+| |
+| php.exe -q c:\htdocs\modules\xortify\cron\serverup.php |
+| |
+| Some of the paths in these examples for executables or the cron file may be |
+| different and you will have to alter them to your needs. |
+| |
++--[ Step 2 - mainfile.php ]--------------------------------------------------------+
+| |
+| You will need to change the following the main file has the following code on it |
+| |
+| [code] |
+| if (!isset($xoopsOption["nocommon"]) && XOOPS_ROOT_PATH != "") { |
+| include XOOPS_ROOT_PATH."/include/common.php"; |
+| } |
+| [/code] |
+| |
+| You will need to alter that to this after it is all install. |
+| |
+| [code] |
+| @include( XOOPS_ROOT_PATH.'/modules/xortify/include/pre.loader.mainfile.php' ); |
+| if (!isset($xoopsOption["nocommon"]) && XOOPS_ROOT_PATH != "") { |
+| include XOOPS_ROOT_PATH."/include/common.php"; |
+| } |
+| @include( XOOPS_ROOT_PATH.'/modules/xortify/include/post.loader.mainfile.php' ); |
+| [/code] |
+| |
++--[ Step 3 - footer.php ----------------------------------------------------------+
+| |
+| At the bottom of footer.php place this line without the [|] Of course. |
+| |
+| [code] |
+| @include( XOOPS_ROOT_PATH.'/modules/xortify/include/post.loader.footer.php' ); |
+| [/code] |
+| |
++-----------------------------------------------------------------------------------+
\ No newline at end of file
Added: XoopsModules/xortify/releases/2.99/docs/licence.txt
===================================================================
--- XoopsModules/xortify/releases/2.99/docs/licence.txt (rev 0)
+++ XoopsModules/xortify/releases/2.99/docs/licence.txt 2011-12-15 06:23:04 UTC (rev 8495)
@@ -0,0 +1,339 @@
+ GNU GENERAL PUBLIC LICENSE
+ Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+ Preamble
+
+ The licenses for most software are designed to take away your
+freedom to share and change it. By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users. This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it. (Some other Free Software Foundation software is covered by
+the GNU Lesser General Public License instead.) You can apply it to
+your programs, too.
+
+ When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+ To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+ For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have. You must make sure that they, too, receive or can get the
+source code. And you must show them these terms so they know their
+rights.
+
+ We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+ Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software. If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+ Finally, any free program is threatened constantly by software
+patents. We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary. To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+ The precise terms and conditions for copying, distribution and
+modification follow.
+
+ GNU GENERAL PUBLIC LICENSE
+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+ 0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License. The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language. (Hereinafter, translation is included without limitation in
+the term "modification".) Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope. The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+ 1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+ 2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+ a) You must cause the modified files to carry prominent notices
+ stating that you changed the files and the date of any change.
+
+ b) You must cause any work that you distribute or publish, that in
+ whole or in part contains or is derived from the Program or any
+ part thereof, to be licensed as a whole at no charge to all third
+ parties under the terms of this License.
+
+ c) If the modified program normally reads commands interactively
+ when run, you must cause it, when started running for such
+ interactive use in the most ordinary way, to print or display an
+ announcement including an appropriate copyright notice and a
+ notice that there is no warranty (or else, saying that you provide
+ a warranty) and that users may redistribute the program under
+ these conditions, and telling the user how to view a copy of this
+ License. (Exception: if the Program itself is interactive but
+ does not normally print such an announcement, your work based on
+ the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole. If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works. But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+ 3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+ a) Accompany it with the complete corresponding machine-readable
+ source code, which must be distributed under the terms of Sections
+ 1 and 2 above on a medium customarily used for software interchange; or,
+
+ b) Accompany it with a written offer, valid for at least three
+ years, to give any third party, for a charge no more than your
+ cost of physically performing source distribution, a complete
+ machine-readable copy of the corresponding source code, to be
+ distributed under the terms of Sections 1 and 2 above on a medium
+ customarily used for software interchange; or,
+
+ c) Accompany it with the information you received as to the offer
+ to distribute corresponding source code. (This alternative is
+ allowed only for noncommercial distribution and only if you
+ received the program in object code or executable form with such
+ an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it. For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable. However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+ 4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License. Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+ 5. You are not required to accept this License, since you have not
+signed it. However, nothing else grants you permission to modify or
+distribute the Program or its derivative works. These actions are
+prohibited by law if you do not accept this License. Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+ 6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions. You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+ 7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all. For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices. Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+ 8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded. In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+ 9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time. Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number. If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation. If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+ 10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission. For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this. Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+ NO WARRANTY
+
+ 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+ 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+ END OF TERMS AND CONDITIONS
+
+ How to Apply These Terms to Your New Programs
+
+ If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+ To do so, attach the following notices to the program. It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+ <one line to give the program's name and a brief idea of what it does.>
+ Copyright (C) <year> <name of author>
+
+ 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 2 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, write to the Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+ Gnomovision version 69, Copyright (C) year name of author
+ Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+ This is free software, and you are welcome to redistribute it
+ under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License. Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary. Here is a sample; alter the names:
+
+ Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+ `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+ <signature of Ty Coon>, 1 April 1989
+ Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs. If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library. If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.
Added: XoopsModules/xortify/releases/2.99/extras/docs/install.txt
===================================================================
--- XoopsModules/xortify/releases/2.99/extras/docs/install.txt (rev 0)
+++ XoopsModules/xortify/releases/2.99/extras/docs/install.txt 2011-12-15 06:23:04 UTC (rev 8495)
@@ -0,0 +1,8 @@
+EXTRA INSTALLATION:
+
+You may want Xortify to perform better, this is so the missing preloader in the header when a cache file is loaded and then the
+execution of the PHP is terminated, will now call the footer preloader/add meta class for preloaders.
+
+You need to replace the files within /htdocs of the extra folder to have a better performing system.
+
+This htdocs/header.php is from XOOPS 2.5.x and has been altered at line 92.
\ No newline at end of file
Added: XoopsModules/xortify/releases/2.99/extras/htdocs/header.php
===================================================================
--- XoopsModules/xortify/releases/2.99/extras/htdocs/header.php (rev 0)
+++ XoopsModules/xortify/releases/2.99/extras/htdocs/header.php 2011-12-15 06:23:04 UTC (rev 8495)
@@ -0,0 +1,109 @@
+<?php
+/**
+ * XOOPS global header file
+ *
+ * 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
+ * which is considered copyrighted (c) material of the original comment or credit authors.
+ * 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.
+ *
+ * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html)
+ * @package core
+ * @since 2.0.0
+ * @author Kazumi Ono <web...@my...>
+ * @author Skalpa Keo <sk...@xo...>
+ * @author Taiwen Jiang <ph...@us...>
+ * @version $Id: header.php 4941 2010-07-22 17:13:36Z beckmi $
+ */
+
+defined('XOOPS_ROOT_PATH') or die('Restricted access');
+
+$xoopsPreload =& XoopsPreload::getInstance();
+$xoopsPreload->triggerEvent('core.header.start');
+
+include_once $GLOBALS['xoops']->path('class/xoopsblock.php');
+
+$xoopsLogger =& XoopsLogger::getInstance();
+$xoopsLogger->stopTime('Module init');
+$xoopsLogger->startTime('XOOPS output init');
+
+if ($xoopsConfig['theme_set'] != 'default' && file_exists(XOOPS_THEME_PATH . '/' . $xoopsConfig['theme_set'] . '/theme.php')) {
+ require_once $GLOBALS['xoops']->path('include/xoops13_header.php');
+} else {
+ global $xoopsOption, $xoopsConfig, $xoopsModule;
+
+ $xoopsOption['theme_use_smarty'] = 1;
+
+ // include Smarty template engine and initialize it
+ require_once $GLOBALS['xoops']->path('class/template.php');
+ require_once $GLOBALS['xoops']->path('class/theme.php');
+ require_once $GLOBALS['xoops']->path('class/theme_blocks.php');
+
+ if (@$xoopsOption['template_main']) {
+ if (false === strpos($xoopsOption['template_main'], ':')) {
+ $xoopsOption['template_main'] = 'db:' . $xoopsOption['template_main'];
+ }
+ }
+
+ $xoopsThemeFactory = null;
+ $xoopsThemeFactory = new xos_opal_ThemeFactory();
+ $xoopsThemeFactory->allowedThemes = $xoopsConfig['theme_set_allowed'];
+ $xoopsThemeFactory->defaultTheme = $xoopsConfig['theme_set'];
+
+ /**
+ * @var xos_opal_Theme
+ */
+ $xoTheme =& $xoopsThemeFactory->createInstance(array('contentTemplate' => @$xoopsOption['template_main']));
+ $xoopsTpl =& $xoTheme->template;
+
+ $xoopsPreload->triggerEvent('core.header.addmeta');
+
+ // Temporary solution for start page redirection
+ if (defined("XOOPS_STARTPAGE_REDIRECTED")) {
+ $params = $content = $tpl = $repeat = null;
+ $xoTheme->headContent($params, "<base href='" . XOOPS_URL . '/modules/' . $xoopsConfig['startpage'] . "/' />", $tpl, $repeat);
+ }
+
+ if (@is_object($xoTheme->plugins['xos_logos_PageBuilder'])) {
+ $aggreg =& $xoTheme->plugins['xos_logos_PageBuilder'];
+ // Backward compatibility code for pre 2.0.14 themes
+ $xoopsTpl->assign_by_ref('xoops_lblocks', $aggreg->blocks['canvas_left']);
+ $xoopsTpl->assign_by_ref('xoops_rblocks', $aggreg->blocks['canvas_right']);
+ $xoopsTpl->assign_by_ref('xoops_ccblocks', $aggreg->blocks['page_topcenter']);
+ $xoopsTpl->assign_by_ref('xoops_clblocks', $aggreg->blocks['page_topleft']);
+ $xoopsTpl->assign_by_ref('xoops_crblocks', $aggreg->blocks['page_topright']);
+ $xoopsTpl->assign('xoops_showlblock', !empty($aggreg->blocks['canvas_left']));
+ $xoopsTpl->assign('xoops_showrblock', !empty($aggreg->blocks['canvas_right']));
+ $xoopsTpl->assign('xoops_showcblock', !empty($aggreg->blocks['page_topcenter']) || !empty($aggreg->blocks['page_topleft']) || !empty($aggreg->blocks['page_topright']));
+ }
+
+ // Sets cache time
+ if (!empty($xoopsModule)) {
+ $xoTheme->contentCacheLifetime = @$xoopsConfig['module_cache'][$xoopsModule->getVar('mid', 'n')];
+ // Tricky solution for setting cache time for homepage
+ } else if (!empty($xoopsOption['template_main']) && $xoopsOption['template_main'] == 'db:system_homepage.html') {
+ $xoTheme->contentCacheLifetime = 604800;
+ }
+
+ if ($xoTheme->checkCache()) {
+ $xoopsPreload->triggerEvent('core.header.cache.end');
+ exit();
+ }
+
+ if (!isset($xoopsOption['template_main']) && $xoopsModule) {
+ // new themes using Smarty does not have old functions that are required in old modules, so include them now
+ include $GLOBALS['xoops']->path('include/old_theme_functions.php');
+ // need this also
+ $xoopsTheme['thename'] = $xoopsConfig['theme_set'];
+ ob_start();
+ }
+
+ $xoopsLogger->stopTime('XOOPS output init');
+ $xoopsLogger->startTime('Module display');
+}
+
+$xoopsPreload->triggerEvent('core.header.end');
+?>
\ No newline at end of file
Added: XoopsModules/xortify/releases/2.99/extras/htdocs/modules/xortify/include/post.header.footer.php
===================================================================
--- XoopsModules/xortify/releases/2.99/extras/htdocs/modules/xortify/include/post.header.footer.php (rev 0)
+++ XoopsModules/xortify/releases/2.99/extras/htdocs/modules/xortify/include/post.header.footer.php 2011-12-15 06:23:04 UTC (rev 8495)
@@ -0,0 +1,15 @@
+<?php
+/**
+ * @package xortify
+ * @subpackage module
+ * @description Sector Network Security Drone
+ * @author Simon Roberts WISHCRAFT <si...@ch...>
+ * @copyright copyright (c) 2010-2013 XOOPS.org
+ * @licence GPL 2.0 - see docs/LICENCE.txt
+ */
+
+ set_time_limit(1800);
+ include_once (XOOPS_ROOT_PATH.'/modules/xortify/providers/providers.php');
+ $check = new Providers('footerpostcheck');
+
+?>
\ No newline at end of file
Added: XoopsModules/xortify/releases/2.99/extras/htdocs/modules/xortify/preloads/core.php
===================================================================
--- XoopsModules/xortify/releases/2.99/extras/htdocs/modules/xortify/preloads/core.php (rev 0)
+++ XoopsModules/xortify/releases/2.99/extras/htdocs/modules/xortify/preloads/core.php 2011-12-15 06:23:04 UTC (rev 8495)
@@ -0,0 +1,99 @@
+<?php
+/**
+ * @package xortify
+ * @subpackage module
+ * @description Sector Nexoork Security Drone
+ * @author Simon Roberts WISHCRAFT <si...@ch...>
+ * @author Richardo Costa TRABIS
+ * @copyright copyright (c) 2010-2013 XOOPS.org
+ * @licence GPL 2.0 - see docs/LICENCE.txt
+ */
+
+defined('XOOPS_ROOT_PATH') or die('Restricted access');
+
+
+class XortifyCorePreload extends XoopsPreloadItem
+{
+
+ function eventCoreIncludeCommonStart($args)
+ {
+ include_once XOOPS_ROOT_PATH . ( '/modules/xortify/include/pre.loader.mainfile.php' );
+
+ }
+
+ function eventCoreIncludeCommonEnd($args)
+ {
+
+ xoops_load('xoopscache');
+ if (!class_exists('XoopsCache')) {
+ // XOOPS 2.4 Compliance
+ xoops_load('cache');
+ if (!class_exists('XoopsCache')) {
+ include_once XOOPS_ROOT_PATH.'/class/cache/xoopscache.php';
+ }
+ }
+ $module_handler = xoops_gethandler('module');
+ $config_handler = xoops_gethandler('config');
+ $xoMod = $module_handler->getByDirname('xortify');
+ if (is_object($xoMod)) {
+ $xoConfig = $config_handler->getConfigList($xoMod->getVar('mid'));
+ switch ($xoConfig['crontype']) {
+ case 'preloader':
+ if (!$read = XoopsCache::read('xortify_pause_preload')) {
+ XoopsCache::write('xortify_pause_preload', true, $xoConfig['croninterval']);
+ $GLOBALS['xortify_preloader']=true;
+ ob_start();
+ include(XOOPS_ROOT_PATH.'/modules/xortify/cron/serverup.php');
+ ob_end_clean();
+ }
+ break;
+ }
+ }
+
+ if (XortifyCorePreload::hasAPIUserPass())
+ if (XortifyCorePreload::isActive()) {
+ include_once XOOPS_ROOT_PATH . ( '/modules/xortify/include/post.loader.mainfile.php' );
+ }
+
+ }
+
+ function eventCoreHeaderCacheEnd($args)
+ {
+ if (XortifyCorePreload::hasAPIUserPass())
+ if (XortifyCorePreload::isActive()) {
+ include_once XOOPS_ROOT_PATH . ( '/modules/xortify/include/post.header.footer.php' );
+ }
+ }
+
+ function eventCoreFooterEnd($args)
+ {
+ if (XortifyCorePreload::hasAPIUserPass())
+ if (XortifyCorePreload::isActive()) {
+ include_once XOOPS_ROOT_PATH . ( '/modules/xortify/include/post.header.footer.php' );
+ }
+ }
+
+ function isActive()
+ {
+ $module_handler =& xoops_getHandler('module');
+ $module = $module_handler->getByDirname('xortify');
+ return ($module && $module->getVar('isactive')) ? ($module->getVar('version')<240) ? false : true : false;
+ }
+
+ function hasAPIUserPass()
+ {
+ $module_handler =& xoops_getHandler('module');
+ $config_handler =& xoops_getHandler('config');
+ $xoModule = $module_handler->getByDirname('xortify');
+ if (is_object($xoModule)) {
+ $xoconfigs = $config_handler->getConfigList($xoModule->getVar('mid'));
+ if ($xoconfigs['xortify_username']!=''&&$xoconfigs['xortify_password']!='')
+ return true;
+ else
+ return false;
+ } else
+ return false;
+ }
+}
+
+?>
\ No newline at end of file
Added: XoopsModules/xortify/releases/2.99/htdocs/Frameworks/moduleclasses/icons/32/access.list.png
===================================================================
(Binary files differ)
Property changes on: XoopsModules/xortify/releases/2.99/htdocs/Frameworks/moduleclasses/icons/32/access.list.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/xortify/releases/2.99/htdocs/Frameworks/moduleclasses/icons/32/current.bans.png
===================================================================
(Binary files differ)
Property changes on: XoopsModules/xortify/releases/2.99/htdocs/Frameworks/moduleclasses/icons/32/current.bans.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/xortify/releases/2.99/htdocs/Frameworks/moduleclasses/icons/32/xortify.log.png
===================================================================
(Binary files differ)
Property changes on: XoopsModules/xortify/releases/2.99/htdocs/Frameworks/moduleclasses/icons/32/xortify.log.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/admin/index.html
===================================================================
--- XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/admin/index.html (rev 0)
+++ XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/admin/index.html 2011-12-15 06:23:04 UTC (rev 8495)
@@ -0,0 +1,10 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<title>Untitled Document</title>
+</head>
+
+<body>
+</body>
+</html>
Added: XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/admin/index.php
===================================================================
--- XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/admin/index.php (rev 0)
+++ XoopsModules/xortify/releases/2.99/htdocs/modules/xortify/admin/index.php 2011-12-15 06:23:04 UTC (rev 8495)
@@ -0,0 +1,439 @@
+<?php
+/**
+ * @package xortify
+ * @subpackage module
+ * @description Sector Network Security Drone
+ * @author Simon Roberts WISHCRAFT <si...@ch...>
+ * @copyright copyright (c) 2010-2013 XOOPS.org
+ * @licence GPL 2.0 - see docs/LICENCE.txt
+ */
+
+
+ include('../../../include/cp_header.php');
+
+ if (!defined('_CHARSET'))
+ define ("_CHARSET","UTF-8");
+ if (!defined('_CHARSET_ISO'))
+ define ("_CHARSET_ISO","ISO-8859-1");
+
+ $GLOBALS['myts'] = MyTextSanitizer::getInstance();
+
+ $module_handler = xoops_gethandler('module');
+ $config_handler = xoops_gethandler('config');
+ $GLOBALS['xortifyModule'] = $module_handler->getByDirname('xortify');
+ $GLOBALS['xortifyModuleConfig'] = $config_handler->getConfigList($GLOBALS['xortifyModule']->getVar('mid'));
+
+ xoops_load('pagenav');
+ xoops_load('xoopslists');
+ xoops_load('xoopsformloader');
+
+ include_once $GLOBALS['xoops']->path('class'.DS.'xoopsmailer.php');
+ include_once $GLOBALS['xoops']->path('class'.DS.'xoopstree.php');
+ include_once $GLOBALS['xoops']->path('modules'.DS.'xortify'.DS.'include'.DS.'functions.php');
+ include_once $GLOBALS['xoops']->path('modules'.DS.'xortify'.DS.'include'.DS.'forms.xortify.php');
+
+ if ( file_exists($GLOBALS['xoops']->path('/Frameworks/moduleclasses/moduleadmin/moduleadmin.php'))){
+ include_once $GLOBALS['xoops']->path('/Frameworks/moduleclasses/moduleadmin/moduleadmin.php');
+ //return true;
+ }else{
+ echo xoops_error("Error: You don't use the Frameworks \"admin module\". Please install this Frameworks");
+ //return false;
+ }
+ $GLOBALS['xortifyImageIcon'] = XOOPS_URL .'/'. $GLOBALS['xortifyModule']->getInfo('icons16');
+ $GLOBALS['xortifyImageAdmin'] = XOOPS_URL .'/'. $GLOBALS['xortifyModule']->getInfo('icons32');
+
+ $myts =& MyTextSanitizer::getInstance();
+
+ if ($GLOBALS['xoopsUser']) {
+ $moduleperm_handler =& xoops_gethandler('groupperm');
+ if (!$moduleperm_handler->checkRight('module_admin', $GLOBALS['xortifyModule']->getVar( 'mid' ), $GLOBALS['xoopsUser']->getGroups())) {
+ redirect_header(XOOPS_URL, 1, _NOPERM);
+ exit();
+ }
+ } else {
+ redirect_header(XOOPS_URL . "/user.php", 1, _NOPERM);
+ exit();
+ }
+
+ xoops_cp_header();
+
+ if (!isset($GLOBALS['xoopsTpl']) || !is_object($GLOBALS['xoopsTpl'])) {
+ include_once(XOOPS_ROOT_PATH."/class/template.php");
+ $GLOBALS['xoopsTpl'] = new XoopsTpl();
+ }
+
+ $GLOBALS['xoopsTpl']->assign('pathImageIcon', $GLOBALS['xortifyImageIcon']);
+ $GLOBALS['xoopsTpl']->assign('pathImageAdmin', $GLOBALS['xortifyImageAdin']);
+
+ $op = isset($_REQUEST['op'])?$_REQUEST['op']:"dashboard";
+ $fct = isset($_REQUEST['fct'])?$_REQUEST['fct']:"";
+
+ switch($op) {
+ case "signup":
+
+ switch ($fct)
+ {
+ case "save":
+
+ $xortifyAuth =& XortifyAuthFactory::getAuthConnection(false, $GLOBALS['xortifyModuleConfig']['protocol']);
+ $myts =& MyTextSanitizer::getInstance();
+ $uname = isset($_POST['uname']) ? $myts->stripSlashesGPC(trim($_POST['uname'])) : '';
+ $email = isset($_POST['email']) ? $myts->stripSlashesGPC(trim($_POST['email'])) : '';
+ $url = isset($_POST['url']) ? $myts->stripSlashesGPC(trim($_POST['url'])) : '';
+ $pass = isset($_POST['pass']) ? $myts->stripSlashesGPC(trim($_POST['pass'])) : '';
+ $vpass = isset($_POST['vpass']) ? $myts->stripSlashesGPC(trim($_POST['vpass'])) : '';
+ $agree = (isset($_POST['agree']) && intval($_POST['agree'])) ? 1 : 0;
+
+ if ($agree != 1) {
+ $stop .= _US_UNEEDAGREE . '<br />';
+ }
+
+ $validate = $xortifyAuth->validate($uname, $email, $pass, $vpass);
+
+ if ($validate!=false)
+ $stop .= "User details didn't validate with Xortify.com<br/>$validate";
+
+ xoops_load("captcha");
+ $xoopsCaptcha = XoopsCaptcha::getInstance();
+ if (! $xoopsCaptcha->verify() ) {
+ $stop .= $xoopsCaptcha->getMessage();
+ }
+
+ if ($stop!='') {
+ xortify_adminMenu(2);
+ echo "<p ...
[truncated message content] |
|
From: <wis...@us...> - 2011-12-15 04:48:17
|
Revision: 8494
http://xoops.svn.sourceforge.net/xoops/?rev=8494&view=rev
Author: wishcraft
Date: 2011-12-15 04:48:07 +0000 (Thu, 15 Dec 2011)
Log Message:
-----------
Xortify 3.02 Stable - Cloud Security for XOOPS 2.6 - bundle (node xortify.com to be moved to hosted at xoops.org)
Added Paths:
-----------
XoopsModules/myalbum/branches/wishcraft/3.02/
XoopsModules/myalbum/branches/wishcraft/3.02/docs/
XoopsModules/myalbum/branches/wishcraft/3.02/docs/INSTALL
XoopsModules/myalbum/branches/wishcraft/3.02/docs/UPGRADE
XoopsModules/myalbum/branches/wishcraft/3.02/docs/licence.txt
XoopsModules/myalbum/branches/wishcraft/3.02/htdocs/
XoopsModules/myalbum/branches/wishcraft/3.02/htdocs/Frameworks/
XoopsModules/myalbum/branches/wishcraft/3.02/htdocs/Frameworks/moduleclasses/
XoopsModules/myalbum/branches/wishcraft/3.02/htdocs/Frameworks/moduleclasses/icons/
XoopsModules/myalbum/branches/wishcraft/3.02/htdocs/Frameworks/moduleclasses/icons/32/
XoopsModules/myalbum/branches/wishcraft/3.02/htdocs/Frameworks/moduleclasses/icons/32/access.list.png
XoopsModules/myalbum/branches/wishcraft/3.02/htdocs/Frameworks/moduleclasses/icons/32/current.bans.png
XoopsModules/myalbum/branches/wishcraft/3.02/htdocs/Frameworks/moduleclasses/icons/32/xortify.log.png
XoopsModules/myalbum/branches/wishcraft/3.02/htdocs/modules/
XoopsModules/myalbum/branches/wishcraft/3.02/htdocs/modules/xortify/
XoopsModules/myalbum/branches/wishcraft/3.02/htdocs/modules/xortify/admin/
XoopsModules/myalbum/branches/wishcraft/3.02/htdocs/modules/xortify/admin/index.html
XoopsModules/myalbum/branches/wishcraft/3.02/htdocs/modules/xortify/admin/index.php
XoopsModules/myalbum/branches/wishcraft/3.02/htdocs/modules/xortify/admin/menu.php
XoopsModules/myalbum/branches/wishcraft/3.02/htdocs/modules/xortify/class/
XoopsModules/myalbum/branches/wishcraft/3.02/htdocs/modules/xortify/class/auth/
XoopsModules/myalbum/branches/wishcraft/3.02/htdocs/modules/xortify/class/auth/auth.php
XoopsModules/myalbum/branches/wishcraft/3.02/htdocs/modules/xortify/class/auth/auth_curl.php
XoopsModules/myalbum/branches/wishcraft/3.02/htdocs/modules/xortify/class/auth/auth_curl_provisionning.php
XoopsModules/myalbum/branches/wishcraft/3.02/htdocs/modules/xortify/class/auth/auth_curlserialised.php
XoopsModules/myalbum/branches/wishcraft/3.02/htdocs/modules/xortify/class/auth/auth_curlserialised_provisionning.php
XoopsModules/myalbum/branches/wishcraft/3.02/htdocs/modules/xortify/class/auth/auth_curlxml.php
XoopsModules/myalbum/branches/wishcraft/3.02/htdocs/modules/xortify/class/auth/auth_curlxml_provisionning.php
XoopsModules/myalbum/branches/wishcraft/3.02/htdocs/modules/xortify/class/auth/auth_json.php
XoopsModules/myalbum/branches/wishcraft/3.02/htdocs/modules/xortify/class/auth/auth_json_provisionning.php
XoopsModules/myalbum/branches/wishcraft/3.02/htdocs/modules/xortify/class/auth/auth_soap.php
XoopsModules/myalbum/branches/wishcraft/3.02/htdocs/modules/xortify/class/auth/auth_soap_provisionning.php
XoopsModules/myalbum/branches/wishcraft/3.02/htdocs/modules/xortify/class/auth/auth_wgetserialised.php
XoopsModules/myalbum/branches/wishcraft/3.02/htdocs/modules/xortify/class/auth/auth_wgetserialised_provisionning.php
XoopsModules/myalbum/branches/wishcraft/3.02/htdocs/modules/xortify/class/auth/auth_wgetxml.php
XoopsModules/myalbum/branches/wishcraft/3.02/htdocs/modules/xortify/class/auth/auth_wgetxml_provisionning.php
XoopsModules/myalbum/branches/wishcraft/3.02/htdocs/modules/xortify/class/auth/authfactory.php
XoopsModules/myalbum/branches/wishcraft/3.02/htdocs/modules/xortify/class/auth/index.html
XoopsModules/myalbum/branches/wishcraft/3.02/htdocs/modules/xortify/class/curl.php
XoopsModules/myalbum/branches/wishcraft/3.02/htdocs/modules/xortify/class/curlserialised.php
XoopsModules/myalbum/branches/wishcraft/3.02/htdocs/modules/xortify/class/curlxml.php
XoopsModules/myalbum/branches/wishcraft/3.02/htdocs/modules/xortify/class/index.html
XoopsModules/myalbum/branches/wishcraft/3.02/htdocs/modules/xortify/class/json.php
XoopsModules/myalbum/branches/wishcraft/3.02/htdocs/modules/xortify/class/log.php
XoopsModules/myalbum/branches/wishcraft/3.02/htdocs/modules/xortify/class/soap.php
XoopsModules/myalbum/branches/wishcraft/3.02/htdocs/modules/xortify/class/wgetserialised.php
XoopsModules/myalbum/branches/wishcraft/3.02/htdocs/modules/xortify/class/wgetxml.php
XoopsModules/myalbum/branches/wishcraft/3.02/htdocs/modules/xortify/cron/
XoopsModules/myalbum/branches/wishcraft/3.02/htdocs/modules/xortify/cron/index.html
XoopsModules/myalbum/branches/wishcraft/3.02/htdocs/modules/xortify/cron/serverup.php
XoopsModules/myalbum/branches/wishcraft/3.02/htdocs/modules/xortify/docs/
XoopsModules/myalbum/branches/wishcraft/3.02/htdocs/modules/xortify/docs/changelog.txt
XoopsModules/myalbum/branches/wishcraft/3.02/htdocs/modules/xortify/docs/credits.txt
XoopsModules/myalbum/branches/wishcraft/3.02/htdocs/modules/xortify/docs/index.html
XoopsModules/myalbum/branches/wishcraft/3.02/htdocs/modules/xortify/docs/install.txt
XoopsModules/myalbum/branches/wishcraft/3.02/htdocs/modules/xortify/docs/lang_diff.txt
XoopsModules/myalbum/branches/wishcraft/3.02/htdocs/modules/xortify/docs/licence.txt
XoopsModules/myalbum/branches/wishcraft/3.02/htdocs/modules/xortify/docs/readme.txt
XoopsModules/myalbum/branches/wishcraft/3.02/htdocs/modules/xortify/images/
XoopsModules/myalbum/branches/wishcraft/3.02/htdocs/modules/xortify/images/accessdenied.png
XoopsModules/myalbum/branches/wishcraft/3.02/htdocs/modules/xortify/images/index.html
XoopsModules/myalbum/branches/wishcraft/3.02/htdocs/modules/xortify/images/left_both.gif
XoopsModules/myalbum/branches/wishcraft/3.02/htdocs/modules/xortify/images/right_both.gif
XoopsModules/myalbum/branches/wishcraft/3.02/htdocs/modules/xortify/images/xortify_slogo.png
XoopsModules/myalbum/branches/wishcraft/3.02/htdocs/modules/xortify/include/
XoopsModules/myalbum/branches/wishcraft/3.02/htdocs/modules/xortify/include/JSON.php
XoopsModules/myalbum/branches/wishcraft/3.02/htdocs/modules/xortify/include/forms.objects.php
XoopsModules/myalbum/branches/wishcraft/3.02/htdocs/modules/xortify/include/forms.xortify.php
XoopsModules/myalbum/branches/wishcraft/3.02/htdocs/modules/xortify/include/functions.php
XoopsModules/myalbum/branches/wishcraft/3.02/htdocs/modules/xortify/include/install.php
XoopsModules/myalbum/branches/wishcraft/3.02/htdocs/modules/xortify/include/post.header.addmeta.php
XoopsModules/myalbum/branches/wishcraft/3.02/htdocs/modules/xortify/include/post.header.endcache.php
XoopsModules/myalbum/branches/wishcraft/3.02/htdocs/modules/xortify/include/post.loader.mainfile.php
XoopsModules/myalbum/branches/wishcraft/3.02/htdocs/modules/xortify/include/pre.loader.mainfile.php
XoopsModules/myalbum/branches/wishcraft/3.02/htdocs/modules/xortify/include/update.php
XoopsModules/myalbum/branches/wishcraft/3.02/htdocs/modules/xortify/index.html
XoopsModules/myalbum/branches/wishcraft/3.02/htdocs/modules/xortify/language/
XoopsModules/myalbum/branches/wishcraft/3.02/htdocs/modules/xortify/language/english/
XoopsModules/myalbum/branches/wishcraft/3.02/htdocs/modules/xortify/language/english/admin.php
XoopsModules/myalbum/branches/wishcraft/3.02/htdocs/modules/xortify/language/english/ban.php
XoopsModules/myalbum/branches/wishcraft/3.02/htdocs/modules/xortify/language/english/help/
XoopsModules/myalbum/branches/wishcraft/3.02/htdocs/modules/xortify/language/english/help/help.html
XoopsModules/myalbum/branches/wishcraft/3.02/htdocs/modules/xortify/language/english/help/index.html
XoopsModules/myalbum/branches/wishcraft/3.02/htdocs/modules/xortify/language/english/index.html
XoopsModules/myalbum/branches/wishcraft/3.02/htdocs/modules/xortify/language/english/main.php
XoopsModules/myalbum/branches/wishcraft/3.02/htdocs/modules/xortify/language/english/modinfo.php
XoopsModules/myalbum/branches/wishcraft/3.02/htdocs/modules/xortify/language/index.html
XoopsModules/myalbum/branches/wishcraft/3.02/htdocs/modules/xortify/plugin/
XoopsModules/myalbum/branches/wishcraft/3.02/htdocs/modules/xortify/plugin/index.html
XoopsModules/myalbum/branches/wishcraft/3.02/htdocs/modules/xortify/plugin/projecthoneypot.org.php
XoopsModules/myalbum/branches/wishcraft/3.02/htdocs/modules/xortify/plugin/protector.php
XoopsModules/myalbum/branches/wishcraft/3.02/htdocs/modules/xortify/plugin/spiders.php
XoopsModules/myalbum/branches/wishcraft/3.02/htdocs/modules/xortify/plugin/stopforumspam.com.php
XoopsModules/myalbum/branches/wishcraft/3.02/htdocs/modules/xortify/plugin/xortify.php
XoopsModules/myalbum/branches/wishcraft/3.02/htdocs/modules/xortify/preloads/
XoopsModules/myalbum/branches/wishcraft/3.02/htdocs/modules/xortify/preloads/core.php
XoopsModules/myalbum/branches/wishcraft/3.02/htdocs/modules/xortify/preloads/index.html
XoopsModules/myalbum/branches/wishcraft/3.02/htdocs/modules/xortify/providers/
XoopsModules/myalbum/branches/wishcraft/3.02/htdocs/modules/xortify/providers/index.html
XoopsModules/myalbum/branches/wishcraft/3.02/htdocs/modules/xortify/providers/projecthoneypot.org/
XoopsModules/myalbum/branches/wishcraft/3.02/htdocs/modules/xortify/providers/projecthoneypot.org/post.loader.php
XoopsModules/myalbum/branches/wishcraft/3.02/htdocs/modules/xortify/providers/protector/
XoopsModules/myalbum/branches/wishcraft/3.02/htdocs/modules/xortify/providers/protector/footer.post.loader.php
XoopsModules/myalbum/branches/wishcraft/3.02/htdocs/modules/xortify/providers/protector/header.post.loader.php
XoopsModules/myalbum/branches/wishcraft/3.02/htdocs/modules/xortify/providers/protector/index.html
XoopsModules/myalbum/branches/wishcraft/3.02/htdocs/modules/xortify/providers/providers.php
XoopsModules/myalbum/branches/wishcraft/3.02/htdocs/modules/xortify/providers/spiders/
XoopsModules/myalbum/branches/wishcraft/3.02/htdocs/modules/xortify/providers/spiders/post.loader.php
XoopsModules/myalbum/branches/wishcraft/3.02/htdocs/modules/xortify/providers/stopforumspam.com/
XoopsModules/myalbum/branches/wishcraft/3.02/htdocs/modules/xortify/providers/stopforumspam.com/post.loader.php
XoopsModules/myalbum/branches/wishcraft/3.02/htdocs/modules/xortify/providers/xortify/
XoopsModules/myalbum/branches/wishcraft/3.02/htdocs/modules/xortify/providers/xortify/footer.post.loader.php
XoopsModules/myalbum/branches/wishcraft/3.02/htdocs/modules/xortify/providers/xortify/header.post.loader.php
XoopsModules/myalbum/branches/wishcraft/3.02/htdocs/modules/xortify/providers/xortify/index.html
XoopsModules/myalbum/branches/wishcraft/3.02/htdocs/modules/xortify/providers/xortify/post.loader.php
XoopsModules/myalbum/branches/wishcraft/3.02/htdocs/modules/xortify/sql/
XoopsModules/myalbum/branches/wishcraft/3.02/htdocs/modules/xortify/sql/index.html
XoopsModules/myalbum/branches/wishcraft/3.02/htdocs/modules/xortify/sql/mysql.sql
XoopsModules/myalbum/branches/wishcraft/3.02/htdocs/modules/xortify/templates/
XoopsModules/myalbum/branches/wishcraft/3.02/htdocs/modules/xortify/templates/admin/
XoopsModules/myalbum/branches/wishcraft/3.02/htdocs/modules/xortify/templates/admin/xortify_cpanel_bans.html
XoopsModules/myalbum/branches/wishcraft/3.02/htdocs/modules/xortify/templates/admin/xortify_cpanel_log.html
XoopsModules/myalbum/branches/wishcraft/3.02/htdocs/modules/xortify/templates/admin/xortify_cpanel_signup_form.html
XoopsModules/myalbum/branches/wishcraft/3.02/htdocs/modules/xortify/templates/admin/xortify_cpanel_signup_nocommunication.html
XoopsModules/myalbum/branches/wishcraft/3.02/htdocs/modules/xortify/templates/index.html
XoopsModules/myalbum/branches/wishcraft/3.02/htdocs/modules/xortify/templates/xortify_banning_notice.html
XoopsModules/myalbum/branches/wishcraft/3.02/htdocs/modules/xortify/xoops_version.php
Added: XoopsModules/myalbum/branches/wishcraft/3.02/docs/INSTALL
===================================================================
--- XoopsModules/myalbum/branches/wishcraft/3.02/docs/INSTALL (rev 0)
+++ XoopsModules/myalbum/branches/wishcraft/3.02/docs/INSTALL 2011-12-15 04:48:07 UTC (rev 8494)
@@ -0,0 +1,75 @@
++-----------------------------------------------------------------------------------+
+| |
+| XXX XXX OOOOO RRRRR TTTTTT IIIIII FFFFFF YYY YYY |
+| XX XX OO OO RR RR TT II FF YY YY |
+| XXX OO OO RRRR TT II FFFF YYYY |
+| XX XX OO OO RR RR TT II FF YY |
+| XXX XXX OOOOO RR RR TT IIIIII FF YY version 2.48 |
+| |
++----[ NETWORK SECTOR SECURITY ]----------------------------------------------------+
+| |
+| Install the Providers Xortify support currently these are: |
+| |
+| * XOOPS Protector (Based in 3.22) |
+| * Xortify Network Security Drone |
+| |
+| Sign up a username for Xortify.com you can do this in the module if everything |
+| is working fine and there isn't any problem with the API SOAP communications. |
+| |
+| You will recieve an activation notice but you account will already be active. |
+| |
+| You will need to alter mainfile.php and do the following:: |
+| |
+| * DO NOT INSTALL PROTECTOR IN THE MAINFILE - Xortify will call this for you |
+| |
+| Xortify is also fited with the XOOPS 2.4 Series Preloads you will not need to |
+| do steps 2 and 3 with XOOPS 2.4 and later series. |
+| |
++--[ Step 1 - Installing Cron ]-----------------------------------------------------+
+| |
+| You will need to install the following cron within your cronjobs section of your |
+| Wesite, if you are using a windows server in WAMP then you will need to schedule |
+| this as a task, remember to change the path to suit your configuration. |
+| |
+| command to run every minute to once an hour, make sure it is within your cache |
+| refresh time. This is the or unix based systems the following is for windows |
+| |
+| /usr/bin/php -q /home/yoursite/public_html/modules/xortify/cron/serverup.php |
+| |
+| Assuming you have your PHP added to your executable path this is the scheduled |
+| task to run on a windows environment. |
+| |
+| php.exe -q c:\htdocs\modules\xortify\cron\serverup.php |
+| |
+| Some of the paths in these examples for executables or the cron file may be |
+| different and you will have to alter them to your needs. |
+| |
++--[ Step 2 - mainfile.php (pre 2.4 series) ]---------------------------------------+
+| |
+| You will need to change the following the main file has the following code on it |
+| |
+| [code] |
+| if (!isset($xoopsOption["nocommon"]) && XOOPS_ROOT_PATH != "") { |
+| include XOOPS_ROOT_PATH."/include/common.php"; |
+| } |
+| [/code] |
+| |
+| You will need to alter that to this after it is all install. |
+| |
+| [code] |
+| @include( XOOPS_ROOT_PATH.'/modules/xortify/include/pre.loader.mainfile.php' ); |
+| if (!isset($xoopsOption["nocommon"]) && XOOPS_ROOT_PATH != "") { |
+| include XOOPS_ROOT_PATH."/include/common.php"; |
+| } |
+| @include( XOOPS_ROOT_PATH.'/modules/xortify/include/post.loader.mainfile.php' ); |
+| [/code] |
+| |
++--[ Step 3 - header.php (pre 2.4 series) ]----------------------------------------+
+| |
+| Below the lin of footer.php which reads $xoopsTpl =& $xoTheme->template; |
+| |
+| [code] |
+| @include( XOOPS_ROOT_PATH.'/modules/xortify/include/post.add.meta.php' ); |
+| [/code] |
+| |
++-----------------------------------------------------------------------------------+
\ No newline at end of file
Added: XoopsModules/myalbum/branches/wishcraft/3.02/docs/UPGRADE
===================================================================
--- XoopsModules/myalbum/branches/wishcraft/3.02/docs/UPGRADE (rev 0)
+++ XoopsModules/myalbum/branches/wishcraft/3.02/docs/UPGRADE 2011-12-15 04:48:07 UTC (rev 8494)
@@ -0,0 +1,75 @@
++-----------------------------------------------------------------------------------+
+| |
+| XXX XXX OOOOO RRRRR TTTTTT IIIIII FFFFFF YYY YYY |
+| XX XX OO OO RR RR TT II FF YY YY |
+| XXX OO OO RRRR TT II FFFF YYYY |
+| XX XX OO OO RR RR TT II FF YY |
+| XXX XXX OOOOO RR RR TT IIIIII FF YY version 2.30 |
+| |
++----[ NETWORK SECTOR SECURITY ]----------------------------------------------------+
+| |
+| Install the Providers Xortify support currently these are: |
+| |
+| * XOOPS Protector (Based in 3.22) |
+| * Xortify Network Security Drone |
+| |
+| Make sure you delete the 'providers' folder in the existing module then upload |
+| Xortify 2.30. Once you have install the file base this way you will remember |
+| to upgrade the module in the system modules application in the xoops system |
+| menu you will need to then goto the preferences and make sure you are running |
+| the protector provider if you are running protector this will populate the |
+| cloud with your bans that come in protector as well:: |
+| |
+| * DO NOT INSTALL PROTECTOR IN THE MAINFILE - Xortify will call this for you |
+| |
+| Xortify is also fited with the XOOPS 2.4 Series Preloads you will not need to |
+| do steps 2 and 3 with XOOPS 2.4 and later series. |
+| |
++--[ Step 1 - Installing Cron ]-----------------------------------------------------+
+| |
+| You will need to install the following cron within your cronjobs section of your |
+| Wesite, if you are using a windows server in WAMP then you will need to schedule |
+| this as a task, remember to change the path to suit your configuration. |
+| |
+| command to run every minute to once an hour, make sure it is within your cache |
+| refresh time. This is the or unix based systems the following is for windows |
+| |
+| /usr/bin/php -q /home/yoursite/public_html/modules/xortify/cron/serverup.php |
+| |
+| Assuming you have your PHP added to your executable path this is the scheduled |
+| task to run on a windows environment. |
+| |
+| php.exe -q c:\htdocs\modules\xortify\cron\serverup.php |
+| |
+| Some of the paths in these examples for executables or the cron file may be |
+| different and you will have to alter them to your needs. |
+| |
++--[ Step 2 - mainfile.php ]--------------------------------------------------------+
+| |
+| You will need to change the following the main file has the following code on it |
+| |
+| [code] |
+| if (!isset($xoopsOption["nocommon"]) && XOOPS_ROOT_PATH != "") { |
+| include XOOPS_ROOT_PATH."/include/common.php"; |
+| } |
+| [/code] |
+| |
+| You will need to alter that to this after it is all install. |
+| |
+| [code] |
+| @include( XOOPS_ROOT_PATH.'/modules/xortify/include/pre.loader.mainfile.php' ); |
+| if (!isset($xoopsOption["nocommon"]) && XOOPS_ROOT_PATH != "") { |
+| include XOOPS_ROOT_PATH."/include/common.php"; |
+| } |
+| @include( XOOPS_ROOT_PATH.'/modules/xortify/include/post.loader.mainfile.php' ); |
+| [/code] |
+| |
++--[ Step 3 - footer.php ----------------------------------------------------------+
+| |
+| At the bottom of footer.php place this line without the [|] Of course. |
+| |
+| [code] |
+| @include( XOOPS_ROOT_PATH.'/modules/xortify/include/post.loader.footer.php' ); |
+| [/code] |
+| |
++-----------------------------------------------------------------------------------+
\ No newline at end of file
Added: XoopsModules/myalbum/branches/wishcraft/3.02/docs/licence.txt
===================================================================
--- XoopsModules/myalbum/branches/wishcraft/3.02/docs/licence.txt (rev 0)
+++ XoopsModules/myalbum/branches/wishcraft/3.02/docs/licence.txt 2011-12-15 04:48:07 UTC (rev 8494)
@@ -0,0 +1,339 @@
+ GNU GENERAL PUBLIC LICENSE
+ Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+ Preamble
+
+ The licenses for most software are designed to take away your
+freedom to share and change it. By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users. This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it. (Some other Free Software Foundation software is covered by
+the GNU Lesser General Public License instead.) You can apply it to
+your programs, too.
+
+ When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+ To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+ For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have. You must make sure that they, too, receive or can get the
+source code. And you must show them these terms so they know their
+rights.
+
+ We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+ Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software. If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+ Finally, any free program is threatened constantly by software
+patents. We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary. To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+ The precise terms and conditions for copying, distribution and
+modification follow.
+
+ GNU GENERAL PUBLIC LICENSE
+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+ 0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License. The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language. (Hereinafter, translation is included without limitation in
+the term "modification".) Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope. The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+ 1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+ 2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+ a) You must cause the modified files to carry prominent notices
+ stating that you changed the files and the date of any change.
+
+ b) You must cause any work that you distribute or publish, that in
+ whole or in part contains or is derived from the Program or any
+ part thereof, to be licensed as a whole at no charge to all third
+ parties under the terms of this License.
+
+ c) If the modified program normally reads commands interactively
+ when run, you must cause it, when started running for such
+ interactive use in the most ordinary way, to print or display an
+ announcement including an appropriate copyright notice and a
+ notice that there is no warranty (or else, saying that you provide
+ a warranty) and that users may redistribute the program under
+ these conditions, and telling the user how to view a copy of this
+ License. (Exception: if the Program itself is interactive but
+ does not normally print such an announcement, your work based on
+ the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole. If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works. But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+ 3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+ a) Accompany it with the complete corresponding machine-readable
+ source code, which must be distributed under the terms of Sections
+ 1 and 2 above on a medium customarily used for software interchange; or,
+
+ b) Accompany it with a written offer, valid for at least three
+ years, to give any third party, for a charge no more than your
+ cost of physically performing source distribution, a complete
+ machine-readable copy of the corresponding source code, to be
+ distributed under the terms of Sections 1 and 2 above on a medium
+ customarily used for software interchange; or,
+
+ c) Accompany it with the information you received as to the offer
+ to distribute corresponding source code. (This alternative is
+ allowed only for noncommercial distribution and only if you
+ received the program in object code or executable form with such
+ an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it. For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable. However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+ 4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License. Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+ 5. You are not required to accept this License, since you have not
+signed it. However, nothing else grants you permission to modify or
+distribute the Program or its derivative works. These actions are
+prohibited by law if you do not accept this License. Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+ 6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions. You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+ 7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all. For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices. Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+ 8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded. In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+ 9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time. Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number. If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation. If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+ 10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission. For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this. Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+ NO WARRANTY
+
+ 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+ 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+ END OF TERMS AND CONDITIONS
+
+ How to Apply These Terms to Your New Programs
+
+ If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+ To do so, attach the following notices to the program. It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+ <one line to give the program's name and a brief idea of what it does.>
+ Copyright (C) <year> <name of author>
+
+ 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 2 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, write to the Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+ Gnomovision version 69, Copyright (C) year name of author
+ Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+ This is free software, and you are welcome to redistribute it
+ under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License. Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary. Here is a sample; alter the names:
+
+ Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+ `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+ <signature of Ty Coon>, 1 April 1989
+ Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs. If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library. If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.
Added: XoopsModules/myalbum/branches/wishcraft/3.02/htdocs/Frameworks/moduleclasses/icons/32/access.list.png
===================================================================
(Binary files differ)
Property changes on: XoopsModules/myalbum/branches/wishcraft/3.02/htdocs/Frameworks/moduleclasses/icons/32/access.list.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/myalbum/branches/wishcraft/3.02/htdocs/Frameworks/moduleclasses/icons/32/current.bans.png
===================================================================
(Binary files differ)
Property changes on: XoopsModules/myalbum/branches/wishcraft/3.02/htdocs/Frameworks/moduleclasses/icons/32/current.bans.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/myalbum/branches/wishcraft/3.02/htdocs/Frameworks/moduleclasses/icons/32/xortify.log.png
===================================================================
(Binary files differ)
Property changes on: XoopsModules/myalbum/branches/wishcraft/3.02/htdocs/Frameworks/moduleclasses/icons/32/xortify.log.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/myalbum/branches/wishcraft/3.02/htdocs/modules/xortify/admin/index.html
===================================================================
--- XoopsModules/myalbum/branches/wishcraft/3.02/htdocs/modules/xortify/admin/index.html (rev 0)
+++ XoopsModules/myalbum/branches/wishcraft/3.02/htdocs/modules/xortify/admin/index.html 2011-12-15 04:48:07 UTC (rev 8494)
@@ -0,0 +1,10 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<title>Untitled Document</title>
+</head>
+
+<body>
+</body>
+</html>
Added: XoopsModules/myalbum/branches/wishcraft/3.02/htdocs/modules/xortify/admin/index.php
===================================================================
--- XoopsModules/myalbum/branches/wishcraft/3.02/htdocs/modules/xortify/admin/index.php (rev 0)
+++ XoopsModules/myalbum/branches/wishcraft/3.02/htdocs/modules/xortify/admin/index.php 2011-12-15 04:48:07 UTC (rev 8494)
@@ -0,0 +1,444 @@
+<?php
+/**
+ * @package xortify
+ * @subpackage module
+ * @description Sector Network Security Drone
+ * @author Simon Roberts WISHCRAFT <si...@ch...>
+ * @copyright copyright (c) 2010-2013 XOOPS.org
+ * @licence GPL 2.0 - see docs/LICENCE.txt
+ */
+
+
+ include(dirname(dirname(dirname(dirname(__FILE__)))).'/include/cp_header.php');
+
+ $xoops = Xoops::getInstance();
+
+ if (!defined('_CHARSET'))
+ define ("_CHARSET","UTF-8");
+ if (!defined('_CHARSET_ISO'))
+ define ("_CHARSET_ISO","ISO-8859-1");
+
+ $GLOBALS['myts'] = MyTextSanitizer::getInstance();
+
+ $module_handler = $xoops->getHandler('module');
+ $config_handler = $xoops->getHandler('config');
+ $GLOBALS['xortifyModule'] = $module_handler->getByDirname('xortify');
+ $GLOBALS['xortifyModuleConfig'] = $config_handler->getConfigList($GLOBALS['xortifyModule']->getVar('mid'));
+
+ XoopsLoad::load('pagenav');
+ XoopsLoad::load('xoopslists');
+ XoopsLoad::load('xoopsformloader');
+
+ include_once $GLOBALS['xoops']->path('class'.DS.'xoopsmailer.php');
+ include_once $GLOBALS['xoops']->path('class'.DS.'xoopstree.php');
+ include_once $GLOBALS['xoops']->path('modules'.DS.'xortify'.DS.'include'.DS.'functions.php');
+ include_once $GLOBALS['xoops']->path('modules'.DS.'xortify'.DS.'include'.DS.'forms.xortify.php');
+ include_once $GLOBALS['xoops']->path('modules'.DS.'xortify'.DS.'include'.DS.'forms.objects.php');
+ include_once $GLOBALS['xoops']->path('modules'.DS.'xortify'.DS.'class'.DS.'auth'.DS.'authfactory.php');
+
+ if ( file_exists($GLOBALS['xoops']->path('/Frameworks/moduleclasses/moduleadmin/moduleadmin.php'))){
+ include_once $GLOBALS['xoops']->path('/Frameworks/moduleclasses/moduleadmin/moduleadmin.php');
+ //return true;
+ }else{
+ echo $xoops->error("Error: You don't use the Frameworks \"admin module\". Please install this Frameworks");
+ //return false;
+ }
+ $GLOBALS['xortifyImageIcon'] = XOOPS_URL .'/'. $GLOBALS['xortifyModule']->getInfo('icons16');
+ $GLOBALS['xortifyImageAdmin'] = XOOPS_URL .'/'. $GLOBALS['xortifyModule']->getInfo('icons32');
+
+ $myts =& MyTextSanitizer::getInstance();
+
+ if ($GLOBALS['xoopsUser']) {
+ $moduleperm_handler =& $xoops->getHandler('groupperm');
+ if (!$moduleperm_handler->checkRight('module_admin', $GLOBALS['xortifyModule']->getVar( 'mid' ), $GLOBALS['xoopsUser']->getGroups())) {
+ $xoops->redirect(XOOPS_URL, 1, _NOPERM);
+ exit();
+ }
+ } else {
+ $xoops->redirect(XOOPS_URL . "/user.php", 1, _NOPERM);
+ exit();
+ }
+
+ $xoops->loadLanguage('admin', 'xortify');
+ $xoops->loadLanguage('modinfo', 'xortify');
+
+ $xoops->header();
+ $xoops->tpl->assign('pathImageIcon', $GLOBALS['xortifyImageIcon']);
+ $xoops->tpl->assign('pathImageAdmin', $GLOBALS['xortifyImageAdin']);
+
+ $op = isset($_REQUEST['op'])?$_REQUEST['op']:"dashboard";
+ $fct = isset($_REQUEST['fct'])?$_REQUEST['fct']:"";
+
+ switch($op) {
+ case "signup":
+
+ switch ($fct)
+ {
+ case "save":
+
+ $xortifyAuth =& XortifyAuthFactory::getAuthConnection(false, $GLOBALS['xortifyModuleConfig']['protocol']);
+ $myts =& MyTextSanitizer::getInstance();
+ $uname = isset($_POST['uname']) ? $myts->stripSlashesGPC(trim($_POST['uname'])) : '';
+ $email = isset($_POST['email']) ? $myts->stripSlashesGPC(trim($_POST['email'])) : '';
+ $url = isset($_POST['url']) ? $myts->stripSlashesGPC(trim($_POST['url'])) : '';
+ $pass = isset($_POST['pass']) ? $myts->stripSlashesGPC(trim($_POST['pass'])) : '';
+ $vpass = isset($_POST['vpass']) ? $myts->stripSlashesGPC(trim($_POST['vpass'])) : '';
+ $agree = (isset($_POST['agree']) && intval($_POST['agree'])) ? 1 : 0;
+
+ if ($agree != 1) {
+ $stop .= _US_UNEEDAGREE . '<br />';
+ }
+
+ $validate = $xortifyAuth->validate($uname, $email, $pass, $vpass);
+
+ if ($validate!=false)
+ $stop .= "User details didn't validate with Xortify.com<br/>$validate";
+
+ XoopsLoad::load("captcha");
+ $xoopsCaptcha = XoopsCaptcha::getInstance();
+ if (! $xoopsCaptcha->verify() ) {
+ $stop .= $xoopsCaptcha->getMessage();
+ }
+
+ if ($stop!='') {
+
+ echo xortify_adminMenu(2);
+ echo "<p align='center' style='font-size: 15px; color: #FF0000;'>$stop</p>";
+ $GLOBALS['xoops'] = Xoops::getInstance();
+ $xortifyAuth =& XortifyAuthFactory::getAuthConnection(false, $GLOBALS['xortifyModuleConfig']['protocol']);
+ $disclaimer = $xortifyAuth->network_disclaimer();
+ if (strlen(trim($disclaimer))==0)
+ {
+ $disclaimer = _XOR_ADMIN_NONETWORKCOMM_DISCLAIMER;
+ }
+ if ($disclaimer != _XOR_ADMIN_NONETWORKCOMM_DISCLAIMER) {
+ $uname = new XoopsFormText('', "uname", 35, 128, (isset($_POST['uname'])?$_POST['uname']:''));
+ $pass = new XoopsFormPassword('', "pass", 35, 128, (isset($_POST['pass'])?$_POST['pass']:''));
+ $vpass = new XoopsFormPassword('', "vpass", 35, 128, (isset($_POST['vpass'])?$_POST['vpass']:''));
+ $email = new XoopsFormText('', "email", 35, 128, (isset($_POST['email'])?$_POST['email']:''));
+ $url = new XoopsFormText('', "url", 35, 128, (isset($_POST['url'])?$_POST['url']:''));
+ $viewemail = new XoopsFormRadioYN('', "viewemail", (isset($_POST['viewemail'])?$_POST['viewemail']:false));
+ $timezone = new XoopsFormSelectTimezone('', "timezone", (isset($_POST['timezone'])?$_POST['timezone']:''));
+ $myts =& MyTextSanitizer::getInstance();
+ $disclaim = new XoopsFormLabel('', $myts->nl2br($disclaimer));
+ $agree = new XoopsFormRadioYN('', "agree", false);
+ $captcha = new XoopsFormCaptcha('', 'xoopscaptcha', false);
+ $op = new XoopsFormHidden('op', 'signup');
+ $fct = new XoopsFormHidden('fct', 'save');
+ $submit = new XoopsFormButton('', 'submit', _XOR_FRM_REGISTER, 'submit');
+ $GLOBALS['xoops']->tpl->assign('uname',$uname->render());
+ $GLOBALS['xoops']->tpl->assign('pass',$pass->render());
+ $GLOBALS['xoops']->tpl->assign('vpass',$vpass->render());
+ $GLOBALS['xoops']->tpl->assign('email',$email->render());
+ $GLOBALS['xoops']->tpl->assign('url',$url->render());
+ $GLOBALS['xoops']->tpl->assign('viewemail',$viewemail->render());
+ $GLOBALS['xoops']->tpl->assign('timezone',$timezone->render());
+ $GLOBALS['xoops']->tpl->assign('disclaimer',$disclaim->render());
+ $GLOBALS['xoops']->tpl->assign('agree',$agree->render());
+ $GLOBALS['xoops']->tpl->assign('captcha',$captcha->render());
+ $GLOBALS['xoops']->tpl->assign('op',$op->render());
+ $GLOBALS['xoops']->tpl->assign('fct',$fct->render());
+ $GLOBALS['xoops']->tpl->assign('submit',$submit->render());
+ $xoops->tpl->display('admin:xortify|xortify_cpanel_signup_form.html');
+ } else {
+ $GLOBALS['xoops']->tpl->assign('protocol', $GLOBALS['xortifyModuleConfig']['protocol']);
+ switch($GLOBALS['xortifyModuleConfig']['protocol']) {
+ case 'curlserialised':
+ case 'wgetserialised':
+ $GLOBALS['xoops']->tpl->assign('port', $GLOBALS['xortifyModuleConfig']['xortify_uriserial']);
+ break;
+ case 'curl':
+ case 'json':
+ $GLOBALS['xoops']->tpl->assign('port', $GLOBALS['xortifyModuleConfig']['xortify_urijson']);
+ break;
+ case 'curlxml':
+ case 'wgetxml':
+ $GLOBALS['xoops']->tpl->assign('port', $GLOBALS['xortifyModuleConfig']['xortify_urixml']);
+ break;
+ case 'soap':
+ $GLOBALS['xoops']->tpl->assign('port', $GLOBALS['xortifyModuleConfig']['xortify_urisoap']);
+ break;
+ }
+ $GLOBALS['xoops']->tpl->assign('error', $disclaimer);
+ $xoops->tpl->display('admin:xortify|xortify_cpanel_signup_nocommunication.html');
+ }
+ } else {
+ @$xortifyAuth->create_user( $_POST['viewemail'], $uname, $email, $url, $actkey,
+ $pass, $_POST['timezone'], $_POST['mailok'], $xortifyAuth->check_siteinfo(array()));
+
+ $moduleHandler =& $xoops->getHandler('module');
+ $configHandler =& $xoops->getHandler('config');
+ $GLOBALS['xortifyModule'] = $moduleHandler->getByDirname('xortify');
+ $configs = $configHandler->getConfigs(new Criteria('conf_modid', $GLOBALS['xortifyModule']->mid()) );
+ foreach($configs as $id => $config)
+ switch($config->getVar('conf_name')) {
+ case 'xortify_username':
+ $config->setVar('conf_value', $uname);
+ @$configHandler->insertConfig($config);
+ break;
+ case 'xortify_password':
+ $config->setVar('conf_value', $pass);
+ @$configHandler->insertConfig($config);
+ break;
+ }
+
+ $xoops->redirect("index.php", 4, _XOR_USERCREATED_PLEASEACTIVATE);
+ exit(0);
+ }
+ break;
+ default:
+ case "signup":
+ echo xortify_adminMenu(4);
+ $GLOBALS['xoops'] = Xoops::getInstance();
+ $xortifyAuth =& XortifyAuthFactory::getAuthConnection(false, $GLOBALS['xortifyModuleConfig']['protocol']);
+ $disclaimer = $xortifyAuth->network_disclaimer();
+ if (strlen(trim($disclaimer))==0)
+ {
+ $disclaimer = _XOR_ADMIN_NONETWORKCOMM_DISCLAIMER;
+ }
+ if ($disclaimer != _XOR_ADMIN_NONETWORKCOMM_DISCLAIMER) {
+ $uname = new XoopsFormText('', "uname", 35, 128, (isset($_POST['uname'])?$_POST['uname']:''));
+ $pass = new XoopsFormPassword('', "pass", 35, 128, (isset($_POST['pass'])?$_POST['pass']:''));
+ $vpass = new XoopsFormPassword('', "vpass", 35, 128, (isset($_POST['vpass'])?$_POST['vpass']:''));
+ $email = new XoopsFormText('', "email", 35, 128, (isset($_POST['email'])?$_POST['email']:''));
+ $url = new XoopsFormText('', "url", 35, 128, (isset($_POST['url'])?$_POST['url']:''));
+ $viewemail = new XoopsFormRadioYN('', "viewemail", (isset($_POST['viewemail'])?$_POST['viewemail']:false));
+ $timezone = new XoopsFormSelectTimezone('', "timezone", (isset($_POST['timezone'])?$_POST['timezone']:''));
+ $myts =& MyTextSanitizer::getInstance();
+ $disclaim = new XoopsFormLabel('', $myts->nl2br($disclaimer));
+ $agree = new XoopsFormRadioYN('', "agree", false);
+ $captcha = new XoopsFormCaptcha('', 'xoopscaptcha', false);
+ $op = new XoopsFormHidden('op', 'signup');
+ $fct = new XoopsFormHidden('fct', 'save');
+ $submit = new XoopsFormButton('', 'submit', _XOR_FRM_REGISTER, 'submit');
+ $GLOBALS['xoops']->tpl->assign('uname',$uname->render());
+ $GLOBALS['xoops']->tpl->assign('pass',$pass->render());
+ $GLOBALS['xoops']->tpl->assign('vpass',$vpass->render());
+ $GLOBALS['xoops']->tpl->assign('email',$email->render());
+ $GLOBALS['xoops']->tpl->assign('url',$url->render());
+ $GLOBALS['xoops']->tpl->assign('viewemail',$viewemail->render());
+ $GLOBALS['xoops']->tpl->assign('timezone',$timezone->render());
+ $GLOBALS['xoops']->tpl->assign('disclaimer',$disclaim->render());
+ $GLOBALS['xoops']->tpl->assign('agree',$agree->render());
+ $GLOBALS['xoops']->tpl->assign('captcha',$captcha->render());
+ $GLOBALS['xoops']->tpl->assign('op',$op->render());
+ $GLOBALS['xoops']->tpl->assign('fct',$fct->render());
+ $GLOBALS['xoops']->tpl->assign('submit',$submit->render());
+ $xoops->tpl->display('admin:xortify|xortify_cpanel_signup_form.html');
+ } else {
+ $GLOBALS['xoops']->tpl->assign('protocol', $GLOBALS['xortifyModuleConfig']['protocol']);
+ switch($GLOBALS['xortifyModuleConfig']['protocol']) {
+ case 'curlserialised':
+ case 'wgetserialised':
+ $GLOBALS['xoops']->tpl->assign('port', $GLOBALS['xortifyModuleConfig']['xortify_uriserial']);
+ break;
+ case 'curl':
+ case 'json':
+ $GLOBALS['xoops']->tpl->assign('port', $GLOBALS['xortifyModuleConfig']['xortify_urijson']);
+ break;
+ case 'curlxml':
+ case 'wgetxml':
+ $GLOBALS['xoops']->tpl->assign('port', $GLOBALS['xortifyModuleConfig']['xortify_urixml']);
+ break;
+ case 'soap':
+ $GLOBALS['xoops']->tpl->assign('port', $GLOBALS['xortifyModuleConfig']['xortify_urisoap']);
+ break;
+ }
+ $GLOBALS['xoops']->tpl->assign('error', $disclaimer);
+ $xoops->tpl->display('admin:xortify|xortify_cpanel_signup_nocommunication.html');
+ }
+ break;
+ }
+ break;
+ case "log":
+ echo xortify_adminMenu(3);
+
+ include_once $GLOBALS['xoops']->path( "/class/pagenav.php" );
+
+ $log_handler =& $xoops->getModuleHandler('log', 'xortify');
+
+ $ttl = $log_handler->getCount(NULL);
+ $limit = !empty($_POST['limit'])?intval($_POST['limit']):30;
+ $start = !empty($_POST['start'])?intval($_POST['start']):0;
+ $order = !empty($_POST['order'])?$_POST['order']:'DESC';
+ $sort = !empty($_POST['sort'])?''.$_POST['sort'].'':'date';
+
+ $pagenav = new XoopsPageNav($ttl, $limit, $start, 'start', 'limit='.$limit.'&sort='.$sort.'&order='.$order.'&op='.$op);
+ $xoops->tpl->assign('pagenav', $pagenav->renderNav());
+
+ foreach (array( 'action','provider','date','uname','email','ip4','ip6','proxy-ip4',
+ 'proxy-ip6','network-addy','agent') as $id => $key) {
+ $xoops->tpl->assign(strtolower(str_replace('-','_',$key).'_th'), '<a href="'.$_SERVER['PHP_SELF'].'?start='.$start.'&limit='.$limit.'&sort='.str_replace('_','-',$key).'&order='.((str_replace('_','-',$key)==$sort)?($order=='DESC'?'ASC':'DESC'):$order).'&op='.$op.'">'.(defined('_XOR_AM_TH_'.strtoupper(str_replace('-','_',$key)))?constant('_XOR_AM_TH_'.strtoupper(str_replace('-','_',$key))):'_XOR_AM_TH_'.strtoupper(str_replace('-','_',$key))).'</a>');
+ }
+
+ $criteria = new Criteria('1','1');
+ $criteria->setStart($st...
[truncated message content] |
|
From: <wis...@us...> - 2011-12-15 04:48:11
|
Revision: 8493
http://xoops.svn.sourceforge.net/xoops/?rev=8493&view=rev
Author: wishcraft
Date: 2011-12-15 04:48:00 +0000 (Thu, 15 Dec 2011)
Log Message:
-----------
Xortify 3.02 Stable - Cloud Security for XOOPS 2.6 - bundle (node xortify.com to be moved to hosted at xoops.org)
Added Paths:
-----------
XoopsCore/branches/2.6.x/2.6.0/htdocs/Frameworks/moduleclasses/
XoopsCore/branches/2.6.x/2.6.0/htdocs/Frameworks/moduleclasses/icons/
XoopsCore/branches/2.6.x/2.6.0/htdocs/Frameworks/moduleclasses/icons/32/
XoopsCore/branches/2.6.x/2.6.0/htdocs/Frameworks/moduleclasses/icons/32/access.list.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/Frameworks/moduleclasses/icons/32/current.bans.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/Frameworks/moduleclasses/icons/32/xortify.log.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/admin/
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/admin/index.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/admin/index.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/admin/menu.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/class/
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/class/auth/
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/class/auth/auth.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/class/auth/auth_curl.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/class/auth/auth_curl_provisionning.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/class/auth/auth_curlserialised.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/class/auth/auth_curlserialised_provisionning.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/class/auth/auth_curlxml.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/class/auth/auth_curlxml_provisionning.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/class/auth/auth_json.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/class/auth/auth_json_provisionning.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/class/auth/auth_soap.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/class/auth/auth_soap_provisionning.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/class/auth/auth_wgetserialised.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/class/auth/auth_wgetserialised_provisionning.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/class/auth/auth_wgetxml.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/class/auth/auth_wgetxml_provisionning.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/class/auth/authfactory.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/class/auth/index.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/class/curl.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/class/curlserialised.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/class/curlxml.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/class/index.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/class/json.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/class/log.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/class/soap.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/class/wgetserialised.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/class/wgetxml.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/cron/
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/cron/index.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/cron/serverup.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/docs/
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/docs/changelog.txt
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/docs/credits.txt
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/docs/index.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/docs/install.txt
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/docs/lang_diff.txt
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/docs/licence.txt
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/docs/readme.txt
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/images/
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/images/accessdenied.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/images/index.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/images/left_both.gif
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/images/right_both.gif
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/images/xortify_slogo.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/include/
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/include/JSON.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/include/forms.objects.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/include/forms.xortify.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/include/functions.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/include/install.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/include/post.header.addmeta.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/include/post.header.endcache.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/include/post.loader.mainfile.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/include/pre.loader.mainfile.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/include/update.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/index.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/language/
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/language/english/
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/language/english/admin.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/language/english/ban.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/language/english/help/
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/language/english/help/help.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/language/english/help/index.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/language/english/index.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/language/english/main.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/language/english/modinfo.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/language/index.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/plugin/
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/plugin/index.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/plugin/projecthoneypot.org.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/plugin/protector.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/plugin/spiders.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/plugin/stopforumspam.com.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/plugin/xortify.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/preloads/
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/preloads/core.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/preloads/index.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/providers/
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/providers/index.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/providers/projecthoneypot.org/
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/providers/projecthoneypot.org/post.loader.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/providers/protector/
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/providers/protector/footer.post.loader.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/providers/protector/header.post.loader.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/providers/protector/index.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/providers/providers.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/providers/spiders/
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/providers/spiders/post.loader.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/providers/stopforumspam.com/
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/providers/stopforumspam.com/post.loader.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/providers/xortify/
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/providers/xortify/footer.post.loader.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/providers/xortify/header.post.loader.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/providers/xortify/index.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/providers/xortify/post.loader.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/sql/
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/sql/index.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/sql/mysql.sql
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/templates/
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/templates/admin/
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/templates/admin/xortify_cpanel_bans.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/templates/admin/xortify_cpanel_log.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/templates/admin/xortify_cpanel_signup_form.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/templates/admin/xortify_cpanel_signup_nocommunication.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/templates/index.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/templates/xortify_banning_notice.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/xoops_version.php
Property changes on: XoopsCore/branches/2.6.x/2.6.0/htdocs/Frameworks/moduleclasses
___________________________________________________________________
Added: tsvn:autoprops
+ *.php = svn:executable=*;svn:keywords=Author Date Id Rev URL;
Property changes on: XoopsCore/branches/2.6.x/2.6.0/htdocs/Frameworks/moduleclasses/icons
___________________________________________________________________
Added: tsvn:autoprops
+ *.php = svn:executable=*;svn:keywords=Author Date Id Rev URL;
Property changes on: XoopsCore/branches/2.6.x/2.6.0/htdocs/Frameworks/moduleclasses/icons/32
___________________________________________________________________
Added: tsvn:autoprops
+ *.php = svn:executable=*;svn:keywords=Author Date Id Rev URL;
Added: XoopsCore/branches/2.6.x/2.6.0/htdocs/Frameworks/moduleclasses/icons/32/access.list.png
===================================================================
(Binary files differ)
Property changes on: XoopsCore/branches/2.6.x/2.6.0/htdocs/Frameworks/moduleclasses/icons/32/access.list.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsCore/branches/2.6.x/2.6.0/htdocs/Frameworks/moduleclasses/icons/32/current.bans.png
===================================================================
(Binary files differ)
Property changes on: XoopsCore/branches/2.6.x/2.6.0/htdocs/Frameworks/moduleclasses/icons/32/current.bans.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsCore/branches/2.6.x/2.6.0/htdocs/Frameworks/moduleclasses/icons/32/xortify.log.png
===================================================================
(Binary files differ)
Property changes on: XoopsCore/branches/2.6.x/2.6.0/htdocs/Frameworks/moduleclasses/icons/32/xortify.log.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Property changes on: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify
___________________________________________________________________
Added: tsvn:autoprops
+ *.php = svn:executable=*;svn:keywords=Author Date Id Rev URL;
Property changes on: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/admin
___________________________________________________________________
Added: tsvn:autoprops
+ *.php = svn:executable=*;svn:keywords=Author Date Id Rev URL;
Added: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/admin/index.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/admin/index.html (rev 0)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/admin/index.html 2011-12-15 04:48:00 UTC (rev 8493)
@@ -0,0 +1,10 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<title>Untitled Document</title>
+</head>
+
+<body>
+</body>
+</html>
Added: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/admin/index.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/admin/index.php (rev 0)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/admin/index.php 2011-12-15 04:48:00 UTC (rev 8493)
@@ -0,0 +1,444 @@
+<?php
+/**
+ * @package xortify
+ * @subpackage module
+ * @description Sector Network Security Drone
+ * @author Simon Roberts WISHCRAFT <si...@ch...>
+ * @copyright copyright (c) 2010-2013 XOOPS.org
+ * @licence GPL 2.0 - see docs/LICENCE.txt
+ */
+
+
+ include(dirname(dirname(dirname(dirname(__FILE__)))).'/include/cp_header.php');
+
+ $xoops = Xoops::getInstance();
+
+ if (!defined('_CHARSET'))
+ define ("_CHARSET","UTF-8");
+ if (!defined('_CHARSET_ISO'))
+ define ("_CHARSET_ISO","ISO-8859-1");
+
+ $GLOBALS['myts'] = MyTextSanitizer::getInstance();
+
+ $module_handler = $xoops->getHandler('module');
+ $config_handler = $xoops->getHandler('config');
+ $GLOBALS['xortifyModule'] = $module_handler->getByDirname('xortify');
+ $GLOBALS['xortifyModuleConfig'] = $config_handler->getConfigList($GLOBALS['xortifyModule']->getVar('mid'));
+
+ XoopsLoad::load('pagenav');
+ XoopsLoad::load('xoopslists');
+ XoopsLoad::load('xoopsformloader');
+
+ include_once $GLOBALS['xoops']->path('class'.DS.'xoopsmailer.php');
+ include_once $GLOBALS['xoops']->path('class'.DS.'xoopstree.php');
+ include_once $GLOBALS['xoops']->path('modules'.DS.'xortify'.DS.'include'.DS.'functions.php');
+ include_once $GLOBALS['xoops']->path('modules'.DS.'xortify'.DS.'include'.DS.'forms.xortify.php');
+ include_once $GLOBALS['xoops']->path('modules'.DS.'xortify'.DS.'include'.DS.'forms.objects.php');
+ include_once $GLOBALS['xoops']->path('modules'.DS.'xortify'.DS.'class'.DS.'auth'.DS.'authfactory.php');
+
+ if ( file_exists($GLOBALS['xoops']->path('/Frameworks/moduleclasses/moduleadmin/moduleadmin.php'))){
+ include_once $GLOBALS['xoops']->path('/Frameworks/moduleclasses/moduleadmin/moduleadmin.php');
+ //return true;
+ }else{
+ echo $xoops->error("Error: You don't use the Frameworks \"admin module\". Please install this Frameworks");
+ //return false;
+ }
+ $GLOBALS['xortifyImageIcon'] = XOOPS_URL .'/'. $GLOBALS['xortifyModule']->getInfo('icons16');
+ $GLOBALS['xortifyImageAdmin'] = XOOPS_URL .'/'. $GLOBALS['xortifyModule']->getInfo('icons32');
+
+ $myts =& MyTextSanitizer::getInstance();
+
+ if ($GLOBALS['xoopsUser']) {
+ $moduleperm_handler =& $xoops->getHandler('groupperm');
+ if (!$moduleperm_handler->checkRight('module_admin', $GLOBALS['xortifyModule']->getVar( 'mid' ), $GLOBALS['xoopsUser']->getGroups())) {
+ $xoops->redirect(XOOPS_URL, 1, _NOPERM);
+ exit();
+ }
+ } else {
+ $xoops->redirect(XOOPS_URL . "/user.php", 1, _NOPERM);
+ exit();
+ }
+
+ $xoops->loadLanguage('admin', 'xortify');
+ $xoops->loadLanguage('modinfo', 'xortify');
+
+ $xoops->header();
+ $xoops->tpl->assign('pathImageIcon', $GLOBALS['xortifyImageIcon']);
+ $xoops->tpl->assign('pathImageAdmin', $GLOBALS['xortifyImageAdin']);
+
+ $op = isset($_REQUEST['op'])?$_REQUEST['op']:"dashboard";
+ $fct = isset($_REQUEST['fct'])?$_REQUEST['fct']:"";
+
+ switch($op) {
+ case "signup":
+
+ switch ($fct)
+ {
+ case "save":
+
+ $xortifyAuth =& XortifyAuthFactory::getAuthConnection(false, $GLOBALS['xortifyModuleConfig']['protocol']);
+ $myts =& MyTextSanitizer::getInstance();
+ $uname = isset($_POST['uname']) ? $myts->stripSlashesGPC(trim($_POST['uname'])) : '';
+ $email = isset($_POST['email']) ? $myts->stripSlashesGPC(trim($_POST['email'])) : '';
+ $url = isset($_POST['url']) ? $myts->stripSlashesGPC(trim($_POST['url'])) : '';
+ $pass = isset($_POST['pass']) ? $myts->stripSlashesGPC(trim($_POST['pass'])) : '';
+ $vpass = isset($_POST['vpass']) ? $myts->stripSlashesGPC(trim($_POST['vpass'])) : '';
+ $agree = (isset($_POST['agree']) && intval($_POST['agree'])) ? 1 : 0;
+
+ if ($agree != 1) {
+ $stop .= _US_UNEEDAGREE . '<br />';
+ }
+
+ $validate = $xortifyAuth->validate($uname, $email, $pass, $vpass);
+
+ if ($validate!=false)
+ $stop .= "User details didn't validate with Xortify.com<br/>$validate";
+
+ XoopsLoad::load("captcha");
+ $xoopsCaptcha = XoopsCaptcha::getInstance();
+ if (! $xoopsCaptcha->verify() ) {
+ $stop .= $xoopsCaptcha->getMessage();
+ }
+
+ if ($stop!='') {
+
+ echo xortify_adminMenu(2);
+ echo "<p align='center' style='font-size: 15px; color: #FF0000;'>$stop</p>";
+ $GLOBALS['xoops'] = Xoops::getInstance();
+ $xortifyAuth =& XortifyAuthFactory::getAuthConnection(false, $GLOBALS['xortifyModuleConfig']['protocol']);
+ $disclaimer = $xortifyAuth->network_disclaimer();
+ if (strlen(trim($disclaimer))==0)
+ {
+ $disclaimer = _XOR_ADMIN_NONETWORKCOMM_DISCLAIMER;
+ }
+ if ($disclaimer != _XOR_ADMIN_NONETWORKCOMM_DISCLAIMER) {
+ $uname = new XoopsFormText('', "uname", 35, 128, (isset($_POST['uname'])?$_POST['uname']:''));
+ $pass = new XoopsFormPassword('', "pass", 35, 128, (isset($_POST['pass'])?$_POST['pass']:''));
+ $vpass = new XoopsFormPassword('', "vpass", 35, 128, (isset($_POST['vpass'])?$_POST['vpass']:''));
+ $email = new XoopsFormText('', "email", 35, 128, (isset($_POST['email'])?$_POST['email']:''));
+ $url = new XoopsFormText('', "url", 35, 128, (isset($_POST['url'])?$_POST['url']:''));
+ $viewemail = new XoopsFormRadioYN('', "viewemail", (isset($_POST['viewemail'])?$_POST['viewemail']:false));
+ $timezone = new XoopsFormSelectTimezone('', "timezone", (isset($_POST['timezone'])?$_POST['timezone']:''));
+ $myts =& MyTextSanitizer::getInstance();
+ $disclaim = new XoopsFormLabel('', $myts->nl2br($disclaimer));
+ $agree = new XoopsFormRadioYN('', "agree", false);
+ $captcha = new XoopsFormCaptcha('', 'xoopscaptcha', false);
+ $op = new XoopsFormHidden('op', 'signup');
+ $fct = new XoopsFormHidden('fct', 'save');
+ $submit = new XoopsFormButton('', 'submit', _XOR_FRM_REGISTER, 'submit');
+ $GLOBALS['xoops']->tpl->assign('uname',$uname->render());
+ $GLOBALS['xoops']->tpl->assign('pass',$pass->render());
+ $GLOBALS['xoops']->tpl->assign('vpass',$vpass->render());
+ $GLOBALS['xoops']->tpl->assign('email',$email->render());
+ $GLOBALS['xoops']->tpl->assign('url',$url->render());
+ $GLOBALS['xoops']->tpl->assign('viewemail',$viewemail->render());
+ $GLOBALS['xoops']->tpl->assign('timezone',$timezone->render());
+ $GLOBALS['xoops']->tpl->assign('disclaimer',$disclaim->render());
+ $GLOBALS['xoops']->tpl->assign('agree',$agree->render());
+ $GLOBALS['xoops']->tpl->assign('captcha',$captcha->render());
+ $GLOBALS['xoops']->tpl->assign('op',$op->render());
+ $GLOBALS['xoops']->tpl->assign('fct',$fct->render());
+ $GLOBALS['xoops']->tpl->assign('submit',$submit->render());
+ $xoops->tpl->display('admin:xortify|xortify_cpanel_signup_form.html');
+ } else {
+ $GLOBALS['xoops']->tpl->assign('protocol', $GLOBALS['xortifyModuleConfig']['protocol']);
+ switch($GLOBALS['xortifyModuleConfig']['protocol']) {
+ case 'curlserialised':
+ case 'wgetserialised':
+ $GLOBALS['xoops']->tpl->assign('port', $GLOBALS['xortifyModuleConfig']['xortify_uriserial']);
+ break;
+ case 'curl':
+ case 'json':
+ $GLOBALS['xoops']->tpl->assign('port', $GLOBALS['xortifyModuleConfig']['xortify_urijson']);
+ break;
+ case 'curlxml':
+ case 'wgetxml':
+ $GLOBALS['xoops']->tpl->assign('port', $GLOBALS['xortifyModuleConfig']['xortify_urixml']);
+ break;
+ case 'soap':
+ $GLOBALS['xoops']->tpl->assign('port', $GLOBALS['xortifyModuleConfig']['xortify_urisoap']);
+ break;
+ }
+ $GLOBALS['xoops']->tpl->assign('error', $disclaimer);
+ $xoops->tpl->display('admin:xortify|xortify_cpanel_signup_nocommunication.html');
+ }
+ } else {
+ @$xortifyAuth->create_user( $_POST['viewemail'], $uname, $email, $url, $actkey,
+ $pass, $_POST['timezone'], $_POST['mailok'], $xortifyAuth->check_siteinfo(array()));
+
+ $moduleHandler =& $xoops->getHandler('module');
+ $configHandler =& $xoops->getHandler('config');
+ $GLOBALS['xortifyModule'] = $moduleHandler->getByDirname('xortify');
+ $configs = $configHandler->getConfigs(new Criteria('conf_modid', $GLOBALS['xortifyModule']->mid()) );
+ foreach($configs as $id => $config)
+ switch($config->getVar('conf_name')) {
+ case 'xortify_username':
+ $config->setVar('conf_value', $uname);
+ @$configHandler->insertConfig($config);
+ break;
+ case 'xortify_password':
+ $config->setVar('conf_value', $pass);
+ @$configHandler->insertConfig($config);
+ break;
+ }
+
+ $xoops->redirect("index.php", 4, _XOR_USERCREATED_PLEASEACTIVATE);
+ exit(0);
+ }
+ break;
+ default:
+ case "signup":
+ echo xortify_adminMenu(4);
+ $GLOBALS['xoops'] = Xoops::getInstance();
+ $xortifyAuth =& XortifyAuthFactory::getAuthConnection(false, $GLOBALS['xortifyModuleConfig']['protocol']);
+ $disclaimer = $xortifyAuth->network_disclaimer();
+ if (strlen(trim($disclaimer))==0)
+ {
+ $disclaimer = _XOR_ADMIN_NONETWORKCOMM_DISCLAIMER;
+ }
+ if ($disclaimer != _XOR_ADMIN_NONETWORKCOMM_DISCLAIMER) {
+ $uname = new XoopsFormText('', "uname", 35, 128, (isset($_POST['uname'])?$_POST['uname']:''));
+ $pass = new XoopsFormPassword('', "pass", 35, 128, (isset($_POST['pass'])?$_POST['pass']:''));
+ $vpass = new XoopsFormPassword('', "vpass", 35, 128, (isset($_POST['vpass'])?$_POST['vpass']:''));
+ $email = new XoopsFormText('', "email", 35, 128, (isset($_POST['email'])?$_POST['email']:''));
+ $url = new XoopsFormText('', "url", 35, 128, (isset($_POST['url'])?$_POST['url']:''));
+ $viewemail = new XoopsFormRadioYN('', "viewemail", (isset($_POST['viewemail'])?$_POST['viewemail']:false));
+ $timezone = new XoopsFormSelectTimezone('', "timezone", (isset($_POST['timezone'])?$_POST['timezone']:''));
+ $myts =& MyTextSanitizer::getInstance();
+ $disclaim = new XoopsFormLabel('', $myts->nl2br($disclaimer));
+ $agree = new XoopsFormRadioYN('', "agree", false);
+ $captcha = new XoopsFormCaptcha('', 'xoopscaptcha', false);
+ $op = new XoopsFormHidden('op', 'signup');
+ $fct = new XoopsFormHidden('fct', 'save');
+ $submit = new XoopsFormButton('', 'submit', _XOR_FRM_REGISTER, 'submit');
+ $GLOBALS['xoops']->tpl->assign('uname',$uname->render());
+ $GLOBALS['xoops']->tpl->assign('pass',$pass->render());
+ $GLOBALS['xoops']->tpl->assign('vpass',$vpass->render());
+ $GLOBALS['xoops']->tpl->assign('email',$email->render());
+ $GLOBALS['xoops']->tpl->assign('url',$url->render());
+ $GLOBALS['xoops']->tpl->assign('viewemail',$viewemail->render());
+ $GLOBALS['xoops']->tpl->assign('timezone',$timezone->render());
+ $GLOBALS['xoops']->tpl->assign('disclaimer',$disclaim->render());
+ $GLOBALS['xoops']->tpl->assign('agree',$agree->render());
+ $GLOBALS['xoops']->tpl->assign('captcha',$captcha->render());
+ $GLOBALS['xoops']->tpl->assign('op',$op->render());
+ $GLOBALS['xoops']->tpl->assign('fct',$fct->render());
+ $GLOBALS['xoops']->tpl->assign('submit',$submit->render());
+ $xoops->tpl->display('admin:xortify|xortify_cpanel_signup_form.html');
+ } else {
+ $GLOBALS['xoops']->tpl->assign('protocol', $GLOBALS['xortifyModuleConfig']['protocol']);
+ switch($GLOBALS['xortifyModuleConfig']['protocol']) {
+ case 'curlserialised':
+ case 'wgetserialised':
+ $GLOBALS['xoops']->tpl->assign('port', $GLOBALS['xortifyModuleConfig']['xortify_uriserial']);
+ break;
+ case 'curl':
+ case 'json':
+ $GLOBALS['xoops']->tpl->assign('port', $GLOBALS['xortifyModuleConfig']['xortify_urijson']);
+ break;
+ case 'curlxml':
+ case 'wgetxml':
+ $GLOBALS['xoops']->tpl->assign('port', $GLOBALS['xortifyModuleConfig']['xortify_urixml']);
+ break;
+ case 'soap':
+ $GLOBALS['xoops']->tpl->assign('port', $GLOBALS['xortifyModuleConfig']['xortify_urisoap']);
+ break;
+ }
+ $GLOBALS['xoops']->tpl->assign('error', $disclaimer);
+ $xoops->tpl->display('admin:xortify|xortify_cpanel_signup_nocommunication.html');
+ }
+ break;
+ }
+ break;
+ case "log":
+ echo xortify_adminMenu(3);
+
+ include_once $GLOBALS['xoops']->path( "/class/pagenav.php" );
+
+ $log_handler =& $xoops->getModuleHandler('log', 'xortify');
+
+ $ttl = $log_handler->getCount(NULL);
+ $limit = !empty($_POST['limit'])?intval($_POST['limit']):30;
+ $start = !empty($_POST['start'])?intval($_POST['start']):0;
+ $order = !empty($_POST['order'])?$_POST['order']:'DESC';
+ $sort = !empty($_POST['sort'])?''.$_POST['sort'].'':'date';
+
+ $pagenav = new XoopsPageNav($ttl, $limit, $start, 'start', 'limit='.$limit.'&sort='.$sort.'&order='.$order.'&op='.$op);
+ $xoops->tpl->assign('pagenav', $pagenav->renderNav());
+
+ foreach (array( 'action','provider','date','uname','email','ip4','ip6','proxy-ip4',
+ 'proxy-ip6','network-addy','agent') as $id => $key) {
+ $xoops->tpl->assign(strtolower(str_replace('-','_',$key).'_th'), '<a href="'.$_SERVER['PHP_SELF'].'?start='.$start.'&limit='.$limit.'&sort='.str_replace('_','-',$key).'&order='.((str_replace('_','-',$key)==$sort)?($order=='DESC'?'ASC':'DESC'):$order).'&op='.$op.'">'.(defined('_XOR_AM_TH_'.strtoupper(str_replace('-','_',$key)))?constant('_XOR_AM_TH_'.strtoupper(str_replace('-','_',$key))):'_XOR_AM_TH_'.strtoupper(str_replace('-','_',$key))).'</a>');
+ }
+
+ $criteria = new Criteria('1','1');
+ $criteria->setStart($start);
+ $criteria->setLimit($limit);
+ $criteria->setSort('`'.$sort.'`');
+ $criteria->setOrder($order);
+
+ $logs = $log_handler->getObjects($criteria, true);
+ foreach($logs as $id => $log) {
+ $xoops->tpl->append('log', $log->toArray());
+ }
+ $xoops->tpl->display('admin:xortify|xortify_cpanel_log.html');
+
+ break;
+ case "list":
+
+ echo xortify_adminMenu(2);
+
+ XoopsLoad::load("xoopscache");
+ if (!class_exists('XoopsCache'))
+ XoopsLoad::load("cache");
+ XoopsLoad::load("pagenav");
+
+ if (!$bans = XoopsCache::read('xortify_bans_cache')) {
+
+ require_once( XOOPS_ROOT_PATH.'/modules/xortify/class/'.$GLOBALS['xortifyModuleConfig']['protocol'].'.php' );
+
+ $func = strtoupper($GLOBALS['xortifyModuleConfig']['protocol']).'XortifyExchange';
+
+ ob_start();
+ $soapExchg = new $func;
+ $bans = $soapExchg->retrieveBans();
+ ob_end_flush();
+
+ XoopsCache::delete('xortify_bans_cache');
+ XoopsCache::delete('xortify_bans_cache_backup');
+ XoopsCache::write('xortify_bans_cache', $bans, $GLOBALS['xortifyModuleConfig']['xortify_seconds']);
+ XoopsCache::write('xortify_bans_cache_backup', $bans, ($GLOBALS['xortifyModuleConfig']['xortify_seconds'] * 1.45));
+ }
+
+ if ($bans['bans']==0) {
+
+ echo _XS_AM_NOCACHEMSG;
+ } else {
+
+ $limit = !empty($_REQUEST['limit'])?intval($_REQUEST['limit']):30;
+ $start = !empty($_REQUEST['start'])?intval($_REQUEST['start']):0;
+
+ $pagenav = new XoopsPageNav($bans['bans'], $limit, $start, 'start', 'limit='.$limit.'&op='.$op);
+ $xoops->tpl->assign('pagenav', $pagenav->renderNav());
+ $i=0;
+ $num=0;
+ foreach($bans['data'] as $key => $data) {
+ $i++;
+ if ($i>=$start&&$num<=$limit) {
+ $num++;
+ if (strlen($data['ip4'])>0) {
+ $ipaddy = $data['ip4'];
+ $iptype = _XS_IPTYPE_IP4;
+ } elseif (strlen($data['ip6'])>0) {
+ $ipaddy = $data['ip6'];
+ $iptype = _XS_IPTYPE_IP6;
+ } else {
+ $ipaddy = '';
+ $iptype = _XS_IPTYPE_EMPTY;
+ }
+
+ if (strlen($data['proxy-ip4'])>0) {
+ $proxyip = $data['proxy-ip4'];
+ $proxyiptype = _XS_IPTYPE_IP4;
+ } elseif (strlen($data['proxy-ip6'])>0) {
+ $proxyip = $data['proxy-ip6'];
+ $proxyiptype = _XS_IPTYPE_IP6;
+ } else {
+ $proxyip = '';
+ $proxyiptype = '';
+ }
+
+ $xoops->tpl->append('bans', array('iptype' => $iptype, 'ipaddy' => $ipaddy,
+ 'proxyiptype' => $proxyiptype, 'ip' => $proxyip,
+ 'netaddy' => $data['network-addy']?$data['network-addy']:' ',
+ 'macaddy' => $data['mac-addy']?$data['mac-addy']:' ',
+ 'long' => $data['long']?$data['long']:' '));
+ }
+ }
+ $xoops->tpl->display('admin:xortify|xortify_cpanel_bans.html');
+ }
+
+
+ break;
+ case "dashboard":
+ default:
+
+ echo xortify_adminMenu(1);
+
+ $log_handler = $xoops->getModuleHandler('log', 'xortify');
+
+ $indexAdmin = new ModuleAdmin();
+
+ $indexAdmin->addInfoBox(_XOR_ADMIN_COUNTS);
+ $indexAdmin->addInfoBoxLine(_XOR_ADMIN_COUNTS, "<label>"._XOR_ADMIN_THEREARE_BANNED."</label>", $log_handler->getCountByField('action','banned'), 'Green');
+ $indexAdmin->addInfoBoxLine(_XOR_ADMIN_COUNTS, "<label>"._XOR_ADMIN_THEREARE_BLOCKED."</label>", $log_handler->getCountByField('action','blocked'), 'Green');
+ $indexAdmin->addInfoBoxLine(_XOR_ADMIN_COUNTS, "<label>"._XOR_ADMIN_THEREARE_MONITORED."</label>", $log_handler->getCountByField('action','monitored'), 'Green');
+ $indexAdmin->addInfoBoxLine(_XOR_ADMIN_COUNTS, "<label>"._XOR_ADMIN_THEREARE_PROJECTHONEYPOTORG."</label>", $log_handler->getCountByField('provider','projecthoneypot.org'), 'Green');
+ $indexAdmin->addInfoBoxLine(_XOR_ADMIN_COUNTS, "<label>"._XOR_ADMIN_THEREARE_PROTECTOR."</label>", $log_handler->getCountByField('provider','protector'), 'Green');
+ $indexAdmin->addInfoBoxLine(_XOR_ADMIN_COUNTS, "<label>"._XOR_ADMIN_THEREARE_SPIDERS."</label>", $log_handler->getCountByField('provider','spiders'), 'Green');
+ $indexAdmin->addInfoBoxLine(_XOR_ADMIN_COUNTS, "<label>"._XOR_ADMIN_THEREARE_STOPFORUMSPAMCOM."</label>", $log_handler->getCountByField('provider','stopforumspam.com'), 'Green');
+ $indexAdmin->addInfoBoxLine(_XOR_ADMIN_COUNTS, "<label>"._XOR_ADMIN_THEREARE_XORTIFY."</label>", $log_handler->getCountByField('provider','xortify'), 'Green');
+
+ XoopsLoad::load('xoopscache');
+ if (!class_exists('XoopsCache')) {
+ // XOOPS 2.4 Compliance
+ XoopsLoad::load('cache');
+ if (!class_exists('XoopsCache')) {
+ include_once XOOPS_ROOT_PATH.DS.'class'.DS.'cache'.DS.'xoopscache.php';
+ }
+ }
+
+ if ($bans = XoopsCache::read('xortify_bans_cache')) {
+ $indexAdmin->addInfoBoxLine(_XOR_ADMIN_COUNTS, "<label>"._XOR_ADMIN_THEREARE_CLOUDEDBANS."</label>", count($bans), 'Green');
+ }
+
+ echo $indexAdmin->renderIndex();
+
+ break;
+ case "about":
+
+ echo xortify_adminMenu(5);
+
+ $paypalitemno='XORTIFY302';
+ $aboutAdmin = new ModuleAdmin();
+ $about = $aboutAdmin->renderabout($paypalitemno, false);
+
+ $donationform = array( 0 => '<form name="donation" id="donation" action="http://www.chronolabs.coop/modules/xpayment/" method="post" onsubmit="return xoopsFormValidate_donation();">',
+ 1 => '<table class="outer" cellspacing="1" width="100%"><tbody><tr><th colspan="2">'._XOR_ADMIN_MAKEDONATE.'</th></tr><tr align="left" valign="top"><td class="head"><div class="xoops-form-element-caption-required"><span class="caption-text">Donation Amount</span><span class="caption-marker">*</span></div></td><td class="even"><select size="1" name="item[A][amount]" id="item[A][amount]" title="Donation Amount"><option value="5">5.00 AUD</option><option value="10">10.00 AUD</option><option value="20">20.00 AUD</option><option value="40">40.00 AUD</option><option value="60">60.00 AUD</option><option value="80">80.00 AUD</option><option value="90">90.00 AUD</option><option value="100">100.00 AUD</option><option value="200">200.00 AUD</option></select></td></tr><tr align="left" valign="top"><td class="head"></td><td class="even"><input class="formButton" name="submit" id="submit" value="'._SUBMIT.'" title="'._SUBMIT.'" type="submit"></td></tr></tbody></table>',
+ 2 => '<input name="op" id="op" value="createinvoice" type="hidden"><input name="plugin" id="plugin" value="donations" type="hidden"><input name="donation" id="donation" value="1" type="hidden"><input name="drawfor" id="drawfor" value="Chronolabs Co-Operative" type="hidden"><input name="drawto" id="drawto" value="%s" type="hidden"><input name="drawto_email" id="drawto_email" value="%s" type="hidden"><input name="key" id="key" value="%s" type="hidden"><input name="currency" id="currency" value="AUD" type="hidden"><input name="weight_unit" id="weight_unit" value="kgs" type="hidden"><input name="item[A][cat]" id="item[A][cat]" value="XDN%s" type="hidden"><input name="item[A][name]" id="item[A][name]" value="Donation for %s" type="hidden"><input name="item[A][quantity]" id="item[A][quantity]" value="1" type="hidden"><input name="item[A][shipping]" id="item[A][shipping]" value="0" type="hidden"><input name="item[A][handling]" id="item[A][handling]" value="0" type="hidden"><input name="item[A][weight]" id="item[A][weight]" value="0" type="hidden"><input name="item[A][tax]" id="item[A][tax]" value="0" type="hidden"><input name="return" id="return" value="http://www.chronolabs.coop/modules/donations/success.php" type="hidden"><input name="cancel" id="cancel" value="http://www.chronolabs.coop/modules/donations/success.php" type="hidden"></form>',
+ 3 => '',
+ 4 => '<!-- Start Form Validation JavaScript //-->
+<script type="text/javascript">
+<!--//
+function xoopsFormValidate_donation() { var myform = window.document.donation;
+var hasSelected = false; var selectBox = myform.item[A][amount];for (i = 0; i < selectBox.options.length; i++ ) { if (selectBox.options[i].selected == true && selectBox.options[i].value != \'\') { hasSelected = true; break; } }if (!hasSelected) { window.alert("Please enter Donation Amount"); selectBox.focus(); return false; }return true;
+}
+//--></script>
+<!-- End Form Validation JavaScript //-->');
+
+ $paypalform = array( 0 => '<form action="https://www.paypal.com/cgi-bin/webscr" method="post">',
+ 1 => '<input name="cmd" value="_s-xclick" type="hidden">',
+ 2 => '<input name="hosted_button_id" value="%s" type="hidden">',
+ 3 => '<img alt="" src="https://www.paypal.com/fr_FR/i/scr/pixel.gif" height="1" border="0" width="1">',
+ 4 => '<input src="https://www.paypal.com/en_US/i/btn/btn_donate_LG.gif" name="submit" alt="PayPal - The safer, easier way to pay online!" border="0" type="image">',
+ 5 => '</form>');
+
+ for($key=0;$key<=4;$key++) {
+ switch ($key) {
+ case 2:
+ $donationform[$key] = sprintf($donationform[$key], $GLOBALS['xoopsConfig']['sitename'] . ' - ' . (strlen($GLOBALS['xoopsUser']->getVar('name'))>0?$GLOBALS['xoopsUser']->getVar('name'). ' ['.$GLOBALS['xoopsUser']->getVar('uname').']':$GLOBALS['xoopsUser']->getVar('uname')), $GLOBALS['xoopsUser']->getVar('email'), XOOPS_LICENSE_KEY, strtoupper($GLOBALS['xortifyModule']->getVar('dirname')), strtoupper($GLOBALS['xortifyModule']->getVar('dirname')). ' '.$GLOBALS['xortifyModule']->getVar('name'));
+ break;
+ }
+ }
+
+ $istart = strpos($about, ($paypalform[0]), 1);
+ $iend = strpos($about, ($paypalform[5]), $istart+1)+strlen($paypalform[5])-1;
+ echo (substr($about, 0, $istart-1));
+ echo implode("\n", $donationform);
+ echo (substr($about, $iend+1, strlen($about)-$iend-1));
+ break;
+ }
+
+ xortify_footer_adminMenu();
+ $xoops->footer();
+?>
\ No newline at end of file
Property changes on: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/admin/index.php
___________________________________________________________________
Added: svn:executable
+ *
Added: svn:keywords
+ Author Date Id Rev URL
Added: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/admin/menu.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/admin/menu.php (rev 0)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/admin/menu.php 2011-12-15 04:48:00 UTC (rev 8493)
@@ -0,0 +1,37 @@
+<?php
+/**
+ * @package xortify
+ * @subpackage module
+ * @description Sector Network Security Drone
+ * @author Simon Roberts WISHCRAFT <si...@ch...>
+ * @copyright copyright (c) 2010-2013 XOOPS.org
+ * @licence GPL 2.0 - see docs/LICENCE.txt
+ */
+$xoops = Xoops::getInstance();
+$module_handler =& $xoops->getHandler('module');
+$GLOBALS['xortifyModule'] = $module_handler->getByDirname('xortify');
+$GLOBALS['xortifyImageAdmin'] = $GLOBALS['xortifyModule']->getInfo('icons32');
+
+global $adminmenu;
+$adminmenu = array();
+$adminmenu[1]['title'] = _XOR_ADMENU4;
+$adminmenu[1]['icon'] = '../../'.$GLOBALS['xortifyImageAdmin'].'/home.png';
+$adminmenu[1]['image'] = '../../'.$GLOBALS['xortifyImageAdmin'].'/home.png';
+$adminmenu[1]['link'] = "admin/index.php?op=dashboard";
+$adminmenu[2]['title'] = _XOR_ADMENU1;
+$adminmenu[2]['icon'] = '../../'.$GLOBALS['xortifyImageAdmin'].'/current.bans.png';
+$adminmenu[2]['image'] = '../../'.$GLOBALS['xortifyImageAdmin'].'/current.bans.png';
+$adminmenu[2]['link'] = "admin/index.php?op=list&fct=bans";
+$adminmenu[3]['title'] = _XOR_ADMENU3;
+$adminmenu[3]['icon'] = '../../'.$GLOBALS['xortifyImageAdmin'].'/xortify.log.png';
+$adminmenu[3]['image'] = '../../'.$GLOBALS['xortifyImageAdmin'].'/xortify.log.png';
+$adminmenu[3]['link'] = "admin/index.php?op=log";
+$adminmenu[4]['title'] = _XOR_ADMENU2;
+$adminmenu[4]['icon'] = '../../'.$GLOBALS['xortifyImageAdmin'].'/access.list.png';
+$adminmenu[4]['image'] = '../../'.$GLOBALS['xortifyImageAdmin'].'/access.list.png';
+$adminmenu[4]['link'] = "admin/index.php?op=signup&fct=signup";
+$adminmenu[5]['title'] = _XOR_ADMENU5;
+$adminmenu[5]['icon'] = '../../'.$GLOBALS['xortifyImageAdmin'].'/about.png';
+$adminmenu[5]['image'] = '../../'.$GLOBALS['xortifyImageAdmin'].'/about.png';
+$adminmenu[5]['link'] = "admin/index.php?op=about";
+?>
\ No newline at end of file
Property changes on: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/admin/menu.php
___________________________________________________________________
Added: svn:executable
+ *
Added: svn:keywords
+ Author Date Id Rev URL
Property changes on: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/class
___________________________________________________________________
Added: tsvn:autoprops
+ *.php = svn:executable=*;svn:keywords=Author Date Id Rev URL;
Property changes on: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/class/auth
___________________________________________________________________
Added: tsvn:autoprops
+ *.php = svn:executable=*;svn:keywords=Author Date Id Rev URL;
Added: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/class/auth/auth.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/class/auth/auth.php (rev 0)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/class/auth/auth.php 2011-12-15 04:48:00 UTC (rev 8493)
@@ -0,0 +1,118 @@
+<?php
+/**
+ * @package xortify
+ * @subpackage module
+ * @description Sector Network Security Drone
+ * @author Simon Roberts WISHCRAFT <si...@ch...>
+ * @copyright copyright (c) 2010-2013 XOOPS.org
+ * @licence GPL 2.0 - see docs/LICENCE.txt
+ */
+
+
+class XortifyAuth {
+
+ var $_dao;
+
+ var $_errors;
+ /**
+ * Authentication Service constructor
+ */
+ function XortifyAuth (&$dao){
+ $this->_dao = $dao;
+ }
+
+ /**
+ * @abstract need to be write in the dervied class
+ */
+ function authenticate() {
+ $authenticated = false;
+
+ return $authenticated;
+ }
+
+ /**
+ * add an error
+ *
+ * @param string $value error to add
+ * @access public
+ */
+ function setErrors($err_no, $err_str)
+ {
+ $this->_errors[$err_no] = trim($err_str);
+ }
+
+ /**
+ * return the errors for this object as an array
+ *
+ * @return array an array of errors
+ * @access public
+ */
+ function getErrors()
+ {
+ return $this->_errors;
+ }
+
+ /**
+ * return the errors for this object as html
+ *
+ * @return string html listing the errors
+ * @access public
+ */
+ function getHtmlErrors()
+ {
+ global $xoopsConfig;
+ $ret = '<br>';
+ if ( $xoopsConfig['debug_mode'] == 1 || $xoopsConfig['debug_mode'] == 2 )
+ {
+ if (!empty($this->_errors)) {
+ foreach ($this->_errors as $errno => $errstr) {
+ $ret .= $errstr . '<br/>';
+ }
+ } else {
+ $ret .= _NONE.'<br />';
+ }
+ $ret .= sprintf(_AUTH_MSG_AUTH_METHOD, $this->auth_method);
+ }
+ else {
+ $ret .= _US_INCORRECTLOGIN;
+ }
+ return $ret;
+ }
+
+ /**
+ * checks for variables require in siteinfo package in the auth library
+ *
+ * @param array $siteinfo
+ *
+ * @return array $siteinfo
+ * @access public
+ */
+ function check_siteinfo($siteinfo){
+
+ global $xoopsConfig;
+ if (!isset($siteinfo)||empty($siteinfo)||!is_array($siteinfo)){
+ $siteinfo = array();
+ $siteinfo['sitename'] = $xoopsConfig['sitename'];
+ $siteinfo['adminmail'] = $xoopsConfig['adminmail'];
+ $siteinfo['systemkey'] = XOOPS_LICENSE_KEY;
+ $siteinfo['xoops_url'] = XOOPS_URL;
+ }
+
+ if (!isset($siteinfo['sitename'])||empty($siteinfo['sitename']))
+ $siteinfo['sitename'] = $xoopsConfig['sitename'];
+
+ if (!isset($siteinfo['adminmail'])||empty($siteinfo['adminmail']))
+ $siteinfo['adminmail'] = $xoopsConfig['adminmail'];
+
+ if (!isset($siteinfo['xoops_url'])||empty($siteinfo['xoops_url']))
+ $siteinfo['xoops_url'] = XOOPS_URL;
+
+ if (!isset($siteinfo['systemkey'])||empty($siteinfo['systemkey']))
+ $siteinfo['systemkey'] = $xoopsConfig['systemkey'];
+
+ return $siteinfo;
+ }
+}
+
+
+?>
Property changes on: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/class/auth/auth.php
___________________________________________________________________
Added: svn:executable
+ *
Added: svn:keywords
+ Author Date Id Rev URL
Added: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/class/auth/auth_curl.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/class/auth/auth_curl.php (rev 0)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/class/auth/auth_curl.php 2011-12-15 04:48:00 UTC (rev 8493)
@@ -0,0 +1,184 @@
+<?php
+/**
+ * @package xortify
+ * @subpackage module
+ * @description Sector Network Security Drone
+ * @author Simon Roberts WISHCRAFT <si...@ch...>
+ * @copyright copyright (c) 2010-2013 XOOPS.org
+ * @licence GPL 2.0 - see docs/LICENCE.txt
+ */
+
+if (!function_exists('json_encode')){
+ function json_encode($data) {
+ static $json = NULL;
+ if (!class_exists('Services_JSON') ) { include_once $GLOBALS['xoops']->path('/modules/xortify/include/JSON.php'); }
+ $json = new Services_JSON();
+ return $json->encode($data);
+ }
+}
+
+if (!function_exists('json_decode')){
+ function json_decode($data) {
+ static $json = NULL;
+ if (!class_exists('Services_JSON') ) { include_once $GLOBALS['xoops']->path('/modules/xortify/include/JSON.php'); }
+ $json = new Services_JSON();
+ return $json->decode($data);
+ }
+}
+
+
+define('XORTIFY_CURL_API', $GLOBALS['xoopsModuleConfig']['xortify_uricurl']);
+define('XORTIFY_USER_AGENT', 'Mozilla/5.0 (X11; U; Linux i686; pl-PL; rv:1.9.0.2) XOOPS/20100101 XoopsAuth/1.xx (php)');
+include_once XOOPS_ROOT_PATH . '/modules/xortify/class/auth/auth_curl_provisionning.php';
+
+class XortifyAuthCurl extends XortifyAuth {
+
+ var $curl_client;
+ var $curl_xoops_username = '';
+ var $curl_xoops_password = '';
+ var $_dao;
+ var $_json = '';
+ /**
+ * Authentication Service constructor
+ */
+ function XortifyAuthCurl (&$dao) {
+ if (!$ch = curl_init(XORTIFY_CURL_API)) {
+ trigger_error('Could not intialise CURL file: '.XORTIFY_CURL_API);
+ return false;
+ }
+ $cookies = XOOPS_VAR_PATH.'/cache/xoops_cache/authcurl_'.md5(XORTIFY_CURL_API).'.cookie';
+
+ curl_setopt($ch, CURLOPT_HEADER, 0);
+ curl_setopt($ch, CURLOPT_POST, 1);
+ curl_setopt($ch, CURLOPT_COOKIEJAR, $cookies);
+ curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
+ curl_setopt($ch, CURLOPT_USERAGENT, XORTIFY_USER_AGENT);
+ $this->curl_client =& $ch;
+ }
+
+
+ /**
+ * Authenticate user again curl directory (Bind)
+ *
+ * @param string $uname Username
+ * @param string $pwd Password
+ *
+ * @return bool
+ */
+ function authenticate($uname, $pwd = null) {
+ $authenticated = false;
+ $this->XortifyAuthCurl($GLOBALS['xoopsDB']);
+
+ if (!$this->curl_client) {
+ $this->setErrors(0, _AUTH_CURL_EXTENSION_NOT_LOAD);
+ return $authenticated;
+ }
+
+
+ $rnd = rand(-100000, 100000000);
+ curl_setopt($this->curl_client, CURLOPT_POSTFIELDS, array('xoops_authentication' => json_encode(array("username"=> $this->curl_xoops_username, "password"=> $this->curl_xoops_password, "auth" => array('username' => $uname, "password" => $pwd, "time" => time(), "passhash" => sha1((time()-$rnd).$uname.$pwd), "rand"=>$rnd)))));
+ $data = curl_exec($this->curl_client);
+ curl_close($this->curl_client);
+ $result = $this->obj2array(json_decode($data));
+ return $result["RESULT"];
+ }
+
+
+ /**
+ * validate a user via curl
+ *
+ * @param string $uname
+ * @param string $email
+ * @param string $pass
+ * @param string $vpass
+ *
+ * @return string
+ */
+ function validate($uname, $email, $pass, $vpass){
+ $this->XortifyAuthCurl($GLOBALS['xoopsDB']);
+ $rnd = rand(-100000, 100000000);
+ curl_setopt($this->curl_client, CURLOPT_POSTFIELDS, array('xoops_user_validate' => json_encode(array("username"=> $this->curl_xoops_username, "password"=> $this->curl_xoops_password, "validate" => array('uname' => $uname, "pass" => $pass, "vpass" => $vpass, "email" => $email, "time" => time(), "passhash" => sha1((time()-$rnd).$uname.$pass), "rand"=>$rnd)))));
+ $data = curl_exec($this->curl_client);
+ curl_close($this->curl_client);
+ $result = $this->obj2array(json_decode($data));
+ if ($result['ERRNUM']==1){
+ return $result["RESULT"];
+ } else {
+ return false;
+ }
+
+ }
+
+
+ /**
+ * get the xoops site disclaimer via curl
+ *
+ * @return string
+ */
+ function network_disclaimer(){
+ $this->XortifyAuthCurl($GLOBALS['xoopsDB']);
+ curl_setopt($this->curl_client, CURLOPT_POSTFIELDS, array('xoops_network_disclaimer' => json_encode(array("username"=> $this->curl_xoops_username, "password"=> $this->curl_xoops_password))));
+ $data = curl_exec($this->curl_client);
+ curl_close($this->curl_client);
+
+ $result = $this->obj2array(json_decode($data));
+ if ($result['ERRNUM']==1){
+ return $result["RESULT"];
+ } else {
+ return false;
+ }
+
+ }
+
+ /**
+ * create a user
+ *
+ * @param bool $user_viewemail
+ * @param string $uname
+ * @param string $email
+ * @param string $url
+ * @param string $actkey
+ * @param string $pass
+ * @param integer $timezone_offset
+ * @param bool $user_mailok
+ * @param array $siteinfo
+ *
+ * @return array
+ */
+ function create_user($user_viewemail, $uname, $email, $url, $actkey,
+ $pass, $timezone_offset, $user_mailok, $siteinfo){
+
+ $siteinfo = $this->check_siteinfo($siteinfo);
+
+ $rnd = rand(-100000, 100000000);
+ $this->XortifyAuthCurl($GLOBALS['xoopsDB']);
+ curl_setopt($this->curl_client, CURLOPT_POSTFIELDS, 'xoops_create_user='.json_encode(array("username"=> $this->curl_xoops_username, "password"=> $this->curl_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(json_decode($data));
+ if ($result['ERRNUM']==1){
+ return $result["RESULT"];
+ } else {
+ return false;
+ }
+ }
+
+ function obj2array($objects) {
+ $ret = array();
+ foreach($objects as $key => $value) {
+ if (is_a($value, 'stdClass')) {
+ $ret[$key] = (array)$value;
+ } elseif (is_array($value)) {
+ $ret[$key] = $this->obj2array($value);
+ } else {
+ $ret[$key] = $value;
+ }
+ }
+ return $ret;
+ }
+
+}
+// end class
+
+
+?>
Property changes on: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/class/auth/auth_curl.php
___________________________________________________________________
Added: svn:executable
+ *
Added: svn:keywords
+ Author Date Id Rev URL
Added: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/class/auth/auth_curl_provisionning.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/class/auth/auth_curl_provisionning.php (rev 0)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/class/auth/auth_curl_provisionning.php 2011-12-15 04:48:00 UTC (rev 8493)
@@ -0,0 +1,190 @@
+<?php
+/**
+ * @package xortify
+ * @subpackage module
+ * @description Sector Network Security Drone
+ * @author Simon Roberts WISHCRAFT <si...@ch...>
+ * @copyright copyright (c) 2010-2013 XOOPS.org
+ * @licence GPL 2.0 - see docs/LICENCE.txt
+ */
+
+
+class XortifyAuthCurlProvisionning {
+
+ var $_auth_instance;
+
+ function &getInstance(&$auth_instance)
+ {
+ static $provis_instance;
+ if (!isset($provis_instance)) {
+ $provis_instance = new XortifyAuthCurlProvisionning($auth_instance);
+ }
+ return $provis_instance;
+ }
+
+ /**
+ * Authentication Service constructor
+ */
+ function XortifyAuthCurlProvisionning (&$auth_instance) {
+ $this->_auth_instance = &$auth_instance;
+ $config_handler =& xoops_gethandler('config');
+ $config =& $config_handler->getConfigsByCat(XOOPS_CONF_AUTH);
+ foreach ($config as $key => $val) {
+ $this->$key = $val;
+ }
+ $config_gen =& $config_handler->getConfigsByCat(XOOPS_CONF);
+ $this->default_TZ = $config_gen['default_TZ'];
+ $this->theme_set = $config_gen['theme_set'];
+ $this->com_mode = $config_gen['com_mode'];
+ $this->com_order = $config_gen['com_order'];
+ }
+
+ /**
+ * Return a Xortify User Object
+ *
+ * @return XortifyUser or false
+ */
+ function getXortifyUser($uname) {
+ $member_handler =& xoops_gethandler('member');
+ $criteria = new Criteria('uname', $uname);
+ $getuser = $member_handler->getUsers($criteria);
+ if (count($getuser) == 1)
+ return $getuser[0];
+ else return false;
+ }
+
+ /**
+ * Launch the synchronisation process
+ *
+ * @return bool
+ */
+ function sync($datas, $uname, $pwd = null) {
+ $xoopsUser = $this->getXortifyUser($uname);
+ if (!$xoopsUser) { // Xortify User Database not exists
+ if ($this->curl_provisionning) {
+ $xoopsUser = $this->add($datas, $uname, $pwd);
+ } else $this->_auth_instance->setErrors(0, sprintf(_AUTH_LDAP_XOOPS_USER_NOTFOUND, $uname));
+ } else { // Xortify User Database exists
+
+ }
+ return $xoopsUser;
+ }
+
+ /**
+ * Add a new user to the system
+ *
+ * @return bool
+ */
+ function add($datas, $uname, $pwd = null) {
+ $ret = false;
+ $member_handler =& xoops_gethandler('member');
+ // Create XOOPS Database User
+ $newuser = $member_handler->createUser();
+ $newuser->setVar('uname', $uname);
+ $newuser->setVar('pass', md5(stripslashes($pwd)));
+ $newuser->setVar('email', $datas['email']);
+ $newuser->setVar('rank', 0);
+ $newuser->setVar('level', 1);
+ $newuser->setVar('timezone_offset', $this->default_TZ);
+ $newuser->setVar('theme', $this->theme_set);
+ $newuser->setVar('umode', $this->com_mode);
+ $newuser->setVar('uorder', $this->com_order);
+ if ($this->curl_provisionning)
+ $tab_mapping = explode('|', $this->curl_field_mapping);
+ else
+ $tab_mapping = explode('|', $this->ldap_field_mapping);
+
+ foreach ($tab_mapping as $mapping) {
+ $fields = explode('=', trim($mapping));
+ if ($fields[0] && $fields[1])
+ $newuser->setVar(trim($fields[0]), utf8_decode($datas[trim($fields[1])]));
+ }
+ if ($member_handler->insertUser($newuser)) {
+ }
+ if ($member_handler->insertUser($newuser)) {
+ foreach ($this->curl_provisionning_group as $groupid)
+ $member_handler->addUserToGroup($groupid, $newuser->getVar('uid'));
+ $newuser->unsetNew();
+ return $newuser;
+ } else redirect_header(XOOPS_URL.'/user.php', 5, $newuser->getHtmlErrors());
+
+ $newuser->unsetNew();
+ return $newuser;
+ //else redirect_header(XOOPS_URL.'/user.php', 5, $newuser->getHtmlErrors());
+ return $ret;
+ }
+
+ /**
+ * Modify user information
+ *
+ * @return bool
+ */
+ function change(&$xoopsUser, $datas, $uname, $pwd = null) {
+ $ret = false;
+ $member_handler =& xoops_gethandler('member');
+ $xoopsUser->setVar('pass', md5(stripslashes($pwd)));
+ $tab_mapping = explode('|', $this->ldap_field_mapping);
+ foreach ($tab_mapping as $mapping) {
+ $fields = explode('=', trim($mapping));
+ if ($fields[0] && $fields[1])
+ $xoopsUser->setVar(trim($fields[0]), utf8_decode($datas[trim($fields[1])][0]));
+ }
+ if ($member_handler->insertUser($xoopsUser)) {
+ return $xoopsUser;
+ } else redirect_header(XOOPS_URL.'/user.php', 5, $xoopsUser->getHtmlErrors());
+ return $ret;
+ }
+
+ function change_curl(&$xoopsUser, $datas, $uname, $pwd = null) {
+ $ret = false;
+ $member_handler =& xoops_gethandler('member');
+ $xoopsUser->setVar('pass', md5(stripslashes($pwd)));
+ $tab_mapping = explode('|', $this->curl_field_mapping);
+ foreach ($tab_mapping as $mapping) {
+ $fields = explode('=', trim($mapping));
+ if ($fields[0] && $fields[1])
+ $xoopsUser->setVar(trim($fields[0]), utf8_decode($datas[trim($fields[1])][0]));
+ }
+ if ($member_handler->insertUser($xoopsUser)) {
+ return $xoopsUser;
+ } else redirect_header(XOOPS_URL.'/user.php', 5, $xoopsUser->getHtmlErrors());
+ return $ret;
+ }
+
+ /**
+ * Modify a user
+ *
+ * @return bool
+ */
+ function delete() {
+ }
+
+ /**
+ * Suspend a user
+ *
+ * @return bool
+ */
+ function suspend() {
+ }
+
+ /**
+ * Restore a user
+ *
+ * @return bool
+ */
+ function restore() {
+ }
+
+ /**
+ * Add a new user to the system
+ *
+ * @return bool
+ */
+ function resetpwd() {
+ }
+
+
+}
+// end class
+
+?>
Property changes on: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/class/auth/auth_curl_provisionning.php
___________________________________________________________________
Added: svn:executable
+ *
Added: svn:keywords
+ Author Date Id Rev URL
Added: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/class/auth/auth_curlserialised.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/class/auth/auth_curlserialised.php (rev 0)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/class/auth/auth_curlserialised.php 2011-12-15 04:48:00 UTC (rev 8493)
@@ -0,0 +1,165 @@
+<?php
+/**
+ * @package xortify
+ * @subpackage module
+ * @description Sector Network Security Drone
+ * @author Simon Roberts WISHCRAFT <si...@ch...>
+ * @copyright copyright (c) 2010-2013 XOOPS.org
+ * @licence GPL 2.0 - see docs/LICENCE.txt
+ */
+
+
+define('XORTIFY_CURLSERIAL_API', $GLOBALS['xoopsModuleConfig']['xortify_uriserial']);
+define('XORTIFY_USER_AGENT', 'Mozilla/5.0 (X11; U; Linux i686; pl-PL; rv:1.9.0.2) XOOPS/20100101 XoopsAuth/1.xx (php)');
+include_once XOOPS_ROOT_PATH . '/modules/xortify/class/auth/auth_curlserilaised_provisionning.php';
+
+class XortifyAuthCurlserialised extends XortifyAuth {
+
+ var $curl_client;
+ var $curl_xoops_username = '';
+ var $curl_xoops_password = '';
+ var $_dao;
+ /**
+ * Authentication Service constructor
+ */
+ function XortifyAuthCurlserialised (&$dao) {
+
+ if (!$ch = curl_init(XORTIFY_CURLSERIAL_API)) {
+ trigger_error('Could not intialise CURL file: '.$url);
+ return false;
+ }
+ $cookies = XOOPS_VAR_PATH.'/cache/xoops_cache/authcurl_'.md5(XORTIFY_CURLSERIAL_API).'.cookie';
+
+ curl_setopt($ch, CURLOPT_HEADER, 0);
+ curl_setopt($ch, CURLOPT_POST, 1);
+ curl_setopt($ch, CURLOPT_COOKIEJAR, $cookies);
+ curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
+ curl_setopt($ch, CURLOPT_USERAGENT, XORTIFY_USER_AGENT);
+ $this->curl_client =& $ch;
+ }
+
+
+ /**
+ * Authenticate user again curl directory (Bind)
+ *
+ * @param string $uname Username
+ * @param string $pwd Password
+ *
+ * @return bool
+ */
+ function authenticate($uname, $pwd = null) {
+ $authenticated = false;
+ $this->XortifyAuthCurlserialised($GLOBALS['xoopsDB']);
+
+ if (!$this->curl_client) {
+ $this->setErrors(0, _AUTH_CURL_EXTENSION_NOT_LOAD);
+ return $authenticated;
+ }
+
+
+ $rnd = rand(-100000, 100000000);
+ curl_setopt($this->curl_client, CURLOPT_POSTFIELDS, array('xoops_authentication' => serialize(array("username"=> $this->curl_xoops_username, "password"=> $this->curl_xoops_password, "auth" => array('username' => $uname, "password" => $pwd, "time" => time(), "passhash" => sha1((time()-$rnd).$uname.$pwd), "rand"=>$rnd)))));
+ $data = curl_exec($this->curl_client);
+ curl_close($this->curl_client);
+ $result = unserialize($data);
+ return $result["RESULT"];
+ }
+
+
+ /**
+ * validate a user via curl
+ *
+ * @param string $uname
+ * @param string $email
+ * @param string $pass
+ * @param string $vpass
+ *
+ * @return string
+ */
+ function validate($uname, $email, $pass, $vpass){
+ $this->XortifyAuthCurlserialised($GLOBALS['xoopsDB']);
+ $rnd = rand(-100000, 100000000);
+ curl_setopt($this->curl_client, CURLOPT_POSTFIELDS, array('xoops_user_validate' => serialize(array("username"=> $this->curl_xoops_username, "password"=> $this->curl_xoops_password, "validate" => array('uname' => $uname, "pass" => $pass, "vpass" => $vpass, "email" => $email, "time" => time(), "passhash" => sha1((time()-$rnd).$uname.$pass), "rand"=>$rnd)))));
+ $data = curl_exec($this->curl_client);
+ curl_close($this->curl_client);
+ $result = unserialize($data);
+ if ($result['ERRNUM']==1){
+ return $result["RESULT"];
+ } else {
+ return false;
+ }
+
+ }
+
+
+ /**
+ * get the xoops site disclaimer via curl
+ *
+ * @return string
+ */
+ function network_disclaimer(){
+ $this->XortifyAuthCurlserialised($GLOBALS['xoopsDB']);
+ curl_setopt($this->curl_client, CURLOPT_POSTFIELDS, array('xoops_network_disclaimer' => serialize(array("username"=> $this->curl_xoops_username, "password"=> $this->curl_xoops_password))));
+ $data = curl_exec($this->curl_client);
+ curl_close($this->curl_client);
+ $result = unserialize($data);
+ if ($result['ERRNUM']==1){
+ return $result["RESULT"];
+ } else {
+ return false;
+ }
+
+ }
+
+ /**
+ * create a user
+ *
+ * @param bool $user_viewemail
+ * @param string $uname
+ * @param string $email
+ * @param string $url
+ * @par...
[truncated message content] |
|
From: <wis...@us...> - 2011-12-15 04:21:23
|
Revision: 8492
http://xoops.svn.sourceforge.net/xoops/?rev=8492&view=rev
Author: wishcraft
Date: 2011-12-15 04:21:16 +0000 (Thu, 15 Dec 2011)
Log Message:
-----------
MyAlbum-p 3.01 Beta - Blue Room, XOOPS 2.5 GUI, Class Modeller, SEO, Tag & Sitemap Plugins (Roby73 Fix)
Modified Paths:
--------------
XoopsModules/myalbum/branches/wishcraft/3.01/htdocs/modules/myalbum/include/draw_functions.php
Modified: XoopsModules/myalbum/branches/wishcraft/3.01/htdocs/modules/myalbum/include/draw_functions.php
===================================================================
--- XoopsModules/myalbum/branches/wishcraft/3.01/htdocs/modules/myalbum/include/draw_functions.php 2011-12-14 23:33:24 UTC (rev 8491)
+++ XoopsModules/myalbum/branches/wishcraft/3.01/htdocs/modules/myalbum/include/draw_functions.php 2011-12-15 04:21:16 UTC (rev 8492)
@@ -228,7 +228,7 @@
// get list of sub categories in header space
-function myalbum_get_sub_categories( $parent_id , $cattree )
+function myalbum_get_sub_categories( $parent_id , $GLOBALS['cattree'] )
{
$ret = array() ;
@@ -243,13 +243,13 @@
extract($cat);
// Show first child of this category
$subcat = array() ;
- $arr = $cattree->getFirstChild( $cid ) ;
+ $arr = $GLOBALS['cattree']->getFirstChild( $cid ) ;
foreach( $arr as $child ) {
$subcat[] = array(
'cid' => $child->getVar('cid') ,
'title' => $GLOBALS['myts']->htmlSpecialChars( $child->getVar('title') ) ,
'photo_small_sum' => myalbum_get_photo_small_sum_from_cat( $child->getVar('cid') , $criteria ) ,
- 'number_of_subcat' => sizeof( $cattree->getFirstChildId( $child->getVar('cid') ) )
+ 'number_of_subcat' => sizeof( $GLOBALS['cattree']->getFirstChild( $child->getVar('cid') ) )
) ;
}
@@ -257,7 +257,7 @@
if( $imgurl == "http://" ) $imgurl = '' ;
// Total sum of photos
- foreach($cattree->getAllChild( $cid , array()) as $children)
+ foreach($GLOBALS['cattree']->getAllChild( $cid , array()) as $children)
$cids[] = $children->getVar('cid');
array_push( $cids , $cid ) ;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
275 messages has been excluded from this view by a project administrator.
![https://www.paypal.com/fr_FR/i/scr/pixel.gif"](https://www.paypal.com/fr_FR/i/scr/pixel.gif"){kind=link}
![https://www.paypal.com/en_US/i/btn/btn_donate_LG.gif"](https://www.paypal.com/en_US/i/btn/btn_donate_LG.gif"){kind=link}