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

Merge branch 'master' into next

Browse Source
This commit is contained in:
following
2013-07-22 14:48:18 +02:00
parent 11ccac0a1f acbda597f9
commit bbd8c96e78
7 changed files with 758 additions and 613 deletions
Download Patch File Download Diff File Expand all files Collapse all files
doc/license.txt
+4 -8
View File
@@ -97,19 +97,20 @@ PHP libraries
9. HTML Purifier
Path : lib/htmlpurifier-4.2.0
lib2/HTMLPurifier
htdocs/lib2/HTMLPurifier
URI : http://htmlpurifier.org/
License : LGPL
10. ss_zip class
Path : lib2/ss_zip.php
Path : htdocs/lib2/ss_zip.php
URI : http://smiledsoft.com/demos/phpzip/ (no longer works?)
License : ??
11. OKAPI: Opencaching API
Path : htdocs/okapi/
URI : http://code.google.com/p/opencaching-api/
License : MIT
License : MIT, with exception of okapi/res/attribute icons which
are under Opencaching-GPL license
The following PHP libraries are currently not in use and may be discarded.
@@ -127,11 +128,6 @@ the distrubution!
http://cyberai.users.phpclasses.org/package/2189-PHP-Filter-out-unwanted-PHP-Javascript-HTML-tags-.html
License : GPL
14. SimpleTest unit testing
Path : lib/simpletest
URI : http://simpletest.org/en/download.html
License : LGPL
JavaScript libraries
--------------------
htdocs/doc/sql/static-data/data.sql
+722 -596
View File
File diff suppressed because it is too large Load Diff
htdocs/resource2/ocstyle/images/profile/32x32-adopt.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

htdocs/templates2/ocstyle/adoptcache.tpl
+11 -8
View File
@@ -11,7 +11,7 @@
<input type="hidden" name="cacheid" value="{$cacheid}" />
<div class="content2-pagetitle">
<img src="resource2/{$opt.template.style}/images/profile/22x22-email.png" style="align: left; margin-right: 10px;" width="22" height="22" alt="" />
<img src="resource2/{$opt.template.style}/images/profile/32x32-adopt.png" style="align: left; margin-right: 10px;" width="32" height="32" alt="" />
{t 1=$cachename|escape}List of users you offered %1 for adoption{/t}
</div>
@@ -36,6 +36,7 @@
</td>
</tr>
{foreachelse}
<tr><td class="spacer" colspan="3"></td></tr>
<tr>
<td colspan="3">
{t}You have no users invited to adopt your cache.{/t}
@@ -43,21 +44,22 @@
</tr>
{/foreach}
<tr><td colspan="3">&nbsp;</td></tr>
<tr><td colspan="3"></td></tr>
<tr>
<td class="header" colspan="3">
<b>{t 1=$cachename|escape}Offer %1 for adoption{/t}</b>
{t 1=$cachename|escape}Offer <b>%1</b> for adoption{/t}
</td>
</tr>
<tr>
<td colspan="3">
{t}If you find a user that wants to adopt your Geocache, fill in the username here
<p>{t}If you find a user that wants to adopt your Geocache, fill in the username here
and submit. The user will then see this Geocache under My Profile &gt; Adoptions.
To complete, the user has to accept our terms of use and commit the adoption.
You can offer this Geocache to more than one user. The first user committing the
To complete, the user has to accept our terms of use and commit the adoption.{/t}</p>
<p>{t}You can offer this Geocache to more than one user. The first user committing the
adoption will get the new owner of this Geocache.
With the adoption, you will give the committing user an unlimited right to use, modifiy,
publish and sublicense content of this Geocache.{/t}
publish and sublicense content of this Geocache.{/t}</p>
</td>
</tr>
<tr><td colspan="3">&nbsp;</td></tr>
@@ -72,6 +74,7 @@
{elseif $error=='self'}
<tr><td>&nbsp;</td><td colspan="2"><span class="errormsg">{t}You cannot adopt your own cache!{/t}</span></td></tr>
{/if}
<tr><td class="spacer" colspan="3"></td></tr>
<tr>
<td colspan="3">
<input type="checkbox" name="tou" value="1" />
@@ -96,7 +99,7 @@
{elseif $action=='listbyuser'}
<div class="content2-pagetitle">
<img src="resource2/{$opt.template.style}/images/profile/22x22-email.png" style="align: left; margin-right: 10px;" width="22" height="22" alt="" />
<img src="resource2/{$opt.template.style}/images/profile/32x32-adopt.png" style="align: left; margin-right: 10px;" width="32" height="32" alt="" />
{t}Geocaches the owner offers you for adoption{/t}
</div>
htdocs/templates2/ocstyle/search.tpl
+1 -1
View File
@@ -306,7 +306,7 @@ function switchAttributeCat2()
</script>
{/literal}
<div class="content2-pagetitle"><img src="resource2/ocstyle/images/misc/32x32-search.png" style="align: left; margin-right: 10px;" width="32" height="32" alt="{t}Search for caches{/t}" />{t}Search for caches{/t} &nbsp; <small style="font-weight:normal">[<a href="search1.php">{t}old{/t}</a>]</small></div>
<div class="content2-pagetitle"><img src="resource2/ocstyle/images/misc/32x32-search.png" style="align: left; margin-right: 10px;" width="32" height="32" alt="{t}Search for caches{/t}" />{t}Search for caches{/t}</div>
<form name="optionsform" style="display:inline;">
htdocs/templates2/ocstyle/translate.tpl
+3
View File
@@ -49,6 +49,9 @@
<a href="translate.php?translang={$translang}&action=textexportnew">{t}Text Download (new){/t} {$translang}</a><br />
<a href="translate.php?translang={$translang}&action=textexportall">{t}Text Download (all){/t} {$translang}</a><br />
<a href="translate.php?translang={$translang}&action=textimport">{t}Text Import{/t} {$translang}</a><br />
{if $translang == 'EN'}
<a href="translate.php?translang={$translang}&action=copy_en">{t}Copy EN{/t}</a><br />
{/if}
<br />
{if $action=="listnew" || $action=="listfaults" || $action=="listall"}
htdocs/translate.php
+17
View File
@@ -85,6 +85,8 @@
edit();
}
else if ($action == 'copy_en')
copy_english_texts();
else if ($action == 'listfaults')
{
$trans = sql("SELECT `sys_trans`.`id`, `sys_trans`.`text` FROM `sys_trans` LEFT JOIN `sys_trans_ref` ON `sys_trans`.`id`=`sys_trans_ref`.`trans_id` WHERE ISNULL(`sys_trans_ref`.`trans_id`) ORDER BY `sys_trans`.`id` DESC");
@@ -772,6 +774,21 @@ function textimport($lang)
$tpl->assign('texts', $saTexts);
}
function copy_english_texts()
{
sql_temp_table('transtmp');
sql("
CREATE TEMPORARY TABLE &transtmp
SELECT `st`.`id` AS `trans_id`, 'EN' AS `lang`, `st`.`text`
FROM `sys_trans` `st`
LEFT JOIN `sys_trans_text` `stt` ON `stt`.`trans_id`=`st`.`id` AND `stt`.`lang`='EN'
WHERE `stt`.`trans_id` IS NULL");
sql("
INSERT INTO `sys_trans_text`
SELECT *,NULL FROM &transtmp");
sql_drop_temp_table('transtmp');
}
function addClassesDirecotriesToDirlist($basedir)
{
global $msDirlist;