summaryrefslogtreecommitdiff
path: root/includes
diff options
context:
space:
mode:
authordirk <beliebige_email_adresse@fidocon.de>2011-08-17 01:08:00 +0200
committerdirk <beliebige_email_adresse@fidocon.de>2011-08-17 01:08:00 +0200
commit920872907c76d3e2c21cb6bfe36842af9121a314 (patch)
treecb9fd048942de76872d093d14157608c1fbe93b6 /includes
parent443cafa2003738f9b2d34fdb1cad38528943fc46 (diff)
parent84c058819acda629c4d3f88350d0cb5f3f24fd38 (diff)
downloadcacert-devel-920872907c76d3e2c21cb6bfe36842af9121a314.tar.gz
cacert-devel-920872907c76d3e2c21cb6bfe36842af9121a314.tar.xz
cacert-devel-920872907c76d3e2c21cb6bfe36842af9121a314.zip
Merge commit 'origin/bug-827' into bug-827
Conflicts: includes/wot.inc.php
Diffstat (limited to 'includes')
-rw-r--r--includes/wot.inc.php16
1 files changed, 8 insertions, 8 deletions
diff --git a/includes/wot.inc.php b/includes/wot.inc.php
index d7c4b13..a21f78a 100644
--- a/includes/wot.inc.php
+++ b/includes/wot.inc.php
@@ -14,7 +14,7 @@
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-*/
+*/
function query_init ($query)
{
@@ -72,25 +72,25 @@
function get_given_assurances ($userid)
{
- $res = query_init ("select * from `notary` where `from`='".intval($userid)."' and `from` != `to` order by `id` asc");
+ $res = query_init ("select * from `notary` where `notary`.`from`='".intval($userid)."' and `notary`.`from` != `to` order by `notary`.`id` asc");
return $res;
}
function get_received_assurances ($userid)
{
- $res = query_init ("select * from `notary` where `to`='".intval($userid)."' and `from` != `to` order by `id` asc ");
+ $res = query_init ("select * from `notary` where `notary`.`to`='".intval($userid)."' and `notary`.`from` != `notary`.`to` order by `notary`.`id` asc ");
return $res;
}
function get_given_assurances_summary ($userid)
{
- $res = query_init ("select count(*) as number,points,awarded,method from notary where `from`='".intval($userid)."' group by points,awarded,method");
+ $res = query_init ("select count(*) as number,points,awarded,method from notary where `notary`.`from`='".intval($userid)."' group by points,awarded,method");
return $res;
}
-
+
function get_received_assurances_summary ($userid)
{
- $res = query_init ("select count(*) as number,points,awarded,method from notary where `to`='".intval($userid)."' group by points,awarded,method");
+ $res = query_init ("select count(*) as number,points,awarded,method from notary where `notary`.`to`='".intval($userid)."' group by points,awarded,method");
return $res;
}
@@ -130,7 +130,7 @@
$awarded = 100;
}
else
- $experience = 0;
+ $experience = 0;
switch ($row['method'])
{
@@ -288,7 +288,7 @@
$res = get_given_assurances(intval($userid));
while($row = mysql_fetch_assoc($res))
{
- $fromuser = get_user (intval($row['to']));
+ $fromuser = get_user (intval($row['to']));
calc_experience ($row,$points,$experience,$sum_experience);
$name = show_user_link ($fromuser['fname']." ".$fromuser['lname'],intval($row['to']));
output_assurances_row (intval($row['id']),$row['date'],$name,intval($row['awarded']),$row['location'],$row['method']==""?"":_(sprintf("%s", $row['method'])),$experience);