From 20c11bccf7e0a8f846c2f802882af996628e1208 Mon Sep 17 00:00:00 2001
From: David Anderson <davea@ssl.berkeley.edu>
Date: Sun, 2 Mar 2014 22:47:24 -0800
Subject: [PATCH] fixes for Android/x86 build scripts, from Jon

---
 android/build_libraries_x86.sh |  8 ++++----
 html/ops/manage_user.php       | 10 +++++++---
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/android/build_libraries_x86.sh b/android/build_libraries_x86.sh
index 14fa2016db..389531cddf 100755
--- a/android/build_libraries_x86.sh
+++ b/android/build_libraries_x86.sh
@@ -15,14 +15,14 @@ export BOINC=".." #BOINC source code
 
 export ANDROIDTC="$HOME/androidx86-tc"
 export TCBINARIES="$ANDROIDTC/bin"
-export TCINCLUDES="$ANDROIDTC/i686-android-linux"
+export TCINCLUDES="$ANDROIDTC/i686-linux-android"
 export TCSYSROOT="$ANDROIDTC/sysroot"
 export STDCPPTC="$TCINCLUDES/lib/libstdc++.a"
 
 export PATH="$PATH:$TCBINARIES:$TCINCLUDES/bin"
-export CC=i686-android-linux-gcc
-export CXX=i686-android-linux-g++
-export LD=i686-android-linux-ld
+export CC=i686-linux-android-gcc
+export CXX=i686-linux-android-g++
+export LD=i686-linux-android-ld
 export CFLAGS="--sysroot=$TCSYSROOT -DANDROID -DDECLARE_TIMEZONE -Wall -I$TCINCLUDES/include -O3 -fomit-frame-pointer"
 export CXXFLAGS="--sysroot=$TCSYSROOT -DANDROID -Wall -I$TCINCLUDES/include -funroll-loops -fexceptions -O3 -fomit-frame-pointer"
 export LDFLAGS="-L$TCSYSROOT/usr/lib -L$TCINCLUDES/lib -llog"
diff --git a/html/ops/manage_user.php b/html/ops/manage_user.php
index 3fd90c6a29..9ea10e984b 100644
--- a/html/ops/manage_user.php
+++ b/html/ops/manage_user.php
@@ -33,6 +33,10 @@ require_once("../inc/util_ops.inc");
 require_once("../inc/profile.inc");
 require_once("../project/project.inc");
 
+error_reporting(E_ALL);
+ini_set('display_errors', true);
+ini_set('display_startup_errors', true);
+
 get_logged_in_user();
 db_init();
 
@@ -96,11 +100,13 @@ $delete_problem="";
 // Process user search form
 
 $matches="";
+print_r($_POST);
 
 if (isset($_POST['search_submit'])){
     $search_name = post_str('search_text');
     $search_name = BoincDb::escape_string(sanitize_tags($search_name));
 
+    echo "search name ($search_name)";
     if (!empty($search_name)){ 
         $result = mysql_query("SELECT * FROM user WHERE name='$search_name'");
 
@@ -234,9 +240,7 @@ if (!empty($user)) {
 
 // Output:
 
-admin_page_head("User Management: $user->name");
-
-echo "<h2>User Management</h2>\n";
+admin_page_head("Management $user->name");
 
 if (!defined("POST_REPORT_EMAILS")) {
     echo "<p><font color='RED'>