Revision: 1161
http://mrbs.svn.sourceforge.net/mrbs/?rev=1161&view=rev
Author: cimorrison
Date: 2009-07-20 16:23:13 +0000 (Mon, 20 Jul 2009)
Log Message:
-----------
Brought commenting style into line with MRBS standard practice.
Modified Paths:
--------------
mrbs/trunk/web/edit_entry.php
mrbs/trunk/web/report.php
mrbs/trunk/web/search.php
Modified: mrbs/trunk/web/edit_entry.php
===================================================================
--- mrbs/trunk/web/edit_entry.php 2009-07-17 19:59:50 UTC (rev 1160)
+++ mrbs/trunk/web/edit_entry.php 2009-07-20 16:23:13 UTC (rev 1161)
@@ -107,12 +107,12 @@
{
$private = $private_default;
}
- # Need to clear some data if entry is private and user
- # does not have permission to edit/view details
+ // Need to clear some data if entry is private and user
+ // does not have permission to edit/view details
if (isset($copy) && ($create_by != $row['create_by']))
{
- # Entry being copied by different user
- # If they don't have rights to view details, clear them
+ // Entry being copied by different user
+ // If they don't have rights to view details, clear them
$privatewriteable = getWritable($row['create_by'],getUserName());
if (is_private_event($private) && !$privatewriteable)
{
Modified: mrbs/trunk/web/report.php
===================================================================
--- mrbs/trunk/web/report.php 2009-07-17 19:59:50 UTC (rev 1160)
+++ mrbs/trunk/web/report.php 2009-07-20 16:23:13 UTC (rev 1161)
@@ -334,7 +334,7 @@
$display = get_form_var('display', 'string');
$sumby = get_form_var('sumby', 'string');
-# Require authenticated user if private bookings are required
+// Require authenticated user if private bookings are required
if ($private_override == "private")
{
if (!getAuthorised(1))
@@ -344,7 +344,7 @@
}
}
-# Need to know user name and if they are an admin
+// Need to know user name and if they are an admin
$user = getUserName();
$is_admin = (isset($user) && authGetUserLevel($user)>=2) ;
@@ -646,7 +646,7 @@
$sql .= " AND" . sql_syntax_caseless_contains("e.create_by",
$creatormatch);
}
- # If not overriding as public entries and user isn't and admin...
+ // If not overriding as public entries and user isn't and admin...
if (($private_override != "public") && !$is_admin)
{
if (isset($user))
@@ -662,8 +662,8 @@
}
else
{
- # un-authenticated users can only report on
- # items which are not marked private
+ // un-authenticated users can only report on
+ // items which are not marked private
$sql .= " AND e.private=0";
}
}
Modified: mrbs/trunk/web/search.php
===================================================================
--- mrbs/trunk/web/search.php 2009-07-17 19:59:50 UTC (rev 1160)
+++ mrbs/trunk/web/search.php 2009-07-20 16:23:13 UTC (rev 1161)
@@ -63,7 +63,7 @@
exit;
}
-# Require authenticated user if private bookings are required
+// Require authenticated user if private bookings are required
if ($private_override == "private")
{
if (!getAuthorised(1))
@@ -93,14 +93,14 @@
. " OR " . sql_syntax_caseless_contains("E.description", $search_str)
. ") AND E.end_time > $now";
-# Unless we overriding privacy settings as "public" or user
-# is and admin, we have to restrict which listings are returned
+// Unless we overriding privacy settings as "public" or user
+// is and admin, we have to restrict which listings are returned
if (($private_override != "public") && !$is_admin)
{
if (isset($user))
{
- # If private bookings are forced then user can only
- # search their own. If not they can also search non-private entries
+ // If private bookings are forced then user can only
+ // search their own. If not they can also search non-private entries
if ($private_override == "private")
{
$sql_pred .= " AND E.create_by = '$user'";
@@ -112,9 +112,9 @@
}
else
{
- # If user isn't logged in then we already know
- # override isn't set to "private" and we wouldn't
- # be here if it were "public" so...
+ // If user isn't logged in then we already know
+ // override isn't set to "private" and we wouldn't
+ // be here if it were "public" so...
$sql_pred .= " AND NOT E.private";
}
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Enter the BlackBerry Developer Challenge
This is your chance to win up to $100,000 in prizes! For a limited time,
vendors submitting new applications to BlackBerry App World(TM) will have
the opportunity to enter the BlackBerry Developer Challenge. See full prize
details at: http://p.sf.net/sfu/Challenge
_______________________________________________
Mrbs-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mrbs-commits
