From f57e452209c5e09d091bd358d8249d4570a515f0 Mon Sep 17 00:00:00 2001 From: amygdala Date: Wed, 22 Sep 2010 14:21:07 -0500 Subject: [PATCH] Issue #266: Include license information at the top of each source file * Added GPL v2+ header, added copyright and license URL to docblocks, created docblock as necessary --- COPYING | 674 ++++++++++++++++++ GPL-LICENSE.txt | 278 -------- extras/wordpress/thinkup/thinkup.php | 273 +++---- .../TestOfAccountConfigurationController.php | 23 + tests/TestOfActivateAccountController.php | 23 + tests/TestOfCheckCrawlerController.php | 23 + tests/TestOfConfig.php | 23 + tests/TestOfCrawler.php | 23 + tests/TestOfCrawlerAuthController.php | 26 + tests/TestOfDAOFactory.php | 23 + tests/TestOfDashboardController.php | 23 + tests/TestOfExportController.php | 29 + tests/TestOfFollowMySQLDAO.php | 28 + tests/TestOfFollowerCountMySQLDAO.php | 27 + tests/TestOfForgotPasswordController.php | 28 + tests/TestOfGridController.php | 28 + tests/TestOfGridExportController.php | 27 + tests/TestOfInstaller.php | 23 + tests/TestOfInstallerController.php | 28 + tests/TestOfInstallerMySQLDAO.php | 23 + tests/TestOfInstanceMySQLDAO.php | 30 + tests/TestOfLinkMySQLDAO.php | 23 + tests/TestOfLoader.php | 23 + tests/TestOfLocationMySQLDAO.php | 28 + tests/TestOfLogger.php | 27 + tests/TestOfLoginController.php | 23 + tests/TestOfLogoutController.php | 23 + tests/TestOfMapController.php | 23 + tests/TestOfMarkParentController.php | 26 + tests/TestOfMutexMySQLDAO.php | 23 + tests/TestOfOwnerInstanceMySQLDAO.php | 28 + tests/TestOfOwnerMySQLDAO.php | 23 + tests/TestOfPDODAO.php | 30 + tests/TestOfPasswordResetController.php | 28 + tests/TestOfPluginHook.php | 23 + tests/TestOfPluginMySQLDAO.php | 30 + tests/TestOfPluginOptionController.php | 23 + tests/TestOfPluginOptionMySQLDAO.php | 28 + tests/TestOfPost.php | 23 + tests/TestOfPostController.php | 23 + tests/TestOfPostErrorMySQLDAO.php | 23 + tests/TestOfPostIterator.php | 28 + tests/TestOfPostMySQLDAO.php | 23 + tests/TestOfProfiler.php | 23 + tests/TestOfRSSController.php | 23 + tests/TestOfRegisterController.php | 23 + tests/TestOfSession.php | 23 + tests/TestOfSmartyThinkUp.php | 23 + tests/TestOfTestAdminController.php | 23 + tests/TestOfTestAuthAPIController.php | 23 + tests/TestOfTestAuthController.php | 23 + tests/TestOfTestController.php | 23 + .../TestOfToggleActiveInstanceController.php | 27 + tests/TestOfToggleActivePluginController.php | 27 + .../TestOfTogglePublicInstanceController.php | 27 + tests/TestOfUserController.php | 27 + tests/TestOfUserErrorMySQLDAO.php | 23 + tests/TestOfUserMySQLDAO.php | 23 + tests/TestOfUtils.php | 28 + tests/TestOfWebapp.php | 23 + tests/TestOfWebappTab.php | 23 + tests/TestOfWebappTabDataset.php | 23 + tests/WebTestOfChangePassword.php | 26 + tests/WebTestOfDashboard.php | 26 + tests/WebTestOfSignIn.php | 26 + tests/all_controller_tests.php | 31 + tests/all_integration_tests.php | 27 + tests/all_model_tests.php | 31 + tests/all_plugin_tests.php | 29 + tests/all_tests.php | 27 + tests/classes/class.TestAdminController.php | 23 + tests/classes/class.TestAuthAPIController.php | 23 + tests/classes/class.TestAuthController.php | 23 + tests/classes/class.TestController.php | 23 + tests/classes/class.TestFauxDAO.php | 29 + tests/classes/class.TestFauxHookableApp.php | 23 + tests/classes/class.TestFauxPlugin.php | 23 + tests/classes/class.TestMysqlDAO.php | 29 + .../class.ThinkUpBasicUnitTestCase.php | 23 + .../class.ThinkUpTestDatabaseHelper.php | 23 + tests/classes/class.ThinkUpUnitTestCase.php | 23 + tests/classes/class.ThinkUpWebTestCase.php | 27 + tests/classes/interface.TestAppPlugin.php | 23 + tests/classes/interface.TestDAO.php | 27 + tests/config.tests.sample.inc.php | 28 + tests/fixtures/class.FixtureBuilder.php | 23 + .../class.FixtureBuilderException.php | 29 +- tests/fixtures/tests/TestOfFixtureBuilder.php | 28 + tests/init.tests.php | 28 + webapp/COPYING | 674 ++++++++++++++++++ .../class.AccountConfigurationController.php | 23 + .../class.ActivateAccountController.php | 23 + .../class.CaptchaImageController.php | 23 + .../class.CheckCrawlerController.php | 23 + .../class.CrawlerAuthController.php | 23 + .../controller/class.CrawlerWebController.php | 23 + .../controller/class.DashboardController.php | 23 + .../controller/class.ExportController.php | 23 + .../class.ForgotPasswordController.php | 23 + .../_lib/controller/class.GridController.php | 23 + .../controller/class.GridExportController.php | 23 + .../controller/class.InstallerController.php | 23 + .../_lib/controller/class.LoginController.php | 23 + .../controller/class.LogoutController.php | 23 + .../_lib/controller/class.MapController.php | 23 + .../controller/class.MarkParentController.php | 23 + .../class.PasswordResetController.php | 23 + .../class.PluginConfigurationController.php | 23 + .../class.PluginOptionController.php | 23 + .../_lib/controller/class.PostController.php | 23 + .../_lib/controller/class.RSSController.php | 37 +- .../controller/class.RegisterController.php | 23 + .../class.ThinkUpAdminController.php | 23 + .../class.ThinkUpAuthAPIController.php | 23 + .../class.ThinkUpAuthController.php | 23 + .../controller/class.ThinkUpController.php | 23 + .../class.ToggleActiveInstanceController.php | 23 + .../class.ToggleActivePluginController.php | 23 + .../class.TogglePublicInstanceController.php | 23 + .../_lib/controller/class.UserController.php | 23 + .../_lib/extlib/simpletest/authentication.php | 4 +- webapp/_lib/extlib/simpletest/dumper.php | 4 +- webapp/_lib/extlib/simpletest/eclipse.php | 4 +- webapp/_lib/model/class.Captcha.php | 23 + webapp/_lib/model/class.Config.php | 23 + webapp/_lib/model/class.Crawler.php | 23 + webapp/_lib/model/class.DAOFactory.php | 23 + .../_lib/model/class.Database.deprecated.php | 23 + webapp/_lib/model/class.FollowMySQLDAO.php | 23 + .../model/class.FollowerCountMySQLDAO.php | 23 + webapp/_lib/model/class.Installer.php | 25 +- webapp/_lib/model/class.InstallerMySQLDAO.php | 23 + webapp/_lib/model/class.Instance.php | 26 + webapp/_lib/model/class.InstanceMySQLDAO.php | 25 +- webapp/_lib/model/class.Link.php | 23 + webapp/_lib/model/class.LinkMySQLDAO.php | 23 + webapp/_lib/model/class.Loader.php | 23 + webapp/_lib/model/class.Location.php | 25 +- webapp/_lib/model/class.LocationMySQLDAO.php | 23 + webapp/_lib/model/class.Logger.php | 23 + webapp/_lib/model/class.LoggerSlowSQL.php | 51 +- webapp/_lib/model/class.Mailer.php | 26 + webapp/_lib/model/class.MutexMySQLDAO.php | 23 + .../_lib/model/class.MySQLDAO.deprecated.php | 25 +- webapp/_lib/model/class.Owner.php | 23 + webapp/_lib/model/class.OwnerInstance.php | 25 +- .../model/class.OwnerInstanceMySQLDAO.php | 23 + webapp/_lib/model/class.OwnerMySQLDAO.php | 23 + webapp/_lib/model/class.PDODAO.php | 25 +- webapp/_lib/model/class.Plugin.php | 23 + webapp/_lib/model/class.PluginHook.php | 23 + webapp/_lib/model/class.PluginMySQLDAO.php | 23 + webapp/_lib/model/class.PluginOption.php | 25 +- .../_lib/model/class.PluginOptionMySQLDAO.php | 23 + webapp/_lib/model/class.Post.php | 23 + webapp/_lib/model/class.PostErrorMySQLDAO.php | 23 + webapp/_lib/model/class.PostIterator.php | 23 + webapp/_lib/model/class.PostMySQLDAO.php | 23 + webapp/_lib/model/class.Profiler.php | 23 + webapp/_lib/model/class.Session.php | 23 + webapp/_lib/model/class.SmartyThinkUp.php | 23 + webapp/_lib/model/class.User.php | 23 + webapp/_lib/model/class.UserErrorMySQLDAO.php | 23 + webapp/_lib/model/class.UserMySQLDAO.php | 23 + webapp/_lib/model/class.Utils.php | 23 + webapp/_lib/model/class.Webapp.php | 23 + webapp/_lib/model/class.WebappTab.php | 23 + webapp/_lib/model/class.WebappTabDataset.php | 25 +- .../exceptions/class.BadArgumentException.php | 29 +- .../class.CrawlerLockedException.php | 26 + .../exceptions/class.InstallerException.php | 26 + .../class.UnauthorizedUserException.php | 26 + webapp/_lib/model/interface.CrawlerPlugin.php | 23 + webapp/_lib/model/interface.FollowDAO.php | 23 + .../_lib/model/interface.FollowerCountDAO.php | 23 + webapp/_lib/model/interface.InstallerDAO.php | 23 + webapp/_lib/model/interface.InstanceDAO.php | 23 + webapp/_lib/model/interface.LinkDAO.php | 23 + webapp/_lib/model/interface.LocationDAO.php | 27 +- webapp/_lib/model/interface.MutexDAO.php | 23 + webapp/_lib/model/interface.OwnerDAO.php | 23 + .../_lib/model/interface.OwnerInstanceDAO.php | 25 +- webapp/_lib/model/interface.PluginDAO.php | 23 + .../_lib/model/interface.PluginOptionDAO.php | 23 + webapp/_lib/model/interface.PostDAO.php | 33 +- webapp/_lib/model/interface.PostErrorDAO.php | 23 + webapp/_lib/model/interface.ThinkUpPlugin.php | 23 + webapp/_lib/model/interface.UserDAO.php | 23 + webapp/_lib/model/interface.UserErrorDAO.php | 23 + webapp/_lib/model/interface.WebappPlugin.php | 23 + .../view/plugins/modifier.get_plugin_path.php | 26 + .../view/plugins/modifier.link_usernames.php | 23 + .../modifier.link_usernames_to_twitter.php | 23 + .../plugins/modifier.relative_datetime.php | 23 + .../plugins/modifier.truncate_for_select.php | 26 + .../view/plugins/modifier.tweet_from_id.php | 23 + webapp/account/index.php | 26 + webapp/account/plugin-options.php | 26 + webapp/account/toggle-active.php | 26 + webapp/account/toggle-pluginactive.php | 26 + webapp/account/toggle-public.php | 26 + webapp/config.sample.inc.php | 3 +- webapp/crawler/checkcrawler.php | 26 + webapp/crawler/crawl.php | 27 + webapp/crawler/rss.php | 26 + webapp/crawler/run.php | 26 + webapp/index.php | 26 + webapp/init.php | 28 +- webapp/install/index.php | 27 + webapp/install/version.php | 27 + .../expandurls/controller/expandurls.php | 26 + .../model/class.ExpandURLsPlugin.php | 23 + .../tests/TestOfExpandURLsPlugin.php | 29 +- webapp/plugins/facebook/auth.php | 28 + .../class.FacebookAuthController.php | 23 + ....FacebookPluginConfigurationController.php | 23 + .../plugins/facebook/controller/facebook.php | 26 + .../facebook/model/class.FacebookCrawler.php | 26 + .../facebook/model/class.FacebookPlugin.php | 29 + .../tests/TestOfFacebookAuthController.php | 23 + .../facebook/tests/TestOfFacebookCrawler.php | 27 + .../facebook/tests/TestOfFacebookPlugin.php | 27 + ...fFacebookPluginConfigurationController.php | 23 + .../facebook/tests/classes/mock.facebook.php | 27 + webapp/plugins/facebook/xd_receiver.php | 26 + ...humbnailsPluginConfigurationController.php | 23 + .../controller/flickrthumbnails.php | 27 + .../model/class.FlickrAPIAccessor.php | 26 + .../model/class.FlickrThumbnailsPlugin.php | 23 + .../tests/TestOfFlickrAPIAccessor.php | 27 + .../tests/TestOfFlickrThumbnailsPlugin.php | 29 + ...humbnailsPluginConfigurationController.php | 23 + .../tests/classes/mock.FlickrAPIAccessor.php | 27 + ...eoEncoderPluginConfigurationController.php | 23 + .../geoencoder/controller/geoencoder.php | 29 +- .../model/class.GeoEncoderCrawler.php | 23 + .../model/class.GeoEncoderPlugin.php | 23 + .../tests/TestOfGeoEncoderPlugin.php | 23 + ...eoEncoderPluginConfigurationController.php | 23 + .../tests/classes/mock.GeoEncoderCrawler.php | 23 + ...loThinkUpPluginConfigurationController.php | 23 + .../hellothinkup/controller/hellothinkup.php | 31 +- .../model/class.HelloThinkUpPlugin.php | 66 +- ...loThinkUpPluginConfigurationController.php | 23 + webapp/plugins/twitter/auth.php | 28 + .../class.TwitterAuthController.php | 23 + ...s.TwitterPluginConfigurationController.php | 23 + webapp/plugins/twitter/controller/twitter.php | 27 + .../class.CrawlerTwitterAPIAccessorOAuth.php | 23 + .../twitter/model/class.RetweetDetector.php | 23 + .../model/class.TwitterAPIAccessorOAuth.php | 23 + .../twitter/model/class.TwitterCrawler.php | 23 + .../model/class.TwitterOAuthThinkUp.php | 26 + .../twitter/model/class.TwitterPlugin.php | 23 + .../twitter/tests/TestOfRetweetDetector.php | 28 + .../tests/TestOfTwitterAPIAccessorOAuth.php | 28 + .../tests/TestOfTwitterAuthController.php | 23 + .../twitter/tests/TestOfTwitterCrawler.php | 23 + .../twitter/tests/TestOfTwitterOAuth.php | 27 + .../twitter/tests/TestOfTwitterPlugin.php | 23 + ...OfTwitterPluginConfigurationController.php | 23 + .../tests/classes/mock.TwitterOAuth.php | 23 + webapp/post/export.php | 28 + webapp/post/grid-export.php | 26 + webapp/post/grid.php | 26 + webapp/post/index.php | 26 + webapp/post/map.php | 26 + webapp/post/mark-parent.php | 26 + webapp/public.php | 28 +- webapp/session/activate.php | 26 + webapp/session/captcha-img.php | 26 + webapp/session/forgot.php | 27 + webapp/session/index.php | 28 +- webapp/session/login.php | 26 + webapp/session/logout.php | 26 + webapp/session/register.php | 26 + webapp/session/reset.php | 26 + webapp/user/index.php | 26 + 278 files changed, 8188 insertions(+), 472 deletions(-) create mode 100644 COPYING delete mode 100644 GPL-LICENSE.txt mode change 100755 => 100644 tests/TestOfActivateAccountController.php mode change 100755 => 100644 tests/TestOfConfig.php mode change 100755 => 100644 tests/TestOfCrawler.php mode change 100755 => 100644 tests/TestOfLogger.php mode change 100755 => 100644 tests/TestOfLogoutController.php mode change 100755 => 100644 tests/TestOfMutexMySQLDAO.php mode change 100755 => 100644 tests/TestOfOwnerInstanceMySQLDAO.php mode change 100755 => 100644 tests/TestOfOwnerMySQLDAO.php mode change 100755 => 100644 tests/TestOfPluginMySQLDAO.php mode change 100755 => 100644 tests/TestOfPostController.php mode change 100755 => 100644 tests/TestOfPostErrorMySQLDAO.php mode change 100755 => 100644 tests/TestOfPostMySQLDAO.php mode change 100755 => 100644 tests/TestOfRSSController.php mode change 100755 => 100644 tests/TestOfRegisterController.php mode change 100755 => 100644 tests/TestOfSession.php mode change 100755 => 100644 tests/TestOfSmartyThinkUp.php mode change 100755 => 100644 tests/TestOfTestAdminController.php mode change 100755 => 100644 tests/TestOfTestAuthAPIController.php mode change 100755 => 100644 tests/TestOfTestAuthController.php mode change 100755 => 100644 tests/TestOfUserErrorMySQLDAO.php mode change 100755 => 100644 tests/TestOfUserMySQLDAO.php mode change 100755 => 100644 tests/TestOfWebapp.php mode change 100755 => 100644 tests/all_tests.php mode change 100755 => 100644 tests/classes/class.TestAdminController.php mode change 100755 => 100644 tests/classes/class.TestAuthController.php mode change 100755 => 100644 tests/classes/class.TestFauxHookableApp.php mode change 100755 => 100644 tests/classes/class.TestFauxPlugin.php mode change 100755 => 100644 tests/classes/class.ThinkUpBasicUnitTestCase.php mode change 100755 => 100644 tests/classes/class.ThinkUpTestDatabaseHelper.php mode change 100755 => 100644 tests/classes/interface.TestAppPlugin.php mode change 100755 => 100644 tests/config.tests.sample.inc.php create mode 100644 webapp/COPYING mode change 100755 => 100644 webapp/_lib/controller/class.ActivateAccountController.php mode change 100755 => 100644 webapp/_lib/controller/class.LogoutController.php mode change 100755 => 100644 webapp/_lib/controller/class.PostController.php mode change 100755 => 100644 webapp/_lib/controller/class.RegisterController.php mode change 100755 => 100644 webapp/_lib/controller/class.ThinkUpAdminController.php mode change 100755 => 100644 webapp/_lib/controller/class.ThinkUpAuthController.php mode change 100755 => 100644 webapp/_lib/model/class.InstanceMySQLDAO.php mode change 100755 => 100644 webapp/_lib/model/class.Link.php mode change 100755 => 100644 webapp/_lib/model/class.Mailer.php mode change 100755 => 100644 webapp/_lib/model/class.MySQLDAO.deprecated.php mode change 100755 => 100644 webapp/_lib/model/class.OwnerMySQLDAO.php mode change 100755 => 100644 webapp/_lib/model/class.Plugin.php mode change 100755 => 100644 webapp/_lib/model/class.PostErrorMySQLDAO.php mode change 100755 => 100644 webapp/_lib/model/class.PostMySQLDAO.php mode change 100755 => 100644 webapp/_lib/model/class.UserErrorMySQLDAO.php mode change 100755 => 100644 webapp/_lib/model/class.UserMySQLDAO.php mode change 100755 => 100644 webapp/_lib/model/class.WebappTab.php mode change 100755 => 100644 webapp/_lib/model/class.WebappTabDataset.php mode change 100755 => 100644 webapp/_lib/model/exceptions/class.UnauthorizedUserException.php mode change 100755 => 100644 webapp/_lib/model/interface.CrawlerPlugin.php mode change 100755 => 100644 webapp/_lib/model/interface.InstanceDAO.php mode change 100755 => 100644 webapp/_lib/model/interface.OwnerDAO.php mode change 100755 => 100644 webapp/_lib/model/interface.PostDAO.php mode change 100755 => 100644 webapp/_lib/model/interface.PostErrorDAO.php mode change 100755 => 100644 webapp/_lib/model/interface.ThinkUpPlugin.php mode change 100755 => 100644 webapp/_lib/model/interface.UserDAO.php mode change 100755 => 100644 webapp/_lib/model/interface.UserErrorDAO.php mode change 100755 => 100644 webapp/_lib/model/interface.WebappPlugin.php mode change 100755 => 100644 webapp/_lib/view/plugins/modifier.tweet_from_id.php mode change 100755 => 100644 webapp/account/toggle-active.php mode change 100755 => 100644 webapp/account/toggle-pluginactive.php mode change 100755 => 100644 webapp/crawler/rss.php mode change 100755 => 100644 webapp/plugins/expandurls/controller/expandurls.php mode change 100755 => 100644 webapp/plugins/expandurls/model/class.ExpandURLsPlugin.php mode change 100755 => 100644 webapp/plugins/expandurls/tests/TestOfExpandURLsPlugin.php mode change 100755 => 100644 webapp/plugins/facebook/auth.php mode change 100755 => 100644 webapp/plugins/facebook/controller/class.FacebookPluginConfigurationController.php mode change 100755 => 100644 webapp/plugins/facebook/controller/facebook.php mode change 100755 => 100644 webapp/plugins/facebook/model/class.FacebookCrawler.php mode change 100755 => 100644 webapp/plugins/facebook/model/class.FacebookPlugin.php mode change 100755 => 100644 webapp/plugins/facebook/tests/TestOfFacebookCrawler.php mode change 100755 => 100644 webapp/plugins/facebook/tests/TestOfFacebookPluginConfigurationController.php mode change 100755 => 100644 webapp/plugins/facebook/tests/classes/mock.facebook.php mode change 100755 => 100644 webapp/plugins/facebook/xd_receiver.php mode change 100755 => 100644 webapp/plugins/flickrthumbnails/controller/flickrthumbnails.php mode change 100755 => 100644 webapp/plugins/flickrthumbnails/model/class.FlickrAPIAccessor.php mode change 100755 => 100644 webapp/plugins/flickrthumbnails/model/class.FlickrThumbnailsPlugin.php mode change 100755 => 100644 webapp/plugins/flickrthumbnails/tests/TestOfFlickrAPIAccessor.php mode change 100755 => 100644 webapp/plugins/flickrthumbnails/tests/TestOfFlickrThumbnailsPlugin.php mode change 100755 => 100644 webapp/plugins/hellothinkup/controller/class.HelloThinkUpPluginConfigurationController.php mode change 100755 => 100644 webapp/plugins/hellothinkup/model/class.HelloThinkUpPlugin.php mode change 100755 => 100644 webapp/plugins/twitter/controller/class.TwitterPluginConfigurationController.php mode change 100755 => 100644 webapp/plugins/twitter/controller/twitter.php mode change 100755 => 100644 webapp/plugins/twitter/model/class.RetweetDetector.php mode change 100755 => 100644 webapp/plugins/twitter/model/class.TwitterOAuthThinkUp.php mode change 100755 => 100644 webapp/plugins/twitter/model/class.TwitterPlugin.php mode change 100755 => 100644 webapp/plugins/twitter/tests/TestOfRetweetDetector.php mode change 100755 => 100644 webapp/plugins/twitter/tests/TestOfTwitterAPIAccessorOAuth.php mode change 100755 => 100644 webapp/plugins/twitter/tests/TestOfTwitterCrawler.php mode change 100755 => 100644 webapp/plugins/twitter/tests/TestOfTwitterOAuth.php mode change 100755 => 100644 webapp/plugins/twitter/tests/TestOfTwitterPluginConfigurationController.php mode change 100755 => 100644 webapp/plugins/twitter/tests/classes/mock.TwitterOAuth.php mode change 100755 => 100644 webapp/session/activate.php mode change 100755 => 100644 webapp/session/captcha-img.php mode change 100755 => 100644 webapp/session/forgot.php mode change 100755 => 100644 webapp/session/login.php mode change 100755 => 100644 webapp/session/logout.php diff --git a/COPYING b/COPYING new file mode 100644 index 0000000000..20d40b6bce --- /dev/null +++ b/COPYING @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. 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 +them 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 prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. 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. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey 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; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If 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 convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU 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 that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + 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. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +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. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + 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 +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + Copyright (C) + This program 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, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU 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. But first, please read +. \ No newline at end of file diff --git a/GPL-LICENSE.txt b/GPL-LICENSE.txt deleted file mode 100644 index 11dddd00ef..0000000000 --- a/GPL-LICENSE.txt +++ /dev/null @@ -1,278 +0,0 @@ - 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. diff --git a/extras/wordpress/thinkup/thinkup.php b/extras/wordpress/thinkup/thinkup.php index 944480df37..f4a6c5cb1a 100644 --- a/extras/wordpress/thinkup/thinkup.php +++ b/extras/wordpress/thinkup/thinkup.php @@ -1,4 +1,4 @@ -. + */ +/** + * @author Gina Trapani + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Gina Trapani */ - - // [thinkup_chronological_archive] function thinkup_chron_archive_handler($atts) { - extract(shortcode_atts(array('twitter_username'=>get_option('thinkup_twitter_username'), 'title'=>'

@#twitter_username#\'s Tweets in Chronological Order (sans replies)

', 'before'=>'
    ', 'after'=>'
', 'before_tweet'=>'
  • ', 'after_tweet'=>'
    • ', 'before_date'=>'', 'after_date'=>'', 'before_tweet_html'=>'', 'after_tweet_html'=>'', 'date_format'=>'Y.m.d, g:ia', 'gmt_offset'=>get_option('gmt_offset'), ), $atts)); - + extract(shortcode_atts(array('twitter_username'=>get_option('thinkup_twitter_username'), 'title'=> + '

    @#twitter_username#\'s Tweets in Chronological Order '. + '(sans replies)

    ', 'before'=>'
      ', 'after'=>'
    ', 'before_tweet'=>'
  • ', 'after_tweet'=>'
    • ', + 'before_date'=>'', 'after_date'=>'', 'before_tweet_html'=>'', 'after_tweet_html'=>'', 'date_format'=>'Y.m.d, g:ia', + 'gmt_offset'=>get_option('gmt_offset'), ), $atts)); + $options_array = thinkup_get_options_array(); - + if ($options_array['thinkup_server']['value'] != '') - $wpdb2 = new wpdb($options_array['thinkup_dbusername']['value'], $options_array['thinkup_dbpw']['value'], $options_array['thinkup_db']['value'], $options_array['thinkup_server']['value']); + $wpdb2 = new wpdb($options_array['thinkup_dbusername']['value'], $options_array['thinkup_dbpw']['value'], + $options_array['thinkup_db']['value'], $options_array['thinkup_server']['value']); else { global $wpdb; $wpdb2 = $wpdb; } - - $sql = $wpdb2->prepare("select pub_date, post_text, post_id from ".$options_array['thinkup_table_prefix']['value']."posts where author_username='%s' and in_reply_to_user_id is null order by pub_date asc", $twitter_username); - + + $sql = $wpdb2->prepare("select pub_date, post_text, post_id from ".$options_array['thinkup_table_prefix']['value']. + "posts where author_username='%s' and in_reply_to_user_id is null order by pub_date asc", $twitter_username); + $tweets = $wpdb2->get_results($sql); - + if ($tweets) { echo str_replace('#twitter_username#', $twitter_username, $title); echo "{$before}"; foreach ($tweets as $t) { $tweet_content = linkUrls($t->post_text); $tweet_content = linkTwitterUsers($tweet_content); - echo "{$before_tweet}{$before_tweet_html}{$tweet_content}{$after_tweet_html} {$before_date}post_id}/\">".actual_time($date_format, $gmt_offset, strtotime($t->pub_date))."{$after_date}{$after_tweet}"; + echo "{$before_tweet}{$before_tweet_html}{$tweet_content}{$after_tweet_html} {$before_date} + post_id}/\">". + actual_time($date_format, $gmt_offset, strtotime($t->pub_date))."{$after_date}{$after_tweet}"; } echo "{$after}"; } else { @@ -58,33 +77,38 @@ function thinkup_chron_archive_handler($atts) { // [thinkup_status_replies post_id="12345"] function thinkup_replies_handler($atts) { - extract(shortcode_atts(array('post_id'=>0, 'twitter_username'=>get_option('thinkup_twitter_username'), 'title'=>'

    Public Twitter replies to @#twitter_username#\'s tweet:

    ', 'before'=>'
      ', 'after'=>'
    ', 'before_tweet'=>'
  • ', 'after_tweet'=>'
    • ', 'before_user'=>'', 'after_user'=>'', 'before_tweet_html'=>'', 'after_tweet_html'=>'', 'date_format'=>'Y.m.d, g:ia', 'gmt_offset'=>8, ), $atts)); - + extract(shortcode_atts(array('post_id'=>0, 'twitter_username'=>get_option('thinkup_twitter_username'), + 'title'=>'

    Public Twitter replies to '. + '@#twitter_username#\'s tweet:

    ', 'before'=>'
      ', 'after'=>'
    ', 'before_tweet'=>'
  • ', + 'after_tweet'=>'
    • ', 'before_user'=>'', 'after_user'=>'', 'before_tweet_html'=>'', 'after_tweet_html'=>'', + 'date_format'=>'Y.m.d, g:ia', 'gmt_offset'=>8, ), $atts)); + $options_array = thinkup_get_options_array(); - + if ($options_array['thinkup_server']['value'] != '') - $wpdb2 = new wpdb($options_array['thinkup_dbusername']['value'], $options_array['thinkup_dbpw']['value'], $options_array['thinkup_db']['value'], $options_array['thinkup_server']['value']); + $wpdb2 = new wpdb($options_array['thinkup_dbusername']['value'], $options_array['thinkup_dbpw']['value'], + $options_array['thinkup_db']['value'], $options_array['thinkup_server']['value']); else { global $wpdb; $wpdb2 = $wpdb; } - - $sql = $wpdb2->prepare("select - t.*, u.* - from - ".$options_array['thinkup_table_prefix']['value']."posts t - inner join - ".$options_array['thinkup_table_prefix']['value']."users u - on - t.author_user_id = u.user_id - where - in_reply_to_post_id = %0.0f - AND u.is_protected = 0 - order by - follower_count desc;", $post_id); - + + $sql = $wpdb2->prepare("select + t.*, u.* + from + ".$options_array['thinkup_table_prefix']['value']."posts t + inner join + ".$options_array['thinkup_table_prefix']['value']."users u + on + t.author_user_id = u.user_id + where + in_reply_to_post_id = %0.0f + AND u.is_protected = 0 + order by + follower_count desc;", $post_id); + $replies = $wpdb2->get_results($sql); - + $output = ''; if ($replies) { $modified_title = str_replace('#twitter_username#', $twitter_username, $title); @@ -95,7 +119,9 @@ function thinkup_replies_handler($atts) { $tweet_content = strip_starter_username($t->post_text); $tweet_content = linkUrls($tweet_content); $tweet_content = linkTwitterUsers($tweet_content); - $output .= "{$before_tweet}{$before_user}author_username}/statuses/{$t->post_id}/\">{$t->author_username}{$after_user}: {$before_tweet_html}{$tweet_content}{$after_tweet_html}{$after_tweet}"; + $output .= "{$before_tweet}{$before_user}author_username}/statuses/". + "{$t->post_id}/\">{$t->author_username}{$after_user}: {$before_tweet_html}{$tweet_content}". + "{$after_tweet_html}{$after_tweet}"; } $output .= "{$after}"; } else { @@ -106,31 +132,33 @@ function thinkup_replies_handler($atts) { // [thinkup_status_reply_count post_id="12345"] function thinkup_reply_count_handler($atts) { - extract(shortcode_atts(array('post_id'=>0, 'before'=>'', 'after'=>' Twitter replies', ), $atts)); - + extract(shortcode_atts(array('post_id'=>0, 'before'=>'', 'after'=>' Twitter replies', ), + $atts)); + $options_array = thinkup_get_options_array(); - + if ($options_array['thinkup_server']['value'] != '') - $wpdb2 = new wpdb($options_array['thinkup_dbusername']['value'], $options_array['thinkup_dbpw']['value'], $options_array['thinkup_db']['value'], $options_array['thinkup_server']['value']); + $wpdb2 = new wpdb($options_array['thinkup_dbusername']['value'], $options_array['thinkup_dbpw']['value'], + $options_array['thinkup_db']['value'], $options_array['thinkup_server']['value']); else { global $wpdb; $wpdb2 = $wpdb; } - - $sql = $wpdb2->prepare("select - count(*) - from - ".$options_array['thinkup_table_prefix']['value']."posts t - inner join - ".$options_array['thinkup_table_prefix']['value']."users u - on - t.author_user_id = u.user_id - where - in_reply_to_post_id=%0.0f - AND u.is_protected = 0 - order by - follower_count desc;", $post_id); + + $sql = $wpdb2->prepare("select + count(*) + from + ".$options_array['thinkup_table_prefix']['value']."posts t + inner join + ".$options_array['thinkup_table_prefix']['value']."users u + on + t.author_user_id = u.user_id + where + in_reply_to_post_id=%0.0f + AND u.is_protected = 0 + order by + follower_count desc;", $post_id); //echo $sql; $count = $wpdb2->get_var($sql); $before_mod = str_replace('#permalink#', get_permalink(), $before); @@ -151,8 +179,9 @@ function linkUrls($text) { * $4 is the URL without the protocol:// * $5 is the URL parameters */ - $text = preg_replace("/(^|\s)(([a-zA-Z]+:\/\/)([a-z][a-z0-9_\..-]*[a-z]{2,6})([a-zA-Z0-9~\/*-?&%]*))/i", "$1$2", $text); - + $text = preg_replace("/(^|\s)(([a-zA-Z]+:\/\/)([a-z][a-z0-9_\..-]*[a-z]{2,6})([a-zA-Z0-9~\/*-?&%]*))/i", + "$1$2", $text); + /** * match www.something.domain/path/file.extension?some=variable&another=asf% * $1 is a possible space, this keeps us from linking href="[link]" etc @@ -161,8 +190,9 @@ function linkUrls($text) { * $4 is the URL matched without the www. * $5 is the URL parameters */ - $text = preg_replace("/(^|\s)(www\.([a-z][a-z0-9_\..-]*[a-z]{2,6})([a-zA-Z0-9~\/*-?&%]*))/i", "$1$2", $text); - + $text = preg_replace("/(^|\s)(www\.([a-z][a-z0-9_\..-]*[a-z]{2,6})([a-zA-Z0-9~\/*-?&%]*))/i", + "$1$2", $text); + return $text; } @@ -186,9 +216,23 @@ function thinkup_menu() { function thinkup_get_options_array() { - $arr = array('thinkup_twitter_username'=>array('key'=>'thinkup_twitter_username', 'label'=>'Default Twitter username:', 'description'=>'(Required) Override this by using the twitter_username parameter in the shortcode', 'type'=>'text', 'value'=>get_option('thinkup_twitter_username')), 'thinkup_table_prefix'=>array('key'=>'thinkup_table_prefix', 'label'=>'ThinkUp table prefix:', 'description'=>'(Optional) For example tu_', 'type'=>'text', 'value'=>get_option('thinkup_table_prefix')), 'thinkup_server'=>array('key'=>'thinkup_server', 'label'=>'ThinkUp database server:', 'description'=>'(Optional) If ThinkUp is located in a different database than WordPress', 'type'=>'text', 'value'=>get_option('thinkup_server')), 'thinkup_db'=>array('key'=>'thinkup_db', 'label'=>'ThinkUp database name:', 'description'=>'(Optional) If ThinkUp is located in a different database than WordPress', 'type'=>'text', 'value'=>get_option('thinkup_db')), 'thinkup_dbusername'=>array('key'=>'thinkup_dbusername', 'label'=>'ThinkUp database username:', 'description'=>'(Optional) If ThinkUp is located in a different database than WordPress', 'type'=>'text', 'value'=>get_option('thinkup_dbusername')), 'thinkup_dbpw'=>array('key'=>'thinkup_dbpw', 'label'=>'ThinkUp database password:', 'description'=>'(Optional) If ThinkUp is located in a different database than WordPress', 'type'=>'password', 'value'=>thinkup_unscramble_password(get_option('thinkup_dbpw')))); + $arr = array('thinkup_twitter_username'=>array('key'=>'thinkup_twitter_username', + 'label'=>'Default Twitter username:', 'description'=>'(Required) Override this by using the twitter_username '. + 'parameter in the shortcode', 'type'=>'text', 'value'=>get_option('thinkup_twitter_username')), + 'thinkup_table_prefix'=>array('key'=>'thinkup_table_prefix', 'label'=>'ThinkUp table prefix:', + 'description'=>'(Optional) For example tu_', 'type'=>'text', 'value'=>get_option('thinkup_table_prefix')), + 'thinkup_server'=>array('key'=>'thinkup_server', 'label'=>'ThinkUp database server:', + 'description'=>'(Optional) If ThinkUp is located in a different database than WordPress', 'type'=>'text', + 'value'=>get_option('thinkup_server')), 'thinkup_db'=>array('key'=>'thinkup_db', 'label'=>'ThinkUp database name:', + 'description'=>'(Optional) If ThinkUp is located in a different database than WordPress', 'type'=>'text', + 'value'=>get_option('thinkup_db')), 'thinkup_dbusername'=>array('key'=>'thinkup_dbusername', + 'label'=>'ThinkUp database username:', 'description'=>'(Optional) If ThinkUp is located in a different database '. + 'than WordPress', 'type'=>'text', 'value'=>get_option('thinkup_dbusername')), 'thinkup_dbpw'=>array( + 'key'=>'thinkup_dbpw', 'label'=>'ThinkUp database password:', 'description'=> + '(Optional) If ThinkUp is located in a different database than WordPress', 'type'=>'password', + 'value'=>thinkup_unscramble_password(get_option('thinkup_dbpw')))); return $arr; - + } //Don't want to store passwords in plaintext in the database @@ -211,70 +255,63 @@ function thinkup_unscramble_password($stored_password) { function thinkup_options() { // variables for the field and option names $options_hidden_field_name = 'thinkup_submit_hidden'; - + $options_array = thinkup_get_options_array(); - + // See if the user has posted us some information // If they did, this hidden field will be set to 'Y' if ($_POST[$options_hidden_field_name] == 'Y') { - + foreach ($options_array as $opt) { // Read their posted value $opt['value'] = $_POST[$opt['key']]; // Save the posted value in the database - + if ($opt['key'] == 'thinkup_dbpw') - update_option($opt['key'], thinkup_scramble_password($opt['value'])); + update_option($opt['key'], thinkup_scramble_password($opt['value'])); else - update_option($opt['key'], $opt['value']); + update_option($opt['key'], $opt['value']); } // Put an options updated message on the screen - -?> + + ?>
    -

    - -

    +

    -'; -// header -echo "

    ".__('ThinkUp Plugin Options', 'mt_trans_domain')."

    "; -// options form -?> -
    - - - - - - - - -
    - - - -
    - - - -
    -

    - -

    + '; + // header + echo "

    ".__('ThinkUp Plugin Options', 'mt_trans_domain')."

    "; + // options form + ?> + + + + + + + + +
    +
    +
    +

    - diff --git a/tests/TestOfAccountConfigurationController.php b/tests/TestOfAccountConfigurationController.php index a2c19c3926..75714ae7d7 100644 --- a/tests/TestOfAccountConfigurationController.php +++ b/tests/TestOfAccountConfigurationController.php @@ -1,4 +1,25 @@ . +*/ require_once dirname(__FILE__).'/init.tests.php'; require_once THINKUP_ROOT_PATH.'webapp/_lib/extlib/simpletest/autorun.php'; require_once THINKUP_ROOT_PATH.'webapp/config.inc.php'; @@ -13,6 +34,8 @@ /** * Test of AccountConfigurationController * + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Gina Trapani, Dwi Widiastuti, ekansh * @author Gina Trapani * */ diff --git a/tests/TestOfActivateAccountController.php b/tests/TestOfActivateAccountController.php old mode 100755 new mode 100644 index b149a5f40e..4106cb335d --- a/tests/TestOfActivateAccountController.php +++ b/tests/TestOfActivateAccountController.php @@ -1,4 +1,25 @@ . +*/ require dirname(__FILE__).'/init.tests.php'; require_once THINKUP_ROOT_PATH.'webapp/_lib/extlib/simpletest/autorun.php'; require_once THINKUP_ROOT_PATH.'webapp/config.inc.php'; @@ -6,6 +27,8 @@ /** * Test of ActivateAccountController * + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Gina Trapani, Dwi Widiastuti * @author Gina Trapani * */ diff --git a/tests/TestOfCheckCrawlerController.php b/tests/TestOfCheckCrawlerController.php index f45209daf6..51740d968e 100644 --- a/tests/TestOfCheckCrawlerController.php +++ b/tests/TestOfCheckCrawlerController.php @@ -1,4 +1,25 @@ . +*/ require_once dirname(__FILE__).'/init.tests.php'; require_once THINKUP_ROOT_PATH.'webapp/_lib/extlib/simpletest/autorun.php'; require_once THINKUP_ROOT_PATH.'webapp/config.inc.php'; @@ -6,6 +27,8 @@ /** * Test of CheckCrawlerController * + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Dwi Widiastuti, Gina Trapani * @author Gina Trapani * */ diff --git a/tests/TestOfConfig.php b/tests/TestOfConfig.php old mode 100755 new mode 100644 index 2b918f900e..f4246efc17 --- a/tests/TestOfConfig.php +++ b/tests/TestOfConfig.php @@ -1,10 +1,33 @@ . +*/ require_once dirname(__FILE__).'/init.tests.php'; require_once THINKUP_ROOT_PATH.'webapp/_lib/extlib/simpletest/autorun.php'; require_once THINKUP_ROOT_PATH.'webapp/config.inc.php'; /** * Test of Config object + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Gina Trapani, Dwi Widiastuti, Mark Wilkie * @author Gina Trapani * */ diff --git a/tests/TestOfCrawler.php b/tests/TestOfCrawler.php old mode 100755 new mode 100644 index 7514b83484..f96e6e8d98 --- a/tests/TestOfCrawler.php +++ b/tests/TestOfCrawler.php @@ -1,4 +1,25 @@ . +*/ require_once dirname(__FILE__).'/init.tests.php'; require_once THINKUP_ROOT_PATH.'webapp/_lib/extlib/simpletest/autorun.php'; require_once THINKUP_ROOT_PATH.'webapp/config.inc.php'; @@ -7,6 +28,8 @@ /** * Test Crawler object + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Gina Trapani, Dwi Widiastuti, Guillaume Boudreau * @author Gina Trapani * */ diff --git a/tests/TestOfCrawlerAuthController.php b/tests/TestOfCrawlerAuthController.php index 4642e384db..cd7e2feee2 100644 --- a/tests/TestOfCrawlerAuthController.php +++ b/tests/TestOfCrawlerAuthController.php @@ -1,4 +1,30 @@ . +*/ +/** + * @author Gina Trapani + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Gina Trapani +*/ require_once dirname(__FILE__).'/init.tests.php'; require_once THINKUP_ROOT_PATH.'webapp/_lib/extlib/simpletest/autorun.php'; require_once THINKUP_ROOT_PATH.'webapp/config.inc.php'; diff --git a/tests/TestOfDAOFactory.php b/tests/TestOfDAOFactory.php index 28de037262..1b551fff30 100644 --- a/tests/TestOfDAOFactory.php +++ b/tests/TestOfDAOFactory.php @@ -1,4 +1,25 @@ . +*/ require_once dirname(__FILE__).'/init.tests.php'; require_once THINKUP_ROOT_PATH.'webapp/_lib/extlib/simpletest/autorun.php'; require_once THINKUP_ROOT_PATH.'webapp/config.inc.php'; @@ -6,6 +27,8 @@ /** * Test of DAOFactory * + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Gina Trapani, Mark Wilkie, Dwi Widiastuti, Christoffer Viken, Guillaume Boudreau * @author Mark Wilkie * @author Gina Trapani * diff --git a/tests/TestOfDashboardController.php b/tests/TestOfDashboardController.php index ba3fd0caf8..476950abc2 100644 --- a/tests/TestOfDashboardController.php +++ b/tests/TestOfDashboardController.php @@ -1,4 +1,25 @@ . +*/ require_once dirname(__FILE__).'/init.tests.php'; require_once THINKUP_ROOT_PATH.'webapp/_lib/extlib/simpletest/autorun.php'; require_once THINKUP_ROOT_PATH.'webapp/config.inc.php'; @@ -9,6 +30,8 @@ /** * Test of DashboardController * + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Gina Trapani, Mark Wilkie * @author Gina Trapani * */ diff --git a/tests/TestOfExportController.php b/tests/TestOfExportController.php index b30293ff00..af7cfede0a 100644 --- a/tests/TestOfExportController.php +++ b/tests/TestOfExportController.php @@ -1,4 +1,33 @@ . +*/ +/** + * @author Gina Trapani + * @author Dwi Widiastuti + * @author Mark Wilkie + * @author Michael Louis Thaler + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Gina Trapani, Dwi Widiastuti, Mark Wilkie, Michael Louis Thaler +*/ require_once dirname(__FILE__).'/init.tests.php'; require_once THINKUP_ROOT_PATH.'webapp/_lib/extlib/simpletest/autorun.php'; require_once THINKUP_ROOT_PATH.'webapp/config.inc.php'; diff --git a/tests/TestOfFollowMySQLDAO.php b/tests/TestOfFollowMySQLDAO.php index 0d7bc2fd4b..c7551d5421 100644 --- a/tests/TestOfFollowMySQLDAO.php +++ b/tests/TestOfFollowMySQLDAO.php @@ -1,4 +1,32 @@ . +*/ +/** + * @author Gina Trapani + * @author Christoffer Viken + * @author Dwi Widiastuti + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Gina Trapani, Christoffer Viken, Dwi Widiastuti +*/ require_once dirname(__FILE__).'/init.tests.php'; require_once THINKUP_ROOT_PATH.'webapp/_lib/extlib/simpletest/autorun.php'; require_once THINKUP_ROOT_PATH.'webapp/config.inc.php'; diff --git a/tests/TestOfFollowerCountMySQLDAO.php b/tests/TestOfFollowerCountMySQLDAO.php index c20eab261b..b25063e4a3 100644 --- a/tests/TestOfFollowerCountMySQLDAO.php +++ b/tests/TestOfFollowerCountMySQLDAO.php @@ -1,4 +1,31 @@ . +*/ +/** + * @author Gina Trapani + * @author Dwi Widiastuti + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Gina Trapani, Dwi Widiastuti +*/ require_once dirname(__FILE__).'/init.tests.php'; require_once THINKUP_ROOT_PATH.'webapp/_lib/extlib/simpletest/autorun.php'; require_once THINKUP_ROOT_PATH.'webapp/config.inc.php'; diff --git a/tests/TestOfForgotPasswordController.php b/tests/TestOfForgotPasswordController.php index f8ef443ddc..f82d8f502e 100644 --- a/tests/TestOfForgotPasswordController.php +++ b/tests/TestOfForgotPasswordController.php @@ -1,4 +1,32 @@ . +*/ +/** + * @author Dwi Widiastuti + * @author Gina Trapani + * @author Michael Louis Thaler + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Dwi Widiastuti, Gina Trapani, Michael Louis Thaler +*/ require_once dirname(__FILE__).'/init.tests.php'; require_once THINKUP_ROOT_PATH.'webapp/_lib/extlib/simpletest/autorun.php'; require_once THINKUP_ROOT_PATH.'webapp/config.inc.php'; diff --git a/tests/TestOfGridController.php b/tests/TestOfGridController.php index 08911252bf..1a5a0d163a 100644 --- a/tests/TestOfGridController.php +++ b/tests/TestOfGridController.php @@ -1,4 +1,32 @@ . +*/ +/** + * @author Mark Wilkie + * @author Gina Trapani + * @author Guillaume Boudreau + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Mark Wilkie, Gina Trapani, Guillaume Boudreau +*/ require_once dirname(__FILE__).'/init.tests.php'; require_once THINKUP_ROOT_PATH.'webapp/_lib/extlib/simpletest/autorun.php'; require_once THINKUP_ROOT_PATH.'webapp/config.inc.php'; diff --git a/tests/TestOfGridExportController.php b/tests/TestOfGridExportController.php index 22f06a69e4..e9e3c7cc44 100644 --- a/tests/TestOfGridExportController.php +++ b/tests/TestOfGridExportController.php @@ -1,4 +1,31 @@ . +*/ +/** + * @author Gina Trapani + * @author Mark Wilkie + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Gina Trapani, Mark Wilkie +*/ require_once dirname(__FILE__).'/init.tests.php'; require_once THINKUP_ROOT_PATH.'webapp/_lib/extlib/simpletest/autorun.php'; require_once THINKUP_ROOT_PATH.'webapp/config.inc.php'; diff --git a/tests/TestOfInstaller.php b/tests/TestOfInstaller.php index 16ec967beb..688b0a22a7 100644 --- a/tests/TestOfInstaller.php +++ b/tests/TestOfInstaller.php @@ -1,4 +1,25 @@ . +*/ require_once dirname(__FILE__).'/init.tests.php'; require_once THINKUP_ROOT_PATH.'webapp/_lib/extlib/simpletest/autorun.php'; require_once THINKUP_ROOT_PATH.'webapp/config.inc.php'; @@ -6,6 +27,8 @@ /** * Test Of Installer * + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Dwi Widiastuti, Gina Trapani * @author Dwi Widiastuti * @author Gina Trapani */ diff --git a/tests/TestOfInstallerController.php b/tests/TestOfInstallerController.php index 3246342ecf..ccc2088b1d 100644 --- a/tests/TestOfInstallerController.php +++ b/tests/TestOfInstallerController.php @@ -1,4 +1,32 @@ . +*/ +/** + * @author Gina Trapani + * @author Guillaume Boudreau + * @author Dwi Widiastuti + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Gina Trapani, Guillaume Boudreau, Dwi Widiastuti +*/ require_once dirname(__FILE__).'/init.tests.php'; require_once THINKUP_ROOT_PATH.'webapp/_lib/extlib/simpletest/autorun.php'; require_once THINKUP_ROOT_PATH.'webapp/config.inc.php'; diff --git a/tests/TestOfInstallerMySQLDAO.php b/tests/TestOfInstallerMySQLDAO.php index 3441e62f2d..06a24433b3 100644 --- a/tests/TestOfInstallerMySQLDAO.php +++ b/tests/TestOfInstallerMySQLDAO.php @@ -1,4 +1,25 @@ . +*/ require_once dirname(__FILE__).'/init.tests.php'; require_once THINKUP_ROOT_PATH.'webapp/_lib/extlib/simpletest/autorun.php'; require_once THINKUP_ROOT_PATH.'webapp/config.inc.php'; @@ -6,6 +27,8 @@ /** * Test Of Installer MySQLDAO * + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Dwi Widiastuti, Gina Trapani, Guillaume Boudreau * @author Dwi Widiastuti * @author Gina Trapani */ diff --git a/tests/TestOfInstanceMySQLDAO.php b/tests/TestOfInstanceMySQLDAO.php index f10c48f031..898f7e6a9f 100644 --- a/tests/TestOfInstanceMySQLDAO.php +++ b/tests/TestOfInstanceMySQLDAO.php @@ -1,4 +1,34 @@ . +*/ +/** + * @author Gina Trapani + * @author Guillaume Boudreau + * @author Christoffer Viken + * @author Dwi Widiastuti + * @author Mark Wilkie + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Gina Trapani, Guillaume Boudreau, Christoffer Viken, Dwi Widiastuti, Mark Wilkie +*/ require_once dirname(__FILE__).'/init.tests.php'; require_once THINKUP_ROOT_PATH.'webapp/_lib/extlib/simpletest/autorun.php'; require_once THINKUP_ROOT_PATH.'webapp/config.inc.php'; diff --git a/tests/TestOfLinkMySQLDAO.php b/tests/TestOfLinkMySQLDAO.php index 2f21ae44d3..f490587208 100644 --- a/tests/TestOfLinkMySQLDAO.php +++ b/tests/TestOfLinkMySQLDAO.php @@ -1,10 +1,33 @@ . +*/ require_once dirname(__FILE__).'/init.tests.php'; require_once THINKUP_ROOT_PATH.'webapp/_lib/extlib/simpletest/autorun.php'; require_once THINKUP_ROOT_PATH.'webapp/config.inc.php'; /** * Test Of Link DAO + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Gina Trapani, Christoffer Viken, Dwi Widiastuti * @author Gina Trapani * @author christoffer Viken */ diff --git a/tests/TestOfLoader.php b/tests/TestOfLoader.php index b2f0f949b0..917b25bde6 100644 --- a/tests/TestOfLoader.php +++ b/tests/TestOfLoader.php @@ -1,4 +1,25 @@ . +*/ require_once dirname(__FILE__).'/init.tests.php'; require_once THINKUP_ROOT_PATH.'webapp/_lib/extlib/simpletest/autorun.php'; require_once THINKUP_ROOT_PATH.'webapp/config.inc.php'; @@ -6,6 +27,8 @@ /** * Test of Loader class * + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Gina Trapani, Dwi Widiastuti, Mark Wilkie * @author Dwi Widiastuti * @author Gina Trapani */ diff --git a/tests/TestOfLocationMySQLDAO.php b/tests/TestOfLocationMySQLDAO.php index 2638393c46..f638c974a5 100644 --- a/tests/TestOfLocationMySQLDAO.php +++ b/tests/TestOfLocationMySQLDAO.php @@ -1,4 +1,32 @@ . +*/ +/** + * @author Dwi Widiastuti + * @author Gina Trapani + * @author ekansh + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Dwi Widiastuti, Gina Trapani, ekansh +*/ require_once dirname(__FILE__).'/init.tests.php'; require_once THINKUP_ROOT_PATH.'webapp/_lib/extlib/simpletest/autorun.php'; require_once THINKUP_ROOT_PATH.'webapp/config.inc.php'; diff --git a/tests/TestOfLogger.php b/tests/TestOfLogger.php old mode 100755 new mode 100644 index e0d1c3b24d..fa70451f15 --- a/tests/TestOfLogger.php +++ b/tests/TestOfLogger.php @@ -1,4 +1,31 @@ . +*/ +/** + * @author Gina Trapani + * @author Dwi Widiastuti + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Gina Trapani, Dwi Widiastuti +*/ require_once dirname(__FILE__).'/init.tests.php'; require_once THINKUP_ROOT_PATH.'webapp/_lib/extlib/simpletest/autorun.php'; require_once THINKUP_ROOT_PATH.'webapp/config.inc.php'; diff --git a/tests/TestOfLoginController.php b/tests/TestOfLoginController.php index f7e5e30e80..7d6b4efcf7 100644 --- a/tests/TestOfLoginController.php +++ b/tests/TestOfLoginController.php @@ -1,4 +1,25 @@ . +*/ require_once dirname(__FILE__).'/init.tests.php'; require_once THINKUP_ROOT_PATH.'webapp/_lib/extlib/simpletest/autorun.php'; require_once THINKUP_ROOT_PATH.'webapp/config.inc.php'; @@ -9,6 +30,8 @@ /** * Test of LoginController * + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Gina Trapani, Dwi Widiastuti * @author Gina Trapani * */ diff --git a/tests/TestOfLogoutController.php b/tests/TestOfLogoutController.php old mode 100755 new mode 100644 index 618b5495c6..0147c05e74 --- a/tests/TestOfLogoutController.php +++ b/tests/TestOfLogoutController.php @@ -1,4 +1,25 @@ . +*/ require_once dirname(__FILE__).'/init.tests.php'; require_once THINKUP_ROOT_PATH.'webapp/_lib/extlib/simpletest/autorun.php'; require_once THINKUP_ROOT_PATH.'webapp/config.inc.php'; @@ -6,6 +27,8 @@ /** * Test of LoginController * + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Gina Trapani, Dwi Widiastuti * @author Gina Trapani * */ diff --git a/tests/TestOfMapController.php b/tests/TestOfMapController.php index d29a64187d..1435284f59 100644 --- a/tests/TestOfMapController.php +++ b/tests/TestOfMapController.php @@ -1,4 +1,25 @@ . +*/ require_once dirname(__FILE__).'/init.tests.php'; require_once THINKUP_ROOT_PATH.'webapp/_lib/extlib/simpletest/autorun.php'; require_once THINKUP_ROOT_PATH.'webapp/config.inc.php'; @@ -6,6 +27,8 @@ /** * Test of Map Controller * + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Gina Trapani, Dwi Widiastuti, ekansh * @author Ekansh Preet Singh * @author Mark Wilkie * @author Gina Trapani diff --git a/tests/TestOfMarkParentController.php b/tests/TestOfMarkParentController.php index dc684a7499..3f1164beb3 100644 --- a/tests/TestOfMarkParentController.php +++ b/tests/TestOfMarkParentController.php @@ -1,4 +1,30 @@ . +*/ +/** + * @author Gina Trapani + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Gina Trapani +*/ require_once dirname(__FILE__).'/init.tests.php'; require_once THINKUP_ROOT_PATH.'webapp/_lib/extlib/simpletest/autorun.php'; require_once THINKUP_ROOT_PATH.'webapp/config.inc.php'; diff --git a/tests/TestOfMutexMySQLDAO.php b/tests/TestOfMutexMySQLDAO.php old mode 100755 new mode 100644 index 2635054357..04292ec5c9 --- a/tests/TestOfMutexMySQLDAO.php +++ b/tests/TestOfMutexMySQLDAO.php @@ -1,4 +1,25 @@ . +*/ require_once dirname(__FILE__).'/init.tests.php'; require_once THINKUP_ROOT_PATH.'webapp/_lib/extlib/simpletest/autorun.php'; require_once THINKUP_ROOT_PATH.'webapp/config.inc.php'; @@ -6,6 +27,8 @@ /** * Test of MutexDAO * + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Guillaume Boudreau * @author Guillaume Boudreau * */ diff --git a/tests/TestOfOwnerInstanceMySQLDAO.php b/tests/TestOfOwnerInstanceMySQLDAO.php old mode 100755 new mode 100644 index 9a843dd9be..9de54b596b --- a/tests/TestOfOwnerInstanceMySQLDAO.php +++ b/tests/TestOfOwnerInstanceMySQLDAO.php @@ -1,4 +1,32 @@ . +*/ +/** + * @author Gina Trapani + * @author Dwi Widiastuti + * @author Mark Wilkie + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Gina Trapani, Dwi Widiastuti, Mark Wilkie +*/ require_once dirname(__FILE__).'/init.tests.php'; require_once THINKUP_ROOT_PATH.'webapp/_lib/extlib/simpletest/autorun.php'; require_once THINKUP_ROOT_PATH.'webapp/config.inc.php'; diff --git a/tests/TestOfOwnerMySQLDAO.php b/tests/TestOfOwnerMySQLDAO.php old mode 100755 new mode 100644 index d8614fbe65..c70c3bebcd --- a/tests/TestOfOwnerMySQLDAO.php +++ b/tests/TestOfOwnerMySQLDAO.php @@ -1,10 +1,33 @@ . +*/ require_once dirname(__FILE__).'/init.tests.php'; require_once THINKUP_ROOT_PATH.'webapp/_lib/extlib/simpletest/autorun.php'; require_once THINKUP_ROOT_PATH.'webapp/config.inc.php'; /** * Test of OwnerMySQL DAO implementation + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Gina Trapani, Dwi Widiastuti, Michael Louis Thaler * @author Gina Trapani * */ diff --git a/tests/TestOfPDODAO.php b/tests/TestOfPDODAO.php index 090822c427..622f0cea6b 100644 --- a/tests/TestOfPDODAO.php +++ b/tests/TestOfPDODAO.php @@ -1,4 +1,34 @@ . +*/ +/** + * @author Gina Trapani + * @author Dwi Widiastuti + * @author Mark Wilkie + * @author Christoffer Viken + * @author Guillaume Boudreau + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Gina Trapani, Dwi Widiastuti, Mark Wilkie, Christoffer Viken, Guillaume Boudreau +*/ require_once dirname(__FILE__).'/init.tests.php'; require_once THINKUP_ROOT_PATH.'webapp/_lib/extlib/simpletest/autorun.php'; require_once THINKUP_ROOT_PATH.'webapp/config.inc.php'; diff --git a/tests/TestOfPasswordResetController.php b/tests/TestOfPasswordResetController.php index 3b907ef4f3..ceb6e9afac 100644 --- a/tests/TestOfPasswordResetController.php +++ b/tests/TestOfPasswordResetController.php @@ -1,4 +1,32 @@ . +*/ +/** + * @author Dwi Widiastuti + * @author Gina Trapani + * @author Michael Louis Thaler + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Dwi Widiastuti, Gina Trapani, Michael Louis Thaler +*/ require_once dirname(__FILE__).'/init.tests.php'; require_once THINKUP_ROOT_PATH.'webapp/_lib/extlib/simpletest/autorun.php'; require_once THINKUP_ROOT_PATH.'webapp/config.inc.php'; diff --git a/tests/TestOfPluginHook.php b/tests/TestOfPluginHook.php index 1c9ea9b00f..cd97851627 100644 --- a/tests/TestOfPluginHook.php +++ b/tests/TestOfPluginHook.php @@ -1,10 +1,33 @@ . +*/ require_once dirname(__FILE__).'/init.tests.php'; require_once THINKUP_ROOT_PATH.'webapp/_lib/extlib/simpletest/autorun.php'; require_once THINKUP_ROOT_PATH.'webapp/config.inc.php'; /** * Test of PluginHook class + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Gina Trapani, Dwi Widiastuti * @author Gina Trapani * */ diff --git a/tests/TestOfPluginMySQLDAO.php b/tests/TestOfPluginMySQLDAO.php old mode 100755 new mode 100644 index 87b9cbc734..f58a2a43d5 --- a/tests/TestOfPluginMySQLDAO.php +++ b/tests/TestOfPluginMySQLDAO.php @@ -1,4 +1,34 @@ . +*/ +/** + * @author Gina Trapani + * @author Dwi Widiastuti + * @author Guillaume Boudreau + * @author Mark Wilkie + * @author ekansh + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Gina Trapani, Dwi Widiastuti, Guillaume Boudreau, Mark Wilkie, ekansh +*/ require_once dirname(__FILE__).'/init.tests.php'; require_once THINKUP_ROOT_PATH.'webapp/_lib/extlib/simpletest/autorun.php'; require_once THINKUP_ROOT_PATH.'webapp/config.inc.php'; diff --git a/tests/TestOfPluginOptionController.php b/tests/TestOfPluginOptionController.php index d9ae604fb6..8f148375dd 100644 --- a/tests/TestOfPluginOptionController.php +++ b/tests/TestOfPluginOptionController.php @@ -1,4 +1,25 @@ . +*/ require_once dirname(__FILE__).'/init.tests.php'; require_once THINKUP_ROOT_PATH.'webapp/_lib/extlib/simpletest/autorun.php'; require_once THINKUP_ROOT_PATH.'webapp/config.inc.php'; @@ -6,6 +27,8 @@ /** * Test TestOfPluginOptionController class * + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Dwi Widiastuti, Gina Trapani, Mark Wilkie, Guillaume Boudreau * @author Mark Wilkie */ class TestOfPluginOptionController extends ThinkUpUnitTestCase { diff --git a/tests/TestOfPluginOptionMySQLDAO.php b/tests/TestOfPluginOptionMySQLDAO.php index b4ca5337be..a0a9a29a1b 100644 --- a/tests/TestOfPluginOptionMySQLDAO.php +++ b/tests/TestOfPluginOptionMySQLDAO.php @@ -1,4 +1,32 @@ . +*/ +/** + * @author Gina Trapani + * @author Dwi Widiastuti + * @author Mark Wilkie + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Gina Trapani, Dwi Widiastuti, Mark Wilkie +*/ require_once dirname(__FILE__).'/init.tests.php'; require_once THINKUP_ROOT_PATH.'webapp/_lib/extlib/simpletest/autorun.php'; require_once THINKUP_ROOT_PATH.'webapp/config.inc.php'; diff --git a/tests/TestOfPost.php b/tests/TestOfPost.php index ba8e4e69a8..1c9ab251fe 100644 --- a/tests/TestOfPost.php +++ b/tests/TestOfPost.php @@ -1,4 +1,25 @@ . +*/ require_once dirname(__FILE__).'/init.tests.php'; require_once THINKUP_ROOT_PATH.'webapp/_lib/extlib/simpletest/autorun.php'; require_once THINKUP_ROOT_PATH.'webapp/config.inc.php'; @@ -6,6 +27,8 @@ /** * Test of Post class * + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Gina Trapani * @author Gina Trapani */ class TestOfPost extends ThinkUpBasicUnitTestCase { diff --git a/tests/TestOfPostController.php b/tests/TestOfPostController.php old mode 100755 new mode 100644 index 9b77a9a869..d8c2d9d5e4 --- a/tests/TestOfPostController.php +++ b/tests/TestOfPostController.php @@ -1,4 +1,25 @@ . +*/ require_once dirname(__FILE__).'/init.tests.php'; require_once THINKUP_ROOT_PATH.'webapp/_lib/extlib/simpletest/autorun.php'; require_once THINKUP_ROOT_PATH.'webapp/config.inc.php'; @@ -6,6 +27,8 @@ /** * Test of Post Controller * + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Gina Trapani, Dwi Widiastuti * @author Gina Trapani * */ diff --git a/tests/TestOfPostErrorMySQLDAO.php b/tests/TestOfPostErrorMySQLDAO.php old mode 100755 new mode 100644 index 6fd52a97cc..f455d71f7a --- a/tests/TestOfPostErrorMySQLDAO.php +++ b/tests/TestOfPostErrorMySQLDAO.php @@ -1,4 +1,25 @@ . +*/ require_once dirname(__FILE__).'/init.tests.php'; require_once THINKUP_ROOT_PATH.'webapp/_lib/extlib/simpletest/autorun.php'; require_once THINKUP_ROOT_PATH.'webapp/config.inc.php'; @@ -6,6 +27,8 @@ /** * Test PostErrorMySQLDAO * + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Gina Trapani, Dwi Widiastuti * @author Gina Trapani * */ diff --git a/tests/TestOfPostIterator.php b/tests/TestOfPostIterator.php index 70e03c25bd..a60229b15b 100644 --- a/tests/TestOfPostIterator.php +++ b/tests/TestOfPostIterator.php @@ -1,4 +1,32 @@ . +*/ +/** + * @author Dwi Widiastuti + * @author Gina Trapani + * @author Mark Wilkie + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Dwi Widiastuti, Gina Trapani, Mark Wilkie +*/ require_once dirname(__FILE__).'/init.tests.php'; require_once THINKUP_ROOT_PATH.'webapp/_lib/extlib/simpletest/autorun.php'; require_once THINKUP_ROOT_PATH.'webapp/config.inc.php'; diff --git a/tests/TestOfPostMySQLDAO.php b/tests/TestOfPostMySQLDAO.php old mode 100755 new mode 100644 index 53cfd4e341..eb765234f4 --- a/tests/TestOfPostMySQLDAO.php +++ b/tests/TestOfPostMySQLDAO.php @@ -1,10 +1,33 @@ . +*/ require_once dirname(__FILE__).'/init.tests.php'; require_once THINKUP_ROOT_PATH.'webapp/_lib/extlib/simpletest/autorun.php'; require_once THINKUP_ROOT_PATH.'webapp/config.inc.php'; /** * Test of PostMySQL DAO implementation + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Gina Trapani, Mark Wilkie, ekansh, Dwi Widiastuti, Guillaume Boudreau * @author Gina Trapani * */ diff --git a/tests/TestOfProfiler.php b/tests/TestOfProfiler.php index 1b6b9ad4d7..6509086351 100644 --- a/tests/TestOfProfiler.php +++ b/tests/TestOfProfiler.php @@ -1,10 +1,33 @@ . +*/ require_once dirname(__FILE__).'/init.tests.php'; require_once THINKUP_ROOT_PATH.'webapp/_lib/extlib/simpletest/autorun.php'; require_once THINKUP_ROOT_PATH.'webapp/config.inc.php'; /** * Test of Profiler object + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Gina Trapani, Dwi Widiastuti * @author Gina Trapani * */ diff --git a/tests/TestOfRSSController.php b/tests/TestOfRSSController.php old mode 100755 new mode 100644 index 6ee51c13e7..601d95373d --- a/tests/TestOfRSSController.php +++ b/tests/TestOfRSSController.php @@ -1,4 +1,25 @@ . +*/ require_once dirname(__FILE__).'/init.tests.php'; require_once THINKUP_ROOT_PATH.'webapp/_lib/extlib/simpletest/autorun.php'; require_once THINKUP_ROOT_PATH.'webapp/config.inc.php'; @@ -6,6 +27,8 @@ /** * Test of RSSController * + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Guillaume Boudreau * @author Guillaume Boudreau * */ diff --git a/tests/TestOfRegisterController.php b/tests/TestOfRegisterController.php old mode 100755 new mode 100644 index 77ce020696..9acd59dffe --- a/tests/TestOfRegisterController.php +++ b/tests/TestOfRegisterController.php @@ -1,4 +1,25 @@ . +*/ require_once dirname(__FILE__).'/init.tests.php'; require_once THINKUP_ROOT_PATH.'webapp/_lib/extlib/simpletest/autorun.php'; require_once THINKUP_ROOT_PATH.'webapp/config.inc.php'; @@ -9,6 +30,8 @@ /** * Test of RegisterController * + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Gina Trapani, Dwi Widiastuti * @author Gina Trapani * */ diff --git a/tests/TestOfSession.php b/tests/TestOfSession.php old mode 100755 new mode 100644 index 5e4e7ffb9f..0d449db5fa --- a/tests/TestOfSession.php +++ b/tests/TestOfSession.php @@ -1,4 +1,25 @@ . +*/ require_once dirname(__FILE__).'/init.tests.php'; require_once THINKUP_ROOT_PATH.'webapp/_lib/extlib/simpletest/autorun.php'; require_once THINKUP_ROOT_PATH.'webapp/config.inc.php'; @@ -6,6 +27,8 @@ /** * Test of Session * + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Gina Trapani, Dwi Widiastuti, Guillaume Boudreau * @author Gina Trapani * */ diff --git a/tests/TestOfSmartyThinkUp.php b/tests/TestOfSmartyThinkUp.php old mode 100755 new mode 100644 index c7205f39b7..5410f33d20 --- a/tests/TestOfSmartyThinkUp.php +++ b/tests/TestOfSmartyThinkUp.php @@ -1,4 +1,25 @@ . +*/ require_once dirname(__FILE__).'/init.tests.php'; require_once THINKUP_ROOT_PATH.'webapp/_lib/extlib/simpletest/autorun.php'; require_once THINKUP_ROOT_PATH.'webapp/config.inc.php'; @@ -6,6 +27,8 @@ /** * Test of SmartyThinkUp class * + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Dwi Widiastuti, Gina Trapani * @author Gina Trapani */ class TestOfSmartyThinkUp extends ThinkUpBasicUnitTestCase { diff --git a/tests/TestOfTestAdminController.php b/tests/TestOfTestAdminController.php old mode 100755 new mode 100644 index cd0c7e4815..44ca0ca269 --- a/tests/TestOfTestAdminController.php +++ b/tests/TestOfTestAdminController.php @@ -1,4 +1,25 @@ . +*/ require_once dirname(__FILE__).'/init.tests.php'; require_once THINKUP_ROOT_PATH.'webapp/_lib/extlib/simpletest/autorun.php'; require_once THINKUP_ROOT_PATH.'webapp/config.inc.php'; @@ -8,6 +29,8 @@ * * TestController isn't a real ThinkUp controller, this is just a template for all Controller tests. * + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Gina Trapani, Mark Wilkie, Dwi Widiastuti * @author Gina Trapani */ class TestOfTestAdminController extends ThinkUpUnitTestCase { diff --git a/tests/TestOfTestAuthAPIController.php b/tests/TestOfTestAuthAPIController.php old mode 100755 new mode 100644 index 2fab21ac8a..b647f59827 --- a/tests/TestOfTestAuthAPIController.php +++ b/tests/TestOfTestAuthAPIController.php @@ -1,4 +1,25 @@ . +*/ require_once dirname(__FILE__).'/init.tests.php'; require_once THINKUP_ROOT_PATH.'webapp/_lib/extlib/simpletest/autorun.php'; require_once THINKUP_ROOT_PATH.'webapp/config.inc.php'; @@ -6,6 +27,8 @@ /** * Test of TestAuthAPIController * + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Gina Trapani, Guillaume Boudreau * @author Guillaume Boudreau * */ diff --git a/tests/TestOfTestAuthController.php b/tests/TestOfTestAuthController.php old mode 100755 new mode 100644 index 9ddb64c0da..33be599529 --- a/tests/TestOfTestAuthController.php +++ b/tests/TestOfTestAuthController.php @@ -1,4 +1,25 @@ . +*/ require_once dirname(__FILE__).'/init.tests.php'; require_once THINKUP_ROOT_PATH.'webapp/_lib/extlib/simpletest/autorun.php'; require_once THINKUP_ROOT_PATH.'webapp/config.inc.php'; @@ -7,6 +28,8 @@ * Test TestAuthController class * * TestController isn't a real ThinkUp controller, this is just a template for all Controller tests. + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Gina Trapani, Dwi Widiastuti * @author Gina Trapani */ class TestOfTestAuthController extends ThinkUpUnitTestCase { diff --git a/tests/TestOfTestController.php b/tests/TestOfTestController.php index 117d2d036e..5070a72b7a 100644 --- a/tests/TestOfTestController.php +++ b/tests/TestOfTestController.php @@ -1,4 +1,25 @@ . +*/ require_once dirname(__FILE__).'/init.tests.php'; require_once THINKUP_ROOT_PATH.'webapp/_lib/extlib/simpletest/autorun.php'; require_once THINKUP_ROOT_PATH.'webapp/config.inc.php'; @@ -7,6 +28,8 @@ * Test TestController class * * TestController isn't a real ThinkUp controller, this is just a template for all Controller tests. + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Gina Trapani, Dwi Widiastuti, Guillaume Boudreau, Mark Wilkie * @author Gina Trapani */ class TestOfTestController extends ThinkUpUnitTestCase { diff --git a/tests/TestOfToggleActiveInstanceController.php b/tests/TestOfToggleActiveInstanceController.php index bcce29538b..78d3c020d2 100644 --- a/tests/TestOfToggleActiveInstanceController.php +++ b/tests/TestOfToggleActiveInstanceController.php @@ -1,4 +1,31 @@ . +*/ +/** + * @author Gina Trapani + * @author Dwi Widiastuti + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Gina Trapani, Dwi Widiastuti +*/ require_once dirname(__FILE__).'/init.tests.php'; require_once THINKUP_ROOT_PATH.'webapp/_lib/extlib/simpletest/autorun.php'; require_once THINKUP_ROOT_PATH.'webapp/config.inc.php'; diff --git a/tests/TestOfToggleActivePluginController.php b/tests/TestOfToggleActivePluginController.php index ce29782ba2..49fd213d74 100644 --- a/tests/TestOfToggleActivePluginController.php +++ b/tests/TestOfToggleActivePluginController.php @@ -1,4 +1,31 @@ . +*/ +/** + * @author Gina Trapani + * @author Dwi Widiastuti + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Gina Trapani, Dwi Widiastuti +*/ require_once dirname(__FILE__).'/init.tests.php'; require_once THINKUP_ROOT_PATH.'webapp/_lib/extlib/simpletest/autorun.php'; require_once THINKUP_ROOT_PATH.'webapp/config.inc.php'; diff --git a/tests/TestOfTogglePublicInstanceController.php b/tests/TestOfTogglePublicInstanceController.php index c66f792153..b5ce333990 100644 --- a/tests/TestOfTogglePublicInstanceController.php +++ b/tests/TestOfTogglePublicInstanceController.php @@ -1,4 +1,31 @@ . +*/ +/** + * @author Gina Trapani + * @author Dwi Widiastuti + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Gina Trapani, Dwi Widiastuti +*/ require_once dirname(__FILE__).'/init.tests.php'; require_once THINKUP_ROOT_PATH.'webapp/_lib/extlib/simpletest/autorun.php'; require_once THINKUP_ROOT_PATH.'webapp/config.inc.php'; diff --git a/tests/TestOfUserController.php b/tests/TestOfUserController.php index bdcb88587c..b307ec93bf 100644 --- a/tests/TestOfUserController.php +++ b/tests/TestOfUserController.php @@ -1,4 +1,31 @@ . +*/ +/** + * @author Gina Trapani + * @author Dwi Widiastuti + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Gina Trapani, Dwi Widiastuti +*/ require_once dirname(__FILE__).'/init.tests.php'; require_once THINKUP_ROOT_PATH.'webapp/_lib/extlib/simpletest/autorun.php'; require_once THINKUP_ROOT_PATH.'webapp/config.inc.php'; diff --git a/tests/TestOfUserErrorMySQLDAO.php b/tests/TestOfUserErrorMySQLDAO.php old mode 100755 new mode 100644 index 736c0c8896..1f20290399 --- a/tests/TestOfUserErrorMySQLDAO.php +++ b/tests/TestOfUserErrorMySQLDAO.php @@ -1,4 +1,25 @@ . +*/ require_once dirname(__FILE__).'/init.tests.php'; require_once THINKUP_ROOT_PATH.'webapp/_lib/extlib/simpletest/autorun.php'; require_once THINKUP_ROOT_PATH.'webapp/config.inc.php'; @@ -6,6 +27,8 @@ /** * Test of UserErrorMySQLDAO * + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Gina Trapani, Dwi Widiastuti * @author Gina Trapani * */ diff --git a/tests/TestOfUserMySQLDAO.php b/tests/TestOfUserMySQLDAO.php old mode 100755 new mode 100644 index c2491fd682..257e0a42a5 --- a/tests/TestOfUserMySQLDAO.php +++ b/tests/TestOfUserMySQLDAO.php @@ -1,4 +1,25 @@ . +*/ require_once dirname(__FILE__).'/init.tests.php'; require_once THINKUP_ROOT_PATH.'webapp/_lib/extlib/simpletest/autorun.php'; require_once THINKUP_ROOT_PATH.'webapp/config.inc.php'; @@ -6,6 +27,8 @@ /** * Test of UserDAO * + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Gina Trapani, Dwi Widiastuti * @author Gina Trapani * */ diff --git a/tests/TestOfUtils.php b/tests/TestOfUtils.php index 72de671740..c734aa1b36 100644 --- a/tests/TestOfUtils.php +++ b/tests/TestOfUtils.php @@ -1,4 +1,32 @@ . +*/ +/** + * @author Gina Trapani + * @author Dwi Widiastuti + * @author Guillaume Boudreau + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Gina Trapani, Dwi Widiastuti, Guillaume Boudreau +*/ require_once dirname(__FILE__).'/init.tests.php'; require_once THINKUP_ROOT_PATH.'webapp/_lib/extlib/simpletest/autorun.php'; require_once THINKUP_ROOT_PATH.'webapp/config.inc.php'; diff --git a/tests/TestOfWebapp.php b/tests/TestOfWebapp.php old mode 100755 new mode 100644 index 534167bce6..f16516876a --- a/tests/TestOfWebapp.php +++ b/tests/TestOfWebapp.php @@ -1,4 +1,25 @@ . +*/ require_once dirname(__FILE__).'/init.tests.php'; require_once THINKUP_ROOT_PATH.'webapp/_lib/extlib/simpletest/autorun.php'; require_once THINKUP_ROOT_PATH.'webapp/config.inc.php'; @@ -8,6 +29,8 @@ /** * Test Webapp object + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Gina Trapani, Dwi Widiastuti * @author Gina Trapani * */ diff --git a/tests/TestOfWebappTab.php b/tests/TestOfWebappTab.php index 76b118953f..3d5aa505ed 100644 --- a/tests/TestOfWebappTab.php +++ b/tests/TestOfWebappTab.php @@ -1,10 +1,33 @@ . +*/ require_once dirname(__FILE__).'/init.tests.php'; require_once THINKUP_ROOT_PATH.'webapp/_lib/extlib/simpletest/autorun.php'; require_once THINKUP_ROOT_PATH.'webapp/config.inc.php'; /** * Test of WebappTab + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Gina Trapani, Dwi Widiastuti * @author Gina Trapani * */ diff --git a/tests/TestOfWebappTabDataset.php b/tests/TestOfWebappTabDataset.php index 216490be76..666473c41d 100644 --- a/tests/TestOfWebappTabDataset.php +++ b/tests/TestOfWebappTabDataset.php @@ -1,10 +1,33 @@ . +*/ require_once dirname(__FILE__).'/init.tests.php'; require_once THINKUP_ROOT_PATH.'webapp/_lib/extlib/simpletest/autorun.php'; require_once THINKUP_ROOT_PATH.'webapp/config.inc.php'; /** * Test of WebappTabDataset + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Gina Trapani, Dwi Widiastuti, Mark Wilkie * @author Gina Trapani * */ diff --git a/tests/WebTestOfChangePassword.php b/tests/WebTestOfChangePassword.php index 5626f8cf2c..340e83f7a4 100644 --- a/tests/WebTestOfChangePassword.php +++ b/tests/WebTestOfChangePassword.php @@ -1,4 +1,30 @@ . +*/ +/** + * @author Gina Trapani + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Gina Trapani +*/ require_once dirname(__FILE__).'/init.tests.php'; require_once THINKUP_ROOT_PATH.'webapp/_lib/extlib/simpletest/autorun.php'; require_once THINKUP_ROOT_PATH.'webapp/_lib/extlib/simpletest/web_tester.php'; diff --git a/tests/WebTestOfDashboard.php b/tests/WebTestOfDashboard.php index 737fe0ffc0..4b4e498959 100644 --- a/tests/WebTestOfDashboard.php +++ b/tests/WebTestOfDashboard.php @@ -1,4 +1,30 @@ . +*/ +/** + * @author Gina Trapani + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Gina Trapani +*/ require_once dirname(__FILE__).'/init.tests.php'; require_once THINKUP_ROOT_PATH.'webapp/_lib/extlib/simpletest/autorun.php'; require_once THINKUP_ROOT_PATH.'webapp/config.inc.php'; diff --git a/tests/WebTestOfSignIn.php b/tests/WebTestOfSignIn.php index 52d905a46f..f1df614561 100644 --- a/tests/WebTestOfSignIn.php +++ b/tests/WebTestOfSignIn.php @@ -1,4 +1,30 @@ . +*/ +/** + * @author Gina Trapani + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Gina Trapani +*/ require_once dirname(__FILE__).'/init.tests.php'; require_once THINKUP_ROOT_PATH.'webapp/_lib/extlib/simpletest/autorun.php'; require_once THINKUP_ROOT_PATH.'webapp/config.inc.php'; diff --git a/tests/all_controller_tests.php b/tests/all_controller_tests.php index 0a4f29cd3c..2a37eaf89b 100644 --- a/tests/all_controller_tests.php +++ b/tests/all_controller_tests.php @@ -1,4 +1,35 @@ . +*/ +/** + * @author Gina Trapani + * @author Mark Wilkie + * @author Dwi Widiastuti + * @author Guillaume Boudreau + * @author Michael Louis Thaler + * @author ekansh + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Gina Trapani, Mark Wilkie, Dwi Widiastuti, Guillaume Boudreau, Michael Louis Thaler, ekansh +*/ require_once 'init.tests.php'; require_once THINKUP_ROOT_PATH.'webapp/_lib/extlib/simpletest/autorun.php'; require_once THINKUP_ROOT_PATH.'webapp/_lib/extlib/simpletest/web_tester.php'; diff --git a/tests/all_integration_tests.php b/tests/all_integration_tests.php index 421c0fd20d..262a481201 100644 --- a/tests/all_integration_tests.php +++ b/tests/all_integration_tests.php @@ -1,4 +1,31 @@ . +*/ +/** + * @author Gina Trapani + * @author Dwi Widiastuti + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Gina Trapani, Dwi Widiastuti +*/ require_once 'init.tests.php'; require_once THINKUP_ROOT_PATH.'webapp/_lib/extlib/simpletest/autorun.php'; require_once THINKUP_ROOT_PATH.'webapp/_lib/extlib/simpletest/web_tester.php'; diff --git a/tests/all_model_tests.php b/tests/all_model_tests.php index 34a1e56140..53b3d082c2 100644 --- a/tests/all_model_tests.php +++ b/tests/all_model_tests.php @@ -1,4 +1,35 @@ . +*/ +/** + * @author Gina Trapani + * @author Mark Wilkie + * @author Christoffer Viken + * @author Dwi Widiastuti + * @author Guillaume Boudreau + * @author ekansh + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Gina Trapani, Mark Wilkie, Christoffer Viken, Dwi Widiastuti, Guillaume Boudreau, ekansh +*/ require_once 'init.tests.php'; require_once THINKUP_ROOT_PATH.'webapp/_lib/extlib/simpletest/autorun.php'; require_once THINKUP_ROOT_PATH.'webapp/_lib/extlib/simpletest/web_tester.php'; diff --git a/tests/all_plugin_tests.php b/tests/all_plugin_tests.php index 3f466f5fc8..d985fa2db2 100644 --- a/tests/all_plugin_tests.php +++ b/tests/all_plugin_tests.php @@ -1,4 +1,33 @@ . +*/ +/** + * @author Gina Trapani + * @author Mark Wilkie + * @author ekansh + * @author Dwi Widiastuti + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Gina Trapani, Mark Wilkie, ekansh, Dwi Widiastuti +*/ require_once 'init.tests.php'; require_once THINKUP_ROOT_PATH.'webapp/_lib/extlib/simpletest/autorun.php'; require_once THINKUP_ROOT_PATH.'webapp/_lib/extlib/simpletest/web_tester.php'; diff --git a/tests/all_tests.php b/tests/all_tests.php old mode 100755 new mode 100644 index b7af89acd8..34bb87b7b5 --- a/tests/all_tests.php +++ b/tests/all_tests.php @@ -1,4 +1,31 @@ . +*/ +/** + * @author Gina Trapani + * @author Dwi Widiastuti + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Gina Trapani, Dwi Widiastuti +*/ require_once 'init.tests.php'; require_once THINKUP_ROOT_PATH.'webapp/_lib/extlib/simpletest/autorun.php'; require_once THINKUP_ROOT_PATH.'webapp/_lib/extlib/simpletest/web_tester.php'; diff --git a/tests/classes/class.TestAdminController.php b/tests/classes/class.TestAdminController.php old mode 100755 new mode 100644 index d89ac3dd4c..63b65354f0 --- a/tests/classes/class.TestAdminController.php +++ b/tests/classes/class.TestAdminController.php @@ -1,8 +1,31 @@ . +*/ /** * Test AdminController * * Test admin controller to try the ThinkUpAdminController abstract class and Controller interface + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Gina Trapani * @author Gina Trapani */ class TestAdminController extends ThinkUpAdminController { diff --git a/tests/classes/class.TestAuthAPIController.php b/tests/classes/class.TestAuthAPIController.php index e72a5c4644..a1bc5ca6f0 100644 --- a/tests/classes/class.TestAuthAPIController.php +++ b/tests/classes/class.TestAuthAPIController.php @@ -1,8 +1,31 @@ . +*/ /** * Test AuthAPIController * * Test auth API controller to try the ThinkUpAuthAPIController abstract class and Controller interface + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Guillaume Boudreau * @author Guillaume Boudreau */ class TestAuthAPIController extends ThinkUpAuthAPIController { diff --git a/tests/classes/class.TestAuthController.php b/tests/classes/class.TestAuthController.php old mode 100755 new mode 100644 index 8f57b3629b..5ae6543987 --- a/tests/classes/class.TestAuthController.php +++ b/tests/classes/class.TestAuthController.php @@ -1,8 +1,31 @@ . +*/ /** * Test AuthController * * Test auth controller to try the ThinkUpAuthController abstract class and Controller interface + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Gina Trapani * @author Gina Trapani */ class TestAuthController extends ThinkUpAuthController { diff --git a/tests/classes/class.TestController.php b/tests/classes/class.TestController.php index 917d591c18..414722db30 100644 --- a/tests/classes/class.TestController.php +++ b/tests/classes/class.TestController.php @@ -1,7 +1,30 @@ . +*/ /** * Test Controller * Test controller to try the ThinkUpController abstract class and Controller interface + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Gina Trapani, Guillaume Boudreau, Mark Wilkie * @author Gina Trapani */ class TestController extends ThinkUpController { diff --git a/tests/classes/class.TestFauxDAO.php b/tests/classes/class.TestFauxDAO.php index dc86802513..207d12638d 100644 --- a/tests/classes/class.TestFauxDAO.php +++ b/tests/classes/class.TestFauxDAO.php @@ -1,4 +1,33 @@ . +*/ +/** + * @author Christoffer Viken + * @author Dwi Widiastuti + * @author Gina Trapani + * @author Mark Wilkie + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Christoffer Viken, Dwi Widiastuti, Gina Trapani, Mark Wilkie +*/ require_once 'tests/classes/interface.TestDAO.php'; /* diff --git a/tests/classes/class.TestFauxHookableApp.php b/tests/classes/class.TestFauxHookableApp.php old mode 100755 new mode 100644 index d1ad95dce2..094baa8314 --- a/tests/classes/class.TestFauxHookableApp.php +++ b/tests/classes/class.TestFauxHookableApp.php @@ -1,7 +1,30 @@ . +*/ /** * Faux TestPluginHook class for TestOfPluginHook test * + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Gina Trapani * @author Gina Trapani * */ diff --git a/tests/classes/class.TestFauxPlugin.php b/tests/classes/class.TestFauxPlugin.php old mode 100755 new mode 100644 index 0e3fcd3497..27dee5d76c --- a/tests/classes/class.TestFauxPlugin.php +++ b/tests/classes/class.TestFauxPlugin.php @@ -1,6 +1,29 @@ . +*/ /** * Test Faux Plugin for TestOfPluginHook + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Gina Trapani * @author Gina Trapani * */ diff --git a/tests/classes/class.TestMysqlDAO.php b/tests/classes/class.TestMysqlDAO.php index 127bfd41c2..82616c6aed 100644 --- a/tests/classes/class.TestMysqlDAO.php +++ b/tests/classes/class.TestMysqlDAO.php @@ -1,4 +1,33 @@ . +*/ +/** + * @author Christoffer Viken + * @author Dwi Widiastuti + * @author Gina Trapani + * @author Mark Wilkie + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Christoffer Viken, Dwi Widiastuti, Gina Trapani, Mark Wilkie +*/ /** * MySQL TestDAO implementation class for TestOfPDODAO and TestOfDAOFactory */ diff --git a/tests/classes/class.ThinkUpBasicUnitTestCase.php b/tests/classes/class.ThinkUpBasicUnitTestCase.php old mode 100755 new mode 100644 index ed80d0a4be..39eb3f9dee --- a/tests/classes/class.ThinkUpBasicUnitTestCase.php +++ b/tests/classes/class.ThinkUpBasicUnitTestCase.php @@ -1,9 +1,32 @@ . +*/ require_once THINKUP_ROOT_PATH.'webapp/_lib/model/class.Loader.php'; /** * ThinkUp Basic Unit Test Case * * Base test case for tests without the need for database availability. + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Gina Trapani, Dwi Widiastuti * @author Gina Trapani * */ diff --git a/tests/classes/class.ThinkUpTestDatabaseHelper.php b/tests/classes/class.ThinkUpTestDatabaseHelper.php old mode 100755 new mode 100644 index 1301420fd7..add44474b1 --- a/tests/classes/class.ThinkUpTestDatabaseHelper.php +++ b/tests/classes/class.ThinkUpTestDatabaseHelper.php @@ -1,9 +1,32 @@ . +*/ /** * ThinkUp Database Helper * * Constructs and destructs the ThinkUp data structure for testing purposes. * + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Gina Trapani * @author Gina Trapani * */ diff --git a/tests/classes/class.ThinkUpUnitTestCase.php b/tests/classes/class.ThinkUpUnitTestCase.php index f54b588b84..95f294a27e 100644 --- a/tests/classes/class.ThinkUpUnitTestCase.php +++ b/tests/classes/class.ThinkUpUnitTestCase.php @@ -1,9 +1,32 @@ . +*/ /** * ThinkUp Unit Test Case * * Adds database support to the basic unit test case, for tests that need ThinkUp's database structure. + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Gina Trapani, Dwi Widiastuti * @author Gina Trapani * */ diff --git a/tests/classes/class.ThinkUpWebTestCase.php b/tests/classes/class.ThinkUpWebTestCase.php index 7572023a23..e481fcd7fa 100644 --- a/tests/classes/class.ThinkUpWebTestCase.php +++ b/tests/classes/class.ThinkUpWebTestCase.php @@ -1,4 +1,31 @@ . +*/ +/** + * @author Dwi Widiastuti + * @author Gina Trapani + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Dwi Widiastuti, Gina Trapani +*/ class ThinkUpWebTestCase extends WebTestCase { var $db; var $conn; diff --git a/tests/classes/interface.TestAppPlugin.php b/tests/classes/interface.TestAppPlugin.php old mode 100755 new mode 100644 index 00d45eb559..f538063c4e --- a/tests/classes/interface.TestAppPlugin.php +++ b/tests/classes/interface.TestAppPlugin.php @@ -1,7 +1,30 @@ . +*/ /** * Test Plugin for use with TestOfPluginHook * + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Gina Trapani * @author Gina Trapani * */ diff --git a/tests/classes/interface.TestDAO.php b/tests/classes/interface.TestDAO.php index 3a5a837872..d0496a2e0f 100644 --- a/tests/classes/interface.TestDAO.php +++ b/tests/classes/interface.TestDAO.php @@ -1,4 +1,31 @@ . +*/ +/** + * @author Christoffer Viken + * @author Mark Wilkie + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Christoffer Viken, Mark Wilkie +*/ class TestData { var $id; diff --git a/tests/config.tests.sample.inc.php b/tests/config.tests.sample.inc.php old mode 100755 new mode 100644 index bcdaf3b3be..e040195802 --- a/tests/config.tests.sample.inc.php +++ b/tests/config.tests.sample.inc.php @@ -1,4 +1,32 @@ . +*/ +/** + * @author Gina Trapani + * @author Christoffer Viken + * @author Dwi Widiastuti + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Gina Trapani, Christoffer Viken, Dwi Widiastuti +*/ $TEST_SERVER_DOMAIN = 'http://localhost'; diff --git a/tests/fixtures/class.FixtureBuilder.php b/tests/fixtures/class.FixtureBuilder.php index 5304990942..5e237c728d 100644 --- a/tests/fixtures/class.FixtureBuilder.php +++ b/tests/fixtures/class.FixtureBuilder.php @@ -1,4 +1,25 @@ . +*/ /** * FixtureBuilder * @@ -38,6 +59,8 @@ * $builder = null; * * + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Mark Wilkie, Gina Trapani, Dwi Widiastuti, Guillaume Boudreau * @author Mark Wilkie */ class FixtureBuilder { diff --git a/tests/fixtures/class.FixtureBuilderException.php b/tests/fixtures/class.FixtureBuilderException.php index ab7cc69fc1..18cba9309e 100644 --- a/tests/fixtures/class.FixtureBuilderException.php +++ b/tests/fixtures/class.FixtureBuilderException.php @@ -1 +1,28 @@ -. +*/ +/** + * @author Mark Wilkie + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Mark Wilkie +*/ +class FixtureBuilderException extends Exception {} diff --git a/tests/fixtures/tests/TestOfFixtureBuilder.php b/tests/fixtures/tests/TestOfFixtureBuilder.php index 6024b105a4..419db79625 100644 --- a/tests/fixtures/tests/TestOfFixtureBuilder.php +++ b/tests/fixtures/tests/TestOfFixtureBuilder.php @@ -1,4 +1,32 @@ . +*/ +/** + * @author Gina Trapani + * @author Dwi Widiastuti + * @author Mark Wilkie + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Gina Trapani, Dwi Widiastuti, Mark Wilkie +*/ require_once THINKUP_ROOT_PATH.'webapp/config.inc.php'; require_once THINKUP_ROOT_PATH.'tests/config.tests.inc.php'; require_once THINKUP_ROOT_PATH.'webapp/_lib/extlib/simpletest/autorun.php'; diff --git a/tests/init.tests.php b/tests/init.tests.php index 45f7ef9be8..bd2743700c 100644 --- a/tests/init.tests.php +++ b/tests/init.tests.php @@ -1,4 +1,32 @@ . +*/ +/** + * @author Gina Trapani + * @author Dwi Widiastuti + * @author Christoffer Viken + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Gina Trapani, Dwi Widiastuti, Christoffer Viken +*/ require_once 'config.tests.inc.php'; //set up 3 required constants diff --git a/webapp/COPYING b/webapp/COPYING new file mode 100644 index 0000000000..20d40b6bce --- /dev/null +++ b/webapp/COPYING @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. 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 +them 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 prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. 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. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey 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; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If 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 convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU 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 that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + 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. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +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. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + 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 +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + Copyright (C) + This program 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, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU 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. But first, please read +. \ No newline at end of file diff --git a/webapp/_lib/controller/class.AccountConfigurationController.php b/webapp/_lib/controller/class.AccountConfigurationController.php index 6a4a50d52e..3b71f22ebb 100644 --- a/webapp/_lib/controller/class.AccountConfigurationController.php +++ b/webapp/_lib/controller/class.AccountConfigurationController.php @@ -1,7 +1,30 @@ . + * + * * AccountConfiguration Controller * + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Gina Trapani * @author Gina Trapani * */ diff --git a/webapp/_lib/controller/class.ActivateAccountController.php b/webapp/_lib/controller/class.ActivateAccountController.php old mode 100755 new mode 100644 index 442331c09b..3c6a912ee2 --- a/webapp/_lib/controller/class.ActivateAccountController.php +++ b/webapp/_lib/controller/class.ActivateAccountController.php @@ -1,7 +1,30 @@ . + * + * * Activate Account Controller * When a user registers for a ThinkUp account s/he receives an email with an activation link that lands here. + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Gina Trapani * @author Gina Trapani * */ diff --git a/webapp/_lib/controller/class.CaptchaImageController.php b/webapp/_lib/controller/class.CaptchaImageController.php index a68f31436e..b1b5c51d66 100644 --- a/webapp/_lib/controller/class.CaptchaImageController.php +++ b/webapp/_lib/controller/class.CaptchaImageController.php @@ -1,7 +1,30 @@ . + * + * * CAPTCHA Image Controller * Generates a CAPTCHA image with a random number embedded in it. + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Gina Trapani * @author Gina Trapani * */ diff --git a/webapp/_lib/controller/class.CheckCrawlerController.php b/webapp/_lib/controller/class.CheckCrawlerController.php index 6d4681527f..b0bda4a3a1 100644 --- a/webapp/_lib/controller/class.CheckCrawlerController.php +++ b/webapp/_lib/controller/class.CheckCrawlerController.php @@ -1,7 +1,30 @@ . + * + * * CheckCrawler Controller * Outputs a message if crawler hasn't run in over 3 hours. + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Gina Trapani * @author Gina Trapani * */ diff --git a/webapp/_lib/controller/class.CrawlerAuthController.php b/webapp/_lib/controller/class.CrawlerAuthController.php index 6680daa1ea..dc23be22ce 100644 --- a/webapp/_lib/controller/class.CrawlerAuthController.php +++ b/webapp/_lib/controller/class.CrawlerAuthController.php @@ -1,8 +1,31 @@ . + * + * * CrawlerAuth Controller * * Runs crawler from the command line given valid command line credentials. + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Gina Trapani * @author Gina Trapani */ class CrawlerAuthController extends ThinkUpController { diff --git a/webapp/_lib/controller/class.CrawlerWebController.php b/webapp/_lib/controller/class.CrawlerWebController.php index 3a0998e315..e30d8ad377 100644 --- a/webapp/_lib/controller/class.CrawlerWebController.php +++ b/webapp/_lib/controller/class.CrawlerWebController.php @@ -1,8 +1,31 @@ . + * + * * Crawler Web Controller * * Runs crawler from the web for the logged-in user and outputs logging into a text area. + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Gina Trapani, Guillaume Boudreau * @author Gina Trapani */ class CrawlerWebController extends ThinkUpAuthAPIController { diff --git a/webapp/_lib/controller/class.DashboardController.php b/webapp/_lib/controller/class.DashboardController.php index 6a8cf9c491..f041aebaa0 100644 --- a/webapp/_lib/controller/class.DashboardController.php +++ b/webapp/_lib/controller/class.DashboardController.php @@ -1,9 +1,32 @@ . + * + * * Dashboard controller * * The main controller which displays a given view for a give instance user. * + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Gina Trapani, Mark Wilkie * @author Gina Trapani * */ diff --git a/webapp/_lib/controller/class.ExportController.php b/webapp/_lib/controller/class.ExportController.php index 2f9d01a6df..621e959a5a 100644 --- a/webapp/_lib/controller/class.ExportController.php +++ b/webapp/_lib/controller/class.ExportController.php @@ -1,8 +1,31 @@ . + * + * * Export Controller * Exports posts from an instance user on ThinkUp. * + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Gina Trapani, Michael Louis Thaler * @author Gina Trapani * */ diff --git a/webapp/_lib/controller/class.ForgotPasswordController.php b/webapp/_lib/controller/class.ForgotPasswordController.php index cd09867230..b1fe8fee9c 100644 --- a/webapp/_lib/controller/class.ForgotPasswordController.php +++ b/webapp/_lib/controller/class.ForgotPasswordController.php @@ -1,7 +1,30 @@ . + * + * * A controller for sending requests for forgotten passwords. * + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Gina Trapani * @author Michael Louis Thaler */ diff --git a/webapp/_lib/controller/class.GridController.php b/webapp/_lib/controller/class.GridController.php index a97a56b78c..498cc29097 100644 --- a/webapp/_lib/controller/class.GridController.php +++ b/webapp/_lib/controller/class.GridController.php @@ -1,9 +1,32 @@ . + * + * * Grid Controller * * Returns Unbuffered JS XSS callback/JSON list of posts for javascript grid search view * + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Mark Wilkie, Guillaume Boudreau * @author Mark Wilkie * */ diff --git a/webapp/_lib/controller/class.GridExportController.php b/webapp/_lib/controller/class.GridExportController.php index 61fbafb78e..879fe1fdac 100644 --- a/webapp/_lib/controller/class.GridExportController.php +++ b/webapp/_lib/controller/class.GridExportController.php @@ -1,8 +1,31 @@ . + * + * * Grid Export Controller * Exports Grid posts from an instance user on ThinkUp. * + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Mark Wilkie * @author Mark Wilkie * */ diff --git a/webapp/_lib/controller/class.InstallerController.php b/webapp/_lib/controller/class.InstallerController.php index abf3606357..5283a33470 100644 --- a/webapp/_lib/controller/class.InstallerController.php +++ b/webapp/_lib/controller/class.InstallerController.php @@ -1,8 +1,31 @@ . + * + * * Installer Controller * Web-based application installer. * + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Guillaume Boudreau, Gina Trapani * @author Dwi Widiastuti * @author Gina Trapani */ diff --git a/webapp/_lib/controller/class.LoginController.php b/webapp/_lib/controller/class.LoginController.php index 0f5bde5204..d0e0fab9b1 100644 --- a/webapp/_lib/controller/class.LoginController.php +++ b/webapp/_lib/controller/class.LoginController.php @@ -1,8 +1,31 @@ . + * + * * Login Controller * * @TODO Build mechanism for redirecting user to originally-requested logged-in only page. + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Gina Trapani * @author Gina Trapani * */ diff --git a/webapp/_lib/controller/class.LogoutController.php b/webapp/_lib/controller/class.LogoutController.php old mode 100755 new mode 100644 index 73d959311f..b2f00bed72 --- a/webapp/_lib/controller/class.LogoutController.php +++ b/webapp/_lib/controller/class.LogoutController.php @@ -1,9 +1,32 @@ . + * + * * Logout Controller * * Log out of ThinkUp. * + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Gina Trapani * @author Gina Trapani * */ diff --git a/webapp/_lib/controller/class.MapController.php b/webapp/_lib/controller/class.MapController.php index 7811aeec2d..31b3fd5985 100644 --- a/webapp/_lib/controller/class.MapController.php +++ b/webapp/_lib/controller/class.MapController.php @@ -1,9 +1,32 @@ . + * + * * Map Controller * * Renders the map for a post showing the post and its replies and retweets * + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Gina Trapani * @author Ekansh Preet Singh * @author Mark Wilkie * @author Gina Trapani diff --git a/webapp/_lib/controller/class.MarkParentController.php b/webapp/_lib/controller/class.MarkParentController.php index 7b2846029f..dd71b00408 100644 --- a/webapp/_lib/controller/class.MarkParentController.php +++ b/webapp/_lib/controller/class.MarkParentController.php @@ -1,8 +1,31 @@ . + * + * * Mark Parent Controller * * Mark a post the parent of a reply. + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Gina Trapani * @author Gina Trapani */ diff --git a/webapp/_lib/controller/class.PasswordResetController.php b/webapp/_lib/controller/class.PasswordResetController.php index 13f27ae805..6031a7ea8c 100644 --- a/webapp/_lib/controller/class.PasswordResetController.php +++ b/webapp/_lib/controller/class.PasswordResetController.php @@ -1,8 +1,31 @@ . + * + * * A controller for allowing a user to change their password if they have * the correct hash. * + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Gina Trapani * @author Michael Louis Thaler */ class PasswordResetController extends ThinkUpController { diff --git a/webapp/_lib/controller/class.PluginConfigurationController.php b/webapp/_lib/controller/class.PluginConfigurationController.php index dc01c944a1..399668732d 100644 --- a/webapp/_lib/controller/class.PluginConfigurationController.php +++ b/webapp/_lib/controller/class.PluginConfigurationController.php @@ -1,5 +1,26 @@ . + * + * * Plugin Configuration Controller * Extends ThinkUpAuthController to add plugin configuration option functionality * @@ -43,6 +64,8 @@ * * * + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Gina Trapani * @author Mark Wilkie */ diff --git a/webapp/_lib/controller/class.PluginOptionController.php b/webapp/_lib/controller/class.PluginOptionController.php index 8c4e7fb92e..345b7f7ff6 100644 --- a/webapp/_lib/controller/class.PluginOptionController.php +++ b/webapp/_lib/controller/class.PluginOptionController.php @@ -1,9 +1,32 @@ . + * + * * Plugin Option Controller * * Controller to add and update plugin options * + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Gina Trapani * @author Mark Wilkie * @author Gina Trapani * diff --git a/webapp/_lib/controller/class.PostController.php b/webapp/_lib/controller/class.PostController.php old mode 100755 new mode 100644 index 9944b670e0..6c88e90667 --- a/webapp/_lib/controller/class.PostController.php +++ b/webapp/_lib/controller/class.PostController.php @@ -1,9 +1,32 @@ . + * + * * Post Controller * * Displays a post and its replies, retweets, reach, and location information. * + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Gina Trapani, Mark Wilkie * @author Gina Trapani * */ diff --git a/webapp/_lib/controller/class.RSSController.php b/webapp/_lib/controller/class.RSSController.php index 1d219cd01e..058d84d9f0 100644 --- a/webapp/_lib/controller/class.RSSController.php +++ b/webapp/_lib/controller/class.RSSController.php @@ -1,10 +1,33 @@ . + * + * * RSS Controller * * Launch the crawler, if the last updated date is older than X minutes, then return a valid RSS feed. * This will allow users to crawl their ThinkUp instances by subscribing to their ThinkUp RSS feed in any RSS reader. * + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Guillaume Boudreau * @author Guillaume Boudreau */ class RSSController extends ThinkUpAuthAPIController { @@ -17,7 +40,7 @@ public function authControl() { Utils::defineConstants(); $this->setContentType('application/rss+xml; charset=UTF-8'); $this->setViewTemplate('rss.tpl'); - + $config = Config::getInstance(); $rss_crawler_refresh_rate = $config->getValue('rss_crawler_refresh_rate'); if (empty($rss_crawler_refresh_rate)) { @@ -26,7 +49,7 @@ public function authControl() { $protocol = isset($_SERVER['HTTPS']) ? 'https' : 'http'; $base_url = "$protocol://".$_SERVER['HTTP_HOST'].THINKUP_BASE_URL; - + $crawler_launched = false; $instance_dao = DAOFactory::getDAO('InstanceDAO'); $freshest_instance = $instance_dao->getInstanceFreshestOne(); @@ -42,7 +65,7 @@ public function authControl() { curl_setopt($ch, CURLOPT_HEADER, true); $result = curl_exec($ch); curl_close($ch); - $body = substr($result, strpos($result, "\r\n\r\n")+4); + $body = substr($result, strpos($result, "\r\n\r\n")+4); if (strpos($result, 'Content-Type: application/json') && function_exists('json_decode')) { $json = json_decode($body); if (isset($json->error)) { @@ -56,7 +79,7 @@ public function authControl() { $crawler_launched = true; } } - + $items = array(); $logger = Logger::getInstance(); // Don't return an item if there is a crawler log defined; @@ -72,7 +95,7 @@ public function authControl() { $this->addToView('items', $items); $this->addToView('logged_in_user', htmlspecialchars($this->getLoggedInUser())); $this->addToView('rss_crawler_refresh_rate', htmlspecialchars($rss_crawler_refresh_rate)); - + return $this->generateView(); } @@ -86,7 +109,7 @@ private function getAdditionalItems($base_url) { // Make sure the crawler log, if specified, is writable; add an item if not $config = Config::getInstance(); $log_location = $config->getValue('log_location'); - if ($log_location !== FALSE && !is_writable($log_location) && + if ($log_location !== FALSE && !is_writable($log_location) && (file_exists($log_location) || !is_writable(dirname($log_location)))) { $title = 'Error: crawler log is not writable'; $link = $base_url.'rss.php?e=1&d='.urlencode(date('Y-m-d H:i:s')); @@ -99,7 +122,7 @@ private function getAdditionalItems($base_url) { } return $items; } - + /** * Build an RSS item from a title, link and description. * @param string $title diff --git a/webapp/_lib/controller/class.RegisterController.php b/webapp/_lib/controller/class.RegisterController.php old mode 100755 new mode 100644 index 9c4efe93ec..03eb612a83 --- a/webapp/_lib/controller/class.RegisterController.php +++ b/webapp/_lib/controller/class.RegisterController.php @@ -1,7 +1,30 @@ . + * + * * Register Controller * Registers new ThinkUp users. + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Gina Trapani * @author Gina Trapani * */ diff --git a/webapp/_lib/controller/class.ThinkUpAdminController.php b/webapp/_lib/controller/class.ThinkUpAdminController.php old mode 100755 new mode 100644 index 65c5c64e90..63190c6036 --- a/webapp/_lib/controller/class.ThinkUpAdminController.php +++ b/webapp/_lib/controller/class.ThinkUpAdminController.php @@ -1,9 +1,32 @@ . + * + * * ThinkUp Admin Controller * * Parent controller for all logged-in admin user-only actions. * + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Gina Trapani * @author Gina Trapani * */ diff --git a/webapp/_lib/controller/class.ThinkUpAuthAPIController.php b/webapp/_lib/controller/class.ThinkUpAuthAPIController.php index 73cecd3bbc..47d1723f26 100644 --- a/webapp/_lib/controller/class.ThinkUpAuthAPIController.php +++ b/webapp/_lib/controller/class.ThinkUpAuthAPIController.php @@ -1,9 +1,32 @@ . + * + * * ThinkUp Authorized Controller for API calls * API calls can be made while a valid session is open, or by specifying a username and an API secret in parameters. * * Parent controller for all API calls + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Guillaume Boudreau * @author Guillaume Boudreau * */ diff --git a/webapp/_lib/controller/class.ThinkUpAuthController.php b/webapp/_lib/controller/class.ThinkUpAuthController.php old mode 100755 new mode 100644 index 5280e430c7..00cf6a7bf8 --- a/webapp/_lib/controller/class.ThinkUpAuthController.php +++ b/webapp/_lib/controller/class.ThinkUpAuthController.php @@ -1,8 +1,31 @@ . + * + * * ThinkUp Authorized Controller * * Parent controller for all logged-in user-only actions + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Gina Trapani * @author Gina Trapani * */ diff --git a/webapp/_lib/controller/class.ThinkUpController.php b/webapp/_lib/controller/class.ThinkUpController.php index 3caa982d4e..684e2aff57 100644 --- a/webapp/_lib/controller/class.ThinkUpController.php +++ b/webapp/_lib/controller/class.ThinkUpController.php @@ -1,9 +1,32 @@ . + * + * * ThinkUp Controller * * The parent class of all ThinkUp webapp controllers. * + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Gina Trapani * @author Gina Trapani */ diff --git a/webapp/_lib/controller/class.ToggleActiveInstanceController.php b/webapp/_lib/controller/class.ToggleActiveInstanceController.php index d6203055e8..78ada456de 100644 --- a/webapp/_lib/controller/class.ToggleActiveInstanceController.php +++ b/webapp/_lib/controller/class.ToggleActiveInstanceController.php @@ -1,7 +1,30 @@ . + * + * * Toggle Active Instance Controller * Set an instance active or inactive. + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Gina Trapani * @author Gina Trapani */ class ToggleActiveInstanceController extends ThinkUpAdminController { diff --git a/webapp/_lib/controller/class.ToggleActivePluginController.php b/webapp/_lib/controller/class.ToggleActivePluginController.php index 4e29111066..75a69d8b7a 100644 --- a/webapp/_lib/controller/class.ToggleActivePluginController.php +++ b/webapp/_lib/controller/class.ToggleActivePluginController.php @@ -1,7 +1,30 @@ . + * + * * Toggle Active Plugin Controller * Activate or deactivat a plugin. + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Gina Trapani * @author Gina Trapani */ class ToggleActivePluginController extends ThinkUpAdminController { diff --git a/webapp/_lib/controller/class.TogglePublicInstanceController.php b/webapp/_lib/controller/class.TogglePublicInstanceController.php index 465b124c93..084cd3091e 100644 --- a/webapp/_lib/controller/class.TogglePublicInstanceController.php +++ b/webapp/_lib/controller/class.TogglePublicInstanceController.php @@ -1,7 +1,30 @@ . + * + * * Toggle Public Instance Controller * Add/remove an instance from the public timeline. + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Gina Trapani * @author Gina Trapani */ class TogglePublicInstanceController extends ThinkUpAuthController { diff --git a/webapp/_lib/controller/class.UserController.php b/webapp/_lib/controller/class.UserController.php index 1d425e6b6f..7973b79411 100644 --- a/webapp/_lib/controller/class.UserController.php +++ b/webapp/_lib/controller/class.UserController.php @@ -1,7 +1,30 @@ . + * + * * User Controller * + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Gina Trapani * @author Gina Trapani * */ diff --git a/webapp/_lib/extlib/simpletest/authentication.php b/webapp/_lib/extlib/simpletest/authentication.php index c56d11bbbf..33ff3041c0 100755 --- a/webapp/_lib/extlib/simpletest/authentication.php +++ b/webapp/_lib/extlib/simpletest/authentication.php @@ -4,8 +4,8 @@ * @package SimpleTest * @subpackage WebTester * @version $Id: authentication.php 1720 2008-04-07 02:32:43Z lastcraft $ - */ -/** + * + * * include http class */ require_once(dirname(__FILE__) . '/http.php'); diff --git a/webapp/_lib/extlib/simpletest/dumper.php b/webapp/_lib/extlib/simpletest/dumper.php index 2d75985c0f..946991ac59 100755 --- a/webapp/_lib/extlib/simpletest/dumper.php +++ b/webapp/_lib/extlib/simpletest/dumper.php @@ -4,8 +4,8 @@ * @package SimpleTest * @subpackage UnitTester * @version $Id: dumper.php 1723 2008-04-08 00:34:10Z lastcraft $ - */ -/** + * + * * does type matter */ if (! defined('TYPE_MATTERS')) { diff --git a/webapp/_lib/extlib/simpletest/eclipse.php b/webapp/_lib/extlib/simpletest/eclipse.php index 0f1a4fcb22..20712b84f4 100755 --- a/webapp/_lib/extlib/simpletest/eclipse.php +++ b/webapp/_lib/extlib/simpletest/eclipse.php @@ -4,8 +4,8 @@ * @package SimpleTest * @subpackage Eclipse * @version $Id: eclipse.php 1723 2008-04-08 00:34:10Z lastcraft $ - */ -/**#@+ + * + * * simpletest include files */ include_once 'unit_tester.php'; diff --git a/webapp/_lib/model/class.Captcha.php b/webapp/_lib/model/class.Captcha.php index 3ea823b9b9..c13de50b68 100644 --- a/webapp/_lib/model/class.Captcha.php +++ b/webapp/_lib/model/class.Captcha.php @@ -1,7 +1,30 @@ . + * + * * CAPTCHA generator * Registration "Prove you're human" CAPTCHA image, with reCAPTCHA support. + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Gina Trapani * @author Gina Trapani * */ diff --git a/webapp/_lib/model/class.Config.php b/webapp/_lib/model/class.Config.php index ed3f585f9d..c90d60f904 100644 --- a/webapp/_lib/model/class.Config.php +++ b/webapp/_lib/model/class.Config.php @@ -1,4 +1,25 @@ . + */ /** * Configuration singleton @@ -16,6 +37,8 @@ * * * @package ThinkUp + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Gina Trapani, Guillaume Boudreau * @author Gina Trapani * @author Mark Wilkie */ diff --git a/webapp/_lib/model/class.Crawler.php b/webapp/_lib/model/class.Crawler.php index e05abac44a..beadc02396 100644 --- a/webapp/_lib/model/class.Crawler.php +++ b/webapp/_lib/model/class.Crawler.php @@ -1,9 +1,32 @@ . + * + * * Crawler * * Singleton provides hooks for crawler plugins. * + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Gina Trapani, Guillaume Boudreau * @author Gina Trapani * */ diff --git a/webapp/_lib/model/class.DAOFactory.php b/webapp/_lib/model/class.DAOFactory.php index 4bfb39ca48..c3cc3946e3 100644 --- a/webapp/_lib/model/class.DAOFactory.php +++ b/webapp/_lib/model/class.DAOFactory.php @@ -1,5 +1,26 @@ . + * + * * Data Access Object Factory * * Inits a DAO based on the ThinkUp config db_type and $dao_mapping definitions. @@ -13,6 +34,8 @@ * DAOFactory::getDAO('SomeDAO'); * * + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Mark Wilkie, Gina Trapani * @author Mark Wilkie * @author Gina Trapani */ diff --git a/webapp/_lib/model/class.Database.deprecated.php b/webapp/_lib/model/class.Database.deprecated.php index 1e7c622100..b334a9dc92 100644 --- a/webapp/_lib/model/class.Database.deprecated.php +++ b/webapp/_lib/model/class.Database.deprecated.php @@ -1,10 +1,33 @@ . + * + * * Deprecated Database class--DO NOT USE * * Do not use this class in any new code. Instead, use the PDODAO system in place. This deprecated class is still here * only for existing unit tests that use it. The production webapp no longer utilizes this class. * + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Gina Trapani * @author Gina Trapani * */ diff --git a/webapp/_lib/model/class.FollowMySQLDAO.php b/webapp/_lib/model/class.FollowMySQLDAO.php index 6ee704ad03..11ae7a674b 100644 --- a/webapp/_lib/model/class.FollowMySQLDAO.php +++ b/webapp/_lib/model/class.FollowMySQLDAO.php @@ -1,7 +1,30 @@ . + * + * * Follow MySQL Data Access Object Implementation * + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Gina Trapani * @author Gina Trapani * @author Jason McPheron * @author Christoffer Viken diff --git a/webapp/_lib/model/class.FollowerCountMySQLDAO.php b/webapp/_lib/model/class.FollowerCountMySQLDAO.php index 91ebbdd383..e3d4c6acb9 100644 --- a/webapp/_lib/model/class.FollowerCountMySQLDAO.php +++ b/webapp/_lib/model/class.FollowerCountMySQLDAO.php @@ -1,7 +1,30 @@ . + * + * * Follower Count MySQL Data Access Object Implementation * + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Gina Trapani * @author Gina Trapani * */ diff --git a/webapp/_lib/model/class.Installer.php b/webapp/_lib/model/class.Installer.php index 342a7fc32d..c7fdb1a784 100644 --- a/webapp/_lib/model/class.Installer.php +++ b/webapp/_lib/model/class.Installer.php @@ -1,8 +1,31 @@ . + * + * * Installer * A singleton class that doess the heavy lifting of installing ThinkUp. * + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Dwi Widiastuti, Gina Trapani * @author Dwi Widiastuti * @author Gina Trapani */ @@ -592,7 +615,7 @@ public function generateConfigFile($db_config, $admin_user) { if (preg_match('/\[\'([a-z0-9_]+)\'\]/', $line, $regs)) { $what = $regs[1]; if (isset($new_config[$what])) { - $sample_config[$line_num] = preg_replace('/=.*;(.*)/', "= '" . $new_config[$what] . "';\\1", + $sample_config[$line_num] = preg_replace('/=.*;(.*)/', "= '" . $new_config[$what] . "';\\1", $sample_config[$line_num]); } } diff --git a/webapp/_lib/model/class.InstallerMySQLDAO.php b/webapp/_lib/model/class.InstallerMySQLDAO.php index e17beaa3c4..72291c057b 100644 --- a/webapp/_lib/model/class.InstallerMySQLDAO.php +++ b/webapp/_lib/model/class.InstallerMySQLDAO.php @@ -1,8 +1,31 @@ . + * + * * Installer DAO MySQL Implementation * The MySQL data access object for the installer. * + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Dwi Widiastuti, Gina Trapani * @author Dwi Widiastuti * @author Gina Trapani */ diff --git a/webapp/_lib/model/class.Instance.php b/webapp/_lib/model/class.Instance.php index 7f165951d9..17dc6d2b18 100644 --- a/webapp/_lib/model/class.Instance.php +++ b/webapp/_lib/model/class.Instance.php @@ -1,4 +1,30 @@ . + * + * + * @author Gina Trapani + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Gina Trapani + */ class Instance { var $id; var $network_username; diff --git a/webapp/_lib/model/class.InstanceMySQLDAO.php b/webapp/_lib/model/class.InstanceMySQLDAO.php old mode 100755 new mode 100644 index 29927f64aa..46e70453d9 --- a/webapp/_lib/model/class.InstanceMySQLDAO.php +++ b/webapp/_lib/model/class.InstanceMySQLDAO.php @@ -1,7 +1,30 @@ . + * + * * Instance MySQL Data Access Object Implementation * + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Gina Trapani, Mark Wilkie, Guillaume Boudreau * @author Gina Trapani */ class InstanceMySQLDAO extends PDODAO implements InstanceDAO { @@ -292,7 +315,7 @@ private function getInstanceUserStats($network_user_id, $network) { $percent_replies = $result['num_replies'] / $result['num_posts'] * 100.0; $percent_links = $result['num_links'] / $result['num_posts'] * 100.0; } - + return array($posts_per_day, $posts_per_week, $percent_replies, $percent_links); } diff --git a/webapp/_lib/model/class.Link.php b/webapp/_lib/model/class.Link.php old mode 100755 new mode 100644 index 0573aab670..25ec7b9290 --- a/webapp/_lib/model/class.Link.php +++ b/webapp/_lib/model/class.Link.php @@ -1,6 +1,29 @@ . + * + * * Link object + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Gina Trapani * @author Gina Trapani * @author christoffer Viken */ diff --git a/webapp/_lib/model/class.LinkMySQLDAO.php b/webapp/_lib/model/class.LinkMySQLDAO.php index 5b97decd25..62ec18ddc8 100644 --- a/webapp/_lib/model/class.LinkMySQLDAO.php +++ b/webapp/_lib/model/class.LinkMySQLDAO.php @@ -1,7 +1,30 @@ . + * + * * Link MySQL Data Access Object * + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Gina Trapani * @author Christoffer Viken * @author Gina Trapani */ diff --git a/webapp/_lib/model/class.Loader.php b/webapp/_lib/model/class.Loader.php index b2d3430113..8b4bead4a0 100644 --- a/webapp/_lib/model/class.Loader.php +++ b/webapp/_lib/model/class.Loader.php @@ -1,9 +1,32 @@ . + * + * * Project-wide Loader * * Implements lazy loading of ThinkUp classes by registering _autoload method in this class. * + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Dwi Widiastuti, Gina Trapani * @author Dwi Widiastuti * @author Gina Trapani * diff --git a/webapp/_lib/model/class.Location.php b/webapp/_lib/model/class.Location.php index 4284b8f038..66e37a9712 100644 --- a/webapp/_lib/model/class.Location.php +++ b/webapp/_lib/model/class.Location.php @@ -1,6 +1,29 @@ . + * + * * Location Object + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Ekansh Preet Singh, Mark Wilkie * @author Ekansh Preet Singh * @author Mark Wilkie */ @@ -19,7 +42,7 @@ class Location { * @var str */ var $latlng; - + /** * Constructor * @param array $val Array of key/value pairs diff --git a/webapp/_lib/model/class.LocationMySQLDAO.php b/webapp/_lib/model/class.LocationMySQLDAO.php index a8d00c03b9..821156bb4f 100644 --- a/webapp/_lib/model/class.LocationMySQLDAO.php +++ b/webapp/_lib/model/class.LocationMySQLDAO.php @@ -1,7 +1,30 @@ . + * + * * Location Data Access Object * The data access object for retrieving and saving locations in the ThinkUp database + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Ekansh Preet Singh, Mark Wilkie * @author Ekansh Preet Singh * @author Mark Wilkie */ diff --git a/webapp/_lib/model/class.Logger.php b/webapp/_lib/model/class.Logger.php index 9cadf1157e..fb02cf7c54 100644 --- a/webapp/_lib/model/class.Logger.php +++ b/webapp/_lib/model/class.Logger.php @@ -1,8 +1,31 @@ . + * + * * Logger singleton * * Crawler logger outputs information about crawler to terminal or to file, depending on configuration. + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Gina Trapani * @author Gina Trapani * */ diff --git a/webapp/_lib/model/class.LoggerSlowSQL.php b/webapp/_lib/model/class.LoggerSlowSQL.php index a15aaf4874..bec8a6d9b8 100644 --- a/webapp/_lib/model/class.LoggerSlowSQL.php +++ b/webapp/_lib/model/class.LoggerSlowSQL.php @@ -1,17 +1,44 @@ . + * + * + * @author Gina Trapani + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Gina Trapani + */ class LoggerSlowSQL { var $log; - function __construct($location) { + public function __construct($location) { $this->log = $this->openFile($location, 'a'); # Append to any prior file } - function setUsername($uname) { + public function setUsername($uname) { $this->twitter_username = $uname; } - function logQuery($query, $time) { - $log_signature = date("Y-m-d H:i:s", time())." | ".(string) number_format(round(memory_get_usage() / 1024000, 2), 2)." MB | "; + public function logQuery($query, $time) { + $log_signature = date("Y-m-d H:i:s", time())." | ".(string) number_format(round(memory_get_usage() / 1024000, + 2), 2)." MB | "; if (strlen($query) > 0) { $this->writeFile($this->log, $log_signature.$query." | ".$time." Seconds"); # Write status to log } @@ -21,12 +48,12 @@ private function addBreaks() { $this->writeFile($this->log, ""); # Add a little whitespace } - function close() { + public function close() { $this->addBreaks(); $this->closeFile($this->log); } - function openFile($filename, $type) { + public function openFile($filename, $type) { if (array_search($type, array('w', 'a')) < 0) { $type = 'w'; } @@ -34,19 +61,15 @@ function openFile($filename, $type) { return $filehandle; } - function writeFile($filehandle, $message) { + public function writeFile($filehandle, $message) { return fwrite($filehandle, $message."\n"); } - function closeFile($filehandle) { + public function closeFile($filehandle) { return fclose($filehandle); } - function deleteFile($filename) { + public function deleteFile($filename) { return unlink($filename); } - - -} - -?> +} \ No newline at end of file diff --git a/webapp/_lib/model/class.Mailer.php b/webapp/_lib/model/class.Mailer.php old mode 100755 new mode 100644 index 8712c2020a..7b4483ac42 --- a/webapp/_lib/model/class.Mailer.php +++ b/webapp/_lib/model/class.Mailer.php @@ -1,4 +1,30 @@ . + * + * + * @author Gina Trapani + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Gina Trapani + */ class Mailer { public static function mail($to, $subject, $message) { $mailheader = "From: \"Auto-Response\" \r\n"; diff --git a/webapp/_lib/model/class.MutexMySQLDAO.php b/webapp/_lib/model/class.MutexMySQLDAO.php index 1882135067..14c8014552 100644 --- a/webapp/_lib/model/class.MutexMySQLDAO.php +++ b/webapp/_lib/model/class.MutexMySQLDAO.php @@ -1,7 +1,30 @@ . + * + * * Mutex Data Access Object implementation * + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Guillaume Boudreau * @author Guillaume Boudreau * */ diff --git a/webapp/_lib/model/class.MySQLDAO.deprecated.php b/webapp/_lib/model/class.MySQLDAO.deprecated.php old mode 100755 new mode 100644 index 4ec3acd5aa..686f2a77cd --- a/webapp/_lib/model/class.MySQLDAO.deprecated.php +++ b/webapp/_lib/model/class.MySQLDAO.deprecated.php @@ -1,9 +1,32 @@ . + * + * * * Do not use this class in any new code. Instead, use the PDODAO system in place. This deprecated class is still here * only for existing unit tests that use it. The production webapp no longer utilizes this class. * + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Gina Trapani * @author Gina Trapani */ class MySQLDAO { diff --git a/webapp/_lib/model/class.Owner.php b/webapp/_lib/model/class.Owner.php index 0bf847ca5b..b8f2ceeec3 100644 --- a/webapp/_lib/model/class.Owner.php +++ b/webapp/_lib/model/class.Owner.php @@ -1,6 +1,29 @@ . + * + * * ThinkUp User, i.e., owner of social network user accounts + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Gina Trapani * @author Gina Trapani * */ diff --git a/webapp/_lib/model/class.OwnerInstance.php b/webapp/_lib/model/class.OwnerInstance.php index 4ba33f4869..6c9f3af170 100644 --- a/webapp/_lib/model/class.OwnerInstance.php +++ b/webapp/_lib/model/class.OwnerInstance.php @@ -1,9 +1,32 @@ . + * + * * OwnerInstance class * * This class represents an owner instance * + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Gina Trapani * @author Gina Trapani * @author Mark Wilkie * @@ -23,7 +46,7 @@ class OwnerInstance { * @param int owner id - optional * @param int instance id - optional */ - function __construct($oid = null, $iid = null) { + public function __construct($oid = null, $iid = null) { if($oid) { $this->owner_id = $oid; } if($iid) { $this->instance_id = $iid; } } diff --git a/webapp/_lib/model/class.OwnerInstanceMySQLDAO.php b/webapp/_lib/model/class.OwnerInstanceMySQLDAO.php index 16aa5897c5..3a1e9a886f 100644 --- a/webapp/_lib/model/class.OwnerInstanceMySQLDAO.php +++ b/webapp/_lib/model/class.OwnerInstanceMySQLDAO.php @@ -1,7 +1,30 @@ . + * + * * OwnerInstance Data Access Object MySQL Implementationn * + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Gina Trapani * @author Gina Trapani * @author Mark Wilkie * diff --git a/webapp/_lib/model/class.OwnerMySQLDAO.php b/webapp/_lib/model/class.OwnerMySQLDAO.php old mode 100755 new mode 100644 index 33943331cc..a7684f1793 --- a/webapp/_lib/model/class.OwnerMySQLDAO.php +++ b/webapp/_lib/model/class.OwnerMySQLDAO.php @@ -1,7 +1,30 @@ . + * + * * Owner Data Access Object * The data access object for retrieving and saving owners in the ThinkUp database. + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Gina Trapani * @author Gina Trapani */ class OwnerMySQLDAO extends PDODAO implements OwnerDAO { diff --git a/webapp/_lib/model/class.PDODAO.php b/webapp/_lib/model/class.PDODAO.php index 02c588d798..5c7e2cc6aa 100644 --- a/webapp/_lib/model/class.PDODAO.php +++ b/webapp/_lib/model/class.PDODAO.php @@ -1,7 +1,30 @@ . + * + * * PDO DAO * Parent class for PDO DAOs + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Mark Wilkie, Christoffer Viken, Gina Trapani * @author Christoffer Viken * @author Mark Wilkie * @author Gina Trapani @@ -69,7 +92,7 @@ public final function connect(){ self::$PDO->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION); } } - + /** * Generates a connect string to use when creating a PDO object. * @param Config $config diff --git a/webapp/_lib/model/class.Plugin.php b/webapp/_lib/model/class.Plugin.php old mode 100755 new mode 100644 index fd5306e675..1040386b23 --- a/webapp/_lib/model/class.Plugin.php +++ b/webapp/_lib/model/class.Plugin.php @@ -1,9 +1,32 @@ . + * + * * Plugin * * A ThinkUp plugin * + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Gina Trapani * @author Gina Trapani * @author Mark Wilkie * diff --git a/webapp/_lib/model/class.PluginHook.php b/webapp/_lib/model/class.PluginHook.php index 7e8ec9aec6..fe85ddb423 100644 --- a/webapp/_lib/model/class.PluginHook.php +++ b/webapp/_lib/model/class.PluginHook.php @@ -1,9 +1,32 @@ . + * + * * Plugin Hook * * Provides hooks to register plugin objects in ThinkUp. * + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Gina Trapani * @author Gina Trapani * */ diff --git a/webapp/_lib/model/class.PluginMySQLDAO.php b/webapp/_lib/model/class.PluginMySQLDAO.php index 14f28714e9..f46996e109 100644 --- a/webapp/_lib/model/class.PluginMySQLDAO.php +++ b/webapp/_lib/model/class.PluginMySQLDAO.php @@ -1,7 +1,30 @@ . + * + * * Plugin Data Access Object * The data access object for retrieving and saving plugin data for thinkup + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Gina Trapani * @author Gina Trapani * @author Mark Wilkie */ diff --git a/webapp/_lib/model/class.PluginOption.php b/webapp/_lib/model/class.PluginOption.php index 47f89372de..c1dcad1c2b 100644 --- a/webapp/_lib/model/class.PluginOption.php +++ b/webapp/_lib/model/class.PluginOption.php @@ -1,9 +1,32 @@ . + * + * * Plugin Option * * A ThinkUp plugin option * + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Mark Wilkie * @author Mark Wilkie * */ @@ -17,7 +40,7 @@ class PluginOption { * @var int plugin id */ var $plugin_id; - + /* * @var str plugin option name */ diff --git a/webapp/_lib/model/class.PluginOptionMySQLDAO.php b/webapp/_lib/model/class.PluginOptionMySQLDAO.php index 0413ab5cae..4f6d97aefd 100644 --- a/webapp/_lib/model/class.PluginOptionMySQLDAO.php +++ b/webapp/_lib/model/class.PluginOptionMySQLDAO.php @@ -1,9 +1,32 @@ . + * + * * Plugin Option Data Access Object * * The data access object for retrieving and saving plugin options. * + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Mark Wilkie, Gina Trapani * @author Mark Wilkie * @author Gina Trapani */ diff --git a/webapp/_lib/model/class.Post.php b/webapp/_lib/model/class.Post.php index f10db716d1..bbbe14caea 100644 --- a/webapp/_lib/model/class.Post.php +++ b/webapp/_lib/model/class.Post.php @@ -1,7 +1,30 @@ . + * + * * Post * A post, tweet, or status update on a ThinkUp source network or service (like Twitter or Facebook) + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Gina Trapani * @author Gina Trapani */ class Post { diff --git a/webapp/_lib/model/class.PostErrorMySQLDAO.php b/webapp/_lib/model/class.PostErrorMySQLDAO.php old mode 100755 new mode 100644 index c542ed2a78..e3e404fef6 --- a/webapp/_lib/model/class.PostErrorMySQLDAO.php +++ b/webapp/_lib/model/class.PostErrorMySQLDAO.php @@ -1,7 +1,30 @@ . + * + * * Post Error MySQL Data Access Object Implementation * + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Gina Trapani * @author Gina Trapani */ class PostErrorMySQLDAO extends PDODAO implements PostErrorDAO { diff --git a/webapp/_lib/model/class.PostIterator.php b/webapp/_lib/model/class.PostIterator.php index bc63ce7f80..2f361020d7 100644 --- a/webapp/_lib/model/class.PostIterator.php +++ b/webapp/_lib/model/class.PostIterator.php @@ -1,9 +1,32 @@ . + * + * * Post Iterator. * * Used to iterate through the cursor of SQL results for Posts. * + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Mark Wilkie * @author Mark Wilkie */ class PostIterator implements Iterator { diff --git a/webapp/_lib/model/class.PostMySQLDAO.php b/webapp/_lib/model/class.PostMySQLDAO.php old mode 100755 new mode 100644 index eeef1016dc..14036836d9 --- a/webapp/_lib/model/class.PostMySQLDAO.php +++ b/webapp/_lib/model/class.PostMySQLDAO.php @@ -1,9 +1,32 @@ . + * + * * Post Data Access Object * * The data access object for retrieving and saving posts in the ThinkUp database * + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Gina Trapani, Mark Wilkie * @author Gina Trapani */ class PostMySQLDAO extends PDODAO implements PostDAO { diff --git a/webapp/_lib/model/class.Profiler.php b/webapp/_lib/model/class.Profiler.php index 83f90d81fa..6f10c11335 100644 --- a/webapp/_lib/model/class.Profiler.php +++ b/webapp/_lib/model/class.Profiler.php @@ -1,6 +1,29 @@ . + * + * * Profiler + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Gina Trapani * @author Gina Trapani * */ diff --git a/webapp/_lib/model/class.Session.php b/webapp/_lib/model/class.Session.php index 7be8181207..5deeb37ce3 100644 --- a/webapp/_lib/model/class.Session.php +++ b/webapp/_lib/model/class.Session.php @@ -1,9 +1,32 @@ . + * + * * Session * * The object that manages logged-in ThinkUp users' sessions via the web and API calls. * + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Christoffer Viken, Gina Trapani * @author Christoffer Viken * @author Gina Trapani * diff --git a/webapp/_lib/model/class.SmartyThinkUp.php b/webapp/_lib/model/class.SmartyThinkUp.php index 924c39a925..f4979919b5 100644 --- a/webapp/_lib/model/class.SmartyThinkUp.php +++ b/webapp/_lib/model/class.SmartyThinkUp.php @@ -1,9 +1,32 @@ . + * + * * ThinkUp's Smarty object * * Configures and initalizes Smarty per ThinkUp's configuration. * + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Gina Trapani * @author Gina Trapani * */ diff --git a/webapp/_lib/model/class.User.php b/webapp/_lib/model/class.User.php index db4706aa99..d676f90608 100644 --- a/webapp/_lib/model/class.User.php +++ b/webapp/_lib/model/class.User.php @@ -1,10 +1,33 @@ . + * + * * User class * * This class represents social network users like @ginatrapani on Twitter, or Joe Smith on Facebook. * It does not represent not ThinkUp users, see the Owner class for ThinkUp users. * + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Gina Trapani * @author Gina Trapani * */ diff --git a/webapp/_lib/model/class.UserErrorMySQLDAO.php b/webapp/_lib/model/class.UserErrorMySQLDAO.php old mode 100755 new mode 100644 index cf148491ad..75775d0e05 --- a/webapp/_lib/model/class.UserErrorMySQLDAO.php +++ b/webapp/_lib/model/class.UserErrorMySQLDAO.php @@ -1,7 +1,30 @@ . + * + * * User Error MySQL DAO Implementation * + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Gina Trapani * @author Gina Trapani * */ diff --git a/webapp/_lib/model/class.UserMySQLDAO.php b/webapp/_lib/model/class.UserMySQLDAO.php old mode 100755 new mode 100644 index fb023376ca..0d7084494d --- a/webapp/_lib/model/class.UserMySQLDAO.php +++ b/webapp/_lib/model/class.UserMySQLDAO.php @@ -1,7 +1,30 @@ . + * + * * User Data Access Object MySQL Implementation * + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Gina Trapani * @author Gina Trapani * */ diff --git a/webapp/_lib/model/class.Utils.php b/webapp/_lib/model/class.Utils.php index 055c5eaefd..0787a3aec4 100644 --- a/webapp/_lib/model/class.Utils.php +++ b/webapp/_lib/model/class.Utils.php @@ -1,8 +1,31 @@ . + * + * * Utils * * Generic, reusable, common utility methods + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Gina Trapani * @author Gina Trapani * */ diff --git a/webapp/_lib/model/class.Webapp.php b/webapp/_lib/model/class.Webapp.php index 44a27993d8..a674725a16 100644 --- a/webapp/_lib/model/class.Webapp.php +++ b/webapp/_lib/model/class.Webapp.php @@ -1,9 +1,32 @@ . + * + * * Webapp * * Singleton provides hooks for webapp plugins. * + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Gina Trapani * @author Gina Trapani * */ diff --git a/webapp/_lib/model/class.WebappTab.php b/webapp/_lib/model/class.WebappTab.php old mode 100755 new mode 100644 index e730895d5c..3898efa0c7 --- a/webapp/_lib/model/class.WebappTab.php +++ b/webapp/_lib/model/class.WebappTab.php @@ -1,6 +1,29 @@ . + * + * * Webapp Tab + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Gina Trapani * @author Gina Trapani * */ diff --git a/webapp/_lib/model/class.WebappTabDataset.php b/webapp/_lib/model/class.WebappTabDataset.php old mode 100755 new mode 100644 index 81da3f23da..7c8f585d02 --- a/webapp/_lib/model/class.WebappTabDataset.php +++ b/webapp/_lib/model/class.WebappTabDataset.php @@ -1,6 +1,29 @@ . + * + * * Webapp Tab Dataset + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Gina Trapani * @author Gina Trapani * */ @@ -49,7 +72,7 @@ class WebappTabDataset { */ public function __construct($name, $dao_name, $dao_method_name, $method_params=array(), $iterator_method_name = null, $iterator_method_params = array()) { - $this->name = $name; + $this->name = $name; if (in_array($dao_name, $this->FETCHING_DAOS)) { $this->dao_name = $dao_name; $this->dao_method_name = $dao_method_name; diff --git a/webapp/_lib/model/exceptions/class.BadArgumentException.php b/webapp/_lib/model/exceptions/class.BadArgumentException.php index fe6787d44d..c2827e3966 100644 --- a/webapp/_lib/model/exceptions/class.BadArgumentException.php +++ b/webapp/_lib/model/exceptions/class.BadArgumentException.php @@ -1,2 +1,29 @@ -. + * + * + * + * @author Gina Trapani + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Gina Trapani + */ class BadArgumentException extends Exception {} diff --git a/webapp/_lib/model/exceptions/class.CrawlerLockedException.php b/webapp/_lib/model/exceptions/class.CrawlerLockedException.php index 044ab78a44..467cfe3d1f 100644 --- a/webapp/_lib/model/exceptions/class.CrawlerLockedException.php +++ b/webapp/_lib/model/exceptions/class.CrawlerLockedException.php @@ -1,2 +1,28 @@ . + * + * + * @author Guillaume Boudreau + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Guillaume Boudreau + */ class CrawlerLockedException extends Exception {} diff --git a/webapp/_lib/model/exceptions/class.InstallerException.php b/webapp/_lib/model/exceptions/class.InstallerException.php index 1802682e7b..3628032e8f 100644 --- a/webapp/_lib/model/exceptions/class.InstallerException.php +++ b/webapp/_lib/model/exceptions/class.InstallerException.php @@ -1,2 +1,28 @@ . + * + * + * @author Gina Trapani + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Gina Trapani + */ class InstallerException extends Exception {} diff --git a/webapp/_lib/model/exceptions/class.UnauthorizedUserException.php b/webapp/_lib/model/exceptions/class.UnauthorizedUserException.php old mode 100755 new mode 100644 index b3c994985a..1c7d790528 --- a/webapp/_lib/model/exceptions/class.UnauthorizedUserException.php +++ b/webapp/_lib/model/exceptions/class.UnauthorizedUserException.php @@ -1,2 +1,28 @@ . + * + * + * @author Guillaume Boudreau + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Guillaume Boudreau + */ class UnauthorizedUserException extends Exception {} diff --git a/webapp/_lib/model/interface.CrawlerPlugin.php b/webapp/_lib/model/interface.CrawlerPlugin.php old mode 100755 new mode 100644 index ba66a233ff..c45d3d4706 --- a/webapp/_lib/model/interface.CrawlerPlugin.php +++ b/webapp/_lib/model/interface.CrawlerPlugin.php @@ -1,7 +1,30 @@ . + * + * * Crawler plugin interface * + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Gina Trapani * @author Gina Trapani * */ diff --git a/webapp/_lib/model/interface.FollowDAO.php b/webapp/_lib/model/interface.FollowDAO.php index 8b5a3697d4..f16abbe432 100644 --- a/webapp/_lib/model/interface.FollowDAO.php +++ b/webapp/_lib/model/interface.FollowDAO.php @@ -1,7 +1,30 @@ . + * + * * Follow Data Access Object Interface * + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Gina Trapani, Christoffer Viken * @author Gina Trapani * @author Christoffer Viken */ diff --git a/webapp/_lib/model/interface.FollowerCountDAO.php b/webapp/_lib/model/interface.FollowerCountDAO.php index 79dfb63d80..fef23d88c2 100644 --- a/webapp/_lib/model/interface.FollowerCountDAO.php +++ b/webapp/_lib/model/interface.FollowerCountDAO.php @@ -1,7 +1,30 @@ . + * + * * Follower Count Data Access Object * + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Gina Trapani * @author Gina Trapani * */ diff --git a/webapp/_lib/model/interface.InstallerDAO.php b/webapp/_lib/model/interface.InstallerDAO.php index 3b83cae1b8..901c263005 100644 --- a/webapp/_lib/model/interface.InstallerDAO.php +++ b/webapp/_lib/model/interface.InstallerDAO.php @@ -1,7 +1,30 @@ . + * + * * Installer Data Access Object interface * + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Dwi Widiastuti, Gina Trapani * @author Dwi Widiastuti * */ diff --git a/webapp/_lib/model/interface.InstanceDAO.php b/webapp/_lib/model/interface.InstanceDAO.php old mode 100755 new mode 100644 index 508f272057..0233eea60e --- a/webapp/_lib/model/interface.InstanceDAO.php +++ b/webapp/_lib/model/interface.InstanceDAO.php @@ -1,7 +1,30 @@ . + * + * * Instance Data Access Object Interface * + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Gina Trapani * @author Gina Trapani * */ diff --git a/webapp/_lib/model/interface.LinkDAO.php b/webapp/_lib/model/interface.LinkDAO.php index 5b83e12747..25b032783e 100644 --- a/webapp/_lib/model/interface.LinkDAO.php +++ b/webapp/_lib/model/interface.LinkDAO.php @@ -1,7 +1,30 @@ . + * + * * Link Data Access Object Interface * + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Gina Trapani, Christoffer Viken * @author Gina Trapani * @author Christoffer Viken */ diff --git a/webapp/_lib/model/interface.LocationDAO.php b/webapp/_lib/model/interface.LocationDAO.php index b1cf46206c..e35da6a1d3 100644 --- a/webapp/_lib/model/interface.LocationDAO.php +++ b/webapp/_lib/model/interface.LocationDAO.php @@ -1,7 +1,30 @@ . + * + * * Location Data Access Object Interface * + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Ekansh Preet Singh, Mark Wilkie * @author Ekansh Preet Singh * @author Mark Wilkie */ @@ -13,14 +36,14 @@ interface LocationDAO { * @return array Details of Location */ public function getLocation($location); - + /** * Adds a location to DB * @param array Details of Location * @return int update count */ public function addLocation($vals); - + /** * Returns all locations in table * @return array Details of Locations diff --git a/webapp/_lib/model/interface.MutexDAO.php b/webapp/_lib/model/interface.MutexDAO.php index c688983f43..dd573efcc4 100644 --- a/webapp/_lib/model/interface.MutexDAO.php +++ b/webapp/_lib/model/interface.MutexDAO.php @@ -1,7 +1,30 @@ . + * + * * Mutex Data Access Object interface * + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Guillaume Boudreau * @author Guillaume Boudreau * */ diff --git a/webapp/_lib/model/interface.OwnerDAO.php b/webapp/_lib/model/interface.OwnerDAO.php old mode 100755 new mode 100644 index 481430d241..787e040867 --- a/webapp/_lib/model/interface.OwnerDAO.php +++ b/webapp/_lib/model/interface.OwnerDAO.php @@ -1,7 +1,30 @@ . + * + * * Owner Data Access Object interface * + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Gina Trapani * @author Gina Trapani * */ diff --git a/webapp/_lib/model/interface.OwnerInstanceDAO.php b/webapp/_lib/model/interface.OwnerInstanceDAO.php index 1657eee7dd..3380be6183 100644 --- a/webapp/_lib/model/interface.OwnerInstanceDAO.php +++ b/webapp/_lib/model/interface.OwnerInstanceDAO.php @@ -1,14 +1,37 @@ . + * + * * OwnerInstance Data Access Object interface * + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Gina Trapani, Mark Wilkie * @author Mark Wilkie * */ interface OwnerInstanceDAO { /** - * Check if an Owner has access to an instance + * Check if an Owner has access to an instance * @throws BadArgumentException If we do not pass a valid owner object * @param Owner * @param Instance diff --git a/webapp/_lib/model/interface.PluginDAO.php b/webapp/_lib/model/interface.PluginDAO.php index d982f6c2a0..d3da07d9a1 100644 --- a/webapp/_lib/model/interface.PluginDAO.php +++ b/webapp/_lib/model/interface.PluginDAO.php @@ -1,7 +1,30 @@ . + * + * * Plugin Data Access Object interface * + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Mark Wilkie, Gina Trapani * @author Mark Wilkie * @author Gina Trapani * diff --git a/webapp/_lib/model/interface.PluginOptionDAO.php b/webapp/_lib/model/interface.PluginOptionDAO.php index 50e2d6f1d9..0cba3ef935 100644 --- a/webapp/_lib/model/interface.PluginOptionDAO.php +++ b/webapp/_lib/model/interface.PluginOptionDAO.php @@ -1,7 +1,30 @@ . + * + * * Plugin Data Access Object interface * + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Mark Wilkie, Gina Trapani * @author Mark Wilkie * @author Gina Trapani */ diff --git a/webapp/_lib/model/interface.PostDAO.php b/webapp/_lib/model/interface.PostDAO.php old mode 100755 new mode 100644 index a7303cdae0..6f6cc49052 --- a/webapp/_lib/model/interface.PostDAO.php +++ b/webapp/_lib/model/interface.PostDAO.php @@ -1,7 +1,30 @@ . + * + * * Post Data Access Object interface * + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Gina Trapani * @author Gina Trapani * */ @@ -37,7 +60,7 @@ public function getRepliesToPost($post_id, $network, $order_by = 'default', $uni $count = 350); /** - * Get replies Iterator to a post + * Get replies Iterator to a post * @param int $post_id * @param str $network * @param str $order_by Order of sorting posts @@ -48,8 +71,8 @@ public function getRepliesToPost($post_id, $network, $order_by = 'default', $uni */ public function getRepliesToPostIterator($post_id, $network, $order_by = 'default', $unit = 'km', $is_public = false, $count = 350); - - + + /** * Get retweets of post * @param int $post_id @@ -245,8 +268,8 @@ public function getMostRepliedToPosts($user_id, $network, $count, $page=1); * @return Iterator Posts with link object set */ public function getMostRepliedToPostsIterator($user_id, $network, $count); - - + + /** * Get posts by a usre ordered by retweet count desc * @param int $user_id diff --git a/webapp/_lib/model/interface.PostErrorDAO.php b/webapp/_lib/model/interface.PostErrorDAO.php old mode 100755 new mode 100644 index 522fbae522..64dfbe906c --- a/webapp/_lib/model/interface.PostErrorDAO.php +++ b/webapp/_lib/model/interface.PostErrorDAO.php @@ -1,5 +1,26 @@ . + * + * * PostError Data Access Object * * Inserts post errors into the tu_post_error table. @@ -8,6 +29,8 @@ * "Sorry, you are not authorized to see this status." * "This account is currently suspended." * + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Gina Trapani * @author Gina Trapani * */ diff --git a/webapp/_lib/model/interface.ThinkUpPlugin.php b/webapp/_lib/model/interface.ThinkUpPlugin.php old mode 100755 new mode 100644 index 486c159866..293a4efb7b --- a/webapp/_lib/model/interface.ThinkUpPlugin.php +++ b/webapp/_lib/model/interface.ThinkUpPlugin.php @@ -1,6 +1,29 @@ . + * + * * ThinkUp Plugin interface + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Gina Trapani * @author Gina Trapani * */ diff --git a/webapp/_lib/model/interface.UserDAO.php b/webapp/_lib/model/interface.UserDAO.php old mode 100755 new mode 100644 index 523e145e18..d81917b372 --- a/webapp/_lib/model/interface.UserDAO.php +++ b/webapp/_lib/model/interface.UserDAO.php @@ -1,7 +1,30 @@ . + * + * * User Data Access Object interface * + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Gina Trapani * @author Gina Trapani * */ diff --git a/webapp/_lib/model/interface.UserErrorDAO.php b/webapp/_lib/model/interface.UserErrorDAO.php old mode 100755 new mode 100644 index 1587c0d39c..88dbfd3f89 --- a/webapp/_lib/model/interface.UserErrorDAO.php +++ b/webapp/_lib/model/interface.UserErrorDAO.php @@ -1,5 +1,26 @@ . + * + * * UserError Data Access Object * * Inserts user errors into the tu_user_error table. @@ -8,6 +29,8 @@ * "Not authorized" * "User has been suspended." * + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Gina Trapani * @author Gina Trapani * */ diff --git a/webapp/_lib/model/interface.WebappPlugin.php b/webapp/_lib/model/interface.WebappPlugin.php old mode 100755 new mode 100644 index 8b4b8faa17..8f2e486af1 --- a/webapp/_lib/model/interface.WebappPlugin.php +++ b/webapp/_lib/model/interface.WebappPlugin.php @@ -1,7 +1,30 @@ . + * + * * Webapp plugin interface * + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Gina Trapani * @author Gina Trapani * */ diff --git a/webapp/_lib/view/plugins/modifier.get_plugin_path.php b/webapp/_lib/view/plugins/modifier.get_plugin_path.php index ff650ce520..4e1b606eab 100644 --- a/webapp/_lib/view/plugins/modifier.get_plugin_path.php +++ b/webapp/_lib/view/plugins/modifier.get_plugin_path.php @@ -1,4 +1,30 @@ . +*/ +/** + * @author Gina Trapani + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Gina Trapani +*/ /* * Smarty plugin * ------------------------------------------------------------- diff --git a/webapp/_lib/view/plugins/modifier.link_usernames.php b/webapp/_lib/view/plugins/modifier.link_usernames.php index f9ac110c35..df44ac1d1d 100644 --- a/webapp/_lib/view/plugins/modifier.link_usernames.php +++ b/webapp/_lib/view/plugins/modifier.link_usernames.php @@ -1,4 +1,25 @@ . +*/ /** * Smarty plugin * @package Smarty @@ -14,6 +35,8 @@ * Purpose: links a Twitter username to their user page * Input: status update text * Example: {$status_html|link_usernames} + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Gina Trapani * @author Gina Trapani * @version 1.0 * @param string diff --git a/webapp/_lib/view/plugins/modifier.link_usernames_to_twitter.php b/webapp/_lib/view/plugins/modifier.link_usernames_to_twitter.php index c6bec4293c..b550dae2ea 100644 --- a/webapp/_lib/view/plugins/modifier.link_usernames_to_twitter.php +++ b/webapp/_lib/view/plugins/modifier.link_usernames_to_twitter.php @@ -1,4 +1,25 @@ . +*/ /** * Smarty plugin * @package Smarty @@ -15,6 +36,8 @@ * Input: status update text * Example: {$status_html|link_usernames_to_twitter} * @TODO Find a more elegant way to do this that's totally regex-based, not loving this explode/implode approach + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Gina Trapani * @author Gina Trapani * @version 1.0 * @param string diff --git a/webapp/_lib/view/plugins/modifier.relative_datetime.php b/webapp/_lib/view/plugins/modifier.relative_datetime.php index f4d349e8ef..b7de08aa94 100644 --- a/webapp/_lib/view/plugins/modifier.relative_datetime.php +++ b/webapp/_lib/view/plugins/modifier.relative_datetime.php @@ -1,4 +1,25 @@ . +*/ /** * Smarty plugin * @package Smarty @@ -14,6 +35,8 @@ * Purpose: converts a date to a relative time * Input: date to format * Example: {$datetime|relative_datetime} + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Gina Trapani * @author Eric Lamb * @version 1.0 * @param string diff --git a/webapp/_lib/view/plugins/modifier.truncate_for_select.php b/webapp/_lib/view/plugins/modifier.truncate_for_select.php index 32fe7143c6..9fb7a7eae6 100644 --- a/webapp/_lib/view/plugins/modifier.truncate_for_select.php +++ b/webapp/_lib/view/plugins/modifier.truncate_for_select.php @@ -1,4 +1,30 @@ . +*/ +/** + * @author Gina Trapani + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Gina Trapani +*/ /* * Smarty plugin * ------------------------------------------------------------- diff --git a/webapp/_lib/view/plugins/modifier.tweet_from_id.php b/webapp/_lib/view/plugins/modifier.tweet_from_id.php old mode 100755 new mode 100644 index af2a095fd5..13180dfc8d --- a/webapp/_lib/view/plugins/modifier.tweet_from_id.php +++ b/webapp/_lib/view/plugins/modifier.tweet_from_id.php @@ -1,4 +1,25 @@ . +*/ /** * Smarty plugin * @package Smarty @@ -14,6 +35,8 @@ * Purpose: Converts a tweet id into a full Tweet object. * Input: status id * Example: {$tweet->in_reply_to_id|tweet_from_id} + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Gina Trapani * @author Thomas Woodham * @version 1.0 * @param integer diff --git a/webapp/account/index.php b/webapp/account/index.php index ef658a8889..30dccb63e8 100644 --- a/webapp/account/index.php +++ b/webapp/account/index.php @@ -1,4 +1,30 @@ . + * + * + * @author Gina Trapani + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Gina Trapani + */ chdir(".."); require_once 'init.php'; diff --git a/webapp/account/plugin-options.php b/webapp/account/plugin-options.php index 6870108002..9b523c3d3d 100644 --- a/webapp/account/plugin-options.php +++ b/webapp/account/plugin-options.php @@ -1,4 +1,30 @@ . + * + * + * @author Mark Wilkie + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Dwi Widiastuti, Mark Wilkie + */ chdir(".."); require_once 'init.php'; diff --git a/webapp/account/toggle-active.php b/webapp/account/toggle-active.php old mode 100755 new mode 100644 index 6580b8a4fa..7cfec8d388 --- a/webapp/account/toggle-active.php +++ b/webapp/account/toggle-active.php @@ -1,4 +1,30 @@ . + * + * + * @author Gina Trapani + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Gina Trapani + */ chdir(".."); require_once 'init.php'; diff --git a/webapp/account/toggle-pluginactive.php b/webapp/account/toggle-pluginactive.php old mode 100755 new mode 100644 index aee52029ae..f03c46357d --- a/webapp/account/toggle-pluginactive.php +++ b/webapp/account/toggle-pluginactive.php @@ -1,4 +1,30 @@ . + * + * + * @author Gina Trapani + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Gina Trapani + */ chdir(".."); require_once 'init.php'; diff --git a/webapp/account/toggle-public.php b/webapp/account/toggle-public.php index b1e6bf84a2..da1d44f9b5 100644 --- a/webapp/account/toggle-public.php +++ b/webapp/account/toggle-public.php @@ -1,4 +1,30 @@ . + * + * + * @author Gina Trapani + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Gina Trapani + */ chdir(".."); require_once 'init.php'; diff --git a/webapp/config.sample.inc.php b/webapp/config.sample.inc.php index 6c05160d3f..5a9796cb48 100644 --- a/webapp/config.sample.inc.php +++ b/webapp/config.sample.inc.php @@ -1,5 +1,4 @@ . + * + * + * @author Gina Trapani + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Gina Trapani + */ require_once 'init.php'; $controller = new CheckCrawlerController(true); diff --git a/webapp/crawler/crawl.php b/webapp/crawler/crawl.php index da730387f8..6af48733f9 100644 --- a/webapp/crawler/crawl.php +++ b/webapp/crawler/crawl.php @@ -1,4 +1,31 @@ . + * + * + * @author Gina Trapani + * @author Guillaume Boudreau + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Gina Trapani, Guillaume Boudreau + */ chdir(".."); require_once 'init.php'; diff --git a/webapp/crawler/rss.php b/webapp/crawler/rss.php old mode 100755 new mode 100644 index e28772a1bb..a8f609fc5a --- a/webapp/crawler/rss.php +++ b/webapp/crawler/rss.php @@ -1,4 +1,30 @@ . + * + * + * @author Guillaume Boudreau + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Guillaume Boudreau + */ chdir(".."); require_once 'init.php'; diff --git a/webapp/crawler/run.php b/webapp/crawler/run.php index c3c7e82000..fecc1203be 100644 --- a/webapp/crawler/run.php +++ b/webapp/crawler/run.php @@ -1,4 +1,30 @@ . + * + * + * @author Gina Trapani + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Gina Trapani + */ chdir(".."); require_once 'init.php'; diff --git a/webapp/index.php b/webapp/index.php index 81358cc2c6..eaf43ce8cc 100644 --- a/webapp/index.php +++ b/webapp/index.php @@ -1,4 +1,30 @@ . + * + * + * @author Gina Trapani + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Gina Trapani + */ require_once 'init.php'; $controller = new DashboardController(); diff --git a/webapp/init.php b/webapp/init.php index 8d19dbd16d..11401ea4a0 100644 --- a/webapp/init.php +++ b/webapp/init.php @@ -1,5 +1,31 @@ . + * + * + * @author Gina Trapani + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Gina Trapani + * + */ $version = explode('.', PHP_VERSION); if ($version[0] < 5) { echo "ERROR: ThinkUp requires PHP 5. The current version of PHP is ".phpversion()."."; diff --git a/webapp/install/index.php b/webapp/install/index.php index 2fdd1d18dd..2cec61df3b 100644 --- a/webapp/install/index.php +++ b/webapp/install/index.php @@ -1,4 +1,31 @@ . + * + * + * @author Gina Trapani + * @author Dwi Widiastuti + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Gina Trapani, Dwi Widiastuti + */ chdir(".."); require_once '_lib/model/class.Loader.php'; Loader::register(); diff --git a/webapp/install/version.php b/webapp/install/version.php index 6d39d688f6..0418d03130 100644 --- a/webapp/install/version.php +++ b/webapp/install/version.php @@ -1,4 +1,31 @@ . + * + * + * @author Dwi Widiastuti + * @author Gina Trapani + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Dwi Widiastuti, Gina Trapani, Guillaume Boudreau + */ $THINKUP_VERSION = '0.008'; $THINKUP_VERSION_REQUIRED['php'] = '5.2'; $THINKUP_VERSION_REQUIRED['mysql'] = '5'; \ No newline at end of file diff --git a/webapp/plugins/expandurls/controller/expandurls.php b/webapp/plugins/expandurls/controller/expandurls.php old mode 100755 new mode 100644 index c9e822b7cf..7a262a6393 --- a/webapp/plugins/expandurls/controller/expandurls.php +++ b/webapp/plugins/expandurls/controller/expandurls.php @@ -8,6 +8,32 @@ Author: Gina Trapani */ +/** + * + * ThinkUp/webapp/plugins/expandurls/controller/expandurls.php + * + * Copyright (c) 2009-2010 Gina Trapani + * + * LICENSE: + * + * This file is part of ThinkUp (http://thinkupapp.com). + * + * ThinkUp 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. + * + * ThinkUp 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 ThinkUp. If not, see + * . + * + * @author Gina Trapani + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Gina Trapani + */ + $webapp = Webapp::getInstance(); $webapp->registerPlugin('expandurls', 'ExpandURLsPlugin'); diff --git a/webapp/plugins/expandurls/model/class.ExpandURLsPlugin.php b/webapp/plugins/expandurls/model/class.ExpandURLsPlugin.php old mode 100755 new mode 100644 index f40b8e4a34..398ca3404c --- a/webapp/plugins/expandurls/model/class.ExpandURLsPlugin.php +++ b/webapp/plugins/expandurls/model/class.ExpandURLsPlugin.php @@ -1,7 +1,30 @@ . + * + * * ExpandURLs Crawler Plugin * + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Gina Trapani, Christoffer Viken, Guillaume Boudreau, Mark Wilkie * @author Gina Trapani * */ diff --git a/webapp/plugins/expandurls/tests/TestOfExpandURLsPlugin.php b/webapp/plugins/expandurls/tests/TestOfExpandURLsPlugin.php old mode 100755 new mode 100644 index 5d447117d4..2e696c5799 --- a/webapp/plugins/expandurls/tests/TestOfExpandURLsPlugin.php +++ b/webapp/plugins/expandurls/tests/TestOfExpandURLsPlugin.php @@ -1,4 +1,25 @@ . + */ if ( !isset($RUNNING_ALL_TESTS) || !$RUNNING_ALL_TESTS ) { require_once '../../../../tests/init.tests.php'; } @@ -11,6 +32,8 @@ /** * Test of ExpandURLs Crawler plugin * + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Gina Trapani, Guillaume Boudreau, Christoffer Viken, Dwi Widiastuti * @author Gina Trapani * */ @@ -32,7 +55,7 @@ public function tearDown() { public function testExpandURLsCrawl() { $builders = $this->buildData(); - + $this->simulateLogin('admin@example.com', true); $crawler = Crawler::getInstance(); $crawler->crawl(); @@ -82,7 +105,7 @@ private function buildData() { 'is_image' => 0, 'error' => null )); - + // A malformed URL $link3_builder = FixtureBuilder::build('links', array( 'id' => 3, @@ -94,7 +117,7 @@ private function buildData() { 'is_image' => 0, 'error' => null )); - + return array($owner_builder, $link1_builder, $link2_builder, $link3_builder); } } \ No newline at end of file diff --git a/webapp/plugins/facebook/auth.php b/webapp/plugins/facebook/auth.php old mode 100755 new mode 100644 index 409c8970e2..50bb97873e --- a/webapp/plugins/facebook/auth.php +++ b/webapp/plugins/facebook/auth.php @@ -1,4 +1,32 @@ . +*/ +/** + * @author Gina Trapani + * @author Christoffer Viken + * @author Mark Wilkie + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Gina Trapani, Christoffer Viken, Mark Wilkie +*/ chdir(".."); chdir(".."); require_once 'init.php'; diff --git a/webapp/plugins/facebook/controller/class.FacebookAuthController.php b/webapp/plugins/facebook/controller/class.FacebookAuthController.php index 0314853f0a..b5513a9c01 100644 --- a/webapp/plugins/facebook/controller/class.FacebookAuthController.php +++ b/webapp/plugins/facebook/controller/class.FacebookAuthController.php @@ -1,7 +1,30 @@ . + * + * * Facebook Auth Controller * Save the session key for authorized Facebook accounts. + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Gina Trapani * @author Gina Trapani * */ diff --git a/webapp/plugins/facebook/controller/class.FacebookPluginConfigurationController.php b/webapp/plugins/facebook/controller/class.FacebookPluginConfigurationController.php old mode 100755 new mode 100644 index 17216d7def..e7abce50a7 --- a/webapp/plugins/facebook/controller/class.FacebookPluginConfigurationController.php +++ b/webapp/plugins/facebook/controller/class.FacebookPluginConfigurationController.php @@ -1,6 +1,29 @@ . + */ /** * Facebook Plugin Configuration controller + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Gina Trapani, Guillaume Boudreau, Mark Wilkie * @author Gina Trapani * */ diff --git a/webapp/plugins/facebook/controller/facebook.php b/webapp/plugins/facebook/controller/facebook.php old mode 100755 new mode 100644 index 76f634d769..b39039ff4d --- a/webapp/plugins/facebook/controller/facebook.php +++ b/webapp/plugins/facebook/controller/facebook.php @@ -7,6 +7,32 @@ Version: 0.01 Author: Gina Trapani */ +/** + * + * ThinkUp/webapp/plugins/facebook/controller/facebook.php + * + * Copyright (c) 2009-2010 Gina Trapani + * + * LICENSE: + * + * This file is part of ThinkUp (http://thinkupapp.com). + * + * ThinkUp 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. + * + * ThinkUp 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 ThinkUp. If not, see + * . + */ +/** + * @author Gina Trapani + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Gina Trapani + */ Utils::defineConstants(); require_once THINKUP_WEBAPP_PATH.'_lib/extlib/facebook/facebook.php'; diff --git a/webapp/plugins/facebook/model/class.FacebookCrawler.php b/webapp/plugins/facebook/model/class.FacebookCrawler.php old mode 100755 new mode 100644 index fa3302d818..5180c5ae07 --- a/webapp/plugins/facebook/model/class.FacebookCrawler.php +++ b/webapp/plugins/facebook/model/class.FacebookCrawler.php @@ -1,4 +1,30 @@ . + */ +/** + * @author Gina Trapani + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Gina Trapani + */ class FacebookCrawler { var $instance; var $logger; diff --git a/webapp/plugins/facebook/model/class.FacebookPlugin.php b/webapp/plugins/facebook/model/class.FacebookPlugin.php old mode 100755 new mode 100644 index e6094406dc..1e4a559ee9 --- a/webapp/plugins/facebook/model/class.FacebookPlugin.php +++ b/webapp/plugins/facebook/model/class.FacebookPlugin.php @@ -1,4 +1,33 @@ . + */ +/** + * @author Gina Trapani + * @author Mark Wilkie + * @author Christoffer Viken + * @author Guillaume Boudreau + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Gina Trapani, Mark Wilkie, Christoffer Viken, Guillaume Boudreau + */ class FacebookPlugin implements CrawlerPlugin, WebappPlugin { public function crawl() { $logger = Logger::getInstance(); diff --git a/webapp/plugins/facebook/tests/TestOfFacebookAuthController.php b/webapp/plugins/facebook/tests/TestOfFacebookAuthController.php index 856d2dff94..20ecc24d57 100644 --- a/webapp/plugins/facebook/tests/TestOfFacebookAuthController.php +++ b/webapp/plugins/facebook/tests/TestOfFacebookAuthController.php @@ -1,4 +1,25 @@ . +*/ if ( !isset($RUNNING_ALL_TESTS) || !$RUNNING_ALL_TESTS ) { require_once '../../../../tests/init.tests.php'; } @@ -13,6 +34,8 @@ /** * Test of FacebookAuthController * + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Gina Trapani, Dwi Widiastuti * @author Gina Trapani * */ diff --git a/webapp/plugins/facebook/tests/TestOfFacebookCrawler.php b/webapp/plugins/facebook/tests/TestOfFacebookCrawler.php old mode 100755 new mode 100644 index 5dc58a5e22..f6de6c86b2 --- a/webapp/plugins/facebook/tests/TestOfFacebookCrawler.php +++ b/webapp/plugins/facebook/tests/TestOfFacebookCrawler.php @@ -1,4 +1,31 @@ . +*/ +/** + * @author Gina Trapani + * @author Dwi Widiastuti + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Gina Trapani, Dwi Widiastuti +*/ if (!isset($RUNNING_ALL_TESTS) || !$RUNNING_ALL_TESTS) { require_once '../../../../tests/config.tests.inc.php'; } diff --git a/webapp/plugins/facebook/tests/TestOfFacebookPlugin.php b/webapp/plugins/facebook/tests/TestOfFacebookPlugin.php index a24c415d0e..a81d6b1c70 100644 --- a/webapp/plugins/facebook/tests/TestOfFacebookPlugin.php +++ b/webapp/plugins/facebook/tests/TestOfFacebookPlugin.php @@ -1,4 +1,31 @@ . +*/ +/** + * @author Gina Trapani + * @author Dwi Widiastuti + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Gina Trapani, Dwi Widiastuti +*/ if ( !isset($RUNNING_ALL_TESTS) || !$RUNNING_ALL_TESTS ) { require_once '../../../../tests/config.tests.inc.php'; } diff --git a/webapp/plugins/facebook/tests/TestOfFacebookPluginConfigurationController.php b/webapp/plugins/facebook/tests/TestOfFacebookPluginConfigurationController.php old mode 100755 new mode 100644 index 4705c1576e..84c6258996 --- a/webapp/plugins/facebook/tests/TestOfFacebookPluginConfigurationController.php +++ b/webapp/plugins/facebook/tests/TestOfFacebookPluginConfigurationController.php @@ -1,4 +1,25 @@ . +*/ if ( !isset($RUNNING_ALL_TESTS) || !$RUNNING_ALL_TESTS ) { require_once '../../../../tests/config.tests.inc.php'; } @@ -12,6 +33,8 @@ /** * Test of FacebookPluginConfigurationController * + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Gina Trapani, Dwi Widiastuti, Guillaume Boudreau * @author Gina Trapani * */ diff --git a/webapp/plugins/facebook/tests/classes/mock.facebook.php b/webapp/plugins/facebook/tests/classes/mock.facebook.php old mode 100755 new mode 100644 index ed0f7a0f5b..26fa878685 --- a/webapp/plugins/facebook/tests/classes/mock.facebook.php +++ b/webapp/plugins/facebook/tests/classes/mock.facebook.php @@ -1,4 +1,31 @@ . +*/ +/** + * @author Gina Trapani + * @author Dwi Widiastuti + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Gina Trapani, Dwi Widiastuti +*/ class MockFacebookRestClient { var $data_file_path; diff --git a/webapp/plugins/facebook/xd_receiver.php b/webapp/plugins/facebook/xd_receiver.php old mode 100755 new mode 100644 index 8b0775515e..a14c475649 --- a/webapp/plugins/facebook/xd_receiver.php +++ b/webapp/plugins/facebook/xd_receiver.php @@ -1,3 +1,29 @@ +/** + * + * ThinkUp/webapp/plugins/facebook/xd_receiver.php + * + * Copyright (c) 2009-2010 Gina Trapani + * + * LICENSE: + * + * This file is part of ThinkUp (http://thinkupapp.com). + * + * ThinkUp 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. + * + * ThinkUp 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 ThinkUp. If not, see + * . +*/ +/** + * @author Gina Trapani + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Gina Trapani +*/ . + */ /** * FlickrThumbnails Plugin configuration controller * + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Gina Trapani * @author Gina Trapani */ diff --git a/webapp/plugins/flickrthumbnails/controller/flickrthumbnails.php b/webapp/plugins/flickrthumbnails/controller/flickrthumbnails.php old mode 100755 new mode 100644 index cb90dca8f5..8f11c541be --- a/webapp/plugins/flickrthumbnails/controller/flickrthumbnails.php +++ b/webapp/plugins/flickrthumbnails/controller/flickrthumbnails.php @@ -8,6 +8,33 @@ Author: Gina Trapani */ +/** + * + * ThinkUp/webapp/plugins/flickrthumbnails/controller/flickrthumbnails.php + * + * Copyright (c) 2009-2010 Gina Trapani + * + * LICENSE: + * + * This file is part of ThinkUp (http://thinkupapp.com). + * + * ThinkUp 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. + * + * ThinkUp 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 ThinkUp. If not, see + * . + */ +/** + * @author Gina Trapani + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Gina Trapani + */ + $webapp = Webapp::getInstance(); $webapp->registerPlugin('flickrthumbnails', 'FlickrThumbnailsPlugin'); diff --git a/webapp/plugins/flickrthumbnails/model/class.FlickrAPIAccessor.php b/webapp/plugins/flickrthumbnails/model/class.FlickrAPIAccessor.php old mode 100755 new mode 100644 index 4882a2de91..199da3b6ae --- a/webapp/plugins/flickrthumbnails/model/class.FlickrAPIAccessor.php +++ b/webapp/plugins/flickrthumbnails/model/class.FlickrAPIAccessor.php @@ -1,4 +1,30 @@ . + */ +/** + * @author Gina Trapani + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Gina Trapani + */ class FlickrAPIAccessor { var $api_url = "http://api.flickr.com/services/rest/?"; var $format = "php_serial"; diff --git a/webapp/plugins/flickrthumbnails/model/class.FlickrThumbnailsPlugin.php b/webapp/plugins/flickrthumbnails/model/class.FlickrThumbnailsPlugin.php old mode 100755 new mode 100644 index d17de7bc1b..3803b87c0d --- a/webapp/plugins/flickrthumbnails/model/class.FlickrThumbnailsPlugin.php +++ b/webapp/plugins/flickrthumbnails/model/class.FlickrThumbnailsPlugin.php @@ -1,8 +1,31 @@ . + */ /** * Flickr Thumbnails Plugin * * Expands Flickr links to direct path to image thumbnail. + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Gina Trapani * @author Gina Trapani * */ diff --git a/webapp/plugins/flickrthumbnails/tests/TestOfFlickrAPIAccessor.php b/webapp/plugins/flickrthumbnails/tests/TestOfFlickrAPIAccessor.php old mode 100755 new mode 100644 index bddc7930ee..7f9c812eda --- a/webapp/plugins/flickrthumbnails/tests/TestOfFlickrAPIAccessor.php +++ b/webapp/plugins/flickrthumbnails/tests/TestOfFlickrAPIAccessor.php @@ -1,4 +1,31 @@ . +*/ +/** + * @author Gina Trapani + * @author Dwi Widiastuti + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Gina Trapani, Dwi Widiastuti +*/ if ( !isset($RUNNING_ALL_TESTS) || !$RUNNING_ALL_TESTS ) { require_once '../../../../tests/config.tests.inc.php'; } diff --git a/webapp/plugins/flickrthumbnails/tests/TestOfFlickrThumbnailsPlugin.php b/webapp/plugins/flickrthumbnails/tests/TestOfFlickrThumbnailsPlugin.php old mode 100755 new mode 100644 index 7e5d37c860..23d7b1caca --- a/webapp/plugins/flickrthumbnails/tests/TestOfFlickrThumbnailsPlugin.php +++ b/webapp/plugins/flickrthumbnails/tests/TestOfFlickrThumbnailsPlugin.php @@ -1,4 +1,33 @@ . +*/ +/** + * @author Gina Trapani + * @author Christoffer Viken + * @author Dwi Widiastuti + * @author Guillaume Boudreau + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Gina Trapani, Christoffer Viken, Dwi Widiastuti, Guillaume Boudreau +*/ if ( !isset($RUNNING_ALL_TESTS) || !$RUNNING_ALL_TESTS ) { require_once '../../../../tests/config.tests.inc.php'; } diff --git a/webapp/plugins/flickrthumbnails/tests/TestOfFlickrThumbnailsPluginConfigurationController.php b/webapp/plugins/flickrthumbnails/tests/TestOfFlickrThumbnailsPluginConfigurationController.php index dccb788276..b725e67184 100644 --- a/webapp/plugins/flickrthumbnails/tests/TestOfFlickrThumbnailsPluginConfigurationController.php +++ b/webapp/plugins/flickrthumbnails/tests/TestOfFlickrThumbnailsPluginConfigurationController.php @@ -1,4 +1,25 @@ . +*/ if ( !isset($RUNNING_ALL_TESTS) || !$RUNNING_ALL_TESTS ) { require_once '../../../../tests/config.tests.inc.php'; } @@ -10,6 +31,8 @@ /** * Test of FlickrThumbnailsPluginConfigurationController * + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Gina Trapani, Dwi Widiastuti * @author Gina Trapani * */ diff --git a/webapp/plugins/flickrthumbnails/tests/classes/mock.FlickrAPIAccessor.php b/webapp/plugins/flickrthumbnails/tests/classes/mock.FlickrAPIAccessor.php index 2b21150ebf..3ee5e1dccf 100644 --- a/webapp/plugins/flickrthumbnails/tests/classes/mock.FlickrAPIAccessor.php +++ b/webapp/plugins/flickrthumbnails/tests/classes/mock.FlickrAPIAccessor.php @@ -1,4 +1,31 @@ . +*/ +/** + * @author Gina Trapani + * @author Dwi Widiastuti + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Gina Trapani, Dwi Widiastuti +*/ class FlickrAPIAccessor { var $api_url = "http://api.flickr.com/services/rest/?"; var $format = "php_serial"; diff --git a/webapp/plugins/geoencoder/controller/class.GeoEncoderPluginConfigurationController.php b/webapp/plugins/geoencoder/controller/class.GeoEncoderPluginConfigurationController.php index 682b9e4128..dfa0260c70 100644 --- a/webapp/plugins/geoencoder/controller/class.GeoEncoderPluginConfigurationController.php +++ b/webapp/plugins/geoencoder/controller/class.GeoEncoderPluginConfigurationController.php @@ -1,6 +1,29 @@ . + */ /** * GeoEncoder Plugin configuration controller + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Ekansh Preet Singh, Mark Wilkie * @author Ekansh Preet Singh * @author Mark Wilkie * diff --git a/webapp/plugins/geoencoder/controller/geoencoder.php b/webapp/plugins/geoencoder/controller/geoencoder.php index f858dd3ff0..30c2215625 100644 --- a/webapp/plugins/geoencoder/controller/geoencoder.php +++ b/webapp/plugins/geoencoder/controller/geoencoder.php @@ -1,4 +1,4 @@ -. + */ +/** + * @author ekansh + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Ekansh Preet Singh, Mark Wilkie + */ + $webapp = Webapp::getInstance(); $webapp->registerPlugin('geoencoder', 'GeoEncoderPlugin'); diff --git a/webapp/plugins/geoencoder/model/class.GeoEncoderCrawler.php b/webapp/plugins/geoencoder/model/class.GeoEncoderCrawler.php index aa362c5141..0602d5bf99 100644 --- a/webapp/plugins/geoencoder/model/class.GeoEncoderCrawler.php +++ b/webapp/plugins/geoencoder/model/class.GeoEncoderCrawler.php @@ -1,9 +1,32 @@ . + */ /** * GeoEncoder Crawler * * The GeoEncoder crawler retrieves geolocation information for a post. * + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Ekansh Preet Singh, Mark Wilkie * @author Ekansh Preet Singh * @author Mark Wilkie * diff --git a/webapp/plugins/geoencoder/model/class.GeoEncoderPlugin.php b/webapp/plugins/geoencoder/model/class.GeoEncoderPlugin.php index c29991c6b5..e2db2ddc8e 100644 --- a/webapp/plugins/geoencoder/model/class.GeoEncoderPlugin.php +++ b/webapp/plugins/geoencoder/model/class.GeoEncoderPlugin.php @@ -1,10 +1,33 @@ . + */ /** * GeoEncoder Plugin * * The GeoEncoder plugin validates the geolocation information for a post and stores it to use * for Geolocation visualization later. * + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Ekansh Preet Singh, Mark Wilkie * @author Ekansh Preet Singh * @author Mark Wilkie * diff --git a/webapp/plugins/geoencoder/tests/TestOfGeoEncoderPlugin.php b/webapp/plugins/geoencoder/tests/TestOfGeoEncoderPlugin.php index 65a00c3a17..6f2fbdead5 100644 --- a/webapp/plugins/geoencoder/tests/TestOfGeoEncoderPlugin.php +++ b/webapp/plugins/geoencoder/tests/TestOfGeoEncoderPlugin.php @@ -1,4 +1,25 @@ . +*/ if (!isset($RUNNING_ALL_TESTS) || !$RUNNING_ALL_TESTS) { require_once '../../../../tests/config.tests.inc.php'; } @@ -11,6 +32,8 @@ /** * Test of GeoEncoder ThinkUp plugin * + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Gina Trapani, ekansh, Dwi Widiastuti, Guillaume Boudreau * @author Ekansh Preet Singh * @author Mark Wilkie * diff --git a/webapp/plugins/geoencoder/tests/TestOfGeoEncoderPluginConfigurationController.php b/webapp/plugins/geoencoder/tests/TestOfGeoEncoderPluginConfigurationController.php index eae5cb6a10..2a1dbe6d8f 100644 --- a/webapp/plugins/geoencoder/tests/TestOfGeoEncoderPluginConfigurationController.php +++ b/webapp/plugins/geoencoder/tests/TestOfGeoEncoderPluginConfigurationController.php @@ -1,4 +1,25 @@ . +*/ if ( !isset($RUNNING_ALL_TESTS) || !$RUNNING_ALL_TESTS ) { require_once '../../../../tests/config.tests.inc.php'; } @@ -8,6 +29,8 @@ /** * Test of TestOfGeoEncoderPluginConfigurationController * + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Dwi Widiastuti, Gina Trapani, ekansh * @author Mark Wilkie * */ diff --git a/webapp/plugins/geoencoder/tests/classes/mock.GeoEncoderCrawler.php b/webapp/plugins/geoencoder/tests/classes/mock.GeoEncoderCrawler.php index 38c7a4fd09..a6aa62ec3a 100644 --- a/webapp/plugins/geoencoder/tests/classes/mock.GeoEncoderCrawler.php +++ b/webapp/plugins/geoencoder/tests/classes/mock.GeoEncoderCrawler.php @@ -1,6 +1,29 @@ . +*/ /** * Mock GeoEncoder class for tests + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 ekansh, Dwi Widiastuti * @author Ekansh Preet Singh * @author Mark Wilkie */ diff --git a/webapp/plugins/hellothinkup/controller/class.HelloThinkUpPluginConfigurationController.php b/webapp/plugins/hellothinkup/controller/class.HelloThinkUpPluginConfigurationController.php old mode 100755 new mode 100644 index 995c04c7c8..a38fae6490 --- a/webapp/plugins/hellothinkup/controller/class.HelloThinkUpPluginConfigurationController.php +++ b/webapp/plugins/hellothinkup/controller/class.HelloThinkUpPluginConfigurationController.php @@ -1,7 +1,30 @@ . + */ /** * HelloThinkUp Plugin Configuration Controller * + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Gina Trapani, Mark Wilkie * @author Gina Trapani * @author Mark Wilkie */ diff --git a/webapp/plugins/hellothinkup/controller/hellothinkup.php b/webapp/plugins/hellothinkup/controller/hellothinkup.php index 7695c2e78b..3adc133148 100644 --- a/webapp/plugins/hellothinkup/controller/hellothinkup.php +++ b/webapp/plugins/hellothinkup/controller/hellothinkup.php @@ -1,5 +1,5 @@ -. + */ +/** + * @author Gina Trapani + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Gina Trapani + */ + $webapp = Webapp::getInstance(); $webapp->registerPlugin('hellothinkup', 'HelloThinkUpPlugin'); diff --git a/webapp/plugins/hellothinkup/model/class.HelloThinkUpPlugin.php b/webapp/plugins/hellothinkup/model/class.HelloThinkUpPlugin.php old mode 100755 new mode 100644 index 6883e85ace..15125e56d3 --- a/webapp/plugins/hellothinkup/model/class.HelloThinkUpPlugin.php +++ b/webapp/plugins/hellothinkup/model/class.HelloThinkUpPlugin.php @@ -1,4 +1,32 @@ . + */ +/** + * @author Gina Trapani + * @author Guillaume Boudreau + * @author Mark Wilkie + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Gina Trapani, Guillaume Boudreau, Mark Wilkie + */ class HelloThinkUpPlugin implements CrawlerPlugin { public function renderConfiguration($owner) { @@ -9,24 +37,24 @@ public function renderConfiguration($owner) { public function crawl() { //echo "HelloThinkUp crawler plugin is running now."; /** - * When crawling, make sure you only work on objects the current Owner has access to. - * - * Example: - * - * $od = DAOFactory::getDAO('OwnerDAO'); - * $oid = DAOFactory::getDAO('OwnerInstanceDAO'); - * - * $current_owner = $od->getByEmail(Session::getLoggedInUser()); - * - * $instances = [...] - * foreach ($instances as $instance) { - * if (!$oid->doesOwnerHaveAccess($current_owner, $instance)) { - * // Owner doesn't have access to this instance; let's not crawl it. - * continue; - * } - * [...] - * } - * - */ + * When crawling, make sure you only work on objects the current Owner has access to. + * + * Example: + * + * $od = DAOFactory::getDAO('OwnerDAO'); + * $oid = DAOFactory::getDAO('OwnerInstanceDAO'); + * + * $current_owner = $od->getByEmail(Session::getLoggedInUser()); + * + * $instances = [...] + * foreach ($instances as $instance) { + * if (!$oid->doesOwnerHaveAccess($current_owner, $instance)) { + * // Owner doesn't have access to this instance; let's not crawl it. + * continue; + * } + * [...] + * } + * + */ } } \ No newline at end of file diff --git a/webapp/plugins/hellothinkup/tests/TestOfHelloThinkUpPluginConfigurationController.php b/webapp/plugins/hellothinkup/tests/TestOfHelloThinkUpPluginConfigurationController.php index 1f644c1796..9b414b4709 100644 --- a/webapp/plugins/hellothinkup/tests/TestOfHelloThinkUpPluginConfigurationController.php +++ b/webapp/plugins/hellothinkup/tests/TestOfHelloThinkUpPluginConfigurationController.php @@ -1,4 +1,25 @@ . +*/ if ( !isset($RUNNING_ALL_TESTS) || !$RUNNING_ALL_TESTS ) { require_once '../../../../tests/init.tests.php'; } @@ -12,6 +33,8 @@ /** * Test of TestOfHelloThinkUpPluginConfigurationController * + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Gina Trapani, Mark Wilkie, Dwi Widiastuti * @author Mark Wilkie * */ diff --git a/webapp/plugins/twitter/auth.php b/webapp/plugins/twitter/auth.php index 22e18b7e5e..30c7ca8d15 100644 --- a/webapp/plugins/twitter/auth.php +++ b/webapp/plugins/twitter/auth.php @@ -1,4 +1,32 @@ . +*/ +/** + * @author Gina Trapani + * @author Mark Wilkie + * @author Christoffer Viken + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Gina Trapani, Mark Wilkie, Christoffer Viken +*/ chdir(".."); chdir(".."); require_once 'init.php'; diff --git a/webapp/plugins/twitter/controller/class.TwitterAuthController.php b/webapp/plugins/twitter/controller/class.TwitterAuthController.php index 9f831c316c..1e3be5d850 100644 --- a/webapp/plugins/twitter/controller/class.TwitterAuthController.php +++ b/webapp/plugins/twitter/controller/class.TwitterAuthController.php @@ -1,7 +1,30 @@ . + */ /** * Twitter Auth Controller * Save the OAuth tokens for Twitter account authorization. + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Gina Trapani * @author Gina Trapani * */ diff --git a/webapp/plugins/twitter/controller/class.TwitterPluginConfigurationController.php b/webapp/plugins/twitter/controller/class.TwitterPluginConfigurationController.php old mode 100755 new mode 100644 index c3d3f1cf4f..89a52505ef --- a/webapp/plugins/twitter/controller/class.TwitterPluginConfigurationController.php +++ b/webapp/plugins/twitter/controller/class.TwitterPluginConfigurationController.php @@ -1,9 +1,32 @@ . + */ /** * Twitter Plugin Configuration Controller * * Handles plugin configuration requests. * + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Gina Trapani, Mark Wilkie * @author Gina Trapani * */ diff --git a/webapp/plugins/twitter/controller/twitter.php b/webapp/plugins/twitter/controller/twitter.php old mode 100755 new mode 100644 index 6755c2ccab..8da8c09d1a --- a/webapp/plugins/twitter/controller/twitter.php +++ b/webapp/plugins/twitter/controller/twitter.php @@ -7,6 +7,33 @@ Version: 0.01 Author: Gina Trapani */ + +/** + * + * ThinkUp/webapp/plugins/twitter/controller/twitter.php + * + * Copyright (c) 2009-2010 Gina Trapani + * + * LICENSE: + * + * This file is part of ThinkUp (http://thinkupapp.com). + * + * ThinkUp 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. + * + * ThinkUp 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 ThinkUp. If not, see + * . + */ +/** + * @author Gina Trapani + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Gina Trapani + */ $config = Config::getInstance(); //@TODO: For the testing sake, check if mock class has already been loaded //@TODO: Figure out a better way to do this diff --git a/webapp/plugins/twitter/model/class.CrawlerTwitterAPIAccessorOAuth.php b/webapp/plugins/twitter/model/class.CrawlerTwitterAPIAccessorOAuth.php index 53c095f7c6..f1848f54da 100644 --- a/webapp/plugins/twitter/model/class.CrawlerTwitterAPIAccessorOAuth.php +++ b/webapp/plugins/twitter/model/class.CrawlerTwitterAPIAccessorOAuth.php @@ -1,7 +1,30 @@ . + */ /** * Crawler TwitterAPI Accessor, via OAuth * + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Gina Trapani * @author Gina Trapani * */ diff --git a/webapp/plugins/twitter/model/class.RetweetDetector.php b/webapp/plugins/twitter/model/class.RetweetDetector.php old mode 100755 new mode 100644 index 29c045df89..76f4c2db4e --- a/webapp/plugins/twitter/model/class.RetweetDetector.php +++ b/webapp/plugins/twitter/model/class.RetweetDetector.php @@ -1,7 +1,30 @@ . + */ /** * Retweet Detector * Detects retweets and original tweets + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Gina Trapani * @author Gina Trapani */ class RetweetDetector { diff --git a/webapp/plugins/twitter/model/class.TwitterAPIAccessorOAuth.php b/webapp/plugins/twitter/model/class.TwitterAPIAccessorOAuth.php index 76a61cf630..19f4e8c845 100644 --- a/webapp/plugins/twitter/model/class.TwitterAPIAccessorOAuth.php +++ b/webapp/plugins/twitter/model/class.TwitterAPIAccessorOAuth.php @@ -1,8 +1,31 @@ . + */ /** * Twitter API Accessor * Accesses the Twitter.com API via OAuth authentication. * + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Gina Trapani * @author Gina Trapani */ diff --git a/webapp/plugins/twitter/model/class.TwitterCrawler.php b/webapp/plugins/twitter/model/class.TwitterCrawler.php index 37544fb4a4..2ba0b1d3a7 100644 --- a/webapp/plugins/twitter/model/class.TwitterCrawler.php +++ b/webapp/plugins/twitter/model/class.TwitterCrawler.php @@ -1,10 +1,33 @@ . + */ /** * Twitter Crawler * * Retrieves tweets, replies, users, and following relationships from Twitter.com * * @TODO Complete docblocks + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Gina Trapani * @author Gina Trapani * */ diff --git a/webapp/plugins/twitter/model/class.TwitterOAuthThinkUp.php b/webapp/plugins/twitter/model/class.TwitterOAuthThinkUp.php old mode 100755 new mode 100644 index 1be75998ea..19f524ced4 --- a/webapp/plugins/twitter/model/class.TwitterOAuthThinkUp.php +++ b/webapp/plugins/twitter/model/class.TwitterOAuthThinkUp.php @@ -1,4 +1,30 @@ . + */ +/** + * @author Gina Trapani + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Gina Trapani + */ if (!class_exists('twitterOAuth')) { Utils::defineConstants(); require_once THINKUP_WEBAPP_PATH.'_lib/extlib/twitteroauth/twitteroauth.php'; diff --git a/webapp/plugins/twitter/model/class.TwitterPlugin.php b/webapp/plugins/twitter/model/class.TwitterPlugin.php old mode 100755 new mode 100644 index 75e9f915af..809ea81037 --- a/webapp/plugins/twitter/model/class.TwitterPlugin.php +++ b/webapp/plugins/twitter/model/class.TwitterPlugin.php @@ -1,9 +1,32 @@ . + */ /** * Twitter Plugin * * Twitter crawler and webapp plugin retrieves data from Twitter and displays it. * + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Gina Trapani * @author Gina Trapani * */ diff --git a/webapp/plugins/twitter/tests/TestOfRetweetDetector.php b/webapp/plugins/twitter/tests/TestOfRetweetDetector.php old mode 100755 new mode 100644 index 7a1727f87a..af4e3d451c --- a/webapp/plugins/twitter/tests/TestOfRetweetDetector.php +++ b/webapp/plugins/twitter/tests/TestOfRetweetDetector.php @@ -1,4 +1,32 @@ . +*/ +/** + * @author Gina Trapani + * @author ekansh + * @author Dwi Widiastuti + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Gina Trapani, ekansh, Dwi Widiastuti +*/ if ( !isset($RUNNING_ALL_TESTS) || !$RUNNING_ALL_TESTS ) { require_once '../../../../tests/init.tests.php'; } diff --git a/webapp/plugins/twitter/tests/TestOfTwitterAPIAccessorOAuth.php b/webapp/plugins/twitter/tests/TestOfTwitterAPIAccessorOAuth.php old mode 100755 new mode 100644 index 90404bfe41..dee6b770ba --- a/webapp/plugins/twitter/tests/TestOfTwitterAPIAccessorOAuth.php +++ b/webapp/plugins/twitter/tests/TestOfTwitterAPIAccessorOAuth.php @@ -1,4 +1,32 @@ . +*/ +/** + * @author Gina Trapani + * @author Dwi Widiastuti + * @author Mark Wilkie + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Gina Trapani, Dwi Widiastuti, Mark Wilkie +*/ if ( !isset($RUNNING_ALL_TESTS) || !$RUNNING_ALL_TESTS ) { require_once '../../../../tests/init.tests.php'; } diff --git a/webapp/plugins/twitter/tests/TestOfTwitterAuthController.php b/webapp/plugins/twitter/tests/TestOfTwitterAuthController.php index 30fc4811b3..c8b8611bfc 100644 --- a/webapp/plugins/twitter/tests/TestOfTwitterAuthController.php +++ b/webapp/plugins/twitter/tests/TestOfTwitterAuthController.php @@ -1,4 +1,25 @@ . +*/ if ( !isset($RUNNING_ALL_TESTS) || !$RUNNING_ALL_TESTS ) { require_once '../../../../tests/init.tests.php'; } @@ -16,6 +37,8 @@ /** * Test of TwitterAuthController * + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Gina Trapani, Dwi Widiastuti * @author Gina Trapani * */ diff --git a/webapp/plugins/twitter/tests/TestOfTwitterCrawler.php b/webapp/plugins/twitter/tests/TestOfTwitterCrawler.php old mode 100755 new mode 100644 index 23f31667db..c87e5238cb --- a/webapp/plugins/twitter/tests/TestOfTwitterCrawler.php +++ b/webapp/plugins/twitter/tests/TestOfTwitterCrawler.php @@ -1,4 +1,25 @@ . +*/ if ( !isset($RUNNING_ALL_TESTS) || !$RUNNING_ALL_TESTS ) { require_once '../../../../tests/init.tests.php'; } @@ -17,6 +38,8 @@ * * @TODO Test the rest of the TwitterCrawler methods * @TODO Add testFetchTweetsWithLinks, assert Links and images get inserted + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Gina Trapani, Christoffer Viken, Dwi Widiastuti, Mark Wilkie, ekansh * @author Gina Trapani * */ diff --git a/webapp/plugins/twitter/tests/TestOfTwitterOAuth.php b/webapp/plugins/twitter/tests/TestOfTwitterOAuth.php old mode 100755 new mode 100644 index 9854680fc9..5281dd8ec7 --- a/webapp/plugins/twitter/tests/TestOfTwitterOAuth.php +++ b/webapp/plugins/twitter/tests/TestOfTwitterOAuth.php @@ -1,4 +1,31 @@ . +*/ +/** + * @author Gina Trapani + * @author Dwi Widiastuti + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Gina Trapani, Dwi Widiastuti +*/ if ( !isset($RUNNING_ALL_TESTS) || !$RUNNING_ALL_TESTS ) { require_once '../../../../tests/init.tests.php'; } diff --git a/webapp/plugins/twitter/tests/TestOfTwitterPlugin.php b/webapp/plugins/twitter/tests/TestOfTwitterPlugin.php index 15c1b33f4d..85d6e04835 100644 --- a/webapp/plugins/twitter/tests/TestOfTwitterPlugin.php +++ b/webapp/plugins/twitter/tests/TestOfTwitterPlugin.php @@ -1,4 +1,25 @@ . +*/ if ( !isset($RUNNING_ALL_TESTS) || !$RUNNING_ALL_TESTS ) { require_once '../../../../tests/init.tests.php'; } @@ -12,6 +33,8 @@ /** * Test of TwitterPlugin class * + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Gina Trapani, Dwi Widiastuti, Guillaume Boudreau * @author Gina Trapani * */ diff --git a/webapp/plugins/twitter/tests/TestOfTwitterPluginConfigurationController.php b/webapp/plugins/twitter/tests/TestOfTwitterPluginConfigurationController.php old mode 100755 new mode 100644 index 2442955af7..91d6a8b252 --- a/webapp/plugins/twitter/tests/TestOfTwitterPluginConfigurationController.php +++ b/webapp/plugins/twitter/tests/TestOfTwitterPluginConfigurationController.php @@ -1,4 +1,25 @@ . +*/ if ( !isset($RUNNING_ALL_TESTS) || !$RUNNING_ALL_TESTS ) { require_once '../../../../tests/init.tests.php'; } @@ -13,6 +34,8 @@ /** * Test of TwitterPluginConfigurationController * + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Gina Trapani, Dwi Widiastuti, Mark Wilkie * @author Gina Trapani * */ diff --git a/webapp/plugins/twitter/tests/classes/mock.TwitterOAuth.php b/webapp/plugins/twitter/tests/classes/mock.TwitterOAuth.php old mode 100755 new mode 100644 index 271fd5d516..cf1f8eb0a3 --- a/webapp/plugins/twitter/tests/classes/mock.TwitterOAuth.php +++ b/webapp/plugins/twitter/tests/classes/mock.TwitterOAuth.php @@ -1,6 +1,29 @@ . +*/ /** * Mock Twitter OAuth class for tests + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Gina Trapani, Dwi Widiastuti * @author Gina Trapani */ class TwitterOAuth { diff --git a/webapp/post/export.php b/webapp/post/export.php index bbba54301d..57f30ecdac 100644 --- a/webapp/post/export.php +++ b/webapp/post/export.php @@ -1,4 +1,32 @@ . + * + * + * @author Gina Trapani + * @author Christoffer Viken + * @author Mark Wilkie + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Gina Trapani, Christoffer Viken, Mark Wilkie + */ chdir(".."); require_once 'init.php'; diff --git a/webapp/post/grid-export.php b/webapp/post/grid-export.php index 6d8adfa31b..f0b5aa7ec8 100644 --- a/webapp/post/grid-export.php +++ b/webapp/post/grid-export.php @@ -1,4 +1,30 @@ . + * + * + * @author Mark Wilkie + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Mark Wilkie + */ chdir(".."); require_once 'init.php'; diff --git a/webapp/post/grid.php b/webapp/post/grid.php index 3938f0f4e8..627a9bfbfe 100644 --- a/webapp/post/grid.php +++ b/webapp/post/grid.php @@ -1,4 +1,30 @@ . + * + * + * @author Mark Wilkie + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Mark Wilkie + */ chdir(".."); require_once 'init.php'; diff --git a/webapp/post/index.php b/webapp/post/index.php index 70d78a1ac2..018efd59d5 100644 --- a/webapp/post/index.php +++ b/webapp/post/index.php @@ -1,4 +1,30 @@ . + * + * + * @author Gina Trapani + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Gina Trapani + */ chdir(".."); require_once 'init.php'; diff --git a/webapp/post/map.php b/webapp/post/map.php index 0477b085bf..a4173d1719 100644 --- a/webapp/post/map.php +++ b/webapp/post/map.php @@ -1,4 +1,30 @@ . + * + * + * @author Gina Trapani + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Gina Trapani + */ chdir('..'); require_once 'init.php'; diff --git a/webapp/post/mark-parent.php b/webapp/post/mark-parent.php index 5eaccebe4c..bdaf7ba495 100644 --- a/webapp/post/mark-parent.php +++ b/webapp/post/mark-parent.php @@ -1,4 +1,30 @@ . + * + * + * @author Gina Trapani + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Gina Trapani + */ chdir(".."); require_once 'init.php'; diff --git a/webapp/public.php b/webapp/public.php index 5c541c1baf..aa06bd3bb0 100644 --- a/webapp/public.php +++ b/webapp/public.php @@ -1,3 +1,29 @@ . + * + * + * @author Gina Trapani + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Gina Trapani + * + */ require_once 'index.php'; diff --git a/webapp/session/activate.php b/webapp/session/activate.php old mode 100755 new mode 100644 index 8ccf6f0abd..fda8ffb50a --- a/webapp/session/activate.php +++ b/webapp/session/activate.php @@ -1,4 +1,30 @@ . + * + * + * @author Gina Trapani + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Gina Trapani, Christoffer Viken, Dwi Widiastuti + */ chdir('..'); require_once 'init.php'; diff --git a/webapp/session/captcha-img.php b/webapp/session/captcha-img.php old mode 100755 new mode 100644 index 879f8b2800..ce9de4270c --- a/webapp/session/captcha-img.php +++ b/webapp/session/captcha-img.php @@ -1,4 +1,30 @@ . + * + * + * @author Gina Trapani + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Gina Trapani + */ chdir('..'); require_once 'init.php'; diff --git a/webapp/session/forgot.php b/webapp/session/forgot.php old mode 100755 new mode 100644 index 8e5e0478d0..4e988240f0 --- a/webapp/session/forgot.php +++ b/webapp/session/forgot.php @@ -1,4 +1,31 @@ . + * + * + * @author Gina Trapani + * @author Michael Louis Thaler + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Gina Trapani, Michael Louis Thaler + */ chdir('..'); require_once 'init.php'; diff --git a/webapp/session/index.php b/webapp/session/index.php index af24f5d0f3..1fc8eb8787 100644 --- a/webapp/session/index.php +++ b/webapp/session/index.php @@ -1,2 +1,28 @@ -. + * + * + * @author Gina Trapani + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Gina Trapani + */ require_once 'login.php'; \ No newline at end of file diff --git a/webapp/session/login.php b/webapp/session/login.php old mode 100755 new mode 100644 index bc53187a2f..dd7d3d5470 --- a/webapp/session/login.php +++ b/webapp/session/login.php @@ -1,4 +1,30 @@ . + * + * + * @author Gina Trapani + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Gina Trapani + */ chdir('..'); require_once 'init.php'; diff --git a/webapp/session/logout.php b/webapp/session/logout.php old mode 100755 new mode 100644 index c70c042d70..36e1962002 --- a/webapp/session/logout.php +++ b/webapp/session/logout.php @@ -1,4 +1,30 @@ . + * + * + * @author Gina Trapani + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Gina Trapani, Christoffer Viken, Dash30, Dwi Widiastuti + */ chdir('..'); require_once 'init.php'; diff --git a/webapp/session/register.php b/webapp/session/register.php index a24b59432b..c60a8d1c94 100644 --- a/webapp/session/register.php +++ b/webapp/session/register.php @@ -1,4 +1,30 @@ . + * + * + * @author Gina Trapani + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Gina Trapani, Christoffer Viken, unruthless, Dwi Widiastuti, Russell Smith, is0dvil + */ chdir('..'); require_once 'init.php'; diff --git a/webapp/session/reset.php b/webapp/session/reset.php index bae13753fd..11014fc6e7 100644 --- a/webapp/session/reset.php +++ b/webapp/session/reset.php @@ -1,4 +1,30 @@ . + * + * + * @author Michael Louis Thaler + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Gina Trapani, Michael Louis Thaler + */ chdir('..'); require_once 'init.php'; diff --git a/webapp/user/index.php b/webapp/user/index.php index d4e21d85e7..8d1ee2cde3 100644 --- a/webapp/user/index.php +++ b/webapp/user/index.php @@ -1,4 +1,30 @@ . + * + * + * @author Gina Trapani + * @license http://www.gnu.org/licenses/gpl.html + * @copyright 2009-2010 Gina Trapani + */ chdir(".."); require_once 'init.php';