Some improvements, package.json added

diff --git a/.gitattributes b/.gitattributes
index 7992e0f9aca27f79b6622d396e4c43e8e4496ac1..879c7390543eebe4a0b5a235cfabad912ef71335 100644 (file)
--- 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 (file)
index 0000000..7061821
--- /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 516e3a7ec6313f468c0ed9a3a4817cbf22511286..172d4427e63dd5d09476888c185821172599f8f8 100644 (file)
--- 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 027f3a2b6c52b6509fa0da8dcce644d1b5993e40..d97d33d37fd9899ef59c376b858fcc3c557cdc8c 100644 (file)
--- 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) {