summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenny Baumann <BenBE@geshi.org>2014-09-09 23:46:41 +0200
committerBenny Baumann <BenBE@geshi.org>2014-09-09 23:46:41 +0200
commit5a0a64af7c5f3d5e7069c419f384c2c4f71f91a1 (patch)
treeddb9b4b779b65d85d9116d4549dc73e0cbcdae7d
parent2bf1684067b9b12b88a9144eb1aade57da17d58f (diff)
downloadcacert-devel-5a0a64af7c5f3d5e7069c419f384c2c4f71f91a1.tar.gz
cacert-devel-5a0a64af7c5f3d5e7069c419f384c2c4f71f91a1.tar.xz
cacert-devel-5a0a64af7c5f3d5e7069c419f384c2c4f71f91a1.zip
bug 612: Minor fixups in formatting and error outputbug-612
-rw-r--r--includes/general.php5
-rw-r--r--pages/account/13.php9
2 files changed, 7 insertions, 7 deletions
diff --git a/includes/general.php b/includes/general.php
index ff8e90e..faefb2b 100644
--- a/includes/general.php
+++ b/includes/general.php
@@ -807,8 +807,9 @@
*/
function anonymizeIP($ip){
$bits = @inet_pton($ip);
- if($bits === false)
+ if($bits === false) {
return false;
+ }
if(strlen($bits) == 4) {
$bits[2] = "\0";
@@ -830,5 +831,3 @@
}
return false;
}
-
-?>
diff --git a/pages/account/13.php b/pages/account/13.php
index c982a2d..32812ce 100644
--- a/pages/account/13.php
+++ b/pages/account/13.php
@@ -14,8 +14,8 @@
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
-*/ ?>
-<?
+*/
+
$query = "select * from `users` where `id`='".intval($_SESSION['profile']['id'])."' and `users`.`deleted`=0";
$res = mysql_query($query);
$user = mysql_fetch_assoc($res);
@@ -28,8 +28,9 @@
if($showdetails){
$body = sprintf(_("Hi %s,"),$user['fname'])."\n\n";
$ip = anonymizeIp($_SERVER['REMOTE_ADDR']);
- if($ip === false)
- $ip = _("Error");
+ if($ip === false) {
+ $ip = _("Error anonymising IP/network information");
+ }
$body .= sprintf(_("You receive this automatic mail since you yourself or someone ".
"else looked up your secret questions and answers for a forgotten ".
"password.\n\n".