Merge branch 'refactor-ui'

web/inc/secure_login.php

@@ -1,10 +1,4 @@
 <?php
-if (file_exists('/usr/local/hestia/web/inc/nginx_proxy')==true) {
-    if (isset($_SERVER['REQUEST_URI']) && $_SERVER['REQUEST_URI']=="/") {
-        header("Location: /webmail/");
-        exit;
-    }
-}
 
 $login_url_skip=0;
 if ($_SERVER['SCRIPT_FILENAME']=='/usr/local/hestia/web/reset/mail/index.php') $login_url_skip=1;

web/js/i18n.js.php

@@ -11,57 +11,4 @@ if (empty($_SESSION['language'])) {
 
 App.i18n.ARE_YOU_SURE                           = '<?=__('Are you sure?')?>';
 App.Constants.UNLIM_TRANSLATED_VALUE            = '<?=__('unlimited')?>';
-
-App.Constants.FM_HIT                            = '<?=__('Hit')?>';
-App.Constants.FM_TO_RELOAD_THE_PAGE             = '<?=__('to reload the page')?>'
-App.Constants.FM_DIRECTORY_NAME_CANNOT_BE_EMPTY = '<?=__('Directory name cannot be empty')?>';
-App.Constants.FM_FILE_NAME_CANNOT_BE_EMPTY      = '<?=__('File name cannot be empty')?>';
-App.Constants.FM_NO_FILE_SELECTED               = '<?=__('No file selected')?>';
-App.Constants.FM_NO_FILE_OR_DIRECTORY_SELECTED  = '<?=__('No file or folder selected')?>';
-App.Constants.FM_FILE_TYPE_NOT_SUPPORTED        = '<?=__('File type not supported')?>';
-App.Constants.FM_DIRECTORY_DOWNLOAD_NOT_READY   = '<?=__('Directory download not available in current version')?>';
-
-App.Constants.FM_DIRECTORY_NOT_AVAILABLE        = '<?=__('Directory not available')?>';
-App.Constants.FM_DONE                           = '<?=__('Done')?>';
-App.Constants.FM_CLOSE                          = '<?=__('Close')?>';
-App.Constants.FM_COPY                           = '<?=__('Copy') ?>';
-App.Constants.FM_MOVE                           = '<?=__('Move') ?>';
-App.Constants.FM_CANCEL                         = '<?=__('Cancel')?>';
-App.Constants.FM_RENAME                         = '<?=__('Rename')?>';
-App.Constants.FM_CHMOD                          = '<?=__('Change Rights')?>';
-App.Constants.FM_DELETE                         = '<?=__('Delete')?>';
-App.Constants.FM_CONFIRM_DELETE_BULK            = '<?=__('Delete items')?>';
-App.Constants.FM_EXTRACT                        = '<?=__('Extract')?>';
-App.Constants.FM_CREATE                         = '<?=__('Create')?>';
-App.Constants.FM_PACK                           = '<?=__('Compress')?>';
-App.Constants.FM_PACK_BUTTON                    = '<?=__('Compress')?>';
-App.Constants.FM_OK                             = '<?=__('OK')?>';
-App.Constants.FM_YOU_ARE_COPYING                = '<?=__('YOU ARE COPYING')?>';
-App.Constants.FM_YOU_ARE_REMOVING               = '<?=__('YOU ARE REMOVING')?>';
-
-App.Constants.FM_COPY_BULK                      = '<?=__('Copy files')?>';
-App.Constants.FM_MOVE_BULK                      = '<?=__('Move files')?>';
-
-App.Constants.FM_CONFIRM_COPY                   = '<?=__('Are you sure you want to copy')?>';
-App.Constants.FM_CONFIRM_MOVE                   = '<?=__('Are you sure you want to move')?>';
-App.Constants.FM_CONFIRM_DELETE                 = '<?=__('Are you sure you want to delete')?>';
-App.Constants.FM_INTO_KEYWORD                   = '<?=__('into')?>';
-App.Constants.FM_EXISTING_FILES_WILL_BE_REPLACED= '<?=__('existing files will be replaced')?>';
-App.Constants.FM_ORIGINAL_NAME                  = '<?=__('Original name')?>';
-App.Constants.FM_FILE                           = '<?=__('File')?>';
-App.Constants.FM_ALREADY_EXISTS                 = '<?=__('already exists')?>';
-App.Constants.FM_CREATE_FILE                    = '<?=__('Create file')?>';
-App.Constants.FM_CREATE_DIRECTORY               = '<?=__('Create directory')?>';
-App.Constants.FM_TRANSLATED_DATES               = {'Jan': '<?=__('Jan')?>', 'Feb': '<?=__('Feb')?>','Mar': '<?=__('Mar')?>','Apr': '<?=__('Apr')?>','May': '<?=__('May')?>','Jun': '<?=__('Jun')?>','Jul': '<?=__('Jul')?>','Aug': '<?=__('Aug')?>','Sep': '<?=__('Sep')?>','Oct': '<?=__('Oct')?>','Nov': '<?=__('Nov')?>','Dec': '<?=__('Dec')?>'};
-
-App.Constants.FM_READ_BY_OWNER                  = '<?=__('read by owner')?>';
-App.Constants.FM_WRITE_BY_OWNER                 = '<?=__('write by owner')?>';
-App.Constants.FM_EXECUTE_BY_OWNER               = '<?=__('execute/search by owner')?>';
-App.Constants.FM_READ_BY_GROUP                  = '<?=__('read by group')?>';
-App.Constants.FM_WRITE_BY_GROUP                 = '<?=__('write by group')?>';
-App.Constants.FM_EXECUTE_BY_GROUP               = '<?=__('execute/search by group')?>';
-App.Constants.FM_READ_BY_OTHERS                 = '<?=__('read by others')?>';
-App.Constants.FM_WRITE_BY_OTHERS                = '<?=__('write by others')?>';
-App.Constants.FM_EXECUTE_BY_OTHERS              = '<?=__('execute/search by others')?>';
-
 App.Constants.NOTIFICATIONS_EMPTY               = '<?=__('no notifications')?>';

web/js/templates.js

@@ -17,246 +17,6 @@ App.Templates.html = {
                     '+App.Constants.NOTIFICATIONS_EMPTY+'\</span></li>'
         ]
     },
-
-    // file manager
-    //
-
-    FM: {
-        reload_in_time: [
-                    '<div id="reload-in-time" class="warning-box reload">\
-                        <div class="message-small">'+App.Constants.FM_HIT+' <span>F5</span> '+App.Constants.FM_TO_RELOAD_THE_PAGE+'</div>\
-                    </div>'
-        ],
-        entry_line: ['<li class="dir">\
-                        <span class="marker">\
-                        </span>\
-                        <span class="icon ~!:ITEM_TYPE~!" ></span>\
-                        <input type="hidden" class="source" value=\'~!:SOURCE~!\'/>\
-                        <span class="filename-holder"><div class="filename ripple" ~!:CL_ACTION_1~!>~!:NAME~!</div></span>\
-                        <span class="mode">~!:PERMISSIONS~!</span>\
-                        <span class="owner">~!:OWNER~!</span>\
-                        <span class="size-unit">~!:SIZE_UNIT~!</span>\
-                        <span class="size-value">~!:SIZE_VALUE~!</span>\
-                        <span class="date">~!:DATE~!</span>\
-                        <span class="time">~!:TIME~!</span>\
-                        <!-- span class="subcontext-control ~!:SUBMENU_CLASS~!" onClick="FM.toggleSubContextMenu(this)">&#8226;&#8226;&#8226;&nbsp;\
-                        <ul class="subcontext-menu subcontext-menu-hidden"><li onClick="FM.downloadFileFromSubcontext(this);">Download</li><li onClick="FM.editFileFromSubcontext(this);">Edit</li></ul>\
-                        </span -->\
-                    </li>'],
-        popup_alert: ['<div class="confirm-box alarm popup-box">\
-                            <div class="message">~!:TEXT~!</div>\
-                                <div class="controls">\
-                            <p class="ok" onClick="FM.popupClose();">'+App.Constants.FM_CLOSE+'</p>\
-                            </div>\
-                        </div>'],
-        popup_bulk_remove: ['<div class="confirm-box delete popup-box">\
-                            <div class="message">'+App.Constants.FM_CONFIRM_DELETE_BULK+' (~!:NUMBER_OF_ITEMS~!)?</div>\
-                            <div class="results"></div>\
-                                <div class="controls">\
-                            <p class="cancel" onClick="FM.popupClose();">'+App.Constants.FM_CANCEL+'</p>\
-                            <p class="ok" onClick="FM.bulkRemoveDo();">'+App.Constants.FM_DELETE+'</p>\
-                            </div>\
-                        </div>'],
-        popup_bulk_copy: ['<div class="confirm-box copy popup-box">\
-                            <div class="message">'+App.Constants.FM_COPY_BULK+' (~!:NUMBER_OF_ITEMS~!) '+ App.Constants.FM_INTO_KEYWORD +':</div>\
-                            <div class="actions">\
-                                <input type="text" id="copy_dest" value="~!:DST_FILENAME~!" class="new-title">\
-                            </div>\
-                            <div class="results"></div>\
-                            <div class="warning">'+App.Constants.FM_EXISTING_FILES_WILL_BE_REPLACED+'</div>\
-                                <div class="controls">\
-                            <p class="cancel" onClick="FM.popupClose();">'+App.Constants.FM_CANCEL+'</p>\
-                            <p class="ok" onClick="FM.bulkCopyDo();">'+App.Constants.FM_COPY+'</p>\
-                            </div>\
-                        </div>'],
-        popup_bulk_move: ['<div class="confirm-box copy popup-box">\
-                            <div class="message">'+App.Constants.FM_MOVE_BULK+' (~!:NUMBER_OF_ITEMS~!) '+ App.Constants.FM_INTO_KEYWORD +':</div>\
-                            <div class="actions">\
-                                <input type="text" id="dst-name" value="~!:DST_NAME~!" class="new-title">\
-                            </div>\
-                            <div class="results"></div>\
-                            <div class="warning">'+App.Constants.FM_EXISTING_FILES_WILL_BE_REPLACED+'</div>\
-                                <div class="controls">\
-                            <p class="cancel" onClick="FM.popupClose();">'+App.Constants.FM_CANCEL+'</p>\
-                            <p class="ok" onClick="FM.bulkMoveDo();">'+App.Constants.FM_MOVE+'</p>\
-                            </div>\
-                        </div>'],
-        popup_delete: ['<div class="confirm-box delete popup-box">\
-                            <div class="message">'+App.Constants.FM_CONFIRM_DELETE+' <span class="title">"~!:FILENAME~!"</span>?</div>\
-                            <div class="warning warning-message"></div>\
-                                <div class="controls">\
-                            <p class="cancel" onClick="FM.popupClose();">'+App.Constants.FM_CANCEL+'</p>\
-                            <p class="ok" onClick="FM.confirmDelete();">'+App.Constants.FM_DELETE+'</p>\
-                            </div>\
-                        </div>'],
-        popup_copy: ['<div class="confirm-box copy popup-box">\
-                            <div class="message">'+App.Constants.FM_COPY+' <span class="title">"~!:SRC_FILENAME~!"</span> '+App.Constants.FM_INTO_KEYWORD+':</div>\
-                            <div class="actions">\
-                                <input type="text" id="copy_dest" value="~!:DST_FILENAME~!" class="new-title">\
-                            </div>\
-                            <div class="message"></div>\
-                           <div class="warning warning-message">'+App.Constants.FM_EXISTING_FILES_WILL_BE_REPLACED+'</div>\
-                                <div class="controls">\
-                            <p class="cancel" onClick="FM.popupClose();">'+App.Constants.FM_CANCEL+'</p>\
-                            <p class="ok" onClick="FM.confirmCopyItems();">'+App.Constants.FM_COPY+'</p>\
-                            </div>\
-                        </div>'],
-
-        popup_move: ['<div class="confirm-box copy popup-box">\
-                            <div class="message">'+App.Constants.FM_MOVE+' <span class="title">"~!:FILENAME~!"</span> '+App.Constants.FM_INTO_KEYWORD+':</div>\
-                            <div class="actions">\
-                                <input type="text" id="dst-name" value="~!:DST_NAME~!" class="new-title">\
-                            </div>\
-                            <div class="message"></div>\
-                           <div class="warning warning-message">'+App.Constants.FM_EXISTING_FILES_WILL_BE_REPLACED+'</div>\
-                                <div class="controls">\
-                            <p class="cancel" onClick="FM.popupClose();">'+App.Constants.FM_CANCEL+'</p>\
-                            <p class="ok" onClick="FM.confirmMove();">'+App.Constants.FM_MOVE+'</p>\
-                            </div>\
-                        </div>'],
-
-        popup_rename: ['<div class="confirm-box rename warning">\
-                            <div class="message">'+App.Constants.FM_RENAME+': <span class="title">"~!:FILENAME~!"</span></div>\
-                            <div class="warning warning-message"></div>\
-                            <div class="actions">\
-                                <input type="text" id="rename-title" class="new-title"  value="~!:NEW_NAME~!" />\
-                            </div>\
-                            <div class="controls">\
-                                <p class="cancel" onClick="FM.popupClose();">'+App.Constants.FM_CANCEL+'</p>\
-                                <p class="ok" onClick="FM.confirmRename();">'+App.Constants.FM_RENAME+'</p>\
-                            </div>\
-                            <div class="controls replace">\
-                                <p class="cancel" onClick="FM.popupClose();">'+App.Constants.FM_CANCEL+'</p>\
-                                <p class="ok" onClick="FM.confirmRename();">'+App.Constants.FM_RENAME+'</p>\
-                            </div>\
-                        </div>'],
-
-        popup_chmod: ['<div class="confirm-box chmod warning">\
-                            <div class="message">'+App.Constants.FM_CHMOD+': <span class="title">"~!:FILENAME~!"</span></div>\
-                            <div class="warning warning-message"></div>\
-                            <div class="actions">\
-                                <ul>\
-                                    <li><label><input type="checkbox" name="read-by-owner" value="1" ~!:READ_BY_OWNER~! /> '+App.Constants.FM_READ_BY_OWNER+'</label></li>\
-                                    <li><label><input type="checkbox" name="write-by-owner" value="1" ~!:WRITE_BY_OWNER~! /> '+App.Constants.FM_WRITE_BY_OWNER+'</label></li>\
-                                    <li><label><input type="checkbox" name="execute-by-owner" value="1" ~!:EXECUTE_BY_OWNER~! /> '+App.Constants.FM_EXECUTE_BY_OWNER+'</label></li>\
-                                </ul><ul>\
-                                    <li><label><input type="checkbox" name="read-by-group" value="1" ~!:READ_BY_GROUP~! /> '+App.Constants.FM_READ_BY_GROUP+'</label></li>\
-                                    <li><label><input type="checkbox" name="write-by-group" value="1" ~!:WRITE_BY_GROUP~! /> '+App.Constants.FM_WRITE_BY_GROUP+'</label></li>\
-                                    <li><label><input type="checkbox" name="execute-by-group" value="1" ~!:EXECUTE_BY_GROUP~! /> '+App.Constants.FM_EXECUTE_BY_GROUP+'</label></li>\
-                                </ul><ul>\
-                                    <li><label><input type="checkbox" name="read-by-others" value="1" ~!:READ_BY_OTHERS~! /> '+App.Constants.FM_READ_BY_OTHERS+'</label></li>\
-                                    <li><label><input type="checkbox" name="write-by-others" value="1" ~!:WRITE_BY_OTHERS~! /> '+App.Constants.FM_WRITE_BY_OTHERS+'</label></li>\
-                                    <li><label><input type="checkbox" name="execute-by-others" value="1" ~!:EXECUTE_BY_OTHERS~! /> '+App.Constants.FM_EXECUTE_BY_OTHERS+'</label></li>\
-                                </ul>\
-                                <input type="text" name="mask" class="chmod-mask" maxlength="3" />\
-                            </div>\
-                            <div class="controls">\
-                                <p class="cancel" onClick="FM.popupClose();">'+App.Constants.FM_CANCEL+'</p>\
-                                <p class="ok" onClick="FM.confirmChmod();">'+App.Constants.FM_OK+'</p>\
-                            </div>\
-                        </div>'],
-        popup_bulk_chmod: ['<div class="confirm-box chmod warning">\
-                            <div class="message">'+App.Constants.FM_CHMOD+' (~!:NUMBER_OF_ITEMS~!)</div>\
-                            <div class="warning warning-message"></div>\
-                            <div class="actions">\
-                                <ul>\
-                                    <li><label><input type="checkbox" name="read-by-owner" value="1" checked /> '+App.Constants.FM_READ_BY_OWNER+'</label></li>\
-                                    <li><label><input type="checkbox" name="write-by-owner" value="1" checked /> '+App.Constants.FM_WRITE_BY_OWNER+'</label></li>\
-                                    <li><label><input type="checkbox" name="execute-by-owner" value="1" checked /> '+App.Constants.FM_EXECUTE_BY_OWNER+'</label></li>\
-                                </ul><ul>\
-                                    <li><label><input type="checkbox" name="read-by-group" value="1" checked /> '+App.Constants.FM_READ_BY_GROUP+'</label></li>\
-                                    <li><label><input type="checkbox" name="write-by-group" value="1" checked /> '+App.Constants.FM_WRITE_BY_GROUP+'</label></li>\
-                                    <li><label><input type="checkbox" name="execute-by-group" value="1" checked /> '+App.Constants.FM_EXECUTE_BY_GROUP+'</label></li>\
-                                </ul><ul>\
-                                    <li><label><input type="checkbox" name="read-by-others" value="1" checked /> '+App.Constants.FM_READ_BY_OTHERS+'</label></li>\
-                                    <li><label><input type="checkbox" name="write-by-others" value="1" checked /> '+App.Constants.FM_WRITE_BY_OTHERS+'</label></li>\
-                                    <li><label><input type="checkbox" name="execute-by-others" value="1" checked /> '+App.Constants.FM_EXECUTE_BY_OTHERS+'</label></li>\
-                                </ul>\
-                                <input type="text" name="mask" class="chmod-mask" maxlength="3" value="777" />\
-                            </div>\
-                            <div class="controls">\
-                                <p class="cancel" onClick="FM.popupClose();">'+App.Constants.FM_CANCEL+'</p>\
-                                <p class="ok" onClick="FM.confirmBulkChmod();">'+App.Constants.FM_OK+'</p>\
-                            </div>\
-                        </div>'],
-
-        popup_pack: ['<div class="confirm-box pack warning">\
-                            <div class="message">'+App.Constants.FM_PACK+' <span class="title">"~!:FILENAME~!"</span></div>\
-                            <div class="actions">\
-                                <input type="text" id="pack-destination" class="new-title" value="~!:DST_DIRNAME~!">\
-                            </div>\
-                            <div class="warning warning-message"></div>\
-                            <!-- div class="actions">\
-                                <label><input type="checkbox" name="overwrite" class="title" />Overwrite exising files</label>\
-                            </div -->\
-                            <div class="controls">\
-                                <p class="cancel" onClick="FM.popupClose();">'+App.Constants.FM_CANCEL+'</p>\
-                                <p class="ok" onClick="FM.confirmPackItem();">'+App.Constants.FM_PACK_BUTTON+'</p>\
-                            </div>\
-                        </div>'],
-
-        popup_bulk_pack: ['<div class="confirm-box pack warning">\
-                            <div class="message">'+App.Constants.FM_PACK+' (~!:NUMBER_OF_ITEMS~!)</div>\
-                            <div class="actions">\
-                                <input type="text" id="pack-destination" class="new-title" value="~!:DST_DIRNAME~!">\
-                            </div>\
-                            <div class="warning warning-message"></div>\
-                            <!-- div class="actions">\
-                                <label><input type="checkbox" name="overwrite" class="title" />Overwrite exising files</label>\
-                            </div -->\
-                            <div class="controls">\
-                                <p class="cancel" onClick="FM.popupClose();">'+App.Constants.FM_CANCEL+'</p>\
-                                <p class="ok" onClick="FM.confirmPackItem();">'+App.Constants.FM_PACK_BUTTON+'</p>\
-                            </div>\
-                        </div>'],
-
-        popup_unpack: ['<div class="confirm-box unpack warning">\
-                            <div class="message">'+App.Constants.FM_EXTRACT+' <span class="title">"~!:FILENAME~!"</span> '+App.Constants.FM_INTO_KEYWORD+':</div>\
-                            <div class="actions">\
-                                <input type="text" id="unpack-destination" class="new-title" value="~!:DST_DIRNAME~!">\
-                            </div>\
-                            <div class="warning warning-message"></div>\
-                            <!-- div class="actions">\
-                                <label><input type="checkbox" name="overwrite" class="title" />Overwrite exising files</label>\
-                            </div -->\
-                            <div class="controls">\
-                                <p class="cancel" onClick="FM.popupClose();">'+App.Constants.FM_CANCEL+'</p>\
-                                <p class="ok" onClick="FM.confirmUnpackItem();">'+App.Constants.FM_EXTRACT+'</p>\
-                            </div>\
-                        </div>'],
-
-
-        popup_create_file: ['<div class="confirm-box rename warning">\
-                            <div class="message">'+App.Constants.FM_CREATE_FILE+'</div>\
-                            <!-- div class="warning">File <span class="title">"reading.txt"</span> already exists</div -->\
-                            <div class="warning warning-message"></div>\
-                            <div class="actions">\
-                                <input type="text" id="rename-title" class="new-title" />\
-                            </div>\
-                            <div class="controls replace">\
-                                <p class="cancel" onClick="FM.popupClose();">'+App.Constants.FM_CANCEL+'</p>\
-                                <p class="ok" onClick="FM.confirmCreateFile();">'+App.Constants.FM_CREATE+'</p>\
-                            </div>\
-                        </div>'],
-        popup_create_dir: ['<div class="confirm-box rename warning">\
-                            <div class="message">'+App.Constants.FM_CREATE_DIRECTORY+'</div>\
-                            <!-- div class="warning">File <span class="title">"reading.txt"</span> already exists</div -->\
-                            <div class="warning warning-message"></div>\
-                            <div class="actions">\
-                                <input type="text" id="rename-title" class="new-title" />\
-                            </div>\
-                            <div class="controls replace">\
-                                <p class="cancel" onClick="FM.popupClose();">'+App.Constants.FM_CANCEL+'</p>\
-                                <p class="ok" onClick="FM.confirmCreateDir();">'+App.Constants.FM_CREATE+'</p>\
-                            </div>\
-                        </div>'],
-        popup_no_file_selected: ['<div class="confirm-box no-file-selected">\
-                            <div class="message">Please select a file</div>\
-                            <div class="controls">\
-                                <p class="ok" onClick="FM.confirmCreateDir();">'+App.Constants.FM_OK+'</p>\
-                            </div>\
-                        </div>']
-    }
 };
 
 // Internals