Skip to content
Browse files

tweak to license, and show during update bins/releases

git-svn-id: svn://svn.newznab.com/nn/trunk@1114 a8b8df2f-1e19-4095-b43c-2e6d618ca476
  • Loading branch information...
1 parent a2db62b commit 450ec49a84fc88d444518d9500200086b5cc5061 barnseenio committed Jan 6, 2011
Showing with 34 additions and 58 deletions.
  1. +0 −56 LICENSE.txt
  2. +7 −2 README.txt
  3. +3 −0 www/lib/binaries.php
  4. +4 −0 www/lib/releases.php
  5. +20 −0 www/lib/site.php
View
56 LICENSE.txt
@@ -617,59 +617,3 @@ 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.
-
- <one line to give the program's name and a brief idea of what it does.>
- Copyright (C) <year> <name of author>
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 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 <http://www.gnu.org/licenses/>.
-
-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:
-
- <program> Copyright (C) <year> <name of author>
- 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
-<http://www.gnu.org/licenses/>.
-
- 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
-<http://www.gnu.org/philosophy/why-not-lgpl.html>.
-
View
9 README.txt
@@ -1,6 +1,11 @@
-Newznab is an nzbs.org clone PHP/Smarty application, which supports the indexing of usenet headers into a mysql database and provides a simple web based search interface onto the data.
+Newznab is an nzbs.org clone PHP/Smarty application, which supports the indexing of
+usenet headers into a mysql database and provides a simple web based search interface
+onto the data.
-It includes simple CMS facilities, SEO friendly URLs and is designed with the intention of allowing users to create a community around their index.
+It includes simple CMS facilities, SEO friendly URLs and is designed with the intention
+of allowing users to create a community around their index.
+
+For information on how to install, please refer to INSTALL.txt
To add a bug report or feature request browse to http://code.google.com/p/newznab/issues/list
View
3 www/lib/binaries.php
@@ -35,6 +35,9 @@ function updateAllGroups()
$groups = new Groups;
$res = $groups->getActive();
+ $s = new Sites();
+ echo $s->getLicense();
+
if ($res)
{
$alltime = microtime(true);
View
4 www/lib/releases.php
@@ -778,12 +778,16 @@ function processReleases($echooutput=false)
$cat = new Category;
$bin = new Binaries;
$nzb = new Nzb;
+ $s = new Sites;
$relreg = new ReleaseRegex;
$page = new Page;
$nfo = new Nfo($echooutput);
$retcount = 0;
if ($echooutput)
+ echo $s->getLicense();
+
+ if ($echooutput)
echo "\n\nStarting release update process (".date("Y-m-d H:i:s").")\n";
if (!file_exists($page->site->nzbpath))
View
20 www/lib/site.php
@@ -148,5 +148,25 @@ public function updateLatestRegexRevision($rev)
return $db->query(sprintf("update site set latestregexrevision = %d", $rev));
}
+
+ public function getLicense($html=false)
+ {
+ $n = "\r\n";
+ if ($html)
+ $n = "<br/>";
+
+ return $n."newznab ".$this->version()." Copyright (C) ".date("Y")." newznab.com".$n."
+
+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.".$n."
+
+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.
+".$n;
+ }
}
?>

0 comments on commit 450ec49

Please sign in to comment.
Something went wrong with that request. Please try again.