@@ -828,7 +986,7 @@ $(document).ready(function() {
-
{'Change Password'|@translate}
+
{'Change Password'|@translate}
@@ -838,120 +996,126 @@ $(document).ready(function() {
-
-
-
{'Properties'|@translate}
-
-
-
{'Email Adress'|@translate}
-
-
-
-
{'Status'|@translate}
-
-
-
-
-
-
{'Privacy Level'|@translate}
-
-
-
-
-
-
{'Groups'|@translate}
-
-
-
+
+
+
+
{'Properties'|@translate}
+
{'Preferences'|@translate}
-
-
-
-
-
{'High definition enabled'|translate}
+
+
+
+
{'Email Adress'|@translate}
+
+
+
+
{'Status'|@translate}
+
+
+
+
+
+
{'Privacy Level'|@translate}
+
+
+
+
+
+
{'Groups'|@translate}
+
+
+
+
+
+
+
+
+
+ {'High definition enabled'|translate}
+
+
+
+
+
{'Photos per page'|translate}
+
+
+
+
+
+
{'Theme'|@translate}
+
+
+
+
+
+
{'Language'|@translate}
+
+
+
+
+
{'Recent period'|translate}
+
+
+
+
+
+
+
+
+
+
+ {'Expand all albums'|translate}
+
+
+
+
+
+ {'Show number of comments'|translate}
+
+
+
+
+
+ {'Show number of hits'|translate}
+
+
+
+
-
-
- {'Update'|@translate}
- {'Close'|@translate}
- {'User updated'|@translate}
-
-
-
-
-
+
{'Close'|@translate}
+
+ {'User updated'|@translate}
+
+ {'Update'|@translate}
+
-
-
-
-
{'Preferences'|translate}
-
-
{'Photos per page'|translate}
-
-
-
-
-
-
{'Theme'|@translate}
-
-
-
-
-
-
{'Language'|@translate}
-
-
-
-
-
{'Recent period'|translate}
-
-
-
-
-
-
-
- {'Expand all albums'|translate}
-
-
-
-
-
- {'Show number of comments'|translate}
-
-
-
-
-
- {'Show number of hits'|translate}
-
-
@@ -1033,6 +1197,19 @@ $(document).ready(function() {
display:none;
}
+#the_king {
+ color: #F4AB4F;
+ margin-left: 5px;
+}
+
+.can-change:hover {
+ cursor: pointer;
+}
+
+.cannot-change:hover {
+ cursor: default;
+}
+
/* selection mode */
.user-selection-content {
@@ -1187,8 +1364,7 @@ $(document).ready(function() {
}
.user-container-username span {
- max-width: 100%;
-
+ max-width: 100px;
overflow: hidden;
text-overflow: ellipsis;
}
@@ -1372,15 +1548,17 @@ $(document).ready(function() {
top: 50%;
transform:translate(-50%, -48%);
text-align:left;
- padding:20px;
+ padding:30px;
display:flex;
- width:840px
+ width:745px;
+ height: 630px;
}
.summary-properties-update-container {
height:100%;
display:flex;
- flex-direction:column
+ flex-direction:column;
+ width: 100%;
}
.summary-properties-container {
@@ -1389,32 +1567,54 @@ $(document).ready(function() {
}
.summary-container {
- width:250px;
+ width:35%;
display:flex;
flex-direction:column;
align-items:center;
- padding:5px;
- padding-right:20px;
+ padding-right:30px;
}
-.properties-container {
- width:250px;
- padding: 0 20px
+.edit-user-tab,
+.guest-edit-user-tab {
+ width: 65%;
+ padding-left: 30px;
+ overflow-x: auto;
}
-.UserListPopInContainer .update-container {
- padding-right:20px;
- padding-top:30px;
+.edit-user-slides,
+.guest-edit-user-slides {
+ display: flex;
+ overflow-x: auto;
+ scroll-snap-type: x mandatory;
+ scroll-behavior: smooth;
+ -webkit-overflow-scrolling: touch;
+ scrollbar-width: none;
+ -ms-overflow-style: none;
}
+.edit-user-slides::-webkit-scrollbar,
+.guest-edit-user-slides::-webkit-scrollbar {
+ display: none;
+}
+
+.edit-user-slides > div,
+.guest-edit-user-slides > div {
+ scroll-snap-align: start;
+ flex-shrink: 0;
+ transform-origin: center center;
+ transform: scale(1);
+ transition: transform 0.5s;
+ position: relative;
+ width: 100%;
+ margin-right: 5px;
+ margin-top: 20px;
+}
+
+.UserListPopInContainer .update-container,
.GuestUserListPopInContainer .update-container {
- padding-right:20px;
- padding-top:20px;
-}
-
-.preferences-container {
- width:250px;
- padding-left:20px;
+ display: flex;
+ justify-content: space-between;
+ padding-top:20px;
}
/* general pop in rules */
@@ -1428,6 +1628,124 @@ $(document).ready(function() {
margin:0;
}
+.edit-user-tab-title {
+ display: flex;
+ /* justify-content: space-between; */
+ gap: 30px;
+ font-weight: bold;
+ font-size: 14px;
+}
+
+.guest-edit-user-tab-title {
+ display: flex;
+ gap: 40px;
+ font-weight: bold;
+ font-size: 14px;
+}
+
+.edit-user-tab-title .edit-user-tabsheet,
+.guest-edit-user-tab-title .guest-edit-user-tabsheet {
+ padding-bottom: 5px;
+ margin: 0;
+ border-bottom: solid 4px transparent;
+ transition: border-bottom 0.4s;
+ transition: color 0.3s;
+ text-decoration: none;
+}
+.edit-user-tab-title p:hover,
+.guest-edit-user-tab-title p:hover {
+ cursor: pointer;
+}
+
+.tab-with-plugin {
+ max-width: 100px;
+ white-space: nowrap;
+ overflow: hidden;
+ text-overflow: ellipsis;
+}
+
+.mores-plugins {
+ cursor: pointer;
+ position: relative;
+ padding: 5px 10px;
+}
+
+.mores-plugins::after {
+ content: "";
+ position: absolute;
+ top: 45%;
+ left: 50%;
+ transform: translate(-50%, -50%);
+ background-color: #f0f0f0;
+ width: 0px;
+ height: 0px;
+ border-radius: 100%;
+ transition: ease-in-out 0.2s;
+ z-index: 0;
+ opacity: 0;
+ z-index: -1;
+}
+
+.mores-plugins:hover::after {
+ width: 35px;
+ height: 35px;
+ opacity: 1;
+}
+
+.dropdown-mores-plugins {
+ display: none;
+ position: absolute;
+ width: 150px;
+ z-index: 1;
+ top: 65px;
+ right: 20px;
+ background: linear-gradient(130deg, #ff7700 0%, #ffa744 100%);
+ color: white;
+ border-radius: 10px;
+}
+
+.dropdown-mores-plugins::after {
+ content: " ";
+ position: absolute;
+ bottom: 99%;
+ left: 78%;
+ border-width: 5px;
+ border-style: solid;
+ border-color: transparent transparent #ff952a transparent;
+}
+
+#dropdown_mores_plugins_content {
+ display: flex;
+ flex-direction: column;
+ align-items: flex-start;
+}
+
+#dropdown_mores_plugins .selected,
+#dropdown_mores_plugins .edit-user-tabsheet {
+ border-bottom: unset !important;
+}
+
+#dropdown_mores_plugins .edit-user-tabsheet {
+ padding: 5px 0;
+ font-size: 13px;
+ color: white;
+}
+
+#dropdown_mores_plugins .edit-user-tabsheet::before {
+ content : "\002022";
+ padding: 0 5px;
+ opacity: 0;
+ transition: opacity 0.05s, padding 0.05s;
+}
+
+#dropdown_mores_plugins .edit-user-tabsheet.selected::before {
+ padding: 0 10px;
+ opacity: 1;
+}
+
+#dropdown_mores_plugins .edit-user-tabsheet:hover {
+ background-color: #00000012;
+}
.user-property-label {
color:#A4A4A4;
@@ -1443,6 +1761,32 @@ $(document).ready(function() {
margin-left: 5px;
}
+.user-property-input-icon {
+ display: flex;
+ align-items: center;
+ padding: 5px;
+ color: #353535;
+ background-color: #F3F3F3;
+}
+
+.user-property-input-icon .icon-show-password {
+ font-size: 20px;
+ cursor: pointer;
+}
+
+.user-property-input-icon .icon-show-password:hover {
+ color:#ffa646;
+}
+
+.user-property-input-icon .user-property-input {
+ background-color: transparent;
+ padding: 0 0 0 5px !important;
+ font-size: 16px;
+}
+
+.user-property-input-icon .user-property-input:hover {
+ background-color: transparent;
+}
.user-property-input {
width: 100%;
@@ -1460,9 +1804,19 @@ $(document).ready(function() {
margin-top:0;
font-size:1.1em;
margin-bottom:15px;
- cursor:pointer;
- padding:8px;
+ cursor: ;
border:none;
+ margin-right: 0;
+ font-weight: normal;
+}
+
+.button-edit-password-icon {
+ cursor: pointer;
+}
+
+.user-property-password .user-property-button {
+ display: flex;
+ align-items: center;
}
.user-property-select {
@@ -1474,13 +1828,9 @@ $(document).ready(function() {
font-size:1.1em;
}
-.user-property-select-container {
- margin-bottom: 15px;
-}
-
.user-property-select-container::before {
margin-top: 10px;
- margin-left: 220px;
+ margin-left: 418px;
}
.user-action-select-container {
@@ -1502,65 +1852,290 @@ $(document).ready(function() {
.user-list-checkbox-label {
margin-left: 5px;
vertical-align:top;
- font-size:1em;
+ font-size:14px;
cursor:pointer;
}
/* summary section */
+.edit-user-icons {
+ width: 100%;
+ display: flex;
+ justify-content: space-between;
+}
+
+.edit-user-icons span::before{
+ font-size: 16px;
+}
+
+.delete-user-button {
+ cursor: pointer;
+}
+
.user-property-initials {
- margin-bottom: 40px;
+ margin-bottom: 20px;
}
.user-property-initials i {
margin-left: 5px;
}
-.user-property-initials > div {
- padding-left:10px;
-}
-
.user-property-initials span{
border-radius:50%;
padding:5px;
- width:100px;
- height:100px;
+ width:83px;
+ height:83px;
display:inline-block;
text-align:center;
font-size:4em;
- line-height:1.9em;
+ line-height:83px;
font-weight:bold;
}
.user-property-username {
font-weight:bold;
- margin-bottom:34px;
+ margin-bottom:45px;
height:30px;
+ display: flex;
+ gap: 5px;
+ max-width: 250px;
}
.user-property-username-change {
- justify-content:center;
- align-items:center;
- display:none;
- margin-bottom:25px;
+ display: none;
+ position: fixed;
+ z-index: 100;
+ left: 0;
+ top: 0;
+ width: 100%;
+ height: 100%;
+ overflow: auto;
+ background-color: rgba(0,0,0,0.7);
}
-.user-property-password-change {
- display:none;
+.user-property-username-change-content {
+ display: block;
+ position: absolute;
+ left: 50%;
+ top: 50%;
+ transform: translate(-50%, -48%);
+ text-align: left;
+ padding: 40px;
+ border-radius: 10px;
+ width: 280px;
+}
+
+.user-property-username-change-content .group-button,
+.user-property-password-change-content .group-button {
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+}
+
+.user-property-username-change-content .summary-input-container {
+ width: 100%;
+ margin-bottom: 35px;
+}
+
+.user-property-password .icon-edit-pass {
+ margin-left: auto;
+ padding: 10px;
+ background-color: #ffa744;
+ color: #3c3c3c;
+}
+
+.user-property-password .icon-edit-pass:hover {
+ background-color: #ff7700;
+}
+
+.user-property-password-change,
+.user-property-main-user-change {
+ display: none;
+ position: fixed;
+ z-index: 100;
+ left: 0;
+ top: 0;
+ width: 100%;
+ height: 100%;
+ overflow: auto;
+ background-color: rgba(0,0,0,0.7);
+}
+
+.user-property-password-change-content {
+ position: absolute;
+ left: 50%;
+ top: 50%;
+ transform: translate(-50%, -48%);
+ text-align: left;
+ padding: 40px 40px 40px 40px;
+ border-radius: 10px;
+ width: 280px;
+}
+
+.user-property-password-change-content .summary-input-container {
+ width: 100%;
+}
+
+.user-property-password-choice .head-button-2 {
+ display: block;
+ text-align: center;
+ margin-right: 0;
margin-bottom: 20px;
}
+.user-property-password-choice .edit-password-cancel {
+ text-align: center;
+ margin: 0;
+}
+
+.edit-password-success,
+.edit-username-success {
+ display: flex;
+ flex-direction: column;
+}
+
+.edit-password-success {
+ padding-top: 30px;
+}
+
+.edit-password-success .edit-password-success-input {
+ background-color: transparent;
+ font-size: 15px;
+ border: none;
+ flex: auto;
+ padding: 0 5px;
+}
+
+.edit-password-success .edit-password-success-reset-link {
+ display: flex;
+ align-items: center;
+ width: 100%;
+ margin: 10px 0;
+ background-color: #F3F3F3;
+}
+
+.edit-password-success .edit-password-success-reset-link span {
+ padding: 5px;
+ cursor: pointer;
+}
+
+.edit-password-success .edit-password-success-reset-link span:hover {
+ color: #ffffff;
+ background-color: #ff7700;
+}
+
+#result_send_mail_copy {
+ margin-bottom: 0px;
+}
+
+#edit_password_result_mail_copy {
+ padding-top: 0px;
+}
+
+.update-password-success,
+.update-password-fail,
+.update-main-user-success {
+ padding: 10px;
+ font-weight: bold;
+ margin-bottom: 20px;
+}
+
+#result_send_mail {
+ display: flex;
+ align-items: center;
+ gap: 10px;
+ margin-bottom: 10px;
+}
+
+#edit_password_result_mail {
+ padding-top: 20px;
+}
+
+.update-username-success {
+ display: flex;
+ padding: 10px;
+ font-weight: bold;
+ margin-bottom: 20px;
+ align-items: center;
+ gap: 10px;
+}
+
+.edit-password-success-ok {
+ align-self: center;
+ margin-top: 30px;
+}
+
+.edit-username-success-ok {
+ align-self: center;
+}
+
+.edit-password-success-ok .icon-button,
+.edit-username-success-ok .icon-button,
+.user-property-main-user-close .icon-button {
+ padding: 10px 20px;
+ font-size: 1.1em;
+ font-weight: bold;
+ cursor: pointer;
+ background-color: #E8E8E8;
+ color: #777;
+}
+
+.edit-password-success-ok .icon-button:hover,
+.edit-username-success-ok .icon-button:hover,
+.user-property-main-user-close .icon-button:hover {
+ background-color: #ddd;
+ color: #3A3A3A;
+}
+
+.edit-password-success-ok .icon-button::before,
+.edit-username-success-ok .icon-button::before,
+.user-property-main-user-close .icon-button::before {
+ margin-left: 0;
+}
+
+.button-copy-pass {
+ margin: auto;
+ color: #777;
+ font-weight: bold;
+}
+
+.EditUserGenPassword {
+ margin-top: 15px;
+ font-size: 1.1em;
+ cursor:pointer;
+}
+.EditUserGenPassword:hover, .EditUserGenPassword:active {
+ color:#ffa646;
+}
+
+.EditUserGenPassword span {
+ margin-right:10px;
+}
+
+.EditUserErrors {
+ opacity: 0;
+ padding: 7px 0;
+ border-left: solid 3px red;
+ margin: 10px 0;
+ font-weight: bold;
+}
+
.summary-input-container {
width:171px;
display:inline-block;
}
.edit-username {
- font-size:1.4em;
+ font-size:1.2em;
cursor:pointer;
+ color: #ffa744;
}
.edit-username-title {
font-size:1.4em;
+ width: auto;
+ max-width: 200px;
+ overflow-x: hidden;
+ text-overflow: ellipsis;
}
.edit-username-specifier {
@@ -1568,8 +2143,8 @@ $(document).ready(function() {
color:#A4A4A4;
}
-.user-property-input.user-property-input-username {
- border: solid 2px #ffa744;
+.user-property-input.user-property-input-username,
+.user-property-input.user-property-input-password {
padding: 9px;
}
@@ -1583,13 +2158,12 @@ $(document).ready(function() {
.edit-username-validate,
.edit-password-validate {
display: block;
- margin: auto 5px;
cursor: pointer;
background-color: #ffa744;
color: #3c3c3c;
- font-size: 17px;
+ font-size: 1.1em;
font-weight: 700;
- padding: 7px;
+ padding: 10px 20px;
}
.edit-username-validate:hover,
@@ -1600,52 +2174,169 @@ $(document).ready(function() {
}
.edit-username-cancel,
-.edit-password-cancel {
+.edit-password-cancel,
+.user-property-main-user-cancel {
cursor:pointer;
- font-size:22px;
- padding-top: 4px;
+ font-size:1.1em;
}
.edit-username-cancel:hover,
-.edit-password-cancel:hover {
- color: #ff7700;
-}
-
-.user-property-input.user-property-input-password {
- border: solid 2px #ffa744;
- padding: 9px;
+.edit-password-cancel:hover,
+.user-property-main-user-cancel:hover {
+ color: #000;
}
.user-property-register-visit {
+ width: 100%;
color:#A4A4A4;
- font-weight:bold;
- font-size:1.2em;
+ font-size:1.1em;
display:flex;
align-items: first baseline;
- justify-content:center;
+ text-align: center;
+ margin-top: auto;
+ margin-bottom: 15px;
+ justify-content: space-between;
}
.user-property-register-visit span {
margin:0;
}
+.user-property-register-visit div {
+ display: flex;
+ flex-direction: column;
+}
+
+.user-property-register,
+.user-property-last-visit, {
+ font-size: 11px !important;
+}
.user-property-register, .user-property-last-visit {
min-width: 80px;
+}
+
+.edit-user-register-label,
+.edit-user-lastvisit-label {
+ font-weight: 600;
+}
+
+.user-property-main-user-content {
+ position: absolute;
+ left: 50%;
+ top: 50%;
+ transform: translate(-50%, -50%);
+ text-align: left;
+ padding: 30px;
+ border-radius: 10px;
+ width: 300px;
+ display: flex;
+ flex-direction: column;
+}
+
+.user-property-main-user-content-header {
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+ gap: 5px;
+}
+
+.user-property-main-user-content-header .main-user-icon {
+ border-radius: 50%;
+ width: 40px;
+ height: 40px;
+ display: flex;
+ font-size: 15px;
+ justify-content: center;
+ align-items: center;
+ align-self: center;
+ background-color: #FFECF0;
+ color: #FF0155;
+}
+
+.user-property-main-user-content-header .main-user-icon::before {
+ margin-left: .1em;
+}
+
+.user-property-main-user-content-header .main-user-title {
+ font-weight: 700;
font-size: 14px;
}
-.user-property-register-visit .icon-calendar {
- margin:0 4px 0 0;
- font-size: 20px;
+.user-property-main-user-body .main-user-proceed,
+.user-property-main-user-body .main-user-rewrite,
+.user-property-main-user-body .main-user-validate,
+.user-property-main-user-body .main-user-success {
+ display: flex;
+ flex-direction: column;
+}
+
+.user-property-main-user-body .main-user-proceed-footer,
+.user-property-main-user-body .main-user-validate-footer {
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+}
+
+.user-property-main-user-body .main-user-rewrite-footer {
+ display: flex;
+}
+
+.user-property-main-user-body .main-user-rewrite-footer input {
+ width: 100%;
+}
+
+.user-property-main-user-body .main-user-rewrite-footer span {
+ background-color: transparent !important;
+}
+
+.user-property-main-user-body .main-user-proceed-desc,
+.user-property-main-user-body .main-user-rewrite-desc,
+.user-property-main-user-body .main-user-validate-desc,
+.user-property-main-user-body .update-main-user-success {
+ margin: 20px 0;
+}
+
+.user-property-main-user-body .main-user-btn-proceed {
+ margin-right: 0;
+}
+
+.user-property-main-user-body .user-property-main-user-close {
+ margin-top: 10px;
+ align-self: center;
}
/* properties */
-.user-property-group-container {
- margin-bottom:20px;
+.properties-container {
+ display: flex;
+ flex-direction: column;
+ gap: 25px;
+ /* margin-top: 25px; */
}
+.properties-container p {
+ margin: 0 0 5px 0;
+}
+
+.properties-container .user-list-checkbox {
+ display: flex;
+ align-items: center;
+ gap: 5px;
+}
+
+.properties-container .select-checkbox {
+ width: 25px;
+ height: 25px;
+}
+
+.properties-container .select-checkbox i {
+ font-size: 22px;
+}
+
+.user-property-group-text {
+ font-size: 11px;
+}
.user-property-select > .selectize-input.items {
padding:0;
@@ -1655,9 +2346,39 @@ $(document).ready(function() {
border:none;
}
+.user-property-group-container .selectize-input {
+ height: 70px !important;
+}
+
/* preferences */
+.preferencies-container {
+ display: flex;
+ flex-direction: column;
+ gap: 30px;
+}
+
+.preferencies-container p {
+ margin: 0 0 5px 0;
+}
+
+.preferences-container {
+ display: flex;
+ flex-direction: column;
+ gap: 10px;
+}
+
+.preferences-container .user-property-label.period-select-bar {
+ margin: 15px 0;
+}
+
+.user-group-checkbox {
+ display: flex;
+ flex-direction: column;
+ padding-top: 10px;
+}
+
.nb-img-page-infos {
color:#353535;
font-weight:normal;
@@ -1672,20 +2393,35 @@ $(document).ready(function() {
font-weight:normal;
}
+/* plugins tabsheet */
+.edit-user-tabsheet-plugins {
+ width: 435px !important;
+ height: 480px !important;
+ margin-right: 15px !important;
+ margin-top: 29px !important;
+}
+/* for firefox */
+@-moz-document url-prefix() {
+ .edit-user-tabsheet-plugins {
+ margin-top: 25px !important;
+ }
+}
+
/* update */
-.update-user-button {
+.update-user-button,
+.user-property-main-user-body .main-user-btn-validate {
cursor:pointer;
color:#353535;
padding:10px 20px;
font-size:1.1em;
font-weight:bold;
-
background-color: #ffa744;
color: #3c3c3c;
}
-.update-user-button:hover {
+.update-user-button:hover,
+.user-property-main-user-body .main-user-btn-rewrite:hover {
background-color: #ff7700;
}
@@ -1697,16 +2433,13 @@ $(document).ready(function() {
.close-update-button {
cursor: pointer;
color: #A4A4A4;
- padding:10px 20px;
+ padding:10px 0;
font-size:1.1em;
font-weight:bold;
+ align-self: center;
}
-
-.delete-user-button {
- cursor:pointer;
- padding:10px 20px;
- font-size:1.1em;
- font-weight:bold;
+.close-update-button.icon-cancel-circled::before {
+ margin-left: 0;
}
.update-user-success {
@@ -1744,10 +2477,10 @@ $(document).ready(function() {
top: 50%;
transform:translate(-50%, -48%);
text-align:left;
- display:flex;
background-color:white;
- padding:20px;
- width:840px;
+ padding:30px;
+ width:745px;
+ height: 630px;
flex-direction:column;
border-radius:15px;
}
@@ -2016,6 +2749,7 @@ Advanced filter
.slider-bar-wrapper {
margin-top: 12px;
+ margin-bottom: 0;
}
.advanced-filter-date {
diff --git a/admin/themes/default/theme.css b/admin/themes/default/theme.css
index 6be075c45..b358f781c 100644
--- a/admin/themes/default/theme.css
+++ b/admin/themes/default/theme.css
@@ -5617,7 +5617,7 @@ input:checked + .slider:before, input:checked + .slider::after {
position: relative;
}
-.AddUserErrors, .update-user-fail, .AddAlbumErrors {
+.AddUserErrors, .update-user-fail, .AddAlbumErrors, .EditUserErrors, .update-password-fail {
background-color: #ffcfcf;
color: #ff5252;
border-left:solid 3px red;
@@ -5632,7 +5632,9 @@ input:checked + .slider:before, input:checked + .slider::after {
border-left: 2px solid #00FF00;
color: #0a0;
}
-.update-user-success {
+.update-user-success,
+.update-password-success,
+.update-username-success {
border-left: 2px solid #00FF00;
}
#UserList .AddUserBlock p,
@@ -6588,19 +6590,53 @@ color:#FF7B00;
color: #4c4c4c
}
-.delete-user-button {
- color:#353535;
- background-color: #F3F3F3;
-}
-
.slider-bar-wrapper .ui-slider-horizontal{
background-color:#e3e3e3;
}
-.preferences-container, .properties-container {
+.edit-user-tab,
+.guest-edit-user-tab {
border-left: solid 1px #ddd;
}
+.edit-user-tab-title,
+.guest-edit-user-tab-title {
+ border-bottom: solid 1px #ddd;
+}
+
+.edit-user-tab-title .selected,
+.edit-user-tab-title .selected:hover,
+.guest-edit-user-tab-title .selected,
+.guest-edit-user-tab-title .selected:hover {
+ color: #323232;
+ border-bottom: solid 4px #323232 !important;
+}
+
+.edit-user-tab-title p:hover,
+.guest-edit-user-tab-title p:hover {
+ border-color: #ddd;
+}
+
+.edit-user-icons .delete-user-button::before,
+.princes-of-this-piwigo {
+ color: #777777;
+}
+
+.edit-user-icons .icon-trash-1:hover::before,
+.king-of-this-piwigo {
+ color: #ffa646;
+}
+
+.royal-court-of-this-piwigo {
+ color: #dbdbdb;
+}
+
+.user-property-username-change-content,
+.user-property-password-change-content,
+.user-property-main-user-content {
+ background-color: white;
+}
+
.update-container {
border-top:solid 1px #ddd;
}
@@ -6612,6 +6648,11 @@ color:#FF7B00;
background-color: #f0f0f0;
}
+.password-choice-content .unavailable,
+.password-choice-content .unavailable:hover {
+ color:#CBCBCB !important;
+}
+
/* Activity Tab in user manager */
.select-user {
diff --git a/admin/themes/roma/theme.css b/admin/themes/roma/theme.css
index 17f3b921e..bbb6eb348 100644
--- a/admin/themes/roma/theme.css
+++ b/admin/themes/roma/theme.css
@@ -998,7 +998,8 @@ li.plupload_delete a:hover {background: url("images/cancelhover.svg")!important;
}
.cat-modify-actions a::after,
-.cat-modify-actions .toggle-comment-option::after {
+.cat-modify-actions .toggle-comment-option::after,
+.mores-plugins::after {
background: #111 !important;
}
@@ -1650,11 +1651,6 @@ li.plupload_delete a:hover {background: url("images/cancelhover.svg")!important;
color: #c1c1c1
}
-.delete-user-button {
- color:#c1c1c1;
- background-color: #333;
-}
-
.slider-bar-wrapper .ui-slider-horizontal{
background-color:#666;
}
@@ -1664,10 +1660,71 @@ li.plupload_delete a:hover {background: url("images/cancelhover.svg")!important;
border: 1px solid #ffa500;
}
-.preferences-container, .properties-container {
+.edit-user-tab,
+.guest-edit-user-tab {
border-left: solid 1px #333;
}
+.edit-user-tab-title,
+.guest-edit-user-tab-title {
+ border-bottom: solid 1px #333;
+}
+
+.edit-user-tab-title .selected,
+.edit-user-tab-title .selected:hover,
+.guest-edit-user-tab-title .selected,
+.guest-edit-user-tab-title:hover .selected{
+ color: #c1c1c1;
+ border-bottom: solid 4px #c1c1c1 !important;
+}
+
+.edit-user-tab-title p:hover,
+.guest-edit-user-tab-title p:hover {
+ border-color: #323232;
+}
+
+.edit-user-icons .delete-user-button::before,
+.princes-of-this-piwigo {
+ color: #c1c1c1;
+}
+
+.edit-user-icons .icon-trash-1:hover::before,
+.king-of-this-piwigo {
+ color: #f70;
+}
+
+.royal-court-of-this-piwigo {
+ color: #777;
+}
+
+.user-property-username-change-content,
+.user-property-password-change-content,
+.user-property-main-user-content {
+ background-color: #444;
+}
+
+.edit-password-success-reset-link,
+.user-property-input-icon {
+ background-color: #505050 !important;
+ color: #999 !important;
+}
+
+.edit-password-success-ok .icon-button,
+.user-property-main-user-close .icon-button {
+ background-color: #333 !important;
+}
+
+.edit-password-success-ok .icon-button:hover,
+.user-property-main-user-close .icon-button:hover {
+ color: #c1c1c1 !important;
+}
+
+.main-user-proceed,
+.main-user-rewrite,
+.main-user-validate {
+ color: #A4A4A4 !important;
+}
+
.update-container {
border-top:solid 1px #333;
}
@@ -1679,6 +1736,16 @@ li.plupload_delete a:hover {background: url("images/cancelhover.svg")!important;
background-color: #333;
}
+.password-choice-content .unavailable,
+.password-choice-content .unavailable:hover {
+ color:#777 !important;
+}
+
+.password-choice-content .head-button-2,
+.password-choice-content .head-button-2:hover {
+ color: #CBCBCB;
+}
+
.lineView .user-container-initials-wrapper > span {
height: 31px!important;
width: 31px!important;
@@ -1801,7 +1868,7 @@ li.plupload_delete a:hover {background: url("images/cancelhover.svg")!important;
background-color: #343434;
}
-.AddUserErrors, .update-user-fail {
+.AddUserErrors, .update-user-fail, .EditUserErrors, .update-password-fail {
background-color: #f22;;
color: #ffd5dc;
border-left:solid 3px #f22;
@@ -1834,7 +1901,9 @@ li.plupload_delete a:hover {background: url("images/cancelhover.svg")!important;
color: #a9f6e3;
}
-.update-user-success {
+.update-user-success,
+.update-password-success,
+.update-username-success {
border-left: 2px solid #a9f6e3;
}
diff --git a/admin/user_list.php b/admin/user_list.php
index 069f8e1a7..8d814aac9 100644
--- a/admin/user_list.php
+++ b/admin/user_list.php
@@ -100,6 +100,15 @@ SELECT
$password_protected_users = array_merge($password_protected_users, array_diff($admin_ids, array($user['id'])));
}
+$query = '
+SELECT
+ username
+ FROM '.USERS_TABLE.'
+ WHERE id = '.$conf['webmaster_id'].'
+;';
+
+$owner_username = query2array($query, null, 'username');
+
$template->assign(
array(
'U_HISTORY' => get_root_url().'admin.php?page=history&filter_user_id=',
@@ -117,7 +126,8 @@ $template->assign(
'filter_group' => (isset($_GET['group']) ? $_GET['group'] : null),
'connected_user' => $user["id"],
'connected_user_status' => $user['status'],
- 'owner' => $conf['webmaster_id']
+ 'owner' => $conf['webmaster_id'],
+ 'owner_username' => $owner_username[0]
)
);
@@ -184,6 +194,23 @@ else
//Show 10 users by default
$template->assign('pagination', userprefs_get_param('user-manager-pagination', 10));
}
+
+function webmaster_id_is_local()
+{
+ $conf = array();
+ include(PHPWG_ROOT_PATH . 'include/config_default.inc.php');
+ @include(PHPWG_ROOT_PATH. 'local/config/config.inc.php');
+ if (isset($conf['local_dir_site']))
+ {
+ @include(PHPWG_ROOT_PATH.PWG_LOCAL_DIR. 'config/config.inc.php');
+ }
+ return $conf['webmaster_id'] ?? false;
+}
+
+if (webmaster_id_is_local())
+{
+ $page['warnings'][] = l10n('You have specified
$conf[\'webmaster_id\'] in your local configuration file, this parameter in deprecated, please remove it!');
+}
// +-----------------------------------------------------------------------+
// | html code display |
// +-----------------------------------------------------------------------+
diff --git a/include/config_default.inc.php b/include/config_default.inc.php
index ebe5ac129..8e68214a7 100644
--- a/include/config_default.inc.php
+++ b/include/config_default.inc.php
@@ -579,9 +579,6 @@ $conf['default_user_id'] = $conf['guest_id'];
// if language isn't available PHPWG_DEFAULT_LANGUAGE is used as previously
$conf['browser_language'] = true;
-// webmaster_id : webmaster'id.
-$conf['webmaster_id'] = 1;
-
// does the guest have access ?
// (not a security feature, set your categories "private" too)
// If false it'll be redirected from index.php to identification.php
diff --git a/include/functions_mail.inc.php b/include/functions_mail.inc.php
index fe5859ebb..edd7bda95 100644
--- a/include/functions_mail.inc.php
+++ b/include/functions_mail.inc.php
@@ -1004,6 +1004,43 @@ function pwg_send_mail_test($success, $mail, $args)
}
}
+/**
+ * Generate content mail for reset password
+ *
+ * Return the content mail to send
+ * @since 15
+ * @param string $username
+ * @param string $reset_password_link
+ * @param string $gallery_title
+ * @return string mail content
+ */
+function pwg_generate_reset_password_mail($username, $reset_password_link, $gallery_title)
+{
+ set_make_full_url();
+
+ $message = l10n('Someone requested that the password be reset for the following user account:') . "\r\n\r\n";
+ $message.= l10n(
+ 'Username "%s" on gallery %s',
+ $username,
+ get_gallery_home_url()
+ );
+ $message.= "\r\n\r\n";
+ $message.= l10n('To reset your password, visit the following address:') . "\r\n";
+ $message.= $reset_password_link;
+ $message.= "\r\n\r\n";
+ $message.= l10n('If this was a mistake, just ignore this email and nothing will happen.')."\r\n";
+
+ unset_make_full_url();
+
+ $message = trigger_change('render_lost_password_mail_content', $message);
+
+ return array(
+ 'subject' => '['.$gallery_title.'] '.l10n('Password Reset'),
+ 'content' => $message,
+ 'email_format' => 'text/plain',
+ );
+}
+
trigger_notify('functions_mail_included');
?>
diff --git a/include/functions_user.inc.php b/include/functions_user.inc.php
index 5fab17c57..d4f1bf9ee 100644
--- a/include/functions_user.inc.php
+++ b/include/functions_user.inc.php
@@ -1733,6 +1733,41 @@ function deactivate_password_reset_key($user_id)
);
}
+/**
+ * Generate reset password link
+ *
+ * @since 15
+ * @param int $user_id
+ * @param string $user_email
+ * @return array activation_key and reset password link
+ */
+function generate_reset_password_link($user_id)
+{
+ $activation_key = generate_key(20);
+
+ list($expire) = pwg_db_fetch_row(pwg_query('SELECT ADDDATE(NOW(), INTERVAL 1 HOUR)'));
+
+ single_update(
+ USER_INFOS_TABLE,
+ array(
+ 'activation_key' => pwg_password_hash($activation_key),
+ 'activation_key_expire' => $expire,
+ ),
+ array('user_id' => $user_id)
+ );
+
+ set_make_full_url();
+
+ $reset_password_link = get_root_url().'password.php?key='.$activation_key;
+
+ unset_make_full_url();
+
+ return array(
+ 'activation_key' => $activation_key,
+ 'reset_password_link' => $reset_password_link,
+ );
+}
+
/**
* Gets the last visit (datetime) of a user, based on history table
*
diff --git a/include/ws_functions/pwg.users.php b/include/ws_functions/pwg.users.php
index f1afdabf0..2c9c38822 100644
--- a/include/ws_functions/pwg.users.php
+++ b/include/ws_functions/pwg.users.php
@@ -961,4 +961,108 @@ SELECT
);
}
+/**
+ * API method
+ * Returns the reset password link of the current user
+ * @since 15
+ * @param mixed[] $params
+ * @option int user_id
+ * @option string pwg_token
+ * @option boolean send_by_mail
+ */
+function ws_users_generate_reset_password_link($params, &$service)
+{
+ global $user, $conf;
+ include_once(PHPWG_ROOT_PATH.'admin/include/functions.php');
+ include_once(PHPWG_ROOT_PATH.'include/functions_mail.inc.php');
+
+ if (get_pwg_token() != $params['pwg_token'])
+ {
+ return new PwgError(403, 'Invalid security token');
+ }
+
+ // check if user exist
+ if (get_username($params['user_id']) === false)
+ {
+ return new PwgError(WS_ERR_INVALID_PARAM, 'This user does not exist.');
+ }
+
+ $user_lost = getuserdata($params['user_id']);
+
+ // Cannot perform this action for a guest or generic user
+ if (is_a_guest($user_lost['status']) or is_generic($user_lost['status']))
+ {
+ return new PwgError(403, 'Password reset is not allowed for this user');
+ }
+
+ // Only webmaster can perform this action for another webmaster
+ if ('admin' === $user['status'] && 'webmaster' === $user_lost['status'])
+ {
+ return new PwgError(403, 'You cannot perform this action');
+ }
+
+ $generate_link = generate_reset_password_link($params['user_id']);
+ $send_by_mail_response = null;
+
+ if ($params['send_by_mail'] and !empty($user_lost['email']))
+ {
+ $email_params = pwg_generate_reset_password_mail($user_lost['username'], $generate_link['reset_password_link'], $conf['gallery_title']);
+ // Here we remove the display of errors because they prevent the response from being parsed
+ if (@pwg_mail($user_lost['email'], $email_params))
+ {
+ $send_by_mail_response = 'Mail sent at : ' . $user_lost['email'];
+ }
+ else
+ {
+ $send_by_mail_response = false;
+ }
+ }
+
+ return array(
+ 'generated_link' => $generate_link['reset_password_link'],
+ 'send_by_mail' => $send_by_mail_response,
+ );
+}
+
+/**
+ * API method
+ * Set a user as the main user
+ * @since 15
+ * @param mixed[] $params
+ * @option int user_id
+ * @option string pwg_token
+ */
+function ws_set_main_user($params, &$service)
+{
+ include_once(PHPWG_ROOT_PATH.'admin/include/functions.php');
+
+ // check if not webmaster
+ if (!is_webmaster())
+ {
+ return new PwgError(403, 'You cannot perform this action');
+ }
+
+ //check pwg_token
+ if (get_pwg_token() != $params['pwg_token'])
+ {
+ return new PwgError(403, 'Invalid security token');
+ }
+
+ // checl if user exist
+ if (get_username($params['user_id']) === false)
+ {
+ return new PwgError(WS_ERR_INVALID_PARAM, 'This user does not exist.');
+ }
+
+ $new_main_user = getuserdata($params['user_id']);
+
+ // check if the user to set as main user is not webmaster
+ if ('webmaster' !== $new_main_user['status'])
+ {
+ return new PwgError(403, 'This user cannot become a main user because he is not a webmaster.');
+ }
+
+ conf_update_param('webmaster_id', $params['user_id']);
+ return 'The main user has been changed.';
+}
?>
diff --git a/install.php b/install.php
index 0fac49ed0..5b34727d6 100644
--- a/install.php
+++ b/install.php
@@ -387,7 +387,7 @@ INSERT INTO '.$prefixeTable.'config (param,value,comment)
// webmaster admin user
$inserts = array(
array(
- 'id' => 1,
+ 'id' => 1, // must be the same value as webmaster_id in config.sql
'username' => $admin_name,
'password' => md5($admin_pass1),
'mail_address' => $admin_mail,
diff --git a/install/config.sql b/install/config.sql
index 342a5ec60..86dd06b5c 100644
--- a/install/config.sql
+++ b/install/config.sql
@@ -78,3 +78,4 @@ INSERT INTO piwigo_config (param,value) VALUES ('show_mobile_app_banner_in_galle
INSERT INTO piwigo_config (param,value) VALUES ('index_search_in_set_button','false');
INSERT INTO piwigo_config (param,value) VALUES ('index_search_in_set_action','true');
INSERT INTO piwigo_config (param,value) VALUES ('upload_detect_duplicate','true');
+INSERT INTO piwigo_config (param,value) VALUES ('webmaster_id','1');
diff --git a/install/db/171-database.php b/install/db/171-database.php
new file mode 100644
index 000000000..c58331e57
--- /dev/null
+++ b/install/db/171-database.php
@@ -0,0 +1,22 @@
+
\ No newline at end of file
diff --git a/password.php b/password.php
index 286f0a8d7..ee9262adc 100644
--- a/password.php
+++ b/password.php
@@ -76,44 +76,11 @@ function process_password_request()
return false;
}
- $activation_key = generate_key(20);
-
- list($expire) = pwg_db_fetch_row(pwg_query('SELECT ADDDATE(NOW(), INTERVAL 1 HOUR)'));
-
- single_update(
- USER_INFOS_TABLE,
- array(
- 'activation_key' => pwg_password_hash($activation_key),
- 'activation_key_expire' => $expire,
- ),
- array('user_id' => $user_id)
- );
+ $generate_link = generate_reset_password_link($user_id);
- $userdata['activation_key'] = $activation_key;
+ $userdata['activation_key'] = $generate_link['activation_key'];
- set_make_full_url();
-
- $message = l10n('Someone requested that the password be reset for the following user account:') . "\r\n\r\n";
- $message.= l10n(
- 'Username "%s" on gallery %s',
- $userdata['username'],
- get_gallery_home_url()
- );
- $message.= "\r\n\r\n";
- $message.= l10n('To reset your password, visit the following address:') . "\r\n";
- $message.= get_root_url().'password.php?key='.$activation_key.'-'.urlencode($userdata['email']);
- $message.= "\r\n\r\n";
- $message.= l10n('If this was a mistake, just ignore this email and nothing will happen.')."\r\n";
-
- unset_make_full_url();
-
- $message = trigger_change('render_lost_password_mail_content', $message);
-
- $email_params = array(
- 'subject' => '['.$conf['gallery_title'].'] '.l10n('Password Reset'),
- 'content' => $message,
- 'email_format' => 'text/plain',
- );
+ $email_params = pwg_generate_reset_password_mail($userdata['username'], $generate_link['reset_password_link'], $conf['gallery_title']);
if (pwg_mail($userdata['email'], $email_params))
{
@@ -137,54 +104,27 @@ function check_password_reset_key($reset_key)
{
global $page, $conf;
- list($key, $email) = explode('-', $reset_key, 2);
-
+ $key = $reset_key;
if (!preg_match('/^[a-z0-9]{20}$/i', $key))
{
$page['errors'][] = l10n('Invalid key');
return false;
}
- $user_ids = array();
-
- $query = '
-SELECT
- '.$conf['user_fields']['id'].' AS id
- FROM '.USERS_TABLE.'
- WHERE '.$conf['user_fields']['email'].' = \''.pwg_db_real_escape_string($email).'\'
-;';
- $user_ids = query2array($query, null, 'id');
-
- if (count($user_ids) == 0)
- {
- $page['errors'][] = l10n('Invalid username or email');
- return false;
- }
-
- $user_id = null;
-
$query = '
SELECT
user_id,
status,
- activation_key,
- activation_key_expire,
- NOW() AS dbnow
+ activation_key
FROM '.USER_INFOS_TABLE.'
- WHERE user_id IN ('.implode(',', $user_ids).')
+ WHERE activation_key IS NOT NULL
+ AND activation_key_expire > NOW()
;';
$result = pwg_query($query);
while ($row = pwg_db_fetch_assoc($result))
{
if (pwg_password_verify($key, $row['activation_key']))
{
- if (strtotime($row['dbnow']) > strtotime($row['activation_key_expire']))
- {
- // key has expired
- $page['errors'][] = l10n('Invalid key');
- return false;
- }
-
if (is_a_guest($row['status']) or is_generic($row['status']))
{
$page['errors'][] = l10n('Password reset is not allowed for this user');
@@ -192,6 +132,7 @@ SELECT
}
$user_id = $row['user_id'];
+ break;
}
}
diff --git a/ws.php b/ws.php
index 83d86f80b..3b1ce4437 100644
--- a/ws.php
+++ b/ws.php
@@ -1453,6 +1453,42 @@ enabled_high, registration_date, registration_date_string, registration_date_sin
'',
$ws_functions_root . 'pwg.images.php'
);
+
+ $service->addMethod(
+ 'pwg.users.generateResetPasswordLink',
+ 'ws_users_generate_reset_password_link',
+ array(
+ 'user_id' => array(
+ 'type'=>WS_TYPE_ID
+ ),
+ 'pwg_token' => array(),
+ 'send_by_mail' => array(
+ 'flags' => WS_PARAM_OPTIONAL,
+ 'type' => WS_TYPE_BOOL,
+ 'default' => false,
+ ),
+ ),
+ 'Return the reset password link
+ (Only webmaster can perform this action for another webmaster)',
+ $ws_functions_root . 'pwg.users.php',
+ array('admin_only'=>true)
+ );
+
+ $service->addMethod(
+ 'pwg.users.setMainUser',
+ 'ws_set_main_user',
+ array(
+ 'user_id' => array(
+ 'type'=>WS_TYPE_ID
+ ),
+ 'pwg_token' => array(),
+ ),
+ 'Update the main user (owner)
+ - To be the main user, the user must have the status "webmaster".
+ - Only a webmaster can perform this action',
+ $ws_functions_root . 'pwg.users.php',
+ array('admin_only'=>true, 'post_only'=>true)
+ );
}
?>