Menu
▾
▴
xoops-cvs2
|
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 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.
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X