ver 3.46 release

ChangeLog.md

@@ -1,3 +1,21 @@
+### ver3.46 `2017/4/20` 
+-----
+#### update:
+- 图片预览：加入删除按钮；删除快捷键
+- 删除文档对话框样式优化
+- 0kb文件上传问题；【拖拽单文件，文件夹；选择文件，文件夹；】上传取消后上传失败优化
+- 普通用户压缩到tar,gz时路径问题解决
+- 部分服务器反向代理导致不支持csrf防护的，加入设置中手动开关
+- 右键文件夹打开：提示仅支持分享您自己的文档
+- 数据丢失：删除install.lock;重置admin密码；—— 新建用户
+- 分享文件夹预览：图片播放，不支持权限则隐藏对应功能；显示列表模式切换
+- 适配新浪sae虚拟主机.
+
+#### fix bug
+- 文件外链打开下载文件名问题
+- 重命名状态，双击选择优化
+
+
 ### ver3.45 `2017/4/9` 
 -----
 #### update:

config/i18n/ar/main.php

@@ -44,7 +44,8 @@ return array(
     "keyboard_type"                  => "وضع لوحة المفاتيح",
     "font_family"                    => "الخطوط",
     "code_mode"                      => "تسليط الضوء على تركيب",
-    "path_can_not_action"            => "يدعم فقط مشاركة الوثائق الخاصة بك!",
+    "path_can_not_share"             => "يدعم فقط مشاركة المستندات الخاصة بك!",
+    "path_can_not_action"            => "هذا الدليل لا يدعم هذه العملية!",
     "wap_page_pc"                    => "نسخة الكمبيوتر",
     "wap_page_phone"                 => "متحرك",
     "image_size"                     => "أبعاد الصورة",
@@ -275,6 +276,9 @@ return array(
     "password"                       => "كلمة المرور",
     "login_code"                     => "رموز",
     "need_check_code"                => "رمز التوثيق الدخول المفتوح",
+    "need_check_code_desc"           => "بعد فتح الهبوط يجب أن تحتاج إلى إدخال رمز التحقق، سوف تفشل السياح تسجيل الدخول التلقائي.",
+    "setting_csrf_protect"           => "حماية CSRF المفتوحة",
+    "setting_csrf_protect_desc"      => "بعد نوع افتتاح هجوم يمكن أن تحمي بشكل فعال CSRF",
     "login_rember_password"          => "تذكر كلمة المرور",
     "setting_show_root_group"        => "قائمة جميع الفئات",
     "setting_show_root_group_desc"   => "يتم سرد شجرة مجموعة الدليل الجذر جميع الفئات",
@@ -295,6 +299,8 @@ return array(
     "old_password_error"             => "القديمة كلمة السر غير صحيحة!",
     "permission"                     => "إذن!",
     "permission_edit"                => "تعديل ضوابط",
+    "file_info_owner"                => "مالك",
+    "file_info_group"                => "مجموعة",
     "no_permission"                  => "عطل المشرف هذا الامتياز!",
     "no_permission_ext"              => "المسؤول حظر هذا النوع من أذونات الملف",
     "dialog_max"                     => "تعظيم",

config/i18n/bg/main.php

@@ -44,7 +44,8 @@ return array(
     "keyboard_type"                  => "клавиатура Mode",
     "font_family"                    => "Fonts",
     "code_mode"                      => "Оцветяване на синтаксиса",
-    "path_can_not_action"            => "Поддържа споделят само собствените си документи!",
+    "path_can_not_share"             => "Поддържа споделяне само на собствените си документи!",
+    "path_can_not_action"            => "Тази директория не поддържа тази операция!",
     "wap_page_pc"                    => "PC версия",
     "wap_page_phone"                 => "подвижен",
     "image_size"                     => "размери на изображението",
@@ -275,6 +276,9 @@ return array(
     "password"                       => "парола",
     "login_code"                     => "кодове",
     "need_check_code"                => "код Вход удостоверяване отворен",
+    "need_check_code_desc"           => "След отваряне на площадката трябва да се наложи да въведете код за потвърждение, туристите автоматичен вход ще се провали.",
+    "setting_csrf_protect"           => "Open защита CSRF",
+    "setting_csrf_protect_desc"      => "След тип отваряне на атака може ефективно да защити CSRF",
     "login_rember_password"          => "Запомни паролата",
     "setting_show_root_group"        => "Списък на всички групи",
     "setting_show_root_group_desc"   => "Tree главната директория група е в списъка на всички групи",
@@ -295,6 +299,8 @@ return array(
     "old_password_error"             => "Old парола е грешна!",
     "permission"                     => "Разрешение!",
     "permission_edit"                => "Промяна на разрешенията",
+    "file_info_owner"                => "собственик",
+    "file_info_group"                => "група",
     "no_permission"                  => "Администраторът е забранил тази привилегия!",
     "no_permission_ext"              => "Administrator забрани този вид файловите права",
     "dialog_max"                     => "Увеличете",

config/i18n/bn/main.php

@@ -44,7 +44,8 @@ return array(
     "keyboard_type"                  => "কীবোর্ড মোড",
     "font_family"                    => "ফন্ট",
     "code_mode"                      => "সিনট্যাক্স হাইলাইটিং",
-    "path_can_not_action"            => "শুধুমাত্র আপনার নিজের নথি ভাগ সমর্থন!",
+    "path_can_not_share"             => "শুধুমাত্র আপনার নিজের নথি ভাগ সমর্থন!",
+    "path_can_not_action"            => "এই ডিরেক্টরিটি এই অপারেশন সমর্থন করে না!",
     "wap_page_pc"                    => "পিসি সংস্করণ",
     "wap_page_phone"                 => "মোবাইল",
     "image_size"                     => "চিত্র মাত্রা",
@@ -275,6 +276,9 @@ return array(
     "password"                       => "পাসওয়ার্ড",
     "login_code"                     => "সঙ্কেত",
     "need_check_code"                => "লগইন প্রমাণীকরণ কোডটি উন্মুক্ত",
+    "need_check_code_desc"           => "পরে অবতরণ খোলার একটি যাচাইকরণ কোড লিখতে হবে হবে, পর্যটকদের স্বয়ংক্রিয় লগ-ইন ব্যর্থ হবে।",
+    "setting_csrf_protect"           => "ওপেন csrf সুরক্ষা",
+    "setting_csrf_protect_desc"      => "হামলা কার্যকরভাবে csrf রক্ষা করতে পারে খোলার টাইপ করার পর",
     "login_rember_password"          => "পাসওয়ার্ড মনে রেখো",
     "setting_show_root_group"        => "সব গ্রুপে একটি তালিকা",
     "setting_show_root_group_desc"   => "বৃক্ষ রুট ডিরেক্টরিটি গ্রুপ সকল গোষ্ঠী তালিকাভুক্ত করা হয়",
@@ -295,6 +299,8 @@ return array(
     "old_password_error"             => "পুরানো পাসওয়ার্ড ভুল!",
     "permission"                     => "অনুমতি!",
     "permission_edit"                => "অনুমতি সংশোধন",
+    "file_info_owner"                => "মালিক",
+    "file_info_group"                => "গ্রুপ",
     "no_permission"                  => "অ্যাডমিনিস্ট্রেটর এই বিশেষ সুযোগ অক্ষম করেছে!",
     "no_permission_ext"              => "অ্যাডমিনিস্ট্রেটর ফাইল অনুমতি এই ধরনের নিষিদ্ধ",
     "dialog_max"                     => "চরমে তোলা",

config/i18n/ca/main.php

@@ -44,7 +44,8 @@ return array(
     "keyboard_type"                  => "La manera de teclat",
     "font_family"                    => "fonts",
     "code_mode"                      => "El ressaltat de sintaxi",
-    "path_can_not_action"            => "Només admet compartir els seus propis documents!",
+    "path_can_not_share"             => "Només admet compartir els seus propis documents!",
+    "path_can_not_action"            => "Aquest directori no és compatible amb aquesta operació!",
     "wap_page_pc"                    => "versió PC",
     "wap_page_phone"                 => "mòbil",
     "image_size"                     => "dimensions de la imatge",
@@ -275,6 +276,9 @@ return array(
     "password"                       => "contrasenya",
     "login_code"                     => "codis",
     "need_check_code"                => "codi d'autenticació d'inici de sessió oberta",
+    "need_check_code_desc"           => "Després d'obrir l'aterratge deu que hagi d'introduir un codi de verificació, els turistes inici de sessió automàtic fallarà.",
+    "setting_csrf_protect"           => "protecció CSRF obert",
+    "setting_csrf_protect_desc"      => "Després de tipus d'obertura d'atac pot protegir eficaçment CSRF",
     "login_rember_password"          => "recordar contrasenya",
     "setting_show_root_group"        => "Una llista de tots els grups",
     "setting_show_root_group_desc"   => "Arbre de grups directori arrel és a la llista tots els grups",
@@ -295,6 +299,8 @@ return array(
     "old_password_error"             => "antiga contrasenya és incorrecta!",
     "permission"                     => "Permís!",
     "permission_edit"                => "modificar permisos",
+    "file_info_owner"                => "propietari",
+    "file_info_group"                => "grup",
     "no_permission"                  => "Administrador ha desactivat aquest privilegi!",
     "no_permission_ext"              => "Administrador prohibir aquest tipus de permisos d'arxiu",
     "dialog_max"                     => "maximitzar",

config/i18n/el/main.php

@@ -44,7 +44,8 @@ return array(
     "keyboard_type"                  => "Λειτουργία πληκτρολογίου",
     "font_family"                    => "γραμματοσειρές",
     "code_mode"                      => "τονισμό σύνταξης",
-    "path_can_not_action"            => "Υποστηρίζει μοιράζονται μόνο τα δικά σας έγγραφα!",
+    "path_can_not_share"             => "Υποστηρίζει μοιράζονται μόνο τα δικά σας έγγραφα!",
+    "path_can_not_action"            => "Αυτός ο κατάλογος δεν υποστηρίζει αυτή τη λειτουργία!",
     "wap_page_pc"                    => "PC Έκδοση",
     "wap_page_phone"                 => "κινητός",
     "image_size"                     => "διαστάσεις εικόνας",
@@ -275,6 +276,9 @@ return array(
     "password"                       => "Κωδικός πρόσβασης",
     "login_code"                     => "κώδικες",
     "need_check_code"                => "Ο κωδικός σύνδεσης ταυτότητας ανοικτού",
+    "need_check_code_desc"           => "Μετά το άνοιγμα της προσγείωσης πρέπει να πρέπει να εισαγάγετε έναν κωδικό επαλήθευσης, οι τουρίστες αυτόματη σύνδεση θα αποτύχει.",
+    "setting_csrf_protect"           => "Ανοίξτε την προστασία CSRF",
+    "setting_csrf_protect_desc"      => "Μετά τύπου άνοιγμα της επίθεσης μπορεί να προστατεύσει αποτελεσματικά CSRF",
     "login_rember_password"          => "Απομνημόνευση κωδικού πρόσβασης",
     "setting_show_root_group"        => "Μια λίστα όλων των ομάδων",
     "setting_show_root_group_desc"   => "Δέντρο ομάδα ριζικό αναφέρεται σε όλες τις ομάδες",
@@ -295,6 +299,8 @@ return array(
     "old_password_error"             => "Παλιά κωδικός πρόσβασης είναι λάθος!",
     "permission"                     => "Άδεια!",
     "permission_edit"                => "Τροποποίηση Δικαιώματα",
+    "file_info_owner"                => "ιδιοκτήτης",
+    "file_info_group"                => "ομάδα",
     "no_permission"                  => "Διαχειριστής έχει απενεργοποιήσει αυτό το προνόμιο!",
     "no_permission_ext"              => "Διαχειριστής απαγορεύσει αυτό το είδος της δικαιώματα αρχείου",
     "dialog_max"                     => "Μεγιστοποιήστε",

config/i18n/en/main.php

@@ -44,7 +44,8 @@ return array(
     "keyboard_type"                  => "Keyboard",
     "font_family"                    => "Font",
     "code_mode"                      => "Syntax highlighter",
-    "path_can_not_action"            => "Only support sharing your own documents!",
+    "path_can_not_share"             => "Only support sharing your own documents!",
+    "path_can_not_action"            => "This directory does not support this operation!",
     "wap_page_pc"                    => "PC",
     "wap_page_phone"                 => "Phone",
     "image_size"                     => "Image size",
@@ -275,6 +276,9 @@ return array(
     "password"                       => "Password",
     "login_code"                     => "Verification",
     "need_check_code"                => "Need Verification",
+    "need_check_code_desc"           => "Login must be required to enter the verification code, visitors will automatically fail landing.",
+    "setting_csrf_protect"           => "Open csrf protection",
+    "setting_csrf_protect_desc"      => "Open after the effective protection csrf class attack",
     "login_rember_password"          => "Remember me",
     "setting_show_root_group"        => "List all groups",
     "setting_show_root_group_desc"   => "Does the tree directory root group list all groups",
@@ -295,6 +299,8 @@ return array(
     "old_password_error"             => "Old password error!",
     "permission"                     => "Permission",
     "permission_edit"                => "Permission Edit",
+    "file_info_owner"                => "Owner",
+    "file_info_group"                => "Group",
     "no_permission"                  => "User without permission!",
     "no_permission_ext"              => "This type of file without permission",
     "dialog_max"                     => "Maximize",

config/i18n/es/main.php

@@ -44,7 +44,8 @@ return array(
     "keyboard_type"                  => "El modo de teclado",
     "font_family"                    => "Fuentes",
     "code_mode"                      => "El resaltado de sintaxis",
-    "path_can_not_action"            => "Sólo admite compartir sus propios documentos!",
+    "path_can_not_share"             => "Sólo admite compartir sus propios documentos!",
+    "path_can_not_action"            => "Este directorio no es compatible con esta operación!",
     "wap_page_pc"                    => "Versión PC",
     "wap_page_phone"                 => "móvil",
     "image_size"                     => "dimensiones de la imagen",
@@ -275,6 +276,9 @@ return array(
     "password"                       => "contraseña",
     "login_code"                     => "códigos",
     "need_check_code"                => "código de autenticación de inicio de sesión abierta",
+    "need_check_code_desc"           => "Después de abrir el aterrizaje debe que tenga que introducir un código de verificación, los turistas inicio de sesión automático fallará.",
+    "setting_csrf_protect"           => "protección CSRF abierto",
+    "setting_csrf_protect_desc"      => "Después de tipo de apertura de ataque puede proteger eficazmente csrf",
     "login_rember_password"          => "recordar contraseña",
     "setting_show_root_group"        => "Una lista de todos los grupos",
     "setting_show_root_group_desc"   => "Árbol de grupos directorio raíz está en la lista todos los grupos",
@@ -295,6 +299,8 @@ return array(
     "old_password_error"             => "antigua contraseña es incorrecta!",
     "permission"                     => "Permiso!",
     "permission_edit"                => "modificar permisos",
+    "file_info_owner"                => "propietario",
+    "file_info_group"                => "grupo",
     "no_permission"                  => "Administrador ha desactivado este privilegio!",
     "no_permission_ext"              => "Administrador prohibió este tipo de permisos de archivo",
     "dialog_max"                     => "maximizar",

config/i18n/fa/main.php

@@ -44,7 +44,8 @@ return array(
     "keyboard_type"                  => "حالت صفحه کلید",
     "font_family"                    => "فونت",
     "code_mode"                      => "نحو برجسته",
-    "path_can_not_action"            => "پشتیبانی تنها اسناد خود را به اشتراک بگذارید!",
+    "path_can_not_share"             => "پشتیبانی تنها اسناد خود را به اشتراک بگذارید!",
+    "path_can_not_action"            => "این دایرکتوری این عملیات را پشتیبانی نمی کند!",
     "wap_page_pc"                    => "PC نسخه",
     "wap_page_phone"                 => "سیار",
     "image_size"                     => "ابعاد تصویر",
@@ -275,6 +276,9 @@ return array(
     "password"                       => "رمز عبور",
     "login_code"                     => "کد",
     "need_check_code"                => "کد تصدیق ورود به سیستم باز",
+    "need_check_code_desc"           => "پس از باز کردن فرود باید نیاز به وارد کردن کد امنیتی، گردشگران ورود خودکار شکست خواهد خورد.",
+    "setting_csrf_protect"           => "حفاظت CSRF گسترش",
+    "setting_csrf_protect_desc"      => "پس از باز شدن نوع حمله موثر می تواند محافظت CSRF",
     "login_rember_password"          => "به یاد داشته باشید رمز عبور",
     "setting_show_root_group"        => "یک لیست از تمام گروه های",
     "setting_show_root_group_desc"   => "درخت گروه دایرکتوری ریشه است همه گروه های ذکر شده",
@@ -295,6 +299,8 @@ return array(
     "old_password_error"             => "رمز عبور قدیمی اشتباه است!",
     "permission"                     => "اجازه!",
     "permission_edit"                => "تغییر مجوز",
+    "file_info_owner"                => "مالک",
+    "file_info_group"                => "گروه",
     "no_permission"                  => "مدیر این امتیاز را غیرفعال کرده است.",
     "no_permission_ext"              => "مدیر ممنوع این نوع مجوز های دسترسی فایل",
     "dialog_max"                     => "بیشینه ساختن",

config/i18n/hi/main.php

@@ -44,7 +44,8 @@ return array(
     "keyboard_type"                  => "कीबोर्ड मोड",
     "font_family"                    => "फ़ॉन्ट्स",
     "code_mode"                      => "सिंटेक्स हाइलाइटिंग",
-    "path_can_not_action"            => "केवल अपने खुद के दस्तावेजों का हिस्सा समर्थन करता है!",
+    "path_can_not_share"             => "केवल अपने स्वयं के दस्तावेज़ों को साझा करने का समर्थन!",
+    "path_can_not_action"            => "इस निर्देशिका में इस आपरेशन का समर्थन नहीं करता!",
     "wap_page_pc"                    => "पीसी संस्करण",
     "wap_page_phone"                 => "मोबाइल",
     "image_size"                     => "छवि आयाम",
@@ -275,6 +276,9 @@ return array(
     "password"                       => "पासवर्ड",
     "login_code"                     => "संहिताओं",
     "need_check_code"                => "लॉगिन प्रमाणीकरण कोड खुला",
+    "need_check_code_desc"           => "बाद लैंडिंग खोलने सत्यापन कोड डालने की जरूरत है चाहिए, पर्यटकों स्वचालित लॉगइन असफल हो जायेगी।",
+    "setting_csrf_protect"           => "ओपन CSRF संरक्षण",
+    "setting_csrf_protect_desc"      => "हमले को प्रभावी ढंग से CSRF रक्षा कर सकते हैं के उद्घाटन के प्रकार के बाद",
     "login_rember_password"          => "पासवर्ड याद रखें",
     "setting_show_root_group"        => "सभी समूहों की सूची",
     "setting_show_root_group_desc"   => "ट्री रूट निर्देशिका समूह सभी समूहों में सूचीबद्ध है",
@@ -295,6 +299,8 @@ return array(
     "old_password_error"             => "पुराना पासवर्ड गलत है!",
     "permission"                     => "अनुमति!",
     "permission_edit"                => "अनुमतियों को संशोधित",
+    "file_info_owner"                => "मालिक",
+    "file_info_group"                => "समूह",
     "no_permission"                  => "प्रशासक इस विशेषाधिकार अक्षम है!",
     "no_permission_ext"              => "प्रशासक फाइल अनुमति के इस प्रकार के प्रतिबंध लगा",
     "dialog_max"                     => "अधिकतम",

config/i18n/ja/main.php

@@ -44,7 +44,8 @@ return array(
     "keyboard_type"                  => "キーボードモード",
     "font_family"                    => "フォント",
     "code_mode"                      => "構文強調表示",
-    "path_can_not_action"            => "サポートする唯一の独自のドキュメントを共有！",
+    "path_can_not_share"             => "サポートしている唯一の独自のドキュメントを共有！",
+    "path_can_not_action"            => "このディレクトリには、この操作をサポートしていません！",
     "wap_page_pc"                    => "PC版",
     "wap_page_phone"                 => "モバイル",
     "image_size"                     => "画像サイズ",
@@ -275,6 +276,9 @@ return array(
     "password"                       => "パスワード",
     "login_code"                     => "コード",
     "need_check_code"                => "ログイン認証コードオープン",
+    "need_check_code_desc"           => "着陸を開いた後に確認コードを入力する必要がある必要があり、観光客の自動ログインは失敗します。",
+    "setting_csrf_protect"           => "オープンCSRF保護",
+    "setting_csrf_protect_desc"      => "攻撃の種類を開いた後効果的にCSRFを保護することができます。",
     "login_rember_password"          => "パスワードを覚えておいてください",
     "setting_show_root_group"        => "すべてのグループのリスト",
     "setting_show_root_group_desc"   => "ツリーのルートディレクトリグループは、すべてのグループがリストされています",
@@ -295,6 +299,8 @@ return array(
     "old_password_error"             => "古いパスワードが間違っています！",
     "permission"                     => "許可！",
     "permission_edit"                => "アクセス権を変更します",
+    "file_info_owner"                => "所有者",
+    "file_info_group"                => "グループ",
     "no_permission"                  => "管理者は、この権限を無効にしています！",
     "no_permission_ext"              => "管理者は、ファイルのアクセス権のこのタイプを禁止しました",
     "dialog_max"                     => "最大にします",

config/i18n/ru/main.php

@@ -44,7 +44,8 @@ return array(
     "keyboard_type"                  => "Режим клавиатуры",
     "font_family"                    => "шрифты",
     "code_mode"                      => "подсветка синтаксиса",
-    "path_can_not_action"            => "Поддержка только поделиться своими собственными документами!",
+    "path_can_not_share"             => "Поддержка только поделиться своими собственными документами!",
+    "path_can_not_action"            => "Этот каталог не поддерживает эту операцию!",
     "wap_page_pc"                    => "PC Версия",
     "wap_page_phone"                 => "мобильный",
     "image_size"                     => "размеры изображения",
@@ -275,6 +276,9 @@ return array(
     "password"                       => "пароль",
     "login_code"                     => "коды",
     "need_check_code"                => "Код аутентификации Войти с открытым",
+    "need_check_code_desc"           => "После открытия посадки должна необходимо ввести код подтверждения, туристы автоматического Логин провалится.",
+    "setting_csrf_protect"           => "Открытая защита CSRF",
+    "setting_csrf_protect_desc"      => "После открытия типа атаки может эффективно защитить CSRF",
     "login_rember_password"          => "Запомнить пароль",
     "setting_show_root_group"        => "Список всех групп",
     "setting_show_root_group_desc"   => "Дерево группы корневого каталога перечислены все группы",
@@ -295,6 +299,8 @@ return array(
     "old_password_error"             => "Старый пароль неправильный!",
     "permission"                     => "Разрешение!",
     "permission_edit"                => "Изменение разрешений",
+    "file_info_owner"                => "владелец",
+    "file_info_group"                => "группа",
     "no_permission"                  => "Администратор отключил эту привилегию!",
     "no_permission_ext"              => "Администратор запретил этот тип прав доступа к файлам",
     "dialog_max"                     => "максимизировать",

config/i18n/si/main.php

@@ -44,7 +44,8 @@ return array(
     "keyboard_type"                  => "යතුරු පුවරුව ප්රකාරය",
     "font_family"                    => "සිංහල ෆොන්ට්",
     "code_mode"                      => "වාග් රීතිය අවධාරණය",
-    "path_can_not_action"            => "සහාය දක්වයි පමණක් ඔබේ ම ලිපි ලේඛන හුවමාරු කරන්න!",
+    "path_can_not_share"             => "සහාය පමණක් ඔබේ ම ලිපි ලේඛන හුවමාරු කරන්න!",
+    "path_can_not_action"            => "මෙම බහලුම මෙම මෙහෙයුම සඳහා පහසුකම් සපයන්නේ නැත!",
     "wap_page_pc"                    => "පළාත් සභා අනුවාදය",
     "wap_page_phone"                 => "ජංගම",
     "image_size"                     => "රූප මාන",
@@ -275,6 +276,9 @@ return array(
     "password"                       => "රහස් පදය",
     "login_code"                     => "කේත",
     "need_check_code"                => "ලොගින් වන්න සත්යාපන කේතය විවෘත",
+    "need_check_code_desc"           => "ගොඩ විවෘත කිරීමෙන් අනතුරුව සත්යාපන කේතය ඇතුලත් කිරීම අවශ්ය යුතුය, සංචාරකයන් ස්වයංක්රීය පිවිසුම් අසාර්ථක වනු ඇත.",
+    "setting_csrf_protect"           => "විවෘත csrf ආරක්ෂාව",
+    "setting_csrf_protect_desc"      => "ප්රහාරය වර්ගය විවෘත කිරීමෙන් අනතුරුව ඵලදායී csrf ආරක්ෂා කළ හැකි",
     "login_rember_password"          => "රහස් පදය මතක තබා ගන්න",
     "setting_show_root_group"        => "සියලු කණ්ඩායම් ලැයිස්තුව",
     "setting_show_root_group_desc"   => "ගස මූල ඩිරෙක්ටරිය කණ්ඩායමක් කණ්ඩායම් ලැයිස්තුගත කර ඇත",
@@ -295,6 +299,8 @@ return array(
     "old_password_error"             => "පැරණි මුරපදය වැරදියි!",
     "permission"                     => "අවසර!",
     "permission_edit"                => "අවසර වෙනස් කරන්න",
+    "file_info_owner"                => "හිමිකරු",
+    "file_info_group"                => "සමූහ",
     "no_permission"                  => "පරිපාලක වරයා මෙම වරප්රසාදය අක්රිය කොට ඇත!",
     "no_permission_ext"              => "පරිපාලක ගොනු අවසරයන් මෙම වර්ගය තහනම්",
     "dialog_max"                     => "උපරිම",

config/i18n/sr/main.php

@@ -44,7 +44,8 @@ return array(
     "keyboard_type"                  => "тастатура режим",
     "font_family"                    => "фонтс",
     "code_mode"                      => "истицање синтаксе",
-    "path_can_not_action"            => "Подржава деле само своје документе!",
+    "path_can_not_share"             => "Подржава деле само своје документе!",
+    "path_can_not_action"            => "Овај директоријум не подржава ову операцију!",
     "wap_page_pc"                    => "ПЦ верзија",
     "wap_page_phone"                 => "мобиле",
     "image_size"                     => "slika димензије",
@@ -275,6 +276,9 @@ return array(
     "password"                       => "лозинка",
     "login_code"                     => "кодови",
     "need_check_code"                => "Пријава Аутхентицатион Цоде отворен",
+    "need_check_code_desc"           => "Након отварања слетање мора треба да унесете верификациони код, туристи аутоматски пријављивање неће успети.",
+    "setting_csrf_protect"           => "Опен заштита ЦСРФ",
+    "setting_csrf_protect_desc"      => "Након врсти отварања напада може ефикасно да заштити ЦСРФ",
     "login_rember_password"          => "Запамти лозинку",
     "setting_show_root_group"        => "Листа свих група",
     "setting_show_root_group_desc"   => "Корен стабла директоријум група је наведен све групе",
@@ -295,6 +299,8 @@ return array(
     "old_password_error"             => "Стара лозинка није у реду!",
     "permission"                     => "Дозвола!",
     "permission_edit"                => "мјењање",
+    "file_info_owner"                => "власник",
+    "file_info_group"                => "група",
     "no_permission"                  => "Администратор је онемогућио ту привилегију!",
     "no_permission_ext"              => "Администратор забранио ову врсту датотека дозвола",
     "dialog_max"                     => "Макимизе",

config/i18n/ta/main.php

@@ -44,7 +44,8 @@ return array(
     "keyboard_type"                  => "விசைப்பலகை முறை",
     "font_family"                    => "எழுத்துருக்கள்",
     "code_mode"                      => "தொடரியல் தனிப்படுத்தல்",
-    "path_can_not_action"            => "உங்கள் சொந்த ஆவணங்களை பகிர்ந்து ஆதரிக்கிறது!",
+    "path_can_not_share"             => "உங்கள் சொந்த ஆவணங்கள் பகிர்ந்து ஆதரிக்கிறது!",
+    "path_can_not_action"            => "இந்த அடைவு இந்த இச்செயலுக்கு ஆதரவளிக்கவில்லை!",
     "wap_page_pc"                    => "PC பதிப்பு",
     "wap_page_phone"                 => "மொபைல்",
     "image_size"                     => "பட அளவுகள்",
@@ -275,6 +276,9 @@ return array(
     "password"                       => "கடவுச்சொல்",
     "login_code"                     => "குறியீடுகள்",
     "need_check_code"                => "தேதி அங்கீகார குறியீடு திறந்த",
+    "need_check_code_desc"           => "இறங்கும் திறப்பதில் சரிபார்ப்பு குறியீட்டை உள்ளிட வேண்டும் வேண்டும் பிறகு, சுற்றுலா பயணிகள் தானியங்கி உள்நுழைவு தோல்வியடையும்.",
+    "setting_csrf_protect"           => "திறந்த CSRF பாதுகாப்பு",
+    "setting_csrf_protect_desc"      => "தாக்குதல் திறம்பட CSRF பாதுகாக்க முடியும் திறப்பு வகை பிறகு",
     "login_rember_password"          => "கடவுச்சொல்லை நினைவில்",
     "setting_show_root_group"        => "அனைத்து குழுக்களையும் பட்டியல்",
     "setting_show_root_group_desc"   => "மர வேர் அடைவு குழு அனைத்து குழுக்களையும் பட்டியலிடப்பட்டுள்ளது",
@@ -295,6 +299,8 @@ return array(
     "old_password_error"             => "பழைய கடவுச்சொல் தவறு!",
     "permission"                     => "அனுமதி!",
     "permission_edit"                => "அனுமதிகளை மாற்று",
+    "file_info_owner"                => "உரிமையாளர்",
+    "file_info_group"                => "குழு",
     "no_permission"                  => "நிர்வாகி இந்த சலுகை முடக்கியுள்ளது!",
     "no_permission_ext"              => "நிர்வாகி கோப்பு அனுமதிகளை இந்த வகை தடை",
     "dialog_max"                     => "பெருக்குங்கள்",

config/i18n/th/main.php

@@ -44,7 +44,8 @@ return array(
     "keyboard_type"                  => "โหมดแป้นพิมพ์",
     "font_family"                    => "แบบอักษร",
     "code_mode"                      => "เน้นไวยากรณ์",
-    "path_can_not_action"            => "สนับสนุนเฉพาะแบ่งปันเอกสารของคุณเอง!",
+    "path_can_not_share"             => "รองรับการแชร์เอกสารของคุณเอง!",
+    "path_can_not_action"            => "ไดเรกทอรีนี้ไม่สนับสนุนการดำเนินการนี้!",
     "wap_page_pc"                    => "เวอร์ชันพีซี",
     "wap_page_phone"                 => "โทรศัพท์มือถือ",
     "image_size"                     => "ขนาดภาพ",
@@ -275,6 +276,9 @@ return array(
     "password"                       => "รหัสผ่าน",
     "login_code"                     => "รหัส",
     "need_check_code"                => "รหัสรับรองความถูกต้องเข้าสู่ระบบเปิด",
+    "need_check_code_desc"           => "หลังจากเปิดเชื่อมโยงไปถึงจะต้องจำเป็นต้องใส่รหัสยืนยันให้นักท่องเที่ยวเข้าสู่ระบบอัตโนมัติจะล้มเหลว",
+    "setting_csrf_protect"           => "ป้องกัน CSRF เปิด",
+    "setting_csrf_protect_desc"      => "หลังจากเปิดประเภทของการโจมตีได้อย่างมีประสิทธิภาพสามารถป้องกัน CSRF",
     "login_rember_password"          => "จำรหัสผ่าน",
     "setting_show_root_group"        => "รายชื่อของกลุ่มทั้งหมด",
     "setting_show_root_group_desc"   => "ต้นไม้กลุ่มไดเรกทอรีรากเป็น บริษัท จดทะเบียนทุกกลุ่ม",
@@ -295,6 +299,8 @@ return array(
     "old_password_error"             => "รหัสผ่านเดิมที่เป็นธรรม!",
     "permission"                     => "ได้รับอนุญาต!",
     "permission_edit"                => "ปรับเปลี่ยนสิทธิ์",
+    "file_info_owner"                => "เจ้าของ",
+    "file_info_group"                => "กลุ่ม",
     "no_permission"                  => "ผู้ดูแลระบบได้สิทธิพิเศษนี้!",
     "no_permission_ext"              => "ผู้ดูแลระบบต้องห้ามประเภทของสิทธิ์ของแฟ้มนี้",
     "dialog_max"                     => "เพิ่ม",

config/i18n/uk/main.php

@@ -44,7 +44,8 @@ return array(
     "keyboard_type"                  => "режим клавіатури",
     "font_family"                    => "шрифти",
     "code_mode"                      => "підсвічування синтаксису",
-    "path_can_not_action"            => "Підтримка тільки поділитися своїми власними документами!",
+    "path_can_not_share"             => "Підтримка тільки поділитися своїми власними документами!",
+    "path_can_not_action"            => "Цей каталог не підтримує цю операцію!",
     "wap_page_pc"                    => "PC Версія",
     "wap_page_phone"                 => "мобільний",
     "image_size"                     => "розміри зображення",
@@ -275,6 +276,9 @@ return array(
     "password"                       => "пароль",
     "login_code"                     => "коди",
     "need_check_code"                => "Код аутентифікації увійти з відкритим",
+    "need_check_code_desc"           => "Після відкриття посадки повинна необхідно ввести код підтвердження, туристи автоматичного Логін провалиться.",
+    "setting_csrf_protect"           => "Відкрита захист CSRF",
+    "setting_csrf_protect_desc"      => "Після відкриття типу атаки може ефективно захистити CSRF",
     "login_rember_password"          => "Запам'ятати пароль",
     "setting_show_root_group"        => "Список всіх груп",
     "setting_show_root_group_desc"   => "Дерево групи кореневого каталогу перераховані всі групи",
@@ -295,6 +299,8 @@ return array(
     "old_password_error"             => "Старий пароль неправильний!",
     "permission"                     => "Дозвіл!",
     "permission_edit"                => "зміна дозволів",
+    "file_info_owner"                => "власник",
+    "file_info_group"                => "група",
     "no_permission"                  => "Адміністратор вимкнув цей привілей!",
     "no_permission_ext"              => "Адміністратор заборонив цей тип прав доступу до файлів",
     "dialog_max"                     => "максимізувати",

config/i18n/zh-CN/main.php

@@ -44,7 +44,8 @@ return array(
     "keyboard_type"                  => "键盘模式",
     "font_family"                    => "字体",
     "code_mode"                      => "高亮语法",
-    "path_can_not_action"            => "仅支持分享您自己的文档！",
+    "path_can_not_share"             => "仅支持分享您自己的文档！",
+    "path_can_not_action"            => "此目录不支持该操作!",
     "wap_page_pc"                    => "电脑版",
     "wap_page_phone"                 => "手机版",
     "image_size"                     => "图片尺寸",
@@ -275,6 +276,9 @@ return array(
     "password"                       => "密码",
     "login_code"                     => "验证码",
     "need_check_code"                => "登陆验证码开启",
+    "need_check_code_desc"           => "开启后登陆必须需要输入验证码,游客自动登陆将失效.",
+    "setting_csrf_protect"           => "开启csrf保护",
+    "setting_csrf_protect_desc"      => "开启后能有效防护csrf类攻击",
     "login_rember_password"          => "记住密码",
     "setting_show_root_group"        => "罗列所有群组",
     "setting_show_root_group_desc"   => "树目录根群组是否列出所有群组",
@@ -295,6 +299,8 @@ return array(
     "old_password_error"             => "原密码错误!",
     "permission"                     => "权限!",
     "permission_edit"                => "修改权限",
+    "file_info_owner"                => "所有者",
+    "file_info_group"                => "组",
     "no_permission"                  => "管理员禁止了此权限!",
     "no_permission_ext"              => "管理员禁止了该类型文件权限",
     "dialog_max"                     => "最大化",

config/i18n/zh-TW/main.php

@@ -44,7 +44,8 @@ return array(
     "keyboard_type"                  => "鍵盤模式",
     "font_family"                    => "字體",
     "code_mode"                      => "高亮語法",
-    "path_can_not_action"            => "僅支持分享您自己的文檔！",
+    "path_can_not_share"             => "僅支持分享您自己的文檔！",
+    "path_can_not_action"            => "此目錄不支持該操作!",
     "wap_page_pc"                    => "電腦版",
     "wap_page_phone"                 => "手機版",
     "image_size"                     => "圖片尺寸",
@@ -275,6 +276,9 @@ return array(
     "password"                       => "密碼",
     "login_code"                     => "驗證碼",
     "need_check_code"                => "登錄驗證碼开启",
+    "need_check_code_desc"           => "開啟後登陸必須需要輸入驗證碼,遊客自動登陸將失效.",
+    "setting_csrf_protect"           => "開啟csrf保護",
+    "setting_csrf_protect_desc"      => "開啟後能有效防護csrf類攻擊",
     "login_rember_password"          => "記住密碼",
     "setting_show_root_group"        => "羅列所有群組",
     "setting_show_root_group_desc"   => "樹目錄根群組是否列出所有群組",
@@ -295,6 +299,8 @@ return array(
     "old_password_error"             => "原密碼錯誤!",
     "permission"                     => "許可權!",
     "permission_edit"                => "修改權限",
+    "file_info_owner"                => "所有者",
+    "file_info_group"                => "組",
     "no_permission"                  => "您無此權限!",
     "no_permission_ext"              => "您無該類型檔案權限",
     "dialog_max"                     => "最大化",

config/setting.php

@@ -12,7 +12,6 @@ $config['settings'] = array(
 	'api_login_tonken'	=> '',			 //设定则认为开启服务端api通信登陆，同时作为加密密匙
 	'updload_chunk_size'=> 1024*1024*0.4,//0.4M;分片上传大小设定;需要小于php.ini上传限制的大小
 	'param_rewrite'		=> false,		 //开启url 去除? 直接跟参数
-	'csrf_protect'		=> true, 		 //开启csrf保护
 );
 
 //初始化系统配置
@@ -31,8 +30,9 @@ $config['setting_system_default'] = array(
 	
 	'desktop_folder'	=> 'desktop',	//桌面文件夹别名
 	'version_type'		=> "A",			// 版本
-	'root_list_user'	=> 1,			// 组织架构根节点展示群组内用户
+	'root_list_user'	=> 0,			// 组织架构根节点展示群组内用户
 	'root_list_group'	=> 0,			// 组织架构根节点展示子群组
+	'csrf_protect'		=> 1, 		 	//开启csrf保护
 );
 //初始化默认菜单配置
 $config['setting_system_default']['menu'] = array(

config/version.php

@@ -1,2 +1,2 @@
 <?php
-define('KOD_VERSION','3.45');
+define('KOD_VERSION','3.46');

controller/explorer.class.php

@@ -619,6 +619,10 @@ class explorer extends Controller{
 				substr_count(trim($val['path'],'/'),'/') <= 1){ //分享根项目
 				show_json($this->L['no_permission_write'],false);
 			}
+			if(!path_writeable($path_this)){
+				$error++;
+				continue;
+			}
 
 			// 群组文件删除，移动到个人回收站。
 			// $GLOBALS['path_type'] == KOD_GROUP_SHARE ||
@@ -1065,7 +1069,7 @@ class explorer extends Controller{
 		}
 		//下载
 		$save_path = _DIR($this->in['save_path']);
-		if (!path_writeable($save_path)){
+		if (!$save_path || !path_writeable($save_path)){
 			show_json($this->L['no_permission_write'],false);
 		}
 		$url = rawurldecode($this->in['url']);

controller/user.class.php

@@ -269,6 +269,9 @@ class user extends Controller{
 	 * 登录view
 	 */
 	public function login($msg = ''){
+		if(isset($this->in['is_ajax'])){
+			show_json($msg,false);
+		}
 		if (!file_exists(USER_SYSTEM.'install.lock')) {
 			chmod_path(BASIC_PATH,DEFAULT_PERRMISSIONS);
 			$this->display('install.html');
@@ -294,10 +297,22 @@ class user extends Controller{
 			}
 			$root = '1';
 			$sql=system_member::load_data();
-			$user = $sql->get($root);
+			$user = array(//重置admin
-			$user['password'] = md5($this->in['password']);
+				'name'			=> 'admin',
+				'path'			=> "admin",
+				'password'		=> md5($this->in['password']),
+				'user_id'		=> $root,
+				'role'			=> '1',
+				'config'		=> array('size_max'=>'0','size_use'=>1024),
+				'group_info'	=> array('1'=>'write'),
+				'create_time'	=> time(),
+				'status'		=> 1,
+			);
 			$sql->set($root,$user);
-			if(!$user['create_time'] || !$user['path']){
+			if( !$user['create_time'] || 
+				!$user['path'] ||
+				!file_exists(USER_PATH.$user['path'])
+				){
 				$member = new system_member();
 				$member->init_install();
 			}
@@ -424,13 +439,12 @@ class user extends Controller{
 	//referer检测
 	private function checkCSRF(){
 		$not_check = array('user:common_js');
-		if( !$this->config['settings']['csrf_protect'] ||
+		if( !$this->config['setting_system']['csrf_protect'] ||
 			isset($this->in['access_token']) ||
 			in_array(ST.':'.ACT, $not_check) 
 			){
 			return;
 		}
-
 		if( !isset($_SERVER['HTTP_X_CSRF_TOKEN'])||
 			$_SERVER['HTTP_X_CSRF_TOKEN'] != $_SESSION['X-CSRF-TOKEN']
 		){

lib/class/downloader.class.php

@@ -32,7 +32,7 @@ class downloader {
 			}else{
 				@unlink($save_temp);
 				@unlink($save_file);
-				return self::file_download_curl($url,$save_file);
+				return self::file_download_curl($url,$save_file,false,0,$file_header['length']);
 			}
 		}
 
@@ -64,7 +64,7 @@ class downloader {
 		}
 		// write exists data
 		file_put_contents($data_file, json_encode($exists_data));
-		$result = self::file_download_curl($url,$save_file,true,$exists_length);
+		$result = self::file_download_curl($url,$save_file,true,$exists_length,$content_length);
 		if($result['code']){
 			@unlink($data_file);
 		}
@@ -97,6 +97,12 @@ class downloader {
 			//下载完成，重命名临时文件到目标文件
 			fclose($download_fp);
 			fclose($fp);
+			
+			$filesize = get_filesize(iconv_system($file_temp));
+			if($header_size != 0 && $filesize != $header_size){
+			    return array('code'=>false,'data'=>'file size error');
+			}
+			
 			if(!@rename($file_temp,$file_name)){
 				usleep(round(rand(0,1000)*50));//0.01~10ms
 				@unlink($file_name);
@@ -113,7 +119,7 @@ class downloader {
 
 	// curl 方式下载
 	// 断点续传 http://www.linuxidc.com/Linux/2014-10/107508.htm
-	static function file_download_curl($url, $file_name,$support_range=false,$exists_length=0){
+	static function file_download_curl($url, $file_name,$support_range=false,$exists_length=0,$length=0){
 		$file_temp = $file_name.'.downloading';
 		@set_time_limit(0);
 		if ($fp = @fopen ($file_temp, "a")){
@@ -127,6 +133,16 @@ class downloader {
 			$res = curl_exec($ch);
 			curl_close($ch);
 			fclose($fp);
+
+            $filesize = get_filesize(iconv_system($file_temp));
+			if($filesize < $length && $length!=0){
+			    return array('code'=>false,'data'=>'downloading');
+			}
+			if($filesize > $length && $length!=0){
+			    //远程下载大小不匹配；则返回正在下载中，客户端重新触发下载
+			    return array('code'=>false,'data'=>'file size error');
+			}
+			
 			if($res && filesize($file_temp) != 0){
 				if(!@rename($file_temp,$file_name)){
 					@unlink($file_name);

lib/class/fileCache.class.php

@@ -173,11 +173,11 @@ class fileCache{
 
 		$str = file_read_safe($file,0.4);
 		if($str === false || strlen($str) == 0){
-			$time = @filemtime($file); 
 			//服务器崩溃下文件不存在异常恢复
 			if( (!file_exists($file) || filesize($file) == 0 ) && 
 				file_exists($file_lock) &&
-				$time > 1000 && time() - $time > 10
+				@filemtime($file_lock) > 1000 && 
+				time() - @filemtime($file_lock) > 10
 				){
 				@rename($file_lock,$file);
 			}

lib/class/kodArchive.class.php

@@ -271,9 +271,9 @@ class kodArchive {
 			//TrOn(10);
 			$test = array($files);
 			foreach ($files as $key =>$val) {
+				$val = str_replace('//','/',$val);
 				$remove_path_pre = _DIR_CLEAR(get_path_father($val));
 				$test[] = array($val,$remove_path_pre);
-
 				if($key == 0){
 					$result = PclTarCreate($file,array($val), $ext,null, $remove_path_pre);
 					continue;

lib/function/file.function.php

@@ -68,7 +68,7 @@ function iconv_system($str){
 function get_filesize($path){
 	$result = false;
 	$fp = fopen($path,"r");
-	if(! $fp = fopen($path,"r")) return $return;
+	if(! $fp = fopen($path,"r")) return $result;
 	if(PHP_INT_SIZE >= 8 ){ //64bit
 		$result = (float)(abs(sprintf("%u",@filesize($path))));
 	}else{
@@ -631,13 +631,14 @@ function recursion_dir($path,&$dir,&$file,$deepest=-1,$deep=0){
 
 // 安全读取文件，避免并发下读取数据为空
 function file_read_safe($file,$timeout = 0.1){
+	clearstatcache();
 	if(!$file || !file_exists($file)) return false;
 
 	$start_time = microtime(true);
 	$index = 0;
 	do{
-	    $index++;
 		clearstatcache();
+		$index++;
 		$file_size = filesize($file);
 		$result = @file_get_contents($file);
 		if( $result === false ||
@@ -653,6 +654,7 @@ function file_read_safe($file,$timeout = 0.1){
 
 // 安全读取文件，避免并发下读取数据为空
 function file_wirte_safe($file,$buffer,$timeout=0.1){
+	clearstatcache();
 	$file_temp = $file.'.'.time().rand_string(5);
 	if(!$fp = fopen($file_temp, "w")){
 		@unlink($file_temp);
@@ -665,6 +667,7 @@ function file_wirte_safe($file,$buffer,$timeout=0.1){
 	$start_time = microtime(true);
 	$index = 0;
 	do{
+		clearstatcache();
 		$index++;
 		if(!file_exists($file_lock)){
 			@rename($file,$file_lock);
@@ -947,13 +950,13 @@ function file_put_out($file,$download=false,$download_filename=false){
 
 	$mime = get_file_mime(get_path_ext($filename));
 	$filename_output = rawurlencode(iconv_app($filename));
-	if ($download) {
+	if ($download || !mime_support($mime)) {
-		header("Content-Type: application/octet-stream");
-		header("Content-Transfer-Encoding: binary");
 		$header_name = $filename_output;
 		if(!is_wap()){
 			$header_name.=";filename*=UTF-8''".$filename_output;
 		}
+		header("Content-Type: application/octet-stream");
+		header("Content-Transfer-Encoding: binary");
 		header("Content-Disposition: attachment;filename=".$header_name);
 	}else{
 		//缓存文件
@@ -971,10 +974,10 @@ function file_put_out($file,$download=false,$download_filename=false){
 		}
 		header('Etag: '.$etag);
 		header('Last-Modified: '.$time.' GMT');
+		header("Content-Type: ".$mime);
 	}
 	header("X-OutFileName: ".$filename_output);
 	header("X-Powered-By: kodExplorer.");
-	header("Content-Type: ".$mime);
 	
 	//远程路径不支持断点续传；打开zip内部文件
 	if(!file_exists($file)){

lib/function/web.function.php

@@ -484,6 +484,36 @@ function get_os (){
 	return $os;
 }
 
+// 浏览器是否直接打开
+function mime_support($mime){
+	$arr_start = array(
+		"text/",
+		"image/",
+		"audio/",
+		"video/",
+		"message/",
+	);
+	$arr_mime = array(
+		"application/hta",
+		"application/javascript",
+		"application/json",
+		"application/x-latex",
+		"application/pdf",
+		"application/x-shockwave-flash",
+		"application/x-tex",
+		"application/x-texinfo"
+	);
+	if(in_array($mime,$arr_mime)){
+		return true;
+	}
+	foreach ($arr_start as $val) {
+		if(substr($mime,0,strlen($val)) == $val){
+			return true;
+		}
+	}
+	return false;
+}
+
 //根据扩展名获取mime
 function get_file_mime($ext){
 	$mimetypes = array(
@@ -626,7 +656,7 @@ function get_file_mime($ext){
 		"ram" => "audio/x-pn-realaudio",
 		"ras" => "image/x-cmu-raster",
 		"rgb" => "image/x-rgb",
-		"rmi audio/mid" => "http://www.dreamdu.com",
+		"rmi" => "audio/mid",
 		"roff" => "application/x-troff",
 		"rtf" => "application/rtf",
 		"rtx" => "text/richtext",

lib/plugins/adminer/adminer.css

@@ -730,3 +730,8 @@ h2, h3 {
     z-index: 999;
     position: fixed;
 }
+
+.js .checkable .checked td, 
+.js .checkable .checked th {
+    background: #2196f3;
+}

static/js/lib/artDialog/jquery-artDialog.js

@@ -842,7 +842,6 @@ artDialog.fn = artDialog.prototype = {
 
 		that._lockMaskWrap = lockMaskWrap;
 		that._lockMask = lockMask;
-
 		that._lock = true;
 		return that;
 	},

static/js/lib/picasa/picasa.js

@@ -249,14 +249,20 @@ Picasa.prototype = {
 			'<div id="PV_Control">'+
 			'	<ul id="PV_Items"></ul>'+
 			'	<div id="PV_Buttons">'+
-			'		<div id="PV_Zoom"><a href="javascript: void(0);" id="PV_Btn_ZoomActual">1:1</a><a href="javascript: void(0);" id="PV_Btn_ZoomOut">-</a><a href="javascript: void(0);" id="PV_Btn_ZoomIn">+</a></div>'+
+			'		<a href="javascript: void(0);" id="PV_Btn_ZoomOut" class="tool-btn">-</a>'+
+			'		<a href="javascript: void(0);" id="PV_Btn_ZoomIn" class="tool-btn">+</a>'+
+			'		<a href="javascript: void(0);" id="PV_Btn_ZoomActual" class="tool-btn">1:1</a>'+
 			'		<div id="PV_Select" class="PV_Btn_Normal">'+
 			'			<a href="javascript: void(0);" id="PV_Btn_Prev"><i class="icon-arrow-left"></i></a>'+
 			'			<a href="javascript: void(0);" id="PV_Btn_Slide"><i class="icon-play"></i></a>'+
-			'			<a href="javascript: void(0);" id="PV_Btn_Next"><i class="icon-arrow-right"></i></a></div>'+
+			'			<a href="javascript: void(0);" id="PV_Btn_Next"><i class="icon-arrow-right"></i></a>'+
-			'		<a href="javascript:void(0);" id="PV_rotate_Left" class="rotate"><i class=" icon-rotate-left"></i></a>'+
+			'		</div>'+
-			'		<a href="javascript:void(0);" id="PV_rotate_Right" class="rotate"><i class="icon-rotate-right"></i></a>'+
+			'		<a href="javascript:void(0);" id="PV_rotate_Left" class="tool-btn rotate"><i class=" icon-rotate-left"></i></a>'+
-			'		<a href="javascript:void(0);" id="PV_Btn_Full"><i class="icon-fullscreen"></i></a>'+
+			'		<a href="javascript:void(0);" id="PV_rotate_Right" class="tool-btn rotate"><i class="icon-rotate-right"></i></a>'+
+			'		<a href="javascript:void(0);" id="PV_Btn_Full" class="tool-btn"><i class="icon-fullscreen"></i></a>'+
+
+			'		<a href="javascript:void(0);" id="PV_Btn_Remove" title="Remove(key delete)" class="tool-btn ml-20"><i class="icon-trash"></i></a>'+
+			'		<a href="javascript:void(0);" id="PV_Btn_Open" class="tool-btn"><i class="icon-external-link"></i></a>'+
 			'	</div>'+
 			'</div>';
 		document.body.appendChild(this.frame);
@@ -436,6 +442,17 @@ Picasa.prototype = {
 			}catch(e){}
 		});
 
+		$('#PV_Btn_Remove').die("click").bind('click',function(e){
+			try{
+				self.removeImage();
+			}catch(e){}
+		});
+		$('#PV_Btn_Open').die("click").bind('click',function(e){
+			try{
+				window.open($('#PV_Picture').attr('src'));
+			}catch(e){}
+		});
+
 		this.btnAutoPlay.onmouseover = function() {self.hint(self.lng.autoplay);}
 		this.btnAutoPlay.onmouseout = function() {self.hint();}
 		this.btnAutoPlay.onclick = function() {self.autoPlayAction(); return false;}
@@ -560,11 +577,12 @@ Picasa.prototype = {
 		if(this.isAutoPlaying) {
 			clearTimeout(this.doAuto);
 			this.isAutoPlaying = false;
+			$(this.btnAutoPlay).removeClass('seled');
 		}else{
 			this.autoPlay();
 			this.isAutoPlaying = true;
+			$(this.btnAutoPlay).addClass('seled');
 		}
-		this.setButton(this.btnAutoPlay, this.isAutoPlaying);
 	},
 	autoPlay : function() {
 		var self = this;
@@ -639,7 +657,6 @@ Picasa.prototype = {
 			this.currentSizePer = Math.round(this.currentSizePer);
 		}
 		
-		this.setButton(this.btnZoomActual, (this.currentSizePer==100));
 		var size = this.arrItems[this.currentNo][2];
 		this.currentZoomSize = [Math.round(size[0]*this.currentSizePer/100), Math.round(size[1]*this.currentSizePer/100)];
 		this.currentZoomCoord = [Math.round(this.initialCoord[0]-this.currentZoomSize[0]/2), Math.round(this.initialCoord[1]-this.currentZoomSize[1]/2)];
@@ -798,30 +815,36 @@ Picasa.prototype = {
 		var key = e.keyCode;
 		var isHotKey = false;
 		
-		if(key==27) {
+		if(key==27) {//esc
 			this.close();
 			isHotKey = true;
-		}else if(key==37) {
+		}else if(key==37) {//left
 			this.changeImage(this.currentNo-1);
 			isHotKey = true;
-		}else if(key==39) {
+		}else if(key==39) {//right
 			this.changeImage(this.currentNo+1);
 			isHotKey = true;
-		}else if(key==38 || key==187 || key==107) {
+		}else if(key==38 || key==187 || key==107) {//up + number+
 			this.zoomAction(1);
 			isHotKey = true;
-		}else if(key==40 || key==189 || key==109) {
+		}else if(key==40 || key==189 || key==109) {//down - number-
 			this.zoomAction(-1);
 			isHotKey = true;
-		}else if(key==111 || key==191 || key==220) {
+		}else if(key==111 || key==191 || key==220) {//KP_Divide less greater bar
 			this.zoomAction(100);
 			isHotKey = true;
 		}else if(key==106) {
 			this.zoomAction(this.defaultSizePer);
 			isHotKey = true;
+		}else if(key==46) {
+			this.removeImage();
 		}
 		if(isHotKey) this.Event.end(e);
 	},
+	removeImage:function(){
+		var index = $('#PV_Control #PV_Items .current').attr('number');
+		ui.path.removeImage(index);
+	},
 
 	// 滚轮操作
 	setWheel : function(b) {
@@ -856,12 +879,6 @@ Picasa.prototype = {
 		this.Event.end(e);
 	},
 	
-	// 设置按钮
-	setButton : function() {
-		var args = arguments;
-		args[0].className = args[1] ? 'seled' : '';
-	},
-	
 	// 停止所有动作
 	stopAll : function() {
 		clearTimeout(this.doShowItem);

static/js/lib/picasa/style/style.css

@@ -2,18 +2,18 @@
 * body {height: 100%; overflow-y: auto}
 * html{overflow-x: auto; overflow-y: hidden}
 /* www.codefans.net */
-#PicasaMask {position: fixed; _position: absolute; z-index: 9998; top: 0; left: 0; 
+#PicasaMask {position: fixed; _position: absolute; z-index: 100; top: 0; left: 0; 
 background: #000; overflow: hidden;}
 
 
-#PV_Close{position: fixed; _position: absolute; z-index: 9999; right:-70px; top:-75px;height:140px;
+#PV_Close{position: fixed; _position: absolute; z-index: 200; right:-70px; top:-75px;height:140px;
 width:140px;text-decoration:none;background:#000;border-radius:70px;opacity:0.4;filter:alpha(opacity=40);}
 #PV_Close span{display:block;margin-top:75px;margin-left:35px;color:#fff;
 font-size:35px;font-family: Arial, sans-serif;}
 #PV_Close:hover{opacity:0.6;filter:alpha(opacity=80);}
 #PV_Close:hover span{color:#f30;}
 #PV_Picture_Temp {display: none;}
-#PicasaView {position: fixed; _position: absolute; z-index: 9999; left: 0; top: 0; overflow: hidden}
+#PicasaView {position: fixed; _position: absolute; z-index: 200; left: 0; top: 0; overflow: hidden}
 	#PV_Picture {position: absolute; z-index: 0; cursor: move;
 	-webkit-box-reflect: below 1px -webkit-gradient(linear,left top,left bottom,from(transparent),color-stop(80%,transparent),color-stop(70%,rgba(255,255,255,0)),to(rgba(255,255,255,0.3)));
 }
@@ -30,10 +30,6 @@ font-size:35px;font-family: Arial, sans-serif;}
 			#PV_Items img {border: none; width: 35px; height: 35px;-webkit-box-reflect: below 1px -webkit-gradient(linear,left top,left bottom,from(transparent),color-stop(20%,transparent),color-stop(60%,rgba(255,255,255,0.1)),to(rgba(255,255,255,0.8)));}
 		#PV_Buttons {position: absolute; z-index: 6; margin: 20px auto 0 auto}
 			#PV_Buttons a {float: left; color: #808080; text-align: center; text-decoration: none}
-			#PV_Zoom {float: left; width: 100px; margin-top: 8px}
-				#PV_Zoom a {float: right; width: 28px; height: 19px; font: 11px/19px Tahoma; margin-left: 1px; background-image: url(Picasa_Button.gif)}
-				#PV_Zoom a:hover {color: #ccc; background-position: 0 -20px}
-				#PV_Zoom a.seled {color: #fff; background-position: 0 -40px;font-weight:800;}
 			#PV_Select {float: left; width: 78px; height: 30px; margin: 0 15px; background-image: url(Picasa_Button.gif); overflow: hidden}
 				.PV_Btn_Normal {background-position: -120px 0}
 				.PV_Btn_PrevOver {background-position: -120px -40px}
@@ -50,7 +46,7 @@ font-size:35px;font-family: Arial, sans-serif;}
 
 #PV_Buttons{opacity:0.9;}
 #PV_Zoom{margin:0;margin-right: 10px;}
-#PV_Buttons #PV_Zoom a,#PV_Buttons #PV_Btn_Full,#PV_Buttons .rotate{
+#PV_Buttons .tool-btn{
 	background-image: none;
 	margin-right: 2px;
 	border-radius: 4px;
@@ -61,10 +57,7 @@ font-size:35px;font-family: Arial, sans-serif;}
 	border:2px solid #555;
 	border-color:rgba(255,255,255,0.1);
 }
-#PV_Buttons #PV_Zoom a:hover
+#PV_Buttons .tool-btn:hover{border: 2px solid #888;background:#222;}
-,#PV_Buttons #PV_Btn_Full:hover,
-#PV_Buttons .rotate:hover
-{border: 2px solid #888;background:#222;}
 #PV_Select{
 	margin: 0 15px;
 	height: 40px;

static/js/lib/util.js

@@ -1310,6 +1310,7 @@ var MaskView =  (function(){
 			if (typeof jQuery === "function" && el instanceof jQuery) {
 				el = el[0];
 			}
+			if(!el) return false;
 			var rect     = el.getBoundingClientRect(),
 				vWidth   = window.innerWidth || document.documentElement.clientWidth,
 				vHeight  = window.innerHeight || document.documentElement.clientHeight,

template/explorer/content.php

@@ -116,6 +116,7 @@
 						<span class='msg fl-left'><?php echo $L['path_loading'];?></span>
 						<div class="clear"></div>
 					</div>
+				</div>
 				<div class="tools-right">
 					<div class="btn-group btn-group-sm">
 					  <button id='set_icon' title="<?php echo $L['list_icon'];?>" type="button" class="btn btn-default">

template/share/explorer.php

@@ -27,7 +27,9 @@
 
 <style>
 .frame-main .frame-left {bottom: 0px;}
-.frame-main .bottom_box{display:none;}
+.frame-main .bottom_box{display:none !important;}
+.tools-right #set_theme{display:none !important;}
+#PV_rotate_Left,#PV_rotate_Right,#PV_Btn_Remove{display:none !important;}
 <?php if(isset($_GET['type'])){?>
 	.topbar,.common_footer,.bottom_box{display:none;}
 	.frame-header{top:0;}