From: quix0r Date: Wed, 3 Oct 2012 13:24:32 +0000 (+0000) Subject: Some improvements, package.json added X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=9983aa1824be71fb6bb288a7757b27004bedb881;p=mailer.git Some improvements, package.json added --- diff --git a/.gitattributes b/.gitattributes index 7992e0f9ac..879c739054 100644 --- a/.gitattributes +++ b/.gitattributes @@ -64,6 +64,7 @@ DOCS/en/rewrite/README.txt svneol=native#text/plain DOCS/en/task/README.txt svneol=native#text/plain DOCS/en/themes/README.txt svneol=native#text/plain DOCS/geoip_LICENSE.txt svneol=native#text/plain +DOCS/package.json -text DOCS/tpl-validator.php svneol=native#text/plain /admin.php svneol=native#text/plain /agb.php svneol=native#text/plain diff --git a/DOCS/package.json b/DOCS/package.json new file mode 100644 index 0000000000..7061821c5c --- /dev/null +++ b/DOCS/package.json @@ -0,0 +1,28 @@ +{ + "name": "mailer", + "title": "Mailer Project", + "description": "A free paid mail service script with a wide range of extensions which enhance the main script.", + "version": "0.2.1-FINAL", + "homepage": "http://mxchange.org", + "author": { + "name": "en/AUTHORS.txt" + }, + "repository": { + "type": "svn", + "url": "http://mxchange.org/repos/mailer/branches/0.2.1-FINAL/" + }, + "bugs": { + "url": "http://bugs.mxchange.org/" + }, + "licenses": [ + { + "type": "GPL", + "url": "http://www.opensource.org/licenses/GPL-2.0" + } + ], + "dependencies": {}, + "devDependencies": { + //"foo": "1.2.3" + }, + "keywords": [] +} diff --git a/inc/monthly/monthly_beg.php b/inc/monthly/monthly_beg.php index 516e3a7ec6..172d4427e6 100644 --- a/inc/monthly/monthly_beg.php +++ b/inc/monthly/monthly_beg.php @@ -73,7 +73,8 @@ if ((getBegRanks() > 0) && (!isCssOutputMode())) { FROM `{?_MYSQL_PREFIX?}_user_data` WHERE - `status`='CONFIRMED'" . $whereStatement . " + `status`='CONFIRMED' + " . $whereStatement . " " . runFilterChain('user_exclusion_sql', ' ') . " AND `beg_points` > 0 ORDER BY diff --git a/inc/mysql-manager.php b/inc/mysql-manager.php index 027f3a2b6c..d97d33d37f 100644 --- a/inc/mysql-manager.php +++ b/inc/mysql-manager.php @@ -491,11 +491,14 @@ function fetchUserData ($value, $column = 'userid') { $found = false; // Extra SQL statements - $ADD = runFilterChain('convert_user_data_columns', ''); + $ADD = runFilterChain('convert_user_data_columns', ' '); // Query for the user $result = SQL_QUERY_ESC("SELECT *" . $ADD . " FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `%s`='%s' LIMIT 1", - array($column, $value), __FUNCTION__, __LINE__); + array( + $column, + $value + ), __FUNCTION__, __LINE__); // Do we have a record? if (SQL_NUMROWS($result) == 1) {