- several comments for the language_hook function:
- x_* naming policy for custom texts
- note that custom texts must appear in all blocks
- note that translation fixes should be reported in the bugtracker
git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1177 a1433add-5e2c-0410-b055-b7f2511e0802
- split off $fDomain from ?username= (admin mode)
- basic sanity check for ?username= (admin mode)
- urlencode $fDomain for $Return_url (admin mode)
- don't split off domain from username in users mode (not needed)
- added various TODO notes
- some whitespace fixes near the end of the file (2*3 lines)
list-virtual_mailbox.tpl
- don't include domain in link to vacation.php (no longer needed)
git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1172 a1433add-5e2c-0410-b055-b7f2511e0802
vacation.php
- result of merging edit-vacation.php and users/vacation.php
- vacation.php comes with the svn history of edit-vacation.php
- display "vacation already active" (only) in user mode if vacation is active
(would be useful in admin mode too, but needs a text change)
- various comment updates
- add username in $PALANG[pVacation_result_removed] and
$PALANG[pVacation_result_added] using sprintf
- change compared to Jan Kruis' patch:
- set return url for users to main.php instead of users/main.php
- set return url for admins after setting $fDomain. Otherwise the return url
does not contain the domain.
- removed unused variable $tDomain
users/vacation.php:
- require(../vacation.php)
- remove everything else
- whitespace changes in the license header
- note: this is completely different from Jan Kruis' patch - his intention was
to remove this file and use ../vacation.php. However, with his way all links
in the users menu would point to the wrong place/directory
edit-vacation.php:
- deleted
templates/vacation.tpl
- display username only in admin mode
templates/list-virtual_mailbox.tpl
- link changed to merged vacation.php
languages/en.lang
- add username in $PALANG[pVacation_result_removed] and
$PALANG[pVacation_result_added] as sprintf variable
- (comments added by Jan Kruis' patch are not part of this commit)
languages/nl.lang
- translation updates
- already contains the sprintf variable in $PALANG[pVacation_result_removed]
and $PALANG[pVacation_result_added]
(updates for other *.lang files follow in another commit)
The following parts of Jan Kruis' patch are not part of this commit:
- rejected:
- variables.inc.php: don't add $Admin_role and $Return_url
If we initialize them, it should be done directly in (edit-)vacation.php,
but the current code always sets them already in all cases.
- templates/users_main.tpl: do not change url for vacation.php
- postponed:
- added comments in en.lang about obsolete texts
Most parts of this commit (see exceptions above) were provided as patch
by Jan Kruis (jan-kruis@SF), see
https://sourceforge.net/tracker/?func=detail&aid=3383236&group_id=191583&atid=937966
git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1169 a1433add-5e2c-0410-b055-b7f2511e0802
- removed superfluous white background in some elements (body already
has white background)
images/mail_bg.gif:
- made background transparent instead of white
git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1164 a1433add-5e2c-0410-b055-b7f2511e0802
Prepare merging of edit-vacation.php and users/vacation.php
users/vacation.php, edit-vacation.php:
- first step of merging
- renamed some variables to fit vacation.tpl
- some code sorting and cleanup
- replaced JS redirect on cancel with handling in PHP
users_vacation.tpl, edit-vacation.tpl:
- deleted (merged to vacation.tpl)
vacation.tpl:
- new file, result of merging edit-vacation.tpl and users_vacation.tpl
- display mail address to users also (to be discussed)
Thanks to J.Kruis (jan-kruis@SF) for the patch,
https://sourceforge.net/tracker/?func=detail&aid=3383236&group_id=191583&atid=937966
git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1163 a1433add-5e2c-0410-b055-b7f2511e0802
ADDITIONS/squirrelmail-plugin/**/postfixadmin.po:
- whitespace fix: replace DOS line ends with Linux line ends
(no other changes)
git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1160 a1433add-5e2c-0410-b055-b7f2511e0802
- replace SQL instructions to create a superadmin with a note about setup.php
SECURITY.txt:
- add a note about permissions needed by setup.php
- add note about templates_c directory
git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1157 a1433add-5e2c-0410-b055-b7f2511e0802
edit-alias.tpl:
- merge with create-alias.tpl
- added various {if $mode = ...}
- for edit mode: used "multiple targets" help text right of textarea
(instead of having it under the headline)
- use $fGoto instead of array in textarea
create-alias.tpl
- deleted
edit-alias.php:
- fixed $tGoto to contain unmodified $_POST value on error
- dropped $array smarty variable that was used instead of $tGoto
- added mode = edit smarty variable
- add empty pCreate_alias_address_text_error smarty variable to avoid
"undefined" warning
create-alias.php:
- added mode = create smarty variable
- switched to edit-alias template
*.lang
- marked $PALANG['pCreate_alias_address'] as obsolete
git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1153 a1433add-5e2c-0410-b055-b7f2511e0802
edit-mailbox.php
- report password errors next to the password field instead of flash_error()
- small changes to smarty variables
create-mailbox.php:
- small changes to smarty variables
edit-mailbox.tpl, create-mailbox.tpl:
- merge as good as possible (everything that is still left will probably
need an {if}
- renamed some smarty variables
- use colspan=3 for buttons
*.lang:
- mark pCreate_mailbox_username, pCreate_mailbox_name, pCreate_mailbox_quota,
pCreate_mailbox_quota_text and pEdit_mailbox_name_text as obsolete
- added some "please check" notes for translators
git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1146 a1433add-5e2c-0410-b055-b7f2511e0802
- integrate $defaults in $struct to have everything in one place
- integrate field labels, descriptions etc. in $struct
- $struct now has named keys and is filled with the new pacal() helper function
- replaced TODO comments with new ones ;-)
functions.inc.php:
- new function pacol() to fill $struct with an associative array
git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1145 a1433add-5e2c-0410-b055-b7f2511e0802
users/password.php:
- use SESSID_USERNAME instead of USERID_USERNAME to match the smarty
variable name in the password module for admins
- switch to 'password' template
templates/password.tpl:
- display "exit" button if logged in as user
- change form name to something more useful
templates/users_password.tpl:
- deleted
git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1140 a1433add-5e2c-0410-b055-b7f2511e0802
- use $authentication_has_role instead of checking if $smarty_template
contains "users_". This makes the code cleaner and avoids problems
when merging templates to names without "users_".
- check for login template without using needle - that's possible after
merging the login and users_login template to login.tpl
git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1139 a1433add-5e2c-0410-b055-b7f2511e0802
login.php, users/login.php:
- set logintype=admin/user smarty variable
- cleanup: move smarty assignments outside of GET/POST handling - it's
the same for both
users/login.php:
- do not pre-fill username on failed login
templates/login.tpl:
- merge in users_login.tpl
- add some {if} to handle the differences between admin and user login
templates/users_login.tpl:
- deleted
*.lang:
- mark pUsersLogin_username, pUsersLogin_password, pUsersLogin_language
and pUsersLogin_button as obsolete
- add some notes if pLogin_* and pUsersLogin differ
git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1137 a1433add-5e2c-0410-b055-b7f2511e0802
- default aliases were always created, even when unchecking the checkbox
(to be exact: after my last commit yesterday, they were never created)
This bug was introduced in r867 (setting the default to "on") in
combination with isset() falling back to the default value. For an
unchecked checkbox, this means that it always used the default fallback
which was "on" since r867.
(Does _not_ affect the 2.3 branch.)
- replaced two <br> with a TODO ;-)
git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1135 a1433add-5e2c-0410-b055-b7f2511e0802
- moved some variables from variables.inc.php to the (only) file that
uses them
- removed unused $escaped_string
create-domain.php
- target for $fDefaultaliases and $tDefaultaliases
list-virtual.php
- target for $tDisplay_back, $tDisplay_back_show, $tDisplay_up_show,
$tDisplay_next, $tDisplay_next_show
git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1134 a1433add-5e2c-0410-b055-b7f2511e0802
- removed always empty variable $pCreate_mailbox_username_text
- replaced "static" variables $pCreate_mailbox_password_text and
$pCreate_mailbox_quota_text with their PALANG content in the template
git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1132 a1433add-5e2c-0410-b055-b7f2511e0802
- use smtp_get_admin_email() to get the sender for the welcome mail
- add a check for empty (shouldn't happen in theory) or 'CLI' username
and use the mailbox address as fallback
This is based on Dale's patch, but completely rewritten (what a big word
for two lines of code ;-) Dale had only added the line
if(empty($fFrom)) $fFrom = $this->username;
My version is tested with CLI with both $CONF[admin_email] set and empty.
This commit is part of the huge cleanup patch by Dale Blount (lnxus@SF),
https://sourceforge.net/tracker/?func=detail&atid=937966&aid=3370510&group_id=191583
git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1127 a1433add-5e2c-0410-b055-b7f2511e0802
- redesign login form - now has an image on the right
- change width from 730px to 990px
- change menu :hover background color from green to dark grey
- change button :hover background color from green to light grey
- change table row :hover color in list mode from green to light grey
- add padding to input fields
- remove background color and border in edit form header
- remove border-left from list-virtual submenu (show all / mailboxes / ...)
- change main.php :hover from green left + bottom border to dark grey and
only left border
- removed green background in overview row (the line containing the search box)
- removed table borders (list and edit mode)
- add text-align:right for edit form labels
- some whitespace fixes
images/mail_bg.gif:
- [new file] the image in the login form
This commit is based on Dale's patch, but some styles were moved around
in the CSS file (to keep the diff of this commit somehow readable).
Some of Dale's changes are not yet included in this commit.
This commit is part of the huge cleanup patch by Dale Blount (lnxus@SF),
https://sourceforge.net/tracker/?func=detail&atid=937966&aid=3370510&group_id=191583
git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1122 a1433add-5e2c-0410-b055-b7f2511e0802
Christian Boltz