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

Merge branch 'stable'

Browse Source
This commit is contained in:
following
2013-03-23 22:25:11 +01:00
parent e090921970 59217e1717
commit 45ba51b5c2
6 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/config2/settings-dev.inc.php
View File

@@ -116,4 +116,8 @@
$opt['template']['locales']['DA']['show'] = false;
$opt['template']['locales']['PT']['show'] = false;
$opt['template']['locales']['JA']['show'] = false;
function post_config()
{
}
?>

2
htdocs/config2/settings-dist.inc.php
View File

@@ -361,7 +361,7 @@
/* license-related functions
*/
$opt['logic']['license']['newusers'] = NEW_DATA_LICENSE_ACTIVELY_ACCEPTED;
$opt['logic']['license']['newusers'] = 2; // see license constants in lib2/logic/const.inc.php
$opt['logic']['license']['admin'] = true;
$opt['logic']['license']['disclaimer'] = false;
$opt['logic']['license']['terms'] = 'http://www.opencaching.de/articles.php?page=impressum#datalicense';

4
htdocs/lib/settings-dev.inc.php
View File

@@ -174,4 +174,8 @@
$opt['template']['locales']['DA']['show'] = false;
$opt['template']['locales']['PT']['show'] = false;
$opt['template']['locales']['JA']['show'] = false;
function post_config()
{
}
?>

2
htdocs/lib2/common.inc.php
View File

@@ -37,7 +37,6 @@ function __autoload($class_name)
fix_magic_quotes_gpc();
// set options
require_once($opt['rootpath'] . 'lib2/logic/const.inc.php');
require_once($opt['rootpath'] . 'config2/settings-dist.inc.php');
require_once($opt['rootpath'] . 'config2/settings.inc.php');
@@ -82,6 +81,7 @@ function __autoload($class_name)
$tpl = new OcSmarty();
// include all we need
require_once($opt['rootpath'] . 'lib2/logic/const.inc.php');
require_once($opt['rootpath'] . 'lib2/logic/geomath.class.php');
require_once($opt['rootpath'] . 'lib2/error.inc.php');
require_once($opt['rootpath'] . 'lib2/util.inc.php');

8
htdocs/removelog.php
View File

@@ -123,8 +123,6 @@
{
// remove log pictures
// see also picture.class.php: delete()
require('lib2/const.inc.php');
require('config2/settings.inc.php');
$rs = sql("SELECT `id`, `url` FROM `pictures`
WHERE `object_type`=1 AND `object_id`='&1'",
@@ -141,10 +139,10 @@
$archived = (sqlValue("SELECT `id` FROM `pictures_modified` WHERE `id`=" . $r['id'], 0) > 0);
$fna = mb_split('\\/', $r['url']);
$filename = end($fna);
if (mb_substr($opt['logic']['pictures']['dir'], -1, 1) != '/')
$path = $opt['logic']['pictures']['dir'] . "/";
if (mb_substr($picdir, -1, 1) != '/')
$path = $picdir . "/";
else
$path = $opt['logic']['pictures']['dir'];
$path = $picdir;
if ($archived)
@rename($path . $filename, $path . "deleted/" . $filename);

2
htdocs/templates2/ocstyle/res_logpicture.tpl
View File

@@ -3,7 +3,7 @@
<td style="text-align:center; padding:0" align="center" valign="middle">
<div style="max-width:{$itemwidth}px; overflow:hidden">
<a id="pl{$picture.pic_uuid}" href="{$picture.pic_url}">
<img src="thumbs.php?uuid={$picture.pic_uuid}" class="img-shadow-loggallery" onclick="enlarge(this);" longdesc="{$picture.pic_url}" onload="document.getElementById('pl{$picture.pic_uuid}').removeAttribute('href'); this.alt='{$picture.title}'"/>
<img src="thumbs.php?uuid={$picture.pic_uuid}" class="img-shadow-loggallery" onclick="enlarge(this);" longdesc="{$picture.pic_url}" onload="document.getElementById('pl{$picture.pic_uuid}').removeAttribute('href'); this.alt='{$picture.title|escape}'" title="{$picture.title|escape}"/>
</a>
{if $logdate || $loguser}
<div style="line-height:1.2em; max-height:2.4em; margin-top:5px">