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

completed data license functions, picture fixes, public profile link

Browse Source 
+ menu option "my profile/public profile"
- enlargit log pics
- short date format for some locales
- data license constants
* dont display license-disabled log pics
* delete log pics on declined license instead replacing
+ delete waypoint descriptions on declined license
* no cache desc replacement message if it was empty
+ license-content-disable-function for old-disabled users
+ script to process all old-deleted users due to incompatible license
+ settings for license admin functions and for license disclaimer
- fixed CC license link on english tos page
* update caches.last_modified with changes of additional waypoints
+ XML interface license disclaimer
This commit is contained in:
following
2013-03-18 10:44:53 +01:00
parent cc2fc6c25e
commit 37b5268a7e
33 changed files with 505 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
htdocs/viewprofile.php
View File

@ -8,6 +8,7 @@
***************************************************************************/
require('./lib2/web.inc.php');
require_once('./lib2/logic/user.class.php');
require_once('./lib2/logic/useroptions.class.php');
require_once('./lib2/logic/logpics.inc.php');
@ -17,6 +18,17 @@
$userid = isset($_REQUEST['userid']) ? $_REQUEST['userid']+0 : 0;
$allpics = isset($_REQUEST['allpics']) ? $_REQUEST['allpics']+0 : 0;
if ($userid == 0)
{
$login->verify();
if ($login->userid != 0)
{
// 'show public profile' in my-profile menu
$userid = $login->userid;
$tpl->menuitem = MNU_MYPROFILE_PUBLIC;
}
}
$rs = sql("SELECT `user`.`username`,
`user`.`last_login`,
`user`.`pmr_flag`,
@ -97,7 +109,9 @@
$tpl->assign('recommended', sql_value("SELECT COUNT(*) FROM `cache_rating` WHERE `user_id`='&1'", 0, $userid));
$tpl->assign('maxrecommended', floor($record['found'] * $opt['logic']['rating']['percentageOfFounds'] / 100));
$picstat = ($useropt->getOptValue(USR_OPT_PICSTAT) == 1);
$user = new user($userid);
$picstat = ($useropt->getOptValue(USR_OPT_PICSTAT) == 1) && !$user->getLicenseDeclined();
$tpl->assign('show_picstat', $picstat);
if ($picstat)
{
@ -146,7 +160,8 @@
$tpl->assign('lastlogin', 4);
}
$tpl->assign('license_declined', $record['data_license'] == 1);
$tpl->assign('license_actively_declined', $record['data_license'] == NEW_DATA_LICENSE_ACTIVELY_DECLINED);
$tpl->assign('license_passively_declined', $record['data_license'] == NEW_DATA_LICENSE_PASSIVELY_DECLINED);
$tpl->assign('pmr', $record['pmr_flag']);
$tpl->display();