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: <vo...@us...> - 2012-01-10 05:29:31
|
Revision: 8691
http://xoops.svn.sourceforge.net/xoops/?rev=8691&view=rev
Author: voltan1
Date: 2012-01-10 05:29:25 +0000 (Tue, 10 Jan 2012)
Log Message:
-----------
Fix some problems
Modified Paths:
--------------
XoopsModules/fmcontent/branches/news/admin/action.module.php
XoopsModules/fmcontent/branches/news/admin/index.php
XoopsModules/fmcontent/branches/news/index.php
XoopsModules/fmcontent/branches/news/templates/news_index.html
XoopsModules/fmcontent/branches/news/xoops_version.php
Modified: XoopsModules/fmcontent/branches/news/admin/action.module.php
===================================================================
--- XoopsModules/fmcontent/branches/news/admin/action.module.php 2012-01-09 20:02:45 UTC (rev 8690)
+++ XoopsModules/fmcontent/branches/news/admin/action.module.php 2012-01-10 05:29:25 UTC (rev 8691)
@@ -21,16 +21,18 @@
function xoops_module_pre_install_news($module) {
- /*
- $db =& $GLOBALS["xoopsDB"];
- $error = false;
+
+ $db = $GLOBALS["xoopsDB"];
+ $error = false;
+
+ /*
if (substr(XOOPS_VERSION, 0, 9) < "XOOPS 2.5") {
$module->setErrors("The module only works for XOOPS 2.5+");
return false;
}
-
+ */
$sqlfile = array('mysql' => 'sql/mysql.sql');
- */
+
$modsDirname = 'news';
$indexFile = XOOPS_ROOT_PATH . "/uploads/index.html";
$blankFile = XOOPS_ROOT_PATH . "/uploads/blank.gif";
@@ -44,39 +46,39 @@
}
//Creation du fichier price dans uploads
- $module_uploads = XOOPS_ROOT_PATH . "/uploads/" . $modsDirname . "/img";
+ $module_uploads = XOOPS_ROOT_PATH . "/uploads/" . $modsDirname . "/image";
if (!is_dir($module_uploads)) {
mkdir($module_uploads, 0777);
chmod($module_uploads, 0777);
- copy($indexFile, XOOPS_ROOT_PATH . "/uploads/" . $modsDirname . "/img/index.html");
- copy($blankFile, XOOPS_ROOT_PATH . "/uploads/" . $modsDirname . "/img/blank.gif");
+ copy($indexFile, XOOPS_ROOT_PATH . "/uploads/" . $modsDirname . "/image/index.html");
+ copy($blankFile, XOOPS_ROOT_PATH . "/uploads/" . $modsDirname . "/image/blank.gif");
}
//Creation du fichier price dans uploads
- $module_uploads = XOOPS_ROOT_PATH . "/uploads/" . $modsDirname . "/img/original";
+ $module_uploads = XOOPS_ROOT_PATH . "/uploads/" . $modsDirname . "/image/original";
if (!is_dir($module_uploads)) {
mkdir($module_uploads, 0777);
chmod($module_uploads, 0777);
- copy($indexFile, XOOPS_ROOT_PATH . "/uploads/" . $modsDirname . "/img/original/index.html");
- copy($blankFile, XOOPS_ROOT_PATH . "/uploads/" . $modsDirname . "/img/original/blank.gif");
+ copy($indexFile, XOOPS_ROOT_PATH . "/uploads/" . $modsDirname . "/image/original/index.html");
+ copy($blankFile, XOOPS_ROOT_PATH . "/uploads/" . $modsDirname . "/image/original/blank.gif");
}
//Creation du fichier price dans uploads
- $module_uploads = XOOPS_ROOT_PATH . "/uploads/" . $modsDirname . "/img/medium";
+ $module_uploads = XOOPS_ROOT_PATH . "/uploads/" . $modsDirname . "/image/medium";
if (!is_dir($module_uploads)) {
mkdir($module_uploads, 0777);
chmod($module_uploads, 0777);
- copy($indexFile, XOOPS_ROOT_PATH . "/uploads/" . $modsDirname . "/img/medium/index.html");
- copy($blankFile, XOOPS_ROOT_PATH . "/uploads/" . $modsDirname . "/img/medium/blank.gif");
+ copy($indexFile, XOOPS_ROOT_PATH . "/uploads/" . $modsDirname . "/image/medium/index.html");
+ copy($blankFile, XOOPS_ROOT_PATH . "/uploads/" . $modsDirname . "/image/medium/blank.gif");
}
//Creation du fichier price dans uploads
- $module_uploads = XOOPS_ROOT_PATH . "/uploads/" . $modsDirname . "/img/thumb";
+ $module_uploads = XOOPS_ROOT_PATH . "/uploads/" . $modsDirname . "/image/thumb";
if (!is_dir($module_uploads)) {
mkdir($module_uploads, 0777);
chmod($module_uploads, 0777);
- copy($indexFile, XOOPS_ROOT_PATH . "/uploads/" . $modsDirname . "/img/thumb/index.html");
- copy($blankFile, XOOPS_ROOT_PATH . "/uploads/" . $modsDirname . "/img/thumb/blank.gif");
+ copy($indexFile, XOOPS_ROOT_PATH . "/uploads/" . $modsDirname . "/image/thumb/index.html");
+ copy($blankFile, XOOPS_ROOT_PATH . "/uploads/" . $modsDirname . "/image/thumb/blank.gif");
}
//Creation du fichier price dans uploads
@@ -88,13 +90,13 @@
copy($blankFile, XOOPS_ROOT_PATH . "/uploads/" . $modsDirname . "/file/blank.gif");
}
- /*
- if (is_array($sqlfile) && !empty($sqlfile[XOOPS_DB_TYPE])) {
- $sql_file_path = XOOPS_ROOT_PATH . "/modules/" . $modsDirname . "/" . $sqlfile[XOOPS_DB_TYPE];
+ if (is_array($sqlfile) && !empty($sqlfile[XOOPS_DB_TYPE])) {
+ $sql_file_path = XOOPS_ROOT_PATH . "/modules/" . $modsDirname . "/" . $sqlfile[XOOPS_DB_TYPE];
+
if (!file_exists($sql_file_path)) {
$module->setErrors("<p>" . sprintf(_NEWS_MI_SQL_NOT_FOUND, "<strong>{$sql_file_path}</strong>"));
$error = true;
- } else {
+ } else {
$msgs[] = "<p>" . sprintf(_NEWS_MI_SQL_FOUND, "<strong>{$sql_file_path}</strong>") . "<br />" . _NEWS_MI_CREATE_TABLES;
require_once $GLOBALS['xoops']->path('/class/database/sqlutility.php');
@@ -145,11 +147,9 @@
return false;
}
}
- return true;
+ return true;
}
return false;
- */
- return true;
}
function xoops_module_update_news($module, $version) {
@@ -159,7 +159,6 @@
function xoops_module_uninstall_news($module) {
$db =& $GLOBALS["xoopsDB"];
- //$created_tables = array(0 => 'news');
$created_tables = array(0 => 'news_story', 1 => 'news_topic' , 2 => 'news_file');
foreach ($created_tables as $ct) {
Modified: XoopsModules/fmcontent/branches/news/admin/index.php
===================================================================
--- XoopsModules/fmcontent/branches/news/admin/index.php 2012-01-09 20:02:45 UTC (rev 8690)
+++ XoopsModules/fmcontent/branches/news/admin/index.php 2012-01-10 05:29:25 UTC (rev 8691)
@@ -34,8 +34,11 @@
$folder = array(
XOOPS_ROOT_PATH . '/uploads/news/',
- XOOPS_ROOT_PATH . '/uploads/news/img',
- XOOPS_ROOT_PATH . '/uploads/news/file'
+ XOOPS_ROOT_PATH . xoops_getModuleOption ( 'img_dir', $NewsModule->getVar ( 'dirname' ) ),
+ XOOPS_ROOT_PATH . xoops_getModuleOption ( 'img_dir', $NewsModule->getVar ( 'dirname' ) ) . '/thumb/',
+ XOOPS_ROOT_PATH . xoops_getModuleOption ( 'img_dir', $NewsModule->getVar ( 'dirname' ) ) . '/medium/',
+ XOOPS_ROOT_PATH . xoops_getModuleOption ( 'img_dir', $NewsModule->getVar ( 'dirname' ) ) . '/original/',
+ XOOPS_ROOT_PATH . xoops_getModuleOption ( 'file_dir', $NewsModule->getVar ( 'dirname' ) )
);
$story_infos = array(
Modified: XoopsModules/fmcontent/branches/news/index.php
===================================================================
--- XoopsModules/fmcontent/branches/news/index.php 2012-01-09 20:02:45 UTC (rev 8690)
+++ XoopsModules/fmcontent/branches/news/index.php 2012-01-10 05:29:25 UTC (rev 8691)
@@ -84,12 +84,14 @@
$topic_alias = $default_alias = $view_topic->getVar ( 'topic_alias' );
$topic_id = $default_id = $view_topic->getVar ( 'topic_id' );
$topic_img = $view_topic->getVar ( 'topic_img' );
- $topic_imgurl = XOOPS_URL . xoops_getModuleOption ( 'img_dir', $NewsModule->getVar ( 'dirname' ) ) . $view_topic->getVar ( 'topic_img' );
+ $topic_thumb = XOOPS_URL . xoops_getModuleOption ( 'img_dir', $NewsModule->getVar ( 'dirname' ) ) . '/thumb/'. $view_topic->getVar ( 'topic_img' );
+ $topic_medium = XOOPS_URL . xoops_getModuleOption ( 'img_dir', $NewsModule->getVar ( 'dirname' ) ) . '/medium/'. $view_topic->getVar ( 'topic_img' );
$topic_desc = $view_topic->getVar ( 'topic_desc' );
$xoopsTpl->assign ( 'topic_desc', $topic_desc );
$xoopsTpl->assign ( 'topic_img', $topic_img );
- $xoopsTpl->assign ( 'topic_imgurl', $topic_imgurl );
+ $xoopsTpl->assign ( 'topic_thumb', $topic_thumb );
+ $xoopsTpl->assign ( 'topic_medium', $topic_medium );
$xoopsTpl->assign ( 'topic_title', $topic_title );
$xoopsTpl->assign ( 'xoops_pagetitle', $topic_title );
Modified: XoopsModules/fmcontent/branches/news/templates/news_index.html
===================================================================
--- XoopsModules/fmcontent/branches/news/templates/news_index.html 2012-01-09 20:02:45 UTC (rev 8690)
+++ XoopsModules/fmcontent/branches/news/templates/news_index.html 2012-01-10 05:29:25 UTC (rev 8691)
@@ -20,15 +20,16 @@
<{if $topic_img}>
<div class="itemImg gallery">
<{if $img_lightbox}>
- <a href="<{$topic_imgurl}>" title="<{$topic_title}>" >
- <img width="<{$imgwidth}>" class="<{$imgfloat}> story_img" src="<{$topic_imgurl}>" alt="<{$topic_title}>"/>
+ <a href="<{$topic_medium}>" title="<{$topic_title}>" >
+ <img width="<{$imgwidth}>" class="<{$imgfloat}> story_img" src="<{$topic_thumb}>" alt="<{$topic_title}>"/>
</a>
<{else}>
- <img width="<{$imgwidth}>" class="<{$imgfloat}> story_img" src="<{$topic_imgurl}>" alt="<{$topic_title}>"/>
+ <img width="<{$imgwidth}>" class="<{$imgfloat}> story_img" src="<{$topic_thumb}>" alt="<{$topic_title}>"/>
<{/if}>
</div>
<{/if}>
<{$topic_desc}>
+ <div class="clear"></div>
</div>
<{/if}>
<{/if}>
Modified: XoopsModules/fmcontent/branches/news/xoops_version.php
===================================================================
--- XoopsModules/fmcontent/branches/news/xoops_version.php 2012-01-09 20:02:45 UTC (rev 8690)
+++ XoopsModules/fmcontent/branches/news/xoops_version.php 2012-01-10 05:29:25 UTC (rev 8691)
@@ -63,14 +63,6 @@
'min_admin' => '1.1'
);
-//Sql file
-$modversion["sqlfile"]["mysql"] = "sql/mysql.sql";
-$modversion["tables"] = array(
- "news_story",
- "news_topic",
- "news_file",
-);
-
//Recherche
$modversion["search"]["file"] = "include/search.inc.php";
$modversion["search"]["func"] = "news_search";
@@ -516,7 +508,7 @@
'description' => '_NEWS_MI_FILE_DIR_DESC',
'formtype' => 'textbox',
'valuetype' => 'text',
- 'default' => "/uploads/news/file/");
+ 'default' => "/uploads/news/file");
$modversion['config'][] = array(
'name' => 'file_size',
@@ -548,7 +540,7 @@
'description' => '_NEWS_MI_IMAGE_DIR_DESC',
'formtype' => 'textbox',
'valuetype' => 'text',
- 'default' => "/uploads/news/img/");
+ 'default' => "/uploads/news/image");
$modversion['config'][] = array(
'name' => 'img_size',
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2012-01-09 20:02:56
|
Revision: 8690
http://xoops.svn.sourceforge.net/xoops/?rev=8690&view=rev
Author: mageg
Date: 2012-01-09 20:02:45 +0000 (Mon, 09 Jan 2012)
Log Message:
-----------
omissions in smilies module
Modified Paths:
--------------
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/smilies/admin/smilies.php
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/smilies/admin/smilies.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/smilies/admin/smilies.php 2012-01-09 13:31:19 UTC (rev 8689)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/smilies/admin/smilies.php 2012-01-09 20:02:45 UTC (rev 8690)
@@ -26,10 +26,6 @@
if (!$xoops->isUser() || !$xoops->isModule() || !$xoops->user->isAdmin($xoops->module->mid())) {
exit(_NOPERM);
}
-// Check is active
-if (!$xoops->getModuleConfig('active_smilies', 'system')) {
- $xoops->redirect('admin.php', 2, _AM_SYSTEM_NOTACTIVE);
-}
// Parameters
$nb_smilies = $xoops->getModuleConfig('smilies_pager');
$mimetypes = array('image/gif', 'image/jpeg', 'image/pjpeg', 'image/x-png', 'image/png');
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vo...@us...> - 2012-01-09 13:31:30
|
Revision: 8689
http://xoops.svn.sourceforge.net/xoops/?rev=8689&view=rev
Author: voltan1
Date: 2012-01-09 13:31:19 +0000 (Mon, 09 Jan 2012)
Log Message:
-----------
Add news pream in tools
Modified Paths:
--------------
XoopsModules/fmcontent/branches/news/admin/tools.php
XoopsModules/fmcontent/branches/news/class/story.php
XoopsModules/fmcontent/branches/news/language/arabic/admin.php
XoopsModules/fmcontent/branches/news/language/english/admin.php
XoopsModules/fmcontent/branches/news/language/persian/admin.php
XoopsModules/fmcontent/branches/news/templates/admin/news_tools.html
Modified: XoopsModules/fmcontent/branches/news/admin/tools.php
===================================================================
--- XoopsModules/fmcontent/branches/news/admin/tools.php 2012-01-09 10:53:40 UTC (rev 8688)
+++ XoopsModules/fmcontent/branches/news/admin/tools.php 2012-01-09 13:31:19 UTC (rev 8689)
@@ -97,7 +97,32 @@
$form->addElement(new XoopsFormHidden('op', 'keyword'));
$form->addElement(new XoopsFormButton('', 'post', _SUBMIT, 'submit'));
$xoopsTpl->assign('keyword', $form->render());
-
+
+ // prune manager
+ $form = new XoopsThemeForm(_NEWS_AM_TOOLS_PRUNE, 'tools', 'tools.php', 'post');
+ $form->addElement(new XoopsFormTextDateSelect(_NEWS_AM_TOOLS_PRUNE_BEFORE, 'prune_date', 15, time()));
+ $onlyexpired=new xoopsFormCheckBox('', 'onlyexpired');
+ $onlyexpired->addOption(1, _NEWS_AM_TOOLS_PRUNE_EXPIREDONLY);
+ $form->addElement($onlyexpired, false);
+ $form->addElement(new XoopsFormHidden('op', 'confirmbeforetoprune'), false);
+ $form->addElement(new XoopsFormHidden('op', 'confirmbeforetoprune'), false);
+ $topiclist = new XoopsFormSelect(_NEWS_AM_TOOLS_PRUNE_TOPICS, 'pruned_topics','',5,true);
+ $criteria = new CriteriaCompo ();
+ $criteria->add ( new Criteria ( 'topic_modid', $NewsModule->getVar ( 'mid' ) ) );
+ $criteria->setSort ( 'topic_id' );
+ $criteria->setOrder ( 'DESC' );
+ $allTopics = $topic_handler->getObjects ( $criteria );
+ $topic_tree = new XoopsObjectTree($allTopics, 'topic_id', 'topic_pid');
+ $topics_arr = $topic_tree->getAllChild(0);
+ foreach ($topics_arr as $onetopic) {
+ $topiclist->addOption($onetopic->getVar ( 'topic_id' ),$onetopic->getVar ( 'topic_title', 'e' ));
+ }
+ $topiclist->setDescription(_NEWS_AM_TOOLS_EXPORT_PRUNE_DSC);
+ $form->addElement($topiclist,false);
+ $form->addElement(new XoopsFormHidden('op', 'prune'));
+ $form->addElement(new XoopsFormButton('', 'post', _SUBMIT, 'submit'));
+ $xoopsTpl->assign('prune', $form->render());
+
// other options
$xoopsTpl->assign('header', true );
break;
@@ -154,6 +179,19 @@
NewsUtils::News_Rebuild ($story_handler , 'story_id' , 'description' , 'story_desc' , 'story_title' , $start_id , $end_id);
NewsUtils::News_Redirect('tools.php', 1, _NEWS_AM_MSG_WAIT);
break;
+
+ case 'prune':
+ $timestamp = NewsUtils::News_CleanVars ( $_REQUEST, 'prune_date', '', 'int' );
+ $expired = NewsUtils::News_CleanVars ( $_REQUEST, 'onlyexpired', 0, 'int' );
+ $timestamp = strtotime($_REQUEST ['prune_date']);
+ $topiclist = '';
+ if(isset($_REQUEST['pruned_topics'])) {
+ $topiclist = implode ( ',', $_REQUEST['pruned_topics'] );
+ }
+ $count = $story_handler->News_PruneCount($NewsModule,$timestamp,$expired,$topiclist);
+ $story_handler->News_DeleteBeforeDate($NewsModule,$timestamp,$expired,$topiclist);
+ NewsUtils::News_Redirect('tools.php', 100, sprintf(_NEWS_AM_MSG_PRUNE_DELETED,$count));
+ break;
}
$xoopsTpl->assign('navigation', 'tools');
Modified: XoopsModules/fmcontent/branches/news/class/story.php
===================================================================
--- XoopsModules/fmcontent/branches/news/class/story.php 2012-01-09 10:53:40 UTC (rev 8688)
+++ XoopsModules/fmcontent/branches/news/class/story.php 2012-01-09 13:31:19 UTC (rev 8689)
@@ -1052,7 +1052,7 @@
return $result;
}
- /**
+ /**
* Get archive
*/
function News_GetArchive($NewsModule, $publish_start, $publish_end ,$topics) {
@@ -1088,6 +1088,50 @@
}
return $ret;
}
+
+ /**
+ * News Prune Count
+ */
+ function News_PruneCount($NewsModule,$timestamp,$expired,$topiclist) {
+ $criteria = new CriteriaCompo ();
+ $criteria->add ( new Criteria ( 'story_modid', $NewsModule->getVar ( 'mid' ) ) );
+ $criteria->add ( new Criteria ( 'story_publish', $timestamp , '<=' ));
+ if($expired) {
+ $criteria->add ( new Criteria ( 'story_expire', 0 ));
+ $criteria->add ( new Criteria ( 'story_expire', time() , '>' ) ,'OR');
+ }
+ if($topiclist) {
+ $criteria->add ( new Criteria ( 'story_topic', '(' . $topiclist . ')', 'IN' ) );
+ }
+ return $this->getCount ( $criteria );
+ }
+
+ /**
+ * News Delete Before Date
+ */
+ function News_DeleteBeforeDate($NewsModule,$timestamp,$expired,$topiclist) {
+ $criteria = new CriteriaCompo ();
+ $criteria->add ( new Criteria ( 'story_modid', $NewsModule->getVar ( 'mid' ) ) );
+ $criteria->add ( new Criteria ( 'story_publish', $timestamp , '<=' ));
+ if($expired) {
+ $criteria->add ( new Criteria ( 'story_expire', 0 ));
+ $criteria->add ( new Criteria ( 'story_expire', time() , '>' ) ,'OR');
+ }
+ if($topiclist) {
+ $criteria->add ( new Criteria ( 'story_topic', '(' . $topiclist . ')', 'IN' ) );
+ }
+ /*
+ $obj = $this->getObjects ( $criteria, false );
+ if ($obj) {
+ foreach ( $obj as $root ) {
+ xoops_comment_delete( $NewsModule->getVar ( 'mid' ) , $root->getVar ( 'story_id' ));
+ //xoops_notification_deletebyitem( $NewsModule->getVar ( 'mid' ) , 'story', $root->getVar ( 'story_id' ));
+ }
+ }
+ */
+ $this->deleteAll($criteria);
+ return true;
+ }
}
?>
\ No newline at end of file
Modified: XoopsModules/fmcontent/branches/news/language/arabic/admin.php
===================================================================
--- XoopsModules/fmcontent/branches/news/language/arabic/admin.php 2012-01-09 10:53:40 UTC (rev 8688)
+++ XoopsModules/fmcontent/branches/news/language/arabic/admin.php 2012-01-09 13:31:19 UTC (rev 8689)
@@ -168,6 +168,7 @@
define('_NEWS_AM_MSG_CLONE_ERROR', 'هذا الدليل هو متاح الآن !');
define("_NEWS_AM_MSG_NOPERMSSET", "لایمکن تعدیل الإتاحات: لم یتم تحدیث أي فئة ! الرجاء تحدیث فئة أولا.");
define('_NEWS_AM_MSG_ALIASERROR', 'لقد تم اختیار هذا الإسم. الرجاء اختیار اسم آخر.');
+ define('_NEWS_AM_MSG_PRUNE_DELETED', '%s Articles deleted');
// about
define('_NEWS_AM_ABOUT_ADMIN', 'درباره');
define('_NEWS_AM_ABOUT_DESCRIPTION', 'وصف:');
Modified: XoopsModules/fmcontent/branches/news/language/english/admin.php
===================================================================
--- XoopsModules/fmcontent/branches/news/language/english/admin.php 2012-01-09 10:53:40 UTC (rev 8688)
+++ XoopsModules/fmcontent/branches/news/language/english/admin.php 2012-01-09 13:31:19 UTC (rev 8689)
@@ -167,7 +167,8 @@
define('_NEWS_AM_MSG_CLONE_ERROR', 'This folder already exists !');
define('_NEWS_AM_MSG_NOPERMSSET', 'Permission cannot be set: No Topics created yet! Please create a Topic first.');
define('_NEWS_AM_MSG_ALIASERROR', 'Your selected Alias is already taken. Please change it and try again');
- define('_NEWS_AM_MSG_INPROC', 'Rebuilding ... ');
+ define('_NEWS_AM_MSG_INPROC', 'Rebuilding ... ');
+ define('_NEWS_AM_MSG_PRUNE_DELETED', '%s Articles deleted');
// about
define('_NEWS_AM_ABOUT_ADMIN', 'About');
define('_NEWS_AM_ABOUT_DESCRIPTION', 'Description:');
Modified: XoopsModules/fmcontent/branches/news/language/persian/admin.php
===================================================================
--- XoopsModules/fmcontent/branches/news/language/persian/admin.php 2012-01-09 10:53:40 UTC (rev 8688)
+++ XoopsModules/fmcontent/branches/news/language/persian/admin.php 2012-01-09 13:31:19 UTC (rev 8689)
@@ -167,7 +167,8 @@
define('_NEWS_AM_MSG_INSERT_ERROR', 'ناتوان در به روز رسانی پایگاه داده ها! خطا در مورد اخبار');
define('_NEWS_AM_MSG_CLONE_ERROR', 'این شاخه هماکنون موجود است!');
define("_NEWS_AM_MSG_NOPERMSSET", "هیچ دسترسی قابل تنظیم نیست : هنوز هیچ شاخه ای ساخته نشده است! لطفا ابتدا یک شاخه بسازید.");
- define('_NEWS_AM_MSG_ALIASERROR', 'نام مستعار مورد انتخاب شما گرفته شده است. لطفا یک نام دیگر انتخاب کنید.');
+ define('_NEWS_AM_MSG_ALIASERROR', 'نام مستعار مورد انتخاب شما گرفته شده است. لطفا یک نام دیگر انتخاب کنید.');
+ define('_NEWS_AM_MSG_PRUNE_DELETED', '%s Articles deleted');
// about
define('_NEWS_AM_ABOUT_ADMIN', 'درباره');
define('_NEWS_AM_ABOUT_DESCRIPTION', 'توضیحات:');
Modified: XoopsModules/fmcontent/branches/news/templates/admin/news_tools.html
===================================================================
--- XoopsModules/fmcontent/branches/news/templates/admin/news_tools.html 2012-01-09 10:53:40 UTC (rev 8688)
+++ XoopsModules/fmcontent/branches/news/templates/admin/news_tools.html 2012-01-09 13:31:19 UTC (rev 8689)
@@ -8,7 +8,7 @@
<{if $topicalias}><{$topicalias}><{/if}>
<{if $description}><{$description}><{/if}>
<{if $keyword}><{$keyword}><{/if}>
-
+ <{if $prune}><{$prune}><{/if}>
<{if $messages}>
<div id="xo-module-log">
<h4><{$smarty.const._NEWS_AM_TOOLS_LOG_TITLE}></h4>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vo...@us...> - 2012-01-09 10:53:51
|
Revision: 8688
http://xoops.svn.sourceforge.net/xoops/?rev=8688&view=rev
Author: voltan1
Date: 2012-01-09 10:53:40 +0000 (Mon, 09 Jan 2012)
Log Message:
-----------
Add archive page
Modified Paths:
--------------
XoopsModules/fmcontent/branches/news/class/story.php
XoopsModules/fmcontent/branches/news/language/arabic/main.php
XoopsModules/fmcontent/branches/news/language/arabic/modinfo.php
XoopsModules/fmcontent/branches/news/language/english/main.php
XoopsModules/fmcontent/branches/news/language/english/modinfo.php
XoopsModules/fmcontent/branches/news/language/persian/main.php
XoopsModules/fmcontent/branches/news/language/persian/modinfo.php
XoopsModules/fmcontent/branches/news/xoops_version.php
Added Paths:
-----------
XoopsModules/fmcontent/branches/news/archive.php
XoopsModules/fmcontent/branches/news/templates/news_archive.html
Added: XoopsModules/fmcontent/branches/news/archive.php
===================================================================
--- XoopsModules/fmcontent/branches/news/archive.php (rev 0)
+++ XoopsModules/fmcontent/branches/news/archive.php 2012-01-09 10:53:40 UTC (rev 8688)
@@ -0,0 +1,125 @@
+<?php
+/*
+ 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.
+*/
+
+/**
+ * News index file
+ *
+ * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license http://www.fsf.org/copyleft/gpl.html GNU public license
+ * @author Andricq Nicolas (AKA MusS)
+ * @version $Id$
+ */
+
+require dirname(__FILE__) . '/header.php';
+if (!isset($NewsModule)) exit('Module not found');
+
+include_once XOOPS_ROOT_PATH.'/language/'.$xoopsConfig['language'].'/calendar.php';
+
+// Initialize content handler
+$story_handler = xoops_getmodulehandler ( 'story', 'news' );
+$topic_handler = xoops_getmodulehandler ( 'topic', 'news' );
+$file_handler = xoops_getmodulehandler('file', 'news');
+
+// Include content template
+$xoopsOption ['template_main'] = 'news_archive.html';
+
+// include Xoops header
+include XOOPS_ROOT_PATH . '/header.php';
+
+// Add Stylesheet
+$xoTheme->addStylesheet ( XOOPS_URL . '/modules/' . $NewsModule->getVar ( 'dirname' ) . '/css/style.css' );
+
+$lastyear = 0;
+$lastmonth = 0;
+
+$months_arr = array(1 => _CAL_JANUARY, 2 => _CAL_FEBRUARY, 3 => _CAL_MARCH, 4 => _CAL_APRIL, 5 => _CAL_MAY, 6 => _CAL_JUNE, 7 => _CAL_JULY, 8 => _CAL_AUGUST, 9 => _CAL_SEPTEMBER, 10 => _CAL_OCTOBER, 11 => _CAL_NOVEMBER, 12 => _CAL_DECEMBER);
+
+$fromyear = NewsUtils::News_CleanVars ( $_REQUEST, 'year', 0, 'int' );
+$frommonth = NewsUtils::News_CleanVars ( $_REQUEST, 'month', 0, 'int' );
+
+$pgtitle = '';
+if($fromyear && $frommonth) {
+ $pgtitle = sprintf(" - %d - %d", $fromyear, $frommonth);
+}
+
+$dateformat='m';
+
+$xoopsTpl->assign('xoops_pagetitle', _NEWS_MD_ARCHIVE . $pgtitle . ' - ' . $xoopsModule->name('s'));
+
+$useroffset = '';
+if(is_object($xoopsUser)) {
+ $timezone = $xoopsUser->timezone();
+ if(isset($timezone)){
+ $useroffset = $xoopsUser->timezone();
+ } else {
+ $useroffset = $xoopsConfig['default_TZ'];
+ }
+}
+
+$result = $story_handler->News_GetArchiveMonth($NewsModule);
+$years = array();
+$months = array();
+$i = 0;
+
+while (list($time) = $xoopsDB->fetchRow($result)) {
+ $time = formatTimestamp($time, 'mysql', $useroffset);
+ if (preg_match("/([0-9]{4})-([0-9]{1,2})-([0-9]{1,2}) ([0-9]{1,2}):([0-9]{1,2}):([0-9]{1,2})/", $time, $datetime)) {
+ $this_year = intval($datetime[1]);
+ $this_month = intval($datetime[2]);
+ if (empty($lastyear)) {
+ $lastyear = $this_year;
+ }
+ if ($lastmonth == 0) {
+ $lastmonth = $this_month;
+ $months[$lastmonth]['string'] = $months_arr[$lastmonth];
+ $months[$lastmonth]['number'] = $lastmonth;
+ }
+ if ($lastyear != $this_year) {
+ $years[$i]['number'] = $lastyear;
+ $years[$i]['months'] = $months;
+ $months = array();
+ $lastmonth = 0;
+ $lastyear = $this_year;
+ $i++;
+ }
+ if ($lastmonth != $this_month) {
+ $lastmonth = $this_month;
+ $months[$lastmonth]['string'] = $months_arr[$lastmonth];
+ $months[$lastmonth]['number'] = $lastmonth;
+ }
+ }
+}
+
+ $years[$i]['number'] = $this_year;
+ $years[$i]['months'] = $months;
+ $xoopsTpl->assign('years', $years);
+ $xoopsTpl->assign('module', $NewsModule->getVar ( 'dirname' ));
+
+
+if ($fromyear != 0 && $frommonth != 0) {
+ // must adjust the selected time to server timestamp
+ $timeoffset = $useroffset - $xoopsConfig['server_TZ'];
+ $monthstart = mktime(0 - $timeoffset, 0, 0, $frommonth, 1, $fromyear);
+ $monthend = mktime(23 - $timeoffset, 59, 59, $frommonth + 1, 0, $fromyear);
+ $monthend = ($monthend > time()) ? time() : $monthend;
+
+ $topics = $topic_handler->getall ();
+ $archive = $story_handler->News_GetArchive($NewsModule , $monthstart, $monthend , $topics);
+ $xoopsTpl->assign('archive', $archive);
+ $xoopsTpl->assign('show_articles', true);
+} else {
+ $xoopsTpl->assign('show_articles', false);
+}
+
+
+// include Xoops footer
+include XOOPS_ROOT_PATH . '/footer.php';
+?>
\ No newline at end of file
Modified: XoopsModules/fmcontent/branches/news/class/story.php
===================================================================
--- XoopsModules/fmcontent/branches/news/class/story.php 2012-01-09 08:00:51 UTC (rev 8687)
+++ XoopsModules/fmcontent/branches/news/class/story.php 2012-01-09 10:53:40 UTC (rev 8688)
@@ -846,7 +846,7 @@
*
* @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
* @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html)
- * @author Hervé Thouzard (ttp://www.instant-zero.com)
+ * @author Hervé Thouzard (http://www.instant-zero.com)
*/
function News_UpdateHits($story_id) {
@@ -1027,7 +1027,7 @@
* Returns the number of published news per topic
* @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
* @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html)
- * @author Hervé Thouzard (ttp://www.instant-zero.com)
+ * @author Hervé Thouzard (http://www.instant-zero.com)
*/
function News_GetNewsCountByTopic()
{
@@ -1039,6 +1039,55 @@
}
return $ret;
}
+
+ /**
+ * Get archive month
+ * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html)
+ * @author Hervé Thouzard (http://www.instant-zero.com)
+ */
+ function News_GetArchiveMonth($NewsModule) {
+ $sql = "SELECT `story_publish` FROM ".$this->db->prefix('news_story')." WHERE ( story_status = 1 ) AND ( story_topic != 0 ) AND ( story_modid = " . $NewsModule->getVar ( 'mid' ) . " ) AND ( story_publish > 0 AND story_publish <= " . time() . " ) AND ( story_expire = 0 OR story_expire <= " . time() . " ) ORDER BY story_publish DESC";
+ $result = $this->db->query($sql);
+ return $result;
+ }
+
+ /**
+ * Get archive
+ */
+ function News_GetArchive($NewsModule, $publish_start, $publish_end ,$topics) {
+ $ret = array();
+ $criteria = new CriteriaCompo ();
+ $criteria->add ( new Criteria ( 'story_modid', $NewsModule->getVar ( 'mid' ) ) );
+ $criteria->add ( new Criteria ( 'story_status', '1' ) );
+ $criteria->add ( new Criteria ( 'story_publish', $publish_start , '>' ));
+ $criteria->add ( new Criteria ( 'story_publish', $publish_end , '<=' ));
+ $criteria->add ( new Criteria ( 'story_expire', 0 ));
+ $criteria->add ( new Criteria ( 'story_expire', time() , '>' ) ,'OR');
+ $criteria->setSort ( 'story_publish' );
+ $criteria->setOrder ( 'DESC' );
+ $obj = $this->getObjects ( $criteria, false );
+ if ($obj) {
+ foreach ( $obj as $root ) {
+ $tab = array ();
+ $tab = $root->toArray ();
+ foreach ( array_keys ( $topics ) as $i ) {
+ $list [$i] ['topic_title'] = $topics [$i]->getVar ( "topic_title" );
+ $list [$i] ['topic_id'] = $topics [$i]->getVar ( "topic_id" );
+ $list [$i] ['topic_alias'] =$topics [$i]->getVar ( "topic_alias" );
+ }
+ $tab ['topic'] = $list [$root->getVar ( 'story_topic' )] ['topic_title'];
+ $tab ['topic_alias'] = $list [$root->getVar ( 'story_topic' )] ['topic_alias'];
+ $tab ['topicurl'] = NewsUtils::News_TopicUrl ( $NewsModule->getVar ( 'dirname' ), array('topic_id'=>$list [$root->getVar ( 'story_topic' )] ['topic_id'], 'topic_alias'=>$list [$root->getVar ( 'story_topic' )] ['topic_alias'] ));
+ $tab ['url'] = NewsUtils::News_Url ( $NewsModule->getVar ( 'dirname' ), $tab );
+ $tab ['story_publish'] = formatTimestamp ( $root->getVar ( 'story_publish' ), _MEDIUMDATESTRING );
+ $tab ['imageurl'] = XOOPS_URL . xoops_getModuleOption ( 'img_dir', $NewsModule->getVar ( 'dirname' ) ) . '/medium/' . $root->getVar ( 'story_img' );
+ $tab ['thumburl'] = XOOPS_URL . xoops_getModuleOption ( 'img_dir', $NewsModule->getVar ( 'dirname' ) ) . '/thumb/' . $root->getVar ( 'story_img' );
+ $ret [] = $tab;
+ }
+ }
+ return $ret;
+ }
}
?>
\ No newline at end of file
Modified: XoopsModules/fmcontent/branches/news/language/arabic/main.php
===================================================================
--- XoopsModules/fmcontent/branches/news/language/arabic/main.php 2012-01-09 08:00:51 UTC (rev 8687)
+++ XoopsModules/fmcontent/branches/news/language/arabic/main.php 2012-01-09 10:53:40 UTC (rev 8688)
@@ -85,5 +85,12 @@
define("_NEWS_MD_TOPIC_NAME", "العنوان");
define("_NEWS_MD_TOPIC_DESC", "شرح");
define("_NEWS_MD_TOPIC_IMG", "صورة");
+// Archive
+ define("_NEWS_MD_ARCHIVE", "News Archive");
+ define("_NEWS_MD_ARCHIVE_ARTICLES", "Articles");
+ define("_NEWS_MD_ARCHIVE_VIEW", "Hits");
+ define("_NEWS_MD_ARCHIVE_DATE", "Date");
+ define("_NEWS_MD_ARCHIVE_TOPIC", "Topic");
+ define("_NEWS_MD_ARCHIVE_TOTAL", "Total Stores");
}
?>
\ No newline at end of file
Modified: XoopsModules/fmcontent/branches/news/language/arabic/modinfo.php
===================================================================
--- XoopsModules/fmcontent/branches/news/language/arabic/modinfo.php 2012-01-09 08:00:51 UTC (rev 8687)
+++ XoopsModules/fmcontent/branches/news/language/arabic/modinfo.php 2012-01-09 10:53:40 UTC (rev 8688)
@@ -32,6 +32,7 @@
define("_NEWS_MI_HELP", "دلیل");
define("_NEWS_MI_SUBMIT", "ارسال");
define('_NEWS_MI_FILE', 'ملف');
+ define('_NEWS_MI_ARCHIVE', 'Archive');
// Block
define("_NEWS_MI_BLOCK_PAGE", "الصفحة");
define("_NEWS_MI_BLOCK_LIST", "الفهرسة");
Modified: XoopsModules/fmcontent/branches/news/language/english/main.php
===================================================================
--- XoopsModules/fmcontent/branches/news/language/english/main.php 2012-01-09 08:00:51 UTC (rev 8687)
+++ XoopsModules/fmcontent/branches/news/language/english/main.php 2012-01-09 10:53:40 UTC (rev 8688)
@@ -80,10 +80,17 @@
define("_NEWS_MD_BOOKMARK_TO_GOOLGEBUZZ", "Bookmark to Google Buzz");
define("_NEWS_MD_BOOKMARK_TO_GOOLGEREADER", "Bookmark to Google Reader");
define("_NEWS_MD_BOOKMARK_TO_GOOLGEBOOKMARKS", "Bookmark to Google Bookmarks");
-// topic
+// Topic
define("_NEWS_MD_TOPIC_ID", "ID");
define("_NEWS_MD_TOPIC_NAME", "Title");
define("_NEWS_MD_TOPIC_DESC", "Description");
- define("_NEWS_MD_TOPIC_IMG", "image");
+ define("_NEWS_MD_TOPIC_IMG", "image");
+// Archive
+ define("_NEWS_MD_ARCHIVE", "News Archive");
+ define("_NEWS_MD_ARCHIVE_ARTICLES", "Articles");
+ define("_NEWS_MD_ARCHIVE_VIEW", "Hits");
+ define("_NEWS_MD_ARCHIVE_DATE", "Date");
+ define("_NEWS_MD_ARCHIVE_TOPIC", "Topic");
+ define("_NEWS_MD_ARCHIVE_TOTAL", "Total Stores");
}
?>
\ No newline at end of file
Modified: XoopsModules/fmcontent/branches/news/language/english/modinfo.php
===================================================================
--- XoopsModules/fmcontent/branches/news/language/english/modinfo.php 2012-01-09 08:00:51 UTC (rev 8687)
+++ XoopsModules/fmcontent/branches/news/language/english/modinfo.php 2012-01-09 10:53:40 UTC (rev 8688)
@@ -31,7 +31,8 @@
define('_NEWS_MI_ABOUT', 'About');
define('_NEWS_MI_HELP', 'Help');
define('_NEWS_MI_SUBMIT', 'Submit');
- define('_NEWS_MI_FILE', 'File');
+ define('_NEWS_MI_FILE', 'File');
+ define('_NEWS_MI_ARCHIVE', 'Archive');
// Block
define('_NEWS_MI_BLOCK_PAGE', 'Article page');
define('_NEWS_MI_BLOCK_LIST', 'Article list');
Modified: XoopsModules/fmcontent/branches/news/language/persian/main.php
===================================================================
--- XoopsModules/fmcontent/branches/news/language/persian/main.php 2012-01-09 08:00:51 UTC (rev 8687)
+++ XoopsModules/fmcontent/branches/news/language/persian/main.php 2012-01-09 10:53:40 UTC (rev 8688)
@@ -85,5 +85,12 @@
define("_NEWS_MD_TOPIC_NAME", "عنوان");
define("_NEWS_MD_TOPIC_DESC", "توضیحات");
define("_NEWS_MD_TOPIC_IMG", "تصویر");
+// Archive
+ define("_NEWS_MD_ARCHIVE", "News Archive");
+ define("_NEWS_MD_ARCHIVE_ARTICLES", "Articles");
+ define("_NEWS_MD_ARCHIVE_VIEW", "Hits");
+ define("_NEWS_MD_ARCHIVE_DATE", "Date");
+ define("_NEWS_MD_ARCHIVE_TOPIC", "Topic");
+ define("_NEWS_MD_ARCHIVE_TOTAL", "Total Stores");
}
?>
\ No newline at end of file
Modified: XoopsModules/fmcontent/branches/news/language/persian/modinfo.php
===================================================================
--- XoopsModules/fmcontent/branches/news/language/persian/modinfo.php 2012-01-09 08:00:51 UTC (rev 8687)
+++ XoopsModules/fmcontent/branches/news/language/persian/modinfo.php 2012-01-09 10:53:40 UTC (rev 8688)
@@ -31,7 +31,8 @@
define("_NEWS_MI_ABOUT", "درباره");
define("_NEWS_MI_HELP", "راهنما");
define("_NEWS_MI_SUBMIT", "ارسال");
- define('_NEWS_MI_FILE', 'فایل');
+ define('_NEWS_MI_FILE', 'فایل');
+ define('_NEWS_MI_ARCHIVE', 'Archive');
// Block
define("_NEWS_MI_BLOCK_PAGE", "صفحه");
define("_NEWS_MI_BLOCK_LIST", "فهرست");
Added: XoopsModules/fmcontent/branches/news/templates/news_archive.html
===================================================================
--- XoopsModules/fmcontent/branches/news/templates/news_archive.html (rev 0)
+++ XoopsModules/fmcontent/branches/news/templates/news_archive.html 2012-01-09 10:53:40 UTC (rev 8688)
@@ -0,0 +1,39 @@
+<div class="news-archive">
+ <div class="pad2 marg2">
+ <table>
+ <tr>
+ <th><{$smarty.const._NEWS_MD_ARCHIVE}></th>
+ </tr>
+ <{foreach item=year from=$years}>
+ <{foreach item=month from=$year.months}>
+ <tr class="even">
+ <td><a title="<{$month.string}> <{$year.number}>" href="<{$xoops_url}>/modules/<{$module}>/archive.php?year=<{$year.number}>&month=<{$month.number}>"><{$month.string}> <{$year.number}></a></td>
+ </tr>
+ <{/foreach}>
+ <{/foreach}>
+ </table>
+ </div>
+
+ <{if $show_articles == true}>
+ <div class="pad2 marg2">
+ <table>
+ <tr>
+ <th><{$smarty.const._NEWS_MD_ARCHIVE_ARTICLES}></th>
+ <th class="center"><{$smarty.const._NEWS_MD_ARCHIVE_VIEW}></th>
+ <th class="center"><{$smarty.const._NEWS_MD_ARCHIVE_DATE}></th>
+ <th class="center"><{$smarty.const._NEWS_MD_ARCHIVE_TOPIC}></th>
+ </tr>
+ <{foreach item=archive from=$archive}>
+ <tr class="<{cycle values="even,odd"}>">
+ <td><a title="<{$archive.story_title}>" href="<{$archive.url}>"><{$archive.story_title}></a></td>
+ <td class="center"><{$archive.story_hits}></td>
+ <td class="center"><{$archive.story_publish}></td>
+ <td class="center"><a title="<{$archive.topic}>" href="<{$archive.topicurl}>" ><{$archive.topic}></a></td>
+ </tr>
+ <{/foreach}>
+ </table>
+ </div>
+ <div class="marg2 pad2 center"><a title="<{$smarty.const._NEWS_MD_ARCHIVE_TOTAL}>" href="<{$xoops_url}>/modules/<{$module}>/archive.php"><{$smarty.const._NEWS_MD_ARCHIVE_TOTAL}></a></div>
+ <{/if}>
+
+</div>
\ No newline at end of file
Modified: XoopsModules/fmcontent/branches/news/xoops_version.php
===================================================================
--- XoopsModules/fmcontent/branches/news/xoops_version.php 2012-01-09 08:00:51 UTC (rev 8687)
+++ XoopsModules/fmcontent/branches/news/xoops_version.php 2012-01-09 10:53:40 UTC (rev 8688)
@@ -95,6 +95,7 @@
$modversion['templates'][] = array('file' => 'news_bookmarkme.html', 'description' => '');
$modversion['templates'][] = array('file' => 'news_header.html', 'description' => '');
$modversion['templates'][] = array('file' => 'news_topic.html', 'description' => '');
+$modversion['templates'][] = array('file' => 'news_archive.html', 'description' => '');
// Menu
$modversion['sub'][] = array(
@@ -103,6 +104,9 @@
$modversion['sub'][] = array(
'name' => _NEWS_MI_TOPIC,
'url' => 'topic.php');
+$modversion['sub'][] = array(
+ 'name' => _NEWS_MI_ARCHIVE,
+ 'url' => 'archive.php');
// Blocks
$modversion['blocks'][] = array(
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vo...@us...> - 2012-01-09 08:00:57
|
Revision: 8687
http://xoops.svn.sourceforge.net/xoops/?rev=8687&view=rev
Author: voltan1
Date: 2012-01-09 08:00:51 +0000 (Mon, 09 Jan 2012)
Log Message:
-----------
REmove leagacy css file
Modified Paths:
--------------
XoopsModules/fmcontent/branches/news/article.php
XoopsModules/fmcontent/branches/news/index.php
Removed Paths:
-------------
XoopsModules/fmcontent/branches/news/css/legacy.css
Modified: XoopsModules/fmcontent/branches/news/article.php
===================================================================
--- XoopsModules/fmcontent/branches/news/article.php 2012-01-09 07:53:07 UTC (rev 8686)
+++ XoopsModules/fmcontent/branches/news/article.php 2012-01-09 08:00:51 UTC (rev 8687)
@@ -44,7 +44,6 @@
// Add Stylesheet
$xoTheme->addStylesheet ( XOOPS_URL . '/modules/' . $NewsModule->getVar ( 'dirname' ) . '/css/style.css' );
-$xoTheme->addStylesheet ( XOOPS_URL . '/modules/' . $NewsModule->getVar ( 'dirname' ) . '/css/legacy.css' );
if (! $story_id) {
$criteria = new CriteriaCompo ();
Deleted: XoopsModules/fmcontent/branches/news/css/legacy.css
===================================================================
--- XoopsModules/fmcontent/branches/news/css/legacy.css 2012-01-09 07:53:07 UTC (rev 8686)
+++ XoopsModules/fmcontent/branches/news/css/legacy.css 2012-01-09 08:00:51 UTC (rev 8687)
@@ -1,18 +0,0 @@
-/**
- * News module
- *
- * 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 http://www.fsf.org/copyleft/gpl.html GNU public license
- * @package News
- * @since 2.5.0
- * @author voltan
- * @version $Id $
- **/
-
Modified: XoopsModules/fmcontent/branches/news/index.php
===================================================================
--- XoopsModules/fmcontent/branches/news/index.php 2012-01-09 07:53:07 UTC (rev 8686)
+++ XoopsModules/fmcontent/branches/news/index.php 2012-01-09 08:00:51 UTC (rev 8687)
@@ -53,7 +53,6 @@
// Add Stylesheet
$xoTheme->addStylesheet ( XOOPS_URL . '/modules/' . $NewsModule->getVar ( 'dirname' ) . '/css/style.css' );
-$xoTheme->addStylesheet ( XOOPS_URL . '/modules/' . $NewsModule->getVar ( 'dirname' ) . '/css/legacy.css' );
if (isset ( $story_topic )) {
$topics = $topic_handler->getall ( $story_topic );
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vo...@us...> - 2012-01-09 07:53:13
|
Revision: 8686
http://xoops.svn.sourceforge.net/xoops/?rev=8686&view=rev
Author: voltan1
Date: 2012-01-09 07:53:07 +0000 (Mon, 09 Jan 2012)
Log Message:
-----------
Add story cont for each topic in topic list page
Modified Paths:
--------------
XoopsModules/fmcontent/branches/news/class/topic.php
XoopsModules/fmcontent/branches/news/templates/news_topic.html
XoopsModules/fmcontent/branches/news/topic.php
Modified: XoopsModules/fmcontent/branches/news/class/topic.php
===================================================================
--- XoopsModules/fmcontent/branches/news/class/topic.php 2012-01-09 06:03:25 UTC (rev 8685)
+++ XoopsModules/fmcontent/branches/news/class/topic.php 2012-01-09 07:53:07 UTC (rev 8686)
@@ -243,7 +243,7 @@
/**
* Get topic information
*/
- function News_GetTopics($NewsModule, $topic_limit, $topic_start, $topic_order, $topic_sort, $topic_menu, $topic_online , $topic_parent) {
+ function News_GetTopics($NewsModule, $topic_limit, $topic_start, $topic_order, $topic_sort, $topic_menu, $topic_online , $topic_parent , $newscountbytopic) {
$ret = array ();
$criteria = new CriteriaCompo ();
$criteria->add ( new Criteria ( 'topic_modid', $NewsModule->getVar ( 'mid' ) ) );
@@ -265,6 +265,7 @@
$tab ['topicurl'] = NewsUtils::News_TopicUrl ( $NewsModule->getVar ( 'dirname' ), $tab );
$tab ['thumburl'] = XOOPS_URL . xoops_getModuleOption ( 'img_dir', $NewsModule->getVar ( 'dirname' ) ) . '/thumb/' .$root->getVar ( 'topic_img' );
$tab ['imageurl'] = XOOPS_URL . xoops_getModuleOption ( 'img_dir', $NewsModule->getVar ( 'dirname' ) ) . '/medium/' .$root->getVar ( 'topic_img' );
+ $tab ['count'] = $newscountbytopic[$root->getVar ( 'topic_id' )];
$ret [] = $tab;
}
}
Modified: XoopsModules/fmcontent/branches/news/templates/news_topic.html
===================================================================
--- XoopsModules/fmcontent/branches/news/templates/news_topic.html 2012-01-09 06:03:25 UTC (rev 8685)
+++ XoopsModules/fmcontent/branches/news/templates/news_topic.html 2012-01-09 07:53:07 UTC (rev 8686)
@@ -11,7 +11,7 @@
<{foreach item=topic from=$topics}>
<tr class="odd">
<td<{if !$topic.topic_img}> colspan="2"<{/if}> class="top">
- <div class=""><a title="<{$topic.topic_title}>" href="<{$topic.topicurl}>"><{$topic.topic_title}></a></div>
+ <div class=""><a title="<{$topic.topic_title}>" href="<{$topic.topicurl}>"><{$topic.topic_title}></a> ( <{$topic.count}> ) </div>
<div class=""><{$topic.topic_desc}></div>
</td>
<{if $topic.topic_img}>
Modified: XoopsModules/fmcontent/branches/news/topic.php
===================================================================
--- XoopsModules/fmcontent/branches/news/topic.php 2012-01-09 06:03:25 UTC (rev 8685)
+++ XoopsModules/fmcontent/branches/news/topic.php 2012-01-09 07:53:07 UTC (rev 8686)
@@ -52,9 +52,10 @@
$topic_start = NewsUtils::News_CleanVars($_REQUEST, 'start', 0, 'int');
} else {
$topic_start = 0;
-}
+}
-$topics = $topic_handler->News_GetTopics($NewsModule, $topic_limit, $topic_start, $topic_order, $topic_sort, $topic_menu = null, $topic_online = null , $topic_parent = null);
+$newscountbytopic = $story_handler->News_GetNewsCountByTopic();
+$topics = $topic_handler->News_GetTopics($NewsModule, $topic_limit, $topic_start, $topic_order, $topic_sort, $topic_menu = null, $topic_online = null , $topic_parent = null , $newscountbytopic);
$topic_numrows = $topic_handler->News_GetTopicCount($NewsModule);
if ($topic_numrows > $topic_limit) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vo...@us...> - 2012-01-09 06:03:31
|
Revision: 8685
http://xoops.svn.sourceforge.net/xoops/?rev=8685&view=rev
Author: voltan1
Date: 2012-01-09 06:03:25 +0000 (Mon, 09 Jan 2012)
Log Message:
-----------
Add subtitle to template
Modified Paths:
--------------
XoopsModules/fmcontent/branches/news/css/legacy.css
XoopsModules/fmcontent/branches/news/css/style.css
XoopsModules/fmcontent/branches/news/templates/news_article.html
Modified: XoopsModules/fmcontent/branches/news/css/legacy.css
===================================================================
--- XoopsModules/fmcontent/branches/news/css/legacy.css 2012-01-09 03:14:03 UTC (rev 8684)
+++ XoopsModules/fmcontent/branches/news/css/legacy.css 2012-01-09 06:03:25 UTC (rev 8685)
@@ -15,88 +15,4 @@
* @author voltan
* @version $Id $
**/
-.item {
- margin-bottom: 12px;
-}
-
-#default.item {
- border-width: 0;
-}
-
-#default .itemTitle {
- padding-bottom: 2px;
-}
-
-#default .itemShort,#default .itemText {
- text-align: justify;
-}
-
-.itemHead {
- padding: 5px 3px 6px 7px;
-}
-
-.itemInfo {
- padding: 4px 5px;
-}
-
-.itemBody {
- padding: 3px 4px;
-}
-
-.itemFoot {
- padding: 4px 5px;
-}
-
-.itemFoot img {
- vertical-align: -3px;
-}
-
-.itemTitle h1 {
- padding: 0;
- margin: 0;
-}
-
-.itemTitle h2 {
- padding: 0;
- margin: 0;
-}
-
-.itemTitle a {
- font-size: inherit;
-}
-
-.itemShort {
- line-height: 1.5em;
- margin: 0 2px;
- padding: 0 2px;
-}
-
-.itemSource {
- font-style: italic;
- font-size: 0.9em;;
- margin-bottom: 2px;
-}
-
-.itemAdminLink img {
- vertical-align: bottom;
-}
-
-.itemAde {
- text-align: center;
- margin: 4px 0 1px 0;
- auto;
-}
-
-.itemMore {
- margin-top: 4px;
-}
-
-.related h2 {
- padding: 7px 0 6px 0;
- margin: 0;
-}
-
-#xo-canvas-content ul li,.news ul li {
- list-style-position: outside;
- margin: 0 0 5px 15px;
-}
\ No newline at end of file
+
Modified: XoopsModules/fmcontent/branches/news/css/style.css
===================================================================
--- XoopsModules/fmcontent/branches/news/css/style.css 2012-01-09 03:14:03 UTC (rev 8684)
+++ XoopsModules/fmcontent/branches/news/css/style.css 2012-01-09 06:03:25 UTC (rev 8685)
@@ -16,6 +16,92 @@
* @version $Id $
**/
+.item {
+ margin-bottom: 12px;
+}
+
+#default.item {
+ border-width: 0;
+}
+
+#default .itemTitle {
+ padding-bottom: 2px;
+}
+
+#default .itemShort,#default .itemText {
+ text-align: justify;
+}
+
+.itemHead {
+ padding: 5px 3px 6px 7px;
+}
+
+.itemInfo {
+ padding: 4px 5px;
+}
+
+.itemBody {
+ padding: 3px 4px;
+}
+
+.itemFoot {
+ padding: 4px 5px;
+}
+
+.itemFoot img {
+ vertical-align: -3px;
+}
+
+.itemTitle h1 {
+ padding: 0;
+ margin: 0;
+}
+
+.itemTitle h2 {
+ padding: 0;
+ margin: 0;
+}
+
+.itemTitle a {
+ font-size: inherit;
+}
+
+.itemShort {
+ line-height: 1.5em;
+ margin: 0 2px;
+ padding: 0 2px;
+}
+
+.itemSource {
+ font-style: italic;
+ font-size: 0.9em;;
+ margin-bottom: 2px;
+}
+
+.itemAdminLink img {
+ vertical-align: bottom;
+}
+
+.itemAde {
+ text-align: center;
+ margin: 4px 0 1px 0;
+ auto;
+}
+
+.itemMore {
+ margin-top: 4px;
+}
+
+.related h2 {
+ padding: 7px 0 6px 0;
+ margin: 0;
+}
+
+#xo-canvas-content ul li,.news ul li {
+ list-style-position: outside;
+ margin: 0 0 5px 15px;
+}
+
.itemImg img {
max-width: 200px;
max-height: 200px;
@@ -32,6 +118,11 @@
margin: 5px;
}
+.itemSubTitle {
+ padding: 0px;
+ margin: 0px;
+}
+
.content_img {
max-width: 300px;
max-height: 300px;
Modified: XoopsModules/fmcontent/branches/news/templates/news_article.html
===================================================================
--- XoopsModules/fmcontent/branches/news/templates/news_article.html 2012-01-09 03:14:03 UTC (rev 8684)
+++ XoopsModules/fmcontent/branches/news/templates/news_article.html 2012-01-09 06:03:25 UTC (rev 8685)
@@ -38,6 +38,9 @@
</div>
<div class="itemBody">
<!-- Display content body -->
+ <{if $content.story_subtitle}>
+ <div class="itemSubTitle"><h3><{$content.story_subtitle}></h3></div>
+ <{/if}>
<{if $content.story_short}>
<div class="itemShort"><{$content.story_short}></div>
<{/if}>
@@ -55,7 +58,7 @@
<img class="<{$imgfloat}> story_img" src="<{$content.thumburl}>" alt="<{$content.story_title}>"/>
<{/if}>
</div>
- <{/if}>
+ <{/if}>
<{$content.story_text}>
<div class="clear spacer"></div>
<{if $content.story_author}>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <wis...@us...> - 2012-01-09 03:14:09
|
Revision: 8684
http://xoops.svn.sourceforge.net/xoops/?rev=8684&view=rev
Author: wishcraft
Date: 2012-01-09 03:14:03 +0000 (Mon, 09 Jan 2012)
Log Message:
-----------
Twitterbomb 1.26 - Warnings & Notices, About Dialogue Box, Dashboard WSOD with Log Data - see changelog.txt
Modified Paths:
--------------
XoopsModules/twitterbomb/releases/1.26/htdocs/modules/twitterbomb/admin/index.php
XoopsModules/twitterbomb/releases/1.26/htdocs/modules/twitterbomb/language/english/modinfo.php
XoopsModules/twitterbomb/releases/1.26/htdocs/modules/twitterbomb/xoops_version.php
Modified: XoopsModules/twitterbomb/releases/1.26/htdocs/modules/twitterbomb/admin/index.php
===================================================================
--- XoopsModules/twitterbomb/releases/1.26/htdocs/modules/twitterbomb/admin/index.php 2012-01-09 03:03:08 UTC (rev 8683)
+++ XoopsModules/twitterbomb/releases/1.26/htdocs/modules/twitterbomb/admin/index.php 2012-01-09 03:14:03 UTC (rev 8684)
@@ -137,7 +137,7 @@
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['spidersModule']->getVar('dirname')), strtoupper($GLOBALS['spidersModule']->getVar('dirname')). ' '.$GLOBALS['spidersModule']->getVar('name'));
+ $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['twitterbombModule']->getVar('dirname')), strtoupper($GLOBALS['twitterbombModule']->getVar('dirname')). ' '.$GLOBALS['twitterbombModule']->getVar('name'));
break;
}
}
Modified: XoopsModules/twitterbomb/releases/1.26/htdocs/modules/twitterbomb/language/english/modinfo.php
===================================================================
--- XoopsModules/twitterbomb/releases/1.26/htdocs/modules/twitterbomb/language/english/modinfo.php 2012-01-09 03:03:08 UTC (rev 8683)
+++ XoopsModules/twitterbomb/releases/1.26/htdocs/modules/twitterbomb/language/english/modinfo.php 2012-01-09 03:14:03 UTC (rev 8684)
@@ -41,8 +41,8 @@
// Version 1.05
//Preferences Definitions
- define('_MI_TWEETBOMB_ANONYMOUS', 'Anonymous Guest can Submit Twitter Usernames?');
- define('_MI_TWEETBOMB_ANONYMOUS_DESC', 'Allows anonymous guest to submit twitter usernames to campaigns and categories.');
+ define('_MI_TWEETBOMB_PREF_ANONYMOUS', 'Anonymous Guest can Submit Twitter Usernames?');
+ define('_MI_TWEETBOMB_PREF_ANONYMOUS_DESC', 'Allows anonymous guest to submit twitter usernames to campaigns and categories.');
define('_MI_TWEETBOMB_CACHE', 'Number of Seconds RSS Feed is cached!');
define('_MI_TWEETBOMB_CACHE_DESC', 'Total number of seconds the RSS Feed is cached for.');
@@ -133,9 +133,6 @@
define('_MI_TWEETBOMB_ROOT_TWEETER_DESC', 'Your default twitter username for the basis of following etc. (without the @)');
define('_MI_TWEETBOMB_CRONTYPE', 'Cron execution type');
define('_MI_TWEETBOMB_CRONTYPE_DESC', 'This is the type of cron job that is being executed. If you have set up a cronjob as per INSTALL then please select either the \'cron job\' or \'scheduler\'.');
- define('_MI_TWEETBOMB_CRONTYPE_PRELOADER', 'Preloader');
- define('_MI_TWEETBOMB_CRONTYPE_CRONTAB', 'UNIX Cron Job');
- define('_MI_TWEETBOMB_CRONTYPE_SCHEDULER', 'Windows Scheduled Task');
define('_MI_TWEETBOMB_INTERVAL_OF_CRON', 'Interval of Cron');
define('_MI_TWEETBOMB_INTERVAL_OF_CRON_DESC', 'This is the interval between executions of the cron job. (In Seconds)');
define('_MI_TWEETBOMB_RUNTIME_OF_CRON', 'Runtime of Cron');
@@ -151,9 +148,9 @@
//Preference Options
define('_MI_TWEETBOMB_CRONTYPE_RSS', 'Aggregated Via RSS Feed');
- define('_MI_TWEETBOMB_CRONTYPE_PRELOADER', 'Aggregated Via API & Preloader');
- define('_MI_TWEETBOMB_CRONTYPE_CRONTAB', 'Aggregated Via API & Cron Job');
- define('_MI_TWEETBOMB_CRONTYPE_SCHEDULER', 'Aggregated Via API & a Scheduled Task');
+ define('_MI_TWEETBOMB_CRONTYPE_PRELOADER', 'Preloader');
+ define('_MI_TWEETBOMB_CRONTYPE_CRONTAB', 'UNIX Cron Job');
+ define('_MI_TWEETBOMB_CRONTYPE_SCHEDULER', 'Windows Scheduled Task');
define('_MI_TWEETBOMB_CACHE_30SECONDS', 'Cache for 30 Seconds');
define('_MI_TWEETBOMB_CACHE_60SECONDS', 'Cache for 1 Minute');
define('_MI_TWEETBOMB_CACHE_120SECONDS', 'Cache for 2 Minutes');
Modified: XoopsModules/twitterbomb/releases/1.26/htdocs/modules/twitterbomb/xoops_version.php
===================================================================
--- XoopsModules/twitterbomb/releases/1.26/htdocs/modules/twitterbomb/xoops_version.php 2012-01-09 03:03:08 UTC (rev 8683)
+++ XoopsModules/twitterbomb/releases/1.26/htdocs/modules/twitterbomb/xoops_version.php 2012-01-09 03:14:03 UTC (rev 8684)
@@ -307,8 +307,8 @@
$i++;
$modversion['config'][$i]['name'] = 'anonymous';
-$modversion['config'][$i]['title'] = "_MI_TWEETBOMB_ANONYMOUS";
-$modversion['config'][$i]['description'] = "_MI_TWEETBOMB_ANONYMOUS_DESC";
+$modversion['config'][$i]['title'] = "_MI_TWEETBOMB_PREF_ANONYMOUS";
+$modversion['config'][$i]['description'] = "_MI_TWEETBOMB_PREF_ANONYMOUS_DESC";
$modversion['config'][$i]['formtype'] = 'yesno';
$modversion['config'][$i]['valuetype'] = 'int';
$modversion['config'][$i]['default'] = 0;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <wis...@us...> - 2012-01-09 03:03:15
|
Revision: 8683
http://xoops.svn.sourceforge.net/xoops/?rev=8683&view=rev
Author: wishcraft
Date: 2012-01-09 03:03:08 +0000 (Mon, 09 Jan 2012)
Log Message:
-----------
Twitterbomb 1.26 - Optimized Tweet Cron and Search Exceptions - see changelog.txt
Modified Paths:
--------------
XoopsModules/twitterbomb/releases/1.26/htdocs/modules/twitterbomb/admin/index.php
XoopsModules/twitterbomb/releases/1.26/htdocs/modules/twitterbomb/docs/changelog.txt
Modified: XoopsModules/twitterbomb/releases/1.26/htdocs/modules/twitterbomb/admin/index.php
===================================================================
--- XoopsModules/twitterbomb/releases/1.26/htdocs/modules/twitterbomb/admin/index.php 2012-01-09 00:49:13 UTC (rev 8682)
+++ XoopsModules/twitterbomb/releases/1.26/htdocs/modules/twitterbomb/admin/index.php 2012-01-09 03:03:08 UTC (rev 8683)
@@ -29,24 +29,26 @@
$scheduler_handler = xoops_getmodulehandler('scheduler', 'twitterbomb');
$urls_handler = xoops_getmodulehandler('urls', 'twitterbomb');
$usernames_handler = xoops_getmodulehandler('usernames', 'twitterbomb');
-
+
$indexAdmin = new ModuleAdmin();
$indexAdmin->addInfoBox(_AM_TWEETBOMB_ADMIN_COUNTS);
$indexAdmin->addInfoBoxLine(_AM_TWEETBOMB_ADMIN_COUNTS, "<label>"._AM_TWEETBOMB_ADMIN_THEREARE_CAMPAIGNSBOMB."</label>", $campaign_handler->getCount(new Criteria('`type`', 'bomb', '=')), 'Green');
$indexAdmin->addInfoBoxLine(_AM_TWEETBOMB_ADMIN_COUNTS, "<label>"._AM_TWEETBOMB_ADMIN_THEREARE_CAMPAIGNSSCHEDULER."</label>", $campaign_handler->getCount(new Criteria('`type`', 'scheduler', '=')), 'Green');
$indexAdmin->addInfoBoxLine(_AM_TWEETBOMB_ADMIN_COUNTS, "<label>"._AM_TWEETBOMB_ADMIN_THEREARE_CAMPAIGNSRETWEET."</label>", $campaign_handler->getCount(new Criteria('`type`', 'retweet', '=')), 'Green');
+
$criteria_a = new CriteriaCompo(new Criteria('timed', '0'));
$criteria_b = new CriteriaCompo(new Criteria('timed', '1'));
$criteria_b->add(new Criteria('start', time(), '<'));
$criteria_b->add(new Criteria('end', time(), '>'));
$criteria = new CriteriaCompo($criteria_a);
$criteria->add($criteria_b, 'OR');
+
$indexAdmin->addInfoBoxLine(_AM_TWEETBOMB_ADMIN_COUNTS, "<label>"._AM_TWEETBOMB_ADMIN_THEREARE_CAMPAIGNSACTIVE."</label>", $campaign_handler->getCount($criteria), 'Orange');
$indexAdmin->addInfoBoxLine(_AM_TWEETBOMB_ADMIN_COUNTS, "<label>"._AM_TWEETBOMB_ADMIN_THEREARE_CAMPAIGNSINACTIVE."</label>", ($campaign_handler->getCount(NULL)-$campaign_handler->getCount($criteria)), 'Orange');
$indexAdmin->addInfoBoxLine(_AM_TWEETBOMB_ADMIN_COUNTS, "<label>"._AM_TWEETBOMB_ADMIN_THEREARE_CATEGORIES."</label>", $category_handler->getCount(NULL), 'Green');
$indexAdmin->addInfoBoxLine(_AM_TWEETBOMB_ADMIN_COUNTS, "<label>"._AM_TWEETBOMB_ADMIN_THEREARE_KEYWORDS."</label>", $keywords_handler->getCount(NULL), 'Green');
$indexAdmin->addInfoBoxLine(_AM_TWEETBOMB_ADMIN_COUNTS, "<label>"._AM_TWEETBOMB_ADMIN_THEREARE_URLS."</label>", $urls_handler->getCount(NULL), 'Green');
- $indexAdmin->addInfoBoxLine(_AM_TWEETBOMB_ADMIN_COUNTS, "<label>"._AM_TWEETBOMB_ADMIN_THEREARE_RETWEETS."</label>", $retweet_handler->getCount(NULL), 'Green');
+ $indexAdmin->addInfoBoxLine(_AM_TWEETBOMB_ADMIN_COUNTS, "<label>"._AM_TWEETBOMB_ADMIN_THEREARE_RETWEETS."</label>", $retweet_handler->getCount(NULL), 'Green');
$indexAdmin->addInfoBoxLine(_AM_TWEETBOMB_ADMIN_COUNTS, "<label>"._AM_TWEETBOMB_ADMIN_THEREARE_SCHEDULERTOTAL."</label>", $scheduler_handler->getCount(NULL), 'Green');
$indexAdmin->addInfoBoxLine(_AM_TWEETBOMB_ADMIN_COUNTS, "<label>"._AM_TWEETBOMB_ADMIN_THEREARE_SCHEDULERWAITING."</label>", $scheduler_handler->getCount(new Criteria('`tweeted`', '0', '=')), 'Green');
$indexAdmin->addInfoBoxLine(_AM_TWEETBOMB_ADMIN_COUNTS, "<label>"._AM_TWEETBOMB_ADMIN_THEREARE_SCHEDULERTWEETED."</label>", $scheduler_handler->getCount(new Criteria('`tweeted`', '0', '!=')), 'Green');
@@ -54,20 +56,21 @@
$indexAdmin->addInfoBoxLine(_AM_TWEETBOMB_ADMIN_COUNTS, "<label>"._AM_TWEETBOMB_ADMIN_THEREARE_LOGBOMB."</label>", $log_handler->getCount(new Criteria('`provider`', 'bomb', '=')), 'Orange');
$indexAdmin->addInfoBoxLine(_AM_TWEETBOMB_ADMIN_COUNTS, "<label>"._AM_TWEETBOMB_ADMIN_THEREARE_LOGSCHEDULER."</label>", $log_handler->getCount(new Criteria('`provider`', 'scheduler', '=')), 'Orange');
$indexAdmin->addInfoBoxLine(_AM_TWEETBOMB_ADMIN_COUNTS, "<label>"._AM_TWEETBOMB_ADMIN_THEREARE_LOGRETWEET."</label>", $log_handler->getCount(new Criteria('`provider`', 'retweet', '=')), 'Orange');
+
$criteria = new CriteriaCompo(new Criteria('`provider`', 'bomb', '='));
$criteria->setSort('`date`');
$criteria->setOrder('DESC');
$criteria->setLimit(1);
$logs = $log_handler->getObjects($criteria, false);
if (is_object($logs[0])) {
- $indexAdmin->addInfoBoxLine(_AM_TWEETBOMB_ADMIN_COUNTS, "<label>"._AM_TWEETBOMB_ADMIN_THEREARE_LOGLASTBOMB."</label>", date(_DATESTRING, $logs[0]-getVar('date')), 'Green');
+ $indexAdmin->addInfoBoxLine(_AM_TWEETBOMB_ADMIN_COUNTS, "<label>"._AM_TWEETBOMB_ADMIN_THEREARE_LOGLASTBOMB."</label>", date(_DATESTRING, $logs[0]->getVar('date')), 'Green');
$criteria = new CriteriaCompo(new Criteria('`provider`', 'bomb', '='));
$criteria->setSort('`date`');
$criteria->setOrder('ASC');
$criteria->setLimit(1);
$logs = $log_handler->getObjects($criteria, false);
if (is_object($logs[0])) {
- $indexAdmin->addInfoBoxLine(_AM_TWEETBOMB_ADMIN_COUNTS, "<label>"._AM_TWEETBOMB_ADMIN_THEREARE_LOGFIRSTBOMB."</label>", date(_DATESTRING, $logs[0]-getVar('date')), 'Green');
+ $indexAdmin->addInfoBoxLine(_AM_TWEETBOMB_ADMIN_COUNTS, "<label>"._AM_TWEETBOMB_ADMIN_THEREARE_LOGFIRSTBOMB."</label>", date(_DATESTRING, $logs[0]->getVar('date')), 'Green');
}
}
@@ -77,14 +80,14 @@
$criteria->setLimit(1);
$logs = $log_handler->getObjects($criteria, false);
if (is_object($logs[0])) {
- $indexAdmin->addInfoBoxLine(_AM_TWEETBOMB_ADMIN_COUNTS, "<label>"._AM_TWEETBOMB_ADMIN_THEREARE_LOGLASTSCHEDULE."</label>", date(_DATESTRING, $logs[0]-getVar('date')), 'Green');
+ $indexAdmin->addInfoBoxLine(_AM_TWEETBOMB_ADMIN_COUNTS, "<label>"._AM_TWEETBOMB_ADMIN_THEREARE_LOGLASTSCHEDULE."</label>", date(_DATESTRING, $logs[0]->getVar('date')), 'Green');
$criteria = new CriteriaCompo(new Criteria('`provider`', 'scheduler', '='));
$criteria->setSort('`date`');
$criteria->setOrder('ASC');
$criteria->setLimit(1);
$logs = $log_handler->getObjects($criteria, false);
if (is_object($logs[0])) {
- $indexAdmin->addInfoBoxLine(_AM_TWEETBOMB_ADMIN_COUNTS, "<label>"._AM_TWEETBOMB_ADMIN_THEREARE_LOGFIRSTSCHEDULE."</label>", date(_DATESTRING, $logs[0]-getVar('date')), 'Green');
+ $indexAdmin->addInfoBoxLine(_AM_TWEETBOMB_ADMIN_COUNTS, "<label>"._AM_TWEETBOMB_ADMIN_THEREARE_LOGFIRSTSCHEDULE."</label>", date(_DATESTRING, $logs[0]->getVar('date')), 'Green');
}
}
@@ -94,14 +97,14 @@
$criteria->setLimit(1);
$logs = $log_handler->getObjects($criteria, false);
if (is_object($logs[0])) {
- $indexAdmin->addInfoBoxLine(_AM_TWEETBOMB_ADMIN_COUNTS, "<label>"._AM_TWEETBOMB_ADMIN_THEREARE_LOGLASTRETWEET."</label>", date(_DATESTRING, $logs[0]-getVar('date')), 'Green');
+ $indexAdmin->addInfoBoxLine(_AM_TWEETBOMB_ADMIN_COUNTS, "<label>"._AM_TWEETBOMB_ADMIN_THEREARE_LOGLASTRETWEET."</label>", date(_DATESTRING, $logs[0]->getVar('date')), 'Green');
$criteria = new CriteriaCompo(new Criteria('`provider`', 'retweet', '='));
$criteria->setSort('`date`');
$criteria->setOrder('ASC');
$criteria->setLimit(1);
$logs = $log_handler->getObjects($criteria, false);
if (is_object($logs[0])) {
- $indexAdmin->addInfoBoxLine(_AM_TWEETBOMB_ADMIN_COUNTS, "<label>"._AM_TWEETBOMB_ADMIN_THEREARE_LOGFIRSTRETWEET."</label>", date(_DATESTRING, $logs[0]-getVar('date')), 'Green');
+ $indexAdmin->addInfoBoxLine(_AM_TWEETBOMB_ADMIN_COUNTS, "<label>"._AM_TWEETBOMB_ADMIN_THEREARE_LOGFIRSTRETWEET."</label>", date(_DATESTRING, $logs[0]->getVar('date')), 'Green');
}
}
Modified: XoopsModules/twitterbomb/releases/1.26/htdocs/modules/twitterbomb/docs/changelog.txt
===================================================================
--- XoopsModules/twitterbomb/releases/1.26/htdocs/modules/twitterbomb/docs/changelog.txt 2012-01-09 00:49:13 UTC (rev 8682)
+++ XoopsModules/twitterbomb/releases/1.26/htdocs/modules/twitterbomb/docs/changelog.txt 2012-01-09 03:03:08 UTC (rev 8683)
@@ -1,4 +1,11 @@
========================================
+ 2012/01/09 14:00:00 Version 1.26 STABLE
+========================================
+ - Changed /admin/index.php - Fixed WSOD on Dashboard with $log[0]-getVar to ->getVar (Wishcraft)
+ - Changed /include/function.php - Fixed twitterbomb_searchtwitter() Line 140 - 155 - Exceptions (Wishcraft)
+ - Changed /cron/tweet.php - Changed Exceptions and Closure of Routine as well as population of $cids (Wishcraft)
+
+========================================
2011/11/09 20:11:00 Version 1.25 STABLE
========================================
- Changed $pathImageAdmin renamed to $GLOBALS['twitterbombImageAdmin'] (Wishcraft)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <wis...@us...> - 2012-01-09 00:49:19
|
Revision: 8682
http://xoops.svn.sourceforge.net/xoops/?rev=8682&view=rev
Author: wishcraft
Date: 2012-01-09 00:49:13 +0000 (Mon, 09 Jan 2012)
Log Message:
-----------
Twitterbomb 1.26 - Optimized Tweet Cron and Search Exceptions - see changelog.txt
Modified Paths:
--------------
XoopsModules/twitterbomb/releases/1.26/htdocs/modules/twitterbomb/include/functions.php
Modified: XoopsModules/twitterbomb/releases/1.26/htdocs/modules/twitterbomb/include/functions.php
===================================================================
--- XoopsModules/twitterbomb/releases/1.26/htdocs/modules/twitterbomb/include/functions.php 2012-01-09 00:33:56 UTC (rev 8681)
+++ XoopsModules/twitterbomb/releases/1.26/htdocs/modules/twitterbomb/include/functions.php 2012-01-09 00:49:13 UTC (rev 8682)
@@ -148,7 +148,11 @@
elseif ($numberpositive>0&&$foundpos>0)
$pass=true;
elseif ($numbernegative>0&&$foundneg==0)
- $pass=true;
+ $pass=true;
+ if ($foundneg>0&&$numbernegative>0)
+ $pass=false;
+ elseif ($foundpos==0&&$numberpositive>0)
+ $pass=false;
} else {
$pass=true;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <wis...@us...> - 2012-01-09 00:34:02
|
Revision: 8681
http://xoops.svn.sourceforge.net/xoops/?rev=8681&view=rev
Author: wishcraft
Date: 2012-01-09 00:33:56 +0000 (Mon, 09 Jan 2012)
Log Message:
-----------
X-REST 1.52 - Rest API for XOOPS 2.5 - Usability Issue with Admin Fields and No Fields for tables added to database.
Modified Paths:
--------------
XoopsModules/xrest/releases/1.52/htdocs/modules/xrest/include/forms.xrest.php
XoopsModules/xrest/releases/1.52/htdocs/modules/xrest/language/english/admin.php
Modified: XoopsModules/xrest/releases/1.52/htdocs/modules/xrest/include/forms.xrest.php
===================================================================
--- XoopsModules/xrest/releases/1.52/htdocs/modules/xrest/include/forms.xrest.php 2012-01-09 00:32:32 UTC (rev 8680)
+++ XoopsModules/xrest/releases/1.52/htdocs/modules/xrest/include/forms.xrest.php 2012-01-09 00:33:56 UTC (rev 8681)
@@ -27,6 +27,11 @@
$fields_handler = xoops_getmodulehandler('fields', 'xrest');
$table = $tables_handler->get($tbl_id);
+
+ if (!is_object($table)) {
+ redirect_header(XOOPS_URL.'/modules/xrest/admin/index.php?op=tables', 10, _XREST_AM_MSG_NEEDTOSAVETABLES_FIRST);
+ exit;
+ }
$fields = $fields_handler->getFieldFromTable($table->getVar('tablename'));
Modified: XoopsModules/xrest/releases/1.52/htdocs/modules/xrest/language/english/admin.php
===================================================================
--- XoopsModules/xrest/releases/1.52/htdocs/modules/xrest/language/english/admin.php 2012-01-09 00:32:32 UTC (rev 8680)
+++ XoopsModules/xrest/releases/1.52/htdocs/modules/xrest/language/english/admin.php 2012-01-09 00:33:56 UTC (rev 8681)
@@ -5,7 +5,7 @@
define('_XREST_AM_MSG_SAVETABLES_DATABASE_UPDATED', 'Saving Tables is complete, database has been updated!');
define('_XREST_AM_MSG_SAVEVIEWS_DATABASE_UPDATED', 'Saving Views is complete, database has been updated!');
define('_XREST_AM_MSG_SAVEPLUGINS_DATABASE_UPDATED', 'Saving Plugins is complete, database has been updated - Don\'t forget to set your permissions!');
-
+ define('_XREST_AM_MSG_NEEDTOSAVETABLES_FIRST', 'Either the table ID you have selected doesn\'t exist or you haven\'t saved any tables in the database yet!');
//About box
define('_XREST_AM_MAKE_DONATION', 'Make XRest Even Better - Make a donation now!');
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <wis...@us...> - 2012-01-09 00:32:43
|
Revision: 8680
http://xoops.svn.sourceforge.net/xoops/?rev=8680&view=rev
Author: wishcraft
Date: 2012-01-09 00:32:32 +0000 (Mon, 09 Jan 2012)
Log Message:
-----------
Twitterbomb 1.26 - Optimized Tweet Cron and Search Exceptions - see changelog.txt
Added Paths:
-----------
XoopsModules/twitterbomb/releases/1.26/
XoopsModules/twitterbomb/releases/1.26/docs/
XoopsModules/twitterbomb/releases/1.26/docs/.htaccess
XoopsModules/twitterbomb/releases/1.26/docs/INSTALL
XoopsModules/twitterbomb/releases/1.26/docs/licence.txt
XoopsModules/twitterbomb/releases/1.26/extras/
XoopsModules/twitterbomb/releases/1.26/extras/XOOPS 2.4.x/
XoopsModules/twitterbomb/releases/1.26/extras/XOOPS 2.4.x/htdocs/
XoopsModules/twitterbomb/releases/1.26/extras/XOOPS 2.4.x/htdocs/header.php
XoopsModules/twitterbomb/releases/1.26/extras/XOOPS 2.5.x/
XoopsModules/twitterbomb/releases/1.26/extras/XOOPS 2.5.x/htdocs/
XoopsModules/twitterbomb/releases/1.26/extras/XOOPS 2.5.x/htdocs/header.php
XoopsModules/twitterbomb/releases/1.26/htdocs/
XoopsModules/twitterbomb/releases/1.26/htdocs/Frameworks/
XoopsModules/twitterbomb/releases/1.26/htdocs/Frameworks/moduleclasses/
XoopsModules/twitterbomb/releases/1.26/htdocs/Frameworks/moduleclasses/icons/
XoopsModules/twitterbomb/releases/1.26/htdocs/Frameworks/moduleclasses/icons/16/
XoopsModules/twitterbomb/releases/1.26/htdocs/Frameworks/moduleclasses/icons/16/twitterbomb.campaigns.png
XoopsModules/twitterbomb/releases/1.26/htdocs/Frameworks/moduleclasses/icons/16/twitterbomb.categories.png
XoopsModules/twitterbomb/releases/1.26/htdocs/Frameworks/moduleclasses/icons/16/twitterbomb.keywords.png
XoopsModules/twitterbomb/releases/1.26/htdocs/Frameworks/moduleclasses/icons/16/twitterbomb.logs.png
XoopsModules/twitterbomb/releases/1.26/htdocs/Frameworks/moduleclasses/icons/16/twitterbomb.preferences.png
XoopsModules/twitterbomb/releases/1.26/htdocs/Frameworks/moduleclasses/icons/16/twitterbomb.retweet.png
XoopsModules/twitterbomb/releases/1.26/htdocs/Frameworks/moduleclasses/icons/16/twitterbomb.scheduler.png
XoopsModules/twitterbomb/releases/1.26/htdocs/Frameworks/moduleclasses/icons/16/twitterbomb.sentence.png
XoopsModules/twitterbomb/releases/1.26/htdocs/Frameworks/moduleclasses/icons/16/twitterbomb.urls.png
XoopsModules/twitterbomb/releases/1.26/htdocs/Frameworks/moduleclasses/icons/16/twitterbomb.usernames.png
XoopsModules/twitterbomb/releases/1.26/htdocs/Frameworks/moduleclasses/icons/32/
XoopsModules/twitterbomb/releases/1.26/htdocs/Frameworks/moduleclasses/icons/32/twitterbomb.campaigns.png
XoopsModules/twitterbomb/releases/1.26/htdocs/Frameworks/moduleclasses/icons/32/twitterbomb.categories.png
XoopsModules/twitterbomb/releases/1.26/htdocs/Frameworks/moduleclasses/icons/32/twitterbomb.keywords.png
XoopsModules/twitterbomb/releases/1.26/htdocs/Frameworks/moduleclasses/icons/32/twitterbomb.logs.png
XoopsModules/twitterbomb/releases/1.26/htdocs/Frameworks/moduleclasses/icons/32/twitterbomb.preferences.png
XoopsModules/twitterbomb/releases/1.26/htdocs/Frameworks/moduleclasses/icons/32/twitterbomb.retweet.png
XoopsModules/twitterbomb/releases/1.26/htdocs/Frameworks/moduleclasses/icons/32/twitterbomb.scheduler.png
XoopsModules/twitterbomb/releases/1.26/htdocs/Frameworks/moduleclasses/icons/32/twitterbomb.sentence.png
XoopsModules/twitterbomb/releases/1.26/htdocs/Frameworks/moduleclasses/icons/32/twitterbomb.urls.png
XoopsModules/twitterbomb/releases/1.26/htdocs/Frameworks/moduleclasses/icons/32/twitterbomb.usernames.png
XoopsModules/twitterbomb/releases/1.26/htdocs/modules/
XoopsModules/twitterbomb/releases/1.26/htdocs/modules/tag/
XoopsModules/twitterbomb/releases/1.26/htdocs/modules/tag/plugin/
XoopsModules/twitterbomb/releases/1.26/htdocs/modules/tag/plugin/twitterbomb.php
XoopsModules/twitterbomb/releases/1.26/htdocs/modules/twitterbomb/
XoopsModules/twitterbomb/releases/1.26/htdocs/modules/twitterbomb/admin/
XoopsModules/twitterbomb/releases/1.26/htdocs/modules/twitterbomb/admin/header.php
XoopsModules/twitterbomb/releases/1.26/htdocs/modules/twitterbomb/admin/index.html
XoopsModules/twitterbomb/releases/1.26/htdocs/modules/twitterbomb/admin/index.php
XoopsModules/twitterbomb/releases/1.26/htdocs/modules/twitterbomb/admin/menu.php
XoopsModules/twitterbomb/releases/1.26/htdocs/modules/twitterbomb/backend.php
XoopsModules/twitterbomb/releases/1.26/htdocs/modules/twitterbomb/blocks/
XoopsModules/twitterbomb/releases/1.26/htdocs/modules/twitterbomb/blocks/index.html
XoopsModules/twitterbomb/releases/1.26/htdocs/modules/twitterbomb/blocks/twitterbomb_block_bomb.php
XoopsModules/twitterbomb/releases/1.26/htdocs/modules/twitterbomb/blocks/twitterbomb_block_follow.php
XoopsModules/twitterbomb/releases/1.26/htdocs/modules/twitterbomb/blocks/twitterbomb_block_retweet.php
XoopsModules/twitterbomb/releases/1.26/htdocs/modules/twitterbomb/blocks/twitterbomb_block_scheduler.php
XoopsModules/twitterbomb/releases/1.26/htdocs/modules/twitterbomb/blocks/twitterbomb_block_tag.php
XoopsModules/twitterbomb/releases/1.26/htdocs/modules/twitterbomb/blocks/twitterbomb_block_topranked.php
XoopsModules/twitterbomb/releases/1.26/htdocs/modules/twitterbomb/blocks/twitterbomb_block_tweet.php
XoopsModules/twitterbomb/releases/1.26/htdocs/modules/twitterbomb/blocks/twitterbomb_block_usernames.php
XoopsModules/twitterbomb/releases/1.26/htdocs/modules/twitterbomb/blocks/twitterbomb_block_widget.php
XoopsModules/twitterbomb/releases/1.26/htdocs/modules/twitterbomb/callback/
XoopsModules/twitterbomb/releases/1.26/htdocs/modules/twitterbomb/callback/index.php
XoopsModules/twitterbomb/releases/1.26/htdocs/modules/twitterbomb/class/
XoopsModules/twitterbomb/releases/1.26/htdocs/modules/twitterbomb/class/base_matrix.php
XoopsModules/twitterbomb/releases/1.26/htdocs/modules/twitterbomb/class/campaign.php
XoopsModules/twitterbomb/releases/1.26/htdocs/modules/twitterbomb/class/category.php
XoopsModules/twitterbomb/releases/1.26/htdocs/modules/twitterbomb/class/following.php
XoopsModules/twitterbomb/releases/1.26/htdocs/modules/twitterbomb/class/index.html
XoopsModules/twitterbomb/releases/1.26/htdocs/modules/twitterbomb/class/keywords.php
XoopsModules/twitterbomb/releases/1.26/htdocs/modules/twitterbomb/class/log.php
XoopsModules/twitterbomb/releases/1.26/htdocs/modules/twitterbomb/class/myuploader.php
XoopsModules/twitterbomb/releases/1.26/htdocs/modules/twitterbomb/class/oauth.php
XoopsModules/twitterbomb/releases/1.26/htdocs/modules/twitterbomb/class/retweet.php
XoopsModules/twitterbomb/releases/1.26/htdocs/modules/twitterbomb/class/scheduler.php
XoopsModules/twitterbomb/releases/1.26/htdocs/modules/twitterbomb/class/urls.php
XoopsModules/twitterbomb/releases/1.26/htdocs/modules/twitterbomb/class/usernames.php
XoopsModules/twitterbomb/releases/1.26/htdocs/modules/twitterbomb/cron/
XoopsModules/twitterbomb/releases/1.26/htdocs/modules/twitterbomb/cron/all.php
XoopsModules/twitterbomb/releases/1.26/htdocs/modules/twitterbomb/cron/follow.php
XoopsModules/twitterbomb/releases/1.26/htdocs/modules/twitterbomb/cron/gather.php
XoopsModules/twitterbomb/releases/1.26/htdocs/modules/twitterbomb/cron/tweet.php
XoopsModules/twitterbomb/releases/1.26/htdocs/modules/twitterbomb/docs/
XoopsModules/twitterbomb/releases/1.26/htdocs/modules/twitterbomb/docs/changelog.txt
XoopsModules/twitterbomb/releases/1.26/htdocs/modules/twitterbomb/docs/credits.txt
XoopsModules/twitterbomb/releases/1.26/htdocs/modules/twitterbomb/docs/index.html
XoopsModules/twitterbomb/releases/1.26/htdocs/modules/twitterbomb/docs/install.txt
XoopsModules/twitterbomb/releases/1.26/htdocs/modules/twitterbomb/docs/lang_diff.txt
XoopsModules/twitterbomb/releases/1.26/htdocs/modules/twitterbomb/docs/licence.txt
XoopsModules/twitterbomb/releases/1.26/htdocs/modules/twitterbomb/docs/readme.txt
XoopsModules/twitterbomb/releases/1.26/htdocs/modules/twitterbomb/go.php
XoopsModules/twitterbomb/releases/1.26/htdocs/modules/twitterbomb/header.php
XoopsModules/twitterbomb/releases/1.26/htdocs/modules/twitterbomb/images/
XoopsModules/twitterbomb/releases/1.26/htdocs/modules/twitterbomb/images/index.html
XoopsModules/twitterbomb/releases/1.26/htdocs/modules/twitterbomb/images/rss.png
XoopsModules/twitterbomb/releases/1.26/htdocs/modules/twitterbomb/images/twitterbomb_slogo.png
XoopsModules/twitterbomb/releases/1.26/htdocs/modules/twitterbomb/include/
XoopsModules/twitterbomb/releases/1.26/htdocs/modules/twitterbomb/include/OAuth.php
XoopsModules/twitterbomb/releases/1.26/htdocs/modules/twitterbomb/include/formcheckboxretweet.php
XoopsModules/twitterbomb/releases/1.26/htdocs/modules/twitterbomb/include/formobjects.twitterbomb.php
XoopsModules/twitterbomb/releases/1.26/htdocs/modules/twitterbomb/include/forms.twitterbomb.php
XoopsModules/twitterbomb/releases/1.26/htdocs/modules/twitterbomb/include/formselectbase.php
XoopsModules/twitterbomb/releases/1.26/htdocs/modules/twitterbomb/include/formselectcampaigns.php
XoopsModules/twitterbomb/releases/1.26/htdocs/modules/twitterbomb/include/formselectcategories.php
XoopsModules/twitterbomb/releases/1.26/htdocs/modules/twitterbomb/include/formselectlanguage.php
XoopsModules/twitterbomb/releases/1.26/htdocs/modules/twitterbomb/include/formselectlogtype.php
XoopsModules/twitterbomb/releases/1.26/htdocs/modules/twitterbomb/include/formselectmeasurement.php
XoopsModules/twitterbomb/releases/1.26/htdocs/modules/twitterbomb/include/formselectmode.php
XoopsModules/twitterbomb/releases/1.26/htdocs/modules/twitterbomb/include/formselectoauthmode.php
XoopsModules/twitterbomb/releases/1.26/htdocs/modules/twitterbomb/include/formselectretweettype.php
XoopsModules/twitterbomb/releases/1.26/htdocs/modules/twitterbomb/include/formselectscreenname.php
XoopsModules/twitterbomb/releases/1.26/htdocs/modules/twitterbomb/include/formselecttype.php
XoopsModules/twitterbomb/releases/1.26/htdocs/modules/twitterbomb/include/functions.php
XoopsModules/twitterbomb/releases/1.26/htdocs/modules/twitterbomb/include/index.html
XoopsModules/twitterbomb/releases/1.26/htdocs/modules/twitterbomb/include/install.php
XoopsModules/twitterbomb/releases/1.26/htdocs/modules/twitterbomb/include/twitteroauth.php
XoopsModules/twitterbomb/releases/1.26/htdocs/modules/twitterbomb/include/update.php
XoopsModules/twitterbomb/releases/1.26/htdocs/modules/twitterbomb/index.php
XoopsModules/twitterbomb/releases/1.26/htdocs/modules/twitterbomb/language/
XoopsModules/twitterbomb/releases/1.26/htdocs/modules/twitterbomb/language/english/
XoopsModules/twitterbomb/releases/1.26/htdocs/modules/twitterbomb/language/english/admin.php
XoopsModules/twitterbomb/releases/1.26/htdocs/modules/twitterbomb/language/english/blocks.php
XoopsModules/twitterbomb/releases/1.26/htdocs/modules/twitterbomb/language/english/errors.php
XoopsModules/twitterbomb/releases/1.26/htdocs/modules/twitterbomb/language/english/help/
XoopsModules/twitterbomb/releases/1.26/htdocs/modules/twitterbomb/language/english/help/help.html
XoopsModules/twitterbomb/releases/1.26/htdocs/modules/twitterbomb/language/english/help/index.html
XoopsModules/twitterbomb/releases/1.26/htdocs/modules/twitterbomb/language/english/index.html
XoopsModules/twitterbomb/releases/1.26/htdocs/modules/twitterbomb/language/english/main.php
XoopsModules/twitterbomb/releases/1.26/htdocs/modules/twitterbomb/language/english/modinfo.php
XoopsModules/twitterbomb/releases/1.26/htdocs/modules/twitterbomb/language/index.html
XoopsModules/twitterbomb/releases/1.26/htdocs/modules/twitterbomb/language/italian/
XoopsModules/twitterbomb/releases/1.26/htdocs/modules/twitterbomb/language/italian/admin.php
XoopsModules/twitterbomb/releases/1.26/htdocs/modules/twitterbomb/language/italian/index.html
XoopsModules/twitterbomb/releases/1.26/htdocs/modules/twitterbomb/language/italian/main.php
XoopsModules/twitterbomb/releases/1.26/htdocs/modules/twitterbomb/language/italian/modinfo.php
XoopsModules/twitterbomb/releases/1.26/htdocs/modules/twitterbomb/list.tag.php
XoopsModules/twitterbomb/releases/1.26/htdocs/modules/twitterbomb/plugins/
XoopsModules/twitterbomb/releases/1.26/htdocs/modules/twitterbomb/plugins/bomb.php
XoopsModules/twitterbomb/releases/1.26/htdocs/modules/twitterbomb/plugins/clause.php
XoopsModules/twitterbomb/releases/1.26/htdocs/modules/twitterbomb/plugins/direct.php
XoopsModules/twitterbomb/releases/1.26/htdocs/modules/twitterbomb/plugins/disabled.php
XoopsModules/twitterbomb/releases/1.26/htdocs/modules/twitterbomb/plugins/expired.php
XoopsModules/twitterbomb/releases/1.26/htdocs/modules/twitterbomb/plugins/filtered.php
XoopsModules/twitterbomb/releases/1.26/htdocs/modules/twitterbomb/plugins/filteredpregmatch.php
XoopsModules/twitterbomb/releases/1.26/htdocs/modules/twitterbomb/plugins/filteredpregmatchstrip.php
XoopsModules/twitterbomb/releases/1.26/htdocs/modules/twitterbomb/plugins/filteredstrip.php
XoopsModules/twitterbomb/releases/1.26/htdocs/modules/twitterbomb/plugins/filteredstrippregmatch.php
XoopsModules/twitterbomb/releases/1.26/htdocs/modules/twitterbomb/plugins/for.php
XoopsModules/twitterbomb/releases/1.26/htdocs/modules/twitterbomb/plugins/index.html
XoopsModules/twitterbomb/releases/1.26/htdocs/modules/twitterbomb/plugins/invalid.php
XoopsModules/twitterbomb/releases/1.26/htdocs/modules/twitterbomb/plugins/mirc.php
XoopsModules/twitterbomb/releases/1.26/htdocs/modules/twitterbomb/plugins/mixed.php
XoopsModules/twitterbomb/releases/1.26/htdocs/modules/twitterbomb/plugins/other.php
XoopsModules/twitterbomb/releases/1.26/htdocs/modules/twitterbomb/plugins/over.php
XoopsModules/twitterbomb/releases/1.26/htdocs/modules/twitterbomb/plugins/popular.php
XoopsModules/twitterbomb/releases/1.26/htdocs/modules/twitterbomb/plugins/pregmatch.php
XoopsModules/twitterbomb/releases/1.26/htdocs/modules/twitterbomb/plugins/pregmatchfiltered.php
XoopsModules/twitterbomb/releases/1.26/htdocs/modules/twitterbomb/plugins/pregmatchfilteredstrip.php
XoopsModules/twitterbomb/releases/1.26/htdocs/modules/twitterbomb/plugins/pregmatchstrip.php
XoopsModules/twitterbomb/releases/1.26/htdocs/modules/twitterbomb/plugins/pregmatchstripfiltered.php
XoopsModules/twitterbomb/releases/1.26/htdocs/modules/twitterbomb/plugins/recent.php
XoopsModules/twitterbomb/releases/1.26/htdocs/modules/twitterbomb/plugins/scheduler.php
XoopsModules/twitterbomb/releases/1.26/htdocs/modules/twitterbomb/plugins/strip.php
XoopsModules/twitterbomb/releases/1.26/htdocs/modules/twitterbomb/plugins/stripfiltered.php
XoopsModules/twitterbomb/releases/1.26/htdocs/modules/twitterbomb/plugins/stripfilteredpregmatch.php
XoopsModules/twitterbomb/releases/1.26/htdocs/modules/twitterbomb/plugins/strippregmatch.php
XoopsModules/twitterbomb/releases/1.26/htdocs/modules/twitterbomb/plugins/strippregmatchfiltered.php
XoopsModules/twitterbomb/releases/1.26/htdocs/modules/twitterbomb/plugins/their.php
XoopsModules/twitterbomb/releases/1.26/htdocs/modules/twitterbomb/plugins/then.php
XoopsModules/twitterbomb/releases/1.26/htdocs/modules/twitterbomb/plugins/there.php
XoopsModules/twitterbomb/releases/1.26/htdocs/modules/twitterbomb/plugins/under.php
XoopsModules/twitterbomb/releases/1.26/htdocs/modules/twitterbomb/plugins/valid.php
XoopsModules/twitterbomb/releases/1.26/htdocs/modules/twitterbomb/plugins/when.php
XoopsModules/twitterbomb/releases/1.26/htdocs/modules/twitterbomb/post.cache.end.php
XoopsModules/twitterbomb/releases/1.26/htdocs/modules/twitterbomb/post.common.end.php
XoopsModules/twitterbomb/releases/1.26/htdocs/modules/twitterbomb/post.footer.end.php
XoopsModules/twitterbomb/releases/1.26/htdocs/modules/twitterbomb/preloads/
XoopsModules/twitterbomb/releases/1.26/htdocs/modules/twitterbomb/preloads/core.php
XoopsModules/twitterbomb/releases/1.26/htdocs/modules/twitterbomb/preloads/index.html
XoopsModules/twitterbomb/releases/1.26/htdocs/modules/twitterbomb/redirect.php
XoopsModules/twitterbomb/releases/1.26/htdocs/modules/twitterbomb/search.php
XoopsModules/twitterbomb/releases/1.26/htdocs/modules/twitterbomb/sql/
XoopsModules/twitterbomb/releases/1.26/htdocs/modules/twitterbomb/sql/index.html
XoopsModules/twitterbomb/releases/1.26/htdocs/modules/twitterbomb/sql/mysql.sql
XoopsModules/twitterbomb/releases/1.26/htdocs/modules/twitterbomb/templates/
XoopsModules/twitterbomb/releases/1.26/htdocs/modules/twitterbomb/templates/blocks/
XoopsModules/twitterbomb/releases/1.26/htdocs/modules/twitterbomb/templates/blocks/index.html
XoopsModules/twitterbomb/releases/1.26/htdocs/modules/twitterbomb/templates/blocks/twitterbomb_block_follow.html
XoopsModules/twitterbomb/releases/1.26/htdocs/modules/twitterbomb/templates/blocks/twitterbomb_block_tweet.html
XoopsModules/twitterbomb/releases/1.26/htdocs/modules/twitterbomb/templates/blocks/twitterbomb_block_tweets.html
XoopsModules/twitterbomb/releases/1.26/htdocs/modules/twitterbomb/templates/blocks/twitterbomb_block_tweets_ranked.html
XoopsModules/twitterbomb/releases/1.26/htdocs/modules/twitterbomb/templates/blocks/twitterbomb_block_usernames.html
XoopsModules/twitterbomb/releases/1.26/htdocs/modules/twitterbomb/templates/blocks/twitterbomb_block_widget.html
XoopsModules/twitterbomb/releases/1.26/htdocs/modules/twitterbomb/templates/blocks/twitterbomb_tag_block_cloud.html
XoopsModules/twitterbomb/releases/1.26/htdocs/modules/twitterbomb/templates/blocks/twitterbomb_tag_block_top.html
XoopsModules/twitterbomb/releases/1.26/htdocs/modules/twitterbomb/templates/index.html
XoopsModules/twitterbomb/releases/1.26/htdocs/modules/twitterbomb/templates/twitterbomb_campaign_item.html
XoopsModules/twitterbomb/releases/1.26/htdocs/modules/twitterbomb/templates/twitterbomb_campaign_list.html
XoopsModules/twitterbomb/releases/1.26/htdocs/modules/twitterbomb/templates/twitterbomb_categories_list.html
XoopsModules/twitterbomb/releases/1.26/htdocs/modules/twitterbomb/templates/twitterbomb_category_item.html
XoopsModules/twitterbomb/releases/1.26/htdocs/modules/twitterbomb/templates/twitterbomb_cpanel_base_matrix_edit.html
XoopsModules/twitterbomb/releases/1.26/htdocs/modules/twitterbomb/templates/twitterbomb_cpanel_base_matrix_list.html
XoopsModules/twitterbomb/releases/1.26/htdocs/modules/twitterbomb/templates/twitterbomb_cpanel_campaign_edit.html
XoopsModules/twitterbomb/releases/1.26/htdocs/modules/twitterbomb/templates/twitterbomb_cpanel_campaign_list.html
XoopsModules/twitterbomb/releases/1.26/htdocs/modules/twitterbomb/templates/twitterbomb_cpanel_category_edit.html
XoopsModules/twitterbomb/releases/1.26/htdocs/modules/twitterbomb/templates/twitterbomb_cpanel_category_list.html
XoopsModules/twitterbomb/releases/1.26/htdocs/modules/twitterbomb/templates/twitterbomb_cpanel_keywords_edit.html
XoopsModules/twitterbomb/releases/1.26/htdocs/modules/twitterbomb/templates/twitterbomb_cpanel_keywords_list.html
XoopsModules/twitterbomb/releases/1.26/htdocs/modules/twitterbomb/templates/twitterbomb_cpanel_log.html
XoopsModules/twitterbomb/releases/1.26/htdocs/modules/twitterbomb/templates/twitterbomb_cpanel_retweet_edit.html
XoopsModules/twitterbomb/releases/1.26/htdocs/modules/twitterbomb/templates/twitterbomb_cpanel_retweet_list.html
XoopsModules/twitterbomb/releases/1.26/htdocs/modules/twitterbomb/templates/twitterbomb_cpanel_scheduler_edit.html
XoopsModules/twitterbomb/releases/1.26/htdocs/modules/twitterbomb/templates/twitterbomb_cpanel_scheduler_list.html
XoopsModules/twitterbomb/releases/1.26/htdocs/modules/twitterbomb/templates/twitterbomb_cpanel_urls_edit.html
XoopsModules/twitterbomb/releases/1.26/htdocs/modules/twitterbomb/templates/twitterbomb_cpanel_urls_list.html
XoopsModules/twitterbomb/releases/1.26/htdocs/modules/twitterbomb/templates/twitterbomb_cpanel_usernames_edit.html
XoopsModules/twitterbomb/releases/1.26/htdocs/modules/twitterbomb/templates/twitterbomb_cpanel_usernames_list.html
XoopsModules/twitterbomb/releases/1.26/htdocs/modules/twitterbomb/templates/twitterbomb_index.html
XoopsModules/twitterbomb/releases/1.26/htdocs/modules/twitterbomb/templates/twitterbomb_rss.html
XoopsModules/twitterbomb/releases/1.26/htdocs/modules/twitterbomb/templates/twitterbomb_trail.html
XoopsModules/twitterbomb/releases/1.26/htdocs/modules/twitterbomb/templates/twitterbomb_usernames.html
XoopsModules/twitterbomb/releases/1.26/htdocs/modules/twitterbomb/trail.php
XoopsModules/twitterbomb/releases/1.26/htdocs/modules/twitterbomb/view.tag.php
XoopsModules/twitterbomb/releases/1.26/htdocs/modules/twitterbomb/xoops_version.php
Added: XoopsModules/twitterbomb/releases/1.26/docs/.htaccess
===================================================================
--- XoopsModules/twitterbomb/releases/1.26/docs/.htaccess (rev 0)
+++ XoopsModules/twitterbomb/releases/1.26/docs/.htaccess 2012-01-09 00:32:32 UTC (rev 8680)
@@ -0,0 +1,14 @@
+
+RewriteEngine On
+RewriteCond %{REQUEST_FILENAME} !-f
+RewriteCond %{REQUEST_FILENAME} !-d
+
+RewriteRule ^tweetbomb/([a-zA-Z0-9]+),([a-zA-Z0-9]+),([0-9]+),([0-9]+),([0-9]+),([0-9]+).html$ modules/twitterbomb/index.php?op=$1&fct=$2&start=$3&limit=$4&cid=$5&catid=$6
+RewriteRule ^tweetbomb/rss,([0-9]+),([0-9]+),([a-zA-Z0-9]+).rss$ modules/twitterbomb/backend.php?cid=$1&catid=$2&cacheid=$3
+RewriteRule ^tweetbomb/go.html$ modules/twitterbomb/go.php
+RewriteRule ^tweetbomb/index.php$ modules/twitterbomb/index.php
+
+
+
+
+
Added: XoopsModules/twitterbomb/releases/1.26/docs/INSTALL
===================================================================
--- XoopsModules/twitterbomb/releases/1.26/docs/INSTALL (rev 0)
+++ XoopsModules/twitterbomb/releases/1.26/docs/INSTALL 2012-01-09 00:32:32 UTC (rev 8680)
@@ -0,0 +1,63 @@
++-----------------------------------------------------------------------------------+
+| |
+| TwitterBomb Version 1.18 |
+| |
++--[ 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 a minute, make sure it is within your |
+| refresh time. This is the or unix based systems after it is for windows: |
+| |
+| /usr/bin/php -q /home/yoursite/public_html/modules/twitterbomb/cron/all.php |
+| |
+| -- For this method set the cron type in preferences to Unix Cron Job -- |
+| |
+| 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\twitterbomb\cron\all.php |
+| |
+| -- For this method set the cron type in preferences to Windows Scheduled Task -- |
+| |
+| 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. |
+| |
++--[ Preloader Alternative to Installing Cron ]-------------------------------------+
+| |
+| Replace the header.php file provided in the extras setting and set your cron |
+| type in preferences to 'Preloader', alternatively you can include the files in |
+| a hack of the files which are in the TwitterBomb Root. |
+| |
+| Line 91 - 94 of header.php in XOOPS 2.5/2.4 should read with this patch: |
+| |
+| if ($xoTheme->checkCache()) { |
+| $xoopsPreload->triggerEvent('core.header.cache.end'); |
+| exit(); |
+| } |
+| |
++--[ Include file Alternative to Installing Cron & Preloaders ]---------------------+
+| |
+| the following lines can be included if your preloaders are not working, but |
+| remember to delete the /twitterbomb/preloads folder so there are no conflict |
+| when using the include method. Still set your cron type in preferences for this |
+| method to 'preloaders'. |
+| | |
+| Step 1 - Last line of /include/common.php should read: |
+| |
+| include($GLOBALS['xoops']->path('/modules/twitterbomb/post.common.end.php')); |
+| |
+| Step 2 - Line 91 to 94 of /header.php should read: |
+| |
+| if ($xoTheme->checkCache()) { |
+| include($GLOBALS['xoops']->path('/modules/twitterbomb/post.cache.end.php')); |
+| exit(); |
+| } |
+| |
+| Step 3 - Last line of /footer.php should read: |
+| |
+| include($GLOBALS['xoops']->path('/modules/twitterbomb/post.footer.end.php')); |
+| |
++-----------------------------------------------------------------------------------+
\ No newline at end of file
Added: XoopsModules/twitterbomb/releases/1.26/docs/licence.txt
===================================================================
--- XoopsModules/twitterbomb/releases/1.26/docs/licence.txt (rev 0)
+++ XoopsModules/twitterbomb/releases/1.26/docs/licence.txt 2012-01-09 00:32:32 UTC (rev 8680)
@@ -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/twitterbomb/releases/1.26/extras/XOOPS 2.4.x/htdocs/header.php
===================================================================
--- XoopsModules/twitterbomb/releases/1.26/extras/XOOPS 2.4.x/htdocs/header.php (rev 0)
+++ XoopsModules/twitterbomb/releases/1.26/extras/XOOPS 2.4.x/htdocs/header.php 2012-01-09 00:32:32 UTC (rev 8680)
@@ -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 http://www.fsf.org/copyleft/gpl.html GNU public license
+ * @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 4897 2010-06-19 02:55:48Z phppp $
+ */
+
+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/twitterbomb/releases/1.26/extras/XOOPS 2.5.x/htdocs/header.php
===================================================================
--- XoopsModules/twitterbomb/releases/1.26/extras/XOOPS 2.5.x/htdocs/header.php (rev 0)
+++ XoopsModules/twitterbomb/releases/1.26/extras/XOOPS 2.5.x/htdocs/header.php 2012-01-09 00:32:32 UTC (rev 8680)
@@ -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/twitterbomb/releases/1.26/htdocs/Frameworks/moduleclasses/icons/16/twitterbomb.campaigns.png
===================================================================
(Binary files differ)
Property changes on: XoopsModules/twitterbomb/releases/1.26/htdocs/Frameworks/moduleclasses/icons/16/twitterbomb.campaigns.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/twitterbomb/releases/1.26/htdocs/Frameworks/moduleclasses/icons/16/twitterbomb.categories.png
===================================================================
(Binary files differ)
Property changes on: XoopsModules/twitterbomb/releases/1.26/htdocs/Frameworks/moduleclasses/icons/16/twitterbomb.categories.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/twitterbomb/releases/1.26/htdocs/Frameworks/moduleclasses/icons/16/twitterbomb.keywords.png
===================================================================
(Binary files differ)
Property changes on: XoopsModules/twitterbomb/releases/1.26/htdocs/Frameworks/moduleclasses/icons/16/twitterbomb.keywords.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/twitterbomb/releases/1.26/htdocs/Frameworks/moduleclasses/icons/16/twitterbomb.logs.png
===================================================================
(Binary files differ)
Property changes on: XoopsModules/twitterbomb/releases/1.26/htdocs/Frameworks/moduleclasses/icons/16/twitterbomb.logs.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/twitterbomb/releases/1.26/htdocs/Frameworks/moduleclasses/icons/16/twitterbomb.preferences.png
===================================================================
(Binary files differ)
Property changes on: XoopsModules/twitterbomb/releases/1.26/htdocs/Frameworks/moduleclasses/icons/16/twitterbomb.preferences.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/twitterbomb/releases/1.26/htdocs/Frameworks/moduleclasses/icons/16/twitterbomb.retweet.png
===================================================================
(Binary files differ)
Property changes on: XoopsModules/twitterbomb/releases/1.26/htdocs/Frameworks/moduleclasses/icons/16/twitterbomb.retweet.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/twitterbomb/releases/1.26/htdocs/Frameworks/moduleclasses/icons/16/twitterbomb.scheduler.png
===================================================================
(Binary files differ)
Property changes on: XoopsModules/twitterbomb/releases/1.26/htdocs/Frameworks/moduleclasses/icons/16/twitterbomb.scheduler.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/twitterbomb/releases/1.26/htdocs/Frameworks/moduleclasses/icons/16/twitterbomb.sentence.png
=====================================...
[truncated message content] |
|
From: <wis...@us...> - 2012-01-08 21:53:42
|
Revision: 8679
http://xoops.svn.sourceforge.net/xoops/?rev=8679&view=rev
Author: wishcraft
Date: 2012-01-08 21:53:35 +0000 (Sun, 08 Jan 2012)
Log Message:
-----------
X-REST 1.52 - Rest API for XOOPS 2.5 - JSON, Serialisation, XML output, with reserved words ?restplugin= & &outputmode= - use http://yoursite.com/module/xrest/plugin/?var1=example&var2=example2 to access API
Modified Paths:
--------------
XoopsModules/xrest/releases/1.52/htdocs/modules/xrest/include/server.php
Modified: XoopsModules/xrest/releases/1.52/htdocs/modules/xrest/include/server.php
===================================================================
--- XoopsModules/xrest/releases/1.52/htdocs/modules/xrest/include/server.php 2012-01-08 21:24:39 UTC (rev 8678)
+++ XoopsModules/xrest/releases/1.52/htdocs/modules/xrest/include/server.php 2012-01-08 21:53:35 UTC (rev 8679)
@@ -13,11 +13,11 @@
$part = explode('?', $_SERVER['REQUEST_URI']);
unset($part[0]);
-$request = urldecode(implode('?', $part));
+$request = implode('?', $part);
$values = array();
foreach(explode('&', $request) as $vars) {
$part = explode('=', $vars);
- $values[$part[0]] = $part[1];
+ $values[$part[0]] = urldecode($part[1]);
}
if (isset($_POST)) {
foreach($_POST as $field => $value) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <wis...@us...> - 2012-01-08 21:24:49
|
Revision: 8678
http://xoops.svn.sourceforge.net/xoops/?rev=8678&view=rev
Author: wishcraft
Date: 2012-01-08 21:24:39 +0000 (Sun, 08 Jan 2012)
Log Message:
-----------
X-REST 1.52 - Rest API for XOOPS 2.5 - JSON, Serialisation, XML output, with reserved words ?restplugin= & &outputmode= - use http://yoursite.com/module/xrest/plugin/?var1=example&var2=example2 to access API
Added Paths:
-----------
XoopsModules/xrest/releases/1.52/
XoopsModules/xrest/releases/1.52/docs/
XoopsModules/xrest/releases/1.52/docs/licence.txt
XoopsModules/xrest/releases/1.52/htdocs/
XoopsModules/xrest/releases/1.52/htdocs/Frameworks/
XoopsModules/xrest/releases/1.52/htdocs/Frameworks/moduleclasses/
XoopsModules/xrest/releases/1.52/htdocs/Frameworks/moduleclasses/icons/
XoopsModules/xrest/releases/1.52/htdocs/Frameworks/moduleclasses/icons/16/
XoopsModules/xrest/releases/1.52/htdocs/Frameworks/moduleclasses/icons/16/xrest.fields.png
XoopsModules/xrest/releases/1.52/htdocs/Frameworks/moduleclasses/icons/16/xrest.permissions.png
XoopsModules/xrest/releases/1.52/htdocs/Frameworks/moduleclasses/icons/16/xrest.plugins.png
XoopsModules/xrest/releases/1.52/htdocs/Frameworks/moduleclasses/icons/16/xrest.tables.png
XoopsModules/xrest/releases/1.52/htdocs/Frameworks/moduleclasses/icons/16/xrest.views.png
XoopsModules/xrest/releases/1.52/htdocs/Frameworks/moduleclasses/icons/32/
XoopsModules/xrest/releases/1.52/htdocs/Frameworks/moduleclasses/icons/32/xrest.fields.png
XoopsModules/xrest/releases/1.52/htdocs/Frameworks/moduleclasses/icons/32/xrest.permissions.png
XoopsModules/xrest/releases/1.52/htdocs/Frameworks/moduleclasses/icons/32/xrest.plugins.png
XoopsModules/xrest/releases/1.52/htdocs/Frameworks/moduleclasses/icons/32/xrest.tables.png
XoopsModules/xrest/releases/1.52/htdocs/Frameworks/moduleclasses/icons/32/xrest.views.png
XoopsModules/xrest/releases/1.52/htdocs/modules/
XoopsModules/xrest/releases/1.52/htdocs/modules/xrest/
XoopsModules/xrest/releases/1.52/htdocs/modules/xrest/.htaccess
XoopsModules/xrest/releases/1.52/htdocs/modules/xrest/admin/
XoopsModules/xrest/releases/1.52/htdocs/modules/xrest/admin/admin_header.php
XoopsModules/xrest/releases/1.52/htdocs/modules/xrest/admin/index.php
XoopsModules/xrest/releases/1.52/htdocs/modules/xrest/admin/menu.php
XoopsModules/xrest/releases/1.52/htdocs/modules/xrest/admin/permissions.php
XoopsModules/xrest/releases/1.52/htdocs/modules/xrest/class/
XoopsModules/xrest/releases/1.52/htdocs/modules/xrest/class/fields.php
XoopsModules/xrest/releases/1.52/htdocs/modules/xrest/class/index.html
XoopsModules/xrest/releases/1.52/htdocs/modules/xrest/class/plugins.php
XoopsModules/xrest/releases/1.52/htdocs/modules/xrest/class/tables.php
XoopsModules/xrest/releases/1.52/htdocs/modules/xrest/docs/
XoopsModules/xrest/releases/1.52/htdocs/modules/xrest/docs/changelog.txt
XoopsModules/xrest/releases/1.52/htdocs/modules/xrest/docs/credits.txt
XoopsModules/xrest/releases/1.52/htdocs/modules/xrest/docs/index.html
XoopsModules/xrest/releases/1.52/htdocs/modules/xrest/docs/install.txt
XoopsModules/xrest/releases/1.52/htdocs/modules/xrest/docs/lang_diff.txt
XoopsModules/xrest/releases/1.52/htdocs/modules/xrest/docs/licence.txt
XoopsModules/xrest/releases/1.52/htdocs/modules/xrest/docs/readme.txt
XoopsModules/xrest/releases/1.52/htdocs/modules/xrest/images/
XoopsModules/xrest/releases/1.52/htdocs/modules/xrest/images/close12.gif
XoopsModules/xrest/releases/1.52/htdocs/modules/xrest/images/index.html
XoopsModules/xrest/releases/1.52/htdocs/modules/xrest/images/left_both.gif
XoopsModules/xrest/releases/1.52/htdocs/modules/xrest/images/open12.gif
XoopsModules/xrest/releases/1.52/htdocs/modules/xrest/images/right_both.gif
XoopsModules/xrest/releases/1.52/htdocs/modules/xrest/images/xrest_slogo.png
XoopsModules/xrest/releases/1.52/htdocs/modules/xrest/include/
XoopsModules/xrest/releases/1.52/htdocs/modules/xrest/include/JSON.php
XoopsModules/xrest/releases/1.52/htdocs/modules/xrest/include/common.php
XoopsModules/xrest/releases/1.52/htdocs/modules/xrest/include/forms.xrest.php
XoopsModules/xrest/releases/1.52/htdocs/modules/xrest/include/functions.php
XoopsModules/xrest/releases/1.52/htdocs/modules/xrest/include/index.html
XoopsModules/xrest/releases/1.52/htdocs/modules/xrest/include/server.php
XoopsModules/xrest/releases/1.52/htdocs/modules/xrest/index.php
XoopsModules/xrest/releases/1.52/htdocs/modules/xrest/language/
XoopsModules/xrest/releases/1.52/htdocs/modules/xrest/language/english/
XoopsModules/xrest/releases/1.52/htdocs/modules/xrest/language/english/admin.php
XoopsModules/xrest/releases/1.52/htdocs/modules/xrest/language/english/forms.php
XoopsModules/xrest/releases/1.52/htdocs/modules/xrest/language/english/help/
XoopsModules/xrest/releases/1.52/htdocs/modules/xrest/language/english/help/help.html
XoopsModules/xrest/releases/1.52/htdocs/modules/xrest/language/english/help/index.html
XoopsModules/xrest/releases/1.52/htdocs/modules/xrest/language/english/index.html
XoopsModules/xrest/releases/1.52/htdocs/modules/xrest/language/english/main.php
XoopsModules/xrest/releases/1.52/htdocs/modules/xrest/language/english/modinfo.php
XoopsModules/xrest/releases/1.52/htdocs/modules/xrest/language/index.html
XoopsModules/xrest/releases/1.52/htdocs/modules/xrest/plugins/
XoopsModules/xrest/releases/1.52/htdocs/modules/xrest/plugins/tweet.php
XoopsModules/xrest/releases/1.52/htdocs/modules/xrest/preloads/
XoopsModules/xrest/releases/1.52/htdocs/modules/xrest/preloads/core.php
XoopsModules/xrest/releases/1.52/htdocs/modules/xrest/preloads/index.html
XoopsModules/xrest/releases/1.52/htdocs/modules/xrest/sql/
XoopsModules/xrest/releases/1.52/htdocs/modules/xrest/sql/index.html
XoopsModules/xrest/releases/1.52/htdocs/modules/xrest/sql/mysql.sql
XoopsModules/xrest/releases/1.52/htdocs/modules/xrest/templates/
XoopsModules/xrest/releases/1.52/htdocs/modules/xrest/templates/index.html
XoopsModules/xrest/releases/1.52/htdocs/modules/xrest/xoops_version.php
Added: XoopsModules/xrest/releases/1.52/docs/licence.txt
===================================================================
--- XoopsModules/xrest/releases/1.52/docs/licence.txt (rev 0)
+++ XoopsModules/xrest/releases/1.52/docs/licence.txt 2012-01-08 21:24:39 UTC (rev 8678)
@@ -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/xrest/releases/1.52/htdocs/Frameworks/moduleclasses/icons/16/xrest.fields.png
===================================================================
(Binary files differ)
Property changes on: XoopsModules/xrest/releases/1.52/htdocs/Frameworks/moduleclasses/icons/16/xrest.fields.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/xrest/releases/1.52/htdocs/Frameworks/moduleclasses/icons/16/xrest.permissions.png
===================================================================
(Binary files differ)
Property changes on: XoopsModules/xrest/releases/1.52/htdocs/Frameworks/moduleclasses/icons/16/xrest.permissions.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/xrest/releases/1.52/htdocs/Frameworks/moduleclasses/icons/16/xrest.plugins.png
===================================================================
(Binary files differ)
Property changes on: XoopsModules/xrest/releases/1.52/htdocs/Frameworks/moduleclasses/icons/16/xrest.plugins.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/xrest/releases/1.52/htdocs/Frameworks/moduleclasses/icons/16/xrest.tables.png
===================================================================
(Binary files differ)
Property changes on: XoopsModules/xrest/releases/1.52/htdocs/Frameworks/moduleclasses/icons/16/xrest.tables.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/xrest/releases/1.52/htdocs/Frameworks/moduleclasses/icons/16/xrest.views.png
===================================================================
(Binary files differ)
Property changes on: XoopsModules/xrest/releases/1.52/htdocs/Frameworks/moduleclasses/icons/16/xrest.views.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/xrest/releases/1.52/htdocs/Frameworks/moduleclasses/icons/32/xrest.fields.png
===================================================================
(Binary files differ)
Property changes on: XoopsModules/xrest/releases/1.52/htdocs/Frameworks/moduleclasses/icons/32/xrest.fields.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/xrest/releases/1.52/htdocs/Frameworks/moduleclasses/icons/32/xrest.permissions.png
===================================================================
(Binary files differ)
Property changes on: XoopsModules/xrest/releases/1.52/htdocs/Frameworks/moduleclasses/icons/32/xrest.permissions.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/xrest/releases/1.52/htdocs/Frameworks/moduleclasses/icons/32/xrest.plugins.png
===================================================================
(Binary files differ)
Property changes on: XoopsModules/xrest/releases/1.52/htdocs/Frameworks/moduleclasses/icons/32/xrest.plugins.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/xrest/releases/1.52/htdocs/Frameworks/moduleclasses/icons/32/xrest.tables.png
===================================================================
(Binary files differ)
Property changes on: XoopsModules/xrest/releases/1.52/htdocs/Frameworks/moduleclasses/icons/32/xrest.tables.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/xrest/releases/1.52/htdocs/Frameworks/moduleclasses/icons/32/xrest.views.png
===================================================================
(Binary files differ)
Property changes on: XoopsModules/xrest/releases/1.52/htdocs/Frameworks/moduleclasses/icons/32/xrest.views.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/xrest/releases/1.52/htdocs/modules/xrest/.htaccess
===================================================================
--- XoopsModules/xrest/releases/1.52/htdocs/modules/xrest/.htaccess (rev 0)
+++ XoopsModules/xrest/releases/1.52/htdocs/modules/xrest/.htaccess 2012-01-08 21:24:39 UTC (rev 8678)
@@ -0,0 +1,8 @@
+RewriteEngine On
+RewriteCond %{REQUEST_FILENAME} !-f
+RewriteCond %{REQUEST_FILENAME} !-d
+
+RewriteRule ^images/(.*?)$ images/$1
+RewriteRule ^admin/(.*?)$ admin/$1
+RewriteRule ^([a-zA-Z0-9]+)/([a-z]+)/$ index.php?xrestplugin=$1&outputmode=$2&$3
+RewriteRule ^([a-zA-Z0-9]+)/$ index.php?xrestplugin=$1&$2
Added: XoopsModules/xrest/releases/1.52/htdocs/modules/xrest/admin/admin_header.php
===================================================================
--- XoopsModules/xrest/releases/1.52/htdocs/modules/xrest/admin/admin_header.php (rev 0)
+++ XoopsModules/xrest/releases/1.52/htdocs/modules/xrest/admin/admin_header.php 2012-01-08 21:24:39 UTC (rev 8678)
@@ -0,0 +1,139 @@
+<?php
+/**
+ * Invoice Transaction Gateway with Modular Plugin set
+ *
+ * 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 Chronolabs Co-Op http://www.chronolabs.coop/
+ * @license http://www.fsf.org/copyleft/gpl.html GNU public license
+ * @package xrest
+ * @since 1.30.0
+ * @author Simon Roberts <si...@ch...>
+ * @translation Erol Konik <ap...@ap...>
+ * @translation Mariane <mar...@ho...>
+ * @translation Voltan <vo...@xo...>
+ * @translation Ezsky <ezs...@gm...>
+ * @translation Richardo Costa <lus...@gm...>
+ * @translation Kris_fr <kr...@fr...>
+ */
+ 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['xrestModule'] = $module_handler->getByDirname('xrest');
+ $GLOBALS['xrestModuleConfig'] = $config_handler->getConfigList($GLOBALS['xrestModule']->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');
+
+ 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['xrestImageIcon'] = XOOPS_URL .'/'. $GLOBALS['xrestModule']->getInfo('icons16');
+ $GLOBALS['xrestImageAdmin'] = XOOPS_URL .'/'. $GLOBALS['xrestModule']->getInfo('icons32');
+
+ if ($GLOBALS['xoopsUser']) {
+ $moduleperm_handler =& xoops_gethandler('groupperm');
+ if (!$moduleperm_handler->checkRight('module_admin', $GLOBALS['xrestModule']->getVar( 'mid' ), $GLOBALS['xoopsUser']->getGroups())) {
+ redirect_header(XOOPS_URL, 1, _NOPERM);
+ exit();
+ }
+ } else {
+ redirect_header(XOOPS_URL . "/user.php", 1, _NOPERM);
+ exit();
+ }
+
+ 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['xrestImageIcon']);
+
+ include_once $GLOBALS['xoops']->path('/modules/xrest/include/common.php');
+ include_once $GLOBALS['xoops']->path('/modules/xrest/include/functions.php');
+ include_once $GLOBALS['xoops']->path('/modules/xrest/include/forms.xrest.php');
+
+ xoops_load('pagenav');
+ xoops_load('xoopsmultimailer');
+
+ IF (!@ include_once XOOPS_ROOT_PATH."/Frameworks/art/functions.admin.php"):
+ function loadModuleAdminMenu($currentoption, $breadcrumb = "")
+ {
+ if (!$adminmenu = $GLOBALS['xrestModule']->getAdminMenu()) {
+ return false;
+ }
+
+ $breadcrumb = empty($breadcrumb) ? $adminmenu[$currentoption]["title"] : $breadcrumb;
+ $module_link = XOOPS_URL."/modules/".$GLOBALS['xrestModule']->getVar("dirname")."/";
+ $image_link = XOOPS_URL."/modules/".$GLOBALS['xrestModule']->getVar("dirname")."/images";
+
+ $adminmenu_text ='
+ <style type="text/css">
+ <!--
+ #buttontop { float:left; width:100%; background: #e7e7e7; font-size:93%; line-height:normal; border-top: 1px solid black; border-left: 1px solid black; border-right: 1px solid black; margin: 0;}
+ #buttonbar { float:left; width:100%; background: #e7e7e7 url("'.$image_link.'/modadminbg.gif") repeat-x left bottom; font-size:93%; line-height:normal; border-left: 1px solid black; border-right: 1px solid black; margin-bottom: 12px;}
+ #buttonbar ul { margin:0; margin-top: 15px; padding:10px 10px 0; list-style:none; }
+ #buttonbar li { display:inline; margin:0; padding:0; }
+ #buttonbar a { float:left; background:url("'.$image_link.'/left_both.gif") no-repeat left top; margin:0; padding:0 0 0 9px; border-bottom:1px solid #000; text-decoration:none; }
+ #buttonbar a span { float:left; display:block; background:url("'.$image_link.'/right_both.gif") no-repeat right top; padding:5px 15px 4px 6px; font-weight:bold; color:#765; }
+ /* Commented Backslash Hack hides rule from IE5-Mac \*/
+ #buttonbar a span {float:none;}
+ /* End IE5-Mac hack */
+ #buttonbar a:hover span { color:#333; }
+ #buttonbar .current a { background-position:0 -150px; border-width:0; }
+ #buttonbar .current a span { background-position:100% -150px; padding-bottom:5px; color:#333; }
+ #buttonbar a:hover { background-position:0% -150px; }
+ #buttonbar a:hover span { background-position:100% -150px; }
+ //-->
+ </style>
+ <div id="buttontop">
+ <table style="width: 100%; padding: 0; " cellspacing="0">
+ <tr>
+ <td style="width: 70%; font-size: 10px; text-align: left; color: #2F5376; padding: 0 6px; line-height: 18px;">
+ <a href="../index.php">'.$GLOBALS['xrestModule']->getVar("name").'</a>
+ </td>
+ <td style="width: 30%; font-size: 10px; text-align: right; color: #2F5376; padding: 0 6px; line-height: 18px;">
+ <strong>'.$GLOBALS['xrestModule']->getVar("name").'</strong> '.$breadcrumb.'
+ </td>
+ </tr>
+ </table>
+ </div>
+ <div id="buttonbar">
+ <ul>
+ ';
+ foreach (array_keys($adminmenu) as $key) {
+ $adminmenu_text .= (($currentoption == $key) ? '<li class="current">' : '<li>').'<a href="'.$module_link.$adminmenu[$key]["link"].'"><span>'.$adminmenu[$key]["title"].'</span></a></li>';
+ }
+ $adminmenu_text .= '<li><a href="'.XOOPS_URL.'/modules/system/admin.php?fct=preferences&op=showmod&mod='.$GLOBALS['xrestModule']->getVar("mid").'"><span>'._PREFERENCES.'</span></a></li>';
+ $adminmenu_text .= '
+ </ul>
+ </div>
+ <br style="clear:both;" />';
+
+ echo $adminmenu_text;
+ }
+
+ ENDIF;
+
+?>
\ No newline at end of file
Added: XoopsModules/xrest/releases/1.52/htdocs/modules/xrest/admin/index.php
===================================================================
--- XoopsModules/xrest/releases/1.52/htdocs/modules/xrest/admin/index.php (rev 0)
+++ XoopsModules/xrest/releases/1.52/htdocs/modules/xrest/admin/index.php 2012-01-08 21:24:39 UTC (rev 8678)
@@ -0,0 +1,225 @@
+<?php
+include 'admin_header.php';
+
+$op = (isset($_REQUEST['op'])?$_REQUEST['op']:'dashboard');
+$tbl_id = (isset($_REQUEST['tbl_id'])?$_REQUEST['tbl_id']:0);
+
+switch ($op){
+default:
+case "dashboard":
+
+ xoops_load('xoopscache');
+ xoops_cp_header();
+ loadModuleAdminMenu(0);
+ $indexAdmin = new ModuleAdmin();
+ echo $indexAdmin->addNavigation('index.php?op=dashboard');
+
+ $plugins_handler = xoops_getmodulehandler('plugins', 'xrest');
+ $tables_handler = xoops_getmodulehandler('tables', 'xrest');
+ $fields_handler = xoops_getmodulehandler('fields', 'xrest');
+
+ $indexAdmin = new ModuleAdmin();
+ $indexAdmin->addInfoBox(_XREST_AM_XREST_SUMANDTOTAL);
+ $indexAdmin->addInfoBoxLine(_XREST_AM_XREST_SUMANDTOTAL, "<label>"._XREST_AM_XREST_TOTAL_PLUGINS."</label>", $plugins_handler->getCount(), ($plugins_handler->getCount()>0?'Green':'Red'));
+ $indexAdmin->addInfoBoxLine(_XREST_AM_XREST_SUMANDTOTAL, "<label>"._XREST_AM_XREST_TOTAL_ACTIVE_PLUGINS."</label>", $plugins_handler->getCount(new Criteria('`active`', '1','=')), ($plugins_handler->getCount(new Criteria('`active`', '1','='))>0?'Green':'Red'));
+ $indexAdmin->addInfoBoxLine(_XREST_AM_XREST_SUMANDTOTAL, "<label>"._XREST_AM_XREST_TOTAL_INACTIVE_PLUGINS."</label>", $plugins_handler->getCount(new Criteria('`active`', '0','=')), ($plugins_handler->getCount(new Criteria('`active`', '0','='))>0?'Green':'Red'));
+ $indexAdmin->addInfoBoxLine(_XREST_AM_XREST_SUMANDTOTAL, "<label>"._XREST_AM_XREST_TOTAL_FAILED_PLUGINS."</label>", intval(XoopsCache::read('xrest_plugins_failed')), (intval(XoopsCache::read('xrest_plugins_failed'))>0?'Red':'Green'));
+ $indexAdmin->addInfoBoxLine(_XREST_AM_XREST_SUMANDTOTAL, "<label>"._XREST_AM_XREST_TOTAL_TABLES."</label>", $tables_handler->getCount(new Criteria('`view`', '0','=')), ($tables_handler->getCount(new Criteria('`view`', '0','='))>0?'Green':'Red'));
+ $indexAdmin->addInfoBoxLine(_XREST_AM_XREST_SUMANDTOTAL, "<label>"._XREST_AM_XREST_TOTAL_VIEWS."</label>", $tables_handler->getCount(new Criteria('`view`', '1','=')), ($tables_handler->getCount(new Criteria('`view`', '1','='))>0?'Green':'Red'));
+ $indexAdmin->addInfoBoxLine(_XREST_AM_XREST_SUMANDTOTAL, "<label>"._XREST_AM_XREST_TOTAL_FIELDS."</label>", $fields_handler->getCount(), ($tables_handler->getCount()>0?'Green':'Red'));
+ $indexAdmin->addInfoBoxLine(_XREST_AM_XREST_SUMANDTOTAL, "<label>"._XREST_AM_XREST_AVERAGE_FIELDS."</label>", number_format(($fields_handler->getCount()+1)/($tables_handler->getCount(new Criteria('`view`', '0','='))+1),2), (number_format(($fields_handler->getCount()+1)/($tables_handler->getCount(new Criteria('`view`', '0','='))+1),2)>0?'Green':'Red'));
+ $lastplugin = XoopsCache::read('xrest_plugins_last');
+ if (sizeof($lastplugin)>=5) {
+ $indexAdmin->addInfoBox(_XREST_AM_XREST_LASTANDDATE);
+ $indexAdmin->addInfoBoxLine(_XREST_AM_XREST_LASTANDDATE, "<label>"._XREST_AM_XREST_LAST_PLUGINS_CALLED."</label>", $lastplugin['plugin'], 'Blue');
+ if (!empty($lastplugin['user']))
+ $indexAdmin->addInfoBoxLine(_XREST_AM_XREST_LASTANDDATE, "<label>"._XREST_AM_XREST_LAST_PLUGINS_CALLEDBY."</label>", $lastplugin['user'], 'Blue');
+ $indexAdmin->addInfoBoxLine(_XREST_AM_XREST_LASTANDDATE, "<label>"._XREST_AM_XREST_LAST_PLUGINS_CALLEDWHEN."</label>", date(_DATESTRING, $lastplugin['when']), 'Blue');
+ $indexAdmin->addInfoBoxLine(_XREST_AM_XREST_LASTANDDATE, "<label>"._XREST_AM_XREST_LAST_PLUGINS_TOOKTOEXECUTE."</label>", $lastplugin['took'], 'Blue');
+ $indexAdmin->addInfoBoxLine(_XREST_AM_XREST_LASTANDDATE, "<label>"._XREST_AM_XREST_LAST_PLUGINS_EXECUTED."</label>", $lastplugin['executed'], 'Green');
+ $indexAdmin->addInfoBoxLine(_XREST_AM_XREST_LASTANDDATE, "<label>"._XREST_AM_XREST_LAST_PLUGINS_EXECUTION."</label>", $lastplugin['execution'], 'Green');
+ }
+ $lastcleanup = XoopsCache::read('xrest_cleanup_last');
+ if (sizeof($lastcleanup)==3) {
+ $indexAdmin->addInfoBox(_XREST_AM_XREST_CLEANUPANDDATE);
+ $indexAdmin->addInfoBoxLine(_XREST_AM_XREST_CLEANUPANDDATE, "<label>"._XREST_AM_XREST_LAST_CLEANUP_WHEN."</label>", date(_DATESTRING, $lastcleanup['when']), 'Purple');
+ $indexAdmin->addInfoBoxLine(_XREST_AM_XREST_CLEANUPANDDATE, "<label>"._XREST_AM_XREST_LAST_CLEANUP_FILES."</label>", $lastcleanup['files'], 'Purple');
+ $indexAdmin->addInfoBoxLine(_XREST_AM_XREST_CLEANUPANDDATE, "<label>"._XREST_AM_XREST_LAST_CLEANUP_TOOKTOEXECUTE."</label>", $lastcleanup['took'], 'Purple');
+ }
+ echo $indexAdmin->renderIndex();
+ xoops_cp_footer();
+ break;
+case "about":
+ xoops_cp_header();
+ loadModuleAdminMenu(6);
+ $indexAdmin = new ModuleAdmin();
+ echo $indexAdmin->addNavigation('index.php?op=about');
+
+ $paypalitemno='XRESTABOUT100';
+ $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">'.constant('_XREST_AM_MAKE_DONATION').'</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>', 'D'=>'',
+ 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['xrestModule']->getVar('dirname')), strtoupper($GLOBALS['xrestModule']->getVar('dirname')). ' '.$GLOBALS['xrestModule']->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));
+ xoops_cp_footer();
+ break;
+case "fields":
+
+ if (!$tbl_id)
+ $tbl_id=1;
+
+ xoops_cp_header();
+ loadModuleAdminMenu(2);
+ $indexAdmin = new ModuleAdmin();
+ echo $indexAdmin->addNavigation('index.php?op=fields');
+
+ echo xrest_admin_form_select_table($tbl_id);
+ echo "<div style='clear:both;'></div>";
+ echo xrest_admin_form_select_fields($tbl_id);
+ xoops_cp_footer();
+ break;
+
+case "views":
+
+ xoops_cp_header();
+ loadModuleAdminMenu(3);
+ $indexAdmin = new ModuleAdmin();
+ echo $indexAdmin->addNavigation('index.php?op=views');
+
+ echo xrest_admin_form_select_views(XOOPS_DB_NAME);
+ xoops_cp_footer();
+ break;
+
+case "plugins":
+
+ xoops_cp_header();
+ loadModuleAdminMenu(4);
+ $indexAdmin = new ModuleAdmin();
+ echo $indexAdmin->addNavigation('index.php?op=plugins');
+
+ echo xrest_admin_form_select_plugins();
+ xoops_cp_footer();
+ break;
+
+case "tables":
+
+ xoops_cp_header();
+ loadModuleAdminMenu(1);
+ $indexAdmin = new ModuleAdmin();
+ echo $indexAdmin->addNavigation('index.php?op=tables');
+
+ echo xrest_admin_form_select_tables(XOOPS_DB_NAME, XOOPS_DB_PREFIX);
+ xoops_cp_footer();
+ break;
+
+
+case "savefields":
+ $fields_handler = xoops_getmodulehandler('fields', 'xrest');
+ foreach ($_POST['id'] as $id => $fld_id){
+ switch ($fld_id){
+ case "new":
+ $field = $fields_handler->create();
+ $field->setVars($_POST[$id]);
+ $field->setVar('tbl_id', $_POST['tbl_id']);
+ $fields_handler->insert($field);
+ break;
+ default:
+ $field = $fields_handler->get($fld_id);
+ $field->setVars($_POST[$id]);
+ $fields_handler->insert($field);
+ }
+ }
+ redirect_header("index.php?op=fields&tbl_id=".$tbl_id,2,_XREST_AM_MSG_SAVEFIELDS_DATABASE_UPDATED);
+ break;
+
+case "savetables":
+
+ $tables_handler = xoops_getmodulehandler('tables', 'xrest');
+ foreach ($_POST['id'] as $id => $tbl_id){
+ switch ($tbl_id){
+ case "new":
+ $table = $tables_handler->create();
+ $table->setVars($_POST[$id]);
+ $tables_handler->insert($table);
+ break;
+ default:
+ $table = $tables_handler->get($tbl_id);
+ $table->setVars($_POST[$id]);
+ $tables_handler->insert($table);
+ }
+ }
+ redirect_header("index.php?op=tables",2,_XREST_AM_MSG_SAVETABLES_DATABASE_UPDATED);
+ break;
+case "saveviews":
+
+ $tables_handler = xoops_getmodulehandler('tables', 'xrest');
+ foreach ($_POST['id'] as $id => $tbl_id){
+ switch ($tbl_id){
+ case "new":
+ $table = $tables_handler->create();
+ $table->setVars($_POST[$id]);
+ $table->setVar('view', true);
+ $tables_handler->insert($table);
+ break;
+ default:
+ $table = $tables_handler->get($tbl_id);
+ $table->setVars($_POST[$id]);
+ $tables_handler->insert($table);
+ }
+ }
+ redirect_header("index.php?op=views",2,_XREST_AM_MSG_SAVEVIEWS_DATABASE_UPDATED);
+ break;
+
+case "saveplugins":
+
+ $plugins_handler = xoops_getmodulehandler('plugins', 'xrest');
+ foreach ($_POST['id'] as $id => $plugin_id){
+ switch ($plugin_id){
+ case "new":
+ $plugin = $plugins_handler->create();
+ $plugin->setVars($_POST[$id]);
+ $plugins_handler->insert($plugin);
+ break;
+ default:
+ $plugin = $plugins_handler->get($plugin_id);
+ $plugin->setVars($_POST[$id]);
+ $plugins_handler->insert($plugin);
+ }
+ }
+ redirect_header("index.php?op=plugins",2,_XREST_AM_MSG_SAVEPLUGINS_DATABASE_UPDATED);
+ break;
+
+}
+
+
+
+
+?>
\ No newline at end of file
Added: XoopsModules/xrest/releases/1.52/htdocs/modules/xrest/admin/menu.php
===================================================================
--- XoopsModules/xrest/releases/1.52/htdocs/modules/xrest/admin/menu.php (rev 0)
+++ XoopsModules/xrest/releases/1.52/htdocs/modules/xrest/admin/menu.php 2012-01-08 21:24:39 UTC (rev 8678)
@@ -0,0 +1,36 @@
+<?php
+$module_handler =& xoops_gethandler('module');
+$GLOBALS['xrestModule'] = $module_handler->getByDirname('xrest');
+
+global $adminmenu;
+$adminmenu=array();
+$adminmenu[0]['title'] = _XREST_MI_ADMINMENU_0;
+$adminmenu[0]['link'] = "admin/index.php?op=dashboard";
+$adminmenu[0]['icon'] = '../../'.$GLOBALS['xrestModule']->getInfo('icons32').'/home.png';
+$adminmenu[0]['image'] = '../../'.$GLOBALS['xrestModule']->getInfo('icons32').'/home.png';
+$adminmenu[1]['title'] = _XREST_MI_ADMINMENU_1;
+$adminmenu[1]['link'] = "admin/index.php?op=tables";
+$adminmenu[1]['icon'] = '../../'.$GLOBALS['xrestModule']->getInfo('icons32').'/xrest.tables.png';
+$adminmenu[1]['image'] = '../../'.$GLOBALS['xrestModule']->getInfo('icons32').'/xrest.tables.png';
+$adminmenu[2]['title'] = _XREST_MI_ADMINMENU_2;
+$adminmenu[2]['link'] = "admin/index.php?op=fields";
+$adminmenu[2]['icon'] = '../../'.$GLOBALS['xrestModule']->getInfo('icons32').'/xrest.fields.png';
+$adminmenu[2]['image'] = '../../'.$GLOBALS['xrestModule']->getInfo('icons32').'/xrest.fields.png';
+$adminmenu[3]['title'] = _XREST_MI_ADMINMENU_3;
+$adminmenu[3]['link'] = "admin/index.php?op=views";
+$adminmenu[3]['icon'] = '../../'.$GLOBALS['xrestModule']->getInfo('icons32').'/xrest.views.png';
+$adminmenu[3]['image'] = '../../'.$GLOBALS['xrestModule']->getInfo('icons32').'/xrest.views.png';
+$adminmenu[4]['title'] = _XREST_MI_ADMINMENU_4;
+$adminmenu[4]['link'] = "admin/index.php?op=plugins";
+$adminmenu[4]['icon'] = '../../'.$GLOBALS['xrestModule']->getInfo('icons32').'/xrest.plugins.png';
+$adminmenu[4]['image'] = '../../'.$GLOBALS['xrestModule']->getInfo('icons32').'/xrest.plugins.png';
+$adminmenu[5]['title'] = _XREST_MI_ADMINMENU_5;
+$adminmenu[5]['link'] = "admin/permissions.php";
+$adminmenu[5]['icon'] = '../../'.$GLOBALS['xrestModule']->getInfo('icons32').'/xrest.permissions.png';
+$adminmenu[5]['image'] = '../../'.$GLOBALS['xrestModule']->getInfo('icons32').'/xrest.permissions.png';
+$adminmenu[6]['title'] = _XREST_MI_ADMINMENU_6;
+$adminmenu[6]['link'] = "admin/index.php?op=about";
+$adminmenu[6]['icon'] = '../../'.$GLOBALS['xrestModule']->getInfo('icons32').'/about.png';
+$adminmenu[6]['image'] = '../../'.$GLOBALS['xrestModule']->getInfo('icons32').'/about.png';
+
+?>
\ No newline at end of file
Added: XoopsModules/xrest/releases/1.52/htdocs/modules/xrest/admin/permissions.php
===================================================================
--- XoopsModules/xrest/releases/1.52/htdocs/modules/xrest/admin/permissions.php (rev 0)
+++ XoopsModules/xrest/releases/1.52/htdocs/modules/xrest/admin/permissions.php 2012-01-08 21:24:39 UTC (rev 8678)
@@ -0,0 +1,37 @@
+<?php
+
+include_once("admin_header.php");
+include_once XOOPS_ROOT_PATH . '/class/xoopsform/grouppermform.php';
+
+xoops_loadLanguage('forms', 'xrest');
+$op = (isset($_REQUEST['op'])?$_REQUEST['op']:'default');
+
+xoops_cp_header();
+loadModuleAdminMenu(5);
+$indexAdmin = new ModuleAdmin();
+echo $indexAdmin->addNavigation('permissions.php');
+
+switch ($op) {
+ case "default":
+ default:
+ $module_handler = xoops_gethandler('module');
+ $GLOBALS['xrestModule'] = $module_handler->getByDirname('xrest');
+ // View Categories permissions
+ $plugins_handler = xoops_getmodulehandler('plugins', 'xrest');
+ $plugins = $plugins_handler->getObjects(NULL, true);
+ if (count($plugins)) {
+ $form_view = new XoopsGroupPermForm(_XREST_FRM_VIEW_FUNCTION, $GLOBALS['xrestModule']->getVar('mid'), "plugin_call", "<img id='toptableicon' src=" . XOOPS_URL . "/modules/" . $GLOBALS['xrestModule']->dirname() . "/images/close12.gif alt='' /></a>" . _XREST_FRM_PERMISSIONSVIEWMAN . "</h3><div id='toptable'><span style=\"color: #567; margin: 3px 0 0 0; font-size: small; display: block; \">" . _XREST_FRM_VIEW_FUNCTION . "</span>", 'admin/permissions.php');
+ foreach($plugins as $plugin_id => $plugin) {
+ $form_view->addItem($plugin_id, $plugin->getVar('plugin_name'));
+ }
+ echo $form_view->render();
+ } else {
+ echo "<img id='toptableicon' src=" . XOOPS_URL . "/modules/" . $GLOBALS['xrestModule']->dirname() . "/images/close12.gif alt='' /></a> " . _XREST_FRM_PERMISSIONSVIEWMAN . "</h3><div id='toptable'><span style=\"color: #567; margin: 3px 0 0 0; font-size: small; display: block; \">" . _XREST_FRM_NOPERMSSET . "</span>";
+ }
+ echo "</div>";
+ echo "<br />\n";
+ break;
+}
+xoops_cp_footer();
+
+?>
\ No newline at end of file
Added: XoopsModules/xrest/releases/1.52/htdocs/modules/xrest/class/fields.php
===================================================================
--- XoopsModules/xrest/releases/1.52/htdocs/modules/xrest/class/fields.php (rev 0)
+++ XoopsModules/xrest/releases/1.52/htdocs/modules/xrest/class/fields.php 2012-01-08 21:24:39 UTC (rev 8678)
@@ -0,0 +1,100 @@
+<?php
+
+if (!defined('XOOPS_ROOT_PATH')) {
+ exit();
+}
+/**
+ * Class for Blue Room XRest 1.52
+ * @author Simon Roberts <si...@ch...>
+ * @copyright copyright (c) 2012-2011 chronolabs.coop
+ * @package kernel
+ */
+class XrestFields extends XoopsObject
+{
+
+ function XrestFields($id = null)
+ {
+ $this->initVar('fld_id', XOBJ_DTYPE_INT, null, false);
+ $this->initVar('tbl_id', XOBJ_DTYPE_INT, null, false);
+ $this->initVar('key', XOBJ_DTYPE_INT, null, false);
+ $this->initVar('fieldname', XOBJ_DTYPE_TXTBOX, null, false, 220);
+ $this->initVar('allowpost', XOBJ_DTYPE_INT, null, false);
+ $this->initVar('allowretrieve', XOBJ_DTYPE_INT, null, false);
+ $this->initVar('allowupdate', XOBJ_DTYPE_INT, null, false);
+ $this->initVar('visible', XOBJ_DTYPE_INT, null, false);
+ $this->initVar('string', XOBJ_DTYPE_INT, null, false);
+ $this->initVar('int', XOBJ_DTYPE_INT, null, false);
+ $this->initVar('float', XOBJ_DTYPE_INT, null, false);
+ $this->initVar('text', XOBJ_DTYPE_INT, null, false);
+ $this->initVar('other', XOBJ_DTYPE_INT, null, false);
+ $this->initVar('crc', XOBJ_DTYPE_INT, null, false);
+ }
+
+}
+
+/**
+ * Class for Blue Room XRest 1.52
+ * @author Simon Roberts <si...@ch...>
+ * @copyright copyright (c) 2012-2011 chronolabs.coop
+ * @package kernel
+ */
+class XrestMysqlFields extends XoopsObject
+{
+
+ function XrestMysqlFields()
+ {
+ $this->initVar('Field', XOBJ_DTYPE_OTHER, null, false);
+ $this->initVar('Type', XOBJ_DTYPE_OTHER, null, false);
+ $this->initVar('Null', XOBJ_DTYPE_OTHER, null, false);
+ $this->initVar('Key', XOBJ_DTYPE_OTHER, null, false);
+ $this->initVar('Default', XOBJ_DTYPE_OTHER, null, false);
+ $this->initVar('Extra', XOBJ_DTYPE_OTHER, null, false);
+ }
+
+}
+
+/**
+* XOOPS policies handler class.
+* This class is responsible for providing data access mechanisms to the data source
+* of XOOPS user class objects.
+*
+* @author Simon Roberts <si...@ch...>
+* @package kernel
+*/
+class XrestFieldsHandler extends XoopsPersistableObjectHandler
+{
+ public function __construct(&$db)
+ {
+ $this->db = $db;
+ parent::__construct($db, 'rest_fields', 'XrestFields', "fld_id", "fieldname");
+ }
+
+ public function getFieldFromTable($table) {
+ $sql = "SHOW FIELDS FROM `".$GLOBALS['xoopsDB']->prefix($table).'`';
+ $result = $GLOBALS['xoopsDB']->queryF($sql);
+ $ret = array();
+ $i=1;
+ while($row = $GLOBALS['xoopsDB']->fetchArray($result)) {
+ $ret[$i] = new XrestMysqlFields();
+ $ret[$i]->assignVars($row);
+ $i++;
+ }
+ return $ret;
+ }
+
+ public function getFieldWithNameAndTableID($fieldname, $tbl_id) {
+ $criteria = new CriteriaCompo(new Criteria('`fieldname`', $fieldname));
+ $criteria->add(new Criteria('`tbl_id`', $tbl_id));
+ if ($this->getCount($criteria)==0) {
+ return false;
+ } elseif ($objects = $this->getObjects($criteria, false)) {
+ if (isset($objects[0]))
+ return $objects[0];
+ else
+ return false;
+ }
+ return false;
+ }
+}
+
+?>
\ No newline at end of file
Added: XoopsModules/xrest/releases/1.52/htdocs/modules/xrest/class/index.html
===================================================================
--- XoopsModules/xrest/releases/1.52/htdocs/modules/xrest/class/index.html (rev 0)
+++ XoopsModules/xrest/releases/1.52/htdocs/modules/xrest/class/index.html 2012-01-08 21:24:39 UTC (rev 8678)
@@ -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/xrest/releases/1.52/htdocs/modules/xrest/class/plugins.php
===================================================================
--- XoopsModules/xrest/releases/1.52/htdocs/modules/xrest/class/plugins.php (rev 0)
+++ XoopsModules/xrest/releases/1.52/htdocs/modules/xrest/class/plugins.php 2012-01-08 21:24:39 UTC (rev 8678)
@@ -0,0 +1,151 @@
+<?php
+
+if (!defined('XOOPS_ROOT_PATH')) {
+ exit();
+}
+
+xoops_load('xoopscache');
+/**
+ * Class for Blue Room XRest 1.52
+ * @author Simon Roberts <si...@ch...>
+ * @copyright copyright (c) 2012-2011 chronolabs.coop
+ * @package kernel
+ */
+class XrestPlugins extends XoopsObject
+{
+
+ function XrestPlugins($id = null)
+ {
+ $this->initVar('plugin_id', XOBJ_DTYPE_INT, null, false);
+ $this->initVar('plugin_name', XOBJ_DTYPE_TXTBOX, null, false, 255);
+ $this->initVar('plugin_file', XOBJ_DTYPE_TXTBOX, null, false, 255);
+ $this->initVar('active', XOBJ_DTYPE_INT, null, false);
+ }
+
+}
+
+
+/**
+* XOOPS policies handler class.
+* This class is responsible for providing data access mechanisms to the data source
+* of XOOPS user class objects.
+*
+* @author Simon Roberts <si...@ch...>
+* @package kernel
+*/
+class XrestPluginsHandler extends XoopsPersistableObjectHandler
+{
+ public function __construct(&$db)
+ {
+ $this->db = $db;
+ parent::__construct($db, 'rest_plugins', 'XrestPlugins', "plugin_id", "plugin_name");
+ }
+
+ public function getServerExtensions() {
+ $f = array();
+ $f_count = 0;
+ $failed = 0;
+ $i=1;
+ static $f_buffer;
+ $f_b...
[truncated message content] |
|
From: <ma...@us...> - 2012-01-08 20:42:10
|
Revision: 8677
http://xoops.svn.sourceforge.net/xoops/?rev=8677&view=rev
Author: mageg
Date: 2012-01-08 20:42:02 +0000 (Sun, 08 Jan 2012)
Log Message:
-----------
changes in protector module (in templates admin, define new, etc.)
Modified Paths:
--------------
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/protector/admin/advisory.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/protector/admin/center.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/protector/admin/menu.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/protector/admin/prefix_manager.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/protector/language/english/admin.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/protector/xoops_version.php
Added Paths:
-----------
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/protector/templates/
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/protector/templates/admin/
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/protector/templates/admin/index.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/protector/templates/admin/protector_advisory.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/protector/templates/admin/protector_center.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/protector/templates/admin/protector_prefix.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/protector/templates/index.html
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/protector/admin/advisory.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/protector/admin/advisory.php 2012-01-08 17:26:36 UTC (rev 8676)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/protector/admin/advisory.php 2012-01-08 20:42:02 UTC (rev 8677)
@@ -21,19 +21,22 @@
include_once dirname(__FILE__) . '/header.php';
-$xoops = Xoops::getInstance();
-
$db = XoopsDatabaseFactory::getDatabaseConnection();
-// beggining of Output
-$xoops->header();
+// Call header
+$xoops->header('protector_advisory.html');
-$advisoryAdmin = new XoopsModuleAdmin();
-echo $advisoryAdmin->renderNavigation('advisory.php');
-// open table for ADVISORY
-echo "<style>dd {margin-left: 32px;}</style>\n";
-echo "<br />\n<div style='border: 2px solid #2F5376;padding:8px;width:95%;' class='bg4'>\n";
+$admin_page = new XoopsModuleAdmin();
+$admin_page->renderNavigation('advisory.php');
+// Define Stylesheet
+$xoops->theme->addStylesheet('media/jquery/ui/' . $xoops->getModuleConfig('jquery_theme', 'system') . '/ui.all.css');
+// Define scripts
+$xoops->theme->addScript($xoops->url('/media/jquery/plugins/jquery.ui.js'));
+$xoops->theme->addScript('modules/system/js/admin.js');
+
+$i = 0;
+// XOOPS_ROOT_PATH
// calculate the relative path between XOOPS_ROOT_PATH and XOOPS_TRUST_PATH
$root_paths = explode('/', XOOPS_ROOT_PATH);
$trust_paths = explode('/', XOOPS_TRUST_PATH);
@@ -43,105 +46,112 @@
}
}
$relative_path = str_repeat('../', count($root_paths) - $i) . implode('/', array_slice($trust_paths, $i));
+$security_arr[$i]['id'] = $i + 1;
+$security_arr[$i]['type'] = 'XOOPS_TRUST_PATH';
+$security_arr[$i]['status'] = '-';
+$security_arr[$i]['info'] = "<img src='" . XOOPS_URL . '/' . htmlspecialchars($relative_path) . "/modules/protector/public_check.png' width='40' height='20' alt='' style='border:1px solid black;' /> <a href='" . XOOPS_URL . '/' . htmlspecialchars($relative_path) . "/modules/protector/public_check.php'>" . _AM_ADV_TRUSTPATHPUBLICLINK . "</a>";
+$security_arr[$i]['text'] = _AM_ADV_TRUSTPATHPUBLIC;
+$i++;
-// the path of XOOPS_TRUST_PATH accessible check
-echo "<dl><dt>'XOOPS_TRUST_PATH' : ";
-echo "<img src='" . XOOPS_URL . '/' . htmlspecialchars($relative_path) . "/modules/protector/public_check.png' width='40' height='20' alt='' style='border:1px solid black;' /><br /><a href='" . XOOPS_URL . '/' . htmlspecialchars($relative_path) . "/modules/protector/public_check.php'>" . _AM_ADV_TRUSTPATHPUBLICLINK . "</a></dt>\n";
-echo "<dd>" . _AM_ADV_TRUSTPATHPUBLIC . "</b><br /><br /></dd></dl>";
-
// register_globals
-echo "<dl><dt>'register_globals' : ";
$safe = !ini_get("register_globals");
+$security_arr[$i]['id'] = $i + 1;
+$security_arr[$i]['type'] = 'register_globals';
if ($safe) {
- echo "off <span style='color:green;font-weight:bold;'>OK</span></dt>\n";
+ $security_arr[$i]['status'] = '1';
+ $security_arr[$i]['info'] = "<span style='color:green;font-weight:bold;'>register_globals: off</span>";
} else {
- echo "on <span style='color:red;font-weight:bold;'>" . _AM_ADV_NOTSECURE . "</span></dt>\n";
- echo "<dd><br /><br />" . _AM_ADV_REGISTERGLOBALS . "<br /><br />
- " . XOOPS_ROOT_PATH . "/.htaccess<br /><br />
- " . _AM_ADV_REGISTERGLOBALS2 . "<br /><br />
- <b>php_flag register_globals off
- </dd>";
+ $security_arr[$i]['status'] = '0';
+ $security_arr[$i]['info'] = "<span style='color:red;font-weight:bold;'>register_globals: on</span>";
}
-echo "</b><br /><br /></dl>\n";
+$security_arr[$i]['text'] = _AM_ADV_REGISTERGLOBALS . "<br /><br />" . XOOPS_ROOT_PATH . "/.htaccess<br /><br />" . _AM_ADV_REGISTERGLOBALS2 . "<br /><br /><b>php_flag register_globals off</b>";
+$i++;
// allow_url_fopen
-echo "<dl><dt>'allow_url_fopen' : ";
$safe = !ini_get("allow_url_fopen");
+$security_arr[$i]['id'] = $i + 1;
+$security_arr[$i]['type'] = 'allow_url_fopen';
if ($safe) {
- echo "off <span style='color:green;font-weight:bold;'>OK</span></dt>\n";
+ $security_arr[$i]['status'] = '1';
+ $security_arr[$i]['info'] = "<span style='color:green;font-weight:bold;'>allow_url_fopen: off</span>";
} else {
- echo "on <span style='color:red;font-weight:bold;'>" . _AM_ADV_NOTSECURE . "</span></dt>\n";
- echo "<dd>" . _AM_ADV_ALLOWURLFOPEN . "</dd>";
+ $security_arr[$i]['status'] = '0';
+ $security_arr[$i]['info'] = "<span style='color:red;font-weight:bold;'>allow_url_fopen: on</span>";
}
-echo "</b><br /><br /></dl>\n";
+$security_arr[$i]['text'] = _AM_ADV_ALLOWURLFOPEN;
+$i++;
// session.use_trans_sid
-echo "<dl><dt>'session.use_trans_sid' : ";
$safe = !ini_get("session.use_trans_sid");
+$security_arr[$i]['id'] = $i + 1;
+$security_arr[$i]['type'] = 'session.use_trans_sid';
if ($safe) {
- echo "off <span style='color:green;font-weight:bold;'>OK</span></dt>\n";
+ $security_arr[$i]['status'] = '1';
+ $security_arr[$i]['info'] = "<span style='color:green;font-weight:bold;'>session.use_trans_sid: off</span>";
} else {
- echo "on <span style='color:red;font-weight:bold;'>" . _AM_ADV_NOTSECURE . "</span></dt>\n";
- echo "<dd>" . _AM_ADV_USETRANSSID . "</dd>";
+ $security_arr[$i]['status'] = '0';
+ $security_arr[$i]['info'] = "<span style='color:red;font-weight:bold;'>session.use_trans_sid: on</span>";
}
-echo "</b><br /><br /></dl>\n";
+$security_arr[$i]['text'] = _AM_ADV_USETRANSSID;
+$i++;
// XOOPS_DB_PREFIX
-echo "<dl><dt>'XOOPS_DB_PREFIX' : ";
$safe = strtolower(XOOPS_DB_PREFIX) != 'xoops';
+$security_arr[$i]['id'] = $i + 1;
+$security_arr[$i]['type'] = 'XOOPS_DB_PREFIX';
if ($safe) {
- echo XOOPS_DB_PREFIX . " <span style='color:green;font-weight:bold;'>OK</span></dt>\n<dd>";
+ $security_arr[$i]['status'] = '1';
+ $security_arr[$i]['info'] = "<span style='color:green;font-weight:bold;'>XOOPS_DB_PREFIX: " . XOOPS_DB_PREFIX . "</span>";
} else {
- echo XOOPS_DB_PREFIX . " <span style='color:red;font-weight:bold;'>" . _AM_ADV_NOTSECURE . "</span></dt>\n";
- echo "<dd>" . _AM_ADV_DBPREFIX . "<br />\n";
+ $security_arr[$i]['status'] = '0';
+ $security_arr[$i]['info'] = "<span style='color:red;font-weight:bold;'>XOOPS_DB_PREFIX: " . XOOPS_DB_PREFIX . "</span> <a href='prefix_manager.php'>" . _AM_ADV_LINK_TO_PREFIXMAN . "</a>";
}
-echo "<a href='index.php?page=prefix_manager'>" . _AM_ADV_LINK_TO_PREFIXMAN . "</a></dd>";
-echo "</b><br /><br /></dl>\n";
+$security_arr[$i]['text'] = _AM_ADV_DBPREFIX;
+$i++;
// patch to mainfile.php
-echo "<dl><dt>'mainfile.php' : ";
+$security_arr[$i]['id'] = $i + 1;
+$security_arr[$i]['type'] = 'mainfile.php';
if (!defined('PROTECTOR_PRECHECK_INCLUDED')) {
- echo "missing precheck <span style='color:red;font-weight:bold;'>" . _AM_ADV_NOTSECURE . "</span></dt>\n";
- echo "<dd>" . _AM_ADV_MAINUNPATCHED . "</dd>";
+ $security_arr[$i]['status'] = '0';
+ $security_arr[$i]['info'] = "<span style='color:red;font-weight:bold;'>missing precheck</span>";
} else {
if (!defined('PROTECTOR_POSTCHECK_INCLUDED')) {
- echo "missing postcheck <span style='color:red;font-weight:bold;'>" . _AM_ADV_NOTSECURE . "</span></dt>\n";
- echo "<dd>" . _AM_ADV_MAINUNPATCHED . "</dd>";
+ $security_arr[$i]['status'] = '0';
+ $security_arr[$i]['info'] = "<span style='color:red;font-weight:bold;'>missing postcheck</span>";
} else {
- echo "patched <span style='color:green;font-weight:bold;'>OK</span></dt>\n";
+ $security_arr[$i]['status'] = '1';
+ $security_arr[$i]['info'] = "<span style='color:green;font-weight:bold;'>patched</span>";
}
+
}
-echo "</b><br /><br /></dl>\n";
+$security_arr[$i]['text'] = _AM_ADV_MAINUNPATCHED;
+$i++;
-// patch to databasefactory.php
-echo "<dl><dt>'databasefactory.php' : ";
-$db = XoopsDatabaseFactory::getDatabaseConnection();
+// databasefactory.php
+$security_arr[$i]['id'] = $i + 1;
+$security_arr[$i]['type'] = 'databasefactory.php';
if (substr(@XOOPS_VERSION, 6, 3) < 2.4 && strtolower(get_class($db)) != 'protectormysqldatabase') {
- echo "<span style='color:red;font-weight:bold;'>" . _AM_ADV_DBFACTORYUNPATCHED . "</span></dt>\n";
+ $security_arr[$i]['status'] = '0';
+ $security_arr[$i]['info'] = "<span style='color:red;font-weight:bold;'>" . _AM_ADV_DBFACTORYUNPATCHED . "</span>";
} else {
- echo _AM_ADV_DBFACTORYPATCHED . "<span style='color:green;font-weight:bold;'> OK</span></dt>\n";
+ $security_arr[$i]['status'] = '1';
+ $security_arr[$i]['info'] = "<span style='color:green;font-weight:bold;'>" . _AM_ADV_DBFACTORYPATCHED . "</span>";
}
-echo "</dl>\n";
+$security_arr[$i]['text'] = '';
+$i++;
-// close table for ADVISORY
-echo "</div><br />\n";
+foreach (array_keys($security_arr) as $i) {
+ $xoops->tpl->append_by_ref('security', $security_arr[$i]);
+ $xoops->tpl->append_by_ref('popup_security', $security_arr[$i]);
+}
-// open table for PROTECTION CHECK
-echo "<br />\n<div style='border: 2px solid #2F5376;padding:8px;width:95%;' class='bg4'>\n";
-
-echo "<h3>" . _AM_ADV_SUBTITLECHECK . "</h3>\n";
// Check contaminations
$uri_contami = XOOPS_URL . "/index.php?xoopsConfig%5Bnocommon%5D=1";
-echo "<dl><dt>" . _AM_ADV_CHECKCONTAMI . ":</dt>\n";
-echo "<dd><a href='$uri_contami' target='_blank'>$uri_contami</a></dd>";
-echo "</dl>\n";
+$xoops->tpl->assign('uri_contami', $uri_contami);
// Check isolated comments
$uri_isocom = XOOPS_URL . "/index.php?cid=" . urlencode(",password /*");
-echo "<dl><dt>" . _AM_ADV_CHECKISOCOM . ":</dt>\n";
-echo "<dd><a href='$uri_isocom' target='_blank'>$uri_isocom</a></dd>";
-echo "</dl>\n";
-// close table for PROTECTION CHECK
-echo "</div>\n";
+$xoops->tpl->assign('uri_isocom', $uri_isocom);
$xoops->footer();
\ No newline at end of file
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/protector/admin/center.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/protector/admin/center.php 2012-01-08 17:26:36 UTC (rev 8676)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/protector/admin/center.php 2012-01-08 20:42:02 UTC (rev 8677)
@@ -23,15 +23,6 @@
require_once dirname(dirname(__FILE__)) . '/class/gtickets.php';
-$xoops = Xoops::getInstance();
-
-
-//dirty trick to get navigation working with system menus
-if (isset($_GET['num'])) {
- $_SERVER['REQUEST_URI'] = 'admin/center.php?page=center';
-}
-
-$myts = MyTextSanitizer::getInstance();
$db = XoopsDatabaseFactory::getDatabaseConnection();
// GET vars
@@ -43,7 +34,6 @@
// Protector object
require_once dirname(dirname(__FILE__)) . '/class/protector.php';
-$db = XoopsDatabaseFactory::getDatabaseConnection();
$protector = Protector::getInstance($db->conn);
$conf = $protector->getConf();
@@ -120,38 +110,12 @@
}
}
}
-
-//
-// display stage
-//
-
-// query for listing
-$rs = $db->query("SELECT count(lid) FROM $log_table");
-list($numrows) = $db->fetchRow($rs);
-$prs = $db->query("SELECT l.lid, l.uid, l.ip, l.agent, l.type, l.description, UNIX_TIMESTAMP(l.timestamp), u.uname FROM $log_table l LEFT JOIN " . $db->prefix("users") . " u ON l.uid=u.uid ORDER BY timestamp DESC LIMIT $pos,$num");
-
-// Page Navigation
-$nav = new XoopsPageNav($numrows, $num, $pos, 'pos', "num=$num");
-$nav_html = $nav->renderNav(10);
-
-// Number selection
-$num_options = '';
-$num_array = array(20, 100, 500, 2000);
-foreach ($num_array as $n) {
- if ($n == $num) {
- $num_options .= "<option value='$n' selected='selected'>$n</option>\n";
- } else {
- $num_options .= "<option value='$n'>$n</option>\n";
- }
-}
-
// beggining of Output
-$xoops->header();
+$xoops->header('protector_center.html');
+$admin_page = new XoopsModuleAdmin();
+$admin_page->renderNavigation('center.php');
-$centerAdmin = new XoopsModuleAdmin();
-echo $centerAdmin->renderNavigation('center.php');
-
// bad_ips
$bad_ips = $protector->get_bad_ips(true);
uksort($bad_ips, 'protector_ip_cmp');
@@ -166,74 +130,32 @@
$group1_ips = $protector->get_group1_ips();
usort($group1_ips, 'protector_ip_cmp');
$group1_ips4disp = htmlspecialchars(implode("\n", $group1_ips), ENT_QUOTES);
-
// edit configs about IP ban and IPs for group=1
-echo "
-<form name='ConfigForm' action='' method='POST'>
-" . $xoopsGTicket->getTicketHtml(__LINE__, 1800, 'protector_admin') . "
-<input type='hidden' name='action' value='update_ips' />
-<table width='95%' class='outer' cellpadding='4' cellspacing='1'>
- <tr valign='top' align='left'>
- <td class='head'>
- " . _AM_TH_BADIPS . "
- </td>
- <td class='even'>
- <textarea name='bad_ips' id='bad_ips' style='width:200px;height:60px;'>$bad_ips4disp</textarea>
- <br />
- " . htmlspecialchars($protector->get_filepath4badips()) . "
- </td>
- </tr>
- <tr valign='top' align='left'>
- <td class='head'>
- " . _AM_TH_GROUP1IPS . "
- </td>
- <td class='even'>
- <textarea name='group1_ips' id='group1_ips' style='width:200px;height:60px;'>$group1_ips4disp</textarea>
- <br />
- " . htmlspecialchars($protector->get_filepath4group1ips()) . "
- </td>
- </tr>
- <tr valign='top' align='left'>
- <td class='head'>
- </td>
- <td class='even'>
- <input type='submit' value='" . _GO . "' />
- </td>
- </tr>
-</table>
-</form>
-";
-
+$xoops->tpl->assign('ticket', $xoopsGTicket->getTicketHtml(__LINE__, 1800, 'protector_admin'));
+$xoops->tpl->assign('bad_ips4disp', $bad_ips4disp);
+$xoops->tpl->assign('filepath4badips', htmlspecialchars($protector->get_filepath4badips()));
+$xoops->tpl->assign('group1_ips4disp', $group1_ips4disp);
+$xoops->tpl->assign('filepath4group1ips', htmlspecialchars($protector->get_filepath4group1ips()));
// header of log listing
-echo "
-<table width='95%' border='0' cellpadding='4' cellspacing='0'><tr><td>
-<form action='' method='GET' style='margin-bottom:0px;'>
- <table width='95%' border='0' cellpadding='4' cellspacing='0'>
- <tr>
- <td align='left'>
- <select name='num' onchange='submit();'>$num_options</select>
- <input type='submit' value='" . _SUBMIT . "'>
- </td>
- <td align='right'>
- $nav_html
- </td>
- </tr>
- </table>
-</form>
-<form name='MainForm' action='' method='POST' style='margin-top:0px;'>
-" . $xoopsGTicket->getTicketHtml(__LINE__, 1800, 'protector_admin') . "
-<input type='hidden' name='action' value='' />
-<table width='95%' class='outer' cellpadding='4' cellspacing='1'>
- <tr valign='middle'>
- <th width='5'><input type='checkbox' name='dummy' onclick=\"with(document.MainForm){for(i=0;i<length;i++){if(elements[i].type=='checkbox'){elements[i].checked=this.checked;}}}\" /></th>
- <th>" . _AM_TH_DATETIME . "</th>
- <th>" . _AM_TH_USER . "</th>
- <th>" . _AM_TH_IP . "<br />" . _AM_TH_AGENT . "</th>
- <th>" . _AM_TH_TYPE . "</th>
- <th>" . _AM_TH_DESCRIPTION . "</th>
- </tr>
-";
-
+// query for listing
+$rs = $db->query("SELECT count(lid) FROM $log_table");
+list($numrows) = $db->fetchRow($rs);
+$prs = $db->query("SELECT l.lid, l.uid, l.ip, l.agent, l.type, l.description, UNIX_TIMESTAMP(l.timestamp), u.uname FROM $log_table l LEFT JOIN " . $db->prefix("users") . " u ON l.uid=u.uid ORDER BY timestamp DESC LIMIT $pos,$num");
+// Number selection
+$num_options = '';
+$num_array = array(20, 100, 500, 2000);
+foreach ($num_array as $n) {
+ if ($n == $num) {
+ $num_options .= "<option value='$n' selected='selected'>$n</option>\n";
+ } else {
+ $num_options .= "<option value='$n'>$n</option>\n";
+ }
+}
+$xoops->tpl->assign('num_options', $num_options);
+// Page Navigation
+$nav = new XoopsPageNav($numrows, $num, $pos, 'pos', "num=$num");
+$nav_html = $nav->renderNav(10);
+$xoops->tpl->assign('nav_html', $nav_html);
// body of log listing
$oddeven = 'odd';
while (list($lid, $uid, $ip, $agent, $type, $description, $timestamp, $uname) = $db->fetchRow($prs)) {
@@ -256,37 +178,19 @@
}
$agent4disp = htmlspecialchars($agent, ENT_QUOTES);
$agent_desc = $agent == $agent_short ? $agent4disp : htmlspecialchars($agent_short, ENT_QUOTES) . "<img src='../images/dotdotdot.gif' alt='$agent4disp' title='$agent4disp' />";
-
- echo "
- <tr>
- <td class='$oddeven'><input type='checkbox' name='ids[]' value='$lid' /></td>
- <td class='$oddeven'>" . XoopsLocal::formatTimestamp($timestamp) . "</td>
- <td class='$oddeven'>$uname</td>
- <td class='$oddeven'>$ip<br />$agent_desc</td>
- <td class='$oddeven'>$type</td>
- <td class='$oddeven' width='100%'>$description</td>
- </tr>\n";
+
+ $log_arr['lid'] = $lid;
+ $log_arr['date'] = XoopsLocal::formatTimestamp($timestamp);
+ $log_arr['uname'] = $uname;
+ $log_arr['ip'] = $ip;
+ $log_arr['agent_desc'] = $agent_desc;
+ $log_arr['type'] = $type;
+ $log_arr['description'] = $description;
+
+ $xoops->tpl->append_by_ref('log', $log_arr);
+ unset($table_arr);
}
-// footer of log listing
-echo "
- <tr>
- <td colspan='8' align='left'>" . _AM_LABEL_REMOVE . "<input type='button' value='" . _AM_BUTTON_REMOVE . "' onclick='if(confirm(\"" . _AM_JS_REMOVECONFIRM . "\")){document.MainForm.action.value=\"delete\"; submit();}' /></td>
- </tr>
-</table>
-<div align='right'>
- $nav_html
-</div>
-<div style='clear:both;'><br /><br /></div>
-<div align='right'>
-" . _AM_LABEL_COMPACTLOG . "<input type='button' value='" . _AM_BUTTON_COMPACTLOG . "' onclick='if(confirm(\"" . _AM_JS_COMPACTLOGCONFIRM . "\")){document.MainForm.action.value=\"compactlog\"; submit();}' />
-
-" . _AM_LABEL_REMOVEALL . "<input type='button' value='" . _AM_BUTTON_REMOVEALL . "' onclick='if(confirm(\"" . _AM_JS_REMOVEALLCONFIRM . "\")){document.MainForm.action.value=\"deleteall\"; submit();}' />
-</div>
-</form>
-</td></tr></table>
-";
-
$xoops->footer();
function protector_ip_cmp($a, $b)
@@ -297,4 +201,4 @@
$bval = @$bs[0] * 167777216 + @$bs[1] * 65536 + @$bs[2] * 256 + @$bs[3];
return $aval > $bval ? 1 : -1;
-}
+}
\ No newline at end of file
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/protector/admin/menu.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/protector/admin/menu.php 2012-01-08 17:26:36 UTC (rev 8676)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/protector/admin/menu.php 2012-01-08 20:42:02 UTC (rev 8677)
@@ -45,5 +45,4 @@
'link' => 'admin/about.php',
'icon' => $pathIcon32 . '/about.png',
),
-);
-?>
+);
\ No newline at end of file
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/protector/admin/prefix_manager.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/protector/admin/prefix_manager.php 2012-01-08 17:26:36 UTC (rev 8676)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/protector/admin/prefix_manager.php 2012-01-08 20:42:02 UTC (rev 8677)
@@ -21,16 +21,18 @@
include_once dirname(__FILE__) . '/header.php';
-$xoops = Xoops::getInstance();
-
require_once dirname(dirname(__FILE__)) . '/class/gtickets.php';
$db = XoopsDatabaseFactory::getDatabaseConnection();
+$xoops->header('protector_prefix.html');
+$error = '';
// COPY TABLES
if (!empty($_POST['copy']) && !empty($_POST['old_prefix'])) {
if (preg_match('/[^0-9A-Za-z_-]/', $_POST['new_prefix'])) {
- die('wrong prefix');
+ $xoops->tpl->assign('error', _AM_PROTECTOR_PREFIX_ERROR_WP);
+ $xoops->footer();
+ exit;
}
// Ticket check
@@ -44,7 +46,9 @@
$srs = $db->queryF('SHOW TABLE STATUS FROM `' . XOOPS_DB_NAME . '`');
if (!$db->getRowsNum($srs)) {
- die("You are not allowed to copy tables");
+ $xoops->tpl->assign('error', _AM_PROTECTOR_PREFIX_ERROR_NACT);
+ $xoops->footer();
+ exit;
}
$count = 0;
@@ -59,7 +63,7 @@
$crs = $db->queryF('SHOW CREATE TABLE ' . $old_table);
if (!$db->getRowsNum($crs)) {
- echo "error: SHOW CREATE TABLE ($old_table)<br />\n";
+ $error .= sprintf(_AM_PROTECTOR_PREFIX_ERROR_SCT, $old_table) . '<br />';
continue;
}
$row_create = $db->fetchArray($crs);
@@ -67,26 +71,32 @@
$crs = $db->queryF($create_sql);
if (!$crs) {
- echo "error: CREATE TABLE ($new_table)<br />\n";
+ $error .= sprintf(_AM_PROTECTOR_PREFIX_ERROR_CT, $new_table) . '<br />';
continue;
}
$irs = $db->queryF("INSERT INTO `$new_table` SELECT * FROM `$old_table`");
if (!$irs) {
- echo "error: INSERT INTO ($new_table)<br />\n";
+ $error .= sprintf(_AM_PROTECTOR_PREFIX_ERROR_II, $new_table) . '<br />';
continue;
}
}
$_SESSION['protector_logger'] = $xoops->logger->dump('queries');
-
- $xoops->redirect('prefix_manager.php', 1, _AM_MSG_DBUPDATED);
+
+ if ( $error != '' ) {
+ $xoops->tpl->assign('error', $error);
+ $xoops->footer();
+ } else {
+ $xoops->redirect('prefix_manager.php', 1, _AM_MSG_DBUPDATED);
+ }
// DUMP INTO A LOCAL FILE
} else {
if (!empty($_POST['backup']) && !empty($_POST['prefix'])) {
-
if (preg_match('/[^0-9A-Za-z_-]/', $_POST['prefix'])) {
- die('wrong prefix');
+ $xoops->tpl->assign('error', _AM_PROTECTOR_PREFIX_ERROR_WP);
+ $xoops->footer();
+ exit;
}
// Ticket check
@@ -98,8 +108,10 @@
// get table list
$srs = $db->queryF('SHOW TABLE STATUS FROM `' . XOOPS_DB_NAME . '`');
- if (!$db->getRowsNum($srs)) {
- die("You are not allowed to delete tables");
+ if (!$db->getRowsNum($srs)) {
+ $xoops->tpl->assign('error', _AM_PROTECTOR_PREFIX_ERROR_NADT);
+ $xoops->footer();
+ exit;
}
$export_string = '';
@@ -167,7 +179,9 @@
if (!empty($_POST['delete']) && !empty($_POST['prefix'])) {
if (preg_match('/[^0-9A-Za-z_-]/', $_POST['prefix'])) {
- die('wrong prefix');
+ $xoops->tpl->assign('error', _AM_PROTECTOR_PREFIX_ERROR_WP);
+ $xoops->footer();
+ exit;
}
// Ticket check
@@ -179,19 +193,25 @@
// check if prefix is working
if ($prefix == XOOPS_DB_PREFIX) {
- die("You can't drop working tables");
+ $xoops->tpl->assign('error', _AM_PROTECTOR_PREFIX_ERROR_CTDWT);
+ $xoops->footer();
+ exit;
}
// check if prefix_xoopscomments exists
$check_rs = $db->queryF("SELECT * FROM {$prefix}_xoopscomments LIMIT 1");
- if (!$check_rs) {
- die("This is not a prefix for XOOPS");
+ if (!$check_rs) {
+ $xoops->tpl->assign('error', _AM_PROTECTOR_PREFIX_ERROR_NPX);
+ $xoops->footer();
+ exit;
}
// get table list
$srs = $db->queryF('SHOW TABLE STATUS FROM `' . XOOPS_DB_NAME . '`');
if (!$db->getRowsNum($srs)) {
- die("You are not allowed to delete tables");
+ $xoops->tpl->assign('error', _AM_PROTECTOR_PREFIX_ERROR_NADT);
+ $xoops->footer();
+ exit;
}
while ($row_table = $db->fetchArray($srs)) {
@@ -210,14 +230,24 @@
}
// beggining of Output
-$xoops->header();
-$prefix_managerAdmin = new XoopsModuleAdmin();
-echo $prefix_managerAdmin->renderNavigation('prefix_manager.php');
+
+$admin_page = new XoopsModuleAdmin();
+$admin_page->renderNavigation('prefix_manager.php');
+
+$xoops->tpl->assign('prefix', sprintf(_AM_TXT_HOWTOCHANGEDB, XOOPS_VAR_PATH . "/data/secure.php"));
+$xoops->tpl->assign('prefix_line', sprintf(_AM_PROTECTOR_PREFIX_CHANGEDBLINE, XOOPS_DB_PREFIX));
+
+// Display Log if exists
+if (!empty($_SESSION['protector_logger'])) {
+ $xoops->tpl->assign('protector_logger', $_SESSION['protector_logger']);
+ $_SESSION['protector_logger'] = '';
+ unset($_SESSION['protector_logger']);
+}
+
// query
$srs = $db->queryF("SHOW TABLE STATUS FROM `" . XOOPS_DB_NAME . '`');
if (!$db->getRowsNum($srs)) {
- //die("You are not allowed to copy tables");
- echo "You are not allowed to copy tables";
+ $xoops->tpl->assign('error', '_AM_PROTECTOR_PREFIX_ERROR_NACT');
$xoops->footer();
exit;
}
@@ -235,20 +265,8 @@
$tables[] = $row_table["Name"];
}
-// table
-echo "
-<table class='outer' width='95%'>
- <tr>
- <th>PREFIX</th>
- <th>TABLES</th>
- <th>UPDATED</th>
- <th>COPY</th>
- <th>ACTIONS</th>
- </tr>
-";
-
+$xoops->tpl->assign('aff_table', true);
foreach ($prefixes as $prefix) {
-
// count the number of tables with the prefix
$table_count = 0;
$has_xoopscomments = false;
@@ -260,7 +278,6 @@
if (substr($table, 0, strlen($prefix['name']) + 1) === $prefix['name'] . '_')
$table_count++;
}
-
// check if prefix_xoopscomments exists
if (!$has_xoopscomments)
continue;
@@ -269,48 +286,18 @@
$ticket_input = $xoopsGTicket->getTicketHtml(__LINE__, 1800, 'protector_admin');
if ($prefix['name'] == XOOPS_DB_PREFIX) {
- $del_button = '';
- $style_append = 'background-color:#FFFFFF';
+ $del_button = false;
} else {
- $del_button = "<input type='submit' name='delete' value='delete' onclick='return confirm(\"" . _AM_CONFIRM_DELETE . "\")' />";
- $style_append = '';
+ $del_button = true;
}
-
- echo "
- <tr>
- <td class='odd' style='$style_append;'>$prefix4disp</td>
- <td class='odd' style='text-align:right;$style_append;'>$table_count</td>
- <td class='odd' style='text-align:right;$style_append;'>{$prefix['updated']}</td>
- <td class='odd' style='text-align:center;$style_append;' nowrap='nowrap'>
- <form action='?page=prefix_manager' method='POST' style='margin:0px;'>
- $ticket_input
- <input type='hidden' name='old_prefix' value='$prefix4disp' />
- <input type='text' name='new_prefix' size='8' maxlength='16' />
- <input type='submit' name='copy' value='copy' />
- </form>
- </td>
- <td class='odd' style='text-align:center;$style_append;'>
- <form action='?page=prefix_manager' method='POST' style='margin:0px;'>
- $ticket_input
- <input type='hidden' name='prefix' value='$prefix4disp' />
- $del_button
- <input type='submit' name='backup' value='backup' onclick='this.form.target=\"_blank\"' />
- </form>
- </td>
- </tr>\n";
+
+ $table_arr['prefix'] = $prefix4disp;
+ $table_arr['count'] = $table_count;
+ $table_arr['update'] = $prefix['updated'];
+ $table_arr['ticket'] = $ticket_input;
+ $table_arr['del'] = $del_button;
+
+ $xoops->tpl->append_by_ref('table', $table_arr);
+ unset($table_arr);
}
-
-echo "
-</table>
-<p>" . sprintf(_AM_TXT_HOWTOCHANGEDB, XOOPS_ROOT_PATH, XOOPS_DB_PREFIX) . "</p>
-
-";
-
-// Display Log if exists
-if (!empty($_SESSION['protector_logger'])) {
- echo $_SESSION['protector_logger'];
- $_SESSION['protector_logger'] = '';
- unset($_SESSION['protector_logger']);
-}
-
-$xoops->footer();
+$xoops->footer();
\ No newline at end of file
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/protector/language/english/admin.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/protector/language/english/admin.php 2012-01-08 17:26:36 UTC (rev 8676)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/protector/language/english/admin.php 2012-01-08 20:42:02 UTC (rev 8677)
@@ -1,10 +1,4 @@
<?php
-
-// mymenu
-define('_MD_A_MYMENU_MYTPLSADMIN', '');
-define('_MD_A_MYMENU_MYBLOCKSADMIN', 'Permissions');
-define('_MD_A_MYMENU_MYPREFERENCES', 'Preferences');
-
// index.php
define("_AM_TH_DATETIME", "Time");
define("_AM_TH_USER", "User");
@@ -33,10 +27,9 @@
define("_AM_FMT_CONFIGSNOTWRITABLE", "Turn the configs directory writable: %s");
// prefix_manager.php
-define("_AM_H3_PREFIXMAN", "Prefix Manager");
define("_AM_MSG_DBUPDATED", "Database Updated Successfully!");
define("_AM_CONFIRM_DELETE", "All data will be dropped. OK?");
-define("_AM_TXT_HOWTOCHANGEDB", "If you want to change prefix,<br /> edit %s/mainfile.php manually.<br /><br />define('XOOPS_DB_PREFIX', '<b>%s</b>');");
+define("_AM_TXT_HOWTOCHANGEDB", "If you want to change prefix, edit <b>%s</b> manually");
// advisory.php
define("_AM_ADV_NOTSECURE", "Not secure");
@@ -59,4 +52,39 @@
//XOOPS 2.5.4
define("_AM_ADV_REGISTERGLOBALS2", "and place in it the line below:");
-?>
\ No newline at end of file
+//XOOPS 2.6.0
+/**************************************
+- Removed
+- _AM_H3_PREFIXMAN
+- _MD_A_MYMENU_MYTPLSADMIN
+- _MD_A_MYMENU_MYBLOCKSADMIN
+- _MD_A_MYMENU_MYPREFERENCES
+
+* Modified
+* _AM_TXT_HOWTOCHANGEDB
+
+*****************************************/
+// advisory.php
+define("_AM_ADV_ACTION", "Action");
+define("_AM_ADV_INFO", "Information");
+define("_AM_ADV_STATUS", "Status");
+define("_AM_ADV_TYPE", "Type of security");
+define("_AM_ADV_VIEW", "Information");
+
+// prefix_manager.php
+define("_AM_PROTECTOR_PREFIX", "PREFIX");
+define("_AM_PROTECTOR_PREFIX_ACTIONS", "ACTIONS");
+define("_AM_PROTECTOR_PREFIX_CHANGEDB", "Change prefix");
+define("_AM_PROTECTOR_PREFIX_CHANGEDBLINE", "Line: define('XOOPS_DB_PREFIX', '<b>%s</b>');");
+define("_AM_PROTECTOR_PREFIX_COPY", "COPY");
+define("_AM_PROTECTOR_PREFIX_ERROR_CT", "error: CREATE TABLE (%s)");
+define("_AM_PROTECTOR_PREFIX_ERROR_CTDWT", "You can't drop working tables");
+define("_AM_PROTECTOR_PREFIX_ERROR_II", "error: INSERT INTO (%s)");
+define("_AM_PROTECTOR_PREFIX_ERROR_NACT", "You are not allowed to copy tables");
+define("_AM_PROTECTOR_PREFIX_ERROR_NADT", "You are not allowed to delete tables");
+define("_AM_PROTECTOR_PREFIX_ERROR_NPX", "This is not a prefix for XOOPS");
+define("_AM_PROTECTOR_PREFIX_ERROR_SCT", "error: SHOW CREATE TABLE (%s)");
+define("_AM_PROTECTOR_PREFIX_ERROR_WP", "Wrong prefix");
+define("_AM_PROTECTOR_PREFIX_LOG", "Log");
+define("_AM_PROTECTOR_PREFIX_TABLES", "TABLES");
+define("_AM_PROTECTOR_PREFIX_UPDATED", "UPDATED");
\ No newline at end of file
Property changes on: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/protector/templates
___________________________________________________________________
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/protector/templates/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/protector/templates/admin/index.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/protector/templates/admin/index.html (rev 0)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/protector/templates/admin/index.html 2012-01-08 20:42:02 UTC (rev 8677)
@@ -0,0 +1 @@
+ <script>history.go(-1);</script>
\ No newline at end of file
Added: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/protector/templates/admin/protector_advisory.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/protector/templates/admin/protector_advisory.html (rev 0)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/protector/templates/admin/protector_advisory.html 2012-01-08 20:42:02 UTC (rev 8677)
@@ -0,0 +1,55 @@
+<{includeq file="admin:system|admin_navigation.html"}>
+<{includeq file="admin:system|admin_tips.html"}>
+<table id="xo-advisorylist-sorter" cellspacing="1" class="outer tablesorter">
+ <thead>
+ <tr>
+ <th class="txtcenter width15"><{$smarty.const._AM_ADV_TYPE}></th>
+ <th class="txtcenter width5"><{$smarty.const._AM_ADV_STATUS}></th>
+ <th class="txtcenter"><{$smarty.const._AM_ADV_INFO}></th>
+ <th class="txtcenter width5"><{$smarty.const._AM_ADV_ACTION}></th>
+ </tr>
+ </thead>
+ <tbody>
+ <{foreach item=security from=$security}>
+ <tr class="<{cycle values='even,odd'}>">
+ <td class="txtcenter"><{$security.type}></td>
+ <td class="txtcenter">
+ <{if $security.status == '1'}>
+ <img src="<{xoAdminIcons success.png}>" alt="OK" height="16"/>
+ <{/if}>
+ <{if $security.status == '0'}>
+ <img src="<{xoAdminIcons cancel.png}>" alt="<{$smarty.const._AM_ADV_NOTSECURE}>" height="16"/>
+ <{/if}>
+ <{if $security.status == '-'}>
+ <{$security.status}>
+ <{/if}>
+ </td>
+ <td class="txtleft"><{$security.info}></td>
+ <td class="xo-actions txtcenter">
+ <{if $security.text != ''}>
+ <img class="tooltip" onclick="display_dialog(<{$security.id}>, true, true, 'slide', 'slide', 200, 520);" src="<{xoAdminIcons display.png}>" title="<{$smarty.const._AM_ADV_VIEW}>" alt="<{$smarty.const._AM_ADV_VIEW}>" />
+ <{/if}>
+ </td>
+ </tr>
+ <{/foreach}>
+ </tbody>
+</table>
+
+<!--Pop-pup-->
+<{foreach item=security from=$popup_security}>
+<div id="dialog<{$security.id}>" title="<{$security.type}>" style='display:none;'>
+ <{$security.text}>
+</div>
+<{/foreach}>
+<!--Pop-pup-->
+
+<fieldset>
+ <legend class="label" title="<{$box.title}>"><img src="<{$xoops_url}>/media/xoops/images/icons/16/info.png" alt="<{$box.title}>" /> <{$smarty.const._AM_ADV_SUBTITLECHECK}></legend>
+ <div class="bold spacer">
+ <{$smarty.const._AM_ADV_CHECKCONTAMI}>: <a href='<{$uri_contami}>' target='_blank'><{$uri_contami}></a>
+ </div>
+ <br />
+ <div class="bold spacer">
+ <{$smarty.const._AM_ADV_CHECKISOCOM}>: <a href='<{$uri_isocom}>' target='_blank'><{$uri_isocom}></a>
+ </div>
+</fieldset>
\ No newline at end of file
Added: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/protector/templates/admin/protector_center.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/protector/templates/admin/protector_center.html (rev 0)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/protector/templates/admin/protector_center.html 2012-01-08 20:42:02 UTC (rev 8677)
@@ -0,0 +1,112 @@
+<{includeq file="admin:system|admin_navigation.html"}>
+<{includeq file="admin:system|admin_tips.html"}>
+<form name='ConfigForm' action='center.php' method='post'>
+ <{$ticket}>
+ <input type='hidden' name='action' value='update_ips' />
+ <table width="100%" cellspacing="1" cellpadding='4' class="outer">
+ <thead>
+ <tr>
+ <th colspan="2" class="txtcenter"><{$smarty.const._AM_PROTECTOR_PREFIX}></th>
+ </tr>
+ </thead>
+ <tbody>
+ <tr valign='top' align='left'>
+ <td class="txtleft width25 head">
+ <{$smarty.const._AM_TH_BADIPS}>
+ </td>
+ <td class='even'>
+ <textarea name='bad_ips' id='bad_ips' style='width:200px' rows="3" cols="150"><{$bad_ips4disp}></textarea>
+ <br />
+ <{$filepath4badips}>
+ </td>
+ </tr>
+ <tr valign='top' align='left'>
+ <td class="txtleft width25 head">
+ <{$smarty.const._AM_TH_GROUP1IPS}>
+ </td>
+ <td class='even'>
+ <textarea name='group1_ips' id='group1_ips' style='width:200px' rows="3" cols="150"><{$group1_ips4disp}></textarea>
+ <br />
+ <{$filepath4group1ips}>
+ </td>
+ </tr>
+ <tr valign='top' align='left'>
+ <td class='head'> </td>
+ <td class='even'>
+ <input type='submit' value='<{$smarty.const._GO}>' />
+ </td>
+ </tr>
+ </tbody>
+ </table>
+</form>
+
+<form action='center.php' method='get'>
+ <table width="100%" cellspacing="1" cellpadding='4'>
+ <tbody>
+ <tr>
+ <td align='left'>
+ <select name='num' onchange='submit();'><{$num_options}></select>
+ <input type='submit' value='<{$smarty.const._SUBMIT}>' />
+ </td>
+ <td align='right'>
+ <{$nav_html}>
+ </td>
+ </tr>
+ </tbody>
+ </table>
+</form>
+
+<form name='MainForm' action='center.php' method='post'>
+ <{$ticket}>
+ <input type='hidden' name='action' value='' />
+ <table width="100%" cellspacing="1" cellpadding='4' class="outer">
+ <thead>
+ <tr>
+ <th class="txtcenter width2">
+ <input type='checkbox' name='dummy' onclick="with(document.MainForm){for(i=0;i<length;i++){if(elements[i].type=='checkbox'){elements[i].checked=this.checked;}}}" />
+ </th>
+ <th class="txtcenter width10"><{$smarty.const._AM_TH_DATETIME}></th>
+ <th class="txtcenter width10"><{$smarty.const._AM_TH_USER}></th>
+ <th class="txtcenter width10">
+ <{$smarty.const._AM_TH_IP}>
+ <br />
+ <{$smarty.const._AM_TH_AGENT}>
+ </th>
+ <th class="txtcenter width10"><{$smarty.const._AM_TH_TYPE}></th>
+ <th class="txtcenter"><{$smarty.const._AM_TH_DESCRIPTION}></th>
+ </tr>
+ </thead>
+ <tbody>
+ <{foreach item=log from=$log}>
+ <tr class="<{cycle values='even,odd'}>">
+ <td class="txtcenter"><input type='checkbox' name='ids[]' value='<{$log.lid}>' /></td>
+ <td class="txtcenter"><{$log.date}></td>
+ <td class="txtcenter"><{$log.uname}></td>
+ <td class="txtleft"><{$log.ip}>
+ <{$log.ip}>
+ <br />
+ <{$log.agent_desc}>
+ </td>
+ <td class="txtcenter"><{$log.type}></td>
+ <td class="txtleft"><{$log.description}></td>
+ </tr>
+ <{/foreach}>
+ <tr class="odd">
+ <td colspan="6" class="txtleft">
+ <{$smarty.const._AM_LABEL_REMOVE}>
+ <input type='button' value='<{$smarty.const._AM_BUTTON_REMOVE}>' onclick='if(confirm("<{$smarty.const._AM_JS_REMOVECONFIRM}>")){document.MainForm.action.value="delete"; submit();}' />
+ </td>
+ </tr>
+ </tbody>
+ </table>
+ <div align='right'>
+ <{$nav_html}>
+ </div>
+ <br />
+ <br />
+ <div align='right'>
+ <{$smarty.const._AM_LABEL_COMPACTLOG}><input type='button' value='<{$smarty.const._AM_BUTTON_COMPACTLOG}>' onclick='if(confirm("<{$smarty.const._AM_JS_COMPACTLOGCONFIRM}>")){document.MainForm.action.value="compactlog"; submit();}' />
+
+ <{$smarty.const._AM_LABEL_REMOVEALL}><input type='button' value='<{$smarty.const._AM_BUTTON_REMOVEALL}>' onclick='if(confirm("<{$smarty.const._AM_JS_REMOVEALLCONFIRM}>")){document.MainForm.action.value="deleteall"; submit();}' />
+ </div>
+</form>
\ No newline at end of file
Added: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/protector/templates/admin/protector_prefix.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/protector/templates/admin/protector_prefix.html (rev 0)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/protector/templates/admin/protector_prefix.html 2012-01-08 20:42:02 UTC (rev 8677)
@@ -0,0 +1,74 @@
+<{includeq file="admin:system|admin_navigation.html"}>
+<{includeq file="admin:system|admin_tips.html"}>
+<{if $error}>
+ <div class="errorMsg">
+ <{$error}>
+ </div>
+<{/if}>
+
+<{if $aff_table}>
+<table id="xo-advisorylist-sorter" cellspacing="1" class="outer tablesorter">
+ <thead>
+ <tr>
+ <th class="txtcenter width10"><{$smarty.const._AM_PROTECTOR_PREFIX}></th>
+ <th class="txtcenter width5"><{$smarty.const._AM_PROTECTOR_PREFIX_TABLES}></th>
+ <th class="txtcenter"><{$smarty.const._AM_PROTECTOR_PREFIX_UPDATED}></th>
+ <th class="txtcenter width25"><{$smarty.const._AM_PROTECTOR_PREFIX_COPY}></th>
+ <th class="txtcenter width25"><{$smarty.const._AM_PROTECTOR_PREFIX_ACTIONS}></th>
+ </tr>
+ </thead>
+ <tbody>
+ <{foreach item=table from=$table}>
+ <{if $table.del}>
+ <tr class="even">
+ <{else}>
+ <tr class="odd">
+ <{/if}>
+ <td class="txtcenter"><{$table.prefix}></td>
+ <td class="txtcenter"><{$table.count}></td>
+ <td class="txtcenter"><{$table.update}></td>
+ <td class="txtcenter">
+ <form action='prefix_manager.php' method='post' style='margin:0px;'>
+ <{$table.ticket}>
+ <input type='hidden' name='old_prefix' value='<{$table.prefix}>' />
+ <input type='text' name='new_prefix' size='8' maxlength='16' />
+ <input type='submit' name='copy' value='copy' />
+ </form>
+ </td>
+ <td class="txtcenter">
+ <form action='prefix_manager.php' method='post' style='margin:0px;'>
+ <{$table.ticket}>
+ <input type='hidden' name='prefix' value='<{$table.prefix}>' />
+ <{if $table.del}>
+ <input type='submit' name='delete' value='delete' onclick='return confirm("<{$smarty.const._AM_CONFIRM_DELETE}>")' />
+ <{/if}>
+ <input type='submit' name='backup' value='backup' onclick='this.form.target=\"_blank\"' />
+ </form>
+ </td>
+ </tr>
+ <{/foreach}>
+ </tbody>
+</table>
+<{/if}>
+
+<{if $prefix}>
+<fieldset>
+ <legend class="label" title="<{$box.title}>"><img src="<{$xoops_url}>/media/xoops/images/icons/16/info.png" alt="<{$box.title}>" /> <{$smarty.const._AM_PROTECTOR_PREFIX_CHANGEDB}></legend>
+ <div class="spacer">
+ <{$prefix}>
+ </div>
+ <br />
+ <div class="spacer">
+ <{$prefix_line}>
+ </div>
+</fieldset>
+<{/if}>
+
+<{if $protector_logger}>
+<fieldset>
+ <legend class="label" title="<{$box.title}>"><img src="<{$xoops_url}>/media/xoops/images/icons/16/info.png" alt="<{$box.title}>" /> <{$smarty.const._AM_PROTECTOR_PREFIX_LOG}></legend>
+ <div class="spacer">
+ <{$protector_logger}>
+ </div>
+</fieldset>
+<{/if}>
\ No newline at end of file
Added: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/protector/templates/index.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/protector/templates/index.html (rev 0)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/protector/templates/index.html 2012-01-08 20:42:02 UTC (rev 8677)
@@ -0,0 +1 @@
+ <script>history.go(-1);</script>
\ No newline at end of file
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/protector/xoops_version.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/protector/xoops_version.php 2012-01-08 17:26:36 UTC (rev 8676)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/protector/xoops_version.php 2012-01-08 20:42:02 UTC (rev 8677)
@@ -74,6 +74,11 @@
$modversion['adminindex'] = "admin/index.php";
$modversion['adminmenu'] = "admin/menu.php";
+// Admin Templates
+$modversion['templates'][] = array( 'file' => 'protector_advisory.html', 'description' => '', 'type' => 'admin' );
+$modversion['templates'][] = array( 'file' => 'protector_prefix.html', 'description' => '', 'type' => 'admin' );
+$modversion['templates'][] = array( 'file' => 'protector_center.html', 'description' => '', 'type' => 'admin' );
+
/*
Blocks
*/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2012-01-08 17:26:43
|
Revision: 8676
http://xoops.svn.sourceforge.net/xoops/?rev=8676&view=rev
Author: mageg
Date: 2012-01-08 17:26:36 +0000 (Sun, 08 Jan 2012)
Log Message:
-----------
fix html error
Modified Paths:
--------------
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/banners/admin/banners.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/banners/index.php
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/banners/admin/banners.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/banners/admin/banners.php 2012-01-08 13:55:00 UTC (rev 8675)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/banners/admin/banners.php 2012-01-08 17:26:36 UTC (rev 8676)
@@ -106,13 +106,11 @@
if ($htmlbanner) {
$img .= html_entity_decode($htmlcode);
} else {
- $img = '<div id="xo-bannerfix">';
if (stristr($imageurl, '.swf')) {
$img .= '<object type="application/x-shockwave-flash" width="468" height="60" data="' . $imageurl . '" style="z-index:100;">' . '<param name="movie" value="' . $imageurl . '" />' . '<param name="wmode" value="opaque" />' . '</object>';
} else {
$img .= '<img src="' . $imageurl . '" alt="" />';
}
- $img .= '</div>';
}
$banner['bid'] = $banner_arr[$i]->getVar("bid");
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/banners/index.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/banners/index.php 2012-01-08 13:55:00 UTC (rev 8675)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/banners/index.php 2012-01-08 17:26:36 UTC (rev 8676)
@@ -146,7 +146,11 @@
$banner['imageurl'] = $img;
$banner['name'] = $client_name;
$banner['uid'] = $client_uid;
- $banner['clickurl'] = $banner_arr[$i]->getVar("clickurl");
+ if ($banner_arr[$i]->getVar("clickurl") == '') {
+ $banner['clickurl'] = '#';
+ } else {
+ $banner['clickurl'] = $banner_arr[$i]->getVar("clickurl");
+ }
$xoops->tpl->append_by_ref('banner', $banner);
$xoops->tpl->append_by_ref('popup_banner', $banner);
unset($banner);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <wis...@us...> - 2012-01-08 13:55:06
|
Revision: 8675
http://xoops.svn.sourceforge.net/xoops/?rev=8675&view=rev
Author: wishcraft
Date: 2012-01-08 13:55:00 +0000 (Sun, 08 Jan 2012)
Log Message:
-----------
XPayment 1.42 - Warnings & Notices (Requested Mamba) - See changelog.txt
Modified Paths:
--------------
XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/xoops_version.php
Modified: XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/xoops_version.php
===================================================================
--- XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/xoops_version.php 2012-01-08 13:47:02 UTC (rev 8674)
+++ XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/xoops_version.php 2012-01-08 13:55:00 UTC (rev 8675)
@@ -238,7 +238,7 @@
$modversion['config'][$i]['valuetype'] = 'int';
$criteria = new Criteria('group_type', _XPY_MI_GROUP_TYPE_BROKER);
$group = $groups_handler->getObjects($criteria);
-if (is_object($group[0]))
+if (isset($group[0]))
$modversion['config'][$i]['default'] = $group[0]->getVar('groupid');
$i++;
@@ -249,7 +249,7 @@
$modversion['config'][$i]['valuetype'] = 'int';
$criteria = new Criteria('group_type', _XPY_MI_GROUP_TYPE_ACCOUNTS);
$group = $groups_handler->getObjects($criteria);
-if (is_object($group[0]))
+if (isset($group[0]))
$modversion['config'][$i]['default'] = $group[0]->getVar('groupid');
$i++;
@@ -260,7 +260,7 @@
$modversion['config'][$i]['valuetype'] = 'int';
$criteria = new Criteria('group_type', _XPY_MI_GROUP_TYPE_OFFICER);
$group = $groups_handler->getObjects($criteria);
-if (is_object($group[0]))
+if (isset($group[0]))
$modversion['config'][$i]['default'] = $group[0]->getVar('groupid');
$i++;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <wis...@us...> - 2012-01-08 13:47:09
|
Revision: 8674
http://xoops.svn.sourceforge.net/xoops/?rev=8674&view=rev
Author: wishcraft
Date: 2012-01-08 13:47:02 +0000 (Sun, 08 Jan 2012)
Log Message:
-----------
XPayment 1.42 - Warnings & Notices (Requested Mamba) - See changelog.txt
Modified Paths:
--------------
XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/admin/index.php
XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/docs/changelog.txt
XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/header.php
XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/index.php
XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/language/english/admin.php
XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/language/english/main.php
XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/xoops_version.php
Modified: XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/admin/index.php
===================================================================
--- XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/admin/index.php 2012-01-08 13:22:31 UTC (rev 8673)
+++ XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/admin/index.php 2012-01-08 13:47:02 UTC (rev 8674)
@@ -1022,7 +1022,7 @@
$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">'.constant('_AM_SPIDERS_ABOUT_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>',
+ 1 => '<table class="outer" cellspacing="1" width="100%"><tbody><tr><th colspan="2">'.constant('_XPY_AM_MAKE_DONATION').'</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>', 'D'=>'',
3 => '',
4 => '<!-- Start Form Validation JavaScript //-->
@@ -1042,7 +1042,7 @@
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['spidersModule']->getVar('dirname')), strtoupper($GLOBALS['spidersModule']->getVar('dirname')). ' '.$GLOBALS['spidersModule']->getVar('name'));
+ $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['xpaymentModule']->getVar('dirname')), strtoupper($GLOBALS['xpaymentModule']->getVar('dirname')). ' '.$GLOBALS['xpaymentModule']->getVar('name'));
break;
}
}
Modified: XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/docs/changelog.txt
===================================================================
--- XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/docs/changelog.txt 2012-01-08 13:22:31 UTC (rev 8673)
+++ XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/docs/changelog.txt 2012-01-08 13:47:02 UTC (rev 8674)
@@ -1,5 +1,5 @@
========================================
- 2012/01/08 22:10:00 Version 1.42 STABLE
+ 2012/01/09 00:45:00 Version 1.42 STABLE
========================================
- Changed $GLOBALS['xoopsModule'] in module renamed to $GLOBALS['xpaymentModule'] /class/gateway, /class, /include, / (Wishcraft)
- Changed $GLOBALS['xoopsModuleConfig'] in module renamed to $GLOBALS['xpaymentModuleConfig'] /class/gateway, /class, /include, / (Wishcraft)
@@ -8,6 +8,7 @@
- Changed /xoops_version.php Manual transaction prefix code for invoice (Wishcraft)
- Changed /language/english/modinfo.php Manual transaction prefix code for invoice Preferences text (Wishcraft)
- Changed /templates/xpayment_payment.php Distinction between payment types with border & manual transaction prefix to invoice number (Wishcraft)
+ - Fixed Warnings & Notices (Requested by Mamba) (Wishcraft)
========================================
2012/01/05 8:59:00 Version 1.41 STABLE
Modified: XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/header.php
===================================================================
--- XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/header.php 2012-01-08 13:22:31 UTC (rev 8673)
+++ XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/header.php 2012-01-08 13:47:02 UTC (rev 8674)
@@ -28,7 +28,7 @@
include_once $GLOBALS['xoops']->path('/modules/xpayment/include/xpayment.forms.php');
xoops_load('pagenav');
- xoops_load('xoopsmailer');
+ xoops_load('xoopsmultimailer');
$GLOBALS['myts'] = MyTextSanitizer::getInstance();
@@ -39,6 +39,6 @@
include_once $GLOBALS['xoops']->path( "/class/template.php" );
$GLOBALS['xoopsTpl'] = new XoopsTpl();
+ $iid = 0;
-
?>
\ No newline at end of file
Modified: XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/index.php
===================================================================
--- XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/index.php 2012-01-08 13:22:31 UTC (rev 8673)
+++ XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/index.php 2012-01-08 13:47:02 UTC (rev 8674)
@@ -222,7 +222,7 @@
} elseif (isset($_GET['invoicenum'])&&$GLOBALS['xpaymentModuleConfig']['id_protect']==false) {
$invoice =& $invoice_handler->getInvoiceNumber($_GET['invoicenum']);
} else {
- $key = $_GET['iid'];
+ $key = (isset($_GET['iid'])?$_GET['iid']:0);
$criteria = new Criteria('offline', time(), '>=');
$criteria->setSort('iid');
$criteria->setOrder('DESC');
@@ -235,7 +235,7 @@
}
}
- if (!is_object($invoice)) {
+ if (!isset($invoice)) {
if ($GLOBALS['xpaymentModuleConfig']['htaccess']==true)
$url = XOOPS_URL.'/'.$GLOBALS['xpaymentModuleConfig']['baseurl'].'/index'.$GLOBALS['xpaymentModuleConfig']['endofurl'];
Modified: XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/language/english/admin.php
===================================================================
--- XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/language/english/admin.php 2012-01-08 13:22:31 UTC (rev 8673)
+++ XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/language/english/admin.php 2012-01-08 13:47:02 UTC (rev 8674)
@@ -61,13 +61,11 @@
define('_XPY_AM_TH_CREATED', 'Created');
define('_XPY_AM_TH_UPDATED', 'Updated');
define('_XPY_AM_TH_ACTIONED', 'Made');
- define('_XPY_AM_TH_PLUGIN', 'Plugin');
define('_XPY_AM_TH_UID', 'User');
define('_XPY_AM_TH_LIMIT', 'Limited');
define('_XPY_AM_TH_MINIMUM', 'Minimum Amount');
define('_XPY_AM_TH_MAXIMUM', 'Maximum Amount');
define('_XPY_AM_TH_REMITTION', 'Remittion');
- define('_XPY_MSG_INVOICE_PAID', 'Invoice Marked Paid!');
define('_XPY_AM_PAID', 'Amount Paid');
define('_XPY_AM_ADDRULE', 'Add/Edit Group Rule');
define('_XPY_AM_GROUP_FCT', 'Select Group');
@@ -188,7 +186,6 @@
define('_XPY_AM_TOTALWEIGHT_TH', 'Total Weight');
define('_XPY_AM_UNITWEIGHT_TH', 'Unit Weight');
define('_XPY_AM_GRANDAMOUUNT_TH', 'Grand Sum');
- define('_XPY_AM_TOTALAMOUUNT_TH', 'Total Amount');
define('_XPY_AM_TOTALSHIPPING_TH', 'Total Shipping');
define('_XPY_AM_TOTALHANDLING_TH', 'Total Handling');
define('_XPY_AM_TOTALTAX_TH', 'Total Tax');
@@ -313,7 +310,6 @@
define('_XPY_MSG_TAX_SAVED', 'Tax rates in current list saved!');
//Tax List
- define('_XPY_AM_TH_COUNTRY', 'Country Name');
define('_XPY_AM_TH_CODE', 'Code');
define('_XPY_AM_TH_RATE', 'Perentile Tax Rate');
define('_XPY_AM_TAX_H1', 'Automatic Tax Rates');
@@ -329,14 +325,10 @@
// Table Headers
define('_XPY_AM_TH_DID', 'Discount ID');
- define('_XPY_AM_TH_UID', 'User');
- define('_XPY_AM_TH_EMAIL', 'Email');
define('_XPY_AM_TH_VALIDTILL', 'Valid Till');
define('_XPY_AM_TH_REDEEMS', 'Redeems');
define('_XPY_AM_TH_DISCOUNT', 'Discount');
define('_XPY_AM_TH_REDEEMED', 'Redeemed');
- define('_XPY_AM_TH_CREATED', 'Created');
- define('_XPY_AM_TH_UPDATED', 'Updated');
define('_XPY_AM_TH_DISCOUNT_AMOUNT', 'Discount Amount');
//Permissions
@@ -519,4 +511,7 @@
// Emails
define('_XPY_EMAIL_REMINDER_SUBJECT','Reminder of a Generated Invoice for %s %s drawn to %s!');
+
+ // Version 1.42
+ define('_XPY_AM_MAKE_DONATION', 'Make XPayment Grand - Make a donation Today!');
?>
\ No newline at end of file
Modified: XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/language/english/main.php
===================================================================
--- XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/language/english/main.php 2012-01-08 13:22:31 UTC (rev 8673)
+++ XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/language/english/main.php 2012-01-08 13:47:02 UTC (rev 8674)
@@ -65,7 +65,6 @@
define('_XPY_MF_TOTALWEIGHT_TH', 'Total Weight');
define('_XPY_MF_UNITWEIGHT_TH', 'Unit Weight');
define('_XPY_MF_GRANDAMOUUNT_TH', 'Grand Sum');
- define('_XPY_MF_TOTALAMOUUNT_TH', 'Total Amount');
define('_XPY_MF_TOTALSHIPPING_TH', 'Total Shipping');
define('_XPY_MF_TOTALHANDLING_TH', 'Total Handling');
define('_XPY_MF_TOTALTAX_TH', 'Total Tax');
@@ -108,7 +107,6 @@
define('_XPY_MF_TH_MINIMUM', 'Minimum Amount');
define('_XPY_MF_TH_MAXIMUM', 'Maximum Amount');
define('_XPY_MF_TH_REMITTION', 'Remittion');
- define('_XPY_MF_PAID', 'Amount Paid');
define('_XPY_MF_ADDRULE', 'Add/Edit Group Rule');
define('_XPY_MF_GROUP_FCT', 'Select Group');
define('_XPY_MF_EDITGROUP', 'Edit Rule');
@@ -147,7 +145,6 @@
define('_XPY_MF_STATUS', 'Status');
define('_XPY_MF_DATE', 'Date');
define('_XPY_MF_GROSS', 'Gross');
- define('_XPY_MF_FEE', 'Fee');
define('_XPY_MF_SETTLE', 'Settlement');
define('_XPY_MF_EXCHANGERATE', 'Exchange Rate');
define('_XPY_MF_FIRSTNAME', 'Firstname');
@@ -255,20 +252,15 @@
define('_XPY_PDF_MF_TOTALWEIGHT_TH', 'Total Weight');
define('_XPY_PDF_MF_UNITWEIGHT_TH', 'Unit Weight');
define('_XPY_PDF_MF_TOTALTAX_TH', 'Tax Paid');
- define('_XPY_PDF_MF_TOTALWEIGHT_TH', 'Total Weight');
- define('_XPY_PDF_MF_UNITWEIGHT_TH', 'Unit Weight');
define('_XPY_PDF_MF_GRANDAMOUUNT_TH', 'Grand Sum');
- define('_XPY_PDF_MF_TOTALAMOUUNT_TH', 'Total Amount');
define('_XPY_PDF_MF_TOTALSHIPPING_TH', 'Total Shipping');
define('_XPY_PDF_MF_TOTALHANDLING_TH', 'Total Handling');
- define('_XPY_PDF_MF_TOTALTAX_TH', 'Total Tax');
define('_XPY_PDF_MF_BREAKDOWN_H2', 'Invoice Breakdown on Charges');
define('_XPY_PDF_MF_BREAKDOWN_P', 'This is the invoice break down on shipping, handling, taxes and totals.');
define('_XPY_PDF_MF_BREAKDOWN_H2B', 'Totals Breakdown on Charges');
define('_XPY_PDF_MF_BREAKDOWN_PB','This is the invoice continuing to break down in totals.');
define('_XPY_PDF_MF_GRANDAMOUNT', 'Total Grand Amount:');
define('_XPY_PDF_MF_PAID', 'Amount Paid');
- define('_XPY_PDF_MF_DONATION', 'Donation');
define('_XPY_PDF_MF_DUE', 'Invoice Due');
define('_XPY_PDF_MF_COLLECT', 'Invoice Collect on');
define('_XPY_PDF_MF_WAIT', 'Invoice Wait');
Modified: XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/xoops_version.php
===================================================================
--- XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/xoops_version.php 2012-01-08 13:22:31 UTC (rev 8673)
+++ XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/xoops_version.php 2012-01-08 13:47:02 UTC (rev 8674)
@@ -30,7 +30,7 @@
$modversion['dirname'] = basename(dirname(__FILE__));
$modversion['name'] = ucfirst(basename(dirname(__FILE__)));
$modversion['version'] = "1.42";
-$modversion['releasedate'] = "2012-01-08";
+$modversion['releasedate'] = "2012-01-09";
$modversion['module_status']= "Stable";
$modversion['description'] = _MI_XPY_DESC;
$modversion['credits'] = _MI_XPY_CREDITS;
@@ -45,9 +45,9 @@
$modversion['icons16'] = 'Frameworks/moduleclasses/icons/16';
$modversion['icons32'] = 'Frameworks/moduleclasses/icons/32';
-$modversion['release_info'] = "Stable 2012/01/08";
+$modversion['release_info'] = "Stable 2012/01/09";
$modversion['release_file'] = XOOPS_URL."/modules/xpayment/docs/changelog.txt";
-$modversion['release_date'] = "2012/01/08";
+$modversion['release_date'] = "2012/01/09";
$modversion['author_realname'] = "Simon Antony Roberts";
$modversion['author_website_url'] = "http://www.chronolabs.org.au";
@@ -274,7 +274,7 @@
BSB: 0000000<br/>
ACCOUNT: 0000000<br/>
NAME: John Doe';
-
+$prefix = '';
foreach(explode(' ', $GLOBALS['xoopsConfig']['sitename']) as $word) {
$prefix .= strtoupper(substr($word,0,1));
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vo...@us...> - 2012-01-08 13:22:37
|
Revision: 8673
http://xoops.svn.sourceforge.net/xoops/?rev=8673&view=rev
Author: voltan1
Date: 2012-01-08 13:22:31 +0000 (Sun, 08 Jan 2012)
Log Message:
-----------
Set days for content hits
Modified Paths:
--------------
XoopsModules/fmcontent/branches/news/blocks/list.php
XoopsModules/fmcontent/branches/news/class/story.php
XoopsModules/fmcontent/branches/news/language/arabic/blocks.php
XoopsModules/fmcontent/branches/news/language/english/blocks.php
XoopsModules/fmcontent/branches/news/language/persian/blocks.php
XoopsModules/fmcontent/branches/news/xoops_version.php
Modified: XoopsModules/fmcontent/branches/news/blocks/list.php
===================================================================
--- XoopsModules/fmcontent/branches/news/blocks/list.php 2012-01-08 12:55:37 UTC (rev 8672)
+++ XoopsModules/fmcontent/branches/news/blocks/list.php 2012-01-08 13:22:31 UTC (rev 8673)
@@ -46,6 +46,7 @@
$story_infos['story_order'] = $options[10];
$block['showmore'] = $options[11];
$block['morelink'] = $options[12];
+ $day = $options[13];
array_shift($options);
array_shift($options);
@@ -59,11 +60,24 @@
array_shift($options);
array_shift($options);
array_shift($options);
+ array_shift($options);
array_shift($options);
$NewsModule = $module_handler->getByDirname($NewsModule);
+
+ if($story_infos['story_sort'] == 'story_hits') {
+ if($day) {
+ $day = 86400 * $day;
+ $publish = time() - $day;
+ } else {
+ $publish = 0;
+ }
+ } else {
+ $publish = 0;
+ }
-
+ $story_infos['story_publish'] = $publish;
+
$options0 = $options[0];
$story_infos ['topics'] = $topic_handler->getall ();
$contents = $story_handler->News_GetContentBlockList($NewsModule, $story_infos ,$options);
@@ -154,8 +168,8 @@
$story_sort->addOption("story_update", _NEWS_MI_SHOWSORT_3);
$story_sort->addOption("story_title", _NEWS_MI_SHOWSORT_4);
$story_sort->addOption("story_order", _NEWS_MI_SHOWSORT_5);
- $story_sort->addOption("RAND()", _NEWS_MI_SHOWSORT_6);
- $story_sort->addOption("story_hits", _NEWS_MI_SHOWSORT_7);
+ $story_sort->addOption("story_hits", _NEWS_MI_SHOWSORT_7);
+ $story_sort->addOption("RAND()", _NEWS_MI_SHOWSORT_6);
$form .= _NEWS_MI_SHOWSORT . " : " . $story_sort->render() . '<br />';
$form .= _NEWS_MB_WIDTH . " : <input name=\"options[8]\" size=\"5\" maxlength=\"255\" value=\"" . $options[8] . "\" type=\"text\" /><br />\n";
@@ -181,6 +195,7 @@
$form .= "<input name=\"options[11]\" value=\"0\" type=\"radio\" " . $checked_no . "/>" . _NO . "<br />\n";
$form .= _NEWS_MB_MORELINK . " : <input name=\"options[12]\" size=\"50\" maxlength=\"255\" value=\"" . $options[12] . "\" type=\"text\" /><br />\n";
+ $form .= _NEWS_MB_HITINDAY1 . " <input name=\"options[13]\" size=\"5\" maxlength=\"255\" value=\"" . $options[13] . "\" type=\"text\" />" . _NEWS_MB_HITINDAY2 . "<br />\n";
array_shift($options);
array_shift($options);
@@ -194,6 +209,7 @@
array_shift($options);
array_shift($options);
array_shift($options);
+ array_shift($options);
array_shift($options);
$form .= "<br />" . _NEWS_MB_TOPICDISPLAY . "<br /><select name=\"options[]\" multiple=\"multiple\" size=\"5\">\n";
Modified: XoopsModules/fmcontent/branches/news/class/story.php
===================================================================
--- XoopsModules/fmcontent/branches/news/class/story.php 2012-01-08 12:55:37 UTC (rev 8672)
+++ XoopsModules/fmcontent/branches/news/class/story.php 2012-01-08 13:22:31 UTC (rev 8673)
@@ -580,7 +580,7 @@
$criteria->add ( new Criteria ( 'story_topic', '(' . implode ( ',', $topiclist ) . ')', 'IN' ) );
$criteria->add ( new Criteria ( 'story_modid', $NewsModule->getVar ( 'mid' ) ) );
$criteria->add ( new Criteria ( 'story_status', '1' ) );
- $criteria->add ( new Criteria ( 'story_publish', 0 , '>' ));
+ $criteria->add ( new Criteria ( 'story_publish', $story_infos['story_publish'] , '>' ));
$criteria->add ( new Criteria ( 'story_publish', time() , '<=' ));
$criteria->add ( new Criteria ( 'story_expire', 0 ));
$criteria->add ( new Criteria ( 'story_expire', time() , '>' ) ,'OR');
Modified: XoopsModules/fmcontent/branches/news/language/arabic/blocks.php
===================================================================
--- XoopsModules/fmcontent/branches/news/language/arabic/blocks.php 2012-01-08 12:55:37 UTC (rev 8672)
+++ XoopsModules/fmcontent/branches/news/language/arabic/blocks.php 2012-01-08 13:22:31 UTC (rev 8673)
@@ -32,5 +32,7 @@
define("_NEWS_MB_COUNT", "Show news count");
define("_NEWS_MB_TOPIC_NAME", "Title");
define("_NEWS_MB_TOPIC_IMG", "image");
+ define("_NEWS_MB_HITINDAY1", "Show news since");
+ define("_NEWS_MB_HITINDAY2", "Day's ago. This option work when you sort news by hit");
}
?>
\ No newline at end of file
Modified: XoopsModules/fmcontent/branches/news/language/english/blocks.php
===================================================================
--- XoopsModules/fmcontent/branches/news/language/english/blocks.php 2012-01-08 12:55:37 UTC (rev 8672)
+++ XoopsModules/fmcontent/branches/news/language/english/blocks.php 2012-01-08 13:22:31 UTC (rev 8673)
@@ -32,5 +32,7 @@
define("_NEWS_MB_COUNT", "Show news count");
define("_NEWS_MB_TOPIC_NAME", "Title");
define("_NEWS_MB_TOPIC_IMG", "image");
+ define("_NEWS_MB_HITINDAY1", "Show news since");
+ define("_NEWS_MB_HITINDAY2", "Day's ago. This option work when you sort news by hit");
}
?>
\ No newline at end of file
Modified: XoopsModules/fmcontent/branches/news/language/persian/blocks.php
===================================================================
--- XoopsModules/fmcontent/branches/news/language/persian/blocks.php 2012-01-08 12:55:37 UTC (rev 8672)
+++ XoopsModules/fmcontent/branches/news/language/persian/blocks.php 2012-01-08 13:22:31 UTC (rev 8673)
@@ -32,5 +32,7 @@
define("_NEWS_MB_COUNT", "Show news count");
define("_NEWS_MB_TOPIC_NAME", "Title");
define("_NEWS_MB_TOPIC_IMG", "image");
+ define("_NEWS_MB_HITINDAY1", "Show news since");
+ define("_NEWS_MB_HITINDAY2", "Day's ago. This option work when you sort news by hit");
}
?>
\ No newline at end of file
Modified: XoopsModules/fmcontent/branches/news/xoops_version.php
===================================================================
--- XoopsModules/fmcontent/branches/news/xoops_version.php 2012-01-08 12:55:37 UTC (rev 8672)
+++ XoopsModules/fmcontent/branches/news/xoops_version.php 2012-01-08 13:22:31 UTC (rev 8673)
@@ -75,11 +75,12 @@
$modversion["search"]["file"] = "include/search.inc.php";
$modversion["search"]["func"] = "news_search";
-// Commentaires
-$modversion['comments']['itemName'] = 'storyid';
-$modversion['comments']['pageName'] = 'article.php';
-$modversion['comments']['callbackFile'] = 'include/comment_functions.php';
-$modversion['comments']['callback']['approve'] = 'news_com_approve';
+// Comments
+$modversion['comments']['pageName'] = 'article.php';
+$modversion['comments']['itemName'] = 'storyid';
+// Comment callback functions
+$modversion['comments']['callbackFile'] = 'include/comment_functions.php';
+$modversion['comments']['callback']['approve'] = 'news_com_approve';
$modversion['comments']['callback']['update'] = 'news_com_update';
// Templates
@@ -119,7 +120,7 @@
'description' => '',
'show_func' => 'news_list_show',
'edit_func' => 'news_list_edit',
- 'options' => $modversion['dirname'] . '|news|10|100|1|1|1|story_publish|180|left|DESC|0|'. XOOPS_URL.'|0',
+ 'options' => $modversion['dirname'] . '|news|10|100|1|1|1|story_publish|180|left|DESC|0|'. XOOPS_URL.'|0|0',
'template' => 'news_block_list.html');
$modversion['blocks'][] = array(
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <wis...@us...> - 2012-01-08 12:55:44
|
Revision: 8672
http://xoops.svn.sourceforge.net/xoops/?rev=8672&view=rev
Author: wishcraft
Date: 2012-01-08 12:55:37 +0000 (Sun, 08 Jan 2012)
Log Message:
-----------
XPayment 1.42 - Minor fix to email validation in discount codes - See changelog.txt
Modified Paths:
--------------
XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/admin/index.php
Modified: XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/admin/index.php
===================================================================
--- XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/admin/index.php 2012-01-08 12:25:32 UTC (rev 8671)
+++ XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/admin/index.php 2012-01-08 12:55:37 UTC (rev 8672)
@@ -275,7 +275,7 @@
foreach($discounts as $iid => $discount) {
$GLOBALS['xoopsTpl']->append('discounts', $discount->toArray());
}
- loadModuleAdminMenu(8);
+ loadModuleAdminMenu(7);
$GLOBALS['xoopsTpl']->display('db:xpayment_cpanel_discounts_list.html');
break;
case "create":
@@ -293,7 +293,7 @@
$prefix = str_replace(' ', '', $prefix);
$discount_handler =& xoops_getmodulehandler('discounts', 'xpayment');
foreach(explode("|", $emails) as $email) {
- if(eregi("^[_a-z0-9-]+(\.[_a-z0-9-]+)*@[a-z0-9-]+(\.[a-z0-9-]+)*(\.[a-z]{2,3})$", $email)) {
+ if(eregi("^[_a-z0-9-]+(\.[_a-z0-9-]+)*@[a-z0-9-]+(\.[a-z0-9-]+)*(\.[a-z0-9-]+)$", $email)) {
if (!$dis = $discount_handler->getByEmail($email)) {
if ($discount_handler->sendDiscountCode($email, ($validtill_infinte==true?0:strtotime($validtill['date'])+$validtill['time']), intval($redeems), (float)$discount, $prefix, 0))
$created++;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <wis...@us...> - 2012-01-08 12:25:43
|
Revision: 8671
http://xoops.svn.sourceforge.net/xoops/?rev=8671&view=rev
Author: wishcraft
Date: 2012-01-08 12:25:32 +0000 (Sun, 08 Jan 2012)
Log Message:
-----------
XPayment 1.42 - Minor fix to accepting discount in realtime submission of invoice. Minor changes to templates, manual payment prefix - See changelog.txt
Added Paths:
-----------
XoopsModules/xpayment/releases/1.42/
XoopsModules/xpayment/releases/1.42/docs/
XoopsModules/xpayment/releases/1.42/docs/.htaccess.dist
XoopsModules/xpayment/releases/1.42/docs/licence.txt
XoopsModules/xpayment/releases/1.42/htdocs/
XoopsModules/xpayment/releases/1.42/htdocs/Frameworks/
XoopsModules/xpayment/releases/1.42/htdocs/Frameworks/moduleclasses/
XoopsModules/xpayment/releases/1.42/htdocs/Frameworks/moduleclasses/icons/
XoopsModules/xpayment/releases/1.42/htdocs/Frameworks/moduleclasses/icons/16/
XoopsModules/xpayment/releases/1.42/htdocs/Frameworks/moduleclasses/icons/16/xpayment.discounts.png
XoopsModules/xpayment/releases/1.42/htdocs/Frameworks/moduleclasses/icons/16/xpayment.gateways.png
XoopsModules/xpayment/releases/1.42/htdocs/Frameworks/moduleclasses/icons/16/xpayment.groups.png
XoopsModules/xpayment/releases/1.42/htdocs/Frameworks/moduleclasses/icons/16/xpayment.invoices.png
XoopsModules/xpayment/releases/1.42/htdocs/Frameworks/moduleclasses/icons/16/xpayment.permissions.png
XoopsModules/xpayment/releases/1.42/htdocs/Frameworks/moduleclasses/icons/16/xpayment.taxes.png
XoopsModules/xpayment/releases/1.42/htdocs/Frameworks/moduleclasses/icons/16/xpayment.transactions.png
XoopsModules/xpayment/releases/1.42/htdocs/Frameworks/moduleclasses/icons/32/
XoopsModules/xpayment/releases/1.42/htdocs/Frameworks/moduleclasses/icons/32/xpayment.discounts.png
XoopsModules/xpayment/releases/1.42/htdocs/Frameworks/moduleclasses/icons/32/xpayment.gateways.png
XoopsModules/xpayment/releases/1.42/htdocs/Frameworks/moduleclasses/icons/32/xpayment.groups.png
XoopsModules/xpayment/releases/1.42/htdocs/Frameworks/moduleclasses/icons/32/xpayment.invoices.png
XoopsModules/xpayment/releases/1.42/htdocs/Frameworks/moduleclasses/icons/32/xpayment.permissions.png
XoopsModules/xpayment/releases/1.42/htdocs/Frameworks/moduleclasses/icons/32/xpayment.taxes.png
XoopsModules/xpayment/releases/1.42/htdocs/Frameworks/moduleclasses/icons/32/xpayment.transactions.png
XoopsModules/xpayment/releases/1.42/htdocs/Frameworks/tcpdf/
XoopsModules/xpayment/releases/1.42/htdocs/ZombaioGW_1_1.php
XoopsModules/xpayment/releases/1.42/htdocs/modules/
XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/
XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/accounts.php
XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/admin/
XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/admin/header.php
XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/admin/index.php
XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/admin/menu.php
XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/broker.php
XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/cancel.php
XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/class/
XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/class/autotax.php
XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/class/discounts.php
XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/class/gateway/
XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/class/gateway/ccbill/
XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/class/gateway/ccbill/ccbill.php
XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/class/gateway/ccbill/gateway_info.php
XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/class/gateway/ccbill/index.html
XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/class/gateway/index.html
XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/class/gateway/paypal/
XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/class/gateway/paypal/gateway_info.php
XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/class/gateway/paypal/index.html
XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/class/gateway/paypal/paypal.php
XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/class/gateway/twocheckout/
XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/class/gateway/twocheckout/gateway_info.php
XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/class/gateway/twocheckout/index.html
XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/class/gateway/twocheckout/twocheckout.php
XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/class/gateway/zombaio/
XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/class/gateway/zombaio/gateway_info.php
XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/class/gateway/zombaio/index.html
XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/class/gateway/zombaio/zombaio.php
XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/class/gateways.php
XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/class/gateways_options.php
XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/class/groups.php
XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/class/index.html
XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/class/invoice.php
XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/class/invoice_items.php
XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/class/invoice_transactions.php
XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/class/ip2locationlite.class.php
XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/crons/
XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/crons/actions.php
XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/docs/
XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/docs/changelog.txt
XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/docs/credits.txt
XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/docs/index.html
XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/docs/install.txt
XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/docs/lang_diff.txt
XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/docs/licence.txt
XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/docs/readme.txt
XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/dojsongateway.php
XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/error_log
XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/header.php
XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/images/
XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/images/index.html
XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/images/pdf.png
XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/images/xpayment_slogo.png
XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/include/
XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/include/JSON.php
XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/include/formselectgateway.php
XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/include/formselectinvoicemode.php
XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/include/formselectinvoiceremittion.php
XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/include/formselectplugin.php
XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/include/formselectuser.php
XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/include/index.html
XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/include/install.php
XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/include/onupdate.php
XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/include/uninstall.php
XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/include/xpayment.forms.php
XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/include/xpayment.functions.php
XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/include/xpayment.objects.php
XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/index.php
XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/ipn.php
XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/js/
XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/js/index.html
XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/js/jquery.json.gateway.js
XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/language/
XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/language/english/
XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/language/english/admin.php
XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/language/english/block.php
XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/language/english/ccbill.php
XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/language/english/help/
XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/language/english/help/help.html
XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/language/english/help/index.html
XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/language/english/index.html
XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/language/english/mail_templates/
XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/language/english/mail_templates/index.html
XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/language/english/mail_templates/xpayment_discount_more.tpl
XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/language/english/mail_templates/xpayment_discount_new.tpl
XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/language/english/mail_templates/xpayment_discount_reminder.tpl
XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/language/english/mail_templates/xpayment_invoice_canceled.tpl
XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/language/english/mail_templates/xpayment_invoice_canceled_collect.tpl
XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/language/english/mail_templates/xpayment_invoice_canceled_damaged.tpl
XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/language/english/mail_templates/xpayment_invoice_canceled_discounted.tpl
XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/language/english/mail_templates/xpayment_invoice_canceled_express.tpl
XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/language/english/mail_templates/xpayment_invoice_canceled_fraud.tpl
XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/language/english/mail_templates/xpayment_invoice_canceled_none.tpl
XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/language/english/mail_templates/xpayment_invoice_canceled_notice.tpl
XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/language/english/mail_templates/xpayment_invoice_canceled_pending.tpl
XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/language/english/mail_templates/xpayment_invoice_canceled_purchased.tpl
XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/language/english/mail_templates/xpayment_invoice_canceled_refunded.tpl
XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/language/english/mail_templates/xpayment_invoice_canceled_settled.tpl
XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/language/english/mail_templates/xpayment_invoice_canceled_undelivered.tpl
XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/language/english/mail_templates/xpayment_invoice_created.tpl
XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/language/english/mail_templates/xpayment_invoice_paid.tpl
XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/language/english/mail_templates/xpayment_invoice_paid_collect.tpl
XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/language/english/mail_templates/xpayment_invoice_paid_damaged.tpl
XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/language/english/mail_templates/xpayment_invoice_paid_discounted.tpl
XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/language/english/mail_templates/xpayment_invoice_paid_express.tpl
XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/language/english/mail_templates/xpayment_invoice_paid_fraud.tpl
XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/language/english/mail_templates/xpayment_invoice_paid_none.tpl
XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/language/english/mail_templates/xpayment_invoice_paid_notice.tpl
XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/language/english/mail_templates/xpayment_invoice_paid_pending.tpl
XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/language/english/mail_templates/xpayment_invoice_paid_purchased.tpl
XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/language/english/mail_templates/xpayment_invoice_paid_refunded.tpl
XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/language/english/mail_templates/xpayment_invoice_paid_settled.tpl
XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/language/english/mail_templates/xpayment_invoice_paid_undelieved.tpl
XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/language/english/mail_templates/xpayment_invoice_reminder.tpl
XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/language/english/mail_templates/xpayment_invoice_transaction_canceled_notice.tpl
XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/language/english/mail_templates/xpayment_invoice_transaction_canceled_other.tpl
XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/language/english/mail_templates/xpayment_invoice_transaction_canceled_payment.tpl
XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/language/english/mail_templates/xpayment_invoice_transaction_canceled_pending.tpl
XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/language/english/mail_templates/xpayment_invoice_transaction_canceled_refund.tpl
XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/language/english/mail_templates/xpayment_invoice_transaction_paid_notice.tpl
XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/language/english/mail_templates/xpayment_invoice_transaction_paid_other.tpl
XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/language/english/mail_templates/xpayment_invoice_transaction_paid_payment.tpl
XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/language/english/mail_templates/xpayment_invoice_transaction_paid_pending.tpl
XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/language/english/mail_templates/xpayment_invoice_transaction_paid_refund.tpl
XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/language/english/mail_templates/xpayment_invoice_transaction_unpaid_notice.tpl
XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/language/english/mail_templates/xpayment_invoice_transaction_unpaid_other.tpl
XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/language/english/mail_templates/xpayment_invoice_transaction_unpaid_payment.tpl
XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/language/english/mail_templates/xpayment_invoice_transaction_unpaid_pending.tpl
XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/language/english/mail_templates/xpayment_invoice_transaction_unpaid_refund.tpl
XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/language/english/mail_templates/xpayment_invoice_unpaid.tpl
XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/language/english/mail_templates/xpayment_invoice_unpaid_collect.tpl
XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/language/english/mail_templates/xpayment_invoice_unpaid_damaged.tpl
XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/language/english/mail_templates/xpayment_invoice_unpaid_discounted.tpl
XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/language/english/mail_templates/xpayment_invoice_unpaid_express.tpl
XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/language/english/mail_templates/xpayment_invoice_unpaid_fraud.tpl
XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/language/english/mail_templates/xpayment_invoice_unpaid_none.tpl
XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/language/english/mail_templates/xpayment_invoice_unpaid_notice.tpl
XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/language/english/mail_templates/xpayment_invoice_unpaid_pending.tpl
XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/language/english/mail_templates/xpayment_invoice_unpaid_purchased.tpl
XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/language/english/mail_templates/xpayment_invoice_unpaid_refunded.tpl
XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/language/english/mail_templates/xpayment_invoice_unpaid_settled.tpl
XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/language/english/mail_templates/xpayment_invoice_unpaid_undelieved.tpl
XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/language/english/main.php
XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/language/english/modinfo.php
XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/language/english/paypal.php
XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/language/english/twocheckout.php
XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/language/english/zombaio.php
XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/language/index.html
XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/officers.php
XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/pdf.php
XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/plugin/
XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/plugin/example.php
XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/plugin/xpayment.php
XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/return.php
XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/sql/
XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/sql/index.html
XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/sql/mysql.sql
XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/templates/
XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/templates/index.html
XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/templates/xpayment_cancel.html
XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/templates/xpayment_cpanel_discounts_list.html
XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/templates/xpayment_cpanel_gateways_list.html
XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/templates/xpayment_cpanel_gateways_options.html
XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/templates/xpayment_cpanel_groups.html
XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/templates/xpayment_cpanel_groups_edit.html
XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/templates/xpayment_cpanel_invoice_list.html
XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/templates/xpayment_cpanel_invoice_view.html
XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/templates/xpayment_cpanel_tax_list.html
XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/templates/xpayment_cpanel_transactions_list.html
XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/templates/xpayment_cpanel_transactions_view.html
XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/templates/xpayment_help.html
XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/templates/xpayment_invoice.html
XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/templates/xpayment_invoice_list.html
XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/templates/xpayment_invoice_view.html
XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/templates/xpayment_payment.html
XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/templates/xpayment_payment_pdf.html
XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/templates/xpayment_return.html
XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/templates/xpayment_transactions_list.html
XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/templates/xpayment_transactions_view.html
XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/xoops_version.php
Added: XoopsModules/xpayment/releases/1.42/docs/.htaccess.dist
===================================================================
--- XoopsModules/xpayment/releases/1.42/docs/.htaccess.dist (rev 0)
+++ XoopsModules/xpayment/releases/1.42/docs/.htaccess.dist 2012-01-08 12:25:32 UTC (rev 8671)
@@ -0,0 +1,11 @@
+
+RewriteEngine On
+RewriteCond %{REQUEST_FILENAME} !-f
+RewriteCond %{REQUEST_FILENAME} !-d
+
+RewriteRule ^payment/(.*?).html$ modules/xpayment/index.php?iid=$1
+RewriteRule ^payment/pdf,(.*?).pdf$ modules/xpayment/pdf.php?iid=$1
+RewriteRule ^payment/index$ modules/xpayment/index.php$1
+RewriteRule ^payment/$ modules/xpayment/index.php$1
+
+
Added: XoopsModules/xpayment/releases/1.42/docs/licence.txt
===================================================================
--- XoopsModules/xpayment/releases/1.42/docs/licence.txt (rev 0)
+++ XoopsModules/xpayment/releases/1.42/docs/licence.txt 2012-01-08 12:25:32 UTC (rev 8671)
@@ -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/xpayment/releases/1.42/htdocs/Frameworks/moduleclasses/icons/16/xpayment.discounts.png
===================================================================
(Binary files differ)
Property changes on: XoopsModules/xpayment/releases/1.42/htdocs/Frameworks/moduleclasses/icons/16/xpayment.discounts.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/xpayment/releases/1.42/htdocs/Frameworks/moduleclasses/icons/16/xpayment.gateways.png
===================================================================
(Binary files differ)
Property changes on: XoopsModules/xpayment/releases/1.42/htdocs/Frameworks/moduleclasses/icons/16/xpayment.gateways.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/xpayment/releases/1.42/htdocs/Frameworks/moduleclasses/icons/16/xpayment.groups.png
===================================================================
(Binary files differ)
Property changes on: XoopsModules/xpayment/releases/1.42/htdocs/Frameworks/moduleclasses/icons/16/xpayment.groups.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/xpayment/releases/1.42/htdocs/Frameworks/moduleclasses/icons/16/xpayment.invoices.png
===================================================================
(Binary files differ)
Property changes on: XoopsModules/xpayment/releases/1.42/htdocs/Frameworks/moduleclasses/icons/16/xpayment.invoices.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/xpayment/releases/1.42/htdocs/Frameworks/moduleclasses/icons/16/xpayment.permissions.png
===================================================================
(Binary files differ)
Property changes on: XoopsModules/xpayment/releases/1.42/htdocs/Frameworks/moduleclasses/icons/16/xpayment.permissions.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/xpayment/releases/1.42/htdocs/Frameworks/moduleclasses/icons/16/xpayment.taxes.png
===================================================================
(Binary files differ)
Property changes on: XoopsModules/xpayment/releases/1.42/htdocs/Frameworks/moduleclasses/icons/16/xpayment.taxes.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/xpayment/releases/1.42/htdocs/Frameworks/moduleclasses/icons/16/xpayment.transactions.png
===================================================================
(Binary files differ)
Property changes on: XoopsModules/xpayment/releases/1.42/htdocs/Frameworks/moduleclasses/icons/16/xpayment.transactions.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/xpayment/releases/1.42/htdocs/Frameworks/moduleclasses/icons/32/xpayment.discounts.png
===================================================================
(Binary files differ)
Property changes on: XoopsModules/xpayment/releases/1.42/htdocs/Frameworks/moduleclasses/icons/32/xpayment.discounts.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/xpayment/releases/1.42/htdocs/Frameworks/moduleclasses/icons/32/xpayment.gateways.png
===================================================================
(Binary files differ)
Property changes on: XoopsModules/xpayment/releases/1.42/htdocs/Frameworks/moduleclasses/icons/32/xpayment.gateways.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/xpayment/releases/1.42/htdocs/Frameworks/moduleclasses/icons/32/xpayment.groups.png
===================================================================
(Binary files differ)
Property changes on: XoopsModules/xpayment/releases/1.42/htdocs/Frameworks/moduleclasses/icons/32/xpayment.groups.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/xpayment/releases/1.42/htdocs/Frameworks/moduleclasses/icons/32/xpayment.invoices.png
===================================================================
(Binary files differ)
Property changes on: XoopsModules/xpayment/releases/1.42/htdocs/Frameworks/moduleclasses/icons/32/xpayment.invoices.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/xpayment/releases/1.42/htdocs/Frameworks/moduleclasses/icons/32/xpayment.permissions.png
===================================================================
(Binary files differ)
Property changes on: XoopsModules/xpayment/releases/1.42/htdocs/Frameworks/moduleclasses/icons/32/xpayment.permissions.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/xpayment/releases/1.42/htdocs/Frameworks/moduleclasses/icons/32/xpayment.taxes.png
===================================================================
(Binary files differ)
Property changes on: XoopsModules/xpayment/releases/1.42/htdocs/Frameworks/moduleclasses/icons/32/xpayment.taxes.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/xpayment/releases/1.42/htdocs/Frameworks/moduleclasses/icons/32/xpayment.transactions.png
===================================================================
(Binary files differ)
Property changes on: XoopsModules/xpayment/releases/1.42/htdocs/Frameworks/moduleclasses/icons/32/xpayment.transactions.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/xpayment/releases/1.42/htdocs/ZombaioGW_1_1.php
===================================================================
--- XoopsModules/xpayment/releases/1.42/htdocs/ZombaioGW_1_1.php (rev 0)
+++ XoopsModules/xpayment/releases/1.42/htdocs/ZombaioGW_1_1.php 2012-01-08 12:25:32 UTC (rev 8671)
@@ -0,0 +1,19 @@
+<?php
+ include('modules/xpayment/header.php');
+
+ include_once($GLOBALS['xoops']->path('/modules/xpayment/class/gateway/zombaio/zombaio.php'));
+ $class = 'ZombaioGatewaysPlugin';
+
+ if (class_exists($class))
+ $invoice = $class::goInvoiceObj();
+
+ if (is_a($invoice, 'XpaymentInvoice')) {
+ $gateways_handler =& xoops_getmodulehandler('gateways','xpayment');
+ $gateway = $gateways_handler->getGateway($invoice->getVar('gateway'), $invoice);
+ }
+
+ if (is_a($gateway, 'XpaymentGateways')) {
+ $gateway->goIPN($_REQUEST);
+ }
+
+?>
\ No newline at end of file
Added: XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/accounts.php
===================================================================
--- XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/accounts.php (rev 0)
+++ XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/accounts.php 2012-01-08 12:25:32 UTC (rev 8671)
@@ -0,0 +1,241 @@
+<?php
+/**
+ * Invoice Transaction Gateway with Modular Plugin set
+ *
+ * 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 Chronolabs Co-Op http://www.chronolabs.coop/
+ * @license http://www.fsf.org/copyleft/gpl.html GNU public license
+ * @package xpayment
+ * @since 1.30.0
+ * @author Simon Roberts <si...@ch...>
+ * @translation Erol Konik <ap...@ap...>
+ * @translation Mariane <mar...@ho...>
+ * @translation Voltan <vo...@xo...>
+ * @translation Ezsky <ezs...@gm...>
+ * @translation Richardo Costa <lus...@gm...>
+ * @translation Kris_fr <kr...@fr...>
+ */
+ include('header.php');
+
+ if (!is_object($GLOBALS['xoopsUser'])) {
+ redirect_header(XOOPS_URL.'/modules/xpayment/index.php', 3, _NOPERM);
+ exit(0);
+ }
+
+ if (!in_array($GLOBALS['xpaymentModuleConfig']['accounts'], $GLOBALS['xoopsUser']->getGroups())) {
+ redirect_header(XOOPS_URL.'/modules/xpayment/index.php', 3, _NOPERM);
+ exit(0);
+ }
+
+ xoops_loadLanguage('admin', 'xpayment');
+
+ switch($_REQUEST['op']) {
+ default:
+ case "invoices":
+ switch ($_REQUEST['fct'])
+ {
+ default:
+ case "list":
+ $xoopsOption['template_main'] = 'xpayment_invoice_list.html';
+ include_once $GLOBALS['xoops']->path( "/header.php" );
+ $GLOBALS['xoopsTpl']->assign('php_self', $_SERVER['PHP_SELF']);
+
+ $invoice_handler =& xoops_getmodulehandler('invoice', 'xpayment');
+
+ $criteria = new CriteriaCompo(new Criteria('accounts_uids', '%"'.$GLOBALS['xoopsUser']->getVar('uid').'"%', 'LIKE'));
+
+ $ttl = $invoice_handler->getCount($criteria);
+ $limit = !empty($_REQUEST['limit'])?intval($_REQUEST['limit']):30;
+ $start = !empty($_REQUEST['start'])?intval($_REQUEST['start']):0;
+ $order = !empty($_REQUEST['order'])?$_REQUEST['order']:'DESC';
+ $sort = !empty($_REQUEST['sort'])?$_REQUEST['sort']:'created';
+
+ $pagenav = new XoopsPageNav($ttl, $limit, $start, 'start', 'limit='.$limit.'&sort='.$sort.'&order='.$order.'&op='.$_REQUEST['op'].'&fct='.$_REQUEST['fct']);
+ $GLOBALS['xoopsTpl']->assign('pagenav', $pagenav->renderNav());
+
+ foreach (array( 'mode','invoicenumber','drawfor','drawto','drawto_email','amount','grand','shipping',
+ 'handling','weight','weight_unit','tax','currency','items','transactionid','created',
+ 'updated','actioned','reoccurence','reoccurences','reoccurence_period_days','occurence',
+ 'previous','occurence_grand','occurence_amount','occurence_tax','occurence_shipping',
+ 'occurence_handling','occurence_weight','remittion','remittion_settled',
+ 'donation','comment','user_ip','user_netaddy','user_uid','remitted','due',
+ 'collect','wait','offline','remittion') as $id => $key) {
+ $GLOBALS['xoopsTpl']->assign(strtolower($key.'_th'), '<a href="'.$_SERVER['PHP_SELF'].'?start='.$start.'&limit='.$limit.'&sort='.$key.'&order='.(($key==$sort)?($order=='ASC'?'DESC':'ASC'):$order).'&op='.$_REQUEST['op'].'&fct='.$_REQUEST['fct'].'">'.(defined('_XPY_AM_TH_'.strtoupper($key))?constant('_XPY_AM_TH_'.strtoupper($key)):'_XPY_AM_TH_'.strtoupper($key)).'</a>');
+ }
+
+ $criteria->setStart($start);
+ $criteria->setLimit($limit);
+ $criteria->setSort($sort);
+ $criteria->setOrder($order);
+
+ $invoices = $invoice_handler->getObjects($criteria, true);
+ foreach($invoices as $iid => $invoice) {
+ $GLOBALS['xoopsTpl']->append('invoices', $invoice->toArray());
+ }
+
+ break;
+ case 'view':
+ $xoopsOption['template_main'] = 'xpayment_invoice_view.html';
+ include_once $GLOBALS['xoops']->path( "/header.php" );
+ $GLOBALS['xoopsTpl']->assign('php_self', $_SERVER['PHP_SELF']);
+
+ $invoice_handler =& xoops_getmodulehandler('invoice', 'xpayment');
+ $invoice_items_handler =& xoops_getmodulehandler('invoice_items', 'xpayment');
+
+ $invoice =& $invoice_handler->get($_GET['iid']);
+
+ $GLOBALS['xoopsTpl']->assign('invoice', $invoice->toArray());
+
+ if ($invoice->getVar('mode')=='UNPAID')
+ $GLOBALS['xoopsTpl']->assign('payment_markup', $invoice->getAdminPaymentHtml());
+
+ if ($invoice->getVar('mode')=='UNPAID'&&($invoice->getVar('remittion')=='COLLECT'||$invoice->getVar('remittion')=='SETTLED'))
+ $GLOBALS['xoopsTpl']->assign('settle_markup', $invoice->getAdminSettleHtml());
+
+ $criteria = new Criteria('iid', $invoice->getVar('iid'));
+ $items = $invoice_items_handler->getObjects($criteria, true);
+ foreach($items as $iiid => $item)
+ $GLOBALS['xoopsTpl']->append('items', $item->toArray());
+
+
+
+ break;
+ case 'cancel':
+
+ include_once $GLOBALS['xoops']->path( "/header.php" );
+ $GLOBALS['xoopsTpl']->assign('php_self', $_SERVER['PHP_SELF']);
+
+ if (!isset($_POST['confirm'])) {
+ xoops_confirm(array('confirm'=>true,'op'=>$_REQUEST['op'],'fct'=>$_REQUEST['fct'],'iid'=>$_REQUEST['iid']), $_SERVER['PHP_SELF'], _XPY_MSG_CONFIRM_CANCEL);
+ include($GLOBALS['xoops']->path('/footer.php'));
+ exit(0);
+ }
+
+ $invoice_handler =& xoops_getmodulehandler('invoice', 'xpayment');
+ $invoice = $invoice_handler->get($_REQUEST['iid']);
+ $invoice->setVar('mode', 'CANCEL');
+ $invoice_handler->insert($invoice);
+ $invoice->runPlugin();
+ redirect_header($_SERVER['PHP_SELF'].'?op=invoices&fct=list', 3, _XPY_MSG_INVOICE_CANCELED);
+ exit(0);
+ break;
+ case 'transaction':
+
+ $invoice_handler =& xoops_getmodulehandler('invoice', 'xpayment');
+ $invoice_transactions_handler =& xoops_getmodulehandler('invoice_transactions', 'xpayment');
+ $invoice_transactions = $invoice_transactions_handler->create();
+ $invoice = $invoice_handler->get($_REQUEST['iid']);
+ $invoice_transactions->setVar('transactionid', $_REQUEST['transactionid']);
+ $invoice_transactions->setVar('iid', $_REQUEST['iid']);
+ $invoice_transactions->setVar('invoice', $_REQUEST['iid']);
+ $invoice_transactions->setVar('date', time());
+ $invoice_transactions->setVar('email', $GLOBALS['xoopsConfig']['adminmail']);
+ $invoice_transactions->setVar('gross', $_REQUEST['amount']);
+ $invoice_transactions->setVar('status', 'Manual');
+ $invoice_transactions_handler->insert($invoice_transactions);
+ $gross = $invoice_transactions_handler->sumOfGross($_REQUEST['iid']);
+ if ($gross>=$invoice->getVar('grand'))
+ $invoice->setVar('mode', 'PAID');
+ $invoice->setVar('transactionid', $_REQUEST['transactionid']);
+ $invoice_handler->insert($invoice);
+ redirect_header($_SERVER['PHP_SELF'].'?op=invoices&fct=list', 3, _XPY_MSG_INVOICE_PAID);
+ exit(0);
+ break;
+ case 'settle':
+ $invoice_handler =& xoops_getmodulehandler('invoice', 'xpayment');
+ $invoice = $invoice_handler->get($_REQUEST['iid']);
+ $invoice->setVar('remittion','SETTLED');
+ $invoice->setVar('remittion_settled',$_REQUEST['settlement']);
+ $invoice_handler->insert($invoice);
+ redirect_header($_SERVER['PHP_SELF'].'?op=invoices&fct=list', 3, _XPY_MSG_INVOICE_SETTLEMENT);
+ exit(0);
+ break;
+
+ }
+ break;
+ case "transactions":
+
+ switch ($_REQUEST['fct'])
+ {
+ default:
+ case "list":
+ $xoopsOption['template_main'] = 'xpayment_transactions_list.html';
+ include_once $GLOBALS['xoops']->path( "/header.php" );
+ $GLOBALS['xoopsTpl']->assign('php_self', $_SERVER['PHP_SELF']);
+
+ $invoice_transactions_handler =& xoops_getmodulehandler('invoice_transactions', 'xpayment');
+
+ $ttl = $invoice_transactions_handler->getCount(NULL);
+ $limit = !empty($_REQUEST['limit'])?intval($_REQUEST['limit']):30;
+ $start = !empty($_REQUEST['start'])?intval($_REQUEST['start']):0;
+ $order = !empty($_REQUEST['order'])?$_REQUEST['order']:'DESC';
+ $sort = !empty($_REQUEST['sort'])?$_REQUEST['sort']:'date';
+
+ if ($_GET['iid']==0) {
+ $pagenav = new XoopsPageNav($ttl, $limit, $start, 'start', 'limit='.$limit.'&sort='.$sort.'&order='.$order.'&op='.$_REQUEST['op'].'&fct='.$_REQUEST['fct']);
+ $GLOBALS['xoopsTpl']->assign('pagenav', $pagenav->renderNav());
+
+ $criteria = new Criteria('1','1');
+ $criteria->setStart($start);
+ $criteria->setLimit($limit);
+ $criteria->setSort($sort);
+ $criteria->setOrder($order);
+ } else {
+ $pagenav = new XoopsPageNav($ttl, $limit, $start, 'start', 'limit='.$limit.'&sort='.$sort.'&order='.$order.'&iid='.$_REQUEST['iid'].'&op='.$_REQUEST['op'].'&fct='.$_REQUEST['fct']);
+ $GLOBALS['xoopsTpl']->assign('pagenav', $pagenav->renderNav());
+
+ $criteria = new Criteria('iid',$_REQUEST['iid']);
+ $criteria->setStart($start);
+ $criteria->setLimit($limit);
+ $criteria->setSort($sort);
+ $criteria->setOrder($order);
+
+ $invoice_handler =& xoops_getmodulehandler('invoice', 'xpayment');
+ $invoice =& $invoice_handler->get($_GET['iid']);
+ $GLOBALS['xoopsTpl']->assign('invoice', $invoice->toArray());
+
+ }
+
+ $transactions = $invoice_transactions_handler->getObjects($criteria, true);
+
+ foreach($transactions as $tiid => $transaction) {
+ $GLOBALS['xoopsTpl']->append('transactions', $transaction->toArray());
+ }
+
+ if ($_GET['iid']==0) {
+ foreach (array( 'transactionid','email','invoice','status','date','gross','fee','settle',
+ 'exchangerate','firstname','lastname','street','city','state','postcode','country',
+ 'address_status','payer_email','payer_status','gateway', 'plugin') as $id => $key) {
+ $GLOBALS['xoopsTpl']->assign($key.'_th', '<a href="'.$_SERVER['PHP_SELF'].'?'.'start='.$start.'&limit='.$limit.'&sort='.$key.'&order='.(($key==$sort)?($order=='ASC'?'DESC':'ASC'):$order).'&op='.$_REQUEST['op'].'&fct='.$_REQUEST['fct'].'">'.(defined('_XPY_AM_TH_'.strtoupper($key))?constant('_XPY_AM_TH_'.strtoupper($key)):'_XPY_AM_TH_'.strtoupper($key)).'</a>');
+ }
+ } else {
+ foreach (array( 'transactionid','email','invoice','status','date','gross','fee','settle',
+ 'exchangerate','firstname','lastname','street','city','state','postcode','country',
+ 'address_status','payer_email','payer_status','gateway', 'plugin') as $id => $key) {
+ $GLOBALS['xoopsTpl']->assign($key.'_th', '<a href="'.$_SERVER['PHP_SELF'].'?'.'start='.$start.'&limit='.$limit.'&sort='.$key.'&order='.(($key==$sort)?($order=='ASC'?'DESC':'ASC'):$order).'&op='.$_REQUEST['op'].'&fct='.$_REQUEST['fct'].'&iid='.$_REQUEST['iid'].'">'.(defined('_XPY_AM_TH_'.strtoupper($key))?constant('_XPY_AM_TH_'.strtoupper($key)):'_XPY_AM_TH_'.strtoupper($key)).'</a>');
+ }
+ }
+
+ break;
+ case 'view':
+ $xoopsOption['template_main'] = 'xpayment_transactions_view.html';
+ include_once $GLOBALS['xoops']->path( "/header.php" );
+ $GLOBALS['xoopsTpl']->assign('php_self', $_SERVER['PHP_SELF']);
+
+ $invoice_transactions_handler =& xoops_getmodulehandler('invoice_transactions', 'xpayment');
+ $transaction =& $invoice_transactions_handler->get($_GET['tiid']);
+ $GLOBALS['xoopsTpl']->assign('transaction', $transaction->toArray());
+ break;
+ }
+ break;
+
+ }
+
+ include($GLOBALS['xoops']->path('/footer.php'));
+?>
\ No newline at end of file
Added: XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/admin/header.php
===================================================================
--- XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/admin/header.php (rev 0)
+++ XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/admin/header.php 2012-01-08 12:25:32 UTC (rev 8671)
@@ -0,0 +1,140 @@
+<?php
+/**
+ * Invoice Transaction Gateway with Modular Plugin set
+ *
+ * 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 Chronolabs Co-Op http://www.chronolabs.coop/
+ * @license http://www.fsf.org/copyleft/gpl....
[truncated message content] |
|
From: <vo...@us...> - 2012-01-08 11:22:07
|
Revision: 8670
http://xoops.svn.sourceforge.net/xoops/?rev=8670&view=rev
Author: voltan1
Date: 2012-01-08 11:22:01 +0000 (Sun, 08 Jan 2012)
Log Message:
-----------
Fix comment
Modified Paths:
--------------
XoopsModules/fmcontent/branches/news/comment_new.php
Modified: XoopsModules/fmcontent/branches/news/comment_new.php
===================================================================
--- XoopsModules/fmcontent/branches/news/comment_new.php 2012-01-08 10:02:50 UTC (rev 8669)
+++ XoopsModules/fmcontent/branches/news/comment_new.php 2012-01-08 11:22:01 UTC (rev 8670)
@@ -24,7 +24,8 @@
// along with this program; if not, write to the Free Software //
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA //
// ------------------------------------------------------------------------ //
-
+
+require dirname(__FILE__) . '/header.php';
$com_itemid = isset($_GET['com_itemid']) ? intval($_GET['com_itemid']) : 0;
if ($com_itemid > 0) {
$story_handler = xoops_getmodulehandler('story', 'news');
@@ -32,4 +33,4 @@
$com_replytitle = $content->getVar('story_title');
include_once XOOPS_ROOT_PATH . '/include/comment_new.php';
}
-?>
+?>
\ 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: <vo...@us...> - 2012-01-08 10:02:56
|
Revision: 8669
http://xoops.svn.sourceforge.net/xoops/?rev=8669&view=rev
Author: voltan1
Date: 2012-01-08 10:02:50 +0000 (Sun, 08 Jan 2012)
Log Message:
-----------
Remove html tags from list
Modified Paths:
--------------
XoopsModules/fmcontent/branches/news/class/story.php
Modified: XoopsModules/fmcontent/branches/news/class/story.php
===================================================================
--- XoopsModules/fmcontent/branches/news/class/story.php 2012-01-08 08:04:30 UTC (rev 8668)
+++ XoopsModules/fmcontent/branches/news/class/story.php 2012-01-08 10:02:50 UTC (rev 8669)
@@ -551,8 +551,11 @@
$tab ['story_update'] = formatTimestamp ( $root->getVar ( 'story_update' ), _MEDIUMDATESTRING );
$tab ['imageurl'] = XOOPS_URL . xoops_getModuleOption ( 'img_dir', $NewsModule->getVar ( 'dirname' ) ) . '/medium/' . $root->getVar ( 'story_img' );
$tab ['thumburl'] = XOOPS_URL . xoops_getModuleOption ( 'img_dir', $NewsModule->getVar ( 'dirname' ) ) . '/thumb/' . $root->getVar ( 'story_img' );
- $tab ['story_short'] = strip_tags($root->getVar ( 'story_short' ));
- $tab ['story_text'] = strip_tags($root->getVar ( 'story_text' ));
+
+ if(!$root->getVar ( 'story_short' )) {
+ $tab ['story_short'] = mb_substr ( strip_tags($root->getVar ( 'story_text' )), 0, 500, 'utf-8' ) . "...";
+ }
+
$ret [] = $tab;
}
}
@@ -606,8 +609,13 @@
$tab ['url'] = NewsUtils::News_Url ( $NewsModule->getVar ( 'dirname' ), $tab );
$tab ['title'] = mb_strlen ( $root->getVar ( 'story_title' ), 'utf-8' ) > $story_infos ['lenght_title'] ? mb_substr ( $root->getVar ( 'story_title' ), 0, ($story_infos ['lenght_title']), 'utf-8' ) . "..." : $root->getVar ( 'story_title' );
$tab ['date'] = formatTimestamp ( $root->getVar ( 'story_publish' ), _MEDIUMDATESTRING );
- $tab ['story_short'] = strip_tags($root->getVar ( 'story_short' ));
- $tab ['story_text'] = strip_tags($root->getVar ( 'story_text' ));
+
+ if(!$root->getVar ( 'story_short' )) {
+ $tab ['story_short'] = mb_substr ( strip_tags($root->getVar ( 'story_text' )), 0, 300, 'utf-8' ) . "...";
+ } else {
+ $tab ['story_short'] = strip_tags($root->getVar ( 'story_short' ));
+ }
+
$ret [] = $tab;
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vo...@us...> - 2012-01-08 08:04:36
|
Revision: 8668
http://xoops.svn.sourceforge.net/xoops/?rev=8668&view=rev
Author: voltan1
Date: 2012-01-08 08:04:30 +0000 (Sun, 08 Jan 2012)
Log Message:
-----------
Remove html tags from list
Modified Paths:
--------------
XoopsModules/fmcontent/branches/news/class/story.php
Modified: XoopsModules/fmcontent/branches/news/class/story.php
===================================================================
--- XoopsModules/fmcontent/branches/news/class/story.php 2012-01-08 07:23:46 UTC (rev 8667)
+++ XoopsModules/fmcontent/branches/news/class/story.php 2012-01-08 08:04:30 UTC (rev 8668)
@@ -551,6 +551,8 @@
$tab ['story_update'] = formatTimestamp ( $root->getVar ( 'story_update' ), _MEDIUMDATESTRING );
$tab ['imageurl'] = XOOPS_URL . xoops_getModuleOption ( 'img_dir', $NewsModule->getVar ( 'dirname' ) ) . '/medium/' . $root->getVar ( 'story_img' );
$tab ['thumburl'] = XOOPS_URL . xoops_getModuleOption ( 'img_dir', $NewsModule->getVar ( 'dirname' ) ) . '/thumb/' . $root->getVar ( 'story_img' );
+ $tab ['story_short'] = strip_tags($root->getVar ( 'story_short' ));
+ $tab ['story_text'] = strip_tags($root->getVar ( 'story_text' ));
$ret [] = $tab;
}
}
@@ -604,6 +606,8 @@
$tab ['url'] = NewsUtils::News_Url ( $NewsModule->getVar ( 'dirname' ), $tab );
$tab ['title'] = mb_strlen ( $root->getVar ( 'story_title' ), 'utf-8' ) > $story_infos ['lenght_title'] ? mb_substr ( $root->getVar ( 'story_title' ), 0, ($story_infos ['lenght_title']), 'utf-8' ) . "..." : $root->getVar ( 'story_title' );
$tab ['date'] = formatTimestamp ( $root->getVar ( 'story_publish' ), _MEDIUMDATESTRING );
+ $tab ['story_short'] = strip_tags($root->getVar ( 'story_short' ));
+ $tab ['story_text'] = strip_tags($root->getVar ( 'story_text' ));
$ret [] = $tab;
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vo...@us...> - 2012-01-08 07:23:52
|
Revision: 8667
http://xoops.svn.sourceforge.net/xoops/?rev=8667&view=rev
Author: voltan1
Date: 2012-01-08 07:23:46 +0000 (Sun, 08 Jan 2012)
Log Message:
-----------
Fix bug in etory block
Modified Paths:
--------------
XoopsModules/fmcontent/branches/news/class/story.php
Modified: XoopsModules/fmcontent/branches/news/class/story.php
===================================================================
--- XoopsModules/fmcontent/branches/news/class/story.php 2012-01-08 07:19:16 UTC (rev 8666)
+++ XoopsModules/fmcontent/branches/news/class/story.php 2012-01-08 07:23:46 UTC (rev 8667)
@@ -582,7 +582,6 @@
$criteria->setSort ( $story_infos ['story_sort'] );
$criteria->setOrder ( $story_infos ['story_order'] );
$criteria->setLimit ( $story_infos ['story_limit'] );
- $criteria->setStart ( $story_infos ['story_start'] );
$obj = $this->getObjects ( $criteria, false );
if ($obj) {
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}