From 0eec6fcfb639b9e50fa0d22144acc1e9b09d6b63 Mon Sep 17 00:00:00 2001 From: Alexei Sorokin Date: Tue, 9 Jun 2020 20:26:06 +0300 Subject: [PATCH] [DATABASE] Replace NOW() with CURRENT_TIMESTAMP --- classes/File.php | 5 +- db/foreign_services.sql | 12 +- db/location_namespace.sql | 10 +- db/notice_source.sql | 160 ++++++++++++------------- db/sms_carrier.sql | 128 ++++++++++---------- plugins/UserFlag/actions/clearflag.php | 6 +- 6 files changed, 161 insertions(+), 160 deletions(-) diff --git a/classes/File.php b/classes/File.php index e09d189be7..4a4d4208dd 100644 --- a/classes/File.php +++ b/classes/File.php @@ -283,7 +283,8 @@ class File extends Managed_DataObject ) ); } - $query .= ' AND EXTRACT(month FROM file.modified) = EXTRACT(month FROM now()) AND EXTRACT(year FROM file.modified) = EXTRACT(year FROM now())'; + $query .= ' AND EXTRACT(MONTH FROM file.modified) = EXTRACT(MONTH FROM CURRENT_DATE)' + . ' AND EXTRACT(YEAR FROM file.modified) = EXTRACT(YEAR FROM CURRENT_DATE)'; $file->query($query); $file->fetch(); $total = $file->total + $fileSize; @@ -748,7 +749,7 @@ class File extends Managed_DataObject if ($file instanceof File) { throw new ServerException('URL already exists in DB'); } - $sql = 'UPDATE %1$s SET urlhash=%2$s, url=%3$s WHERE urlhash=%4$s;'; + $sql = 'UPDATE %1$s SET urlhash = %2$s, url = %3$s WHERE urlhash = %4$s;'; $result = $this->query(sprintf( $sql, $this->tableName(), diff --git a/db/foreign_services.sql b/db/foreign_services.sql index 79c04cee56..dce2466f62 100644 --- a/db/foreign_services.sql +++ b/db/foreign_services.sql @@ -1,6 +1,6 @@ -insert into foreign_service - (id, name, description, created) -values - ('1','Twitter', 'Twitter Micro-blogging service', now()), - ('2','Facebook', 'Facebook', now()), - ('3','FacebookConnect', 'Facebook Connect', now()); +INSERT INTO foreign_service + (id, name, description, created) +VALUES + (1, 'Twitter', 'Twitter Micro-blogging service', CURRENT_TIMESTAMP), + (2, 'Facebook', 'Facebook', CURRENT_TIMESTAMP), + (3, 'FacebookConnect', 'Facebook Connect', CURRENT_TIMESTAMP); diff --git a/db/location_namespace.sql b/db/location_namespace.sql index 59b2ce67c3..36ad928add 100644 --- a/db/location_namespace.sql +++ b/db/location_namespace.sql @@ -1,5 +1,5 @@ -insert into location_namespace - (id, description, created) -values - (1, 'Geonames', now()), - (2, 'Where on Earth', now()); +INSERT INTO location_namespace + (id, description, created) +VALUES + (1, 'Geonames', CURRENT_TIMESTAMP), + (2, 'Where on Earth', CURRENT_TIMESTAMP); diff --git a/db/notice_source.sql b/db/notice_source.sql index 69bf928e55..9f4a5e3ada 100644 --- a/db/notice_source.sql +++ b/db/notice_source.sql @@ -1,82 +1,82 @@ INSERT INTO notice_source - (code, name, url, created) + (code, name, url, created) VALUES - ('adium', 'Adium', 'http://www.adiumx.com/', now()), - ('Afficheur', 'Afficheur', 'http://afficheur.sourceforge.jp/', now()), - ('AgentSolo.com','AgentSolo.com','http://www.agentsolo.com/', now()), - ('anyio', 'Any.IO', 'http://any.io/', now()), - ('betwittered','BeTwittered','http://www.32hours.com/betwitteredinfo/', now()), - ('bti','bti','http://gregkh.github.com/bti/', now()), - ('choqok', 'Choqok', 'http://choqok.gnufolks.org/', now()), - ('cliqset', 'Cliqset', 'http://www.cliqset.com/', now()), - ('DarterosStatus', 'Darteros Status', 'http://www.darteros.com/doc/Darteros_Status', now()), - ('deskbar','Deskbar-Applet','http://www.gnome.org/projects/deskbar-applet/', now()), - ('Do','Gnome Do','http://do.davebsd.com/wiki/index.php?title=Microblog_Plugin', now()), - ('drupal','Drupal','http://drupal.org/', now()), - ('eventbox','EventBox','http://thecosmicmachine.com/eventbox/', now()), - ('identica-mode','Emacs Identica-mode','http://nongnu.org/identica-mode/', now()), - ('Facebook','Facebook','http://apps.facebook.com/identica/', now()), - ('feed2omb','feed2omb','http://projects.ciarang.com/p/feed2omb/', now()), - ('get2gnow', 'get2gnow', 'http://uberchicgeekchick.com/?projects=get2gnow', now()), - ('gNewBook', 'gNewBook', 'http://www.gnewbook.org/', now()), - ('gravity', 'Gravity', 'http://mobileways.de/gravity', now()), - ('Gwibber','Gwibber','http://launchpad.net/gwibber', now()), - ('HelloTxt','HelloTxt','http://hellotxt.com/', now()), - ('identicatools','Laconica Tools','http://bitbucketlabs.net/laconica-tools/', now()), - ('identichat','identichat','http://identichat.prosody.im/', now()), - ('IdentiCurse','IdentiCurse','http://identicurse.net/', now()), - ('IdentiFox','IdentiFox','http://www.bitbucket.org/uncryptic/identifox/', now()), - ('identitwitch','IdentiTwitch','http://richfish.org/identitwitch/', now()), - ('Jiminy','Jiminy','', now()), - ('LaTwit','LaTwit','http://latwit.mac65.com/', now()), - ('LiveTweeter', 'LiveTweeter', 'http://addons.songbirdnest.com/addon/1204', now()), - ('livetweeter', 'livetweeter', 'http://addons.songbirdnest.com/addon/1204', now()), - ('maisha', 'Maisha', 'http://maisha.grango.org/', now()), - ('mbpidgin','mbpidgin','', now()), - ('Mobidentica', 'Mobidentica', 'http://www.substanceofcode.com/software/mobidentica/', now()), - ('moconica','Moconica','http://moconica.com/', now()), - ('mustard', 'mustard', 'http://mustard.macno.org', now()), - ('nambu','Nambu','http://www.nambu.com/', now()), - ('peoplebrowsr', 'PeopleBrowsr', 'http://www.peoplebrowsr.com/', now()), - ('Pikchur','Pikchur','http://www.pikchur.com/', now()), - ('Ping.fm','Ping.fm','http://ping.fm/', now()), - ('pingvine','PingVine','http://pingvine.com/', now()), - ('pocketwit','PockeTwit','', now()), - ('posty','Posty','http://spreadingfunkyness.com/posty/', now()), - ('qtwitter','qTwitter','http://qtwitter.ayoy.net/', now()), - ('qwit', 'Qwit', '', now()), - ('royalewithcheese','Royale With Cheese','http://p.hellyeah.org/', now()), - ('rssdent','rssdent','http://github.com/zcopley/rssdent/tree/master', now()), - ('rygh.no','rygh.no','http://rygh.no/', now()), - ('ryghsms','ryghsms','http://sms.rygh.no/', now()), - ('smob','SMOB','http://smob.sioc-project.org/', now()), - ('socialoomphBfD4pMqz31', 'SocialOomph', 'http://www.socialoomph.com/', now()), - ('spaz','Spaz','http://funkatron.com/spaz', now()), - ('StatusNet Desktop', 'StatusNet Desktop', 'http://status.net/desktop', now()), - ('StatusNet Mobile', 'StatusNet Mobile', 'http://status.net/mobile', now()), - ('StatusNet iPhone', 'iPhone', 'http://status.net/iphone', now()), - ('StatusNet Android', 'Android', 'http://status.net/android', now()), - ('StatusNet Blackberry', 'Blackberry', 'http://status.net/blackberry', now()), - ('tarpipe','tarpipe','http://tarpipe.com/', now()), - ('tjunar','Tjunar','http://nederflash.nl/boek/titels/tjunar-air', now()), - ('tr.im','tr.im','http://tr.im/', now()), - ('triklepost', 'Tricklepost', 'http://github.com/zcopley/tricklepost/tree/master', now()), - ('tweenky','Tweenky','http://beta.tweenky.com/', now()), - ('TweetDeck', 'TweetDeck', 'http://www.tweetdeck.com/', now()), - ('twhirl','Twhirl','http://www.twhirl.org/', now()), - ('twibble','twibble','http://www.twibble.de/', now()), - ('Twidge','Twidge','http://software.complete.org/twidge', now()), - ('twidge','Twidge','http://software.complete.org/twidge', now()), - ('twidroid','twidroid','http://www.twidroid.com/', now()), - ('twittelator','Twittelator','http://www.stone.com/iPhone/Twittelator/', now()), - ('twitter','Twitter','http://twitter.com/', now()), - ('twitterfeed','twitterfeed','http://twitterfeed.com/', now()), - ('twitterphoto','TwitterPhoto','http://richfish.org/twitterphoto/', now()), - ('twitterpm','Net::Twitter','http://search.cpan.org/dist/Net-Twitter/', now()), - ('twittertools','Twitter Tools','http://wordpress.org/extend/plugins/twitter-tools/', now()), - ('twitux','Twitux','http://live.gnome.org/DanielMorales/Twitux', now()), - ('twitvim','TwitVim','http://vim.sourceforge.net/scripts/script.php?script_id=2204', now()), - ('Updating.Me','Updating.Me','http://updating.me/', now()), - ('urfastr','urfastr','http://urfastr.net/', now()), - ('yatca','Yatca','http://www.yatca.com/', now()), - ('rss.me', 'rss.me', 'http://rss.me/', now()); + ('adium', 'Adium', 'http://www.adiumx.com/', CURRENT_TIMESTAMP), + ('Afficheur', 'Afficheur', 'http://afficheur.sourceforge.jp/', CURRENT_TIMESTAMP), + ('AgentSolo.com','AgentSolo.com','http://www.agentsolo.com/', CURRENT_TIMESTAMP), + ('anyio', 'Any.IO', 'http://any.io/', CURRENT_TIMESTAMP), + ('betwittered','BeTwittered','http://www.32hours.com/betwitteredinfo/', CURRENT_TIMESTAMP), + ('bti','bti','http://gregkh.github.com/bti/', CURRENT_TIMESTAMP), + ('choqok', 'Choqok', 'http://choqok.gnufolks.org/', CURRENT_TIMESTAMP), + ('cliqset', 'Cliqset', 'http://www.cliqset.com/', CURRENT_TIMESTAMP), + ('DarterosStatus', 'Darteros Status', 'http://www.darteros.com/doc/Darteros_Status', CURRENT_TIMESTAMP), + ('deskbar','Deskbar-Applet','http://www.gnome.org/projects/deskbar-applet/', CURRENT_TIMESTAMP), + ('Do','Gnome Do','http://do.davebsd.com/wiki/index.php?title=Microblog_Plugin', CURRENT_TIMESTAMP), + ('drupal','Drupal','http://drupal.org/', CURRENT_TIMESTAMP), + ('eventbox','EventBox','http://thecosmicmachine.com/eventbox/', CURRENT_TIMESTAMP), + ('identica-mode','Emacs Identica-mode','http://nongnu.org/identica-mode/', CURRENT_TIMESTAMP), + ('Facebook','Facebook','http://apps.facebook.com/identica/', CURRENT_TIMESTAMP), + ('feed2omb','feed2omb','http://projects.ciarang.com/p/feed2omb/', CURRENT_TIMESTAMP), + ('get2gnow', 'get2gnow', 'http://uberchicgeekchick.com/?projects=get2gnow', CURRENT_TIMESTAMP), + ('gNewBook', 'gNewBook', 'http://www.gnewbook.org/', CURRENT_TIMESTAMP), + ('gravity', 'Gravity', 'http://mobileways.de/gravity', CURRENT_TIMESTAMP), + ('Gwibber','Gwibber','http://launchpad.net/gwibber', CURRENT_TIMESTAMP), + ('HelloTxt','HelloTxt','http://hellotxt.com/', CURRENT_TIMESTAMP), + ('identicatools','Laconica Tools','http://bitbucketlabs.net/laconica-tools/', CURRENT_TIMESTAMP), + ('identichat','identichat','http://identichat.prosody.im/', CURRENT_TIMESTAMP), + ('IdentiCurse','IdentiCurse','http://identicurse.net/', CURRENT_TIMESTAMP), + ('IdentiFox','IdentiFox','http://www.bitbucket.org/uncryptic/identifox/', CURRENT_TIMESTAMP), + ('identitwitch','IdentiTwitch','http://richfish.org/identitwitch/', CURRENT_TIMESTAMP), + ('Jiminy','Jiminy','', CURRENT_TIMESTAMP), + ('LaTwit','LaTwit','http://latwit.mac65.com/', CURRENT_TIMESTAMP), + ('LiveTweeter', 'LiveTweeter', 'http://addons.songbirdnest.com/addon/1204', CURRENT_TIMESTAMP), + ('livetweeter', 'livetweeter', 'http://addons.songbirdnest.com/addon/1204', CURRENT_TIMESTAMP), + ('maisha', 'Maisha', 'http://maisha.grango.org/', CURRENT_TIMESTAMP), + ('mbpidgin','mbpidgin','', CURRENT_TIMESTAMP), + ('Mobidentica', 'Mobidentica', 'http://www.substanceofcode.com/software/mobidentica/', CURRENT_TIMESTAMP), + ('moconica','Moconica','http://moconica.com/', CURRENT_TIMESTAMP), + ('mustard', 'mustard', 'http://mustard.macno.org', CURRENT_TIMESTAMP), + ('nambu','Nambu','http://www.nambu.com/', CURRENT_TIMESTAMP), + ('peoplebrowsr', 'PeopleBrowsr', 'http://www.peoplebrowsr.com/', CURRENT_TIMESTAMP), + ('Pikchur','Pikchur','http://www.pikchur.com/', CURRENT_TIMESTAMP), + ('Ping.fm','Ping.fm','http://ping.fm/', CURRENT_TIMESTAMP), + ('pingvine','PingVine','http://pingvine.com/', CURRENT_TIMESTAMP), + ('pocketwit','PockeTwit','', CURRENT_TIMESTAMP), + ('posty','Posty','http://spreadingfunkyness.com/posty/', CURRENT_TIMESTAMP), + ('qtwitter','qTwitter','http://qtwitter.ayoy.net/', CURRENT_TIMESTAMP), + ('qwit', 'Qwit', '', CURRENT_TIMESTAMP), + ('royalewithcheese','Royale With Cheese','http://p.hellyeah.org/', CURRENT_TIMESTAMP), + ('rssdent','rssdent','http://github.com/zcopley/rssdent/tree/master', CURRENT_TIMESTAMP), + ('rygh.no','rygh.no','http://rygh.no/', CURRENT_TIMESTAMP), + ('ryghsms','ryghsms','http://sms.rygh.no/', CURRENT_TIMESTAMP), + ('smob','SMOB','http://smob.sioc-project.org/', CURRENT_TIMESTAMP), + ('socialoomphBfD4pMqz31', 'SocialOomph', 'http://www.socialoomph.com/', CURRENT_TIMESTAMP), + ('spaz','Spaz','http://funkatron.com/spaz', CURRENT_TIMESTAMP), + ('StatusNet Desktop', 'StatusNet Desktop', 'http://status.net/desktop', CURRENT_TIMESTAMP), + ('StatusNet Mobile', 'StatusNet Mobile', 'http://status.net/mobile', CURRENT_TIMESTAMP), + ('StatusNet iPhone', 'iPhone', 'http://status.net/iphone', CURRENT_TIMESTAMP), + ('StatusNet Android', 'Android', 'http://status.net/android', CURRENT_TIMESTAMP), + ('StatusNet Blackberry', 'Blackberry', 'http://status.net/blackberry', CURRENT_TIMESTAMP), + ('tarpipe','tarpipe','http://tarpipe.com/', CURRENT_TIMESTAMP), + ('tjunar','Tjunar','http://nederflash.nl/boek/titels/tjunar-air', CURRENT_TIMESTAMP), + ('tr.im','tr.im','http://tr.im/', CURRENT_TIMESTAMP), + ('triklepost', 'Tricklepost', 'http://github.com/zcopley/tricklepost/tree/master', CURRENT_TIMESTAMP), + ('tweenky','Tweenky','http://beta.tweenky.com/', CURRENT_TIMESTAMP), + ('TweetDeck', 'TweetDeck', 'http://www.tweetdeck.com/', CURRENT_TIMESTAMP), + ('twhirl','Twhirl','http://www.twhirl.org/', CURRENT_TIMESTAMP), + ('twibble','twibble','http://www.twibble.de/', CURRENT_TIMESTAMP), + ('Twidge','Twidge','http://software.complete.org/twidge', CURRENT_TIMESTAMP), + ('twidge','Twidge','http://software.complete.org/twidge', CURRENT_TIMESTAMP), + ('twidroid','twidroid','http://www.twidroid.com/', CURRENT_TIMESTAMP), + ('twittelator','Twittelator','http://www.stone.com/iPhone/Twittelator/', CURRENT_TIMESTAMP), + ('twitter','Twitter','http://twitter.com/', CURRENT_TIMESTAMP), + ('twitterfeed','twitterfeed','http://twitterfeed.com/', CURRENT_TIMESTAMP), + ('twitterphoto','TwitterPhoto','http://richfish.org/twitterphoto/', CURRENT_TIMESTAMP), + ('twitterpm','Net::Twitter','http://search.cpan.org/dist/Net-Twitter/', CURRENT_TIMESTAMP), + ('twittertools','Twitter Tools','http://wordpress.org/extend/plugins/twitter-tools/', CURRENT_TIMESTAMP), + ('twitux','Twitux','http://live.gnome.org/DanielMorales/Twitux', CURRENT_TIMESTAMP), + ('twitvim','TwitVim','http://vim.sourceforge.net/scripts/script.php?script_id=2204', CURRENT_TIMESTAMP), + ('Updating.Me','Updating.Me','http://updating.me/', CURRENT_TIMESTAMP), + ('urfastr','urfastr','http://urfastr.net/', CURRENT_TIMESTAMP), + ('yatca','Yatca','http://www.yatca.com/', CURRENT_TIMESTAMP), + ('rss.me', 'rss.me', 'http://rss.me/', CURRENT_TIMESTAMP); diff --git a/db/sms_carrier.sql b/db/sms_carrier.sql index 59848d1c19..04deb38bae 100644 --- a/db/sms_carrier.sql +++ b/db/sms_carrier.sql @@ -1,66 +1,66 @@ INSERT INTO sms_carrier - (id, name, email_pattern, created) + (id, name, email_pattern, created) VALUES - (100056, '3 River Wireless', '%s@sms.3rivers.net', now()), - (100057, '7-11 Speakout', '%s@cingularme.com', now()), - (100058, 'Airtel (Karnataka, India)', '%s@airtelkk.com', now()), - (100059, 'Alaska Communications Systems', '%s@msg.acsalaska.com', now()), - (100060, 'Alltel Wireless', '%s@message.alltel.com', now()), - (100061, 'AT&T Wireless', '%s@txt.att.net', now()), - (100062, 'Bell Mobility (Canada)', '%s@txt.bell.ca', now()), - (100063, 'Boost Mobile', '%s@myboostmobile.com', now()), - (100064, 'Cellular One (Dobson)', '%s@mobile.celloneusa.com', now()), - (100065, 'Cingular (Postpaid)', '%s@cingularme.com', now()), - (100066, 'Centennial Wireless', '%s@cwemail.com', now()), - (100067, 'Cingular (GoPhone prepaid)', '%s@cingularme.com', now()), - (100068, 'Claro (Nicaragua)', '%s@ideasclaro-ca.com', now()), - (100069, 'Comcel', '%s@comcel.com.co', now()), - (100070, 'Cricket', '%s@sms.mycricket.com', now()), - (100071, 'CTI', '%s@sms.ctimovil.com.ar', now()), - (100072, 'Emtel (Mauritius)', '%s@emtelworld.net', now()), - (100073, 'Fido (Canada)', '%s@fido.ca', now()), - (100074, 'General Communications Inc.', '%s@msg.gci.net', now()), - (100075, 'Globalstar', '%s@msg.globalstarusa.com', now()), - (100076, 'Helio', '%s@myhelio.com', now()), - (100077, 'Illinois Valley Cellular', '%s@ivctext.com', now()), - (100078, 'i wireless', '%s.iws@iwspcs.net', now()), - (100079, 'Meteor (Ireland)', '%s@sms.mymeteor.ie', now()), - (100080, 'Mero Mobile (Nepal)', '%s@sms.spicenepal.com', now()), - (100081, 'MetroPCS', '%s@mymetropcs.com', now()), - (100082, 'Movicom', '%s@movimensaje.com.ar', now()), - (100083, 'Mobitel (Sri Lanka)', '%s@sms.mobitel.lk', now()), - (100084, 'Movistar (Colombia)', '%s@movistar.com.co', now()), - (100085, 'MTN (South Africa)', '%s@sms.co.za', now()), - (100086, 'MTS (Canada)', '%s@text.mtsmobility.com', now()), - (100087, 'Nextel (Argentina)', '%s@nextel.net.ar', now()), - (100088, 'Orange (Poland)', '%s@orange.pl', now()), - (100089, 'Personal (Argentina)', '%s@personal-net.com.ar', now()), - (100090, 'Plus GSM (Poland)', '%s@text.plusgsm.pl', now()), - (100091, 'President''s Choice (Canada)', '%s@txt.bell.ca', now()), - (100092, 'Qwest', '%s@qwestmp.com', now()), - (100093, 'Rogers (Canada)', '%s@pcs.rogers.com', now()), - (100094, 'Sasktel (Canada)', '%s@sms.sasktel.com', now()), - (100095, 'Setar Mobile email (Aruba)', '%s@mas.aw', now()), - (100096, 'Solo Mobile', '%s@txt.bell.ca', now()), - (100097, 'Sprint (PCS)', '%s@messaging.sprintpcs.com', now()), - (100098, 'Sprint (Nextel)', '%s@page.nextel.com', now()), - (100099, 'Suncom', '%s@tms.suncom.com', now()), - (100100, 'T-Mobile', '%s@tmomail.net', now()), - (100101, 'T-Mobile (Austria)', '%s@sms.t-mobile.at', now()), - (100102, 'Telus Mobility (Canada)', '%s@msg.telus.com', now()), - (100103, 'Thumb Cellular', '%s@sms.thumbcellular.com', now()), - (100104, 'Tigo (Formerly Ola)', '%s@sms.tigo.com.co', now()), - (100105, 'Unicel', '%s@utext.com', now()), - (100106, 'US Cellular', '%s@email.uscc.net', now()), - (100107, 'Verizon', '%s@vtext.com', now()), - (100108, 'Virgin Mobile (Canada)', '%s@vmobile.ca', now()), - (100109, 'Virgin Mobile (USA)', '%s@vmobl.com', now()), - (100110, 'YCC', '%s@sms.ycc.ru', now()), - (100111, 'Orange (UK)', '%s@orange.net', now()), - (100112, 'Cincinnati Bell Wireless', '%s@gocbw.com', now()), - (100113, 'T-Mobile Germany', '%s@t-mobile-sms.de', now()), - (100114, 'Vodafone Germany', '%s@vodafone-sms.de', now()), - (100115, 'E-Plus', '%s@smsmail.eplus.de', now()), - (100116, 'Cellular South', '%s@csouth1.com', now()), - (100117, 'ChinaMobile (139)', '%s@139.com', now()), - (100118, 'Dialog Axiata', '%s@dialog.lk', now()); + (100056, '3 River Wireless', '%s@sms.3rivers.net', CURRENT_TIMESTAMP), + (100057, '7-11 Speakout', '%s@cingularme.com', CURRENT_TIMESTAMP), + (100058, 'Airtel (Karnataka, India)', '%s@airtelkk.com', CURRENT_TIMESTAMP), + (100059, 'Alaska Communications Systems', '%s@msg.acsalaska.com', CURRENT_TIMESTAMP), + (100060, 'Alltel Wireless', '%s@message.alltel.com', CURRENT_TIMESTAMP), + (100061, 'AT&T Wireless', '%s@txt.att.net', CURRENT_TIMESTAMP), + (100062, 'Bell Mobility (Canada)', '%s@txt.bell.ca', CURRENT_TIMESTAMP), + (100063, 'Boost Mobile', '%s@myboostmobile.com', CURRENT_TIMESTAMP), + (100064, 'Cellular One (Dobson)', '%s@mobile.celloneusa.com', CURRENT_TIMESTAMP), + (100065, 'Cingular (Postpaid)', '%s@cingularme.com', CURRENT_TIMESTAMP), + (100066, 'Centennial Wireless', '%s@cwemail.com', CURRENT_TIMESTAMP), + (100067, 'Cingular (GoPhone prepaid)', '%s@cingularme.com', CURRENT_TIMESTAMP), + (100068, 'Claro (Nicaragua)', '%s@ideasclaro-ca.com', CURRENT_TIMESTAMP), + (100069, 'Comcel', '%s@comcel.com.co', CURRENT_TIMESTAMP), + (100070, 'Cricket', '%s@sms.mycricket.com', CURRENT_TIMESTAMP), + (100071, 'CTI', '%s@sms.ctimovil.com.ar', CURRENT_TIMESTAMP), + (100072, 'Emtel (Mauritius)', '%s@emtelworld.net', CURRENT_TIMESTAMP), + (100073, 'Fido (Canada)', '%s@fido.ca', CURRENT_TIMESTAMP), + (100074, 'General Communications Inc.', '%s@msg.gci.net', CURRENT_TIMESTAMP), + (100075, 'Globalstar', '%s@msg.globalstarusa.com', CURRENT_TIMESTAMP), + (100076, 'Helio', '%s@myhelio.com', CURRENT_TIMESTAMP), + (100077, 'Illinois Valley Cellular', '%s@ivctext.com', CURRENT_TIMESTAMP), + (100078, 'i wireless', '%s.iws@iwspcs.net', CURRENT_TIMESTAMP), + (100079, 'Meteor (Ireland)', '%s@sms.mymeteor.ie', CURRENT_TIMESTAMP), + (100080, 'Mero Mobile (Nepal)', '%s@sms.spicenepal.com', CURRENT_TIMESTAMP), + (100081, 'MetroPCS', '%s@mymetropcs.com', CURRENT_TIMESTAMP), + (100082, 'Movicom', '%s@movimensaje.com.ar', CURRENT_TIMESTAMP), + (100083, 'Mobitel (Sri Lanka)', '%s@sms.mobitel.lk', CURRENT_TIMESTAMP), + (100084, 'Movistar (Colombia)', '%s@movistar.com.co', CURRENT_TIMESTAMP), + (100085, 'MTN (South Africa)', '%s@sms.co.za', CURRENT_TIMESTAMP), + (100086, 'MTS (Canada)', '%s@text.mtsmobility.com', CURRENT_TIMESTAMP), + (100087, 'Nextel (Argentina)', '%s@nextel.net.ar', CURRENT_TIMESTAMP), + (100088, 'Orange (Poland)', '%s@orange.pl', CURRENT_TIMESTAMP), + (100089, 'Personal (Argentina)', '%s@personal-net.com.ar', CURRENT_TIMESTAMP), + (100090, 'Plus GSM (Poland)', '%s@text.plusgsm.pl', CURRENT_TIMESTAMP), + (100091, 'President''s Choice (Canada)', '%s@txt.bell.ca', CURRENT_TIMESTAMP), + (100092, 'Qwest', '%s@qwestmp.com', CURRENT_TIMESTAMP), + (100093, 'Rogers (Canada)', '%s@pcs.rogers.com', CURRENT_TIMESTAMP), + (100094, 'Sasktel (Canada)', '%s@sms.sasktel.com', CURRENT_TIMESTAMP), + (100095, 'Setar Mobile email (Aruba)', '%s@mas.aw', CURRENT_TIMESTAMP), + (100096, 'Solo Mobile', '%s@txt.bell.ca', CURRENT_TIMESTAMP), + (100097, 'Sprint (PCS)', '%s@messaging.sprintpcs.com', CURRENT_TIMESTAMP), + (100098, 'Sprint (Nextel)', '%s@page.nextel.com', CURRENT_TIMESTAMP), + (100099, 'Suncom', '%s@tms.suncom.com', CURRENT_TIMESTAMP), + (100100, 'T-Mobile', '%s@tmomail.net', CURRENT_TIMESTAMP), + (100101, 'T-Mobile (Austria)', '%s@sms.t-mobile.at', CURRENT_TIMESTAMP), + (100102, 'Telus Mobility (Canada)', '%s@msg.telus.com', CURRENT_TIMESTAMP), + (100103, 'Thumb Cellular', '%s@sms.thumbcellular.com', CURRENT_TIMESTAMP), + (100104, 'Tigo (Formerly Ola)', '%s@sms.tigo.com.co', CURRENT_TIMESTAMP), + (100105, 'Unicel', '%s@utext.com', CURRENT_TIMESTAMP), + (100106, 'US Cellular', '%s@email.uscc.net', CURRENT_TIMESTAMP), + (100107, 'Verizon', '%s@vtext.com', CURRENT_TIMESTAMP), + (100108, 'Virgin Mobile (Canada)', '%s@vmobile.ca', CURRENT_TIMESTAMP), + (100109, 'Virgin Mobile (USA)', '%s@vmobl.com', CURRENT_TIMESTAMP), + (100110, 'YCC', '%s@sms.ycc.ru', CURRENT_TIMESTAMP), + (100111, 'Orange (UK)', '%s@orange.net', CURRENT_TIMESTAMP), + (100112, 'Cincinnati Bell Wireless', '%s@gocbw.com', CURRENT_TIMESTAMP), + (100113, 'T-Mobile Germany', '%s@t-mobile-sms.de', CURRENT_TIMESTAMP), + (100114, 'Vodafone Germany', '%s@vodafone-sms.de', CURRENT_TIMESTAMP), + (100115, 'E-Plus', '%s@smsmail.eplus.de', CURRENT_TIMESTAMP), + (100116, 'Cellular South', '%s@csouth1.com', CURRENT_TIMESTAMP), + (100117, 'ChinaMobile (139)', '%s@139.com', CURRENT_TIMESTAMP), + (100118, 'Dialog Axiata', '%s@dialog.lk', CURRENT_TIMESTAMP); diff --git a/plugins/UserFlag/actions/clearflag.php b/plugins/UserFlag/actions/clearflag.php index fd85e22695..95f51de9ad 100644 --- a/plugins/UserFlag/actions/clearflag.php +++ b/plugins/UserFlag/actions/clearflag.php @@ -89,11 +89,11 @@ class ClearflagAction extends ProfileFormAction $ufp = new User_flag_profile(); $result = $ufp->query('UPDATE user_flag_profile ' . - 'SET cleared = now() ' . - 'WHERE cleared is null ' . + 'SET cleared = CURRENT_TIMESTAMP ' . + 'WHERE cleared IS NULL ' . 'AND profile_id = ' . $this->profile->id); - if ($result == false) { + if ($result === false) { // TRANS: Server exception given when flags could not be cleared. // TRANS: %s is a profile nickname. $msg = sprintf(