Changeset 467 for branches/eli_branch/services/admins.php

Timestamp:

Feb 19, 2014 2:28:00 AM (10 years ago)

Author:

anonymous

Message:

Merged in changes from trunk to finish Eli's branch.

Location:

branches/eli_branch

Files:

• . (modified) (1 prop)
• services/admins.php (modified) (11 diffs)

branches/eli_branch/services/admins.php

@@ -4 +4 @@
  * For details visit the project site: <http://trac.strangecode.com/codebase/>
  * Copyright 2001-2012 Strangecode, LLC
- * 
+ *
  * This file is part of The Strangecode Codebase.
  *
@@ -11 +11 @@
  * Free Software Foundation, either version 3 of the License, or (at your option)
  * any later version.
- * 
+ *
  * The Strangecode Codebase 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
  * The Strangecode Codebase. If not, see <http://www.gnu.org/licenses/>.
@@ -27 +27 @@
 // require_once dirname(__FILE__) . '/_config.inc.php';
 
+$app->sslOn();
 $auth->requireLogin();
-$app->sslOn();
 
 require_once 'codebase/lib/PageNumbers.inc.php';
@@ -282 +282 @@
     $app =& App::getInstance();
     $db =& DB::getInstance();
-    
+
     $lock->select($auth->getParam('db_table'), $auth->getParam('db_primary_key'), $id);
     if ($lock->isLocked() && !$lock->isMine()) {
@@ -341 +341 @@
     $app =& App::getInstance();
     $db =& DB::getInstance();
-    
+
     $lock->select($auth->getParam('db_table'), $auth->getParam('db_primary_key'), $id);
     if ($lock->isLocked() && !$lock->isMine()) {
@@ -353 +353 @@
     $qid = $db->query("
         SELECT " . $auth->getParam('db_username_column') . "
+        FROM " . $auth->getParam('db_table') . "
         WHERE " . $auth->getParam('db_primary_key') . " = '" . $db->escapeString($id) . "'
     ");
@@ -386 +387 @@
     $app =& App::getInstance();
     $db =& DB::getInstance();
-    
+
     // Remove any stale cached list data.
     $cache->delete('list');
@@ -429 +430 @@
     $app =& App::getInstance();
     $db =& DB::getInstance();
-    
+
     $lock->select($auth->getParam('db_table'), $auth->getParam('db_primary_key'), $frm['admin_id']);
     if ($lock->isLocked() && !$lock->isMine()) {
@@ -474 +475 @@
     global $auth;
     $db =& DB::getInstance();
-    
+
     $where_clause = '';
 
@@ -508 +509 @@
         SELECT
             " . $auth->getParam('db_table') . ".*,
-            " . $auth->getParam('db_table') . "." . $auth->getParam('db_primary_key') . " AS admin_id,            
+            " . $auth->getParam('db_table') . "." . $auth->getParam('db_primary_key') . " AS admin_id,
             a1." . $auth->getParam('db_username_column') . " AS added_admin_username,
             a2." . $auth->getParam('db_username_column') . " AS modified_admin_username
@@ -536 +537 @@
         return $list;
     }
-    
+
     // The list was not cached, so issue the real query.
     $qid = $db->query($sql);