malhuda/developer
1
0
Fork 0
mirror of https://github.com/easy-wi/developer.git synced 2025-02-20 11:23:28 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

#340 Substitutes can maintain their own data

Browse Source
This commit is contained in:
Ulrich Block 2014-02-21 19:32:48 +01:00
parent 5c5ed1c843
commit 9a831c0934
14 changed files with 361 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
web/login.php
View File

@ -256,6 +256,32 @@ if ($ui->st('w', 'get') == 'lo') {
unset($_SESSION['loginUserAllowed']);
} else if (isset($serviceProviderConfig['providers'][$serviceProvider]) and $ui->id('loginSubstituteId', 10, 'get')) {
if (isset($_SESSION['loginSubstitutesAllowed'][$ui->id('loginSubstituteId', 10, 'get')])) {
$query = $sql->prepare("SELECT * FROM `userdata_substitutes` WHERE `sID`=? LIMIT 1");
$query->execute(array($ui->id('loginSubstituteId', 10, 'get')));
foreach ($query->fetchAll(PDO::FETCH_ASSOC) as $row) {
$mail = '';
$externalID = 0;
$accounttype = 'v';
$sID = $row['sID'];
$id = $row['userID'];
$username = $row['loginName'];
$active = $row['active'];
$resellerid = $row['resellerID'];
$passwordCorrect = true;
}
}
unset($_SESSION['loginSubstitutesAllowed']);
} else if (isset($serviceProviderConfig['providers'][$serviceProvider])) {
$_SERVER = $ui->server;
@ -267,6 +293,7 @@ if ($ui->st('w', 'get') == 'lo') {
try{
$connectedUsers = array();
$connectedSubstitutes = array();
// initialize Hybrid_Auth with a given file
$hybridauth = new Hybrid_Auth($serviceProviderConfig);
@ -282,8 +309,17 @@ if ($ui->st('w', 'get') == 'lo') {
if ((isset($user_id) or isset($admin_id)) and strlen($userProfile->identifier) > 0) {
$query = $sql->prepare("INSERT INTO `userdata_social_identities` (`userID`,`serviceProviderID`,`serviceUserID`,`resellerID`) VALUES (?,?,?,?)");
$query->execute(array((isset($admin_id)) ? $admin_id : $user_id, $serviceProviderID, $userProfile->identifier, $reseller_id));
if (isset($_SESSION['sID'])) {
$query = $sql->prepare("INSERT INTO `userdata_social_identities_substitutes` (`userID`,`serviceProviderID`,`serviceUserID`,`resellerID`) VALUES (?,?,?,?)");
$query->execute(array($_SESSION['sID'], $serviceProviderID, $userProfile->identifier, $reseller_id));
} else {
$query = $sql->prepare("INSERT INTO `userdata_social_identities` (`userID`,`serviceProviderID`,`serviceUserID`,`resellerID`) VALUES (?,?,?,?)");
$query->execute(array((isset($admin_id)) ? $admin_id : $user_id, $serviceProviderID, $userProfile->identifier, $reseller_id));
}
$redirectURL = (isset($admin_id)) ? $pageUrl . '/admin.php?w=su&added=' . $serviceProvider . '&r=su' : $pageUrl . '/userpanel.php?w=se&added=' . $serviceProvider . '&r=se';
@ -304,8 +340,18 @@ if ($ui->st('w', 'get') == 'lo') {
$connectedUserCount = count($connectedUsers);
$query = $sql->prepare("SELECT u.`sID`,u.`loginName`,CONCAT(u.`vname`,' ',u.`name`) AS `username` FROM `userdata_social_identities_substitutes` AS s INNER JOIN `userdata_substitutes` AS u ON u.`sID`=s.`userID` WHERE s.`serviceProviderID`=? AND s.`serviceUserID`=? AND u.`active`='Y'");
$query->execute(array($serviceProviderID, $userProfile->identifier));
foreach ($query->fetchAll(PDO::FETCH_ASSOC) as $row) {
$connectedSubstitutes[$row['sID']] = (strlen(trim($row['username'])) > 0) ? trim($row['username']) . ' (' . $row['loginName'] . ')' : $row['loginName'];
}
$connectedSubstituteCount = count($connectedSubstitutes);
// no user has been found. Check if registration is allowed. If yes display registration form
if ($connectedUserCount == 0) {
if ($connectedUserCount == 0 and $connectedSubstituteCount == 0) {
if (isset($registration) and in_array($registration, array('A', 'M', 'D'))) {
@ -320,16 +366,17 @@ if ($ui->st('w', 'get') == 'lo') {
}
// multiple active users are connected, let the user pick one
} else if ($connectedUserCount > 1) {
} else if (($connectedUserCount + $connectedSubstituteCount) > 1) {
$sprache->multipleHelper = str_replace('%sp%', $serviceProvider, $sprache->multipleHelper);
$_SESSION['loginUserAllowed'] = $connectedUsers;
$_SESSION['loginSubstitutesAllowed'] = $connectedSubstitutes;
$include = 'login_mutiple.tpl';
// exactly one user connected, login
} else {
} else if ($connectedUserCount == 1 and $connectedSubstituteCount == 0) {
$query = $sql->prepare("SELECT `id`,`accounttype`,`cname`,`active`,`security`,`resellerid`,`mail`,`salt`,`externalID` FROM `userdata` WHERE `id`=? LIMIT 1");
$query->execute(array(key($connectedUsers)));
@ -346,6 +393,24 @@ if ($ui->st('w', 'get') == 'lo') {
$passwordCorrect = true;
}
} else if ($connectedUserCount == 0 and $connectedSubstituteCount == 1) {
$query = $sql->prepare("SELECT * FROM `userdata_substitutes` WHERE `sID`=? LIMIT 1");
$query->execute(array(key($connectedSubstitutes)));
foreach ($query->fetchAll(PDO::FETCH_ASSOC) as $row) {
$mail = '';
$externalID = 0;
$accounttype = 'v';
$sID = $row['sID'];
$id = $row['userID'];
$username = $row['loginName'];
$active = $row['active'];
$resellerid = $row['resellerID'];
$passwordCorrect = true;
}
}
}
}

20
web/stuff/functions.php
View File

@ -1152,22 +1152,24 @@ if (!function_exists('passwordgenerate')) {
global $_SESSION;
if ($id != '' and $d != '') {
unset($_SESSION[$w][$d][$id]);
if ($w != 'sID') {
if ($id != '' and $d != '') {
unset($_SESSION[$w][$d][$id]);
} else if ($id == '' and $d != '') {
unset($_SESSION[$w][$d]);
} else if ($id == '' and $d != '') {
unset($_SESSION[$w][$d]);
} else if ($id != '' and $d == '') {
unset($_SESSION[$w][$id]);
} else if ($id != '' and $d == '') {
unset($_SESSION[$w][$id]);
} else if ($id == '' and $d == '') {
unset($_SESSION[$w]);
} else if ($id == '' and $d == '') {
unset($_SESSION[$w]);
}
}
foreach ($_SESSION as $k => $v) {
if (wpreg_check($k, 4) and ((isset($_SESSION[$k]['t']) and $_SESSION[$k]['d'] < strtotime('now')) or (is_array($_SESSION[$k]) and count($_SESSION[$k]) == 0))) {
if (wpreg_check($k, 4) and $k != 'sID' and ((isset($_SESSION[$k]['t']) and $_SESSION[$k]['d'] < strtotime('now')) or (is_array($_SESSION[$k]) and count($_SESSION[$k]) == 0))) {
unset($_SESSION[$k]);
} else if (wpreg_check($k, 4) and is_array($_SESSION[$k]) and count($_SESSION[$k]) > 0) {

2
web/stuff/global_userdata.php
View File

@ -133,9 +133,11 @@ if ($ui->st('d', 'get') == 'pw') {
$template_file = $spracheResponse->error_table;
}
}
} else {
$template_file = 'userpanel_404.tpl';
}
} else if ($ui->escaped('spUser', 'get') and $ui->id('spId', 10, 'get')) {
$query = $sql->prepare("DELETE FROM `userdata_social_identities` WHERE `userID`=? AND `serviceProviderID`=? AND `serviceUserID`=? AND `resellerID`=? LIMIT 1");

6
web/stuff/init_user.php
View File

@ -135,7 +135,7 @@ if (isset($lastlogin) and $lastlogin != null and $lastlogin != '0000-00-00 00:00
# https://github.com/easy-wi/developer/issues/61
# basic modules array. available at any time to anyone
$what_to_be_included_array = array('lo' => 'userpanel_logdata.php','ti' => 'userpanel_tickets.php');
$what_to_be_included_array = array('lo' => 'userpanel_logdata.php', 'ti' => 'userpanel_tickets.php');
$easywiModules = array('gs' => true, 'ip' => true, 'my' => true, 'ro' => true, 'ti' => true, 'le' => true, 'vo' => true);
@ -168,7 +168,9 @@ foreach ($query->fetchAll(PDO::FETCH_ASSOC) as $row) {
}
# modules meant only for user only
if (!isset($_SESSION['sID'])) {
if (isset($_SESSION['sID'])) {
$what_to_be_included_array['se'] = 'userpanel_substitutes_own.php';
} else {
$what_to_be_included_array['su'] = 'userpanel_substitutes.php';
$what_to_be_included_array['se'] = 'global_userdata.php';
}

2
web/stuff/jobs_user_rm.php
View File

@ -156,6 +156,8 @@ $sql->exec("DELETE p.* FROM `userpermissions` p LEFT JOIN `userdata` u ON p.`use
$sql->exec("DELETE g.* FROM `userdata_groups` g LEFT JOIN `userdata` u ON g.`userID`=u.`id` WHERE u.`id` IS NULL");
$sql->exec("DELETE s.* FROM `userdata_substitutes` s LEFT JOIN `userdata` u ON s.`userID`=u.`id` WHERE u.`id` IS NULL");
$sql->exec("DELETE o.* FROM `userdata_substitutes_servers` o LEFT JOIN `userdata_substitutes` s ON o.`sID`=s.`sID` WHERE s.`sID` IS NULL");
$sql->exec("DELETE s.* FROM `userdata_social_identities` s LEFT JOIN `userdata` u ON s.`userID`=u.`id` WHERE u.`id` IS NULL");
$sql->exec("DELETE s.* FROM `userdata_social_identities_substitutes` s LEFT JOIN `userdata_substitutes` u ON s.`userID`=u.`sID` WHERE u.`sID` IS NULL");
$sql->exec("DELETE g.* FROM `gsswitch` g LEFT JOIN `userdata` u ON g.`userid`=u.`id` WHERE u.`id` IS NULL");
$sql->exec("DELETE s.* FROM `serverlist` s LEFT JOIN `gsswitch` g ON s.`switchID`=g.`id` WHERE g.`id` IS NULL");
$sql->exec("DELETE a.* FROM `addons_installed` a LEFT JOIN `serverlist` s ON a.`serverid`=s.`id` WHERE s.`id` IS NULL");

10
web/stuff/tables_add.php
View File

@ -1130,6 +1130,16 @@ $query = "CREATE TABLE IF NOT EXISTS `userdata_social_identities` (
$add = $sql->prepare($query);
$add->execute();
$query = "CREATE TABLE IF NOT EXISTS `userdata_social_identities_substitutes` (
`userID` int(10) unsigned NOT NULL,
`serviceProviderID` int(10) unsigned NOT NULL,
`serviceUserID` varchar(255) DEFAULT NULL,
`resellerID` int(10) unsigned DEFAULT 0,
PRIMARY KEY (`userID`,`serviceProviderID`,`serviceUserID`),KEY(`resellerID`)
) ENGINE=InnoDB";
$add = $sql->prepare($query);
$add->execute();
$query = "CREATE TABLE IF NOT EXISTS `userdata_social_providers` (
`serviceProviderID` int(10) unsigned NOT NULL AUTO_INCREMENT,
`active` enum('Y','N') NOT NULL DEFAULT 'Y',

8
web/stuff/tables_repair.php
View File

@ -960,6 +960,14 @@ $defined['userdata_social_identities'] = array(
'resellerID' => array("Type"=>"int(10) unsigned","Null"=>"NO","Key"=>"MUL","Default"=>"0","Extra"=>"")
);
#https://github.com/easy-wi/developer/issues/1
$defined['userdata_social_identities_substitutes'] = array(
'userID' => array("Type"=>"int(10) unsigned","Null"=>"NO","Key"=>"PRI","Default"=>"","Extra"=>""),
'serviceProviderID' => array("Type"=>"int(10) unsigned","Null"=>"NO","Key"=>"PRI","Default"=>"","Extra"=>""),
'serviceUserID' => array("Type"=>"varchar(255)","Null"=>"NO","Key"=>"PRI","Default"=>"","Extra"=>""),
'resellerID' => array("Type"=>"int(10) unsigned","Null"=>"NO","Key"=>"MUL","Default"=>"0","Extra"=>"")
);
$defined['userdata_social_providers'] = array(
'serviceProviderID' => array("Type"=>"int(10) unsigned","Null"=>"NO","Key"=>"PRI","Default"=>"","Extra"=>"auto_increment"),
'active' => array("Type"=>"enum('Y','N')","Null"=>"NO","Key"=>"","Default"=>"Y","Extra"=>""),

2
web/stuff/userpanel_substitutes.php
View File

@ -176,7 +176,7 @@ if ($ui->w('action', 4, 'post') and !token(true)) {
if ($ui->password('security',255, 'post') != '(encrypted)') {
$salt=md5(mt_rand().date('Y-m-d H:i:s:u'));
$salt = md5(mt_rand().date('Y-m-d H:i:s:u'));
$query = $sql->prepare("SELECT `loginName` FROM `userdata_substitutes` WHERE `sID`=? AND `resellerID`=? LIMIT 1");
$query->execute(array($id,$reseller_id));
$loginName = $query->fetchColumn();

169
web/stuff/userpanel_substitutes_own.php Normal file
View File

@ -0,0 +1,169 @@
<?php
/**
* File: userpanel_substitutes_own.php.
* Author: Ulrich Block
* Date: 21.02.14
* Contact: <ulrich.block@easy-wi.com>
*
* This file is part of Easy-WI.
*
* Easy-WI is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* Easy-WI is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with Easy-WI. If not, see <http://www.gnu.org/licenses/>.
*
* Diese Datei ist Teil von Easy-WI.
*
* Easy-WI ist Freie Software: Sie koennen es unter den Bedingungen
* der GNU General Public License, wie von der Free Software Foundation,
* Version 3 der Lizenz oder (nach Ihrer Wahl) jeder spaeteren
* veroeffentlichten Version, weiterverbreiten und/oder modifizieren.
*
* Easy-WI wird in der Hoffnung, dass es nuetzlich sein wird, aber
* OHNE JEDE GEWAEHELEISTUNG, bereitgestellt; sogar ohne die implizite
* Gewaehrleistung der MARKTFAEHIGKEIT oder EIGNUNG FUER EINEN BESTIMMTEN ZWECK.
* Siehe die GNU General Public License fuer weitere Details.
*
* Sie sollten eine Kopie der GNU General Public License zusammen mit diesem
* Programm erhalten haben. Wenn nicht, siehe <http://www.gnu.org/licenses/>.
*/
include(EASYWIDIR . '/stuff/keyphrasefile.php');
include(EASYWIDIR . '/third_party/password_compat/password.php');
$sprache = getlanguagefile('user', $user_language, $reseller_id);
if ($ui->st('d', 'get') == 'pw') {
if (!$ui->smallletters('action', 2, 'post')) {
$template_file = 'userpanel_pass.tpl';
} else if ($ui->smallletters('action', 2, 'post') == 'md'){
$errors = array();
if (!$ui->password('password', 255, 'post')) {
$errors[] = $sprache->error_pass;
}
if (!$ui->password('pass2', 255, 'post')) {
$errors[] = $sprache->error_pas;
}
if ($ui->password('password', 255, 'post') != $ui->password('pass2', 255, 'post')) {
$errors[] = $sprache->error_passw_succ;
}
if (!token(true)) {
$errors[] = $spracheResponse->token;
}
if (count($errors)>0) {
$template_file = implode('<br />', $errors);
} else {
$salt = md5(mt_rand() . date('Y-m-d H:i:s:u'));
$query = $sql->prepare("SELECT `loginName` FROM `userdata_substitutes` WHERE `sID`=? AND `resellerID`=? LIMIT 1");
$query->execute(array($_SESSION['sID'], $reseller_id));
$loginName = $query->fetchColumn();
if (strlen($loginName) > 0 and $ui->password('password', 255, 'post')) {
$newHash = passwordCreate($loginName, (string) $ui->password('password', 255, 'post'));
if (is_array($newHash)) {
$query = $sql->prepare("UPDATE `userdata_substitutes` SET `passwordHashed`=?,`salt`=? WHERE `sID`=? AND `resellerID`=? LIMIT 1");
$query->execute(array($newHash['hash'], $newHash['salt'], $_SESSION['sID'], $reseller_id));
} else {
$query = $sql->prepare("UPDATE `userdata_substitutes` SET `passwordHashed`=? WHERE `sID`=? AND `resellerID`=? LIMIT 1");
$query->execute(array($newHash, $_SESSION['sID'], $reseller_id));
}
if ($query->rowCount() > 0) {
$template_file = $spracheResponse->table_add;
} else {
$template_file = $spracheResponse->error_table;
}
} else {
$template_file = 'userpanel_404.tpl';
}
}
} else {
$template_file = 'userpanel_404.tpl';
}
} else if ($ui->escaped('spUser', 'get') and $ui->id('spId', 10, 'get')) {
$query = $sql->prepare("DELETE FROM `userdata_social_identities_substitutes` WHERE `userID`=? AND `serviceProviderID`=? AND `serviceUserID`=? AND `resellerID`=? LIMIT 1");
$query->execute(array($_SESSION['sID'], $ui->id('spId', 10, 'get'), $ui->escaped('spUser', 'get'), $reseller_id));
if ($query->rowCount() > 0) {
$template_file = $spracheResponse->table_del;
} else {
$template_file = $spracheResponse->error_table;
}
} else {
if ($ui->smallletters('action', 2, 'post') != 'md' and $ui->w('added', 255, 'get')) {
$template_file = $spracheResponse->table_add;
} else if ($ui->smallletters('action', 2, 'post') != 'md') {
$serviceProviders = array();
$htmlExtraInformation['css'][] = '<link href="css/default/social_buttons.css" rel="stylesheet">';
$query = $sql->prepare("SELECT `serviceProviderID`,`filename` FROM `userdata_social_providers` WHERE `resellerID`=0 AND `active`='Y'");
$query2 = $sql->prepare("SELECT `serviceUserID` FROM `userdata_social_identities_substitutes` WHERE `serviceProviderID`=? AND `userID`=? LIMIT 1");
$query->execute();
foreach ($query->fetchAll(PDO::FETCH_ASSOC) as $row) {
$query2->execute(array($row['serviceProviderID'], $_SESSION['sID']));
$serviceProviders[] = array(
'spId' => $row['serviceProviderID'],
'sp' => $row['filename'],
'spUserId' => urlencode($query2->fetchColumn())
);
}
$query = $sql->prepare("SELECT `name`,`vname` FROM `userdata_substitutes` WHERE `sID`=? AND `resellerID`=? LIMIT 1");
$query->execute(array($_SESSION['sID'], $reseller_id));
foreach ($query->fetchAll(PDO::FETCH_ASSOC) as $row) {
$name = $row['name'];
$vname = $row['vname'];
}
$template_file = 'userpanel_user_substitute_md.tpl';
} else if ($ui->smallletters('action', 2, 'post') == 'md' and token(true)) {
$query = $sql->prepare("UPDATE `userdata_substitutes` SET `name`=?,`vname`=? WHERE `sID`=? AND `resellerID`=? LIMIT 1");
$query->execute(array($ui->names('name',255, 'post'),$ui->names('vname',255, 'post'), $_SESSION['sID'], $reseller_id));
if ($query->rowCount() > 0) {
$template_file = $spracheResponse->table_add;
} else {
$template_file = $spracheResponse->error_table;
}
}
}

38
web/template/default/admin_user_own_md.tpl
View File

@ -11,6 +11,24 @@
<div class="span11">
<form class="form-horizontal" action="admin.php?w=su&amp;r=su" onsubmit="return confirm('<?php echo $gsprache->sure;?>');" method="post">
<input type="hidden" name="token" value="<?php echo token();?>">
<?php if(count($serviceProviders) > 0 ) echo '<h2>Social Auth</h2>';?>
<?php foreach($serviceProviders as $sp){ ?>
<div class="control-group">
<label class="control-label" for="sp<?php echo $sp['sp'];?>"><?php echo $sp['sp'];?></label>
<div class="controls">
<?php if (strlen($sp['spUserId'])==0){ ?>
<a class="btn btn-block btn-social btn-<?php echo strtolower($sp['sp']);?> span10" href="login.php?serviceProvider=<?php echo $sp['sp'];?>" id="sp<?php echo $sp['sp'];?>">
<i class="fa fa-<?php echo strtolower($sp['sp']);?>"></i> <?php echo $sprache->socialConnect.' '.$sp['sp'];?>
</a>
<?php } else { ?>
<a class="btn btn-block btn-social btn-<?php echo strtolower($sp['sp']);?> span10" href="admin.php?w=su&amp;spUser=<?php echo $sp['spUserId'];?>&amp;spId=<?php echo $sp['spId'];?>&amp;r=su" id="sp<?php echo $sp['sp'];?>">
<i class="fa fa-<?php echo strtolower($sp['sp']);?>"></i> <?php echo $sprache->socialRemove.' '.$sp['sp'];?>
</a>
<?php } ?>
</div>
</div>
<?php } ?>
<?php if(count($serviceProviders) > 0 ) echo '<hr>';?>
<h2>Mails</h2>
<div class="control-group">
<label class="control-label" for="mail_backup"><?php echo $sprache->mail_backup;?></label>
@ -49,25 +67,7 @@
</div>
</div>
<hr>
<?php if(count($serviceProviders) > 0 ) echo '<h2>Social Auth</h2>';?>
<?php foreach($serviceProviders as $sp){ ?>
<div class="control-group">
<label class="control-label" for="sp<?php echo $sp['sp'];?>"><?php echo $sp['sp'];?></label>
<div class="controls">
<?php if (strlen($sp['spUserId'])==0){ ?>
<a class="btn btn-block btn-social btn-<?php echo strtolower($sp['sp']);?> span10" href="login.php?serviceProvider=<?php echo $sp['sp'];?>" id="sp<?php echo $sp['sp'];?>">
<i class="fa fa-<?php echo strtolower($sp['sp']);?>"></i> <?php echo $sprache->socialConnect.' '.$sp['sp'];?>
</a>
<?php } else { ?>
<a class="btn btn-block btn-social btn-<?php echo strtolower($sp['sp']);?> span10" href="admin.php?w=su&amp;spUser=<?php echo $sp['spUserId'];?>&amp;spId=<?php echo $sp['spId'];?>&amp;r=su" id="sp<?php echo $sp['sp'];?>">
<i class="fa fa-<?php echo strtolower($sp['sp']);?>"></i> <?php echo $sprache->socialRemove.' '.$sp['sp'];?>
</a>
<?php } ?>
</div>
</div>
<?php } ?>
<?php if(count($serviceProviders) > 0 ) echo '<hr>';?>
<h2></h2>
<h2><?php echo $gsprache->user;?></h2>
<div class="control-group">
<label class="control-label" for="fname"><?php echo $sprache->fname;?></label>
<div class="controls">

3
web/template/default/login_mutiple.tpl
View File

@ -35,6 +35,9 @@
<?php foreach($connectedUsers as $k=>$v){ ?>
<li><a href="login.php?serviceProvider=<?php echo $serviceProvider;?>&amp;loginUserId=<?php echo $k;?>"><?php echo $v;?></a></li>
<?php }?>
<?php foreach($connectedSubstitutes as $k=>$v){ ?>
<li><a href="login.php?serviceProvider=<?php echo $serviceProvider;?>&amp;loginSubstituteId=<?php echo $k;?>"><?php echo $v;?></a></li>
<?php }?>
</ul>
</div>
<hr>

2
web/template/default/userpanel_header.tpl
View File

@ -65,11 +65,9 @@
<li><a href="#"><?php echo $gsprache->last.'<br />'.$great_last;?></a></li>
<li class="divider"></li>
<?php if ($support_phonenumber!="") echo '<li><a href="#"><i class="fa fa-phone fa-fw"></i> '.$gsprache->hotline.": ".$support_phonenumber.'</a></li><li class="divider"></li>';?>
<?php if($pa['usersettings'] and !isset($_SESSION['sID'])) { ?>
<li><a href="userpanel.php?w=se&amp;d=pw"><i class="fa fa-key fa-fw"></i> <?php echo $gsprache->password." ".$gsprache->change;?></a></li>
<li><a href="userpanel.php?w=se"><i class="fa fa-cog fa-fw"></i> <?php echo $gsprache->settings;?></a></li>
<li class="divider"></li>
<?php } ?>
<li><a href="https://easy-wi.com" target="_blank"><i class="fa fa-info-circle fa-fw"></i> About</a></li>
<li><a href="https://easy-wi.com/forum/" target="_blank"><i class="fa fa-comments fa-fw"></i> Forum</a></li>
<li><a href="http://wiki.easy-wi.com" target="_blank"><i class="fa fa-question-circle fa-fw"></i> Wiki</a></li>

17
web/template/default/userpanel_user_md.tpl
View File

@ -11,13 +11,7 @@
<div class="span12">
<form class="form-horizontal" action="userpanel.php?w=se&amp;r=se" onsubmit="return confirm('<?php echo $gsprache->sure;?>');" method="post">
<input type="hidden" name="token" value="<?php echo token();?>">
<div class="control-group">
<label class="control-label" for="mail_backup"><?php echo $sprache->mail_backup;?></label>
<div class="controls">
<input id="mail_backup" type="checkbox" name="mail_backup" value="Y" <?php if ($mail_backup=="Y") echo 'checked="checked"'; ?>>
</div>
</div>
<hr>
<?php if(count($serviceProviders) > 0 ) echo '<h2>Social Auth</h2>';?>
<?php foreach($serviceProviders as $sp){ ?>
<div class="control-group">
<label class="control-label" for="sp<?php echo $sp['sp'];?>"><?php echo $sp['sp'];?></label>
@ -35,6 +29,13 @@
</div>
<?php } ?>
<?php if(count($serviceProviders) > 0 ) echo '<hr>';?>
<h2>Mail</h2>
<div class="control-group">
<label class="control-label" for="mail_backup"><?php echo $sprache->mail_backup;?></label>
<div class="controls">
<input id="mail_backup" type="checkbox" name="mail_backup" value="Y" <?php if ($mail_backup=="Y") echo 'checked="checked"'; ?>>
</div>
</div>
<div class="control-group">
<label class="control-label" for="mail_serverdown"><?php echo $sprache->mail_serverdown;?></label>
<div class="controls">
@ -47,6 +48,8 @@
<input id="mail_ticket" type="checkbox" name="mail_ticket" value="Y" <?php if ($mail_ticket=="Y") echo 'checked="checked"'; ?>>
</div>
</div>
<hr>
<h2><?php echo $gsprache->user;?></h2>
<div class="control-group">
<label class="control-label" for="fname"><?php echo $sprache->fname;?></label>
<div class="controls">

52
web/template/default/userpanel_user_substitute_md.tpl Normal file
View File

@ -0,0 +1,52 @@
<div class="row-fluid">
<div class="span12">
<ul class="breadcrumb">
<li><a href="userpanel.php">Home</a> <span class="divider">/</span></li>
<li><?php echo $gsprache->user;?> <span class="divider">/</span></li>
<li class="active"><?php echo $gsprache->settings;?></li>
</ul>
</div>
</div>
<div class="row-fluid">
<div class="span12">
<form class="form-horizontal" action="userpanel.php?w=se&amp;r=se" onsubmit="return confirm('<?php echo $gsprache->sure;?>');" method="post">
<input type="hidden" name="token" value="<?php echo token();?>">
<input type="hidden" name="action" value="md">
<?php foreach($serviceProviders as $sp){ ?>
<div class="control-group">
<label class="control-label" for="sp<?php echo $sp['sp'];?>"><?php echo $sp['sp'];?></label>
<div class="controls">
<?php if (strlen($sp['spUserId'])==0){ ?>
<a class="btn btn-block btn-social btn-<?php echo strtolower($sp['sp']);?> span10" href="login.php?serviceProvider=<?php echo $sp['sp'];?>" id="sp<?php echo $sp['sp'];?>">
<i class="fa fa-<?php echo strtolower($sp['sp']);?>"></i> <?php echo $sprache->socialConnect.' '.$sp['sp'];?>
</a>
<?php } else { ?>
<a class="btn btn-block btn-social btn-<?php echo strtolower($sp['sp']);?> span10" href="userpanel.php?w=se&amp;spUser=<?php echo $sp['spUserId'];?>&amp;spId=<?php echo $sp['spId'];?>&amp;r=se" id="sp<?php echo $sp['sp'];?>">
<i class="fa fa-<?php echo strtolower($sp['sp']);?>"></i> <?php echo $sprache->socialRemove.' '.$sp['sp'];?>
</a>
<?php } ?>
</div>
</div>
<?php } ?>
<?php if(count($serviceProviders) > 0 ) echo '<hr>';?>
<div class="control-group">
<label class="control-label" for="fname"><?php echo $sprache->fname;?></label>
<div class="controls">
<input id="fname" type="text" name="name" value="<?php echo $name;?>">
</div>
</div>
<div class="control-group">
<label class="control-label" for="vname"><?php echo $sprache->vname;?></label>
<div class="controls">
<input id="vname" type="text" name="vname" value="<?php echo $vname;?>">
</div>
</div>
<div class="control-group">
<label class="control-label" for="inputEdit"></label>
<div class="controls">
<button class="btn btn-primary" id="inputEdit" type="submit"><i class="icon-edit icon-white"></i> <?php echo $gsprache->save;?></button>
</div>
</div>
</form>
</div>
</div>