OpencachingDeutschland/oc-server3
1
0
Fork 0
Code Issues Pull Requests Releases Activity

okapi r694

Browse Source
This commit is contained in:
following
2013-04-09 15:50:49 +02:00
parent 6841be3d26
commit ce460979ce
6 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/okapi/core.php
View File

@ -778,7 +778,7 @@ class Okapi
{ {
public static $data_store; public static $data_store;
public static $server; public static $server;
public static $revision = 686; # This gets replaced in automatically deployed packages public static $revision = 694; # This gets replaced in automatically deployed packages
private static $okapi_vars = null; private static $okapi_vars = null;
/** Get a variable stored in okapi_vars. If variable not found, return $default. */ /** Get a variable stored in okapi_vars. If variable not found, return $default. */

2
htdocs/okapi/services/caches/geocaches.php
View File

@ -1012,6 +1012,8 @@ class WebService
} }
else else
{ {
# OC.de wants the tld in lowercase here
$site_name = ucfirst(strtolower($site_name));
if ($type == 'full') if ($type == 'full')
{ {
$note = sprintf( $note = sprintf(

6
htdocs/okapi/services/logs/entry.xml
View File

@ -14,8 +14,10 @@
<li><b>cache_code</b> - code of the cache which the log entry refers to,</li> <li><b>cache_code</b> - code of the cache which the log entry refers to,</li>
<li> <li>
<p><b>date</b> - date and time (ISO 8601) when the log entry was submitted.</p> <p><b>date</b> - date and time (ISO 8601) when the log entry was submitted.</p>
<p>Note, that some Opencaching servers don't store the exact times along <p>Please note that log entries often contain dates only (with the times
with the log entries.</p> truncated to midnight, as in the local timezone). In such cases, you may
want to avoid displaying the time. You may assume that if the <b>date</b>
value contains the "00:00:00" string, then it is date-only.</p>
</li> </li>
<li> <li>
<p><b>user</b> - a dictionary:</p> <p><b>user</b> - a dictionary:</p>

2
htdocs/okapi/services/logs/submit.php
View File

@ -100,7 +100,7 @@ class WebService
throw new InvalidParam('recommend', "Unknown option: '$recommend'."); throw new InvalidParam('recommend', "Unknown option: '$recommend'.");
$recommend = ($recommend == 'true'); $recommend = ($recommend == 'true');
if ($recommend && $logtype != 'Found it') if ($recommend && $logtype != 'Found it')
throw new BadRequest(_("Recommending is allowed only for 'Found it' logtypes.")); throw new BadRequest("Recommending is allowed only for 'Found it' logtypes.");
$needs_maintenance = $request->get_parameter('needs_maintenance'); $needs_maintenance = $request->get_parameter('needs_maintenance');
if (!$needs_maintenance) $needs_maintenance = 'false'; if (!$needs_maintenance) $needs_maintenance = 'false';

6
htdocs/okapi/services/logs/userlogs.xml
View File

@ -23,8 +23,10 @@
<li><b>uuid</b> - ID of the log entry,</li> <li><b>uuid</b> - ID of the log entry,</li>
<li> <li>
<p><b>date</b> - date and time (ISO 8601) when the log entry was submitted.</p> <p><b>date</b> - date and time (ISO 8601) when the log entry was submitted.</p>
<p>Note, that some Opencaching servers don't store the exact times along <p>Please note that log entries often contain dates only (with the times
with the log entries.</p> truncated to midnight, as in the local timezone). In such cases, you may
want to avoid displaying the time. You may assume that if the <b>date</b>
value contains the "00:00:00" string, then it is date-only.</p>
</li> </li>
<li><b>cache_code</b> - code of the geocache,</li> <li><b>cache_code</b> - code of the geocache,</li>
<li> <li>

3
htdocs/okapi/views/devel/dbstruct.php
View File

@ -27,7 +27,8 @@ class View
$user = Settings::get('DB_USERNAME'); $user = Settings::get('DB_USERNAME');
$password = Settings::get('DB_PASSWORD'); $password = Settings::get('DB_PASSWORD');
$dbname = Settings::get('DB_NAME'); $dbname = Settings::get('DB_NAME');
$struct = shell_exec("mysqldump --no-data -u$user -p$password $dbname"); $dbserver = Settings::get('DB_SERVER');
$struct = shell_exec("mysqldump --no-data -h$dbserver -u$user -p$password $dbname");
# Remove the "AUTO_INCREMENT=..." values. They break the diffs. # Remove the "AUTO_INCREMENT=..." values. They break the diffs.