Mirrors/sysPass
2
0
Fork 0
mirror of https://github.com/nuxsmin/sysPass.git synced 2026-03-05 08:04:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

* [DEV] UI tweaks

Browse Source 
* [DEV] Modified some demo mode behavior
* [DEV] Minor bugfixes
This commit is contained in:
nuxsmin
2016-11-22 18:07:38 +01:00
parent 541e40c28a
commit 845bc6857c
26 changed files with 290 additions and 202 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ajax/ajax_configSave.php
View File

@@ -65,6 +65,9 @@ $sk = Request::analyze('sk', false);
if (!$sk || !SessionUtil::checkSessionKey($sk)) {
$Json->setDescription(_('CONSULTA INVÁLIDA'));
Json::returnJson($Json);
} elseif (Checks::demoIsEnabled()) {
$Json->setDescription(_('Ey, esto es una DEMO!!'));
Json::returnJson($Json);
}
// Variables POST del formulario

4
inc/SP/Controller/Grids.class.php
View File

@@ -499,7 +499,9 @@ class Grids implements ActionsInterface
$Grid->setDataActions($GridActionNew);
if (Acl::checkUserAccess(ActionsInterface::ACTION_CFG_LDAP)) {
if (Config::getConfig()->isLdapEnabled()
&& Acl::checkUserAccess(ActionsInterface::ACTION_CFG_IMPORT)
) {
$GridActionLdapSync = new DataGridAction();
$GridActionLdapSync->setId(self::ACTION_USR_SYNC_LDAP);
$GridActionLdapSync->setType(DataGridActionType::NEW_ITEM);

7
inc/SP/Core/Acl.class.php
View File

@@ -85,7 +85,6 @@ class Acl implements ActionsInterface
case self::ACTION_ACC_DELETE:
return ($curUserIsAdminAcc || $curUserProfile->isAccDelete());
case self::ACTION_ACC_FILES:
case self::ACTION_MGM_FILES:
return ($curUserIsAdminAcc || $curUserProfile->isAccFiles());
case self::ACTION_MGM:
return ($curUserProfile->isMgmCategories() || $curUserProfile->isMgmCustomers());
@@ -105,6 +104,12 @@ class Acl implements ActionsInterface
return $curUserProfile->isMgmPublicLinks();
case self::ACTION_MGM_PUBLICLINKS_NEW:
return ($curUserProfile->isMgmPublicLinks() || $curUserProfile->isAccPublicLinks());
case self::ACTION_MGM_ACCOUNTS:
return $curUserProfile->isMgmAccounts();
case self::ACTION_MGM_FILES:
return $curUserProfile->isMgmFiles();
case self::ACTION_MGM_TAGS:
return $curUserProfile->isMgmTags();
case self::ACTION_CFG_ENCRYPTION:
return $curUserProfile->isConfigEncryption();
case self::ACTION_CFG_BACKUP:

60
inc/SP/DataModel/ProfileData.class.php
View File

@@ -122,6 +122,18 @@ class ProfileData extends ProfileBaseData
* @var bool
*/
protected $mgmPublicLinks = false;
/**
* @var bool
*/
protected $mgmAccounts = false;
/**
* @var bool
*/
protected $mgmTags = false;
/**
* @var bool
*/
protected $mgmFiles = false;
/**
* @var bool
*/
@@ -534,4 +546,52 @@ class ProfileData extends ProfileBaseData
{
$this->accPermission = $accPermission;
}
/**
* @return boolean
*/
public function isMgmAccounts()
{
return $this->mgmAccounts;
}
/**
* @param boolean $mgmAccounts
*/
public function setMgmAccounts($mgmAccounts)
{
$this->mgmAccounts = $mgmAccounts;
}
/**
* @return boolean
*/
public function isMgmTags()
{
return $this->mgmTags;
}
/**
* @param boolean $mgmTags
*/
public function setMgmTags($mgmTags)
{
$this->mgmTags = $mgmTags;
}
/**
* @return boolean
*/
public function isMgmFiles()
{
return $this->mgmFiles;
}
/**
* @param boolean $mgmFiles
*/
public function setMgmFiles($mgmFiles)
{
$this->mgmFiles = $mgmFiles;
}
}

3
inc/SP/Forms/ProfileForm.class.php
View File

@@ -111,6 +111,9 @@ class ProfileForm extends FormBase implements FormInterface
$this->ProfileData->setMgmProfiles(Request::analyze('profile_profiles', 0, false, 1));
$this->ProfileData->setMgmApiTokens(Request::analyze('profile_apitokens', 0, false, 1));
$this->ProfileData->setMgmPublicLinks(Request::analyze('profile_publinks', 0, false, 1));
$this->ProfileData->setMgmAccounts(Request::analyze('profile_accounts', 0, false, 1));
$this->ProfileData->setMgmFiles(Request::analyze('profile_files', 0, false, 1));
$this->ProfileData->setMgmTags(Request::analyze('profile_tags', 0, false, 1));
$this->ProfileData->setEvl(Request::analyze('profile_eventlog', 0, false, 1));
}
}

16
inc/SP/Mgmt/Profiles/Profile.class.php
View File

@@ -114,7 +114,7 @@ class Profile extends ProfileBase implements ItemInterface, ItemSelectInterface
public function delete($id)
{
if (is_array($id)) {
foreach ($id as $itemId){
foreach ($id as $itemId) {
$this->delete($itemId);
}
@@ -185,7 +185,7 @@ class Profile extends ProfileBase implements ItemInterface, ItemSelectInterface
/**
* @var ProfileBaseData $ProfileData
* @var ProfileData $Profile
* @var ProfileData $Profile
*/
$ProfileData = DB::getResults($Data);
$Profile = unserialize($ProfileData->getUserprofileProfile());
@@ -275,18 +275,10 @@ class Profile extends ProfileBase implements ItemInterface, ItemSelectInterface
*/
public function getAll()
{
if (Checks::demoIsEnabled()) {
$query = /** @lang SQL */
'SELECT userprofile_id, userprofile_name
FROM usrProfiles
WHERE userprofile_name <> "Admin"
ORDER BY userprofile_name';
} else {
$query = /** @lang SQL */
'SELECT userprofile_id, userprofile_name
$query = /** @lang SQL */
'SELECT userprofile_id, userprofile_name
FROM usrProfiles
ORDER BY userprofile_name';
}
$Data = new QueryData();
$Data->setMapClassName($this->getDataModel());

8
inc/SP/Mgmt/Profiles/ProfileSearch.class.php
View File

@@ -52,16 +52,10 @@ class ProfileSearch extends ProfileBase implements ItemSearchInterface
$Data->setOrder('userprofile_name');
if ($SearchData->getSeachString() !== '') {
if (Checks::demoIsEnabled()) {
$Data->setWhere('userprofile_name LIKE ? AND userprofile_name <> "Admin" AND userprofile_name <> "Demo"');
} else {
$Data->setWhere('userprofile_name LIKE ?');
}
$Data->setWhere('userprofile_name LIKE ?');
$search = '%' . $SearchData->getSeachString() . '%';
$Data->addParam($search);
} elseif (Checks::demoIsEnabled()) {
$Data->setWhere('userprofile_name <> "Admin" AND userprofile_name <> "Demo"');
}
$Data->setLimit('?,?');

4
inc/SP/Mgmt/Users/UserPreferences.class.php
View File

@@ -105,7 +105,9 @@ class UserPreferences extends UserPreferencesBase implements ItemInterface
$UserPreferencesData = unserialize($queryRes->getUserPreferences());
if (get_class($UserPreferencesData) === '__PHP_Incomplete_Class') {
if ($UserPreferencesData === false) {
return new UserPreferencesData();
} elseif (get_class($UserPreferencesData) === '__PHP_Incomplete_Class') {
$UserPreferencesData = Util::castToClass($this->getDataModel(), $UserPreferencesData);
}

49
inc/themes/material-blue/css/styles.css
View File

@@ -186,7 +186,7 @@ pre, code, samp, kbd {
}
#container.login {
padding-top: 10em
margin-top: 3%;
}
/*#container.main {
@@ -1409,36 +1409,43 @@ footer img {
min-width: 20em;
}
#boxLogin {
position: relative;
/* LOGIN - START */
#login-container {
width: 40em;
min-height: 22em;
margin: 0 auto;
padding: 1em;
background: #fff url("../imgs/logo_full_new.png") no-repeat bottom left;
background-size: 300px auto;
background: transparent url("../imgs/logo_full_new.png") no-repeat top left;
background-size: auto 10em;
}
#boxLogin #boxData {
#login-container #boxLogin {
position: relative;
margin: 10em auto 0 auto;
width: 100%;
min-height: 12em;
padding: 1em;
background-color: #fff;
}
#login-container #boxLogin #boxData {
height: 100%;
min-height: 13em;
margin-bottom: 10em;
min-height: 14em;
/*margin-bottom: 10em;*/
text-align: left;
background-color: transparent;
}
#boxLogin #boxData i {
#login-container #boxLogin #boxData i {
margin-right: .5em;
opacity: .5;
}
#boxLogin #boxButton {
#login-container #boxLogin #boxButton {
position: absolute;
top: 2em;
right: 2em;
}
#boxLogin #boxActions {
#login-container #boxLogin #boxActions {
position: absolute;
bottom: 1em;
right: 1em;
@@ -1447,11 +1454,11 @@ footer img {
text-align: right;
}
#boxLogin #boxActions a {
#login-container #boxLogin #boxActions a {
color: #c9c9c9
}
#boxLogout {
#login-container #boxLogout {
width: 250px;
margin: 8em auto 0 auto;
font-size: 14px;
@@ -1462,7 +1469,7 @@ footer img {
padding: .5em
}
#boxUpdated {
#login-container #boxUpdated {
width: 350px;
margin: 5em auto 5em auto;
font-size: 14px;
@@ -1473,6 +1480,8 @@ footer img {
padding: .5em
}
/* LOGIN - END */
fieldset.warning {
padding: 8px;
color: #b94a48;
@@ -1492,7 +1501,7 @@ fieldset.warning a {
#actions {
width: 100%;
margin: auto auto 50px;
/*margin: auto auto 50px;*/
line-height: 2em
}
@@ -1501,9 +1510,9 @@ fieldset.warning a {
width: 100%;
margin-bottom: 30px;
color: #607d8b;
box-shadow: 0 8px 6px -6px rgba(83, 109, 254, .3);
-webkit-box-shadow: 0 8px 6px -6px rgba(83, 109, 254, .3);
-moz-box-shadow: 0 8px 6px -6px rgba(83, 109, 254, .3);
/*box-shadow: 0 8px 6px -6px rgba(83, 109, 254, .3);*/
/*-webkit-box-shadow: 0 8px 6px -6px rgba(83, 109, 254, .3);*/
/*-moz-box-shadow: 0 8px 6px -6px rgba(83, 109, 254, .3);*/
align-items: center;
background: url("../imgs/logo_full_new.png") left no-repeat;
background-size: auto 150px;

2
inc/themes/material-blue/css/styles.min.css vendored
View File

File diff suppressed because one or more lines are too long

2
inc/themes/material-blue/views/accountsearch/rows.inc
View File

@@ -191,7 +191,7 @@
<?php endif; ?>
<?php endforeach; ?>
<?php if (count($data->getDataActionsMenu()) > 0): ?>
<?php if (!$AccountSearchItem->isShowRequest() && count($data->getDataActionsMenu()) > 0): ?>
<button id="actions-menu-lower-right-<?php echo $AccountSearchData->getAccountId(); ?>"
class="mdl-button mdl-js-button mdl-button--icon">
<i class="material-icons">more_vert</i>

2
inc/themes/material-blue/views/config/general-accounts.inc
View File

@@ -55,7 +55,7 @@
<div class="mdl-textfield mdl-js-textfield mdl-textfield--floating-label">
<input id="account_count" name="account_count" type="number" step="6"
pattern="[0-9]{1,5}" class="mdl-textfield__input mdl-color-text--indigo-400" maxlength="5"
value="<?php echo $accountCount; ?>" <?php echo $isDisabled; ?> required/>
value="<?php echo $accountCount; ?>" required/>
<label class="mdl-textfield__label"
for="account_count"><?php echo _('Número de resultados por página'); ?></label>
</div>

6
inc/themes/material-blue/views/config/general-events.inc
View File

@@ -18,7 +18,7 @@
<td class="valField">
<label class="mdl-switch mdl-js-switch mdl-js-ripple-effect" for="log_enabled">
<input type="checkbox" id="log_enabled" class="mdl-switch__input mdl-color-text--indigo-400" name="log_enabled"
<?php echo $chkLog, ' ', $isDisabled; ?>/>
<?php echo $chkLog; ?>/>
<span class="mdl-switch__label"></span>
</label>
</td>
@@ -30,7 +30,7 @@
<td class="valField">
<label class="mdl-switch mdl-js-switch mdl-js-ripple-effect" for="syslog_enabled">
<input type="checkbox" id="syslog_enabled" class="mdl-switch__input mdl-color-text--indigo-400" name="syslog_enabled"
<?php echo $chkSyslog, ' ', $isDisabled; ?>/>
<?php echo $chkSyslog; ?>/>
<span class="mdl-switch__label"></span>
</label>
</td>
@@ -42,7 +42,7 @@
<td class="valField">
<label class="mdl-switch mdl-js-switch mdl-js-ripple-effect" for="remotesyslog_enabled">
<input type="checkbox" id="remotesyslog_enabled" class="mdl-switch__input mdl-color-text--indigo-400" name="remotesyslog_enabled"
<?php echo $chkRemoteSyslog, ' ', $isDisabled; ?>/>
<?php echo $chkRemoteSyslog; ?>/>
<span class="mdl-switch__label"></span>
</label>
</td>

4
inc/themes/material-blue/views/config/general-files.inc
View File

@@ -20,7 +20,7 @@
<label class="mdl-switch mdl-js-switch mdl-js-ripple-effect" for="files_enabled">
<input type="checkbox" id="files_enabled" class="mdl-switch__input mdl-color-text--indigo-400"
name="files_enabled"
<?php echo $chkFiles, ' ', $isDisabled; ?>/>
<?php echo $chkFiles; ?>/>
<span class="mdl-switch__label"></span>
</label>
</td>
@@ -68,7 +68,7 @@
<div class="mdl-textfield mdl-js-textfield mdl-textfield--floating-label">
<input id="files_allowed_size" name="files_allowed_size" type="number" step="512"
pattern="[0-9]{1,5}" class="mdl-textfield__input mdl-color-text--indigo-400" maxlength="5"
value="<?php echo $filesAllowedSize; ?>" <?php echo $isDisabled; ?>/>
value="<?php echo $filesAllowedSize; ?>"/>
<label class="mdl-textfield__label"
for="files_allowed_size"><?php echo _('Tamaño máximo de archivo en bytes'); ?></label>
</div>

4
inc/themes/material-blue/views/config/general-links.inc
View File

@@ -28,7 +28,7 @@
<label class="mdl-switch mdl-js-switch mdl-js-ripple-effect" for="publinks_enabled">
<input type="checkbox" id="publinks_enabled" class="mdl-switch__input mdl-color-text--indigo-400"
name="publinks_enabled"
<?php echo $chkPubLinks, ' ', $isDisabled; ?>/>
<?php echo $chkPubLinks; ?>/>
<span class="mdl-switch__label"></span>
</label>
</td>
@@ -74,7 +74,7 @@
<label class="mdl-switch mdl-js-switch mdl-js-ripple-effect" for="publinks_image_enabled">
<input type="checkbox" id="publinks_image_enabled" class="mdl-switch__input mdl-color-text--indigo-400"
name="publinks_image_enabled"
<?php echo $chkPubLinksImage, ' ', $isDisabled; ?>/>
<?php echo $chkPubLinksImage; ?>/>
<span class="mdl-switch__label"></span>
</label>
</td>

2
inc/themes/material-blue/views/config/general-proxy.inc
View File

@@ -11,7 +11,7 @@
<label class="mdl-switch mdl-js-switch mdl-js-ripple-effect" for="proxy_enabled">
<input type="checkbox" id="proxy_enabled" class="mdl-switch__input mdl-color-text--indigo-400"
name="proxy_enabled"
<?php echo $chkProxy, ' ', $isDisabled; ?>/>
<?php echo $chkProxy; ?>/>
<span class="mdl-switch__label"></span>
</label>
</td>

10
inc/themes/material-blue/views/config/general-site.inc
View File

@@ -42,7 +42,7 @@
</td>
<td class="valField">
<select name="sitetheme" id="sel-sitetheme" size="1"
class="select-box sel-chosen-ns" <?php echo $isDisabled; ?>>
class="select-box sel-chosen-ns" >
<?php foreach ($themesAvailable as $themeDir => $themeName): ?>
<option
value='<?php echo $themeDir; ?>' <?php echo ($currentTheme == $themeDir) ? "SELECTED" : ""; ?>><?php echo $themeName; ?></option>
@@ -58,7 +58,7 @@
<div class="mdl-textfield mdl-js-textfield mdl-textfield--floating-label">
<input id="session_timeout" name="session_timeout" type="number" step="300"
pattern="[0-9]{2,4}" class="mdl-textfield__input mdl-color-text--indigo-400" maxlength="5"
value="<?php echo $sessionTimeout; ?>" <?php echo $isDisabled; ?> required/>
value="<?php echo $sessionTimeout; ?>" required/>
<label class="mdl-textfield__label"
for="session_timeout"><?php echo _('Timeout de sesión (s)'); ?></label>
</div>
@@ -79,7 +79,7 @@
<label class="mdl-switch mdl-js-switch mdl-js-ripple-effect" for="https_enabled">
<input type="checkbox" id="https_enabled" class="mdl-switch__input mdl-color-text--indigo-400"
name="https_enabled"
<?php echo $chkHttps, ' ', $isDisabled; ?>/>
<?php echo $chkHttps; ?>/>
<span class="mdl-switch__label"></span>
</label>
</td>
@@ -98,7 +98,7 @@
<td class="valField">
<label class="mdl-switch mdl-js-switch mdl-js-ripple-effect" for="debug">
<input type="checkbox" id="debug" class="mdl-switch__input mdl-color-text--indigo-400" name="debug"
<?php echo $chkDebug, ' ', $isDisabled; ?>/>
<?php echo $chkDebug; ?>/>
<span class="mdl-switch__label"></span>
</label>
</td>
@@ -117,7 +117,7 @@
<td class="valField">
<label class="mdl-switch mdl-js-switch mdl-js-ripple-effect" for="maintenance">
<input type="checkbox" id="maintenance" class="mdl-switch__input mdl-color-text--indigo-400" name="maintenance"
<?php echo $chkMaintenance, ' ', $isDisabled; ?>/>
<?php echo $chkMaintenance; ?>/>
<span class="mdl-switch__label"></span>
</label>
</td>

5
inc/themes/material-blue/views/config/general.inc
View File

@@ -15,11 +15,6 @@
<?php include $this->includeTemplate('general-links'); ?>
<?php include $this->includeTemplate('general-proxy'); ?>
<?php if ($isDemoMode): ?>
<input type="hidden" name="log_enabled" value="1"/>
<input type="hidden" name="files_enabled" value="1"/>
<?php endif; ?>
<input type="hidden" name="activeTab" value="<?php echo $config_tabIndex; ?>"/>
<input type="hidden" name="actionId" value="<?php echo $config_actionId; ?>"/>
<input type="hidden" name="sk" value="">

22
inc/themes/material-blue/views/config/ldap.inc
View File

@@ -31,7 +31,7 @@
<input type="checkbox" id="ldap_enabled"
class="mdl-switch__input mdl-color-text--indigo-400"
name="ldap_enabled"
<?php echo $chkLdap, ' ', $isDisabled; ?>/>
<?php echo $chkLdap; ?>/>
<span class="mdl-switch__label"></span>
</label>
</td>
@@ -61,7 +61,7 @@
<div class="mdl-textfield mdl-js-textfield mdl-textfield--floating-label">
<input id="ldap_server" name="ldap_server" type="text"
class="mdl-textfield__input mdl-color-text--indigo-400"
maxlength="128" value="<?php echo $ldapServer; ?>" <?php echo $isDisabled; ?>/>
maxlength="128" value="<?php echo $ldapServer; ?>"/>
<label class="mdl-textfield__label"
for="ldap_server"><?php echo _('Servidor'); ?></label>
</div>
@@ -91,7 +91,7 @@
<div class="mdl-textfield mdl-js-textfield mdl-textfield--floating-label">
<input id="ldap_binduser" name="ldap_binduser" type="text"
class="mdl-textfield__input mdl-color-text--indigo-400"
maxlength="128" value="<?php echo $ldapBindUser; ?>" <?php echo $isDisabled; ?>/>
maxlength="128" value="<?php echo $ldapBindUser; ?>"/>
<label class="mdl-textfield__label"
for="ldap_binduser"><?php echo _('Usuario'); ?></label>
</div>
@@ -112,7 +112,7 @@
<div class="mdl-textfield mdl-js-textfield mdl-textfield--floating-label">
<input id="ldap_bindpass" name="ldap_bindpass" type="password"
class="mdl-textfield__input passwordfield__input mdl-color-text--indigo-400"
maxlength="128" value="<?php echo $ldapBindPass; ?>" <?php echo $isDisabled; ?>/>
maxlength="128" value="<?php echo $ldapBindPass; ?>"/>
<label class="mdl-textfield__label"
for="ldap_bindpass"><?php echo _('Clave'); ?></label>
</div>
@@ -142,7 +142,7 @@
<div class="mdl-textfield mdl-js-textfield mdl-textfield--floating-label">
<input id="ldap_base" name="ldap_base" type="text"
class="mdl-textfield__input mdl-color-text--indigo-400"
maxlength="128" value="<?php echo $ldapBase; ?>" <?php echo $isDisabled; ?>/>
maxlength="128" value="<?php echo $ldapBase; ?>"/>
<label class="mdl-textfield__label"
for="ldap_base"><?php echo _('Base de búsqueda'); ?></label>
</div>
@@ -176,7 +176,7 @@
<div class="mdl-textfield mdl-js-textfield mdl-textfield--floating-label">
<input id="ldap_group" name="ldap_group" type="text"
class="mdl-textfield__input mdl-color-text--indigo-400"
maxlength="128" value="<?php echo $ldapGroup; ?>" <?php echo $isDisabled; ?>/>
maxlength="128" value="<?php echo $ldapGroup; ?>"/>
<label class="mdl-textfield__label" for="ldap_group"><?php echo _('Grupo'); ?></label>
</div>
</td>
@@ -194,7 +194,7 @@
</td>
<td class="valField">
<select id="ldap_defaultgroup" name="ldap_defaultgroup"
class="select-box sel-chosen-usergroup" <?php echo $isDisabled; ?> required>
class="select-box sel-chosen-usergroup" required>
<option value=""><?php echo _('Seleccionar Grupo'); ?></option>
<?php foreach ($groups as $group): ?>
<option
@@ -216,7 +216,7 @@
</td>
<td class="valField">
<select id="ldap_defaultprofile" name="ldap_defaultprofile"
class="select-box sel-chosen-profile" <?php echo $isDisabled; ?> required>
class="select-box sel-chosen-profile" required>
<option value=""><?php echo _('Seleccionar Usuario'); ?></option>
<?php foreach ($profiles as $profile): ?>
<option
@@ -241,7 +241,7 @@
<input type="checkbox" id="ldap_ads"
class="mdl-switch__input mdl-color-text--indigo-400"
name="ldap_ads"
<?php echo $chkLdapADS, ' ', $isDisabled; ?>/>
<?php echo $chkLdapADS; ?>/>
<span class="mdl-switch__label"></span>
</label>
</td>
@@ -264,10 +264,6 @@
<?php endif; ?>
</table>
<?php if ($isDemoMode): ?>
<input type="hidden" name="ldap_enabled" value="0"/>
<?php endif; ?>
<input type="hidden" name="type" value="ldap"/>
<input type="hidden" name="activeTab" value="<?php echo $ldap_tabIndex; ?>"/>
<input type="hidden" name="actionId" value="<?php echo $ldap_actionId; ?>"/>

20
inc/themes/material-blue/views/config/mail.inc
View File

@@ -19,7 +19,7 @@
<input type="checkbox" id="mail_enabled"
class="mdl-switch__input mdl-color-text--indigo-400"
name="mail_enabled"
<?php echo $chkMail, ' ', $isDisabled; ?>/>
<?php echo $chkMail; ?>/>
<span class="mdl-switch__label"></span>
</label>
</td>
@@ -32,7 +32,7 @@
<div class="mdl-textfield mdl-js-textfield mdl-textfield--floating-label">
<input id="mail_server" name="mail_server" type="text"
class="mdl-textfield__input mdl-color-text--indigo-400"
maxlength="128" value="<?php echo $mailServer; ?>" <?php echo $isDisabled; ?>/>
maxlength="128" value="<?php echo $mailServer; ?>"/>
<label class="mdl-textfield__label" for="mail_server"><?php echo _('Servidor'); ?></label>
</div>
</td>
@@ -45,7 +45,7 @@
<div class="mdl-textfield mdl-js-textfield mdl-textfield--floating-label">
<input id="mail_port" name="mail_port" type="number" pattern="[0-9]{1,5}"
class="mdl-textfield__input mdl-color-text--indigo-400" maxlength="5"
value="<?php echo $mailPort; ?>" <?php echo $isDisabled; ?>/>
value="<?php echo $mailPort; ?>"/>
<label class="mdl-textfield__label" for="mail_port"><?php echo _('Puerto'); ?></label>
</div>
</td>
@@ -58,7 +58,7 @@
<label class="mdl-switch mdl-js-switch mdl-js-ripple-effect" for="mail_authenabled">
<input type="checkbox" id="mail_authenabled"
class="mdl-switch__input mdl-color-text--indigo-400"
name="mail_authenabled" <?php echo $chkMailAuth, ' ', $isDisabled; ?>/>
name="mail_authenabled" <?php echo $chkMailAuth; ?>/>
<span class="mdl-switch__label"></span>
</label>
</td>
@@ -71,7 +71,7 @@
<div class="mdl-textfield mdl-js-textfield mdl-textfield--floating-label">
<input id="mail_user" name="mail_user" type="email"
class="mdl-textfield__input mdl-color-text--indigo-400"
maxlength="50" value="<?php echo $mailUser; ?>" <?php echo $isDisabled; ?>/>
maxlength="50" value="<?php echo $mailUser; ?>"/>
<label class="mdl-textfield__label" for="mail_user"><?php echo _('Usuario'); ?></label>
</div>
</td>
@@ -84,7 +84,7 @@
<div class="mdl-textfield mdl-js-textfield mdl-textfield--floating-label">
<input id="mail_pass" name="mail_pass" type="password"
class="mdl-textfield__input mdl-color-text--indigo-400 passwordfield__input"
maxlength="128" value="<?php echo $mailPass; ?>" <?php echo $isDisabled; ?>/>
maxlength="128" value="<?php echo $mailPass; ?>"/>
<label class="mdl-textfield__label" for="mail_pass"><?php echo _('Clave'); ?></label>
</div>
</td>
@@ -111,7 +111,7 @@
<div class="mdl-textfield mdl-js-textfield mdl-textfield--floating-label">
<input id="mail_from" name="mail_from" type="email"
class="mdl-textfield__input mdl-color-text--indigo-400"
maxlength="128" value="<?php echo $mailFrom; ?>" <?php echo $isDisabled; ?>/>
maxlength="128" value="<?php echo $mailFrom; ?>"/>
<label class="mdl-textfield__label"
for="mail_from"><?php echo _('Dirección de correo de envío'); ?></label>
</div>
@@ -133,17 +133,13 @@
<label class="mdl-switch mdl-js-switch mdl-js-ripple-effect" for="mail_requestsenabled">
<input type="checkbox" id="mail_requestsenabled"
class="mdl-switch__input mdl-color-text--indigo-400"
name="mail_requestsenabled" <?php echo $chkMailRequests, ' ', $isDisabled; ?>/>
name="mail_requestsenabled" <?php echo $chkMailRequests; ?>/>
<span class="mdl-switch__label"></span>
</label>
</td>
</tr>
</table>
<?php if ($isDemoMode): ?>
<input type="hidden" name="mail_enabled" value="0"/>
<?php endif; ?>
<input type="hidden" name="activeTab" value="<?php echo $mail_tabIndex; ?>"/>
<input type="hidden" name="actionId" value="<?php echo $mail_actionId; ?>"/>
<input type="hidden" name="sk" value="">

18
inc/themes/material-blue/views/config/wiki.inc
View File

@@ -27,7 +27,7 @@
<input type="checkbox" id="wiki_enabled"
class="mdl-switch__input mdl-color-text--indigo-400"
name="wiki_enabled"
<?php echo $chkWiki, ' ', $isDisabled; ?>/>
<?php echo $chkWiki; ?>/>
<span class="mdl-switch__label"></span>
</label>
</td>
@@ -143,7 +143,7 @@
<input type="checkbox" id="dokuwiki_enabled"
class="mdl-switch__input mdl-color-text--indigo-400"
name="dokuwiki_enabled"
<?php echo $chkDokuWiki, ' ', $isDisabled; ?>/>
<?php echo $chkDokuWiki; ?>/>
<span class="mdl-switch__label"></span>
</label>
</td>
@@ -171,7 +171,7 @@
<div class="mdl-textfield mdl-js-textfield mdl-textfield--floating-label">
<input id="dokuwiki_url" name="dokuwiki_url" type="text"
class="mdl-textfield__input mdl-color-text--indigo-400"
maxlength="128" value="<?php echo $dokuWikiUrl; ?>" <?php echo $isDisabled; ?>/>
maxlength="128" value="<?php echo $dokuWikiUrl; ?>"/>
<label class="mdl-textfield__label" for="dokuwiki_url"><?php echo _('URL API'); ?></label>
</div>
</td>
@@ -198,7 +198,7 @@
<div class="mdl-textfield mdl-js-textfield mdl-textfield--floating-label">
<input id="dokuwiki_urlbase" name="dokuwiki_urlbase" type="text"
class="mdl-textfield__input mdl-color-text--indigo-400"
maxlength="128" value="<?php echo $dokuWikiUrlBase; ?>" <?php echo $isDisabled; ?>/>
maxlength="128" value="<?php echo $dokuWikiUrlBase; ?>"/>
<label class="mdl-textfield__label"
for="dokuwiki_urlbase"><?php echo _('URL Base'); ?></label>
</div>
@@ -219,7 +219,7 @@
<div class="mdl-textfield mdl-js-textfield mdl-textfield--floating-label">
<input id="dokuwiki_user" name="dokuwiki_user" type="text"
class="mdl-textfield__input mdl-color-text--indigo-400"
maxlength="128" value="<?php echo $dokuWikiUser; ?>" <?php echo $isDisabled; ?>/>
maxlength="128" value="<?php echo $dokuWikiUser; ?>"/>
<label class="mdl-textfield__label" for="dokuwiki_user"><?php echo _('Usuario'); ?></label>
</div>
</td>
@@ -232,7 +232,7 @@
<div class="mdl-textfield mdl-js-textfield mdl-textfield--floating-label">
<input id="dokuwiki_pass" name="dokuwiki_pass" type="password"
class="mdl-textfield__input passwordfield__input mdl-color-text--indigo-400"
maxlength="128" value="<?php echo $dokuWikiPass; ?>" <?php echo $isDisabled; ?>/>
maxlength="128" value="<?php echo $dokuWikiPass; ?>"/>
<label class="mdl-textfield__label" for="dokuwiki_pass"><?php echo _('Clave'); ?></label>
</div>
</td>
@@ -253,7 +253,7 @@
<input id="dokuwiki_namespace" name="dokuwiki_namespace" type="text"
class="mdl-textfield__input mdl-color-text--indigo-400"
maxlength="128"
value="<?php echo $dokuWikiNamespace; ?>" <?php echo $isDisabled; ?>/>
value="<?php echo $dokuWikiNamespace; ?>"/>
<label class="mdl-textfield__label"
for="dokuwiki_namespace"><?php echo _('Namespace'); ?></label>
</div>
@@ -261,10 +261,6 @@
</tr>
</table>
<?php if ($isDemoMode): ?>
<input type="hidden" name="wiki_enabled" value="1"/>
<?php endif; ?>
<input type="hidden" name="type" value="dokuwiki"/>
<input type="hidden" name="activeTab" value="<?php echo $wiki_tabIndex; ?>"/>
<input type="hidden" name="actionId" value="<?php echo $wiki_actionId; ?>"/>

20
inc/themes/material-blue/views/eventlog/eventlog.inc
View File

@@ -129,12 +129,16 @@
</div>
</div>
<div class="action fullWidth">
<button
class="btn-action mdl-button mdl-js-button mdl-button--fab mdl-button--mini-fab mdl-button--colored <?php echo $icons->getIconClear()->getClassButton(); ?>"
title="<?php echo _('Vaciar registro de eventos'); ?>"
data-onclick="eventlog/clear"
data-nextaction-id="<?php echo \SP\Core\ActionsInterface::ACTION_EVL; ?>">
<i class="material-icons"><?php echo $icons->getIconClear()->getIcon(); ?></i>
</button>
<div class="item-actions">
<ul>
<li>
<button
class="btn-action mdl-button mdl-js-button mdl-button--fab mdl-button--mini-fab mdl-button--colored <?php echo $icons->getIconClear()->getClassButton(); ?>"
title="<?php echo _('Vaciar registro de eventos'); ?>"
data-onclick="eventlog/clear"
data-nextaction-id="<?php echo \SP\Core\ActionsInterface::ACTION_EVL; ?>">
<i class="material-icons"><?php echo $icons->getIconClear()->getIcon(); ?></i>
</button>
</li>
</ul>
</div>

21
inc/themes/material-blue/views/itemshow/profiles.inc
View File

@@ -204,6 +204,27 @@
<span class="mdl-switch__label"
title="<?php echo _('Gestión de enlaces'); ?>"><?php echo _('Enlaces Públicos'); ?></span>
</label>
<label class="mdl-switch mdl-js-switch mdl-js-ripple-effect" for="profile_accounts">
<input type="checkbox" id="profile_accounts"
class="mdl-switch__input mdl-color-text--indigo-400"
name="profile_accounts" <?php echo $profile->isMgmAccounts() ? 'CHECKED' : ''; ?> <?php echo $isDisabled; ?>/>
<span class="mdl-switch__label"
title="<?php echo _('Gestión de cuentas'); ?>"><?php echo _('Cuentas'); ?></span>
</label>
<label class="mdl-switch mdl-js-switch mdl-js-ripple-effect" for="profile_files">
<input type="checkbox" id="profile_files"
class="mdl-switch__input mdl-color-text--indigo-400"
name="profile_files" <?php echo $profile->isMgmFiles() ? 'CHECKED' : ''; ?> <?php echo $isDisabled; ?>/>
<span class="mdl-switch__label"
title="<?php echo _('Gestión de archivos'); ?>"><?php echo _('Archivos'); ?></span>
</label>
<label class="mdl-switch mdl-js-switch mdl-js-ripple-effect" for="profile_tags">
<input type="checkbox" id="profile_tags"
class="mdl-switch__input mdl-color-text--indigo-400"
name="profile_tags" <?php echo $profile->isMgmTags() ? 'CHECKED' : ''; ?> <?php echo $isDisabled; ?>/>
<span class="mdl-switch__label"
title="<?php echo _('Gestión de etiquetas'); ?>"><?php echo _('Etiquetas'); ?></span>
</label>
</div>
</td>
</tr>

190
inc/themes/material-blue/views/main/login.inc
View File

@@ -1,99 +1,109 @@
<div id="boxLogin" class="round shadow">
<?php if (!$isLogout): ?>
<form method="post" name="frmLogin" id="frmLogin" class="form-action" data-onsubmit="main/login">
<div id="boxData">
<?php if ($demoEnabled): ?>
<div class="mdl-textfield mdl-js-textfield mdl-textfield--floating-label">
<input id="user" name="user" type="text"
class="mdl-textfield__input mdl-color-text--indigo-400"
maxlength="80"
title="> demo <">
<label class="mdl-textfield__label"
for="user"><?php echo _('Usuario'); ?></label>
</div>
<div class="mdl-textfield mdl-js-textfield mdl-textfield--floating-label">
<input id="pass" name="pass" type="password"
class="mdl-textfield__input mdl-color-text--indigo-400"
maxlength="80"
title="> syspass <">
<label class="mdl-textfield__label"
for="pass"><?php echo _('Clave'); ?></label>
</div>
<span id="smpass" style="display: none">
<div class="mdl-textfield mdl-js-textfield mdl-textfield--floating-label">
<input id="mpass" name="mpass" type="password"
class="mdl-textfield__input mdl-color-text--indigo-400"
maxlength="80" title="> 12345678900 <">
<label class="mdl-textfield__label"
for="mpass"><?php echo _('Clave Maestra'); ?></label>
</div>
</span>
<?php else: ?>
<div>
<i class="material-icons">perm_identity</i>
<div class="mdl-textfield mdl-js-textfield mdl-textfield--floating-label">
<input id="user" name="user" type="text"
class="mdl-textfield__input mdl-color-text--indigo-400"
maxlength="80"
autocomplete="off">
<label class="mdl-textfield__label"
for="user"><?php echo _('Usuario'); ?></label>
<div id="login-container">
<div id="boxLogin" class="round shadow">
<?php if (!$isLogout): ?>
<form method="post" name="frmLogin" id="frmLogin" class="form-action" data-onsubmit="main/login">
<div id="boxData">
<?php if ($demoEnabled): ?>
<div>
<i class="material-icons">perm_identity</i>
<div class="mdl-textfield mdl-js-textfield mdl-textfield--floating-label">
<input id="user" name="user" type="text"
class="mdl-textfield__input mdl-color-text--indigo-400"
maxlength="80"
title="> demo <">
<label class="mdl-textfield__label"
for="user"><?php echo _('Usuario'); ?></label>
</div>
</div>
</div>
<div>
<i class="material-icons">vpn_key</i>
<div class="mdl-textfield mdl-js-textfield mdl-textfield--floating-label">
<input id="pass" name="pass" type="password"
class="mdl-textfield__input mdl-color-text--indigo-400"
maxlength="80"
autocomplete="off">
<label class="mdl-textfield__label"
for="pass"><?php echo _('Clave'); ?></label>
<div>
<i class="material-icons">vpn_key</i>
<div class="mdl-textfield mdl-js-textfield mdl-textfield--floating-label">
<input id="pass" name="pass" type="password"
class="mdl-textfield__input mdl-color-text--indigo-400"
maxlength="80"
title="> syspass <">
<label class="mdl-textfield__label"
for="pass"><?php echo _('Clave'); ?></label>
</div>
</div>
</div>
<div id="smpass" style="display: none">
<i class="material-icons">vpn_key</i>
<div class="mdl-textfield mdl-js-textfield mdl-textfield--floating-label">
<input id="mpass" name="mpass" type="password"
class="mdl-textfield__input mdl-color-text--indigo-400"
maxlength="80" autocomplete="off">
<label class="mdl-textfield__label"
for="mpass"><?php echo _('Clave Maestra'); ?></label>
<div id="smpass" style="display: none">
<i class="material-icons">vpn_key</i>
<div class="mdl-textfield mdl-js-textfield mdl-textfield--floating-label">
<input id="mpass" name="mpass" type="password"
class="mdl-textfield__input mdl-color-text--indigo-400"
maxlength="80" title="> 12345678900 <">
<label class="mdl-textfield__label"
for="mpass"><?php echo _('Clave Maestra'); ?></label>
</div>
</div>
<?php else: ?>
<div>
<i class="material-icons">perm_identity</i>
<div class="mdl-textfield mdl-js-textfield mdl-textfield--floating-label">
<input id="user" name="user" type="text"
class="mdl-textfield__input mdl-color-text--indigo-400"
maxlength="80"
autocomplete="off">
<label class="mdl-textfield__label"
for="user"><?php echo _('Usuario'); ?></label>
</div>
</div>
</div>
<?php endif; ?>
<input type="hidden" name="login" value="1"/>
<input type="hidden" name="isAjax" value="1"/>
<?php if (is_array($getParams)): ?>
<?php foreach ($getParams as $param => $value): ?>
<input type="hidden" name="<?php echo $param; ?>" value="<?php echo $value; ?>"/>
<?php endforeach; ?>
<?php endif; ?>
</div>
<div id="boxButton">
<button id="btnLogin" type="submit" form="frmLogin"
class="mdl-button mdl-js-button mdl-button--fab mdl-js-ripple-effect mdl-button--colored mdl-color--indigo-400"
title="<?php echo _('Acceder'); ?>">
<i class="material-icons">play_arrow</i>
</button>
</div>
</form>
<div>
<i class="material-icons">vpn_key</i>
<div class="mdl-textfield mdl-js-textfield mdl-textfield--floating-label">
<input id="pass" name="pass" type="password"
class="mdl-textfield__input mdl-color-text--indigo-400"
maxlength="80"
autocomplete="off">
<label class="mdl-textfield__label"
for="pass"><?php echo _('Clave'); ?></label>
</div>
</div>
<!-- Close boxData -->
<?php if ($mailEnabled): ?>
<div id="boxActions">
<a href="index.php?a=passreset"><?php echo _('¿Olvidó su clave?'); ?></a>
</div>
<div id="smpass" style="display: none">
<i class="material-icons">vpn_key</i>
<div class="mdl-textfield mdl-js-textfield mdl-textfield--floating-label">
<input id="mpass" name="mpass" type="password"
class="mdl-textfield__input mdl-color-text--indigo-400"
maxlength="80" autocomplete="off">
<label class="mdl-textfield__label"
for="mpass"><?php echo _('Clave Maestra'); ?></label>
</div>
</div>
<?php endif; ?>
<input type="hidden" name="login" value="1"/>
<input type="hidden" name="isAjax" value="1"/>
<?php if (is_array($getParams)): ?>
<?php foreach ($getParams as $param => $value): ?>
<input type="hidden" name="<?php echo $param; ?>" value="<?php echo $value; ?>"/>
<?php endforeach; ?>
<?php endif; ?>
</div>
<div id="boxButton">
<button id="btnLogin" type="submit" form="frmLogin"
class="mdl-button mdl-js-button mdl-button--fab mdl-js-ripple-effect mdl-button--colored mdl-color--indigo-400"
title="<?php echo _('Acceder'); ?>">
<i class="material-icons">play_arrow</i>
</button>
</div>
</form>
<!-- Close boxData -->
<?php if ($mailEnabled): ?>
<div id="boxActions">
<a href="index.php?a=passreset"><?php echo _('¿Olvidó su clave?'); ?></a>
</div>
<?php endif; ?>
<?php else: ?>
<div id="boxLogout" class="round5"><?php echo _('Sesión finalizada'); ?></div>
<?php endif; ?>
<?php else: ?>
<div id="boxLogout" class="round5"><?php echo _('Sesión finalizada'); ?></div>
<?php endif; ?>
</div><!-- Close boxLogin -->
</div><!-- Close boxLogin -->
<?php if ($updated): ?>
<div id="boxUpdated" class="round5"><?php echo _('Aplicación actualizada correctamente'); ?></div>
<?php endif; ?>
<?php if ($updated): ?>
<div id="boxUpdated" class="round5"><?php echo _('Aplicación actualizada correctamente'); ?></div>
<?php endif; ?>
</div>

6
inc/themes/material-blue/views/main/menu.inc
View File

@@ -1,8 +1,8 @@
<header class="mdl-layout__header">
<header class="mdl-layout__header mdl-color--indigo-400">
<div class="mdl-layout__header-row">
<!-- Title -->
<span class="mdl-layout-icon"><img class="logo" src="<?php echo $logo; ?>" alt="logo"/></span>
<!-- <span class="mdl-layout-title">--><?php //echo $appInfo['appname']; ?><!--</span>-->
<span class="mdl-layout-icon"><img class="logo" src="imgs/logo_full_new.png" alt="logo"/></span>
<!-- <span class="mdl-layout-title">--><?php //echo '#', $appInfo['appname']; ?><!--</span>-->
<!-- Add spacer, to align navigation to the right -->
<div class="mdl-layout-spacer"></div>
<!-- Navigation -->

4
js/app-actions.js
View File

@@ -244,8 +244,8 @@ sysPass.Actions = function (Common) {
$obj.find("input[type='text'],input[type='password']").val("");
$obj.find("input:first").focus();
$("#mpass").prop("disabled", false);
$("#smpass").val("").show();
$("#mpass").prop("disabled", false).val("");
$("#smpass").show();
break;
default:
Common.msg.out(json);